update and rebuild translations.

author: Andrei Karas <akaras@inbox.ru> 2013-05-11 12:19:16 +0300
committer: Andrei Karas <akaras@inbox.ru> 2013-05-11 12:19:16 +0300
commit: 8b74148d038ae9ed5e102bf52d218c3f59cfd624 (patch)
tree: 15b87f56d886ab6657d88e04aa2bd093a6792c2f /po
parent: 7553637ed9d1f6f6116493ab4367f4cff53fe2cc (diff)
download: mv-8b74148d038ae9ed5e102bf52d218c3f59cfd624.tar.gz
mv-8b74148d038ae9ed5e102bf52d218c3f59cfd624.tar.bz2
mv-8b74148d038ae9ed5e102bf52d218c3f59cfd624.tar.xz
mv-8b74148d038ae9ed5e102bf52d218c3f59cfd624.zip
40 files changed, 13212 insertions, 12172 deletions
diff --git a/po/ar.po b/po/ar.po
index 16f988076..38ccf8046 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-05-03 12:38+0300\n"
-"PO-Revision-Date: 2013-05-03 09:44+0000\n"
+"POT-Creation-Date: 2013-05-10 18:34+0300\n"
+"PO-Revision-Date: 2013-05-10 15:39+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -59,25 +59,25 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: full button name
-#: src/client.cpp:1136 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
+#: src/client.cpp:1137 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
 msgid "Setup"
 msgstr "تثبيت"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1140 src/gui/setup_perfomance.cpp:61
+#: src/client.cpp:1141 src/gui/setup_perfomance.cpp:61
 msgid "Perfomance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:1143 src/gui/setup_video.cpp:258
+#: src/client.cpp:1144 src/gui/setup_video.cpp:258
 msgid "Video"
 msgstr "مرئية"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1146 src/gui/setup_theme.cpp:273
+#: src/client.cpp:1147 src/gui/setup_theme.cpp:283
 msgid "Theme"
 msgstr ""
 
@@ -88,7 +88,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1150 src/gui/didyouknowwindow.cpp:78
+#: src/client.cpp:1151 src/gui/didyouknowwindow.cpp:78
 #: src/gui/inventorywindow.cpp:228 src/gui/npcdialog.cpp:63
 #: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:574
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:80
@@ -96,32 +96,32 @@ msgid "Close"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1238
+#: src/client.cpp:1239
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1282
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1320
+#: src/client.cpp:1321
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1431
+#: src/client.cpp:1432
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1471
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1483
+#: src/client.cpp:1484
 msgid "Changing game servers"
 msgstr ""
 
@@ -136,69 +136,69 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1540 src/client.cpp:1551 src/client.cpp:1721
+#: src/client.cpp:1541 src/client.cpp:1552 src/client.cpp:1722
 #: src/gui/changeemaildialog.cpp:168 src/gui/changepassworddialog.cpp:158
-#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:288
-#: src/gui/editserverdialog.cpp:220 src/gui/registerdialog.cpp:263
+#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:290
+#: src/gui/editserverdialog.cpp:216 src/gui/registerdialog.cpp:263
 #: src/gui/unregisterdialog.cpp:143 src/net/ea/charserverhandler.cpp:190
 #: src/net/ea/charserverhandler.cpp:210
 msgid "Error"
 msgstr "خطأ"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1564
+#: src/client.cpp:1565
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1601
+#: src/client.cpp:1602
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1603
+#: src/client.cpp:1604
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1624
+#: src/client.cpp:1625
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1626
+#: src/client.cpp:1627
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1647
+#: src/client.cpp:1648
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1649
+#: src/client.cpp:1650
 msgid "Farewell, come back any time..."
 msgstr ""
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1902 src/client.cpp:1917 src/client.cpp:1960
-#: src/client.cpp:1976 src/client.cpp:2417 src/client.cpp:2425
+#: src/client.cpp:1903 src/client.cpp:1918 src/client.cpp:1961
+#: src/client.cpp:1977 src/client.cpp:2418 src/client.cpp:2426
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2113
+#: src/client.cpp:2114
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2154 src/client.cpp:2161
+#: src/client.cpp:2155 src/client.cpp:2162
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:2183 src/client.cpp:2196
+#: src/client.cpp:2184 src/client.cpp:2197
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -478,19 +478,19 @@ msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: bot checker window header
-#: src/gui/botcheckerwindow.cpp:269
+#: src/gui/botcheckerwindow.cpp:268
 msgid "Bot Checker"
 msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:102
+#: src/gui/botcheckerwindow.cpp:277 src/gui/npcdialog.cpp:102
 msgid "Reset"
 msgstr ""
 
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: relations table header
-#: src/gui/botcheckerwindow.cpp:305 src/gui/setup_relations.cpp:61
+#: src/gui/botcheckerwindow.cpp:304 src/gui/setup_relations.cpp:61
 msgid "Name"
 msgstr ""
 
@@ -498,7 +498,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:145
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:145
 #: src/gui/popupmenu.cpp:241 src/gui/popupmenu.cpp:640
 #: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:257
 #: src/net/tmwa/generalhandler.cpp:292
@@ -508,7 +508,7 @@ msgstr ""
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
-#: src/gui/botcheckerwindow.cpp:309 src/gui/popupmenu.cpp:225
+#: src/gui/botcheckerwindow.cpp:308 src/gui/popupmenu.cpp:225
 #: src/gui/setupactiondata.h:93
 msgid "Talk"
 msgstr ""
@@ -516,7 +516,7 @@ msgstr ""
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/botcheckerwindow.cpp:311 src/gui/popupmenu.cpp:215
+#: src/gui/botcheckerwindow.cpp:310 src/gui/popupmenu.cpp:215
 #: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:371
 #: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:653
 #: src/gui/popupmenu.cpp:727 src/gui/setupactiondata.h:1856
@@ -524,7 +524,7 @@ msgid "Move"
 msgstr ""
 
 #. TRANSLATORS: bot checker window table header
-#: src/gui/botcheckerwindow.cpp:313
+#: src/gui/botcheckerwindow.cpp:312
 msgid "Result"
 msgstr ""
 
@@ -580,7 +580,7 @@ msgstr "شراء"
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:516
+#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:511
 #: src/gui/selldialog.cpp:94 src/gui/selldialog.cpp:342
 #, c-format
 msgid "Price: %s / Total: %s"
@@ -597,9 +597,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:208
-#: src/gui/itemamountwindow.cpp:243 src/gui/npcdialog.cpp:93
-#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:833
+#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:202
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:93
+#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:821
 msgid "+"
 msgstr ""
 
@@ -609,9 +609,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:240 src/gui/npcdialog.cpp:95
-#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:846
+#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:200
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:95
+#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:834
 msgid "-"
 msgstr ""
 
@@ -623,7 +623,7 @@ msgstr ""
 #. TRANSLATORS: input action name
 #: src/gui/buydialog.cpp:260 src/gui/quitdialog.cpp:54
 #: src/gui/quitdialog.cpp:59 src/gui/quitdialog.cpp:61
-#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:255
+#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:264
 #: src/gui/setupactiondata.h:177
 msgid "Quit"
 msgstr "مغادرة"
@@ -635,7 +635,7 @@ msgstr "مغادرة"
 #. TRANSLATORS: status bar label
 #: src/gui/buydialog.cpp:262 src/gui/selldialog.cpp:106
 #: src/gui/statuswindow.cpp:558 src/gui/statuswindow.cpp:615
-#: src/gui/statuswindow.cpp:830 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:852
 msgid "Max"
 msgstr ""
 
@@ -680,7 +680,7 @@ msgstr "بيع"
 #: src/gui/buyselldialog.cpp:71 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:120
 #: src/gui/connectiondialog.cpp:48 src/gui/editserverdialog.cpp:80
-#: src/gui/itemamountwindow.cpp:212 src/gui/npcpostdialog.cpp:64
+#: src/gui/itemamountwindow.cpp:206 src/gui/npcpostdialog.cpp:64
 #: src/gui/popupmenu.cpp:290 src/gui/popupmenu.cpp:324
 #: src/gui/popupmenu.cpp:411 src/gui/popupmenu.cpp:454
 #: src/gui/popupmenu.cpp:485 src/gui/popupmenu.cpp:512
@@ -696,7 +696,7 @@ msgstr "بيع"
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
 #: src/gui/setup.cpp:84 src/gui/socialwindow.cpp:1204
 #: src/gui/textcommandeditor.cpp:212 src/gui/textdialog.cpp:53
-#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:167
+#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:183
 msgid "Cancel"
 msgstr "إلغاء"
 
@@ -860,7 +860,7 @@ msgstr "رجاء أن توزّع %d نقطة"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:570
+#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:581
 #: src/gui/socialwindow.cpp:1269
 msgid "Create"
 msgstr "إنشاء"
@@ -887,17 +887,17 @@ msgid "Please remove %d points"
 msgstr "رجاء حذف %d نقطة"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:60
+#: src/gui/charselectdialog.cpp:61
 msgid "Confirm Character Delete"
 msgstr ""
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:62
+#: src/gui/charselectdialog.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "هل أنت متأكّد من حذف هذه الشخصيّة؟"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:86
+#: src/gui/charselectdialog.cpp:87
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
@@ -909,8 +909,8 @@ msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:565
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:576
+#: src/gui/updaterwindow.cpp:185
 msgid "Play"
 msgstr ""
 
@@ -926,7 +926,7 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:263
+#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:272
 #: src/gui/setupactiondata.h:1803 src/gui/setup_relations.cpp:262
 #: src/gui/shopwindow.cpp:96 src/gui/shopwindow.cpp:103
 #: src/gui/textcommandeditor.cpp:216
@@ -936,24 +936,24 @@ msgstr "حذف"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/charselectdialog.cpp:129 src/gui/unregisterdialog.cpp:48
+#: src/gui/charselectdialog.cpp:130 src/gui/unregisterdialog.cpp:48
 #: src/gui/unregisterdialog.cpp:53
 msgid "Unregister"
 msgstr "إلغاء التسجيل"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/charselectdialog.cpp:141
+#: src/gui/charselectdialog.cpp:142
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:172
+#: src/gui/charselectdialog.cpp:175
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/charselectdialog.cpp:246
+#: src/gui/charselectdialog.cpp:248
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -963,16 +963,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:288
+#: src/gui/charselectdialog.cpp:290
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password:"
 msgstr ""
 
@@ -1059,13 +1059,13 @@ msgid "Chat"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:735
+#: src/gui/chatwindow.cpp:638
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1165
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -1083,7 +1083,7 @@ msgstr "لا"
 
 #. TRANSLATORS: confirm dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/confirmdialog.cpp:58 src/gui/popupmenu.cpp:2429
+#: src/gui/confirmdialog.cpp:55 src/gui/popupmenu.cpp:2429
 #: src/gui/popupmenu.cpp:2442 src/gui/popupmenu.cpp:2457
 #: src/gui/popupmenu.cpp:2483
 msgid "Ignore"
@@ -1092,7 +1092,7 @@ msgstr ""
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
 #. TRANSLATORS: settings group
-#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:109
+#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:108
 #: src/gui/setup_other.cpp:123 src/gui/windowmenu.cpp:106
 msgid "Map"
 msgstr ""
@@ -1108,190 +1108,190 @@ msgid "Net"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:265
-#: src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:268
+#: src/gui/debugwindow.cpp:311
 msgid "Music:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:153 src/gui/debugwindow.cpp:271
-#: src/gui/debugwindow.cpp:312
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:274
+#: src/gui/debugwindow.cpp:315
 msgid "Map:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:155 src/gui/debugwindow.cpp:268
-#: src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:271
+#: src/gui/debugwindow.cpp:313
 msgid "Minimap:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:262
-#: src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:161 src/gui/debugwindow.cpp:265
+#: src/gui/debugwindow.cpp:309
 msgid "Cursor:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:161
+#: src/gui/debugwindow.cpp:164
 msgid "Particle count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:284
-#: src/gui/debugwindow.cpp:316
+#: src/gui/debugwindow.cpp:167 src/gui/debugwindow.cpp:287
+#: src/gui/debugwindow.cpp:319
 msgid "Map actors count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:166 src/gui/debugwindow.cpp:243
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:169 src/gui/debugwindow.cpp:246
+#: src/gui/debugwindow.cpp:252
 msgid "Player Position:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:172 src/gui/debugwindow.cpp:297
+#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:300
 msgid "Draw calls:"
 msgstr ""
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:175
+#. TRANSLATORS: debug window label, frames per second
+#: src/gui/debugwindow.cpp:178
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:177 src/gui/debugwindow.cpp:324
+#. TRANSLATORS: debug window label, logic per second
+#: src/gui/debugwindow.cpp:180 src/gui/debugwindow.cpp:327
 #, c-format
 msgid "%d LPS"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:191 src/gui/debugwindow.cpp:209
 #, c-format
 msgid "%d FPS (Software)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:193
+#: src/gui/debugwindow.cpp:196
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:197
+#: src/gui/debugwindow.cpp:200
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:201
+#: src/gui/debugwindow.cpp:204
 #, c-format
 msgid "%d FPS (mobile OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:225 src/gui/debugwindow.cpp:290
+#: src/gui/debugwindow.cpp:228 src/gui/debugwindow.cpp:293
 msgid "Textures count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:279
+#: src/gui/debugwindow.cpp:282
 #, c-format
 msgid "Particle count: %d"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:330 src/gui/debugwindow.cpp:380
-#: src/gui/debugwindow.cpp:442
+#: src/gui/debugwindow.cpp:333 src/gui/debugwindow.cpp:383
+#: src/gui/debugwindow.cpp:445
 msgid "Target:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:332 src/gui/debugwindow.cpp:386
-#: src/gui/debugwindow.cpp:444
+#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
+#: src/gui/debugwindow.cpp:447
 msgid "Target Id:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
-#: src/gui/debugwindow.cpp:446
+#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:392
+#: src/gui/debugwindow.cpp:449
 msgid "Target type:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:337
+#: src/gui/debugwindow.cpp:340
 msgid "Target level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:339 src/gui/debugwindow.cpp:405
+#: src/gui/debugwindow.cpp:342 src/gui/debugwindow.cpp:408
 msgid "Target race:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:341
+#: src/gui/debugwindow.cpp:344
 msgid "Target party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:346
 msgid "Target guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:430
-#: src/gui/debugwindow.cpp:436 src/gui/debugwindow.cpp:454
+#: src/gui/debugwindow.cpp:348 src/gui/debugwindow.cpp:433
+#: src/gui/debugwindow.cpp:439 src/gui/debugwindow.cpp:457
 msgid "Attack delay:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:347 src/gui/debugwindow.cpp:417
-#: src/gui/debugwindow.cpp:456
+#: src/gui/debugwindow.cpp:350 src/gui/debugwindow.cpp:420
+#: src/gui/debugwindow.cpp:459
 msgid "Minimal hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:349 src/gui/debugwindow.cpp:420
-#: src/gui/debugwindow.cpp:458
+#: src/gui/debugwindow.cpp:352 src/gui/debugwindow.cpp:423
+#: src/gui/debugwindow.cpp:461
 msgid "Maximum hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:351 src/gui/debugwindow.cpp:423
-#: src/gui/debugwindow.cpp:460
+#: src/gui/debugwindow.cpp:354 src/gui/debugwindow.cpp:426
+#: src/gui/debugwindow.cpp:463
 msgid "Critical hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:394 src/gui/debugwindow.cpp:400
-#: src/gui/debugwindow.cpp:448
+#: src/gui/debugwindow.cpp:397 src/gui/debugwindow.cpp:403
+#: src/gui/debugwindow.cpp:451
 msgid "Target Level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:408 src/gui/debugwindow.cpp:450
+#: src/gui/debugwindow.cpp:411 src/gui/debugwindow.cpp:453
 msgid "Target Party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:412 src/gui/debugwindow.cpp:452
+#: src/gui/debugwindow.cpp:415 src/gui/debugwindow.cpp:455
 msgid "Target Guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:493
+#: src/gui/debugwindow.cpp:496
 #, c-format
 msgid "Ping: %s ms"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:496
+#: src/gui/debugwindow.cpp:499
 #, c-format
 msgid "In: %d bytes/s"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:499
+#: src/gui/debugwindow.cpp:502
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
@@ -1323,7 +1323,7 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #: src/gui/editdialog.cpp:45 src/gui/editserverdialog.cpp:78
-#: src/gui/itemamountwindow.cpp:210 src/gui/okdialog.cpp:51
+#: src/gui/itemamountwindow.cpp:204 src/gui/okdialog.cpp:51
 #: src/gui/quitdialog.cpp:70 src/gui/textdialog.cpp:46
 msgid "OK"
 msgstr ""
@@ -1335,7 +1335,7 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:257
+#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:266
 msgid "Connect"
 msgstr ""
 
@@ -1365,7 +1365,7 @@ msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/editserverdialog.cpp:222
+#: src/gui/editserverdialog.cpp:218
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -1417,7 +1417,7 @@ msgstr "استعمال العتاد"
 #: src/gui/inventorywindow.cpp:178 src/gui/inventorywindow.cpp:630
 #: src/gui/popupmenu.cpp:1843 src/gui/popupmenu.cpp:1922
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2041
-#: src/gui/skilldialog.cpp:277
+#: src/gui/skilldialog.cpp:279
 msgid "Use"
 msgstr "استخدام"
 
@@ -1451,7 +1451,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: setup button
-#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:718
+#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:719
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1992
 #: src/gui/popupmenu.cpp:2066 src/gui/setup.cpp:86
 msgid "Store"
@@ -1473,47 +1473,47 @@ msgid "Drop"
 msgstr "إسقاط"
 
 #. TRANSLATORS: item amount window button
-#: src/gui/itemamountwindow.cpp:214
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:264
 msgid "Select amount of items to trade."
 msgstr "انتقاء كمّيّة من المواد للمتاجرة بها."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:274
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to drop."
 msgstr "انتقاء كمّيّة من المواد لإسقاطها."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:278
+#: src/gui/itemamountwindow.cpp:272
 msgid "Select amount of items to store."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:276
 msgid "Select amount of items to retrieve."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:286
+#: src/gui/itemamountwindow.cpp:280
 msgid "Select amount of items to split."
 msgstr "انتقاء كمّيّة من المواد لقسمها."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:290
+#: src/gui/itemamountwindow.cpp:284
 msgid "Add to buy shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:294
+#: src/gui/itemamountwindow.cpp:288
 msgid "Add to sell shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:298
+#: src/gui/itemamountwindow.cpp:292
 msgid "Unknown."
 msgstr ""
 
@@ -1540,7 +1540,7 @@ msgstr ""
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:58 src/gui/killstats.cpp:171
-#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:516
+#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:509
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
@@ -1548,7 +1548,7 @@ msgstr ""
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:61 src/gui/killstats.cpp:173
 #: src/gui/killstats.cpp:253 src/gui/killstats.cpp:268
-#: src/gui/killstats.cpp:518
+#: src/gui/killstats.cpp:511
 #, c-format
 msgid "Avg Exp: %s"
 msgstr ""
@@ -1556,14 +1556,14 @@ msgstr ""
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:63 src/gui/killstats.cpp:176
 #: src/gui/killstats.cpp:258 src/gui/killstats.cpp:272
-#: src/gui/killstats.cpp:521
+#: src/gui/killstats.cpp:514
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:66 src/gui/killstats.cpp:187
-#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:524
+#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:517
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
@@ -1599,9 +1599,9 @@ msgid "Last kill exp:"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:414
-#: src/gui/killstats.cpp:421 src/gui/killstats.cpp:428
-#: src/gui/killstats.cpp:434
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:408
+#: src/gui/killstats.cpp:415 src/gui/killstats.cpp:422
+#: src/gui/killstats.cpp:428
 msgid "Time before jacko spawn:"
 msgstr ""
 
@@ -1633,12 +1633,12 @@ msgid "  Time for next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:421
+#: src/gui/killstats.cpp:415
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:428
+#: src/gui/killstats.cpp:422
 msgid "jacko spawning"
 msgstr ""
 
@@ -1744,32 +1744,32 @@ msgid "arrows bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:88
+#: src/gui/ministatuswindow.cpp:89
 msgid "status bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:108
+#: src/gui/ministatuswindow.cpp:109
 msgid "job bar"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:306 src/gui/statuswindow.cpp:298
+#: src/gui/ministatuswindow.cpp:307 src/gui/statuswindow.cpp:298
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:313 src/gui/statuswindow.cpp:141
+#: src/gui/ministatuswindow.cpp:314 src/gui/statuswindow.cpp:141
 #: src/gui/statuswindow.cpp:305 src/gui/statuswindow.cpp:375
 #, c-format
 msgid "Level: %d"
 msgstr "المستوى: %d"
 
 #. TRANSLATORS: status bar label
-#: src/gui/ministatuswindow.cpp:330 src/gui/ministatuswindow.cpp:367
+#: src/gui/ministatuswindow.cpp:331 src/gui/ministatuswindow.cpp:368
 msgid "Need"
 msgstr ""
 
@@ -2157,7 +2157,7 @@ msgstr ""
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2209 src/gui/popupmenu.cpp:2280
-#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:139
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
 #: src/gui/socialwindow.cpp:934
 msgid "(default)"
 msgstr ""
@@ -2340,7 +2340,7 @@ msgid "Passwords do not match."
 msgstr "كلمات السرّ غير متطابقة."
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:257
 msgid "Choose Your Server"
 msgstr ""
 
@@ -2348,61 +2348,61 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:259 src/gui/shopwindow.cpp:94
+#: src/gui/serverdialog.cpp:268 src/gui/shopwindow.cpp:94
 #: src/gui/shopwindow.cpp:101 src/gui/tradewindow.cpp:77
 msgid "Add"
 msgstr "إضافة"
 
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
-#: src/gui/serverdialog.cpp:261 src/gui/widgets/setupitem.cpp:299
+#: src/gui/serverdialog.cpp:270 src/gui/widgets/setupitem.cpp:299
 #: src/gui/widgets/setupitem.cpp:426
 msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:274
 msgid "Load"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:279
+#: src/gui/serverdialog.cpp:288
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:297
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:518
+#: src/gui/serverdialog.cpp:527
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:524
+#: src/gui/serverdialog.cpp:533
 msgid "Waiting for server..."
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:529
+#: src/gui/serverdialog.cpp:538
 msgid "Preparing download"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:534
+#: src/gui/serverdialog.cpp:543
 msgid "Error retreiving server list!"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:626
+#: src/gui/serverdialog.cpp:635
 msgid "requires a newer version"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:631
+#: src/gui/serverdialog.cpp:640
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -3413,7 +3413,7 @@ msgid "Type:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:334
+#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:336
 msgid "Delay:"
 msgstr ""
 
@@ -3433,30 +3433,30 @@ msgid "Blue:"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:420
+#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:422
 msgid "Static"
 msgstr ""
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:107 src/gui/setup_colors.cpp:110
-#: src/gui/setup_colors.cpp:422
+#: src/gui/setup_colors.cpp:424
 msgid "Pulse"
 msgstr ""
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:112 src/gui/setup_colors.cpp:115
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Rainbow"
 msgstr ""
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:117 src/gui/setup_colors.cpp:120
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Spectrum"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:328
+#: src/gui/setup_colors.cpp:330
 msgid "Alpha:"
 msgstr ""
 
@@ -3622,7 +3622,7 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: palette color
-#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:134
+#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:135
 msgid "Monsters"
 msgstr ""
 
@@ -4171,206 +4171,231 @@ msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:86
-msgid "Very small (9)"
+msgid "Very small (8)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:88
-msgid "Tiny (10)"
+msgid "Very small (9)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:90
-msgid "Small (11)"
+msgid "Tiny (10)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:92
-msgid "Medium (12)"
+msgid "Small (11)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:94
-msgid "Normal (13)"
+msgid "Medium (12)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:96
-msgid "Large (14)"
+msgid "Normal (13)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:98
-msgid "Very large (15)"
+msgid "Large (14)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:100
-msgid "Big (16)"
+msgid "Large (15)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:102
-msgid "Very big (17)"
+msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:104
-msgid "Huge (18)"
+msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:106
-msgid "Very huge (19)"
+msgid "Big (18)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:108
+msgid "Big (19)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:110
+msgid "Very big (20)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:112
+msgid "Very big (21)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:114
+msgid "Very big (22)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:116
+msgid "Huge (23)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:151
 msgid "Chinese (China)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:153
 msgid "Czech"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:155
 msgid "English"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:157
 msgid "Finnish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:159
 msgid "French"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:161
 msgid "German"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:153
+#: src/gui/setup_theme.cpp:163
 msgid "Indonesian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:155
+#: src/gui/setup_theme.cpp:165
 msgid "Italian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:157
+#: src/gui/setup_theme.cpp:167
 msgid "Polish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:159
+#: src/gui/setup_theme.cpp:169
 msgid "Japanese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:161
+#: src/gui/setup_theme.cpp:171
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:163
+#: src/gui/setup_theme.cpp:173
 msgid "Portuguese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:165
+#: src/gui/setup_theme.cpp:175
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:167
+#: src/gui/setup_theme.cpp:177
 msgid "Russian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:169
+#: src/gui/setup_theme.cpp:179
 msgid "Spanish (Castilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:171
+#: src/gui/setup_theme.cpp:181
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:223
+#: src/gui/setup_theme.cpp:233
 msgid "Gui theme"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:230
+#: src/gui/setup_theme.cpp:240
 msgid "Main Font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:235
+#: src/gui/setup_theme.cpp:245
 msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:239
+#: src/gui/setup_theme.cpp:249
 msgid "Bold font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:243
+#: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:247
+#: src/gui/setup_theme.cpp:257
 msgid "Help font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:251
+#: src/gui/setup_theme.cpp:261
 msgid "Secure font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:255
+#: src/gui/setup_theme.cpp:265
 msgid "Japanese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:260
+#: src/gui/setup_theme.cpp:270
 msgid "Font size"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:265
+#: src/gui/setup_theme.cpp:275
 msgid "Npc font size"
 msgstr ""
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/setup_theme.cpp:269
+#: src/gui/setup_theme.cpp:279
 msgid "i"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/setup_theme.cpp:442
+#: src/gui/setup_theme.cpp:452
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/setup_theme.cpp:467
+#: src/gui/setup_theme.cpp:477
 msgid "Theme Changed"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/setup_theme.cpp:467 src/gui/setup_video.cpp:537
+#: src/gui/setup_theme.cpp:477 src/gui/setup_video.cpp:537
 #: src/gui/setup_video.cpp:546
 msgid "Restart your client for the change to take effect."
 msgstr ""
@@ -4668,7 +4693,8 @@ msgid "Ambient FX"
 msgstr "مؤثّرات محيطة"
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_visual.cpp:140
+#. TRANSLATORS: palette color
+#: src/gui/setup_visual.cpp:140 src/gui/userpalette.cpp:146
 msgid "Particle effects"
 msgstr ""
 
@@ -4755,45 +4781,45 @@ msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/skilldialog.cpp:270 src/gui/windowmenu.cpp:112
+#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:112
 msgid "Skills"
 msgstr "مهارات"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/skilldialog.cpp:279
+#: src/gui/skilldialog.cpp:281
 msgid "Up"
 msgstr ""
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/skilldialog.cpp:391
+#: src/gui/skilldialog.cpp:393
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skills tab
-#: src/gui/skilldialog.cpp:444
+#: src/gui/skilldialog.cpp:446
 msgid "basic"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill name
-#: src/gui/skilldialog.cpp:447
+#: src/gui/skilldialog.cpp:449
 msgid "basic, 1"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/skilldialog.cpp:484
+#: src/gui/skilldialog.cpp:486
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/skilldialog.cpp:518
+#: src/gui/skilldialog.cpp:520
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/skilldialog.cpp:612 src/gui/skilldialog.cpp:762
+#: src/gui/skilldialog.cpp:614 src/gui/skilldialog.cpp:764
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -5236,7 +5262,7 @@ msgid "Trade: You"
 msgstr ""
 
 #. TRANSLATORS: trade window money label
-#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:182
+#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:184
 #, c-format
 msgid "You get %s"
 msgstr ""
@@ -5252,12 +5278,12 @@ msgid "You give:"
 msgstr "أنت تقدّم:"
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:393
+#: src/gui/tradewindow.cpp:396
 msgid "You don't have enough money."
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:475
+#: src/gui/tradewindow.cpp:479
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
@@ -5269,223 +5295,223 @@ msgid "Name: %s"
 msgstr "الاسم: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/updaterwindow.cpp:140
+#: src/gui/updaterwindow.cpp:156
 msgid "Updating..."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:165
+#: src/gui/updaterwindow.cpp:181
 msgid "Connecting..."
 msgstr "جارِ الاتّصال..."
 
 #. TRANSLATORS: update message
-#: src/gui/updaterwindow.cpp:656
+#: src/gui/updaterwindow.cpp:672
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/updaterwindow.cpp:658
+#: src/gui/updaterwindow.cpp:674
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:660
+#: src/gui/updaterwindow.cpp:676
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:839
+#: src/gui/updaterwindow.cpp:855
 msgid "Completed"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
 msgid "Being"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:118
-msgid "Friend Names"
+#: src/gui/userpalette.cpp:119
+msgid "Friend names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:120
-msgid "Disregarded Names"
+#: src/gui/userpalette.cpp:121
+msgid "Disregarded names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:122
-msgid "Ignored Names"
+#: src/gui/userpalette.cpp:123
+msgid "Ignored names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:124
-msgid "Erased Names"
+#: src/gui/userpalette.cpp:125
+msgid "Erased names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:126
-msgid "Other Players' Names"
+#: src/gui/userpalette.cpp:127
+msgid "Other players names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:128
-msgid "Own Name"
+#: src/gui/userpalette.cpp:129
+msgid "Own name"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:130
-msgid "GM Names"
+#: src/gui/userpalette.cpp:131
+msgid "GM names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
 msgid "NPCs"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
 msgid "Monster HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:140
 msgid "Monster HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:141
-msgid "Party Members"
+#: src/gui/userpalette.cpp:142
+msgid "Party members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:143
-msgid "Guild Members"
+#: src/gui/userpalette.cpp:144
+msgid "Guild members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:145
-msgid "Particle Effects"
+#: src/gui/userpalette.cpp:148
+msgid "Pickup notification"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:147
-msgid "Pickup Notification"
+#: src/gui/userpalette.cpp:150
+msgid "Exp notification"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:149
-msgid "Exp Notification"
-msgstr ""
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
 msgid "Player HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
 msgid "Player HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:157
-msgid "Player Hits Monster"
+#: src/gui/userpalette.cpp:158
+msgid "Player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:159
-msgid "Monster Hits Player"
+#: src/gui/userpalette.cpp:160
+msgid "Monster hits player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:163
-msgid "Other Player Hits Local Player"
+#: src/gui/userpalette.cpp:164
+msgid "Other player hits local player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:166
 msgid "Critical Hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
-msgid "Local Player Hits Monster"
+#: src/gui/userpalette.cpp:170
+msgid "Local player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:172
-msgid "Local Player Critical Hit"
+#: src/gui/userpalette.cpp:173
+msgid "Local player critical hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:175
-msgid "Local Player Miss"
+#: src/gui/userpalette.cpp:176
+msgid "Local player miss"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:177
+#: src/gui/userpalette.cpp:178
 msgid "Misses"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
-msgid "Portal Highlight"
+#: src/gui/userpalette.cpp:180
+msgid "Portal highlight"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:183
+msgid "Default collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:182
-msgid "Default collision Highlight"
+#: src/gui/userpalette.cpp:186
+msgid "Air collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:185
-msgid "Air collision Highlight"
+#: src/gui/userpalette.cpp:189
+msgid "Water collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:188
-msgid "Water collision Highlight"
+#: src/gui/userpalette.cpp:192
+msgid "Special ground collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:191
-msgid "Special ground collision Highlight"
+#: src/gui/userpalette.cpp:195
+msgid "Walkable highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
-msgid "Walkable Highlight"
+#: src/gui/userpalette.cpp:198
+msgid "Local player attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:197
-msgid "Local Player Attack Range"
+#: src/gui/userpalette.cpp:201
+msgid "Local player attack range border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:200
-msgid "Local Player Attack Range Border"
+#: src/gui/userpalette.cpp:204
+msgid "Monster attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:203
-msgid "Monster Attack Range"
+#: src/gui/userpalette.cpp:208
+msgid "Floor item amount color"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:206
-msgid "Home Place"
+#: src/gui/userpalette.cpp:211
+msgid "Home place"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:209
-msgid "Home Place Border"
+#: src/gui/userpalette.cpp:214
+msgid "Home place border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:212
-msgid "Road Point"
+#: src/gui/userpalette.cpp:217
+msgid "Road point"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
@@ -5615,7 +5641,7 @@ msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:315
+#: src/gui/widgets/itemcontainer.cpp:317
 msgid "Eq."
 msgstr ""
 
diff --git a/po/bg.po b/po/bg.po
index c7ee1dc30..f35cd5b32 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-05-03 12:38+0300\n"
-"PO-Revision-Date: 2013-05-03 09:44+0000\n"
+"POT-Creation-Date: 2013-05-10 18:34+0300\n"
+"PO-Revision-Date: 2013-05-10 15:39+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -59,25 +59,25 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: full button name
-#: src/client.cpp:1136 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
+#: src/client.cpp:1137 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
 msgid "Setup"
 msgstr ""
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1140 src/gui/setup_perfomance.cpp:61
+#: src/client.cpp:1141 src/gui/setup_perfomance.cpp:61
 msgid "Perfomance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:1143 src/gui/setup_video.cpp:258
+#: src/client.cpp:1144 src/gui/setup_video.cpp:258
 msgid "Video"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1146 src/gui/setup_theme.cpp:273
+#: src/client.cpp:1147 src/gui/setup_theme.cpp:283
 msgid "Theme"
 msgstr ""
 
@@ -88,7 +88,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1150 src/gui/didyouknowwindow.cpp:78
+#: src/client.cpp:1151 src/gui/didyouknowwindow.cpp:78
 #: src/gui/inventorywindow.cpp:228 src/gui/npcdialog.cpp:63
 #: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:574
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:80
@@ -96,32 +96,32 @@ msgid "Close"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1238
+#: src/client.cpp:1239
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1282
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1320
+#: src/client.cpp:1321
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1431
+#: src/client.cpp:1432
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1471
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1483
+#: src/client.cpp:1484
 msgid "Changing game servers"
 msgstr ""
 
@@ -136,69 +136,69 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1540 src/client.cpp:1551 src/client.cpp:1721
+#: src/client.cpp:1541 src/client.cpp:1552 src/client.cpp:1722
 #: src/gui/changeemaildialog.cpp:168 src/gui/changepassworddialog.cpp:158
-#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:288
-#: src/gui/editserverdialog.cpp:220 src/gui/registerdialog.cpp:263
+#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:290
+#: src/gui/editserverdialog.cpp:216 src/gui/registerdialog.cpp:263
 #: src/gui/unregisterdialog.cpp:143 src/net/ea/charserverhandler.cpp:190
 #: src/net/ea/charserverhandler.cpp:210
 msgid "Error"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1564
+#: src/client.cpp:1565
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1601
+#: src/client.cpp:1602
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1603
+#: src/client.cpp:1604
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1624
+#: src/client.cpp:1625
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1626
+#: src/client.cpp:1627
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1647
+#: src/client.cpp:1648
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1649
+#: src/client.cpp:1650
 msgid "Farewell, come back any time..."
 msgstr ""
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1902 src/client.cpp:1917 src/client.cpp:1960
-#: src/client.cpp:1976 src/client.cpp:2417 src/client.cpp:2425
+#: src/client.cpp:1903 src/client.cpp:1918 src/client.cpp:1961
+#: src/client.cpp:1977 src/client.cpp:2418 src/client.cpp:2426
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2113
+#: src/client.cpp:2114
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2154 src/client.cpp:2161
+#: src/client.cpp:2155 src/client.cpp:2162
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:2183 src/client.cpp:2196
+#: src/client.cpp:2184 src/client.cpp:2197
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -478,19 +478,19 @@ msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: bot checker window header
-#: src/gui/botcheckerwindow.cpp:269
+#: src/gui/botcheckerwindow.cpp:268
 msgid "Bot Checker"
 msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:102
+#: src/gui/botcheckerwindow.cpp:277 src/gui/npcdialog.cpp:102
 msgid "Reset"
 msgstr ""
 
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: relations table header
-#: src/gui/botcheckerwindow.cpp:305 src/gui/setup_relations.cpp:61
+#: src/gui/botcheckerwindow.cpp:304 src/gui/setup_relations.cpp:61
 msgid "Name"
 msgstr ""
 
@@ -498,7 +498,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:145
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:145
 #: src/gui/popupmenu.cpp:241 src/gui/popupmenu.cpp:640
 #: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:257
 #: src/net/tmwa/generalhandler.cpp:292
@@ -508,7 +508,7 @@ msgstr ""
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
-#: src/gui/botcheckerwindow.cpp:309 src/gui/popupmenu.cpp:225
+#: src/gui/botcheckerwindow.cpp:308 src/gui/popupmenu.cpp:225
 #: src/gui/setupactiondata.h:93
 msgid "Talk"
 msgstr ""
@@ -516,7 +516,7 @@ msgstr ""
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/botcheckerwindow.cpp:311 src/gui/popupmenu.cpp:215
+#: src/gui/botcheckerwindow.cpp:310 src/gui/popupmenu.cpp:215
 #: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:371
 #: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:653
 #: src/gui/popupmenu.cpp:727 src/gui/setupactiondata.h:1856
@@ -524,7 +524,7 @@ msgid "Move"
 msgstr ""
 
 #. TRANSLATORS: bot checker window table header
-#: src/gui/botcheckerwindow.cpp:313
+#: src/gui/botcheckerwindow.cpp:312
 msgid "Result"
 msgstr ""
 
@@ -580,7 +580,7 @@ msgstr ""
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:516
+#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:511
 #: src/gui/selldialog.cpp:94 src/gui/selldialog.cpp:342
 #, c-format
 msgid "Price: %s / Total: %s"
@@ -597,9 +597,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:208
-#: src/gui/itemamountwindow.cpp:243 src/gui/npcdialog.cpp:93
-#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:833
+#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:202
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:93
+#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:821
 msgid "+"
 msgstr ""
 
@@ -609,9 +609,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:240 src/gui/npcdialog.cpp:95
-#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:846
+#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:200
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:95
+#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:834
 msgid "-"
 msgstr ""
 
@@ -623,7 +623,7 @@ msgstr ""
 #. TRANSLATORS: input action name
 #: src/gui/buydialog.cpp:260 src/gui/quitdialog.cpp:54
 #: src/gui/quitdialog.cpp:59 src/gui/quitdialog.cpp:61
-#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:255
+#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:264
 #: src/gui/setupactiondata.h:177
 msgid "Quit"
 msgstr ""
@@ -635,7 +635,7 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #: src/gui/buydialog.cpp:262 src/gui/selldialog.cpp:106
 #: src/gui/statuswindow.cpp:558 src/gui/statuswindow.cpp:615
-#: src/gui/statuswindow.cpp:830 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:852
 msgid "Max"
 msgstr ""
 
@@ -680,7 +680,7 @@ msgstr ""
 #: src/gui/buyselldialog.cpp:71 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:120
 #: src/gui/connectiondialog.cpp:48 src/gui/editserverdialog.cpp:80
-#: src/gui/itemamountwindow.cpp:212 src/gui/npcpostdialog.cpp:64
+#: src/gui/itemamountwindow.cpp:206 src/gui/npcpostdialog.cpp:64
 #: src/gui/popupmenu.cpp:290 src/gui/popupmenu.cpp:324
 #: src/gui/popupmenu.cpp:411 src/gui/popupmenu.cpp:454
 #: src/gui/popupmenu.cpp:485 src/gui/popupmenu.cpp:512
@@ -696,7 +696,7 @@ msgstr ""
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
 #: src/gui/setup.cpp:84 src/gui/socialwindow.cpp:1204
 #: src/gui/textcommandeditor.cpp:212 src/gui/textdialog.cpp:53
-#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:167
+#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:183
 msgid "Cancel"
 msgstr ""
 
@@ -860,7 +860,7 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:570
+#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:581
 #: src/gui/socialwindow.cpp:1269
 msgid "Create"
 msgstr ""
@@ -887,17 +887,17 @@ msgid "Please remove %d points"
 msgstr ""
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:60
+#: src/gui/charselectdialog.cpp:61
 msgid "Confirm Character Delete"
 msgstr ""
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:62
+#: src/gui/charselectdialog.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:86
+#: src/gui/charselectdialog.cpp:87
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
@@ -909,8 +909,8 @@ msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:565
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:576
+#: src/gui/updaterwindow.cpp:185
 msgid "Play"
 msgstr ""
 
@@ -926,7 +926,7 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:263
+#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:272
 #: src/gui/setupactiondata.h:1803 src/gui/setup_relations.cpp:262
 #: src/gui/shopwindow.cpp:96 src/gui/shopwindow.cpp:103
 #: src/gui/textcommandeditor.cpp:216
@@ -936,24 +936,24 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/charselectdialog.cpp:129 src/gui/unregisterdialog.cpp:48
+#: src/gui/charselectdialog.cpp:130 src/gui/unregisterdialog.cpp:48
 #: src/gui/unregisterdialog.cpp:53
 msgid "Unregister"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/charselectdialog.cpp:141
+#: src/gui/charselectdialog.cpp:142
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:172
+#: src/gui/charselectdialog.cpp:175
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/charselectdialog.cpp:246
+#: src/gui/charselectdialog.cpp:248
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -963,16 +963,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:288
+#: src/gui/charselectdialog.cpp:290
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password:"
 msgstr ""
 
@@ -1059,13 +1059,13 @@ msgid "Chat"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:735
+#: src/gui/chatwindow.cpp:638
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1165
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -1083,7 +1083,7 @@ msgstr ""
 
 #. TRANSLATORS: confirm dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/confirmdialog.cpp:58 src/gui/popupmenu.cpp:2429
+#: src/gui/confirmdialog.cpp:55 src/gui/popupmenu.cpp:2429
 #: src/gui/popupmenu.cpp:2442 src/gui/popupmenu.cpp:2457
 #: src/gui/popupmenu.cpp:2483
 msgid "Ignore"
@@ -1092,7 +1092,7 @@ msgstr ""
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
 #. TRANSLATORS: settings group
-#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:109
+#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:108
 #: src/gui/setup_other.cpp:123 src/gui/windowmenu.cpp:106
 msgid "Map"
 msgstr ""
@@ -1108,190 +1108,190 @@ msgid "Net"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:265
-#: src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:268
+#: src/gui/debugwindow.cpp:311
 msgid "Music:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:153 src/gui/debugwindow.cpp:271
-#: src/gui/debugwindow.cpp:312
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:274
+#: src/gui/debugwindow.cpp:315
 msgid "Map:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:155 src/gui/debugwindow.cpp:268
-#: src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:271
+#: src/gui/debugwindow.cpp:313
 msgid "Minimap:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:262
-#: src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:161 src/gui/debugwindow.cpp:265
+#: src/gui/debugwindow.cpp:309
 msgid "Cursor:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:161
+#: src/gui/debugwindow.cpp:164
 msgid "Particle count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:284
-#: src/gui/debugwindow.cpp:316
+#: src/gui/debugwindow.cpp:167 src/gui/debugwindow.cpp:287
+#: src/gui/debugwindow.cpp:319
 msgid "Map actors count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:166 src/gui/debugwindow.cpp:243
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:169 src/gui/debugwindow.cpp:246
+#: src/gui/debugwindow.cpp:252
 msgid "Player Position:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:172 src/gui/debugwindow.cpp:297
+#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:300
 msgid "Draw calls:"
 msgstr ""
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:175
+#. TRANSLATORS: debug window label, frames per second
+#: src/gui/debugwindow.cpp:178
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:177 src/gui/debugwindow.cpp:324
+#. TRANSLATORS: debug window label, logic per second
+#: src/gui/debugwindow.cpp:180 src/gui/debugwindow.cpp:327
 #, c-format
 msgid "%d LPS"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:191 src/gui/debugwindow.cpp:209
 #, c-format
 msgid "%d FPS (Software)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:193
+#: src/gui/debugwindow.cpp:196
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:197
+#: src/gui/debugwindow.cpp:200
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:201
+#: src/gui/debugwindow.cpp:204
 #, c-format
 msgid "%d FPS (mobile OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:225 src/gui/debugwindow.cpp:290
+#: src/gui/debugwindow.cpp:228 src/gui/debugwindow.cpp:293
 msgid "Textures count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:279
+#: src/gui/debugwindow.cpp:282
 #, c-format
 msgid "Particle count: %d"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:330 src/gui/debugwindow.cpp:380
-#: src/gui/debugwindow.cpp:442
+#: src/gui/debugwindow.cpp:333 src/gui/debugwindow.cpp:383
+#: src/gui/debugwindow.cpp:445
 msgid "Target:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:332 src/gui/debugwindow.cpp:386
-#: src/gui/debugwindow.cpp:444
+#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
+#: src/gui/debugwindow.cpp:447
 msgid "Target Id:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
-#: src/gui/debugwindow.cpp:446
+#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:392
+#: src/gui/debugwindow.cpp:449
 msgid "Target type:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:337
+#: src/gui/debugwindow.cpp:340
 msgid "Target level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:339 src/gui/debugwindow.cpp:405
+#: src/gui/debugwindow.cpp:342 src/gui/debugwindow.cpp:408
 msgid "Target race:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:341
+#: src/gui/debugwindow.cpp:344
 msgid "Target party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:346
 msgid "Target guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:430
-#: src/gui/debugwindow.cpp:436 src/gui/debugwindow.cpp:454
+#: src/gui/debugwindow.cpp:348 src/gui/debugwindow.cpp:433
+#: src/gui/debugwindow.cpp:439 src/gui/debugwindow.cpp:457
 msgid "Attack delay:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:347 src/gui/debugwindow.cpp:417
-#: src/gui/debugwindow.cpp:456
+#: src/gui/debugwindow.cpp:350 src/gui/debugwindow.cpp:420
+#: src/gui/debugwindow.cpp:459
 msgid "Minimal hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:349 src/gui/debugwindow.cpp:420
-#: src/gui/debugwindow.cpp:458
+#: src/gui/debugwindow.cpp:352 src/gui/debugwindow.cpp:423
+#: src/gui/debugwindow.cpp:461
 msgid "Maximum hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:351 src/gui/debugwindow.cpp:423
-#: src/gui/debugwindow.cpp:460
+#: src/gui/debugwindow.cpp:354 src/gui/debugwindow.cpp:426
+#: src/gui/debugwindow.cpp:463
 msgid "Critical hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:394 src/gui/debugwindow.cpp:400
-#: src/gui/debugwindow.cpp:448
+#: src/gui/debugwindow.cpp:397 src/gui/debugwindow.cpp:403
+#: src/gui/debugwindow.cpp:451
 msgid "Target Level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:408 src/gui/debugwindow.cpp:450
+#: src/gui/debugwindow.cpp:411 src/gui/debugwindow.cpp:453
 msgid "Target Party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:412 src/gui/debugwindow.cpp:452
+#: src/gui/debugwindow.cpp:415 src/gui/debugwindow.cpp:455
 msgid "Target Guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:493
+#: src/gui/debugwindow.cpp:496
 #, c-format
 msgid "Ping: %s ms"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:496
+#: src/gui/debugwindow.cpp:499
 #, c-format
 msgid "In: %d bytes/s"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:499
+#: src/gui/debugwindow.cpp:502
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
@@ -1323,7 +1323,7 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #: src/gui/editdialog.cpp:45 src/gui/editserverdialog.cpp:78
-#: src/gui/itemamountwindow.cpp:210 src/gui/okdialog.cpp:51
+#: src/gui/itemamountwindow.cpp:204 src/gui/okdialog.cpp:51
 #: src/gui/quitdialog.cpp:70 src/gui/textdialog.cpp:46
 msgid "OK"
 msgstr ""
@@ -1335,7 +1335,7 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:257
+#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:266
 msgid "Connect"
 msgstr ""
 
@@ -1365,7 +1365,7 @@ msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/editserverdialog.cpp:222
+#: src/gui/editserverdialog.cpp:218
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -1417,7 +1417,7 @@ msgstr ""
 #: src/gui/inventorywindow.cpp:178 src/gui/inventorywindow.cpp:630
 #: src/gui/popupmenu.cpp:1843 src/gui/popupmenu.cpp:1922
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2041
-#: src/gui/skilldialog.cpp:277
+#: src/gui/skilldialog.cpp:279
 msgid "Use"
 msgstr ""
 
@@ -1451,7 +1451,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: setup button
-#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:718
+#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:719
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1992
 #: src/gui/popupmenu.cpp:2066 src/gui/setup.cpp:86
 msgid "Store"
@@ -1473,47 +1473,47 @@ msgid "Drop"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/itemamountwindow.cpp:214
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:264
 msgid "Select amount of items to trade."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:274
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to drop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:278
+#: src/gui/itemamountwindow.cpp:272
 msgid "Select amount of items to store."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:276
 msgid "Select amount of items to retrieve."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:286
+#: src/gui/itemamountwindow.cpp:280
 msgid "Select amount of items to split."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:290
+#: src/gui/itemamountwindow.cpp:284
 msgid "Add to buy shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:294
+#: src/gui/itemamountwindow.cpp:288
 msgid "Add to sell shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:298
+#: src/gui/itemamountwindow.cpp:292
 msgid "Unknown."
 msgstr ""
 
@@ -1540,7 +1540,7 @@ msgstr ""
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:58 src/gui/killstats.cpp:171
-#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:516
+#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:509
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
@@ -1548,7 +1548,7 @@ msgstr ""
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:61 src/gui/killstats.cpp:173
 #: src/gui/killstats.cpp:253 src/gui/killstats.cpp:268
-#: src/gui/killstats.cpp:518
+#: src/gui/killstats.cpp:511
 #, c-format
 msgid "Avg Exp: %s"
 msgstr ""
@@ -1556,14 +1556,14 @@ msgstr ""
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:63 src/gui/killstats.cpp:176
 #: src/gui/killstats.cpp:258 src/gui/killstats.cpp:272
-#: src/gui/killstats.cpp:521
+#: src/gui/killstats.cpp:514
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:66 src/gui/killstats.cpp:187
-#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:524
+#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:517
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
@@ -1591,9 +1591,9 @@ msgid "Last kill exp:"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:414
-#: src/gui/killstats.cpp:421 src/gui/killstats.cpp:428
-#: src/gui/killstats.cpp:434
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:408
+#: src/gui/killstats.cpp:415 src/gui/killstats.cpp:422
+#: src/gui/killstats.cpp:428
 msgid "Time before jacko spawn:"
 msgstr ""
 
@@ -1625,12 +1625,12 @@ msgid "  Time for next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:421
+#: src/gui/killstats.cpp:415
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:428
+#: src/gui/killstats.cpp:422
 msgid "jacko spawning"
 msgstr ""
 
@@ -1736,32 +1736,32 @@ msgid "arrows bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:88
+#: src/gui/ministatuswindow.cpp:89
 msgid "status bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:108
+#: src/gui/ministatuswindow.cpp:109
 msgid "job bar"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:306 src/gui/statuswindow.cpp:298
+#: src/gui/ministatuswindow.cpp:307 src/gui/statuswindow.cpp:298
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:313 src/gui/statuswindow.cpp:141
+#: src/gui/ministatuswindow.cpp:314 src/gui/statuswindow.cpp:141
 #: src/gui/statuswindow.cpp:305 src/gui/statuswindow.cpp:375
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
 #. TRANSLATORS: status bar label
-#: src/gui/ministatuswindow.cpp:330 src/gui/ministatuswindow.cpp:367
+#: src/gui/ministatuswindow.cpp:331 src/gui/ministatuswindow.cpp:368
 msgid "Need"
 msgstr ""
 
@@ -2149,7 +2149,7 @@ msgstr ""
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2209 src/gui/popupmenu.cpp:2280
-#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:139
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
 #: src/gui/socialwindow.cpp:934
 msgid "(default)"
 msgstr ""
@@ -2332,7 +2332,7 @@ msgid "Passwords do not match."
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:257
 msgid "Choose Your Server"
 msgstr ""
 
@@ -2340,61 +2340,61 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:259 src/gui/shopwindow.cpp:94
+#: src/gui/serverdialog.cpp:268 src/gui/shopwindow.cpp:94
 #: src/gui/shopwindow.cpp:101 src/gui/tradewindow.cpp:77
 msgid "Add"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
-#: src/gui/serverdialog.cpp:261 src/gui/widgets/setupitem.cpp:299
+#: src/gui/serverdialog.cpp:270 src/gui/widgets/setupitem.cpp:299
 #: src/gui/widgets/setupitem.cpp:426
 msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:274
 msgid "Load"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:279
+#: src/gui/serverdialog.cpp:288
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:297
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:518
+#: src/gui/serverdialog.cpp:527
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:524
+#: src/gui/serverdialog.cpp:533
 msgid "Waiting for server..."
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:529
+#: src/gui/serverdialog.cpp:538
 msgid "Preparing download"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:534
+#: src/gui/serverdialog.cpp:543
 msgid "Error retreiving server list!"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:626
+#: src/gui/serverdialog.cpp:635
 msgid "requires a newer version"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:631
+#: src/gui/serverdialog.cpp:640
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -3405,7 +3405,7 @@ msgid "Type:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:334
+#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:336
 msgid "Delay:"
 msgstr ""
 
@@ -3425,30 +3425,30 @@ msgid "Blue:"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:420
+#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:422
 msgid "Static"
 msgstr ""
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:107 src/gui/setup_colors.cpp:110
-#: src/gui/setup_colors.cpp:422
+#: src/gui/setup_colors.cpp:424
 msgid "Pulse"
 msgstr ""
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:112 src/gui/setup_colors.cpp:115
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Rainbow"
 msgstr ""
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:117 src/gui/setup_colors.cpp:120
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Spectrum"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:328
+#: src/gui/setup_colors.cpp:330
 msgid "Alpha:"
 msgstr ""
 
@@ -3614,7 +3614,7 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: palette color
-#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:134
+#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:135
 msgid "Monsters"
 msgstr ""
 
@@ -4163,206 +4163,231 @@ msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:86
-msgid "Very small (9)"
+msgid "Very small (8)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:88
-msgid "Tiny (10)"
+msgid "Very small (9)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:90
-msgid "Small (11)"
+msgid "Tiny (10)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:92
-msgid "Medium (12)"
+msgid "Small (11)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:94
-msgid "Normal (13)"
+msgid "Medium (12)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:96
-msgid "Large (14)"
+msgid "Normal (13)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:98
-msgid "Very large (15)"
+msgid "Large (14)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:100
-msgid "Big (16)"
+msgid "Large (15)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:102
-msgid "Very big (17)"
+msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:104
-msgid "Huge (18)"
+msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:106
-msgid "Very huge (19)"
+msgid "Big (18)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:108
+msgid "Big (19)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:110
+msgid "Very big (20)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:112
+msgid "Very big (21)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:114
+msgid "Very big (22)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:116
+msgid "Huge (23)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:151
 msgid "Chinese (China)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:153
 msgid "Czech"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:155
 msgid "English"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:157
 msgid "Finnish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:159
 msgid "French"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:161
 msgid "German"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:153
+#: src/gui/setup_theme.cpp:163
 msgid "Indonesian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:155
+#: src/gui/setup_theme.cpp:165
 msgid "Italian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:157
+#: src/gui/setup_theme.cpp:167
 msgid "Polish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:159
+#: src/gui/setup_theme.cpp:169
 msgid "Japanese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:161
+#: src/gui/setup_theme.cpp:171
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:163
+#: src/gui/setup_theme.cpp:173
 msgid "Portuguese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:165
+#: src/gui/setup_theme.cpp:175
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:167
+#: src/gui/setup_theme.cpp:177
 msgid "Russian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:169
+#: src/gui/setup_theme.cpp:179
 msgid "Spanish (Castilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:171
+#: src/gui/setup_theme.cpp:181
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:223
+#: src/gui/setup_theme.cpp:233
 msgid "Gui theme"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:230
+#: src/gui/setup_theme.cpp:240
 msgid "Main Font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:235
+#: src/gui/setup_theme.cpp:245
 msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:239
+#: src/gui/setup_theme.cpp:249
 msgid "Bold font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:243
+#: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:247
+#: src/gui/setup_theme.cpp:257
 msgid "Help font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:251
+#: src/gui/setup_theme.cpp:261
 msgid "Secure font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:255
+#: src/gui/setup_theme.cpp:265
 msgid "Japanese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:260
+#: src/gui/setup_theme.cpp:270
 msgid "Font size"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:265
+#: src/gui/setup_theme.cpp:275
 msgid "Npc font size"
 msgstr ""
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/setup_theme.cpp:269
+#: src/gui/setup_theme.cpp:279
 msgid "i"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/setup_theme.cpp:442
+#: src/gui/setup_theme.cpp:452
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/setup_theme.cpp:467
+#: src/gui/setup_theme.cpp:477
 msgid "Theme Changed"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/setup_theme.cpp:467 src/gui/setup_video.cpp:537
+#: src/gui/setup_theme.cpp:477 src/gui/setup_video.cpp:537
 #: src/gui/setup_video.cpp:546
 msgid "Restart your client for the change to take effect."
 msgstr ""
@@ -4660,7 +4685,8 @@ msgid "Ambient FX"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_visual.cpp:140
+#. TRANSLATORS: palette color
+#: src/gui/setup_visual.cpp:140 src/gui/userpalette.cpp:146
 msgid "Particle effects"
 msgstr ""
 
@@ -4747,45 +4773,45 @@ msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/skilldialog.cpp:270 src/gui/windowmenu.cpp:112
+#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:112
 msgid "Skills"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/skilldialog.cpp:279
+#: src/gui/skilldialog.cpp:281
 msgid "Up"
 msgstr ""
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/skilldialog.cpp:391
+#: src/gui/skilldialog.cpp:393
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skills tab
-#: src/gui/skilldialog.cpp:444
+#: src/gui/skilldialog.cpp:446
 msgid "basic"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill name
-#: src/gui/skilldialog.cpp:447
+#: src/gui/skilldialog.cpp:449
 msgid "basic, 1"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/skilldialog.cpp:484
+#: src/gui/skilldialog.cpp:486
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/skilldialog.cpp:518
+#: src/gui/skilldialog.cpp:520
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/skilldialog.cpp:612 src/gui/skilldialog.cpp:762
+#: src/gui/skilldialog.cpp:614 src/gui/skilldialog.cpp:764
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -5228,7 +5254,7 @@ msgid "Trade: You"
 msgstr ""
 
 #. TRANSLATORS: trade window money label
-#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:182
+#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:184
 #, c-format
 msgid "You get %s"
 msgstr ""
@@ -5244,12 +5270,12 @@ msgid "You give:"
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:393
+#: src/gui/tradewindow.cpp:396
 msgid "You don't have enough money."
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:475
+#: src/gui/tradewindow.cpp:479
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
@@ -5261,223 +5287,223 @@ msgid "Name: %s"
 msgstr ""
 
 #. TRANSLATORS: updater window name
-#: src/gui/updaterwindow.cpp:140
+#: src/gui/updaterwindow.cpp:156
 msgid "Updating..."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:165
+#: src/gui/updaterwindow.cpp:181
 msgid "Connecting..."
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/updaterwindow.cpp:656
+#: src/gui/updaterwindow.cpp:672
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/updaterwindow.cpp:658
+#: src/gui/updaterwindow.cpp:674
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:660
+#: src/gui/updaterwindow.cpp:676
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:839
+#: src/gui/updaterwindow.cpp:855
 msgid "Completed"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
 msgid "Being"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:118
-msgid "Friend Names"
+#: src/gui/userpalette.cpp:119
+msgid "Friend names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:120
-msgid "Disregarded Names"
+#: src/gui/userpalette.cpp:121
+msgid "Disregarded names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:122
-msgid "Ignored Names"
+#: src/gui/userpalette.cpp:123
+msgid "Ignored names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:124
-msgid "Erased Names"
+#: src/gui/userpalette.cpp:125
+msgid "Erased names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:126
-msgid "Other Players' Names"
+#: src/gui/userpalette.cpp:127
+msgid "Other players names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:128
-msgid "Own Name"
+#: src/gui/userpalette.cpp:129
+msgid "Own name"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:130
-msgid "GM Names"
+#: src/gui/userpalette.cpp:131
+msgid "GM names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
 msgid "NPCs"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
 msgid "Monster HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:140
 msgid "Monster HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:141
-msgid "Party Members"
+#: src/gui/userpalette.cpp:142
+msgid "Party members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:143
-msgid "Guild Members"
+#: src/gui/userpalette.cpp:144
+msgid "Guild members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:145
-msgid "Particle Effects"
+#: src/gui/userpalette.cpp:148
+msgid "Pickup notification"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:147
-msgid "Pickup Notification"
+#: src/gui/userpalette.cpp:150
+msgid "Exp notification"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:149
-msgid "Exp Notification"
-msgstr ""
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
 msgid "Player HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
 msgid "Player HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:157
-msgid "Player Hits Monster"
+#: src/gui/userpalette.cpp:158
+msgid "Player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:159
-msgid "Monster Hits Player"
+#: src/gui/userpalette.cpp:160
+msgid "Monster hits player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:163
-msgid "Other Player Hits Local Player"
+#: src/gui/userpalette.cpp:164
+msgid "Other player hits local player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:166
 msgid "Critical Hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
-msgid "Local Player Hits Monster"
+#: src/gui/userpalette.cpp:170
+msgid "Local player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:172
-msgid "Local Player Critical Hit"
+#: src/gui/userpalette.cpp:173
+msgid "Local player critical hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:175
-msgid "Local Player Miss"
+#: src/gui/userpalette.cpp:176
+msgid "Local player miss"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:177
+#: src/gui/userpalette.cpp:178
 msgid "Misses"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
-msgid "Portal Highlight"
+#: src/gui/userpalette.cpp:180
+msgid "Portal highlight"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:183
+msgid "Default collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:182
-msgid "Default collision Highlight"
+#: src/gui/userpalette.cpp:186
+msgid "Air collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:185
-msgid "Air collision Highlight"
+#: src/gui/userpalette.cpp:189
+msgid "Water collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:188
-msgid "Water collision Highlight"
+#: src/gui/userpalette.cpp:192
+msgid "Special ground collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:191
-msgid "Special ground collision Highlight"
+#: src/gui/userpalette.cpp:195
+msgid "Walkable highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
-msgid "Walkable Highlight"
+#: src/gui/userpalette.cpp:198
+msgid "Local player attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:197
-msgid "Local Player Attack Range"
+#: src/gui/userpalette.cpp:201
+msgid "Local player attack range border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:200
-msgid "Local Player Attack Range Border"
+#: src/gui/userpalette.cpp:204
+msgid "Monster attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:203
-msgid "Monster Attack Range"
+#: src/gui/userpalette.cpp:208
+msgid "Floor item amount color"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:206
-msgid "Home Place"
+#: src/gui/userpalette.cpp:211
+msgid "Home place"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:209
-msgid "Home Place Border"
+#: src/gui/userpalette.cpp:214
+msgid "Home place border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:212
-msgid "Road Point"
+#: src/gui/userpalette.cpp:217
+msgid "Road point"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
@@ -5607,7 +5633,7 @@ msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:315
+#: src/gui/widgets/itemcontainer.cpp:317
 msgid "Eq."
 msgstr ""
 
diff --git a/po/ca.po b/po/ca.po
index 3e1609f8c..7e3247f2f 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-05-03 12:38+0300\n"
-"PO-Revision-Date: 2013-05-03 09:44+0000\n"
+"POT-Creation-Date: 2013-05-10 18:34+0300\n"
+"PO-Revision-Date: 2013-05-10 15:39+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -59,25 +59,25 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: full button name
-#: src/client.cpp:1136 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
+#: src/client.cpp:1137 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
 msgid "Setup"
 msgstr ""
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1140 src/gui/setup_perfomance.cpp:61
+#: src/client.cpp:1141 src/gui/setup_perfomance.cpp:61
 msgid "Perfomance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:1143 src/gui/setup_video.cpp:258
+#: src/client.cpp:1144 src/gui/setup_video.cpp:258
 msgid "Video"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1146 src/gui/setup_theme.cpp:273
+#: src/client.cpp:1147 src/gui/setup_theme.cpp:283
 msgid "Theme"
 msgstr ""
 
@@ -88,7 +88,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1150 src/gui/didyouknowwindow.cpp:78
+#: src/client.cpp:1151 src/gui/didyouknowwindow.cpp:78
 #: src/gui/inventorywindow.cpp:228 src/gui/npcdialog.cpp:63
 #: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:574
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:80
@@ -96,32 +96,32 @@ msgid "Close"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1238
+#: src/client.cpp:1239
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1282
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1320
+#: src/client.cpp:1321
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1431
+#: src/client.cpp:1432
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1471
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1483
+#: src/client.cpp:1484
 msgid "Changing game servers"
 msgstr ""
 
@@ -136,69 +136,69 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1540 src/client.cpp:1551 src/client.cpp:1721
+#: src/client.cpp:1541 src/client.cpp:1552 src/client.cpp:1722
 #: src/gui/changeemaildialog.cpp:168 src/gui/changepassworddialog.cpp:158
-#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:288
-#: src/gui/editserverdialog.cpp:220 src/gui/registerdialog.cpp:263
+#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:290
+#: src/gui/editserverdialog.cpp:216 src/gui/registerdialog.cpp:263
 #: src/gui/unregisterdialog.cpp:143 src/net/ea/charserverhandler.cpp:190
 #: src/net/ea/charserverhandler.cpp:210
 msgid "Error"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1564
+#: src/client.cpp:1565
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1601
+#: src/client.cpp:1602
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1603
+#: src/client.cpp:1604
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1624
+#: src/client.cpp:1625
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1626
+#: src/client.cpp:1627
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1647
+#: src/client.cpp:1648
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1649
+#: src/client.cpp:1650
 msgid "Farewell, come back any time..."
 msgstr ""
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1902 src/client.cpp:1917 src/client.cpp:1960
-#: src/client.cpp:1976 src/client.cpp:2417 src/client.cpp:2425
+#: src/client.cpp:1903 src/client.cpp:1918 src/client.cpp:1961
+#: src/client.cpp:1977 src/client.cpp:2418 src/client.cpp:2426
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2113
+#: src/client.cpp:2114
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2154 src/client.cpp:2161
+#: src/client.cpp:2155 src/client.cpp:2162
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:2183 src/client.cpp:2196
+#: src/client.cpp:2184 src/client.cpp:2197
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -478,19 +478,19 @@ msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: bot checker window header
-#: src/gui/botcheckerwindow.cpp:269
+#: src/gui/botcheckerwindow.cpp:268
 msgid "Bot Checker"
 msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:102
+#: src/gui/botcheckerwindow.cpp:277 src/gui/npcdialog.cpp:102
 msgid "Reset"
 msgstr ""
 
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: relations table header
-#: src/gui/botcheckerwindow.cpp:305 src/gui/setup_relations.cpp:61
+#: src/gui/botcheckerwindow.cpp:304 src/gui/setup_relations.cpp:61
 msgid "Name"
 msgstr ""
 
@@ -498,7 +498,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:145
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:145
 #: src/gui/popupmenu.cpp:241 src/gui/popupmenu.cpp:640
 #: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:257
 #: src/net/tmwa/generalhandler.cpp:292
@@ -508,7 +508,7 @@ msgstr ""
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
-#: src/gui/botcheckerwindow.cpp:309 src/gui/popupmenu.cpp:225
+#: src/gui/botcheckerwindow.cpp:308 src/gui/popupmenu.cpp:225
 #: src/gui/setupactiondata.h:93
 msgid "Talk"
 msgstr ""
@@ -516,7 +516,7 @@ msgstr ""
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/botcheckerwindow.cpp:311 src/gui/popupmenu.cpp:215
+#: src/gui/botcheckerwindow.cpp:310 src/gui/popupmenu.cpp:215
 #: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:371
 #: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:653
 #: src/gui/popupmenu.cpp:727 src/gui/setupactiondata.h:1856
@@ -524,7 +524,7 @@ msgid "Move"
 msgstr ""
 
 #. TRANSLATORS: bot checker window table header
-#: src/gui/botcheckerwindow.cpp:313
+#: src/gui/botcheckerwindow.cpp:312
 msgid "Result"
 msgstr ""
 
@@ -580,7 +580,7 @@ msgstr ""
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:516
+#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:511
 #: src/gui/selldialog.cpp:94 src/gui/selldialog.cpp:342
 #, c-format
 msgid "Price: %s / Total: %s"
@@ -597,9 +597,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:208
-#: src/gui/itemamountwindow.cpp:243 src/gui/npcdialog.cpp:93
-#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:833
+#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:202
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:93
+#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:821
 msgid "+"
 msgstr ""
 
@@ -609,9 +609,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:240 src/gui/npcdialog.cpp:95
-#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:846
+#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:200
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:95
+#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:834
 msgid "-"
 msgstr ""
 
@@ -623,7 +623,7 @@ msgstr ""
 #. TRANSLATORS: input action name
 #: src/gui/buydialog.cpp:260 src/gui/quitdialog.cpp:54
 #: src/gui/quitdialog.cpp:59 src/gui/quitdialog.cpp:61
-#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:255
+#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:264
 #: src/gui/setupactiondata.h:177
 msgid "Quit"
 msgstr "sortir"
@@ -635,7 +635,7 @@ msgstr "sortir"
 #. TRANSLATORS: status bar label
 #: src/gui/buydialog.cpp:262 src/gui/selldialog.cpp:106
 #: src/gui/statuswindow.cpp:558 src/gui/statuswindow.cpp:615
-#: src/gui/statuswindow.cpp:830 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:852
 msgid "Max"
 msgstr ""
 
@@ -680,7 +680,7 @@ msgstr ""
 #: src/gui/buyselldialog.cpp:71 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:120
 #: src/gui/connectiondialog.cpp:48 src/gui/editserverdialog.cpp:80
-#: src/gui/itemamountwindow.cpp:212 src/gui/npcpostdialog.cpp:64
+#: src/gui/itemamountwindow.cpp:206 src/gui/npcpostdialog.cpp:64
 #: src/gui/popupmenu.cpp:290 src/gui/popupmenu.cpp:324
 #: src/gui/popupmenu.cpp:411 src/gui/popupmenu.cpp:454
 #: src/gui/popupmenu.cpp:485 src/gui/popupmenu.cpp:512
@@ -696,7 +696,7 @@ msgstr ""
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
 #: src/gui/setup.cpp:84 src/gui/socialwindow.cpp:1204
 #: src/gui/textcommandeditor.cpp:212 src/gui/textdialog.cpp:53
-#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:167
+#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:183
 msgid "Cancel"
 msgstr ""
 
@@ -860,7 +860,7 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:570
+#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:581
 #: src/gui/socialwindow.cpp:1269
 msgid "Create"
 msgstr ""
@@ -887,17 +887,17 @@ msgid "Please remove %d points"
 msgstr ""
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:60
+#: src/gui/charselectdialog.cpp:61
 msgid "Confirm Character Delete"
 msgstr ""
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:62
+#: src/gui/charselectdialog.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:86
+#: src/gui/charselectdialog.cpp:87
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
@@ -909,8 +909,8 @@ msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:565
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:576
+#: src/gui/updaterwindow.cpp:185
 msgid "Play"
 msgstr ""
 
@@ -926,7 +926,7 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:263
+#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:272
 #: src/gui/setupactiondata.h:1803 src/gui/setup_relations.cpp:262
 #: src/gui/shopwindow.cpp:96 src/gui/shopwindow.cpp:103
 #: src/gui/textcommandeditor.cpp:216
@@ -936,24 +936,24 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/charselectdialog.cpp:129 src/gui/unregisterdialog.cpp:48
+#: src/gui/charselectdialog.cpp:130 src/gui/unregisterdialog.cpp:48
 #: src/gui/unregisterdialog.cpp:53
 msgid "Unregister"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/charselectdialog.cpp:141
+#: src/gui/charselectdialog.cpp:142
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:172
+#: src/gui/charselectdialog.cpp:175
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/charselectdialog.cpp:246
+#: src/gui/charselectdialog.cpp:248
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -963,16 +963,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:288
+#: src/gui/charselectdialog.cpp:290
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password:"
 msgstr ""
 
@@ -1059,13 +1059,13 @@ msgid "Chat"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:735
+#: src/gui/chatwindow.cpp:638
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1165
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -1083,7 +1083,7 @@ msgstr "no"
 
 #. TRANSLATORS: confirm dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/confirmdialog.cpp:58 src/gui/popupmenu.cpp:2429
+#: src/gui/confirmdialog.cpp:55 src/gui/popupmenu.cpp:2429
 #: src/gui/popupmenu.cpp:2442 src/gui/popupmenu.cpp:2457
 #: src/gui/popupmenu.cpp:2483
 msgid "Ignore"
@@ -1092,7 +1092,7 @@ msgstr ""
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
 #. TRANSLATORS: settings group
-#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:109
+#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:108
 #: src/gui/setup_other.cpp:123 src/gui/windowmenu.cpp:106
 msgid "Map"
 msgstr ""
@@ -1108,190 +1108,190 @@ msgid "Net"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:265
-#: src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:268
+#: src/gui/debugwindow.cpp:311
 msgid "Music:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:153 src/gui/debugwindow.cpp:271
-#: src/gui/debugwindow.cpp:312
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:274
+#: src/gui/debugwindow.cpp:315
 msgid "Map:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:155 src/gui/debugwindow.cpp:268
-#: src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:271
+#: src/gui/debugwindow.cpp:313
 msgid "Minimap:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:262
-#: src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:161 src/gui/debugwindow.cpp:265
+#: src/gui/debugwindow.cpp:309
 msgid "Cursor:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:161
+#: src/gui/debugwindow.cpp:164
 msgid "Particle count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:284
-#: src/gui/debugwindow.cpp:316
+#: src/gui/debugwindow.cpp:167 src/gui/debugwindow.cpp:287
+#: src/gui/debugwindow.cpp:319
 msgid "Map actors count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:166 src/gui/debugwindow.cpp:243
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:169 src/gui/debugwindow.cpp:246
+#: src/gui/debugwindow.cpp:252
 msgid "Player Position:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:172 src/gui/debugwindow.cpp:297
+#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:300
 msgid "Draw calls:"
 msgstr ""
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:175
+#. TRANSLATORS: debug window label, frames per second
+#: src/gui/debugwindow.cpp:178
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:177 src/gui/debugwindow.cpp:324
+#. TRANSLATORS: debug window label, logic per second
+#: src/gui/debugwindow.cpp:180 src/gui/debugwindow.cpp:327
 #, c-format
 msgid "%d LPS"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:191 src/gui/debugwindow.cpp:209
 #, c-format
 msgid "%d FPS (Software)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:193
+#: src/gui/debugwindow.cpp:196
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:197
+#: src/gui/debugwindow.cpp:200
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:201
+#: src/gui/debugwindow.cpp:204
 #, c-format
 msgid "%d FPS (mobile OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:225 src/gui/debugwindow.cpp:290
+#: src/gui/debugwindow.cpp:228 src/gui/debugwindow.cpp:293
 msgid "Textures count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:279
+#: src/gui/debugwindow.cpp:282
 #, c-format
 msgid "Particle count: %d"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:330 src/gui/debugwindow.cpp:380
-#: src/gui/debugwindow.cpp:442
+#: src/gui/debugwindow.cpp:333 src/gui/debugwindow.cpp:383
+#: src/gui/debugwindow.cpp:445
 msgid "Target:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:332 src/gui/debugwindow.cpp:386
-#: src/gui/debugwindow.cpp:444
+#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
+#: src/gui/debugwindow.cpp:447
 msgid "Target Id:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
-#: src/gui/debugwindow.cpp:446
+#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:392
+#: src/gui/debugwindow.cpp:449
 msgid "Target type:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:337
+#: src/gui/debugwindow.cpp:340
 msgid "Target level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:339 src/gui/debugwindow.cpp:405
+#: src/gui/debugwindow.cpp:342 src/gui/debugwindow.cpp:408
 msgid "Target race:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:341
+#: src/gui/debugwindow.cpp:344
 msgid "Target party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:346
 msgid "Target guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:430
-#: src/gui/debugwindow.cpp:436 src/gui/debugwindow.cpp:454
+#: src/gui/debugwindow.cpp:348 src/gui/debugwindow.cpp:433
+#: src/gui/debugwindow.cpp:439 src/gui/debugwindow.cpp:457
 msgid "Attack delay:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:347 src/gui/debugwindow.cpp:417
-#: src/gui/debugwindow.cpp:456
+#: src/gui/debugwindow.cpp:350 src/gui/debugwindow.cpp:420
+#: src/gui/debugwindow.cpp:459
 msgid "Minimal hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:349 src/gui/debugwindow.cpp:420
-#: src/gui/debugwindow.cpp:458
+#: src/gui/debugwindow.cpp:352 src/gui/debugwindow.cpp:423
+#: src/gui/debugwindow.cpp:461
 msgid "Maximum hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:351 src/gui/debugwindow.cpp:423
-#: src/gui/debugwindow.cpp:460
+#: src/gui/debugwindow.cpp:354 src/gui/debugwindow.cpp:426
+#: src/gui/debugwindow.cpp:463
 msgid "Critical hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:394 src/gui/debugwindow.cpp:400
-#: src/gui/debugwindow.cpp:448
+#: src/gui/debugwindow.cpp:397 src/gui/debugwindow.cpp:403
+#: src/gui/debugwindow.cpp:451
 msgid "Target Level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:408 src/gui/debugwindow.cpp:450
+#: src/gui/debugwindow.cpp:411 src/gui/debugwindow.cpp:453
 msgid "Target Party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:412 src/gui/debugwindow.cpp:452
+#: src/gui/debugwindow.cpp:415 src/gui/debugwindow.cpp:455
 msgid "Target Guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:493
+#: src/gui/debugwindow.cpp:496
 #, c-format
 msgid "Ping: %s ms"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:496
+#: src/gui/debugwindow.cpp:499
 #, c-format
 msgid "In: %d bytes/s"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:499
+#: src/gui/debugwindow.cpp:502
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
@@ -1323,7 +1323,7 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #: src/gui/editdialog.cpp:45 src/gui/editserverdialog.cpp:78
-#: src/gui/itemamountwindow.cpp:210 src/gui/okdialog.cpp:51
+#: src/gui/itemamountwindow.cpp:204 src/gui/okdialog.cpp:51
 #: src/gui/quitdialog.cpp:70 src/gui/textdialog.cpp:46
 msgid "OK"
 msgstr ""
@@ -1335,7 +1335,7 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:257
+#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:266
 msgid "Connect"
 msgstr ""
 
@@ -1365,7 +1365,7 @@ msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/editserverdialog.cpp:222
+#: src/gui/editserverdialog.cpp:218
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -1417,7 +1417,7 @@ msgstr ""
 #: src/gui/inventorywindow.cpp:178 src/gui/inventorywindow.cpp:630
 #: src/gui/popupmenu.cpp:1843 src/gui/popupmenu.cpp:1922
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2041
-#: src/gui/skilldialog.cpp:277
+#: src/gui/skilldialog.cpp:279
 msgid "Use"
 msgstr ""
 
@@ -1451,7 +1451,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: setup button
-#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:718
+#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:719
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1992
 #: src/gui/popupmenu.cpp:2066 src/gui/setup.cpp:86
 msgid "Store"
@@ -1473,47 +1473,47 @@ msgid "Drop"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/itemamountwindow.cpp:214
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:264
 msgid "Select amount of items to trade."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:274
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to drop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:278
+#: src/gui/itemamountwindow.cpp:272
 msgid "Select amount of items to store."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:276
 msgid "Select amount of items to retrieve."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:286
+#: src/gui/itemamountwindow.cpp:280
 msgid "Select amount of items to split."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:290
+#: src/gui/itemamountwindow.cpp:284
 msgid "Add to buy shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:294
+#: src/gui/itemamountwindow.cpp:288
 msgid "Add to sell shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:298
+#: src/gui/itemamountwindow.cpp:292
 msgid "Unknown."
 msgstr ""
 
@@ -1540,7 +1540,7 @@ msgstr ""
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:58 src/gui/killstats.cpp:171
-#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:516
+#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:509
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
@@ -1548,7 +1548,7 @@ msgstr ""
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:61 src/gui/killstats.cpp:173
 #: src/gui/killstats.cpp:253 src/gui/killstats.cpp:268
-#: src/gui/killstats.cpp:518
+#: src/gui/killstats.cpp:511
 #, c-format
 msgid "Avg Exp: %s"
 msgstr ""
@@ -1556,14 +1556,14 @@ msgstr ""
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:63 src/gui/killstats.cpp:176
 #: src/gui/killstats.cpp:258 src/gui/killstats.cpp:272
-#: src/gui/killstats.cpp:521
+#: src/gui/killstats.cpp:514
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:66 src/gui/killstats.cpp:187
-#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:524
+#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:517
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
@@ -1591,9 +1591,9 @@ msgid "Last kill exp:"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:414
-#: src/gui/killstats.cpp:421 src/gui/killstats.cpp:428
-#: src/gui/killstats.cpp:434
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:408
+#: src/gui/killstats.cpp:415 src/gui/killstats.cpp:422
+#: src/gui/killstats.cpp:428
 msgid "Time before jacko spawn:"
 msgstr ""
 
@@ -1625,12 +1625,12 @@ msgid "  Time for next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:421
+#: src/gui/killstats.cpp:415
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:428
+#: src/gui/killstats.cpp:422
 msgid "jacko spawning"
 msgstr ""
 
@@ -1736,32 +1736,32 @@ msgid "arrows bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:88
+#: src/gui/ministatuswindow.cpp:89
 msgid "status bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:108
+#: src/gui/ministatuswindow.cpp:109
 msgid "job bar"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:306 src/gui/statuswindow.cpp:298
+#: src/gui/ministatuswindow.cpp:307 src/gui/statuswindow.cpp:298
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:313 src/gui/statuswindow.cpp:141
+#: src/gui/ministatuswindow.cpp:314 src/gui/statuswindow.cpp:141
 #: src/gui/statuswindow.cpp:305 src/gui/statuswindow.cpp:375
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
 #. TRANSLATORS: status bar label
-#: src/gui/ministatuswindow.cpp:330 src/gui/ministatuswindow.cpp:367
+#: src/gui/ministatuswindow.cpp:331 src/gui/ministatuswindow.cpp:368
 msgid "Need"
 msgstr ""
 
@@ -2149,7 +2149,7 @@ msgstr ""
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2209 src/gui/popupmenu.cpp:2280
-#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:139
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
 #: src/gui/socialwindow.cpp:934
 msgid "(default)"
 msgstr ""
@@ -2332,7 +2332,7 @@ msgid "Passwords do not match."
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:257
 msgid "Choose Your Server"
 msgstr ""
 
@@ -2340,61 +2340,61 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:259 src/gui/shopwindow.cpp:94
+#: src/gui/serverdialog.cpp:268 src/gui/shopwindow.cpp:94
 #: src/gui/shopwindow.cpp:101 src/gui/tradewindow.cpp:77
 msgid "Add"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
-#: src/gui/serverdialog.cpp:261 src/gui/widgets/setupitem.cpp:299
+#: src/gui/serverdialog.cpp:270 src/gui/widgets/setupitem.cpp:299
 #: src/gui/widgets/setupitem.cpp:426
 msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:274
 msgid "Load"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:279
+#: src/gui/serverdialog.cpp:288
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:297
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:518
+#: src/gui/serverdialog.cpp:527
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:524
+#: src/gui/serverdialog.cpp:533
 msgid "Waiting for server..."
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:529
+#: src/gui/serverdialog.cpp:538
 msgid "Preparing download"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:534
+#: src/gui/serverdialog.cpp:543
 msgid "Error retreiving server list!"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:626
+#: src/gui/serverdialog.cpp:635
 msgid "requires a newer version"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:631
+#: src/gui/serverdialog.cpp:640
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -3405,7 +3405,7 @@ msgid "Type:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:334
+#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:336
 msgid "Delay:"
 msgstr ""
 
@@ -3425,30 +3425,30 @@ msgid "Blue:"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:420
+#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:422
 msgid "Static"
 msgstr ""
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:107 src/gui/setup_colors.cpp:110
-#: src/gui/setup_colors.cpp:422
+#: src/gui/setup_colors.cpp:424
 msgid "Pulse"
 msgstr ""
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:112 src/gui/setup_colors.cpp:115
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Rainbow"
 msgstr ""
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:117 src/gui/setup_colors.cpp:120
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Spectrum"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:328
+#: src/gui/setup_colors.cpp:330
 msgid "Alpha:"
 msgstr ""
 
@@ -3614,7 +3614,7 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: palette color
-#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:134
+#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:135
 msgid "Monsters"
 msgstr ""
 
@@ -4163,206 +4163,231 @@ msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:86
-msgid "Very small (9)"
+msgid "Very small (8)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:88
-msgid "Tiny (10)"
+msgid "Very small (9)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:90
-msgid "Small (11)"
+msgid "Tiny (10)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:92
-msgid "Medium (12)"
+msgid "Small (11)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:94
-msgid "Normal (13)"
+msgid "Medium (12)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:96
-msgid "Large (14)"
+msgid "Normal (13)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:98
-msgid "Very large (15)"
+msgid "Large (14)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:100
-msgid "Big (16)"
+msgid "Large (15)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:102
-msgid "Very big (17)"
+msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:104
-msgid "Huge (18)"
+msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:106
-msgid "Very huge (19)"
+msgid "Big (18)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:108
+msgid "Big (19)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:110
+msgid "Very big (20)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:112
+msgid "Very big (21)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:114
+msgid "Very big (22)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:116
+msgid "Huge (23)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:151
 msgid "Chinese (China)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:153
 msgid "Czech"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:155
 msgid "English"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:157
 msgid "Finnish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:159
 msgid "French"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:161
 msgid "German"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:153
+#: src/gui/setup_theme.cpp:163
 msgid "Indonesian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:155
+#: src/gui/setup_theme.cpp:165
 msgid "Italian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:157
+#: src/gui/setup_theme.cpp:167
 msgid "Polish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:159
+#: src/gui/setup_theme.cpp:169
 msgid "Japanese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:161
+#: src/gui/setup_theme.cpp:171
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:163
+#: src/gui/setup_theme.cpp:173
 msgid "Portuguese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:165
+#: src/gui/setup_theme.cpp:175
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:167
+#: src/gui/setup_theme.cpp:177
 msgid "Russian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:169
+#: src/gui/setup_theme.cpp:179
 msgid "Spanish (Castilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:171
+#: src/gui/setup_theme.cpp:181
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:223
+#: src/gui/setup_theme.cpp:233
 msgid "Gui theme"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:230
+#: src/gui/setup_theme.cpp:240
 msgid "Main Font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:235
+#: src/gui/setup_theme.cpp:245
 msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:239
+#: src/gui/setup_theme.cpp:249
 msgid "Bold font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:243
+#: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:247
+#: src/gui/setup_theme.cpp:257
 msgid "Help font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:251
+#: src/gui/setup_theme.cpp:261
 msgid "Secure font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:255
+#: src/gui/setup_theme.cpp:265
 msgid "Japanese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:260
+#: src/gui/setup_theme.cpp:270
 msgid "Font size"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:265
+#: src/gui/setup_theme.cpp:275
 msgid "Npc font size"
 msgstr ""
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/setup_theme.cpp:269
+#: src/gui/setup_theme.cpp:279
 msgid "i"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/setup_theme.cpp:442
+#: src/gui/setup_theme.cpp:452
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/setup_theme.cpp:467
+#: src/gui/setup_theme.cpp:477
 msgid "Theme Changed"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/setup_theme.cpp:467 src/gui/setup_video.cpp:537
+#: src/gui/setup_theme.cpp:477 src/gui/setup_video.cpp:537
 #: src/gui/setup_video.cpp:546
 msgid "Restart your client for the change to take effect."
 msgstr ""
@@ -4660,7 +4685,8 @@ msgid "Ambient FX"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_visual.cpp:140
+#. TRANSLATORS: palette color
+#: src/gui/setup_visual.cpp:140 src/gui/userpalette.cpp:146
 msgid "Particle effects"
 msgstr ""
 
@@ -4747,45 +4773,45 @@ msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/skilldialog.cpp:270 src/gui/windowmenu.cpp:112
+#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:112
 msgid "Skills"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/skilldialog.cpp:279
+#: src/gui/skilldialog.cpp:281
 msgid "Up"
 msgstr ""
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/skilldialog.cpp:391
+#: src/gui/skilldialog.cpp:393
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skills tab
-#: src/gui/skilldialog.cpp:444
+#: src/gui/skilldialog.cpp:446
 msgid "basic"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill name
-#: src/gui/skilldialog.cpp:447
+#: src/gui/skilldialog.cpp:449
 msgid "basic, 1"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/skilldialog.cpp:484
+#: src/gui/skilldialog.cpp:486
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/skilldialog.cpp:518
+#: src/gui/skilldialog.cpp:520
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/skilldialog.cpp:612 src/gui/skilldialog.cpp:762
+#: src/gui/skilldialog.cpp:614 src/gui/skilldialog.cpp:764
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -5228,7 +5254,7 @@ msgid "Trade: You"
 msgstr ""
 
 #. TRANSLATORS: trade window money label
-#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:182
+#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:184
 #, c-format
 msgid "You get %s"
 msgstr ""
@@ -5244,12 +5270,12 @@ msgid "You give:"
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:393
+#: src/gui/tradewindow.cpp:396
 msgid "You don't have enough money."
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:475
+#: src/gui/tradewindow.cpp:479
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
@@ -5261,223 +5287,223 @@ msgid "Name: %s"
 msgstr ""
 
 #. TRANSLATORS: updater window name
-#: src/gui/updaterwindow.cpp:140
+#: src/gui/updaterwindow.cpp:156
 msgid "Updating..."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:165
+#: src/gui/updaterwindow.cpp:181
 msgid "Connecting..."
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/updaterwindow.cpp:656
+#: src/gui/updaterwindow.cpp:672
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/updaterwindow.cpp:658
+#: src/gui/updaterwindow.cpp:674
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:660
+#: src/gui/updaterwindow.cpp:676
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:839
+#: src/gui/updaterwindow.cpp:855
 msgid "Completed"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
 msgid "Being"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:118
-msgid "Friend Names"
+#: src/gui/userpalette.cpp:119
+msgid "Friend names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:120
-msgid "Disregarded Names"
+#: src/gui/userpalette.cpp:121
+msgid "Disregarded names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:122
-msgid "Ignored Names"
+#: src/gui/userpalette.cpp:123
+msgid "Ignored names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:124
-msgid "Erased Names"
+#: src/gui/userpalette.cpp:125
+msgid "Erased names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:126
-msgid "Other Players' Names"
+#: src/gui/userpalette.cpp:127
+msgid "Other players names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:128
-msgid "Own Name"
+#: src/gui/userpalette.cpp:129
+msgid "Own name"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:130
-msgid "GM Names"
+#: src/gui/userpalette.cpp:131
+msgid "GM names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
 msgid "NPCs"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
 msgid "Monster HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:140
 msgid "Monster HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:141
-msgid "Party Members"
+#: src/gui/userpalette.cpp:142
+msgid "Party members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:143
-msgid "Guild Members"
+#: src/gui/userpalette.cpp:144
+msgid "Guild members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:145
-msgid "Particle Effects"
+#: src/gui/userpalette.cpp:148
+msgid "Pickup notification"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:147
-msgid "Pickup Notification"
+#: src/gui/userpalette.cpp:150
+msgid "Exp notification"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:149
-msgid "Exp Notification"
-msgstr ""
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
 msgid "Player HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
 msgid "Player HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:157
-msgid "Player Hits Monster"
+#: src/gui/userpalette.cpp:158
+msgid "Player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:159
-msgid "Monster Hits Player"
+#: src/gui/userpalette.cpp:160
+msgid "Monster hits player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:163
-msgid "Other Player Hits Local Player"
+#: src/gui/userpalette.cpp:164
+msgid "Other player hits local player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:166
 msgid "Critical Hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
-msgid "Local Player Hits Monster"
+#: src/gui/userpalette.cpp:170
+msgid "Local player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:172
-msgid "Local Player Critical Hit"
+#: src/gui/userpalette.cpp:173
+msgid "Local player critical hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:175
-msgid "Local Player Miss"
+#: src/gui/userpalette.cpp:176
+msgid "Local player miss"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:177
+#: src/gui/userpalette.cpp:178
 msgid "Misses"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
-msgid "Portal Highlight"
+#: src/gui/userpalette.cpp:180
+msgid "Portal highlight"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:183
+msgid "Default collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:182
-msgid "Default collision Highlight"
+#: src/gui/userpalette.cpp:186
+msgid "Air collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:185
-msgid "Air collision Highlight"
+#: src/gui/userpalette.cpp:189
+msgid "Water collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:188
-msgid "Water collision Highlight"
+#: src/gui/userpalette.cpp:192
+msgid "Special ground collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:191
-msgid "Special ground collision Highlight"
+#: src/gui/userpalette.cpp:195
+msgid "Walkable highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
-msgid "Walkable Highlight"
+#: src/gui/userpalette.cpp:198
+msgid "Local player attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:197
-msgid "Local Player Attack Range"
+#: src/gui/userpalette.cpp:201
+msgid "Local player attack range border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:200
-msgid "Local Player Attack Range Border"
+#: src/gui/userpalette.cpp:204
+msgid "Monster attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:203
-msgid "Monster Attack Range"
+#: src/gui/userpalette.cpp:208
+msgid "Floor item amount color"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:206
-msgid "Home Place"
+#: src/gui/userpalette.cpp:211
+msgid "Home place"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:209
-msgid "Home Place Border"
+#: src/gui/userpalette.cpp:214
+msgid "Home place border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:212
-msgid "Road Point"
+#: src/gui/userpalette.cpp:217
+msgid "Road point"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
@@ -5607,7 +5633,7 @@ msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:315
+#: src/gui/widgets/itemcontainer.cpp:317
 msgid "Eq."
 msgstr ""
 
diff --git a/po/cs.po b/po/cs.po
index 5f333ca64..d0d4e7ec2 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-05-03 12:38+0300\n"
-"PO-Revision-Date: 2013-05-03 09:44+0000\n"
+"POT-Creation-Date: 2013-05-11 12:13+0300\n"
+"PO-Revision-Date: 2013-05-10 15:39+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Czech (http://www.transifex.com/projects/p/manaplus/language/"
 "cs/)\n"
@@ -63,25 +63,25 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: full button name
-#: src/client.cpp:1136 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
+#: src/client.cpp:1137 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
 msgid "Setup"
 msgstr "Nastavení"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1140 src/gui/setup_perfomance.cpp:61
+#: src/client.cpp:1141 src/gui/setup_perfomance.cpp:61
 msgid "Perfomance"
 msgstr "Výkon"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:1143 src/gui/setup_video.cpp:258
+#: src/client.cpp:1144 src/gui/setup_video.cpp:258
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1146 src/gui/setup_theme.cpp:273
+#: src/client.cpp:1147 src/gui/setup_theme.cpp:283
 msgid "Theme"
 msgstr "Téma"
 
@@ -92,7 +92,7 @@ msgstr "Téma"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1150 src/gui/didyouknowwindow.cpp:78
+#: src/client.cpp:1151 src/gui/didyouknowwindow.cpp:78
 #: src/gui/inventorywindow.cpp:228 src/gui/npcdialog.cpp:63
 #: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:574
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:80
@@ -100,32 +100,32 @@ msgid "Close"
 msgstr "Zavřít"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1238
+#: src/client.cpp:1239
 msgid "Connecting to server"
 msgstr "Připojuji se k serveru"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1282
 msgid "Logging in"
 msgstr "Přihlašuji se"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1320
+#: src/client.cpp:1321
 msgid "Entering game world"
 msgstr "Vstupuji do herního světa"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1431
+#: src/client.cpp:1432
 msgid "Requesting characters"
 msgstr "Požaduji postavy"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1471
 msgid "Connecting to the game server"
 msgstr "Připojuji se k hernímu serveru"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1483
+#: src/client.cpp:1484
 msgid "Changing game servers"
 msgstr "Zaměňuji herní servery"
 
@@ -140,69 +140,69 @@ msgstr "Zaměňuji herní servery"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1540 src/client.cpp:1551 src/client.cpp:1721
+#: src/client.cpp:1541 src/client.cpp:1552 src/client.cpp:1722
 #: src/gui/changeemaildialog.cpp:168 src/gui/changepassworddialog.cpp:158
-#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:288
-#: src/gui/editserverdialog.cpp:220 src/gui/registerdialog.cpp:263
+#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:290
+#: src/gui/editserverdialog.cpp:216 src/gui/registerdialog.cpp:263
 #: src/gui/unregisterdialog.cpp:143 src/net/ea/charserverhandler.cpp:190
 #: src/net/ea/charserverhandler.cpp:210
 msgid "Error"
 msgstr "Chyba"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1564
+#: src/client.cpp:1565
 msgid "Requesting registration details"
 msgstr "Požaduji registrační detaily"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1601
+#: src/client.cpp:1602
 msgid "Password Change"
 msgstr "Změna hesla"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1603
+#: src/client.cpp:1604
 msgid "Password changed successfully!"
 msgstr "Heslo úspěšně změněno!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1624
+#: src/client.cpp:1625
 msgid "Email Change"
 msgstr "Změna emailu"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1626
+#: src/client.cpp:1627
 msgid "Email changed successfully!"
 msgstr "Email úspěšně změněn!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1647
+#: src/client.cpp:1648
 msgid "Unregister Successful"
 msgstr "Zrušení registrace úspěšné"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1649
+#: src/client.cpp:1650
 msgid "Farewell, come back any time..."
 msgstr "Nashledanou, vraťte se kdykoli..."
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1902 src/client.cpp:1917 src/client.cpp:1960
-#: src/client.cpp:1976 src/client.cpp:2417 src/client.cpp:2425
+#: src/client.cpp:1903 src/client.cpp:1918 src/client.cpp:1961
+#: src/client.cpp:1977 src/client.cpp:2418 src/client.cpp:2426
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s neexistuje a vytvoření selhalo. Končím."
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2113
+#: src/client.cpp:2114
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Neplatný host updatů: %s"
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2154 src/client.cpp:2161
+#: src/client.cpp:2155 src/client.cpp:2162
 msgid "Error creating updates directory!"
 msgstr "Chyba při vytváření adresáře s updaty!"
 
-#: src/client.cpp:2183 src/client.cpp:2196
+#: src/client.cpp:2184 src/client.cpp:2197
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Chyba: %s neexistuje a nelze ho vytvořit. Ukončuji."
@@ -484,19 +484,19 @@ msgid "Comment: %s"
 msgstr "Komentář: %s"
 
 #. TRANSLATORS: bot checker window header
-#: src/gui/botcheckerwindow.cpp:269
+#: src/gui/botcheckerwindow.cpp:268
 msgid "Bot Checker"
 msgstr "Ověřovač botů"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:102
+#: src/gui/botcheckerwindow.cpp:277 src/gui/npcdialog.cpp:102
 msgid "Reset"
 msgstr "Vynulovat"
 
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: relations table header
-#: src/gui/botcheckerwindow.cpp:305 src/gui/setup_relations.cpp:61
+#: src/gui/botcheckerwindow.cpp:304 src/gui/setup_relations.cpp:61
 msgid "Name"
 msgstr "Jméno"
 
@@ -504,7 +504,7 @@ msgstr "Jméno"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:145
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:145
 #: src/gui/popupmenu.cpp:241 src/gui/popupmenu.cpp:640
 #: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:257
 #: src/net/tmwa/generalhandler.cpp:292
@@ -514,7 +514,7 @@ msgstr "Zaútoč"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
-#: src/gui/botcheckerwindow.cpp:309 src/gui/popupmenu.cpp:225
+#: src/gui/botcheckerwindow.cpp:308 src/gui/popupmenu.cpp:225
 #: src/gui/setupactiondata.h:93
 msgid "Talk"
 msgstr "Promluv"
@@ -522,7 +522,7 @@ msgstr "Promluv"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/botcheckerwindow.cpp:311 src/gui/popupmenu.cpp:215
+#: src/gui/botcheckerwindow.cpp:310 src/gui/popupmenu.cpp:215
 #: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:371
 #: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:653
 #: src/gui/popupmenu.cpp:727 src/gui/setupactiondata.h:1856
@@ -530,7 +530,7 @@ msgid "Move"
 msgstr "Jdi sem"
 
 #. TRANSLATORS: bot checker window table header
-#: src/gui/botcheckerwindow.cpp:313
+#: src/gui/botcheckerwindow.cpp:312
 msgid "Result"
 msgstr "Výsledek"
 
@@ -586,7 +586,7 @@ msgstr "Nákup"
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:516
+#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:511
 #: src/gui/selldialog.cpp:94 src/gui/selldialog.cpp:342
 #, c-format
 msgid "Price: %s / Total: %s"
@@ -603,9 +603,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:208
-#: src/gui/itemamountwindow.cpp:243 src/gui/npcdialog.cpp:93
-#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:833
+#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:202
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:93
+#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:821
 msgid "+"
 msgstr "+"
 
@@ -615,9 +615,9 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:240 src/gui/npcdialog.cpp:95
-#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:846
+#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:200
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:95
+#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:834
 msgid "-"
 msgstr "-"
 
@@ -629,7 +629,7 @@ msgstr "-"
 #. TRANSLATORS: input action name
 #: src/gui/buydialog.cpp:260 src/gui/quitdialog.cpp:54
 #: src/gui/quitdialog.cpp:59 src/gui/quitdialog.cpp:61
-#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:255
+#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:264
 #: src/gui/setupactiondata.h:177
 msgid "Quit"
 msgstr "Ukončit"
@@ -641,7 +641,7 @@ msgstr "Ukončit"
 #. TRANSLATORS: status bar label
 #: src/gui/buydialog.cpp:262 src/gui/selldialog.cpp:106
 #: src/gui/statuswindow.cpp:558 src/gui/statuswindow.cpp:615
-#: src/gui/statuswindow.cpp:830 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:852
 msgid "Max"
 msgstr "Vše"
 
@@ -686,7 +686,7 @@ msgstr "Prodej"
 #: src/gui/buyselldialog.cpp:71 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:120
 #: src/gui/connectiondialog.cpp:48 src/gui/editserverdialog.cpp:80
-#: src/gui/itemamountwindow.cpp:212 src/gui/npcpostdialog.cpp:64
+#: src/gui/itemamountwindow.cpp:206 src/gui/npcpostdialog.cpp:64
 #: src/gui/popupmenu.cpp:290 src/gui/popupmenu.cpp:324
 #: src/gui/popupmenu.cpp:411 src/gui/popupmenu.cpp:454
 #: src/gui/popupmenu.cpp:485 src/gui/popupmenu.cpp:512
@@ -702,7 +702,7 @@ msgstr "Prodej"
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
 #: src/gui/setup.cpp:84 src/gui/socialwindow.cpp:1204
 #: src/gui/textcommandeditor.cpp:212 src/gui/textdialog.cpp:53
-#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:167
+#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:183
 msgid "Cancel"
 msgstr "Zrušit"
 
@@ -866,7 +866,7 @@ msgstr "Rozdělte prosím %d bodů"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:570
+#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:581
 #: src/gui/socialwindow.cpp:1269
 msgid "Create"
 msgstr "Vytvořit"
@@ -893,17 +893,17 @@ msgid "Please remove %d points"
 msgstr "Odstraňte prosím %d bodů"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:60
+#: src/gui/charselectdialog.cpp:61
 msgid "Confirm Character Delete"
 msgstr "Potvrďte smazání postavy"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:62
+#: src/gui/charselectdialog.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "Jste si jistí, že chcete smazat tuto postavu?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:86
+#: src/gui/charselectdialog.cpp:87
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
@@ -915,8 +915,8 @@ msgstr "Přepnout přihlášení"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:565
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:576
+#: src/gui/updaterwindow.cpp:185
 msgid "Play"
 msgstr "Hrát"
 
@@ -932,7 +932,7 @@ msgstr "informaceInfo"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:263
+#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:272
 #: src/gui/setupactiondata.h:1803 src/gui/setup_relations.cpp:262
 #: src/gui/shopwindow.cpp:96 src/gui/shopwindow.cpp:103
 #: src/gui/textcommandeditor.cpp:216
@@ -942,24 +942,24 @@ msgstr "Smazat"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/charselectdialog.cpp:129 src/gui/unregisterdialog.cpp:48
+#: src/gui/charselectdialog.cpp:130 src/gui/unregisterdialog.cpp:48
 #: src/gui/unregisterdialog.cpp:53
 msgid "Unregister"
 msgstr "Zrušit registraci"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/charselectdialog.cpp:141
+#: src/gui/charselectdialog.cpp:142
 msgid "Change Email"
 msgstr "Změnit email"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:172
+#: src/gui/charselectdialog.cpp:175
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/charselectdialog.cpp:246
+#: src/gui/charselectdialog.cpp:248
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -969,16 +969,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:288
+#: src/gui/charselectdialog.cpp:290
 msgid "Incorrect password"
 msgstr "Špatné heslo"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password for deleting character"
 msgstr "Zadej heslo pro smazání postavy"
 
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password:"
 msgstr "Zadej heslo:"
 
@@ -1065,13 +1065,13 @@ msgid "Chat"
 msgstr "Chat"
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:735
+#: src/gui/chatwindow.cpp:638
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Přítomni: %s; %d hráčů je přítomno."
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1165
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Šeptání pro %s: %s"
@@ -1089,7 +1089,7 @@ msgstr "Ne"
 
 #. TRANSLATORS: confirm dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/confirmdialog.cpp:58 src/gui/popupmenu.cpp:2429
+#: src/gui/confirmdialog.cpp:55 src/gui/popupmenu.cpp:2429
 #: src/gui/popupmenu.cpp:2442 src/gui/popupmenu.cpp:2457
 #: src/gui/popupmenu.cpp:2483
 msgid "Ignore"
@@ -1098,7 +1098,7 @@ msgstr "Ignorovat"
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
 #. TRANSLATORS: settings group
-#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:109
+#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:108
 #: src/gui/setup_other.cpp:123 src/gui/windowmenu.cpp:106
 msgid "Map"
 msgstr "Mapa"
@@ -1114,190 +1114,190 @@ msgid "Net"
 msgstr "Síť"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:265
-#: src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:268
+#: src/gui/debugwindow.cpp:311
 msgid "Music:"
 msgstr "Hudba:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:153 src/gui/debugwindow.cpp:271
-#: src/gui/debugwindow.cpp:312
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:274
+#: src/gui/debugwindow.cpp:315
 msgid "Map:"
 msgstr "Mapa:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:155 src/gui/debugwindow.cpp:268
-#: src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:271
+#: src/gui/debugwindow.cpp:313
 msgid "Minimap:"
 msgstr "Minimapa:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:262
-#: src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:161 src/gui/debugwindow.cpp:265
+#: src/gui/debugwindow.cpp:309
 msgid "Cursor:"
 msgstr "Kurzor:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:161
+#: src/gui/debugwindow.cpp:164
 msgid "Particle count:"
 msgstr "Počet částic:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:284
-#: src/gui/debugwindow.cpp:316
+#: src/gui/debugwindow.cpp:167 src/gui/debugwindow.cpp:287
+#: src/gui/debugwindow.cpp:319
 msgid "Map actors count:"
 msgstr "Počet hráčů na mapě:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:166 src/gui/debugwindow.cpp:243
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:169 src/gui/debugwindow.cpp:246
+#: src/gui/debugwindow.cpp:252
 msgid "Player Position:"
 msgstr "Pozice hráče:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:172 src/gui/debugwindow.cpp:297
+#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:300
 msgid "Draw calls:"
 msgstr ""
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:175
+#. TRANSLATORS: debug window label, frames per second
+#: src/gui/debugwindow.cpp:178
 #, c-format
 msgid "%d FPS"
 msgstr "%d FPS"
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:177 src/gui/debugwindow.cpp:324
+#. TRANSLATORS: debug window label, logic per second
+#: src/gui/debugwindow.cpp:180 src/gui/debugwindow.cpp:327
 #, c-format
 msgid "%d LPS"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:191 src/gui/debugwindow.cpp:209
 #, c-format
 msgid "%d FPS (Software)"
 msgstr "%d FPS (Software)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:193
+#: src/gui/debugwindow.cpp:196
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr "%d FPS (fast OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:197
+#: src/gui/debugwindow.cpp:200
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr "%d FPS (old OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:201
+#: src/gui/debugwindow.cpp:204
 #, c-format
 msgid "%d FPS (mobile OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:225 src/gui/debugwindow.cpp:290
+#: src/gui/debugwindow.cpp:228 src/gui/debugwindow.cpp:293
 msgid "Textures count:"
 msgstr "Počet textur:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:279
+#: src/gui/debugwindow.cpp:282
 #, c-format
 msgid "Particle count: %d"
 msgstr "Počet částic: %d"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:330 src/gui/debugwindow.cpp:380
-#: src/gui/debugwindow.cpp:442
+#: src/gui/debugwindow.cpp:333 src/gui/debugwindow.cpp:383
+#: src/gui/debugwindow.cpp:445
 msgid "Target:"
 msgstr "Cíl:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:332 src/gui/debugwindow.cpp:386
-#: src/gui/debugwindow.cpp:444
+#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
+#: src/gui/debugwindow.cpp:447
 msgid "Target Id:"
 msgstr "Id cíle:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
-#: src/gui/debugwindow.cpp:446
+#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:392
+#: src/gui/debugwindow.cpp:449
 msgid "Target type:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:337
+#: src/gui/debugwindow.cpp:340
 msgid "Target level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:339 src/gui/debugwindow.cpp:405
+#: src/gui/debugwindow.cpp:342 src/gui/debugwindow.cpp:408
 msgid "Target race:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:341
+#: src/gui/debugwindow.cpp:344
 msgid "Target party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:346
 msgid "Target guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:430
-#: src/gui/debugwindow.cpp:436 src/gui/debugwindow.cpp:454
+#: src/gui/debugwindow.cpp:348 src/gui/debugwindow.cpp:433
+#: src/gui/debugwindow.cpp:439 src/gui/debugwindow.cpp:457
 msgid "Attack delay:"
 msgstr "Prodleva útoku:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:347 src/gui/debugwindow.cpp:417
-#: src/gui/debugwindow.cpp:456
+#: src/gui/debugwindow.cpp:350 src/gui/debugwindow.cpp:420
+#: src/gui/debugwindow.cpp:459
 msgid "Minimal hit:"
 msgstr "Minimální zásah:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:349 src/gui/debugwindow.cpp:420
-#: src/gui/debugwindow.cpp:458
+#: src/gui/debugwindow.cpp:352 src/gui/debugwindow.cpp:423
+#: src/gui/debugwindow.cpp:461
 msgid "Maximum hit:"
 msgstr "Maximální zásah:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:351 src/gui/debugwindow.cpp:423
-#: src/gui/debugwindow.cpp:460
+#: src/gui/debugwindow.cpp:354 src/gui/debugwindow.cpp:426
+#: src/gui/debugwindow.cpp:463
 msgid "Critical hit:"
 msgstr "Kritický zásah:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:394 src/gui/debugwindow.cpp:400
-#: src/gui/debugwindow.cpp:448
+#: src/gui/debugwindow.cpp:397 src/gui/debugwindow.cpp:403
+#: src/gui/debugwindow.cpp:451
 msgid "Target Level:"
 msgstr "Úroveň cíle:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:408 src/gui/debugwindow.cpp:450
+#: src/gui/debugwindow.cpp:411 src/gui/debugwindow.cpp:453
 msgid "Target Party:"
 msgstr "Parta cíle:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:412 src/gui/debugwindow.cpp:452
+#: src/gui/debugwindow.cpp:415 src/gui/debugwindow.cpp:455
 msgid "Target Guild:"
 msgstr "Gilda cíle:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:493
+#: src/gui/debugwindow.cpp:496
 #, c-format
 msgid "Ping: %s ms"
 msgstr "Ping: %s ms"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:496
+#: src/gui/debugwindow.cpp:499
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "Příchozí: %d bytes/s"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:499
+#: src/gui/debugwindow.cpp:502
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "Odchozí: %d bytes/s"
@@ -1329,7 +1329,7 @@ msgstr "Automaticky otevírat toto okno"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #: src/gui/editdialog.cpp:45 src/gui/editserverdialog.cpp:78
-#: src/gui/itemamountwindow.cpp:210 src/gui/okdialog.cpp:51
+#: src/gui/itemamountwindow.cpp:204 src/gui/okdialog.cpp:51
 #: src/gui/quitdialog.cpp:70 src/gui/textdialog.cpp:46
 msgid "OK"
 msgstr "OK"
@@ -1341,7 +1341,7 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:257
+#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:266
 msgid "Connect"
 msgstr "Připojit"
 
@@ -1371,7 +1371,7 @@ msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/editserverdialog.cpp:222
+#: src/gui/editserverdialog.cpp:218
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -1423,7 +1423,7 @@ msgstr "Vybavit"
 #: src/gui/inventorywindow.cpp:178 src/gui/inventorywindow.cpp:630
 #: src/gui/popupmenu.cpp:1843 src/gui/popupmenu.cpp:1922
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2041
-#: src/gui/skilldialog.cpp:277
+#: src/gui/skilldialog.cpp:279
 msgid "Use"
 msgstr "Použít"
 
@@ -1457,7 +1457,7 @@ msgstr "Výstroje"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: setup button
-#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:718
+#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:719
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1992
 #: src/gui/popupmenu.cpp:2066 src/gui/setup.cpp:86
 msgid "Store"
@@ -1479,47 +1479,47 @@ msgid "Drop"
 msgstr "Upustit"
 
 #. TRANSLATORS: item amount window button
-#: src/gui/itemamountwindow.cpp:214
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "Vše"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:264
 msgid "Select amount of items to trade."
 msgstr "Vyberte množství předmětů, se kterými budete obchodovat."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:274
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to drop."
 msgstr "Vyberte množství předmětů, které chcete upustit."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:278
+#: src/gui/itemamountwindow.cpp:272
 msgid "Select amount of items to store."
 msgstr "Vyberte množství předmětů, které chcete uskladnit."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:276
 msgid "Select amount of items to retrieve."
 msgstr "Vyberte množství předmětů, které chcete obdržet."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:286
+#: src/gui/itemamountwindow.cpp:280
 msgid "Select amount of items to split."
 msgstr "Vyberte množství předmětů, které chcete rozdělit."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:290
+#: src/gui/itemamountwindow.cpp:284
 msgid "Add to buy shop."
 msgstr "Přidat k nákupu."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:294
+#: src/gui/itemamountwindow.cpp:288
 msgid "Add to sell shop."
 msgstr "Přidat k prodeji."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:298
+#: src/gui/itemamountwindow.cpp:292
 msgid "Unknown."
 msgstr "Neznámý."
 
@@ -1546,7 +1546,7 @@ msgstr "Reset časomíry"
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:58 src/gui/killstats.cpp:171
-#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:516
+#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:509
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr "Zabitých: %s, celkem exp %s"
@@ -1554,7 +1554,7 @@ msgstr "Zabitých: %s, celkem exp %s"
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:61 src/gui/killstats.cpp:173
 #: src/gui/killstats.cpp:253 src/gui/killstats.cpp:268
-#: src/gui/killstats.cpp:518
+#: src/gui/killstats.cpp:511
 #, c-format
 msgid "Avg Exp: %s"
 msgstr ""
@@ -1562,14 +1562,14 @@ msgstr ""
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:63 src/gui/killstats.cpp:176
 #: src/gui/killstats.cpp:258 src/gui/killstats.cpp:272
-#: src/gui/killstats.cpp:521
+#: src/gui/killstats.cpp:514
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:66 src/gui/killstats.cpp:187
-#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:524
+#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:517
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr "Zabitých/Min: %s, Exp/Min: %s"
@@ -1599,9 +1599,9 @@ msgid "Last kill exp:"
 msgstr "Exp za poslední zabití:"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:414
-#: src/gui/killstats.cpp:421 src/gui/killstats.cpp:428
-#: src/gui/killstats.cpp:434
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:408
+#: src/gui/killstats.cpp:415 src/gui/killstats.cpp:422
+#: src/gui/killstats.cpp:428
 msgid "Time before jacko spawn:"
 msgstr "Čas do zrození Jack O:"
 
@@ -1633,12 +1633,12 @@ msgid "  Time for next level: %s"
 msgstr "Čas do další úrovně: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:421
+#: src/gui/killstats.cpp:415
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:428
+#: src/gui/killstats.cpp:422
 msgid "jacko spawning"
 msgstr "Jack O se rodí"
 
@@ -1744,32 +1744,32 @@ msgid "arrows bar"
 msgstr "pruh šípů"
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:88
+#: src/gui/ministatuswindow.cpp:89
 msgid "status bar"
 msgstr "stavový řádek"
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:108
+#: src/gui/ministatuswindow.cpp:109
 msgid "job bar"
 msgstr "pruh práce"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:306 src/gui/statuswindow.cpp:298
+#: src/gui/ministatuswindow.cpp:307 src/gui/statuswindow.cpp:298
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Úroveň: %d (GM %d)"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:313 src/gui/statuswindow.cpp:141
+#: src/gui/ministatuswindow.cpp:314 src/gui/statuswindow.cpp:141
 #: src/gui/statuswindow.cpp:305 src/gui/statuswindow.cpp:375
 #, c-format
 msgid "Level: %d"
 msgstr "Úroveň: %d"
 
 #. TRANSLATORS: status bar label
-#: src/gui/ministatuswindow.cpp:330 src/gui/ministatuswindow.cpp:367
+#: src/gui/ministatuswindow.cpp:331 src/gui/ministatuswindow.cpp:368
 msgid "Need"
 msgstr "Potřebuješ"
 
@@ -2157,7 +2157,7 @@ msgstr "Zkopírovat do chatu"
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2209 src/gui/popupmenu.cpp:2280
-#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:139
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
 #: src/gui/socialwindow.cpp:934
 msgid "(default)"
 msgstr ""
@@ -2340,7 +2340,7 @@ msgid "Passwords do not match."
 msgstr "Hesla se neshodují."
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:257
 msgid "Choose Your Server"
 msgstr "Zvolte server"
 
@@ -2348,61 +2348,61 @@ msgstr "Zvolte server"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:259 src/gui/shopwindow.cpp:94
+#: src/gui/serverdialog.cpp:268 src/gui/shopwindow.cpp:94
 #: src/gui/shopwindow.cpp:101 src/gui/tradewindow.cpp:77
 msgid "Add"
 msgstr "Přidat"
 
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
-#: src/gui/serverdialog.cpp:261 src/gui/widgets/setupitem.cpp:299
+#: src/gui/serverdialog.cpp:270 src/gui/widgets/setupitem.cpp:299
 #: src/gui/widgets/setupitem.cpp:426
 msgid "Edit"
 msgstr "Upravit"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:274
 msgid "Load"
 msgstr "Načíst"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:279
+#: src/gui/serverdialog.cpp:288
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Zvolte server *** BEZPEČNÝ MÓD ***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:297
 msgid "Use same ip for game sub servers"
 msgstr "Použít stejnou IP pro herní sub servery"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:518
+#: src/gui/serverdialog.cpp:527
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Stahuji seznam serverů...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:524
+#: src/gui/serverdialog.cpp:533
 msgid "Waiting for server..."
 msgstr "Čekám na odezvu serveru..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:529
+#: src/gui/serverdialog.cpp:538
 msgid "Preparing download"
 msgstr "Připravuji stažení"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:534
+#: src/gui/serverdialog.cpp:543
 msgid "Error retreiving server list!"
 msgstr "Chyba při získávání seznamu serverů!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:626
+#: src/gui/serverdialog.cpp:635
 msgid "requires a newer version"
 msgstr "potřebuje novější verzi"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:631
+#: src/gui/serverdialog.cpp:640
 #, c-format
 msgid "requires v%s"
 msgstr "potřebuje v%s"
@@ -3413,7 +3413,7 @@ msgid "Type:"
 msgstr "Typ:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:334
+#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:336
 msgid "Delay:"
 msgstr "Prodleva:"
 
@@ -3433,30 +3433,30 @@ msgid "Blue:"
 msgstr "Modrá:"
 
 #. TRANSLATORS: color type
-#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:420
+#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:422
 msgid "Static"
 msgstr "Statický"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:107 src/gui/setup_colors.cpp:110
-#: src/gui/setup_colors.cpp:422
+#: src/gui/setup_colors.cpp:424
 msgid "Pulse"
 msgstr "Pulzní"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:112 src/gui/setup_colors.cpp:115
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Rainbow"
 msgstr "Duhový"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:117 src/gui/setup_colors.cpp:120
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Spectrum"
 msgstr "Spektrum"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:328
+#: src/gui/setup_colors.cpp:330
 msgid "Alpha:"
 msgstr "Průhlednost:"
 
@@ -3624,7 +3624,7 @@ msgstr "Ostatní"
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: palette color
-#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:134
+#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:135
 msgid "Monsters"
 msgstr "Monstra"
 
@@ -4173,206 +4173,231 @@ msgstr "Když ignoruji:"
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:86
+msgid "Very small (8)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:88
 msgid "Very small (9)"
 msgstr "Velmi malý (9)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:88
+#: src/gui/setup_theme.cpp:90
 msgid "Tiny (10)"
 msgstr "Mrňavý (10)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:90
+#: src/gui/setup_theme.cpp:92
 msgid "Small (11)"
 msgstr "Malý (11)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:92
+#: src/gui/setup_theme.cpp:94
 msgid "Medium (12)"
 msgstr "Střední (12)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:94
+#: src/gui/setup_theme.cpp:96
 msgid "Normal (13)"
 msgstr "Normální (13)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:96
+#: src/gui/setup_theme.cpp:98
 msgid "Large (14)"
 msgstr "Trošku větší (14)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:98
-msgid "Very large (15)"
-msgstr "Středně větší (15)"
-
-#. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:100
-msgid "Big (16)"
-msgstr "Hodně větší (16)"
+msgid "Large (15)"
+msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:102
-msgid "Very big (17)"
-msgstr "Velký (17)"
+msgid "Large (16)"
+msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:104
-msgid "Huge (18)"
-msgstr "Obrovský (18)"
+msgid "Big (17)"
+msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:106
-msgid "Very huge (19)"
-msgstr "Velmi obrovský (19)"
+msgid "Big (18)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:108
+msgid "Big (19)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:110
+msgid "Very big (20)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:112
+msgid "Very big (21)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:114
+msgid "Very big (22)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:116
+msgid "Huge (23)"
+msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:151
 msgid "Chinese (China)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:153
 msgid "Czech"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:155
 msgid "English"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:157
 msgid "Finnish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:159
 msgid "French"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:161
 msgid "German"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:153
+#: src/gui/setup_theme.cpp:163
 msgid "Indonesian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:155
+#: src/gui/setup_theme.cpp:165
 msgid "Italian"
 msgstr "Kurzíva"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:157
+#: src/gui/setup_theme.cpp:167
 msgid "Polish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:159
+#: src/gui/setup_theme.cpp:169
 msgid "Japanese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:161
+#: src/gui/setup_theme.cpp:171
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:163
+#: src/gui/setup_theme.cpp:173
 msgid "Portuguese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:165
+#: src/gui/setup_theme.cpp:175
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:167
+#: src/gui/setup_theme.cpp:177
 msgid "Russian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:169
+#: src/gui/setup_theme.cpp:179
 msgid "Spanish (Castilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:171
+#: src/gui/setup_theme.cpp:181
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:223
+#: src/gui/setup_theme.cpp:233
 msgid "Gui theme"
 msgstr "Téma GUI"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:230
+#: src/gui/setup_theme.cpp:240
 msgid "Main Font"
 msgstr "Hlavní font"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:235
+#: src/gui/setup_theme.cpp:245
 msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:239
+#: src/gui/setup_theme.cpp:249
 msgid "Bold font"
 msgstr "Tučný font"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:243
+#: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr "Font částic"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:247
+#: src/gui/setup_theme.cpp:257
 msgid "Help font"
 msgstr "Pomocný font"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:251
+#: src/gui/setup_theme.cpp:261
 msgid "Secure font"
 msgstr "Bezpečný font"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:255
+#: src/gui/setup_theme.cpp:265
 msgid "Japanese font"
 msgstr "Japonský font"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:260
+#: src/gui/setup_theme.cpp:270
 msgid "Font size"
 msgstr "Velikost písma"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:265
+#: src/gui/setup_theme.cpp:275
 msgid "Npc font size"
 msgstr "Velikost fontu NPC"
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/setup_theme.cpp:269
+#: src/gui/setup_theme.cpp:279
 msgid "i"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/setup_theme.cpp:442
+#: src/gui/setup_theme.cpp:452
 msgid "Theme info"
 msgstr "Informace o motivu"
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/setup_theme.cpp:467
+#: src/gui/setup_theme.cpp:477
 msgid "Theme Changed"
 msgstr "Téma změněno"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/setup_theme.cpp:467 src/gui/setup_video.cpp:537
+#: src/gui/setup_theme.cpp:477 src/gui/setup_video.cpp:537
 #: src/gui/setup_video.cpp:546
 msgid "Restart your client for the change to take effect."
 msgstr "Restartujte klient pro aplikováni změn."
@@ -4673,7 +4698,8 @@ msgid "Ambient FX"
 msgstr "Efekty prostředí"
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_visual.cpp:140
+#. TRANSLATORS: palette color
+#: src/gui/setup_visual.cpp:140 src/gui/userpalette.cpp:146
 msgid "Particle effects"
 msgstr "Částicové efekty"
 
@@ -4760,45 +4786,45 @@ msgid "%s wants to %s %s do you accept?"
 msgstr "%s chce %s %s příjímáte?"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/skilldialog.cpp:270 src/gui/windowmenu.cpp:112
+#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:112
 msgid "Skills"
 msgstr "Dovednosti"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/skilldialog.cpp:279
+#: src/gui/skilldialog.cpp:281
 msgid "Up"
 msgstr "Zvýšit"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/skilldialog.cpp:391
+#: src/gui/skilldialog.cpp:393
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Dovednostních bodů k dispozici: %d"
 
 #. TRANSLATORS: skills dialog default skills tab
-#: src/gui/skilldialog.cpp:444
+#: src/gui/skilldialog.cpp:446
 msgid "basic"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill name
-#: src/gui/skilldialog.cpp:447
+#: src/gui/skilldialog.cpp:449
 msgid "basic, 1"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/skilldialog.cpp:484
+#: src/gui/skilldialog.cpp:486
 #, c-format
 msgid "Skill Set %d"
 msgstr "Dovednost nastavena %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/skilldialog.cpp:518
+#: src/gui/skilldialog.cpp:520
 #, c-format
 msgid "Skill %d"
 msgstr "Dovednost %d"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/skilldialog.cpp:612 src/gui/skilldialog.cpp:762
+#: src/gui/skilldialog.cpp:614 src/gui/skilldialog.cpp:764
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -5241,7 +5267,7 @@ msgid "Trade: You"
 msgstr "Obchod: Ty"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:182
+#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:184
 #, c-format
 msgid "You get %s"
 msgstr "Dostaneš: %s"
@@ -5257,12 +5283,12 @@ msgid "You give:"
 msgstr "Dáváš:"
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:393
+#: src/gui/tradewindow.cpp:396
 msgid "You don't have enough money."
 msgstr "Nemáte dost peněz."
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:475
+#: src/gui/tradewindow.cpp:479
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "Přidání věci selhalo. Nemůžeš přidat jeden druh vícekrát."
 
@@ -5273,224 +5299,224 @@ msgid "Name: %s"
 msgstr "Jméno: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/updaterwindow.cpp:140
+#: src/gui/updaterwindow.cpp:156
 msgid "Updating..."
 msgstr "Aktualizuje se..."
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:165
+#: src/gui/updaterwindow.cpp:181
 msgid "Connecting..."
 msgstr "Připojuji se..."
 
 #. TRANSLATORS: update message
-#: src/gui/updaterwindow.cpp:656
+#: src/gui/updaterwindow.cpp:672
 msgid "##1  The update process is incomplete."
 msgstr "##1  Proces aktualizace není kompletní."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/updaterwindow.cpp:658
+#: src/gui/updaterwindow.cpp:674
 msgid "##1  It is strongly recommended that"
 msgstr "##1  silně doporučujeme zkusit"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:660
+#: src/gui/updaterwindow.cpp:676
 msgid "##1  you try again later."
 msgstr "##1  aktualizaci později"
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:839
+#: src/gui/updaterwindow.cpp:855
 msgid "Completed"
 msgstr "Hotovo"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
 msgid "Being"
 msgstr "Bytost"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:118
-msgid "Friend Names"
-msgstr "Jména přátel"
+#: src/gui/userpalette.cpp:119
+msgid "Friend names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:120
-msgid "Disregarded Names"
-msgstr "Jména přehlížených"
+#: src/gui/userpalette.cpp:121
+msgid "Disregarded names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:122
-msgid "Ignored Names"
-msgstr "Jména ignorovaných"
+#: src/gui/userpalette.cpp:123
+msgid "Ignored names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:124
-msgid "Erased Names"
-msgstr "Jména vymazaných"
+#: src/gui/userpalette.cpp:125
+msgid "Erased names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:126
-msgid "Other Players' Names"
-msgstr "Jména ostatních hráčů"
+#: src/gui/userpalette.cpp:127
+msgid "Other players names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:128
-msgid "Own Name"
-msgstr "Vlastní jméno"
+#: src/gui/userpalette.cpp:129
+msgid "Own name"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:130
-msgid "GM Names"
-msgstr "Jména GM"
+#: src/gui/userpalette.cpp:131
+msgid "GM names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
 msgid "NPCs"
 msgstr "Jména NPC"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
 msgid "Monster HP bar"
 msgstr "Pruh HP monster"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:140
 msgid "Monster HP bar (second color)"
 msgstr "Pruh HP monster (druhá barva)"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:141
-msgid "Party Members"
-msgstr "Členové party"
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:143
-msgid "Guild Members"
-msgstr "Členové gildy"
+#: src/gui/userpalette.cpp:142
+msgid "Party members"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:145
-msgid "Particle Effects"
-msgstr "Částicové efekty"
+#: src/gui/userpalette.cpp:144
+msgid "Guild members"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:147
-msgid "Pickup Notification"
-msgstr "Oznámení o sběru"
+#: src/gui/userpalette.cpp:148
+msgid "Pickup notification"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:149
-msgid "Exp Notification"
-msgstr "Oznámení o zkušenostech"
+#: src/gui/userpalette.cpp:150
+msgid "Exp notification"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
 msgid "Player HP bar"
 msgstr "Hráčův HP pruh"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
 msgid "Player HP bar (second color)"
 msgstr "Hráčův HP pruh (druhá barva)"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:157
-msgid "Player Hits Monster"
-msgstr "Hráč zasáhne monstrum"
+#: src/gui/userpalette.cpp:158
+msgid "Player hits monster"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:159
-msgid "Monster Hits Player"
-msgstr "Monstrum zasáhne hráče"
+#: src/gui/userpalette.cpp:160
+msgid "Monster hits player"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:163
-msgid "Other Player Hits Local Player"
-msgstr "Hráč zasáhne místního hráče"
+#: src/gui/userpalette.cpp:164
+msgid "Other player hits local player"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:166
 msgid "Critical Hit"
 msgstr "Kritický zásah"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
-msgid "Local Player Hits Monster"
-msgstr "Místní hráč zasáhne monstrum"
+#: src/gui/userpalette.cpp:170
+msgid "Local player hits monster"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:172
-msgid "Local Player Critical Hit"
-msgstr "Kritický zásah místního hráče"
+#: src/gui/userpalette.cpp:173
+msgid "Local player critical hit"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:175
-msgid "Local Player Miss"
-msgstr "Místní hráč minul"
+#: src/gui/userpalette.cpp:176
+msgid "Local player miss"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:177
+#: src/gui/userpalette.cpp:178
 msgid "Misses"
 msgstr "Minutí"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
-msgid "Portal Highlight"
-msgstr "Zvýraznění portálů"
+#: src/gui/userpalette.cpp:180
+msgid "Portal highlight"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:182
-msgid "Default collision Highlight"
-msgstr "Zvýraznění výchozí kolize"
+#: src/gui/userpalette.cpp:183
+msgid "Default collision highlight"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:185
-msgid "Air collision Highlight"
-msgstr "Zvýraznění vzdušné kolize"
+#: src/gui/userpalette.cpp:186
+msgid "Air collision highlight"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:188
-msgid "Water collision Highlight"
-msgstr "Zvýraznění vodní kolize"
+#: src/gui/userpalette.cpp:189
+msgid "Water collision highlight"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:192
+msgid "Special ground collision highlight"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:191
-msgid "Special ground collision Highlight"
+#: src/gui/userpalette.cpp:195
+msgid "Walkable highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
-msgid "Walkable Highlight"
-msgstr "Zvýraznění schůdnosti"
+#: src/gui/userpalette.cpp:198
+msgid "Local player attack range"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:197
-msgid "Local Player Attack Range"
-msgstr "Útočný dosah místního hráče"
+#: src/gui/userpalette.cpp:201
+msgid "Local player attack range border"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:200
-msgid "Local Player Attack Range Border"
-msgstr "Hranice útočného dosahu místního hráče"
+#: src/gui/userpalette.cpp:204
+msgid "Monster attack range"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:203
-msgid "Monster Attack Range"
-msgstr "Útočný dosah monstra"
+#: src/gui/userpalette.cpp:208
+msgid "Floor item amount color"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:206
-msgid "Home Place"
-msgstr "Domovské místo"
+#: src/gui/userpalette.cpp:211
+msgid "Home place"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:209
-msgid "Home Place Border"
-msgstr "Hranice domácího místa"
+#: src/gui/userpalette.cpp:214
+msgid "Home place border"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:212
-msgid "Road Point"
-msgstr "Bod cesty"
+#: src/gui/userpalette.cpp:217
+msgid "Road point"
+msgstr ""
 
 #. TRANSLATORS: who is online window name
 #: src/gui/whoisonline.cpp:79 src/gui/whoisonline.cpp:623
@@ -5619,7 +5645,7 @@ msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:315
+#: src/gui/widgets/itemcontainer.cpp:317
 msgid "Eq."
 msgstr ""
 
diff --git a/po/da.po b/po/da.po
index 29703f149..c35ff7702 100644
--- a/po/da.po
+++ b/po/da.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-05-03 12:38+0300\n"
-"PO-Revision-Date: 2013-05-03 09:44+0000\n"
+"POT-Creation-Date: 2013-05-10 18:34+0300\n"
+"PO-Revision-Date: 2013-05-10 15:39+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/manaplus/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -60,25 +60,25 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: full button name
-#: src/client.cpp:1136 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
+#: src/client.cpp:1137 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
 msgid "Setup"
 msgstr "Opsætning"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1140 src/gui/setup_perfomance.cpp:61
+#: src/client.cpp:1141 src/gui/setup_perfomance.cpp:61
 msgid "Perfomance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:1143 src/gui/setup_video.cpp:258
+#: src/client.cpp:1144 src/gui/setup_video.cpp:258
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1146 src/gui/setup_theme.cpp:273
+#: src/client.cpp:1147 src/gui/setup_theme.cpp:283
 msgid "Theme"
 msgstr ""
 
@@ -89,7 +89,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1150 src/gui/didyouknowwindow.cpp:78
+#: src/client.cpp:1151 src/gui/didyouknowwindow.cpp:78
 #: src/gui/inventorywindow.cpp:228 src/gui/npcdialog.cpp:63
 #: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:574
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:80
@@ -97,32 +97,32 @@ msgid "Close"
 msgstr "Luk"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1238
+#: src/client.cpp:1239
 msgid "Connecting to server"
 msgstr "Forbinder til server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1282
 msgid "Logging in"
 msgstr "Logger ind"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1320
+#: src/client.cpp:1321
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1431
+#: src/client.cpp:1432
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1471
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1483
+#: src/client.cpp:1484
 msgid "Changing game servers"
 msgstr ""
 
@@ -137,69 +137,69 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1540 src/client.cpp:1551 src/client.cpp:1721
+#: src/client.cpp:1541 src/client.cpp:1552 src/client.cpp:1722
 #: src/gui/changeemaildialog.cpp:168 src/gui/changepassworddialog.cpp:158
-#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:288
-#: src/gui/editserverdialog.cpp:220 src/gui/registerdialog.cpp:263
+#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:290
+#: src/gui/editserverdialog.cpp:216 src/gui/registerdialog.cpp:263
 #: src/gui/unregisterdialog.cpp:143 src/net/ea/charserverhandler.cpp:190
 #: src/net/ea/charserverhandler.cpp:210
 msgid "Error"
 msgstr "Fejl"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1564
+#: src/client.cpp:1565
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1601
+#: src/client.cpp:1602
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1603
+#: src/client.cpp:1604
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1624
+#: src/client.cpp:1625
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1626
+#: src/client.cpp:1627
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1647
+#: src/client.cpp:1648
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1649
+#: src/client.cpp:1650
 msgid "Farewell, come back any time..."
 msgstr ""
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1902 src/client.cpp:1917 src/client.cpp:1960
-#: src/client.cpp:1976 src/client.cpp:2417 src/client.cpp:2425
+#: src/client.cpp:1903 src/client.cpp:1918 src/client.cpp:1961
+#: src/client.cpp:1977 src/client.cpp:2418 src/client.cpp:2426
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2113
+#: src/client.cpp:2114
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2154 src/client.cpp:2161
+#: src/client.cpp:2155 src/client.cpp:2162
 msgid "Error creating updates directory!"
 msgstr "Fejl under oprettelsen af opdateringen mappen!"
 
-#: src/client.cpp:2183 src/client.cpp:2196
+#: src/client.cpp:2184 src/client.cpp:2197
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -479,19 +479,19 @@ msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: bot checker window header
-#: src/gui/botcheckerwindow.cpp:269
+#: src/gui/botcheckerwindow.cpp:268
 msgid "Bot Checker"
 msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:102
+#: src/gui/botcheckerwindow.cpp:277 src/gui/npcdialog.cpp:102
 msgid "Reset"
 msgstr "Nulstil"
 
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: relations table header
-#: src/gui/botcheckerwindow.cpp:305 src/gui/setup_relations.cpp:61
+#: src/gui/botcheckerwindow.cpp:304 src/gui/setup_relations.cpp:61
 msgid "Name"
 msgstr "Navn"
 
@@ -499,7 +499,7 @@ msgstr "Navn"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:145
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:145
 #: src/gui/popupmenu.cpp:241 src/gui/popupmenu.cpp:640
 #: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:257
 #: src/net/tmwa/generalhandler.cpp:292
@@ -509,7 +509,7 @@ msgstr "Angrib"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
-#: src/gui/botcheckerwindow.cpp:309 src/gui/popupmenu.cpp:225
+#: src/gui/botcheckerwindow.cpp:308 src/gui/popupmenu.cpp:225
 #: src/gui/setupactiondata.h:93
 msgid "Talk"
 msgstr "Snak"
@@ -517,7 +517,7 @@ msgstr "Snak"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/botcheckerwindow.cpp:311 src/gui/popupmenu.cpp:215
+#: src/gui/botcheckerwindow.cpp:310 src/gui/popupmenu.cpp:215
 #: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:371
 #: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:653
 #: src/gui/popupmenu.cpp:727 src/gui/setupactiondata.h:1856
@@ -525,7 +525,7 @@ msgid "Move"
 msgstr ""
 
 #. TRANSLATORS: bot checker window table header
-#: src/gui/botcheckerwindow.cpp:313
+#: src/gui/botcheckerwindow.cpp:312
 msgid "Result"
 msgstr ""
 
@@ -581,7 +581,7 @@ msgstr "Køb"
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:516
+#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:511
 #: src/gui/selldialog.cpp:94 src/gui/selldialog.cpp:342
 #, c-format
 msgid "Price: %s / Total: %s"
@@ -598,9 +598,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:208
-#: src/gui/itemamountwindow.cpp:243 src/gui/npcdialog.cpp:93
-#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:833
+#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:202
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:93
+#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:821
 msgid "+"
 msgstr ""
 
@@ -610,9 +610,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:240 src/gui/npcdialog.cpp:95
-#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:846
+#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:200
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:95
+#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:834
 msgid "-"
 msgstr ""
 
@@ -624,7 +624,7 @@ msgstr ""
 #. TRANSLATORS: input action name
 #: src/gui/buydialog.cpp:260 src/gui/quitdialog.cpp:54
 #: src/gui/quitdialog.cpp:59 src/gui/quitdialog.cpp:61
-#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:255
+#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:264
 #: src/gui/setupactiondata.h:177
 msgid "Quit"
 msgstr "Afslut"
@@ -636,7 +636,7 @@ msgstr "Afslut"
 #. TRANSLATORS: status bar label
 #: src/gui/buydialog.cpp:262 src/gui/selldialog.cpp:106
 #: src/gui/statuswindow.cpp:558 src/gui/statuswindow.cpp:615
-#: src/gui/statuswindow.cpp:830 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:852
 msgid "Max"
 msgstr "Maks"
 
@@ -681,7 +681,7 @@ msgstr "Sælg"
 #: src/gui/buyselldialog.cpp:71 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:120
 #: src/gui/connectiondialog.cpp:48 src/gui/editserverdialog.cpp:80
-#: src/gui/itemamountwindow.cpp:212 src/gui/npcpostdialog.cpp:64
+#: src/gui/itemamountwindow.cpp:206 src/gui/npcpostdialog.cpp:64
 #: src/gui/popupmenu.cpp:290 src/gui/popupmenu.cpp:324
 #: src/gui/popupmenu.cpp:411 src/gui/popupmenu.cpp:454
 #: src/gui/popupmenu.cpp:485 src/gui/popupmenu.cpp:512
@@ -697,7 +697,7 @@ msgstr "Sælg"
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
 #: src/gui/setup.cpp:84 src/gui/socialwindow.cpp:1204
 #: src/gui/textcommandeditor.cpp:212 src/gui/textdialog.cpp:53
-#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:167
+#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:183
 msgid "Cancel"
 msgstr "Fortryd"
 
@@ -861,7 +861,7 @@ msgstr "Du mangler at fordele %d points"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:570
+#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:581
 #: src/gui/socialwindow.cpp:1269
 msgid "Create"
 msgstr "Opret"
@@ -888,17 +888,17 @@ msgid "Please remove %d points"
 msgstr "Du skal fjerne %d points"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:60
+#: src/gui/charselectdialog.cpp:61
 msgid "Confirm Character Delete"
 msgstr "Bekræft sletning af karakter"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:62
+#: src/gui/charselectdialog.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "Er du sikker på at du vil slette denne karakter?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:86
+#: src/gui/charselectdialog.cpp:87
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
@@ -910,8 +910,8 @@ msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:565
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:576
+#: src/gui/updaterwindow.cpp:185
 msgid "Play"
 msgstr "Spil"
 
@@ -927,7 +927,7 @@ msgstr "Info"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:263
+#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:272
 #: src/gui/setupactiondata.h:1803 src/gui/setup_relations.cpp:262
 #: src/gui/shopwindow.cpp:96 src/gui/shopwindow.cpp:103
 #: src/gui/textcommandeditor.cpp:216
@@ -937,24 +937,24 @@ msgstr "Slet"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/charselectdialog.cpp:129 src/gui/unregisterdialog.cpp:48
+#: src/gui/charselectdialog.cpp:130 src/gui/unregisterdialog.cpp:48
 #: src/gui/unregisterdialog.cpp:53
 msgid "Unregister"
 msgstr "Frameld"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/charselectdialog.cpp:141
+#: src/gui/charselectdialog.cpp:142
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:172
+#: src/gui/charselectdialog.cpp:175
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/charselectdialog.cpp:246
+#: src/gui/charselectdialog.cpp:248
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -964,16 +964,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:288
+#: src/gui/charselectdialog.cpp:290
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password:"
 msgstr ""
 
@@ -1060,13 +1060,13 @@ msgid "Chat"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:735
+#: src/gui/chatwindow.cpp:638
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1165
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Hvisker til %s: %s"
@@ -1084,7 +1084,7 @@ msgstr "Nej"
 
 #. TRANSLATORS: confirm dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/confirmdialog.cpp:58 src/gui/popupmenu.cpp:2429
+#: src/gui/confirmdialog.cpp:55 src/gui/popupmenu.cpp:2429
 #: src/gui/popupmenu.cpp:2442 src/gui/popupmenu.cpp:2457
 #: src/gui/popupmenu.cpp:2483
 msgid "Ignore"
@@ -1093,7 +1093,7 @@ msgstr ""
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
 #. TRANSLATORS: settings group
-#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:109
+#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:108
 #: src/gui/setup_other.cpp:123 src/gui/windowmenu.cpp:106
 msgid "Map"
 msgstr "Kort"
@@ -1109,190 +1109,190 @@ msgid "Net"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:265
-#: src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:268
+#: src/gui/debugwindow.cpp:311
 msgid "Music:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:153 src/gui/debugwindow.cpp:271
-#: src/gui/debugwindow.cpp:312
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:274
+#: src/gui/debugwindow.cpp:315
 msgid "Map:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:155 src/gui/debugwindow.cpp:268
-#: src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:271
+#: src/gui/debugwindow.cpp:313
 msgid "Minimap:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:262
-#: src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:161 src/gui/debugwindow.cpp:265
+#: src/gui/debugwindow.cpp:309
 msgid "Cursor:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:161
+#: src/gui/debugwindow.cpp:164
 msgid "Particle count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:284
-#: src/gui/debugwindow.cpp:316
+#: src/gui/debugwindow.cpp:167 src/gui/debugwindow.cpp:287
+#: src/gui/debugwindow.cpp:319
 msgid "Map actors count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:166 src/gui/debugwindow.cpp:243
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:169 src/gui/debugwindow.cpp:246
+#: src/gui/debugwindow.cpp:252
 msgid "Player Position:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:172 src/gui/debugwindow.cpp:297
+#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:300
 msgid "Draw calls:"
 msgstr ""
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:175
+#. TRANSLATORS: debug window label, frames per second
+#: src/gui/debugwindow.cpp:178
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:177 src/gui/debugwindow.cpp:324
+#. TRANSLATORS: debug window label, logic per second
+#: src/gui/debugwindow.cpp:180 src/gui/debugwindow.cpp:327
 #, c-format
 msgid "%d LPS"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:191 src/gui/debugwindow.cpp:209
 #, c-format
 msgid "%d FPS (Software)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:193
+#: src/gui/debugwindow.cpp:196
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:197
+#: src/gui/debugwindow.cpp:200
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:201
+#: src/gui/debugwindow.cpp:204
 #, c-format
 msgid "%d FPS (mobile OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:225 src/gui/debugwindow.cpp:290
+#: src/gui/debugwindow.cpp:228 src/gui/debugwindow.cpp:293
 msgid "Textures count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:279
+#: src/gui/debugwindow.cpp:282
 #, c-format
 msgid "Particle count: %d"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:330 src/gui/debugwindow.cpp:380
-#: src/gui/debugwindow.cpp:442
+#: src/gui/debugwindow.cpp:333 src/gui/debugwindow.cpp:383
+#: src/gui/debugwindow.cpp:445
 msgid "Target:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:332 src/gui/debugwindow.cpp:386
-#: src/gui/debugwindow.cpp:444
+#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
+#: src/gui/debugwindow.cpp:447
 msgid "Target Id:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
-#: src/gui/debugwindow.cpp:446
+#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:392
+#: src/gui/debugwindow.cpp:449
 msgid "Target type:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:337
+#: src/gui/debugwindow.cpp:340
 msgid "Target level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:339 src/gui/debugwindow.cpp:405
+#: src/gui/debugwindow.cpp:342 src/gui/debugwindow.cpp:408
 msgid "Target race:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:341
+#: src/gui/debugwindow.cpp:344
 msgid "Target party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:346
 msgid "Target guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:430
-#: src/gui/debugwindow.cpp:436 src/gui/debugwindow.cpp:454
+#: src/gui/debugwindow.cpp:348 src/gui/debugwindow.cpp:433
+#: src/gui/debugwindow.cpp:439 src/gui/debugwindow.cpp:457
 msgid "Attack delay:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:347 src/gui/debugwindow.cpp:417
-#: src/gui/debugwindow.cpp:456
+#: src/gui/debugwindow.cpp:350 src/gui/debugwindow.cpp:420
+#: src/gui/debugwindow.cpp:459
 msgid "Minimal hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:349 src/gui/debugwindow.cpp:420
-#: src/gui/debugwindow.cpp:458
+#: src/gui/debugwindow.cpp:352 src/gui/debugwindow.cpp:423
+#: src/gui/debugwindow.cpp:461
 msgid "Maximum hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:351 src/gui/debugwindow.cpp:423
-#: src/gui/debugwindow.cpp:460
+#: src/gui/debugwindow.cpp:354 src/gui/debugwindow.cpp:426
+#: src/gui/debugwindow.cpp:463
 msgid "Critical hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:394 src/gui/debugwindow.cpp:400
-#: src/gui/debugwindow.cpp:448
+#: src/gui/debugwindow.cpp:397 src/gui/debugwindow.cpp:403
+#: src/gui/debugwindow.cpp:451
 msgid "Target Level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:408 src/gui/debugwindow.cpp:450
+#: src/gui/debugwindow.cpp:411 src/gui/debugwindow.cpp:453
 msgid "Target Party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:412 src/gui/debugwindow.cpp:452
+#: src/gui/debugwindow.cpp:415 src/gui/debugwindow.cpp:455
 msgid "Target Guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:493
+#: src/gui/debugwindow.cpp:496
 #, c-format
 msgid "Ping: %s ms"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:496
+#: src/gui/debugwindow.cpp:499
 #, c-format
 msgid "In: %d bytes/s"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:499
+#: src/gui/debugwindow.cpp:502
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
@@ -1324,7 +1324,7 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #: src/gui/editdialog.cpp:45 src/gui/editserverdialog.cpp:78
-#: src/gui/itemamountwindow.cpp:210 src/gui/okdialog.cpp:51
+#: src/gui/itemamountwindow.cpp:204 src/gui/okdialog.cpp:51
 #: src/gui/quitdialog.cpp:70 src/gui/textdialog.cpp:46
 msgid "OK"
 msgstr "OK"
@@ -1336,7 +1336,7 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:257
+#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:266
 msgid "Connect"
 msgstr ""
 
@@ -1366,7 +1366,7 @@ msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/editserverdialog.cpp:222
+#: src/gui/editserverdialog.cpp:218
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -1418,7 +1418,7 @@ msgstr "Tag på"
 #: src/gui/inventorywindow.cpp:178 src/gui/inventorywindow.cpp:630
 #: src/gui/popupmenu.cpp:1843 src/gui/popupmenu.cpp:1922
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2041
-#: src/gui/skilldialog.cpp:277
+#: src/gui/skilldialog.cpp:279
 msgid "Use"
 msgstr "Brug"
 
@@ -1452,7 +1452,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: setup button
-#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:718
+#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:719
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1992
 #: src/gui/popupmenu.cpp:2066 src/gui/setup.cpp:86
 msgid "Store"
@@ -1474,47 +1474,47 @@ msgid "Drop"
 msgstr "Smid"
 
 #. TRANSLATORS: item amount window button
-#: src/gui/itemamountwindow.cpp:214
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "Alle"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:264
 msgid "Select amount of items to trade."
 msgstr "Vælg hvor mange genstande du vil bytte."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:274
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to drop."
 msgstr "Vælg hvor mange genstande du vil smide."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:278
+#: src/gui/itemamountwindow.cpp:272
 msgid "Select amount of items to store."
 msgstr "Vælg hvor mange genstande du vil lagre"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:276
 msgid "Select amount of items to retrieve."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:286
+#: src/gui/itemamountwindow.cpp:280
 msgid "Select amount of items to split."
 msgstr "Vælg hvor mange genstande du vil opdele."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:290
+#: src/gui/itemamountwindow.cpp:284
 msgid "Add to buy shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:294
+#: src/gui/itemamountwindow.cpp:288
 msgid "Add to sell shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:298
+#: src/gui/itemamountwindow.cpp:292
 msgid "Unknown."
 msgstr ""
 
@@ -1541,7 +1541,7 @@ msgstr ""
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:58 src/gui/killstats.cpp:171
-#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:516
+#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:509
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
@@ -1549,7 +1549,7 @@ msgstr ""
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:61 src/gui/killstats.cpp:173
 #: src/gui/killstats.cpp:253 src/gui/killstats.cpp:268
-#: src/gui/killstats.cpp:518
+#: src/gui/killstats.cpp:511
 #, c-format
 msgid "Avg Exp: %s"
 msgstr ""
@@ -1557,14 +1557,14 @@ msgstr ""
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:63 src/gui/killstats.cpp:176
 #: src/gui/killstats.cpp:258 src/gui/killstats.cpp:272
-#: src/gui/killstats.cpp:521
+#: src/gui/killstats.cpp:514
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:66 src/gui/killstats.cpp:187
-#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:524
+#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:517
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
@@ -1592,9 +1592,9 @@ msgid "Last kill exp:"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:414
-#: src/gui/killstats.cpp:421 src/gui/killstats.cpp:428
-#: src/gui/killstats.cpp:434
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:408
+#: src/gui/killstats.cpp:415 src/gui/killstats.cpp:422
+#: src/gui/killstats.cpp:428
 msgid "Time before jacko spawn:"
 msgstr ""
 
@@ -1626,12 +1626,12 @@ msgid "  Time for next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:421
+#: src/gui/killstats.cpp:415
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:428
+#: src/gui/killstats.cpp:422
 msgid "jacko spawning"
 msgstr ""
 
@@ -1737,32 +1737,32 @@ msgid "arrows bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:88
+#: src/gui/ministatuswindow.cpp:89
 msgid "status bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:108
+#: src/gui/ministatuswindow.cpp:109
 msgid "job bar"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:306 src/gui/statuswindow.cpp:298
+#: src/gui/ministatuswindow.cpp:307 src/gui/statuswindow.cpp:298
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:313 src/gui/statuswindow.cpp:141
+#: src/gui/ministatuswindow.cpp:314 src/gui/statuswindow.cpp:141
 #: src/gui/statuswindow.cpp:305 src/gui/statuswindow.cpp:375
 #, c-format
 msgid "Level: %d"
 msgstr "Niveau: %d"
 
 #. TRANSLATORS: status bar label
-#: src/gui/ministatuswindow.cpp:330 src/gui/ministatuswindow.cpp:367
+#: src/gui/ministatuswindow.cpp:331 src/gui/ministatuswindow.cpp:368
 msgid "Need"
 msgstr ""
 
@@ -2150,7 +2150,7 @@ msgstr ""
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2209 src/gui/popupmenu.cpp:2280
-#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:139
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
 #: src/gui/socialwindow.cpp:934
 msgid "(default)"
 msgstr ""
@@ -2333,7 +2333,7 @@ msgid "Passwords do not match."
 msgstr "De indtastede adgangskoder stemmer ikke overens."
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:257
 msgid "Choose Your Server"
 msgstr ""
 
@@ -2341,61 +2341,61 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:259 src/gui/shopwindow.cpp:94
+#: src/gui/serverdialog.cpp:268 src/gui/shopwindow.cpp:94
 #: src/gui/shopwindow.cpp:101 src/gui/tradewindow.cpp:77
 msgid "Add"
 msgstr "Tilføj"
 
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
-#: src/gui/serverdialog.cpp:261 src/gui/widgets/setupitem.cpp:299
+#: src/gui/serverdialog.cpp:270 src/gui/widgets/setupitem.cpp:299
 #: src/gui/widgets/setupitem.cpp:426
 msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:274
 msgid "Load"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:279
+#: src/gui/serverdialog.cpp:288
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:297
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:518
+#: src/gui/serverdialog.cpp:527
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:524
+#: src/gui/serverdialog.cpp:533
 msgid "Waiting for server..."
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:529
+#: src/gui/serverdialog.cpp:538
 msgid "Preparing download"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:534
+#: src/gui/serverdialog.cpp:543
 msgid "Error retreiving server list!"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:626
+#: src/gui/serverdialog.cpp:635
 msgid "requires a newer version"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:631
+#: src/gui/serverdialog.cpp:640
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -3406,7 +3406,7 @@ msgid "Type:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:334
+#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:336
 msgid "Delay:"
 msgstr ""
 
@@ -3426,30 +3426,30 @@ msgid "Blue:"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:420
+#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:422
 msgid "Static"
 msgstr "Fastlåst"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:107 src/gui/setup_colors.cpp:110
-#: src/gui/setup_colors.cpp:422
+#: src/gui/setup_colors.cpp:424
 msgid "Pulse"
 msgstr "Pulserende"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:112 src/gui/setup_colors.cpp:115
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Rainbow"
 msgstr "Regnbuefarvet"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:117 src/gui/setup_colors.cpp:120
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Spectrum"
 msgstr "Spektrum"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:328
+#: src/gui/setup_colors.cpp:330
 msgid "Alpha:"
 msgstr ""
 
@@ -3615,7 +3615,7 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: palette color
-#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:134
+#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:135
 msgid "Monsters"
 msgstr "Monstre"
 
@@ -4164,206 +4164,231 @@ msgstr "Når ignorer:"
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:86
-msgid "Very small (9)"
+msgid "Very small (8)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:88
-msgid "Tiny (10)"
+msgid "Very small (9)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:90
-msgid "Small (11)"
+msgid "Tiny (10)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:92
-msgid "Medium (12)"
+msgid "Small (11)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:94
-msgid "Normal (13)"
+msgid "Medium (12)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:96
-msgid "Large (14)"
+msgid "Normal (13)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:98
-msgid "Very large (15)"
+msgid "Large (14)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:100
-msgid "Big (16)"
+msgid "Large (15)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:102
-msgid "Very big (17)"
+msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:104
-msgid "Huge (18)"
+msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:106
-msgid "Very huge (19)"
+msgid "Big (18)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:108
+msgid "Big (19)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:110
+msgid "Very big (20)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:112
+msgid "Very big (21)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:114
+msgid "Very big (22)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:116
+msgid "Huge (23)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:151
 msgid "Chinese (China)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:153
 msgid "Czech"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:155
 msgid "English"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:157
 msgid "Finnish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:159
 msgid "French"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:161
 msgid "German"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:153
+#: src/gui/setup_theme.cpp:163
 msgid "Indonesian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:155
+#: src/gui/setup_theme.cpp:165
 msgid "Italian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:157
+#: src/gui/setup_theme.cpp:167
 msgid "Polish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:159
+#: src/gui/setup_theme.cpp:169
 msgid "Japanese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:161
+#: src/gui/setup_theme.cpp:171
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:163
+#: src/gui/setup_theme.cpp:173
 msgid "Portuguese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:165
+#: src/gui/setup_theme.cpp:175
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:167
+#: src/gui/setup_theme.cpp:177
 msgid "Russian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:169
+#: src/gui/setup_theme.cpp:179
 msgid "Spanish (Castilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:171
+#: src/gui/setup_theme.cpp:181
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:223
+#: src/gui/setup_theme.cpp:233
 msgid "Gui theme"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:230
+#: src/gui/setup_theme.cpp:240
 msgid "Main Font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:235
+#: src/gui/setup_theme.cpp:245
 msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:239
+#: src/gui/setup_theme.cpp:249
 msgid "Bold font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:243
+#: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:247
+#: src/gui/setup_theme.cpp:257
 msgid "Help font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:251
+#: src/gui/setup_theme.cpp:261
 msgid "Secure font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:255
+#: src/gui/setup_theme.cpp:265
 msgid "Japanese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:260
+#: src/gui/setup_theme.cpp:270
 msgid "Font size"
 msgstr "Skriftstørrelse"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:265
+#: src/gui/setup_theme.cpp:275
 msgid "Npc font size"
 msgstr ""
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/setup_theme.cpp:269
+#: src/gui/setup_theme.cpp:279
 msgid "i"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/setup_theme.cpp:442
+#: src/gui/setup_theme.cpp:452
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/setup_theme.cpp:467
+#: src/gui/setup_theme.cpp:477
 msgid "Theme Changed"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/setup_theme.cpp:467 src/gui/setup_video.cpp:537
+#: src/gui/setup_theme.cpp:477 src/gui/setup_video.cpp:537
 #: src/gui/setup_video.cpp:546
 msgid "Restart your client for the change to take effect."
 msgstr "Ændringerne kræver at du genstarter klienten."
@@ -4661,7 +4686,8 @@ msgid "Ambient FX"
 msgstr "Omgivende FX"
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_visual.cpp:140
+#. TRANSLATORS: palette color
+#: src/gui/setup_visual.cpp:140 src/gui/userpalette.cpp:146
 msgid "Particle effects"
 msgstr "Partikeleffekter"
 
@@ -4748,45 +4774,45 @@ msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/skilldialog.cpp:270 src/gui/windowmenu.cpp:112
+#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:112
 msgid "Skills"
 msgstr "Færdigheder"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/skilldialog.cpp:279
+#: src/gui/skilldialog.cpp:281
 msgid "Up"
 msgstr "Op"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/skilldialog.cpp:391
+#: src/gui/skilldialog.cpp:393
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skills tab
-#: src/gui/skilldialog.cpp:444
+#: src/gui/skilldialog.cpp:446
 msgid "basic"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill name
-#: src/gui/skilldialog.cpp:447
+#: src/gui/skilldialog.cpp:449
 msgid "basic, 1"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/skilldialog.cpp:484
+#: src/gui/skilldialog.cpp:486
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/skilldialog.cpp:518
+#: src/gui/skilldialog.cpp:520
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/skilldialog.cpp:612 src/gui/skilldialog.cpp:762
+#: src/gui/skilldialog.cpp:614 src/gui/skilldialog.cpp:764
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -5229,7 +5255,7 @@ msgid "Trade: You"
 msgstr "Handel: Dig"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:182
+#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:184
 #, c-format
 msgid "You get %s"
 msgstr ""
@@ -5245,12 +5271,12 @@ msgid "You give:"
 msgstr "Du giver:"
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:393
+#: src/gui/tradewindow.cpp:396
 msgid "You don't have enough money."
 msgstr "Du har ikke penge nok."
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:475
+#: src/gui/tradewindow.cpp:479
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "Fejlede i at tilføje genstand. Du kan ikke overlappe en slags genstand på vinduet."
@@ -5262,223 +5288,223 @@ msgid "Name: %s"
 msgstr "Navn: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/updaterwindow.cpp:140
+#: src/gui/updaterwindow.cpp:156
 msgid "Updating..."
 msgstr "Updatere..."
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:165
+#: src/gui/updaterwindow.cpp:181
 msgid "Connecting..."
 msgstr "Opretter forbindelse..."
 
 #. TRANSLATORS: update message
-#: src/gui/updaterwindow.cpp:656
+#: src/gui/updaterwindow.cpp:672
 msgid "##1  The update process is incomplete."
 msgstr "##1  Opdateringsprocessen er ikke færdiggjort"
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/updaterwindow.cpp:658
+#: src/gui/updaterwindow.cpp:674
 msgid "##1  It is strongly recommended that"
 msgstr "##1  Det er varmt anbefalet at"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:660
+#: src/gui/updaterwindow.cpp:676
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:839
+#: src/gui/updaterwindow.cpp:855
 msgid "Completed"
 msgstr "Udført"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
 msgid "Being"
 msgstr "Skabning"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:118
-msgid "Friend Names"
+#: src/gui/userpalette.cpp:119
+msgid "Friend names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:120
-msgid "Disregarded Names"
+#: src/gui/userpalette.cpp:121
+msgid "Disregarded names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:122
-msgid "Ignored Names"
+#: src/gui/userpalette.cpp:123
+msgid "Ignored names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:124
-msgid "Erased Names"
+#: src/gui/userpalette.cpp:125
+msgid "Erased names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:126
-msgid "Other Players' Names"
-msgstr "Andre spilleres navne"
+#: src/gui/userpalette.cpp:127
+msgid "Other players names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:128
-msgid "Own Name"
-msgstr "Eget navn"
+#: src/gui/userpalette.cpp:129
+msgid "Own name"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:130
-msgid "GM Names"
-msgstr "GM-navne"
+#: src/gui/userpalette.cpp:131
+msgid "GM names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
 msgid "NPCs"
 msgstr "NPC'er"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
 msgid "Monster HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:140
 msgid "Monster HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:141
-msgid "Party Members"
+#: src/gui/userpalette.cpp:142
+msgid "Party members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:143
-msgid "Guild Members"
+#: src/gui/userpalette.cpp:144
+msgid "Guild members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:145
-msgid "Particle Effects"
-msgstr "Partikeleffekter"
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:147
-msgid "Pickup Notification"
-msgstr "Opsamlingsnotits"
+#: src/gui/userpalette.cpp:148
+msgid "Pickup notification"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:149
-msgid "Exp Notification"
-msgstr "XP-notits"
+#: src/gui/userpalette.cpp:150
+msgid "Exp notification"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
 msgid "Player HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
 msgid "Player HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:157
-msgid "Player Hits Monster"
+#: src/gui/userpalette.cpp:158
+msgid "Player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:159
-msgid "Monster Hits Player"
+#: src/gui/userpalette.cpp:160
+msgid "Monster hits player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:163
-msgid "Other Player Hits Local Player"
+#: src/gui/userpalette.cpp:164
+msgid "Other player hits local player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:166
 msgid "Critical Hit"
 msgstr "Kritisk sår"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
-msgid "Local Player Hits Monster"
+#: src/gui/userpalette.cpp:170
+msgid "Local player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:172
-msgid "Local Player Critical Hit"
+#: src/gui/userpalette.cpp:173
+msgid "Local player critical hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:175
-msgid "Local Player Miss"
+#: src/gui/userpalette.cpp:176
+msgid "Local player miss"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:177
+#: src/gui/userpalette.cpp:178
 msgid "Misses"
 msgstr "Rammer forbi"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
-msgid "Portal Highlight"
+#: src/gui/userpalette.cpp:180
+msgid "Portal highlight"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:183
+msgid "Default collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:182
-msgid "Default collision Highlight"
+#: src/gui/userpalette.cpp:186
+msgid "Air collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:185
-msgid "Air collision Highlight"
+#: src/gui/userpalette.cpp:189
+msgid "Water collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:188
-msgid "Water collision Highlight"
+#: src/gui/userpalette.cpp:192
+msgid "Special ground collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:191
-msgid "Special ground collision Highlight"
+#: src/gui/userpalette.cpp:195
+msgid "Walkable highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
-msgid "Walkable Highlight"
+#: src/gui/userpalette.cpp:198
+msgid "Local player attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:197
-msgid "Local Player Attack Range"
+#: src/gui/userpalette.cpp:201
+msgid "Local player attack range border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:200
-msgid "Local Player Attack Range Border"
+#: src/gui/userpalette.cpp:204
+msgid "Monster attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:203
-msgid "Monster Attack Range"
+#: src/gui/userpalette.cpp:208
+msgid "Floor item amount color"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:206
-msgid "Home Place"
+#: src/gui/userpalette.cpp:211
+msgid "Home place"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:209
-msgid "Home Place Border"
+#: src/gui/userpalette.cpp:214
+msgid "Home place border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:212
-msgid "Road Point"
+#: src/gui/userpalette.cpp:217
+msgid "Road point"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
@@ -5608,7 +5634,7 @@ msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:315
+#: src/gui/widgets/itemcontainer.cpp:317
 msgid "Eq."
 msgstr ""
 
diff --git a/po/de.po b/po/de.po
index fcd7bca34..fc5fcfcb9 100644
--- a/po/de.po
+++ b/po/de.po
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-05-03 12:38+0300\n"
-"PO-Revision-Date: 2013-05-03 09:44+0000\n"
+"POT-Creation-Date: 2013-05-11 12:13+0300\n"
+"PO-Revision-Date: 2013-05-10 15:39+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/manaplus/language/"
 "de/)\n"
@@ -73,25 +73,25 @@ msgstr "I"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: full button name
-#: src/client.cpp:1136 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
+#: src/client.cpp:1137 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
 msgid "Setup"
 msgstr "Einstellungen"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1140 src/gui/setup_perfomance.cpp:61
+#: src/client.cpp:1141 src/gui/setup_perfomance.cpp:61
 msgid "Perfomance"
 msgstr "Leistung"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:1143 src/gui/setup_video.cpp:258
+#: src/client.cpp:1144 src/gui/setup_video.cpp:258
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1146 src/gui/setup_theme.cpp:273
+#: src/client.cpp:1147 src/gui/setup_theme.cpp:283
 msgid "Theme"
 msgstr "Theme"
 
@@ -102,7 +102,7 @@ msgstr "Theme"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1150 src/gui/didyouknowwindow.cpp:78
+#: src/client.cpp:1151 src/gui/didyouknowwindow.cpp:78
 #: src/gui/inventorywindow.cpp:228 src/gui/npcdialog.cpp:63
 #: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:574
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:80
@@ -110,32 +110,32 @@ msgid "Close"
 msgstr "Schließen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1238
+#: src/client.cpp:1239
 msgid "Connecting to server"
 msgstr "Verbinde zum Server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1282
 msgid "Logging in"
 msgstr "Anmelden"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1320
+#: src/client.cpp:1321
 msgid "Entering game world"
 msgstr "Betrete die Spielwelt"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1431
+#: src/client.cpp:1432
 msgid "Requesting characters"
 msgstr "Spielfiguren werden abgefragt"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1471
 msgid "Connecting to the game server"
 msgstr "Verbinde zum Charakterserver"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1483
+#: src/client.cpp:1484
 msgid "Changing game servers"
 msgstr "Charakterserver wechseln"
 
@@ -150,69 +150,69 @@ msgstr "Charakterserver wechseln"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1540 src/client.cpp:1551 src/client.cpp:1721
+#: src/client.cpp:1541 src/client.cpp:1552 src/client.cpp:1722
 #: src/gui/changeemaildialog.cpp:168 src/gui/changepassworddialog.cpp:158
-#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:288
-#: src/gui/editserverdialog.cpp:220 src/gui/registerdialog.cpp:263
+#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:290
+#: src/gui/editserverdialog.cpp:216 src/gui/registerdialog.cpp:263
 #: src/gui/unregisterdialog.cpp:143 src/net/ea/charserverhandler.cpp:190
 #: src/net/ea/charserverhandler.cpp:210
 msgid "Error"
 msgstr "Fehler"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1564
+#: src/client.cpp:1565
 msgid "Requesting registration details"
 msgstr "Anfrage der Registrierungsdetails"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1601
+#: src/client.cpp:1602
 msgid "Password Change"
 msgstr "Passwort ändern"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1603
+#: src/client.cpp:1604
 msgid "Password changed successfully!"
 msgstr "Passwort erfolgreich geändert!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1624
+#: src/client.cpp:1625
 msgid "Email Change"
 msgstr "E-Mail ändern"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1626
+#: src/client.cpp:1627
 msgid "Email changed successfully!"
 msgstr "E-Mail erfolgreich geändert!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1647
+#: src/client.cpp:1648
 msgid "Unregister Successful"
 msgstr "Erfolgreich abgemeldet."
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1649
+#: src/client.cpp:1650
 msgid "Farewell, come back any time..."
 msgstr "Leb wohl und komm jeder Zeit wieder..."
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1902 src/client.cpp:1917 src/client.cpp:1960
-#: src/client.cpp:1976 src/client.cpp:2417 src/client.cpp:2425
+#: src/client.cpp:1903 src/client.cpp:1918 src/client.cpp:1961
+#: src/client.cpp:1977 src/client.cpp:2418 src/client.cpp:2426
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s existiert nicht und kann nicht erstellt werden! Beende."
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2113
+#: src/client.cpp:2114
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Ungültiger Updateserver: %s"
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2154 src/client.cpp:2161
+#: src/client.cpp:2155 src/client.cpp:2162
 msgid "Error creating updates directory!"
 msgstr "Fehler beim Erstellen des Verzeichnisses für Updates!"
 
-#: src/client.cpp:2183 src/client.cpp:2196
+#: src/client.cpp:2184 src/client.cpp:2197
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -496,19 +496,19 @@ msgid "Comment: %s"
 msgstr "Kommentar: %s"
 
 #. TRANSLATORS: bot checker window header
-#: src/gui/botcheckerwindow.cpp:269
+#: src/gui/botcheckerwindow.cpp:268
 msgid "Bot Checker"
 msgstr "Bot-Prüfer"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:102
+#: src/gui/botcheckerwindow.cpp:277 src/gui/npcdialog.cpp:102
 msgid "Reset"
 msgstr "Zurücksetzten"
 
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: relations table header
-#: src/gui/botcheckerwindow.cpp:305 src/gui/setup_relations.cpp:61
+#: src/gui/botcheckerwindow.cpp:304 src/gui/setup_relations.cpp:61
 msgid "Name"
 msgstr "Name"
 
@@ -516,7 +516,7 @@ msgstr "Name"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:145
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:145
 #: src/gui/popupmenu.cpp:241 src/gui/popupmenu.cpp:640
 #: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:257
 #: src/net/tmwa/generalhandler.cpp:292
@@ -526,7 +526,7 @@ msgstr "Angriff"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
-#: src/gui/botcheckerwindow.cpp:309 src/gui/popupmenu.cpp:225
+#: src/gui/botcheckerwindow.cpp:308 src/gui/popupmenu.cpp:225
 #: src/gui/setupactiondata.h:93
 msgid "Talk"
 msgstr "Sprechen"
@@ -534,7 +534,7 @@ msgstr "Sprechen"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/botcheckerwindow.cpp:311 src/gui/popupmenu.cpp:215
+#: src/gui/botcheckerwindow.cpp:310 src/gui/popupmenu.cpp:215
 #: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:371
 #: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:653
 #: src/gui/popupmenu.cpp:727 src/gui/setupactiondata.h:1856
@@ -542,7 +542,7 @@ msgid "Move"
 msgstr "Bewegen"
 
 #. TRANSLATORS: bot checker window table header
-#: src/gui/botcheckerwindow.cpp:313
+#: src/gui/botcheckerwindow.cpp:312
 msgid "Result"
 msgstr "Resultat"
 
@@ -598,7 +598,7 @@ msgstr "Kaufen"
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:516
+#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:511
 #: src/gui/selldialog.cpp:94 src/gui/selldialog.cpp:342
 #, c-format
 msgid "Price: %s / Total: %s"
@@ -615,9 +615,9 @@ msgstr "Menge:"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:208
-#: src/gui/itemamountwindow.cpp:243 src/gui/npcdialog.cpp:93
-#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:833
+#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:202
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:93
+#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:821
 msgid "+"
 msgstr "+"
 
@@ -627,9 +627,9 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:240 src/gui/npcdialog.cpp:95
-#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:846
+#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:200
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:95
+#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:834
 msgid "-"
 msgstr "-"
 
@@ -641,7 +641,7 @@ msgstr "-"
 #. TRANSLATORS: input action name
 #: src/gui/buydialog.cpp:260 src/gui/quitdialog.cpp:54
 #: src/gui/quitdialog.cpp:59 src/gui/quitdialog.cpp:61
-#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:255
+#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:264
 #: src/gui/setupactiondata.h:177
 msgid "Quit"
 msgstr "Beenden"
@@ -653,7 +653,7 @@ msgstr "Beenden"
 #. TRANSLATORS: status bar label
 #: src/gui/buydialog.cpp:262 src/gui/selldialog.cpp:106
 #: src/gui/statuswindow.cpp:558 src/gui/statuswindow.cpp:615
-#: src/gui/statuswindow.cpp:830 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:852
 msgid "Max"
 msgstr "Max"
 
@@ -698,7 +698,7 @@ msgstr "Verkaufen"
 #: src/gui/buyselldialog.cpp:71 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:120
 #: src/gui/connectiondialog.cpp:48 src/gui/editserverdialog.cpp:80
-#: src/gui/itemamountwindow.cpp:212 src/gui/npcpostdialog.cpp:64
+#: src/gui/itemamountwindow.cpp:206 src/gui/npcpostdialog.cpp:64
 #: src/gui/popupmenu.cpp:290 src/gui/popupmenu.cpp:324
 #: src/gui/popupmenu.cpp:411 src/gui/popupmenu.cpp:454
 #: src/gui/popupmenu.cpp:485 src/gui/popupmenu.cpp:512
@@ -714,7 +714,7 @@ msgstr "Verkaufen"
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
 #: src/gui/setup.cpp:84 src/gui/socialwindow.cpp:1204
 #: src/gui/textcommandeditor.cpp:212 src/gui/textdialog.cpp:53
-#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:167
+#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:183
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -878,7 +878,7 @@ msgstr "Bitte verteile %d Punkte"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:570
+#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:581
 #: src/gui/socialwindow.cpp:1269
 msgid "Create"
 msgstr "Erstellen"
@@ -905,17 +905,17 @@ msgid "Please remove %d points"
 msgstr "Bitte entferne %d Punkte"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:60
+#: src/gui/charselectdialog.cpp:61
 msgid "Confirm Character Delete"
 msgstr "Bestätige Löschung des Charakters."
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:62
+#: src/gui/charselectdialog.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "Bist du sicher, dass du diesen Charakter löschen möchtest?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:86
+#: src/gui/charselectdialog.cpp:87
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
@@ -927,8 +927,8 @@ msgstr "Login wechseln"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:565
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:576
+#: src/gui/updaterwindow.cpp:185
 msgid "Play"
 msgstr "Los!"
 
@@ -944,7 +944,7 @@ msgstr "Info"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:263
+#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:272
 #: src/gui/setupactiondata.h:1803 src/gui/setup_relations.cpp:262
 #: src/gui/shopwindow.cpp:96 src/gui/shopwindow.cpp:103
 #: src/gui/textcommandeditor.cpp:216
@@ -954,24 +954,24 @@ msgstr "Löschen"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/charselectdialog.cpp:129 src/gui/unregisterdialog.cpp:48
+#: src/gui/charselectdialog.cpp:130 src/gui/unregisterdialog.cpp:48
 #: src/gui/unregisterdialog.cpp:53
 msgid "Unregister"
 msgstr "Abmelden"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/charselectdialog.cpp:141
+#: src/gui/charselectdialog.cpp:142
 msgid "Change Email"
 msgstr "E-Mailadresse ändern"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:172
+#: src/gui/charselectdialog.cpp:175
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/charselectdialog.cpp:246
+#: src/gui/charselectdialog.cpp:248
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -981,16 +981,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:288
+#: src/gui/charselectdialog.cpp:290
 msgid "Incorrect password"
 msgstr "Falsches Passwort"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password for deleting character"
 msgstr "Gib dein Passwort ein, um den Charakter zu löschen"
 
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password:"
 msgstr "Gib dein Passwort ein:"
 
@@ -1077,13 +1077,13 @@ msgid "Chat"
 msgstr "Chat"
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:735
+#: src/gui/chatwindow.cpp:638
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Anwesend: %s ; %d Spieler sind anwesend."
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1165
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Flüstern zu %s: %s"
@@ -1101,7 +1101,7 @@ msgstr "Nein"
 
 #. TRANSLATORS: confirm dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/confirmdialog.cpp:58 src/gui/popupmenu.cpp:2429
+#: src/gui/confirmdialog.cpp:55 src/gui/popupmenu.cpp:2429
 #: src/gui/popupmenu.cpp:2442 src/gui/popupmenu.cpp:2457
 #: src/gui/popupmenu.cpp:2483
 msgid "Ignore"
@@ -1110,7 +1110,7 @@ msgstr "Ignorieren"
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
 #. TRANSLATORS: settings group
-#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:109
+#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:108
 #: src/gui/setup_other.cpp:123 src/gui/windowmenu.cpp:106
 msgid "Map"
 msgstr "Karte"
@@ -1126,190 +1126,190 @@ msgid "Net"
 msgstr "Netz"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:265
-#: src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:268
+#: src/gui/debugwindow.cpp:311
 msgid "Music:"
 msgstr "Musik:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:153 src/gui/debugwindow.cpp:271
-#: src/gui/debugwindow.cpp:312
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:274
+#: src/gui/debugwindow.cpp:315
 msgid "Map:"
 msgstr "Karte:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:155 src/gui/debugwindow.cpp:268
-#: src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:271
+#: src/gui/debugwindow.cpp:313
 msgid "Minimap:"
 msgstr "Minikarte:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:262
-#: src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:161 src/gui/debugwindow.cpp:265
+#: src/gui/debugwindow.cpp:309
 msgid "Cursor:"
 msgstr "Zeiger:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:161
+#: src/gui/debugwindow.cpp:164
 msgid "Particle count:"
 msgstr "Partikelanzahl:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:284
-#: src/gui/debugwindow.cpp:316
+#: src/gui/debugwindow.cpp:167 src/gui/debugwindow.cpp:287
+#: src/gui/debugwindow.cpp:319
 msgid "Map actors count:"
 msgstr "Anzahl aktiver Mapobjekte:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:166 src/gui/debugwindow.cpp:243
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:169 src/gui/debugwindow.cpp:246
+#: src/gui/debugwindow.cpp:252
 msgid "Player Position:"
 msgstr "Spielerposition:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:172 src/gui/debugwindow.cpp:297
+#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:300
 msgid "Draw calls:"
 msgstr "Draw calls:"
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:175
+#. TRANSLATORS: debug window label, frames per second
+#: src/gui/debugwindow.cpp:178
 #, c-format
 msgid "%d FPS"
 msgstr "%d FPS"
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:177 src/gui/debugwindow.cpp:324
+#. TRANSLATORS: debug window label, logic per second
+#: src/gui/debugwindow.cpp:180 src/gui/debugwindow.cpp:327
 #, c-format
 msgid "%d LPS"
 msgstr "%d LPS"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:191 src/gui/debugwindow.cpp:209
 #, c-format
 msgid "%d FPS (Software)"
 msgstr "%d FPS (Software)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:193
+#: src/gui/debugwindow.cpp:196
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr "%d FPS (schnelles OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:197
+#: src/gui/debugwindow.cpp:200
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr "%d FPS (altes OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:201
+#: src/gui/debugwindow.cpp:204
 #, c-format
 msgid "%d FPS (mobile OpenGL)"
 msgstr "%d FPS (mobile OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:225 src/gui/debugwindow.cpp:290
+#: src/gui/debugwindow.cpp:228 src/gui/debugwindow.cpp:293
 msgid "Textures count:"
 msgstr "Texturanzahl:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:279
+#: src/gui/debugwindow.cpp:282
 #, c-format
 msgid "Particle count: %d"
 msgstr "Partikelanzahl: %d"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:330 src/gui/debugwindow.cpp:380
-#: src/gui/debugwindow.cpp:442
+#: src/gui/debugwindow.cpp:333 src/gui/debugwindow.cpp:383
+#: src/gui/debugwindow.cpp:445
 msgid "Target:"
 msgstr "Ziel:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:332 src/gui/debugwindow.cpp:386
-#: src/gui/debugwindow.cpp:444
+#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
+#: src/gui/debugwindow.cpp:447
 msgid "Target Id:"
 msgstr "Ziel ID:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
-#: src/gui/debugwindow.cpp:446
+#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:392
+#: src/gui/debugwindow.cpp:449
 msgid "Target type:"
 msgstr "Art des Ziels:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:337
+#: src/gui/debugwindow.cpp:340
 msgid "Target level:"
 msgstr "Ziel Level:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:339 src/gui/debugwindow.cpp:405
+#: src/gui/debugwindow.cpp:342 src/gui/debugwindow.cpp:408
 msgid "Target race:"
 msgstr "Ziel Rasse:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:341
+#: src/gui/debugwindow.cpp:344
 msgid "Target party:"
 msgstr "Ziel Party:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:346
 msgid "Target guild:"
 msgstr "Ziel Gilde:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:430
-#: src/gui/debugwindow.cpp:436 src/gui/debugwindow.cpp:454
+#: src/gui/debugwindow.cpp:348 src/gui/debugwindow.cpp:433
+#: src/gui/debugwindow.cpp:439 src/gui/debugwindow.cpp:457
 msgid "Attack delay:"
 msgstr "Angriffs-Verzögerung:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:347 src/gui/debugwindow.cpp:417
-#: src/gui/debugwindow.cpp:456
+#: src/gui/debugwindow.cpp:350 src/gui/debugwindow.cpp:420
+#: src/gui/debugwindow.cpp:459
 msgid "Minimal hit:"
 msgstr "Minimaler Treffer"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:349 src/gui/debugwindow.cpp:420
-#: src/gui/debugwindow.cpp:458
+#: src/gui/debugwindow.cpp:352 src/gui/debugwindow.cpp:423
+#: src/gui/debugwindow.cpp:461
 msgid "Maximum hit:"
 msgstr "Maximaler Treffer"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:351 src/gui/debugwindow.cpp:423
-#: src/gui/debugwindow.cpp:460
+#: src/gui/debugwindow.cpp:354 src/gui/debugwindow.cpp:426
+#: src/gui/debugwindow.cpp:463
 msgid "Critical hit:"
 msgstr "Kritischer Treffer"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:394 src/gui/debugwindow.cpp:400
-#: src/gui/debugwindow.cpp:448
+#: src/gui/debugwindow.cpp:397 src/gui/debugwindow.cpp:403
+#: src/gui/debugwindow.cpp:451
 msgid "Target Level:"
 msgstr "Ziel Level:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:408 src/gui/debugwindow.cpp:450
+#: src/gui/debugwindow.cpp:411 src/gui/debugwindow.cpp:453
 msgid "Target Party:"
 msgstr "Ziel Gruppe:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:412 src/gui/debugwindow.cpp:452
+#: src/gui/debugwindow.cpp:415 src/gui/debugwindow.cpp:455
 msgid "Target Guild:"
 msgstr "Ziel Gilde:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:493
+#: src/gui/debugwindow.cpp:496
 #, c-format
 msgid "Ping: %s ms"
 msgstr "Ping: %s ms"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:496
+#: src/gui/debugwindow.cpp:499
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "Eingehend: %d bytes/s"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:499
+#: src/gui/debugwindow.cpp:502
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "Ausgehend: %d bytes/s"
@@ -1341,7 +1341,7 @@ msgstr "Öffne dieses Fenster automatisch"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #: src/gui/editdialog.cpp:45 src/gui/editserverdialog.cpp:78
-#: src/gui/itemamountwindow.cpp:210 src/gui/okdialog.cpp:51
+#: src/gui/itemamountwindow.cpp:204 src/gui/okdialog.cpp:51
 #: src/gui/quitdialog.cpp:70 src/gui/textdialog.cpp:46
 msgid "OK"
 msgstr "Ok"
@@ -1353,7 +1353,7 @@ msgstr "Bearbeite Server"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:257
+#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:266
 msgid "Connect"
 msgstr "Verbinde..."
 
@@ -1383,7 +1383,7 @@ msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/editserverdialog.cpp:222
+#: src/gui/editserverdialog.cpp:218
 msgid "Please at least type both the address and the port of the server."
 msgstr "Bitte die Adresse und den Port eines Servers eingeben."
 
@@ -1435,7 +1435,7 @@ msgstr "Ausrüsten"
 #: src/gui/inventorywindow.cpp:178 src/gui/inventorywindow.cpp:630
 #: src/gui/popupmenu.cpp:1843 src/gui/popupmenu.cpp:1922
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2041
-#: src/gui/skilldialog.cpp:277
+#: src/gui/skilldialog.cpp:279
 msgid "Use"
 msgstr "Benutzen"
 
@@ -1469,7 +1469,7 @@ msgstr "Ausrüstung"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: setup button
-#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:718
+#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:719
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1992
 #: src/gui/popupmenu.cpp:2066 src/gui/setup.cpp:86
 msgid "Store"
@@ -1491,47 +1491,47 @@ msgid "Drop"
 msgstr "Wegwerfen"
 
 #. TRANSLATORS: item amount window button
-#: src/gui/itemamountwindow.cpp:214
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "Alle"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:264
 msgid "Select amount of items to trade."
 msgstr "Wähle aus, wie viele Gegenstände Du handeln möchtest."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:274
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to drop."
 msgstr "Wähle aus, wie viele Gegenstände Du wegwerfen möchtest."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:278
+#: src/gui/itemamountwindow.cpp:272
 msgid "Select amount of items to store."
 msgstr "Wähle aus, wie viele Gegenstände Du aufbewahren möchtest."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:276
 msgid "Select amount of items to retrieve."
 msgstr "Wähle aus, wie viele Gegenstände Du abholen möchtest."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:286
+#: src/gui/itemamountwindow.cpp:280
 msgid "Select amount of items to split."
 msgstr "Wähle Anzahl der Gegenstände die Du aufteilen möchtest."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:290
+#: src/gui/itemamountwindow.cpp:284
 msgid "Add to buy shop."
 msgstr "Füge zu Einkaufsladen hinzu."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:294
+#: src/gui/itemamountwindow.cpp:288
 msgid "Add to sell shop."
 msgstr "Füge zu Verkaufsladen hinzu."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:298
+#: src/gui/itemamountwindow.cpp:292
 msgid "Unknown."
 msgstr "Unbekannt."
 
@@ -1558,7 +1558,7 @@ msgstr "Timer zurücksetzen"
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:58 src/gui/killstats.cpp:171
-#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:516
+#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:509
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr "Getötet: %s, Summe Erfahrungspunkte: %s"
@@ -1566,7 +1566,7 @@ msgstr "Getötet: %s, Summe Erfahrungspunkte: %s"
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:61 src/gui/killstats.cpp:173
 #: src/gui/killstats.cpp:253 src/gui/killstats.cpp:268
-#: src/gui/killstats.cpp:518
+#: src/gui/killstats.cpp:511
 #, c-format
 msgid "Avg Exp: %s"
 msgstr "Durchschnitt. Exp: %s"
@@ -1574,14 +1574,14 @@ msgstr "Durchschnitt. Exp: %s"
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:63 src/gui/killstats.cpp:176
 #: src/gui/killstats.cpp:258 src/gui/killstats.cpp:272
-#: src/gui/killstats.cpp:521
+#: src/gui/killstats.cpp:514
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr "Durchschn. Monsteranzahl zum nächsten Level %s"
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:66 src/gui/killstats.cpp:187
-#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:524
+#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:517
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr "Kills/Min: %s, Exp/Min: %s"
@@ -1609,9 +1609,9 @@ msgid "Last kill exp:"
 msgstr "Letze exp:"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:414
-#: src/gui/killstats.cpp:421 src/gui/killstats.cpp:428
-#: src/gui/killstats.cpp:434
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:408
+#: src/gui/killstats.cpp:415 src/gui/killstats.cpp:422
+#: src/gui/killstats.cpp:428
 msgid "Time before jacko spawn:"
 msgstr "Zeit bis zum nächsten JackO:"
 
@@ -1645,12 +1645,12 @@ msgid "  Time for next level: %s"
 msgstr "Zeit bis zum nächsten Level: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:421
+#: src/gui/killstats.cpp:415
 #, c-format
 msgid "%s %d?"
 msgstr "%s %d?"
 
-#: src/gui/killstats.cpp:428
+#: src/gui/killstats.cpp:422
 msgid "jacko spawning"
 msgstr "JackO erscheint"
 
@@ -1756,32 +1756,32 @@ msgid "arrows bar"
 msgstr "Pfeile Balken"
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:88
+#: src/gui/ministatuswindow.cpp:89
 msgid "status bar"
 msgstr "Status Balken"
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:108
+#: src/gui/ministatuswindow.cpp:109
 msgid "job bar"
 msgstr "Job Balken"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:306 src/gui/statuswindow.cpp:298
+#: src/gui/ministatuswindow.cpp:307 src/gui/statuswindow.cpp:298
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Level: %d (GM %d)"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:313 src/gui/statuswindow.cpp:141
+#: src/gui/ministatuswindow.cpp:314 src/gui/statuswindow.cpp:141
 #: src/gui/statuswindow.cpp:305 src/gui/statuswindow.cpp:375
 #, c-format
 msgid "Level: %d"
 msgstr "Stufe: %d"
 
 #. TRANSLATORS: status bar label
-#: src/gui/ministatuswindow.cpp:330 src/gui/ministatuswindow.cpp:367
+#: src/gui/ministatuswindow.cpp:331 src/gui/ministatuswindow.cpp:368
 msgid "Need"
 msgstr "Muss"
 
@@ -2169,7 +2169,7 @@ msgstr "Kopiere zu Chat"
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2209 src/gui/popupmenu.cpp:2280
-#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:139
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
 #: src/gui/socialwindow.cpp:934
 msgid "(default)"
 msgstr "(normal)"
@@ -2352,7 +2352,7 @@ msgid "Passwords do not match."
 msgstr "Passwörter stimmen nicht überein."
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:257
 msgid "Choose Your Server"
 msgstr "Wähle deinen Server"
 
@@ -2360,61 +2360,61 @@ msgstr "Wähle deinen Server"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:259 src/gui/shopwindow.cpp:94
+#: src/gui/serverdialog.cpp:268 src/gui/shopwindow.cpp:94
 #: src/gui/shopwindow.cpp:101 src/gui/tradewindow.cpp:77
 msgid "Add"
 msgstr "Hinzufügen"
 
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
-#: src/gui/serverdialog.cpp:261 src/gui/widgets/setupitem.cpp:299
+#: src/gui/serverdialog.cpp:270 src/gui/widgets/setupitem.cpp:299
 #: src/gui/widgets/setupitem.cpp:426
 msgid "Edit"
 msgstr "Ändern"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:274
 msgid "Load"
 msgstr "Laden"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:279
+#: src/gui/serverdialog.cpp:288
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Wähle einen Server  ***SICHERER MODUS ***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:297
 msgid "Use same ip for game sub servers"
 msgstr "Benutze die selbe IP auf Zweitservern des Spiels"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:518
+#: src/gui/serverdialog.cpp:527
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Lade Serverliste herunter...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:524
+#: src/gui/serverdialog.cpp:533
 msgid "Waiting for server..."
 msgstr "Warte auf den Server"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:529
+#: src/gui/serverdialog.cpp:538
 msgid "Preparing download"
 msgstr "Download wird vorbereitet"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:534
+#: src/gui/serverdialog.cpp:543
 msgid "Error retreiving server list!"
 msgstr "Fehler beim Empfangen der Serverliste!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:626
+#: src/gui/serverdialog.cpp:635
 msgid "requires a newer version"
 msgstr "benötigt eine neuere Version"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:631
+#: src/gui/serverdialog.cpp:640
 #, c-format
 msgid "requires v%s"
 msgstr "benötigt v%s"
@@ -3425,7 +3425,7 @@ msgid "Type:"
 msgstr "Typ:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:334
+#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:336
 msgid "Delay:"
 msgstr "Verzögerung:"
 
@@ -3445,30 +3445,30 @@ msgid "Blue:"
 msgstr "Blau:"
 
 #. TRANSLATORS: color type
-#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:420
+#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:422
 msgid "Static"
 msgstr "Statisch"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:107 src/gui/setup_colors.cpp:110
-#: src/gui/setup_colors.cpp:422
+#: src/gui/setup_colors.cpp:424
 msgid "Pulse"
 msgstr "Pulsierend"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:112 src/gui/setup_colors.cpp:115
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Rainbow"
 msgstr "Regenbogen"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:117 src/gui/setup_colors.cpp:120
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Spectrum"
 msgstr "Spektrum"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:328
+#: src/gui/setup_colors.cpp:330
 msgid "Alpha:"
 msgstr "Alpha:"
 
@@ -3636,7 +3636,7 @@ msgstr "Sonstiges"
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: palette color
-#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:134
+#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:135
 msgid "Monsters"
 msgstr "Monster"
 
@@ -4188,206 +4188,231 @@ msgstr "Wenn ignorierend:"
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:86
+msgid "Very small (8)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:88
 msgid "Very small (9)"
 msgstr "Sehr klein (9)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:88
+#: src/gui/setup_theme.cpp:90
 msgid "Tiny (10)"
 msgstr "Winzig"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:90
+#: src/gui/setup_theme.cpp:92
 msgid "Small (11)"
 msgstr "Klein"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:92
+#: src/gui/setup_theme.cpp:94
 msgid "Medium (12)"
 msgstr "Mittel"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:94
+#: src/gui/setup_theme.cpp:96
 msgid "Normal (13)"
 msgstr "Normal (13)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:96
+#: src/gui/setup_theme.cpp:98
 msgid "Large (14)"
 msgstr "Groß (14)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:98
-msgid "Very large (15)"
-msgstr "Größer (15)"
-
-#. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:100
-msgid "Big (16)"
-msgstr "Noch größer (16)"
+msgid "Large (15)"
+msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:102
-msgid "Very big (17)"
-msgstr "Viel größer (17)"
+msgid "Large (16)"
+msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:104
-msgid "Huge (18)"
-msgstr "Riesig (18)"
+msgid "Big (17)"
+msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:106
-msgid "Very huge (19)"
-msgstr "Größer als riesig (19)"
+msgid "Big (18)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:108
+msgid "Big (19)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:110
+msgid "Very big (20)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:112
+msgid "Very big (21)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:114
+msgid "Very big (22)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:116
+msgid "Huge (23)"
+msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:151
 msgid "Chinese (China)"
 msgstr "Chinesisch (China)"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:153
 msgid "Czech"
 msgstr "Tschechisch"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:155
 msgid "English"
 msgstr "Englisch"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:157
 msgid "Finnish"
 msgstr "Finnisch"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:159
 msgid "French"
 msgstr "Französisch"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:161
 msgid "German"
 msgstr "Deutsch"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:153
+#: src/gui/setup_theme.cpp:163
 msgid "Indonesian"
 msgstr "Indonesisch"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:155
+#: src/gui/setup_theme.cpp:165
 msgid "Italian"
 msgstr "Italienisch"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:157
+#: src/gui/setup_theme.cpp:167
 msgid "Polish"
 msgstr "Polnisch"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:159
+#: src/gui/setup_theme.cpp:169
 msgid "Japanese"
 msgstr "Japanisch"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:161
+#: src/gui/setup_theme.cpp:171
 msgid "Dutch (Belgium/Flemish)"
 msgstr "Niederländisch (Belgisch/Flämisch)"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:163
+#: src/gui/setup_theme.cpp:173
 msgid "Portuguese"
 msgstr "Portugiesisch"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:165
+#: src/gui/setup_theme.cpp:175
 msgid "Portuguese (Brazilian)"
 msgstr "Portugiesisch (Brasilien)"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:167
+#: src/gui/setup_theme.cpp:177
 msgid "Russian"
 msgstr "Russisch"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:169
+#: src/gui/setup_theme.cpp:179
 msgid "Spanish (Castilian)"
 msgstr "Spanisch (Kastilisch)"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:171
+#: src/gui/setup_theme.cpp:181
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:223
+#: src/gui/setup_theme.cpp:233
 msgid "Gui theme"
 msgstr "GUI Theme"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:230
+#: src/gui/setup_theme.cpp:240
 msgid "Main Font"
 msgstr "Hauptschriftart"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:235
+#: src/gui/setup_theme.cpp:245
 msgid "Language"
 msgstr "Sprache"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:239
+#: src/gui/setup_theme.cpp:249
 msgid "Bold font"
 msgstr "Dicke Schrift"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:243
+#: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr "Schrift von Spieleraktionen"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:247
+#: src/gui/setup_theme.cpp:257
 msgid "Help font"
 msgstr "Hilfe Schriftart"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:251
+#: src/gui/setup_theme.cpp:261
 msgid "Secure font"
 msgstr "Sichere Schriftart"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:255
+#: src/gui/setup_theme.cpp:265
 msgid "Japanese font"
 msgstr "Japanische Schrift"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:260
+#: src/gui/setup_theme.cpp:270
 msgid "Font size"
 msgstr "Schriftgröße"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:265
+#: src/gui/setup_theme.cpp:275
 msgid "Npc font size"
 msgstr "NPC-Schriftgröße"
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/setup_theme.cpp:269
+#: src/gui/setup_theme.cpp:279
 msgid "i"
 msgstr "i"
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/setup_theme.cpp:442
+#: src/gui/setup_theme.cpp:452
 msgid "Theme info"
 msgstr "Theme Info"
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/setup_theme.cpp:467
+#: src/gui/setup_theme.cpp:477
 msgid "Theme Changed"
 msgstr "Theme geändert"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/setup_theme.cpp:467 src/gui/setup_video.cpp:537
+#: src/gui/setup_theme.cpp:477 src/gui/setup_video.cpp:537
 #: src/gui/setup_video.cpp:546
 msgid "Restart your client for the change to take effect."
 msgstr "Starte das Spiel neu, um die Änderungen zu übernehmen."
@@ -4693,7 +4718,8 @@ msgid "Ambient FX"
 msgstr "Hintergrundeffekte"
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_visual.cpp:140
+#. TRANSLATORS: palette color
+#: src/gui/setup_visual.cpp:140 src/gui/userpalette.cpp:146
 msgid "Particle effects"
 msgstr "Partikeleffekte"
 
@@ -4780,45 +4806,45 @@ msgid "%s wants to %s %s do you accept?"
 msgstr "%s möchte %s %s akzeptierst du?"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/skilldialog.cpp:270 src/gui/windowmenu.cpp:112
+#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:112
 msgid "Skills"
 msgstr "Fähigkeiten"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/skilldialog.cpp:279
+#: src/gui/skilldialog.cpp:281
 msgid "Up"
 msgstr "Erhöhen"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/skilldialog.cpp:391
+#: src/gui/skilldialog.cpp:393
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Fähigkeitspunkte verfügbar: %d"
 
 #. TRANSLATORS: skills dialog default skills tab
-#: src/gui/skilldialog.cpp:444
+#: src/gui/skilldialog.cpp:446
 msgid "basic"
 msgstr "grundlegend"
 
 #. TRANSLATORS: skills dialog default skill name
-#: src/gui/skilldialog.cpp:447
+#: src/gui/skilldialog.cpp:449
 msgid "basic, 1"
 msgstr "basic, 1"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/skilldialog.cpp:484
+#: src/gui/skilldialog.cpp:486
 #, c-format
 msgid "Skill Set %d"
 msgstr "Fähigkeiten Tab %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/skilldialog.cpp:518
+#: src/gui/skilldialog.cpp:520
 #, c-format
 msgid "Skill %d"
 msgstr "Fähigkeit %d"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/skilldialog.cpp:612 src/gui/skilldialog.cpp:762
+#: src/gui/skilldialog.cpp:614 src/gui/skilldialog.cpp:764
 #, c-format
 msgid "Lvl: %d"
 msgstr "Lvl: %d"
@@ -5262,7 +5288,7 @@ msgid "Trade: You"
 msgstr "Handel: Du"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:182
+#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:184
 #, c-format
 msgid "You get %s"
 msgstr "Du bekommst %s"
@@ -5278,12 +5304,12 @@ msgid "You give:"
 msgstr "Du gibst:"
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:393
+#: src/gui/tradewindow.cpp:396
 msgid "You don't have enough money."
 msgstr "Du hast nicht genügend Geld."
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:475
+#: src/gui/tradewindow.cpp:479
 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 "
@@ -5296,224 +5322,224 @@ msgid "Name: %s"
 msgstr "Name : %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/updaterwindow.cpp:140
+#: src/gui/updaterwindow.cpp:156
 msgid "Updating..."
 msgstr "Aktualisiere..."
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:165
+#: src/gui/updaterwindow.cpp:181
 msgid "Connecting..."
 msgstr "Verbinde..."
 
 #. TRANSLATORS: update message
-#: src/gui/updaterwindow.cpp:656
+#: src/gui/updaterwindow.cpp:672
 msgid "##1  The update process is incomplete."
 msgstr "##1 Update wurde nicht erfolgreich abgeschlossen."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/updaterwindow.cpp:658
+#: src/gui/updaterwindow.cpp:674
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Es wird dringend empfohlen,"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:660
+#: src/gui/updaterwindow.cpp:676
 msgid "##1  you try again later."
 msgstr "##1 Du versuchst es später erneut."
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:839
+#: src/gui/updaterwindow.cpp:855
 msgid "Completed"
 msgstr "Fertig"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
 msgid "Being"
 msgstr "Aktionen"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:118
-msgid "Friend Names"
-msgstr "Namen der Freunde"
+#: src/gui/userpalette.cpp:119
+msgid "Friend names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:120
-msgid "Disregarded Names"
-msgstr "Außer Acht gelassene Namen"
+#: src/gui/userpalette.cpp:121
+msgid "Disregarded names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:122
-msgid "Ignored Names"
-msgstr "Ignorierte Namen"
+#: src/gui/userpalette.cpp:123
+msgid "Ignored names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:124
-msgid "Erased Names"
-msgstr "Gelöschte Namen"
+#: src/gui/userpalette.cpp:125
+msgid "Erased names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:126
-msgid "Other Players' Names"
-msgstr "Namen anderer Spieler"
+#: src/gui/userpalette.cpp:127
+msgid "Other players names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:128
-msgid "Own Name"
-msgstr "Eigener Name"
+#: src/gui/userpalette.cpp:129
+msgid "Own name"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:130
-msgid "GM Names"
-msgstr "Namen von GM"
+#: src/gui/userpalette.cpp:131
+msgid "GM names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
 msgid "NPCs"
 msgstr "NPCs"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
 msgid "Monster HP bar"
 msgstr "Monster HP Leiste"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:140
 msgid "Monster HP bar (second color)"
 msgstr "Monster HP Leiste (zweite Farbe)"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:141
-msgid "Party Members"
-msgstr "Mitglieder der Party"
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:143
-msgid "Guild Members"
-msgstr "Mitglieder der Gilde"
+#: src/gui/userpalette.cpp:142
+msgid "Party members"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:145
-msgid "Particle Effects"
-msgstr "Partikeleffekte"
+#: src/gui/userpalette.cpp:144
+msgid "Guild members"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:147
-msgid "Pickup Notification"
-msgstr "aufgehobene Gegenstände"
+#: src/gui/userpalette.cpp:148
+msgid "Pickup notification"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:149
-msgid "Exp Notification"
-msgstr "Anzeige der Erfahrungspunkte"
+#: src/gui/userpalette.cpp:150
+msgid "Exp notification"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
 msgid "Player HP bar"
 msgstr "HP-Leiste des Spielers"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
 msgid "Player HP bar (second color)"
 msgstr "HP-Leiste des Spielers (zweite Farbe)"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:157
-msgid "Player Hits Monster"
-msgstr "Spieler trifft Monster"
+#: src/gui/userpalette.cpp:158
+msgid "Player hits monster"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:159
-msgid "Monster Hits Player"
-msgstr "Monster trifft Spieler"
+#: src/gui/userpalette.cpp:160
+msgid "Monster hits player"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:163
-msgid "Other Player Hits Local Player"
-msgstr "Ein Spieler hat dich getroffen"
+#: src/gui/userpalette.cpp:164
+msgid "Other player hits local player"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:166
 msgid "Critical Hit"
 msgstr "Kritischer Treffer"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
-msgid "Local Player Hits Monster"
-msgstr "Spieler trifft Monster"
+#: src/gui/userpalette.cpp:170
+msgid "Local player hits monster"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:172
-msgid "Local Player Critical Hit"
-msgstr "Spieler trifft Monster stark"
+#: src/gui/userpalette.cpp:173
+msgid "Local player critical hit"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:175
-msgid "Local Player Miss"
-msgstr "Spieler trifft nicht"
+#: src/gui/userpalette.cpp:176
+msgid "Local player miss"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:177
+#: src/gui/userpalette.cpp:178
 msgid "Misses"
 msgstr "Verfehlt"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
-msgid "Portal Highlight"
-msgstr "Portal hervorheben"
+#: src/gui/userpalette.cpp:180
+msgid "Portal highlight"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:183
+msgid "Default collision highlight"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:182
-msgid "Default collision Highlight"
-msgstr "Hervorhebung von normalen Kollisionen"
+#: src/gui/userpalette.cpp:186
+msgid "Air collision highlight"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:185
-msgid "Air collision Highlight"
-msgstr "Hervorhebung von Flug-Kollisionen"
+#: src/gui/userpalette.cpp:189
+msgid "Water collision highlight"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:188
-msgid "Water collision Highlight"
-msgstr "Wasser Hervorhebung"
+#: src/gui/userpalette.cpp:192
+msgid "Special ground collision highlight"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:191
-msgid "Special ground collision Highlight"
-msgstr "Besondere Bodenkollision hervorheben"
+#: src/gui/userpalette.cpp:195
+msgid "Walkable highlight"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
-msgid "Walkable Highlight"
-msgstr "Betretbarer Boden"
+#: src/gui/userpalette.cpp:198
+msgid "Local player attack range"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:197
-msgid "Local Player Attack Range"
-msgstr "Lokale Spieler-Attackenreichweite"
+#: src/gui/userpalette.cpp:201
+msgid "Local player attack range border"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:200
-msgid "Local Player Attack Range Border"
-msgstr "Rand der Attackenreichweite des Lokalen Spielers"
+#: src/gui/userpalette.cpp:204
+msgid "Monster attack range"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:203
-msgid "Monster Attack Range"
-msgstr "Monster Angriffsreichweite"
+#: src/gui/userpalette.cpp:208
+msgid "Floor item amount color"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:206
-msgid "Home Place"
-msgstr "Stammplatz"
+#: src/gui/userpalette.cpp:211
+msgid "Home place"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:209
-msgid "Home Place Border"
-msgstr "Stammplatz Grenze"
+#: src/gui/userpalette.cpp:214
+msgid "Home place border"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:212
-msgid "Road Point"
-msgstr "Wegpunkt"
+#: src/gui/userpalette.cpp:217
+msgid "Road point"
+msgstr ""
 
 #. TRANSLATORS: who is online window name
 #: src/gui/whoisonline.cpp:79 src/gui/whoisonline.cpp:623
@@ -5644,7 +5670,7 @@ msgid "/kick > Kick some one from the guild you are in"
 msgstr "/kick > Jemanden aus deiner Gilde werfen"
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:315
+#: src/gui/widgets/itemcontainer.cpp:317
 msgid "Eq."
 msgstr "Eq."
 
diff --git a/po/el.po b/po/el.po
index ee40a301a..3a57d1d4f 100644
--- a/po/el.po
+++ b/po/el.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-05-03 12:38+0300\n"
-"PO-Revision-Date: 2013-05-03 09:44+0000\n"
+"POT-Creation-Date: 2013-05-10 18:34+0300\n"
+"PO-Revision-Date: 2013-05-10 15:39+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/manaplus/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -59,25 +59,25 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: full button name
-#: src/client.cpp:1136 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
+#: src/client.cpp:1137 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
 msgid "Setup"
 msgstr "Ρύθμισεις"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1140 src/gui/setup_perfomance.cpp:61
+#: src/client.cpp:1141 src/gui/setup_perfomance.cpp:61
 msgid "Perfomance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:1143 src/gui/setup_video.cpp:258
+#: src/client.cpp:1144 src/gui/setup_video.cpp:258
 msgid "Video"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1146 src/gui/setup_theme.cpp:273
+#: src/client.cpp:1147 src/gui/setup_theme.cpp:283
 msgid "Theme"
 msgstr ""
 
@@ -88,7 +88,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1150 src/gui/didyouknowwindow.cpp:78
+#: src/client.cpp:1151 src/gui/didyouknowwindow.cpp:78
 #: src/gui/inventorywindow.cpp:228 src/gui/npcdialog.cpp:63
 #: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:574
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:80
@@ -96,32 +96,32 @@ msgid "Close"
 msgstr "Κλείσιμο"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1238
+#: src/client.cpp:1239
 msgid "Connecting to server"
 msgstr "Σύνδεση σε τονδιακομιστή"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1282
 msgid "Logging in"
 msgstr "Σύνδεση"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1320
+#: src/client.cpp:1321
 msgid "Entering game world"
 msgstr "Μπαίνοντας στον κόσμο του παιχνιδιού "
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1431
+#: src/client.cpp:1432
 msgid "Requesting characters"
 msgstr "Αναζητώντας χαρακτήρες"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1471
 msgid "Connecting to the game server"
 msgstr "Σύνδεση με τον διακομιστή του παιχνιδιού"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1483
+#: src/client.cpp:1484
 msgid "Changing game servers"
 msgstr "Αλλαγή διακοσμητών στο παιχνίδι"
 
@@ -136,69 +136,69 @@ msgstr "Αλλαγή διακοσμητών στο παιχνίδι"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1540 src/client.cpp:1551 src/client.cpp:1721
+#: src/client.cpp:1541 src/client.cpp:1552 src/client.cpp:1722
 #: src/gui/changeemaildialog.cpp:168 src/gui/changepassworddialog.cpp:158
-#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:288
-#: src/gui/editserverdialog.cpp:220 src/gui/registerdialog.cpp:263
+#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:290
+#: src/gui/editserverdialog.cpp:216 src/gui/registerdialog.cpp:263
 #: src/gui/unregisterdialog.cpp:143 src/net/ea/charserverhandler.cpp:190
 #: src/net/ea/charserverhandler.cpp:210
 msgid "Error"
 msgstr "Σφάλμα"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1564
+#: src/client.cpp:1565
 msgid "Requesting registration details"
 msgstr "Αναζητούνται τα στοιχεία της εγγραφής"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1601
+#: src/client.cpp:1602
 msgid "Password Change"
 msgstr "Αλλαγή κωδικού πρόσβασης"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1603
+#: src/client.cpp:1604
 msgid "Password changed successfully!"
 msgstr "Ο κωδικός σας άλλαξε με επιτυχία!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1624
+#: src/client.cpp:1625
 msgid "Email Change"
 msgstr "Αλλαγή ηλεκτρονικού ταχυδρομείου"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1626
+#: src/client.cpp:1627
 msgid "Email changed successfully!"
 msgstr "Ηλεκτρονικό ταχυδρομείο άλλαξε με επιτυχία!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1647
+#: src/client.cpp:1648
 msgid "Unregister Successful"
 msgstr "Διαγραφή Επιτυχής"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1649
+#: src/client.cpp:1650
 msgid "Farewell, come back any time..."
 msgstr "Αντίο, να επιστρέψεις κάθε στιγμή ..."
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1902 src/client.cpp:1917 src/client.cpp:1960
-#: src/client.cpp:1976 src/client.cpp:2417 src/client.cpp:2425
+#: src/client.cpp:1903 src/client.cpp:1918 src/client.cpp:1961
+#: src/client.cpp:1977 src/client.cpp:2418 src/client.cpp:2426
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr " %s δεν υπάρχει και δεν μπορεί να δημιουργηθεί!Έξοδος."
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2113
+#: src/client.cpp:2114
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Άκυρα ενημέρωση υποδοχής: %s"
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2154 src/client.cpp:2161
+#: src/client.cpp:2155 src/client.cpp:2162
 msgid "Error creating updates directory!"
 msgstr "Σφάλμα κατά τη δημιουργία του καταλόγου ενημερώσεων!"
 
-#: src/client.cpp:2183 src/client.cpp:2196
+#: src/client.cpp:2184 src/client.cpp:2197
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Σφάλμα: %s δεν υπάρχει και δεν μπορεί να δημιουργηθεί! Εγκατάλειψη."
@@ -478,19 +478,19 @@ msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: bot checker window header
-#: src/gui/botcheckerwindow.cpp:269
+#: src/gui/botcheckerwindow.cpp:268
 msgid "Bot Checker"
 msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:102
+#: src/gui/botcheckerwindow.cpp:277 src/gui/npcdialog.cpp:102
 msgid "Reset"
 msgstr "Επαναφορά"
 
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: relations table header
-#: src/gui/botcheckerwindow.cpp:305 src/gui/setup_relations.cpp:61
+#: src/gui/botcheckerwindow.cpp:304 src/gui/setup_relations.cpp:61
 msgid "Name"
 msgstr "Όνομα"
 
@@ -498,7 +498,7 @@ msgstr "Όνομα"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:145
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:145
 #: src/gui/popupmenu.cpp:241 src/gui/popupmenu.cpp:640
 #: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:257
 #: src/net/tmwa/generalhandler.cpp:292
@@ -508,7 +508,7 @@ msgstr "Επίθεση"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
-#: src/gui/botcheckerwindow.cpp:309 src/gui/popupmenu.cpp:225
+#: src/gui/botcheckerwindow.cpp:308 src/gui/popupmenu.cpp:225
 #: src/gui/setupactiondata.h:93
 msgid "Talk"
 msgstr "Συζήτηση"
@@ -516,7 +516,7 @@ msgstr "Συζήτηση"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/botcheckerwindow.cpp:311 src/gui/popupmenu.cpp:215
+#: src/gui/botcheckerwindow.cpp:310 src/gui/popupmenu.cpp:215
 #: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:371
 #: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:653
 #: src/gui/popupmenu.cpp:727 src/gui/setupactiondata.h:1856
@@ -524,7 +524,7 @@ msgid "Move"
 msgstr "Κίνηση"
 
 #. TRANSLATORS: bot checker window table header
-#: src/gui/botcheckerwindow.cpp:313
+#: src/gui/botcheckerwindow.cpp:312
 msgid "Result"
 msgstr "Αποτέλεσμα"
 
@@ -580,7 +580,7 @@ msgstr "Αγορά"
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:516
+#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:511
 #: src/gui/selldialog.cpp:94 src/gui/selldialog.cpp:342
 #, c-format
 msgid "Price: %s / Total: %s"
@@ -597,9 +597,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:208
-#: src/gui/itemamountwindow.cpp:243 src/gui/npcdialog.cpp:93
-#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:833
+#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:202
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:93
+#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:821
 msgid "+"
 msgstr "+"
 
@@ -609,9 +609,9 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:240 src/gui/npcdialog.cpp:95
-#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:846
+#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:200
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:95
+#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:834
 msgid "-"
 msgstr "-"
 
@@ -623,7 +623,7 @@ msgstr "-"
 #. TRANSLATORS: input action name
 #: src/gui/buydialog.cpp:260 src/gui/quitdialog.cpp:54
 #: src/gui/quitdialog.cpp:59 src/gui/quitdialog.cpp:61
-#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:255
+#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:264
 #: src/gui/setupactiondata.h:177
 msgid "Quit"
 msgstr "Έξοδος"
@@ -635,7 +635,7 @@ msgstr "Έξοδος"
 #. TRANSLATORS: status bar label
 #: src/gui/buydialog.cpp:262 src/gui/selldialog.cpp:106
 #: src/gui/statuswindow.cpp:558 src/gui/statuswindow.cpp:615
-#: src/gui/statuswindow.cpp:830 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:852
 msgid "Max"
 msgstr "Max"
 
@@ -680,7 +680,7 @@ msgstr "Πουλήστε"
 #: src/gui/buyselldialog.cpp:71 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:120
 #: src/gui/connectiondialog.cpp:48 src/gui/editserverdialog.cpp:80
-#: src/gui/itemamountwindow.cpp:212 src/gui/npcpostdialog.cpp:64
+#: src/gui/itemamountwindow.cpp:206 src/gui/npcpostdialog.cpp:64
 #: src/gui/popupmenu.cpp:290 src/gui/popupmenu.cpp:324
 #: src/gui/popupmenu.cpp:411 src/gui/popupmenu.cpp:454
 #: src/gui/popupmenu.cpp:485 src/gui/popupmenu.cpp:512
@@ -696,7 +696,7 @@ msgstr "Πουλήστε"
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
 #: src/gui/setup.cpp:84 src/gui/socialwindow.cpp:1204
 #: src/gui/textcommandeditor.cpp:212 src/gui/textdialog.cpp:53
-#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:167
+#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:183
 msgid "Cancel"
 msgstr "Ακύρωση"
 
@@ -860,7 +860,7 @@ msgstr "Παρακαλούμε να διανείμετε %d πόντους"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:570
+#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:581
 #: src/gui/socialwindow.cpp:1269
 msgid "Create"
 msgstr "Δημιουργία"
@@ -887,17 +887,17 @@ msgid "Please remove %d points"
 msgstr "Παρακαλώ αφαιρέστε %d πόντους"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:60
+#: src/gui/charselectdialog.cpp:61
 msgid "Confirm Character Delete"
 msgstr "Επιβεβαίωση Διαγραφή Χαρακτήρα"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:62
+#: src/gui/charselectdialog.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "Είσαι σίγουρος ότι θέλεις να διαγράψεις αυτό το χαρακτήρα;"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:86
+#: src/gui/charselectdialog.cpp:87
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
@@ -909,8 +909,8 @@ msgstr "Διακόπτης Σύνδεση"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:565
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:576
+#: src/gui/updaterwindow.cpp:185
 msgid "Play"
 msgstr ""
 
@@ -926,7 +926,7 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:263
+#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:272
 #: src/gui/setupactiondata.h:1803 src/gui/setup_relations.cpp:262
 #: src/gui/shopwindow.cpp:96 src/gui/shopwindow.cpp:103
 #: src/gui/textcommandeditor.cpp:216
@@ -936,24 +936,24 @@ msgstr "Διαγραφή"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/charselectdialog.cpp:129 src/gui/unregisterdialog.cpp:48
+#: src/gui/charselectdialog.cpp:130 src/gui/unregisterdialog.cpp:48
 #: src/gui/unregisterdialog.cpp:53
 msgid "Unregister"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/charselectdialog.cpp:141
+#: src/gui/charselectdialog.cpp:142
 msgid "Change Email"
 msgstr "Αλλαγή Ηλεκτρονικού Ταχυδρομείου"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:172
+#: src/gui/charselectdialog.cpp:175
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/charselectdialog.cpp:246
+#: src/gui/charselectdialog.cpp:248
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -963,16 +963,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:288
+#: src/gui/charselectdialog.cpp:290
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password:"
 msgstr ""
 
@@ -1059,13 +1059,13 @@ msgid "Chat"
 msgstr "Συζήτηση"
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:735
+#: src/gui/chatwindow.cpp:638
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1165
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Ψιθυρίζοντας στο %s: %s"
@@ -1083,7 +1083,7 @@ msgstr "Δεν"
 
 #. TRANSLATORS: confirm dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/confirmdialog.cpp:58 src/gui/popupmenu.cpp:2429
+#: src/gui/confirmdialog.cpp:55 src/gui/popupmenu.cpp:2429
 #: src/gui/popupmenu.cpp:2442 src/gui/popupmenu.cpp:2457
 #: src/gui/popupmenu.cpp:2483
 msgid "Ignore"
@@ -1092,7 +1092,7 @@ msgstr "Παράβλεψη"
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
 #. TRANSLATORS: settings group
-#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:109
+#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:108
 #: src/gui/setup_other.cpp:123 src/gui/windowmenu.cpp:106
 msgid "Map"
 msgstr "Χάρτης"
@@ -1108,190 +1108,190 @@ msgid "Net"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:265
-#: src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:268
+#: src/gui/debugwindow.cpp:311
 msgid "Music:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:153 src/gui/debugwindow.cpp:271
-#: src/gui/debugwindow.cpp:312
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:274
+#: src/gui/debugwindow.cpp:315
 msgid "Map:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:155 src/gui/debugwindow.cpp:268
-#: src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:271
+#: src/gui/debugwindow.cpp:313
 msgid "Minimap:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:262
-#: src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:161 src/gui/debugwindow.cpp:265
+#: src/gui/debugwindow.cpp:309
 msgid "Cursor:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:161
+#: src/gui/debugwindow.cpp:164
 msgid "Particle count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:284
-#: src/gui/debugwindow.cpp:316
+#: src/gui/debugwindow.cpp:167 src/gui/debugwindow.cpp:287
+#: src/gui/debugwindow.cpp:319
 msgid "Map actors count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:166 src/gui/debugwindow.cpp:243
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:169 src/gui/debugwindow.cpp:246
+#: src/gui/debugwindow.cpp:252
 msgid "Player Position:"
 msgstr "Θέση Παίκτη :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:172 src/gui/debugwindow.cpp:297
+#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:300
 msgid "Draw calls:"
 msgstr ""
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:175
+#. TRANSLATORS: debug window label, frames per second
+#: src/gui/debugwindow.cpp:178
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:177 src/gui/debugwindow.cpp:324
+#. TRANSLATORS: debug window label, logic per second
+#: src/gui/debugwindow.cpp:180 src/gui/debugwindow.cpp:327
 #, c-format
 msgid "%d LPS"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:191 src/gui/debugwindow.cpp:209
 #, c-format
 msgid "%d FPS (Software)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:193
+#: src/gui/debugwindow.cpp:196
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:197
+#: src/gui/debugwindow.cpp:200
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:201
+#: src/gui/debugwindow.cpp:204
 #, c-format
 msgid "%d FPS (mobile OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:225 src/gui/debugwindow.cpp:290
+#: src/gui/debugwindow.cpp:228 src/gui/debugwindow.cpp:293
 msgid "Textures count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:279
+#: src/gui/debugwindow.cpp:282
 #, c-format
 msgid "Particle count: %d"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:330 src/gui/debugwindow.cpp:380
-#: src/gui/debugwindow.cpp:442
+#: src/gui/debugwindow.cpp:333 src/gui/debugwindow.cpp:383
+#: src/gui/debugwindow.cpp:445
 msgid "Target:"
 msgstr "Στόχος:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:332 src/gui/debugwindow.cpp:386
-#: src/gui/debugwindow.cpp:444
+#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
+#: src/gui/debugwindow.cpp:447
 msgid "Target Id:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
-#: src/gui/debugwindow.cpp:446
+#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:392
+#: src/gui/debugwindow.cpp:449
 msgid "Target type:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:337
+#: src/gui/debugwindow.cpp:340
 msgid "Target level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:339 src/gui/debugwindow.cpp:405
+#: src/gui/debugwindow.cpp:342 src/gui/debugwindow.cpp:408
 msgid "Target race:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:341
+#: src/gui/debugwindow.cpp:344
 msgid "Target party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:346
 msgid "Target guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:430
-#: src/gui/debugwindow.cpp:436 src/gui/debugwindow.cpp:454
+#: src/gui/debugwindow.cpp:348 src/gui/debugwindow.cpp:433
+#: src/gui/debugwindow.cpp:439 src/gui/debugwindow.cpp:457
 msgid "Attack delay:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:347 src/gui/debugwindow.cpp:417
-#: src/gui/debugwindow.cpp:456
+#: src/gui/debugwindow.cpp:350 src/gui/debugwindow.cpp:420
+#: src/gui/debugwindow.cpp:459
 msgid "Minimal hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:349 src/gui/debugwindow.cpp:420
-#: src/gui/debugwindow.cpp:458
+#: src/gui/debugwindow.cpp:352 src/gui/debugwindow.cpp:423
+#: src/gui/debugwindow.cpp:461
 msgid "Maximum hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:351 src/gui/debugwindow.cpp:423
-#: src/gui/debugwindow.cpp:460
+#: src/gui/debugwindow.cpp:354 src/gui/debugwindow.cpp:426
+#: src/gui/debugwindow.cpp:463
 msgid "Critical hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:394 src/gui/debugwindow.cpp:400
-#: src/gui/debugwindow.cpp:448
+#: src/gui/debugwindow.cpp:397 src/gui/debugwindow.cpp:403
+#: src/gui/debugwindow.cpp:451
 msgid "Target Level:"
 msgstr "Επίπεδο Στόχου :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:408 src/gui/debugwindow.cpp:450
+#: src/gui/debugwindow.cpp:411 src/gui/debugwindow.cpp:453
 msgid "Target Party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:412 src/gui/debugwindow.cpp:452
+#: src/gui/debugwindow.cpp:415 src/gui/debugwindow.cpp:455
 msgid "Target Guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:493
+#: src/gui/debugwindow.cpp:496
 #, c-format
 msgid "Ping: %s ms"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:496
+#: src/gui/debugwindow.cpp:499
 #, c-format
 msgid "In: %d bytes/s"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:499
+#: src/gui/debugwindow.cpp:502
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
@@ -1323,7 +1323,7 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #: src/gui/editdialog.cpp:45 src/gui/editserverdialog.cpp:78
-#: src/gui/itemamountwindow.cpp:210 src/gui/okdialog.cpp:51
+#: src/gui/itemamountwindow.cpp:204 src/gui/okdialog.cpp:51
 #: src/gui/quitdialog.cpp:70 src/gui/textdialog.cpp:46
 msgid "OK"
 msgstr "ΟΚ"
@@ -1335,7 +1335,7 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:257
+#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:266
 msgid "Connect"
 msgstr ""
 
@@ -1365,7 +1365,7 @@ msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/editserverdialog.cpp:222
+#: src/gui/editserverdialog.cpp:218
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -1417,7 +1417,7 @@ msgstr "Equip"
 #: src/gui/inventorywindow.cpp:178 src/gui/inventorywindow.cpp:630
 #: src/gui/popupmenu.cpp:1843 src/gui/popupmenu.cpp:1922
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2041
-#: src/gui/skilldialog.cpp:277
+#: src/gui/skilldialog.cpp:279
 msgid "Use"
 msgstr "Χρήση"
 
@@ -1451,7 +1451,7 @@ msgstr "Ρούχα"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: setup button
-#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:718
+#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:719
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1992
 #: src/gui/popupmenu.cpp:2066 src/gui/setup.cpp:86
 msgid "Store"
@@ -1473,47 +1473,47 @@ msgid "Drop"
 msgstr "Πέτα"
 
 #. TRANSLATORS: item amount window button
-#: src/gui/itemamountwindow.cpp:214
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "Όλες"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:264
 msgid "Select amount of items to trade."
 msgstr "Επιλέξτε το ποσό των στοιχείων για ανταλαγή."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:274
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to drop."
 msgstr "Επιλέξτε το ποσό των στοιχείων για πτώση."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:278
+#: src/gui/itemamountwindow.cpp:272
 msgid "Select amount of items to store."
 msgstr "Επιλέξτε το ποσό των στοιχείων για αποθήκευση."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:276
 msgid "Select amount of items to retrieve."
 msgstr "Επιλέξτε το ποσό των στοιχείων για ανάκτηση."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:286
+#: src/gui/itemamountwindow.cpp:280
 msgid "Select amount of items to split."
 msgstr "Επιλέξτε το ποσό των στοιχείων για διαιρεση."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:290
+#: src/gui/itemamountwindow.cpp:284
 msgid "Add to buy shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:294
+#: src/gui/itemamountwindow.cpp:288
 msgid "Add to sell shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:298
+#: src/gui/itemamountwindow.cpp:292
 msgid "Unknown."
 msgstr "Άγνωστο."
 
@@ -1540,7 +1540,7 @@ msgstr "Επαναφορά χρονόμετρου"
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:58 src/gui/killstats.cpp:171
-#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:516
+#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:509
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
@@ -1548,7 +1548,7 @@ msgstr ""
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:61 src/gui/killstats.cpp:173
 #: src/gui/killstats.cpp:253 src/gui/killstats.cpp:268
-#: src/gui/killstats.cpp:518
+#: src/gui/killstats.cpp:511
 #, c-format
 msgid "Avg Exp: %s"
 msgstr ""
@@ -1556,14 +1556,14 @@ msgstr ""
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:63 src/gui/killstats.cpp:176
 #: src/gui/killstats.cpp:258 src/gui/killstats.cpp:272
-#: src/gui/killstats.cpp:521
+#: src/gui/killstats.cpp:514
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:66 src/gui/killstats.cpp:187
-#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:524
+#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:517
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
@@ -1591,9 +1591,9 @@ msgid "Last kill exp:"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:414
-#: src/gui/killstats.cpp:421 src/gui/killstats.cpp:428
-#: src/gui/killstats.cpp:434
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:408
+#: src/gui/killstats.cpp:415 src/gui/killstats.cpp:422
+#: src/gui/killstats.cpp:428
 msgid "Time before jacko spawn:"
 msgstr ""
 
@@ -1625,12 +1625,12 @@ msgid "  Time for next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:421
+#: src/gui/killstats.cpp:415
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:428
+#: src/gui/killstats.cpp:422
 msgid "jacko spawning"
 msgstr ""
 
@@ -1736,32 +1736,32 @@ msgid "arrows bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:88
+#: src/gui/ministatuswindow.cpp:89
 msgid "status bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:108
+#: src/gui/ministatuswindow.cpp:109
 msgid "job bar"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:306 src/gui/statuswindow.cpp:298
+#: src/gui/ministatuswindow.cpp:307 src/gui/statuswindow.cpp:298
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:313 src/gui/statuswindow.cpp:141
+#: src/gui/ministatuswindow.cpp:314 src/gui/statuswindow.cpp:141
 #: src/gui/statuswindow.cpp:305 src/gui/statuswindow.cpp:375
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
 #. TRANSLATORS: status bar label
-#: src/gui/ministatuswindow.cpp:330 src/gui/ministatuswindow.cpp:367
+#: src/gui/ministatuswindow.cpp:331 src/gui/ministatuswindow.cpp:368
 msgid "Need"
 msgstr "Χρειάζεστε"
 
@@ -2149,7 +2149,7 @@ msgstr ""
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2209 src/gui/popupmenu.cpp:2280
-#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:139
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
 #: src/gui/socialwindow.cpp:934
 msgid "(default)"
 msgstr ""
@@ -2332,7 +2332,7 @@ msgid "Passwords do not match."
 msgstr "Οι κωδικοί πρόσβασης δεν ταιριάζουν."
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:257
 msgid "Choose Your Server"
 msgstr "Επιλέξε τον διακοσμιτή σου"
 
@@ -2340,61 +2340,61 @@ msgstr "Επιλέξε τον διακοσμιτή σου"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:259 src/gui/shopwindow.cpp:94
+#: src/gui/serverdialog.cpp:268 src/gui/shopwindow.cpp:94
 #: src/gui/shopwindow.cpp:101 src/gui/tradewindow.cpp:77
 msgid "Add"
 msgstr "Προσθήκη"
 
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
-#: src/gui/serverdialog.cpp:261 src/gui/widgets/setupitem.cpp:299
+#: src/gui/serverdialog.cpp:270 src/gui/widgets/setupitem.cpp:299
 #: src/gui/widgets/setupitem.cpp:426
 msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:274
 msgid "Load"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:279
+#: src/gui/serverdialog.cpp:288
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:297
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:518
+#: src/gui/serverdialog.cpp:527
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:524
+#: src/gui/serverdialog.cpp:533
 msgid "Waiting for server..."
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:529
+#: src/gui/serverdialog.cpp:538
 msgid "Preparing download"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:534
+#: src/gui/serverdialog.cpp:543
 msgid "Error retreiving server list!"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:626
+#: src/gui/serverdialog.cpp:635
 msgid "requires a newer version"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:631
+#: src/gui/serverdialog.cpp:640
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -3405,7 +3405,7 @@ msgid "Type:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:334
+#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:336
 msgid "Delay:"
 msgstr ""
 
@@ -3425,30 +3425,30 @@ msgid "Blue:"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:420
+#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:422
 msgid "Static"
 msgstr ""
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:107 src/gui/setup_colors.cpp:110
-#: src/gui/setup_colors.cpp:422
+#: src/gui/setup_colors.cpp:424
 msgid "Pulse"
 msgstr ""
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:112 src/gui/setup_colors.cpp:115
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Rainbow"
 msgstr ""
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:117 src/gui/setup_colors.cpp:120
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Spectrum"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:328
+#: src/gui/setup_colors.cpp:330
 msgid "Alpha:"
 msgstr ""
 
@@ -3614,7 +3614,7 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: palette color
-#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:134
+#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:135
 msgid "Monsters"
 msgstr ""
 
@@ -4163,206 +4163,231 @@ msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:86
-msgid "Very small (9)"
+msgid "Very small (8)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:88
-msgid "Tiny (10)"
+msgid "Very small (9)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:90
-msgid "Small (11)"
+msgid "Tiny (10)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:92
-msgid "Medium (12)"
+msgid "Small (11)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:94
-msgid "Normal (13)"
+msgid "Medium (12)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:96
-msgid "Large (14)"
+msgid "Normal (13)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:98
-msgid "Very large (15)"
+msgid "Large (14)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:100
-msgid "Big (16)"
+msgid "Large (15)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:102
-msgid "Very big (17)"
+msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:104
-msgid "Huge (18)"
+msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:106
-msgid "Very huge (19)"
+msgid "Big (18)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:108
+msgid "Big (19)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:110
+msgid "Very big (20)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:112
+msgid "Very big (21)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:114
+msgid "Very big (22)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:116
+msgid "Huge (23)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:151
 msgid "Chinese (China)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:153
 msgid "Czech"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:155
 msgid "English"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:157
 msgid "Finnish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:159
 msgid "French"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:161
 msgid "German"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:153
+#: src/gui/setup_theme.cpp:163
 msgid "Indonesian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:155
+#: src/gui/setup_theme.cpp:165
 msgid "Italian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:157
+#: src/gui/setup_theme.cpp:167
 msgid "Polish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:159
+#: src/gui/setup_theme.cpp:169
 msgid "Japanese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:161
+#: src/gui/setup_theme.cpp:171
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:163
+#: src/gui/setup_theme.cpp:173
 msgid "Portuguese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:165
+#: src/gui/setup_theme.cpp:175
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:167
+#: src/gui/setup_theme.cpp:177
 msgid "Russian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:169
+#: src/gui/setup_theme.cpp:179
 msgid "Spanish (Castilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:171
+#: src/gui/setup_theme.cpp:181
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:223
+#: src/gui/setup_theme.cpp:233
 msgid "Gui theme"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:230
+#: src/gui/setup_theme.cpp:240
 msgid "Main Font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:235
+#: src/gui/setup_theme.cpp:245
 msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:239
+#: src/gui/setup_theme.cpp:249
 msgid "Bold font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:243
+#: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:247
+#: src/gui/setup_theme.cpp:257
 msgid "Help font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:251
+#: src/gui/setup_theme.cpp:261
 msgid "Secure font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:255
+#: src/gui/setup_theme.cpp:265
 msgid "Japanese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:260
+#: src/gui/setup_theme.cpp:270
 msgid "Font size"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:265
+#: src/gui/setup_theme.cpp:275
 msgid "Npc font size"
 msgstr ""
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/setup_theme.cpp:269
+#: src/gui/setup_theme.cpp:279
 msgid "i"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/setup_theme.cpp:442
+#: src/gui/setup_theme.cpp:452
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/setup_theme.cpp:467
+#: src/gui/setup_theme.cpp:477
 msgid "Theme Changed"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/setup_theme.cpp:467 src/gui/setup_video.cpp:537
+#: src/gui/setup_theme.cpp:477 src/gui/setup_video.cpp:537
 #: src/gui/setup_video.cpp:546
 msgid "Restart your client for the change to take effect."
 msgstr ""
@@ -4660,7 +4685,8 @@ msgid "Ambient FX"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_visual.cpp:140
+#. TRANSLATORS: palette color
+#: src/gui/setup_visual.cpp:140 src/gui/userpalette.cpp:146
 msgid "Particle effects"
 msgstr ""
 
@@ -4747,45 +4773,45 @@ msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/skilldialog.cpp:270 src/gui/windowmenu.cpp:112
+#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:112
 msgid "Skills"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/skilldialog.cpp:279
+#: src/gui/skilldialog.cpp:281
 msgid "Up"
 msgstr ""
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/skilldialog.cpp:391
+#: src/gui/skilldialog.cpp:393
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skills tab
-#: src/gui/skilldialog.cpp:444
+#: src/gui/skilldialog.cpp:446
 msgid "basic"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill name
-#: src/gui/skilldialog.cpp:447
+#: src/gui/skilldialog.cpp:449
 msgid "basic, 1"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/skilldialog.cpp:484
+#: src/gui/skilldialog.cpp:486
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/skilldialog.cpp:518
+#: src/gui/skilldialog.cpp:520
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/skilldialog.cpp:612 src/gui/skilldialog.cpp:762
+#: src/gui/skilldialog.cpp:614 src/gui/skilldialog.cpp:764
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -5228,7 +5254,7 @@ msgid "Trade: You"
 msgstr ""
 
 #. TRANSLATORS: trade window money label
-#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:182
+#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:184
 #, c-format
 msgid "You get %s"
 msgstr ""
@@ -5244,12 +5270,12 @@ msgid "You give:"
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:393
+#: src/gui/tradewindow.cpp:396
 msgid "You don't have enough money."
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:475
+#: src/gui/tradewindow.cpp:479
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
@@ -5261,223 +5287,223 @@ msgid "Name: %s"
 msgstr ""
 
 #. TRANSLATORS: updater window name
-#: src/gui/updaterwindow.cpp:140
+#: src/gui/updaterwindow.cpp:156
 msgid "Updating..."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:165
+#: src/gui/updaterwindow.cpp:181
 msgid "Connecting..."
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/updaterwindow.cpp:656
+#: src/gui/updaterwindow.cpp:672
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/updaterwindow.cpp:658
+#: src/gui/updaterwindow.cpp:674
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:660
+#: src/gui/updaterwindow.cpp:676
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:839
+#: src/gui/updaterwindow.cpp:855
 msgid "Completed"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
 msgid "Being"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:118
-msgid "Friend Names"
+#: src/gui/userpalette.cpp:119
+msgid "Friend names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:120
-msgid "Disregarded Names"
+#: src/gui/userpalette.cpp:121
+msgid "Disregarded names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:122
-msgid "Ignored Names"
+#: src/gui/userpalette.cpp:123
+msgid "Ignored names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:124
-msgid "Erased Names"
+#: src/gui/userpalette.cpp:125
+msgid "Erased names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:126
-msgid "Other Players' Names"
+#: src/gui/userpalette.cpp:127
+msgid "Other players names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:128
-msgid "Own Name"
+#: src/gui/userpalette.cpp:129
+msgid "Own name"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:130
-msgid "GM Names"
+#: src/gui/userpalette.cpp:131
+msgid "GM names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
 msgid "NPCs"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
 msgid "Monster HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:140
 msgid "Monster HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:141
-msgid "Party Members"
+#: src/gui/userpalette.cpp:142
+msgid "Party members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:143
-msgid "Guild Members"
+#: src/gui/userpalette.cpp:144
+msgid "Guild members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:145
-msgid "Particle Effects"
+#: src/gui/userpalette.cpp:148
+msgid "Pickup notification"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:147
-msgid "Pickup Notification"
+#: src/gui/userpalette.cpp:150
+msgid "Exp notification"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:149
-msgid "Exp Notification"
-msgstr ""
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
 msgid "Player HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
 msgid "Player HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:157
-msgid "Player Hits Monster"
+#: src/gui/userpalette.cpp:158
+msgid "Player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:159
-msgid "Monster Hits Player"
+#: src/gui/userpalette.cpp:160
+msgid "Monster hits player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:163
-msgid "Other Player Hits Local Player"
+#: src/gui/userpalette.cpp:164
+msgid "Other player hits local player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:166
 msgid "Critical Hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
-msgid "Local Player Hits Monster"
+#: src/gui/userpalette.cpp:170
+msgid "Local player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:172
-msgid "Local Player Critical Hit"
+#: src/gui/userpalette.cpp:173
+msgid "Local player critical hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:175
-msgid "Local Player Miss"
+#: src/gui/userpalette.cpp:176
+msgid "Local player miss"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:177
+#: src/gui/userpalette.cpp:178
 msgid "Misses"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
-msgid "Portal Highlight"
+#: src/gui/userpalette.cpp:180
+msgid "Portal highlight"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:183
+msgid "Default collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:182
-msgid "Default collision Highlight"
+#: src/gui/userpalette.cpp:186
+msgid "Air collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:185
-msgid "Air collision Highlight"
+#: src/gui/userpalette.cpp:189
+msgid "Water collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:188
-msgid "Water collision Highlight"
+#: src/gui/userpalette.cpp:192
+msgid "Special ground collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:191
-msgid "Special ground collision Highlight"
+#: src/gui/userpalette.cpp:195
+msgid "Walkable highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
-msgid "Walkable Highlight"
+#: src/gui/userpalette.cpp:198
+msgid "Local player attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:197
-msgid "Local Player Attack Range"
+#: src/gui/userpalette.cpp:201
+msgid "Local player attack range border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:200
-msgid "Local Player Attack Range Border"
+#: src/gui/userpalette.cpp:204
+msgid "Monster attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:203
-msgid "Monster Attack Range"
+#: src/gui/userpalette.cpp:208
+msgid "Floor item amount color"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:206
-msgid "Home Place"
+#: src/gui/userpalette.cpp:211
+msgid "Home place"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:209
-msgid "Home Place Border"
+#: src/gui/userpalette.cpp:214
+msgid "Home place border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:212
-msgid "Road Point"
+#: src/gui/userpalette.cpp:217
+msgid "Road point"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
@@ -5607,7 +5633,7 @@ msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:315
+#: src/gui/widgets/itemcontainer.cpp:317
 msgid "Eq."
 msgstr ""
 
diff --git a/po/en_GB.po b/po/en_GB.po
index bbd125671..8d31a83de 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-05-03 12:38+0300\n"
-"PO-Revision-Date: 2013-05-03 09:44+0000\n"
+"POT-Creation-Date: 2013-05-10 18:34+0300\n"
+"PO-Revision-Date: 2013-05-10 15:39+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -60,25 +60,25 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: full button name
-#: src/client.cpp:1136 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
+#: src/client.cpp:1137 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
 msgid "Setup"
 msgstr "Setup"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1140 src/gui/setup_perfomance.cpp:61
+#: src/client.cpp:1141 src/gui/setup_perfomance.cpp:61
 msgid "Perfomance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:1143 src/gui/setup_video.cpp:258
+#: src/client.cpp:1144 src/gui/setup_video.cpp:258
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1146 src/gui/setup_theme.cpp:273
+#: src/client.cpp:1147 src/gui/setup_theme.cpp:283
 msgid "Theme"
 msgstr ""
 
@@ -89,7 +89,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1150 src/gui/didyouknowwindow.cpp:78
+#: src/client.cpp:1151 src/gui/didyouknowwindow.cpp:78
 #: src/gui/inventorywindow.cpp:228 src/gui/npcdialog.cpp:63
 #: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:574
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:80
@@ -97,32 +97,32 @@ msgid "Close"
 msgstr "Close"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1238
+#: src/client.cpp:1239
 msgid "Connecting to server"
 msgstr "Connecting to server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1282
 msgid "Logging in"
 msgstr "Logging in"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1320
+#: src/client.cpp:1321
 msgid "Entering game world"
 msgstr "Entering game world"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1431
+#: src/client.cpp:1432
 msgid "Requesting characters"
 msgstr "Requesting characters"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1471
 msgid "Connecting to the game server"
 msgstr "Connecting to the game server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1483
+#: src/client.cpp:1484
 msgid "Changing game servers"
 msgstr "Changing game servers"
 
@@ -137,69 +137,69 @@ msgstr "Changing game servers"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1540 src/client.cpp:1551 src/client.cpp:1721
+#: src/client.cpp:1541 src/client.cpp:1552 src/client.cpp:1722
 #: src/gui/changeemaildialog.cpp:168 src/gui/changepassworddialog.cpp:158
-#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:288
-#: src/gui/editserverdialog.cpp:220 src/gui/registerdialog.cpp:263
+#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:290
+#: src/gui/editserverdialog.cpp:216 src/gui/registerdialog.cpp:263
 #: src/gui/unregisterdialog.cpp:143 src/net/ea/charserverhandler.cpp:190
 #: src/net/ea/charserverhandler.cpp:210
 msgid "Error"
 msgstr "Error"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1564
+#: src/client.cpp:1565
 msgid "Requesting registration details"
 msgstr "Requesting registration details"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1601
+#: src/client.cpp:1602
 msgid "Password Change"
 msgstr "Password Change"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1603
+#: src/client.cpp:1604
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1624
+#: src/client.cpp:1625
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1626
+#: src/client.cpp:1627
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1647
+#: src/client.cpp:1648
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1649
+#: src/client.cpp:1650
 msgid "Farewell, come back any time..."
 msgstr ""
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1902 src/client.cpp:1917 src/client.cpp:1960
-#: src/client.cpp:1976 src/client.cpp:2417 src/client.cpp:2425
+#: src/client.cpp:1903 src/client.cpp:1918 src/client.cpp:1961
+#: src/client.cpp:1977 src/client.cpp:2418 src/client.cpp:2426
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2113
+#: src/client.cpp:2114
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2154 src/client.cpp:2161
+#: src/client.cpp:2155 src/client.cpp:2162
 msgid "Error creating updates directory!"
 msgstr "Error creating updates directory!"
 
-#: src/client.cpp:2183 src/client.cpp:2196
+#: src/client.cpp:2184 src/client.cpp:2197
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -479,19 +479,19 @@ msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: bot checker window header
-#: src/gui/botcheckerwindow.cpp:269
+#: src/gui/botcheckerwindow.cpp:268
 msgid "Bot Checker"
 msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:102
+#: src/gui/botcheckerwindow.cpp:277 src/gui/npcdialog.cpp:102
 msgid "Reset"
 msgstr "Reset"
 
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: relations table header
-#: src/gui/botcheckerwindow.cpp:305 src/gui/setup_relations.cpp:61
+#: src/gui/botcheckerwindow.cpp:304 src/gui/setup_relations.cpp:61
 msgid "Name"
 msgstr "Name"
 
@@ -499,7 +499,7 @@ msgstr "Name"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:145
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:145
 #: src/gui/popupmenu.cpp:241 src/gui/popupmenu.cpp:640
 #: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:257
 #: src/net/tmwa/generalhandler.cpp:292
@@ -509,7 +509,7 @@ msgstr "Attack"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
-#: src/gui/botcheckerwindow.cpp:309 src/gui/popupmenu.cpp:225
+#: src/gui/botcheckerwindow.cpp:308 src/gui/popupmenu.cpp:225
 #: src/gui/setupactiondata.h:93
 msgid "Talk"
 msgstr "Talk"
@@ -517,7 +517,7 @@ msgstr "Talk"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/botcheckerwindow.cpp:311 src/gui/popupmenu.cpp:215
+#: src/gui/botcheckerwindow.cpp:310 src/gui/popupmenu.cpp:215
 #: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:371
 #: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:653
 #: src/gui/popupmenu.cpp:727 src/gui/setupactiondata.h:1856
@@ -525,7 +525,7 @@ msgid "Move"
 msgstr ""
 
 #. TRANSLATORS: bot checker window table header
-#: src/gui/botcheckerwindow.cpp:313
+#: src/gui/botcheckerwindow.cpp:312
 msgid "Result"
 msgstr ""
 
@@ -581,7 +581,7 @@ msgstr "Buy"
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:516
+#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:511
 #: src/gui/selldialog.cpp:94 src/gui/selldialog.cpp:342
 #, c-format
 msgid "Price: %s / Total: %s"
@@ -598,9 +598,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:208
-#: src/gui/itemamountwindow.cpp:243 src/gui/npcdialog.cpp:93
-#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:833
+#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:202
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:93
+#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:821
 msgid "+"
 msgstr ""
 
@@ -610,9 +610,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:240 src/gui/npcdialog.cpp:95
-#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:846
+#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:200
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:95
+#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:834
 msgid "-"
 msgstr ""
 
@@ -624,7 +624,7 @@ msgstr ""
 #. TRANSLATORS: input action name
 #: src/gui/buydialog.cpp:260 src/gui/quitdialog.cpp:54
 #: src/gui/quitdialog.cpp:59 src/gui/quitdialog.cpp:61
-#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:255
+#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:264
 #: src/gui/setupactiondata.h:177
 msgid "Quit"
 msgstr "Exit"
@@ -636,7 +636,7 @@ msgstr "Exit"
 #. TRANSLATORS: status bar label
 #: src/gui/buydialog.cpp:262 src/gui/selldialog.cpp:106
 #: src/gui/statuswindow.cpp:558 src/gui/statuswindow.cpp:615
-#: src/gui/statuswindow.cpp:830 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:852
 msgid "Max"
 msgstr "Max"
 
@@ -681,7 +681,7 @@ msgstr "Sell"
 #: src/gui/buyselldialog.cpp:71 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:120
 #: src/gui/connectiondialog.cpp:48 src/gui/editserverdialog.cpp:80
-#: src/gui/itemamountwindow.cpp:212 src/gui/npcpostdialog.cpp:64
+#: src/gui/itemamountwindow.cpp:206 src/gui/npcpostdialog.cpp:64
 #: src/gui/popupmenu.cpp:290 src/gui/popupmenu.cpp:324
 #: src/gui/popupmenu.cpp:411 src/gui/popupmenu.cpp:454
 #: src/gui/popupmenu.cpp:485 src/gui/popupmenu.cpp:512
@@ -697,7 +697,7 @@ msgstr "Sell"
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
 #: src/gui/setup.cpp:84 src/gui/socialwindow.cpp:1204
 #: src/gui/textcommandeditor.cpp:212 src/gui/textdialog.cpp:53
-#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:167
+#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:183
 msgid "Cancel"
 msgstr "Cancel"
 
@@ -861,7 +861,7 @@ msgstr "Please distribute %d points"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:570
+#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:581
 #: src/gui/socialwindow.cpp:1269
 msgid "Create"
 msgstr "Create"
@@ -888,17 +888,17 @@ msgid "Please remove %d points"
 msgstr "Please remove %d points"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:60
+#: src/gui/charselectdialog.cpp:61
 msgid "Confirm Character Delete"
 msgstr "Confirm Character Delete"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:62
+#: src/gui/charselectdialog.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "Are you sure you want to delete this character?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:86
+#: src/gui/charselectdialog.cpp:87
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
@@ -910,8 +910,8 @@ msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:565
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:576
+#: src/gui/updaterwindow.cpp:185
 msgid "Play"
 msgstr "Play"
 
@@ -927,7 +927,7 @@ msgstr "Info"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:263
+#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:272
 #: src/gui/setupactiondata.h:1803 src/gui/setup_relations.cpp:262
 #: src/gui/shopwindow.cpp:96 src/gui/shopwindow.cpp:103
 #: src/gui/textcommandeditor.cpp:216
@@ -937,24 +937,24 @@ msgstr "Delete"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/charselectdialog.cpp:129 src/gui/unregisterdialog.cpp:48
+#: src/gui/charselectdialog.cpp:130 src/gui/unregisterdialog.cpp:48
 #: src/gui/unregisterdialog.cpp:53
 msgid "Unregister"
 msgstr "Unregister"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/charselectdialog.cpp:141
+#: src/gui/charselectdialog.cpp:142
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:172
+#: src/gui/charselectdialog.cpp:175
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/charselectdialog.cpp:246
+#: src/gui/charselectdialog.cpp:248
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -964,16 +964,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:288
+#: src/gui/charselectdialog.cpp:290
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password:"
 msgstr ""
 
@@ -1060,13 +1060,13 @@ msgid "Chat"
 msgstr "Chat"
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:735
+#: src/gui/chatwindow.cpp:638
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1165
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Whispering to %s: %s"
@@ -1084,7 +1084,7 @@ msgstr "No"
 
 #. TRANSLATORS: confirm dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/confirmdialog.cpp:58 src/gui/popupmenu.cpp:2429
+#: src/gui/confirmdialog.cpp:55 src/gui/popupmenu.cpp:2429
 #: src/gui/popupmenu.cpp:2442 src/gui/popupmenu.cpp:2457
 #: src/gui/popupmenu.cpp:2483
 msgid "Ignore"
@@ -1093,7 +1093,7 @@ msgstr ""
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
 #. TRANSLATORS: settings group
-#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:109
+#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:108
 #: src/gui/setup_other.cpp:123 src/gui/windowmenu.cpp:106
 msgid "Map"
 msgstr "Map"
@@ -1109,190 +1109,190 @@ msgid "Net"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:265
-#: src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:268
+#: src/gui/debugwindow.cpp:311
 msgid "Music:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:153 src/gui/debugwindow.cpp:271
-#: src/gui/debugwindow.cpp:312
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:274
+#: src/gui/debugwindow.cpp:315
 msgid "Map:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:155 src/gui/debugwindow.cpp:268
-#: src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:271
+#: src/gui/debugwindow.cpp:313
 msgid "Minimap:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:262
-#: src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:161 src/gui/debugwindow.cpp:265
+#: src/gui/debugwindow.cpp:309
 msgid "Cursor:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:161
+#: src/gui/debugwindow.cpp:164
 msgid "Particle count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:284
-#: src/gui/debugwindow.cpp:316
+#: src/gui/debugwindow.cpp:167 src/gui/debugwindow.cpp:287
+#: src/gui/debugwindow.cpp:319
 msgid "Map actors count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:166 src/gui/debugwindow.cpp:243
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:169 src/gui/debugwindow.cpp:246
+#: src/gui/debugwindow.cpp:252
 msgid "Player Position:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:172 src/gui/debugwindow.cpp:297
+#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:300
 msgid "Draw calls:"
 msgstr ""
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:175
+#. TRANSLATORS: debug window label, frames per second
+#: src/gui/debugwindow.cpp:178
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:177 src/gui/debugwindow.cpp:324
+#. TRANSLATORS: debug window label, logic per second
+#: src/gui/debugwindow.cpp:180 src/gui/debugwindow.cpp:327
 #, c-format
 msgid "%d LPS"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:191 src/gui/debugwindow.cpp:209
 #, c-format
 msgid "%d FPS (Software)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:193
+#: src/gui/debugwindow.cpp:196
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:197
+#: src/gui/debugwindow.cpp:200
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:201
+#: src/gui/debugwindow.cpp:204
 #, c-format
 msgid "%d FPS (mobile OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:225 src/gui/debugwindow.cpp:290
+#: src/gui/debugwindow.cpp:228 src/gui/debugwindow.cpp:293
 msgid "Textures count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:279
+#: src/gui/debugwindow.cpp:282
 #, c-format
 msgid "Particle count: %d"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:330 src/gui/debugwindow.cpp:380
-#: src/gui/debugwindow.cpp:442
+#: src/gui/debugwindow.cpp:333 src/gui/debugwindow.cpp:383
+#: src/gui/debugwindow.cpp:445
 msgid "Target:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:332 src/gui/debugwindow.cpp:386
-#: src/gui/debugwindow.cpp:444
+#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
+#: src/gui/debugwindow.cpp:447
 msgid "Target Id:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
-#: src/gui/debugwindow.cpp:446
+#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:392
+#: src/gui/debugwindow.cpp:449
 msgid "Target type:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:337
+#: src/gui/debugwindow.cpp:340
 msgid "Target level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:339 src/gui/debugwindow.cpp:405
+#: src/gui/debugwindow.cpp:342 src/gui/debugwindow.cpp:408
 msgid "Target race:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:341
+#: src/gui/debugwindow.cpp:344
 msgid "Target party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:346
 msgid "Target guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:430
-#: src/gui/debugwindow.cpp:436 src/gui/debugwindow.cpp:454
+#: src/gui/debugwindow.cpp:348 src/gui/debugwindow.cpp:433
+#: src/gui/debugwindow.cpp:439 src/gui/debugwindow.cpp:457
 msgid "Attack delay:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:347 src/gui/debugwindow.cpp:417
-#: src/gui/debugwindow.cpp:456
+#: src/gui/debugwindow.cpp:350 src/gui/debugwindow.cpp:420
+#: src/gui/debugwindow.cpp:459
 msgid "Minimal hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:349 src/gui/debugwindow.cpp:420
-#: src/gui/debugwindow.cpp:458
+#: src/gui/debugwindow.cpp:352 src/gui/debugwindow.cpp:423
+#: src/gui/debugwindow.cpp:461
 msgid "Maximum hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:351 src/gui/debugwindow.cpp:423
-#: src/gui/debugwindow.cpp:460
+#: src/gui/debugwindow.cpp:354 src/gui/debugwindow.cpp:426
+#: src/gui/debugwindow.cpp:463
 msgid "Critical hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:394 src/gui/debugwindow.cpp:400
-#: src/gui/debugwindow.cpp:448
+#: src/gui/debugwindow.cpp:397 src/gui/debugwindow.cpp:403
+#: src/gui/debugwindow.cpp:451
 msgid "Target Level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:408 src/gui/debugwindow.cpp:450
+#: src/gui/debugwindow.cpp:411 src/gui/debugwindow.cpp:453
 msgid "Target Party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:412 src/gui/debugwindow.cpp:452
+#: src/gui/debugwindow.cpp:415 src/gui/debugwindow.cpp:455
 msgid "Target Guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:493
+#: src/gui/debugwindow.cpp:496
 #, c-format
 msgid "Ping: %s ms"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:496
+#: src/gui/debugwindow.cpp:499
 #, c-format
 msgid "In: %d bytes/s"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:499
+#: src/gui/debugwindow.cpp:502
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
@@ -1324,7 +1324,7 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #: src/gui/editdialog.cpp:45 src/gui/editserverdialog.cpp:78
-#: src/gui/itemamountwindow.cpp:210 src/gui/okdialog.cpp:51
+#: src/gui/itemamountwindow.cpp:204 src/gui/okdialog.cpp:51
 #: src/gui/quitdialog.cpp:70 src/gui/textdialog.cpp:46
 msgid "OK"
 msgstr "OK"
@@ -1336,7 +1336,7 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:257
+#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:266
 msgid "Connect"
 msgstr ""
 
@@ -1366,7 +1366,7 @@ msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/editserverdialog.cpp:222
+#: src/gui/editserverdialog.cpp:218
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -1418,7 +1418,7 @@ msgstr "Equip"
 #: src/gui/inventorywindow.cpp:178 src/gui/inventorywindow.cpp:630
 #: src/gui/popupmenu.cpp:1843 src/gui/popupmenu.cpp:1922
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2041
-#: src/gui/skilldialog.cpp:277
+#: src/gui/skilldialog.cpp:279
 msgid "Use"
 msgstr "Use"
 
@@ -1452,7 +1452,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: setup button
-#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:718
+#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:719
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1992
 #: src/gui/popupmenu.cpp:2066 src/gui/setup.cpp:86
 msgid "Store"
@@ -1474,47 +1474,47 @@ msgid "Drop"
 msgstr "Drop"
 
 #. TRANSLATORS: item amount window button
-#: src/gui/itemamountwindow.cpp:214
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "All"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:264
 msgid "Select amount of items to trade."
 msgstr "Select amount of items to trade."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:274
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to drop."
 msgstr "Select amount of items to drop."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:278
+#: src/gui/itemamountwindow.cpp:272
 msgid "Select amount of items to store."
 msgstr "Select amount of items to store."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:276
 msgid "Select amount of items to retrieve."
 msgstr "Select amount of items to retrieve."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:286
+#: src/gui/itemamountwindow.cpp:280
 msgid "Select amount of items to split."
 msgstr "Select amount of items to split."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:290
+#: src/gui/itemamountwindow.cpp:284
 msgid "Add to buy shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:294
+#: src/gui/itemamountwindow.cpp:288
 msgid "Add to sell shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:298
+#: src/gui/itemamountwindow.cpp:292
 msgid "Unknown."
 msgstr ""
 
@@ -1541,7 +1541,7 @@ msgstr ""
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:58 src/gui/killstats.cpp:171
-#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:516
+#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:509
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
@@ -1549,7 +1549,7 @@ msgstr ""
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:61 src/gui/killstats.cpp:173
 #: src/gui/killstats.cpp:253 src/gui/killstats.cpp:268
-#: src/gui/killstats.cpp:518
+#: src/gui/killstats.cpp:511
 #, c-format
 msgid "Avg Exp: %s"
 msgstr ""
@@ -1557,14 +1557,14 @@ msgstr ""
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:63 src/gui/killstats.cpp:176
 #: src/gui/killstats.cpp:258 src/gui/killstats.cpp:272
-#: src/gui/killstats.cpp:521
+#: src/gui/killstats.cpp:514
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:66 src/gui/killstats.cpp:187
-#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:524
+#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:517
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
@@ -1592,9 +1592,9 @@ msgid "Last kill exp:"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:414
-#: src/gui/killstats.cpp:421 src/gui/killstats.cpp:428
-#: src/gui/killstats.cpp:434
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:408
+#: src/gui/killstats.cpp:415 src/gui/killstats.cpp:422
+#: src/gui/killstats.cpp:428
 msgid "Time before jacko spawn:"
 msgstr ""
 
@@ -1626,12 +1626,12 @@ msgid "  Time for next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:421
+#: src/gui/killstats.cpp:415
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:428
+#: src/gui/killstats.cpp:422
 msgid "jacko spawning"
 msgstr ""
 
@@ -1737,32 +1737,32 @@ msgid "arrows bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:88
+#: src/gui/ministatuswindow.cpp:89
 msgid "status bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:108
+#: src/gui/ministatuswindow.cpp:109
 msgid "job bar"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:306 src/gui/statuswindow.cpp:298
+#: src/gui/ministatuswindow.cpp:307 src/gui/statuswindow.cpp:298
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:313 src/gui/statuswindow.cpp:141
+#: src/gui/ministatuswindow.cpp:314 src/gui/statuswindow.cpp:141
 #: src/gui/statuswindow.cpp:305 src/gui/statuswindow.cpp:375
 #, c-format
 msgid "Level: %d"
 msgstr "Level: %d"
 
 #. TRANSLATORS: status bar label
-#: src/gui/ministatuswindow.cpp:330 src/gui/ministatuswindow.cpp:367
+#: src/gui/ministatuswindow.cpp:331 src/gui/ministatuswindow.cpp:368
 msgid "Need"
 msgstr ""
 
@@ -2150,7 +2150,7 @@ msgstr ""
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2209 src/gui/popupmenu.cpp:2280
-#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:139
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
 #: src/gui/socialwindow.cpp:934
 msgid "(default)"
 msgstr ""
@@ -2333,7 +2333,7 @@ msgid "Passwords do not match."
 msgstr "Passwords do not match."
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:257
 msgid "Choose Your Server"
 msgstr ""
 
@@ -2341,61 +2341,61 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:259 src/gui/shopwindow.cpp:94
+#: src/gui/serverdialog.cpp:268 src/gui/shopwindow.cpp:94
 #: src/gui/shopwindow.cpp:101 src/gui/tradewindow.cpp:77
 msgid "Add"
 msgstr "Add"
 
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
-#: src/gui/serverdialog.cpp:261 src/gui/widgets/setupitem.cpp:299
+#: src/gui/serverdialog.cpp:270 src/gui/widgets/setupitem.cpp:299
 #: src/gui/widgets/setupitem.cpp:426
 msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:274
 msgid "Load"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:279
+#: src/gui/serverdialog.cpp:288
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:297
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:518
+#: src/gui/serverdialog.cpp:527
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:524
+#: src/gui/serverdialog.cpp:533
 msgid "Waiting for server..."
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:529
+#: src/gui/serverdialog.cpp:538
 msgid "Preparing download"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:534
+#: src/gui/serverdialog.cpp:543
 msgid "Error retreiving server list!"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:626
+#: src/gui/serverdialog.cpp:635
 msgid "requires a newer version"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:631
+#: src/gui/serverdialog.cpp:640
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -3406,7 +3406,7 @@ msgid "Type:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:334
+#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:336
 msgid "Delay:"
 msgstr ""
 
@@ -3426,30 +3426,30 @@ msgid "Blue:"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:420
+#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:422
 msgid "Static"
 msgstr "Static"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:107 src/gui/setup_colors.cpp:110
-#: src/gui/setup_colors.cpp:422
+#: src/gui/setup_colors.cpp:424
 msgid "Pulse"
 msgstr "Pulse"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:112 src/gui/setup_colors.cpp:115
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Rainbow"
 msgstr "Rainbow"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:117 src/gui/setup_colors.cpp:120
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Spectrum"
 msgstr "Spectrum"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:328
+#: src/gui/setup_colors.cpp:330
 msgid "Alpha:"
 msgstr ""
 
@@ -3615,7 +3615,7 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: palette color
-#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:134
+#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:135
 msgid "Monsters"
 msgstr "Monsters"
 
@@ -4164,206 +4164,231 @@ msgstr "When ignoring:"
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:86
-msgid "Very small (9)"
+msgid "Very small (8)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:88
-msgid "Tiny (10)"
+msgid "Very small (9)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:90
-msgid "Small (11)"
+msgid "Tiny (10)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:92
-msgid "Medium (12)"
+msgid "Small (11)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:94
-msgid "Normal (13)"
+msgid "Medium (12)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:96
-msgid "Large (14)"
+msgid "Normal (13)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:98
-msgid "Very large (15)"
+msgid "Large (14)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:100
-msgid "Big (16)"
+msgid "Large (15)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:102
-msgid "Very big (17)"
+msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:104
-msgid "Huge (18)"
+msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:106
-msgid "Very huge (19)"
+msgid "Big (18)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:108
+msgid "Big (19)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:110
+msgid "Very big (20)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:112
+msgid "Very big (21)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:114
+msgid "Very big (22)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:116
+msgid "Huge (23)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:151
 msgid "Chinese (China)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:153
 msgid "Czech"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:155
 msgid "English"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:157
 msgid "Finnish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:159
 msgid "French"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:161
 msgid "German"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:153
+#: src/gui/setup_theme.cpp:163
 msgid "Indonesian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:155
+#: src/gui/setup_theme.cpp:165
 msgid "Italian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:157
+#: src/gui/setup_theme.cpp:167
 msgid "Polish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:159
+#: src/gui/setup_theme.cpp:169
 msgid "Japanese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:161
+#: src/gui/setup_theme.cpp:171
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:163
+#: src/gui/setup_theme.cpp:173
 msgid "Portuguese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:165
+#: src/gui/setup_theme.cpp:175
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:167
+#: src/gui/setup_theme.cpp:177
 msgid "Russian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:169
+#: src/gui/setup_theme.cpp:179
 msgid "Spanish (Castilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:171
+#: src/gui/setup_theme.cpp:181
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:223
+#: src/gui/setup_theme.cpp:233
 msgid "Gui theme"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:230
+#: src/gui/setup_theme.cpp:240
 msgid "Main Font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:235
+#: src/gui/setup_theme.cpp:245
 msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:239
+#: src/gui/setup_theme.cpp:249
 msgid "Bold font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:243
+#: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:247
+#: src/gui/setup_theme.cpp:257
 msgid "Help font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:251
+#: src/gui/setup_theme.cpp:261
 msgid "Secure font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:255
+#: src/gui/setup_theme.cpp:265
 msgid "Japanese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:260
+#: src/gui/setup_theme.cpp:270
 msgid "Font size"
 msgstr "Font size"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:265
+#: src/gui/setup_theme.cpp:275
 msgid "Npc font size"
 msgstr ""
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/setup_theme.cpp:269
+#: src/gui/setup_theme.cpp:279
 msgid "i"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/setup_theme.cpp:442
+#: src/gui/setup_theme.cpp:452
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/setup_theme.cpp:467
+#: src/gui/setup_theme.cpp:477
 msgid "Theme Changed"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/setup_theme.cpp:467 src/gui/setup_video.cpp:537
+#: src/gui/setup_theme.cpp:477 src/gui/setup_video.cpp:537
 #: src/gui/setup_video.cpp:546
 msgid "Restart your client for the change to take effect."
 msgstr "Restart your client for the change to take effect."
@@ -4661,7 +4686,8 @@ msgid "Ambient FX"
 msgstr "Ambient FX"
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_visual.cpp:140
+#. TRANSLATORS: palette color
+#: src/gui/setup_visual.cpp:140 src/gui/userpalette.cpp:146
 msgid "Particle effects"
 msgstr "Particle effects"
 
@@ -4748,45 +4774,45 @@ msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/skilldialog.cpp:270 src/gui/windowmenu.cpp:112
+#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:112
 msgid "Skills"
 msgstr "Skills"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/skilldialog.cpp:279
+#: src/gui/skilldialog.cpp:281
 msgid "Up"
 msgstr "Up"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/skilldialog.cpp:391
+#: src/gui/skilldialog.cpp:393
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skills tab
-#: src/gui/skilldialog.cpp:444
+#: src/gui/skilldialog.cpp:446
 msgid "basic"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill name
-#: src/gui/skilldialog.cpp:447
+#: src/gui/skilldialog.cpp:449
 msgid "basic, 1"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/skilldialog.cpp:484
+#: src/gui/skilldialog.cpp:486
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/skilldialog.cpp:518
+#: src/gui/skilldialog.cpp:520
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/skilldialog.cpp:612 src/gui/skilldialog.cpp:762
+#: src/gui/skilldialog.cpp:614 src/gui/skilldialog.cpp:764
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -5229,7 +5255,7 @@ msgid "Trade: You"
 msgstr "Trade: You"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:182
+#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:184
 #, c-format
 msgid "You get %s"
 msgstr ""
@@ -5245,12 +5271,12 @@ msgid "You give:"
 msgstr "You give:"
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:393
+#: src/gui/tradewindow.cpp:396
 msgid "You don't have enough money."
 msgstr "You don't have enough money."
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:475
+#: src/gui/tradewindow.cpp:479
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "Failed adding item. You can not overlap one kind of item on the window."
@@ -5262,223 +5288,223 @@ msgid "Name: %s"
 msgstr "Name: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/updaterwindow.cpp:140
+#: src/gui/updaterwindow.cpp:156
 msgid "Updating..."
 msgstr "Updating..."
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:165
+#: src/gui/updaterwindow.cpp:181
 msgid "Connecting..."
 msgstr "Connecting..."
 
 #. TRANSLATORS: update message
-#: src/gui/updaterwindow.cpp:656
+#: src/gui/updaterwindow.cpp:672
 msgid "##1  The update process is incomplete."
 msgstr "##1  The update process is incomplete."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/updaterwindow.cpp:658
+#: src/gui/updaterwindow.cpp:674
 msgid "##1  It is strongly recommended that"
 msgstr "##1  It is strongly recommended that"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:660
+#: src/gui/updaterwindow.cpp:676
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:839
+#: src/gui/updaterwindow.cpp:855
 msgid "Completed"
 msgstr "Completed"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
 msgid "Being"
 msgstr "Being"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:118
-msgid "Friend Names"
+#: src/gui/userpalette.cpp:119
+msgid "Friend names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:120
-msgid "Disregarded Names"
+#: src/gui/userpalette.cpp:121
+msgid "Disregarded names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:122
-msgid "Ignored Names"
+#: src/gui/userpalette.cpp:123
+msgid "Ignored names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:124
-msgid "Erased Names"
+#: src/gui/userpalette.cpp:125
+msgid "Erased names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:126
-msgid "Other Players' Names"
-msgstr "Other Players' Names"
+#: src/gui/userpalette.cpp:127
+msgid "Other players names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:128
-msgid "Own Name"
-msgstr "Own Name"
+#: src/gui/userpalette.cpp:129
+msgid "Own name"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:130
-msgid "GM Names"
-msgstr "GM Names"
+#: src/gui/userpalette.cpp:131
+msgid "GM names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
 msgid "NPCs"
 msgstr "NPCs"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
 msgid "Monster HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:140
 msgid "Monster HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:141
-msgid "Party Members"
+#: src/gui/userpalette.cpp:142
+msgid "Party members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:143
-msgid "Guild Members"
+#: src/gui/userpalette.cpp:144
+msgid "Guild members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:145
-msgid "Particle Effects"
-msgstr "Particle Effects"
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:147
-msgid "Pickup Notification"
-msgstr "Pickup Notification"
+#: src/gui/userpalette.cpp:148
+msgid "Pickup notification"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:149
-msgid "Exp Notification"
-msgstr "Exp Notification"
+#: src/gui/userpalette.cpp:150
+msgid "Exp notification"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
 msgid "Player HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
 msgid "Player HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:157
-msgid "Player Hits Monster"
+#: src/gui/userpalette.cpp:158
+msgid "Player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:159
-msgid "Monster Hits Player"
+#: src/gui/userpalette.cpp:160
+msgid "Monster hits player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:163
-msgid "Other Player Hits Local Player"
+#: src/gui/userpalette.cpp:164
+msgid "Other player hits local player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:166
 msgid "Critical Hit"
 msgstr "Critical Hit"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
-msgid "Local Player Hits Monster"
+#: src/gui/userpalette.cpp:170
+msgid "Local player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:172
-msgid "Local Player Critical Hit"
+#: src/gui/userpalette.cpp:173
+msgid "Local player critical hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:175
-msgid "Local Player Miss"
+#: src/gui/userpalette.cpp:176
+msgid "Local player miss"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:177
+#: src/gui/userpalette.cpp:178
 msgid "Misses"
 msgstr "Misses"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
-msgid "Portal Highlight"
+#: src/gui/userpalette.cpp:180
+msgid "Portal highlight"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:183
+msgid "Default collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:182
-msgid "Default collision Highlight"
+#: src/gui/userpalette.cpp:186
+msgid "Air collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:185
-msgid "Air collision Highlight"
+#: src/gui/userpalette.cpp:189
+msgid "Water collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:188
-msgid "Water collision Highlight"
+#: src/gui/userpalette.cpp:192
+msgid "Special ground collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:191
-msgid "Special ground collision Highlight"
+#: src/gui/userpalette.cpp:195
+msgid "Walkable highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
-msgid "Walkable Highlight"
+#: src/gui/userpalette.cpp:198
+msgid "Local player attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:197
-msgid "Local Player Attack Range"
+#: src/gui/userpalette.cpp:201
+msgid "Local player attack range border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:200
-msgid "Local Player Attack Range Border"
+#: src/gui/userpalette.cpp:204
+msgid "Monster attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:203
-msgid "Monster Attack Range"
+#: src/gui/userpalette.cpp:208
+msgid "Floor item amount color"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:206
-msgid "Home Place"
+#: src/gui/userpalette.cpp:211
+msgid "Home place"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:209
-msgid "Home Place Border"
+#: src/gui/userpalette.cpp:214
+msgid "Home place border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:212
-msgid "Road Point"
+#: src/gui/userpalette.cpp:217
+msgid "Road point"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
@@ -5608,7 +5634,7 @@ msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:315
+#: src/gui/widgets/itemcontainer.cpp:317
 msgid "Eq."
 msgstr ""
 
diff --git a/po/eo.po b/po/eo.po
index c5db62a75..f556aea2a 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-05-03 12:38+0300\n"
-"PO-Revision-Date: 2013-05-03 09:44+0000\n"
+"POT-Creation-Date: 2013-05-10 18:34+0300\n"
+"PO-Revision-Date: 2013-05-10 15:39+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/manaplus/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -59,25 +59,25 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: full button name
-#: src/client.cpp:1136 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
+#: src/client.cpp:1137 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
 msgid "Setup"
 msgstr ""
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1140 src/gui/setup_perfomance.cpp:61
+#: src/client.cpp:1141 src/gui/setup_perfomance.cpp:61
 msgid "Perfomance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:1143 src/gui/setup_video.cpp:258
+#: src/client.cpp:1144 src/gui/setup_video.cpp:258
 msgid "Video"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1146 src/gui/setup_theme.cpp:273
+#: src/client.cpp:1147 src/gui/setup_theme.cpp:283
 msgid "Theme"
 msgstr ""
 
@@ -88,7 +88,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1150 src/gui/didyouknowwindow.cpp:78
+#: src/client.cpp:1151 src/gui/didyouknowwindow.cpp:78
 #: src/gui/inventorywindow.cpp:228 src/gui/npcdialog.cpp:63
 #: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:574
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:80
@@ -96,32 +96,32 @@ msgid "Close"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1238
+#: src/client.cpp:1239
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1282
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1320
+#: src/client.cpp:1321
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1431
+#: src/client.cpp:1432
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1471
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1483
+#: src/client.cpp:1484
 msgid "Changing game servers"
 msgstr ""
 
@@ -136,69 +136,69 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1540 src/client.cpp:1551 src/client.cpp:1721
+#: src/client.cpp:1541 src/client.cpp:1552 src/client.cpp:1722
 #: src/gui/changeemaildialog.cpp:168 src/gui/changepassworddialog.cpp:158
-#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:288
-#: src/gui/editserverdialog.cpp:220 src/gui/registerdialog.cpp:263
+#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:290
+#: src/gui/editserverdialog.cpp:216 src/gui/registerdialog.cpp:263
 #: src/gui/unregisterdialog.cpp:143 src/net/ea/charserverhandler.cpp:190
 #: src/net/ea/charserverhandler.cpp:210
 msgid "Error"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1564
+#: src/client.cpp:1565
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1601
+#: src/client.cpp:1602
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1603
+#: src/client.cpp:1604
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1624
+#: src/client.cpp:1625
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1626
+#: src/client.cpp:1627
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1647
+#: src/client.cpp:1648
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1649
+#: src/client.cpp:1650
 msgid "Farewell, come back any time..."
 msgstr ""
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1902 src/client.cpp:1917 src/client.cpp:1960
-#: src/client.cpp:1976 src/client.cpp:2417 src/client.cpp:2425
+#: src/client.cpp:1903 src/client.cpp:1918 src/client.cpp:1961
+#: src/client.cpp:1977 src/client.cpp:2418 src/client.cpp:2426
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2113
+#: src/client.cpp:2114
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2154 src/client.cpp:2161
+#: src/client.cpp:2155 src/client.cpp:2162
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:2183 src/client.cpp:2196
+#: src/client.cpp:2184 src/client.cpp:2197
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -478,19 +478,19 @@ msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: bot checker window header
-#: src/gui/botcheckerwindow.cpp:269
+#: src/gui/botcheckerwindow.cpp:268
 msgid "Bot Checker"
 msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:102
+#: src/gui/botcheckerwindow.cpp:277 src/gui/npcdialog.cpp:102
 msgid "Reset"
 msgstr ""
 
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: relations table header
-#: src/gui/botcheckerwindow.cpp:305 src/gui/setup_relations.cpp:61
+#: src/gui/botcheckerwindow.cpp:304 src/gui/setup_relations.cpp:61
 msgid "Name"
 msgstr ""
 
@@ -498,7 +498,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:145
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:145
 #: src/gui/popupmenu.cpp:241 src/gui/popupmenu.cpp:640
 #: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:257
 #: src/net/tmwa/generalhandler.cpp:292
@@ -508,7 +508,7 @@ msgstr ""
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
-#: src/gui/botcheckerwindow.cpp:309 src/gui/popupmenu.cpp:225
+#: src/gui/botcheckerwindow.cpp:308 src/gui/popupmenu.cpp:225
 #: src/gui/setupactiondata.h:93
 msgid "Talk"
 msgstr ""
@@ -516,7 +516,7 @@ msgstr ""
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/botcheckerwindow.cpp:311 src/gui/popupmenu.cpp:215
+#: src/gui/botcheckerwindow.cpp:310 src/gui/popupmenu.cpp:215
 #: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:371
 #: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:653
 #: src/gui/popupmenu.cpp:727 src/gui/setupactiondata.h:1856
@@ -524,7 +524,7 @@ msgid "Move"
 msgstr ""
 
 #. TRANSLATORS: bot checker window table header
-#: src/gui/botcheckerwindow.cpp:313
+#: src/gui/botcheckerwindow.cpp:312
 msgid "Result"
 msgstr ""
 
@@ -580,7 +580,7 @@ msgstr ""
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:516
+#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:511
 #: src/gui/selldialog.cpp:94 src/gui/selldialog.cpp:342
 #, c-format
 msgid "Price: %s / Total: %s"
@@ -597,9 +597,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:208
-#: src/gui/itemamountwindow.cpp:243 src/gui/npcdialog.cpp:93
-#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:833
+#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:202
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:93
+#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:821
 msgid "+"
 msgstr ""
 
@@ -609,9 +609,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:240 src/gui/npcdialog.cpp:95
-#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:846
+#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:200
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:95
+#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:834
 msgid "-"
 msgstr ""
 
@@ -623,7 +623,7 @@ msgstr ""
 #. TRANSLATORS: input action name
 #: src/gui/buydialog.cpp:260 src/gui/quitdialog.cpp:54
 #: src/gui/quitdialog.cpp:59 src/gui/quitdialog.cpp:61
-#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:255
+#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:264
 #: src/gui/setupactiondata.h:177
 msgid "Quit"
 msgstr ""
@@ -635,7 +635,7 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #: src/gui/buydialog.cpp:262 src/gui/selldialog.cpp:106
 #: src/gui/statuswindow.cpp:558 src/gui/statuswindow.cpp:615
-#: src/gui/statuswindow.cpp:830 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:852
 msgid "Max"
 msgstr ""
 
@@ -680,7 +680,7 @@ msgstr ""
 #: src/gui/buyselldialog.cpp:71 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:120
 #: src/gui/connectiondialog.cpp:48 src/gui/editserverdialog.cpp:80
-#: src/gui/itemamountwindow.cpp:212 src/gui/npcpostdialog.cpp:64
+#: src/gui/itemamountwindow.cpp:206 src/gui/npcpostdialog.cpp:64
 #: src/gui/popupmenu.cpp:290 src/gui/popupmenu.cpp:324
 #: src/gui/popupmenu.cpp:411 src/gui/popupmenu.cpp:454
 #: src/gui/popupmenu.cpp:485 src/gui/popupmenu.cpp:512
@@ -696,7 +696,7 @@ msgstr ""
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
 #: src/gui/setup.cpp:84 src/gui/socialwindow.cpp:1204
 #: src/gui/textcommandeditor.cpp:212 src/gui/textdialog.cpp:53
-#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:167
+#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:183
 msgid "Cancel"
 msgstr ""
 
@@ -860,7 +860,7 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:570
+#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:581
 #: src/gui/socialwindow.cpp:1269
 msgid "Create"
 msgstr ""
@@ -887,17 +887,17 @@ msgid "Please remove %d points"
 msgstr ""
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:60
+#: src/gui/charselectdialog.cpp:61
 msgid "Confirm Character Delete"
 msgstr ""
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:62
+#: src/gui/charselectdialog.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:86
+#: src/gui/charselectdialog.cpp:87
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
@@ -909,8 +909,8 @@ msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:565
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:576
+#: src/gui/updaterwindow.cpp:185
 msgid "Play"
 msgstr ""
 
@@ -926,7 +926,7 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:263
+#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:272
 #: src/gui/setupactiondata.h:1803 src/gui/setup_relations.cpp:262
 #: src/gui/shopwindow.cpp:96 src/gui/shopwindow.cpp:103
 #: src/gui/textcommandeditor.cpp:216
@@ -936,24 +936,24 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/charselectdialog.cpp:129 src/gui/unregisterdialog.cpp:48
+#: src/gui/charselectdialog.cpp:130 src/gui/unregisterdialog.cpp:48
 #: src/gui/unregisterdialog.cpp:53
 msgid "Unregister"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/charselectdialog.cpp:141
+#: src/gui/charselectdialog.cpp:142
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:172
+#: src/gui/charselectdialog.cpp:175
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/charselectdialog.cpp:246
+#: src/gui/charselectdialog.cpp:248
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -963,16 +963,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:288
+#: src/gui/charselectdialog.cpp:290
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password:"
 msgstr ""
 
@@ -1059,13 +1059,13 @@ msgid "Chat"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:735
+#: src/gui/chatwindow.cpp:638
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1165
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -1083,7 +1083,7 @@ msgstr ""
 
 #. TRANSLATORS: confirm dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/confirmdialog.cpp:58 src/gui/popupmenu.cpp:2429
+#: src/gui/confirmdialog.cpp:55 src/gui/popupmenu.cpp:2429
 #: src/gui/popupmenu.cpp:2442 src/gui/popupmenu.cpp:2457
 #: src/gui/popupmenu.cpp:2483
 msgid "Ignore"
@@ -1092,7 +1092,7 @@ msgstr ""
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
 #. TRANSLATORS: settings group
-#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:109
+#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:108
 #: src/gui/setup_other.cpp:123 src/gui/windowmenu.cpp:106
 msgid "Map"
 msgstr ""
@@ -1108,190 +1108,190 @@ msgid "Net"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:265
-#: src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:268
+#: src/gui/debugwindow.cpp:311
 msgid "Music:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:153 src/gui/debugwindow.cpp:271
-#: src/gui/debugwindow.cpp:312
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:274
+#: src/gui/debugwindow.cpp:315
 msgid "Map:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:155 src/gui/debugwindow.cpp:268
-#: src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:271
+#: src/gui/debugwindow.cpp:313
 msgid "Minimap:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:262
-#: src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:161 src/gui/debugwindow.cpp:265
+#: src/gui/debugwindow.cpp:309
 msgid "Cursor:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:161
+#: src/gui/debugwindow.cpp:164
 msgid "Particle count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:284
-#: src/gui/debugwindow.cpp:316
+#: src/gui/debugwindow.cpp:167 src/gui/debugwindow.cpp:287
+#: src/gui/debugwindow.cpp:319
 msgid "Map actors count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:166 src/gui/debugwindow.cpp:243
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:169 src/gui/debugwindow.cpp:246
+#: src/gui/debugwindow.cpp:252
 msgid "Player Position:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:172 src/gui/debugwindow.cpp:297
+#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:300
 msgid "Draw calls:"
 msgstr ""
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:175
+#. TRANSLATORS: debug window label, frames per second
+#: src/gui/debugwindow.cpp:178
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:177 src/gui/debugwindow.cpp:324
+#. TRANSLATORS: debug window label, logic per second
+#: src/gui/debugwindow.cpp:180 src/gui/debugwindow.cpp:327
 #, c-format
 msgid "%d LPS"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:191 src/gui/debugwindow.cpp:209
 #, c-format
 msgid "%d FPS (Software)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:193
+#: src/gui/debugwindow.cpp:196
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:197
+#: src/gui/debugwindow.cpp:200
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:201
+#: src/gui/debugwindow.cpp:204
 #, c-format
 msgid "%d FPS (mobile OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:225 src/gui/debugwindow.cpp:290
+#: src/gui/debugwindow.cpp:228 src/gui/debugwindow.cpp:293
 msgid "Textures count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:279
+#: src/gui/debugwindow.cpp:282
 #, c-format
 msgid "Particle count: %d"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:330 src/gui/debugwindow.cpp:380
-#: src/gui/debugwindow.cpp:442
+#: src/gui/debugwindow.cpp:333 src/gui/debugwindow.cpp:383
+#: src/gui/debugwindow.cpp:445
 msgid "Target:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:332 src/gui/debugwindow.cpp:386
-#: src/gui/debugwindow.cpp:444
+#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
+#: src/gui/debugwindow.cpp:447
 msgid "Target Id:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
-#: src/gui/debugwindow.cpp:446
+#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:392
+#: src/gui/debugwindow.cpp:449
 msgid "Target type:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:337
+#: src/gui/debugwindow.cpp:340
 msgid "Target level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:339 src/gui/debugwindow.cpp:405
+#: src/gui/debugwindow.cpp:342 src/gui/debugwindow.cpp:408
 msgid "Target race:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:341
+#: src/gui/debugwindow.cpp:344
 msgid "Target party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:346
 msgid "Target guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:430
-#: src/gui/debugwindow.cpp:436 src/gui/debugwindow.cpp:454
+#: src/gui/debugwindow.cpp:348 src/gui/debugwindow.cpp:433
+#: src/gui/debugwindow.cpp:439 src/gui/debugwindow.cpp:457
 msgid "Attack delay:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:347 src/gui/debugwindow.cpp:417
-#: src/gui/debugwindow.cpp:456
+#: src/gui/debugwindow.cpp:350 src/gui/debugwindow.cpp:420
+#: src/gui/debugwindow.cpp:459
 msgid "Minimal hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:349 src/gui/debugwindow.cpp:420
-#: src/gui/debugwindow.cpp:458
+#: src/gui/debugwindow.cpp:352 src/gui/debugwindow.cpp:423
+#: src/gui/debugwindow.cpp:461
 msgid "Maximum hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:351 src/gui/debugwindow.cpp:423
-#: src/gui/debugwindow.cpp:460
+#: src/gui/debugwindow.cpp:354 src/gui/debugwindow.cpp:426
+#: src/gui/debugwindow.cpp:463
 msgid "Critical hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:394 src/gui/debugwindow.cpp:400
-#: src/gui/debugwindow.cpp:448
+#: src/gui/debugwindow.cpp:397 src/gui/debugwindow.cpp:403
+#: src/gui/debugwindow.cpp:451
 msgid "Target Level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:408 src/gui/debugwindow.cpp:450
+#: src/gui/debugwindow.cpp:411 src/gui/debugwindow.cpp:453
 msgid "Target Party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:412 src/gui/debugwindow.cpp:452
+#: src/gui/debugwindow.cpp:415 src/gui/debugwindow.cpp:455
 msgid "Target Guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:493
+#: src/gui/debugwindow.cpp:496
 #, c-format
 msgid "Ping: %s ms"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:496
+#: src/gui/debugwindow.cpp:499
 #, c-format
 msgid "In: %d bytes/s"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:499
+#: src/gui/debugwindow.cpp:502
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
@@ -1323,7 +1323,7 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #: src/gui/editdialog.cpp:45 src/gui/editserverdialog.cpp:78
-#: src/gui/itemamountwindow.cpp:210 src/gui/okdialog.cpp:51
+#: src/gui/itemamountwindow.cpp:204 src/gui/okdialog.cpp:51
 #: src/gui/quitdialog.cpp:70 src/gui/textdialog.cpp:46
 msgid "OK"
 msgstr ""
@@ -1335,7 +1335,7 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:257
+#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:266
 msgid "Connect"
 msgstr ""
 
@@ -1365,7 +1365,7 @@ msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/editserverdialog.cpp:222
+#: src/gui/editserverdialog.cpp:218
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -1417,7 +1417,7 @@ msgstr ""
 #: src/gui/inventorywindow.cpp:178 src/gui/inventorywindow.cpp:630
 #: src/gui/popupmenu.cpp:1843 src/gui/popupmenu.cpp:1922
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2041
-#: src/gui/skilldialog.cpp:277
+#: src/gui/skilldialog.cpp:279
 msgid "Use"
 msgstr ""
 
@@ -1451,7 +1451,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: setup button
-#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:718
+#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:719
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1992
 #: src/gui/popupmenu.cpp:2066 src/gui/setup.cpp:86
 msgid "Store"
@@ -1473,47 +1473,47 @@ msgid "Drop"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/itemamountwindow.cpp:214
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:264
 msgid "Select amount of items to trade."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:274
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to drop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:278
+#: src/gui/itemamountwindow.cpp:272
 msgid "Select amount of items to store."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:276
 msgid "Select amount of items to retrieve."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:286
+#: src/gui/itemamountwindow.cpp:280
 msgid "Select amount of items to split."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:290
+#: src/gui/itemamountwindow.cpp:284
 msgid "Add to buy shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:294
+#: src/gui/itemamountwindow.cpp:288
 msgid "Add to sell shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:298
+#: src/gui/itemamountwindow.cpp:292
 msgid "Unknown."
 msgstr ""
 
@@ -1540,7 +1540,7 @@ msgstr ""
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:58 src/gui/killstats.cpp:171
-#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:516
+#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:509
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
@@ -1548,7 +1548,7 @@ msgstr ""
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:61 src/gui/killstats.cpp:173
 #: src/gui/killstats.cpp:253 src/gui/killstats.cpp:268
-#: src/gui/killstats.cpp:518
+#: src/gui/killstats.cpp:511
 #, c-format
 msgid "Avg Exp: %s"
 msgstr ""
@@ -1556,14 +1556,14 @@ msgstr ""
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:63 src/gui/killstats.cpp:176
 #: src/gui/killstats.cpp:258 src/gui/killstats.cpp:272
-#: src/gui/killstats.cpp:521
+#: src/gui/killstats.cpp:514
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:66 src/gui/killstats.cpp:187
-#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:524
+#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:517
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
@@ -1591,9 +1591,9 @@ msgid "Last kill exp:"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:414
-#: src/gui/killstats.cpp:421 src/gui/killstats.cpp:428
-#: src/gui/killstats.cpp:434
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:408
+#: src/gui/killstats.cpp:415 src/gui/killstats.cpp:422
+#: src/gui/killstats.cpp:428
 msgid "Time before jacko spawn:"
 msgstr ""
 
@@ -1625,12 +1625,12 @@ msgid "  Time for next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:421
+#: src/gui/killstats.cpp:415
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:428
+#: src/gui/killstats.cpp:422
 msgid "jacko spawning"
 msgstr ""
 
@@ -1736,32 +1736,32 @@ msgid "arrows bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:88
+#: src/gui/ministatuswindow.cpp:89
 msgid "status bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:108
+#: src/gui/ministatuswindow.cpp:109
 msgid "job bar"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:306 src/gui/statuswindow.cpp:298
+#: src/gui/ministatuswindow.cpp:307 src/gui/statuswindow.cpp:298
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:313 src/gui/statuswindow.cpp:141
+#: src/gui/ministatuswindow.cpp:314 src/gui/statuswindow.cpp:141
 #: src/gui/statuswindow.cpp:305 src/gui/statuswindow.cpp:375
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
 #. TRANSLATORS: status bar label
-#: src/gui/ministatuswindow.cpp:330 src/gui/ministatuswindow.cpp:367
+#: src/gui/ministatuswindow.cpp:331 src/gui/ministatuswindow.cpp:368
 msgid "Need"
 msgstr ""
 
@@ -2149,7 +2149,7 @@ msgstr ""
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2209 src/gui/popupmenu.cpp:2280
-#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:139
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
 #: src/gui/socialwindow.cpp:934
 msgid "(default)"
 msgstr ""
@@ -2332,7 +2332,7 @@ msgid "Passwords do not match."
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:257
 msgid "Choose Your Server"
 msgstr ""
 
@@ -2340,61 +2340,61 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:259 src/gui/shopwindow.cpp:94
+#: src/gui/serverdialog.cpp:268 src/gui/shopwindow.cpp:94
 #: src/gui/shopwindow.cpp:101 src/gui/tradewindow.cpp:77
 msgid "Add"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
-#: src/gui/serverdialog.cpp:261 src/gui/widgets/setupitem.cpp:299
+#: src/gui/serverdialog.cpp:270 src/gui/widgets/setupitem.cpp:299
 #: src/gui/widgets/setupitem.cpp:426
 msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:274
 msgid "Load"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:279
+#: src/gui/serverdialog.cpp:288
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:297
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:518
+#: src/gui/serverdialog.cpp:527
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:524
+#: src/gui/serverdialog.cpp:533
 msgid "Waiting for server..."
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:529
+#: src/gui/serverdialog.cpp:538
 msgid "Preparing download"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:534
+#: src/gui/serverdialog.cpp:543
 msgid "Error retreiving server list!"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:626
+#: src/gui/serverdialog.cpp:635
 msgid "requires a newer version"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:631
+#: src/gui/serverdialog.cpp:640
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -3405,7 +3405,7 @@ msgid "Type:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:334
+#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:336
 msgid "Delay:"
 msgstr ""
 
@@ -3425,30 +3425,30 @@ msgid "Blue:"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:420
+#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:422
 msgid "Static"
 msgstr ""
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:107 src/gui/setup_colors.cpp:110
-#: src/gui/setup_colors.cpp:422
+#: src/gui/setup_colors.cpp:424
 msgid "Pulse"
 msgstr ""
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:112 src/gui/setup_colors.cpp:115
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Rainbow"
 msgstr ""
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:117 src/gui/setup_colors.cpp:120
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Spectrum"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:328
+#: src/gui/setup_colors.cpp:330
 msgid "Alpha:"
 msgstr ""
 
@@ -3614,7 +3614,7 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: palette color
-#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:134
+#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:135
 msgid "Monsters"
 msgstr ""
 
@@ -4163,206 +4163,231 @@ msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:86
-msgid "Very small (9)"
+msgid "Very small (8)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:88
-msgid "Tiny (10)"
+msgid "Very small (9)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:90
-msgid "Small (11)"
+msgid "Tiny (10)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:92
-msgid "Medium (12)"
+msgid "Small (11)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:94
-msgid "Normal (13)"
+msgid "Medium (12)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:96
-msgid "Large (14)"
+msgid "Normal (13)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:98
-msgid "Very large (15)"
+msgid "Large (14)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:100
-msgid "Big (16)"
+msgid "Large (15)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:102
-msgid "Very big (17)"
+msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:104
-msgid "Huge (18)"
+msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:106
-msgid "Very huge (19)"
+msgid "Big (18)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:108
+msgid "Big (19)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:110
+msgid "Very big (20)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:112
+msgid "Very big (21)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:114
+msgid "Very big (22)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:116
+msgid "Huge (23)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:151
 msgid "Chinese (China)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:153
 msgid "Czech"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:155
 msgid "English"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:157
 msgid "Finnish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:159
 msgid "French"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:161
 msgid "German"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:153
+#: src/gui/setup_theme.cpp:163
 msgid "Indonesian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:155
+#: src/gui/setup_theme.cpp:165
 msgid "Italian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:157
+#: src/gui/setup_theme.cpp:167
 msgid "Polish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:159
+#: src/gui/setup_theme.cpp:169
 msgid "Japanese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:161
+#: src/gui/setup_theme.cpp:171
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:163
+#: src/gui/setup_theme.cpp:173
 msgid "Portuguese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:165
+#: src/gui/setup_theme.cpp:175
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:167
+#: src/gui/setup_theme.cpp:177
 msgid "Russian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:169
+#: src/gui/setup_theme.cpp:179
 msgid "Spanish (Castilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:171
+#: src/gui/setup_theme.cpp:181
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:223
+#: src/gui/setup_theme.cpp:233
 msgid "Gui theme"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:230
+#: src/gui/setup_theme.cpp:240
 msgid "Main Font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:235
+#: src/gui/setup_theme.cpp:245
 msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:239
+#: src/gui/setup_theme.cpp:249
 msgid "Bold font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:243
+#: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:247
+#: src/gui/setup_theme.cpp:257
 msgid "Help font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:251
+#: src/gui/setup_theme.cpp:261
 msgid "Secure font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:255
+#: src/gui/setup_theme.cpp:265
 msgid "Japanese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:260
+#: src/gui/setup_theme.cpp:270
 msgid "Font size"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:265
+#: src/gui/setup_theme.cpp:275
 msgid "Npc font size"
 msgstr ""
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/setup_theme.cpp:269
+#: src/gui/setup_theme.cpp:279
 msgid "i"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/setup_theme.cpp:442
+#: src/gui/setup_theme.cpp:452
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/setup_theme.cpp:467
+#: src/gui/setup_theme.cpp:477
 msgid "Theme Changed"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/setup_theme.cpp:467 src/gui/setup_video.cpp:537
+#: src/gui/setup_theme.cpp:477 src/gui/setup_video.cpp:537
 #: src/gui/setup_video.cpp:546
 msgid "Restart your client for the change to take effect."
 msgstr ""
@@ -4660,7 +4685,8 @@ msgid "Ambient FX"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_visual.cpp:140
+#. TRANSLATORS: palette color
+#: src/gui/setup_visual.cpp:140 src/gui/userpalette.cpp:146
 msgid "Particle effects"
 msgstr ""
 
@@ -4747,45 +4773,45 @@ msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/skilldialog.cpp:270 src/gui/windowmenu.cpp:112
+#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:112
 msgid "Skills"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/skilldialog.cpp:279
+#: src/gui/skilldialog.cpp:281
 msgid "Up"
 msgstr ""
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/skilldialog.cpp:391
+#: src/gui/skilldialog.cpp:393
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skills tab
-#: src/gui/skilldialog.cpp:444
+#: src/gui/skilldialog.cpp:446
 msgid "basic"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill name
-#: src/gui/skilldialog.cpp:447
+#: src/gui/skilldialog.cpp:449
 msgid "basic, 1"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/skilldialog.cpp:484
+#: src/gui/skilldialog.cpp:486
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/skilldialog.cpp:518
+#: src/gui/skilldialog.cpp:520
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/skilldialog.cpp:612 src/gui/skilldialog.cpp:762
+#: src/gui/skilldialog.cpp:614 src/gui/skilldialog.cpp:764
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -5228,7 +5254,7 @@ msgid "Trade: You"
 msgstr ""
 
 #. TRANSLATORS: trade window money label
-#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:182
+#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:184
 #, c-format
 msgid "You get %s"
 msgstr ""
@@ -5244,12 +5270,12 @@ msgid "You give:"
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:393
+#: src/gui/tradewindow.cpp:396
 msgid "You don't have enough money."
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:475
+#: src/gui/tradewindow.cpp:479
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
@@ -5261,223 +5287,223 @@ msgid "Name: %s"
 msgstr ""
 
 #. TRANSLATORS: updater window name
-#: src/gui/updaterwindow.cpp:140
+#: src/gui/updaterwindow.cpp:156
 msgid "Updating..."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:165
+#: src/gui/updaterwindow.cpp:181
 msgid "Connecting..."
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/updaterwindow.cpp:656
+#: src/gui/updaterwindow.cpp:672
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/updaterwindow.cpp:658
+#: src/gui/updaterwindow.cpp:674
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:660
+#: src/gui/updaterwindow.cpp:676
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:839
+#: src/gui/updaterwindow.cpp:855
 msgid "Completed"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
 msgid "Being"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:118
-msgid "Friend Names"
+#: src/gui/userpalette.cpp:119
+msgid "Friend names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:120
-msgid "Disregarded Names"
+#: src/gui/userpalette.cpp:121
+msgid "Disregarded names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:122
-msgid "Ignored Names"
+#: src/gui/userpalette.cpp:123
+msgid "Ignored names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:124
-msgid "Erased Names"
+#: src/gui/userpalette.cpp:125
+msgid "Erased names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:126
-msgid "Other Players' Names"
+#: src/gui/userpalette.cpp:127
+msgid "Other players names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:128
-msgid "Own Name"
+#: src/gui/userpalette.cpp:129
+msgid "Own name"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:130
-msgid "GM Names"
+#: src/gui/userpalette.cpp:131
+msgid "GM names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
 msgid "NPCs"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
 msgid "Monster HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:140
 msgid "Monster HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:141
-msgid "Party Members"
+#: src/gui/userpalette.cpp:142
+msgid "Party members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:143
-msgid "Guild Members"
+#: src/gui/userpalette.cpp:144
+msgid "Guild members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:145
-msgid "Particle Effects"
+#: src/gui/userpalette.cpp:148
+msgid "Pickup notification"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:147
-msgid "Pickup Notification"
+#: src/gui/userpalette.cpp:150
+msgid "Exp notification"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:149
-msgid "Exp Notification"
-msgstr ""
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
 msgid "Player HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
 msgid "Player HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:157
-msgid "Player Hits Monster"
+#: src/gui/userpalette.cpp:158
+msgid "Player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:159
-msgid "Monster Hits Player"
+#: src/gui/userpalette.cpp:160
+msgid "Monster hits player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:163
-msgid "Other Player Hits Local Player"
+#: src/gui/userpalette.cpp:164
+msgid "Other player hits local player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:166
 msgid "Critical Hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
-msgid "Local Player Hits Monster"
+#: src/gui/userpalette.cpp:170
+msgid "Local player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:172
-msgid "Local Player Critical Hit"
+#: src/gui/userpalette.cpp:173
+msgid "Local player critical hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:175
-msgid "Local Player Miss"
+#: src/gui/userpalette.cpp:176
+msgid "Local player miss"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:177
+#: src/gui/userpalette.cpp:178
 msgid "Misses"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
-msgid "Portal Highlight"
+#: src/gui/userpalette.cpp:180
+msgid "Portal highlight"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:183
+msgid "Default collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:182
-msgid "Default collision Highlight"
+#: src/gui/userpalette.cpp:186
+msgid "Air collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:185
-msgid "Air collision Highlight"
+#: src/gui/userpalette.cpp:189
+msgid "Water collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:188
-msgid "Water collision Highlight"
+#: src/gui/userpalette.cpp:192
+msgid "Special ground collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:191
-msgid "Special ground collision Highlight"
+#: src/gui/userpalette.cpp:195
+msgid "Walkable highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
-msgid "Walkable Highlight"
+#: src/gui/userpalette.cpp:198
+msgid "Local player attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:197
-msgid "Local Player Attack Range"
+#: src/gui/userpalette.cpp:201
+msgid "Local player attack range border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:200
-msgid "Local Player Attack Range Border"
+#: src/gui/userpalette.cpp:204
+msgid "Monster attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:203
-msgid "Monster Attack Range"
+#: src/gui/userpalette.cpp:208
+msgid "Floor item amount color"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:206
-msgid "Home Place"
+#: src/gui/userpalette.cpp:211
+msgid "Home place"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:209
-msgid "Home Place Border"
+#: src/gui/userpalette.cpp:214
+msgid "Home place border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:212
-msgid "Road Point"
+#: src/gui/userpalette.cpp:217
+msgid "Road point"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
@@ -5607,7 +5633,7 @@ msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:315
+#: src/gui/widgets/itemcontainer.cpp:317
 msgid "Eq."
 msgstr ""
 
diff --git a/po/es.po b/po/es.po
index 03fcff1cc..b8f86c0fe 100644
--- a/po/es.po
+++ b/po/es.po
@@ -17,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-05-03 12:38+0300\n"
-"PO-Revision-Date: 2013-05-03 09:44+0000\n"
+"POT-Creation-Date: 2013-05-11 12:13+0300\n"
+"PO-Revision-Date: 2013-05-10 15:39+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/manaplus/"
 "language/es/)\n"
@@ -69,25 +69,25 @@ msgstr "I"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: full button name
-#: src/client.cpp:1136 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
+#: src/client.cpp:1137 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
 msgid "Setup"
 msgstr "Configuración"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1140 src/gui/setup_perfomance.cpp:61
+#: src/client.cpp:1141 src/gui/setup_perfomance.cpp:61
 msgid "Perfomance"
 msgstr "Rendimiento"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:1143 src/gui/setup_video.cpp:258
+#: src/client.cpp:1144 src/gui/setup_video.cpp:258
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1146 src/gui/setup_theme.cpp:273
+#: src/client.cpp:1147 src/gui/setup_theme.cpp:283
 msgid "Theme"
 msgstr "Tema"
 
@@ -98,7 +98,7 @@ msgstr "Tema"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1150 src/gui/didyouknowwindow.cpp:78
+#: src/client.cpp:1151 src/gui/didyouknowwindow.cpp:78
 #: src/gui/inventorywindow.cpp:228 src/gui/npcdialog.cpp:63
 #: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:574
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:80
@@ -106,32 +106,32 @@ msgid "Close"
 msgstr "Cerrar"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1238
+#: src/client.cpp:1239
 msgid "Connecting to server"
 msgstr "Conectando al servidor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1282
 msgid "Logging in"
 msgstr "Accediendo a la cuenta"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1320
+#: src/client.cpp:1321
 msgid "Entering game world"
 msgstr "Entrando al mundo del juego"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1431
+#: src/client.cpp:1432
 msgid "Requesting characters"
 msgstr "Cargando personajes"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1471
 msgid "Connecting to the game server"
 msgstr "Conectando al servidor del juego"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1483
+#: src/client.cpp:1484
 msgid "Changing game servers"
 msgstr "Cambiando servidores del juego"
 
@@ -146,69 +146,69 @@ msgstr "Cambiando servidores del juego"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1540 src/client.cpp:1551 src/client.cpp:1721
+#: src/client.cpp:1541 src/client.cpp:1552 src/client.cpp:1722
 #: src/gui/changeemaildialog.cpp:168 src/gui/changepassworddialog.cpp:158
-#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:288
-#: src/gui/editserverdialog.cpp:220 src/gui/registerdialog.cpp:263
+#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:290
+#: src/gui/editserverdialog.cpp:216 src/gui/registerdialog.cpp:263
 #: src/gui/unregisterdialog.cpp:143 src/net/ea/charserverhandler.cpp:190
 #: src/net/ea/charserverhandler.cpp:210
 msgid "Error"
 msgstr "Error"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1564
+#: src/client.cpp:1565
 msgid "Requesting registration details"
 msgstr "Solicitando detalles de registro"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1601
+#: src/client.cpp:1602
 msgid "Password Change"
 msgstr "Cambio de contraseña"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1603
+#: src/client.cpp:1604
 msgid "Password changed successfully!"
 msgstr "¡Contraseña cambiada exitosamente!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1624
+#: src/client.cpp:1625
 msgid "Email Change"
 msgstr "Cambio de Email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1626
+#: src/client.cpp:1627
 msgid "Email changed successfully!"
 msgstr "¡Email modificado exitosamente!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1647
+#: src/client.cpp:1648
 msgid "Unregister Successful"
 msgstr "Registro cancelado"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1649
+#: src/client.cpp:1650
 msgid "Farewell, come back any time..."
 msgstr "Adiós, vuelve cuando quieras..."
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1902 src/client.cpp:1917 src/client.cpp:1960
-#: src/client.cpp:1976 src/client.cpp:2417 src/client.cpp:2425
+#: src/client.cpp:1903 src/client.cpp:1918 src/client.cpp:1961
+#: src/client.cpp:1977 src/client.cpp:2418 src/client.cpp:2426
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "¡%s no existe y no puede ser creado! Saliendo."
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2113
+#: src/client.cpp:2114
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Servidor de actualización inválido: %s"
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2154 src/client.cpp:2161
+#: src/client.cpp:2155 src/client.cpp:2162
 msgid "Error creating updates directory!"
 msgstr "¡Error al crear la carpeta de actualizaciones!"
 
-#: src/client.cpp:2183 src/client.cpp:2196
+#: src/client.cpp:2184 src/client.cpp:2197
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Error: ¡%s no existe y no puede ser creado! Saliendo."
@@ -491,19 +491,19 @@ msgid "Comment: %s"
 msgstr "Comentario: %s"
 
 #. TRANSLATORS: bot checker window header
-#: src/gui/botcheckerwindow.cpp:269
+#: src/gui/botcheckerwindow.cpp:268
 msgid "Bot Checker"
 msgstr "Inspector de Bot"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:102
+#: src/gui/botcheckerwindow.cpp:277 src/gui/npcdialog.cpp:102
 msgid "Reset"
 msgstr "Restablecer"
 
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: relations table header
-#: src/gui/botcheckerwindow.cpp:305 src/gui/setup_relations.cpp:61
+#: src/gui/botcheckerwindow.cpp:304 src/gui/setup_relations.cpp:61
 msgid "Name"
 msgstr "Nombre"
 
@@ -511,7 +511,7 @@ msgstr "Nombre"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:145
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:145
 #: src/gui/popupmenu.cpp:241 src/gui/popupmenu.cpp:640
 #: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:257
 #: src/net/tmwa/generalhandler.cpp:292
@@ -521,7 +521,7 @@ msgstr "Atacar"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
-#: src/gui/botcheckerwindow.cpp:309 src/gui/popupmenu.cpp:225
+#: src/gui/botcheckerwindow.cpp:308 src/gui/popupmenu.cpp:225
 #: src/gui/setupactiondata.h:93
 msgid "Talk"
 msgstr "Hablar"
@@ -529,7 +529,7 @@ msgstr "Hablar"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/botcheckerwindow.cpp:311 src/gui/popupmenu.cpp:215
+#: src/gui/botcheckerwindow.cpp:310 src/gui/popupmenu.cpp:215
 #: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:371
 #: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:653
 #: src/gui/popupmenu.cpp:727 src/gui/setupactiondata.h:1856
@@ -537,7 +537,7 @@ msgid "Move"
 msgstr "Mover"
 
 #. TRANSLATORS: bot checker window table header
-#: src/gui/botcheckerwindow.cpp:313
+#: src/gui/botcheckerwindow.cpp:312
 msgid "Result"
 msgstr "Resultado"
 
@@ -593,7 +593,7 @@ msgstr "Comprar"
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:516
+#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:511
 #: src/gui/selldialog.cpp:94 src/gui/selldialog.cpp:342
 #, c-format
 msgid "Price: %s / Total: %s"
@@ -610,9 +610,9 @@ msgstr "Cantidad:"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:208
-#: src/gui/itemamountwindow.cpp:243 src/gui/npcdialog.cpp:93
-#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:833
+#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:202
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:93
+#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:821
 msgid "+"
 msgstr "+"
 
@@ -622,9 +622,9 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:240 src/gui/npcdialog.cpp:95
-#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:846
+#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:200
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:95
+#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:834
 msgid "-"
 msgstr "-"
 
@@ -636,7 +636,7 @@ msgstr "-"
 #. TRANSLATORS: input action name
 #: src/gui/buydialog.cpp:260 src/gui/quitdialog.cpp:54
 #: src/gui/quitdialog.cpp:59 src/gui/quitdialog.cpp:61
-#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:255
+#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:264
 #: src/gui/setupactiondata.h:177
 msgid "Quit"
 msgstr "Salir"
@@ -648,7 +648,7 @@ msgstr "Salir"
 #. TRANSLATORS: status bar label
 #: src/gui/buydialog.cpp:262 src/gui/selldialog.cpp:106
 #: src/gui/statuswindow.cpp:558 src/gui/statuswindow.cpp:615
-#: src/gui/statuswindow.cpp:830 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:852
 msgid "Max"
 msgstr "Máximo"
 
@@ -693,7 +693,7 @@ msgstr "Vender"
 #: src/gui/buyselldialog.cpp:71 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:120
 #: src/gui/connectiondialog.cpp:48 src/gui/editserverdialog.cpp:80
-#: src/gui/itemamountwindow.cpp:212 src/gui/npcpostdialog.cpp:64
+#: src/gui/itemamountwindow.cpp:206 src/gui/npcpostdialog.cpp:64
 #: src/gui/popupmenu.cpp:290 src/gui/popupmenu.cpp:324
 #: src/gui/popupmenu.cpp:411 src/gui/popupmenu.cpp:454
 #: src/gui/popupmenu.cpp:485 src/gui/popupmenu.cpp:512
@@ -709,7 +709,7 @@ msgstr "Vender"
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
 #: src/gui/setup.cpp:84 src/gui/socialwindow.cpp:1204
 #: src/gui/textcommandeditor.cpp:212 src/gui/textdialog.cpp:53
-#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:167
+#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:183
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -877,7 +877,7 @@ msgstr "Por favor, distribuye %d puntos"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:570
+#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:581
 #: src/gui/socialwindow.cpp:1269
 msgid "Create"
 msgstr "Crear"
@@ -904,17 +904,17 @@ msgid "Please remove %d points"
 msgstr "Por favor, borra %d puntos"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:60
+#: src/gui/charselectdialog.cpp:61
 msgid "Confirm Character Delete"
 msgstr "Confirmar la eliminación del personaje"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:62
+#: src/gui/charselectdialog.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "¿Estás seguro de que deseas borrar este personaje?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:86
+#: src/gui/charselectdialog.cpp:87
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
@@ -926,8 +926,8 @@ msgstr "Volver al Login"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:565
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:576
+#: src/gui/updaterwindow.cpp:185
 msgid "Play"
 msgstr "Jugar"
 
@@ -943,7 +943,7 @@ msgstr "Información"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:263
+#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:272
 #: src/gui/setupactiondata.h:1803 src/gui/setup_relations.cpp:262
 #: src/gui/shopwindow.cpp:96 src/gui/shopwindow.cpp:103
 #: src/gui/textcommandeditor.cpp:216
@@ -953,24 +953,24 @@ msgstr "Borrar"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/charselectdialog.cpp:129 src/gui/unregisterdialog.cpp:48
+#: src/gui/charselectdialog.cpp:130 src/gui/unregisterdialog.cpp:48
 #: src/gui/unregisterdialog.cpp:53
 msgid "Unregister"
 msgstr "Cancelar Registro"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/charselectdialog.cpp:141
+#: src/gui/charselectdialog.cpp:142
 msgid "Change Email"
 msgstr "Cambiar Correo Electrónico"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:172
+#: src/gui/charselectdialog.cpp:175
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/charselectdialog.cpp:246
+#: src/gui/charselectdialog.cpp:248
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -980,16 +980,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:288
+#: src/gui/charselectdialog.cpp:290
 msgid "Incorrect password"
 msgstr "Contraseña incorrecta"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password for deleting character"
 msgstr "Ingrese la contraseña para borrar el personaje"
 
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password:"
 msgstr "Ingrese contraseña:"
 
@@ -1076,13 +1076,13 @@ msgid "Chat"
 msgstr "Chat"
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:735
+#: src/gui/chatwindow.cpp:638
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presentes: %s; %d jugadores están presentes."
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1165
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Susurrando a %s: %s"
@@ -1100,7 +1100,7 @@ msgstr "No"
 
 #. TRANSLATORS: confirm dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/confirmdialog.cpp:58 src/gui/popupmenu.cpp:2429
+#: src/gui/confirmdialog.cpp:55 src/gui/popupmenu.cpp:2429
 #: src/gui/popupmenu.cpp:2442 src/gui/popupmenu.cpp:2457
 #: src/gui/popupmenu.cpp:2483
 msgid "Ignore"
@@ -1109,7 +1109,7 @@ msgstr "Ignorar"
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
 #. TRANSLATORS: settings group
-#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:109
+#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:108
 #: src/gui/setup_other.cpp:123 src/gui/windowmenu.cpp:106
 msgid "Map"
 msgstr "Mapa"
@@ -1125,190 +1125,190 @@ msgid "Net"
 msgstr "Red"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:265
-#: src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:268
+#: src/gui/debugwindow.cpp:311
 msgid "Music:"
 msgstr "Música:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:153 src/gui/debugwindow.cpp:271
-#: src/gui/debugwindow.cpp:312
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:274
+#: src/gui/debugwindow.cpp:315
 msgid "Map:"
 msgstr "Mapa:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:155 src/gui/debugwindow.cpp:268
-#: src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:271
+#: src/gui/debugwindow.cpp:313
 msgid "Minimap:"
 msgstr "Minimapa:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:262
-#: src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:161 src/gui/debugwindow.cpp:265
+#: src/gui/debugwindow.cpp:309
 msgid "Cursor:"
 msgstr "Cursor:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:161
+#: src/gui/debugwindow.cpp:164
 msgid "Particle count:"
 msgstr "Recuento de partículas:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:284
-#: src/gui/debugwindow.cpp:316
+#: src/gui/debugwindow.cpp:167 src/gui/debugwindow.cpp:287
+#: src/gui/debugwindow.cpp:319
 msgid "Map actors count:"
 msgstr "Numero de agentes en el mapa:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:166 src/gui/debugwindow.cpp:243
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:169 src/gui/debugwindow.cpp:246
+#: src/gui/debugwindow.cpp:252
 msgid "Player Position:"
 msgstr "Posición del jugador:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:172 src/gui/debugwindow.cpp:297
+#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:300
 msgid "Draw calls:"
 msgstr "Dibujar llamadas:"
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:175
+#. TRANSLATORS: debug window label, frames per second
+#: src/gui/debugwindow.cpp:178
 #, c-format
 msgid "%d FPS"
 msgstr "%d FPS"
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:177 src/gui/debugwindow.cpp:324
+#. TRANSLATORS: debug window label, logic per second
+#: src/gui/debugwindow.cpp:180 src/gui/debugwindow.cpp:327
 #, c-format
 msgid "%d LPS"
 msgstr "%d LPS"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:191 src/gui/debugwindow.cpp:209
 #, c-format
 msgid "%d FPS (Software)"
 msgstr "%d FPS (Software)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:193
+#: src/gui/debugwindow.cpp:196
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr "%d FPS (OpenGL rápido)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:197
+#: src/gui/debugwindow.cpp:200
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr "%d FPS (OpenGL antiguo)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:201
+#: src/gui/debugwindow.cpp:204
 #, c-format
 msgid "%d FPS (mobile OpenGL)"
 msgstr "%d FPS (OpenGL móvil)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:225 src/gui/debugwindow.cpp:290
+#: src/gui/debugwindow.cpp:228 src/gui/debugwindow.cpp:293
 msgid "Textures count:"
 msgstr "Contador de Texturas:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:279
+#: src/gui/debugwindow.cpp:282
 #, c-format
 msgid "Particle count: %d"
 msgstr "Recuento de partículas: %d"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:330 src/gui/debugwindow.cpp:380
-#: src/gui/debugwindow.cpp:442
+#: src/gui/debugwindow.cpp:333 src/gui/debugwindow.cpp:383
+#: src/gui/debugwindow.cpp:445
 msgid "Target:"
 msgstr "Objetivo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:332 src/gui/debugwindow.cpp:386
-#: src/gui/debugwindow.cpp:444
+#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
+#: src/gui/debugwindow.cpp:447
 msgid "Target Id:"
 msgstr "Id de Objetivo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
-#: src/gui/debugwindow.cpp:446
+#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:392
+#: src/gui/debugwindow.cpp:449
 msgid "Target type:"
 msgstr "Tipo de objetivo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:337
+#: src/gui/debugwindow.cpp:340
 msgid "Target level:"
 msgstr "Nivel del objetivo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:339 src/gui/debugwindow.cpp:405
+#: src/gui/debugwindow.cpp:342 src/gui/debugwindow.cpp:408
 msgid "Target race:"
 msgstr "Raza del objetivo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:341
+#: src/gui/debugwindow.cpp:344
 msgid "Target party:"
 msgstr "Grupo de objetivo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:346
 msgid "Target guild:"
 msgstr "Gremio del objetivo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:430
-#: src/gui/debugwindow.cpp:436 src/gui/debugwindow.cpp:454
+#: src/gui/debugwindow.cpp:348 src/gui/debugwindow.cpp:433
+#: src/gui/debugwindow.cpp:439 src/gui/debugwindow.cpp:457
 msgid "Attack delay:"
 msgstr "Retraso de ataque:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:347 src/gui/debugwindow.cpp:417
-#: src/gui/debugwindow.cpp:456
+#: src/gui/debugwindow.cpp:350 src/gui/debugwindow.cpp:420
+#: src/gui/debugwindow.cpp:459
 msgid "Minimal hit:"
 msgstr "Golpe mínimo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:349 src/gui/debugwindow.cpp:420
-#: src/gui/debugwindow.cpp:458
+#: src/gui/debugwindow.cpp:352 src/gui/debugwindow.cpp:423
+#: src/gui/debugwindow.cpp:461
 msgid "Maximum hit:"
 msgstr "Golpe máximo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:351 src/gui/debugwindow.cpp:423
-#: src/gui/debugwindow.cpp:460
+#: src/gui/debugwindow.cpp:354 src/gui/debugwindow.cpp:426
+#: src/gui/debugwindow.cpp:463
 msgid "Critical hit:"
 msgstr "Golpe crítico:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:394 src/gui/debugwindow.cpp:400
-#: src/gui/debugwindow.cpp:448
+#: src/gui/debugwindow.cpp:397 src/gui/debugwindow.cpp:403
+#: src/gui/debugwindow.cpp:451
 msgid "Target Level:"
 msgstr "Nivel del Objetivo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:408 src/gui/debugwindow.cpp:450
+#: src/gui/debugwindow.cpp:411 src/gui/debugwindow.cpp:453
 msgid "Target Party:"
 msgstr "Grupo del Objetivo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:412 src/gui/debugwindow.cpp:452
+#: src/gui/debugwindow.cpp:415 src/gui/debugwindow.cpp:455
 msgid "Target Guild:"
 msgstr "Clan del Objetivo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:493
+#: src/gui/debugwindow.cpp:496
 #, c-format
 msgid "Ping: %s ms"
 msgstr "Ping: %s ms"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:496
+#: src/gui/debugwindow.cpp:499
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "Recibiendo: %d bytes/s"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:499
+#: src/gui/debugwindow.cpp:502
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "Enviando: %d bytes/s"
@@ -1340,7 +1340,7 @@ msgstr "Abrir automáticamente esta ventana"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #: src/gui/editdialog.cpp:45 src/gui/editserverdialog.cpp:78
-#: src/gui/itemamountwindow.cpp:210 src/gui/okdialog.cpp:51
+#: src/gui/itemamountwindow.cpp:204 src/gui/okdialog.cpp:51
 #: src/gui/quitdialog.cpp:70 src/gui/textdialog.cpp:46
 msgid "OK"
 msgstr "OK"
@@ -1352,7 +1352,7 @@ msgstr "Editar Servidor"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:257
+#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:266
 msgid "Connect"
 msgstr "Conectar"
 
@@ -1382,7 +1382,7 @@ msgid "Online list url:"
 msgstr "URL de lista de conectados:"
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/editserverdialog.cpp:222
+#: src/gui/editserverdialog.cpp:218
 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."
@@ -1435,7 +1435,7 @@ msgstr "Equipar"
 #: src/gui/inventorywindow.cpp:178 src/gui/inventorywindow.cpp:630
 #: src/gui/popupmenu.cpp:1843 src/gui/popupmenu.cpp:1922
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2041
-#: src/gui/skilldialog.cpp:277
+#: src/gui/skilldialog.cpp:279
 msgid "Use"
 msgstr "Usar"
 
@@ -1469,7 +1469,7 @@ msgstr "Conjuntos"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: setup button
-#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:718
+#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:719
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1992
 #: src/gui/popupmenu.cpp:2066 src/gui/setup.cpp:86
 msgid "Store"
@@ -1491,47 +1491,47 @@ msgid "Drop"
 msgstr "Tirar"
 
 #. TRANSLATORS: item amount window button
-#: src/gui/itemamountwindow.cpp:214
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "Todo"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:264
 msgid "Select amount of items to trade."
 msgstr "Seleccione la cantidad de objetos a intercambiar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:274
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to drop."
 msgstr "Seleccione la cantidad de objetos a tirar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:278
+#: src/gui/itemamountwindow.cpp:272
 msgid "Select amount of items to store."
 msgstr "Seleccione la cantidad de objetos a almacenar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:276
 msgid "Select amount of items to retrieve."
 msgstr "Seleccione la cantidad de artículos a recuperar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:286
+#: src/gui/itemamountwindow.cpp:280
 msgid "Select amount of items to split."
 msgstr "Seleccione la cantidad de objetos para dividir."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:290
+#: src/gui/itemamountwindow.cpp:284
 msgid "Add to buy shop."
 msgstr "Agregar a las compras de la tienda."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:294
+#: src/gui/itemamountwindow.cpp:288
 msgid "Add to sell shop."
 msgstr "Agregar a las ventas de la tienda."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:298
+#: src/gui/itemamountwindow.cpp:292
 msgid "Unknown."
 msgstr "Desconocido."
 
@@ -1558,7 +1558,7 @@ msgstr "Restablecer cronometrador"
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:58 src/gui/killstats.cpp:171
-#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:516
+#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:509
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr "Muertes: %s, exp. total: %s"
@@ -1566,7 +1566,7 @@ msgstr "Muertes: %s, exp. total: %s"
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:61 src/gui/killstats.cpp:173
 #: src/gui/killstats.cpp:253 src/gui/killstats.cpp:268
-#: src/gui/killstats.cpp:518
+#: src/gui/killstats.cpp:511
 #, c-format
 msgid "Avg Exp: %s"
 msgstr "Avg Exp: %s"
@@ -1574,14 +1574,14 @@ msgstr "Avg Exp: %s"
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:63 src/gui/killstats.cpp:176
 #: src/gui/killstats.cpp:258 src/gui/killstats.cpp:272
-#: src/gui/killstats.cpp:521
+#: src/gui/killstats.cpp:514
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr "No. of avg mob to next level: %s"
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:66 src/gui/killstats.cpp:187
-#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:524
+#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:517
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr "Matanza/Mín: %s, Exp/Mín: %s"
@@ -1609,9 +1609,9 @@ msgid "Last kill exp:"
 msgstr "Exp de último eliminado:"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:414
-#: src/gui/killstats.cpp:421 src/gui/killstats.cpp:428
-#: src/gui/killstats.cpp:434
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:408
+#: src/gui/killstats.cpp:415 src/gui/killstats.cpp:422
+#: src/gui/killstats.cpp:428
 msgid "Time before jacko spawn:"
 msgstr "Tiempo antes de que jacko aparezca:"
 
@@ -1643,12 +1643,12 @@ msgid "  Time for next level: %s"
 msgstr "  Tiempo para el siguiente nivel: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:421
+#: src/gui/killstats.cpp:415
 #, c-format
 msgid "%s %d?"
 msgstr "¿%s %d?"
 
-#: src/gui/killstats.cpp:428
+#: src/gui/killstats.cpp:422
 msgid "jacko spawning"
 msgstr "jacko apareciendo"
 
@@ -1754,32 +1754,32 @@ msgid "arrows bar"
 msgstr "barra de flechas"
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:88
+#: src/gui/ministatuswindow.cpp:89
 msgid "status bar"
 msgstr "barra de estado"
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:108
+#: src/gui/ministatuswindow.cpp:109
 msgid "job bar"
 msgstr "barra de trabajo"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:306 src/gui/statuswindow.cpp:298
+#: src/gui/ministatuswindow.cpp:307 src/gui/statuswindow.cpp:298
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Nivel: %d (GM %d)"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:313 src/gui/statuswindow.cpp:141
+#: src/gui/ministatuswindow.cpp:314 src/gui/statuswindow.cpp:141
 #: src/gui/statuswindow.cpp:305 src/gui/statuswindow.cpp:375
 #, c-format
 msgid "Level: %d"
 msgstr "Nivel: %d"
 
 #. TRANSLATORS: status bar label
-#: src/gui/ministatuswindow.cpp:330 src/gui/ministatuswindow.cpp:367
+#: src/gui/ministatuswindow.cpp:331 src/gui/ministatuswindow.cpp:368
 msgid "Need"
 msgstr "Necesitas"
 
@@ -2167,7 +2167,7 @@ msgstr "Copiar al chat"
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2209 src/gui/popupmenu.cpp:2280
-#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:139
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
 #: src/gui/socialwindow.cpp:934
 msgid "(default)"
 msgstr "(predeterminado)"
@@ -2352,7 +2352,7 @@ msgid "Passwords do not match."
 msgstr "Las contraseñas no coinciden."
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:257
 msgid "Choose Your Server"
 msgstr "Escoge tu servidor"
 
@@ -2360,61 +2360,61 @@ msgstr "Escoge tu servidor"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:259 src/gui/shopwindow.cpp:94
+#: src/gui/serverdialog.cpp:268 src/gui/shopwindow.cpp:94
 #: src/gui/shopwindow.cpp:101 src/gui/tradewindow.cpp:77
 msgid "Add"
 msgstr "Añadir"
 
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
-#: src/gui/serverdialog.cpp:261 src/gui/widgets/setupitem.cpp:299
+#: src/gui/serverdialog.cpp:270 src/gui/widgets/setupitem.cpp:299
 #: src/gui/widgets/setupitem.cpp:426
 msgid "Edit"
 msgstr "Editar"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:274
 msgid "Load"
 msgstr "Cargar"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:279
+#: src/gui/serverdialog.cpp:288
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Elige tu servidor  *** MODO SEGURO ***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:297
 msgid "Use same ip for game sub servers"
 msgstr "Usar el mismo ip para los subservidores del juego"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:518
+#: src/gui/serverdialog.cpp:527
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Bajando la lista de servidores...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:524
+#: src/gui/serverdialog.cpp:533
 msgid "Waiting for server..."
 msgstr "Esperando al servidor..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:529
+#: src/gui/serverdialog.cpp:538
 msgid "Preparing download"
 msgstr "Preparando la descarga"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:534
+#: src/gui/serverdialog.cpp:543
 msgid "Error retreiving server list!"
 msgstr "¡Error al recuperar la lista de servidores!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:626
+#: src/gui/serverdialog.cpp:635
 msgid "requires a newer version"
 msgstr "requiere una versión mas nueva"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:631
+#: src/gui/serverdialog.cpp:640
 #, c-format
 msgid "requires v%s"
 msgstr "requiere v%s"
@@ -3427,7 +3427,7 @@ msgid "Type:"
 msgstr "Tipo:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:334
+#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:336
 msgid "Delay:"
 msgstr "Atraso:"
 
@@ -3447,30 +3447,30 @@ msgid "Blue:"
 msgstr "Azul:"
 
 #. TRANSLATORS: color type
-#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:420
+#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:422
 msgid "Static"
 msgstr "Estático"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:107 src/gui/setup_colors.cpp:110
-#: src/gui/setup_colors.cpp:422
+#: src/gui/setup_colors.cpp:424
 msgid "Pulse"
 msgstr "Pulso"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:112 src/gui/setup_colors.cpp:115
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Rainbow"
 msgstr "Arco iris"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:117 src/gui/setup_colors.cpp:120
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Spectrum"
 msgstr "Espectro"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:328
+#: src/gui/setup_colors.cpp:330
 msgid "Alpha:"
 msgstr "Alfa:"
 
@@ -3638,7 +3638,7 @@ msgstr "Misceláneo"
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: palette color
-#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:134
+#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:135
 msgid "Monsters"
 msgstr "Monstruos"
 
@@ -4195,206 +4195,231 @@ msgstr "Cuando se ignora a alguien:"
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:86
+msgid "Very small (8)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:88
 msgid "Very small (9)"
 msgstr "Muy pequeño (9)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:88
+#: src/gui/setup_theme.cpp:90
 msgid "Tiny (10)"
 msgstr "Diminuto (10)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:90
+#: src/gui/setup_theme.cpp:92
 msgid "Small (11)"
 msgstr "Pequeño (11)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:92
+#: src/gui/setup_theme.cpp:94
 msgid "Medium (12)"
 msgstr "Medio (12)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:94
+#: src/gui/setup_theme.cpp:96
 msgid "Normal (13)"
 msgstr "Normal (13)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:96
+#: src/gui/setup_theme.cpp:98
 msgid "Large (14)"
 msgstr "Extenso (14)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:98
-msgid "Very large (15)"
-msgstr "Muy extenso (15)"
-
-#. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:100
-msgid "Big (16)"
-msgstr "Grande (16)"
+msgid "Large (15)"
+msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:102
-msgid "Very big (17)"
-msgstr "Muy grande (17)"
+msgid "Large (16)"
+msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:104
-msgid "Huge (18)"
-msgstr "Enorme (18)"
+msgid "Big (17)"
+msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:106
-msgid "Very huge (19)"
-msgstr "Muy enorme (19)"
+msgid "Big (18)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:108
+msgid "Big (19)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:110
+msgid "Very big (20)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:112
+msgid "Very big (21)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:114
+msgid "Very big (22)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:116
+msgid "Huge (23)"
+msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:151
 msgid "Chinese (China)"
 msgstr "Chino (China)"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:153
 msgid "Czech"
 msgstr "Checo"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:155
 msgid "English"
 msgstr "Inglés"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:157
 msgid "Finnish"
 msgstr "Finlandés"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:159
 msgid "French"
 msgstr "Francés"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:161
 msgid "German"
 msgstr "Alemán"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:153
+#: src/gui/setup_theme.cpp:163
 msgid "Indonesian"
 msgstr "Indonesio"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:155
+#: src/gui/setup_theme.cpp:165
 msgid "Italian"
 msgstr "Italiano"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:157
+#: src/gui/setup_theme.cpp:167
 msgid "Polish"
 msgstr "Polaco"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:159
+#: src/gui/setup_theme.cpp:169
 msgid "Japanese"
 msgstr "Japonés"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:161
+#: src/gui/setup_theme.cpp:171
 msgid "Dutch (Belgium/Flemish)"
 msgstr "Holanda (Bélgica/Flandes)"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:163
+#: src/gui/setup_theme.cpp:173
 msgid "Portuguese"
 msgstr "Portugués"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:165
+#: src/gui/setup_theme.cpp:175
 msgid "Portuguese (Brazilian)"
 msgstr "Portugués (Brasileño)"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:167
+#: src/gui/setup_theme.cpp:177
 msgid "Russian"
 msgstr "Ruso"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:169
+#: src/gui/setup_theme.cpp:179
 msgid "Spanish (Castilian)"
 msgstr "Español (Castellano)"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:171
+#: src/gui/setup_theme.cpp:181
 msgid "Turkish"
 msgstr "Turco"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:223
+#: src/gui/setup_theme.cpp:233
 msgid "Gui theme"
 msgstr "Tema de interfaz gráfica"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:230
+#: src/gui/setup_theme.cpp:240
 msgid "Main Font"
 msgstr "Fuente principal"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:235
+#: src/gui/setup_theme.cpp:245
 msgid "Language"
 msgstr "Idioma"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:239
+#: src/gui/setup_theme.cpp:249
 msgid "Bold font"
 msgstr "Fuente negrita"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:243
+#: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr "Fuente de partícula"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:247
+#: src/gui/setup_theme.cpp:257
 msgid "Help font"
 msgstr "Fuente de la ayuda"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:251
+#: src/gui/setup_theme.cpp:261
 msgid "Secure font"
 msgstr "Fuente segura"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:255
+#: src/gui/setup_theme.cpp:265
 msgid "Japanese font"
 msgstr "Fuente japonesa"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:260
+#: src/gui/setup_theme.cpp:270
 msgid "Font size"
 msgstr "Tamaño de fuente"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:265
+#: src/gui/setup_theme.cpp:275
 msgid "Npc font size"
 msgstr "Tamaño de letra en NPC"
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/setup_theme.cpp:269
+#: src/gui/setup_theme.cpp:279
 msgid "i"
 msgstr "i"
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/setup_theme.cpp:442
+#: src/gui/setup_theme.cpp:452
 msgid "Theme info"
 msgstr "Info del tema"
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/setup_theme.cpp:467
+#: src/gui/setup_theme.cpp:477
 msgid "Theme Changed"
 msgstr "Tema cambiado"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/setup_theme.cpp:467 src/gui/setup_video.cpp:537
+#: src/gui/setup_theme.cpp:477 src/gui/setup_video.cpp:537
 #: src/gui/setup_video.cpp:546
 msgid "Restart your client for the change to take effect."
 msgstr "Reinicia el juego para que los cambios tengan efecto."
@@ -4695,7 +4720,8 @@ msgid "Ambient FX"
 msgstr "Ambiente FX"
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_visual.cpp:140
+#. TRANSLATORS: palette color
+#: src/gui/setup_visual.cpp:140 src/gui/userpalette.cpp:146
 msgid "Particle effects"
 msgstr "Efectos de partículas"
 
@@ -4782,45 +4808,45 @@ msgid "%s wants to %s %s do you accept?"
 msgstr "%s quiere %s %s ¿aceptas?"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/skilldialog.cpp:270 src/gui/windowmenu.cpp:112
+#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:112
 msgid "Skills"
 msgstr "Habilidades"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/skilldialog.cpp:279
+#: src/gui/skilldialog.cpp:281
 msgid "Up"
 msgstr "Incrementar"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/skilldialog.cpp:391
+#: src/gui/skilldialog.cpp:393
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Puntos de habilidades: %d"
 
 #. TRANSLATORS: skills dialog default skills tab
-#: src/gui/skilldialog.cpp:444
+#: src/gui/skilldialog.cpp:446
 msgid "basic"
 msgstr "básico"
 
 #. TRANSLATORS: skills dialog default skill name
-#: src/gui/skilldialog.cpp:447
+#: src/gui/skilldialog.cpp:449
 msgid "basic, 1"
 msgstr "básico, 1"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/skilldialog.cpp:484
+#: src/gui/skilldialog.cpp:486
 #, c-format
 msgid "Skill Set %d"
 msgstr "Habilidades %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/skilldialog.cpp:518
+#: src/gui/skilldialog.cpp:520
 #, c-format
 msgid "Skill %d"
 msgstr "Habilidad %d"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/skilldialog.cpp:612 src/gui/skilldialog.cpp:762
+#: src/gui/skilldialog.cpp:614 src/gui/skilldialog.cpp:764
 #, c-format
 msgid "Lvl: %d"
 msgstr "Nivel: %d"
@@ -5263,7 +5289,7 @@ msgid "Trade: You"
 msgstr "Intercambio: Tú"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:182
+#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:184
 #, c-format
 msgid "You get %s"
 msgstr "Tú recibes %s"
@@ -5279,12 +5305,12 @@ msgid "You give:"
 msgstr "Tú das:"
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:393
+#: src/gui/tradewindow.cpp:396
 msgid "You don't have enough money."
 msgstr "No tienes dinero suficiente."
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:475
+#: src/gui/tradewindow.cpp:479
 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 "
@@ -5297,224 +5323,224 @@ msgid "Name: %s"
 msgstr "Nombre: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/updaterwindow.cpp:140
+#: src/gui/updaterwindow.cpp:156
 msgid "Updating..."
 msgstr "Actualizando..."
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:165
+#: src/gui/updaterwindow.cpp:181
 msgid "Connecting..."
 msgstr "Conectando..."
 
 #. TRANSLATORS: update message
-#: src/gui/updaterwindow.cpp:656
+#: src/gui/updaterwindow.cpp:672
 msgid "##1  The update process is incomplete."
 msgstr "##1  El proceso de actualización esta incompleto."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/updaterwindow.cpp:658
+#: src/gui/updaterwindow.cpp:674
 msgid "##1  It is strongly recommended that"
 msgstr "##1  Es altamente recomendado que"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:660
+#: src/gui/updaterwindow.cpp:676
 msgid "##1  you try again later."
 msgstr "##1  lo intentes de nuevo más tarde."
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:839
+#: src/gui/updaterwindow.cpp:855
 msgid "Completed"
 msgstr "Completado"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
 msgid "Being"
 msgstr "Ser"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:118
-msgid "Friend Names"
-msgstr "Nombres de Amigos"
+#: src/gui/userpalette.cpp:119
+msgid "Friend names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:120
-msgid "Disregarded Names"
-msgstr "Nombres de Desatendidos"
+#: src/gui/userpalette.cpp:121
+msgid "Disregarded names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:122
-msgid "Ignored Names"
-msgstr "Nombres de Ignorados"
+#: src/gui/userpalette.cpp:123
+msgid "Ignored names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:124
-msgid "Erased Names"
-msgstr "Nombres de Borrados"
+#: src/gui/userpalette.cpp:125
+msgid "Erased names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:126
-msgid "Other Players' Names"
-msgstr "Nombres de otros jugadores"
+#: src/gui/userpalette.cpp:127
+msgid "Other players names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:128
-msgid "Own Name"
-msgstr "Propio Nombre"
+#: src/gui/userpalette.cpp:129
+msgid "Own name"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:130
-msgid "GM Names"
-msgstr "Nombres De Los GMs"
+#: src/gui/userpalette.cpp:131
+msgid "GM names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
 msgid "NPCs"
 msgstr "NPCs"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
 msgid "Monster HP bar"
 msgstr "Barra de energía del monstruo"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:140
 msgid "Monster HP bar (second color)"
 msgstr "Barra de energía del monstruo (segundo color)"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:141
-msgid "Party Members"
-msgstr "Miembros del grupo"
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:143
-msgid "Guild Members"
-msgstr "Miembros del Clan"
+#: src/gui/userpalette.cpp:142
+msgid "Party members"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:145
-msgid "Particle Effects"
-msgstr "Efectos Particulares"
+#: src/gui/userpalette.cpp:144
+msgid "Guild members"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:147
-msgid "Pickup Notification"
-msgstr "Aviso al cojer un objeto"
+#: src/gui/userpalette.cpp:148
+msgid "Pickup notification"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:149
-msgid "Exp Notification"
-msgstr "Aviso de experiencia"
+#: src/gui/userpalette.cpp:150
+msgid "Exp notification"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
 msgid "Player HP bar"
 msgstr "Barra de energía del jugador"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
 msgid "Player HP bar (second color)"
 msgstr "Barra de energía del jugador (segundo color)"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:157
-msgid "Player Hits Monster"
-msgstr "Jugador Golpea al Monstruo"
+#: src/gui/userpalette.cpp:158
+msgid "Player hits monster"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:159
-msgid "Monster Hits Player"
-msgstr "Monstruo Golpea al Jugador"
+#: src/gui/userpalette.cpp:160
+msgid "Monster hits player"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:163
-msgid "Other Player Hits Local Player"
-msgstr "Otros Jugadores le pegan al Jugador Local"
+#: src/gui/userpalette.cpp:164
+msgid "Other player hits local player"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:166
 msgid "Critical Hit"
 msgstr "Golpe Crítico"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
-msgid "Local Player Hits Monster"
-msgstr "Jugador Local Golpea al Monstruo"
+#: src/gui/userpalette.cpp:170
+msgid "Local player hits monster"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:172
-msgid "Local Player Critical Hit"
-msgstr "Golpe Critico del jugador"
+#: src/gui/userpalette.cpp:173
+msgid "Local player critical hit"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:175
-msgid "Local Player Miss"
-msgstr "Cuando fallas un ataque"
+#: src/gui/userpalette.cpp:176
+msgid "Local player miss"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:177
+#: src/gui/userpalette.cpp:178
 msgid "Misses"
 msgstr "Muchos fallos al atacar"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
-msgid "Portal Highlight"
-msgstr "Resaltar portal"
+#: src/gui/userpalette.cpp:180
+msgid "Portal highlight"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:183
+msgid "Default collision highlight"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:182
-msgid "Default collision Highlight"
-msgstr "Resaltar colisiones"
+#: src/gui/userpalette.cpp:186
+msgid "Air collision highlight"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:185
-msgid "Air collision Highlight"
-msgstr "Resaltado de colisión en el Aire"
+#: src/gui/userpalette.cpp:189
+msgid "Water collision highlight"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:188
-msgid "Water collision Highlight"
-msgstr "resaltado de colisión en el Agua"
+#: src/gui/userpalette.cpp:192
+msgid "Special ground collision highlight"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:191
-msgid "Special ground collision Highlight"
-msgstr "Resaltado especial de colisión de terreno."
+#: src/gui/userpalette.cpp:195
+msgid "Walkable highlight"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
-msgid "Walkable Highlight"
-msgstr "Mostrar las partes accesibles"
+#: src/gui/userpalette.cpp:198
+msgid "Local player attack range"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:197
-msgid "Local Player Attack Range"
-msgstr "Alcance de ataque de Jugador local"
+#: src/gui/userpalette.cpp:201
+msgid "Local player attack range border"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:200
-msgid "Local Player Attack Range Border"
-msgstr "Borde de alcance de ataque de Jugador local"
+#: src/gui/userpalette.cpp:204
+msgid "Monster attack range"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:203
-msgid "Monster Attack Range"
-msgstr "Alcance de ataque de Monstruos"
+#: src/gui/userpalette.cpp:208
+msgid "Floor item amount color"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:206
-msgid "Home Place"
-msgstr "Lugar de Inicio"
+#: src/gui/userpalette.cpp:211
+msgid "Home place"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:209
-msgid "Home Place Border"
-msgstr "Limites de Lugar de Inicio"
+#: src/gui/userpalette.cpp:214
+msgid "Home place border"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:212
-msgid "Road Point"
-msgstr "Mostrar camino"
+#: src/gui/userpalette.cpp:217
+msgid "Road point"
+msgstr ""
 
 #. TRANSLATORS: who is online window name
 #: src/gui/whoisonline.cpp:79 src/gui/whoisonline.cpp:623
@@ -5643,7 +5669,7 @@ msgid "/kick > Kick some one from the guild you are in"
 msgstr "/kick > Expulsar a alguien del clan en el que estás."
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:315
+#: src/gui/widgets/itemcontainer.cpp:317
 msgid "Eq."
 msgstr "Eq."
 
diff --git a/po/et.po b/po/et.po
index fd00dd818..918c28618 100644
--- a/po/et.po
+++ b/po/et.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-05-03 12:38+0300\n"
-"PO-Revision-Date: 2013-05-03 09:44+0000\n"
+"POT-Creation-Date: 2013-05-10 18:34+0300\n"
+"PO-Revision-Date: 2013-05-10 15:39+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -59,25 +59,25 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: full button name
-#: src/client.cpp:1136 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
+#: src/client.cpp:1137 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
 msgid "Setup"
 msgstr ""
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1140 src/gui/setup_perfomance.cpp:61
+#: src/client.cpp:1141 src/gui/setup_perfomance.cpp:61
 msgid "Perfomance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:1143 src/gui/setup_video.cpp:258
+#: src/client.cpp:1144 src/gui/setup_video.cpp:258
 msgid "Video"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1146 src/gui/setup_theme.cpp:273
+#: src/client.cpp:1147 src/gui/setup_theme.cpp:283
 msgid "Theme"
 msgstr ""
 
@@ -88,7 +88,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1150 src/gui/didyouknowwindow.cpp:78
+#: src/client.cpp:1151 src/gui/didyouknowwindow.cpp:78
 #: src/gui/inventorywindow.cpp:228 src/gui/npcdialog.cpp:63
 #: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:574
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:80
@@ -96,32 +96,32 @@ msgid "Close"
 msgstr "Sulge"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1238
+#: src/client.cpp:1239
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1282
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1320
+#: src/client.cpp:1321
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1431
+#: src/client.cpp:1432
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1471
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1483
+#: src/client.cpp:1484
 msgid "Changing game servers"
 msgstr ""
 
@@ -136,69 +136,69 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1540 src/client.cpp:1551 src/client.cpp:1721
+#: src/client.cpp:1541 src/client.cpp:1552 src/client.cpp:1722
 #: src/gui/changeemaildialog.cpp:168 src/gui/changepassworddialog.cpp:158
-#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:288
-#: src/gui/editserverdialog.cpp:220 src/gui/registerdialog.cpp:263
+#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:290
+#: src/gui/editserverdialog.cpp:216 src/gui/registerdialog.cpp:263
 #: src/gui/unregisterdialog.cpp:143 src/net/ea/charserverhandler.cpp:190
 #: src/net/ea/charserverhandler.cpp:210
 msgid "Error"
 msgstr "Viga"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1564
+#: src/client.cpp:1565
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1601
+#: src/client.cpp:1602
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1603
+#: src/client.cpp:1604
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1624
+#: src/client.cpp:1625
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1626
+#: src/client.cpp:1627
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1647
+#: src/client.cpp:1648
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1649
+#: src/client.cpp:1650
 msgid "Farewell, come back any time..."
 msgstr ""
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1902 src/client.cpp:1917 src/client.cpp:1960
-#: src/client.cpp:1976 src/client.cpp:2417 src/client.cpp:2425
+#: src/client.cpp:1903 src/client.cpp:1918 src/client.cpp:1961
+#: src/client.cpp:1977 src/client.cpp:2418 src/client.cpp:2426
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2113
+#: src/client.cpp:2114
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2154 src/client.cpp:2161
+#: src/client.cpp:2155 src/client.cpp:2162
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:2183 src/client.cpp:2196
+#: src/client.cpp:2184 src/client.cpp:2197
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -478,19 +478,19 @@ msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: bot checker window header
-#: src/gui/botcheckerwindow.cpp:269
+#: src/gui/botcheckerwindow.cpp:268
 msgid "Bot Checker"
 msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:102
+#: src/gui/botcheckerwindow.cpp:277 src/gui/npcdialog.cpp:102
 msgid "Reset"
 msgstr ""
 
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: relations table header
-#: src/gui/botcheckerwindow.cpp:305 src/gui/setup_relations.cpp:61
+#: src/gui/botcheckerwindow.cpp:304 src/gui/setup_relations.cpp:61
 msgid "Name"
 msgstr ""
 
@@ -498,7 +498,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:145
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:145
 #: src/gui/popupmenu.cpp:241 src/gui/popupmenu.cpp:640
 #: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:257
 #: src/net/tmwa/generalhandler.cpp:292
@@ -508,7 +508,7 @@ msgstr ""
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
-#: src/gui/botcheckerwindow.cpp:309 src/gui/popupmenu.cpp:225
+#: src/gui/botcheckerwindow.cpp:308 src/gui/popupmenu.cpp:225
 #: src/gui/setupactiondata.h:93
 msgid "Talk"
 msgstr ""
@@ -516,7 +516,7 @@ msgstr ""
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/botcheckerwindow.cpp:311 src/gui/popupmenu.cpp:215
+#: src/gui/botcheckerwindow.cpp:310 src/gui/popupmenu.cpp:215
 #: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:371
 #: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:653
 #: src/gui/popupmenu.cpp:727 src/gui/setupactiondata.h:1856
@@ -524,7 +524,7 @@ msgid "Move"
 msgstr ""
 
 #. TRANSLATORS: bot checker window table header
-#: src/gui/botcheckerwindow.cpp:313
+#: src/gui/botcheckerwindow.cpp:312
 msgid "Result"
 msgstr ""
 
@@ -580,7 +580,7 @@ msgstr ""
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:516
+#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:511
 #: src/gui/selldialog.cpp:94 src/gui/selldialog.cpp:342
 #, c-format
 msgid "Price: %s / Total: %s"
@@ -597,9 +597,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:208
-#: src/gui/itemamountwindow.cpp:243 src/gui/npcdialog.cpp:93
-#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:833
+#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:202
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:93
+#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:821
 msgid "+"
 msgstr ""
 
@@ -609,9 +609,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:240 src/gui/npcdialog.cpp:95
-#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:846
+#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:200
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:95
+#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:834
 msgid "-"
 msgstr ""
 
@@ -623,7 +623,7 @@ msgstr ""
 #. TRANSLATORS: input action name
 #: src/gui/buydialog.cpp:260 src/gui/quitdialog.cpp:54
 #: src/gui/quitdialog.cpp:59 src/gui/quitdialog.cpp:61
-#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:255
+#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:264
 #: src/gui/setupactiondata.h:177
 msgid "Quit"
 msgstr ""
@@ -635,7 +635,7 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #: src/gui/buydialog.cpp:262 src/gui/selldialog.cpp:106
 #: src/gui/statuswindow.cpp:558 src/gui/statuswindow.cpp:615
-#: src/gui/statuswindow.cpp:830 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:852
 msgid "Max"
 msgstr ""
 
@@ -680,7 +680,7 @@ msgstr ""
 #: src/gui/buyselldialog.cpp:71 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:120
 #: src/gui/connectiondialog.cpp:48 src/gui/editserverdialog.cpp:80
-#: src/gui/itemamountwindow.cpp:212 src/gui/npcpostdialog.cpp:64
+#: src/gui/itemamountwindow.cpp:206 src/gui/npcpostdialog.cpp:64
 #: src/gui/popupmenu.cpp:290 src/gui/popupmenu.cpp:324
 #: src/gui/popupmenu.cpp:411 src/gui/popupmenu.cpp:454
 #: src/gui/popupmenu.cpp:485 src/gui/popupmenu.cpp:512
@@ -696,7 +696,7 @@ msgstr ""
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
 #: src/gui/setup.cpp:84 src/gui/socialwindow.cpp:1204
 #: src/gui/textcommandeditor.cpp:212 src/gui/textdialog.cpp:53
-#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:167
+#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:183
 msgid "Cancel"
 msgstr ""
 
@@ -860,7 +860,7 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:570
+#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:581
 #: src/gui/socialwindow.cpp:1269
 msgid "Create"
 msgstr ""
@@ -887,17 +887,17 @@ msgid "Please remove %d points"
 msgstr ""
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:60
+#: src/gui/charselectdialog.cpp:61
 msgid "Confirm Character Delete"
 msgstr ""
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:62
+#: src/gui/charselectdialog.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:86
+#: src/gui/charselectdialog.cpp:87
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
@@ -909,8 +909,8 @@ msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:565
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:576
+#: src/gui/updaterwindow.cpp:185
 msgid "Play"
 msgstr ""
 
@@ -926,7 +926,7 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:263
+#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:272
 #: src/gui/setupactiondata.h:1803 src/gui/setup_relations.cpp:262
 #: src/gui/shopwindow.cpp:96 src/gui/shopwindow.cpp:103
 #: src/gui/textcommandeditor.cpp:216
@@ -936,24 +936,24 @@ msgstr "Kustuta"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/charselectdialog.cpp:129 src/gui/unregisterdialog.cpp:48
+#: src/gui/charselectdialog.cpp:130 src/gui/unregisterdialog.cpp:48
 #: src/gui/unregisterdialog.cpp:53
 msgid "Unregister"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/charselectdialog.cpp:141
+#: src/gui/charselectdialog.cpp:142
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:172
+#: src/gui/charselectdialog.cpp:175
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/charselectdialog.cpp:246
+#: src/gui/charselectdialog.cpp:248
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -963,16 +963,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:288
+#: src/gui/charselectdialog.cpp:290
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password:"
 msgstr ""
 
@@ -1059,13 +1059,13 @@ msgid "Chat"
 msgstr "Vestlus"
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:735
+#: src/gui/chatwindow.cpp:638
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1165
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -1083,7 +1083,7 @@ msgstr "Ei"
 
 #. TRANSLATORS: confirm dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/confirmdialog.cpp:58 src/gui/popupmenu.cpp:2429
+#: src/gui/confirmdialog.cpp:55 src/gui/popupmenu.cpp:2429
 #: src/gui/popupmenu.cpp:2442 src/gui/popupmenu.cpp:2457
 #: src/gui/popupmenu.cpp:2483
 msgid "Ignore"
@@ -1092,7 +1092,7 @@ msgstr ""
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
 #. TRANSLATORS: settings group
-#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:109
+#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:108
 #: src/gui/setup_other.cpp:123 src/gui/windowmenu.cpp:106
 msgid "Map"
 msgstr ""
@@ -1108,190 +1108,190 @@ msgid "Net"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:265
-#: src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:268
+#: src/gui/debugwindow.cpp:311
 msgid "Music:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:153 src/gui/debugwindow.cpp:271
-#: src/gui/debugwindow.cpp:312
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:274
+#: src/gui/debugwindow.cpp:315
 msgid "Map:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:155 src/gui/debugwindow.cpp:268
-#: src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:271
+#: src/gui/debugwindow.cpp:313
 msgid "Minimap:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:262
-#: src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:161 src/gui/debugwindow.cpp:265
+#: src/gui/debugwindow.cpp:309
 msgid "Cursor:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:161
+#: src/gui/debugwindow.cpp:164
 msgid "Particle count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:284
-#: src/gui/debugwindow.cpp:316
+#: src/gui/debugwindow.cpp:167 src/gui/debugwindow.cpp:287
+#: src/gui/debugwindow.cpp:319
 msgid "Map actors count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:166 src/gui/debugwindow.cpp:243
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:169 src/gui/debugwindow.cpp:246
+#: src/gui/debugwindow.cpp:252
 msgid "Player Position:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:172 src/gui/debugwindow.cpp:297
+#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:300
 msgid "Draw calls:"
 msgstr ""
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:175
+#. TRANSLATORS: debug window label, frames per second
+#: src/gui/debugwindow.cpp:178
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:177 src/gui/debugwindow.cpp:324
+#. TRANSLATORS: debug window label, logic per second
+#: src/gui/debugwindow.cpp:180 src/gui/debugwindow.cpp:327
 #, c-format
 msgid "%d LPS"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:191 src/gui/debugwindow.cpp:209
 #, c-format
 msgid "%d FPS (Software)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:193
+#: src/gui/debugwindow.cpp:196
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:197
+#: src/gui/debugwindow.cpp:200
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:201
+#: src/gui/debugwindow.cpp:204
 #, c-format
 msgid "%d FPS (mobile OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:225 src/gui/debugwindow.cpp:290
+#: src/gui/debugwindow.cpp:228 src/gui/debugwindow.cpp:293
 msgid "Textures count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:279
+#: src/gui/debugwindow.cpp:282
 #, c-format
 msgid "Particle count: %d"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:330 src/gui/debugwindow.cpp:380
-#: src/gui/debugwindow.cpp:442
+#: src/gui/debugwindow.cpp:333 src/gui/debugwindow.cpp:383
+#: src/gui/debugwindow.cpp:445
 msgid "Target:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:332 src/gui/debugwindow.cpp:386
-#: src/gui/debugwindow.cpp:444
+#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
+#: src/gui/debugwindow.cpp:447
 msgid "Target Id:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
-#: src/gui/debugwindow.cpp:446
+#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:392
+#: src/gui/debugwindow.cpp:449
 msgid "Target type:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:337
+#: src/gui/debugwindow.cpp:340
 msgid "Target level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:339 src/gui/debugwindow.cpp:405
+#: src/gui/debugwindow.cpp:342 src/gui/debugwindow.cpp:408
 msgid "Target race:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:341
+#: src/gui/debugwindow.cpp:344
 msgid "Target party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:346
 msgid "Target guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:430
-#: src/gui/debugwindow.cpp:436 src/gui/debugwindow.cpp:454
+#: src/gui/debugwindow.cpp:348 src/gui/debugwindow.cpp:433
+#: src/gui/debugwindow.cpp:439 src/gui/debugwindow.cpp:457
 msgid "Attack delay:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:347 src/gui/debugwindow.cpp:417
-#: src/gui/debugwindow.cpp:456
+#: src/gui/debugwindow.cpp:350 src/gui/debugwindow.cpp:420
+#: src/gui/debugwindow.cpp:459
 msgid "Minimal hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:349 src/gui/debugwindow.cpp:420
-#: src/gui/debugwindow.cpp:458
+#: src/gui/debugwindow.cpp:352 src/gui/debugwindow.cpp:423
+#: src/gui/debugwindow.cpp:461
 msgid "Maximum hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:351 src/gui/debugwindow.cpp:423
-#: src/gui/debugwindow.cpp:460
+#: src/gui/debugwindow.cpp:354 src/gui/debugwindow.cpp:426
+#: src/gui/debugwindow.cpp:463
 msgid "Critical hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:394 src/gui/debugwindow.cpp:400
-#: src/gui/debugwindow.cpp:448
+#: src/gui/debugwindow.cpp:397 src/gui/debugwindow.cpp:403
+#: src/gui/debugwindow.cpp:451
 msgid "Target Level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:408 src/gui/debugwindow.cpp:450
+#: src/gui/debugwindow.cpp:411 src/gui/debugwindow.cpp:453
 msgid "Target Party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:412 src/gui/debugwindow.cpp:452
+#: src/gui/debugwindow.cpp:415 src/gui/debugwindow.cpp:455
 msgid "Target Guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:493
+#: src/gui/debugwindow.cpp:496
 #, c-format
 msgid "Ping: %s ms"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:496
+#: src/gui/debugwindow.cpp:499
 #, c-format
 msgid "In: %d bytes/s"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:499
+#: src/gui/debugwindow.cpp:502
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
@@ -1323,7 +1323,7 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #: src/gui/editdialog.cpp:45 src/gui/editserverdialog.cpp:78
-#: src/gui/itemamountwindow.cpp:210 src/gui/okdialog.cpp:51
+#: src/gui/itemamountwindow.cpp:204 src/gui/okdialog.cpp:51
 #: src/gui/quitdialog.cpp:70 src/gui/textdialog.cpp:46
 msgid "OK"
 msgstr ""
@@ -1335,7 +1335,7 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:257
+#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:266
 msgid "Connect"
 msgstr ""
 
@@ -1365,7 +1365,7 @@ msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/editserverdialog.cpp:222
+#: src/gui/editserverdialog.cpp:218
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -1417,7 +1417,7 @@ msgstr ""
 #: src/gui/inventorywindow.cpp:178 src/gui/inventorywindow.cpp:630
 #: src/gui/popupmenu.cpp:1843 src/gui/popupmenu.cpp:1922
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2041
-#: src/gui/skilldialog.cpp:277
+#: src/gui/skilldialog.cpp:279
 msgid "Use"
 msgstr ""
 
@@ -1451,7 +1451,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: setup button
-#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:718
+#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:719
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1992
 #: src/gui/popupmenu.cpp:2066 src/gui/setup.cpp:86
 msgid "Store"
@@ -1473,47 +1473,47 @@ msgid "Drop"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/itemamountwindow.cpp:214
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:264
 msgid "Select amount of items to trade."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:274
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to drop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:278
+#: src/gui/itemamountwindow.cpp:272
 msgid "Select amount of items to store."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:276
 msgid "Select amount of items to retrieve."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:286
+#: src/gui/itemamountwindow.cpp:280
 msgid "Select amount of items to split."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:290
+#: src/gui/itemamountwindow.cpp:284
 msgid "Add to buy shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:294
+#: src/gui/itemamountwindow.cpp:288
 msgid "Add to sell shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:298
+#: src/gui/itemamountwindow.cpp:292
 msgid "Unknown."
 msgstr ""
 
@@ -1540,7 +1540,7 @@ msgstr ""
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:58 src/gui/killstats.cpp:171
-#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:516
+#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:509
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
@@ -1548,7 +1548,7 @@ msgstr ""
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:61 src/gui/killstats.cpp:173
 #: src/gui/killstats.cpp:253 src/gui/killstats.cpp:268
-#: src/gui/killstats.cpp:518
+#: src/gui/killstats.cpp:511
 #, c-format
 msgid "Avg Exp: %s"
 msgstr ""
@@ -1556,14 +1556,14 @@ msgstr ""
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:63 src/gui/killstats.cpp:176
 #: src/gui/killstats.cpp:258 src/gui/killstats.cpp:272
-#: src/gui/killstats.cpp:521
+#: src/gui/killstats.cpp:514
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:66 src/gui/killstats.cpp:187
-#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:524
+#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:517
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
@@ -1591,9 +1591,9 @@ msgid "Last kill exp:"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:414
-#: src/gui/killstats.cpp:421 src/gui/killstats.cpp:428
-#: src/gui/killstats.cpp:434
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:408
+#: src/gui/killstats.cpp:415 src/gui/killstats.cpp:422
+#: src/gui/killstats.cpp:428
 msgid "Time before jacko spawn:"
 msgstr ""
 
@@ -1625,12 +1625,12 @@ msgid "  Time for next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:421
+#: src/gui/killstats.cpp:415
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:428
+#: src/gui/killstats.cpp:422
 msgid "jacko spawning"
 msgstr ""
 
@@ -1736,32 +1736,32 @@ msgid "arrows bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:88
+#: src/gui/ministatuswindow.cpp:89
 msgid "status bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:108
+#: src/gui/ministatuswindow.cpp:109
 msgid "job bar"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:306 src/gui/statuswindow.cpp:298
+#: src/gui/ministatuswindow.cpp:307 src/gui/statuswindow.cpp:298
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:313 src/gui/statuswindow.cpp:141
+#: src/gui/ministatuswindow.cpp:314 src/gui/statuswindow.cpp:141
 #: src/gui/statuswindow.cpp:305 src/gui/statuswindow.cpp:375
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
 #. TRANSLATORS: status bar label
-#: src/gui/ministatuswindow.cpp:330 src/gui/ministatuswindow.cpp:367
+#: src/gui/ministatuswindow.cpp:331 src/gui/ministatuswindow.cpp:368
 msgid "Need"
 msgstr ""
 
@@ -2149,7 +2149,7 @@ msgstr ""
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2209 src/gui/popupmenu.cpp:2280
-#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:139
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
 #: src/gui/socialwindow.cpp:934
 msgid "(default)"
 msgstr ""
@@ -2332,7 +2332,7 @@ msgid "Passwords do not match."
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:257
 msgid "Choose Your Server"
 msgstr ""
 
@@ -2340,61 +2340,61 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:259 src/gui/shopwindow.cpp:94
+#: src/gui/serverdialog.cpp:268 src/gui/shopwindow.cpp:94
 #: src/gui/shopwindow.cpp:101 src/gui/tradewindow.cpp:77
 msgid "Add"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
-#: src/gui/serverdialog.cpp:261 src/gui/widgets/setupitem.cpp:299
+#: src/gui/serverdialog.cpp:270 src/gui/widgets/setupitem.cpp:299
 #: src/gui/widgets/setupitem.cpp:426
 msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:274
 msgid "Load"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:279
+#: src/gui/serverdialog.cpp:288
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:297
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:518
+#: src/gui/serverdialog.cpp:527
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:524
+#: src/gui/serverdialog.cpp:533
 msgid "Waiting for server..."
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:529
+#: src/gui/serverdialog.cpp:538
 msgid "Preparing download"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:534
+#: src/gui/serverdialog.cpp:543
 msgid "Error retreiving server list!"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:626
+#: src/gui/serverdialog.cpp:635
 msgid "requires a newer version"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:631
+#: src/gui/serverdialog.cpp:640
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -3405,7 +3405,7 @@ msgid "Type:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:334
+#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:336
 msgid "Delay:"
 msgstr ""
 
@@ -3425,30 +3425,30 @@ msgid "Blue:"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:420
+#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:422
 msgid "Static"
 msgstr ""
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:107 src/gui/setup_colors.cpp:110
-#: src/gui/setup_colors.cpp:422
+#: src/gui/setup_colors.cpp:424
 msgid "Pulse"
 msgstr ""
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:112 src/gui/setup_colors.cpp:115
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Rainbow"
 msgstr ""
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:117 src/gui/setup_colors.cpp:120
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Spectrum"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:328
+#: src/gui/setup_colors.cpp:330
 msgid "Alpha:"
 msgstr ""
 
@@ -3614,7 +3614,7 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: palette color
-#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:134
+#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:135
 msgid "Monsters"
 msgstr ""
 
@@ -4163,206 +4163,231 @@ msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:86
-msgid "Very small (9)"
+msgid "Very small (8)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:88
-msgid "Tiny (10)"
+msgid "Very small (9)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:90
-msgid "Small (11)"
+msgid "Tiny (10)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:92
-msgid "Medium (12)"
+msgid "Small (11)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:94
-msgid "Normal (13)"
+msgid "Medium (12)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:96
-msgid "Large (14)"
+msgid "Normal (13)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:98
-msgid "Very large (15)"
+msgid "Large (14)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:100
-msgid "Big (16)"
+msgid "Large (15)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:102
-msgid "Very big (17)"
+msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:104
-msgid "Huge (18)"
+msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:106
-msgid "Very huge (19)"
+msgid "Big (18)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:108
+msgid "Big (19)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:110
+msgid "Very big (20)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:112
+msgid "Very big (21)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:114
+msgid "Very big (22)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:116
+msgid "Huge (23)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:151
 msgid "Chinese (China)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:153
 msgid "Czech"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:155
 msgid "English"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:157
 msgid "Finnish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:159
 msgid "French"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:161
 msgid "German"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:153
+#: src/gui/setup_theme.cpp:163
 msgid "Indonesian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:155
+#: src/gui/setup_theme.cpp:165
 msgid "Italian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:157
+#: src/gui/setup_theme.cpp:167
 msgid "Polish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:159
+#: src/gui/setup_theme.cpp:169
 msgid "Japanese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:161
+#: src/gui/setup_theme.cpp:171
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:163
+#: src/gui/setup_theme.cpp:173
 msgid "Portuguese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:165
+#: src/gui/setup_theme.cpp:175
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:167
+#: src/gui/setup_theme.cpp:177
 msgid "Russian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:169
+#: src/gui/setup_theme.cpp:179
 msgid "Spanish (Castilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:171
+#: src/gui/setup_theme.cpp:181
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:223
+#: src/gui/setup_theme.cpp:233
 msgid "Gui theme"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:230
+#: src/gui/setup_theme.cpp:240
 msgid "Main Font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:235
+#: src/gui/setup_theme.cpp:245
 msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:239
+#: src/gui/setup_theme.cpp:249
 msgid "Bold font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:243
+#: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:247
+#: src/gui/setup_theme.cpp:257
 msgid "Help font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:251
+#: src/gui/setup_theme.cpp:261
 msgid "Secure font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:255
+#: src/gui/setup_theme.cpp:265
 msgid "Japanese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:260
+#: src/gui/setup_theme.cpp:270
 msgid "Font size"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:265
+#: src/gui/setup_theme.cpp:275
 msgid "Npc font size"
 msgstr ""
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/setup_theme.cpp:269
+#: src/gui/setup_theme.cpp:279
 msgid "i"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/setup_theme.cpp:442
+#: src/gui/setup_theme.cpp:452
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/setup_theme.cpp:467
+#: src/gui/setup_theme.cpp:477
 msgid "Theme Changed"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/setup_theme.cpp:467 src/gui/setup_video.cpp:537
+#: src/gui/setup_theme.cpp:477 src/gui/setup_video.cpp:537
 #: src/gui/setup_video.cpp:546
 msgid "Restart your client for the change to take effect."
 msgstr ""
@@ -4660,7 +4685,8 @@ msgid "Ambient FX"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_visual.cpp:140
+#. TRANSLATORS: palette color
+#: src/gui/setup_visual.cpp:140 src/gui/userpalette.cpp:146
 msgid "Particle effects"
 msgstr ""
 
@@ -4747,45 +4773,45 @@ msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/skilldialog.cpp:270 src/gui/windowmenu.cpp:112
+#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:112
 msgid "Skills"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/skilldialog.cpp:279
+#: src/gui/skilldialog.cpp:281
 msgid "Up"
 msgstr ""
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/skilldialog.cpp:391
+#: src/gui/skilldialog.cpp:393
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skills tab
-#: src/gui/skilldialog.cpp:444
+#: src/gui/skilldialog.cpp:446
 msgid "basic"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill name
-#: src/gui/skilldialog.cpp:447
+#: src/gui/skilldialog.cpp:449
 msgid "basic, 1"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/skilldialog.cpp:484
+#: src/gui/skilldialog.cpp:486
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/skilldialog.cpp:518
+#: src/gui/skilldialog.cpp:520
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/skilldialog.cpp:612 src/gui/skilldialog.cpp:762
+#: src/gui/skilldialog.cpp:614 src/gui/skilldialog.cpp:764
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -5228,7 +5254,7 @@ msgid "Trade: You"
 msgstr ""
 
 #. TRANSLATORS: trade window money label
-#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:182
+#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:184
 #, c-format
 msgid "You get %s"
 msgstr ""
@@ -5244,12 +5270,12 @@ msgid "You give:"
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:393
+#: src/gui/tradewindow.cpp:396
 msgid "You don't have enough money."
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:475
+#: src/gui/tradewindow.cpp:479
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
@@ -5261,223 +5287,223 @@ msgid "Name: %s"
 msgstr "Nimi: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/updaterwindow.cpp:140
+#: src/gui/updaterwindow.cpp:156
 msgid "Updating..."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:165
+#: src/gui/updaterwindow.cpp:181
 msgid "Connecting..."
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/updaterwindow.cpp:656
+#: src/gui/updaterwindow.cpp:672
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/updaterwindow.cpp:658
+#: src/gui/updaterwindow.cpp:674
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:660
+#: src/gui/updaterwindow.cpp:676
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:839
+#: src/gui/updaterwindow.cpp:855
 msgid "Completed"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
 msgid "Being"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:118
-msgid "Friend Names"
+#: src/gui/userpalette.cpp:119
+msgid "Friend names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:120
-msgid "Disregarded Names"
+#: src/gui/userpalette.cpp:121
+msgid "Disregarded names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:122
-msgid "Ignored Names"
+#: src/gui/userpalette.cpp:123
+msgid "Ignored names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:124
-msgid "Erased Names"
+#: src/gui/userpalette.cpp:125
+msgid "Erased names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:126
-msgid "Other Players' Names"
+#: src/gui/userpalette.cpp:127
+msgid "Other players names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:128
-msgid "Own Name"
+#: src/gui/userpalette.cpp:129
+msgid "Own name"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:130
-msgid "GM Names"
+#: src/gui/userpalette.cpp:131
+msgid "GM names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
 msgid "NPCs"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
 msgid "Monster HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:140
 msgid "Monster HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:141
-msgid "Party Members"
+#: src/gui/userpalette.cpp:142
+msgid "Party members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:143
-msgid "Guild Members"
+#: src/gui/userpalette.cpp:144
+msgid "Guild members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:145
-msgid "Particle Effects"
+#: src/gui/userpalette.cpp:148
+msgid "Pickup notification"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:147
-msgid "Pickup Notification"
+#: src/gui/userpalette.cpp:150
+msgid "Exp notification"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:149
-msgid "Exp Notification"
-msgstr ""
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
 msgid "Player HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
 msgid "Player HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:157
-msgid "Player Hits Monster"
+#: src/gui/userpalette.cpp:158
+msgid "Player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:159
-msgid "Monster Hits Player"
+#: src/gui/userpalette.cpp:160
+msgid "Monster hits player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:163
-msgid "Other Player Hits Local Player"
+#: src/gui/userpalette.cpp:164
+msgid "Other player hits local player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:166
 msgid "Critical Hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
-msgid "Local Player Hits Monster"
+#: src/gui/userpalette.cpp:170
+msgid "Local player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:172
-msgid "Local Player Critical Hit"
+#: src/gui/userpalette.cpp:173
+msgid "Local player critical hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:175
-msgid "Local Player Miss"
+#: src/gui/userpalette.cpp:176
+msgid "Local player miss"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:177
+#: src/gui/userpalette.cpp:178
 msgid "Misses"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
-msgid "Portal Highlight"
+#: src/gui/userpalette.cpp:180
+msgid "Portal highlight"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:183
+msgid "Default collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:182
-msgid "Default collision Highlight"
+#: src/gui/userpalette.cpp:186
+msgid "Air collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:185
-msgid "Air collision Highlight"
+#: src/gui/userpalette.cpp:189
+msgid "Water collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:188
-msgid "Water collision Highlight"
+#: src/gui/userpalette.cpp:192
+msgid "Special ground collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:191
-msgid "Special ground collision Highlight"
+#: src/gui/userpalette.cpp:195
+msgid "Walkable highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
-msgid "Walkable Highlight"
+#: src/gui/userpalette.cpp:198
+msgid "Local player attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:197
-msgid "Local Player Attack Range"
+#: src/gui/userpalette.cpp:201
+msgid "Local player attack range border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:200
-msgid "Local Player Attack Range Border"
+#: src/gui/userpalette.cpp:204
+msgid "Monster attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:203
-msgid "Monster Attack Range"
+#: src/gui/userpalette.cpp:208
+msgid "Floor item amount color"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:206
-msgid "Home Place"
+#: src/gui/userpalette.cpp:211
+msgid "Home place"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:209
-msgid "Home Place Border"
+#: src/gui/userpalette.cpp:214
+msgid "Home place border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:212
-msgid "Road Point"
+#: src/gui/userpalette.cpp:217
+msgid "Road point"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
@@ -5607,7 +5633,7 @@ msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:315
+#: src/gui/widgets/itemcontainer.cpp:317
 msgid "Eq."
 msgstr ""
 
diff --git a/po/fa.po b/po/fa.po
index bb274a4ce..e0174460f 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-05-03 12:38+0300\n"
-"PO-Revision-Date: 2013-05-03 09:44+0000\n"
+"POT-Creation-Date: 2013-05-10 18:34+0300\n"
+"PO-Revision-Date: 2013-05-10 15:39+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -59,25 +59,25 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: full button name
-#: src/client.cpp:1136 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
+#: src/client.cpp:1137 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
 msgid "Setup"
 msgstr ""
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1140 src/gui/setup_perfomance.cpp:61
+#: src/client.cpp:1141 src/gui/setup_perfomance.cpp:61
 msgid "Perfomance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:1143 src/gui/setup_video.cpp:258
+#: src/client.cpp:1144 src/gui/setup_video.cpp:258
 msgid "Video"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1146 src/gui/setup_theme.cpp:273
+#: src/client.cpp:1147 src/gui/setup_theme.cpp:283
 msgid "Theme"
 msgstr ""
 
@@ -88,7 +88,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1150 src/gui/didyouknowwindow.cpp:78
+#: src/client.cpp:1151 src/gui/didyouknowwindow.cpp:78
 #: src/gui/inventorywindow.cpp:228 src/gui/npcdialog.cpp:63
 #: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:574
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:80
@@ -96,32 +96,32 @@ msgid "Close"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1238
+#: src/client.cpp:1239
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1282
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1320
+#: src/client.cpp:1321
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1431
+#: src/client.cpp:1432
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1471
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1483
+#: src/client.cpp:1484
 msgid "Changing game servers"
 msgstr ""
 
@@ -136,69 +136,69 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1540 src/client.cpp:1551 src/client.cpp:1721
+#: src/client.cpp:1541 src/client.cpp:1552 src/client.cpp:1722
 #: src/gui/changeemaildialog.cpp:168 src/gui/changepassworddialog.cpp:158
-#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:288
-#: src/gui/editserverdialog.cpp:220 src/gui/registerdialog.cpp:263
+#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:290
+#: src/gui/editserverdialog.cpp:216 src/gui/registerdialog.cpp:263
 #: src/gui/unregisterdialog.cpp:143 src/net/ea/charserverhandler.cpp:190
 #: src/net/ea/charserverhandler.cpp:210
 msgid "Error"
 msgstr "خطا"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1564
+#: src/client.cpp:1565
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1601
+#: src/client.cpp:1602
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1603
+#: src/client.cpp:1604
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1624
+#: src/client.cpp:1625
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1626
+#: src/client.cpp:1627
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1647
+#: src/client.cpp:1648
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1649
+#: src/client.cpp:1650
 msgid "Farewell, come back any time..."
 msgstr ""
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1902 src/client.cpp:1917 src/client.cpp:1960
-#: src/client.cpp:1976 src/client.cpp:2417 src/client.cpp:2425
+#: src/client.cpp:1903 src/client.cpp:1918 src/client.cpp:1961
+#: src/client.cpp:1977 src/client.cpp:2418 src/client.cpp:2426
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2113
+#: src/client.cpp:2114
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2154 src/client.cpp:2161
+#: src/client.cpp:2155 src/client.cpp:2162
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:2183 src/client.cpp:2196
+#: src/client.cpp:2184 src/client.cpp:2197
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -478,19 +478,19 @@ msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: bot checker window header
-#: src/gui/botcheckerwindow.cpp:269
+#: src/gui/botcheckerwindow.cpp:268
 msgid "Bot Checker"
 msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:102
+#: src/gui/botcheckerwindow.cpp:277 src/gui/npcdialog.cpp:102
 msgid "Reset"
 msgstr ""
 
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: relations table header
-#: src/gui/botcheckerwindow.cpp:305 src/gui/setup_relations.cpp:61
+#: src/gui/botcheckerwindow.cpp:304 src/gui/setup_relations.cpp:61
 msgid "Name"
 msgstr ""
 
@@ -498,7 +498,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:145
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:145
 #: src/gui/popupmenu.cpp:241 src/gui/popupmenu.cpp:640
 #: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:257
 #: src/net/tmwa/generalhandler.cpp:292
@@ -508,7 +508,7 @@ msgstr ""
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
-#: src/gui/botcheckerwindow.cpp:309 src/gui/popupmenu.cpp:225
+#: src/gui/botcheckerwindow.cpp:308 src/gui/popupmenu.cpp:225
 #: src/gui/setupactiondata.h:93
 msgid "Talk"
 msgstr ""
@@ -516,7 +516,7 @@ msgstr ""
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/botcheckerwindow.cpp:311 src/gui/popupmenu.cpp:215
+#: src/gui/botcheckerwindow.cpp:310 src/gui/popupmenu.cpp:215
 #: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:371
 #: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:653
 #: src/gui/popupmenu.cpp:727 src/gui/setupactiondata.h:1856
@@ -524,7 +524,7 @@ msgid "Move"
 msgstr ""
 
 #. TRANSLATORS: bot checker window table header
-#: src/gui/botcheckerwindow.cpp:313
+#: src/gui/botcheckerwindow.cpp:312
 msgid "Result"
 msgstr ""
 
@@ -580,7 +580,7 @@ msgstr ""
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:516
+#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:511
 #: src/gui/selldialog.cpp:94 src/gui/selldialog.cpp:342
 #, c-format
 msgid "Price: %s / Total: %s"
@@ -597,9 +597,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:208
-#: src/gui/itemamountwindow.cpp:243 src/gui/npcdialog.cpp:93
-#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:833
+#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:202
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:93
+#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:821
 msgid "+"
 msgstr ""
 
@@ -609,9 +609,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:240 src/gui/npcdialog.cpp:95
-#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:846
+#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:200
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:95
+#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:834
 msgid "-"
 msgstr ""
 
@@ -623,7 +623,7 @@ msgstr ""
 #. TRANSLATORS: input action name
 #: src/gui/buydialog.cpp:260 src/gui/quitdialog.cpp:54
 #: src/gui/quitdialog.cpp:59 src/gui/quitdialog.cpp:61
-#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:255
+#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:264
 #: src/gui/setupactiondata.h:177
 msgid "Quit"
 msgstr "خروج"
@@ -635,7 +635,7 @@ msgstr "خروج"
 #. TRANSLATORS: status bar label
 #: src/gui/buydialog.cpp:262 src/gui/selldialog.cpp:106
 #: src/gui/statuswindow.cpp:558 src/gui/statuswindow.cpp:615
-#: src/gui/statuswindow.cpp:830 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:852
 msgid "Max"
 msgstr "حداکثر"
 
@@ -680,7 +680,7 @@ msgstr ""
 #: src/gui/buyselldialog.cpp:71 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:120
 #: src/gui/connectiondialog.cpp:48 src/gui/editserverdialog.cpp:80
-#: src/gui/itemamountwindow.cpp:212 src/gui/npcpostdialog.cpp:64
+#: src/gui/itemamountwindow.cpp:206 src/gui/npcpostdialog.cpp:64
 #: src/gui/popupmenu.cpp:290 src/gui/popupmenu.cpp:324
 #: src/gui/popupmenu.cpp:411 src/gui/popupmenu.cpp:454
 #: src/gui/popupmenu.cpp:485 src/gui/popupmenu.cpp:512
@@ -696,7 +696,7 @@ msgstr ""
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
 #: src/gui/setup.cpp:84 src/gui/socialwindow.cpp:1204
 #: src/gui/textcommandeditor.cpp:212 src/gui/textdialog.cpp:53
-#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:167
+#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:183
 msgid "Cancel"
 msgstr "انصراف"
 
@@ -860,7 +860,7 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:570
+#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:581
 #: src/gui/socialwindow.cpp:1269
 msgid "Create"
 msgstr "بساز"
@@ -887,17 +887,17 @@ msgid "Please remove %d points"
 msgstr ""
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:60
+#: src/gui/charselectdialog.cpp:61
 msgid "Confirm Character Delete"
 msgstr "تایید می کنم که خواهان حذف این شخصیت هستم"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:62
+#: src/gui/charselectdialog.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "آیا اطمینان دارید که خواهان حذف این شخصیت هستید؟"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:86
+#: src/gui/charselectdialog.cpp:87
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
@@ -909,8 +909,8 @@ msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:565
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:576
+#: src/gui/updaterwindow.cpp:185
 msgid "Play"
 msgstr ""
 
@@ -926,7 +926,7 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:263
+#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:272
 #: src/gui/setupactiondata.h:1803 src/gui/setup_relations.cpp:262
 #: src/gui/shopwindow.cpp:96 src/gui/shopwindow.cpp:103
 #: src/gui/textcommandeditor.cpp:216
@@ -936,24 +936,24 @@ msgstr "حذف"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/charselectdialog.cpp:129 src/gui/unregisterdialog.cpp:48
+#: src/gui/charselectdialog.cpp:130 src/gui/unregisterdialog.cpp:48
 #: src/gui/unregisterdialog.cpp:53
 msgid "Unregister"
 msgstr "ثبت نام نشده"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/charselectdialog.cpp:141
+#: src/gui/charselectdialog.cpp:142
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:172
+#: src/gui/charselectdialog.cpp:175
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/charselectdialog.cpp:246
+#: src/gui/charselectdialog.cpp:248
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -963,16 +963,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:288
+#: src/gui/charselectdialog.cpp:290
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password:"
 msgstr ""
 
@@ -1059,13 +1059,13 @@ msgid "Chat"
 msgstr "چت"
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:735
+#: src/gui/chatwindow.cpp:638
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1165
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -1083,7 +1083,7 @@ msgstr ""
 
 #. TRANSLATORS: confirm dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/confirmdialog.cpp:58 src/gui/popupmenu.cpp:2429
+#: src/gui/confirmdialog.cpp:55 src/gui/popupmenu.cpp:2429
 #: src/gui/popupmenu.cpp:2442 src/gui/popupmenu.cpp:2457
 #: src/gui/popupmenu.cpp:2483
 msgid "Ignore"
@@ -1092,7 +1092,7 @@ msgstr ""
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
 #. TRANSLATORS: settings group
-#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:109
+#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:108
 #: src/gui/setup_other.cpp:123 src/gui/windowmenu.cpp:106
 msgid "Map"
 msgstr ""
@@ -1108,190 +1108,190 @@ msgid "Net"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:265
-#: src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:268
+#: src/gui/debugwindow.cpp:311
 msgid "Music:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:153 src/gui/debugwindow.cpp:271
-#: src/gui/debugwindow.cpp:312
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:274
+#: src/gui/debugwindow.cpp:315
 msgid "Map:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:155 src/gui/debugwindow.cpp:268
-#: src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:271
+#: src/gui/debugwindow.cpp:313
 msgid "Minimap:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:262
-#: src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:161 src/gui/debugwindow.cpp:265
+#: src/gui/debugwindow.cpp:309
 msgid "Cursor:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:161
+#: src/gui/debugwindow.cpp:164
 msgid "Particle count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:284
-#: src/gui/debugwindow.cpp:316
+#: src/gui/debugwindow.cpp:167 src/gui/debugwindow.cpp:287
+#: src/gui/debugwindow.cpp:319
 msgid "Map actors count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:166 src/gui/debugwindow.cpp:243
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:169 src/gui/debugwindow.cpp:246
+#: src/gui/debugwindow.cpp:252
 msgid "Player Position:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:172 src/gui/debugwindow.cpp:297
+#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:300
 msgid "Draw calls:"
 msgstr ""
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:175
+#. TRANSLATORS: debug window label, frames per second
+#: src/gui/debugwindow.cpp:178
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:177 src/gui/debugwindow.cpp:324
+#. TRANSLATORS: debug window label, logic per second
+#: src/gui/debugwindow.cpp:180 src/gui/debugwindow.cpp:327
 #, c-format
 msgid "%d LPS"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:191 src/gui/debugwindow.cpp:209
 #, c-format
 msgid "%d FPS (Software)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:193
+#: src/gui/debugwindow.cpp:196
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:197
+#: src/gui/debugwindow.cpp:200
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:201
+#: src/gui/debugwindow.cpp:204
 #, c-format
 msgid "%d FPS (mobile OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:225 src/gui/debugwindow.cpp:290
+#: src/gui/debugwindow.cpp:228 src/gui/debugwindow.cpp:293
 msgid "Textures count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:279
+#: src/gui/debugwindow.cpp:282
 #, c-format
 msgid "Particle count: %d"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:330 src/gui/debugwindow.cpp:380
-#: src/gui/debugwindow.cpp:442
+#: src/gui/debugwindow.cpp:333 src/gui/debugwindow.cpp:383
+#: src/gui/debugwindow.cpp:445
 msgid "Target:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:332 src/gui/debugwindow.cpp:386
-#: src/gui/debugwindow.cpp:444
+#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
+#: src/gui/debugwindow.cpp:447
 msgid "Target Id:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
-#: src/gui/debugwindow.cpp:446
+#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:392
+#: src/gui/debugwindow.cpp:449
 msgid "Target type:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:337
+#: src/gui/debugwindow.cpp:340
 msgid "Target level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:339 src/gui/debugwindow.cpp:405
+#: src/gui/debugwindow.cpp:342 src/gui/debugwindow.cpp:408
 msgid "Target race:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:341
+#: src/gui/debugwindow.cpp:344
 msgid "Target party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:346
 msgid "Target guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:430
-#: src/gui/debugwindow.cpp:436 src/gui/debugwindow.cpp:454
+#: src/gui/debugwindow.cpp:348 src/gui/debugwindow.cpp:433
+#: src/gui/debugwindow.cpp:439 src/gui/debugwindow.cpp:457
 msgid "Attack delay:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:347 src/gui/debugwindow.cpp:417
-#: src/gui/debugwindow.cpp:456
+#: src/gui/debugwindow.cpp:350 src/gui/debugwindow.cpp:420
+#: src/gui/debugwindow.cpp:459
 msgid "Minimal hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:349 src/gui/debugwindow.cpp:420
-#: src/gui/debugwindow.cpp:458
+#: src/gui/debugwindow.cpp:352 src/gui/debugwindow.cpp:423
+#: src/gui/debugwindow.cpp:461
 msgid "Maximum hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:351 src/gui/debugwindow.cpp:423
-#: src/gui/debugwindow.cpp:460
+#: src/gui/debugwindow.cpp:354 src/gui/debugwindow.cpp:426
+#: src/gui/debugwindow.cpp:463
 msgid "Critical hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:394 src/gui/debugwindow.cpp:400
-#: src/gui/debugwindow.cpp:448
+#: src/gui/debugwindow.cpp:397 src/gui/debugwindow.cpp:403
+#: src/gui/debugwindow.cpp:451
 msgid "Target Level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:408 src/gui/debugwindow.cpp:450
+#: src/gui/debugwindow.cpp:411 src/gui/debugwindow.cpp:453
 msgid "Target Party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:412 src/gui/debugwindow.cpp:452
+#: src/gui/debugwindow.cpp:415 src/gui/debugwindow.cpp:455
 msgid "Target Guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:493
+#: src/gui/debugwindow.cpp:496
 #, c-format
 msgid "Ping: %s ms"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:496
+#: src/gui/debugwindow.cpp:499
 #, c-format
 msgid "In: %d bytes/s"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:499
+#: src/gui/debugwindow.cpp:502
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
@@ -1323,7 +1323,7 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #: src/gui/editdialog.cpp:45 src/gui/editserverdialog.cpp:78
-#: src/gui/itemamountwindow.cpp:210 src/gui/okdialog.cpp:51
+#: src/gui/itemamountwindow.cpp:204 src/gui/okdialog.cpp:51
 #: src/gui/quitdialog.cpp:70 src/gui/textdialog.cpp:46
 msgid "OK"
 msgstr "تایید"
@@ -1335,7 +1335,7 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:257
+#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:266
 msgid "Connect"
 msgstr ""
 
@@ -1365,7 +1365,7 @@ msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/editserverdialog.cpp:222
+#: src/gui/editserverdialog.cpp:218
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -1417,7 +1417,7 @@ msgstr ""
 #: src/gui/inventorywindow.cpp:178 src/gui/inventorywindow.cpp:630
 #: src/gui/popupmenu.cpp:1843 src/gui/popupmenu.cpp:1922
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2041
-#: src/gui/skilldialog.cpp:277
+#: src/gui/skilldialog.cpp:279
 msgid "Use"
 msgstr ""
 
@@ -1451,7 +1451,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: setup button
-#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:718
+#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:719
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1992
 #: src/gui/popupmenu.cpp:2066 src/gui/setup.cpp:86
 msgid "Store"
@@ -1473,47 +1473,47 @@ msgid "Drop"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/itemamountwindow.cpp:214
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:264
 msgid "Select amount of items to trade."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:274
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to drop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:278
+#: src/gui/itemamountwindow.cpp:272
 msgid "Select amount of items to store."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:276
 msgid "Select amount of items to retrieve."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:286
+#: src/gui/itemamountwindow.cpp:280
 msgid "Select amount of items to split."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:290
+#: src/gui/itemamountwindow.cpp:284
 msgid "Add to buy shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:294
+#: src/gui/itemamountwindow.cpp:288
 msgid "Add to sell shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:298
+#: src/gui/itemamountwindow.cpp:292
 msgid "Unknown."
 msgstr ""
 
@@ -1540,7 +1540,7 @@ msgstr ""
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:58 src/gui/killstats.cpp:171
-#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:516
+#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:509
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
@@ -1548,7 +1548,7 @@ msgstr ""
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:61 src/gui/killstats.cpp:173
 #: src/gui/killstats.cpp:253 src/gui/killstats.cpp:268
-#: src/gui/killstats.cpp:518
+#: src/gui/killstats.cpp:511
 #, c-format
 msgid "Avg Exp: %s"
 msgstr ""
@@ -1556,14 +1556,14 @@ msgstr ""
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:63 src/gui/killstats.cpp:176
 #: src/gui/killstats.cpp:258 src/gui/killstats.cpp:272
-#: src/gui/killstats.cpp:521
+#: src/gui/killstats.cpp:514
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:66 src/gui/killstats.cpp:187
-#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:524
+#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:517
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
@@ -1589,9 +1589,9 @@ msgid "Last kill exp:"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:414
-#: src/gui/killstats.cpp:421 src/gui/killstats.cpp:428
-#: src/gui/killstats.cpp:434
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:408
+#: src/gui/killstats.cpp:415 src/gui/killstats.cpp:422
+#: src/gui/killstats.cpp:428
 msgid "Time before jacko spawn:"
 msgstr ""
 
@@ -1623,12 +1623,12 @@ msgid "  Time for next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:421
+#: src/gui/killstats.cpp:415
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:428
+#: src/gui/killstats.cpp:422
 msgid "jacko spawning"
 msgstr ""
 
@@ -1734,32 +1734,32 @@ msgid "arrows bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:88
+#: src/gui/ministatuswindow.cpp:89
 msgid "status bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:108
+#: src/gui/ministatuswindow.cpp:109
 msgid "job bar"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:306 src/gui/statuswindow.cpp:298
+#: src/gui/ministatuswindow.cpp:307 src/gui/statuswindow.cpp:298
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:313 src/gui/statuswindow.cpp:141
+#: src/gui/ministatuswindow.cpp:314 src/gui/statuswindow.cpp:141
 #: src/gui/statuswindow.cpp:305 src/gui/statuswindow.cpp:375
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
 #. TRANSLATORS: status bar label
-#: src/gui/ministatuswindow.cpp:330 src/gui/ministatuswindow.cpp:367
+#: src/gui/ministatuswindow.cpp:331 src/gui/ministatuswindow.cpp:368
 msgid "Need"
 msgstr ""
 
@@ -2147,7 +2147,7 @@ msgstr ""
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2209 src/gui/popupmenu.cpp:2280
-#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:139
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
 #: src/gui/socialwindow.cpp:934
 msgid "(default)"
 msgstr ""
@@ -2330,7 +2330,7 @@ msgid "Passwords do not match."
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:257
 msgid "Choose Your Server"
 msgstr ""
 
@@ -2338,61 +2338,61 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:259 src/gui/shopwindow.cpp:94
+#: src/gui/serverdialog.cpp:268 src/gui/shopwindow.cpp:94
 #: src/gui/shopwindow.cpp:101 src/gui/tradewindow.cpp:77
 msgid "Add"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
-#: src/gui/serverdialog.cpp:261 src/gui/widgets/setupitem.cpp:299
+#: src/gui/serverdialog.cpp:270 src/gui/widgets/setupitem.cpp:299
 #: src/gui/widgets/setupitem.cpp:426
 msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:274
 msgid "Load"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:279
+#: src/gui/serverdialog.cpp:288
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:297
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:518
+#: src/gui/serverdialog.cpp:527
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:524
+#: src/gui/serverdialog.cpp:533
 msgid "Waiting for server..."
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:529
+#: src/gui/serverdialog.cpp:538
 msgid "Preparing download"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:534
+#: src/gui/serverdialog.cpp:543
 msgid "Error retreiving server list!"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:626
+#: src/gui/serverdialog.cpp:635
 msgid "requires a newer version"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:631
+#: src/gui/serverdialog.cpp:640
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -3403,7 +3403,7 @@ msgid "Type:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:334
+#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:336
 msgid "Delay:"
 msgstr ""
 
@@ -3423,30 +3423,30 @@ msgid "Blue:"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:420
+#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:422
 msgid "Static"
 msgstr ""
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:107 src/gui/setup_colors.cpp:110
-#: src/gui/setup_colors.cpp:422
+#: src/gui/setup_colors.cpp:424
 msgid "Pulse"
 msgstr ""
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:112 src/gui/setup_colors.cpp:115
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Rainbow"
 msgstr ""
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:117 src/gui/setup_colors.cpp:120
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Spectrum"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:328
+#: src/gui/setup_colors.cpp:330
 msgid "Alpha:"
 msgstr ""
 
@@ -3612,7 +3612,7 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: palette color
-#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:134
+#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:135
 msgid "Monsters"
 msgstr ""
 
@@ -4161,206 +4161,231 @@ msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:86
-msgid "Very small (9)"
+msgid "Very small (8)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:88
-msgid "Tiny (10)"
+msgid "Very small (9)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:90
-msgid "Small (11)"
+msgid "Tiny (10)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:92
-msgid "Medium (12)"
+msgid "Small (11)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:94
-msgid "Normal (13)"
+msgid "Medium (12)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:96
-msgid "Large (14)"
+msgid "Normal (13)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:98
-msgid "Very large (15)"
+msgid "Large (14)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:100
-msgid "Big (16)"
+msgid "Large (15)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:102
-msgid "Very big (17)"
+msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:104
-msgid "Huge (18)"
+msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:106
-msgid "Very huge (19)"
+msgid "Big (18)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:108
+msgid "Big (19)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:110
+msgid "Very big (20)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:112
+msgid "Very big (21)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:114
+msgid "Very big (22)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:116
+msgid "Huge (23)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:151
 msgid "Chinese (China)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:153
 msgid "Czech"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:155
 msgid "English"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:157
 msgid "Finnish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:159
 msgid "French"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:161
 msgid "German"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:153
+#: src/gui/setup_theme.cpp:163
 msgid "Indonesian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:155
+#: src/gui/setup_theme.cpp:165
 msgid "Italian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:157
+#: src/gui/setup_theme.cpp:167
 msgid "Polish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:159
+#: src/gui/setup_theme.cpp:169
 msgid "Japanese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:161
+#: src/gui/setup_theme.cpp:171
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:163
+#: src/gui/setup_theme.cpp:173
 msgid "Portuguese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:165
+#: src/gui/setup_theme.cpp:175
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:167
+#: src/gui/setup_theme.cpp:177
 msgid "Russian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:169
+#: src/gui/setup_theme.cpp:179
 msgid "Spanish (Castilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:171
+#: src/gui/setup_theme.cpp:181
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:223
+#: src/gui/setup_theme.cpp:233
 msgid "Gui theme"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:230
+#: src/gui/setup_theme.cpp:240
 msgid "Main Font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:235
+#: src/gui/setup_theme.cpp:245
 msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:239
+#: src/gui/setup_theme.cpp:249
 msgid "Bold font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:243
+#: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:247
+#: src/gui/setup_theme.cpp:257
 msgid "Help font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:251
+#: src/gui/setup_theme.cpp:261
 msgid "Secure font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:255
+#: src/gui/setup_theme.cpp:265
 msgid "Japanese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:260
+#: src/gui/setup_theme.cpp:270
 msgid "Font size"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:265
+#: src/gui/setup_theme.cpp:275
 msgid "Npc font size"
 msgstr ""
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/setup_theme.cpp:269
+#: src/gui/setup_theme.cpp:279
 msgid "i"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/setup_theme.cpp:442
+#: src/gui/setup_theme.cpp:452
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/setup_theme.cpp:467
+#: src/gui/setup_theme.cpp:477
 msgid "Theme Changed"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/setup_theme.cpp:467 src/gui/setup_video.cpp:537
+#: src/gui/setup_theme.cpp:477 src/gui/setup_video.cpp:537
 #: src/gui/setup_video.cpp:546
 msgid "Restart your client for the change to take effect."
 msgstr ""
@@ -4658,7 +4683,8 @@ msgid "Ambient FX"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_visual.cpp:140
+#. TRANSLATORS: palette color
+#: src/gui/setup_visual.cpp:140 src/gui/userpalette.cpp:146
 msgid "Particle effects"
 msgstr ""
 
@@ -4745,45 +4771,45 @@ msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/skilldialog.cpp:270 src/gui/windowmenu.cpp:112
+#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:112
 msgid "Skills"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/skilldialog.cpp:279
+#: src/gui/skilldialog.cpp:281
 msgid "Up"
 msgstr ""
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/skilldialog.cpp:391
+#: src/gui/skilldialog.cpp:393
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skills tab
-#: src/gui/skilldialog.cpp:444
+#: src/gui/skilldialog.cpp:446
 msgid "basic"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill name
-#: src/gui/skilldialog.cpp:447
+#: src/gui/skilldialog.cpp:449
 msgid "basic, 1"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/skilldialog.cpp:484
+#: src/gui/skilldialog.cpp:486
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/skilldialog.cpp:518
+#: src/gui/skilldialog.cpp:520
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/skilldialog.cpp:612 src/gui/skilldialog.cpp:762
+#: src/gui/skilldialog.cpp:614 src/gui/skilldialog.cpp:764
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -5226,7 +5252,7 @@ msgid "Trade: You"
 msgstr ""
 
 #. TRANSLATORS: trade window money label
-#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:182
+#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:184
 #, c-format
 msgid "You get %s"
 msgstr ""
@@ -5242,12 +5268,12 @@ msgid "You give:"
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:393
+#: src/gui/tradewindow.cpp:396
 msgid "You don't have enough money."
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:475
+#: src/gui/tradewindow.cpp:479
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
@@ -5259,223 +5285,223 @@ msgid "Name: %s"
 msgstr ""
 
 #. TRANSLATORS: updater window name
-#: src/gui/updaterwindow.cpp:140
+#: src/gui/updaterwindow.cpp:156
 msgid "Updating..."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:165
+#: src/gui/updaterwindow.cpp:181
 msgid "Connecting..."
 msgstr "در حال اتصال..."
 
 #. TRANSLATORS: update message
-#: src/gui/updaterwindow.cpp:656
+#: src/gui/updaterwindow.cpp:672
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/updaterwindow.cpp:658
+#: src/gui/updaterwindow.cpp:674
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:660
+#: src/gui/updaterwindow.cpp:676
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:839
+#: src/gui/updaterwindow.cpp:855
 msgid "Completed"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
 msgid "Being"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:118
-msgid "Friend Names"
+#: src/gui/userpalette.cpp:119
+msgid "Friend names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:120
-msgid "Disregarded Names"
+#: src/gui/userpalette.cpp:121
+msgid "Disregarded names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:122
-msgid "Ignored Names"
+#: src/gui/userpalette.cpp:123
+msgid "Ignored names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:124
-msgid "Erased Names"
+#: src/gui/userpalette.cpp:125
+msgid "Erased names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:126
-msgid "Other Players' Names"
+#: src/gui/userpalette.cpp:127
+msgid "Other players names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:128
-msgid "Own Name"
+#: src/gui/userpalette.cpp:129
+msgid "Own name"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:130
-msgid "GM Names"
+#: src/gui/userpalette.cpp:131
+msgid "GM names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
 msgid "NPCs"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
 msgid "Monster HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:140
 msgid "Monster HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:141
-msgid "Party Members"
+#: src/gui/userpalette.cpp:142
+msgid "Party members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:143
-msgid "Guild Members"
+#: src/gui/userpalette.cpp:144
+msgid "Guild members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:145
-msgid "Particle Effects"
+#: src/gui/userpalette.cpp:148
+msgid "Pickup notification"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:147
-msgid "Pickup Notification"
+#: src/gui/userpalette.cpp:150
+msgid "Exp notification"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:149
-msgid "Exp Notification"
-msgstr ""
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
 msgid "Player HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
 msgid "Player HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:157
-msgid "Player Hits Monster"
+#: src/gui/userpalette.cpp:158
+msgid "Player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:159
-msgid "Monster Hits Player"
+#: src/gui/userpalette.cpp:160
+msgid "Monster hits player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:163
-msgid "Other Player Hits Local Player"
+#: src/gui/userpalette.cpp:164
+msgid "Other player hits local player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:166
 msgid "Critical Hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
-msgid "Local Player Hits Monster"
+#: src/gui/userpalette.cpp:170
+msgid "Local player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:172
-msgid "Local Player Critical Hit"
+#: src/gui/userpalette.cpp:173
+msgid "Local player critical hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:175
-msgid "Local Player Miss"
+#: src/gui/userpalette.cpp:176
+msgid "Local player miss"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:177
+#: src/gui/userpalette.cpp:178
 msgid "Misses"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
-msgid "Portal Highlight"
+#: src/gui/userpalette.cpp:180
+msgid "Portal highlight"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:183
+msgid "Default collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:182
-msgid "Default collision Highlight"
+#: src/gui/userpalette.cpp:186
+msgid "Air collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:185
-msgid "Air collision Highlight"
+#: src/gui/userpalette.cpp:189
+msgid "Water collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:188
-msgid "Water collision Highlight"
+#: src/gui/userpalette.cpp:192
+msgid "Special ground collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:191
-msgid "Special ground collision Highlight"
+#: src/gui/userpalette.cpp:195
+msgid "Walkable highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
-msgid "Walkable Highlight"
+#: src/gui/userpalette.cpp:198
+msgid "Local player attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:197
-msgid "Local Player Attack Range"
+#: src/gui/userpalette.cpp:201
+msgid "Local player attack range border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:200
-msgid "Local Player Attack Range Border"
+#: src/gui/userpalette.cpp:204
+msgid "Monster attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:203
-msgid "Monster Attack Range"
+#: src/gui/userpalette.cpp:208
+msgid "Floor item amount color"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:206
-msgid "Home Place"
+#: src/gui/userpalette.cpp:211
+msgid "Home place"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:209
-msgid "Home Place Border"
+#: src/gui/userpalette.cpp:214
+msgid "Home place border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:212
-msgid "Road Point"
+#: src/gui/userpalette.cpp:217
+msgid "Road point"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
@@ -5605,7 +5631,7 @@ msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:315
+#: src/gui/widgets/itemcontainer.cpp:317
 msgid "Eq."
 msgstr ""
 
diff --git a/po/fi.po b/po/fi.po
index 153441e03..cc3861125 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-05-03 12:38+0300\n"
-"PO-Revision-Date: 2013-05-03 09:44+0000\n"
+"POT-Creation-Date: 2013-05-11 12:13+0300\n"
+"PO-Revision-Date: 2013-05-10 15:39+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: fi\n"
@@ -60,25 +60,25 @@ msgstr "-"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: full button name
-#: src/client.cpp:1136 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
+#: src/client.cpp:1137 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
 msgid "Setup"
 msgstr "Asetukset"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1140 src/gui/setup_perfomance.cpp:61
+#: src/client.cpp:1141 src/gui/setup_perfomance.cpp:61
 msgid "Perfomance"
 msgstr "Tehokkuus"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:1143 src/gui/setup_video.cpp:258
+#: src/client.cpp:1144 src/gui/setup_video.cpp:258
 msgid "Video"
 msgstr "Kuva"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1146 src/gui/setup_theme.cpp:273
+#: src/client.cpp:1147 src/gui/setup_theme.cpp:283
 msgid "Theme"
 msgstr "Teema"
 
@@ -89,7 +89,7 @@ msgstr "Teema"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1150 src/gui/didyouknowwindow.cpp:78
+#: src/client.cpp:1151 src/gui/didyouknowwindow.cpp:78
 #: src/gui/inventorywindow.cpp:228 src/gui/npcdialog.cpp:63
 #: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:574
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:80
@@ -97,32 +97,32 @@ msgid "Close"
 msgstr "Sulje"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1238
+#: src/client.cpp:1239
 msgid "Connecting to server"
 msgstr "Yhdistän palvelimeen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1282
 msgid "Logging in"
 msgstr "Kirjaudun sisään"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1320
+#: src/client.cpp:1321
 msgid "Entering game world"
 msgstr "Siirryn pelimaailmaan"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1431
+#: src/client.cpp:1432
 msgid "Requesting characters"
 msgstr "Pyydän hahmoja"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1471
 msgid "Connecting to the game server"
 msgstr "Yhdistän pelipalvelimeen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1483
+#: src/client.cpp:1484
 msgid "Changing game servers"
 msgstr "Vaihdan pelipalvelinta"
 
@@ -137,69 +137,69 @@ msgstr "Vaihdan pelipalvelinta"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1540 src/client.cpp:1551 src/client.cpp:1721
+#: src/client.cpp:1541 src/client.cpp:1552 src/client.cpp:1722
 #: src/gui/changeemaildialog.cpp:168 src/gui/changepassworddialog.cpp:158
-#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:288
-#: src/gui/editserverdialog.cpp:220 src/gui/registerdialog.cpp:263
+#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:290
+#: src/gui/editserverdialog.cpp:216 src/gui/registerdialog.cpp:263
 #: src/gui/unregisterdialog.cpp:143 src/net/ea/charserverhandler.cpp:190
 #: src/net/ea/charserverhandler.cpp:210
 msgid "Error"
 msgstr "Virhe"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1564
+#: src/client.cpp:1565
 msgid "Requesting registration details"
 msgstr "Pyydän rekisteröitymisen yksityiskohtia"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1601
+#: src/client.cpp:1602
 msgid "Password Change"
 msgstr "Salasanan vaihto"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1603
+#: src/client.cpp:1604
 msgid "Password changed successfully!"
 msgstr "Salasana vaihdettu onnistuneesti!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1624
+#: src/client.cpp:1625
 msgid "Email Change"
 msgstr "Sähköpostin vaihto"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1626
+#: src/client.cpp:1627
 msgid "Email changed successfully!"
 msgstr "Sähköpostiosoite vaihdettu onnistuneesti!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1647
+#: src/client.cpp:1648
 msgid "Unregister Successful"
 msgstr "Tietojen poisto onnistui"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1649
+#: src/client.cpp:1650
 msgid "Farewell, come back any time..."
 msgstr "Näkemisiin, tule pian takaisin..."
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1902 src/client.cpp:1917 src/client.cpp:1960
-#: src/client.cpp:1976 src/client.cpp:2417 src/client.cpp:2425
+#: src/client.cpp:1903 src/client.cpp:1918 src/client.cpp:1961
+#: src/client.cpp:1977 src/client.cpp:2418 src/client.cpp:2426
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s ei ole olemassa eikä sitä voi luoda! Poistun."
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2113
+#: src/client.cpp:2114
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Epäkelpo päivitysosoite: %s"
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2154 src/client.cpp:2161
+#: src/client.cpp:2155 src/client.cpp:2162
 msgid "Error creating updates directory!"
 msgstr "Päivityshakemistoa luodessa tapahtui virhe!"
 
-#: src/client.cpp:2183 src/client.cpp:2196
+#: src/client.cpp:2184 src/client.cpp:2197
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Virhe: %s ei ole olemassa eikä sitä voi luoda! Poistun."
@@ -483,19 +483,19 @@ msgid "Comment: %s"
 msgstr "Kommentti: %s"
 
 #. TRANSLATORS: bot checker window header
-#: src/gui/botcheckerwindow.cpp:269
+#: src/gui/botcheckerwindow.cpp:268
 msgid "Bot Checker"
 msgstr "Bottitutka"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:102
+#: src/gui/botcheckerwindow.cpp:277 src/gui/npcdialog.cpp:102
 msgid "Reset"
 msgstr "Nollaa"
 
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: relations table header
-#: src/gui/botcheckerwindow.cpp:305 src/gui/setup_relations.cpp:61
+#: src/gui/botcheckerwindow.cpp:304 src/gui/setup_relations.cpp:61
 msgid "Name"
 msgstr "Nimi"
 
@@ -503,7 +503,7 @@ msgstr "Nimi"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:145
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:145
 #: src/gui/popupmenu.cpp:241 src/gui/popupmenu.cpp:640
 #: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:257
 #: src/net/tmwa/generalhandler.cpp:292
@@ -513,7 +513,7 @@ msgstr "Hyökkää"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
-#: src/gui/botcheckerwindow.cpp:309 src/gui/popupmenu.cpp:225
+#: src/gui/botcheckerwindow.cpp:308 src/gui/popupmenu.cpp:225
 #: src/gui/setupactiondata.h:93
 msgid "Talk"
 msgstr "Keskustele"
@@ -521,7 +521,7 @@ msgstr "Keskustele"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/botcheckerwindow.cpp:311 src/gui/popupmenu.cpp:215
+#: src/gui/botcheckerwindow.cpp:310 src/gui/popupmenu.cpp:215
 #: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:371
 #: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:653
 #: src/gui/popupmenu.cpp:727 src/gui/setupactiondata.h:1856
@@ -529,7 +529,7 @@ msgid "Move"
 msgstr "Liiku"
 
 #. TRANSLATORS: bot checker window table header
-#: src/gui/botcheckerwindow.cpp:313
+#: src/gui/botcheckerwindow.cpp:312
 msgid "Result"
 msgstr "Tulos"
 
@@ -585,7 +585,7 @@ msgstr "Osta"
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:516
+#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:511
 #: src/gui/selldialog.cpp:94 src/gui/selldialog.cpp:342
 #, c-format
 msgid "Price: %s / Total: %s"
@@ -602,9 +602,9 @@ msgstr "Määrä:"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:208
-#: src/gui/itemamountwindow.cpp:243 src/gui/npcdialog.cpp:93
-#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:833
+#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:202
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:93
+#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:821
 msgid "+"
 msgstr "+"
 
@@ -614,9 +614,9 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:240 src/gui/npcdialog.cpp:95
-#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:846
+#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:200
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:95
+#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:834
 msgid "-"
 msgstr "-"
 
@@ -628,7 +628,7 @@ msgstr "-"
 #. TRANSLATORS: input action name
 #: src/gui/buydialog.cpp:260 src/gui/quitdialog.cpp:54
 #: src/gui/quitdialog.cpp:59 src/gui/quitdialog.cpp:61
-#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:255
+#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:264
 #: src/gui/setupactiondata.h:177
 msgid "Quit"
 msgstr "Sulje"
@@ -640,7 +640,7 @@ msgstr "Sulje"
 #. TRANSLATORS: status bar label
 #: src/gui/buydialog.cpp:262 src/gui/selldialog.cpp:106
 #: src/gui/statuswindow.cpp:558 src/gui/statuswindow.cpp:615
-#: src/gui/statuswindow.cpp:830 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:852
 msgid "Max"
 msgstr "Max"
 
@@ -685,7 +685,7 @@ msgstr "Myy"
 #: src/gui/buyselldialog.cpp:71 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:120
 #: src/gui/connectiondialog.cpp:48 src/gui/editserverdialog.cpp:80
-#: src/gui/itemamountwindow.cpp:212 src/gui/npcpostdialog.cpp:64
+#: src/gui/itemamountwindow.cpp:206 src/gui/npcpostdialog.cpp:64
 #: src/gui/popupmenu.cpp:290 src/gui/popupmenu.cpp:324
 #: src/gui/popupmenu.cpp:411 src/gui/popupmenu.cpp:454
 #: src/gui/popupmenu.cpp:485 src/gui/popupmenu.cpp:512
@@ -701,7 +701,7 @@ msgstr "Myy"
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
 #: src/gui/setup.cpp:84 src/gui/socialwindow.cpp:1204
 #: src/gui/textcommandeditor.cpp:212 src/gui/textdialog.cpp:53
-#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:167
+#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:183
 msgid "Cancel"
 msgstr "Peru"
 
@@ -865,7 +865,7 @@ msgstr "Jaa %d pistettä"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:570
+#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:581
 #: src/gui/socialwindow.cpp:1269
 msgid "Create"
 msgstr "Luo"
@@ -892,17 +892,17 @@ msgid "Please remove %d points"
 msgstr "%d pistettä liikaa, ole hyvä ja poista ylimäärä"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:60
+#: src/gui/charselectdialog.cpp:61
 msgid "Confirm Character Delete"
 msgstr "Vahvista hahmon poisto"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:62
+#: src/gui/charselectdialog.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "Oletko varma, että haluat poistaa tämän hahmon?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:86
+#: src/gui/charselectdialog.cpp:87
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
@@ -914,8 +914,8 @@ msgstr "Vaihda sisäänkirjautumistietoja"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:565
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:576
+#: src/gui/updaterwindow.cpp:185
 msgid "Play"
 msgstr "Pelaa"
 
@@ -931,7 +931,7 @@ msgstr "Tietoja"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:263
+#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:272
 #: src/gui/setupactiondata.h:1803 src/gui/setup_relations.cpp:262
 #: src/gui/shopwindow.cpp:96 src/gui/shopwindow.cpp:103
 #: src/gui/textcommandeditor.cpp:216
@@ -941,24 +941,24 @@ msgstr "Poista"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/charselectdialog.cpp:129 src/gui/unregisterdialog.cpp:48
+#: src/gui/charselectdialog.cpp:130 src/gui/unregisterdialog.cpp:48
 #: src/gui/unregisterdialog.cpp:53
 msgid "Unregister"
 msgstr "Poista palvelimelta"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/charselectdialog.cpp:141
+#: src/gui/charselectdialog.cpp:142
 msgid "Change Email"
 msgstr "Vaihda sähköpostiosoite"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:172
+#: src/gui/charselectdialog.cpp:175
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/charselectdialog.cpp:246
+#: src/gui/charselectdialog.cpp:248
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -968,16 +968,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:288
+#: src/gui/charselectdialog.cpp:290
 msgid "Incorrect password"
 msgstr "Väärä salasana"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password for deleting character"
 msgstr "Anna salasana hahmon poistamiseksi"
 
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password:"
 msgstr "Salasana:"
 
@@ -1064,13 +1064,13 @@ msgid "Chat"
 msgstr "Keskustelu"
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:735
+#: src/gui/chatwindow.cpp:638
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Läsnä: %s; %d pelaajaa paikalla."
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1165
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Kuiskaat pelaajalle %s: %s"
@@ -1088,7 +1088,7 @@ msgstr "Ei"
 
 #. TRANSLATORS: confirm dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/confirmdialog.cpp:58 src/gui/popupmenu.cpp:2429
+#: src/gui/confirmdialog.cpp:55 src/gui/popupmenu.cpp:2429
 #: src/gui/popupmenu.cpp:2442 src/gui/popupmenu.cpp:2457
 #: src/gui/popupmenu.cpp:2483
 msgid "Ignore"
@@ -1097,7 +1097,7 @@ msgstr "Ohita"
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
 #. TRANSLATORS: settings group
-#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:109
+#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:108
 #: src/gui/setup_other.cpp:123 src/gui/windowmenu.cpp:106
 msgid "Map"
 msgstr "Kartta"
@@ -1113,190 +1113,190 @@ msgid "Net"
 msgstr "Verkko"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:265
-#: src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:268
+#: src/gui/debugwindow.cpp:311
 msgid "Music:"
 msgstr "Musiikki:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:153 src/gui/debugwindow.cpp:271
-#: src/gui/debugwindow.cpp:312
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:274
+#: src/gui/debugwindow.cpp:315
 msgid "Map:"
 msgstr "Kartta:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:155 src/gui/debugwindow.cpp:268
-#: src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:271
+#: src/gui/debugwindow.cpp:313
 msgid "Minimap:"
 msgstr "Minikartta:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:262
-#: src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:161 src/gui/debugwindow.cpp:265
+#: src/gui/debugwindow.cpp:309
 msgid "Cursor:"
 msgstr "Osoitin:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:161
+#: src/gui/debugwindow.cpp:164
 msgid "Particle count:"
 msgstr "Hiukkasten määrä:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:284
-#: src/gui/debugwindow.cpp:316
+#: src/gui/debugwindow.cpp:167 src/gui/debugwindow.cpp:287
+#: src/gui/debugwindow.cpp:319
 msgid "Map actors count:"
 msgstr "Toimijoita kartalla:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:166 src/gui/debugwindow.cpp:243
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:169 src/gui/debugwindow.cpp:246
+#: src/gui/debugwindow.cpp:252
 msgid "Player Position:"
 msgstr "Pelaajan sijainti:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:172 src/gui/debugwindow.cpp:297
+#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:300
 msgid "Draw calls:"
 msgstr ""
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:175
+#. TRANSLATORS: debug window label, frames per second
+#: src/gui/debugwindow.cpp:178
 #, c-format
 msgid "%d FPS"
 msgstr "%d FPS"
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:177 src/gui/debugwindow.cpp:324
+#. TRANSLATORS: debug window label, logic per second
+#: src/gui/debugwindow.cpp:180 src/gui/debugwindow.cpp:327
 #, c-format
 msgid "%d LPS"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:191 src/gui/debugwindow.cpp:209
 #, c-format
 msgid "%d FPS (Software)"
 msgstr "%d FPS (ei kiihdytystä)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:193
+#: src/gui/debugwindow.cpp:196
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr "%d FPS (nopea OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:197
+#: src/gui/debugwindow.cpp:200
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr "%d FPS (vanha OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:201
+#: src/gui/debugwindow.cpp:204
 #, c-format
 msgid "%d FPS (mobile OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:225 src/gui/debugwindow.cpp:290
+#: src/gui/debugwindow.cpp:228 src/gui/debugwindow.cpp:293
 msgid "Textures count:"
 msgstr "Tekstuurien määrä:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:279
+#: src/gui/debugwindow.cpp:282
 #, c-format
 msgid "Particle count: %d"
 msgstr "Hiukkasluku: %d"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:330 src/gui/debugwindow.cpp:380
-#: src/gui/debugwindow.cpp:442
+#: src/gui/debugwindow.cpp:333 src/gui/debugwindow.cpp:383
+#: src/gui/debugwindow.cpp:445
 msgid "Target:"
 msgstr "Kohde:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:332 src/gui/debugwindow.cpp:386
-#: src/gui/debugwindow.cpp:444
+#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
+#: src/gui/debugwindow.cpp:447
 msgid "Target Id:"
 msgstr "Kohteen tunniste:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
-#: src/gui/debugwindow.cpp:446
+#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:392
+#: src/gui/debugwindow.cpp:449
 msgid "Target type:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:337
+#: src/gui/debugwindow.cpp:340
 msgid "Target level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:339 src/gui/debugwindow.cpp:405
+#: src/gui/debugwindow.cpp:342 src/gui/debugwindow.cpp:408
 msgid "Target race:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:341
+#: src/gui/debugwindow.cpp:344
 msgid "Target party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:346
 msgid "Target guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:430
-#: src/gui/debugwindow.cpp:436 src/gui/debugwindow.cpp:454
+#: src/gui/debugwindow.cpp:348 src/gui/debugwindow.cpp:433
+#: src/gui/debugwindow.cpp:439 src/gui/debugwindow.cpp:457
 msgid "Attack delay:"
 msgstr "Hyökkäysviive:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:347 src/gui/debugwindow.cpp:417
-#: src/gui/debugwindow.cpp:456
+#: src/gui/debugwindow.cpp:350 src/gui/debugwindow.cpp:420
+#: src/gui/debugwindow.cpp:459
 msgid "Minimal hit:"
 msgstr "Minimivahinko:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:349 src/gui/debugwindow.cpp:420
-#: src/gui/debugwindow.cpp:458
+#: src/gui/debugwindow.cpp:352 src/gui/debugwindow.cpp:423
+#: src/gui/debugwindow.cpp:461
 msgid "Maximum hit:"
 msgstr "Maksimivahinko:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:351 src/gui/debugwindow.cpp:423
-#: src/gui/debugwindow.cpp:460
+#: src/gui/debugwindow.cpp:354 src/gui/debugwindow.cpp:426
+#: src/gui/debugwindow.cpp:463
 msgid "Critical hit:"
 msgstr "Kriittinen osuma:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:394 src/gui/debugwindow.cpp:400
-#: src/gui/debugwindow.cpp:448
+#: src/gui/debugwindow.cpp:397 src/gui/debugwindow.cpp:403
+#: src/gui/debugwindow.cpp:451
 msgid "Target Level:"
 msgstr "Kohteen taso:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:408 src/gui/debugwindow.cpp:450
+#: src/gui/debugwindow.cpp:411 src/gui/debugwindow.cpp:453
 msgid "Target Party:"
 msgstr "Kohteen ryhmä:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:412 src/gui/debugwindow.cpp:452
+#: src/gui/debugwindow.cpp:415 src/gui/debugwindow.cpp:455
 msgid "Target Guild:"
 msgstr "Kohteen kilta:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:493
+#: src/gui/debugwindow.cpp:496
 #, c-format
 msgid "Ping: %s ms"
 msgstr "Ping: %s ms"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:496
+#: src/gui/debugwindow.cpp:499
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "Sisään: %d tavua/s"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:499
+#: src/gui/debugwindow.cpp:502
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "Ulos: %d tavua/s"
@@ -1328,7 +1328,7 @@ msgstr "Avaa tämä ikkuna automaattisesti"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #: src/gui/editdialog.cpp:45 src/gui/editserverdialog.cpp:78
-#: src/gui/itemamountwindow.cpp:210 src/gui/okdialog.cpp:51
+#: src/gui/itemamountwindow.cpp:204 src/gui/okdialog.cpp:51
 #: src/gui/quitdialog.cpp:70 src/gui/textdialog.cpp:46
 msgid "OK"
 msgstr "Ok"
@@ -1340,7 +1340,7 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:257
+#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:266
 msgid "Connect"
 msgstr "Yhdistä"
 
@@ -1370,7 +1370,7 @@ msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/editserverdialog.cpp:222
+#: src/gui/editserverdialog.cpp:218
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -1422,7 +1422,7 @@ msgstr "Ota käyttöön"
 #: src/gui/inventorywindow.cpp:178 src/gui/inventorywindow.cpp:630
 #: src/gui/popupmenu.cpp:1843 src/gui/popupmenu.cpp:1922
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2041
-#: src/gui/skilldialog.cpp:277
+#: src/gui/skilldialog.cpp:279
 msgid "Use"
 msgstr "Käytä"
 
@@ -1456,7 +1456,7 @@ msgstr "Asukokonaisuudet"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: setup button
-#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:718
+#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:719
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1992
 #: src/gui/popupmenu.cpp:2066 src/gui/setup.cpp:86
 msgid "Store"
@@ -1478,47 +1478,47 @@ msgid "Drop"
 msgstr "Pudota"
 
 #. TRANSLATORS: item amount window button
-#: src/gui/itemamountwindow.cpp:214
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "Kaikki"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:264
 msgid "Select amount of items to trade."
 msgstr "Anna vaihtokaupattavien tavaroiden määrä."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:274
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to drop."
 msgstr "Anna pudotettavien tavaroiden määrä."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:278
+#: src/gui/itemamountwindow.cpp:272
 msgid "Select amount of items to store."
 msgstr "Anna varastoitavien tavaroiden määrä."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:276
 msgid "Select amount of items to retrieve."
 msgstr "Anna varastosta otettavien tavaroiden määrä."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:286
+#: src/gui/itemamountwindow.cpp:280
 msgid "Select amount of items to split."
 msgstr "Anna eri pinoon jaettavien tavaroiden määrä."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:290
+#: src/gui/itemamountwindow.cpp:284
 msgid "Add to buy shop."
 msgstr "Lisää ostokauppaan."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:294
+#: src/gui/itemamountwindow.cpp:288
 msgid "Add to sell shop."
 msgstr "Lisää myyntikauppaan."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:298
+#: src/gui/itemamountwindow.cpp:292
 msgid "Unknown."
 msgstr "Tuntematon."
 
@@ -1545,7 +1545,7 @@ msgstr "Nollaa ajastin"
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:58 src/gui/killstats.cpp:171
-#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:516
+#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:509
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr "Tappoja: %s, kp kaikkiaan: %s"
@@ -1553,7 +1553,7 @@ msgstr "Tappoja: %s, kp kaikkiaan: %s"
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:61 src/gui/killstats.cpp:173
 #: src/gui/killstats.cpp:253 src/gui/killstats.cpp:268
-#: src/gui/killstats.cpp:518
+#: src/gui/killstats.cpp:511
 #, c-format
 msgid "Avg Exp: %s"
 msgstr ""
@@ -1561,14 +1561,14 @@ msgstr ""
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:63 src/gui/killstats.cpp:176
 #: src/gui/killstats.cpp:258 src/gui/killstats.cpp:272
-#: src/gui/killstats.cpp:521
+#: src/gui/killstats.cpp:514
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:66 src/gui/killstats.cpp:187
-#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:524
+#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:517
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr "Tappoa/min: %s, kp/min: %s"
@@ -1596,9 +1596,9 @@ msgid "Last kill exp:"
 msgstr "Viime tapon kp:"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:414
-#: src/gui/killstats.cpp:421 src/gui/killstats.cpp:428
-#: src/gui/killstats.cpp:434
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:408
+#: src/gui/killstats.cpp:415 src/gui/killstats.cpp:422
+#: src/gui/killstats.cpp:428
 msgid "Time before jacko spawn:"
 msgstr "Aika jackon resetiin:"
 
@@ -1630,12 +1630,12 @@ msgid "  Time for next level: %s"
 msgstr "  Aika seur. tasolle: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:421
+#: src/gui/killstats.cpp:415
 #, c-format
 msgid "%s %d?"
 msgstr "%s %d?"
 
-#: src/gui/killstats.cpp:428
+#: src/gui/killstats.cpp:422
 msgid "jacko spawning"
 msgstr "jacko elää!"
 
@@ -1741,32 +1741,32 @@ msgid "arrows bar"
 msgstr "nuolipalkki"
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:88
+#: src/gui/ministatuswindow.cpp:89
 msgid "status bar"
 msgstr "tilapalkki"
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:108
+#: src/gui/ministatuswindow.cpp:109
 msgid "job bar"
 msgstr "työpalkki"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:306 src/gui/statuswindow.cpp:298
+#: src/gui/ministatuswindow.cpp:307 src/gui/statuswindow.cpp:298
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Taso: %d (GM %d)"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:313 src/gui/statuswindow.cpp:141
+#: src/gui/ministatuswindow.cpp:314 src/gui/statuswindow.cpp:141
 #: src/gui/statuswindow.cpp:305 src/gui/statuswindow.cpp:375
 #, c-format
 msgid "Level: %d"
 msgstr "Taso: %d"
 
 #. TRANSLATORS: status bar label
-#: src/gui/ministatuswindow.cpp:330 src/gui/ministatuswindow.cpp:367
+#: src/gui/ministatuswindow.cpp:331 src/gui/ministatuswindow.cpp:368
 msgid "Need"
 msgstr "Tarvitaan"
 
@@ -2154,7 +2154,7 @@ msgstr "Kopioi keskusteluun"
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2209 src/gui/popupmenu.cpp:2280
-#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:139
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
 #: src/gui/socialwindow.cpp:934
 msgid "(default)"
 msgstr "(oletus)"
@@ -2337,7 +2337,7 @@ msgid "Passwords do not match."
 msgstr "Salasanat eivät täsmää."
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:257
 msgid "Choose Your Server"
 msgstr "Valitse palvelimesi"
 
@@ -2345,61 +2345,61 @@ msgstr "Valitse palvelimesi"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:259 src/gui/shopwindow.cpp:94
+#: src/gui/serverdialog.cpp:268 src/gui/shopwindow.cpp:94
 #: src/gui/shopwindow.cpp:101 src/gui/tradewindow.cpp:77
 msgid "Add"
 msgstr "Lisää"
 
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
-#: src/gui/serverdialog.cpp:261 src/gui/widgets/setupitem.cpp:299
+#: src/gui/serverdialog.cpp:270 src/gui/widgets/setupitem.cpp:299
 #: src/gui/widgets/setupitem.cpp:426
 msgid "Edit"
 msgstr "Muokkaa"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:274
 msgid "Load"
 msgstr "Lataa"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:279
+#: src/gui/serverdialog.cpp:288
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Valitse palvelimesi  *** VARMUUSTILA ***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:297
 msgid "Use same ip for game sub servers"
 msgstr "Käytä samaa IP-osoitetta alipalvelimille"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:518
+#: src/gui/serverdialog.cpp:527
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Lataan palvelinluettelon...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:524
+#: src/gui/serverdialog.cpp:533
 msgid "Waiting for server..."
 msgstr "Odotan palvelinta..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:529
+#: src/gui/serverdialog.cpp:538
 msgid "Preparing download"
 msgstr "Valmistelen latausta"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:534
+#: src/gui/serverdialog.cpp:543
 msgid "Error retreiving server list!"
 msgstr "Palvelinluettelon hakeminen epäonnistui!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:626
+#: src/gui/serverdialog.cpp:635
 msgid "requires a newer version"
 msgstr "vaatii uudemman version"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:631
+#: src/gui/serverdialog.cpp:640
 #, c-format
 msgid "requires v%s"
 msgstr "vaatii version %s"
@@ -3410,7 +3410,7 @@ msgid "Type:"
 msgstr "Tyyppi:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:334
+#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:336
 msgid "Delay:"
 msgstr "Viive:"
 
@@ -3430,30 +3430,30 @@ msgid "Blue:"
 msgstr "Sininen:"
 
 #. TRANSLATORS: color type
-#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:420
+#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:422
 msgid "Static"
 msgstr "Staattinen"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:107 src/gui/setup_colors.cpp:110
-#: src/gui/setup_colors.cpp:422
+#: src/gui/setup_colors.cpp:424
 msgid "Pulse"
 msgstr "Sykkivä"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:112 src/gui/setup_colors.cpp:115
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Rainbow"
 msgstr "Sateenkaari"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:117 src/gui/setup_colors.cpp:120
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Spectrum"
 msgstr "Spektri"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:328
+#: src/gui/setup_colors.cpp:330
 msgid "Alpha:"
 msgstr "Alfa:"
 
@@ -3621,7 +3621,7 @@ msgstr "Sekal."
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: palette color
-#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:134
+#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:135
 msgid "Monsters"
 msgstr "Hirviöt"
 
@@ -4171,206 +4171,231 @@ msgstr "Kun jätät huomiotta:"
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:86
-msgid "Very small (9)"
+msgid "Very small (8)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:88
+msgid "Very small (9)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:90
 msgid "Tiny (10)"
 msgstr "Pikkiriikkinen (10)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:90
+#: src/gui/setup_theme.cpp:92
 msgid "Small (11)"
 msgstr "Pieni (11)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:92
+#: src/gui/setup_theme.cpp:94
 msgid "Medium (12)"
 msgstr "Keskikokoinen (12)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:94
-msgid "Normal (13)"
-msgstr ""
-
-#. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:96
-msgid "Large (14)"
+msgid "Normal (13)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:98
-msgid "Very large (15)"
+msgid "Large (14)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:100
-msgid "Big (16)"
+msgid "Large (15)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:102
-msgid "Very big (17)"
+msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:104
-msgid "Huge (18)"
+msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:106
-msgid "Very huge (19)"
+msgid "Big (18)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:108
+msgid "Big (19)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:110
+msgid "Very big (20)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:112
+msgid "Very big (21)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:114
+msgid "Very big (22)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:116
+msgid "Huge (23)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:151
 msgid "Chinese (China)"
 msgstr "Kiina (kiina)"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:153
 msgid "Czech"
 msgstr "Tsekki"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:155
 msgid "English"
 msgstr "Englanti"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:157
 msgid "Finnish"
 msgstr "Suomi"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:159
 msgid "French"
 msgstr "Ranska"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:161
 msgid "German"
 msgstr "Saksa"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:153
+#: src/gui/setup_theme.cpp:163
 msgid "Indonesian"
 msgstr "Indonesia"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:155
+#: src/gui/setup_theme.cpp:165
 msgid "Italian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:157
+#: src/gui/setup_theme.cpp:167
 msgid "Polish"
 msgstr "Puola"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:159
+#: src/gui/setup_theme.cpp:169
 msgid "Japanese"
 msgstr "Japani"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:161
+#: src/gui/setup_theme.cpp:171
 msgid "Dutch (Belgium/Flemish)"
 msgstr "Hollanti (Belgia/fleemi)"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:163
+#: src/gui/setup_theme.cpp:173
 msgid "Portuguese"
 msgstr "Portugali"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:165
+#: src/gui/setup_theme.cpp:175
 msgid "Portuguese (Brazilian)"
 msgstr "Portugali (Brasilia)"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:167
+#: src/gui/setup_theme.cpp:177
 msgid "Russian"
 msgstr "Venäjä"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:169
+#: src/gui/setup_theme.cpp:179
 msgid "Spanish (Castilian)"
 msgstr "Espanja (Kastilli)"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:171
+#: src/gui/setup_theme.cpp:181
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:223
+#: src/gui/setup_theme.cpp:233
 msgid "Gui theme"
 msgstr "Käyttöliittymän teema"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:230
+#: src/gui/setup_theme.cpp:240
 msgid "Main Font"
 msgstr "Pääkirjasin"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:235
+#: src/gui/setup_theme.cpp:245
 msgid "Language"
 msgstr "Kieli"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:239
+#: src/gui/setup_theme.cpp:249
 msgid "Bold font"
 msgstr "Lihavoitu kirjasin"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:243
+#: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr "Hiukkaskirjasin"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:247
+#: src/gui/setup_theme.cpp:257
 msgid "Help font"
 msgstr "Ohjekirjasin"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:251
+#: src/gui/setup_theme.cpp:261
 msgid "Secure font"
 msgstr "Turvallinen kirjasin"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:255
+#: src/gui/setup_theme.cpp:265
 msgid "Japanese font"
 msgstr "Japanilainen kirjasin"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:260
+#: src/gui/setup_theme.cpp:270
 msgid "Font size"
 msgstr "Kirjasimen koko"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:265
+#: src/gui/setup_theme.cpp:275
 msgid "Npc font size"
 msgstr ""
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/setup_theme.cpp:269
+#: src/gui/setup_theme.cpp:279
 msgid "i"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/setup_theme.cpp:442
+#: src/gui/setup_theme.cpp:452
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/setup_theme.cpp:467
+#: src/gui/setup_theme.cpp:477
 msgid "Theme Changed"
 msgstr "Ulkoasua muutettu"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/setup_theme.cpp:467 src/gui/setup_video.cpp:537
+#: src/gui/setup_theme.cpp:477 src/gui/setup_video.cpp:537
 #: src/gui/setup_video.cpp:546
 msgid "Restart your client for the change to take effect."
 msgstr "Käynnistä ohjelma uudelleen, jotta muutos astuu voimaan."
@@ -4669,7 +4694,8 @@ msgid "Ambient FX"
 msgstr "Taustaäänet"
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_visual.cpp:140
+#. TRANSLATORS: palette color
+#: src/gui/setup_visual.cpp:140 src/gui/userpalette.cpp:146
 msgid "Particle effects"
 msgstr "Hiukkastehosteet"
 
@@ -4756,45 +4782,45 @@ msgid "%s wants to %s %s do you accept?"
 msgstr "%s haluaa %s %s - hyväksytkö?"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/skilldialog.cpp:270 src/gui/windowmenu.cpp:112
+#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:112
 msgid "Skills"
 msgstr "Taidot"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/skilldialog.cpp:279
+#: src/gui/skilldialog.cpp:281
 msgid "Up"
 msgstr "Ylös"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/skilldialog.cpp:391
+#: src/gui/skilldialog.cpp:393
 #, c-format
 msgid "Skill points available: %d"
 msgstr "%d taitopistettä käyttämättä"
 
 #. TRANSLATORS: skills dialog default skills tab
-#: src/gui/skilldialog.cpp:444
+#: src/gui/skilldialog.cpp:446
 msgid "basic"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill name
-#: src/gui/skilldialog.cpp:447
+#: src/gui/skilldialog.cpp:449
 msgid "basic, 1"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/skilldialog.cpp:484
+#: src/gui/skilldialog.cpp:486
 #, c-format
 msgid "Skill Set %d"
 msgstr "Taitojoukko %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/skilldialog.cpp:518
+#: src/gui/skilldialog.cpp:520
 #, c-format
 msgid "Skill %d"
 msgstr "Taito %d"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/skilldialog.cpp:612 src/gui/skilldialog.cpp:762
+#: src/gui/skilldialog.cpp:614 src/gui/skilldialog.cpp:764
 #, c-format
 msgid "Lvl: %d"
 msgstr "Taso: %d"
@@ -5237,7 +5263,7 @@ msgid "Trade: You"
 msgstr "Kauppa: Sinä"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:182
+#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:184
 #, c-format
 msgid "You get %s"
 msgstr "Saat %s"
@@ -5253,12 +5279,12 @@ msgid "You give:"
 msgstr "Annat:"
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:393
+#: src/gui/tradewindow.cpp:396
 msgid "You don't have enough money."
 msgstr "Sinulla ei ole tarpeeksi rahaa."
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:475
+#: src/gui/tradewindow.cpp:479
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "Tavaran lisääminen epäonnistui, limittämisongelma."
 
@@ -5269,224 +5295,224 @@ msgid "Name: %s"
 msgstr "Nimi: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/updaterwindow.cpp:140
+#: src/gui/updaterwindow.cpp:156
 msgid "Updating..."
 msgstr "Päivitetään..."
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:165
+#: src/gui/updaterwindow.cpp:181
 msgid "Connecting..."
 msgstr "Yhdistetään..."
 
 #. TRANSLATORS: update message
-#: src/gui/updaterwindow.cpp:656
+#: src/gui/updaterwindow.cpp:672
 msgid "##1  The update process is incomplete."
 msgstr "##1  Päivitysprosessi keskeytyi"
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/updaterwindow.cpp:658
+#: src/gui/updaterwindow.cpp:674
 msgid "##1  It is strongly recommended that"
 msgstr "##1  Suosittelemme vahvasti että"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:660
+#: src/gui/updaterwindow.cpp:676
 msgid "##1  you try again later."
 msgstr "##1  yrität myöhemmin uudelleen"
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:839
+#: src/gui/updaterwindow.cpp:855
 msgid "Completed"
 msgstr "Valmis"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
 msgid "Being"
 msgstr "Olo"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:118
-msgid "Friend Names"
-msgstr "Ystävien nimet"
+#: src/gui/userpalette.cpp:119
+msgid "Friend names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:120
-msgid "Disregarded Names"
-msgstr "Vaimennettujen nimet"
+#: src/gui/userpalette.cpp:121
+msgid "Disregarded names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:122
-msgid "Ignored Names"
-msgstr "Huomiotta jätettyjen nimet"
+#: src/gui/userpalette.cpp:123
+msgid "Ignored names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:124
-msgid "Erased Names"
-msgstr "Pyyhittyjen nimet"
+#: src/gui/userpalette.cpp:125
+msgid "Erased names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:126
-msgid "Other Players' Names"
-msgstr "Muiden pelaajien nimet"
+#: src/gui/userpalette.cpp:127
+msgid "Other players names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:128
-msgid "Own Name"
-msgstr "Oma nimi"
+#: src/gui/userpalette.cpp:129
+msgid "Own name"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:130
-msgid "GM Names"
-msgstr "GM-nimet"
+#: src/gui/userpalette.cpp:131
+msgid "GM names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
 msgid "NPCs"
 msgstr "NPCt"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
 msgid "Monster HP bar"
 msgstr "Hirviön VP-palkki"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:140
 msgid "Monster HP bar (second color)"
 msgstr "Hirviön VP-palkki (toinen väri)"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:141
-msgid "Party Members"
-msgstr "Ryhmän jäsenet"
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:143
-msgid "Guild Members"
-msgstr "Killan jäsenet"
+#: src/gui/userpalette.cpp:142
+msgid "Party members"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:145
-msgid "Particle Effects"
-msgstr "Hiukkastehosteet"
+#: src/gui/userpalette.cpp:144
+msgid "Guild members"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:147
-msgid "Pickup Notification"
-msgstr "Poimintailmoitus"
+#: src/gui/userpalette.cpp:148
+msgid "Pickup notification"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:149
-msgid "Exp Notification"
-msgstr "Kokemusilmoitus"
+#: src/gui/userpalette.cpp:150
+msgid "Exp notification"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
 msgid "Player HP bar"
 msgstr "Pelaajan VP-palkki"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
 msgid "Player HP bar (second color)"
 msgstr "Pelaajan VP-palkki (toinen väri)"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:157
-msgid "Player Hits Monster"
-msgstr "Pelaaja lyö hirviötä"
+#: src/gui/userpalette.cpp:158
+msgid "Player hits monster"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:159
-msgid "Monster Hits Player"
-msgstr "Hirviö lyö pelaajaa"
+#: src/gui/userpalette.cpp:160
+msgid "Monster hits player"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:163
-msgid "Other Player Hits Local Player"
-msgstr "Toinen pelaaja lyö paikallista pelaajaa"
+#: src/gui/userpalette.cpp:164
+msgid "Other player hits local player"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:166
 msgid "Critical Hit"
 msgstr "Täysosuma"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
-msgid "Local Player Hits Monster"
-msgstr "Paikallinen pelaaja lyö hirviötä"
+#: src/gui/userpalette.cpp:170
+msgid "Local player hits monster"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:172
-msgid "Local Player Critical Hit"
-msgstr "Paikallinen pelaaja saa täysosuman"
+#: src/gui/userpalette.cpp:173
+msgid "Local player critical hit"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:175
-msgid "Local Player Miss"
-msgstr "Paikallisen pelaajan huti"
+#: src/gui/userpalette.cpp:176
+msgid "Local player miss"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:177
+#: src/gui/userpalette.cpp:178
 msgid "Misses"
 msgstr "Hudit"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
-msgid "Portal Highlight"
-msgstr "Siirtymän korostus"
+#: src/gui/userpalette.cpp:180
+msgid "Portal highlight"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:182
-msgid "Default collision Highlight"
-msgstr "Oletustörmäyskorostus"
+#: src/gui/userpalette.cpp:183
+msgid "Default collision highlight"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:185
-msgid "Air collision Highlight"
-msgstr "Ilmatörmäyksen korostus"
+#: src/gui/userpalette.cpp:186
+msgid "Air collision highlight"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:188
-msgid "Water collision Highlight"
-msgstr "Vesitörmäyksen korostus"
+#: src/gui/userpalette.cpp:189
+msgid "Water collision highlight"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:191
-msgid "Special ground collision Highlight"
+#: src/gui/userpalette.cpp:192
+msgid "Special ground collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
-msgid "Walkable Highlight"
-msgstr "Kuljettavan korostus"
+#: src/gui/userpalette.cpp:195
+msgid "Walkable highlight"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:197
-msgid "Local Player Attack Range"
-msgstr "Paikallispelaajan hyökkäyskantama"
+#: src/gui/userpalette.cpp:198
+msgid "Local player attack range"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:200
-msgid "Local Player Attack Range Border"
-msgstr "Paikallispelaajan hyökkäyskantaman raja"
+#: src/gui/userpalette.cpp:201
+msgid "Local player attack range border"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:203
-msgid "Monster Attack Range"
-msgstr "Hirviön hyökkäyskantama"
+#: src/gui/userpalette.cpp:204
+msgid "Monster attack range"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:206
-msgid "Home Place"
-msgstr "Kotipaikka"
+#: src/gui/userpalette.cpp:208
+msgid "Floor item amount color"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:211
+msgid "Home place"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:209
-msgid "Home Place Border"
-msgstr "Kotipaikan raja"
+#: src/gui/userpalette.cpp:214
+msgid "Home place border"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:212
-msgid "Road Point"
-msgstr "Väyläpiste"
+#: src/gui/userpalette.cpp:217
+msgid "Road point"
+msgstr ""
 
 #. TRANSLATORS: who is online window name
 #: src/gui/whoisonline.cpp:79 src/gui/whoisonline.cpp:623
@@ -5615,7 +5641,7 @@ msgid "/kick > Kick some one from the guild you are in"
 msgstr "/kick > Poista käyttäjä killastasi"
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:315
+#: src/gui/widgets/itemcontainer.cpp:317
 msgid "Eq."
 msgstr ""
 
diff --git a/po/fr.po b/po/fr.po
index f4497919c..118855f30 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-05-03 12:38+0300\n"
-"PO-Revision-Date: 2013-05-03 09:44+0000\n"
+"POT-Creation-Date: 2013-05-11 12:13+0300\n"
+"PO-Revision-Date: 2013-05-10 15:39+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/manaplus/language/"
 "fr/)\n"
@@ -68,25 +68,25 @@ msgstr "I"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: full button name
-#: src/client.cpp:1136 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
+#: src/client.cpp:1137 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
 msgid "Setup"
 msgstr "Configuration"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1140 src/gui/setup_perfomance.cpp:61
+#: src/client.cpp:1141 src/gui/setup_perfomance.cpp:61
 msgid "Perfomance"
 msgstr "Performance"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:1143 src/gui/setup_video.cpp:258
+#: src/client.cpp:1144 src/gui/setup_video.cpp:258
 msgid "Video"
 msgstr "Vidéo"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1146 src/gui/setup_theme.cpp:273
+#: src/client.cpp:1147 src/gui/setup_theme.cpp:283
 msgid "Theme"
 msgstr "Thème"
 
@@ -97,7 +97,7 @@ msgstr "Thème"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1150 src/gui/didyouknowwindow.cpp:78
+#: src/client.cpp:1151 src/gui/didyouknowwindow.cpp:78
 #: src/gui/inventorywindow.cpp:228 src/gui/npcdialog.cpp:63
 #: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:574
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:80
@@ -105,32 +105,32 @@ msgid "Close"
 msgstr "Fermer"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1238
+#: src/client.cpp:1239
 msgid "Connecting to server"
 msgstr "Connexion au serveur"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1282
 msgid "Logging in"
 msgstr "Connexion"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1320
+#: src/client.cpp:1321
 msgid "Entering game world"
 msgstr "Entrée dans le monde de jeu"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1431
+#: src/client.cpp:1432
 msgid "Requesting characters"
 msgstr "Téléchargement des personnages"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1471
 msgid "Connecting to the game server"
 msgstr "Connexion au serveur de jeu"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1483
+#: src/client.cpp:1484
 msgid "Changing game servers"
 msgstr "Changement de serveur de jeu"
 
@@ -145,69 +145,69 @@ msgstr "Changement de serveur de jeu"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1540 src/client.cpp:1551 src/client.cpp:1721
+#: src/client.cpp:1541 src/client.cpp:1552 src/client.cpp:1722
 #: src/gui/changeemaildialog.cpp:168 src/gui/changepassworddialog.cpp:158
-#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:288
-#: src/gui/editserverdialog.cpp:220 src/gui/registerdialog.cpp:263
+#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:290
+#: src/gui/editserverdialog.cpp:216 src/gui/registerdialog.cpp:263
 #: src/gui/unregisterdialog.cpp:143 src/net/ea/charserverhandler.cpp:190
 #: src/net/ea/charserverhandler.cpp:210
 msgid "Error"
 msgstr "Erreur"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1564
+#: src/client.cpp:1565
 msgid "Requesting registration details"
 msgstr "Demande des paramètres d'inscription"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1601
+#: src/client.cpp:1602
 msgid "Password Change"
 msgstr "Changement de mot de passe"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1603
+#: src/client.cpp:1604
 msgid "Password changed successfully!"
 msgstr "Le mot de passe a été changé avec succès !"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1624
+#: src/client.cpp:1625
 msgid "Email Change"
 msgstr "Changer d'e-mail"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1626
+#: src/client.cpp:1627
 msgid "Email changed successfully!"
 msgstr "L'adresse e-mail a été changée avec succès !"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1647
+#: src/client.cpp:1648
 msgid "Unregister Successful"
 msgstr "Désinscription réussie"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1649
+#: src/client.cpp:1650
 msgid "Farewell, come back any time..."
 msgstr "À bientôt, Revenez quand vous voulez..."
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1902 src/client.cpp:1917 src/client.cpp:1960
-#: src/client.cpp:1976 src/client.cpp:2417 src/client.cpp:2425
+#: src/client.cpp:1903 src/client.cpp:1918 src/client.cpp:1961
+#: src/client.cpp:1977 src/client.cpp:2418 src/client.cpp:2426
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s n'existe pas et ne peut pas être créé ! Fermeture du programme."
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2113
+#: src/client.cpp:2114
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Site de mise à jour invalide : %s"
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2154 src/client.cpp:2161
+#: src/client.cpp:2155 src/client.cpp:2162
 msgid "Error creating updates directory!"
 msgstr "Impossible de créer le dossier de mise à jour !"
 
-#: src/client.cpp:2183 src/client.cpp:2196
+#: src/client.cpp:2184 src/client.cpp:2197
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -366,7 +366,7 @@ msgstr "%d semaines"
 #: src/commands.cpp:892
 #, c-format
 msgid "%d weeks"
-msgstr ""
+msgstr "%d semaines"
 
 #. TRANSLATORS: uptime command
 #: src/commands.cpp:903
@@ -377,7 +377,7 @@ msgstr "%d jours"
 #: src/commands.cpp:903
 #, c-format
 msgid "%d days"
-msgstr ""
+msgstr "%d jours"
 
 #. TRANSLATORS: uptime command
 #: src/commands.cpp:913
@@ -388,7 +388,7 @@ msgstr "%d heures"
 #: src/commands.cpp:913
 #, c-format
 msgid "%d hours"
-msgstr ""
+msgstr "%d heures"
 
 #. TRANSLATORS: uptime command
 #: src/commands.cpp:923
@@ -399,7 +399,7 @@ msgstr "%d minutes"
 #: src/commands.cpp:923
 #, c-format
 msgid "%d minutes"
-msgstr ""
+msgstr "%d minutes"
 
 #. TRANSLATORS: uptime command
 #: src/commands.cpp:933
@@ -410,7 +410,7 @@ msgstr "%d secondes"
 #: src/commands.cpp:933
 #, c-format
 msgid "%d seconds"
-msgstr ""
+msgstr "%d secondes"
 
 #. TRANSLATORS: dump environment command
 #: src/commands.cpp:1091
@@ -493,19 +493,19 @@ msgid "Comment: %s"
 msgstr "Commentaire : %s"
 
 #. TRANSLATORS: bot checker window header
-#: src/gui/botcheckerwindow.cpp:269
+#: src/gui/botcheckerwindow.cpp:268
 msgid "Bot Checker"
 msgstr "Testeur de Robot"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:102
+#: src/gui/botcheckerwindow.cpp:277 src/gui/npcdialog.cpp:102
 msgid "Reset"
 msgstr "Réinitialiser"
 
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: relations table header
-#: src/gui/botcheckerwindow.cpp:305 src/gui/setup_relations.cpp:61
+#: src/gui/botcheckerwindow.cpp:304 src/gui/setup_relations.cpp:61
 msgid "Name"
 msgstr "Nom"
 
@@ -513,7 +513,7 @@ msgstr "Nom"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:145
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:145
 #: src/gui/popupmenu.cpp:241 src/gui/popupmenu.cpp:640
 #: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:257
 #: src/net/tmwa/generalhandler.cpp:292
@@ -523,7 +523,7 @@ msgstr "Attaquer"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
-#: src/gui/botcheckerwindow.cpp:309 src/gui/popupmenu.cpp:225
+#: src/gui/botcheckerwindow.cpp:308 src/gui/popupmenu.cpp:225
 #: src/gui/setupactiondata.h:93
 msgid "Talk"
 msgstr "Parler"
@@ -531,7 +531,7 @@ msgstr "Parler"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/botcheckerwindow.cpp:311 src/gui/popupmenu.cpp:215
+#: src/gui/botcheckerwindow.cpp:310 src/gui/popupmenu.cpp:215
 #: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:371
 #: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:653
 #: src/gui/popupmenu.cpp:727 src/gui/setupactiondata.h:1856
@@ -539,7 +539,7 @@ msgid "Move"
 msgstr "Déplacement"
 
 #. TRANSLATORS: bot checker window table header
-#: src/gui/botcheckerwindow.cpp:313
+#: src/gui/botcheckerwindow.cpp:312
 msgid "Result"
 msgstr "Résultat"
 
@@ -595,7 +595,7 @@ msgstr "Acheter"
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:516
+#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:511
 #: src/gui/selldialog.cpp:94 src/gui/selldialog.cpp:342
 #, c-format
 msgid "Price: %s / Total: %s"
@@ -612,9 +612,9 @@ msgstr "Montant :"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:208
-#: src/gui/itemamountwindow.cpp:243 src/gui/npcdialog.cpp:93
-#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:833
+#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:202
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:93
+#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:821
 msgid "+"
 msgstr "+"
 
@@ -624,9 +624,9 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:240 src/gui/npcdialog.cpp:95
-#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:846
+#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:200
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:95
+#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:834
 msgid "-"
 msgstr "-"
 
@@ -638,7 +638,7 @@ msgstr "-"
 #. TRANSLATORS: input action name
 #: src/gui/buydialog.cpp:260 src/gui/quitdialog.cpp:54
 #: src/gui/quitdialog.cpp:59 src/gui/quitdialog.cpp:61
-#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:255
+#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:264
 #: src/gui/setupactiondata.h:177
 msgid "Quit"
 msgstr "Quitter"
@@ -650,7 +650,7 @@ msgstr "Quitter"
 #. TRANSLATORS: status bar label
 #: src/gui/buydialog.cpp:262 src/gui/selldialog.cpp:106
 #: src/gui/statuswindow.cpp:558 src/gui/statuswindow.cpp:615
-#: src/gui/statuswindow.cpp:830 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:852
 msgid "Max"
 msgstr "Max."
 
@@ -695,7 +695,7 @@ msgstr "Vendre"
 #: src/gui/buyselldialog.cpp:71 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:120
 #: src/gui/connectiondialog.cpp:48 src/gui/editserverdialog.cpp:80
-#: src/gui/itemamountwindow.cpp:212 src/gui/npcpostdialog.cpp:64
+#: src/gui/itemamountwindow.cpp:206 src/gui/npcpostdialog.cpp:64
 #: src/gui/popupmenu.cpp:290 src/gui/popupmenu.cpp:324
 #: src/gui/popupmenu.cpp:411 src/gui/popupmenu.cpp:454
 #: src/gui/popupmenu.cpp:485 src/gui/popupmenu.cpp:512
@@ -711,7 +711,7 @@ msgstr "Vendre"
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
 #: src/gui/setup.cpp:84 src/gui/socialwindow.cpp:1204
 #: src/gui/textcommandeditor.cpp:212 src/gui/textdialog.cpp:53
-#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:167
+#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:183
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -875,7 +875,7 @@ msgstr "Distribues %d points"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:570
+#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:581
 #: src/gui/socialwindow.cpp:1269
 msgid "Create"
 msgstr "Créer"
@@ -902,17 +902,17 @@ msgid "Please remove %d points"
 msgstr "Retires %d points"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:60
+#: src/gui/charselectdialog.cpp:61
 msgid "Confirm Character Delete"
 msgstr "Confirmer la suppression du personnage"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:62
+#: src/gui/charselectdialog.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "Etes-vous certain de vouloir supprimer ce personnage ?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:86
+#: src/gui/charselectdialog.cpp:87
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr "Compte %s (dernier ouverture le %s)"
@@ -924,8 +924,8 @@ msgstr "Changer de compte"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:565
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:576
+#: src/gui/updaterwindow.cpp:185
 msgid "Play"
 msgstr "Jouer"
 
@@ -941,7 +941,7 @@ msgstr "Informations"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:263
+#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:272
 #: src/gui/setupactiondata.h:1803 src/gui/setup_relations.cpp:262
 #: src/gui/shopwindow.cpp:96 src/gui/shopwindow.cpp:103
 #: src/gui/textcommandeditor.cpp:216
@@ -951,24 +951,24 @@ msgstr "Supprimer"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/charselectdialog.cpp:129 src/gui/unregisterdialog.cpp:48
+#: src/gui/charselectdialog.cpp:130 src/gui/unregisterdialog.cpp:48
 #: src/gui/unregisterdialog.cpp:53
 msgid "Unregister"
 msgstr "Se désinscrire"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/charselectdialog.cpp:141
+#: src/gui/charselectdialog.cpp:142
 msgid "Change Email"
 msgstr "Modifier l'adresse e-mail"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:172
+#: src/gui/charselectdialog.cpp:175
 #, c-format
 msgid "Account %s"
 msgstr "Compte %s"
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/charselectdialog.cpp:246
+#: src/gui/charselectdialog.cpp:248
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -983,16 +983,16 @@ msgstr ""
 "Expérience : %u\n"
 "Argent : %s"
 
-#: src/gui/charselectdialog.cpp:288
+#: src/gui/charselectdialog.cpp:290
 msgid "Incorrect password"
 msgstr "Mot de passe incorrect"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password for deleting character"
 msgstr "Entrer le mot de passe pour effacer le personnage"
 
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password:"
 msgstr "Entrer le mot de passe :"
 
@@ -1079,13 +1079,13 @@ msgid "Chat"
 msgstr "Conversation"
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:735
+#: src/gui/chatwindow.cpp:638
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Présents : %s ; %d joueurs sont présents."
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1165
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Message envoyé à %s : %s"
@@ -1103,7 +1103,7 @@ msgstr "Non"
 
 #. TRANSLATORS: confirm dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/confirmdialog.cpp:58 src/gui/popupmenu.cpp:2429
+#: src/gui/confirmdialog.cpp:55 src/gui/popupmenu.cpp:2429
 #: src/gui/popupmenu.cpp:2442 src/gui/popupmenu.cpp:2457
 #: src/gui/popupmenu.cpp:2483
 msgid "Ignore"
@@ -1112,7 +1112,7 @@ msgstr "Ignorer"
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
 #. TRANSLATORS: settings group
-#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:109
+#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:108
 #: src/gui/setup_other.cpp:123 src/gui/windowmenu.cpp:106
 msgid "Map"
 msgstr "Carte"
@@ -1128,190 +1128,190 @@ msgid "Net"
 msgstr "Réseau"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:265
-#: src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:268
+#: src/gui/debugwindow.cpp:311
 msgid "Music:"
 msgstr "Musique :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:153 src/gui/debugwindow.cpp:271
-#: src/gui/debugwindow.cpp:312
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:274
+#: src/gui/debugwindow.cpp:315
 msgid "Map:"
 msgstr "Carte :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:155 src/gui/debugwindow.cpp:268
-#: src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:271
+#: src/gui/debugwindow.cpp:313
 msgid "Minimap:"
 msgstr "Mini Carte :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:262
-#: src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:161 src/gui/debugwindow.cpp:265
+#: src/gui/debugwindow.cpp:309
 msgid "Cursor:"
 msgstr "Curseur :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:161
+#: src/gui/debugwindow.cpp:164
 msgid "Particle count:"
 msgstr "Comptage de particules :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:284
-#: src/gui/debugwindow.cpp:316
+#: src/gui/debugwindow.cpp:167 src/gui/debugwindow.cpp:287
+#: src/gui/debugwindow.cpp:319
 msgid "Map actors count:"
 msgstr "Nombre d'acteurs sur la carte :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:166 src/gui/debugwindow.cpp:243
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:169 src/gui/debugwindow.cpp:246
+#: src/gui/debugwindow.cpp:252
 msgid "Player Position:"
 msgstr "Position du joueur :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:172 src/gui/debugwindow.cpp:297
+#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:300
 msgid "Draw calls:"
 msgstr "Dessiner les appels :"
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:175
+#. TRANSLATORS: debug window label, frames per second
+#: src/gui/debugwindow.cpp:178
 #, c-format
 msgid "%d FPS"
 msgstr "%d FPS"
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:177 src/gui/debugwindow.cpp:324
+#. TRANSLATORS: debug window label, logic per second
+#: src/gui/debugwindow.cpp:180 src/gui/debugwindow.cpp:327
 #, c-format
 msgid "%d LPS"
 msgstr "%d LPS"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:191 src/gui/debugwindow.cpp:209
 #, c-format
 msgid "%d FPS (Software)"
 msgstr "%d FPS (Logiciel)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:193
+#: src/gui/debugwindow.cpp:196
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr "%d FPS (OpenGl rapide)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:197
+#: src/gui/debugwindow.cpp:200
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr "%d FPS (ancien OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:201
+#: src/gui/debugwindow.cpp:204
 #, c-format
 msgid "%d FPS (mobile OpenGL)"
 msgstr "%d FPS (mobile OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:225 src/gui/debugwindow.cpp:290
+#: src/gui/debugwindow.cpp:228 src/gui/debugwindow.cpp:293
 msgid "Textures count:"
 msgstr "Comptage des trames :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:279
+#: src/gui/debugwindow.cpp:282
 #, c-format
 msgid "Particle count: %d"
 msgstr "Nombre de particules : %d"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:330 src/gui/debugwindow.cpp:380
-#: src/gui/debugwindow.cpp:442
+#: src/gui/debugwindow.cpp:333 src/gui/debugwindow.cpp:383
+#: src/gui/debugwindow.cpp:445
 msgid "Target:"
 msgstr "Cible :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:332 src/gui/debugwindow.cpp:386
-#: src/gui/debugwindow.cpp:444
+#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
+#: src/gui/debugwindow.cpp:447
 msgid "Target Id:"
 msgstr "ID de la Cible :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
-#: src/gui/debugwindow.cpp:446
+#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:392
+#: src/gui/debugwindow.cpp:449
 msgid "Target type:"
 msgstr "Type de cible :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:337
+#: src/gui/debugwindow.cpp:340
 msgid "Target level:"
 msgstr "Niveau de la cible :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:339 src/gui/debugwindow.cpp:405
+#: src/gui/debugwindow.cpp:342 src/gui/debugwindow.cpp:408
 msgid "Target race:"
 msgstr "Race de la cible :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:341
+#: src/gui/debugwindow.cpp:344
 msgid "Target party:"
 msgstr "Groupe de la cible :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:346
 msgid "Target guild:"
 msgstr "Guilde de la cible :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:430
-#: src/gui/debugwindow.cpp:436 src/gui/debugwindow.cpp:454
+#: src/gui/debugwindow.cpp:348 src/gui/debugwindow.cpp:433
+#: src/gui/debugwindow.cpp:439 src/gui/debugwindow.cpp:457
 msgid "Attack delay:"
 msgstr "Délai d'attaque :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:347 src/gui/debugwindow.cpp:417
-#: src/gui/debugwindow.cpp:456
+#: src/gui/debugwindow.cpp:350 src/gui/debugwindow.cpp:420
+#: src/gui/debugwindow.cpp:459
 msgid "Minimal hit:"
 msgstr "Coup Mini :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:349 src/gui/debugwindow.cpp:420
-#: src/gui/debugwindow.cpp:458
+#: src/gui/debugwindow.cpp:352 src/gui/debugwindow.cpp:423
+#: src/gui/debugwindow.cpp:461
 msgid "Maximum hit:"
 msgstr "Coup Max :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:351 src/gui/debugwindow.cpp:423
-#: src/gui/debugwindow.cpp:460
+#: src/gui/debugwindow.cpp:354 src/gui/debugwindow.cpp:426
+#: src/gui/debugwindow.cpp:463
 msgid "Critical hit:"
 msgstr "Coup Critique :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:394 src/gui/debugwindow.cpp:400
-#: src/gui/debugwindow.cpp:448
+#: src/gui/debugwindow.cpp:397 src/gui/debugwindow.cpp:403
+#: src/gui/debugwindow.cpp:451
 msgid "Target Level:"
 msgstr "Niveau de la cible :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:408 src/gui/debugwindow.cpp:450
+#: src/gui/debugwindow.cpp:411 src/gui/debugwindow.cpp:453
 msgid "Target Party:"
 msgstr "Groupe de la cible :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:412 src/gui/debugwindow.cpp:452
+#: src/gui/debugwindow.cpp:415 src/gui/debugwindow.cpp:455
 msgid "Target Guild:"
 msgstr "Guilde de la cible :"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:493
+#: src/gui/debugwindow.cpp:496
 #, c-format
 msgid "Ping: %s ms"
 msgstr "Ping : %s ms"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:496
+#: src/gui/debugwindow.cpp:499
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "Entrée : %d bytes/s"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:499
+#: src/gui/debugwindow.cpp:502
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "Sortie : %d bytes/s"
@@ -1343,7 +1343,7 @@ msgstr "Ouverture automatique de cette fenêtre"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #: src/gui/editdialog.cpp:45 src/gui/editserverdialog.cpp:78
-#: src/gui/itemamountwindow.cpp:210 src/gui/okdialog.cpp:51
+#: src/gui/itemamountwindow.cpp:204 src/gui/okdialog.cpp:51
 #: src/gui/quitdialog.cpp:70 src/gui/textdialog.cpp:46
 msgid "OK"
 msgstr "Ok"
@@ -1355,7 +1355,7 @@ msgstr "Éditer le Serveur"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:257
+#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:266
 msgid "Connect"
 msgstr "Connexion..."
 
@@ -1385,7 +1385,7 @@ msgid "Online list url:"
 msgstr "URL de la liste en ligne"
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/editserverdialog.cpp:222
+#: src/gui/editserverdialog.cpp:218
 msgid "Please at least type both the address and the port of the server."
 msgstr "Entres au moins l'adresse et le port du serveur."
 
@@ -1437,7 +1437,7 @@ msgstr "Équiper"
 #: src/gui/inventorywindow.cpp:178 src/gui/inventorywindow.cpp:630
 #: src/gui/popupmenu.cpp:1843 src/gui/popupmenu.cpp:1922
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2041
-#: src/gui/skilldialog.cpp:277
+#: src/gui/skilldialog.cpp:279
 msgid "Use"
 msgstr "Utiliser"
 
@@ -1471,7 +1471,7 @@ msgstr "Costumes"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: setup button
-#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:718
+#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:719
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1992
 #: src/gui/popupmenu.cpp:2066 src/gui/setup.cpp:86
 msgid "Store"
@@ -1493,47 +1493,47 @@ msgid "Drop"
 msgstr "Jeter"
 
 #. TRANSLATORS: item amount window button
-#: src/gui/itemamountwindow.cpp:214
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "Tout"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:264
 msgid "Select amount of items to trade."
 msgstr "Choisir le nombre d'objets à échanger."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:274
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to drop."
 msgstr "Choisir le nombre d'objets à jeter."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:278
+#: src/gui/itemamountwindow.cpp:272
 msgid "Select amount of items to store."
 msgstr "Choisir le nombre d'objets à stocker."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:276
 msgid "Select amount of items to retrieve."
 msgstr "Choisir le nombre d'objet à reprendre"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:286
+#: src/gui/itemamountwindow.cpp:280
 msgid "Select amount of items to split."
 msgstr "Choisir le nombre d'objets à séparer."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:290
+#: src/gui/itemamountwindow.cpp:284
 msgid "Add to buy shop."
 msgstr "Ajouter à la boutique d'achats."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:294
+#: src/gui/itemamountwindow.cpp:288
 msgid "Add to sell shop."
 msgstr "Ajouter à la boutique de ventes."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:298
+#: src/gui/itemamountwindow.cpp:292
 msgid "Unknown."
 msgstr "Inconnu."
 
@@ -1560,7 +1560,7 @@ msgstr "Remettre le temps"
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:58 src/gui/killstats.cpp:171
-#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:516
+#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:509
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr "Nbre Tués : %s, total exp : %s"
@@ -1568,7 +1568,7 @@ msgstr "Nbre Tués : %s, total exp : %s"
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:61 src/gui/killstats.cpp:173
 #: src/gui/killstats.cpp:253 src/gui/killstats.cpp:268
-#: src/gui/killstats.cpp:518
+#: src/gui/killstats.cpp:511
 #, c-format
 msgid "Avg Exp: %s"
 msgstr "Exp. Moy. : %s"
@@ -1576,14 +1576,14 @@ msgstr "Exp. Moy. : %s"
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:63 src/gui/killstats.cpp:176
 #: src/gui/killstats.cpp:258 src/gui/killstats.cpp:272
-#: src/gui/killstats.cpp:521
+#: src/gui/killstats.cpp:514
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr "Nb. de mobs moy. pour proc. niv. : %s"
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:66 src/gui/killstats.cpp:187
-#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:524
+#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:517
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr "Tués/Min : %s, Exp/Min : %s"
@@ -1611,9 +1611,9 @@ msgid "Last kill exp:"
 msgstr "Exp du dernier tué :"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:414
-#: src/gui/killstats.cpp:421 src/gui/killstats.cpp:428
-#: src/gui/killstats.cpp:434
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:408
+#: src/gui/killstats.cpp:415 src/gui/killstats.cpp:422
+#: src/gui/killstats.cpp:428
 msgid "Time before jacko spawn:"
 msgstr "Temps avant l'arrivée de Jack0 :"
 
@@ -1645,12 +1645,12 @@ msgid "  Time for next level: %s"
 msgstr "  Temps pour le prochain niveau : %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:421
+#: src/gui/killstats.cpp:415
 #, c-format
 msgid "%s %d?"
 msgstr "%s %d ?"
 
-#: src/gui/killstats.cpp:428
+#: src/gui/killstats.cpp:422
 msgid "jacko spawning"
 msgstr "Arrivée de Jack0"
 
@@ -1756,32 +1756,32 @@ msgid "arrows bar"
 msgstr "Barre de flèches"
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:88
+#: src/gui/ministatuswindow.cpp:89
 msgid "status bar"
 msgstr "Barre de statut"
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:108
+#: src/gui/ministatuswindow.cpp:109
 msgid "job bar"
 msgstr "Barre de compétences"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:306 src/gui/statuswindow.cpp:298
+#: src/gui/ministatuswindow.cpp:307 src/gui/statuswindow.cpp:298
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Niveau : %d (GM %d)"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:313 src/gui/statuswindow.cpp:141
+#: src/gui/ministatuswindow.cpp:314 src/gui/statuswindow.cpp:141
 #: src/gui/statuswindow.cpp:305 src/gui/statuswindow.cpp:375
 #, c-format
 msgid "Level: %d"
 msgstr "Niveau : %d"
 
 #. TRANSLATORS: status bar label
-#: src/gui/ministatuswindow.cpp:330 src/gui/ministatuswindow.cpp:367
+#: src/gui/ministatuswindow.cpp:331 src/gui/ministatuswindow.cpp:368
 msgid "Need"
 msgstr "Restant"
 
@@ -2169,7 +2169,7 @@ msgstr "Copier dans la conversation"
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2209 src/gui/popupmenu.cpp:2280
-#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:139
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
 #: src/gui/socialwindow.cpp:934
 msgid "(default)"
 msgstr "(défaut)"
@@ -2352,7 +2352,7 @@ msgid "Passwords do not match."
 msgstr "Les deux mots de passe sont différents"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:257
 msgid "Choose Your Server"
 msgstr "Choisis le serveur"
 
@@ -2360,61 +2360,61 @@ msgstr "Choisis le serveur"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:259 src/gui/shopwindow.cpp:94
+#: src/gui/serverdialog.cpp:268 src/gui/shopwindow.cpp:94
 #: src/gui/shopwindow.cpp:101 src/gui/tradewindow.cpp:77
 msgid "Add"
 msgstr "Ajouter"
 
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
-#: src/gui/serverdialog.cpp:261 src/gui/widgets/setupitem.cpp:299
+#: src/gui/serverdialog.cpp:270 src/gui/widgets/setupitem.cpp:299
 #: src/gui/widgets/setupitem.cpp:426
 msgid "Edit"
 msgstr "Éditer"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:274
 msgid "Load"
 msgstr "Charger"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:279
+#: src/gui/serverdialog.cpp:288
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Choisis ton serveur  *** Mode Sûr ***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:297
 msgid "Use same ip for game sub servers"
 msgstr "Utiliser la même ip pour les sous-serveurs de jeu"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:518
+#: src/gui/serverdialog.cpp:527
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Téléchargement de la liste des serveurs...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:524
+#: src/gui/serverdialog.cpp:533
 msgid "Waiting for server..."
 msgstr "En attente du serveur..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:529
+#: src/gui/serverdialog.cpp:538
 msgid "Preparing download"
 msgstr "Préparation du téléchargement"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:534
+#: src/gui/serverdialog.cpp:543
 msgid "Error retreiving server list!"
 msgstr "Erreur lors du téléchargement de la liste de serveurs !"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:626
+#: src/gui/serverdialog.cpp:635
 msgid "requires a newer version"
 msgstr "requiert une nouvelle version"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:631
+#: src/gui/serverdialog.cpp:640
 #, c-format
 msgid "requires v%s"
 msgstr "requiert la v%s"
@@ -3425,7 +3425,7 @@ msgid "Type:"
 msgstr "Type : "
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:334
+#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:336
 msgid "Delay:"
 msgstr "Délai : "
 
@@ -3445,30 +3445,30 @@ msgid "Blue:"
 msgstr "Bleu : "
 
 #. TRANSLATORS: color type
-#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:420
+#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:422
 msgid "Static"
 msgstr "Statique"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:107 src/gui/setup_colors.cpp:110
-#: src/gui/setup_colors.cpp:422
+#: src/gui/setup_colors.cpp:424
 msgid "Pulse"
 msgstr "Impulsion"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:112 src/gui/setup_colors.cpp:115
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Rainbow"
 msgstr "Arc-en-ciel"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:117 src/gui/setup_colors.cpp:120
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Spectrum"
 msgstr "Spectre"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:328
+#: src/gui/setup_colors.cpp:330
 msgid "Alpha:"
 msgstr "Opacité : "
 
@@ -3636,7 +3636,7 @@ msgstr "Divers"
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: palette color
-#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:134
+#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:135
 msgid "Monsters"
 msgstr "Monstres"
 
@@ -4189,206 +4189,231 @@ msgstr "Quand vous ignorez :"
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:86
+msgid "Very small (8)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:88
 msgid "Very small (9)"
 msgstr "Très petite (9)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:88
+#: src/gui/setup_theme.cpp:90
 msgid "Tiny (10)"
 msgstr "Minuscule (10)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:90
+#: src/gui/setup_theme.cpp:92
 msgid "Small (11)"
 msgstr "Petite (11)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:92
+#: src/gui/setup_theme.cpp:94
 msgid "Medium (12)"
 msgstr "Moyenne (12)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:94
+#: src/gui/setup_theme.cpp:96
 msgid "Normal (13)"
 msgstr "Normale (13)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:96
+#: src/gui/setup_theme.cpp:98
 msgid "Large (14)"
 msgstr "Large (14)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:98
-msgid "Very large (15)"
-msgstr "Très large (15)"
-
-#. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:100
-msgid "Big (16)"
-msgstr "Grande (16)"
+msgid "Large (15)"
+msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:102
-msgid "Very big (17)"
-msgstr "Très grande (17)"
+msgid "Large (16)"
+msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:104
-msgid "Huge (18)"
-msgstr "Énorme (18)"
+msgid "Big (17)"
+msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:106
-msgid "Very huge (19)"
-msgstr "Gigantesque (19)"
+msgid "Big (18)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:108
+msgid "Big (19)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:110
+msgid "Very big (20)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:112
+msgid "Very big (21)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:114
+msgid "Very big (22)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:116
+msgid "Huge (23)"
+msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:151
 msgid "Chinese (China)"
 msgstr "Chinois (Chine)"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:153
 msgid "Czech"
 msgstr "Tchèque"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:155
 msgid "English"
 msgstr "Anglais"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:157
 msgid "Finnish"
 msgstr "Finlandais"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:159
 msgid "French"
 msgstr "Français"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:161
 msgid "German"
 msgstr "Allemand"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:153
+#: src/gui/setup_theme.cpp:163
 msgid "Indonesian"
 msgstr "Indonésien"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:155
+#: src/gui/setup_theme.cpp:165
 msgid "Italian"
 msgstr "Italien"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:157
+#: src/gui/setup_theme.cpp:167
 msgid "Polish"
 msgstr "Polonais"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:159
+#: src/gui/setup_theme.cpp:169
 msgid "Japanese"
 msgstr "Japonais"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:161
+#: src/gui/setup_theme.cpp:171
 msgid "Dutch (Belgium/Flemish)"
 msgstr "Néerlandais (Belgique / Flamand)"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:163
+#: src/gui/setup_theme.cpp:173
 msgid "Portuguese"
 msgstr "Portugais"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:165
+#: src/gui/setup_theme.cpp:175
 msgid "Portuguese (Brazilian)"
 msgstr "Portugais (Brésilien)"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:167
+#: src/gui/setup_theme.cpp:177
 msgid "Russian"
 msgstr "Russe"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:169
+#: src/gui/setup_theme.cpp:179
 msgid "Spanish (Castilian)"
 msgstr "Espagnol (Castillan)"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:171
+#: src/gui/setup_theme.cpp:181
 msgid "Turkish"
 msgstr "Turc"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:223
+#: src/gui/setup_theme.cpp:233
 msgid "Gui theme"
 msgstr "Thème de l'interface"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:230
+#: src/gui/setup_theme.cpp:240
 msgid "Main Font"
 msgstr "Police principale"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:235
+#: src/gui/setup_theme.cpp:245
 msgid "Language"
 msgstr "Langue"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:239
+#: src/gui/setup_theme.cpp:249
 msgid "Bold font"
 msgstr "Police grasse"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:243
+#: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr "Taille des effets de particules"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:247
+#: src/gui/setup_theme.cpp:257
 msgid "Help font"
 msgstr "Police d'aide"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:251
+#: src/gui/setup_theme.cpp:261
 msgid "Secure font"
 msgstr "Police sécurisée"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:255
+#: src/gui/setup_theme.cpp:265
 msgid "Japanese font"
 msgstr "Police japonaise"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:260
+#: src/gui/setup_theme.cpp:270
 msgid "Font size"
 msgstr "Taille de police"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:265
+#: src/gui/setup_theme.cpp:275
 msgid "Npc font size"
 msgstr "Taille de police des PNJ"
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/setup_theme.cpp:269
+#: src/gui/setup_theme.cpp:279
 msgid "i"
 msgstr "i"
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/setup_theme.cpp:442
+#: src/gui/setup_theme.cpp:452
 msgid "Theme info"
 msgstr "Info thème"
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/setup_theme.cpp:467
+#: src/gui/setup_theme.cpp:477
 msgid "Theme Changed"
 msgstr "Thème changé"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/setup_theme.cpp:467 src/gui/setup_video.cpp:537
+#: src/gui/setup_theme.cpp:477 src/gui/setup_video.cpp:537
 #: src/gui/setup_video.cpp:546
 msgid "Restart your client for the change to take effect."
 msgstr "Redémarres le jeu pour que les changements soient appliqués."
@@ -4694,7 +4719,8 @@ msgid "Ambient FX"
 msgstr "Effets ambiants"
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_visual.cpp:140
+#. TRANSLATORS: palette color
+#: src/gui/setup_visual.cpp:140 src/gui/userpalette.cpp:146
 msgid "Particle effects"
 msgstr "Effets de particules"
 
@@ -4781,45 +4807,45 @@ msgid "%s wants to %s %s do you accept?"
 msgstr "%s souhaite %s %s Acceptez-vous ?"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/skilldialog.cpp:270 src/gui/windowmenu.cpp:112
+#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:112
 msgid "Skills"
 msgstr "Compétences"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/skilldialog.cpp:279
+#: src/gui/skilldialog.cpp:281
 msgid "Up"
 msgstr "Augmenter"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/skilldialog.cpp:391
+#: src/gui/skilldialog.cpp:393
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Points de compétences : %d"
 
 #. TRANSLATORS: skills dialog default skills tab
-#: src/gui/skilldialog.cpp:444
+#: src/gui/skilldialog.cpp:446
 msgid "basic"
 msgstr "de base"
 
 #. TRANSLATORS: skills dialog default skill name
-#: src/gui/skilldialog.cpp:447
+#: src/gui/skilldialog.cpp:449
 msgid "basic, 1"
 msgstr "fondamental, 1"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/skilldialog.cpp:484
+#: src/gui/skilldialog.cpp:486
 #, c-format
 msgid "Skill Set %d"
 msgstr "Compétence choisie : %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/skilldialog.cpp:518
+#: src/gui/skilldialog.cpp:520
 #, c-format
 msgid "Skill %d"
 msgstr "Compétence %d"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/skilldialog.cpp:612 src/gui/skilldialog.cpp:762
+#: src/gui/skilldialog.cpp:614 src/gui/skilldialog.cpp:764
 #, c-format
 msgid "Lvl: %d"
 msgstr "Niveau : %d"
@@ -5266,7 +5292,7 @@ msgid "Trade: You"
 msgstr "Échange : Toi"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:182
+#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:184
 #, c-format
 msgid "You get %s"
 msgstr "Vous recevez %s"
@@ -5282,12 +5308,12 @@ msgid "You give:"
 msgstr "Vous donnez :"
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:393
+#: src/gui/tradewindow.cpp:396
 msgid "You don't have enough money."
 msgstr "Bous n'avez pas assez d'argent."
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:475
+#: src/gui/tradewindow.cpp:479
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "L'objet ne peux être ajouté. Vous ne pouvez pas ajouter deux fois le même "
@@ -5300,224 +5326,224 @@ msgid "Name: %s"
 msgstr "Nom : %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/updaterwindow.cpp:140
+#: src/gui/updaterwindow.cpp:156
 msgid "Updating..."
 msgstr "Mise à jour en cours..."
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:165
+#: src/gui/updaterwindow.cpp:181
 msgid "Connecting..."
 msgstr "Connexion..."
 
 #. TRANSLATORS: update message
-#: src/gui/updaterwindow.cpp:656
+#: src/gui/updaterwindow.cpp:672
 msgid "##1  The update process is incomplete."
 msgstr "##1 Le processus de mise à jour n'est pas achevé"
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/updaterwindow.cpp:658
+#: src/gui/updaterwindow.cpp:674
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Il est fortement recommandé de"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:660
+#: src/gui/updaterwindow.cpp:676
 msgid "##1  you try again later."
 msgstr "##1 Essayes de nouveau plus tard."
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:839
+#: src/gui/updaterwindow.cpp:855
 msgid "Completed"
 msgstr "Terminé"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
 msgid "Being"
 msgstr "Créature"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:118
-msgid "Friend Names"
-msgstr "Noms des amis"
+#: src/gui/userpalette.cpp:119
+msgid "Friend names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:120
-msgid "Disregarded Names"
-msgstr "Noms des écartés"
+#: src/gui/userpalette.cpp:121
+msgid "Disregarded names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:122
-msgid "Ignored Names"
-msgstr "Noms des ignorés"
+#: src/gui/userpalette.cpp:123
+msgid "Ignored names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:124
-msgid "Erased Names"
-msgstr "Noms supprimés"
+#: src/gui/userpalette.cpp:125
+msgid "Erased names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:126
-msgid "Other Players' Names"
-msgstr "Nom des autres joueurs"
+#: src/gui/userpalette.cpp:127
+msgid "Other players names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:128
-msgid "Own Name"
-msgstr "Mon nom"
+#: src/gui/userpalette.cpp:129
+msgid "Own name"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:130
-msgid "GM Names"
-msgstr "Nom des MJ"
+#: src/gui/userpalette.cpp:131
+msgid "GM names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
 msgid "NPCs"
 msgstr "PNJs"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
 msgid "Monster HP bar"
 msgstr "Barre de vie des monstres"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:140
 msgid "Monster HP bar (second color)"
 msgstr "Barre de vie du monstre (Couleur secondaire)"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:141
-msgid "Party Members"
-msgstr "Membres du groupe"
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:143
-msgid "Guild Members"
-msgstr "Membres de la guilde"
+#: src/gui/userpalette.cpp:142
+msgid "Party members"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:145
-msgid "Particle Effects"
-msgstr "Effets de particules"
+#: src/gui/userpalette.cpp:144
+msgid "Guild members"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:147
-msgid "Pickup Notification"
-msgstr "Information de récupération"
+#: src/gui/userpalette.cpp:148
+msgid "Pickup notification"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:149
-msgid "Exp Notification"
-msgstr "Information d'expérience"
+#: src/gui/userpalette.cpp:150
+msgid "Exp notification"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
 msgid "Player HP bar"
 msgstr "Barre de vie du Joueur"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
 msgid "Player HP bar (second color)"
 msgstr "Barre de vie du joueur (Couleur secondaire)"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:157
-msgid "Player Hits Monster"
-msgstr "Coups des joueurs sur les montres"
+#: src/gui/userpalette.cpp:158
+msgid "Player hits monster"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:159
-msgid "Monster Hits Player"
-msgstr "Le monstre touche le joueur"
+#: src/gui/userpalette.cpp:160
+msgid "Monster hits player"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:163
-msgid "Other Player Hits Local Player"
-msgstr "Un autre joueur t'attaque"
+#: src/gui/userpalette.cpp:164
+msgid "Other player hits local player"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:166
 msgid "Critical Hit"
 msgstr "Coup critique"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
-msgid "Local Player Hits Monster"
-msgstr "Ton personnage touche le monstre"
+#: src/gui/userpalette.cpp:170
+msgid "Local player hits monster"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:172
-msgid "Local Player Critical Hit"
-msgstr "Coup critique"
+#: src/gui/userpalette.cpp:173
+msgid "Local player critical hit"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:175
-msgid "Local Player Miss"
-msgstr "Ton personnage manque son coup"
+#: src/gui/userpalette.cpp:176
+msgid "Local player miss"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:177
+#: src/gui/userpalette.cpp:178
 msgid "Misses"
 msgstr "Coups manqués"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
-msgid "Portal Highlight"
-msgstr "Surbrillance des portails d'entrée - sortie"
+#: src/gui/userpalette.cpp:180
+msgid "Portal highlight"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:182
-msgid "Default collision Highlight"
-msgstr "Surbrillance des zones de collision : Défaut"
+#: src/gui/userpalette.cpp:183
+msgid "Default collision highlight"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:185
-msgid "Air collision Highlight"
-msgstr "Surbrillance des zones de collision : Air"
+#: src/gui/userpalette.cpp:186
+msgid "Air collision highlight"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:188
-msgid "Water collision Highlight"
-msgstr "Surbrillance des zones de collision : Eau"
+#: src/gui/userpalette.cpp:189
+msgid "Water collision highlight"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:191
-msgid "Special ground collision Highlight"
-msgstr "Surlignement des carreaux de collision du sol"
+#: src/gui/userpalette.cpp:192
+msgid "Special ground collision highlight"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
-msgid "Walkable Highlight"
-msgstr "Surbrillance des parties praticables"
+#: src/gui/userpalette.cpp:195
+msgid "Walkable highlight"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:197
-msgid "Local Player Attack Range"
-msgstr "Portée de tes attaques"
+#: src/gui/userpalette.cpp:198
+msgid "Local player attack range"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:200
-msgid "Local Player Attack Range Border"
-msgstr "Limite de la portée de tes attaques"
+#: src/gui/userpalette.cpp:201
+msgid "Local player attack range border"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:203
-msgid "Monster Attack Range"
-msgstr "Portée d'attaque des monstres"
+#: src/gui/userpalette.cpp:204
+msgid "Monster attack range"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:206
-msgid "Home Place"
-msgstr "Emplacement de référence"
+#: src/gui/userpalette.cpp:208
+msgid "Floor item amount color"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:209
-msgid "Home Place Border"
-msgstr "Limites de ta position"
+#: src/gui/userpalette.cpp:211
+msgid "Home place"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:212
-msgid "Road Point"
-msgstr "Étape"
+#: src/gui/userpalette.cpp:214
+msgid "Home place border"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:217
+msgid "Road point"
+msgstr ""
 
 #. TRANSLATORS: who is online window name
 #: src/gui/whoisonline.cpp:79 src/gui/whoisonline.cpp:623
@@ -5648,7 +5674,7 @@ msgid "/kick > Kick some one from the guild you are in"
 msgstr "/kick > Éjecter quelqu'un du groupe dont tu fais partie"
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:315
+#: src/gui/widgets/itemcontainer.cpp:317
 msgid "Eq."
 msgstr "Eq."
 
@@ -6308,7 +6334,7 @@ msgstr "Les modificateurs de jeux sont inconnus"
 #: src/localplayer.cpp:3833
 #, c-format
 msgid "Follow: %s"
-msgstr ""
+msgstr "Suivre : %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
@@ -6320,7 +6346,7 @@ msgstr "Suivi annulé"
 #: src/localplayer.cpp:3849
 #, c-format
 msgid "Imitation: %s"
-msgstr ""
+msgstr "Imiter : %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
diff --git a/po/he.po b/po/he.po
index 16d6658f8..df71e6b98 100644
--- a/po/he.po
+++ b/po/he.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-05-03 12:38+0300\n"
-"PO-Revision-Date: 2013-05-03 09:44+0000\n"
+"POT-Creation-Date: 2013-05-10 18:34+0300\n"
+"PO-Revision-Date: 2013-05-10 15:39+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -59,25 +59,25 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: full button name
-#: src/client.cpp:1136 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
+#: src/client.cpp:1137 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
 msgid "Setup"
 msgstr "הגדרות"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1140 src/gui/setup_perfomance.cpp:61
+#: src/client.cpp:1141 src/gui/setup_perfomance.cpp:61
 msgid "Perfomance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:1143 src/gui/setup_video.cpp:258
+#: src/client.cpp:1144 src/gui/setup_video.cpp:258
 msgid "Video"
 msgstr "וידאו"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1146 src/gui/setup_theme.cpp:273
+#: src/client.cpp:1147 src/gui/setup_theme.cpp:283
 msgid "Theme"
 msgstr ""
 
@@ -88,7 +88,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1150 src/gui/didyouknowwindow.cpp:78
+#: src/client.cpp:1151 src/gui/didyouknowwindow.cpp:78
 #: src/gui/inventorywindow.cpp:228 src/gui/npcdialog.cpp:63
 #: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:574
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:80
@@ -96,32 +96,32 @@ msgid "Close"
 msgstr "סגור"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1238
+#: src/client.cpp:1239
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1282
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1320
+#: src/client.cpp:1321
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1431
+#: src/client.cpp:1432
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1471
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1483
+#: src/client.cpp:1484
 msgid "Changing game servers"
 msgstr ""
 
@@ -136,69 +136,69 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1540 src/client.cpp:1551 src/client.cpp:1721
+#: src/client.cpp:1541 src/client.cpp:1552 src/client.cpp:1722
 #: src/gui/changeemaildialog.cpp:168 src/gui/changepassworddialog.cpp:158
-#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:288
-#: src/gui/editserverdialog.cpp:220 src/gui/registerdialog.cpp:263
+#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:290
+#: src/gui/editserverdialog.cpp:216 src/gui/registerdialog.cpp:263
 #: src/gui/unregisterdialog.cpp:143 src/net/ea/charserverhandler.cpp:190
 #: src/net/ea/charserverhandler.cpp:210
 msgid "Error"
 msgstr "שגיאה"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1564
+#: src/client.cpp:1565
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1601
+#: src/client.cpp:1602
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1603
+#: src/client.cpp:1604
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1624
+#: src/client.cpp:1625
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1626
+#: src/client.cpp:1627
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1647
+#: src/client.cpp:1648
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1649
+#: src/client.cpp:1650
 msgid "Farewell, come back any time..."
 msgstr ""
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1902 src/client.cpp:1917 src/client.cpp:1960
-#: src/client.cpp:1976 src/client.cpp:2417 src/client.cpp:2425
+#: src/client.cpp:1903 src/client.cpp:1918 src/client.cpp:1961
+#: src/client.cpp:1977 src/client.cpp:2418 src/client.cpp:2426
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2113
+#: src/client.cpp:2114
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2154 src/client.cpp:2161
+#: src/client.cpp:2155 src/client.cpp:2162
 msgid "Error creating updates directory!"
 msgstr "שגיאה ביצירת ספריית העדכונים!"
 
-#: src/client.cpp:2183 src/client.cpp:2196
+#: src/client.cpp:2184 src/client.cpp:2197
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -478,19 +478,19 @@ msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: bot checker window header
-#: src/gui/botcheckerwindow.cpp:269
+#: src/gui/botcheckerwindow.cpp:268
 msgid "Bot Checker"
 msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:102
+#: src/gui/botcheckerwindow.cpp:277 src/gui/npcdialog.cpp:102
 msgid "Reset"
 msgstr "אפס"
 
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: relations table header
-#: src/gui/botcheckerwindow.cpp:305 src/gui/setup_relations.cpp:61
+#: src/gui/botcheckerwindow.cpp:304 src/gui/setup_relations.cpp:61
 msgid "Name"
 msgstr "שם"
 
@@ -498,7 +498,7 @@ msgstr "שם"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:145
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:145
 #: src/gui/popupmenu.cpp:241 src/gui/popupmenu.cpp:640
 #: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:257
 #: src/net/tmwa/generalhandler.cpp:292
@@ -508,7 +508,7 @@ msgstr "תקוף"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
-#: src/gui/botcheckerwindow.cpp:309 src/gui/popupmenu.cpp:225
+#: src/gui/botcheckerwindow.cpp:308 src/gui/popupmenu.cpp:225
 #: src/gui/setupactiondata.h:93
 msgid "Talk"
 msgstr "דבר"
@@ -516,7 +516,7 @@ msgstr "דבר"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/botcheckerwindow.cpp:311 src/gui/popupmenu.cpp:215
+#: src/gui/botcheckerwindow.cpp:310 src/gui/popupmenu.cpp:215
 #: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:371
 #: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:653
 #: src/gui/popupmenu.cpp:727 src/gui/setupactiondata.h:1856
@@ -524,7 +524,7 @@ msgid "Move"
 msgstr ""
 
 #. TRANSLATORS: bot checker window table header
-#: src/gui/botcheckerwindow.cpp:313
+#: src/gui/botcheckerwindow.cpp:312
 msgid "Result"
 msgstr ""
 
@@ -580,7 +580,7 @@ msgstr "קנה"
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:516
+#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:511
 #: src/gui/selldialog.cpp:94 src/gui/selldialog.cpp:342
 #, c-format
 msgid "Price: %s / Total: %s"
@@ -597,9 +597,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:208
-#: src/gui/itemamountwindow.cpp:243 src/gui/npcdialog.cpp:93
-#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:833
+#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:202
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:93
+#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:821
 msgid "+"
 msgstr ""
 
@@ -609,9 +609,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:240 src/gui/npcdialog.cpp:95
-#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:846
+#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:200
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:95
+#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:834
 msgid "-"
 msgstr ""
 
@@ -623,7 +623,7 @@ msgstr ""
 #. TRANSLATORS: input action name
 #: src/gui/buydialog.cpp:260 src/gui/quitdialog.cpp:54
 #: src/gui/quitdialog.cpp:59 src/gui/quitdialog.cpp:61
-#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:255
+#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:264
 #: src/gui/setupactiondata.h:177
 msgid "Quit"
 msgstr "יציאה"
@@ -635,7 +635,7 @@ msgstr "יציאה"
 #. TRANSLATORS: status bar label
 #: src/gui/buydialog.cpp:262 src/gui/selldialog.cpp:106
 #: src/gui/statuswindow.cpp:558 src/gui/statuswindow.cpp:615
-#: src/gui/statuswindow.cpp:830 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:852
 msgid "Max"
 msgstr "מקסימום"
 
@@ -680,7 +680,7 @@ msgstr "מכר"
 #: src/gui/buyselldialog.cpp:71 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:120
 #: src/gui/connectiondialog.cpp:48 src/gui/editserverdialog.cpp:80
-#: src/gui/itemamountwindow.cpp:212 src/gui/npcpostdialog.cpp:64
+#: src/gui/itemamountwindow.cpp:206 src/gui/npcpostdialog.cpp:64
 #: src/gui/popupmenu.cpp:290 src/gui/popupmenu.cpp:324
 #: src/gui/popupmenu.cpp:411 src/gui/popupmenu.cpp:454
 #: src/gui/popupmenu.cpp:485 src/gui/popupmenu.cpp:512
@@ -696,7 +696,7 @@ msgstr "מכר"
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
 #: src/gui/setup.cpp:84 src/gui/socialwindow.cpp:1204
 #: src/gui/textcommandeditor.cpp:212 src/gui/textdialog.cpp:53
-#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:167
+#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:183
 msgid "Cancel"
 msgstr "בטל"
 
@@ -860,7 +860,7 @@ msgstr "אנא חלק %d נקודות"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:570
+#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:581
 #: src/gui/socialwindow.cpp:1269
 msgid "Create"
 msgstr "צור"
@@ -887,17 +887,17 @@ msgid "Please remove %d points"
 msgstr "אנא הסר %d נקודות"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:60
+#: src/gui/charselectdialog.cpp:61
 msgid "Confirm Character Delete"
 msgstr "אשר מחיקת שחקן"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:62
+#: src/gui/charselectdialog.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "האם אתה בטוח כי ברצונך למחוק את השחקן?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:86
+#: src/gui/charselectdialog.cpp:87
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
@@ -909,8 +909,8 @@ msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:565
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:576
+#: src/gui/updaterwindow.cpp:185
 msgid "Play"
 msgstr "שחק"
 
@@ -926,7 +926,7 @@ msgstr "מידע"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:263
+#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:272
 #: src/gui/setupactiondata.h:1803 src/gui/setup_relations.cpp:262
 #: src/gui/shopwindow.cpp:96 src/gui/shopwindow.cpp:103
 #: src/gui/textcommandeditor.cpp:216
@@ -936,24 +936,24 @@ msgstr "מחק"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/charselectdialog.cpp:129 src/gui/unregisterdialog.cpp:48
+#: src/gui/charselectdialog.cpp:130 src/gui/unregisterdialog.cpp:48
 #: src/gui/unregisterdialog.cpp:53
 msgid "Unregister"
 msgstr "בטל רישום"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/charselectdialog.cpp:141
+#: src/gui/charselectdialog.cpp:142
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:172
+#: src/gui/charselectdialog.cpp:175
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/charselectdialog.cpp:246
+#: src/gui/charselectdialog.cpp:248
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -963,16 +963,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:288
+#: src/gui/charselectdialog.cpp:290
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password:"
 msgstr ""
 
@@ -1059,13 +1059,13 @@ msgid "Chat"
 msgstr "שיחה"
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:735
+#: src/gui/chatwindow.cpp:638
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1165
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "לוחש אל %s: %s"
@@ -1083,7 +1083,7 @@ msgstr "לא"
 
 #. TRANSLATORS: confirm dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/confirmdialog.cpp:58 src/gui/popupmenu.cpp:2429
+#: src/gui/confirmdialog.cpp:55 src/gui/popupmenu.cpp:2429
 #: src/gui/popupmenu.cpp:2442 src/gui/popupmenu.cpp:2457
 #: src/gui/popupmenu.cpp:2483
 msgid "Ignore"
@@ -1092,7 +1092,7 @@ msgstr ""
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
 #. TRANSLATORS: settings group
-#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:109
+#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:108
 #: src/gui/setup_other.cpp:123 src/gui/windowmenu.cpp:106
 msgid "Map"
 msgstr "מפה"
@@ -1108,190 +1108,190 @@ msgid "Net"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:265
-#: src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:268
+#: src/gui/debugwindow.cpp:311
 msgid "Music:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:153 src/gui/debugwindow.cpp:271
-#: src/gui/debugwindow.cpp:312
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:274
+#: src/gui/debugwindow.cpp:315
 msgid "Map:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:155 src/gui/debugwindow.cpp:268
-#: src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:271
+#: src/gui/debugwindow.cpp:313
 msgid "Minimap:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:262
-#: src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:161 src/gui/debugwindow.cpp:265
+#: src/gui/debugwindow.cpp:309
 msgid "Cursor:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:161
+#: src/gui/debugwindow.cpp:164
 msgid "Particle count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:284
-#: src/gui/debugwindow.cpp:316
+#: src/gui/debugwindow.cpp:167 src/gui/debugwindow.cpp:287
+#: src/gui/debugwindow.cpp:319
 msgid "Map actors count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:166 src/gui/debugwindow.cpp:243
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:169 src/gui/debugwindow.cpp:246
+#: src/gui/debugwindow.cpp:252
 msgid "Player Position:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:172 src/gui/debugwindow.cpp:297
+#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:300
 msgid "Draw calls:"
 msgstr ""
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:175
+#. TRANSLATORS: debug window label, frames per second
+#: src/gui/debugwindow.cpp:178
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:177 src/gui/debugwindow.cpp:324
+#. TRANSLATORS: debug window label, logic per second
+#: src/gui/debugwindow.cpp:180 src/gui/debugwindow.cpp:327
 #, c-format
 msgid "%d LPS"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:191 src/gui/debugwindow.cpp:209
 #, c-format
 msgid "%d FPS (Software)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:193
+#: src/gui/debugwindow.cpp:196
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:197
+#: src/gui/debugwindow.cpp:200
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:201
+#: src/gui/debugwindow.cpp:204
 #, c-format
 msgid "%d FPS (mobile OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:225 src/gui/debugwindow.cpp:290
+#: src/gui/debugwindow.cpp:228 src/gui/debugwindow.cpp:293
 msgid "Textures count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:279
+#: src/gui/debugwindow.cpp:282
 #, c-format
 msgid "Particle count: %d"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:330 src/gui/debugwindow.cpp:380
-#: src/gui/debugwindow.cpp:442
+#: src/gui/debugwindow.cpp:333 src/gui/debugwindow.cpp:383
+#: src/gui/debugwindow.cpp:445
 msgid "Target:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:332 src/gui/debugwindow.cpp:386
-#: src/gui/debugwindow.cpp:444
+#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
+#: src/gui/debugwindow.cpp:447
 msgid "Target Id:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
-#: src/gui/debugwindow.cpp:446
+#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:392
+#: src/gui/debugwindow.cpp:449
 msgid "Target type:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:337
+#: src/gui/debugwindow.cpp:340
 msgid "Target level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:339 src/gui/debugwindow.cpp:405
+#: src/gui/debugwindow.cpp:342 src/gui/debugwindow.cpp:408
 msgid "Target race:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:341
+#: src/gui/debugwindow.cpp:344
 msgid "Target party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:346
 msgid "Target guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:430
-#: src/gui/debugwindow.cpp:436 src/gui/debugwindow.cpp:454
+#: src/gui/debugwindow.cpp:348 src/gui/debugwindow.cpp:433
+#: src/gui/debugwindow.cpp:439 src/gui/debugwindow.cpp:457
 msgid "Attack delay:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:347 src/gui/debugwindow.cpp:417
-#: src/gui/debugwindow.cpp:456
+#: src/gui/debugwindow.cpp:350 src/gui/debugwindow.cpp:420
+#: src/gui/debugwindow.cpp:459
 msgid "Minimal hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:349 src/gui/debugwindow.cpp:420
-#: src/gui/debugwindow.cpp:458
+#: src/gui/debugwindow.cpp:352 src/gui/debugwindow.cpp:423
+#: src/gui/debugwindow.cpp:461
 msgid "Maximum hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:351 src/gui/debugwindow.cpp:423
-#: src/gui/debugwindow.cpp:460
+#: src/gui/debugwindow.cpp:354 src/gui/debugwindow.cpp:426
+#: src/gui/debugwindow.cpp:463
 msgid "Critical hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:394 src/gui/debugwindow.cpp:400
-#: src/gui/debugwindow.cpp:448
+#: src/gui/debugwindow.cpp:397 src/gui/debugwindow.cpp:403
+#: src/gui/debugwindow.cpp:451
 msgid "Target Level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:408 src/gui/debugwindow.cpp:450
+#: src/gui/debugwindow.cpp:411 src/gui/debugwindow.cpp:453
 msgid "Target Party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:412 src/gui/debugwindow.cpp:452
+#: src/gui/debugwindow.cpp:415 src/gui/debugwindow.cpp:455
 msgid "Target Guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:493
+#: src/gui/debugwindow.cpp:496
 #, c-format
 msgid "Ping: %s ms"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:496
+#: src/gui/debugwindow.cpp:499
 #, c-format
 msgid "In: %d bytes/s"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:499
+#: src/gui/debugwindow.cpp:502
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
@@ -1323,7 +1323,7 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #: src/gui/editdialog.cpp:45 src/gui/editserverdialog.cpp:78
-#: src/gui/itemamountwindow.cpp:210 src/gui/okdialog.cpp:51
+#: src/gui/itemamountwindow.cpp:204 src/gui/okdialog.cpp:51
 #: src/gui/quitdialog.cpp:70 src/gui/textdialog.cpp:46
 msgid "OK"
 msgstr "אישור"
@@ -1335,7 +1335,7 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:257
+#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:266
 msgid "Connect"
 msgstr ""
 
@@ -1365,7 +1365,7 @@ msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/editserverdialog.cpp:222
+#: src/gui/editserverdialog.cpp:218
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -1417,7 +1417,7 @@ msgstr "השתמש"
 #: src/gui/inventorywindow.cpp:178 src/gui/inventorywindow.cpp:630
 #: src/gui/popupmenu.cpp:1843 src/gui/popupmenu.cpp:1922
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2041
-#: src/gui/skilldialog.cpp:277
+#: src/gui/skilldialog.cpp:279
 msgid "Use"
 msgstr "השתמש"
 
@@ -1451,7 +1451,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: setup button
-#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:718
+#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:719
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1992
 #: src/gui/popupmenu.cpp:2066 src/gui/setup.cpp:86
 msgid "Store"
@@ -1473,47 +1473,47 @@ msgid "Drop"
 msgstr "השלך"
 
 #. TRANSLATORS: item amount window button
-#: src/gui/itemamountwindow.cpp:214
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "הכל"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:264
 msgid "Select amount of items to trade."
 msgstr "בחר כמות חפצים לסחור."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:274
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to drop."
 msgstr "בחר כמות חפצים להשליך."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:278
+#: src/gui/itemamountwindow.cpp:272
 msgid "Select amount of items to store."
 msgstr "בחר כמות חפצים לאחסן."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:276
 msgid "Select amount of items to retrieve."
 msgstr "בחר כמות חפצים להחזיר."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:286
+#: src/gui/itemamountwindow.cpp:280
 msgid "Select amount of items to split."
 msgstr "בחר כמות חפצים לפצל."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:290
+#: src/gui/itemamountwindow.cpp:284
 msgid "Add to buy shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:294
+#: src/gui/itemamountwindow.cpp:288
 msgid "Add to sell shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:298
+#: src/gui/itemamountwindow.cpp:292
 msgid "Unknown."
 msgstr ""
 
@@ -1540,7 +1540,7 @@ msgstr ""
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:58 src/gui/killstats.cpp:171
-#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:516
+#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:509
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
@@ -1548,7 +1548,7 @@ msgstr ""
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:61 src/gui/killstats.cpp:173
 #: src/gui/killstats.cpp:253 src/gui/killstats.cpp:268
-#: src/gui/killstats.cpp:518
+#: src/gui/killstats.cpp:511
 #, c-format
 msgid "Avg Exp: %s"
 msgstr ""
@@ -1556,14 +1556,14 @@ msgstr ""
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:63 src/gui/killstats.cpp:176
 #: src/gui/killstats.cpp:258 src/gui/killstats.cpp:272
-#: src/gui/killstats.cpp:521
+#: src/gui/killstats.cpp:514
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:66 src/gui/killstats.cpp:187
-#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:524
+#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:517
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
@@ -1591,9 +1591,9 @@ msgid "Last kill exp:"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:414
-#: src/gui/killstats.cpp:421 src/gui/killstats.cpp:428
-#: src/gui/killstats.cpp:434
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:408
+#: src/gui/killstats.cpp:415 src/gui/killstats.cpp:422
+#: src/gui/killstats.cpp:428
 msgid "Time before jacko spawn:"
 msgstr ""
 
@@ -1625,12 +1625,12 @@ msgid "  Time for next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:421
+#: src/gui/killstats.cpp:415
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:428
+#: src/gui/killstats.cpp:422
 msgid "jacko spawning"
 msgstr ""
 
@@ -1736,32 +1736,32 @@ msgid "arrows bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:88
+#: src/gui/ministatuswindow.cpp:89
 msgid "status bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:108
+#: src/gui/ministatuswindow.cpp:109
 msgid "job bar"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:306 src/gui/statuswindow.cpp:298
+#: src/gui/ministatuswindow.cpp:307 src/gui/statuswindow.cpp:298
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:313 src/gui/statuswindow.cpp:141
+#: src/gui/ministatuswindow.cpp:314 src/gui/statuswindow.cpp:141
 #: src/gui/statuswindow.cpp:305 src/gui/statuswindow.cpp:375
 #, c-format
 msgid "Level: %d"
 msgstr "רמה: %d"
 
 #. TRANSLATORS: status bar label
-#: src/gui/ministatuswindow.cpp:330 src/gui/ministatuswindow.cpp:367
+#: src/gui/ministatuswindow.cpp:331 src/gui/ministatuswindow.cpp:368
 msgid "Need"
 msgstr ""
 
@@ -2149,7 +2149,7 @@ msgstr ""
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2209 src/gui/popupmenu.cpp:2280
-#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:139
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
 #: src/gui/socialwindow.cpp:934
 msgid "(default)"
 msgstr ""
@@ -2332,7 +2332,7 @@ msgid "Passwords do not match."
 msgstr "הסיסמאות אינן תואמות."
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:257
 msgid "Choose Your Server"
 msgstr ""
 
@@ -2340,61 +2340,61 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:259 src/gui/shopwindow.cpp:94
+#: src/gui/serverdialog.cpp:268 src/gui/shopwindow.cpp:94
 #: src/gui/shopwindow.cpp:101 src/gui/tradewindow.cpp:77
 msgid "Add"
 msgstr "הוסף"
 
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
-#: src/gui/serverdialog.cpp:261 src/gui/widgets/setupitem.cpp:299
+#: src/gui/serverdialog.cpp:270 src/gui/widgets/setupitem.cpp:299
 #: src/gui/widgets/setupitem.cpp:426
 msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:274
 msgid "Load"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:279
+#: src/gui/serverdialog.cpp:288
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:297
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:518
+#: src/gui/serverdialog.cpp:527
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:524
+#: src/gui/serverdialog.cpp:533
 msgid "Waiting for server..."
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:529
+#: src/gui/serverdialog.cpp:538
 msgid "Preparing download"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:534
+#: src/gui/serverdialog.cpp:543
 msgid "Error retreiving server list!"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:626
+#: src/gui/serverdialog.cpp:635
 msgid "requires a newer version"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:631
+#: src/gui/serverdialog.cpp:640
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -3405,7 +3405,7 @@ msgid "Type:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:334
+#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:336
 msgid "Delay:"
 msgstr ""
 
@@ -3425,30 +3425,30 @@ msgid "Blue:"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:420
+#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:422
 msgid "Static"
 msgstr "סטטי"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:107 src/gui/setup_colors.cpp:110
-#: src/gui/setup_colors.cpp:422
+#: src/gui/setup_colors.cpp:424
 msgid "Pulse"
 msgstr "פעימה"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:112 src/gui/setup_colors.cpp:115
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Rainbow"
 msgstr "קשת בענן"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:117 src/gui/setup_colors.cpp:120
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Spectrum"
 msgstr "מינסרה"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:328
+#: src/gui/setup_colors.cpp:330
 msgid "Alpha:"
 msgstr ""
 
@@ -3614,7 +3614,7 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: palette color
-#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:134
+#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:135
 msgid "Monsters"
 msgstr "מפלצות"
 
@@ -4163,206 +4163,231 @@ msgstr "כאשר מתעלם:"
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:86
-msgid "Very small (9)"
+msgid "Very small (8)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:88
-msgid "Tiny (10)"
+msgid "Very small (9)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:90
-msgid "Small (11)"
+msgid "Tiny (10)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:92
-msgid "Medium (12)"
+msgid "Small (11)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:94
-msgid "Normal (13)"
+msgid "Medium (12)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:96
-msgid "Large (14)"
+msgid "Normal (13)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:98
-msgid "Very large (15)"
+msgid "Large (14)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:100
-msgid "Big (16)"
+msgid "Large (15)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:102
-msgid "Very big (17)"
+msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:104
-msgid "Huge (18)"
+msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:106
-msgid "Very huge (19)"
+msgid "Big (18)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:108
+msgid "Big (19)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:110
+msgid "Very big (20)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:112
+msgid "Very big (21)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:114
+msgid "Very big (22)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:116
+msgid "Huge (23)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:151
 msgid "Chinese (China)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:153
 msgid "Czech"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:155
 msgid "English"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:157
 msgid "Finnish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:159
 msgid "French"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:161
 msgid "German"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:153
+#: src/gui/setup_theme.cpp:163
 msgid "Indonesian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:155
+#: src/gui/setup_theme.cpp:165
 msgid "Italian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:157
+#: src/gui/setup_theme.cpp:167
 msgid "Polish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:159
+#: src/gui/setup_theme.cpp:169
 msgid "Japanese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:161
+#: src/gui/setup_theme.cpp:171
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:163
+#: src/gui/setup_theme.cpp:173
 msgid "Portuguese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:165
+#: src/gui/setup_theme.cpp:175
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:167
+#: src/gui/setup_theme.cpp:177
 msgid "Russian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:169
+#: src/gui/setup_theme.cpp:179
 msgid "Spanish (Castilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:171
+#: src/gui/setup_theme.cpp:181
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:223
+#: src/gui/setup_theme.cpp:233
 msgid "Gui theme"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:230
+#: src/gui/setup_theme.cpp:240
 msgid "Main Font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:235
+#: src/gui/setup_theme.cpp:245
 msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:239
+#: src/gui/setup_theme.cpp:249
 msgid "Bold font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:243
+#: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:247
+#: src/gui/setup_theme.cpp:257
 msgid "Help font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:251
+#: src/gui/setup_theme.cpp:261
 msgid "Secure font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:255
+#: src/gui/setup_theme.cpp:265
 msgid "Japanese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:260
+#: src/gui/setup_theme.cpp:270
 msgid "Font size"
 msgstr "גודל הגופן"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:265
+#: src/gui/setup_theme.cpp:275
 msgid "Npc font size"
 msgstr ""
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/setup_theme.cpp:269
+#: src/gui/setup_theme.cpp:279
 msgid "i"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/setup_theme.cpp:442
+#: src/gui/setup_theme.cpp:452
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/setup_theme.cpp:467
+#: src/gui/setup_theme.cpp:477
 msgid "Theme Changed"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/setup_theme.cpp:467 src/gui/setup_video.cpp:537
+#: src/gui/setup_theme.cpp:477 src/gui/setup_video.cpp:537
 #: src/gui/setup_video.cpp:546
 msgid "Restart your client for the change to take effect."
 msgstr "טען מחדש כדי שהשינוי יחול."
@@ -4660,7 +4685,8 @@ msgid "Ambient FX"
 msgstr "אופף FX"
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_visual.cpp:140
+#. TRANSLATORS: palette color
+#: src/gui/setup_visual.cpp:140 src/gui/userpalette.cpp:146
 msgid "Particle effects"
 msgstr "אפקטים חלקיים"
 
@@ -4747,45 +4773,45 @@ msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/skilldialog.cpp:270 src/gui/windowmenu.cpp:112
+#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:112
 msgid "Skills"
 msgstr "כישורים"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/skilldialog.cpp:279
+#: src/gui/skilldialog.cpp:281
 msgid "Up"
 msgstr "למעלה"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/skilldialog.cpp:391
+#: src/gui/skilldialog.cpp:393
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skills tab
-#: src/gui/skilldialog.cpp:444
+#: src/gui/skilldialog.cpp:446
 msgid "basic"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill name
-#: src/gui/skilldialog.cpp:447
+#: src/gui/skilldialog.cpp:449
 msgid "basic, 1"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/skilldialog.cpp:484
+#: src/gui/skilldialog.cpp:486
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/skilldialog.cpp:518
+#: src/gui/skilldialog.cpp:520
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/skilldialog.cpp:612 src/gui/skilldialog.cpp:762
+#: src/gui/skilldialog.cpp:614 src/gui/skilldialog.cpp:764
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -5228,7 +5254,7 @@ msgid "Trade: You"
 msgstr "סחור: אתה"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:182
+#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:184
 #, c-format
 msgid "You get %s"
 msgstr ""
@@ -5244,12 +5270,12 @@ msgid "You give:"
 msgstr "אתה נותן:"
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:393
+#: src/gui/tradewindow.cpp:396
 msgid "You don't have enough money."
 msgstr "אין לך מספיק כסף."
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:475
+#: src/gui/tradewindow.cpp:479
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "הוספת הפריט נכשלה. לא ניתן להכניס מעל חפץ אחד לחלון."
@@ -5261,223 +5287,223 @@ msgid "Name: %s"
 msgstr "שם: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/updaterwindow.cpp:140
+#: src/gui/updaterwindow.cpp:156
 msgid "Updating..."
 msgstr "מעדכן..."
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:165
+#: src/gui/updaterwindow.cpp:181
 msgid "Connecting..."
 msgstr "מתחבר..."
 
 #. TRANSLATORS: update message
-#: src/gui/updaterwindow.cpp:656
+#: src/gui/updaterwindow.cpp:672
 msgid "##1  The update process is incomplete."
 msgstr "##1  תהליך העדכון לא תם."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/updaterwindow.cpp:658
+#: src/gui/updaterwindow.cpp:674
 msgid "##1  It is strongly recommended that"
 msgstr "##1  מומלץ ביותר שתנסה שוב מאוחר יותר"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:660
+#: src/gui/updaterwindow.cpp:676
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:839
+#: src/gui/updaterwindow.cpp:855
 msgid "Completed"
 msgstr "הסתיים"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
 msgid "Being"
 msgstr "נהיה"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:118
-msgid "Friend Names"
+#: src/gui/userpalette.cpp:119
+msgid "Friend names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:120
-msgid "Disregarded Names"
+#: src/gui/userpalette.cpp:121
+msgid "Disregarded names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:122
-msgid "Ignored Names"
+#: src/gui/userpalette.cpp:123
+msgid "Ignored names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:124
-msgid "Erased Names"
+#: src/gui/userpalette.cpp:125
+msgid "Erased names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:126
-msgid "Other Players' Names"
-msgstr "שמות המשתמשים האחרים"
+#: src/gui/userpalette.cpp:127
+msgid "Other players names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:128
-msgid "Own Name"
-msgstr "השם שלך"
+#: src/gui/userpalette.cpp:129
+msgid "Own name"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:130
-msgid "GM Names"
-msgstr "שמות המנהלים"
+#: src/gui/userpalette.cpp:131
+msgid "GM names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
 msgid "NPCs"
 msgstr "דמויות"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
 msgid "Monster HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:140
 msgid "Monster HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:141
-msgid "Party Members"
+#: src/gui/userpalette.cpp:142
+msgid "Party members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:143
-msgid "Guild Members"
+#: src/gui/userpalette.cpp:144
+msgid "Guild members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:145
-msgid "Particle Effects"
-msgstr "אפקטים חלקיים"
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:147
-msgid "Pickup Notification"
-msgstr "הודעה על לקיחה"
+#: src/gui/userpalette.cpp:148
+msgid "Pickup notification"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:149
-msgid "Exp Notification"
-msgstr "הודעה על נק' נסיון"
+#: src/gui/userpalette.cpp:150
+msgid "Exp notification"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
 msgid "Player HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
 msgid "Player HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:157
-msgid "Player Hits Monster"
+#: src/gui/userpalette.cpp:158
+msgid "Player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:159
-msgid "Monster Hits Player"
+#: src/gui/userpalette.cpp:160
+msgid "Monster hits player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:163
-msgid "Other Player Hits Local Player"
+#: src/gui/userpalette.cpp:164
+msgid "Other player hits local player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:166
 msgid "Critical Hit"
 msgstr "מכה קריטית"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
-msgid "Local Player Hits Monster"
+#: src/gui/userpalette.cpp:170
+msgid "Local player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:172
-msgid "Local Player Critical Hit"
+#: src/gui/userpalette.cpp:173
+msgid "Local player critical hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:175
-msgid "Local Player Miss"
+#: src/gui/userpalette.cpp:176
+msgid "Local player miss"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:177
+#: src/gui/userpalette.cpp:178
 msgid "Misses"
 msgstr "פספוס"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
-msgid "Portal Highlight"
+#: src/gui/userpalette.cpp:180
+msgid "Portal highlight"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:183
+msgid "Default collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:182
-msgid "Default collision Highlight"
+#: src/gui/userpalette.cpp:186
+msgid "Air collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:185
-msgid "Air collision Highlight"
+#: src/gui/userpalette.cpp:189
+msgid "Water collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:188
-msgid "Water collision Highlight"
+#: src/gui/userpalette.cpp:192
+msgid "Special ground collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:191
-msgid "Special ground collision Highlight"
+#: src/gui/userpalette.cpp:195
+msgid "Walkable highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
-msgid "Walkable Highlight"
+#: src/gui/userpalette.cpp:198
+msgid "Local player attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:197
-msgid "Local Player Attack Range"
+#: src/gui/userpalette.cpp:201
+msgid "Local player attack range border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:200
-msgid "Local Player Attack Range Border"
+#: src/gui/userpalette.cpp:204
+msgid "Monster attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:203
-msgid "Monster Attack Range"
+#: src/gui/userpalette.cpp:208
+msgid "Floor item amount color"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:206
-msgid "Home Place"
+#: src/gui/userpalette.cpp:211
+msgid "Home place"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:209
-msgid "Home Place Border"
+#: src/gui/userpalette.cpp:214
+msgid "Home place border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:212
-msgid "Road Point"
+#: src/gui/userpalette.cpp:217
+msgid "Road point"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
@@ -5607,7 +5633,7 @@ msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:315
+#: src/gui/widgets/itemcontainer.cpp:317
 msgid "Eq."
 msgstr ""
 
diff --git a/po/hr.po b/po/hr.po
index bc134b99c..bdeb9f021 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-05-03 12:38+0300\n"
-"PO-Revision-Date: 2013-05-03 09:44+0000\n"
+"POT-Creation-Date: 2013-05-10 18:34+0300\n"
+"PO-Revision-Date: 2013-05-10 15:39+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -59,25 +59,25 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: full button name
-#: src/client.cpp:1136 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
+#: src/client.cpp:1137 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
 msgid "Setup"
 msgstr "Podešavanje"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1140 src/gui/setup_perfomance.cpp:61
+#: src/client.cpp:1141 src/gui/setup_perfomance.cpp:61
 msgid "Perfomance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:1143 src/gui/setup_video.cpp:258
+#: src/client.cpp:1144 src/gui/setup_video.cpp:258
 msgid "Video"
 msgstr "Slika"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1146 src/gui/setup_theme.cpp:273
+#: src/client.cpp:1147 src/gui/setup_theme.cpp:283
 msgid "Theme"
 msgstr ""
 
@@ -88,7 +88,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1150 src/gui/didyouknowwindow.cpp:78
+#: src/client.cpp:1151 src/gui/didyouknowwindow.cpp:78
 #: src/gui/inventorywindow.cpp:228 src/gui/npcdialog.cpp:63
 #: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:574
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:80
@@ -96,32 +96,32 @@ msgid "Close"
 msgstr "Zatvori"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1238
+#: src/client.cpp:1239
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1282
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1320
+#: src/client.cpp:1321
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1431
+#: src/client.cpp:1432
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1471
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1483
+#: src/client.cpp:1484
 msgid "Changing game servers"
 msgstr ""
 
@@ -136,69 +136,69 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1540 src/client.cpp:1551 src/client.cpp:1721
+#: src/client.cpp:1541 src/client.cpp:1552 src/client.cpp:1722
 #: src/gui/changeemaildialog.cpp:168 src/gui/changepassworddialog.cpp:158
-#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:288
-#: src/gui/editserverdialog.cpp:220 src/gui/registerdialog.cpp:263
+#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:290
+#: src/gui/editserverdialog.cpp:216 src/gui/registerdialog.cpp:263
 #: src/gui/unregisterdialog.cpp:143 src/net/ea/charserverhandler.cpp:190
 #: src/net/ea/charserverhandler.cpp:210
 msgid "Error"
 msgstr "Greška"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1564
+#: src/client.cpp:1565
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1601
+#: src/client.cpp:1602
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1603
+#: src/client.cpp:1604
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1624
+#: src/client.cpp:1625
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1626
+#: src/client.cpp:1627
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1647
+#: src/client.cpp:1648
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1649
+#: src/client.cpp:1650
 msgid "Farewell, come back any time..."
 msgstr ""
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1902 src/client.cpp:1917 src/client.cpp:1960
-#: src/client.cpp:1976 src/client.cpp:2417 src/client.cpp:2425
+#: src/client.cpp:1903 src/client.cpp:1918 src/client.cpp:1961
+#: src/client.cpp:1977 src/client.cpp:2418 src/client.cpp:2426
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2113
+#: src/client.cpp:2114
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2154 src/client.cpp:2161
+#: src/client.cpp:2155 src/client.cpp:2162
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:2183 src/client.cpp:2196
+#: src/client.cpp:2184 src/client.cpp:2197
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -478,19 +478,19 @@ msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: bot checker window header
-#: src/gui/botcheckerwindow.cpp:269
+#: src/gui/botcheckerwindow.cpp:268
 msgid "Bot Checker"
 msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:102
+#: src/gui/botcheckerwindow.cpp:277 src/gui/npcdialog.cpp:102
 msgid "Reset"
 msgstr "Poništi"
 
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: relations table header
-#: src/gui/botcheckerwindow.cpp:305 src/gui/setup_relations.cpp:61
+#: src/gui/botcheckerwindow.cpp:304 src/gui/setup_relations.cpp:61
 msgid "Name"
 msgstr "Ime"
 
@@ -498,7 +498,7 @@ msgstr "Ime"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:145
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:145
 #: src/gui/popupmenu.cpp:241 src/gui/popupmenu.cpp:640
 #: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:257
 #: src/net/tmwa/generalhandler.cpp:292
@@ -508,7 +508,7 @@ msgstr "Napad"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
-#: src/gui/botcheckerwindow.cpp:309 src/gui/popupmenu.cpp:225
+#: src/gui/botcheckerwindow.cpp:308 src/gui/popupmenu.cpp:225
 #: src/gui/setupactiondata.h:93
 msgid "Talk"
 msgstr "Govori"
@@ -516,7 +516,7 @@ msgstr "Govori"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/botcheckerwindow.cpp:311 src/gui/popupmenu.cpp:215
+#: src/gui/botcheckerwindow.cpp:310 src/gui/popupmenu.cpp:215
 #: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:371
 #: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:653
 #: src/gui/popupmenu.cpp:727 src/gui/setupactiondata.h:1856
@@ -524,7 +524,7 @@ msgid "Move"
 msgstr ""
 
 #. TRANSLATORS: bot checker window table header
-#: src/gui/botcheckerwindow.cpp:313
+#: src/gui/botcheckerwindow.cpp:312
 msgid "Result"
 msgstr ""
 
@@ -580,7 +580,7 @@ msgstr "Kupi"
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:516
+#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:511
 #: src/gui/selldialog.cpp:94 src/gui/selldialog.cpp:342
 #, c-format
 msgid "Price: %s / Total: %s"
@@ -597,9 +597,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:208
-#: src/gui/itemamountwindow.cpp:243 src/gui/npcdialog.cpp:93
-#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:833
+#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:202
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:93
+#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:821
 msgid "+"
 msgstr ""
 
@@ -609,9 +609,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:240 src/gui/npcdialog.cpp:95
-#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:846
+#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:200
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:95
+#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:834
 msgid "-"
 msgstr ""
 
@@ -623,7 +623,7 @@ msgstr ""
 #. TRANSLATORS: input action name
 #: src/gui/buydialog.cpp:260 src/gui/quitdialog.cpp:54
 #: src/gui/quitdialog.cpp:59 src/gui/quitdialog.cpp:61
-#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:255
+#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:264
 #: src/gui/setupactiondata.h:177
 msgid "Quit"
 msgstr "Izlaz"
@@ -635,7 +635,7 @@ msgstr "Izlaz"
 #. TRANSLATORS: status bar label
 #: src/gui/buydialog.cpp:262 src/gui/selldialog.cpp:106
 #: src/gui/statuswindow.cpp:558 src/gui/statuswindow.cpp:615
-#: src/gui/statuswindow.cpp:830 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:852
 msgid "Max"
 msgstr "Max"
 
@@ -680,7 +680,7 @@ msgstr "Prodaj"
 #: src/gui/buyselldialog.cpp:71 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:120
 #: src/gui/connectiondialog.cpp:48 src/gui/editserverdialog.cpp:80
-#: src/gui/itemamountwindow.cpp:212 src/gui/npcpostdialog.cpp:64
+#: src/gui/itemamountwindow.cpp:206 src/gui/npcpostdialog.cpp:64
 #: src/gui/popupmenu.cpp:290 src/gui/popupmenu.cpp:324
 #: src/gui/popupmenu.cpp:411 src/gui/popupmenu.cpp:454
 #: src/gui/popupmenu.cpp:485 src/gui/popupmenu.cpp:512
@@ -696,7 +696,7 @@ msgstr "Prodaj"
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
 #: src/gui/setup.cpp:84 src/gui/socialwindow.cpp:1204
 #: src/gui/textcommandeditor.cpp:212 src/gui/textdialog.cpp:53
-#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:167
+#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:183
 msgid "Cancel"
 msgstr "Poništi"
 
@@ -860,7 +860,7 @@ msgstr "Molimo, rasporedi %d bodova"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:570
+#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:581
 #: src/gui/socialwindow.cpp:1269
 msgid "Create"
 msgstr "Stvori"
@@ -887,17 +887,17 @@ msgid "Please remove %d points"
 msgstr "Molimo, oduzmi %d bodova"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:60
+#: src/gui/charselectdialog.cpp:61
 msgid "Confirm Character Delete"
 msgstr "Potvrdi Brisanje Lika"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:62
+#: src/gui/charselectdialog.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "Da li ste sigurni da želite obrisati ovog lika?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:86
+#: src/gui/charselectdialog.cpp:87
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
@@ -909,8 +909,8 @@ msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:565
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:576
+#: src/gui/updaterwindow.cpp:185
 msgid "Play"
 msgstr "Igraj"
 
@@ -926,7 +926,7 @@ msgstr "Info"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:263
+#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:272
 #: src/gui/setupactiondata.h:1803 src/gui/setup_relations.cpp:262
 #: src/gui/shopwindow.cpp:96 src/gui/shopwindow.cpp:103
 #: src/gui/textcommandeditor.cpp:216
@@ -936,24 +936,24 @@ msgstr "Obriši"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/charselectdialog.cpp:129 src/gui/unregisterdialog.cpp:48
+#: src/gui/charselectdialog.cpp:130 src/gui/unregisterdialog.cpp:48
 #: src/gui/unregisterdialog.cpp:53
 msgid "Unregister"
 msgstr "Odjavi"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/charselectdialog.cpp:141
+#: src/gui/charselectdialog.cpp:142
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:172
+#: src/gui/charselectdialog.cpp:175
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/charselectdialog.cpp:246
+#: src/gui/charselectdialog.cpp:248
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -963,16 +963,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:288
+#: src/gui/charselectdialog.cpp:290
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password:"
 msgstr ""
 
@@ -1059,13 +1059,13 @@ msgid "Chat"
 msgstr "Chat"
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:735
+#: src/gui/chatwindow.cpp:638
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1165
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Šaptaj prema %s: %s"
@@ -1083,7 +1083,7 @@ msgstr "Ne"
 
 #. TRANSLATORS: confirm dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/confirmdialog.cpp:58 src/gui/popupmenu.cpp:2429
+#: src/gui/confirmdialog.cpp:55 src/gui/popupmenu.cpp:2429
 #: src/gui/popupmenu.cpp:2442 src/gui/popupmenu.cpp:2457
 #: src/gui/popupmenu.cpp:2483
 msgid "Ignore"
@@ -1092,7 +1092,7 @@ msgstr ""
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
 #. TRANSLATORS: settings group
-#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:109
+#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:108
 #: src/gui/setup_other.cpp:123 src/gui/windowmenu.cpp:106
 msgid "Map"
 msgstr "Karta"
@@ -1108,190 +1108,190 @@ msgid "Net"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:265
-#: src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:268
+#: src/gui/debugwindow.cpp:311
 msgid "Music:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:153 src/gui/debugwindow.cpp:271
-#: src/gui/debugwindow.cpp:312
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:274
+#: src/gui/debugwindow.cpp:315
 msgid "Map:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:155 src/gui/debugwindow.cpp:268
-#: src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:271
+#: src/gui/debugwindow.cpp:313
 msgid "Minimap:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:262
-#: src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:161 src/gui/debugwindow.cpp:265
+#: src/gui/debugwindow.cpp:309
 msgid "Cursor:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:161
+#: src/gui/debugwindow.cpp:164
 msgid "Particle count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:284
-#: src/gui/debugwindow.cpp:316
+#: src/gui/debugwindow.cpp:167 src/gui/debugwindow.cpp:287
+#: src/gui/debugwindow.cpp:319
 msgid "Map actors count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:166 src/gui/debugwindow.cpp:243
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:169 src/gui/debugwindow.cpp:246
+#: src/gui/debugwindow.cpp:252
 msgid "Player Position:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:172 src/gui/debugwindow.cpp:297
+#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:300
 msgid "Draw calls:"
 msgstr ""
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:175
+#. TRANSLATORS: debug window label, frames per second
+#: src/gui/debugwindow.cpp:178
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:177 src/gui/debugwindow.cpp:324
+#. TRANSLATORS: debug window label, logic per second
+#: src/gui/debugwindow.cpp:180 src/gui/debugwindow.cpp:327
 #, c-format
 msgid "%d LPS"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:191 src/gui/debugwindow.cpp:209
 #, c-format
 msgid "%d FPS (Software)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:193
+#: src/gui/debugwindow.cpp:196
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:197
+#: src/gui/debugwindow.cpp:200
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:201
+#: src/gui/debugwindow.cpp:204
 #, c-format
 msgid "%d FPS (mobile OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:225 src/gui/debugwindow.cpp:290
+#: src/gui/debugwindow.cpp:228 src/gui/debugwindow.cpp:293
 msgid "Textures count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:279
+#: src/gui/debugwindow.cpp:282
 #, c-format
 msgid "Particle count: %d"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:330 src/gui/debugwindow.cpp:380
-#: src/gui/debugwindow.cpp:442
+#: src/gui/debugwindow.cpp:333 src/gui/debugwindow.cpp:383
+#: src/gui/debugwindow.cpp:445
 msgid "Target:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:332 src/gui/debugwindow.cpp:386
-#: src/gui/debugwindow.cpp:444
+#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
+#: src/gui/debugwindow.cpp:447
 msgid "Target Id:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
-#: src/gui/debugwindow.cpp:446
+#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:392
+#: src/gui/debugwindow.cpp:449
 msgid "Target type:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:337
+#: src/gui/debugwindow.cpp:340
 msgid "Target level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:339 src/gui/debugwindow.cpp:405
+#: src/gui/debugwindow.cpp:342 src/gui/debugwindow.cpp:408
 msgid "Target race:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:341
+#: src/gui/debugwindow.cpp:344
 msgid "Target party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:346
 msgid "Target guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:430
-#: src/gui/debugwindow.cpp:436 src/gui/debugwindow.cpp:454
+#: src/gui/debugwindow.cpp:348 src/gui/debugwindow.cpp:433
+#: src/gui/debugwindow.cpp:439 src/gui/debugwindow.cpp:457
 msgid "Attack delay:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:347 src/gui/debugwindow.cpp:417
-#: src/gui/debugwindow.cpp:456
+#: src/gui/debugwindow.cpp:350 src/gui/debugwindow.cpp:420
+#: src/gui/debugwindow.cpp:459
 msgid "Minimal hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:349 src/gui/debugwindow.cpp:420
-#: src/gui/debugwindow.cpp:458
+#: src/gui/debugwindow.cpp:352 src/gui/debugwindow.cpp:423
+#: src/gui/debugwindow.cpp:461
 msgid "Maximum hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:351 src/gui/debugwindow.cpp:423
-#: src/gui/debugwindow.cpp:460
+#: src/gui/debugwindow.cpp:354 src/gui/debugwindow.cpp:426
+#: src/gui/debugwindow.cpp:463
 msgid "Critical hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:394 src/gui/debugwindow.cpp:400
-#: src/gui/debugwindow.cpp:448
+#: src/gui/debugwindow.cpp:397 src/gui/debugwindow.cpp:403
+#: src/gui/debugwindow.cpp:451
 msgid "Target Level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:408 src/gui/debugwindow.cpp:450
+#: src/gui/debugwindow.cpp:411 src/gui/debugwindow.cpp:453
 msgid "Target Party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:412 src/gui/debugwindow.cpp:452
+#: src/gui/debugwindow.cpp:415 src/gui/debugwindow.cpp:455
 msgid "Target Guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:493
+#: src/gui/debugwindow.cpp:496
 #, c-format
 msgid "Ping: %s ms"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:496
+#: src/gui/debugwindow.cpp:499
 #, c-format
 msgid "In: %d bytes/s"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:499
+#: src/gui/debugwindow.cpp:502
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
@@ -1323,7 +1323,7 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #: src/gui/editdialog.cpp:45 src/gui/editserverdialog.cpp:78
-#: src/gui/itemamountwindow.cpp:210 src/gui/okdialog.cpp:51
+#: src/gui/itemamountwindow.cpp:204 src/gui/okdialog.cpp:51
 #: src/gui/quitdialog.cpp:70 src/gui/textdialog.cpp:46
 msgid "OK"
 msgstr "U redu"
@@ -1335,7 +1335,7 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:257
+#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:266
 msgid "Connect"
 msgstr ""
 
@@ -1365,7 +1365,7 @@ msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/editserverdialog.cpp:222
+#: src/gui/editserverdialog.cpp:218
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -1417,7 +1417,7 @@ msgstr "Opremi"
 #: src/gui/inventorywindow.cpp:178 src/gui/inventorywindow.cpp:630
 #: src/gui/popupmenu.cpp:1843 src/gui/popupmenu.cpp:1922
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2041
-#: src/gui/skilldialog.cpp:277
+#: src/gui/skilldialog.cpp:279
 msgid "Use"
 msgstr "Upotrijebi"
 
@@ -1451,7 +1451,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: setup button
-#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:718
+#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:719
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1992
 #: src/gui/popupmenu.cpp:2066 src/gui/setup.cpp:86
 msgid "Store"
@@ -1473,47 +1473,47 @@ msgid "Drop"
 msgstr "Ispusti"
 
 #. TRANSLATORS: item amount window button
-#: src/gui/itemamountwindow.cpp:214
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "Sve"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:264
 msgid "Select amount of items to trade."
 msgstr "Odaberi količinu predmeta za razmjenu."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:274
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to drop."
 msgstr "Odaberi količinu predmeta za ispuštanje."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:278
+#: src/gui/itemamountwindow.cpp:272
 msgid "Select amount of items to store."
 msgstr "Odaberite količinu predmeta za spremanje."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:276
 msgid "Select amount of items to retrieve."
 msgstr "Odaberite iznos predmeta za preuzimanje."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:286
+#: src/gui/itemamountwindow.cpp:280
 msgid "Select amount of items to split."
 msgstr "Odaberi količinu predmeta za razdvajanje."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:290
+#: src/gui/itemamountwindow.cpp:284
 msgid "Add to buy shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:294
+#: src/gui/itemamountwindow.cpp:288
 msgid "Add to sell shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:298
+#: src/gui/itemamountwindow.cpp:292
 msgid "Unknown."
 msgstr ""
 
@@ -1540,7 +1540,7 @@ msgstr ""
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:58 src/gui/killstats.cpp:171
-#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:516
+#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:509
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
@@ -1548,7 +1548,7 @@ msgstr ""
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:61 src/gui/killstats.cpp:173
 #: src/gui/killstats.cpp:253 src/gui/killstats.cpp:268
-#: src/gui/killstats.cpp:518
+#: src/gui/killstats.cpp:511
 #, c-format
 msgid "Avg Exp: %s"
 msgstr ""
@@ -1556,14 +1556,14 @@ msgstr ""
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:63 src/gui/killstats.cpp:176
 #: src/gui/killstats.cpp:258 src/gui/killstats.cpp:272
-#: src/gui/killstats.cpp:521
+#: src/gui/killstats.cpp:514
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:66 src/gui/killstats.cpp:187
-#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:524
+#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:517
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
@@ -1593,9 +1593,9 @@ msgid "Last kill exp:"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:414
-#: src/gui/killstats.cpp:421 src/gui/killstats.cpp:428
-#: src/gui/killstats.cpp:434
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:408
+#: src/gui/killstats.cpp:415 src/gui/killstats.cpp:422
+#: src/gui/killstats.cpp:428
 msgid "Time before jacko spawn:"
 msgstr ""
 
@@ -1627,12 +1627,12 @@ msgid "  Time for next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:421
+#: src/gui/killstats.cpp:415
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:428
+#: src/gui/killstats.cpp:422
 msgid "jacko spawning"
 msgstr ""
 
@@ -1738,32 +1738,32 @@ msgid "arrows bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:88
+#: src/gui/ministatuswindow.cpp:89
 msgid "status bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:108
+#: src/gui/ministatuswindow.cpp:109
 msgid "job bar"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:306 src/gui/statuswindow.cpp:298
+#: src/gui/ministatuswindow.cpp:307 src/gui/statuswindow.cpp:298
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:313 src/gui/statuswindow.cpp:141
+#: src/gui/ministatuswindow.cpp:314 src/gui/statuswindow.cpp:141
 #: src/gui/statuswindow.cpp:305 src/gui/statuswindow.cpp:375
 #, c-format
 msgid "Level: %d"
 msgstr "Nivo: %d"
 
 #. TRANSLATORS: status bar label
-#: src/gui/ministatuswindow.cpp:330 src/gui/ministatuswindow.cpp:367
+#: src/gui/ministatuswindow.cpp:331 src/gui/ministatuswindow.cpp:368
 msgid "Need"
 msgstr ""
 
@@ -2151,7 +2151,7 @@ msgstr ""
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2209 src/gui/popupmenu.cpp:2280
-#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:139
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
 #: src/gui/socialwindow.cpp:934
 msgid "(default)"
 msgstr ""
@@ -2334,7 +2334,7 @@ msgid "Passwords do not match."
 msgstr "Lozinke se ne podudaraju."
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:257
 msgid "Choose Your Server"
 msgstr ""
 
@@ -2342,61 +2342,61 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:259 src/gui/shopwindow.cpp:94
+#: src/gui/serverdialog.cpp:268 src/gui/shopwindow.cpp:94
 #: src/gui/shopwindow.cpp:101 src/gui/tradewindow.cpp:77
 msgid "Add"
 msgstr "Dodaj"
 
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
-#: src/gui/serverdialog.cpp:261 src/gui/widgets/setupitem.cpp:299
+#: src/gui/serverdialog.cpp:270 src/gui/widgets/setupitem.cpp:299
 #: src/gui/widgets/setupitem.cpp:426
 msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:274
 msgid "Load"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:279
+#: src/gui/serverdialog.cpp:288
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:297
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:518
+#: src/gui/serverdialog.cpp:527
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:524
+#: src/gui/serverdialog.cpp:533
 msgid "Waiting for server..."
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:529
+#: src/gui/serverdialog.cpp:538
 msgid "Preparing download"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:534
+#: src/gui/serverdialog.cpp:543
 msgid "Error retreiving server list!"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:626
+#: src/gui/serverdialog.cpp:635
 msgid "requires a newer version"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:631
+#: src/gui/serverdialog.cpp:640
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -3407,7 +3407,7 @@ msgid "Type:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:334
+#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:336
 msgid "Delay:"
 msgstr ""
 
@@ -3427,30 +3427,30 @@ msgid "Blue:"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:420
+#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:422
 msgid "Static"
 msgstr "Statično"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:107 src/gui/setup_colors.cpp:110
-#: src/gui/setup_colors.cpp:422
+#: src/gui/setup_colors.cpp:424
 msgid "Pulse"
 msgstr "Pulsiranje"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:112 src/gui/setup_colors.cpp:115
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Rainbow"
 msgstr "Duga"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:117 src/gui/setup_colors.cpp:120
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Spectrum"
 msgstr "Spektar"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:328
+#: src/gui/setup_colors.cpp:330
 msgid "Alpha:"
 msgstr ""
 
@@ -3616,7 +3616,7 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: palette color
-#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:134
+#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:135
 msgid "Monsters"
 msgstr "Čudovišta"
 
@@ -4165,206 +4165,231 @@ msgstr "Kad ignorira:"
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:86
-msgid "Very small (9)"
+msgid "Very small (8)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:88
-msgid "Tiny (10)"
+msgid "Very small (9)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:90
-msgid "Small (11)"
+msgid "Tiny (10)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:92
-msgid "Medium (12)"
+msgid "Small (11)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:94
-msgid "Normal (13)"
+msgid "Medium (12)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:96
-msgid "Large (14)"
+msgid "Normal (13)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:98
-msgid "Very large (15)"
+msgid "Large (14)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:100
-msgid "Big (16)"
+msgid "Large (15)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:102
-msgid "Very big (17)"
+msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:104
-msgid "Huge (18)"
+msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:106
-msgid "Very huge (19)"
+msgid "Big (18)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:108
+msgid "Big (19)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:110
+msgid "Very big (20)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:112
+msgid "Very big (21)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:114
+msgid "Very big (22)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:116
+msgid "Huge (23)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:151
 msgid "Chinese (China)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:153
 msgid "Czech"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:155
 msgid "English"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:157
 msgid "Finnish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:159
 msgid "French"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:161
 msgid "German"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:153
+#: src/gui/setup_theme.cpp:163
 msgid "Indonesian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:155
+#: src/gui/setup_theme.cpp:165
 msgid "Italian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:157
+#: src/gui/setup_theme.cpp:167
 msgid "Polish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:159
+#: src/gui/setup_theme.cpp:169
 msgid "Japanese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:161
+#: src/gui/setup_theme.cpp:171
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:163
+#: src/gui/setup_theme.cpp:173
 msgid "Portuguese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:165
+#: src/gui/setup_theme.cpp:175
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:167
+#: src/gui/setup_theme.cpp:177
 msgid "Russian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:169
+#: src/gui/setup_theme.cpp:179
 msgid "Spanish (Castilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:171
+#: src/gui/setup_theme.cpp:181
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:223
+#: src/gui/setup_theme.cpp:233
 msgid "Gui theme"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:230
+#: src/gui/setup_theme.cpp:240
 msgid "Main Font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:235
+#: src/gui/setup_theme.cpp:245
 msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:239
+#: src/gui/setup_theme.cpp:249
 msgid "Bold font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:243
+#: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:247
+#: src/gui/setup_theme.cpp:257
 msgid "Help font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:251
+#: src/gui/setup_theme.cpp:261
 msgid "Secure font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:255
+#: src/gui/setup_theme.cpp:265
 msgid "Japanese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:260
+#: src/gui/setup_theme.cpp:270
 msgid "Font size"
 msgstr "Veličina fonta"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:265
+#: src/gui/setup_theme.cpp:275
 msgid "Npc font size"
 msgstr ""
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/setup_theme.cpp:269
+#: src/gui/setup_theme.cpp:279
 msgid "i"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/setup_theme.cpp:442
+#: src/gui/setup_theme.cpp:452
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/setup_theme.cpp:467
+#: src/gui/setup_theme.cpp:477
 msgid "Theme Changed"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/setup_theme.cpp:467 src/gui/setup_video.cpp:537
+#: src/gui/setup_theme.cpp:477 src/gui/setup_video.cpp:537
 #: src/gui/setup_video.cpp:546
 msgid "Restart your client for the change to take effect."
 msgstr "Ponovo pokrenite klijent da bi promjene bile efektne."
@@ -4662,7 +4687,8 @@ msgid "Ambient FX"
 msgstr "Efekti okruženja"
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_visual.cpp:140
+#. TRANSLATORS: palette color
+#: src/gui/setup_visual.cpp:140 src/gui/userpalette.cpp:146
 msgid "Particle effects"
 msgstr "Efekt čestica"
 
@@ -4749,45 +4775,45 @@ msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/skilldialog.cpp:270 src/gui/windowmenu.cpp:112
+#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:112
 msgid "Skills"
 msgstr "Vještine"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/skilldialog.cpp:279
+#: src/gui/skilldialog.cpp:281
 msgid "Up"
 msgstr "Gore"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/skilldialog.cpp:391
+#: src/gui/skilldialog.cpp:393
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skills tab
-#: src/gui/skilldialog.cpp:444
+#: src/gui/skilldialog.cpp:446
 msgid "basic"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill name
-#: src/gui/skilldialog.cpp:447
+#: src/gui/skilldialog.cpp:449
 msgid "basic, 1"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/skilldialog.cpp:484
+#: src/gui/skilldialog.cpp:486
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/skilldialog.cpp:518
+#: src/gui/skilldialog.cpp:520
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/skilldialog.cpp:612 src/gui/skilldialog.cpp:762
+#: src/gui/skilldialog.cpp:614 src/gui/skilldialog.cpp:764
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -5230,7 +5256,7 @@ msgid "Trade: You"
 msgstr "Trgovanje: Vi"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:182
+#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:184
 #, c-format
 msgid "You get %s"
 msgstr ""
@@ -5246,12 +5272,12 @@ msgid "You give:"
 msgstr "Daješ:"
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:393
+#: src/gui/tradewindow.cpp:396
 msgid "You don't have enough money."
 msgstr "Nemate dovoljno novca."
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:475
+#: src/gui/tradewindow.cpp:479
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
@@ -5263,223 +5289,223 @@ msgid "Name: %s"
 msgstr "Ime: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/updaterwindow.cpp:140
+#: src/gui/updaterwindow.cpp:156
 msgid "Updating..."
 msgstr "Ažuriranje"
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:165
+#: src/gui/updaterwindow.cpp:181
 msgid "Connecting..."
 msgstr "Spajanje..."
 
 #. TRANSLATORS: update message
-#: src/gui/updaterwindow.cpp:656
+#: src/gui/updaterwindow.cpp:672
 msgid "##1  The update process is incomplete."
 msgstr "##1  Proces ažuriranja je nepotpun."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/updaterwindow.cpp:658
+#: src/gui/updaterwindow.cpp:674
 msgid "##1  It is strongly recommended that"
 msgstr "##1  Vrlo je preporučljivo da"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:660
+#: src/gui/updaterwindow.cpp:676
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:839
+#: src/gui/updaterwindow.cpp:855
 msgid "Completed"
 msgstr "Dovršeno"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
 msgid "Being"
 msgstr "Biće"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:118
-msgid "Friend Names"
+#: src/gui/userpalette.cpp:119
+msgid "Friend names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:120
-msgid "Disregarded Names"
+#: src/gui/userpalette.cpp:121
+msgid "Disregarded names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:122
-msgid "Ignored Names"
+#: src/gui/userpalette.cpp:123
+msgid "Ignored names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:124
-msgid "Erased Names"
+#: src/gui/userpalette.cpp:125
+msgid "Erased names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:126
-msgid "Other Players' Names"
-msgstr "Imena Drugih Igrača"
+#: src/gui/userpalette.cpp:127
+msgid "Other players names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:128
-msgid "Own Name"
-msgstr "Vlastito Ime"
+#: src/gui/userpalette.cpp:129
+msgid "Own name"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:130
-msgid "GM Names"
-msgstr "GM Imena"
+#: src/gui/userpalette.cpp:131
+msgid "GM names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
 msgid "NPCs"
 msgstr "NPCs"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
 msgid "Monster HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:140
 msgid "Monster HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:141
-msgid "Party Members"
+#: src/gui/userpalette.cpp:142
+msgid "Party members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:143
-msgid "Guild Members"
+#: src/gui/userpalette.cpp:144
+msgid "Guild members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:145
-msgid "Particle Effects"
-msgstr "Efekti Čestica"
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:147
-msgid "Pickup Notification"
-msgstr "Obavijest Sakupljanja"
+#: src/gui/userpalette.cpp:148
+msgid "Pickup notification"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:149
-msgid "Exp Notification"
-msgstr "Exp Obavijest"
+#: src/gui/userpalette.cpp:150
+msgid "Exp notification"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
 msgid "Player HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
 msgid "Player HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:157
-msgid "Player Hits Monster"
+#: src/gui/userpalette.cpp:158
+msgid "Player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:159
-msgid "Monster Hits Player"
+#: src/gui/userpalette.cpp:160
+msgid "Monster hits player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:163
-msgid "Other Player Hits Local Player"
+#: src/gui/userpalette.cpp:164
+msgid "Other player hits local player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:166
 msgid "Critical Hit"
 msgstr "Kritični Udarac"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
-msgid "Local Player Hits Monster"
+#: src/gui/userpalette.cpp:170
+msgid "Local player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:172
-msgid "Local Player Critical Hit"
+#: src/gui/userpalette.cpp:173
+msgid "Local player critical hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:175
-msgid "Local Player Miss"
+#: src/gui/userpalette.cpp:176
+msgid "Local player miss"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:177
+#: src/gui/userpalette.cpp:178
 msgid "Misses"
 msgstr "Promašaji"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
-msgid "Portal Highlight"
+#: src/gui/userpalette.cpp:180
+msgid "Portal highlight"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:183
+msgid "Default collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:182
-msgid "Default collision Highlight"
+#: src/gui/userpalette.cpp:186
+msgid "Air collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:185
-msgid "Air collision Highlight"
+#: src/gui/userpalette.cpp:189
+msgid "Water collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:188
-msgid "Water collision Highlight"
+#: src/gui/userpalette.cpp:192
+msgid "Special ground collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:191
-msgid "Special ground collision Highlight"
+#: src/gui/userpalette.cpp:195
+msgid "Walkable highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
-msgid "Walkable Highlight"
+#: src/gui/userpalette.cpp:198
+msgid "Local player attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:197
-msgid "Local Player Attack Range"
+#: src/gui/userpalette.cpp:201
+msgid "Local player attack range border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:200
-msgid "Local Player Attack Range Border"
+#: src/gui/userpalette.cpp:204
+msgid "Monster attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:203
-msgid "Monster Attack Range"
+#: src/gui/userpalette.cpp:208
+msgid "Floor item amount color"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:206
-msgid "Home Place"
+#: src/gui/userpalette.cpp:211
+msgid "Home place"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:209
-msgid "Home Place Border"
+#: src/gui/userpalette.cpp:214
+msgid "Home place border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:212
-msgid "Road Point"
+#: src/gui/userpalette.cpp:217
+msgid "Road point"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
@@ -5609,7 +5635,7 @@ msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:315
+#: src/gui/widgets/itemcontainer.cpp:317
 msgid "Eq."
 msgstr ""
 
diff --git a/po/hu.po b/po/hu.po
index 45d0fcbe9..b2123a4b4 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-05-03 12:38+0300\n"
-"PO-Revision-Date: 2013-05-03 09:44+0000\n"
+"POT-Creation-Date: 2013-05-10 18:34+0300\n"
+"PO-Revision-Date: 2013-05-10 15:39+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -59,25 +59,25 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: full button name
-#: src/client.cpp:1136 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
+#: src/client.cpp:1137 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
 msgid "Setup"
 msgstr "Beállítások"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1140 src/gui/setup_perfomance.cpp:61
+#: src/client.cpp:1141 src/gui/setup_perfomance.cpp:61
 msgid "Perfomance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:1143 src/gui/setup_video.cpp:258
+#: src/client.cpp:1144 src/gui/setup_video.cpp:258
 msgid "Video"
 msgstr "Videó"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1146 src/gui/setup_theme.cpp:273
+#: src/client.cpp:1147 src/gui/setup_theme.cpp:283
 msgid "Theme"
 msgstr ""
 
@@ -88,7 +88,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1150 src/gui/didyouknowwindow.cpp:78
+#: src/client.cpp:1151 src/gui/didyouknowwindow.cpp:78
 #: src/gui/inventorywindow.cpp:228 src/gui/npcdialog.cpp:63
 #: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:574
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:80
@@ -96,32 +96,32 @@ msgid "Close"
 msgstr "Bezár"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1238
+#: src/client.cpp:1239
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1282
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1320
+#: src/client.cpp:1321
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1431
+#: src/client.cpp:1432
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1471
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1483
+#: src/client.cpp:1484
 msgid "Changing game servers"
 msgstr ""
 
@@ -136,69 +136,69 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1540 src/client.cpp:1551 src/client.cpp:1721
+#: src/client.cpp:1541 src/client.cpp:1552 src/client.cpp:1722
 #: src/gui/changeemaildialog.cpp:168 src/gui/changepassworddialog.cpp:158
-#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:288
-#: src/gui/editserverdialog.cpp:220 src/gui/registerdialog.cpp:263
+#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:290
+#: src/gui/editserverdialog.cpp:216 src/gui/registerdialog.cpp:263
 #: src/gui/unregisterdialog.cpp:143 src/net/ea/charserverhandler.cpp:190
 #: src/net/ea/charserverhandler.cpp:210
 msgid "Error"
 msgstr "Hiba"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1564
+#: src/client.cpp:1565
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1601
+#: src/client.cpp:1602
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1603
+#: src/client.cpp:1604
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1624
+#: src/client.cpp:1625
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1626
+#: src/client.cpp:1627
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1647
+#: src/client.cpp:1648
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1649
+#: src/client.cpp:1650
 msgid "Farewell, come back any time..."
 msgstr ""
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1902 src/client.cpp:1917 src/client.cpp:1960
-#: src/client.cpp:1976 src/client.cpp:2417 src/client.cpp:2425
+#: src/client.cpp:1903 src/client.cpp:1918 src/client.cpp:1961
+#: src/client.cpp:1977 src/client.cpp:2418 src/client.cpp:2426
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2113
+#: src/client.cpp:2114
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2154 src/client.cpp:2161
+#: src/client.cpp:2155 src/client.cpp:2162
 msgid "Error creating updates directory!"
 msgstr "Hiba a frissítési könyvtár létrehozása közben!"
 
-#: src/client.cpp:2183 src/client.cpp:2196
+#: src/client.cpp:2184 src/client.cpp:2197
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -478,19 +478,19 @@ msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: bot checker window header
-#: src/gui/botcheckerwindow.cpp:269
+#: src/gui/botcheckerwindow.cpp:268
 msgid "Bot Checker"
 msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:102
+#: src/gui/botcheckerwindow.cpp:277 src/gui/npcdialog.cpp:102
 msgid "Reset"
 msgstr "Alaphelyzet"
 
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: relations table header
-#: src/gui/botcheckerwindow.cpp:305 src/gui/setup_relations.cpp:61
+#: src/gui/botcheckerwindow.cpp:304 src/gui/setup_relations.cpp:61
 msgid "Name"
 msgstr "Név"
 
@@ -498,7 +498,7 @@ msgstr "Név"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:145
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:145
 #: src/gui/popupmenu.cpp:241 src/gui/popupmenu.cpp:640
 #: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:257
 #: src/net/tmwa/generalhandler.cpp:292
@@ -508,7 +508,7 @@ msgstr "Támadás"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
-#: src/gui/botcheckerwindow.cpp:309 src/gui/popupmenu.cpp:225
+#: src/gui/botcheckerwindow.cpp:308 src/gui/popupmenu.cpp:225
 #: src/gui/setupactiondata.h:93
 msgid "Talk"
 msgstr "Csevegés"
@@ -516,7 +516,7 @@ msgstr "Csevegés"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/botcheckerwindow.cpp:311 src/gui/popupmenu.cpp:215
+#: src/gui/botcheckerwindow.cpp:310 src/gui/popupmenu.cpp:215
 #: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:371
 #: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:653
 #: src/gui/popupmenu.cpp:727 src/gui/setupactiondata.h:1856
@@ -524,7 +524,7 @@ msgid "Move"
 msgstr ""
 
 #. TRANSLATORS: bot checker window table header
-#: src/gui/botcheckerwindow.cpp:313
+#: src/gui/botcheckerwindow.cpp:312
 msgid "Result"
 msgstr ""
 
@@ -580,7 +580,7 @@ msgstr "Vétel"
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:516
+#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:511
 #: src/gui/selldialog.cpp:94 src/gui/selldialog.cpp:342
 #, c-format
 msgid "Price: %s / Total: %s"
@@ -597,9 +597,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:208
-#: src/gui/itemamountwindow.cpp:243 src/gui/npcdialog.cpp:93
-#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:833
+#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:202
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:93
+#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:821
 msgid "+"
 msgstr ""
 
@@ -609,9 +609,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:240 src/gui/npcdialog.cpp:95
-#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:846
+#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:200
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:95
+#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:834
 msgid "-"
 msgstr ""
 
@@ -623,7 +623,7 @@ msgstr ""
 #. TRANSLATORS: input action name
 #: src/gui/buydialog.cpp:260 src/gui/quitdialog.cpp:54
 #: src/gui/quitdialog.cpp:59 src/gui/quitdialog.cpp:61
-#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:255
+#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:264
 #: src/gui/setupactiondata.h:177
 msgid "Quit"
 msgstr "Kilépés"
@@ -635,7 +635,7 @@ msgstr "Kilépés"
 #. TRANSLATORS: status bar label
 #: src/gui/buydialog.cpp:262 src/gui/selldialog.cpp:106
 #: src/gui/statuswindow.cpp:558 src/gui/statuswindow.cpp:615
-#: src/gui/statuswindow.cpp:830 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:852
 msgid "Max"
 msgstr "Max."
 
@@ -680,7 +680,7 @@ msgstr "Eladás"
 #: src/gui/buyselldialog.cpp:71 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:120
 #: src/gui/connectiondialog.cpp:48 src/gui/editserverdialog.cpp:80
-#: src/gui/itemamountwindow.cpp:212 src/gui/npcpostdialog.cpp:64
+#: src/gui/itemamountwindow.cpp:206 src/gui/npcpostdialog.cpp:64
 #: src/gui/popupmenu.cpp:290 src/gui/popupmenu.cpp:324
 #: src/gui/popupmenu.cpp:411 src/gui/popupmenu.cpp:454
 #: src/gui/popupmenu.cpp:485 src/gui/popupmenu.cpp:512
@@ -696,7 +696,7 @@ msgstr "Eladás"
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
 #: src/gui/setup.cpp:84 src/gui/socialwindow.cpp:1204
 #: src/gui/textcommandeditor.cpp:212 src/gui/textdialog.cpp:53
-#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:167
+#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:183
 msgid "Cancel"
 msgstr "Mégse"
 
@@ -860,7 +860,7 @@ msgstr "Kérlek oszd el a pontjaidat (%d van még)"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:570
+#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:581
 #: src/gui/socialwindow.cpp:1269
 msgid "Create"
 msgstr "Létrehozás"
@@ -887,17 +887,17 @@ msgid "Please remove %d points"
 msgstr "Kérlek távolíts el %d pontot"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:60
+#: src/gui/charselectdialog.cpp:61
 msgid "Confirm Character Delete"
 msgstr "Karakter törlésének megerősítése"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:62
+#: src/gui/charselectdialog.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "Biztos hogy ki akarod törölni ezt a karaktert?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:86
+#: src/gui/charselectdialog.cpp:87
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
@@ -909,8 +909,8 @@ msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:565
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:576
+#: src/gui/updaterwindow.cpp:185
 msgid "Play"
 msgstr "Játék"
 
@@ -926,7 +926,7 @@ msgstr "Infó"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:263
+#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:272
 #: src/gui/setupactiondata.h:1803 src/gui/setup_relations.cpp:262
 #: src/gui/shopwindow.cpp:96 src/gui/shopwindow.cpp:103
 #: src/gui/textcommandeditor.cpp:216
@@ -936,24 +936,24 @@ msgstr "Törlés"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/charselectdialog.cpp:129 src/gui/unregisterdialog.cpp:48
+#: src/gui/charselectdialog.cpp:130 src/gui/unregisterdialog.cpp:48
 #: src/gui/unregisterdialog.cpp:53
 msgid "Unregister"
 msgstr "Regisztráció megszüntetése"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/charselectdialog.cpp:141
+#: src/gui/charselectdialog.cpp:142
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:172
+#: src/gui/charselectdialog.cpp:175
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/charselectdialog.cpp:246
+#: src/gui/charselectdialog.cpp:248
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -963,16 +963,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:288
+#: src/gui/charselectdialog.cpp:290
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password:"
 msgstr ""
 
@@ -1059,13 +1059,13 @@ msgid "Chat"
 msgstr "Chat"
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:735
+#: src/gui/chatwindow.cpp:638
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1165
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Üzenet %s számára: %s"
@@ -1083,7 +1083,7 @@ msgstr "Nem"
 
 #. TRANSLATORS: confirm dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/confirmdialog.cpp:58 src/gui/popupmenu.cpp:2429
+#: src/gui/confirmdialog.cpp:55 src/gui/popupmenu.cpp:2429
 #: src/gui/popupmenu.cpp:2442 src/gui/popupmenu.cpp:2457
 #: src/gui/popupmenu.cpp:2483
 msgid "Ignore"
@@ -1092,7 +1092,7 @@ msgstr ""
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
 #. TRANSLATORS: settings group
-#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:109
+#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:108
 #: src/gui/setup_other.cpp:123 src/gui/windowmenu.cpp:106
 msgid "Map"
 msgstr "Térkép"
@@ -1108,190 +1108,190 @@ msgid "Net"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:265
-#: src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:268
+#: src/gui/debugwindow.cpp:311
 msgid "Music:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:153 src/gui/debugwindow.cpp:271
-#: src/gui/debugwindow.cpp:312
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:274
+#: src/gui/debugwindow.cpp:315
 msgid "Map:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:155 src/gui/debugwindow.cpp:268
-#: src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:271
+#: src/gui/debugwindow.cpp:313
 msgid "Minimap:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:262
-#: src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:161 src/gui/debugwindow.cpp:265
+#: src/gui/debugwindow.cpp:309
 msgid "Cursor:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:161
+#: src/gui/debugwindow.cpp:164
 msgid "Particle count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:284
-#: src/gui/debugwindow.cpp:316
+#: src/gui/debugwindow.cpp:167 src/gui/debugwindow.cpp:287
+#: src/gui/debugwindow.cpp:319
 msgid "Map actors count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:166 src/gui/debugwindow.cpp:243
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:169 src/gui/debugwindow.cpp:246
+#: src/gui/debugwindow.cpp:252
 msgid "Player Position:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:172 src/gui/debugwindow.cpp:297
+#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:300
 msgid "Draw calls:"
 msgstr ""
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:175
+#. TRANSLATORS: debug window label, frames per second
+#: src/gui/debugwindow.cpp:178
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:177 src/gui/debugwindow.cpp:324
+#. TRANSLATORS: debug window label, logic per second
+#: src/gui/debugwindow.cpp:180 src/gui/debugwindow.cpp:327
 #, c-format
 msgid "%d LPS"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:191 src/gui/debugwindow.cpp:209
 #, c-format
 msgid "%d FPS (Software)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:193
+#: src/gui/debugwindow.cpp:196
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:197
+#: src/gui/debugwindow.cpp:200
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:201
+#: src/gui/debugwindow.cpp:204
 #, c-format
 msgid "%d FPS (mobile OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:225 src/gui/debugwindow.cpp:290
+#: src/gui/debugwindow.cpp:228 src/gui/debugwindow.cpp:293
 msgid "Textures count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:279
+#: src/gui/debugwindow.cpp:282
 #, c-format
 msgid "Particle count: %d"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:330 src/gui/debugwindow.cpp:380
-#: src/gui/debugwindow.cpp:442
+#: src/gui/debugwindow.cpp:333 src/gui/debugwindow.cpp:383
+#: src/gui/debugwindow.cpp:445
 msgid "Target:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:332 src/gui/debugwindow.cpp:386
-#: src/gui/debugwindow.cpp:444
+#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
+#: src/gui/debugwindow.cpp:447
 msgid "Target Id:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
-#: src/gui/debugwindow.cpp:446
+#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:392
+#: src/gui/debugwindow.cpp:449
 msgid "Target type:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:337
+#: src/gui/debugwindow.cpp:340
 msgid "Target level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:339 src/gui/debugwindow.cpp:405
+#: src/gui/debugwindow.cpp:342 src/gui/debugwindow.cpp:408
 msgid "Target race:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:341
+#: src/gui/debugwindow.cpp:344
 msgid "Target party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:346
 msgid "Target guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:430
-#: src/gui/debugwindow.cpp:436 src/gui/debugwindow.cpp:454
+#: src/gui/debugwindow.cpp:348 src/gui/debugwindow.cpp:433
+#: src/gui/debugwindow.cpp:439 src/gui/debugwindow.cpp:457
 msgid "Attack delay:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:347 src/gui/debugwindow.cpp:417
-#: src/gui/debugwindow.cpp:456
+#: src/gui/debugwindow.cpp:350 src/gui/debugwindow.cpp:420
+#: src/gui/debugwindow.cpp:459
 msgid "Minimal hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:349 src/gui/debugwindow.cpp:420
-#: src/gui/debugwindow.cpp:458
+#: src/gui/debugwindow.cpp:352 src/gui/debugwindow.cpp:423
+#: src/gui/debugwindow.cpp:461
 msgid "Maximum hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:351 src/gui/debugwindow.cpp:423
-#: src/gui/debugwindow.cpp:460
+#: src/gui/debugwindow.cpp:354 src/gui/debugwindow.cpp:426
+#: src/gui/debugwindow.cpp:463
 msgid "Critical hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:394 src/gui/debugwindow.cpp:400
-#: src/gui/debugwindow.cpp:448
+#: src/gui/debugwindow.cpp:397 src/gui/debugwindow.cpp:403
+#: src/gui/debugwindow.cpp:451
 msgid "Target Level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:408 src/gui/debugwindow.cpp:450
+#: src/gui/debugwindow.cpp:411 src/gui/debugwindow.cpp:453
 msgid "Target Party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:412 src/gui/debugwindow.cpp:452
+#: src/gui/debugwindow.cpp:415 src/gui/debugwindow.cpp:455
 msgid "Target Guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:493
+#: src/gui/debugwindow.cpp:496
 #, c-format
 msgid "Ping: %s ms"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:496
+#: src/gui/debugwindow.cpp:499
 #, c-format
 msgid "In: %d bytes/s"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:499
+#: src/gui/debugwindow.cpp:502
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
@@ -1323,7 +1323,7 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #: src/gui/editdialog.cpp:45 src/gui/editserverdialog.cpp:78
-#: src/gui/itemamountwindow.cpp:210 src/gui/okdialog.cpp:51
+#: src/gui/itemamountwindow.cpp:204 src/gui/okdialog.cpp:51
 #: src/gui/quitdialog.cpp:70 src/gui/textdialog.cpp:46
 msgid "OK"
 msgstr "Ok"
@@ -1335,7 +1335,7 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:257
+#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:266
 msgid "Connect"
 msgstr ""
 
@@ -1365,7 +1365,7 @@ msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/editserverdialog.cpp:222
+#: src/gui/editserverdialog.cpp:218
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -1417,7 +1417,7 @@ msgstr "Használ"
 #: src/gui/inventorywindow.cpp:178 src/gui/inventorywindow.cpp:630
 #: src/gui/popupmenu.cpp:1843 src/gui/popupmenu.cpp:1922
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2041
-#: src/gui/skilldialog.cpp:277
+#: src/gui/skilldialog.cpp:279
 msgid "Use"
 msgstr "Bevet"
 
@@ -1451,7 +1451,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: setup button
-#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:718
+#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:719
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1992
 #: src/gui/popupmenu.cpp:2066 src/gui/setup.cpp:86
 msgid "Store"
@@ -1473,47 +1473,47 @@ msgid "Drop"
 msgstr "Eldob"
 
 #. TRANSLATORS: item amount window button
-#: src/gui/itemamountwindow.cpp:214
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "Mind"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:264
 msgid "Select amount of items to trade."
 msgstr "Válaszd ki mennyi tárggyal akarsz üzletelni."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:274
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to drop."
 msgstr "Válaszd ki mennyit akarsz eldobni."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:278
+#: src/gui/itemamountwindow.cpp:272
 msgid "Select amount of items to store."
 msgstr "Válaszd ki a raktározandó mennyiséget."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:276
 msgid "Select amount of items to retrieve."
 msgstr "Válaszd ki mennyit veszel magadhoz."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:286
+#: src/gui/itemamountwindow.cpp:280
 msgid "Select amount of items to split."
 msgstr "Válaszd ki az elosztandó mennyiséget."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:290
+#: src/gui/itemamountwindow.cpp:284
 msgid "Add to buy shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:294
+#: src/gui/itemamountwindow.cpp:288
 msgid "Add to sell shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:298
+#: src/gui/itemamountwindow.cpp:292
 msgid "Unknown."
 msgstr ""
 
@@ -1540,7 +1540,7 @@ msgstr ""
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:58 src/gui/killstats.cpp:171
-#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:516
+#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:509
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
@@ -1548,7 +1548,7 @@ msgstr ""
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:61 src/gui/killstats.cpp:173
 #: src/gui/killstats.cpp:253 src/gui/killstats.cpp:268
-#: src/gui/killstats.cpp:518
+#: src/gui/killstats.cpp:511
 #, c-format
 msgid "Avg Exp: %s"
 msgstr ""
@@ -1556,14 +1556,14 @@ msgstr ""
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:63 src/gui/killstats.cpp:176
 #: src/gui/killstats.cpp:258 src/gui/killstats.cpp:272
-#: src/gui/killstats.cpp:521
+#: src/gui/killstats.cpp:514
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:66 src/gui/killstats.cpp:187
-#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:524
+#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:517
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
@@ -1591,9 +1591,9 @@ msgid "Last kill exp:"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:414
-#: src/gui/killstats.cpp:421 src/gui/killstats.cpp:428
-#: src/gui/killstats.cpp:434
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:408
+#: src/gui/killstats.cpp:415 src/gui/killstats.cpp:422
+#: src/gui/killstats.cpp:428
 msgid "Time before jacko spawn:"
 msgstr ""
 
@@ -1625,12 +1625,12 @@ msgid "  Time for next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:421
+#: src/gui/killstats.cpp:415
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:428
+#: src/gui/killstats.cpp:422
 msgid "jacko spawning"
 msgstr ""
 
@@ -1736,32 +1736,32 @@ msgid "arrows bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:88
+#: src/gui/ministatuswindow.cpp:89
 msgid "status bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:108
+#: src/gui/ministatuswindow.cpp:109
 msgid "job bar"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:306 src/gui/statuswindow.cpp:298
+#: src/gui/ministatuswindow.cpp:307 src/gui/statuswindow.cpp:298
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:313 src/gui/statuswindow.cpp:141
+#: src/gui/ministatuswindow.cpp:314 src/gui/statuswindow.cpp:141
 #: src/gui/statuswindow.cpp:305 src/gui/statuswindow.cpp:375
 #, c-format
 msgid "Level: %d"
 msgstr "Szint: %d"
 
 #. TRANSLATORS: status bar label
-#: src/gui/ministatuswindow.cpp:330 src/gui/ministatuswindow.cpp:367
+#: src/gui/ministatuswindow.cpp:331 src/gui/ministatuswindow.cpp:368
 msgid "Need"
 msgstr ""
 
@@ -2149,7 +2149,7 @@ msgstr ""
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2209 src/gui/popupmenu.cpp:2280
-#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:139
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
 #: src/gui/socialwindow.cpp:934
 msgid "(default)"
 msgstr ""
@@ -2332,7 +2332,7 @@ msgid "Passwords do not match."
 msgstr "A jelszavak nem egyeznek."
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:257
 msgid "Choose Your Server"
 msgstr ""
 
@@ -2340,61 +2340,61 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:259 src/gui/shopwindow.cpp:94
+#: src/gui/serverdialog.cpp:268 src/gui/shopwindow.cpp:94
 #: src/gui/shopwindow.cpp:101 src/gui/tradewindow.cpp:77
 msgid "Add"
 msgstr "Hozzáad"
 
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
-#: src/gui/serverdialog.cpp:261 src/gui/widgets/setupitem.cpp:299
+#: src/gui/serverdialog.cpp:270 src/gui/widgets/setupitem.cpp:299
 #: src/gui/widgets/setupitem.cpp:426
 msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:274
 msgid "Load"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:279
+#: src/gui/serverdialog.cpp:288
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:297
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:518
+#: src/gui/serverdialog.cpp:527
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:524
+#: src/gui/serverdialog.cpp:533
 msgid "Waiting for server..."
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:529
+#: src/gui/serverdialog.cpp:538
 msgid "Preparing download"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:534
+#: src/gui/serverdialog.cpp:543
 msgid "Error retreiving server list!"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:626
+#: src/gui/serverdialog.cpp:635
 msgid "requires a newer version"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:631
+#: src/gui/serverdialog.cpp:640
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -3405,7 +3405,7 @@ msgid "Type:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:334
+#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:336
 msgid "Delay:"
 msgstr ""
 
@@ -3425,30 +3425,30 @@ msgid "Blue:"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:420
+#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:422
 msgid "Static"
 msgstr "Statikus"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:107 src/gui/setup_colors.cpp:110
-#: src/gui/setup_colors.cpp:422
+#: src/gui/setup_colors.cpp:424
 msgid "Pulse"
 msgstr "Pulzáló"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:112 src/gui/setup_colors.cpp:115
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Rainbow"
 msgstr "Szivárvány"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:117 src/gui/setup_colors.cpp:120
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Spectrum"
 msgstr "Színkép"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:328
+#: src/gui/setup_colors.cpp:330
 msgid "Alpha:"
 msgstr ""
 
@@ -3614,7 +3614,7 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: palette color
-#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:134
+#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:135
 msgid "Monsters"
 msgstr "Szörny neve"
 
@@ -4163,206 +4163,231 @@ msgstr "Ha ignorolva van:"
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:86
-msgid "Very small (9)"
+msgid "Very small (8)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:88
-msgid "Tiny (10)"
+msgid "Very small (9)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:90
-msgid "Small (11)"
+msgid "Tiny (10)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:92
-msgid "Medium (12)"
+msgid "Small (11)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:94
-msgid "Normal (13)"
+msgid "Medium (12)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:96
-msgid "Large (14)"
+msgid "Normal (13)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:98
-msgid "Very large (15)"
+msgid "Large (14)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:100
-msgid "Big (16)"
+msgid "Large (15)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:102
-msgid "Very big (17)"
+msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:104
-msgid "Huge (18)"
+msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:106
-msgid "Very huge (19)"
+msgid "Big (18)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:108
+msgid "Big (19)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:110
+msgid "Very big (20)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:112
+msgid "Very big (21)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:114
+msgid "Very big (22)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:116
+msgid "Huge (23)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:151
 msgid "Chinese (China)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:153
 msgid "Czech"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:155
 msgid "English"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:157
 msgid "Finnish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:159
 msgid "French"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:161
 msgid "German"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:153
+#: src/gui/setup_theme.cpp:163
 msgid "Indonesian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:155
+#: src/gui/setup_theme.cpp:165
 msgid "Italian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:157
+#: src/gui/setup_theme.cpp:167
 msgid "Polish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:159
+#: src/gui/setup_theme.cpp:169
 msgid "Japanese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:161
+#: src/gui/setup_theme.cpp:171
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:163
+#: src/gui/setup_theme.cpp:173
 msgid "Portuguese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:165
+#: src/gui/setup_theme.cpp:175
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:167
+#: src/gui/setup_theme.cpp:177
 msgid "Russian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:169
+#: src/gui/setup_theme.cpp:179
 msgid "Spanish (Castilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:171
+#: src/gui/setup_theme.cpp:181
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:223
+#: src/gui/setup_theme.cpp:233
 msgid "Gui theme"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:230
+#: src/gui/setup_theme.cpp:240
 msgid "Main Font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:235
+#: src/gui/setup_theme.cpp:245
 msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:239
+#: src/gui/setup_theme.cpp:249
 msgid "Bold font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:243
+#: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:247
+#: src/gui/setup_theme.cpp:257
 msgid "Help font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:251
+#: src/gui/setup_theme.cpp:261
 msgid "Secure font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:255
+#: src/gui/setup_theme.cpp:265
 msgid "Japanese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:260
+#: src/gui/setup_theme.cpp:270
 msgid "Font size"
 msgstr "Betűméret"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:265
+#: src/gui/setup_theme.cpp:275
 msgid "Npc font size"
 msgstr ""
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/setup_theme.cpp:269
+#: src/gui/setup_theme.cpp:279
 msgid "i"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/setup_theme.cpp:442
+#: src/gui/setup_theme.cpp:452
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/setup_theme.cpp:467
+#: src/gui/setup_theme.cpp:477
 msgid "Theme Changed"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/setup_theme.cpp:467 src/gui/setup_video.cpp:537
+#: src/gui/setup_theme.cpp:477 src/gui/setup_video.cpp:537
 #: src/gui/setup_video.cpp:546
 msgid "Restart your client for the change to take effect."
 msgstr "A változások érvénybe lépéséhez a program újraindítása szükséges."
@@ -4660,7 +4685,8 @@ msgid "Ambient FX"
 msgstr "Környezeti effektek"
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_visual.cpp:140
+#. TRANSLATORS: palette color
+#: src/gui/setup_visual.cpp:140 src/gui/userpalette.cpp:146
 msgid "Particle effects"
 msgstr "Játékbéli effektek"
 
@@ -4747,45 +4773,45 @@ msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/skilldialog.cpp:270 src/gui/windowmenu.cpp:112
+#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:112
 msgid "Skills"
 msgstr "Képességek"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/skilldialog.cpp:279
+#: src/gui/skilldialog.cpp:281
 msgid "Up"
 msgstr "Fejleszt"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/skilldialog.cpp:391
+#: src/gui/skilldialog.cpp:393
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skills tab
-#: src/gui/skilldialog.cpp:444
+#: src/gui/skilldialog.cpp:446
 msgid "basic"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill name
-#: src/gui/skilldialog.cpp:447
+#: src/gui/skilldialog.cpp:449
 msgid "basic, 1"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/skilldialog.cpp:484
+#: src/gui/skilldialog.cpp:486
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/skilldialog.cpp:518
+#: src/gui/skilldialog.cpp:520
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/skilldialog.cpp:612 src/gui/skilldialog.cpp:762
+#: src/gui/skilldialog.cpp:614 src/gui/skilldialog.cpp:764
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -5228,7 +5254,7 @@ msgid "Trade: You"
 msgstr "Üzlet: Te"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:182
+#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:184
 #, c-format
 msgid "You get %s"
 msgstr ""
@@ -5244,12 +5270,12 @@ msgid "You give:"
 msgstr "Adott tárgyak:"
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:393
+#: src/gui/tradewindow.cpp:396
 msgid "You don't have enough money."
 msgstr "Nincs elég pénzed."
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:475
+#: src/gui/tradewindow.cpp:479
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "Hiba a tárgy hozzáadásakor. Nem tudod rárakni az egyik tárgyat a másikra."
@@ -5261,223 +5287,223 @@ msgid "Name: %s"
 msgstr "Név: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/updaterwindow.cpp:140
+#: src/gui/updaterwindow.cpp:156
 msgid "Updating..."
 msgstr "Frissítés…"
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:165
+#: src/gui/updaterwindow.cpp:181
 msgid "Connecting..."
 msgstr "Csatlakozás…"
 
 #. TRANSLATORS: update message
-#: src/gui/updaterwindow.cpp:656
+#: src/gui/updaterwindow.cpp:672
 msgid "##1  The update process is incomplete."
 msgstr "##1 A frissítési folyamat befejezetlen"
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/updaterwindow.cpp:658
+#: src/gui/updaterwindow.cpp:674
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Erősen ajánljuk, hogy"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:660
+#: src/gui/updaterwindow.cpp:676
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:839
+#: src/gui/updaterwindow.cpp:855
 msgid "Completed"
 msgstr "Kész"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
 msgid "Being"
 msgstr "Nevek"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:118
-msgid "Friend Names"
+#: src/gui/userpalette.cpp:119
+msgid "Friend names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:120
-msgid "Disregarded Names"
+#: src/gui/userpalette.cpp:121
+msgid "Disregarded names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:122
-msgid "Ignored Names"
+#: src/gui/userpalette.cpp:123
+msgid "Ignored names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:124
-msgid "Erased Names"
+#: src/gui/userpalette.cpp:125
+msgid "Erased names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:126
-msgid "Other Players' Names"
-msgstr "Ismeretlen játékos neve"
+#: src/gui/userpalette.cpp:127
+msgid "Other players names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:128
-msgid "Own Name"
-msgstr "Saját név"
+#: src/gui/userpalette.cpp:129
+msgid "Own name"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:130
-msgid "GM Names"
-msgstr "GM név"
+#: src/gui/userpalette.cpp:131
+msgid "GM names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
 msgid "NPCs"
 msgstr "Gépjátékos neve"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
 msgid "Monster HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:140
 msgid "Monster HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:141
-msgid "Party Members"
+#: src/gui/userpalette.cpp:142
+msgid "Party members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:143
-msgid "Guild Members"
+#: src/gui/userpalette.cpp:144
+msgid "Guild members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:145
-msgid "Particle Effects"
-msgstr "Effektek"
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:147
-msgid "Pickup Notification"
-msgstr "Tárgy felvételekor"
+#: src/gui/userpalette.cpp:148
+msgid "Pickup notification"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:149
-msgid "Exp Notification"
-msgstr "Tapasztalat szerzésekor"
+#: src/gui/userpalette.cpp:150
+msgid "Exp notification"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
 msgid "Player HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
 msgid "Player HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:157
-msgid "Player Hits Monster"
+#: src/gui/userpalette.cpp:158
+msgid "Player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:159
-msgid "Monster Hits Player"
+#: src/gui/userpalette.cpp:160
+msgid "Monster hits player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:163
-msgid "Other Player Hits Local Player"
+#: src/gui/userpalette.cpp:164
+msgid "Other player hits local player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:166
 msgid "Critical Hit"
 msgstr "Kritikális ütéskor"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
-msgid "Local Player Hits Monster"
+#: src/gui/userpalette.cpp:170
+msgid "Local player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:172
-msgid "Local Player Critical Hit"
+#: src/gui/userpalette.cpp:173
+msgid "Local player critical hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:175
-msgid "Local Player Miss"
+#: src/gui/userpalette.cpp:176
+msgid "Local player miss"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:177
+#: src/gui/userpalette.cpp:178
 msgid "Misses"
 msgstr "Ha nincs találat."
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
-msgid "Portal Highlight"
+#: src/gui/userpalette.cpp:180
+msgid "Portal highlight"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:183
+msgid "Default collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:182
-msgid "Default collision Highlight"
+#: src/gui/userpalette.cpp:186
+msgid "Air collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:185
-msgid "Air collision Highlight"
+#: src/gui/userpalette.cpp:189
+msgid "Water collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:188
-msgid "Water collision Highlight"
+#: src/gui/userpalette.cpp:192
+msgid "Special ground collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:191
-msgid "Special ground collision Highlight"
+#: src/gui/userpalette.cpp:195
+msgid "Walkable highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
-msgid "Walkable Highlight"
+#: src/gui/userpalette.cpp:198
+msgid "Local player attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:197
-msgid "Local Player Attack Range"
+#: src/gui/userpalette.cpp:201
+msgid "Local player attack range border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:200
-msgid "Local Player Attack Range Border"
+#: src/gui/userpalette.cpp:204
+msgid "Monster attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:203
-msgid "Monster Attack Range"
+#: src/gui/userpalette.cpp:208
+msgid "Floor item amount color"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:206
-msgid "Home Place"
+#: src/gui/userpalette.cpp:211
+msgid "Home place"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:209
-msgid "Home Place Border"
+#: src/gui/userpalette.cpp:214
+msgid "Home place border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:212
-msgid "Road Point"
+#: src/gui/userpalette.cpp:217
+msgid "Road point"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
@@ -5607,7 +5633,7 @@ msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:315
+#: src/gui/widgets/itemcontainer.cpp:317
 msgid "Eq."
 msgstr ""
 
diff --git a/po/id.po b/po/id.po
index 1f47889a4..154e90b49 100644
--- a/po/id.po
+++ b/po/id.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-05-03 12:38+0300\n"
-"PO-Revision-Date: 2013-05-03 09:44+0000\n"
+"POT-Creation-Date: 2013-05-11 12:13+0300\n"
+"PO-Revision-Date: 2013-05-10 15:39+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/manaplus/"
 "language/id/)\n"
@@ -62,25 +62,25 @@ msgstr "l"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: full button name
-#: src/client.cpp:1136 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
+#: src/client.cpp:1137 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
 msgid "Setup"
 msgstr "Pengaturan"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1140 src/gui/setup_perfomance.cpp:61
+#: src/client.cpp:1141 src/gui/setup_perfomance.cpp:61
 msgid "Perfomance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:1143 src/gui/setup_video.cpp:258
+#: src/client.cpp:1144 src/gui/setup_video.cpp:258
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1146 src/gui/setup_theme.cpp:273
+#: src/client.cpp:1147 src/gui/setup_theme.cpp:283
 msgid "Theme"
 msgstr "Tema"
 
@@ -91,7 +91,7 @@ msgstr "Tema"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1150 src/gui/didyouknowwindow.cpp:78
+#: src/client.cpp:1151 src/gui/didyouknowwindow.cpp:78
 #: src/gui/inventorywindow.cpp:228 src/gui/npcdialog.cpp:63
 #: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:574
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:80
@@ -99,32 +99,32 @@ msgid "Close"
 msgstr "Tutup"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1238
+#: src/client.cpp:1239
 msgid "Connecting to server"
 msgstr "Terhubung dengan server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1282
 msgid "Logging in"
 msgstr "Masuk"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1320
+#: src/client.cpp:1321
 msgid "Entering game world"
 msgstr "Memasuki arena permainan"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1431
+#: src/client.cpp:1432
 msgid "Requesting characters"
 msgstr "Pemilihan karakter"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1471
 msgid "Connecting to the game server"
 msgstr "terhubung dengan server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1483
+#: src/client.cpp:1484
 msgid "Changing game servers"
 msgstr "Pergantian server"
 
@@ -139,69 +139,69 @@ msgstr "Pergantian server"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1540 src/client.cpp:1551 src/client.cpp:1721
+#: src/client.cpp:1541 src/client.cpp:1552 src/client.cpp:1722
 #: src/gui/changeemaildialog.cpp:168 src/gui/changepassworddialog.cpp:158
-#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:288
-#: src/gui/editserverdialog.cpp:220 src/gui/registerdialog.cpp:263
+#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:290
+#: src/gui/editserverdialog.cpp:216 src/gui/registerdialog.cpp:263
 #: src/gui/unregisterdialog.cpp:143 src/net/ea/charserverhandler.cpp:190
 #: src/net/ea/charserverhandler.cpp:210
 msgid "Error"
 msgstr "Kesalahan"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1564
+#: src/client.cpp:1565
 msgid "Requesting registration details"
 msgstr "Meminta detail registrasi"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1601
+#: src/client.cpp:1602
 msgid "Password Change"
 msgstr "Ubah sandi"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1603
+#: src/client.cpp:1604
 msgid "Password changed successfully!"
 msgstr "Perubahan sandi berhasil"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1624
+#: src/client.cpp:1625
 msgid "Email Change"
 msgstr "Perubahan email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1626
+#: src/client.cpp:1627
 msgid "Email changed successfully!"
 msgstr "Perubahan email berhasil"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1647
+#: src/client.cpp:1648
 msgid "Unregister Successful"
 msgstr "Telah tidak terdaftar"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1649
+#: src/client.cpp:1650
 msgid "Farewell, come back any time..."
 msgstr "Selamat tinggal, datang kembali setiap saat"
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1902 src/client.cpp:1917 src/client.cpp:1960
-#: src/client.cpp:1976 src/client.cpp:2417 src/client.cpp:2425
+#: src/client.cpp:1903 src/client.cpp:1918 src/client.cpp:1961
+#: src/client.cpp:1977 src/client.cpp:2418 src/client.cpp:2426
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s tidak ada dan tidak dapat dibuat!keluar."
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2113
+#: src/client.cpp:2114
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Gagal mengupdate host: %s"
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2154 src/client.cpp:2161
+#: src/client.cpp:2155 src/client.cpp:2162
 msgid "Error creating updates directory!"
 msgstr "Gagal membuat direktori update!"
 
-#: src/client.cpp:2183 src/client.cpp:2196
+#: src/client.cpp:2184 src/client.cpp:2197
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "kesalahan %s tidak ada dan tidak dapat dibuat!keluar."
@@ -484,19 +484,19 @@ msgid "Comment: %s"
 msgstr "Komentar: %s"
 
 #. TRANSLATORS: bot checker window header
-#: src/gui/botcheckerwindow.cpp:269
+#: src/gui/botcheckerwindow.cpp:268
 msgid "Bot Checker"
 msgstr "Pengecek Bot"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:102
+#: src/gui/botcheckerwindow.cpp:277 src/gui/npcdialog.cpp:102
 msgid "Reset"
 msgstr "Reset"
 
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: relations table header
-#: src/gui/botcheckerwindow.cpp:305 src/gui/setup_relations.cpp:61
+#: src/gui/botcheckerwindow.cpp:304 src/gui/setup_relations.cpp:61
 msgid "Name"
 msgstr "Nama"
 
@@ -504,7 +504,7 @@ msgstr "Nama"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:145
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:145
 #: src/gui/popupmenu.cpp:241 src/gui/popupmenu.cpp:640
 #: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:257
 #: src/net/tmwa/generalhandler.cpp:292
@@ -514,7 +514,7 @@ msgstr "Pukul"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
-#: src/gui/botcheckerwindow.cpp:309 src/gui/popupmenu.cpp:225
+#: src/gui/botcheckerwindow.cpp:308 src/gui/popupmenu.cpp:225
 #: src/gui/setupactiondata.h:93
 msgid "Talk"
 msgstr "Berbicara"
@@ -522,7 +522,7 @@ msgstr "Berbicara"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/botcheckerwindow.cpp:311 src/gui/popupmenu.cpp:215
+#: src/gui/botcheckerwindow.cpp:310 src/gui/popupmenu.cpp:215
 #: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:371
 #: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:653
 #: src/gui/popupmenu.cpp:727 src/gui/setupactiondata.h:1856
@@ -530,7 +530,7 @@ msgid "Move"
 msgstr "Jalan"
 
 #. TRANSLATORS: bot checker window table header
-#: src/gui/botcheckerwindow.cpp:313
+#: src/gui/botcheckerwindow.cpp:312
 msgid "Result"
 msgstr "Hasil"
 
@@ -586,7 +586,7 @@ msgstr "Beli"
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:516
+#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:511
 #: src/gui/selldialog.cpp:94 src/gui/selldialog.cpp:342
 #, c-format
 msgid "Price: %s / Total: %s"
@@ -603,9 +603,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:208
-#: src/gui/itemamountwindow.cpp:243 src/gui/npcdialog.cpp:93
-#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:833
+#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:202
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:93
+#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:821
 msgid "+"
 msgstr "+"
 
@@ -615,9 +615,9 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:240 src/gui/npcdialog.cpp:95
-#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:846
+#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:200
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:95
+#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:834
 msgid "-"
 msgstr "-"
 
@@ -629,7 +629,7 @@ msgstr "-"
 #. TRANSLATORS: input action name
 #: src/gui/buydialog.cpp:260 src/gui/quitdialog.cpp:54
 #: src/gui/quitdialog.cpp:59 src/gui/quitdialog.cpp:61
-#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:255
+#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:264
 #: src/gui/setupactiondata.h:177
 msgid "Quit"
 msgstr "Keluar"
@@ -641,7 +641,7 @@ msgstr "Keluar"
 #. TRANSLATORS: status bar label
 #: src/gui/buydialog.cpp:262 src/gui/selldialog.cpp:106
 #: src/gui/statuswindow.cpp:558 src/gui/statuswindow.cpp:615
-#: src/gui/statuswindow.cpp:830 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:852
 msgid "Max"
 msgstr "Max"
 
@@ -686,7 +686,7 @@ msgstr "Jual"
 #: src/gui/buyselldialog.cpp:71 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:120
 #: src/gui/connectiondialog.cpp:48 src/gui/editserverdialog.cpp:80
-#: src/gui/itemamountwindow.cpp:212 src/gui/npcpostdialog.cpp:64
+#: src/gui/itemamountwindow.cpp:206 src/gui/npcpostdialog.cpp:64
 #: src/gui/popupmenu.cpp:290 src/gui/popupmenu.cpp:324
 #: src/gui/popupmenu.cpp:411 src/gui/popupmenu.cpp:454
 #: src/gui/popupmenu.cpp:485 src/gui/popupmenu.cpp:512
@@ -702,7 +702,7 @@ msgstr "Jual"
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
 #: src/gui/setup.cpp:84 src/gui/socialwindow.cpp:1204
 #: src/gui/textcommandeditor.cpp:212 src/gui/textdialog.cpp:53
-#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:167
+#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:183
 msgid "Cancel"
 msgstr "Batal"
 
@@ -866,7 +866,7 @@ msgstr "Tolong distribusikan %d point"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:570
+#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:581
 #: src/gui/socialwindow.cpp:1269
 msgid "Create"
 msgstr "Buat"
@@ -893,17 +893,17 @@ msgid "Please remove %d points"
 msgstr "Tolong hilangkan %d poin"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:60
+#: src/gui/charselectdialog.cpp:61
 msgid "Confirm Character Delete"
 msgstr "Konfirmasi penghapusan karakter"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:62
+#: src/gui/charselectdialog.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "Apakah anda bersungguh-sungguh ingin menghapus karakter ini?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:86
+#: src/gui/charselectdialog.cpp:87
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
@@ -915,8 +915,8 @@ msgstr "Ubah Login"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:565
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:576
+#: src/gui/updaterwindow.cpp:185
 msgid "Play"
 msgstr "Main"
 
@@ -932,7 +932,7 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:263
+#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:272
 #: src/gui/setupactiondata.h:1803 src/gui/setup_relations.cpp:262
 #: src/gui/shopwindow.cpp:96 src/gui/shopwindow.cpp:103
 #: src/gui/textcommandeditor.cpp:216
@@ -942,24 +942,24 @@ msgstr "Hapus"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/charselectdialog.cpp:129 src/gui/unregisterdialog.cpp:48
+#: src/gui/charselectdialog.cpp:130 src/gui/unregisterdialog.cpp:48
 #: src/gui/unregisterdialog.cpp:53
 msgid "Unregister"
 msgstr "Tidak jadi mendaftar"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/charselectdialog.cpp:141
+#: src/gui/charselectdialog.cpp:142
 msgid "Change Email"
 msgstr "Ganti email"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:172
+#: src/gui/charselectdialog.cpp:175
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/charselectdialog.cpp:246
+#: src/gui/charselectdialog.cpp:248
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -969,16 +969,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:288
+#: src/gui/charselectdialog.cpp:290
 msgid "Incorrect password"
 msgstr "Sandi tidak benar"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password for deleting character"
 msgstr "Masukan Sandi untuk menghapus karakter"
 
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password:"
 msgstr "Masukkan sandi"
 
@@ -1065,13 +1065,13 @@ msgid "Chat"
 msgstr "Obrolan"
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:735
+#: src/gui/chatwindow.cpp:638
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Kehadiran: %s; %d pemain yang hadir."
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1165
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Berbisik ke %s: %s"
@@ -1089,7 +1089,7 @@ msgstr "Tidak"
 
 #. TRANSLATORS: confirm dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/confirmdialog.cpp:58 src/gui/popupmenu.cpp:2429
+#: src/gui/confirmdialog.cpp:55 src/gui/popupmenu.cpp:2429
 #: src/gui/popupmenu.cpp:2442 src/gui/popupmenu.cpp:2457
 #: src/gui/popupmenu.cpp:2483
 msgid "Ignore"
@@ -1098,7 +1098,7 @@ msgstr "Abaikan"
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
 #. TRANSLATORS: settings group
-#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:109
+#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:108
 #: src/gui/setup_other.cpp:123 src/gui/windowmenu.cpp:106
 msgid "Map"
 msgstr "Peta"
@@ -1114,190 +1114,190 @@ msgid "Net"
 msgstr "Jaring"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:265
-#: src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:268
+#: src/gui/debugwindow.cpp:311
 msgid "Music:"
 msgstr "Musik"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:153 src/gui/debugwindow.cpp:271
-#: src/gui/debugwindow.cpp:312
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:274
+#: src/gui/debugwindow.cpp:315
 msgid "Map:"
 msgstr "Peta"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:155 src/gui/debugwindow.cpp:268
-#: src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:271
+#: src/gui/debugwindow.cpp:313
 msgid "Minimap:"
 msgstr "Peta mini"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:262
-#: src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:161 src/gui/debugwindow.cpp:265
+#: src/gui/debugwindow.cpp:309
 msgid "Cursor:"
 msgstr "Kursor"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:161
+#: src/gui/debugwindow.cpp:164
 msgid "Particle count:"
 msgstr "Hitung partikel:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:284
-#: src/gui/debugwindow.cpp:316
+#: src/gui/debugwindow.cpp:167 src/gui/debugwindow.cpp:287
+#: src/gui/debugwindow.cpp:319
 msgid "Map actors count:"
 msgstr "Hitung pemain di peta:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:166 src/gui/debugwindow.cpp:243
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:169 src/gui/debugwindow.cpp:246
+#: src/gui/debugwindow.cpp:252
 msgid "Player Position:"
 msgstr "Posisi Pemain"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:172 src/gui/debugwindow.cpp:297
+#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:300
 msgid "Draw calls:"
 msgstr ""
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:175
+#. TRANSLATORS: debug window label, frames per second
+#: src/gui/debugwindow.cpp:178
 #, c-format
 msgid "%d FPS"
 msgstr "%d FPS"
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:177 src/gui/debugwindow.cpp:324
+#. TRANSLATORS: debug window label, logic per second
+#: src/gui/debugwindow.cpp:180 src/gui/debugwindow.cpp:327
 #, c-format
 msgid "%d LPS"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:191 src/gui/debugwindow.cpp:209
 #, c-format
 msgid "%d FPS (Software)"
 msgstr "%d FPS (Perangkat lunak)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:193
+#: src/gui/debugwindow.cpp:196
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr "%d FPS (fast OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:197
+#: src/gui/debugwindow.cpp:200
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr "%d FPS (old OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:201
+#: src/gui/debugwindow.cpp:204
 #, c-format
 msgid "%d FPS (mobile OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:225 src/gui/debugwindow.cpp:290
+#: src/gui/debugwindow.cpp:228 src/gui/debugwindow.cpp:293
 msgid "Textures count:"
 msgstr "Penghitungan tekstur:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:279
+#: src/gui/debugwindow.cpp:282
 #, c-format
 msgid "Particle count: %d"
 msgstr "Hitung partikel: %d"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:330 src/gui/debugwindow.cpp:380
-#: src/gui/debugwindow.cpp:442
+#: src/gui/debugwindow.cpp:333 src/gui/debugwindow.cpp:383
+#: src/gui/debugwindow.cpp:445
 msgid "Target:"
 msgstr "Target"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:332 src/gui/debugwindow.cpp:386
-#: src/gui/debugwindow.cpp:444
+#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
+#: src/gui/debugwindow.cpp:447
 msgid "Target Id:"
 msgstr "Id target:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
-#: src/gui/debugwindow.cpp:446
+#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:392
+#: src/gui/debugwindow.cpp:449
 msgid "Target type:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:337
+#: src/gui/debugwindow.cpp:340
 msgid "Target level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:339 src/gui/debugwindow.cpp:405
+#: src/gui/debugwindow.cpp:342 src/gui/debugwindow.cpp:408
 msgid "Target race:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:341
+#: src/gui/debugwindow.cpp:344
 msgid "Target party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:346
 msgid "Target guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:430
-#: src/gui/debugwindow.cpp:436 src/gui/debugwindow.cpp:454
+#: src/gui/debugwindow.cpp:348 src/gui/debugwindow.cpp:433
+#: src/gui/debugwindow.cpp:439 src/gui/debugwindow.cpp:457
 msgid "Attack delay:"
 msgstr "Kecepatan menyerang:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:347 src/gui/debugwindow.cpp:417
-#: src/gui/debugwindow.cpp:456
+#: src/gui/debugwindow.cpp:350 src/gui/debugwindow.cpp:420
+#: src/gui/debugwindow.cpp:459
 msgid "Minimal hit:"
 msgstr "Pukulan minimal:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:349 src/gui/debugwindow.cpp:420
-#: src/gui/debugwindow.cpp:458
+#: src/gui/debugwindow.cpp:352 src/gui/debugwindow.cpp:423
+#: src/gui/debugwindow.cpp:461
 msgid "Maximum hit:"
 msgstr "Pukulan maksimal:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:351 src/gui/debugwindow.cpp:423
-#: src/gui/debugwindow.cpp:460
+#: src/gui/debugwindow.cpp:354 src/gui/debugwindow.cpp:426
+#: src/gui/debugwindow.cpp:463
 msgid "Critical hit:"
 msgstr "Pukulan kritis:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:394 src/gui/debugwindow.cpp:400
-#: src/gui/debugwindow.cpp:448
+#: src/gui/debugwindow.cpp:397 src/gui/debugwindow.cpp:403
+#: src/gui/debugwindow.cpp:451
 msgid "Target Level:"
 msgstr "Target Level"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:408 src/gui/debugwindow.cpp:450
+#: src/gui/debugwindow.cpp:411 src/gui/debugwindow.cpp:453
 msgid "Target Party:"
 msgstr "Target Kelompok:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:412 src/gui/debugwindow.cpp:452
+#: src/gui/debugwindow.cpp:415 src/gui/debugwindow.cpp:455
 msgid "Target Guild:"
 msgstr "Target Organisasi:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:493
+#: src/gui/debugwindow.cpp:496
 #, c-format
 msgid "Ping: %s ms"
 msgstr "Ping: %s ms"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:496
+#: src/gui/debugwindow.cpp:499
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "Masuk: %d bytes/det"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:499
+#: src/gui/debugwindow.cpp:502
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "Keluar: %d bytes/det"
@@ -1329,7 +1329,7 @@ msgstr "Buka jendela otomatis"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #: src/gui/editdialog.cpp:45 src/gui/editserverdialog.cpp:78
-#: src/gui/itemamountwindow.cpp:210 src/gui/okdialog.cpp:51
+#: src/gui/itemamountwindow.cpp:204 src/gui/okdialog.cpp:51
 #: src/gui/quitdialog.cpp:70 src/gui/textdialog.cpp:46
 msgid "OK"
 msgstr "OK"
@@ -1341,7 +1341,7 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:257
+#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:266
 msgid "Connect"
 msgstr "Menyambung"
 
@@ -1371,7 +1371,7 @@ msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/editserverdialog.cpp:222
+#: src/gui/editserverdialog.cpp:218
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -1423,7 +1423,7 @@ msgstr "Pakai"
 #: src/gui/inventorywindow.cpp:178 src/gui/inventorywindow.cpp:630
 #: src/gui/popupmenu.cpp:1843 src/gui/popupmenu.cpp:1922
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2041
-#: src/gui/skilldialog.cpp:277
+#: src/gui/skilldialog.cpp:279
 msgid "Use"
 msgstr "Gunakan"
 
@@ -1457,7 +1457,7 @@ msgstr "Setelan"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: setup button
-#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:718
+#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:719
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1992
 #: src/gui/popupmenu.cpp:2066 src/gui/setup.cpp:86
 msgid "Store"
@@ -1479,47 +1479,47 @@ msgid "Drop"
 msgstr "Buang"
 
 #. TRANSLATORS: item amount window button
-#: src/gui/itemamountwindow.cpp:214
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "Semua"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:264
 msgid "Select amount of items to trade."
 msgstr "Pilih jumlah item yang mau di perdagangkan"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:274
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to drop."
 msgstr "Pilih jumlah item yang ingin dibuang"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:278
+#: src/gui/itemamountwindow.cpp:272
 msgid "Select amount of items to store."
 msgstr "Pilih jumlah item yang ingin disimpan"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:276
 msgid "Select amount of items to retrieve."
 msgstr "Pilih jumlah item yang ingin diambil kembali"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:286
+#: src/gui/itemamountwindow.cpp:280
 msgid "Select amount of items to split."
 msgstr "Pilih jumlah item yang ingin dipisahkan"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:290
+#: src/gui/itemamountwindow.cpp:284
 msgid "Add to buy shop."
 msgstr "Tambahkan ke daftar beli"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:294
+#: src/gui/itemamountwindow.cpp:288
 msgid "Add to sell shop."
 msgstr "Tambahkan ke daftar jual"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:298
+#: src/gui/itemamountwindow.cpp:292
 msgid "Unknown."
 msgstr "Tidak diketahui"
 
@@ -1546,7 +1546,7 @@ msgstr "Atur ulang penghitung waktu"
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:58 src/gui/killstats.cpp:171
-#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:516
+#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:509
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr "Membunuh: %s, exp total: %s"
@@ -1554,7 +1554,7 @@ msgstr "Membunuh: %s, exp total: %s"
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:61 src/gui/killstats.cpp:173
 #: src/gui/killstats.cpp:253 src/gui/killstats.cpp:268
-#: src/gui/killstats.cpp:518
+#: src/gui/killstats.cpp:511
 #, c-format
 msgid "Avg Exp: %s"
 msgstr ""
@@ -1562,14 +1562,14 @@ msgstr ""
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:63 src/gui/killstats.cpp:176
 #: src/gui/killstats.cpp:258 src/gui/killstats.cpp:272
-#: src/gui/killstats.cpp:521
+#: src/gui/killstats.cpp:514
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:66 src/gui/killstats.cpp:187
-#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:524
+#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:517
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr "Membunuh/menit: %s, Exp/menit: %s"
@@ -1595,9 +1595,9 @@ msgid "Last kill exp:"
 msgstr "Exp terakhir"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:414
-#: src/gui/killstats.cpp:421 src/gui/killstats.cpp:428
-#: src/gui/killstats.cpp:434
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:408
+#: src/gui/killstats.cpp:415 src/gui/killstats.cpp:422
+#: src/gui/killstats.cpp:428
 msgid "Time before jacko spawn:"
 msgstr "waktu sebelum Jacko kembali"
 
@@ -1629,12 +1629,12 @@ msgid "  Time for next level: %s"
 msgstr "waktu untuk ke level selanjutnya: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:421
+#: src/gui/killstats.cpp:415
 #, c-format
 msgid "%s %d?"
 msgstr "%s %d?"
 
-#: src/gui/killstats.cpp:428
+#: src/gui/killstats.cpp:422
 msgid "jacko spawning"
 msgstr "Jacko bertelur"
 
@@ -1740,32 +1740,32 @@ msgid "arrows bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:88
+#: src/gui/ministatuswindow.cpp:89
 msgid "status bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:108
+#: src/gui/ministatuswindow.cpp:109
 msgid "job bar"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:306 src/gui/statuswindow.cpp:298
+#: src/gui/ministatuswindow.cpp:307 src/gui/statuswindow.cpp:298
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:313 src/gui/statuswindow.cpp:141
+#: src/gui/ministatuswindow.cpp:314 src/gui/statuswindow.cpp:141
 #: src/gui/statuswindow.cpp:305 src/gui/statuswindow.cpp:375
 #, c-format
 msgid "Level: %d"
 msgstr "Tingkatan: %d"
 
 #. TRANSLATORS: status bar label
-#: src/gui/ministatuswindow.cpp:330 src/gui/ministatuswindow.cpp:367
+#: src/gui/ministatuswindow.cpp:331 src/gui/ministatuswindow.cpp:368
 msgid "Need"
 msgstr "Butuh"
 
@@ -2153,7 +2153,7 @@ msgstr "Pindahkan ke chat"
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2209 src/gui/popupmenu.cpp:2280
-#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:139
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
 #: src/gui/socialwindow.cpp:934
 msgid "(default)"
 msgstr "(kembalikan)"
@@ -2336,7 +2336,7 @@ msgid "Passwords do not match."
 msgstr "Kata sandi cocok."
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:257
 msgid "Choose Your Server"
 msgstr "Pilih Server Anda"
 
@@ -2344,61 +2344,61 @@ msgstr "Pilih Server Anda"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:259 src/gui/shopwindow.cpp:94
+#: src/gui/serverdialog.cpp:268 src/gui/shopwindow.cpp:94
 #: src/gui/shopwindow.cpp:101 src/gui/tradewindow.cpp:77
 msgid "Add"
 msgstr "Tambah"
 
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
-#: src/gui/serverdialog.cpp:261 src/gui/widgets/setupitem.cpp:299
+#: src/gui/serverdialog.cpp:270 src/gui/widgets/setupitem.cpp:299
 #: src/gui/widgets/setupitem.cpp:426
 msgid "Edit"
 msgstr "Ganti"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:274
 msgid "Load"
 msgstr "Memuat"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:279
+#: src/gui/serverdialog.cpp:288
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Pilih Servermu *** SAFE MODE ***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:297
 msgid "Use same ip for game sub servers"
 msgstr "Gunakan ip yang sama untuk sub server game"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:518
+#: src/gui/serverdialog.cpp:527
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Mengunduh daftar server... %2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:524
+#: src/gui/serverdialog.cpp:533
 msgid "Waiting for server..."
 msgstr "Menyambung ke server..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:529
+#: src/gui/serverdialog.cpp:538
 msgid "Preparing download"
 msgstr "Menyiapkan pengunduhan"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:534
+#: src/gui/serverdialog.cpp:543
 msgid "Error retreiving server list!"
 msgstr "Gagal mengunduh data server!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:626
+#: src/gui/serverdialog.cpp:635
 msgid "requires a newer version"
 msgstr "Membutuhkan versi terbaru"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:631
+#: src/gui/serverdialog.cpp:640
 #, c-format
 msgid "requires v%s"
 msgstr "Membutuhkan v%s"
@@ -3409,7 +3409,7 @@ msgid "Type:"
 msgstr "Tipe"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:334
+#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:336
 msgid "Delay:"
 msgstr "Tunda:"
 
@@ -3429,30 +3429,30 @@ msgid "Blue:"
 msgstr "Biru:"
 
 #. TRANSLATORS: color type
-#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:420
+#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:422
 msgid "Static"
 msgstr "Statis"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:107 src/gui/setup_colors.cpp:110
-#: src/gui/setup_colors.cpp:422
+#: src/gui/setup_colors.cpp:424
 msgid "Pulse"
 msgstr "Getar"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:112 src/gui/setup_colors.cpp:115
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Rainbow"
 msgstr "Pelangi"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:117 src/gui/setup_colors.cpp:120
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Spectrum"
 msgstr "Spektrum"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:328
+#: src/gui/setup_colors.cpp:330
 msgid "Alpha:"
 msgstr "Alpha:"
 
@@ -3618,7 +3618,7 @@ msgstr "macam-macam"
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: palette color
-#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:134
+#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:135
 msgid "Monsters"
 msgstr ""
 
@@ -4167,206 +4167,231 @@ msgstr "Ketika menolak:"
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:86
-msgid "Very small (9)"
+msgid "Very small (8)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:88
+msgid "Very small (9)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:90
 msgid "Tiny (10)"
 msgstr "Sangat kecil (10)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:90
+#: src/gui/setup_theme.cpp:92
 msgid "Small (11)"
 msgstr "Kecil (11)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:92
+#: src/gui/setup_theme.cpp:94
 msgid "Medium (12)"
 msgstr "Sedang (12)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:94
-msgid "Normal (13)"
-msgstr ""
-
-#. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:96
-msgid "Large (14)"
+msgid "Normal (13)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:98
-msgid "Very large (15)"
+msgid "Large (14)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:100
-msgid "Big (16)"
+msgid "Large (15)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:102
-msgid "Very big (17)"
+msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:104
-msgid "Huge (18)"
+msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:106
-msgid "Very huge (19)"
+msgid "Big (18)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:108
+msgid "Big (19)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:110
+msgid "Very big (20)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:112
+msgid "Very big (21)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:114
+msgid "Very big (22)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:116
+msgid "Huge (23)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:151
 msgid "Chinese (China)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:153
 msgid "Czech"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:155
 msgid "English"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:157
 msgid "Finnish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:159
 msgid "French"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:161
 msgid "German"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:153
+#: src/gui/setup_theme.cpp:163
 msgid "Indonesian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:155
+#: src/gui/setup_theme.cpp:165
 msgid "Italian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:157
+#: src/gui/setup_theme.cpp:167
 msgid "Polish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:159
+#: src/gui/setup_theme.cpp:169
 msgid "Japanese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:161
+#: src/gui/setup_theme.cpp:171
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:163
+#: src/gui/setup_theme.cpp:173
 msgid "Portuguese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:165
+#: src/gui/setup_theme.cpp:175
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:167
+#: src/gui/setup_theme.cpp:177
 msgid "Russian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:169
+#: src/gui/setup_theme.cpp:179
 msgid "Spanish (Castilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:171
+#: src/gui/setup_theme.cpp:181
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:223
+#: src/gui/setup_theme.cpp:233
 msgid "Gui theme"
 msgstr "Tema Gui"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:230
+#: src/gui/setup_theme.cpp:240
 msgid "Main Font"
 msgstr "Jenis huruf utama"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:235
+#: src/gui/setup_theme.cpp:245
 msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:239
+#: src/gui/setup_theme.cpp:249
 msgid "Bold font"
 msgstr "Jenis huruf tebal"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:243
+#: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:247
+#: src/gui/setup_theme.cpp:257
 msgid "Help font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:251
+#: src/gui/setup_theme.cpp:261
 msgid "Secure font"
 msgstr "Jenis huruf/Karakter yang diperbolehkan"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:255
+#: src/gui/setup_theme.cpp:265
 msgid "Japanese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:260
+#: src/gui/setup_theme.cpp:270
 msgid "Font size"
 msgstr "Ukuran huruf"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:265
+#: src/gui/setup_theme.cpp:275
 msgid "Npc font size"
 msgstr ""
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/setup_theme.cpp:269
+#: src/gui/setup_theme.cpp:279
 msgid "i"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/setup_theme.cpp:442
+#: src/gui/setup_theme.cpp:452
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/setup_theme.cpp:467
+#: src/gui/setup_theme.cpp:477
 msgid "Theme Changed"
 msgstr "Tema diganti"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/setup_theme.cpp:467 src/gui/setup_video.cpp:537
+#: src/gui/setup_theme.cpp:477 src/gui/setup_video.cpp:537
 #: src/gui/setup_video.cpp:546
 msgid "Restart your client for the change to take effect."
 msgstr "Restart client anda untuk memberikan efek."
@@ -4664,7 +4689,8 @@ msgid "Ambient FX"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_visual.cpp:140
+#. TRANSLATORS: palette color
+#: src/gui/setup_visual.cpp:140 src/gui/userpalette.cpp:146
 msgid "Particle effects"
 msgstr "Efek partikel"
 
@@ -4751,45 +4777,45 @@ msgid "%s wants to %s %s do you accept?"
 msgstr "%s ingin %s %s apakah anda bersedia?"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/skilldialog.cpp:270 src/gui/windowmenu.cpp:112
+#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:112
 msgid "Skills"
 msgstr "Keahlian"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/skilldialog.cpp:279
+#: src/gui/skilldialog.cpp:281
 msgid "Up"
 msgstr "Naik"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/skilldialog.cpp:391
+#: src/gui/skilldialog.cpp:393
 #, c-format
 msgid "Skill points available: %d"
 msgstr "poin Skill yang tersedia: %d"
 
 #. TRANSLATORS: skills dialog default skills tab
-#: src/gui/skilldialog.cpp:444
+#: src/gui/skilldialog.cpp:446
 msgid "basic"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill name
-#: src/gui/skilldialog.cpp:447
+#: src/gui/skilldialog.cpp:449
 msgid "basic, 1"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/skilldialog.cpp:484
+#: src/gui/skilldialog.cpp:486
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/skilldialog.cpp:518
+#: src/gui/skilldialog.cpp:520
 #, c-format
 msgid "Skill %d"
 msgstr "Skill %d"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/skilldialog.cpp:612 src/gui/skilldialog.cpp:762
+#: src/gui/skilldialog.cpp:614 src/gui/skilldialog.cpp:764
 #, c-format
 msgid "Lvl: %d"
 msgstr "Level: %d"
@@ -5232,7 +5258,7 @@ msgid "Trade: You"
 msgstr "Tukar: Anda"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:182
+#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:184
 #, c-format
 msgid "You get %s"
 msgstr "Kamu mendapatkan %s"
@@ -5248,12 +5274,12 @@ msgid "You give:"
 msgstr "Anda memberikan:"
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:393
+#: src/gui/tradewindow.cpp:396
 msgid "You don't have enough money."
 msgstr "Anda tidak memiliki cukup uang."
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:475
+#: src/gui/tradewindow.cpp:479
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
@@ -5264,223 +5290,223 @@ msgid "Name: %s"
 msgstr "Nama: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/updaterwindow.cpp:140
+#: src/gui/updaterwindow.cpp:156
 msgid "Updating..."
 msgstr "Mengupdate..."
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:165
+#: src/gui/updaterwindow.cpp:181
 msgid "Connecting..."
 msgstr "Menyambung..."
 
 #. TRANSLATORS: update message
-#: src/gui/updaterwindow.cpp:656
+#: src/gui/updaterwindow.cpp:672
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/updaterwindow.cpp:658
+#: src/gui/updaterwindow.cpp:674
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:660
+#: src/gui/updaterwindow.cpp:676
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:839
+#: src/gui/updaterwindow.cpp:855
 msgid "Completed"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
 msgid "Being"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:118
-msgid "Friend Names"
+#: src/gui/userpalette.cpp:119
+msgid "Friend names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:120
-msgid "Disregarded Names"
+#: src/gui/userpalette.cpp:121
+msgid "Disregarded names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:122
-msgid "Ignored Names"
+#: src/gui/userpalette.cpp:123
+msgid "Ignored names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:124
-msgid "Erased Names"
+#: src/gui/userpalette.cpp:125
+msgid "Erased names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:126
-msgid "Other Players' Names"
+#: src/gui/userpalette.cpp:127
+msgid "Other players names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:128
-msgid "Own Name"
+#: src/gui/userpalette.cpp:129
+msgid "Own name"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:130
-msgid "GM Names"
+#: src/gui/userpalette.cpp:131
+msgid "GM names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
 msgid "NPCs"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
 msgid "Monster HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:140
 msgid "Monster HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:141
-msgid "Party Members"
-msgstr ""
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:143
-msgid "Guild Members"
+#: src/gui/userpalette.cpp:142
+msgid "Party members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:145
-msgid "Particle Effects"
+#: src/gui/userpalette.cpp:144
+msgid "Guild members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:147
-msgid "Pickup Notification"
+#: src/gui/userpalette.cpp:148
+msgid "Pickup notification"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:149
-msgid "Exp Notification"
+#: src/gui/userpalette.cpp:150
+msgid "Exp notification"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
 msgid "Player HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
 msgid "Player HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:157
-msgid "Player Hits Monster"
+#: src/gui/userpalette.cpp:158
+msgid "Player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:159
-msgid "Monster Hits Player"
+#: src/gui/userpalette.cpp:160
+msgid "Monster hits player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:163
-msgid "Other Player Hits Local Player"
+#: src/gui/userpalette.cpp:164
+msgid "Other player hits local player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:166
 msgid "Critical Hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
-msgid "Local Player Hits Monster"
+#: src/gui/userpalette.cpp:170
+msgid "Local player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:172
-msgid "Local Player Critical Hit"
+#: src/gui/userpalette.cpp:173
+msgid "Local player critical hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:175
-msgid "Local Player Miss"
+#: src/gui/userpalette.cpp:176
+msgid "Local player miss"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:177
+#: src/gui/userpalette.cpp:178
 msgid "Misses"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
-msgid "Portal Highlight"
+#: src/gui/userpalette.cpp:180
+msgid "Portal highlight"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:183
+msgid "Default collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:182
-msgid "Default collision Highlight"
+#: src/gui/userpalette.cpp:186
+msgid "Air collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:185
-msgid "Air collision Highlight"
+#: src/gui/userpalette.cpp:189
+msgid "Water collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:188
-msgid "Water collision Highlight"
+#: src/gui/userpalette.cpp:192
+msgid "Special ground collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:191
-msgid "Special ground collision Highlight"
+#: src/gui/userpalette.cpp:195
+msgid "Walkable highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
-msgid "Walkable Highlight"
+#: src/gui/userpalette.cpp:198
+msgid "Local player attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:197
-msgid "Local Player Attack Range"
+#: src/gui/userpalette.cpp:201
+msgid "Local player attack range border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:200
-msgid "Local Player Attack Range Border"
+#: src/gui/userpalette.cpp:204
+msgid "Monster attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:203
-msgid "Monster Attack Range"
+#: src/gui/userpalette.cpp:208
+msgid "Floor item amount color"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:206
-msgid "Home Place"
+#: src/gui/userpalette.cpp:211
+msgid "Home place"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:209
-msgid "Home Place Border"
+#: src/gui/userpalette.cpp:214
+msgid "Home place border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:212
-msgid "Road Point"
+#: src/gui/userpalette.cpp:217
+msgid "Road point"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
@@ -5610,7 +5636,7 @@ msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:315
+#: src/gui/widgets/itemcontainer.cpp:317
 msgid "Eq."
 msgstr ""
 
diff --git a/po/it.po b/po/it.po
index 3b0a278e8..f94a2a4bd 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,16 +6,16 @@
 # Alel <ale.camplese@gmail.com>, 2013
 # Alel <ale.camplese@gmail.com>, 2013
 # Andrei Karas <akaras@inbox.ru>, 2011
-# WildX <guglielmo__@hotmail.it>, 2011, 2012
+# WildX <gwx480@gmail.com>, 2011, 2012
 # hal9OOO <miglietta.francesco@gmail.com>, 2012
 # reid <reidyaro@gmail.com>, 2011
-# WildX <guglielmo__@hotmail.it>, 2011
+# WildX <gwx480@gmail.com>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-05-03 12:38+0300\n"
-"PO-Revision-Date: 2013-05-03 09:44+0000\n"
+"POT-Creation-Date: 2013-05-11 12:13+0300\n"
+"PO-Revision-Date: 2013-05-10 15:39+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/manaplus/"
 "language/it/)\n"
@@ -66,25 +66,25 @@ msgstr "I"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: full button name
-#: src/client.cpp:1136 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
+#: src/client.cpp:1137 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
 msgid "Setup"
 msgstr "Impostazioni"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1140 src/gui/setup_perfomance.cpp:61
+#: src/client.cpp:1141 src/gui/setup_perfomance.cpp:61
 msgid "Perfomance"
 msgstr "Performance"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:1143 src/gui/setup_video.cpp:258
+#: src/client.cpp:1144 src/gui/setup_video.cpp:258
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1146 src/gui/setup_theme.cpp:273
+#: src/client.cpp:1147 src/gui/setup_theme.cpp:283
 msgid "Theme"
 msgstr "Tema"
 
@@ -95,7 +95,7 @@ msgstr "Tema"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1150 src/gui/didyouknowwindow.cpp:78
+#: src/client.cpp:1151 src/gui/didyouknowwindow.cpp:78
 #: src/gui/inventorywindow.cpp:228 src/gui/npcdialog.cpp:63
 #: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:574
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:80
@@ -103,32 +103,32 @@ msgid "Close"
 msgstr "Chiudi"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1238
+#: src/client.cpp:1239
 msgid "Connecting to server"
 msgstr "Connessione al server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1282
 msgid "Logging in"
 msgstr "Accesso all'account"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1320
+#: src/client.cpp:1321
 msgid "Entering game world"
 msgstr "Accesso al gioco"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1431
+#: src/client.cpp:1432
 msgid "Requesting characters"
 msgstr "Caricamento personaggi"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1471
 msgid "Connecting to the game server"
 msgstr "Connessione al server del gioco"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1483
+#: src/client.cpp:1484
 msgid "Changing game servers"
 msgstr "Cambiamento server del gioco"
 
@@ -143,69 +143,69 @@ msgstr "Cambiamento server del gioco"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1540 src/client.cpp:1551 src/client.cpp:1721
+#: src/client.cpp:1541 src/client.cpp:1552 src/client.cpp:1722
 #: src/gui/changeemaildialog.cpp:168 src/gui/changepassworddialog.cpp:158
-#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:288
-#: src/gui/editserverdialog.cpp:220 src/gui/registerdialog.cpp:263
+#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:290
+#: src/gui/editserverdialog.cpp:216 src/gui/registerdialog.cpp:263
 #: src/gui/unregisterdialog.cpp:143 src/net/ea/charserverhandler.cpp:190
 #: src/net/ea/charserverhandler.cpp:210
 msgid "Error"
 msgstr "Errore"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1564
+#: src/client.cpp:1565
 msgid "Requesting registration details"
 msgstr "Richiesta dettagli di registrazione"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1601
+#: src/client.cpp:1602
 msgid "Password Change"
 msgstr "Cambia password"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1603
+#: src/client.cpp:1604
 msgid "Password changed successfully!"
 msgstr "Password modificata con successo!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1624
+#: src/client.cpp:1625
 msgid "Email Change"
 msgstr "Cambia Email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1626
+#: src/client.cpp:1627
 msgid "Email changed successfully!"
 msgstr "Email cambiata con successo!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1647
+#: src/client.cpp:1648
 msgid "Unregister Successful"
 msgstr "Annullamento registrazione effettuato con successo"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1649
+#: src/client.cpp:1650
 msgid "Farewell, come back any time..."
 msgstr "Addio, torna quando vuoi..."
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1902 src/client.cpp:1917 src/client.cpp:1960
-#: src/client.cpp:1976 src/client.cpp:2417 src/client.cpp:2425
+#: src/client.cpp:1903 src/client.cpp:1918 src/client.cpp:1961
+#: src/client.cpp:1977 src/client.cpp:2418 src/client.cpp:2426
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s non esiste e non può essere creato! Uscita in corso."
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2113
+#: src/client.cpp:2114
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Invalido aggiornamento host: %s"
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2154 src/client.cpp:2161
+#: src/client.cpp:2155 src/client.cpp:2162
 msgid "Error creating updates directory!"
 msgstr "Errore durante la creazione della directory degli aggiornamenti"
 
-#: src/client.cpp:2183 src/client.cpp:2196
+#: src/client.cpp:2184 src/client.cpp:2197
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Errore: %s non esiste e non può essere creato! Ucita in corso."
@@ -489,19 +489,19 @@ msgid "Comment: %s"
 msgstr "Commento: %s"
 
 #. TRANSLATORS: bot checker window header
-#: src/gui/botcheckerwindow.cpp:269
+#: src/gui/botcheckerwindow.cpp:268
 msgid "Bot Checker"
 msgstr "Bot Checker"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:102
+#: src/gui/botcheckerwindow.cpp:277 src/gui/npcdialog.cpp:102
 msgid "Reset"
 msgstr "Reimposta"
 
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: relations table header
-#: src/gui/botcheckerwindow.cpp:305 src/gui/setup_relations.cpp:61
+#: src/gui/botcheckerwindow.cpp:304 src/gui/setup_relations.cpp:61
 msgid "Name"
 msgstr "Nome"
 
@@ -509,7 +509,7 @@ msgstr "Nome"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:145
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:145
 #: src/gui/popupmenu.cpp:241 src/gui/popupmenu.cpp:640
 #: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:257
 #: src/net/tmwa/generalhandler.cpp:292
@@ -519,7 +519,7 @@ msgstr "Attacco"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
-#: src/gui/botcheckerwindow.cpp:309 src/gui/popupmenu.cpp:225
+#: src/gui/botcheckerwindow.cpp:308 src/gui/popupmenu.cpp:225
 #: src/gui/setupactiondata.h:93
 msgid "Talk"
 msgstr "Parla"
@@ -527,7 +527,7 @@ msgstr "Parla"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/botcheckerwindow.cpp:311 src/gui/popupmenu.cpp:215
+#: src/gui/botcheckerwindow.cpp:310 src/gui/popupmenu.cpp:215
 #: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:371
 #: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:653
 #: src/gui/popupmenu.cpp:727 src/gui/setupactiondata.h:1856
@@ -535,7 +535,7 @@ msgid "Move"
 msgstr "Movimento"
 
 #. TRANSLATORS: bot checker window table header
-#: src/gui/botcheckerwindow.cpp:313
+#: src/gui/botcheckerwindow.cpp:312
 msgid "Result"
 msgstr "Risultato"
 
@@ -591,7 +591,7 @@ msgstr "Compra"
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:516
+#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:511
 #: src/gui/selldialog.cpp:94 src/gui/selldialog.cpp:342
 #, c-format
 msgid "Price: %s / Total: %s"
@@ -608,9 +608,9 @@ msgstr "Quantita':"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:208
-#: src/gui/itemamountwindow.cpp:243 src/gui/npcdialog.cpp:93
-#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:833
+#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:202
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:93
+#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:821
 msgid "+"
 msgstr "+"
 
@@ -620,9 +620,9 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:240 src/gui/npcdialog.cpp:95
-#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:846
+#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:200
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:95
+#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:834
 msgid "-"
 msgstr "-"
 
@@ -634,7 +634,7 @@ msgstr "-"
 #. TRANSLATORS: input action name
 #: src/gui/buydialog.cpp:260 src/gui/quitdialog.cpp:54
 #: src/gui/quitdialog.cpp:59 src/gui/quitdialog.cpp:61
-#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:255
+#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:264
 #: src/gui/setupactiondata.h:177
 msgid "Quit"
 msgstr "Esci"
@@ -646,7 +646,7 @@ msgstr "Esci"
 #. TRANSLATORS: status bar label
 #: src/gui/buydialog.cpp:262 src/gui/selldialog.cpp:106
 #: src/gui/statuswindow.cpp:558 src/gui/statuswindow.cpp:615
-#: src/gui/statuswindow.cpp:830 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:852
 msgid "Max"
 msgstr "Massimo"
 
@@ -691,7 +691,7 @@ msgstr "Vendi"
 #: src/gui/buyselldialog.cpp:71 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:120
 #: src/gui/connectiondialog.cpp:48 src/gui/editserverdialog.cpp:80
-#: src/gui/itemamountwindow.cpp:212 src/gui/npcpostdialog.cpp:64
+#: src/gui/itemamountwindow.cpp:206 src/gui/npcpostdialog.cpp:64
 #: src/gui/popupmenu.cpp:290 src/gui/popupmenu.cpp:324
 #: src/gui/popupmenu.cpp:411 src/gui/popupmenu.cpp:454
 #: src/gui/popupmenu.cpp:485 src/gui/popupmenu.cpp:512
@@ -707,7 +707,7 @@ msgstr "Vendi"
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
 #: src/gui/setup.cpp:84 src/gui/socialwindow.cpp:1204
 #: src/gui/textcommandeditor.cpp:212 src/gui/textdialog.cpp:53
-#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:167
+#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:183
 msgid "Cancel"
 msgstr "Annulla"
 
@@ -871,7 +871,7 @@ msgstr "Distribuire %d punti"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:570
+#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:581
 #: src/gui/socialwindow.cpp:1269
 msgid "Create"
 msgstr "Crea"
@@ -898,17 +898,17 @@ msgid "Please remove %d points"
 msgstr "Rimuovere %d punti"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:60
+#: src/gui/charselectdialog.cpp:61
 msgid "Confirm Character Delete"
 msgstr "Conferma la cancellazione del personaggio"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:62
+#: src/gui/charselectdialog.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "Sei sicuro di voler cancellare questo personaggio?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:86
+#: src/gui/charselectdialog.cpp:87
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
@@ -920,8 +920,8 @@ msgstr "Cambia login"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:565
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:576
+#: src/gui/updaterwindow.cpp:185
 msgid "Play"
 msgstr "Gioca"
 
@@ -937,7 +937,7 @@ msgstr "Informazioni"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:263
+#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:272
 #: src/gui/setupactiondata.h:1803 src/gui/setup_relations.cpp:262
 #: src/gui/shopwindow.cpp:96 src/gui/shopwindow.cpp:103
 #: src/gui/textcommandeditor.cpp:216
@@ -947,24 +947,24 @@ msgstr "Elimina"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/charselectdialog.cpp:129 src/gui/unregisterdialog.cpp:48
+#: src/gui/charselectdialog.cpp:130 src/gui/unregisterdialog.cpp:48
 #: src/gui/unregisterdialog.cpp:53
 msgid "Unregister"
 msgstr "Cancella registrazione"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/charselectdialog.cpp:141
+#: src/gui/charselectdialog.cpp:142
 msgid "Change Email"
 msgstr "Cambia email"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:172
+#: src/gui/charselectdialog.cpp:175
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/charselectdialog.cpp:246
+#: src/gui/charselectdialog.cpp:248
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -974,16 +974,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:288
+#: src/gui/charselectdialog.cpp:290
 msgid "Incorrect password"
 msgstr "Password non valida"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password for deleting character"
 msgstr "Digitare password per eliminare un personaggio"
 
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password:"
 msgstr "Digitare password:"
 
@@ -1070,13 +1070,13 @@ msgid "Chat"
 msgstr "Chat"
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:735
+#: src/gui/chatwindow.cpp:638
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presente: %s; %d giocatori sono presenti."
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1165
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Sussurra a %s: %s"
@@ -1094,7 +1094,7 @@ msgstr "No"
 
 #. TRANSLATORS: confirm dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/confirmdialog.cpp:58 src/gui/popupmenu.cpp:2429
+#: src/gui/confirmdialog.cpp:55 src/gui/popupmenu.cpp:2429
 #: src/gui/popupmenu.cpp:2442 src/gui/popupmenu.cpp:2457
 #: src/gui/popupmenu.cpp:2483
 msgid "Ignore"
@@ -1103,7 +1103,7 @@ msgstr "Ignora"
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
 #. TRANSLATORS: settings group
-#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:109
+#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:108
 #: src/gui/setup_other.cpp:123 src/gui/windowmenu.cpp:106
 msgid "Map"
 msgstr "Mappa"
@@ -1119,190 +1119,190 @@ msgid "Net"
 msgstr "Rete"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:265
-#: src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:268
+#: src/gui/debugwindow.cpp:311
 msgid "Music:"
 msgstr "Musica:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:153 src/gui/debugwindow.cpp:271
-#: src/gui/debugwindow.cpp:312
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:274
+#: src/gui/debugwindow.cpp:315
 msgid "Map:"
 msgstr "Mappa:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:155 src/gui/debugwindow.cpp:268
-#: src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:271
+#: src/gui/debugwindow.cpp:313
 msgid "Minimap:"
 msgstr "Mini mappa:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:262
-#: src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:161 src/gui/debugwindow.cpp:265
+#: src/gui/debugwindow.cpp:309
 msgid "Cursor:"
 msgstr "Cursore:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:161
+#: src/gui/debugwindow.cpp:164
 msgid "Particle count:"
 msgstr "Contatore Particelle:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:284
-#: src/gui/debugwindow.cpp:316
+#: src/gui/debugwindow.cpp:167 src/gui/debugwindow.cpp:287
+#: src/gui/debugwindow.cpp:319
 msgid "Map actors count:"
 msgstr "Contatore generatori mappa:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:166 src/gui/debugwindow.cpp:243
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:169 src/gui/debugwindow.cpp:246
+#: src/gui/debugwindow.cpp:252
 msgid "Player Position:"
 msgstr "Posizione giocatore:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:172 src/gui/debugwindow.cpp:297
+#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:300
 msgid "Draw calls:"
 msgstr ""
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:175
+#. TRANSLATORS: debug window label, frames per second
+#: src/gui/debugwindow.cpp:178
 #, c-format
 msgid "%d FPS"
 msgstr "%d FPS"
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:177 src/gui/debugwindow.cpp:324
+#. TRANSLATORS: debug window label, logic per second
+#: src/gui/debugwindow.cpp:180 src/gui/debugwindow.cpp:327
 #, c-format
 msgid "%d LPS"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:191 src/gui/debugwindow.cpp:209
 #, c-format
 msgid "%d FPS (Software)"
 msgstr "%d FPS (Software)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:193
+#: src/gui/debugwindow.cpp:196
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr "%d FPS (OpenGL veloce)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:197
+#: src/gui/debugwindow.cpp:200
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr "%d FPS (OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:201
+#: src/gui/debugwindow.cpp:204
 #, c-format
 msgid "%d FPS (mobile OpenGL)"
 msgstr "%d FPS (OpenGL mobile)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:225 src/gui/debugwindow.cpp:290
+#: src/gui/debugwindow.cpp:228 src/gui/debugwindow.cpp:293
 msgid "Textures count:"
 msgstr "Conteggio Textures:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:279
+#: src/gui/debugwindow.cpp:282
 #, c-format
 msgid "Particle count: %d"
 msgstr "Conto particelle: %d"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:330 src/gui/debugwindow.cpp:380
-#: src/gui/debugwindow.cpp:442
+#: src/gui/debugwindow.cpp:333 src/gui/debugwindow.cpp:383
+#: src/gui/debugwindow.cpp:445
 msgid "Target:"
 msgstr "Target:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:332 src/gui/debugwindow.cpp:386
-#: src/gui/debugwindow.cpp:444
+#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
+#: src/gui/debugwindow.cpp:447
 msgid "Target Id:"
 msgstr "Target ID:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
-#: src/gui/debugwindow.cpp:446
+#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:392
+#: src/gui/debugwindow.cpp:449
 msgid "Target type:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:337
+#: src/gui/debugwindow.cpp:340
 msgid "Target level:"
 msgstr "Livello target:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:339 src/gui/debugwindow.cpp:405
+#: src/gui/debugwindow.cpp:342 src/gui/debugwindow.cpp:408
 msgid "Target race:"
 msgstr "Razza target:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:341
+#: src/gui/debugwindow.cpp:344
 msgid "Target party:"
 msgstr "Party target:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:346
 msgid "Target guild:"
 msgstr "Gilda target:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:430
-#: src/gui/debugwindow.cpp:436 src/gui/debugwindow.cpp:454
+#: src/gui/debugwindow.cpp:348 src/gui/debugwindow.cpp:433
+#: src/gui/debugwindow.cpp:439 src/gui/debugwindow.cpp:457
 msgid "Attack delay:"
 msgstr "Ritardo Attacco:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:347 src/gui/debugwindow.cpp:417
-#: src/gui/debugwindow.cpp:456
+#: src/gui/debugwindow.cpp:350 src/gui/debugwindow.cpp:420
+#: src/gui/debugwindow.cpp:459
 msgid "Minimal hit:"
 msgstr "Danno minimo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:349 src/gui/debugwindow.cpp:420
-#: src/gui/debugwindow.cpp:458
+#: src/gui/debugwindow.cpp:352 src/gui/debugwindow.cpp:423
+#: src/gui/debugwindow.cpp:461
 msgid "Maximum hit:"
 msgstr "Danno massimo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:351 src/gui/debugwindow.cpp:423
-#: src/gui/debugwindow.cpp:460
+#: src/gui/debugwindow.cpp:354 src/gui/debugwindow.cpp:426
+#: src/gui/debugwindow.cpp:463
 msgid "Critical hit:"
 msgstr "Colpo critico:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:394 src/gui/debugwindow.cpp:400
-#: src/gui/debugwindow.cpp:448
+#: src/gui/debugwindow.cpp:397 src/gui/debugwindow.cpp:403
+#: src/gui/debugwindow.cpp:451
 msgid "Target Level:"
 msgstr "Livello Target"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:408 src/gui/debugwindow.cpp:450
+#: src/gui/debugwindow.cpp:411 src/gui/debugwindow.cpp:453
 msgid "Target Party:"
 msgstr "Party del Target:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:412 src/gui/debugwindow.cpp:452
+#: src/gui/debugwindow.cpp:415 src/gui/debugwindow.cpp:455
 msgid "Target Guild:"
 msgstr "Gilda del Target"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:493
+#: src/gui/debugwindow.cpp:496
 #, c-format
 msgid "Ping: %s ms"
 msgstr "Ping: %s ms"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:496
+#: src/gui/debugwindow.cpp:499
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "In: %d bytes/s"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:499
+#: src/gui/debugwindow.cpp:502
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "Out: %d bytes/s"
@@ -1334,7 +1334,7 @@ msgstr "Apri automaticamente questa finestra"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #: src/gui/editdialog.cpp:45 src/gui/editserverdialog.cpp:78
-#: src/gui/itemamountwindow.cpp:210 src/gui/okdialog.cpp:51
+#: src/gui/itemamountwindow.cpp:204 src/gui/okdialog.cpp:51
 #: src/gui/quitdialog.cpp:70 src/gui/textdialog.cpp:46
 msgid "OK"
 msgstr "OK"
@@ -1346,7 +1346,7 @@ msgstr "Modifica Server"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:257
+#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:266
 msgid "Connect"
 msgstr "Connetti"
 
@@ -1376,7 +1376,7 @@ msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/editserverdialog.cpp:222
+#: src/gui/editserverdialog.cpp:218
 msgid "Please at least type both the address and the port of the server."
 msgstr "Per favore indicare almeno l'indirizzo e la porta del server."
 
@@ -1428,7 +1428,7 @@ msgstr "Equipaggia"
 #: src/gui/inventorywindow.cpp:178 src/gui/inventorywindow.cpp:630
 #: src/gui/popupmenu.cpp:1843 src/gui/popupmenu.cpp:1922
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2041
-#: src/gui/skilldialog.cpp:277
+#: src/gui/skilldialog.cpp:279
 msgid "Use"
 msgstr "Usa"
 
@@ -1462,7 +1462,7 @@ msgstr "Attrezzatura"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: setup button
-#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:718
+#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:719
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1992
 #: src/gui/popupmenu.cpp:2066 src/gui/setup.cpp:86
 msgid "Store"
@@ -1484,47 +1484,47 @@ msgid "Drop"
 msgstr "Lascia"
 
 #. TRANSLATORS: item amount window button
-#: src/gui/itemamountwindow.cpp:214
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "Tutti"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:264
 msgid "Select amount of items to trade."
 msgstr "Seleziona la quantità di oggetti da scambiare."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:274
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to drop."
 msgstr "Seleziona la quantità di oggetti da lasciare."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:278
+#: src/gui/itemamountwindow.cpp:272
 msgid "Select amount of items to store."
 msgstr "Selezionare la quantità di oggetti da riporre."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:276
 msgid "Select amount of items to retrieve."
 msgstr "Seleziona la quantità di oggetti da ritirare"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:286
+#: src/gui/itemamountwindow.cpp:280
 msgid "Select amount of items to split."
 msgstr "Seleziona la quantità di oggetti da dividere."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:290
+#: src/gui/itemamountwindow.cpp:284
 msgid "Add to buy shop."
 msgstr "Aggiungi allo shop di acquisto."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:294
+#: src/gui/itemamountwindow.cpp:288
 msgid "Add to sell shop."
 msgstr "Aggiungi allo shop di vendita."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:298
+#: src/gui/itemamountwindow.cpp:292
 msgid "Unknown."
 msgstr "Sconosciuto"
 
@@ -1551,7 +1551,7 @@ msgstr "Reset timer"
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:58 src/gui/killstats.cpp:171
-#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:516
+#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:509
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
@@ -1559,7 +1559,7 @@ msgstr ""
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:61 src/gui/killstats.cpp:173
 #: src/gui/killstats.cpp:253 src/gui/killstats.cpp:268
-#: src/gui/killstats.cpp:518
+#: src/gui/killstats.cpp:511
 #, c-format
 msgid "Avg Exp: %s"
 msgstr ""
@@ -1567,14 +1567,14 @@ msgstr ""
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:63 src/gui/killstats.cpp:176
 #: src/gui/killstats.cpp:258 src/gui/killstats.cpp:272
-#: src/gui/killstats.cpp:521
+#: src/gui/killstats.cpp:514
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:66 src/gui/killstats.cpp:187
-#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:524
+#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:517
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
@@ -1602,9 +1602,9 @@ msgid "Last kill exp:"
 msgstr "Punti Exp ultimo Kill:"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:414
-#: src/gui/killstats.cpp:421 src/gui/killstats.cpp:428
-#: src/gui/killstats.cpp:434
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:408
+#: src/gui/killstats.cpp:415 src/gui/killstats.cpp:422
+#: src/gui/killstats.cpp:428
 msgid "Time before jacko spawn:"
 msgstr "Tempo rimanente prima della comparsa del jacko:"
 
@@ -1636,12 +1636,12 @@ msgid "  Time for next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:421
+#: src/gui/killstats.cpp:415
 #, c-format
 msgid "%s %d?"
 msgstr "%s %d?"
 
-#: src/gui/killstats.cpp:428
+#: src/gui/killstats.cpp:422
 msgid "jacko spawning"
 msgstr "Comparsa jacko"
 
@@ -1747,32 +1747,32 @@ msgid "arrows bar"
 msgstr "barra frecce"
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:88
+#: src/gui/ministatuswindow.cpp:89
 msgid "status bar"
 msgstr "Barra dello stato"
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:108
+#: src/gui/ministatuswindow.cpp:109
 msgid "job bar"
 msgstr "Barra dei punti lavoro"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:306 src/gui/statuswindow.cpp:298
+#: src/gui/ministatuswindow.cpp:307 src/gui/statuswindow.cpp:298
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Livello: %d (GM:%d)"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:313 src/gui/statuswindow.cpp:141
+#: src/gui/ministatuswindow.cpp:314 src/gui/statuswindow.cpp:141
 #: src/gui/statuswindow.cpp:305 src/gui/statuswindow.cpp:375
 #, c-format
 msgid "Level: %d"
 msgstr "Livello: %d"
 
 #. TRANSLATORS: status bar label
-#: src/gui/ministatuswindow.cpp:330 src/gui/ministatuswindow.cpp:367
+#: src/gui/ministatuswindow.cpp:331 src/gui/ministatuswindow.cpp:368
 msgid "Need"
 msgstr "Bisogno"
 
@@ -2160,7 +2160,7 @@ msgstr "Copia in Chat"
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2209 src/gui/popupmenu.cpp:2280
-#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:139
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
 #: src/gui/socialwindow.cpp:934
 msgid "(default)"
 msgstr "(default)"
@@ -2343,7 +2343,7 @@ msgid "Passwords do not match."
 msgstr "Le password non corrispondono."
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:257
 msgid "Choose Your Server"
 msgstr "Scegli il tuo server"
 
@@ -2351,61 +2351,61 @@ msgstr "Scegli il tuo server"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:259 src/gui/shopwindow.cpp:94
+#: src/gui/serverdialog.cpp:268 src/gui/shopwindow.cpp:94
 #: src/gui/shopwindow.cpp:101 src/gui/tradewindow.cpp:77
 msgid "Add"
 msgstr "Aggiungi"
 
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
-#: src/gui/serverdialog.cpp:261 src/gui/widgets/setupitem.cpp:299
+#: src/gui/serverdialog.cpp:270 src/gui/widgets/setupitem.cpp:299
 #: src/gui/widgets/setupitem.cpp:426
 msgid "Edit"
 msgstr "Modifica"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:274
 msgid "Load"
 msgstr "Carica"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:279
+#: src/gui/serverdialog.cpp:288
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Scegli Il Tuo Server  *** MODALITA' SICURA ***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:297
 msgid "Use same ip for game sub servers"
 msgstr "Utilizzare lo stesso IP per i sub server di gioco"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:518
+#: src/gui/serverdialog.cpp:527
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Downloading server list... %2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:524
+#: src/gui/serverdialog.cpp:533
 msgid "Waiting for server..."
 msgstr "Attesa del server..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:529
+#: src/gui/serverdialog.cpp:538
 msgid "Preparing download"
 msgstr "Preparazione download"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:534
+#: src/gui/serverdialog.cpp:543
 msgid "Error retreiving server list!"
 msgstr "Errore nel ricevimento della lista sei server!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:626
+#: src/gui/serverdialog.cpp:635
 msgid "requires a newer version"
 msgstr "Richiede una versione più nuova"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:631
+#: src/gui/serverdialog.cpp:640
 #, c-format
 msgid "requires v%s"
 msgstr "Richiede v%s"
@@ -3416,7 +3416,7 @@ msgid "Type:"
 msgstr "Type:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:334
+#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:336
 msgid "Delay:"
 msgstr "Ritardo: "
 
@@ -3436,30 +3436,30 @@ msgid "Blue:"
 msgstr "blu"
 
 #. TRANSLATORS: color type
-#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:420
+#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:422
 msgid "Static"
 msgstr "Statico"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:107 src/gui/setup_colors.cpp:110
-#: src/gui/setup_colors.cpp:422
+#: src/gui/setup_colors.cpp:424
 msgid "Pulse"
 msgstr "Pulsazione"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:112 src/gui/setup_colors.cpp:115
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Rainbow"
 msgstr "Arcobaleno"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:117 src/gui/setup_colors.cpp:120
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Spectrum"
 msgstr "Gamma"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:328
+#: src/gui/setup_colors.cpp:330
 msgid "Alpha:"
 msgstr "Alfa:"
 
@@ -3627,7 +3627,7 @@ msgstr "Varie"
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: palette color
-#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:134
+#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:135
 msgid "Monsters"
 msgstr "Mostri"
 
@@ -4176,206 +4176,231 @@ msgstr "Quando si ignora:"
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:86
-msgid "Very small (9)"
+msgid "Very small (8)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:88
+msgid "Very small (9)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:90
 msgid "Tiny (10)"
 msgstr "Minuscolo (10)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:90
+#: src/gui/setup_theme.cpp:92
 msgid "Small (11)"
 msgstr "Piccolo (11)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:92
+#: src/gui/setup_theme.cpp:94
 msgid "Medium (12)"
 msgstr "Medio (12)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:94
-msgid "Normal (13)"
-msgstr ""
-
-#. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:96
-msgid "Large (14)"
+msgid "Normal (13)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:98
-msgid "Very large (15)"
+msgid "Large (14)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:100
-msgid "Big (16)"
+msgid "Large (15)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:102
-msgid "Very big (17)"
+msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:104
-msgid "Huge (18)"
+msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:106
-msgid "Very huge (19)"
+msgid "Big (18)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:108
+msgid "Big (19)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:110
+msgid "Very big (20)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:112
+msgid "Very big (21)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:114
+msgid "Very big (22)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:116
+msgid "Huge (23)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:151
 msgid "Chinese (China)"
 msgstr "Cinese (Cina)"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:153
 msgid "Czech"
 msgstr "Ceco"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:155
 msgid "English"
 msgstr "Inglese"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:157
 msgid "Finnish"
 msgstr "Finlandese"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:159
 msgid "French"
 msgstr "Francese"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:161
 msgid "German"
 msgstr "Tedesco"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:153
+#: src/gui/setup_theme.cpp:163
 msgid "Indonesian"
 msgstr "Indonesiano"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:155
+#: src/gui/setup_theme.cpp:165
 msgid "Italian"
 msgstr "Italiano"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:157
+#: src/gui/setup_theme.cpp:167
 msgid "Polish"
 msgstr "Polacco"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:159
+#: src/gui/setup_theme.cpp:169
 msgid "Japanese"
 msgstr "Giapponese"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:161
+#: src/gui/setup_theme.cpp:171
 msgid "Dutch (Belgium/Flemish)"
 msgstr "Olandese (Belgio/Fiandre)"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:163
+#: src/gui/setup_theme.cpp:173
 msgid "Portuguese"
 msgstr "Portoghese"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:165
+#: src/gui/setup_theme.cpp:175
 msgid "Portuguese (Brazilian)"
 msgstr "Portoghese (Brasile)"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:167
+#: src/gui/setup_theme.cpp:177
 msgid "Russian"
 msgstr "Russo"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:169
+#: src/gui/setup_theme.cpp:179
 msgid "Spanish (Castilian)"
 msgstr "Spagnolo (Castigliano)"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:171
+#: src/gui/setup_theme.cpp:181
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:223
+#: src/gui/setup_theme.cpp:233
 msgid "Gui theme"
 msgstr "Tema Gui"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:230
+#: src/gui/setup_theme.cpp:240
 msgid "Main Font"
 msgstr "Font principale"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:235
+#: src/gui/setup_theme.cpp:245
 msgid "Language"
 msgstr "Lingua"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:239
+#: src/gui/setup_theme.cpp:249
 msgid "Bold font"
 msgstr "Font in grassetto"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:243
+#: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr "Font con particelle"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:247
+#: src/gui/setup_theme.cpp:257
 msgid "Help font"
 msgstr "Help font"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:251
+#: src/gui/setup_theme.cpp:261
 msgid "Secure font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:255
+#: src/gui/setup_theme.cpp:265
 msgid "Japanese font"
 msgstr "Caratteri giapponesi"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:260
+#: src/gui/setup_theme.cpp:270
 msgid "Font size"
 msgstr "Dimensione caratteri"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:265
+#: src/gui/setup_theme.cpp:275
 msgid "Npc font size"
 msgstr ""
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/setup_theme.cpp:269
+#: src/gui/setup_theme.cpp:279
 msgid "i"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/setup_theme.cpp:442
+#: src/gui/setup_theme.cpp:452
 msgid "Theme info"
 msgstr "Informazioni sul tema"
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/setup_theme.cpp:467
+#: src/gui/setup_theme.cpp:477
 msgid "Theme Changed"
 msgstr "Tema cambiato"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/setup_theme.cpp:467 src/gui/setup_video.cpp:537
+#: src/gui/setup_theme.cpp:477 src/gui/setup_video.cpp:537
 #: src/gui/setup_video.cpp:546
 msgid "Restart your client for the change to take effect."
 msgstr "Per applicare le modifiche, è necessario riavviare il client."
@@ -4679,7 +4704,8 @@ msgid "Ambient FX"
 msgstr "Suoni ambientali"
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_visual.cpp:140
+#. TRANSLATORS: palette color
+#: src/gui/setup_visual.cpp:140 src/gui/userpalette.cpp:146
 msgid "Particle effects"
 msgstr "Effetti particelle"
 
@@ -4766,45 +4792,45 @@ msgid "%s wants to %s %s do you accept?"
 msgstr "%s vuole %s %s accetti?"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/skilldialog.cpp:270 src/gui/windowmenu.cpp:112
+#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:112
 msgid "Skills"
 msgstr "Abilità"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/skilldialog.cpp:279
+#: src/gui/skilldialog.cpp:281
 msgid "Up"
 msgstr "Su"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/skilldialog.cpp:391
+#: src/gui/skilldialog.cpp:393
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Punti abilità disponibili: %d"
 
 #. TRANSLATORS: skills dialog default skills tab
-#: src/gui/skilldialog.cpp:444
+#: src/gui/skilldialog.cpp:446
 msgid "basic"
 msgstr "Base"
 
 #. TRANSLATORS: skills dialog default skill name
-#: src/gui/skilldialog.cpp:447
+#: src/gui/skilldialog.cpp:449
 msgid "basic, 1"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/skilldialog.cpp:484
+#: src/gui/skilldialog.cpp:486
 #, c-format
 msgid "Skill Set %d"
 msgstr "Abilità impostata %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/skilldialog.cpp:518
+#: src/gui/skilldialog.cpp:520
 #, c-format
 msgid "Skill %d"
 msgstr "Abilità %d"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/skilldialog.cpp:612 src/gui/skilldialog.cpp:762
+#: src/gui/skilldialog.cpp:614 src/gui/skilldialog.cpp:764
 #, c-format
 msgid "Lvl: %d"
 msgstr "Lvl: %d"
@@ -5247,7 +5273,7 @@ msgid "Trade: You"
 msgstr "Commercia: Tu"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:182
+#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:184
 #, c-format
 msgid "You get %s"
 msgstr "Ottieni %s"
@@ -5263,12 +5289,12 @@ msgid "You give:"
 msgstr "Dai:"
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:393
+#: src/gui/tradewindow.cpp:396
 msgid "You don't have enough money."
 msgstr "Non hai abbastanza denaro."
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:475
+#: src/gui/tradewindow.cpp:479
 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 "
@@ -5281,223 +5307,223 @@ msgid "Name: %s"
 msgstr "Nome: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/updaterwindow.cpp:140
+#: src/gui/updaterwindow.cpp:156
 msgid "Updating..."
 msgstr "Aggiornamento..."
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:165
+#: src/gui/updaterwindow.cpp:181
 msgid "Connecting..."
 msgstr "Connessione..."
 
 #. TRANSLATORS: update message
-#: src/gui/updaterwindow.cpp:656
+#: src/gui/updaterwindow.cpp:672
 msgid "##1  The update process is incomplete."
 msgstr "##1 L'aggiornamento è stato completato."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/updaterwindow.cpp:658
+#: src/gui/updaterwindow.cpp:674
 msgid "##1  It is strongly recommended that"
 msgstr "##1 È fortemente raccomandato"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:660
+#: src/gui/updaterwindow.cpp:676
 msgid "##1  you try again later."
 msgstr "##1  riprova più tardi"
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:839
+#: src/gui/updaterwindow.cpp:855
 msgid "Completed"
 msgstr "Completato"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
 msgid "Being"
 msgstr "Essere"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:118
-msgid "Friend Names"
-msgstr "Nomi amici"
+#: src/gui/userpalette.cpp:119
+msgid "Friend names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:120
-msgid "Disregarded Names"
-msgstr "Nomi disprezzati"
+#: src/gui/userpalette.cpp:121
+msgid "Disregarded names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:122
-msgid "Ignored Names"
-msgstr "Nomi ignorati"
+#: src/gui/userpalette.cpp:123
+msgid "Ignored names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:124
-msgid "Erased Names"
-msgstr "Nomi cancellati"
+#: src/gui/userpalette.cpp:125
+msgid "Erased names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:126
-msgid "Other Players' Names"
-msgstr "Nomi degli altri giocatori"
+#: src/gui/userpalette.cpp:127
+msgid "Other players names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:128
-msgid "Own Name"
-msgstr "Proprio nome"
+#: src/gui/userpalette.cpp:129
+msgid "Own name"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:130
-msgid "GM Names"
-msgstr "Nomi dei GM"
+#: src/gui/userpalette.cpp:131
+msgid "GM names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
 msgid "NPCs"
 msgstr "NPCs"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
 msgid "Monster HP bar"
 msgstr "Barra HP nemici"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:140
 msgid "Monster HP bar (second color)"
 msgstr "Barra HP nemici (secondo colore)"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:141
-msgid "Party Members"
-msgstr "Membri del gruppo"
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:143
-msgid "Guild Members"
-msgstr "Membri della gilda"
+#: src/gui/userpalette.cpp:142
+msgid "Party members"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:145
-msgid "Particle Effects"
-msgstr "Effetti particelle"
+#: src/gui/userpalette.cpp:144
+msgid "Guild members"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:147
-msgid "Pickup Notification"
-msgstr "Notifica oggetti raccolti"
+#: src/gui/userpalette.cpp:148
+msgid "Pickup notification"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:149
-msgid "Exp Notification"
-msgstr "Notifica Esperienza"
+#: src/gui/userpalette.cpp:150
+msgid "Exp notification"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
 msgid "Player HP bar"
 msgstr "Barra HP giocatore"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
 msgid "Player HP bar (second color)"
 msgstr "Barra HP del giocatore (secondo colore)"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:157
-msgid "Player Hits Monster"
-msgstr "Il giocatore colpisce il nemico"
+#: src/gui/userpalette.cpp:158
+msgid "Player hits monster"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:159
-msgid "Monster Hits Player"
-msgstr "Il nemico colpisce il giocatore"
+#: src/gui/userpalette.cpp:160
+msgid "Monster hits player"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:163
-msgid "Other Player Hits Local Player"
-msgstr "Altro giocatore colpisce giocatore vicino"
+#: src/gui/userpalette.cpp:164
+msgid "Other player hits local player"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:166
 msgid "Critical Hit"
 msgstr "Colpo critico"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
-msgid "Local Player Hits Monster"
-msgstr "Il giocatore colpisce il nemico"
+#: src/gui/userpalette.cpp:170
+msgid "Local player hits monster"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:172
-msgid "Local Player Critical Hit"
-msgstr "Il giocatore infligge un colpo critico"
+#: src/gui/userpalette.cpp:173
+msgid "Local player critical hit"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:175
-msgid "Local Player Miss"
-msgstr "Il giocatore manca il nemico"
+#: src/gui/userpalette.cpp:176
+msgid "Local player miss"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:177
+#: src/gui/userpalette.cpp:178
 msgid "Misses"
 msgstr "Perde"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
-msgid "Portal Highlight"
-msgstr "Evidenzia portali"
+#: src/gui/userpalette.cpp:180
+msgid "Portal highlight"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:182
-msgid "Default collision Highlight"
-msgstr "Evidenzia collisioni"
+#: src/gui/userpalette.cpp:183
+msgid "Default collision highlight"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:185
-msgid "Air collision Highlight"
-msgstr "Evidenzia collisioni (aria)"
+#: src/gui/userpalette.cpp:186
+msgid "Air collision highlight"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:188
-msgid "Water collision Highlight"
-msgstr "Evidenzia collisioni (acqua)"
+#: src/gui/userpalette.cpp:189
+msgid "Water collision highlight"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:191
-msgid "Special ground collision Highlight"
+#: src/gui/userpalette.cpp:192
+msgid "Special ground collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
-msgid "Walkable Highlight"
+#: src/gui/userpalette.cpp:195
+msgid "Walkable highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:197
-msgid "Local Player Attack Range"
-msgstr "Raggio d'attacco del giocatore"
+#: src/gui/userpalette.cpp:198
+msgid "Local player attack range"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:200
-msgid "Local Player Attack Range Border"
-msgstr "Raggio d'attacco del nemico"
+#: src/gui/userpalette.cpp:201
+msgid "Local player attack range border"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:204
+msgid "Monster attack range"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:203
-msgid "Monster Attack Range"
-msgstr "Raggio d'attacco del nemico"
+#: src/gui/userpalette.cpp:208
+msgid "Floor item amount color"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:206
-msgid "Home Place"
-msgstr "Posizione Preferita"
+#: src/gui/userpalette.cpp:211
+msgid "Home place"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:209
-msgid "Home Place Border"
+#: src/gui/userpalette.cpp:214
+msgid "Home place border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:212
-msgid "Road Point"
+#: src/gui/userpalette.cpp:217
+msgid "Road point"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
@@ -5627,7 +5653,7 @@ msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:315
+#: src/gui/widgets/itemcontainer.cpp:317
 msgid "Eq."
 msgstr ""
 
diff --git a/po/ja.po b/po/ja.po
index 1126caa72..e10479ab5 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-05-03 12:38+0300\n"
-"PO-Revision-Date: 2013-05-03 09:44+0000\n"
+"POT-Creation-Date: 2013-05-11 12:13+0300\n"
+"PO-Revision-Date: 2013-05-10 15:39+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/manaplus/"
 "language/ja/)\n"
@@ -65,25 +65,25 @@ msgstr "I"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: full button name
-#: src/client.cpp:1136 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
+#: src/client.cpp:1137 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
 msgid "Setup"
 msgstr "設定"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1140 src/gui/setup_perfomance.cpp:61
+#: src/client.cpp:1141 src/gui/setup_perfomance.cpp:61
 msgid "Perfomance"
 msgstr "パフォーマンス"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:1143 src/gui/setup_video.cpp:258
+#: src/client.cpp:1144 src/gui/setup_video.cpp:258
 msgid "Video"
 msgstr "ビデオ"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1146 src/gui/setup_theme.cpp:273
+#: src/client.cpp:1147 src/gui/setup_theme.cpp:283
 msgid "Theme"
 msgstr "テーマ"
 
@@ -94,7 +94,7 @@ msgstr "テーマ"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1150 src/gui/didyouknowwindow.cpp:78
+#: src/client.cpp:1151 src/gui/didyouknowwindow.cpp:78
 #: src/gui/inventorywindow.cpp:228 src/gui/npcdialog.cpp:63
 #: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:574
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:80
@@ -102,32 +102,32 @@ msgid "Close"
 msgstr "閉じる"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1238
+#: src/client.cpp:1239
 msgid "Connecting to server"
 msgstr "サーバーに接続しています"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1282
 msgid "Logging in"
 msgstr "ログインしています"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1320
+#: src/client.cpp:1321
 msgid "Entering game world"
 msgstr "ゲームの世界に移動しています"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1431
+#: src/client.cpp:1432
 msgid "Requesting characters"
 msgstr "キャラクターを呼び出しています"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1471
 msgid "Connecting to the game server"
 msgstr "ゲームサーバーに接続しています"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1483
+#: src/client.cpp:1484
 msgid "Changing game servers"
 msgstr "ゲームサーバーを変更しています"
 
@@ -142,69 +142,69 @@ msgstr "ゲームサーバーを変更しています"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1540 src/client.cpp:1551 src/client.cpp:1721
+#: src/client.cpp:1541 src/client.cpp:1552 src/client.cpp:1722
 #: src/gui/changeemaildialog.cpp:168 src/gui/changepassworddialog.cpp:158
-#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:288
-#: src/gui/editserverdialog.cpp:220 src/gui/registerdialog.cpp:263
+#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:290
+#: src/gui/editserverdialog.cpp:216 src/gui/registerdialog.cpp:263
 #: src/gui/unregisterdialog.cpp:143 src/net/ea/charserverhandler.cpp:190
 #: src/net/ea/charserverhandler.cpp:210
 msgid "Error"
 msgstr "エラー"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1564
+#: src/client.cpp:1565
 msgid "Requesting registration details"
 msgstr "登録内容を呼び出しています"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1601
+#: src/client.cpp:1602
 msgid "Password Change"
 msgstr "パスワード変更"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1603
+#: src/client.cpp:1604
 msgid "Password changed successfully!"
 msgstr "パスワードを変更しました"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1624
+#: src/client.cpp:1625
 msgid "Email Change"
 msgstr "メールアドレス変更"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1626
+#: src/client.cpp:1627
 msgid "Email changed successfully!"
 msgstr "メールアドレスを変更しました"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1647
+#: src/client.cpp:1648
 msgid "Unregister Successful"
 msgstr "登録を解除しました"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1649
+#: src/client.cpp:1650
 msgid "Farewell, come back any time..."
 msgstr "さようなら　また会いましょう"
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1902 src/client.cpp:1917 src/client.cpp:1960
-#: src/client.cpp:1976 src/client.cpp:2417 src/client.cpp:2425
+#: src/client.cpp:1903 src/client.cpp:1918 src/client.cpp:1961
+#: src/client.cpp:1977 src/client.cpp:2418 src/client.cpp:2426
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%sは存在しない為、作成できません"
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2113
+#: src/client.cpp:2114
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "無効なアップデートホスト:%s"
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2154 src/client.cpp:2161
+#: src/client.cpp:2155 src/client.cpp:2162
 msgid "Error creating updates directory!"
 msgstr "更新フォルダの作成エラー"
 
-#: src/client.cpp:2183 src/client.cpp:2196
+#: src/client.cpp:2184 src/client.cpp:2197
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "エラー: %s は存在しない為、作成できません"
@@ -487,19 +487,19 @@ msgid "Comment: %s"
 msgstr "コメント: %s"
 
 #. TRANSLATORS: bot checker window header
-#: src/gui/botcheckerwindow.cpp:269
+#: src/gui/botcheckerwindow.cpp:268
 msgid "Bot Checker"
 msgstr "ボットチェッカー"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:102
+#: src/gui/botcheckerwindow.cpp:277 src/gui/npcdialog.cpp:102
 msgid "Reset"
 msgstr "リセット"
 
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: relations table header
-#: src/gui/botcheckerwindow.cpp:305 src/gui/setup_relations.cpp:61
+#: src/gui/botcheckerwindow.cpp:304 src/gui/setup_relations.cpp:61
 msgid "Name"
 msgstr "名前"
 
@@ -507,7 +507,7 @@ msgstr "名前"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:145
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:145
 #: src/gui/popupmenu.cpp:241 src/gui/popupmenu.cpp:640
 #: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:257
 #: src/net/tmwa/generalhandler.cpp:292
@@ -517,7 +517,7 @@ msgstr "攻撃"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
-#: src/gui/botcheckerwindow.cpp:309 src/gui/popupmenu.cpp:225
+#: src/gui/botcheckerwindow.cpp:308 src/gui/popupmenu.cpp:225
 #: src/gui/setupactiondata.h:93
 msgid "Talk"
 msgstr "話す"
@@ -525,7 +525,7 @@ msgstr "話す"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/botcheckerwindow.cpp:311 src/gui/popupmenu.cpp:215
+#: src/gui/botcheckerwindow.cpp:310 src/gui/popupmenu.cpp:215
 #: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:371
 #: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:653
 #: src/gui/popupmenu.cpp:727 src/gui/setupactiondata.h:1856
@@ -533,7 +533,7 @@ msgid "Move"
 msgstr "動く"
 
 #. TRANSLATORS: bot checker window table header
-#: src/gui/botcheckerwindow.cpp:313
+#: src/gui/botcheckerwindow.cpp:312
 msgid "Result"
 msgstr "結果"
 
@@ -589,7 +589,7 @@ msgstr "買う"
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:516
+#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:511
 #: src/gui/selldialog.cpp:94 src/gui/selldialog.cpp:342
 #, c-format
 msgid "Price: %s / Total: %s"
@@ -606,9 +606,9 @@ msgstr "量:"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:208
-#: src/gui/itemamountwindow.cpp:243 src/gui/npcdialog.cpp:93
-#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:833
+#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:202
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:93
+#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:821
 msgid "+"
 msgstr "+"
 
@@ -618,9 +618,9 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:240 src/gui/npcdialog.cpp:95
-#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:846
+#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:200
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:95
+#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:834
 msgid "-"
 msgstr "-"
 
@@ -632,7 +632,7 @@ msgstr "-"
 #. TRANSLATORS: input action name
 #: src/gui/buydialog.cpp:260 src/gui/quitdialog.cpp:54
 #: src/gui/quitdialog.cpp:59 src/gui/quitdialog.cpp:61
-#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:255
+#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:264
 #: src/gui/setupactiondata.h:177
 msgid "Quit"
 msgstr "終了"
@@ -644,7 +644,7 @@ msgstr "終了"
 #. TRANSLATORS: status bar label
 #: src/gui/buydialog.cpp:262 src/gui/selldialog.cpp:106
 #: src/gui/statuswindow.cpp:558 src/gui/statuswindow.cpp:615
-#: src/gui/statuswindow.cpp:830 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:852
 msgid "Max"
 msgstr "最大"
 
@@ -689,7 +689,7 @@ msgstr "売る"
 #: src/gui/buyselldialog.cpp:71 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:120
 #: src/gui/connectiondialog.cpp:48 src/gui/editserverdialog.cpp:80
-#: src/gui/itemamountwindow.cpp:212 src/gui/npcpostdialog.cpp:64
+#: src/gui/itemamountwindow.cpp:206 src/gui/npcpostdialog.cpp:64
 #: src/gui/popupmenu.cpp:290 src/gui/popupmenu.cpp:324
 #: src/gui/popupmenu.cpp:411 src/gui/popupmenu.cpp:454
 #: src/gui/popupmenu.cpp:485 src/gui/popupmenu.cpp:512
@@ -705,7 +705,7 @@ msgstr "売る"
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
 #: src/gui/setup.cpp:84 src/gui/socialwindow.cpp:1204
 #: src/gui/textcommandeditor.cpp:212 src/gui/textdialog.cpp:53
-#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:167
+#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:183
 msgid "Cancel"
 msgstr "キャンセル"
 
@@ -869,7 +869,7 @@ msgstr "%d ポイントを振り分けてください"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:570
+#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:581
 #: src/gui/socialwindow.cpp:1269
 msgid "Create"
 msgstr "作成"
@@ -896,17 +896,17 @@ msgid "Please remove %d points"
 msgstr "%dポイントを取り除いてください"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:60
+#: src/gui/charselectdialog.cpp:61
 msgid "Confirm Character Delete"
 msgstr "キャラクター削除の確認をしてください"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:62
+#: src/gui/charselectdialog.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "このキャラクターを削除しますか？"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:86
+#: src/gui/charselectdialog.cpp:87
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
@@ -918,8 +918,8 @@ msgstr "別アカウントでログイン"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:565
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:576
+#: src/gui/updaterwindow.cpp:185
 msgid "Play"
 msgstr "プレイ"
 
@@ -935,7 +935,7 @@ msgstr "情報"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:263
+#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:272
 #: src/gui/setupactiondata.h:1803 src/gui/setup_relations.cpp:262
 #: src/gui/shopwindow.cpp:96 src/gui/shopwindow.cpp:103
 #: src/gui/textcommandeditor.cpp:216
@@ -945,24 +945,24 @@ msgstr "削除"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/charselectdialog.cpp:129 src/gui/unregisterdialog.cpp:48
+#: src/gui/charselectdialog.cpp:130 src/gui/unregisterdialog.cpp:48
 #: src/gui/unregisterdialog.cpp:53
 msgid "Unregister"
 msgstr "登録解除"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/charselectdialog.cpp:141
+#: src/gui/charselectdialog.cpp:142
 msgid "Change Email"
 msgstr "メールアドレス変更"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:172
+#: src/gui/charselectdialog.cpp:175
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/charselectdialog.cpp:246
+#: src/gui/charselectdialog.cpp:248
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -972,16 +972,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:288
+#: src/gui/charselectdialog.cpp:290
 msgid "Incorrect password"
 msgstr "パスワードが違います"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password for deleting character"
 msgstr "キャラクターを削除するにはパスワードを入力して下さい"
 
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password:"
 msgstr "パスワードを入力して下さい:"
 
@@ -1068,13 +1068,13 @@ msgid "Chat"
 msgstr "チャット"
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:735
+#: src/gui/chatwindow.cpp:638
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "現在: %s; %d プレイヤーがいます"
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1165
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "%sにささやき中:%s"
@@ -1092,7 +1092,7 @@ msgstr "いいえ"
 
 #. TRANSLATORS: confirm dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/confirmdialog.cpp:58 src/gui/popupmenu.cpp:2429
+#: src/gui/confirmdialog.cpp:55 src/gui/popupmenu.cpp:2429
 #: src/gui/popupmenu.cpp:2442 src/gui/popupmenu.cpp:2457
 #: src/gui/popupmenu.cpp:2483
 msgid "Ignore"
@@ -1101,7 +1101,7 @@ msgstr "無視"
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
 #. TRANSLATORS: settings group
-#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:109
+#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:108
 #: src/gui/setup_other.cpp:123 src/gui/windowmenu.cpp:106
 msgid "Map"
 msgstr "マップ"
@@ -1117,190 +1117,190 @@ msgid "Net"
 msgstr "ネット"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:265
-#: src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:268
+#: src/gui/debugwindow.cpp:311
 msgid "Music:"
 msgstr "音楽:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:153 src/gui/debugwindow.cpp:271
-#: src/gui/debugwindow.cpp:312
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:274
+#: src/gui/debugwindow.cpp:315
 msgid "Map:"
 msgstr "マップ:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:155 src/gui/debugwindow.cpp:268
-#: src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:271
+#: src/gui/debugwindow.cpp:313
 msgid "Minimap:"
 msgstr "ミニマップ:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:262
-#: src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:161 src/gui/debugwindow.cpp:265
+#: src/gui/debugwindow.cpp:309
 msgid "Cursor:"
 msgstr "カーソル:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:161
+#: src/gui/debugwindow.cpp:164
 msgid "Particle count:"
 msgstr "パーティクル数:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:284
-#: src/gui/debugwindow.cpp:316
+#: src/gui/debugwindow.cpp:167 src/gui/debugwindow.cpp:287
+#: src/gui/debugwindow.cpp:319
 msgid "Map actors count:"
 msgstr "マップアクターの数:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:166 src/gui/debugwindow.cpp:243
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:169 src/gui/debugwindow.cpp:246
+#: src/gui/debugwindow.cpp:252
 msgid "Player Position:"
 msgstr "プレイヤーの位置:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:172 src/gui/debugwindow.cpp:297
+#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:300
 msgid "Draw calls:"
 msgstr ""
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:175
+#. TRANSLATORS: debug window label, frames per second
+#: src/gui/debugwindow.cpp:178
 #, c-format
 msgid "%d FPS"
 msgstr "%d FPS"
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:177 src/gui/debugwindow.cpp:324
+#. TRANSLATORS: debug window label, logic per second
+#: src/gui/debugwindow.cpp:180 src/gui/debugwindow.cpp:327
 #, c-format
 msgid "%d LPS"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:191 src/gui/debugwindow.cpp:209
 #, c-format
 msgid "%d FPS (Software)"
 msgstr "%d FPS (ソフトウェア)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:193
+#: src/gui/debugwindow.cpp:196
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr "%d FPS (速い OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:197
+#: src/gui/debugwindow.cpp:200
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr "%d FPS (古い OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:201
+#: src/gui/debugwindow.cpp:204
 #, c-format
 msgid "%d FPS (mobile OpenGL)"
 msgstr "%d FPS (モバイルOpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:225 src/gui/debugwindow.cpp:290
+#: src/gui/debugwindow.cpp:228 src/gui/debugwindow.cpp:293
 msgid "Textures count:"
 msgstr "テクスチャー数:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:279
+#: src/gui/debugwindow.cpp:282
 #, c-format
 msgid "Particle count: %d"
 msgstr "パーティクル数:%d"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:330 src/gui/debugwindow.cpp:380
-#: src/gui/debugwindow.cpp:442
+#: src/gui/debugwindow.cpp:333 src/gui/debugwindow.cpp:383
+#: src/gui/debugwindow.cpp:445
 msgid "Target:"
 msgstr "ターゲット:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:332 src/gui/debugwindow.cpp:386
-#: src/gui/debugwindow.cpp:444
+#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
+#: src/gui/debugwindow.cpp:447
 msgid "Target Id:"
 msgstr "ターゲットID:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
-#: src/gui/debugwindow.cpp:446
+#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:392
+#: src/gui/debugwindow.cpp:449
 msgid "Target type:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:337
+#: src/gui/debugwindow.cpp:340
 msgid "Target level:"
 msgstr "ターゲットレベル:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:339 src/gui/debugwindow.cpp:405
+#: src/gui/debugwindow.cpp:342 src/gui/debugwindow.cpp:408
 msgid "Target race:"
 msgstr "ターゲット種別:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:341
+#: src/gui/debugwindow.cpp:344
 msgid "Target party:"
 msgstr "ターゲットパーティ:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:346
 msgid "Target guild:"
 msgstr "ターゲットギルド:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:430
-#: src/gui/debugwindow.cpp:436 src/gui/debugwindow.cpp:454
+#: src/gui/debugwindow.cpp:348 src/gui/debugwindow.cpp:433
+#: src/gui/debugwindow.cpp:439 src/gui/debugwindow.cpp:457
 msgid "Attack delay:"
 msgstr "攻撃遅延"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:347 src/gui/debugwindow.cpp:417
-#: src/gui/debugwindow.cpp:456
+#: src/gui/debugwindow.cpp:350 src/gui/debugwindow.cpp:420
+#: src/gui/debugwindow.cpp:459
 msgid "Minimal hit:"
 msgstr "最低ヒット:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:349 src/gui/debugwindow.cpp:420
-#: src/gui/debugwindow.cpp:458
+#: src/gui/debugwindow.cpp:352 src/gui/debugwindow.cpp:423
+#: src/gui/debugwindow.cpp:461
 msgid "Maximum hit:"
 msgstr "最高ヒット:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:351 src/gui/debugwindow.cpp:423
-#: src/gui/debugwindow.cpp:460
+#: src/gui/debugwindow.cpp:354 src/gui/debugwindow.cpp:426
+#: src/gui/debugwindow.cpp:463
 msgid "Critical hit:"
 msgstr "クリティカルヒット:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:394 src/gui/debugwindow.cpp:400
-#: src/gui/debugwindow.cpp:448
+#: src/gui/debugwindow.cpp:397 src/gui/debugwindow.cpp:403
+#: src/gui/debugwindow.cpp:451
 msgid "Target Level:"
 msgstr "ターゲットレベル:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:408 src/gui/debugwindow.cpp:450
+#: src/gui/debugwindow.cpp:411 src/gui/debugwindow.cpp:453
 msgid "Target Party:"
 msgstr "ターゲットパーティ:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:412 src/gui/debugwindow.cpp:452
+#: src/gui/debugwindow.cpp:415 src/gui/debugwindow.cpp:455
 msgid "Target Guild:"
 msgstr "ターゲットギルド:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:493
+#: src/gui/debugwindow.cpp:496
 #, c-format
 msgid "Ping: %s ms"
 msgstr "ピング: %s ms"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:496
+#: src/gui/debugwindow.cpp:499
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "入力: %dバイト/秒"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:499
+#: src/gui/debugwindow.cpp:502
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "出力: %d バイト/秒"
@@ -1332,7 +1332,7 @@ msgstr "この窓を自動で開ける"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #: src/gui/editdialog.cpp:45 src/gui/editserverdialog.cpp:78
-#: src/gui/itemamountwindow.cpp:210 src/gui/okdialog.cpp:51
+#: src/gui/itemamountwindow.cpp:204 src/gui/okdialog.cpp:51
 #: src/gui/quitdialog.cpp:70 src/gui/textdialog.cpp:46
 msgid "OK"
 msgstr "OK"
@@ -1344,7 +1344,7 @@ msgstr "サーバー編集"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:257
+#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:266
 msgid "Connect"
 msgstr "接続"
 
@@ -1374,7 +1374,7 @@ msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/editserverdialog.cpp:222
+#: src/gui/editserverdialog.cpp:218
 msgid "Please at least type both the address and the port of the server."
 msgstr "サーバーアドレスとポートを入力して下さい"
 
@@ -1426,7 +1426,7 @@ msgstr "装着"
 #: src/gui/inventorywindow.cpp:178 src/gui/inventorywindow.cpp:630
 #: src/gui/popupmenu.cpp:1843 src/gui/popupmenu.cpp:1922
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2041
-#: src/gui/skilldialog.cpp:277
+#: src/gui/skilldialog.cpp:279
 msgid "Use"
 msgstr "使用"
 
@@ -1460,7 +1460,7 @@ msgstr "服装"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: setup button
-#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:718
+#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:719
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1992
 #: src/gui/popupmenu.cpp:2066 src/gui/setup.cpp:86
 msgid "Store"
@@ -1482,47 +1482,47 @@ msgid "Drop"
 msgstr "落とす"
 
 #. TRANSLATORS: item amount window button
-#: src/gui/itemamountwindow.cpp:214
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "全て"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:264
 msgid "Select amount of items to trade."
 msgstr "トレードするアイテムの数量を入力してください"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:274
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to drop."
 msgstr "落とすアイテムの数量を入力してください"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:278
+#: src/gui/itemamountwindow.cpp:272
 msgid "Select amount of items to store."
 msgstr "保管するアイテムの数量を入力してください"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:276
 msgid "Select amount of items to retrieve."
 msgstr "取出すアイテムの数量を入力してください"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:286
+#: src/gui/itemamountwindow.cpp:280
 msgid "Select amount of items to split."
 msgstr "分割するアイテムの量を選択してください"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:290
+#: src/gui/itemamountwindow.cpp:284
 msgid "Add to buy shop."
 msgstr "購入リストに追加"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:294
+#: src/gui/itemamountwindow.cpp:288
 msgid "Add to sell shop."
 msgstr "販売リストに追加"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:298
+#: src/gui/itemamountwindow.cpp:292
 msgid "Unknown."
 msgstr "不明"
 
@@ -1549,7 +1549,7 @@ msgstr "タイマーをリセット"
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:58 src/gui/killstats.cpp:171
-#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:516
+#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:509
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr "キル: %s, 合計exp: %s"
@@ -1557,7 +1557,7 @@ msgstr "キル: %s, 合計exp: %s"
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:61 src/gui/killstats.cpp:173
 #: src/gui/killstats.cpp:253 src/gui/killstats.cpp:268
-#: src/gui/killstats.cpp:518
+#: src/gui/killstats.cpp:511
 #, c-format
 msgid "Avg Exp: %s"
 msgstr "平均 Exp: %s"
@@ -1565,14 +1565,14 @@ msgstr "平均 Exp: %s"
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:63 src/gui/killstats.cpp:176
 #: src/gui/killstats.cpp:258 src/gui/killstats.cpp:272
-#: src/gui/killstats.cpp:521
+#: src/gui/killstats.cpp:514
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr "次のレベルまでに必要なモブ数　約: %s"
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:66 src/gui/killstats.cpp:187
-#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:524
+#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:517
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr "キル/分: %s, Exp/分: %s"
@@ -1598,9 +1598,9 @@ msgid "Last kill exp:"
 msgstr "最後のExp:"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:414
-#: src/gui/killstats.cpp:421 src/gui/killstats.cpp:428
-#: src/gui/killstats.cpp:434
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:408
+#: src/gui/killstats.cpp:415 src/gui/killstats.cpp:422
+#: src/gui/killstats.cpp:428
 msgid "Time before jacko spawn:"
 msgstr "次のJackOの出現まで:"
 
@@ -1632,12 +1632,12 @@ msgid "  Time for next level: %s"
 msgstr "  次のレベル達成までの時間: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:421
+#: src/gui/killstats.cpp:415
 #, c-format
 msgid "%s %d?"
 msgstr "%s %d?"
 
-#: src/gui/killstats.cpp:428
+#: src/gui/killstats.cpp:422
 msgid "jacko spawning"
 msgstr "JackOが出現中"
 
@@ -1743,32 +1743,32 @@ msgid "arrows bar"
 msgstr "矢"
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:88
+#: src/gui/ministatuswindow.cpp:89
 msgid "status bar"
 msgstr "情勢"
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:108
+#: src/gui/ministatuswindow.cpp:109
 msgid "job bar"
 msgstr "職"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:306 src/gui/statuswindow.cpp:298
+#: src/gui/ministatuswindow.cpp:307 src/gui/statuswindow.cpp:298
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "レベル: %d (GM %d)"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:313 src/gui/statuswindow.cpp:141
+#: src/gui/ministatuswindow.cpp:314 src/gui/statuswindow.cpp:141
 #: src/gui/statuswindow.cpp:305 src/gui/statuswindow.cpp:375
 #, c-format
 msgid "Level: %d"
 msgstr "レベル: %d"
 
 #. TRANSLATORS: status bar label
-#: src/gui/ministatuswindow.cpp:330 src/gui/ministatuswindow.cpp:367
+#: src/gui/ministatuswindow.cpp:331 src/gui/ministatuswindow.cpp:368
 msgid "Need"
 msgstr "必要"
 
@@ -2156,7 +2156,7 @@ msgstr "チャットへコピーする"
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2209 src/gui/popupmenu.cpp:2280
-#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:139
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
 #: src/gui/socialwindow.cpp:934
 msgid "(default)"
 msgstr "(デフォルト)"
@@ -2339,7 +2339,7 @@ msgid "Passwords do not match."
 msgstr "パスワードが一致しません"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:257
 msgid "Choose Your Server"
 msgstr "サーバーを選択してください"
 
@@ -2347,61 +2347,61 @@ msgstr "サーバーを選択してください"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:259 src/gui/shopwindow.cpp:94
+#: src/gui/serverdialog.cpp:268 src/gui/shopwindow.cpp:94
 #: src/gui/shopwindow.cpp:101 src/gui/tradewindow.cpp:77
 msgid "Add"
 msgstr "追加"
 
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
-#: src/gui/serverdialog.cpp:261 src/gui/widgets/setupitem.cpp:299
+#: src/gui/serverdialog.cpp:270 src/gui/widgets/setupitem.cpp:299
 #: src/gui/widgets/setupitem.cpp:426
 msgid "Edit"
 msgstr "編集"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:274
 msgid "Load"
 msgstr "読込み"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:279
+#: src/gui/serverdialog.cpp:288
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "サーバーを選んで下さい  *** セーフモード ***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:297
 msgid "Use same ip for game sub servers"
 msgstr "同じIPをゲームサブサーバーでも使用する"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:518
+#: src/gui/serverdialog.cpp:527
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "サーバーリストをダウンロード中...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:524
+#: src/gui/serverdialog.cpp:533
 msgid "Waiting for server..."
 msgstr "サーバーからの応答を待っています"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:529
+#: src/gui/serverdialog.cpp:538
 msgid "Preparing download"
 msgstr "ダウンロード準備中..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:534
+#: src/gui/serverdialog.cpp:543
 msgid "Error retreiving server list!"
 msgstr "サーバーリストの読み込みに失敗"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:626
+#: src/gui/serverdialog.cpp:635
 msgid "requires a newer version"
 msgstr "アップデートが必要です"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:631
+#: src/gui/serverdialog.cpp:640
 #, c-format
 msgid "requires v%s"
 msgstr "v%sが必要"
@@ -3412,7 +3412,7 @@ msgid "Type:"
 msgstr "タイプ:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:334
+#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:336
 msgid "Delay:"
 msgstr "遅延:"
 
@@ -3432,30 +3432,30 @@ msgid "Blue:"
 msgstr "青:"
 
 #. TRANSLATORS: color type
-#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:420
+#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:422
 msgid "Static"
 msgstr "穏やか"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:107 src/gui/setup_colors.cpp:110
-#: src/gui/setup_colors.cpp:422
+#: src/gui/setup_colors.cpp:424
 msgid "Pulse"
 msgstr "点滅"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:112 src/gui/setup_colors.cpp:115
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Rainbow"
 msgstr "カラフル"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:117 src/gui/setup_colors.cpp:120
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Spectrum"
 msgstr "スペクトル"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:328
+#: src/gui/setup_colors.cpp:330
 msgid "Alpha:"
 msgstr "アルファ:"
 
@@ -3623,7 +3623,7 @@ msgstr "その他"
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: palette color
-#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:134
+#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:135
 msgid "Monsters"
 msgstr "モンスター"
 
@@ -4175,206 +4175,231 @@ msgstr "完全無視の際には:"
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:86
-msgid "Very small (9)"
+msgid "Very small (8)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:88
+msgid "Very small (9)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:90
 msgid "Tiny (10)"
 msgstr "小さい (10)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:90
+#: src/gui/setup_theme.cpp:92
 msgid "Small (11)"
 msgstr "小 (11)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:92
+#: src/gui/setup_theme.cpp:94
 msgid "Medium (12)"
 msgstr "中 (12)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:94
-msgid "Normal (13)"
-msgstr ""
-
-#. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:96
-msgid "Large (14)"
+msgid "Normal (13)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:98
-msgid "Very large (15)"
+msgid "Large (14)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:100
-msgid "Big (16)"
+msgid "Large (15)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:102
-msgid "Very big (17)"
+msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:104
-msgid "Huge (18)"
+msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:106
-msgid "Very huge (19)"
+msgid "Big (18)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:108
+msgid "Big (19)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:110
+msgid "Very big (20)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:112
+msgid "Very big (21)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:114
+msgid "Very big (22)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:116
+msgid "Huge (23)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:151
 msgid "Chinese (China)"
 msgstr "中国語 (中国)"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:153
 msgid "Czech"
 msgstr "チェコ語"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:155
 msgid "English"
 msgstr "英語"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:157
 msgid "Finnish"
 msgstr "フィンランド語"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:159
 msgid "French"
 msgstr "フランス語"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:161
 msgid "German"
 msgstr "ドイツ語"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:153
+#: src/gui/setup_theme.cpp:163
 msgid "Indonesian"
 msgstr "インドネシア語"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:155
+#: src/gui/setup_theme.cpp:165
 msgid "Italian"
 msgstr "イタリア語"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:157
+#: src/gui/setup_theme.cpp:167
 msgid "Polish"
 msgstr "ポーランド語"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:159
+#: src/gui/setup_theme.cpp:169
 msgid "Japanese"
 msgstr "日本語"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:161
+#: src/gui/setup_theme.cpp:171
 msgid "Dutch (Belgium/Flemish)"
 msgstr "ドイツ語 (ベルギー/フランドル)"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:163
+#: src/gui/setup_theme.cpp:173
 msgid "Portuguese"
 msgstr "ポルトガル語"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:165
+#: src/gui/setup_theme.cpp:175
 msgid "Portuguese (Brazilian)"
 msgstr "ポルトガル語 (ブラジル)"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:167
+#: src/gui/setup_theme.cpp:177
 msgid "Russian"
 msgstr "ロシア語"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:169
+#: src/gui/setup_theme.cpp:179
 msgid "Spanish (Castilian)"
 msgstr "スペイン語 (カスティリヤ)"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:171
+#: src/gui/setup_theme.cpp:181
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:223
+#: src/gui/setup_theme.cpp:233
 msgid "Gui theme"
 msgstr "GUIテーマ"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:230
+#: src/gui/setup_theme.cpp:240
 msgid "Main Font"
 msgstr "メインフォント"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:235
+#: src/gui/setup_theme.cpp:245
 msgid "Language"
 msgstr "言語"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:239
+#: src/gui/setup_theme.cpp:249
 msgid "Bold font"
 msgstr "太字フォント"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:243
+#: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr "パーティクルフォント"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:247
+#: src/gui/setup_theme.cpp:257
 msgid "Help font"
 msgstr "ヘルプフォント"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:251
+#: src/gui/setup_theme.cpp:261
 msgid "Secure font"
 msgstr "安全なフォント"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:255
+#: src/gui/setup_theme.cpp:265
 msgid "Japanese font"
 msgstr "日本語フォント"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:260
+#: src/gui/setup_theme.cpp:270
 msgid "Font size"
 msgstr "フォントサイズ"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:265
+#: src/gui/setup_theme.cpp:275
 msgid "Npc font size"
 msgstr ""
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/setup_theme.cpp:269
+#: src/gui/setup_theme.cpp:279
 msgid "i"
 msgstr "i"
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/setup_theme.cpp:442
+#: src/gui/setup_theme.cpp:452
 msgid "Theme info"
 msgstr "テーマ情報"
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/setup_theme.cpp:467
+#: src/gui/setup_theme.cpp:477
 msgid "Theme Changed"
 msgstr "テーマを変更しました"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/setup_theme.cpp:467 src/gui/setup_video.cpp:537
+#: src/gui/setup_theme.cpp:477 src/gui/setup_video.cpp:537
 #: src/gui/setup_video.cpp:546
 msgid "Restart your client for the change to take effect."
 msgstr "設定変更の為アプリケーションを再起動してください"
@@ -4672,7 +4697,8 @@ msgid "Ambient FX"
 msgstr "環境FX"
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_visual.cpp:140
+#. TRANSLATORS: palette color
+#: src/gui/setup_visual.cpp:140 src/gui/userpalette.cpp:146
 msgid "Particle effects"
 msgstr "パーティクル効果"
 
@@ -4759,45 +4785,45 @@ msgid "%s wants to %s %s do you accept?"
 msgstr "%sが%s %sを希望しています。承認しますか？"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/skilldialog.cpp:270 src/gui/windowmenu.cpp:112
+#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:112
 msgid "Skills"
 msgstr "スキル"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/skilldialog.cpp:279
+#: src/gui/skilldialog.cpp:281
 msgid "Up"
 msgstr "上"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/skilldialog.cpp:391
+#: src/gui/skilldialog.cpp:393
 #, c-format
 msgid "Skill points available: %d"
 msgstr "スキルポイント: %d"
 
 #. TRANSLATORS: skills dialog default skills tab
-#: src/gui/skilldialog.cpp:444
+#: src/gui/skilldialog.cpp:446
 msgid "basic"
 msgstr "基本"
 
 #. TRANSLATORS: skills dialog default skill name
-#: src/gui/skilldialog.cpp:447
+#: src/gui/skilldialog.cpp:449
 msgid "basic, 1"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/skilldialog.cpp:484
+#: src/gui/skilldialog.cpp:486
 #, c-format
 msgid "Skill Set %d"
 msgstr "スキルセット %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/skilldialog.cpp:518
+#: src/gui/skilldialog.cpp:520
 #, c-format
 msgid "Skill %d"
 msgstr "スキル %d"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/skilldialog.cpp:612 src/gui/skilldialog.cpp:762
+#: src/gui/skilldialog.cpp:614 src/gui/skilldialog.cpp:764
 #, c-format
 msgid "Lvl: %d"
 msgstr "Lvl: %d"
@@ -5240,7 +5266,7 @@ msgid "Trade: You"
 msgstr "トレード:自分"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:182
+#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:184
 #, c-format
 msgid "You get %s"
 msgstr "%sを手に入れた"
@@ -5256,12 +5282,12 @@ msgid "You give:"
 msgstr "トレードするアイテム:"
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:393
+#: src/gui/tradewindow.cpp:396
 msgid "You don't have enough money."
 msgstr "GP不足です"
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:475
+#: src/gui/tradewindow.cpp:479
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "アイテムの追加に失敗しました。アイテム一種類を一つのウインドウ上で重複して追"
@@ -5274,224 +5300,224 @@ msgid "Name: %s"
 msgstr "名前: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/updaterwindow.cpp:140
+#: src/gui/updaterwindow.cpp:156
 msgid "Updating..."
 msgstr "更新しています..."
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:165
+#: src/gui/updaterwindow.cpp:181
 msgid "Connecting..."
 msgstr "接続しています..."
 
 #. TRANSLATORS: update message
-#: src/gui/updaterwindow.cpp:656
+#: src/gui/updaterwindow.cpp:672
 msgid "##1  The update process is incomplete."
 msgstr "##1  アップデートは完了していません"
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/updaterwindow.cpp:658
+#: src/gui/updaterwindow.cpp:674
 msgid "##1  It is strongly recommended that"
 msgstr "##1 する事を強く推奨します"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:660
+#: src/gui/updaterwindow.cpp:676
 msgid "##1  you try again later."
 msgstr "##1  しばらくたってからもう一度試してください"
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:839
+#: src/gui/updaterwindow.cpp:855
 msgid "Completed"
 msgstr "完了"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
 msgid "Being"
 msgstr "プレイヤー"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:118
-msgid "Friend Names"
-msgstr "友達の名前"
+#: src/gui/userpalette.cpp:119
+msgid "Friend names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:120
-msgid "Disregarded Names"
-msgstr "無視している名前"
+#: src/gui/userpalette.cpp:121
+msgid "Disregarded names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:122
-msgid "Ignored Names"
-msgstr "完全無視している名前"
+#: src/gui/userpalette.cpp:123
+msgid "Ignored names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:124
-msgid "Erased Names"
-msgstr "削除した名前"
+#: src/gui/userpalette.cpp:125
+msgid "Erased names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:126
-msgid "Other Players' Names"
-msgstr "他のプレイヤー名"
+#: src/gui/userpalette.cpp:127
+msgid "Other players names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:128
-msgid "Own Name"
-msgstr "自分の名前"
+#: src/gui/userpalette.cpp:129
+msgid "Own name"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:130
-msgid "GM Names"
-msgstr "GM名"
+#: src/gui/userpalette.cpp:131
+msgid "GM names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
 msgid "NPCs"
 msgstr "NPC"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
 msgid "Monster HP bar"
 msgstr "モンスターのHPバー"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:140
 msgid "Monster HP bar (second color)"
 msgstr "モンスターのHPバー（二番目の色）"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:141
-msgid "Party Members"
-msgstr "パーティメンバー"
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:143
-msgid "Guild Members"
-msgstr "ギルドメンバー"
+#: src/gui/userpalette.cpp:142
+msgid "Party members"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:145
-msgid "Particle Effects"
-msgstr "パーティクル効果"
+#: src/gui/userpalette.cpp:144
+msgid "Guild members"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:147
-msgid "Pickup Notification"
-msgstr "収集通知"
+#: src/gui/userpalette.cpp:148
+msgid "Pickup notification"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:149
-msgid "Exp Notification"
-msgstr "Exp通知"
+#: src/gui/userpalette.cpp:150
+msgid "Exp notification"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
 msgid "Player HP bar"
 msgstr "プレイヤーのHPバー"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
 msgid "Player HP bar (second color)"
 msgstr "プレイヤーのHPバー（二番目の色）"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:157
-msgid "Player Hits Monster"
-msgstr "プレイヤーがモンスターをヒットした時"
+#: src/gui/userpalette.cpp:158
+msgid "Player hits monster"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:159
-msgid "Monster Hits Player"
-msgstr "モンスターがプレイヤーをヒットした時"
+#: src/gui/userpalette.cpp:160
+msgid "Monster hits player"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:163
-msgid "Other Player Hits Local Player"
-msgstr "他のプレイヤーがローカルプレイヤーを攻撃した時"
+#: src/gui/userpalette.cpp:164
+msgid "Other player hits local player"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:166
 msgid "Critical Hit"
 msgstr "クリティカルヒット"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
-msgid "Local Player Hits Monster"
-msgstr "ローカルプレイヤーがモンスターを攻撃した時"
+#: src/gui/userpalette.cpp:170
+msgid "Local player hits monster"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:172
-msgid "Local Player Critical Hit"
-msgstr "ローカルプレイヤー　クリティカルヒットした時"
+#: src/gui/userpalette.cpp:173
+msgid "Local player critical hit"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:175
-msgid "Local Player Miss"
-msgstr "ローカルプレイヤー　ミス"
+#: src/gui/userpalette.cpp:176
+msgid "Local player miss"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:177
+#: src/gui/userpalette.cpp:178
 msgid "Misses"
 msgstr "ミス"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
-msgid "Portal Highlight"
-msgstr "ポータルハイライト"
+#: src/gui/userpalette.cpp:180
+msgid "Portal highlight"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:182
-msgid "Default collision Highlight"
-msgstr "デフォルトコリジョンハイライト"
+#: src/gui/userpalette.cpp:183
+msgid "Default collision highlight"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:185
-msgid "Air collision Highlight"
-msgstr "空コリジョンハイライト"
+#: src/gui/userpalette.cpp:186
+msgid "Air collision highlight"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:188
-msgid "Water collision Highlight"
-msgstr "水コリジョンハイライト"
+#: src/gui/userpalette.cpp:189
+msgid "Water collision highlight"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:191
-msgid "Special ground collision Highlight"
+#: src/gui/userpalette.cpp:192
+msgid "Special ground collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
-msgid "Walkable Highlight"
-msgstr "歩道ハイライト"
+#: src/gui/userpalette.cpp:195
+msgid "Walkable highlight"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:197
-msgid "Local Player Attack Range"
-msgstr "ローカルプレイヤーの攻撃範囲"
+#: src/gui/userpalette.cpp:198
+msgid "Local player attack range"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:200
-msgid "Local Player Attack Range Border"
-msgstr "ローカルプレイヤーの攻撃範囲の枠線"
+#: src/gui/userpalette.cpp:201
+msgid "Local player attack range border"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:203
-msgid "Monster Attack Range"
-msgstr "モンスター攻撃範囲"
+#: src/gui/userpalette.cpp:204
+msgid "Monster attack range"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:206
-msgid "Home Place"
-msgstr "ホーム位置"
+#: src/gui/userpalette.cpp:208
+msgid "Floor item amount color"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:211
+msgid "Home place"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:209
-msgid "Home Place Border"
-msgstr "ホームボーダー"
+#: src/gui/userpalette.cpp:214
+msgid "Home place border"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:212
-msgid "Road Point"
-msgstr "ロードポイント"
+#: src/gui/userpalette.cpp:217
+msgid "Road point"
+msgstr ""
 
 #. TRANSLATORS: who is online window name
 #: src/gui/whoisonline.cpp:79 src/gui/whoisonline.cpp:623
@@ -5622,7 +5648,7 @@ msgid "/kick > Kick some one from the guild you are in"
 msgstr "/kick > プレイヤーをギルドから追い出します"
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:315
+#: src/gui/widgets/itemcontainer.cpp:317
 msgid "Eq."
 msgstr "装着"
 
diff --git a/po/ka.po b/po/ka.po
index 7f0501da4..865c326b5 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-05-03 12:38+0300\n"
-"PO-Revision-Date: 2013-05-03 09:44+0000\n"
+"POT-Creation-Date: 2013-05-10 18:34+0300\n"
+"PO-Revision-Date: 2013-05-10 15:39+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -59,25 +59,25 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: full button name
-#: src/client.cpp:1136 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
+#: src/client.cpp:1137 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
 msgid "Setup"
 msgstr ""
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1140 src/gui/setup_perfomance.cpp:61
+#: src/client.cpp:1141 src/gui/setup_perfomance.cpp:61
 msgid "Perfomance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:1143 src/gui/setup_video.cpp:258
+#: src/client.cpp:1144 src/gui/setup_video.cpp:258
 msgid "Video"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1146 src/gui/setup_theme.cpp:273
+#: src/client.cpp:1147 src/gui/setup_theme.cpp:283
 msgid "Theme"
 msgstr ""
 
@@ -88,7 +88,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1150 src/gui/didyouknowwindow.cpp:78
+#: src/client.cpp:1151 src/gui/didyouknowwindow.cpp:78
 #: src/gui/inventorywindow.cpp:228 src/gui/npcdialog.cpp:63
 #: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:574
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:80
@@ -96,32 +96,32 @@ msgid "Close"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1238
+#: src/client.cpp:1239
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1282
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1320
+#: src/client.cpp:1321
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1431
+#: src/client.cpp:1432
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1471
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1483
+#: src/client.cpp:1484
 msgid "Changing game servers"
 msgstr ""
 
@@ -136,69 +136,69 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1540 src/client.cpp:1551 src/client.cpp:1721
+#: src/client.cpp:1541 src/client.cpp:1552 src/client.cpp:1722
 #: src/gui/changeemaildialog.cpp:168 src/gui/changepassworddialog.cpp:158
-#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:288
-#: src/gui/editserverdialog.cpp:220 src/gui/registerdialog.cpp:263
+#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:290
+#: src/gui/editserverdialog.cpp:216 src/gui/registerdialog.cpp:263
 #: src/gui/unregisterdialog.cpp:143 src/net/ea/charserverhandler.cpp:190
 #: src/net/ea/charserverhandler.cpp:210
 msgid "Error"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1564
+#: src/client.cpp:1565
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1601
+#: src/client.cpp:1602
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1603
+#: src/client.cpp:1604
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1624
+#: src/client.cpp:1625
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1626
+#: src/client.cpp:1627
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1647
+#: src/client.cpp:1648
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1649
+#: src/client.cpp:1650
 msgid "Farewell, come back any time..."
 msgstr ""
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1902 src/client.cpp:1917 src/client.cpp:1960
-#: src/client.cpp:1976 src/client.cpp:2417 src/client.cpp:2425
+#: src/client.cpp:1903 src/client.cpp:1918 src/client.cpp:1961
+#: src/client.cpp:1977 src/client.cpp:2418 src/client.cpp:2426
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2113
+#: src/client.cpp:2114
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2154 src/client.cpp:2161
+#: src/client.cpp:2155 src/client.cpp:2162
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:2183 src/client.cpp:2196
+#: src/client.cpp:2184 src/client.cpp:2197
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -478,19 +478,19 @@ msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: bot checker window header
-#: src/gui/botcheckerwindow.cpp:269
+#: src/gui/botcheckerwindow.cpp:268
 msgid "Bot Checker"
 msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:102
+#: src/gui/botcheckerwindow.cpp:277 src/gui/npcdialog.cpp:102
 msgid "Reset"
 msgstr ""
 
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: relations table header
-#: src/gui/botcheckerwindow.cpp:305 src/gui/setup_relations.cpp:61
+#: src/gui/botcheckerwindow.cpp:304 src/gui/setup_relations.cpp:61
 msgid "Name"
 msgstr ""
 
@@ -498,7 +498,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:145
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:145
 #: src/gui/popupmenu.cpp:241 src/gui/popupmenu.cpp:640
 #: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:257
 #: src/net/tmwa/generalhandler.cpp:292
@@ -508,7 +508,7 @@ msgstr ""
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
-#: src/gui/botcheckerwindow.cpp:309 src/gui/popupmenu.cpp:225
+#: src/gui/botcheckerwindow.cpp:308 src/gui/popupmenu.cpp:225
 #: src/gui/setupactiondata.h:93
 msgid "Talk"
 msgstr ""
@@ -516,7 +516,7 @@ msgstr ""
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/botcheckerwindow.cpp:311 src/gui/popupmenu.cpp:215
+#: src/gui/botcheckerwindow.cpp:310 src/gui/popupmenu.cpp:215
 #: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:371
 #: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:653
 #: src/gui/popupmenu.cpp:727 src/gui/setupactiondata.h:1856
@@ -524,7 +524,7 @@ msgid "Move"
 msgstr ""
 
 #. TRANSLATORS: bot checker window table header
-#: src/gui/botcheckerwindow.cpp:313
+#: src/gui/botcheckerwindow.cpp:312
 msgid "Result"
 msgstr ""
 
@@ -580,7 +580,7 @@ msgstr ""
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:516
+#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:511
 #: src/gui/selldialog.cpp:94 src/gui/selldialog.cpp:342
 #, c-format
 msgid "Price: %s / Total: %s"
@@ -597,9 +597,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:208
-#: src/gui/itemamountwindow.cpp:243 src/gui/npcdialog.cpp:93
-#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:833
+#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:202
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:93
+#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:821
 msgid "+"
 msgstr ""
 
@@ -609,9 +609,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:240 src/gui/npcdialog.cpp:95
-#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:846
+#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:200
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:95
+#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:834
 msgid "-"
 msgstr ""
 
@@ -623,7 +623,7 @@ msgstr ""
 #. TRANSLATORS: input action name
 #: src/gui/buydialog.cpp:260 src/gui/quitdialog.cpp:54
 #: src/gui/quitdialog.cpp:59 src/gui/quitdialog.cpp:61
-#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:255
+#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:264
 #: src/gui/setupactiondata.h:177
 msgid "Quit"
 msgstr ""
@@ -635,7 +635,7 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #: src/gui/buydialog.cpp:262 src/gui/selldialog.cpp:106
 #: src/gui/statuswindow.cpp:558 src/gui/statuswindow.cpp:615
-#: src/gui/statuswindow.cpp:830 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:852
 msgid "Max"
 msgstr ""
 
@@ -680,7 +680,7 @@ msgstr ""
 #: src/gui/buyselldialog.cpp:71 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:120
 #: src/gui/connectiondialog.cpp:48 src/gui/editserverdialog.cpp:80
-#: src/gui/itemamountwindow.cpp:212 src/gui/npcpostdialog.cpp:64
+#: src/gui/itemamountwindow.cpp:206 src/gui/npcpostdialog.cpp:64
 #: src/gui/popupmenu.cpp:290 src/gui/popupmenu.cpp:324
 #: src/gui/popupmenu.cpp:411 src/gui/popupmenu.cpp:454
 #: src/gui/popupmenu.cpp:485 src/gui/popupmenu.cpp:512
@@ -696,7 +696,7 @@ msgstr ""
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
 #: src/gui/setup.cpp:84 src/gui/socialwindow.cpp:1204
 #: src/gui/textcommandeditor.cpp:212 src/gui/textdialog.cpp:53
-#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:167
+#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:183
 msgid "Cancel"
 msgstr ""
 
@@ -860,7 +860,7 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:570
+#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:581
 #: src/gui/socialwindow.cpp:1269
 msgid "Create"
 msgstr ""
@@ -887,17 +887,17 @@ msgid "Please remove %d points"
 msgstr ""
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:60
+#: src/gui/charselectdialog.cpp:61
 msgid "Confirm Character Delete"
 msgstr ""
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:62
+#: src/gui/charselectdialog.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:86
+#: src/gui/charselectdialog.cpp:87
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
@@ -909,8 +909,8 @@ msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:565
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:576
+#: src/gui/updaterwindow.cpp:185
 msgid "Play"
 msgstr ""
 
@@ -926,7 +926,7 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:263
+#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:272
 #: src/gui/setupactiondata.h:1803 src/gui/setup_relations.cpp:262
 #: src/gui/shopwindow.cpp:96 src/gui/shopwindow.cpp:103
 #: src/gui/textcommandeditor.cpp:216
@@ -936,24 +936,24 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/charselectdialog.cpp:129 src/gui/unregisterdialog.cpp:48
+#: src/gui/charselectdialog.cpp:130 src/gui/unregisterdialog.cpp:48
 #: src/gui/unregisterdialog.cpp:53
 msgid "Unregister"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/charselectdialog.cpp:141
+#: src/gui/charselectdialog.cpp:142
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:172
+#: src/gui/charselectdialog.cpp:175
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/charselectdialog.cpp:246
+#: src/gui/charselectdialog.cpp:248
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -963,16 +963,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:288
+#: src/gui/charselectdialog.cpp:290
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password:"
 msgstr ""
 
@@ -1059,13 +1059,13 @@ msgid "Chat"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:735
+#: src/gui/chatwindow.cpp:638
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1165
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -1083,7 +1083,7 @@ msgstr ""
 
 #. TRANSLATORS: confirm dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/confirmdialog.cpp:58 src/gui/popupmenu.cpp:2429
+#: src/gui/confirmdialog.cpp:55 src/gui/popupmenu.cpp:2429
 #: src/gui/popupmenu.cpp:2442 src/gui/popupmenu.cpp:2457
 #: src/gui/popupmenu.cpp:2483
 msgid "Ignore"
@@ -1092,7 +1092,7 @@ msgstr ""
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
 #. TRANSLATORS: settings group
-#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:109
+#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:108
 #: src/gui/setup_other.cpp:123 src/gui/windowmenu.cpp:106
 msgid "Map"
 msgstr ""
@@ -1108,190 +1108,190 @@ msgid "Net"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:265
-#: src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:268
+#: src/gui/debugwindow.cpp:311
 msgid "Music:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:153 src/gui/debugwindow.cpp:271
-#: src/gui/debugwindow.cpp:312
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:274
+#: src/gui/debugwindow.cpp:315
 msgid "Map:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:155 src/gui/debugwindow.cpp:268
-#: src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:271
+#: src/gui/debugwindow.cpp:313
 msgid "Minimap:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:262
-#: src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:161 src/gui/debugwindow.cpp:265
+#: src/gui/debugwindow.cpp:309
 msgid "Cursor:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:161
+#: src/gui/debugwindow.cpp:164
 msgid "Particle count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:284
-#: src/gui/debugwindow.cpp:316
+#: src/gui/debugwindow.cpp:167 src/gui/debugwindow.cpp:287
+#: src/gui/debugwindow.cpp:319
 msgid "Map actors count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:166 src/gui/debugwindow.cpp:243
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:169 src/gui/debugwindow.cpp:246
+#: src/gui/debugwindow.cpp:252
 msgid "Player Position:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:172 src/gui/debugwindow.cpp:297
+#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:300
 msgid "Draw calls:"
 msgstr ""
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:175
+#. TRANSLATORS: debug window label, frames per second
+#: src/gui/debugwindow.cpp:178
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:177 src/gui/debugwindow.cpp:324
+#. TRANSLATORS: debug window label, logic per second
+#: src/gui/debugwindow.cpp:180 src/gui/debugwindow.cpp:327
 #, c-format
 msgid "%d LPS"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:191 src/gui/debugwindow.cpp:209
 #, c-format
 msgid "%d FPS (Software)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:193
+#: src/gui/debugwindow.cpp:196
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:197
+#: src/gui/debugwindow.cpp:200
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:201
+#: src/gui/debugwindow.cpp:204
 #, c-format
 msgid "%d FPS (mobile OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:225 src/gui/debugwindow.cpp:290
+#: src/gui/debugwindow.cpp:228 src/gui/debugwindow.cpp:293
 msgid "Textures count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:279
+#: src/gui/debugwindow.cpp:282
 #, c-format
 msgid "Particle count: %d"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:330 src/gui/debugwindow.cpp:380
-#: src/gui/debugwindow.cpp:442
+#: src/gui/debugwindow.cpp:333 src/gui/debugwindow.cpp:383
+#: src/gui/debugwindow.cpp:445
 msgid "Target:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:332 src/gui/debugwindow.cpp:386
-#: src/gui/debugwindow.cpp:444
+#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
+#: src/gui/debugwindow.cpp:447
 msgid "Target Id:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
-#: src/gui/debugwindow.cpp:446
+#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:392
+#: src/gui/debugwindow.cpp:449
 msgid "Target type:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:337
+#: src/gui/debugwindow.cpp:340
 msgid "Target level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:339 src/gui/debugwindow.cpp:405
+#: src/gui/debugwindow.cpp:342 src/gui/debugwindow.cpp:408
 msgid "Target race:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:341
+#: src/gui/debugwindow.cpp:344
 msgid "Target party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:346
 msgid "Target guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:430
-#: src/gui/debugwindow.cpp:436 src/gui/debugwindow.cpp:454
+#: src/gui/debugwindow.cpp:348 src/gui/debugwindow.cpp:433
+#: src/gui/debugwindow.cpp:439 src/gui/debugwindow.cpp:457
 msgid "Attack delay:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:347 src/gui/debugwindow.cpp:417
-#: src/gui/debugwindow.cpp:456
+#: src/gui/debugwindow.cpp:350 src/gui/debugwindow.cpp:420
+#: src/gui/debugwindow.cpp:459
 msgid "Minimal hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:349 src/gui/debugwindow.cpp:420
-#: src/gui/debugwindow.cpp:458
+#: src/gui/debugwindow.cpp:352 src/gui/debugwindow.cpp:423
+#: src/gui/debugwindow.cpp:461
 msgid "Maximum hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:351 src/gui/debugwindow.cpp:423
-#: src/gui/debugwindow.cpp:460
+#: src/gui/debugwindow.cpp:354 src/gui/debugwindow.cpp:426
+#: src/gui/debugwindow.cpp:463
 msgid "Critical hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:394 src/gui/debugwindow.cpp:400
-#: src/gui/debugwindow.cpp:448
+#: src/gui/debugwindow.cpp:397 src/gui/debugwindow.cpp:403
+#: src/gui/debugwindow.cpp:451
 msgid "Target Level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:408 src/gui/debugwindow.cpp:450
+#: src/gui/debugwindow.cpp:411 src/gui/debugwindow.cpp:453
 msgid "Target Party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:412 src/gui/debugwindow.cpp:452
+#: src/gui/debugwindow.cpp:415 src/gui/debugwindow.cpp:455
 msgid "Target Guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:493
+#: src/gui/debugwindow.cpp:496
 #, c-format
 msgid "Ping: %s ms"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:496
+#: src/gui/debugwindow.cpp:499
 #, c-format
 msgid "In: %d bytes/s"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:499
+#: src/gui/debugwindow.cpp:502
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
@@ -1323,7 +1323,7 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #: src/gui/editdialog.cpp:45 src/gui/editserverdialog.cpp:78
-#: src/gui/itemamountwindow.cpp:210 src/gui/okdialog.cpp:51
+#: src/gui/itemamountwindow.cpp:204 src/gui/okdialog.cpp:51
 #: src/gui/quitdialog.cpp:70 src/gui/textdialog.cpp:46
 msgid "OK"
 msgstr ""
@@ -1335,7 +1335,7 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:257
+#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:266
 msgid "Connect"
 msgstr ""
 
@@ -1365,7 +1365,7 @@ msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/editserverdialog.cpp:222
+#: src/gui/editserverdialog.cpp:218
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -1417,7 +1417,7 @@ msgstr ""
 #: src/gui/inventorywindow.cpp:178 src/gui/inventorywindow.cpp:630
 #: src/gui/popupmenu.cpp:1843 src/gui/popupmenu.cpp:1922
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2041
-#: src/gui/skilldialog.cpp:277
+#: src/gui/skilldialog.cpp:279
 msgid "Use"
 msgstr ""
 
@@ -1451,7 +1451,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: setup button
-#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:718
+#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:719
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1992
 #: src/gui/popupmenu.cpp:2066 src/gui/setup.cpp:86
 msgid "Store"
@@ -1473,47 +1473,47 @@ msgid "Drop"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/itemamountwindow.cpp:214
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:264
 msgid "Select amount of items to trade."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:274
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to drop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:278
+#: src/gui/itemamountwindow.cpp:272
 msgid "Select amount of items to store."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:276
 msgid "Select amount of items to retrieve."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:286
+#: src/gui/itemamountwindow.cpp:280
 msgid "Select amount of items to split."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:290
+#: src/gui/itemamountwindow.cpp:284
 msgid "Add to buy shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:294
+#: src/gui/itemamountwindow.cpp:288
 msgid "Add to sell shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:298
+#: src/gui/itemamountwindow.cpp:292
 msgid "Unknown."
 msgstr ""
 
@@ -1540,7 +1540,7 @@ msgstr ""
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:58 src/gui/killstats.cpp:171
-#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:516
+#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:509
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
@@ -1548,7 +1548,7 @@ msgstr ""
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:61 src/gui/killstats.cpp:173
 #: src/gui/killstats.cpp:253 src/gui/killstats.cpp:268
-#: src/gui/killstats.cpp:518
+#: src/gui/killstats.cpp:511
 #, c-format
 msgid "Avg Exp: %s"
 msgstr ""
@@ -1556,14 +1556,14 @@ msgstr ""
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:63 src/gui/killstats.cpp:176
 #: src/gui/killstats.cpp:258 src/gui/killstats.cpp:272
-#: src/gui/killstats.cpp:521
+#: src/gui/killstats.cpp:514
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:66 src/gui/killstats.cpp:187
-#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:524
+#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:517
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
@@ -1589,9 +1589,9 @@ msgid "Last kill exp:"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:414
-#: src/gui/killstats.cpp:421 src/gui/killstats.cpp:428
-#: src/gui/killstats.cpp:434
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:408
+#: src/gui/killstats.cpp:415 src/gui/killstats.cpp:422
+#: src/gui/killstats.cpp:428
 msgid "Time before jacko spawn:"
 msgstr ""
 
@@ -1623,12 +1623,12 @@ msgid "  Time for next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:421
+#: src/gui/killstats.cpp:415
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:428
+#: src/gui/killstats.cpp:422
 msgid "jacko spawning"
 msgstr ""
 
@@ -1734,32 +1734,32 @@ msgid "arrows bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:88
+#: src/gui/ministatuswindow.cpp:89
 msgid "status bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:108
+#: src/gui/ministatuswindow.cpp:109
 msgid "job bar"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:306 src/gui/statuswindow.cpp:298
+#: src/gui/ministatuswindow.cpp:307 src/gui/statuswindow.cpp:298
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:313 src/gui/statuswindow.cpp:141
+#: src/gui/ministatuswindow.cpp:314 src/gui/statuswindow.cpp:141
 #: src/gui/statuswindow.cpp:305 src/gui/statuswindow.cpp:375
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
 #. TRANSLATORS: status bar label
-#: src/gui/ministatuswindow.cpp:330 src/gui/ministatuswindow.cpp:367
+#: src/gui/ministatuswindow.cpp:331 src/gui/ministatuswindow.cpp:368
 msgid "Need"
 msgstr ""
 
@@ -2147,7 +2147,7 @@ msgstr ""
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2209 src/gui/popupmenu.cpp:2280
-#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:139
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
 #: src/gui/socialwindow.cpp:934
 msgid "(default)"
 msgstr ""
@@ -2330,7 +2330,7 @@ msgid "Passwords do not match."
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:257
 msgid "Choose Your Server"
 msgstr ""
 
@@ -2338,61 +2338,61 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:259 src/gui/shopwindow.cpp:94
+#: src/gui/serverdialog.cpp:268 src/gui/shopwindow.cpp:94
 #: src/gui/shopwindow.cpp:101 src/gui/tradewindow.cpp:77
 msgid "Add"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
-#: src/gui/serverdialog.cpp:261 src/gui/widgets/setupitem.cpp:299
+#: src/gui/serverdialog.cpp:270 src/gui/widgets/setupitem.cpp:299
 #: src/gui/widgets/setupitem.cpp:426
 msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:274
 msgid "Load"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:279
+#: src/gui/serverdialog.cpp:288
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:297
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:518
+#: src/gui/serverdialog.cpp:527
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:524
+#: src/gui/serverdialog.cpp:533
 msgid "Waiting for server..."
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:529
+#: src/gui/serverdialog.cpp:538
 msgid "Preparing download"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:534
+#: src/gui/serverdialog.cpp:543
 msgid "Error retreiving server list!"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:626
+#: src/gui/serverdialog.cpp:635
 msgid "requires a newer version"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:631
+#: src/gui/serverdialog.cpp:640
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -3403,7 +3403,7 @@ msgid "Type:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:334
+#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:336
 msgid "Delay:"
 msgstr ""
 
@@ -3423,30 +3423,30 @@ msgid "Blue:"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:420
+#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:422
 msgid "Static"
 msgstr ""
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:107 src/gui/setup_colors.cpp:110
-#: src/gui/setup_colors.cpp:422
+#: src/gui/setup_colors.cpp:424
 msgid "Pulse"
 msgstr ""
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:112 src/gui/setup_colors.cpp:115
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Rainbow"
 msgstr ""
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:117 src/gui/setup_colors.cpp:120
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Spectrum"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:328
+#: src/gui/setup_colors.cpp:330
 msgid "Alpha:"
 msgstr ""
 
@@ -3612,7 +3612,7 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: palette color
-#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:134
+#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:135
 msgid "Monsters"
 msgstr ""
 
@@ -4161,206 +4161,231 @@ msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:86
-msgid "Very small (9)"
+msgid "Very small (8)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:88
-msgid "Tiny (10)"
+msgid "Very small (9)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:90
-msgid "Small (11)"
+msgid "Tiny (10)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:92
-msgid "Medium (12)"
+msgid "Small (11)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:94
-msgid "Normal (13)"
+msgid "Medium (12)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:96
-msgid "Large (14)"
+msgid "Normal (13)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:98
-msgid "Very large (15)"
+msgid "Large (14)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:100
-msgid "Big (16)"
+msgid "Large (15)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:102
-msgid "Very big (17)"
+msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:104
-msgid "Huge (18)"
+msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:106
-msgid "Very huge (19)"
+msgid "Big (18)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:108
+msgid "Big (19)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:110
+msgid "Very big (20)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:112
+msgid "Very big (21)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:114
+msgid "Very big (22)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:116
+msgid "Huge (23)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:151
 msgid "Chinese (China)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:153
 msgid "Czech"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:155
 msgid "English"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:157
 msgid "Finnish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:159
 msgid "French"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:161
 msgid "German"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:153
+#: src/gui/setup_theme.cpp:163
 msgid "Indonesian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:155
+#: src/gui/setup_theme.cpp:165
 msgid "Italian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:157
+#: src/gui/setup_theme.cpp:167
 msgid "Polish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:159
+#: src/gui/setup_theme.cpp:169
 msgid "Japanese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:161
+#: src/gui/setup_theme.cpp:171
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:163
+#: src/gui/setup_theme.cpp:173
 msgid "Portuguese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:165
+#: src/gui/setup_theme.cpp:175
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:167
+#: src/gui/setup_theme.cpp:177
 msgid "Russian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:169
+#: src/gui/setup_theme.cpp:179
 msgid "Spanish (Castilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:171
+#: src/gui/setup_theme.cpp:181
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:223
+#: src/gui/setup_theme.cpp:233
 msgid "Gui theme"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:230
+#: src/gui/setup_theme.cpp:240
 msgid "Main Font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:235
+#: src/gui/setup_theme.cpp:245
 msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:239
+#: src/gui/setup_theme.cpp:249
 msgid "Bold font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:243
+#: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:247
+#: src/gui/setup_theme.cpp:257
 msgid "Help font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:251
+#: src/gui/setup_theme.cpp:261
 msgid "Secure font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:255
+#: src/gui/setup_theme.cpp:265
 msgid "Japanese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:260
+#: src/gui/setup_theme.cpp:270
 msgid "Font size"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:265
+#: src/gui/setup_theme.cpp:275
 msgid "Npc font size"
 msgstr ""
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/setup_theme.cpp:269
+#: src/gui/setup_theme.cpp:279
 msgid "i"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/setup_theme.cpp:442
+#: src/gui/setup_theme.cpp:452
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/setup_theme.cpp:467
+#: src/gui/setup_theme.cpp:477
 msgid "Theme Changed"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/setup_theme.cpp:467 src/gui/setup_video.cpp:537
+#: src/gui/setup_theme.cpp:477 src/gui/setup_video.cpp:537
 #: src/gui/setup_video.cpp:546
 msgid "Restart your client for the change to take effect."
 msgstr ""
@@ -4658,7 +4683,8 @@ msgid "Ambient FX"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_visual.cpp:140
+#. TRANSLATORS: palette color
+#: src/gui/setup_visual.cpp:140 src/gui/userpalette.cpp:146
 msgid "Particle effects"
 msgstr ""
 
@@ -4745,45 +4771,45 @@ msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/skilldialog.cpp:270 src/gui/windowmenu.cpp:112
+#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:112
 msgid "Skills"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/skilldialog.cpp:279
+#: src/gui/skilldialog.cpp:281
 msgid "Up"
 msgstr ""
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/skilldialog.cpp:391
+#: src/gui/skilldialog.cpp:393
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skills tab
-#: src/gui/skilldialog.cpp:444
+#: src/gui/skilldialog.cpp:446
 msgid "basic"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill name
-#: src/gui/skilldialog.cpp:447
+#: src/gui/skilldialog.cpp:449
 msgid "basic, 1"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/skilldialog.cpp:484
+#: src/gui/skilldialog.cpp:486
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/skilldialog.cpp:518
+#: src/gui/skilldialog.cpp:520
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/skilldialog.cpp:612 src/gui/skilldialog.cpp:762
+#: src/gui/skilldialog.cpp:614 src/gui/skilldialog.cpp:764
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -5226,7 +5252,7 @@ msgid "Trade: You"
 msgstr ""
 
 #. TRANSLATORS: trade window money label
-#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:182
+#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:184
 #, c-format
 msgid "You get %s"
 msgstr ""
@@ -5242,12 +5268,12 @@ msgid "You give:"
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:393
+#: src/gui/tradewindow.cpp:396
 msgid "You don't have enough money."
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:475
+#: src/gui/tradewindow.cpp:479
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
@@ -5259,223 +5285,223 @@ msgid "Name: %s"
 msgstr ""
 
 #. TRANSLATORS: updater window name
-#: src/gui/updaterwindow.cpp:140
+#: src/gui/updaterwindow.cpp:156
 msgid "Updating..."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:165
+#: src/gui/updaterwindow.cpp:181
 msgid "Connecting..."
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/updaterwindow.cpp:656
+#: src/gui/updaterwindow.cpp:672
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/updaterwindow.cpp:658
+#: src/gui/updaterwindow.cpp:674
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:660
+#: src/gui/updaterwindow.cpp:676
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:839
+#: src/gui/updaterwindow.cpp:855
 msgid "Completed"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
 msgid "Being"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:118
-msgid "Friend Names"
+#: src/gui/userpalette.cpp:119
+msgid "Friend names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:120
-msgid "Disregarded Names"
+#: src/gui/userpalette.cpp:121
+msgid "Disregarded names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:122
-msgid "Ignored Names"
+#: src/gui/userpalette.cpp:123
+msgid "Ignored names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:124
-msgid "Erased Names"
+#: src/gui/userpalette.cpp:125
+msgid "Erased names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:126
-msgid "Other Players' Names"
+#: src/gui/userpalette.cpp:127
+msgid "Other players names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:128
-msgid "Own Name"
+#: src/gui/userpalette.cpp:129
+msgid "Own name"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:130
-msgid "GM Names"
+#: src/gui/userpalette.cpp:131
+msgid "GM names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
 msgid "NPCs"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
 msgid "Monster HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:140
 msgid "Monster HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:141
-msgid "Party Members"
+#: src/gui/userpalette.cpp:142
+msgid "Party members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:143
-msgid "Guild Members"
+#: src/gui/userpalette.cpp:144
+msgid "Guild members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:145
-msgid "Particle Effects"
+#: src/gui/userpalette.cpp:148
+msgid "Pickup notification"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:147
-msgid "Pickup Notification"
+#: src/gui/userpalette.cpp:150
+msgid "Exp notification"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:149
-msgid "Exp Notification"
-msgstr ""
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
 msgid "Player HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
 msgid "Player HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:157
-msgid "Player Hits Monster"
+#: src/gui/userpalette.cpp:158
+msgid "Player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:159
-msgid "Monster Hits Player"
+#: src/gui/userpalette.cpp:160
+msgid "Monster hits player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:163
-msgid "Other Player Hits Local Player"
+#: src/gui/userpalette.cpp:164
+msgid "Other player hits local player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:166
 msgid "Critical Hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
-msgid "Local Player Hits Monster"
+#: src/gui/userpalette.cpp:170
+msgid "Local player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:172
-msgid "Local Player Critical Hit"
+#: src/gui/userpalette.cpp:173
+msgid "Local player critical hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:175
-msgid "Local Player Miss"
+#: src/gui/userpalette.cpp:176
+msgid "Local player miss"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:177
+#: src/gui/userpalette.cpp:178
 msgid "Misses"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
-msgid "Portal Highlight"
+#: src/gui/userpalette.cpp:180
+msgid "Portal highlight"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:183
+msgid "Default collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:182
-msgid "Default collision Highlight"
+#: src/gui/userpalette.cpp:186
+msgid "Air collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:185
-msgid "Air collision Highlight"
+#: src/gui/userpalette.cpp:189
+msgid "Water collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:188
-msgid "Water collision Highlight"
+#: src/gui/userpalette.cpp:192
+msgid "Special ground collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:191
-msgid "Special ground collision Highlight"
+#: src/gui/userpalette.cpp:195
+msgid "Walkable highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
-msgid "Walkable Highlight"
+#: src/gui/userpalette.cpp:198
+msgid "Local player attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:197
-msgid "Local Player Attack Range"
+#: src/gui/userpalette.cpp:201
+msgid "Local player attack range border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:200
-msgid "Local Player Attack Range Border"
+#: src/gui/userpalette.cpp:204
+msgid "Monster attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:203
-msgid "Monster Attack Range"
+#: src/gui/userpalette.cpp:208
+msgid "Floor item amount color"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:206
-msgid "Home Place"
+#: src/gui/userpalette.cpp:211
+msgid "Home place"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:209
-msgid "Home Place Border"
+#: src/gui/userpalette.cpp:214
+msgid "Home place border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:212
-msgid "Road Point"
+#: src/gui/userpalette.cpp:217
+msgid "Road point"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
@@ -5605,7 +5631,7 @@ msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:315
+#: src/gui/widgets/itemcontainer.cpp:317
 msgid "Eq."
 msgstr ""
 
diff --git a/po/manaplus.pot b/po/manaplus.pot
index 97c683ec7..dd981c7ed 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: 2013-05-03 12:38+0300\n"
+"POT-Creation-Date: 2013-05-11 12:13+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"
@@ -59,25 +59,25 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: full button name
-#: src/client.cpp:1136 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
+#: src/client.cpp:1137 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
 msgid "Setup"
 msgstr ""
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1140 src/gui/setup_perfomance.cpp:61
+#: src/client.cpp:1141 src/gui/setup_perfomance.cpp:61
 msgid "Perfomance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:1143 src/gui/setup_video.cpp:258
+#: src/client.cpp:1144 src/gui/setup_video.cpp:258
 msgid "Video"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1146 src/gui/setup_theme.cpp:273
+#: src/client.cpp:1147 src/gui/setup_theme.cpp:283
 msgid "Theme"
 msgstr ""
 
@@ -88,7 +88,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1150 src/gui/didyouknowwindow.cpp:78
+#: src/client.cpp:1151 src/gui/didyouknowwindow.cpp:78
 #: src/gui/inventorywindow.cpp:228 src/gui/npcdialog.cpp:63
 #: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:574
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:80
@@ -96,32 +96,32 @@ msgid "Close"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1238
+#: src/client.cpp:1239
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1282
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1320
+#: src/client.cpp:1321
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1431
+#: src/client.cpp:1432
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1471
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1483
+#: src/client.cpp:1484
 msgid "Changing game servers"
 msgstr ""
 
@@ -136,69 +136,69 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1540 src/client.cpp:1551 src/client.cpp:1721
+#: src/client.cpp:1541 src/client.cpp:1552 src/client.cpp:1722
 #: src/gui/changeemaildialog.cpp:168 src/gui/changepassworddialog.cpp:158
-#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:288
-#: src/gui/editserverdialog.cpp:220 src/gui/registerdialog.cpp:263
+#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:290
+#: src/gui/editserverdialog.cpp:216 src/gui/registerdialog.cpp:263
 #: src/gui/unregisterdialog.cpp:143 src/net/ea/charserverhandler.cpp:190
 #: src/net/ea/charserverhandler.cpp:210
 msgid "Error"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1564
+#: src/client.cpp:1565
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1601
+#: src/client.cpp:1602
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1603
+#: src/client.cpp:1604
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1624
+#: src/client.cpp:1625
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1626
+#: src/client.cpp:1627
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1647
+#: src/client.cpp:1648
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1649
+#: src/client.cpp:1650
 msgid "Farewell, come back any time..."
 msgstr ""
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1902 src/client.cpp:1917 src/client.cpp:1960
-#: src/client.cpp:1976 src/client.cpp:2417 src/client.cpp:2425
+#: src/client.cpp:1903 src/client.cpp:1918 src/client.cpp:1961
+#: src/client.cpp:1977 src/client.cpp:2418 src/client.cpp:2426
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2113
+#: src/client.cpp:2114
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2154 src/client.cpp:2161
+#: src/client.cpp:2155 src/client.cpp:2162
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:2183 src/client.cpp:2196
+#: src/client.cpp:2184 src/client.cpp:2197
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -478,19 +478,19 @@ msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: bot checker window header
-#: src/gui/botcheckerwindow.cpp:269
+#: src/gui/botcheckerwindow.cpp:268
 msgid "Bot Checker"
 msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:102
+#: src/gui/botcheckerwindow.cpp:277 src/gui/npcdialog.cpp:102
 msgid "Reset"
 msgstr ""
 
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: relations table header
-#: src/gui/botcheckerwindow.cpp:305 src/gui/setup_relations.cpp:61
+#: src/gui/botcheckerwindow.cpp:304 src/gui/setup_relations.cpp:61
 msgid "Name"
 msgstr ""
 
@@ -498,7 +498,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:145
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:145
 #: src/gui/popupmenu.cpp:241 src/gui/popupmenu.cpp:640
 #: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:257
 #: src/net/tmwa/generalhandler.cpp:292
@@ -508,7 +508,7 @@ msgstr ""
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
-#: src/gui/botcheckerwindow.cpp:309 src/gui/popupmenu.cpp:225
+#: src/gui/botcheckerwindow.cpp:308 src/gui/popupmenu.cpp:225
 #: src/gui/setupactiondata.h:93
 msgid "Talk"
 msgstr ""
@@ -516,7 +516,7 @@ msgstr ""
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/botcheckerwindow.cpp:311 src/gui/popupmenu.cpp:215
+#: src/gui/botcheckerwindow.cpp:310 src/gui/popupmenu.cpp:215
 #: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:371
 #: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:653
 #: src/gui/popupmenu.cpp:727 src/gui/setupactiondata.h:1856
@@ -524,7 +524,7 @@ msgid "Move"
 msgstr ""
 
 #. TRANSLATORS: bot checker window table header
-#: src/gui/botcheckerwindow.cpp:313
+#: src/gui/botcheckerwindow.cpp:312
 msgid "Result"
 msgstr ""
 
@@ -580,7 +580,7 @@ msgstr ""
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:516
+#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:511
 #: src/gui/selldialog.cpp:94 src/gui/selldialog.cpp:342
 #, c-format
 msgid "Price: %s / Total: %s"
@@ -597,9 +597,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:208
-#: src/gui/itemamountwindow.cpp:243 src/gui/npcdialog.cpp:93
-#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:833
+#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:202
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:93
+#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:821
 msgid "+"
 msgstr ""
 
@@ -609,9 +609,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:240 src/gui/npcdialog.cpp:95
-#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:846
+#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:200
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:95
+#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:834
 msgid "-"
 msgstr ""
 
@@ -623,7 +623,7 @@ msgstr ""
 #. TRANSLATORS: input action name
 #: src/gui/buydialog.cpp:260 src/gui/quitdialog.cpp:54
 #: src/gui/quitdialog.cpp:59 src/gui/quitdialog.cpp:61
-#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:255
+#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:264
 #: src/gui/setupactiondata.h:177
 msgid "Quit"
 msgstr ""
@@ -635,7 +635,7 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #: src/gui/buydialog.cpp:262 src/gui/selldialog.cpp:106
 #: src/gui/statuswindow.cpp:558 src/gui/statuswindow.cpp:615
-#: src/gui/statuswindow.cpp:830 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:852
 msgid "Max"
 msgstr ""
 
@@ -680,7 +680,7 @@ msgstr ""
 #: src/gui/buyselldialog.cpp:71 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:120
 #: src/gui/connectiondialog.cpp:48 src/gui/editserverdialog.cpp:80
-#: src/gui/itemamountwindow.cpp:212 src/gui/npcpostdialog.cpp:64
+#: src/gui/itemamountwindow.cpp:206 src/gui/npcpostdialog.cpp:64
 #: src/gui/popupmenu.cpp:290 src/gui/popupmenu.cpp:324
 #: src/gui/popupmenu.cpp:411 src/gui/popupmenu.cpp:454
 #: src/gui/popupmenu.cpp:485 src/gui/popupmenu.cpp:512
@@ -696,7 +696,7 @@ msgstr ""
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
 #: src/gui/setup.cpp:84 src/gui/socialwindow.cpp:1204
 #: src/gui/textcommandeditor.cpp:212 src/gui/textdialog.cpp:53
-#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:167
+#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:183
 msgid "Cancel"
 msgstr ""
 
@@ -860,7 +860,7 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:570
+#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:581
 #: src/gui/socialwindow.cpp:1269
 msgid "Create"
 msgstr ""
@@ -887,17 +887,17 @@ msgid "Please remove %d points"
 msgstr ""
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:60
+#: src/gui/charselectdialog.cpp:61
 msgid "Confirm Character Delete"
 msgstr ""
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:62
+#: src/gui/charselectdialog.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:86
+#: src/gui/charselectdialog.cpp:87
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
@@ -909,8 +909,8 @@ msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:565
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:576
+#: src/gui/updaterwindow.cpp:185
 msgid "Play"
 msgstr ""
 
@@ -926,7 +926,7 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:263
+#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:272
 #: src/gui/setupactiondata.h:1803 src/gui/setup_relations.cpp:262
 #: src/gui/shopwindow.cpp:96 src/gui/shopwindow.cpp:103
 #: src/gui/textcommandeditor.cpp:216
@@ -936,24 +936,24 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/charselectdialog.cpp:129 src/gui/unregisterdialog.cpp:48
+#: src/gui/charselectdialog.cpp:130 src/gui/unregisterdialog.cpp:48
 #: src/gui/unregisterdialog.cpp:53
 msgid "Unregister"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/charselectdialog.cpp:141
+#: src/gui/charselectdialog.cpp:142
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:172
+#: src/gui/charselectdialog.cpp:175
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/charselectdialog.cpp:246
+#: src/gui/charselectdialog.cpp:248
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -963,16 +963,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:288
+#: src/gui/charselectdialog.cpp:290
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password:"
 msgstr ""
 
@@ -1059,13 +1059,13 @@ msgid "Chat"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:735
+#: src/gui/chatwindow.cpp:638
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1165
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -1083,7 +1083,7 @@ msgstr ""
 
 #. TRANSLATORS: confirm dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/confirmdialog.cpp:58 src/gui/popupmenu.cpp:2429
+#: src/gui/confirmdialog.cpp:55 src/gui/popupmenu.cpp:2429
 #: src/gui/popupmenu.cpp:2442 src/gui/popupmenu.cpp:2457
 #: src/gui/popupmenu.cpp:2483
 msgid "Ignore"
@@ -1092,7 +1092,7 @@ msgstr ""
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
 #. TRANSLATORS: settings group
-#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:109
+#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:108
 #: src/gui/setup_other.cpp:123 src/gui/windowmenu.cpp:106
 msgid "Map"
 msgstr ""
@@ -1108,190 +1108,190 @@ msgid "Net"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:265
-#: src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:268
+#: src/gui/debugwindow.cpp:311
 msgid "Music:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:153 src/gui/debugwindow.cpp:271
-#: src/gui/debugwindow.cpp:312
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:274
+#: src/gui/debugwindow.cpp:315
 msgid "Map:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:155 src/gui/debugwindow.cpp:268
-#: src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:271
+#: src/gui/debugwindow.cpp:313
 msgid "Minimap:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:262
-#: src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:161 src/gui/debugwindow.cpp:265
+#: src/gui/debugwindow.cpp:309
 msgid "Cursor:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:161
+#: src/gui/debugwindow.cpp:164
 msgid "Particle count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:284
-#: src/gui/debugwindow.cpp:316
+#: src/gui/debugwindow.cpp:167 src/gui/debugwindow.cpp:287
+#: src/gui/debugwindow.cpp:319
 msgid "Map actors count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:166 src/gui/debugwindow.cpp:243
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:169 src/gui/debugwindow.cpp:246
+#: src/gui/debugwindow.cpp:252
 msgid "Player Position:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:172 src/gui/debugwindow.cpp:297
+#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:300
 msgid "Draw calls:"
 msgstr ""
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:175
+#. TRANSLATORS: debug window label, frames per second
+#: src/gui/debugwindow.cpp:178
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:177 src/gui/debugwindow.cpp:324
+#. TRANSLATORS: debug window label, logic per second
+#: src/gui/debugwindow.cpp:180 src/gui/debugwindow.cpp:327
 #, c-format
 msgid "%d LPS"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:191 src/gui/debugwindow.cpp:209
 #, c-format
 msgid "%d FPS (Software)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:193
+#: src/gui/debugwindow.cpp:196
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:197
+#: src/gui/debugwindow.cpp:200
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:201
+#: src/gui/debugwindow.cpp:204
 #, c-format
 msgid "%d FPS (mobile OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:225 src/gui/debugwindow.cpp:290
+#: src/gui/debugwindow.cpp:228 src/gui/debugwindow.cpp:293
 msgid "Textures count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:279
+#: src/gui/debugwindow.cpp:282
 #, c-format
 msgid "Particle count: %d"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:330 src/gui/debugwindow.cpp:380
-#: src/gui/debugwindow.cpp:442
+#: src/gui/debugwindow.cpp:333 src/gui/debugwindow.cpp:383
+#: src/gui/debugwindow.cpp:445
 msgid "Target:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:332 src/gui/debugwindow.cpp:386
-#: src/gui/debugwindow.cpp:444
+#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
+#: src/gui/debugwindow.cpp:447
 msgid "Target Id:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
-#: src/gui/debugwindow.cpp:446
+#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:392
+#: src/gui/debugwindow.cpp:449
 msgid "Target type:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:337
+#: src/gui/debugwindow.cpp:340
 msgid "Target level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:339 src/gui/debugwindow.cpp:405
+#: src/gui/debugwindow.cpp:342 src/gui/debugwindow.cpp:408
 msgid "Target race:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:341
+#: src/gui/debugwindow.cpp:344
 msgid "Target party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:346
 msgid "Target guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:430
-#: src/gui/debugwindow.cpp:436 src/gui/debugwindow.cpp:454
+#: src/gui/debugwindow.cpp:348 src/gui/debugwindow.cpp:433
+#: src/gui/debugwindow.cpp:439 src/gui/debugwindow.cpp:457
 msgid "Attack delay:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:347 src/gui/debugwindow.cpp:417
-#: src/gui/debugwindow.cpp:456
+#: src/gui/debugwindow.cpp:350 src/gui/debugwindow.cpp:420
+#: src/gui/debugwindow.cpp:459
 msgid "Minimal hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:349 src/gui/debugwindow.cpp:420
-#: src/gui/debugwindow.cpp:458
+#: src/gui/debugwindow.cpp:352 src/gui/debugwindow.cpp:423
+#: src/gui/debugwindow.cpp:461
 msgid "Maximum hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:351 src/gui/debugwindow.cpp:423
-#: src/gui/debugwindow.cpp:460
+#: src/gui/debugwindow.cpp:354 src/gui/debugwindow.cpp:426
+#: src/gui/debugwindow.cpp:463
 msgid "Critical hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:394 src/gui/debugwindow.cpp:400
-#: src/gui/debugwindow.cpp:448
+#: src/gui/debugwindow.cpp:397 src/gui/debugwindow.cpp:403
+#: src/gui/debugwindow.cpp:451
 msgid "Target Level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:408 src/gui/debugwindow.cpp:450
+#: src/gui/debugwindow.cpp:411 src/gui/debugwindow.cpp:453
 msgid "Target Party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:412 src/gui/debugwindow.cpp:452
+#: src/gui/debugwindow.cpp:415 src/gui/debugwindow.cpp:455
 msgid "Target Guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:493
+#: src/gui/debugwindow.cpp:496
 #, c-format
 msgid "Ping: %s ms"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:496
+#: src/gui/debugwindow.cpp:499
 #, c-format
 msgid "In: %d bytes/s"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:499
+#: src/gui/debugwindow.cpp:502
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
@@ -1323,7 +1323,7 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #: src/gui/editdialog.cpp:45 src/gui/editserverdialog.cpp:78
-#: src/gui/itemamountwindow.cpp:210 src/gui/okdialog.cpp:51
+#: src/gui/itemamountwindow.cpp:204 src/gui/okdialog.cpp:51
 #: src/gui/quitdialog.cpp:70 src/gui/textdialog.cpp:46
 msgid "OK"
 msgstr ""
@@ -1335,7 +1335,7 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:257
+#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:266
 msgid "Connect"
 msgstr ""
 
@@ -1365,7 +1365,7 @@ msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/editserverdialog.cpp:222
+#: src/gui/editserverdialog.cpp:218
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -1417,7 +1417,7 @@ msgstr ""
 #: src/gui/inventorywindow.cpp:178 src/gui/inventorywindow.cpp:630
 #: src/gui/popupmenu.cpp:1843 src/gui/popupmenu.cpp:1922
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2041
-#: src/gui/skilldialog.cpp:277
+#: src/gui/skilldialog.cpp:279
 msgid "Use"
 msgstr ""
 
@@ -1451,7 +1451,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: setup button
-#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:718
+#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:719
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1992
 #: src/gui/popupmenu.cpp:2066 src/gui/setup.cpp:86
 msgid "Store"
@@ -1473,47 +1473,47 @@ msgid "Drop"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/itemamountwindow.cpp:214
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:264
 msgid "Select amount of items to trade."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:274
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to drop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:278
+#: src/gui/itemamountwindow.cpp:272
 msgid "Select amount of items to store."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:276
 msgid "Select amount of items to retrieve."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:286
+#: src/gui/itemamountwindow.cpp:280
 msgid "Select amount of items to split."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:290
+#: src/gui/itemamountwindow.cpp:284
 msgid "Add to buy shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:294
+#: src/gui/itemamountwindow.cpp:288
 msgid "Add to sell shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:298
+#: src/gui/itemamountwindow.cpp:292
 msgid "Unknown."
 msgstr ""
 
@@ -1540,7 +1540,7 @@ msgstr ""
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:58 src/gui/killstats.cpp:171
-#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:516
+#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:509
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
@@ -1548,7 +1548,7 @@ msgstr ""
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:61 src/gui/killstats.cpp:173
 #: src/gui/killstats.cpp:253 src/gui/killstats.cpp:268
-#: src/gui/killstats.cpp:518
+#: src/gui/killstats.cpp:511
 #, c-format
 msgid "Avg Exp: %s"
 msgstr ""
@@ -1556,14 +1556,14 @@ msgstr ""
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:63 src/gui/killstats.cpp:176
 #: src/gui/killstats.cpp:258 src/gui/killstats.cpp:272
-#: src/gui/killstats.cpp:521
+#: src/gui/killstats.cpp:514
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:66 src/gui/killstats.cpp:187
-#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:524
+#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:517
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
@@ -1591,9 +1591,9 @@ msgid "Last kill exp:"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:414
-#: src/gui/killstats.cpp:421 src/gui/killstats.cpp:428
-#: src/gui/killstats.cpp:434
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:408
+#: src/gui/killstats.cpp:415 src/gui/killstats.cpp:422
+#: src/gui/killstats.cpp:428
 msgid "Time before jacko spawn:"
 msgstr ""
 
@@ -1625,12 +1625,12 @@ msgid "  Time for next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:421
+#: src/gui/killstats.cpp:415
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:428
+#: src/gui/killstats.cpp:422
 msgid "jacko spawning"
 msgstr ""
 
@@ -1736,32 +1736,32 @@ msgid "arrows bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:88
+#: src/gui/ministatuswindow.cpp:89
 msgid "status bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:108
+#: src/gui/ministatuswindow.cpp:109
 msgid "job bar"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:306 src/gui/statuswindow.cpp:298
+#: src/gui/ministatuswindow.cpp:307 src/gui/statuswindow.cpp:298
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:313 src/gui/statuswindow.cpp:141
+#: src/gui/ministatuswindow.cpp:314 src/gui/statuswindow.cpp:141
 #: src/gui/statuswindow.cpp:305 src/gui/statuswindow.cpp:375
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
 #. TRANSLATORS: status bar label
-#: src/gui/ministatuswindow.cpp:330 src/gui/ministatuswindow.cpp:367
+#: src/gui/ministatuswindow.cpp:331 src/gui/ministatuswindow.cpp:368
 msgid "Need"
 msgstr ""
 
@@ -2149,7 +2149,7 @@ msgstr ""
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2209 src/gui/popupmenu.cpp:2280
-#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:139
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
 #: src/gui/socialwindow.cpp:934
 msgid "(default)"
 msgstr ""
@@ -2332,7 +2332,7 @@ msgid "Passwords do not match."
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:257
 msgid "Choose Your Server"
 msgstr ""
 
@@ -2340,61 +2340,61 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:259 src/gui/shopwindow.cpp:94
+#: src/gui/serverdialog.cpp:268 src/gui/shopwindow.cpp:94
 #: src/gui/shopwindow.cpp:101 src/gui/tradewindow.cpp:77
 msgid "Add"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
-#: src/gui/serverdialog.cpp:261 src/gui/widgets/setupitem.cpp:299
+#: src/gui/serverdialog.cpp:270 src/gui/widgets/setupitem.cpp:299
 #: src/gui/widgets/setupitem.cpp:426
 msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:274
 msgid "Load"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:279
+#: src/gui/serverdialog.cpp:288
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:297
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:518
+#: src/gui/serverdialog.cpp:527
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:524
+#: src/gui/serverdialog.cpp:533
 msgid "Waiting for server..."
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:529
+#: src/gui/serverdialog.cpp:538
 msgid "Preparing download"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:534
+#: src/gui/serverdialog.cpp:543
 msgid "Error retreiving server list!"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:626
+#: src/gui/serverdialog.cpp:635
 msgid "requires a newer version"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:631
+#: src/gui/serverdialog.cpp:640
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -3405,7 +3405,7 @@ msgid "Type:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:334
+#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:336
 msgid "Delay:"
 msgstr ""
 
@@ -3425,30 +3425,30 @@ msgid "Blue:"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:420
+#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:422
 msgid "Static"
 msgstr ""
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:107 src/gui/setup_colors.cpp:110
-#: src/gui/setup_colors.cpp:422
+#: src/gui/setup_colors.cpp:424
 msgid "Pulse"
 msgstr ""
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:112 src/gui/setup_colors.cpp:115
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Rainbow"
 msgstr ""
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:117 src/gui/setup_colors.cpp:120
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Spectrum"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:328
+#: src/gui/setup_colors.cpp:330
 msgid "Alpha:"
 msgstr ""
 
@@ -3614,7 +3614,7 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: palette color
-#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:134
+#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:135
 msgid "Monsters"
 msgstr ""
 
@@ -4163,206 +4163,231 @@ msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:86
-msgid "Very small (9)"
+msgid "Very small (8)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:88
-msgid "Tiny (10)"
+msgid "Very small (9)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:90
-msgid "Small (11)"
+msgid "Tiny (10)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:92
-msgid "Medium (12)"
+msgid "Small (11)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:94
-msgid "Normal (13)"
+msgid "Medium (12)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:96
-msgid "Large (14)"
+msgid "Normal (13)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:98
-msgid "Very large (15)"
+msgid "Large (14)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:100
-msgid "Big (16)"
+msgid "Large (15)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:102
-msgid "Very big (17)"
+msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:104
-msgid "Huge (18)"
+msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:106
-msgid "Very huge (19)"
+msgid "Big (18)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:108
+msgid "Big (19)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:110
+msgid "Very big (20)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:112
+msgid "Very big (21)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:114
+msgid "Very big (22)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:116
+msgid "Huge (23)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:151
 msgid "Chinese (China)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:153
 msgid "Czech"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:155
 msgid "English"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:157
 msgid "Finnish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:159
 msgid "French"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:161
 msgid "German"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:153
+#: src/gui/setup_theme.cpp:163
 msgid "Indonesian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:155
+#: src/gui/setup_theme.cpp:165
 msgid "Italian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:157
+#: src/gui/setup_theme.cpp:167
 msgid "Polish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:159
+#: src/gui/setup_theme.cpp:169
 msgid "Japanese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:161
+#: src/gui/setup_theme.cpp:171
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:163
+#: src/gui/setup_theme.cpp:173
 msgid "Portuguese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:165
+#: src/gui/setup_theme.cpp:175
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:167
+#: src/gui/setup_theme.cpp:177
 msgid "Russian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:169
+#: src/gui/setup_theme.cpp:179
 msgid "Spanish (Castilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:171
+#: src/gui/setup_theme.cpp:181
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:223
+#: src/gui/setup_theme.cpp:233
 msgid "Gui theme"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:230
+#: src/gui/setup_theme.cpp:240
 msgid "Main Font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:235
+#: src/gui/setup_theme.cpp:245
 msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:239
+#: src/gui/setup_theme.cpp:249
 msgid "Bold font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:243
+#: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:247
+#: src/gui/setup_theme.cpp:257
 msgid "Help font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:251
+#: src/gui/setup_theme.cpp:261
 msgid "Secure font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:255
+#: src/gui/setup_theme.cpp:265
 msgid "Japanese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:260
+#: src/gui/setup_theme.cpp:270
 msgid "Font size"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:265
+#: src/gui/setup_theme.cpp:275
 msgid "Npc font size"
 msgstr ""
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/setup_theme.cpp:269
+#: src/gui/setup_theme.cpp:279
 msgid "i"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/setup_theme.cpp:442
+#: src/gui/setup_theme.cpp:452
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/setup_theme.cpp:467
+#: src/gui/setup_theme.cpp:477
 msgid "Theme Changed"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/setup_theme.cpp:467 src/gui/setup_video.cpp:537
+#: src/gui/setup_theme.cpp:477 src/gui/setup_video.cpp:537
 #: src/gui/setup_video.cpp:546
 msgid "Restart your client for the change to take effect."
 msgstr ""
@@ -4660,7 +4685,8 @@ msgid "Ambient FX"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_visual.cpp:140
+#. TRANSLATORS: palette color
+#: src/gui/setup_visual.cpp:140 src/gui/userpalette.cpp:146
 msgid "Particle effects"
 msgstr ""
 
@@ -4747,45 +4773,45 @@ msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/skilldialog.cpp:270 src/gui/windowmenu.cpp:112
+#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:112
 msgid "Skills"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/skilldialog.cpp:279
+#: src/gui/skilldialog.cpp:281
 msgid "Up"
 msgstr ""
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/skilldialog.cpp:391
+#: src/gui/skilldialog.cpp:393
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skills tab
-#: src/gui/skilldialog.cpp:444
+#: src/gui/skilldialog.cpp:446
 msgid "basic"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill name
-#: src/gui/skilldialog.cpp:447
+#: src/gui/skilldialog.cpp:449
 msgid "basic, 1"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/skilldialog.cpp:484
+#: src/gui/skilldialog.cpp:486
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/skilldialog.cpp:518
+#: src/gui/skilldialog.cpp:520
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/skilldialog.cpp:612 src/gui/skilldialog.cpp:762
+#: src/gui/skilldialog.cpp:614 src/gui/skilldialog.cpp:764
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -5228,7 +5254,7 @@ msgid "Trade: You"
 msgstr ""
 
 #. TRANSLATORS: trade window money label
-#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:182
+#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:184
 #, c-format
 msgid "You get %s"
 msgstr ""
@@ -5244,12 +5270,12 @@ msgid "You give:"
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:393
+#: src/gui/tradewindow.cpp:396
 msgid "You don't have enough money."
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:475
+#: src/gui/tradewindow.cpp:479
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
@@ -5260,223 +5286,223 @@ msgid "Name: %s"
 msgstr ""
 
 #. TRANSLATORS: updater window name
-#: src/gui/updaterwindow.cpp:140
+#: src/gui/updaterwindow.cpp:156
 msgid "Updating..."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:165
+#: src/gui/updaterwindow.cpp:181
 msgid "Connecting..."
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/updaterwindow.cpp:656
+#: src/gui/updaterwindow.cpp:672
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/updaterwindow.cpp:658
+#: src/gui/updaterwindow.cpp:674
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:660
+#: src/gui/updaterwindow.cpp:676
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:839
+#: src/gui/updaterwindow.cpp:855
 msgid "Completed"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
 msgid "Being"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:118
-msgid "Friend Names"
+#: src/gui/userpalette.cpp:119
+msgid "Friend names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:120
-msgid "Disregarded Names"
+#: src/gui/userpalette.cpp:121
+msgid "Disregarded names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:122
-msgid "Ignored Names"
+#: src/gui/userpalette.cpp:123
+msgid "Ignored names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:124
-msgid "Erased Names"
+#: src/gui/userpalette.cpp:125
+msgid "Erased names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:126
-msgid "Other Players' Names"
+#: src/gui/userpalette.cpp:127
+msgid "Other players names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:128
-msgid "Own Name"
+#: src/gui/userpalette.cpp:129
+msgid "Own name"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:130
-msgid "GM Names"
+#: src/gui/userpalette.cpp:131
+msgid "GM names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
 msgid "NPCs"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
 msgid "Monster HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:140
 msgid "Monster HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:141
-msgid "Party Members"
+#: src/gui/userpalette.cpp:142
+msgid "Party members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:143
-msgid "Guild Members"
+#: src/gui/userpalette.cpp:144
+msgid "Guild members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:145
-msgid "Particle Effects"
+#: src/gui/userpalette.cpp:148
+msgid "Pickup notification"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:147
-msgid "Pickup Notification"
+#: src/gui/userpalette.cpp:150
+msgid "Exp notification"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:149
-msgid "Exp Notification"
-msgstr ""
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
 msgid "Player HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
 msgid "Player HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:157
-msgid "Player Hits Monster"
+#: src/gui/userpalette.cpp:158
+msgid "Player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:159
-msgid "Monster Hits Player"
+#: src/gui/userpalette.cpp:160
+msgid "Monster hits player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:163
-msgid "Other Player Hits Local Player"
+#: src/gui/userpalette.cpp:164
+msgid "Other player hits local player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:166
 msgid "Critical Hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
-msgid "Local Player Hits Monster"
+#: src/gui/userpalette.cpp:170
+msgid "Local player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:172
-msgid "Local Player Critical Hit"
+#: src/gui/userpalette.cpp:173
+msgid "Local player critical hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:175
-msgid "Local Player Miss"
+#: src/gui/userpalette.cpp:176
+msgid "Local player miss"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:177
+#: src/gui/userpalette.cpp:178
 msgid "Misses"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
-msgid "Portal Highlight"
+#: src/gui/userpalette.cpp:180
+msgid "Portal highlight"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:183
+msgid "Default collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:182
-msgid "Default collision Highlight"
+#: src/gui/userpalette.cpp:186
+msgid "Air collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:185
-msgid "Air collision Highlight"
+#: src/gui/userpalette.cpp:189
+msgid "Water collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:188
-msgid "Water collision Highlight"
+#: src/gui/userpalette.cpp:192
+msgid "Special ground collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:191
-msgid "Special ground collision Highlight"
+#: src/gui/userpalette.cpp:195
+msgid "Walkable highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
-msgid "Walkable Highlight"
+#: src/gui/userpalette.cpp:198
+msgid "Local player attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:197
-msgid "Local Player Attack Range"
+#: src/gui/userpalette.cpp:201
+msgid "Local player attack range border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:200
-msgid "Local Player Attack Range Border"
+#: src/gui/userpalette.cpp:204
+msgid "Monster attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:203
-msgid "Monster Attack Range"
+#: src/gui/userpalette.cpp:208
+msgid "Floor item amount color"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:206
-msgid "Home Place"
+#: src/gui/userpalette.cpp:211
+msgid "Home place"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:209
-msgid "Home Place Border"
+#: src/gui/userpalette.cpp:214
+msgid "Home place border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:212
-msgid "Road Point"
+#: src/gui/userpalette.cpp:217
+msgid "Road point"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
@@ -5606,7 +5632,7 @@ msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:315
+#: src/gui/widgets/itemcontainer.cpp:317
 msgid "Eq."
 msgstr ""
 
diff --git a/po/nb.po b/po/nb.po
index e50cab019..0454c72c8 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-05-03 12:38+0300\n"
-"PO-Revision-Date: 2013-05-03 09:44+0000\n"
+"POT-Creation-Date: 2013-05-10 18:34+0300\n"
+"PO-Revision-Date: 2013-05-10 15:39+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -59,25 +59,25 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: full button name
-#: src/client.cpp:1136 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
+#: src/client.cpp:1137 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
 msgid "Setup"
 msgstr ""
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1140 src/gui/setup_perfomance.cpp:61
+#: src/client.cpp:1141 src/gui/setup_perfomance.cpp:61
 msgid "Perfomance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:1143 src/gui/setup_video.cpp:258
+#: src/client.cpp:1144 src/gui/setup_video.cpp:258
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1146 src/gui/setup_theme.cpp:273
+#: src/client.cpp:1147 src/gui/setup_theme.cpp:283
 msgid "Theme"
 msgstr ""
 
@@ -88,7 +88,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1150 src/gui/didyouknowwindow.cpp:78
+#: src/client.cpp:1151 src/gui/didyouknowwindow.cpp:78
 #: src/gui/inventorywindow.cpp:228 src/gui/npcdialog.cpp:63
 #: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:574
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:80
@@ -96,32 +96,32 @@ msgid "Close"
 msgstr "Lukk"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1238
+#: src/client.cpp:1239
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1282
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1320
+#: src/client.cpp:1321
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1431
+#: src/client.cpp:1432
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1471
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1483
+#: src/client.cpp:1484
 msgid "Changing game servers"
 msgstr ""
 
@@ -136,69 +136,69 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1540 src/client.cpp:1551 src/client.cpp:1721
+#: src/client.cpp:1541 src/client.cpp:1552 src/client.cpp:1722
 #: src/gui/changeemaildialog.cpp:168 src/gui/changepassworddialog.cpp:158
-#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:288
-#: src/gui/editserverdialog.cpp:220 src/gui/registerdialog.cpp:263
+#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:290
+#: src/gui/editserverdialog.cpp:216 src/gui/registerdialog.cpp:263
 #: src/gui/unregisterdialog.cpp:143 src/net/ea/charserverhandler.cpp:190
 #: src/net/ea/charserverhandler.cpp:210
 msgid "Error"
 msgstr "Feil"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1564
+#: src/client.cpp:1565
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1601
+#: src/client.cpp:1602
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1603
+#: src/client.cpp:1604
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1624
+#: src/client.cpp:1625
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1626
+#: src/client.cpp:1627
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1647
+#: src/client.cpp:1648
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1649
+#: src/client.cpp:1650
 msgid "Farewell, come back any time..."
 msgstr ""
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1902 src/client.cpp:1917 src/client.cpp:1960
-#: src/client.cpp:1976 src/client.cpp:2417 src/client.cpp:2425
+#: src/client.cpp:1903 src/client.cpp:1918 src/client.cpp:1961
+#: src/client.cpp:1977 src/client.cpp:2418 src/client.cpp:2426
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2113
+#: src/client.cpp:2114
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2154 src/client.cpp:2161
+#: src/client.cpp:2155 src/client.cpp:2162
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:2183 src/client.cpp:2196
+#: src/client.cpp:2184 src/client.cpp:2197
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -478,19 +478,19 @@ msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: bot checker window header
-#: src/gui/botcheckerwindow.cpp:269
+#: src/gui/botcheckerwindow.cpp:268
 msgid "Bot Checker"
 msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:102
+#: src/gui/botcheckerwindow.cpp:277 src/gui/npcdialog.cpp:102
 msgid "Reset"
 msgstr "Tilbakestill"
 
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: relations table header
-#: src/gui/botcheckerwindow.cpp:305 src/gui/setup_relations.cpp:61
+#: src/gui/botcheckerwindow.cpp:304 src/gui/setup_relations.cpp:61
 msgid "Name"
 msgstr "Navn"
 
@@ -498,7 +498,7 @@ msgstr "Navn"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:145
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:145
 #: src/gui/popupmenu.cpp:241 src/gui/popupmenu.cpp:640
 #: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:257
 #: src/net/tmwa/generalhandler.cpp:292
@@ -508,7 +508,7 @@ msgstr ""
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
-#: src/gui/botcheckerwindow.cpp:309 src/gui/popupmenu.cpp:225
+#: src/gui/botcheckerwindow.cpp:308 src/gui/popupmenu.cpp:225
 #: src/gui/setupactiondata.h:93
 msgid "Talk"
 msgstr ""
@@ -516,7 +516,7 @@ msgstr ""
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/botcheckerwindow.cpp:311 src/gui/popupmenu.cpp:215
+#: src/gui/botcheckerwindow.cpp:310 src/gui/popupmenu.cpp:215
 #: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:371
 #: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:653
 #: src/gui/popupmenu.cpp:727 src/gui/setupactiondata.h:1856
@@ -524,7 +524,7 @@ msgid "Move"
 msgstr ""
 
 #. TRANSLATORS: bot checker window table header
-#: src/gui/botcheckerwindow.cpp:313
+#: src/gui/botcheckerwindow.cpp:312
 msgid "Result"
 msgstr ""
 
@@ -580,7 +580,7 @@ msgstr "Kjøp"
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:516
+#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:511
 #: src/gui/selldialog.cpp:94 src/gui/selldialog.cpp:342
 #, c-format
 msgid "Price: %s / Total: %s"
@@ -597,9 +597,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:208
-#: src/gui/itemamountwindow.cpp:243 src/gui/npcdialog.cpp:93
-#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:833
+#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:202
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:93
+#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:821
 msgid "+"
 msgstr ""
 
@@ -609,9 +609,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:240 src/gui/npcdialog.cpp:95
-#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:846
+#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:200
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:95
+#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:834
 msgid "-"
 msgstr ""
 
@@ -623,7 +623,7 @@ msgstr ""
 #. TRANSLATORS: input action name
 #: src/gui/buydialog.cpp:260 src/gui/quitdialog.cpp:54
 #: src/gui/quitdialog.cpp:59 src/gui/quitdialog.cpp:61
-#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:255
+#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:264
 #: src/gui/setupactiondata.h:177
 msgid "Quit"
 msgstr "Avslutt"
@@ -635,7 +635,7 @@ msgstr "Avslutt"
 #. TRANSLATORS: status bar label
 #: src/gui/buydialog.cpp:262 src/gui/selldialog.cpp:106
 #: src/gui/statuswindow.cpp:558 src/gui/statuswindow.cpp:615
-#: src/gui/statuswindow.cpp:830 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:852
 msgid "Max"
 msgstr "Maks"
 
@@ -680,7 +680,7 @@ msgstr "Selg"
 #: src/gui/buyselldialog.cpp:71 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:120
 #: src/gui/connectiondialog.cpp:48 src/gui/editserverdialog.cpp:80
-#: src/gui/itemamountwindow.cpp:212 src/gui/npcpostdialog.cpp:64
+#: src/gui/itemamountwindow.cpp:206 src/gui/npcpostdialog.cpp:64
 #: src/gui/popupmenu.cpp:290 src/gui/popupmenu.cpp:324
 #: src/gui/popupmenu.cpp:411 src/gui/popupmenu.cpp:454
 #: src/gui/popupmenu.cpp:485 src/gui/popupmenu.cpp:512
@@ -696,7 +696,7 @@ msgstr "Selg"
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
 #: src/gui/setup.cpp:84 src/gui/socialwindow.cpp:1204
 #: src/gui/textcommandeditor.cpp:212 src/gui/textdialog.cpp:53
-#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:167
+#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:183
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -860,7 +860,7 @@ msgstr "Vennligst distribuer %d poeng"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:570
+#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:581
 #: src/gui/socialwindow.cpp:1269
 msgid "Create"
 msgstr "Lag"
@@ -887,17 +887,17 @@ msgid "Please remove %d points"
 msgstr "Vennligst fjern %d poeng"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:60
+#: src/gui/charselectdialog.cpp:61
 msgid "Confirm Character Delete"
 msgstr "Bekreft karakter-sletting"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:62
+#: src/gui/charselectdialog.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "Er du sikker på at du vil slette denne karakteren?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:86
+#: src/gui/charselectdialog.cpp:87
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
@@ -909,8 +909,8 @@ msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:565
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:576
+#: src/gui/updaterwindow.cpp:185
 msgid "Play"
 msgstr ""
 
@@ -926,7 +926,7 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:263
+#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:272
 #: src/gui/setupactiondata.h:1803 src/gui/setup_relations.cpp:262
 #: src/gui/shopwindow.cpp:96 src/gui/shopwindow.cpp:103
 #: src/gui/textcommandeditor.cpp:216
@@ -936,24 +936,24 @@ msgstr "Slett"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/charselectdialog.cpp:129 src/gui/unregisterdialog.cpp:48
+#: src/gui/charselectdialog.cpp:130 src/gui/unregisterdialog.cpp:48
 #: src/gui/unregisterdialog.cpp:53
 msgid "Unregister"
 msgstr "Avregistrer"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/charselectdialog.cpp:141
+#: src/gui/charselectdialog.cpp:142
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:172
+#: src/gui/charselectdialog.cpp:175
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/charselectdialog.cpp:246
+#: src/gui/charselectdialog.cpp:248
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -963,16 +963,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:288
+#: src/gui/charselectdialog.cpp:290
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password:"
 msgstr ""
 
@@ -1059,13 +1059,13 @@ msgid "Chat"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:735
+#: src/gui/chatwindow.cpp:638
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1165
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -1083,7 +1083,7 @@ msgstr "Nei"
 
 #. TRANSLATORS: confirm dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/confirmdialog.cpp:58 src/gui/popupmenu.cpp:2429
+#: src/gui/confirmdialog.cpp:55 src/gui/popupmenu.cpp:2429
 #: src/gui/popupmenu.cpp:2442 src/gui/popupmenu.cpp:2457
 #: src/gui/popupmenu.cpp:2483
 msgid "Ignore"
@@ -1092,7 +1092,7 @@ msgstr ""
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
 #. TRANSLATORS: settings group
-#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:109
+#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:108
 #: src/gui/setup_other.cpp:123 src/gui/windowmenu.cpp:106
 msgid "Map"
 msgstr "Kart"
@@ -1108,190 +1108,190 @@ msgid "Net"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:265
-#: src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:268
+#: src/gui/debugwindow.cpp:311
 msgid "Music:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:153 src/gui/debugwindow.cpp:271
-#: src/gui/debugwindow.cpp:312
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:274
+#: src/gui/debugwindow.cpp:315
 msgid "Map:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:155 src/gui/debugwindow.cpp:268
-#: src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:271
+#: src/gui/debugwindow.cpp:313
 msgid "Minimap:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:262
-#: src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:161 src/gui/debugwindow.cpp:265
+#: src/gui/debugwindow.cpp:309
 msgid "Cursor:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:161
+#: src/gui/debugwindow.cpp:164
 msgid "Particle count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:284
-#: src/gui/debugwindow.cpp:316
+#: src/gui/debugwindow.cpp:167 src/gui/debugwindow.cpp:287
+#: src/gui/debugwindow.cpp:319
 msgid "Map actors count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:166 src/gui/debugwindow.cpp:243
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:169 src/gui/debugwindow.cpp:246
+#: src/gui/debugwindow.cpp:252
 msgid "Player Position:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:172 src/gui/debugwindow.cpp:297
+#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:300
 msgid "Draw calls:"
 msgstr ""
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:175
+#. TRANSLATORS: debug window label, frames per second
+#: src/gui/debugwindow.cpp:178
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:177 src/gui/debugwindow.cpp:324
+#. TRANSLATORS: debug window label, logic per second
+#: src/gui/debugwindow.cpp:180 src/gui/debugwindow.cpp:327
 #, c-format
 msgid "%d LPS"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:191 src/gui/debugwindow.cpp:209
 #, c-format
 msgid "%d FPS (Software)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:193
+#: src/gui/debugwindow.cpp:196
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:197
+#: src/gui/debugwindow.cpp:200
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:201
+#: src/gui/debugwindow.cpp:204
 #, c-format
 msgid "%d FPS (mobile OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:225 src/gui/debugwindow.cpp:290
+#: src/gui/debugwindow.cpp:228 src/gui/debugwindow.cpp:293
 msgid "Textures count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:279
+#: src/gui/debugwindow.cpp:282
 #, c-format
 msgid "Particle count: %d"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:330 src/gui/debugwindow.cpp:380
-#: src/gui/debugwindow.cpp:442
+#: src/gui/debugwindow.cpp:333 src/gui/debugwindow.cpp:383
+#: src/gui/debugwindow.cpp:445
 msgid "Target:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:332 src/gui/debugwindow.cpp:386
-#: src/gui/debugwindow.cpp:444
+#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
+#: src/gui/debugwindow.cpp:447
 msgid "Target Id:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
-#: src/gui/debugwindow.cpp:446
+#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:392
+#: src/gui/debugwindow.cpp:449
 msgid "Target type:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:337
+#: src/gui/debugwindow.cpp:340
 msgid "Target level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:339 src/gui/debugwindow.cpp:405
+#: src/gui/debugwindow.cpp:342 src/gui/debugwindow.cpp:408
 msgid "Target race:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:341
+#: src/gui/debugwindow.cpp:344
 msgid "Target party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:346
 msgid "Target guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:430
-#: src/gui/debugwindow.cpp:436 src/gui/debugwindow.cpp:454
+#: src/gui/debugwindow.cpp:348 src/gui/debugwindow.cpp:433
+#: src/gui/debugwindow.cpp:439 src/gui/debugwindow.cpp:457
 msgid "Attack delay:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:347 src/gui/debugwindow.cpp:417
-#: src/gui/debugwindow.cpp:456
+#: src/gui/debugwindow.cpp:350 src/gui/debugwindow.cpp:420
+#: src/gui/debugwindow.cpp:459
 msgid "Minimal hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:349 src/gui/debugwindow.cpp:420
-#: src/gui/debugwindow.cpp:458
+#: src/gui/debugwindow.cpp:352 src/gui/debugwindow.cpp:423
+#: src/gui/debugwindow.cpp:461
 msgid "Maximum hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:351 src/gui/debugwindow.cpp:423
-#: src/gui/debugwindow.cpp:460
+#: src/gui/debugwindow.cpp:354 src/gui/debugwindow.cpp:426
+#: src/gui/debugwindow.cpp:463
 msgid "Critical hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:394 src/gui/debugwindow.cpp:400
-#: src/gui/debugwindow.cpp:448
+#: src/gui/debugwindow.cpp:397 src/gui/debugwindow.cpp:403
+#: src/gui/debugwindow.cpp:451
 msgid "Target Level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:408 src/gui/debugwindow.cpp:450
+#: src/gui/debugwindow.cpp:411 src/gui/debugwindow.cpp:453
 msgid "Target Party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:412 src/gui/debugwindow.cpp:452
+#: src/gui/debugwindow.cpp:415 src/gui/debugwindow.cpp:455
 msgid "Target Guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:493
+#: src/gui/debugwindow.cpp:496
 #, c-format
 msgid "Ping: %s ms"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:496
+#: src/gui/debugwindow.cpp:499
 #, c-format
 msgid "In: %d bytes/s"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:499
+#: src/gui/debugwindow.cpp:502
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
@@ -1323,7 +1323,7 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #: src/gui/editdialog.cpp:45 src/gui/editserverdialog.cpp:78
-#: src/gui/itemamountwindow.cpp:210 src/gui/okdialog.cpp:51
+#: src/gui/itemamountwindow.cpp:204 src/gui/okdialog.cpp:51
 #: src/gui/quitdialog.cpp:70 src/gui/textdialog.cpp:46
 msgid "OK"
 msgstr "OK"
@@ -1335,7 +1335,7 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:257
+#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:266
 msgid "Connect"
 msgstr ""
 
@@ -1365,7 +1365,7 @@ msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/editserverdialog.cpp:222
+#: src/gui/editserverdialog.cpp:218
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -1417,7 +1417,7 @@ msgstr ""
 #: src/gui/inventorywindow.cpp:178 src/gui/inventorywindow.cpp:630
 #: src/gui/popupmenu.cpp:1843 src/gui/popupmenu.cpp:1922
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2041
-#: src/gui/skilldialog.cpp:277
+#: src/gui/skilldialog.cpp:279
 msgid "Use"
 msgstr "Bruk"
 
@@ -1451,7 +1451,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: setup button
-#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:718
+#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:719
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1992
 #: src/gui/popupmenu.cpp:2066 src/gui/setup.cpp:86
 msgid "Store"
@@ -1473,47 +1473,47 @@ msgid "Drop"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/itemamountwindow.cpp:214
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "Alt"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:264
 msgid "Select amount of items to trade."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:274
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to drop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:278
+#: src/gui/itemamountwindow.cpp:272
 msgid "Select amount of items to store."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:276
 msgid "Select amount of items to retrieve."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:286
+#: src/gui/itemamountwindow.cpp:280
 msgid "Select amount of items to split."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:290
+#: src/gui/itemamountwindow.cpp:284
 msgid "Add to buy shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:294
+#: src/gui/itemamountwindow.cpp:288
 msgid "Add to sell shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:298
+#: src/gui/itemamountwindow.cpp:292
 msgid "Unknown."
 msgstr ""
 
@@ -1540,7 +1540,7 @@ msgstr ""
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:58 src/gui/killstats.cpp:171
-#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:516
+#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:509
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
@@ -1548,7 +1548,7 @@ msgstr ""
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:61 src/gui/killstats.cpp:173
 #: src/gui/killstats.cpp:253 src/gui/killstats.cpp:268
-#: src/gui/killstats.cpp:518
+#: src/gui/killstats.cpp:511
 #, c-format
 msgid "Avg Exp: %s"
 msgstr ""
@@ -1556,14 +1556,14 @@ msgstr ""
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:63 src/gui/killstats.cpp:176
 #: src/gui/killstats.cpp:258 src/gui/killstats.cpp:272
-#: src/gui/killstats.cpp:521
+#: src/gui/killstats.cpp:514
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:66 src/gui/killstats.cpp:187
-#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:524
+#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:517
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
@@ -1591,9 +1591,9 @@ msgid "Last kill exp:"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:414
-#: src/gui/killstats.cpp:421 src/gui/killstats.cpp:428
-#: src/gui/killstats.cpp:434
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:408
+#: src/gui/killstats.cpp:415 src/gui/killstats.cpp:422
+#: src/gui/killstats.cpp:428
 msgid "Time before jacko spawn:"
 msgstr ""
 
@@ -1625,12 +1625,12 @@ msgid "  Time for next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:421
+#: src/gui/killstats.cpp:415
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:428
+#: src/gui/killstats.cpp:422
 msgid "jacko spawning"
 msgstr ""
 
@@ -1736,32 +1736,32 @@ msgid "arrows bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:88
+#: src/gui/ministatuswindow.cpp:89
 msgid "status bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:108
+#: src/gui/ministatuswindow.cpp:109
 msgid "job bar"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:306 src/gui/statuswindow.cpp:298
+#: src/gui/ministatuswindow.cpp:307 src/gui/statuswindow.cpp:298
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:313 src/gui/statuswindow.cpp:141
+#: src/gui/ministatuswindow.cpp:314 src/gui/statuswindow.cpp:141
 #: src/gui/statuswindow.cpp:305 src/gui/statuswindow.cpp:375
 #, c-format
 msgid "Level: %d"
 msgstr "Nivå: %d"
 
 #. TRANSLATORS: status bar label
-#: src/gui/ministatuswindow.cpp:330 src/gui/ministatuswindow.cpp:367
+#: src/gui/ministatuswindow.cpp:331 src/gui/ministatuswindow.cpp:368
 msgid "Need"
 msgstr ""
 
@@ -2149,7 +2149,7 @@ msgstr ""
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2209 src/gui/popupmenu.cpp:2280
-#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:139
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
 #: src/gui/socialwindow.cpp:934
 msgid "(default)"
 msgstr ""
@@ -2332,7 +2332,7 @@ msgid "Passwords do not match."
 msgstr "Passordene stemmer ikke."
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:257
 msgid "Choose Your Server"
 msgstr ""
 
@@ -2340,61 +2340,61 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:259 src/gui/shopwindow.cpp:94
+#: src/gui/serverdialog.cpp:268 src/gui/shopwindow.cpp:94
 #: src/gui/shopwindow.cpp:101 src/gui/tradewindow.cpp:77
 msgid "Add"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
-#: src/gui/serverdialog.cpp:261 src/gui/widgets/setupitem.cpp:299
+#: src/gui/serverdialog.cpp:270 src/gui/widgets/setupitem.cpp:299
 #: src/gui/widgets/setupitem.cpp:426
 msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:274
 msgid "Load"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:279
+#: src/gui/serverdialog.cpp:288
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:297
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:518
+#: src/gui/serverdialog.cpp:527
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:524
+#: src/gui/serverdialog.cpp:533
 msgid "Waiting for server..."
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:529
+#: src/gui/serverdialog.cpp:538
 msgid "Preparing download"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:534
+#: src/gui/serverdialog.cpp:543
 msgid "Error retreiving server list!"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:626
+#: src/gui/serverdialog.cpp:635
 msgid "requires a newer version"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:631
+#: src/gui/serverdialog.cpp:640
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -3405,7 +3405,7 @@ msgid "Type:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:334
+#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:336
 msgid "Delay:"
 msgstr ""
 
@@ -3425,30 +3425,30 @@ msgid "Blue:"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:420
+#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:422
 msgid "Static"
 msgstr "Statisk"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:107 src/gui/setup_colors.cpp:110
-#: src/gui/setup_colors.cpp:422
+#: src/gui/setup_colors.cpp:424
 msgid "Pulse"
 msgstr "Puls"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:112 src/gui/setup_colors.cpp:115
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Rainbow"
 msgstr "Regnbue"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:117 src/gui/setup_colors.cpp:120
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Spectrum"
 msgstr "Spektrum"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:328
+#: src/gui/setup_colors.cpp:330
 msgid "Alpha:"
 msgstr ""
 
@@ -3614,7 +3614,7 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: palette color
-#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:134
+#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:135
 msgid "Monsters"
 msgstr "Monstre"
 
@@ -4163,206 +4163,231 @@ msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:86
-msgid "Very small (9)"
+msgid "Very small (8)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:88
-msgid "Tiny (10)"
+msgid "Very small (9)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:90
-msgid "Small (11)"
+msgid "Tiny (10)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:92
-msgid "Medium (12)"
+msgid "Small (11)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:94
-msgid "Normal (13)"
+msgid "Medium (12)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:96
-msgid "Large (14)"
+msgid "Normal (13)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:98
-msgid "Very large (15)"
+msgid "Large (14)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:100
-msgid "Big (16)"
+msgid "Large (15)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:102
-msgid "Very big (17)"
+msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:104
-msgid "Huge (18)"
+msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:106
-msgid "Very huge (19)"
+msgid "Big (18)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:108
+msgid "Big (19)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:110
+msgid "Very big (20)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:112
+msgid "Very big (21)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:114
+msgid "Very big (22)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:116
+msgid "Huge (23)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:151
 msgid "Chinese (China)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:153
 msgid "Czech"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:155
 msgid "English"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:157
 msgid "Finnish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:159
 msgid "French"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:161
 msgid "German"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:153
+#: src/gui/setup_theme.cpp:163
 msgid "Indonesian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:155
+#: src/gui/setup_theme.cpp:165
 msgid "Italian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:157
+#: src/gui/setup_theme.cpp:167
 msgid "Polish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:159
+#: src/gui/setup_theme.cpp:169
 msgid "Japanese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:161
+#: src/gui/setup_theme.cpp:171
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:163
+#: src/gui/setup_theme.cpp:173
 msgid "Portuguese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:165
+#: src/gui/setup_theme.cpp:175
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:167
+#: src/gui/setup_theme.cpp:177
 msgid "Russian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:169
+#: src/gui/setup_theme.cpp:179
 msgid "Spanish (Castilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:171
+#: src/gui/setup_theme.cpp:181
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:223
+#: src/gui/setup_theme.cpp:233
 msgid "Gui theme"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:230
+#: src/gui/setup_theme.cpp:240
 msgid "Main Font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:235
+#: src/gui/setup_theme.cpp:245
 msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:239
+#: src/gui/setup_theme.cpp:249
 msgid "Bold font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:243
+#: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:247
+#: src/gui/setup_theme.cpp:257
 msgid "Help font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:251
+#: src/gui/setup_theme.cpp:261
 msgid "Secure font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:255
+#: src/gui/setup_theme.cpp:265
 msgid "Japanese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:260
+#: src/gui/setup_theme.cpp:270
 msgid "Font size"
 msgstr "Skriftstørrelse"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:265
+#: src/gui/setup_theme.cpp:275
 msgid "Npc font size"
 msgstr ""
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/setup_theme.cpp:269
+#: src/gui/setup_theme.cpp:279
 msgid "i"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/setup_theme.cpp:442
+#: src/gui/setup_theme.cpp:452
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/setup_theme.cpp:467
+#: src/gui/setup_theme.cpp:477
 msgid "Theme Changed"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/setup_theme.cpp:467 src/gui/setup_video.cpp:537
+#: src/gui/setup_theme.cpp:477 src/gui/setup_video.cpp:537
 #: src/gui/setup_video.cpp:546
 msgid "Restart your client for the change to take effect."
 msgstr ""
@@ -4660,7 +4685,8 @@ msgid "Ambient FX"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_visual.cpp:140
+#. TRANSLATORS: palette color
+#: src/gui/setup_visual.cpp:140 src/gui/userpalette.cpp:146
 msgid "Particle effects"
 msgstr "Partikkeleffekter"
 
@@ -4747,45 +4773,45 @@ msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/skilldialog.cpp:270 src/gui/windowmenu.cpp:112
+#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:112
 msgid "Skills"
 msgstr "Ferdigheter"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/skilldialog.cpp:279
+#: src/gui/skilldialog.cpp:281
 msgid "Up"
 msgstr "Opp"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/skilldialog.cpp:391
+#: src/gui/skilldialog.cpp:393
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skills tab
-#: src/gui/skilldialog.cpp:444
+#: src/gui/skilldialog.cpp:446
 msgid "basic"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill name
-#: src/gui/skilldialog.cpp:447
+#: src/gui/skilldialog.cpp:449
 msgid "basic, 1"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/skilldialog.cpp:484
+#: src/gui/skilldialog.cpp:486
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/skilldialog.cpp:518
+#: src/gui/skilldialog.cpp:520
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/skilldialog.cpp:612 src/gui/skilldialog.cpp:762
+#: src/gui/skilldialog.cpp:614 src/gui/skilldialog.cpp:764
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -5228,7 +5254,7 @@ msgid "Trade: You"
 msgstr ""
 
 #. TRANSLATORS: trade window money label
-#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:182
+#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:184
 #, c-format
 msgid "You get %s"
 msgstr ""
@@ -5244,12 +5270,12 @@ msgid "You give:"
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:393
+#: src/gui/tradewindow.cpp:396
 msgid "You don't have enough money."
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:475
+#: src/gui/tradewindow.cpp:479
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
@@ -5261,223 +5287,223 @@ msgid "Name: %s"
 msgstr "Navn: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/updaterwindow.cpp:140
+#: src/gui/updaterwindow.cpp:156
 msgid "Updating..."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:165
+#: src/gui/updaterwindow.cpp:181
 msgid "Connecting..."
 msgstr "Kobler til..."
 
 #. TRANSLATORS: update message
-#: src/gui/updaterwindow.cpp:656
+#: src/gui/updaterwindow.cpp:672
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/updaterwindow.cpp:658
+#: src/gui/updaterwindow.cpp:674
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:660
+#: src/gui/updaterwindow.cpp:676
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:839
+#: src/gui/updaterwindow.cpp:855
 msgid "Completed"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
 msgid "Being"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:118
-msgid "Friend Names"
+#: src/gui/userpalette.cpp:119
+msgid "Friend names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:120
-msgid "Disregarded Names"
+#: src/gui/userpalette.cpp:121
+msgid "Disregarded names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:122
-msgid "Ignored Names"
+#: src/gui/userpalette.cpp:123
+msgid "Ignored names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:124
-msgid "Erased Names"
+#: src/gui/userpalette.cpp:125
+msgid "Erased names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:126
-msgid "Other Players' Names"
-msgstr "Andre Spilleres Navn"
+#: src/gui/userpalette.cpp:127
+msgid "Other players names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:128
-msgid "Own Name"
-msgstr "Eget Navn"
+#: src/gui/userpalette.cpp:129
+msgid "Own name"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:130
-msgid "GM Names"
-msgstr "GM Navn"
+#: src/gui/userpalette.cpp:131
+msgid "GM names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
 msgid "NPCs"
 msgstr "NPCer"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
 msgid "Monster HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:140
 msgid "Monster HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:141
-msgid "Party Members"
+#: src/gui/userpalette.cpp:142
+msgid "Party members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:143
-msgid "Guild Members"
+#: src/gui/userpalette.cpp:144
+msgid "Guild members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:145
-msgid "Particle Effects"
-msgstr "Partikkeleffekter"
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:147
-msgid "Pickup Notification"
+#: src/gui/userpalette.cpp:148
+msgid "Pickup notification"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:149
-msgid "Exp Notification"
+#: src/gui/userpalette.cpp:150
+msgid "Exp notification"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
 msgid "Player HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
 msgid "Player HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:157
-msgid "Player Hits Monster"
+#: src/gui/userpalette.cpp:158
+msgid "Player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:159
-msgid "Monster Hits Player"
+#: src/gui/userpalette.cpp:160
+msgid "Monster hits player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:163
-msgid "Other Player Hits Local Player"
+#: src/gui/userpalette.cpp:164
+msgid "Other player hits local player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:166
 msgid "Critical Hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
-msgid "Local Player Hits Monster"
+#: src/gui/userpalette.cpp:170
+msgid "Local player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:172
-msgid "Local Player Critical Hit"
+#: src/gui/userpalette.cpp:173
+msgid "Local player critical hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:175
-msgid "Local Player Miss"
+#: src/gui/userpalette.cpp:176
+msgid "Local player miss"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:177
+#: src/gui/userpalette.cpp:178
 msgid "Misses"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
-msgid "Portal Highlight"
+#: src/gui/userpalette.cpp:180
+msgid "Portal highlight"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:183
+msgid "Default collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:182
-msgid "Default collision Highlight"
+#: src/gui/userpalette.cpp:186
+msgid "Air collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:185
-msgid "Air collision Highlight"
+#: src/gui/userpalette.cpp:189
+msgid "Water collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:188
-msgid "Water collision Highlight"
+#: src/gui/userpalette.cpp:192
+msgid "Special ground collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:191
-msgid "Special ground collision Highlight"
+#: src/gui/userpalette.cpp:195
+msgid "Walkable highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
-msgid "Walkable Highlight"
+#: src/gui/userpalette.cpp:198
+msgid "Local player attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:197
-msgid "Local Player Attack Range"
+#: src/gui/userpalette.cpp:201
+msgid "Local player attack range border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:200
-msgid "Local Player Attack Range Border"
+#: src/gui/userpalette.cpp:204
+msgid "Monster attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:203
-msgid "Monster Attack Range"
+#: src/gui/userpalette.cpp:208
+msgid "Floor item amount color"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:206
-msgid "Home Place"
+#: src/gui/userpalette.cpp:211
+msgid "Home place"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:209
-msgid "Home Place Border"
+#: src/gui/userpalette.cpp:214
+msgid "Home place border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:212
-msgid "Road Point"
+#: src/gui/userpalette.cpp:217
+msgid "Road point"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
@@ -5607,7 +5633,7 @@ msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:315
+#: src/gui/widgets/itemcontainer.cpp:317
 msgid "Eq."
 msgstr ""
 
diff --git a/po/nl.po b/po/nl.po
index 1f7518a60..da3aed6ed 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-05-03 12:38+0300\n"
-"PO-Revision-Date: 2013-05-03 09:44+0000\n"
+"POT-Creation-Date: 2013-05-10 18:34+0300\n"
+"PO-Revision-Date: 2013-05-10 15:39+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/manaplus/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -60,25 +60,25 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: full button name
-#: src/client.cpp:1136 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
+#: src/client.cpp:1137 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
 msgid "Setup"
 msgstr "Configureren"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1140 src/gui/setup_perfomance.cpp:61
+#: src/client.cpp:1141 src/gui/setup_perfomance.cpp:61
 msgid "Perfomance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:1143 src/gui/setup_video.cpp:258
+#: src/client.cpp:1144 src/gui/setup_video.cpp:258
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1146 src/gui/setup_theme.cpp:273
+#: src/client.cpp:1147 src/gui/setup_theme.cpp:283
 msgid "Theme"
 msgstr ""
 
@@ -89,7 +89,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1150 src/gui/didyouknowwindow.cpp:78
+#: src/client.cpp:1151 src/gui/didyouknowwindow.cpp:78
 #: src/gui/inventorywindow.cpp:228 src/gui/npcdialog.cpp:63
 #: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:574
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:80
@@ -97,32 +97,32 @@ msgid "Close"
 msgstr "Sluiten"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1238
+#: src/client.cpp:1239
 msgid "Connecting to server"
 msgstr "Verbinden met server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1282
 msgid "Logging in"
 msgstr "Aanmelden"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1320
+#: src/client.cpp:1321
 msgid "Entering game world"
 msgstr "Spelwereld binnengaan"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1431
+#: src/client.cpp:1432
 msgid "Requesting characters"
 msgstr "Personages aanvragen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1471
 msgid "Connecting to the game server"
 msgstr "Verbinden met de spelserver"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1483
+#: src/client.cpp:1484
 msgid "Changing game servers"
 msgstr "Van spelserver wissellen"
 
@@ -137,69 +137,69 @@ msgstr "Van spelserver wissellen"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1540 src/client.cpp:1551 src/client.cpp:1721
+#: src/client.cpp:1541 src/client.cpp:1552 src/client.cpp:1722
 #: src/gui/changeemaildialog.cpp:168 src/gui/changepassworddialog.cpp:158
-#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:288
-#: src/gui/editserverdialog.cpp:220 src/gui/registerdialog.cpp:263
+#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:290
+#: src/gui/editserverdialog.cpp:216 src/gui/registerdialog.cpp:263
 #: src/gui/unregisterdialog.cpp:143 src/net/ea/charserverhandler.cpp:190
 #: src/net/ea/charserverhandler.cpp:210
 msgid "Error"
 msgstr "Fout"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1564
+#: src/client.cpp:1565
 msgid "Requesting registration details"
 msgstr "Registratiedetails aanvragen"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1601
+#: src/client.cpp:1602
 msgid "Password Change"
 msgstr "Verander Wachtwoord"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1603
+#: src/client.cpp:1604
 msgid "Password changed successfully!"
 msgstr "Wachtwoord veranderen geslaagd!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1624
+#: src/client.cpp:1625
 msgid "Email Change"
 msgstr "Verander E-mail"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1626
+#: src/client.cpp:1627
 msgid "Email changed successfully!"
 msgstr "E-mail veranderen geslaagd!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1647
+#: src/client.cpp:1648
 msgid "Unregister Successful"
 msgstr "Uitschrijven geslaagd!"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1649
+#: src/client.cpp:1650
 msgid "Farewell, come back any time..."
 msgstr "Vaarwel, je mag altijd terugkomen..."
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1902 src/client.cpp:1917 src/client.cpp:1960
-#: src/client.cpp:1976 src/client.cpp:2417 src/client.cpp:2425
+#: src/client.cpp:1903 src/client.cpp:1918 src/client.cpp:1961
+#: src/client.cpp:1977 src/client.cpp:2418 src/client.cpp:2426
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s bestaat niet en kan niet worden aangemaakt! Sluiten."
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2113
+#: src/client.cpp:2114
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Ongeldige bijwerkhost: %s"
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2154 src/client.cpp:2161
+#: src/client.cpp:2155 src/client.cpp:2162
 msgid "Error creating updates directory!"
 msgstr "Fout bij het creëren van de update map!"
 
-#: src/client.cpp:2183 src/client.cpp:2196
+#: src/client.cpp:2184 src/client.cpp:2197
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Fout: %s bestaat niet en kan niet worden aangemaakt! Sluiten."
@@ -479,19 +479,19 @@ msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: bot checker window header
-#: src/gui/botcheckerwindow.cpp:269
+#: src/gui/botcheckerwindow.cpp:268
 msgid "Bot Checker"
 msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:102
+#: src/gui/botcheckerwindow.cpp:277 src/gui/npcdialog.cpp:102
 msgid "Reset"
 msgstr "Reset"
 
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: relations table header
-#: src/gui/botcheckerwindow.cpp:305 src/gui/setup_relations.cpp:61
+#: src/gui/botcheckerwindow.cpp:304 src/gui/setup_relations.cpp:61
 msgid "Name"
 msgstr "Naam"
 
@@ -499,7 +499,7 @@ msgstr "Naam"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:145
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:145
 #: src/gui/popupmenu.cpp:241 src/gui/popupmenu.cpp:640
 #: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:257
 #: src/net/tmwa/generalhandler.cpp:292
@@ -509,7 +509,7 @@ msgstr "Aanvallen"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
-#: src/gui/botcheckerwindow.cpp:309 src/gui/popupmenu.cpp:225
+#: src/gui/botcheckerwindow.cpp:308 src/gui/popupmenu.cpp:225
 #: src/gui/setupactiondata.h:93
 msgid "Talk"
 msgstr "Spreken"
@@ -517,7 +517,7 @@ msgstr "Spreken"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/botcheckerwindow.cpp:311 src/gui/popupmenu.cpp:215
+#: src/gui/botcheckerwindow.cpp:310 src/gui/popupmenu.cpp:215
 #: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:371
 #: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:653
 #: src/gui/popupmenu.cpp:727 src/gui/setupactiondata.h:1856
@@ -525,7 +525,7 @@ msgid "Move"
 msgstr ""
 
 #. TRANSLATORS: bot checker window table header
-#: src/gui/botcheckerwindow.cpp:313
+#: src/gui/botcheckerwindow.cpp:312
 msgid "Result"
 msgstr ""
 
@@ -581,7 +581,7 @@ msgstr "Kopen"
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:516
+#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:511
 #: src/gui/selldialog.cpp:94 src/gui/selldialog.cpp:342
 #, c-format
 msgid "Price: %s / Total: %s"
@@ -598,9 +598,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:208
-#: src/gui/itemamountwindow.cpp:243 src/gui/npcdialog.cpp:93
-#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:833
+#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:202
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:93
+#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:821
 msgid "+"
 msgstr ""
 
@@ -610,9 +610,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:240 src/gui/npcdialog.cpp:95
-#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:846
+#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:200
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:95
+#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:834
 msgid "-"
 msgstr ""
 
@@ -624,7 +624,7 @@ msgstr ""
 #. TRANSLATORS: input action name
 #: src/gui/buydialog.cpp:260 src/gui/quitdialog.cpp:54
 #: src/gui/quitdialog.cpp:59 src/gui/quitdialog.cpp:61
-#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:255
+#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:264
 #: src/gui/setupactiondata.h:177
 msgid "Quit"
 msgstr "Afsluiten"
@@ -636,7 +636,7 @@ msgstr "Afsluiten"
 #. TRANSLATORS: status bar label
 #: src/gui/buydialog.cpp:262 src/gui/selldialog.cpp:106
 #: src/gui/statuswindow.cpp:558 src/gui/statuswindow.cpp:615
-#: src/gui/statuswindow.cpp:830 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:852
 msgid "Max"
 msgstr "Maximum"
 
@@ -681,7 +681,7 @@ msgstr "Verkopen"
 #: src/gui/buyselldialog.cpp:71 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:120
 #: src/gui/connectiondialog.cpp:48 src/gui/editserverdialog.cpp:80
-#: src/gui/itemamountwindow.cpp:212 src/gui/npcpostdialog.cpp:64
+#: src/gui/itemamountwindow.cpp:206 src/gui/npcpostdialog.cpp:64
 #: src/gui/popupmenu.cpp:290 src/gui/popupmenu.cpp:324
 #: src/gui/popupmenu.cpp:411 src/gui/popupmenu.cpp:454
 #: src/gui/popupmenu.cpp:485 src/gui/popupmenu.cpp:512
@@ -697,7 +697,7 @@ msgstr "Verkopen"
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
 #: src/gui/setup.cpp:84 src/gui/socialwindow.cpp:1204
 #: src/gui/textcommandeditor.cpp:212 src/gui/textdialog.cpp:53
-#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:167
+#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:183
 msgid "Cancel"
 msgstr "Annuleren"
 
@@ -861,7 +861,7 @@ msgstr "Nog %d punten te verdelen"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:570
+#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:581
 #: src/gui/socialwindow.cpp:1269
 msgid "Create"
 msgstr "Aanmaken"
@@ -888,17 +888,17 @@ msgid "Please remove %d points"
 msgstr "Verwijder alstublieft %d punten"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:60
+#: src/gui/charselectdialog.cpp:61
 msgid "Confirm Character Delete"
 msgstr "Bevestig het verwijderen van het personage"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:62
+#: src/gui/charselectdialog.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "Weet je zeker dat je deze personage wilt verwijderen?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:86
+#: src/gui/charselectdialog.cpp:87
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
@@ -910,8 +910,8 @@ msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:565
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:576
+#: src/gui/updaterwindow.cpp:185
 msgid "Play"
 msgstr "Spelen"
 
@@ -927,7 +927,7 @@ msgstr "Info"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:263
+#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:272
 #: src/gui/setupactiondata.h:1803 src/gui/setup_relations.cpp:262
 #: src/gui/shopwindow.cpp:96 src/gui/shopwindow.cpp:103
 #: src/gui/textcommandeditor.cpp:216
@@ -937,24 +937,24 @@ msgstr "Verwijderen"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/charselectdialog.cpp:129 src/gui/unregisterdialog.cpp:48
+#: src/gui/charselectdialog.cpp:130 src/gui/unregisterdialog.cpp:48
 #: src/gui/unregisterdialog.cpp:53
 msgid "Unregister"
 msgstr "Registreren"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/charselectdialog.cpp:141
+#: src/gui/charselectdialog.cpp:142
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:172
+#: src/gui/charselectdialog.cpp:175
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/charselectdialog.cpp:246
+#: src/gui/charselectdialog.cpp:248
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -964,16 +964,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:288
+#: src/gui/charselectdialog.cpp:290
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password:"
 msgstr ""
 
@@ -1060,13 +1060,13 @@ msgid "Chat"
 msgstr "Chat"
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:735
+#: src/gui/chatwindow.cpp:638
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1165
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Fluisteren naar %s: %s"
@@ -1084,7 +1084,7 @@ msgstr "Nee"
 
 #. TRANSLATORS: confirm dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/confirmdialog.cpp:58 src/gui/popupmenu.cpp:2429
+#: src/gui/confirmdialog.cpp:55 src/gui/popupmenu.cpp:2429
 #: src/gui/popupmenu.cpp:2442 src/gui/popupmenu.cpp:2457
 #: src/gui/popupmenu.cpp:2483
 msgid "Ignore"
@@ -1093,7 +1093,7 @@ msgstr ""
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
 #. TRANSLATORS: settings group
-#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:109
+#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:108
 #: src/gui/setup_other.cpp:123 src/gui/windowmenu.cpp:106
 msgid "Map"
 msgstr "Map"
@@ -1109,190 +1109,190 @@ msgid "Net"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:265
-#: src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:268
+#: src/gui/debugwindow.cpp:311
 msgid "Music:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:153 src/gui/debugwindow.cpp:271
-#: src/gui/debugwindow.cpp:312
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:274
+#: src/gui/debugwindow.cpp:315
 msgid "Map:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:155 src/gui/debugwindow.cpp:268
-#: src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:271
+#: src/gui/debugwindow.cpp:313
 msgid "Minimap:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:262
-#: src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:161 src/gui/debugwindow.cpp:265
+#: src/gui/debugwindow.cpp:309
 msgid "Cursor:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:161
+#: src/gui/debugwindow.cpp:164
 msgid "Particle count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:284
-#: src/gui/debugwindow.cpp:316
+#: src/gui/debugwindow.cpp:167 src/gui/debugwindow.cpp:287
+#: src/gui/debugwindow.cpp:319
 msgid "Map actors count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:166 src/gui/debugwindow.cpp:243
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:169 src/gui/debugwindow.cpp:246
+#: src/gui/debugwindow.cpp:252
 msgid "Player Position:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:172 src/gui/debugwindow.cpp:297
+#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:300
 msgid "Draw calls:"
 msgstr ""
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:175
+#. TRANSLATORS: debug window label, frames per second
+#: src/gui/debugwindow.cpp:178
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:177 src/gui/debugwindow.cpp:324
+#. TRANSLATORS: debug window label, logic per second
+#: src/gui/debugwindow.cpp:180 src/gui/debugwindow.cpp:327
 #, c-format
 msgid "%d LPS"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:191 src/gui/debugwindow.cpp:209
 #, c-format
 msgid "%d FPS (Software)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:193
+#: src/gui/debugwindow.cpp:196
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:197
+#: src/gui/debugwindow.cpp:200
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:201
+#: src/gui/debugwindow.cpp:204
 #, c-format
 msgid "%d FPS (mobile OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:225 src/gui/debugwindow.cpp:290
+#: src/gui/debugwindow.cpp:228 src/gui/debugwindow.cpp:293
 msgid "Textures count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:279
+#: src/gui/debugwindow.cpp:282
 #, c-format
 msgid "Particle count: %d"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:330 src/gui/debugwindow.cpp:380
-#: src/gui/debugwindow.cpp:442
+#: src/gui/debugwindow.cpp:333 src/gui/debugwindow.cpp:383
+#: src/gui/debugwindow.cpp:445
 msgid "Target:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:332 src/gui/debugwindow.cpp:386
-#: src/gui/debugwindow.cpp:444
+#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
+#: src/gui/debugwindow.cpp:447
 msgid "Target Id:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
-#: src/gui/debugwindow.cpp:446
+#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:392
+#: src/gui/debugwindow.cpp:449
 msgid "Target type:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:337
+#: src/gui/debugwindow.cpp:340
 msgid "Target level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:339 src/gui/debugwindow.cpp:405
+#: src/gui/debugwindow.cpp:342 src/gui/debugwindow.cpp:408
 msgid "Target race:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:341
+#: src/gui/debugwindow.cpp:344
 msgid "Target party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:346
 msgid "Target guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:430
-#: src/gui/debugwindow.cpp:436 src/gui/debugwindow.cpp:454
+#: src/gui/debugwindow.cpp:348 src/gui/debugwindow.cpp:433
+#: src/gui/debugwindow.cpp:439 src/gui/debugwindow.cpp:457
 msgid "Attack delay:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:347 src/gui/debugwindow.cpp:417
-#: src/gui/debugwindow.cpp:456
+#: src/gui/debugwindow.cpp:350 src/gui/debugwindow.cpp:420
+#: src/gui/debugwindow.cpp:459
 msgid "Minimal hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:349 src/gui/debugwindow.cpp:420
-#: src/gui/debugwindow.cpp:458
+#: src/gui/debugwindow.cpp:352 src/gui/debugwindow.cpp:423
+#: src/gui/debugwindow.cpp:461
 msgid "Maximum hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:351 src/gui/debugwindow.cpp:423
-#: src/gui/debugwindow.cpp:460
+#: src/gui/debugwindow.cpp:354 src/gui/debugwindow.cpp:426
+#: src/gui/debugwindow.cpp:463
 msgid "Critical hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:394 src/gui/debugwindow.cpp:400
-#: src/gui/debugwindow.cpp:448
+#: src/gui/debugwindow.cpp:397 src/gui/debugwindow.cpp:403
+#: src/gui/debugwindow.cpp:451
 msgid "Target Level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:408 src/gui/debugwindow.cpp:450
+#: src/gui/debugwindow.cpp:411 src/gui/debugwindow.cpp:453
 msgid "Target Party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:412 src/gui/debugwindow.cpp:452
+#: src/gui/debugwindow.cpp:415 src/gui/debugwindow.cpp:455
 msgid "Target Guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:493
+#: src/gui/debugwindow.cpp:496
 #, c-format
 msgid "Ping: %s ms"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:496
+#: src/gui/debugwindow.cpp:499
 #, c-format
 msgid "In: %d bytes/s"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:499
+#: src/gui/debugwindow.cpp:502
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
@@ -1324,7 +1324,7 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #: src/gui/editdialog.cpp:45 src/gui/editserverdialog.cpp:78
-#: src/gui/itemamountwindow.cpp:210 src/gui/okdialog.cpp:51
+#: src/gui/itemamountwindow.cpp:204 src/gui/okdialog.cpp:51
 #: src/gui/quitdialog.cpp:70 src/gui/textdialog.cpp:46
 msgid "OK"
 msgstr "OK"
@@ -1336,7 +1336,7 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:257
+#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:266
 msgid "Connect"
 msgstr ""
 
@@ -1366,7 +1366,7 @@ msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/editserverdialog.cpp:222
+#: src/gui/editserverdialog.cpp:218
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -1418,7 +1418,7 @@ msgstr "Uitrusten"
 #: src/gui/inventorywindow.cpp:178 src/gui/inventorywindow.cpp:630
 #: src/gui/popupmenu.cpp:1843 src/gui/popupmenu.cpp:1922
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2041
-#: src/gui/skilldialog.cpp:277
+#: src/gui/skilldialog.cpp:279
 msgid "Use"
 msgstr "Gebruiken"
 
@@ -1452,7 +1452,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: setup button
-#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:718
+#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:719
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1992
 #: src/gui/popupmenu.cpp:2066 src/gui/setup.cpp:86
 msgid "Store"
@@ -1474,47 +1474,47 @@ msgid "Drop"
 msgstr "Neerleggen"
 
 #. TRANSLATORS: item amount window button
-#: src/gui/itemamountwindow.cpp:214
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "Alle"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:264
 msgid "Select amount of items to trade."
 msgstr "Selecteer het aantal exemplaren om te verhandelen"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:274
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to drop."
 msgstr "Selecteer het aantal exemplaren om neer te leggen"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:278
+#: src/gui/itemamountwindow.cpp:272
 msgid "Select amount of items to store."
 msgstr "Selecteer hoeveelheid voorwerpen te bewaren."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:276
 msgid "Select amount of items to retrieve."
 msgstr "Selecteer hoeveelheid voorwerpen terug te nemen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:286
+#: src/gui/itemamountwindow.cpp:280
 msgid "Select amount of items to split."
 msgstr "Selecteer hoeveelheid voorwerpen om te splitsen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:290
+#: src/gui/itemamountwindow.cpp:284
 msgid "Add to buy shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:294
+#: src/gui/itemamountwindow.cpp:288
 msgid "Add to sell shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:298
+#: src/gui/itemamountwindow.cpp:292
 msgid "Unknown."
 msgstr ""
 
@@ -1541,7 +1541,7 @@ msgstr ""
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:58 src/gui/killstats.cpp:171
-#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:516
+#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:509
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
@@ -1549,7 +1549,7 @@ msgstr ""
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:61 src/gui/killstats.cpp:173
 #: src/gui/killstats.cpp:253 src/gui/killstats.cpp:268
-#: src/gui/killstats.cpp:518
+#: src/gui/killstats.cpp:511
 #, c-format
 msgid "Avg Exp: %s"
 msgstr ""
@@ -1557,14 +1557,14 @@ msgstr ""
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:63 src/gui/killstats.cpp:176
 #: src/gui/killstats.cpp:258 src/gui/killstats.cpp:272
-#: src/gui/killstats.cpp:521
+#: src/gui/killstats.cpp:514
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:66 src/gui/killstats.cpp:187
-#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:524
+#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:517
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
@@ -1592,9 +1592,9 @@ msgid "Last kill exp:"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:414
-#: src/gui/killstats.cpp:421 src/gui/killstats.cpp:428
-#: src/gui/killstats.cpp:434
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:408
+#: src/gui/killstats.cpp:415 src/gui/killstats.cpp:422
+#: src/gui/killstats.cpp:428
 msgid "Time before jacko spawn:"
 msgstr ""
 
@@ -1626,12 +1626,12 @@ msgid "  Time for next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:421
+#: src/gui/killstats.cpp:415
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:428
+#: src/gui/killstats.cpp:422
 msgid "jacko spawning"
 msgstr ""
 
@@ -1737,32 +1737,32 @@ msgid "arrows bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:88
+#: src/gui/ministatuswindow.cpp:89
 msgid "status bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:108
+#: src/gui/ministatuswindow.cpp:109
 msgid "job bar"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:306 src/gui/statuswindow.cpp:298
+#: src/gui/ministatuswindow.cpp:307 src/gui/statuswindow.cpp:298
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:313 src/gui/statuswindow.cpp:141
+#: src/gui/ministatuswindow.cpp:314 src/gui/statuswindow.cpp:141
 #: src/gui/statuswindow.cpp:305 src/gui/statuswindow.cpp:375
 #, c-format
 msgid "Level: %d"
 msgstr "Level: %d"
 
 #. TRANSLATORS: status bar label
-#: src/gui/ministatuswindow.cpp:330 src/gui/ministatuswindow.cpp:367
+#: src/gui/ministatuswindow.cpp:331 src/gui/ministatuswindow.cpp:368
 msgid "Need"
 msgstr ""
 
@@ -2150,7 +2150,7 @@ msgstr ""
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2209 src/gui/popupmenu.cpp:2280
-#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:139
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
 #: src/gui/socialwindow.cpp:934
 msgid "(default)"
 msgstr ""
@@ -2333,7 +2333,7 @@ msgid "Passwords do not match."
 msgstr "Wachtwoorden komen niet overeen."
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:257
 msgid "Choose Your Server"
 msgstr ""
 
@@ -2341,61 +2341,61 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:259 src/gui/shopwindow.cpp:94
+#: src/gui/serverdialog.cpp:268 src/gui/shopwindow.cpp:94
 #: src/gui/shopwindow.cpp:101 src/gui/tradewindow.cpp:77
 msgid "Add"
 msgstr "Toevoegen"
 
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
-#: src/gui/serverdialog.cpp:261 src/gui/widgets/setupitem.cpp:299
+#: src/gui/serverdialog.cpp:270 src/gui/widgets/setupitem.cpp:299
 #: src/gui/widgets/setupitem.cpp:426
 msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:274
 msgid "Load"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:279
+#: src/gui/serverdialog.cpp:288
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:297
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:518
+#: src/gui/serverdialog.cpp:527
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:524
+#: src/gui/serverdialog.cpp:533
 msgid "Waiting for server..."
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:529
+#: src/gui/serverdialog.cpp:538
 msgid "Preparing download"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:534
+#: src/gui/serverdialog.cpp:543
 msgid "Error retreiving server list!"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:626
+#: src/gui/serverdialog.cpp:635
 msgid "requires a newer version"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:631
+#: src/gui/serverdialog.cpp:640
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -3406,7 +3406,7 @@ msgid "Type:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:334
+#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:336
 msgid "Delay:"
 msgstr ""
 
@@ -3426,30 +3426,30 @@ msgid "Blue:"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:420
+#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:422
 msgid "Static"
 msgstr "Statisch"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:107 src/gui/setup_colors.cpp:110
-#: src/gui/setup_colors.cpp:422
+#: src/gui/setup_colors.cpp:424
 msgid "Pulse"
 msgstr "Puls"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:112 src/gui/setup_colors.cpp:115
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Rainbow"
 msgstr "Regenboog"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:117 src/gui/setup_colors.cpp:120
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Spectrum"
 msgstr "Spectrum"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:328
+#: src/gui/setup_colors.cpp:330
 msgid "Alpha:"
 msgstr ""
 
@@ -3615,7 +3615,7 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: palette color
-#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:134
+#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:135
 msgid "Monsters"
 msgstr "Monsters"
 
@@ -4164,206 +4164,231 @@ msgstr "Tijdens negeren:"
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:86
-msgid "Very small (9)"
+msgid "Very small (8)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:88
-msgid "Tiny (10)"
+msgid "Very small (9)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:90
-msgid "Small (11)"
+msgid "Tiny (10)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:92
-msgid "Medium (12)"
+msgid "Small (11)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:94
-msgid "Normal (13)"
+msgid "Medium (12)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:96
-msgid "Large (14)"
+msgid "Normal (13)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:98
-msgid "Very large (15)"
+msgid "Large (14)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:100
-msgid "Big (16)"
+msgid "Large (15)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:102
-msgid "Very big (17)"
+msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:104
-msgid "Huge (18)"
+msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:106
-msgid "Very huge (19)"
+msgid "Big (18)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:108
+msgid "Big (19)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:110
+msgid "Very big (20)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:112
+msgid "Very big (21)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:114
+msgid "Very big (22)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:116
+msgid "Huge (23)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:151
 msgid "Chinese (China)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:153
 msgid "Czech"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:155
 msgid "English"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:157
 msgid "Finnish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:159
 msgid "French"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:161
 msgid "German"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:153
+#: src/gui/setup_theme.cpp:163
 msgid "Indonesian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:155
+#: src/gui/setup_theme.cpp:165
 msgid "Italian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:157
+#: src/gui/setup_theme.cpp:167
 msgid "Polish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:159
+#: src/gui/setup_theme.cpp:169
 msgid "Japanese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:161
+#: src/gui/setup_theme.cpp:171
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:163
+#: src/gui/setup_theme.cpp:173
 msgid "Portuguese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:165
+#: src/gui/setup_theme.cpp:175
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:167
+#: src/gui/setup_theme.cpp:177
 msgid "Russian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:169
+#: src/gui/setup_theme.cpp:179
 msgid "Spanish (Castilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:171
+#: src/gui/setup_theme.cpp:181
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:223
+#: src/gui/setup_theme.cpp:233
 msgid "Gui theme"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:230
+#: src/gui/setup_theme.cpp:240
 msgid "Main Font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:235
+#: src/gui/setup_theme.cpp:245
 msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:239
+#: src/gui/setup_theme.cpp:249
 msgid "Bold font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:243
+#: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:247
+#: src/gui/setup_theme.cpp:257
 msgid "Help font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:251
+#: src/gui/setup_theme.cpp:261
 msgid "Secure font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:255
+#: src/gui/setup_theme.cpp:265
 msgid "Japanese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:260
+#: src/gui/setup_theme.cpp:270
 msgid "Font size"
 msgstr "Lettergrootte"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:265
+#: src/gui/setup_theme.cpp:275
 msgid "Npc font size"
 msgstr ""
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/setup_theme.cpp:269
+#: src/gui/setup_theme.cpp:279
 msgid "i"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/setup_theme.cpp:442
+#: src/gui/setup_theme.cpp:452
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/setup_theme.cpp:467
+#: src/gui/setup_theme.cpp:477
 msgid "Theme Changed"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/setup_theme.cpp:467 src/gui/setup_video.cpp:537
+#: src/gui/setup_theme.cpp:477 src/gui/setup_video.cpp:537
 #: src/gui/setup_video.cpp:546
 msgid "Restart your client for the change to take effect."
 msgstr "Herstart de client om de wijzigingen in werking te doen treden."
@@ -4661,7 +4686,8 @@ msgid "Ambient FX"
 msgstr "Omgevingseffecten"
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_visual.cpp:140
+#. TRANSLATORS: palette color
+#: src/gui/setup_visual.cpp:140 src/gui/userpalette.cpp:146
 msgid "Particle effects"
 msgstr "Deeltjes effecten"
 
@@ -4748,45 +4774,45 @@ msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/skilldialog.cpp:270 src/gui/windowmenu.cpp:112
+#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:112
 msgid "Skills"
 msgstr "Vaardigheden"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/skilldialog.cpp:279
+#: src/gui/skilldialog.cpp:281
 msgid "Up"
 msgstr "Omhoog"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/skilldialog.cpp:391
+#: src/gui/skilldialog.cpp:393
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skills tab
-#: src/gui/skilldialog.cpp:444
+#: src/gui/skilldialog.cpp:446
 msgid "basic"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill name
-#: src/gui/skilldialog.cpp:447
+#: src/gui/skilldialog.cpp:449
 msgid "basic, 1"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/skilldialog.cpp:484
+#: src/gui/skilldialog.cpp:486
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/skilldialog.cpp:518
+#: src/gui/skilldialog.cpp:520
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/skilldialog.cpp:612 src/gui/skilldialog.cpp:762
+#: src/gui/skilldialog.cpp:614 src/gui/skilldialog.cpp:764
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -5229,7 +5255,7 @@ msgid "Trade: You"
 msgstr "Handel: Jij"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:182
+#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:184
 #, c-format
 msgid "You get %s"
 msgstr ""
@@ -5245,12 +5271,12 @@ msgid "You give:"
 msgstr "Je geeft:"
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:393
+#: src/gui/tradewindow.cpp:396
 msgid "You don't have enough money."
 msgstr "Je hebt niet genoeg geld."
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:475
+#: src/gui/tradewindow.cpp:479
 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."
@@ -5262,223 +5288,223 @@ msgid "Name: %s"
 msgstr "Naam: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/updaterwindow.cpp:140
+#: src/gui/updaterwindow.cpp:156
 msgid "Updating..."
 msgstr "Actualiseren..."
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:165
+#: src/gui/updaterwindow.cpp:181
 msgid "Connecting..."
 msgstr "Verbinden..."
 
 #. TRANSLATORS: update message
-#: src/gui/updaterwindow.cpp:656
+#: src/gui/updaterwindow.cpp:672
 msgid "##1  The update process is incomplete."
 msgstr "##1 Het updateproces is onvolledig."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/updaterwindow.cpp:658
+#: src/gui/updaterwindow.cpp:674
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Het is ten sterkste aanbevolen dat"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:660
+#: src/gui/updaterwindow.cpp:676
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:839
+#: src/gui/updaterwindow.cpp:855
 msgid "Completed"
 msgstr "Voltooid"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
 msgid "Being"
 msgstr "Wezen"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:118
-msgid "Friend Names"
+#: src/gui/userpalette.cpp:119
+msgid "Friend names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:120
-msgid "Disregarded Names"
+#: src/gui/userpalette.cpp:121
+msgid "Disregarded names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:122
-msgid "Ignored Names"
+#: src/gui/userpalette.cpp:123
+msgid "Ignored names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:124
-msgid "Erased Names"
+#: src/gui/userpalette.cpp:125
+msgid "Erased names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:126
-msgid "Other Players' Names"
-msgstr "Namen van andere Spelers"
+#: src/gui/userpalette.cpp:127
+msgid "Other players names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:128
-msgid "Own Name"
-msgstr "Eigen Naam"
+#: src/gui/userpalette.cpp:129
+msgid "Own name"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:130
-msgid "GM Names"
-msgstr "GM Namen"
+#: src/gui/userpalette.cpp:131
+msgid "GM names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
 msgid "NPCs"
 msgstr "NPCs"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
 msgid "Monster HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:140
 msgid "Monster HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:141
-msgid "Party Members"
+#: src/gui/userpalette.cpp:142
+msgid "Party members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:143
-msgid "Guild Members"
+#: src/gui/userpalette.cpp:144
+msgid "Guild members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:145
-msgid "Particle Effects"
-msgstr "Deeltjes effecten"
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:147
-msgid "Pickup Notification"
-msgstr "Notificatie bij opnemen"
+#: src/gui/userpalette.cpp:148
+msgid "Pickup notification"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:149
-msgid "Exp Notification"
-msgstr "Ervaring Notificatie"
+#: src/gui/userpalette.cpp:150
+msgid "Exp notification"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
 msgid "Player HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
 msgid "Player HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:157
-msgid "Player Hits Monster"
+#: src/gui/userpalette.cpp:158
+msgid "Player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:159
-msgid "Monster Hits Player"
+#: src/gui/userpalette.cpp:160
+msgid "Monster hits player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:163
-msgid "Other Player Hits Local Player"
+#: src/gui/userpalette.cpp:164
+msgid "Other player hits local player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:166
 msgid "Critical Hit"
 msgstr "Kritieke aanval"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
-msgid "Local Player Hits Monster"
+#: src/gui/userpalette.cpp:170
+msgid "Local player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:172
-msgid "Local Player Critical Hit"
+#: src/gui/userpalette.cpp:173
+msgid "Local player critical hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:175
-msgid "Local Player Miss"
+#: src/gui/userpalette.cpp:176
+msgid "Local player miss"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:177
+#: src/gui/userpalette.cpp:178
 msgid "Misses"
 msgstr "Missers"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
-msgid "Portal Highlight"
+#: src/gui/userpalette.cpp:180
+msgid "Portal highlight"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:183
+msgid "Default collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:182
-msgid "Default collision Highlight"
+#: src/gui/userpalette.cpp:186
+msgid "Air collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:185
-msgid "Air collision Highlight"
+#: src/gui/userpalette.cpp:189
+msgid "Water collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:188
-msgid "Water collision Highlight"
+#: src/gui/userpalette.cpp:192
+msgid "Special ground collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:191
-msgid "Special ground collision Highlight"
+#: src/gui/userpalette.cpp:195
+msgid "Walkable highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
-msgid "Walkable Highlight"
+#: src/gui/userpalette.cpp:198
+msgid "Local player attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:197
-msgid "Local Player Attack Range"
+#: src/gui/userpalette.cpp:201
+msgid "Local player attack range border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:200
-msgid "Local Player Attack Range Border"
+#: src/gui/userpalette.cpp:204
+msgid "Monster attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:203
-msgid "Monster Attack Range"
+#: src/gui/userpalette.cpp:208
+msgid "Floor item amount color"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:206
-msgid "Home Place"
+#: src/gui/userpalette.cpp:211
+msgid "Home place"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:209
-msgid "Home Place Border"
+#: src/gui/userpalette.cpp:214
+msgid "Home place border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:212
-msgid "Road Point"
+#: src/gui/userpalette.cpp:217
+msgid "Road point"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
@@ -5608,7 +5634,7 @@ msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:315
+#: src/gui/widgets/itemcontainer.cpp:317
 msgid "Eq."
 msgstr ""
 
diff --git a/po/nl_BE.po b/po/nl_BE.po
index 08636fbbb..6e9a2bfeb 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-05-03 12:38+0300\n"
-"PO-Revision-Date: 2013-05-03 09:44+0000\n"
+"POT-Creation-Date: 2013-05-11 12:13+0300\n"
+"PO-Revision-Date: 2013-05-10 15:39+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/projects/p/manaplus/"
 "language/nl_BE/)\n"
@@ -62,25 +62,25 @@ msgstr "I"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: full button name
-#: src/client.cpp:1136 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
+#: src/client.cpp:1137 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
 msgid "Setup"
 msgstr "Configureren"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1140 src/gui/setup_perfomance.cpp:61
+#: src/client.cpp:1141 src/gui/setup_perfomance.cpp:61
 msgid "Perfomance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:1143 src/gui/setup_video.cpp:258
+#: src/client.cpp:1144 src/gui/setup_video.cpp:258
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1146 src/gui/setup_theme.cpp:273
+#: src/client.cpp:1147 src/gui/setup_theme.cpp:283
 msgid "Theme"
 msgstr "Thema"
 
@@ -91,7 +91,7 @@ msgstr "Thema"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1150 src/gui/didyouknowwindow.cpp:78
+#: src/client.cpp:1151 src/gui/didyouknowwindow.cpp:78
 #: src/gui/inventorywindow.cpp:228 src/gui/npcdialog.cpp:63
 #: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:574
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:80
@@ -99,32 +99,32 @@ msgid "Close"
 msgstr "Sluiten"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1238
+#: src/client.cpp:1239
 msgid "Connecting to server"
 msgstr "Verbinden met server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1282
 msgid "Logging in"
 msgstr "Inloggen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1320
+#: src/client.cpp:1321
 msgid "Entering game world"
 msgstr "Spelwereld binnenkomen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1431
+#: src/client.cpp:1432
 msgid "Requesting characters"
 msgstr "Aanvragen personage"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1471
 msgid "Connecting to the game server"
 msgstr "Verbinden met de spelserver"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1483
+#: src/client.cpp:1484
 msgid "Changing game servers"
 msgstr "Wijzigen spelservers"
 
@@ -139,69 +139,69 @@ msgstr "Wijzigen spelservers"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1540 src/client.cpp:1551 src/client.cpp:1721
+#: src/client.cpp:1541 src/client.cpp:1552 src/client.cpp:1722
 #: src/gui/changeemaildialog.cpp:168 src/gui/changepassworddialog.cpp:158
-#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:288
-#: src/gui/editserverdialog.cpp:220 src/gui/registerdialog.cpp:263
+#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:290
+#: src/gui/editserverdialog.cpp:216 src/gui/registerdialog.cpp:263
 #: src/gui/unregisterdialog.cpp:143 src/net/ea/charserverhandler.cpp:190
 #: src/net/ea/charserverhandler.cpp:210
 msgid "Error"
 msgstr "Fout"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1564
+#: src/client.cpp:1565
 msgid "Requesting registration details"
 msgstr "Aanvragen registratie details"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1601
+#: src/client.cpp:1602
 msgid "Password Change"
 msgstr "Paswoord Wijziging"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1603
+#: src/client.cpp:1604
 msgid "Password changed successfully!"
 msgstr "Paswoord is gewijzigd!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1624
+#: src/client.cpp:1625
 msgid "Email Change"
 msgstr "Email Wijziging"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1626
+#: src/client.cpp:1627
 msgid "Email changed successfully!"
 msgstr "Email is gewijzigd!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1647
+#: src/client.cpp:1648
 msgid "Unregister Successful"
 msgstr "Registratie ongedaan gemaakt!"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1649
+#: src/client.cpp:1650
 msgid "Farewell, come back any time..."
 msgstr "Tot ziens..."
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1902 src/client.cpp:1917 src/client.cpp:1960
-#: src/client.cpp:1976 src/client.cpp:2417 src/client.cpp:2425
+#: src/client.cpp:1903 src/client.cpp:1918 src/client.cpp:1961
+#: src/client.cpp:1977 src/client.cpp:2418 src/client.cpp:2426
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s bestaat niet en kan niet gecreëerd worden! Stoppen."
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2113
+#: src/client.cpp:2114
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Ongeldige update host %s"
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2154 src/client.cpp:2161
+#: src/client.cpp:2155 src/client.cpp:2162
 msgid "Error creating updates directory!"
 msgstr "Fout bij het creëren van de update map!"
 
-#: src/client.cpp:2183 src/client.cpp:2196
+#: src/client.cpp:2184 src/client.cpp:2197
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Fout: %s bestaat niet en kan niet gecreëerd worden! Stoppen."
@@ -484,19 +484,19 @@ msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: bot checker window header
-#: src/gui/botcheckerwindow.cpp:269
+#: src/gui/botcheckerwindow.cpp:268
 msgid "Bot Checker"
 msgstr "Bot Controleerder"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:102
+#: src/gui/botcheckerwindow.cpp:277 src/gui/npcdialog.cpp:102
 msgid "Reset"
 msgstr "Reset"
 
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: relations table header
-#: src/gui/botcheckerwindow.cpp:305 src/gui/setup_relations.cpp:61
+#: src/gui/botcheckerwindow.cpp:304 src/gui/setup_relations.cpp:61
 msgid "Name"
 msgstr "Naam"
 
@@ -504,7 +504,7 @@ msgstr "Naam"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:145
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:145
 #: src/gui/popupmenu.cpp:241 src/gui/popupmenu.cpp:640
 #: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:257
 #: src/net/tmwa/generalhandler.cpp:292
@@ -514,7 +514,7 @@ msgstr "Aanvallen"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
-#: src/gui/botcheckerwindow.cpp:309 src/gui/popupmenu.cpp:225
+#: src/gui/botcheckerwindow.cpp:308 src/gui/popupmenu.cpp:225
 #: src/gui/setupactiondata.h:93
 msgid "Talk"
 msgstr "Spreken"
@@ -522,7 +522,7 @@ msgstr "Spreken"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/botcheckerwindow.cpp:311 src/gui/popupmenu.cpp:215
+#: src/gui/botcheckerwindow.cpp:310 src/gui/popupmenu.cpp:215
 #: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:371
 #: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:653
 #: src/gui/popupmenu.cpp:727 src/gui/setupactiondata.h:1856
@@ -530,7 +530,7 @@ msgid "Move"
 msgstr "Beweeg"
 
 #. TRANSLATORS: bot checker window table header
-#: src/gui/botcheckerwindow.cpp:313
+#: src/gui/botcheckerwindow.cpp:312
 msgid "Result"
 msgstr "Resultaat"
 
@@ -586,7 +586,7 @@ msgstr "Kopen"
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:516
+#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:511
 #: src/gui/selldialog.cpp:94 src/gui/selldialog.cpp:342
 #, c-format
 msgid "Price: %s / Total: %s"
@@ -603,9 +603,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:208
-#: src/gui/itemamountwindow.cpp:243 src/gui/npcdialog.cpp:93
-#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:833
+#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:202
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:93
+#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:821
 msgid "+"
 msgstr "+"
 
@@ -615,9 +615,9 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:240 src/gui/npcdialog.cpp:95
-#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:846
+#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:200
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:95
+#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:834
 msgid "-"
 msgstr "-"
 
@@ -629,7 +629,7 @@ msgstr "-"
 #. TRANSLATORS: input action name
 #: src/gui/buydialog.cpp:260 src/gui/quitdialog.cpp:54
 #: src/gui/quitdialog.cpp:59 src/gui/quitdialog.cpp:61
-#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:255
+#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:264
 #: src/gui/setupactiondata.h:177
 msgid "Quit"
 msgstr "Afsluiten"
@@ -641,7 +641,7 @@ msgstr "Afsluiten"
 #. TRANSLATORS: status bar label
 #: src/gui/buydialog.cpp:262 src/gui/selldialog.cpp:106
 #: src/gui/statuswindow.cpp:558 src/gui/statuswindow.cpp:615
-#: src/gui/statuswindow.cpp:830 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:852
 msgid "Max"
 msgstr "Maximum"
 
@@ -686,7 +686,7 @@ msgstr "Verkopen"
 #: src/gui/buyselldialog.cpp:71 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:120
 #: src/gui/connectiondialog.cpp:48 src/gui/editserverdialog.cpp:80
-#: src/gui/itemamountwindow.cpp:212 src/gui/npcpostdialog.cpp:64
+#: src/gui/itemamountwindow.cpp:206 src/gui/npcpostdialog.cpp:64
 #: src/gui/popupmenu.cpp:290 src/gui/popupmenu.cpp:324
 #: src/gui/popupmenu.cpp:411 src/gui/popupmenu.cpp:454
 #: src/gui/popupmenu.cpp:485 src/gui/popupmenu.cpp:512
@@ -702,7 +702,7 @@ msgstr "Verkopen"
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
 #: src/gui/setup.cpp:84 src/gui/socialwindow.cpp:1204
 #: src/gui/textcommandeditor.cpp:212 src/gui/textdialog.cpp:53
-#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:167
+#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:183
 msgid "Cancel"
 msgstr "Annuleren"
 
@@ -866,7 +866,7 @@ msgstr "Nog %d punten te verdelen"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:570
+#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:581
 #: src/gui/socialwindow.cpp:1269
 msgid "Create"
 msgstr "Aanmaken"
@@ -893,17 +893,17 @@ msgid "Please remove %d points"
 msgstr "Verwijder alstublieft %d punten"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:60
+#: src/gui/charselectdialog.cpp:61
 msgid "Confirm Character Delete"
 msgstr "Bevestig het verwijderen van het personage"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:62
+#: src/gui/charselectdialog.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "Weet je zeker dat je deze personage wilt verwijderen?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:86
+#: src/gui/charselectdialog.cpp:87
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
@@ -915,8 +915,8 @@ msgstr "Verwissel Login"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:565
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:576
+#: src/gui/updaterwindow.cpp:185
 msgid "Play"
 msgstr "Spelen"
 
@@ -932,7 +932,7 @@ msgstr "Info"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:263
+#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:272
 #: src/gui/setupactiondata.h:1803 src/gui/setup_relations.cpp:262
 #: src/gui/shopwindow.cpp:96 src/gui/shopwindow.cpp:103
 #: src/gui/textcommandeditor.cpp:216
@@ -942,24 +942,24 @@ msgstr "Verwijderen"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/charselectdialog.cpp:129 src/gui/unregisterdialog.cpp:48
+#: src/gui/charselectdialog.cpp:130 src/gui/unregisterdialog.cpp:48
 #: src/gui/unregisterdialog.cpp:53
 msgid "Unregister"
 msgstr "Registreren"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/charselectdialog.cpp:141
+#: src/gui/charselectdialog.cpp:142
 msgid "Change Email"
 msgstr "Wijzig Email"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:172
+#: src/gui/charselectdialog.cpp:175
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/charselectdialog.cpp:246
+#: src/gui/charselectdialog.cpp:248
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -969,16 +969,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:288
+#: src/gui/charselectdialog.cpp:290
 msgid "Incorrect password"
 msgstr "Ongeldig paswoord"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password for deleting character"
 msgstr "Geef uw wachtwoord om uw personage te verwijderen"
 
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password:"
 msgstr "Geef wachtwoord:"
 
@@ -1065,13 +1065,13 @@ msgid "Chat"
 msgstr "Chat"
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:735
+#: src/gui/chatwindow.cpp:638
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Aanwezig: %s; %d speler zijn aanwezig."
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1165
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Fluisteren naar %s: %s"
@@ -1089,7 +1089,7 @@ msgstr "Nee"
 
 #. TRANSLATORS: confirm dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/confirmdialog.cpp:58 src/gui/popupmenu.cpp:2429
+#: src/gui/confirmdialog.cpp:55 src/gui/popupmenu.cpp:2429
 #: src/gui/popupmenu.cpp:2442 src/gui/popupmenu.cpp:2457
 #: src/gui/popupmenu.cpp:2483
 msgid "Ignore"
@@ -1098,7 +1098,7 @@ msgstr "Negeer"
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
 #. TRANSLATORS: settings group
-#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:109
+#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:108
 #: src/gui/setup_other.cpp:123 src/gui/windowmenu.cpp:106
 msgid "Map"
 msgstr "Map"
@@ -1114,190 +1114,190 @@ msgid "Net"
 msgstr "Net"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:265
-#: src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:268
+#: src/gui/debugwindow.cpp:311
 msgid "Music:"
 msgstr "Muziek:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:153 src/gui/debugwindow.cpp:271
-#: src/gui/debugwindow.cpp:312
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:274
+#: src/gui/debugwindow.cpp:315
 msgid "Map:"
 msgstr "Kaart:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:155 src/gui/debugwindow.cpp:268
-#: src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:271
+#: src/gui/debugwindow.cpp:313
 msgid "Minimap:"
 msgstr "Minikaart:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:262
-#: src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:161 src/gui/debugwindow.cpp:265
+#: src/gui/debugwindow.cpp:309
 msgid "Cursor:"
 msgstr "Muispunt:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:161
+#: src/gui/debugwindow.cpp:164
 msgid "Particle count:"
 msgstr "Deeltjesaantal: "
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:284
-#: src/gui/debugwindow.cpp:316
+#: src/gui/debugwindow.cpp:167 src/gui/debugwindow.cpp:287
+#: src/gui/debugwindow.cpp:319
 msgid "Map actors count:"
 msgstr "Aantal kaart-acteurs"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:166 src/gui/debugwindow.cpp:243
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:169 src/gui/debugwindow.cpp:246
+#: src/gui/debugwindow.cpp:252
 msgid "Player Position:"
 msgstr "Speler positie:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:172 src/gui/debugwindow.cpp:297
+#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:300
 msgid "Draw calls:"
 msgstr ""
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:175
+#. TRANSLATORS: debug window label, frames per second
+#: src/gui/debugwindow.cpp:178
 #, c-format
 msgid "%d FPS"
 msgstr "%d beelden/sec"
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:177 src/gui/debugwindow.cpp:324
+#. TRANSLATORS: debug window label, logic per second
+#: src/gui/debugwindow.cpp:180 src/gui/debugwindow.cpp:327
 #, c-format
 msgid "%d LPS"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:191 src/gui/debugwindow.cpp:209
 #, c-format
 msgid "%d FPS (Software)"
 msgstr "%d beelden/sec (Software)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:193
+#: src/gui/debugwindow.cpp:196
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr "%d beelden/sec (Snelle OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:197
+#: src/gui/debugwindow.cpp:200
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr "%d beelden/sec (Oude openGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:201
+#: src/gui/debugwindow.cpp:204
 #, c-format
 msgid "%d FPS (mobile OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:225 src/gui/debugwindow.cpp:290
+#: src/gui/debugwindow.cpp:228 src/gui/debugwindow.cpp:293
 msgid "Textures count:"
 msgstr "Textuuraantal:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:279
+#: src/gui/debugwindow.cpp:282
 #, c-format
 msgid "Particle count: %d"
 msgstr "Deeltjes-aantal: %d"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:330 src/gui/debugwindow.cpp:380
-#: src/gui/debugwindow.cpp:442
+#: src/gui/debugwindow.cpp:333 src/gui/debugwindow.cpp:383
+#: src/gui/debugwindow.cpp:445
 msgid "Target:"
 msgstr "Doel:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:332 src/gui/debugwindow.cpp:386
-#: src/gui/debugwindow.cpp:444
+#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
+#: src/gui/debugwindow.cpp:447
 msgid "Target Id:"
 msgstr "Doel identificatie:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
-#: src/gui/debugwindow.cpp:446
+#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:392
+#: src/gui/debugwindow.cpp:449
 msgid "Target type:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:337
+#: src/gui/debugwindow.cpp:340
 msgid "Target level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:339 src/gui/debugwindow.cpp:405
+#: src/gui/debugwindow.cpp:342 src/gui/debugwindow.cpp:408
 msgid "Target race:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:341
+#: src/gui/debugwindow.cpp:344
 msgid "Target party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:346
 msgid "Target guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:430
-#: src/gui/debugwindow.cpp:436 src/gui/debugwindow.cpp:454
+#: src/gui/debugwindow.cpp:348 src/gui/debugwindow.cpp:433
+#: src/gui/debugwindow.cpp:439 src/gui/debugwindow.cpp:457
 msgid "Attack delay:"
 msgstr "Aanvalsvertraging:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:347 src/gui/debugwindow.cpp:417
-#: src/gui/debugwindow.cpp:456
+#: src/gui/debugwindow.cpp:350 src/gui/debugwindow.cpp:420
+#: src/gui/debugwindow.cpp:459
 msgid "Minimal hit:"
 msgstr "Normale slag:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:349 src/gui/debugwindow.cpp:420
-#: src/gui/debugwindow.cpp:458
+#: src/gui/debugwindow.cpp:352 src/gui/debugwindow.cpp:423
+#: src/gui/debugwindow.cpp:461
 msgid "Maximum hit:"
 msgstr "Maximum slag:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:351 src/gui/debugwindow.cpp:423
-#: src/gui/debugwindow.cpp:460
+#: src/gui/debugwindow.cpp:354 src/gui/debugwindow.cpp:426
+#: src/gui/debugwindow.cpp:463
 msgid "Critical hit:"
 msgstr "Critieke slag:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:394 src/gui/debugwindow.cpp:400
-#: src/gui/debugwindow.cpp:448
+#: src/gui/debugwindow.cpp:397 src/gui/debugwindow.cpp:403
+#: src/gui/debugwindow.cpp:451
 msgid "Target Level:"
 msgstr "Doel niveau:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:408 src/gui/debugwindow.cpp:450
+#: src/gui/debugwindow.cpp:411 src/gui/debugwindow.cpp:453
 msgid "Target Party:"
 msgstr "Doel Party:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:412 src/gui/debugwindow.cpp:452
+#: src/gui/debugwindow.cpp:415 src/gui/debugwindow.cpp:455
 msgid "Target Guild:"
 msgstr "Doel Gilde:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:493
+#: src/gui/debugwindow.cpp:496
 #, c-format
 msgid "Ping: %s ms"
 msgstr "Ping: %s ms"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:496
+#: src/gui/debugwindow.cpp:499
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "Invoer: %d bytes/sec"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:499
+#: src/gui/debugwindow.cpp:502
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "Uitvoer: %d bytes/sec"
@@ -1329,7 +1329,7 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #: src/gui/editdialog.cpp:45 src/gui/editserverdialog.cpp:78
-#: src/gui/itemamountwindow.cpp:210 src/gui/okdialog.cpp:51
+#: src/gui/itemamountwindow.cpp:204 src/gui/okdialog.cpp:51
 #: src/gui/quitdialog.cpp:70 src/gui/textdialog.cpp:46
 msgid "OK"
 msgstr "OK"
@@ -1341,7 +1341,7 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:257
+#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:266
 msgid "Connect"
 msgstr "Verbinden"
 
@@ -1371,7 +1371,7 @@ msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/editserverdialog.cpp:222
+#: src/gui/editserverdialog.cpp:218
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -1423,7 +1423,7 @@ msgstr "Uitrusten"
 #: src/gui/inventorywindow.cpp:178 src/gui/inventorywindow.cpp:630
 #: src/gui/popupmenu.cpp:1843 src/gui/popupmenu.cpp:1922
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2041
-#: src/gui/skilldialog.cpp:277
+#: src/gui/skilldialog.cpp:279
 msgid "Use"
 msgstr "Gebruiken"
 
@@ -1457,7 +1457,7 @@ msgstr "Kleren"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: setup button
-#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:718
+#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:719
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1992
 #: src/gui/popupmenu.cpp:2066 src/gui/setup.cpp:86
 msgid "Store"
@@ -1479,47 +1479,47 @@ msgid "Drop"
 msgstr "Neerleggen"
 
 #. TRANSLATORS: item amount window button
-#: src/gui/itemamountwindow.cpp:214
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "Alle"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:264
 msgid "Select amount of items to trade."
 msgstr "Selecteer het aantal voorwerpen om te verhandelen"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:274
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to drop."
 msgstr "Selecteer het aantal voorwerpen om neer te leggen"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:278
+#: src/gui/itemamountwindow.cpp:272
 msgid "Select amount of items to store."
 msgstr "Selecteer hoeveelheid voorwerpen te bewaren."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:276
 msgid "Select amount of items to retrieve."
 msgstr "Selecteer hoeveelheid voorwerpen terug te nemen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:286
+#: src/gui/itemamountwindow.cpp:280
 msgid "Select amount of items to split."
 msgstr "Selecteer hoeveelheid voorwerpen om te splitsen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:290
+#: src/gui/itemamountwindow.cpp:284
 msgid "Add to buy shop."
 msgstr "Toevoegen om te kopen"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:294
+#: src/gui/itemamountwindow.cpp:288
 msgid "Add to sell shop."
 msgstr "Toevoegen om te verkopen"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:298
+#: src/gui/itemamountwindow.cpp:292
 msgid "Unknown."
 msgstr "Onbekend."
 
@@ -1546,7 +1546,7 @@ msgstr "Herzet timer"
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:58 src/gui/killstats.cpp:171
-#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:516
+#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:509
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
@@ -1554,7 +1554,7 @@ msgstr ""
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:61 src/gui/killstats.cpp:173
 #: src/gui/killstats.cpp:253 src/gui/killstats.cpp:268
-#: src/gui/killstats.cpp:518
+#: src/gui/killstats.cpp:511
 #, c-format
 msgid "Avg Exp: %s"
 msgstr ""
@@ -1562,14 +1562,14 @@ msgstr ""
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:63 src/gui/killstats.cpp:176
 #: src/gui/killstats.cpp:258 src/gui/killstats.cpp:272
-#: src/gui/killstats.cpp:521
+#: src/gui/killstats.cpp:514
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:66 src/gui/killstats.cpp:187
-#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:524
+#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:517
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
@@ -1597,9 +1597,9 @@ msgid "Last kill exp:"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:414
-#: src/gui/killstats.cpp:421 src/gui/killstats.cpp:428
-#: src/gui/killstats.cpp:434
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:408
+#: src/gui/killstats.cpp:415 src/gui/killstats.cpp:422
+#: src/gui/killstats.cpp:428
 msgid "Time before jacko spawn:"
 msgstr ""
 
@@ -1631,12 +1631,12 @@ msgid "  Time for next level: %s"
 msgstr "  Tijd tot volgend niveau: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:421
+#: src/gui/killstats.cpp:415
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:428
+#: src/gui/killstats.cpp:422
 msgid "jacko spawning"
 msgstr ""
 
@@ -1742,32 +1742,32 @@ msgid "arrows bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:88
+#: src/gui/ministatuswindow.cpp:89
 msgid "status bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:108
+#: src/gui/ministatuswindow.cpp:109
 msgid "job bar"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:306 src/gui/statuswindow.cpp:298
+#: src/gui/ministatuswindow.cpp:307 src/gui/statuswindow.cpp:298
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Niveau: %d (GM %d)"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:313 src/gui/statuswindow.cpp:141
+#: src/gui/ministatuswindow.cpp:314 src/gui/statuswindow.cpp:141
 #: src/gui/statuswindow.cpp:305 src/gui/statuswindow.cpp:375
 #, c-format
 msgid "Level: %d"
 msgstr "Level: %d"
 
 #. TRANSLATORS: status bar label
-#: src/gui/ministatuswindow.cpp:330 src/gui/ministatuswindow.cpp:367
+#: src/gui/ministatuswindow.cpp:331 src/gui/ministatuswindow.cpp:368
 msgid "Need"
 msgstr "Nood"
 
@@ -2155,7 +2155,7 @@ msgstr "Kopieer naar chat"
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2209 src/gui/popupmenu.cpp:2280
-#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:139
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
 #: src/gui/socialwindow.cpp:934
 msgid "(default)"
 msgstr "(standaard)"
@@ -2338,7 +2338,7 @@ msgid "Passwords do not match."
 msgstr "Wachtwoorden komen niet overeen."
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:257
 msgid "Choose Your Server"
 msgstr "Kies Uw Server"
 
@@ -2346,61 +2346,61 @@ msgstr "Kies Uw Server"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:259 src/gui/shopwindow.cpp:94
+#: src/gui/serverdialog.cpp:268 src/gui/shopwindow.cpp:94
 #: src/gui/shopwindow.cpp:101 src/gui/tradewindow.cpp:77
 msgid "Add"
 msgstr "Toevoegen"
 
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
-#: src/gui/serverdialog.cpp:261 src/gui/widgets/setupitem.cpp:299
+#: src/gui/serverdialog.cpp:270 src/gui/widgets/setupitem.cpp:299
 #: src/gui/widgets/setupitem.cpp:426
 msgid "Edit"
 msgstr "Wijzig"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:274
 msgid "Load"
 msgstr "Laden"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:279
+#: src/gui/serverdialog.cpp:288
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Kies Uw Server  *** VEILIGE MODUS ***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:297
 msgid "Use same ip for game sub servers"
 msgstr "Gebruik hetzelfde ip voor spel sub-servers"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:518
+#: src/gui/serverdialog.cpp:527
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Downloaden van server lijst...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:524
+#: src/gui/serverdialog.cpp:533
 msgid "Waiting for server..."
 msgstr "Wachten op server..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:529
+#: src/gui/serverdialog.cpp:538
 msgid "Preparing download"
 msgstr "Download voorbereiden"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:534
+#: src/gui/serverdialog.cpp:543
 msgid "Error retreiving server list!"
 msgstr "Fout tijdens ophalen server lijst"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:626
+#: src/gui/serverdialog.cpp:635
 msgid "requires a newer version"
 msgstr "vereist een nieuwere versie"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:631
+#: src/gui/serverdialog.cpp:640
 #, c-format
 msgid "requires v%s"
 msgstr "vereist v%s"
@@ -3411,7 +3411,7 @@ msgid "Type:"
 msgstr "Type:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:334
+#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:336
 msgid "Delay:"
 msgstr "Vertraging:"
 
@@ -3431,30 +3431,30 @@ msgid "Blue:"
 msgstr "Blauw:"
 
 #. TRANSLATORS: color type
-#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:420
+#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:422
 msgid "Static"
 msgstr "Statisch"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:107 src/gui/setup_colors.cpp:110
-#: src/gui/setup_colors.cpp:422
+#: src/gui/setup_colors.cpp:424
 msgid "Pulse"
 msgstr "Puls"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:112 src/gui/setup_colors.cpp:115
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Rainbow"
 msgstr "Regenboog"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:117 src/gui/setup_colors.cpp:120
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Spectrum"
 msgstr "Spectrum"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:328
+#: src/gui/setup_colors.cpp:330
 msgid "Alpha:"
 msgstr "Alfa:"
 
@@ -3620,7 +3620,7 @@ msgstr "Allerlei"
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: palette color
-#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:134
+#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:135
 msgid "Monsters"
 msgstr "Monsters"
 
@@ -4169,206 +4169,231 @@ msgstr "Tijdens negeren:"
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:86
-msgid "Very small (9)"
+msgid "Very small (8)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:88
+msgid "Very small (9)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:90
 msgid "Tiny (10)"
 msgstr "Heel klein (10)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:90
+#: src/gui/setup_theme.cpp:92
 msgid "Small (11)"
 msgstr "Klein (11)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:92
+#: src/gui/setup_theme.cpp:94
 msgid "Medium (12)"
 msgstr "Middelmatig (12)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:94
-msgid "Normal (13)"
-msgstr ""
-
-#. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:96
-msgid "Large (14)"
+msgid "Normal (13)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:98
-msgid "Very large (15)"
+msgid "Large (14)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:100
-msgid "Big (16)"
+msgid "Large (15)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:102
-msgid "Very big (17)"
+msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:104
-msgid "Huge (18)"
+msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:106
-msgid "Very huge (19)"
+msgid "Big (18)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:108
+msgid "Big (19)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:110
+msgid "Very big (20)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:112
+msgid "Very big (21)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:114
+msgid "Very big (22)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:116
+msgid "Huge (23)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:151
 msgid "Chinese (China)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:153
 msgid "Czech"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:155
 msgid "English"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:157
 msgid "Finnish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:159
 msgid "French"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:161
 msgid "German"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:153
+#: src/gui/setup_theme.cpp:163
 msgid "Indonesian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:155
+#: src/gui/setup_theme.cpp:165
 msgid "Italian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:157
+#: src/gui/setup_theme.cpp:167
 msgid "Polish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:159
+#: src/gui/setup_theme.cpp:169
 msgid "Japanese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:161
+#: src/gui/setup_theme.cpp:171
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:163
+#: src/gui/setup_theme.cpp:173
 msgid "Portuguese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:165
+#: src/gui/setup_theme.cpp:175
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:167
+#: src/gui/setup_theme.cpp:177
 msgid "Russian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:169
+#: src/gui/setup_theme.cpp:179
 msgid "Spanish (Castilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:171
+#: src/gui/setup_theme.cpp:181
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:223
+#: src/gui/setup_theme.cpp:233
 msgid "Gui theme"
 msgstr "GUI thema"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:230
+#: src/gui/setup_theme.cpp:240
 msgid "Main Font"
 msgstr "Standaard Lettertype"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:235
+#: src/gui/setup_theme.cpp:245
 msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:239
+#: src/gui/setup_theme.cpp:249
 msgid "Bold font"
 msgstr "Vet lettertype"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:243
+#: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr "Deeltjes lettertype"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:247
+#: src/gui/setup_theme.cpp:257
 msgid "Help font"
 msgstr "Help lettertype"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:251
+#: src/gui/setup_theme.cpp:261
 msgid "Secure font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:255
+#: src/gui/setup_theme.cpp:265
 msgid "Japanese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:260
+#: src/gui/setup_theme.cpp:270
 msgid "Font size"
 msgstr "Lettergrootte"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:265
+#: src/gui/setup_theme.cpp:275
 msgid "Npc font size"
 msgstr ""
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/setup_theme.cpp:269
+#: src/gui/setup_theme.cpp:279
 msgid "i"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/setup_theme.cpp:442
+#: src/gui/setup_theme.cpp:452
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/setup_theme.cpp:467
+#: src/gui/setup_theme.cpp:477
 msgid "Theme Changed"
 msgstr "Thema is gewijzigd"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/setup_theme.cpp:467 src/gui/setup_video.cpp:537
+#: src/gui/setup_theme.cpp:477 src/gui/setup_video.cpp:537
 #: src/gui/setup_video.cpp:546
 msgid "Restart your client for the change to take effect."
 msgstr "Herstart de client om de wijzigingen in werking te doen treden."
@@ -4672,7 +4697,8 @@ msgid "Ambient FX"
 msgstr "Omgevingseffecten"
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_visual.cpp:140
+#. TRANSLATORS: palette color
+#: src/gui/setup_visual.cpp:140 src/gui/userpalette.cpp:146
 msgid "Particle effects"
 msgstr "Deeltjes effecten"
 
@@ -4759,45 +4785,45 @@ msgid "%s wants to %s %s do you accept?"
 msgstr "%s wilt %s %s ga je akkoord?"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/skilldialog.cpp:270 src/gui/windowmenu.cpp:112
+#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:112
 msgid "Skills"
 msgstr "Vaardigheden"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/skilldialog.cpp:279
+#: src/gui/skilldialog.cpp:281
 msgid "Up"
 msgstr "Omhoog"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/skilldialog.cpp:391
+#: src/gui/skilldialog.cpp:393
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Vaardigheidspunten vrijgegeven: %d"
 
 #. TRANSLATORS: skills dialog default skills tab
-#: src/gui/skilldialog.cpp:444
+#: src/gui/skilldialog.cpp:446
 msgid "basic"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill name
-#: src/gui/skilldialog.cpp:447
+#: src/gui/skilldialog.cpp:449
 msgid "basic, 1"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/skilldialog.cpp:484
+#: src/gui/skilldialog.cpp:486
 #, c-format
 msgid "Skill Set %d"
 msgstr "Vaardigheid Set %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/skilldialog.cpp:518
+#: src/gui/skilldialog.cpp:520
 #, c-format
 msgid "Skill %d"
 msgstr "Vaardigheid %d"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/skilldialog.cpp:612 src/gui/skilldialog.cpp:762
+#: src/gui/skilldialog.cpp:614 src/gui/skilldialog.cpp:764
 #, c-format
 msgid "Lvl: %d"
 msgstr "Niv: %d"
@@ -5240,7 +5266,7 @@ msgid "Trade: You"
 msgstr "Handel: Jij"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:182
+#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:184
 #, c-format
 msgid "You get %s"
 msgstr "U krijgt %s"
@@ -5256,12 +5282,12 @@ msgid "You give:"
 msgstr "Je geeft:"
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:393
+#: src/gui/tradewindow.cpp:396
 msgid "You don't have enough money."
 msgstr "Je hebt niet genoeg geld."
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:475
+#: src/gui/tradewindow.cpp:479
 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 "
@@ -5274,224 +5300,224 @@ msgid "Name: %s"
 msgstr "Naam: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/updaterwindow.cpp:140
+#: src/gui/updaterwindow.cpp:156
 msgid "Updating..."
 msgstr "Actualiseren..."
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:165
+#: src/gui/updaterwindow.cpp:181
 msgid "Connecting..."
 msgstr "Verbinden..."
 
 #. TRANSLATORS: update message
-#: src/gui/updaterwindow.cpp:656
+#: src/gui/updaterwindow.cpp:672
 msgid "##1  The update process is incomplete."
 msgstr "##1 Het updateproces is onvolledig."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/updaterwindow.cpp:658
+#: src/gui/updaterwindow.cpp:674
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Het is ten sterkste aanbevolen dat"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:660
+#: src/gui/updaterwindow.cpp:676
 msgid "##1  you try again later."
 msgstr "##1  probeer later opnieuw."
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:839
+#: src/gui/updaterwindow.cpp:855
 msgid "Completed"
 msgstr "Voltooid"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
 msgid "Being"
 msgstr "Wezen"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:118
-msgid "Friend Names"
-msgstr "Namen van vrienden"
+#: src/gui/userpalette.cpp:119
+msgid "Friend names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:120
-msgid "Disregarded Names"
-msgstr "Namen van geen belang"
+#: src/gui/userpalette.cpp:121
+msgid "Disregarded names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:122
-msgid "Ignored Names"
-msgstr "Genegeerde Namen"
+#: src/gui/userpalette.cpp:123
+msgid "Ignored names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:124
-msgid "Erased Names"
-msgstr "Verwijderde Namen"
+#: src/gui/userpalette.cpp:125
+msgid "Erased names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:126
-msgid "Other Players' Names"
-msgstr "Namen van andere Spelers"
+#: src/gui/userpalette.cpp:127
+msgid "Other players names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:128
-msgid "Own Name"
-msgstr "Eigen Naam"
+#: src/gui/userpalette.cpp:129
+msgid "Own name"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:130
-msgid "GM Names"
-msgstr "GM Namen"
+#: src/gui/userpalette.cpp:131
+msgid "GM names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
 msgid "NPCs"
 msgstr "NPCs"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
 msgid "Monster HP bar"
 msgstr "Monster Levenspuntenbalk"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:140
 msgid "Monster HP bar (second color)"
 msgstr "Monster Levenspuntenbalk(tweede kleur)"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:141
-msgid "Party Members"
-msgstr "Groep Leden"
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:143
-msgid "Guild Members"
-msgstr "Guild Leden"
+#: src/gui/userpalette.cpp:142
+msgid "Party members"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:145
-msgid "Particle Effects"
-msgstr "Deeltjes effecten"
+#: src/gui/userpalette.cpp:144
+msgid "Guild members"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:147
-msgid "Pickup Notification"
-msgstr "Notificatie bij opnemen"
+#: src/gui/userpalette.cpp:148
+msgid "Pickup notification"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:149
-msgid "Exp Notification"
-msgstr "Ervaring Notificatie"
+#: src/gui/userpalette.cpp:150
+msgid "Exp notification"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
 msgid "Player HP bar"
 msgstr "Speler Levenspuntenbalk"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
 msgid "Player HP bar (second color)"
 msgstr "Speler Levenspuntenbalk"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:157
-msgid "Player Hits Monster"
-msgstr "Speler raakt Monster"
+#: src/gui/userpalette.cpp:158
+msgid "Player hits monster"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:159
-msgid "Monster Hits Player"
-msgstr "Monster raakt Speler"
+#: src/gui/userpalette.cpp:160
+msgid "Monster hits player"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:163
-msgid "Other Player Hits Local Player"
-msgstr "Andere speler raakt lokale speler"
+#: src/gui/userpalette.cpp:164
+msgid "Other player hits local player"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:166
 msgid "Critical Hit"
 msgstr "Kritieke aanval"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
-msgid "Local Player Hits Monster"
-msgstr "Lokale speler raakt andere speler"
+#: src/gui/userpalette.cpp:170
+msgid "Local player hits monster"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:172
-msgid "Local Player Critical Hit"
-msgstr "Lokale speler Critieke slag"
+#: src/gui/userpalette.cpp:173
+msgid "Local player critical hit"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:175
-msgid "Local Player Miss"
-msgstr "Lokale Speler mis"
+#: src/gui/userpalette.cpp:176
+msgid "Local player miss"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:177
+#: src/gui/userpalette.cpp:178
 msgid "Misses"
 msgstr "Missers"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
-msgid "Portal Highlight"
-msgstr "Poortmarkering"
+#: src/gui/userpalette.cpp:180
+msgid "Portal highlight"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:182
-msgid "Default collision Highlight"
+#: src/gui/userpalette.cpp:183
+msgid "Default collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:185
-msgid "Air collision Highlight"
+#: src/gui/userpalette.cpp:186
+msgid "Air collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:188
-msgid "Water collision Highlight"
+#: src/gui/userpalette.cpp:189
+msgid "Water collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:191
-msgid "Special ground collision Highlight"
+#: src/gui/userpalette.cpp:192
+msgid "Special ground collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
-msgid "Walkable Highlight"
-msgstr "Bewandelbare markering"
+#: src/gui/userpalette.cpp:195
+msgid "Walkable highlight"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:197
-msgid "Local Player Attack Range"
-msgstr "Aanvalsbereik van speler"
+#: src/gui/userpalette.cpp:198
+msgid "Local player attack range"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:200
-msgid "Local Player Attack Range Border"
-msgstr "Aanvalsbereikrand van speler"
+#: src/gui/userpalette.cpp:201
+msgid "Local player attack range border"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:203
-msgid "Monster Attack Range"
-msgstr "Aanvalsbereik van monster"
+#: src/gui/userpalette.cpp:204
+msgid "Monster attack range"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:206
-msgid "Home Place"
-msgstr "Thuisplaats"
+#: src/gui/userpalette.cpp:208
+msgid "Floor item amount color"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:211
+msgid "Home place"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:209
-msgid "Home Place Border"
-msgstr "Thuisplaatsgrens"
+#: src/gui/userpalette.cpp:214
+msgid "Home place border"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:212
-msgid "Road Point"
-msgstr "Wegpunt"
+#: src/gui/userpalette.cpp:217
+msgid "Road point"
+msgstr ""
 
 #. TRANSLATORS: who is online window name
 #: src/gui/whoisonline.cpp:79 src/gui/whoisonline.cpp:623
@@ -5622,7 +5648,7 @@ msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:315
+#: src/gui/widgets/itemcontainer.cpp:317
 msgid "Eq."
 msgstr ""
 
diff --git a/po/pl.po b/po/pl.po
index 97126b7a8..367862d6a 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-05-03 12:38+0300\n"
-"PO-Revision-Date: 2013-05-03 09:44+0000\n"
+"POT-Creation-Date: 2013-05-11 12:13+0300\n"
+"PO-Revision-Date: 2013-05-10 15:39+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/manaplus/language/"
 "pl/)\n"
@@ -63,25 +63,25 @@ msgstr "I"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: full button name
-#: src/client.cpp:1136 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
+#: src/client.cpp:1137 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
 msgid "Setup"
 msgstr "Konfiguracja"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1140 src/gui/setup_perfomance.cpp:61
+#: src/client.cpp:1141 src/gui/setup_perfomance.cpp:61
 msgid "Perfomance"
 msgstr "Wydajność programu"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:1143 src/gui/setup_video.cpp:258
+#: src/client.cpp:1144 src/gui/setup_video.cpp:258
 msgid "Video"
 msgstr "Ekran"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1146 src/gui/setup_theme.cpp:273
+#: src/client.cpp:1147 src/gui/setup_theme.cpp:283
 msgid "Theme"
 msgstr "Skórka"
 
@@ -92,7 +92,7 @@ msgstr "Skórka"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1150 src/gui/didyouknowwindow.cpp:78
+#: src/client.cpp:1151 src/gui/didyouknowwindow.cpp:78
 #: src/gui/inventorywindow.cpp:228 src/gui/npcdialog.cpp:63
 #: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:574
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:80
@@ -100,32 +100,32 @@ msgid "Close"
 msgstr "Zamknij"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1238
+#: src/client.cpp:1239
 msgid "Connecting to server"
 msgstr "Łączenie z serwerem"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1282
 msgid "Logging in"
 msgstr "Logowanie"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1320
+#: src/client.cpp:1321
 msgid "Entering game world"
 msgstr "Wchodzenie do świata gry"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1431
+#: src/client.cpp:1432
 msgid "Requesting characters"
 msgstr "Sprawdzanie postaci"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1471
 msgid "Connecting to the game server"
 msgstr "Łączenie się z serwerem gry"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1483
+#: src/client.cpp:1484
 msgid "Changing game servers"
 msgstr "Zmiana serwera"
 
@@ -140,69 +140,69 @@ msgstr "Zmiana serwera"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1540 src/client.cpp:1551 src/client.cpp:1721
+#: src/client.cpp:1541 src/client.cpp:1552 src/client.cpp:1722
 #: src/gui/changeemaildialog.cpp:168 src/gui/changepassworddialog.cpp:158
-#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:288
-#: src/gui/editserverdialog.cpp:220 src/gui/registerdialog.cpp:263
+#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:290
+#: src/gui/editserverdialog.cpp:216 src/gui/registerdialog.cpp:263
 #: src/gui/unregisterdialog.cpp:143 src/net/ea/charserverhandler.cpp:190
 #: src/net/ea/charserverhandler.cpp:210
 msgid "Error"
 msgstr "Błąd"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1564
+#: src/client.cpp:1565
 msgid "Requesting registration details"
 msgstr "Sprawdzanie szczegółów rejestracji"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1601
+#: src/client.cpp:1602
 msgid "Password Change"
 msgstr "Zmiana hasła"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1603
+#: src/client.cpp:1604
 msgid "Password changed successfully!"
 msgstr "Hasło zmienione z powodzeniem!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1624
+#: src/client.cpp:1625
 msgid "Email Change"
 msgstr "Zmiana adresu e-mail"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1626
+#: src/client.cpp:1627
 msgid "Email changed successfully!"
 msgstr "Adres e-mail zmieniony z powodzeniem!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1647
+#: src/client.cpp:1648
 msgid "Unregister Successful"
 msgstr "Wyrejestrowano z powodzeniem"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1649
+#: src/client.cpp:1650
 msgid "Farewell, come back any time..."
 msgstr "Żegnaj, będziemy czekać na Twój powrót..."
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1902 src/client.cpp:1917 src/client.cpp:1960
-#: src/client.cpp:1976 src/client.cpp:2417 src/client.cpp:2425
+#: src/client.cpp:1903 src/client.cpp:1918 src/client.cpp:1961
+#: src/client.cpp:1977 src/client.cpp:2418 src/client.cpp:2426
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s nie istnieje i nie może byś utworzone! Wyjście."
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2113
+#: src/client.cpp:2114
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Nieprawidłowy serwer aktualizacji: %s"
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2154 src/client.cpp:2161
+#: src/client.cpp:2155 src/client.cpp:2162
 msgid "Error creating updates directory!"
 msgstr "Błąd podczas tworzenia katalogu aktualizacji!"
 
-#: src/client.cpp:2183 src/client.cpp:2196
+#: src/client.cpp:2184 src/client.cpp:2197
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Błąd: %s nie istnieje i nie może być utworzone! Wyjście."
@@ -483,19 +483,19 @@ msgid "Comment: %s"
 msgstr "Komentarz: %s"
 
 #. TRANSLATORS: bot checker window header
-#: src/gui/botcheckerwindow.cpp:269
+#: src/gui/botcheckerwindow.cpp:268
 msgid "Bot Checker"
 msgstr "Wykrywacz botów"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:102
+#: src/gui/botcheckerwindow.cpp:277 src/gui/npcdialog.cpp:102
 msgid "Reset"
 msgstr "Resetuj"
 
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: relations table header
-#: src/gui/botcheckerwindow.cpp:305 src/gui/setup_relations.cpp:61
+#: src/gui/botcheckerwindow.cpp:304 src/gui/setup_relations.cpp:61
 msgid "Name"
 msgstr "Imię"
 
@@ -503,7 +503,7 @@ msgstr "Imię"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:145
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:145
 #: src/gui/popupmenu.cpp:241 src/gui/popupmenu.cpp:640
 #: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:257
 #: src/net/tmwa/generalhandler.cpp:292
@@ -513,7 +513,7 @@ msgstr "Atak"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
-#: src/gui/botcheckerwindow.cpp:309 src/gui/popupmenu.cpp:225
+#: src/gui/botcheckerwindow.cpp:308 src/gui/popupmenu.cpp:225
 #: src/gui/setupactiondata.h:93
 msgid "Talk"
 msgstr "Rozmowa"
@@ -521,7 +521,7 @@ msgstr "Rozmowa"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/botcheckerwindow.cpp:311 src/gui/popupmenu.cpp:215
+#: src/gui/botcheckerwindow.cpp:310 src/gui/popupmenu.cpp:215
 #: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:371
 #: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:653
 #: src/gui/popupmenu.cpp:727 src/gui/setupactiondata.h:1856
@@ -529,7 +529,7 @@ msgid "Move"
 msgstr "Podejdź"
 
 #. TRANSLATORS: bot checker window table header
-#: src/gui/botcheckerwindow.cpp:313
+#: src/gui/botcheckerwindow.cpp:312
 msgid "Result"
 msgstr "Rezultat"
 
@@ -585,7 +585,7 @@ msgstr "Kup"
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:516
+#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:511
 #: src/gui/selldialog.cpp:94 src/gui/selldialog.cpp:342
 #, c-format
 msgid "Price: %s / Total: %s"
@@ -602,9 +602,9 @@ msgstr "Ilość:"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:208
-#: src/gui/itemamountwindow.cpp:243 src/gui/npcdialog.cpp:93
-#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:833
+#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:202
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:93
+#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:821
 msgid "+"
 msgstr "+"
 
@@ -614,9 +614,9 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:240 src/gui/npcdialog.cpp:95
-#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:846
+#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:200
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:95
+#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:834
 msgid "-"
 msgstr "-"
 
@@ -628,7 +628,7 @@ msgstr "-"
 #. TRANSLATORS: input action name
 #: src/gui/buydialog.cpp:260 src/gui/quitdialog.cpp:54
 #: src/gui/quitdialog.cpp:59 src/gui/quitdialog.cpp:61
-#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:255
+#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:264
 #: src/gui/setupactiondata.h:177
 msgid "Quit"
 msgstr "Wyjdź"
@@ -640,7 +640,7 @@ msgstr "Wyjdź"
 #. TRANSLATORS: status bar label
 #: src/gui/buydialog.cpp:262 src/gui/selldialog.cpp:106
 #: src/gui/statuswindow.cpp:558 src/gui/statuswindow.cpp:615
-#: src/gui/statuswindow.cpp:830 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:852
 msgid "Max"
 msgstr "Maks."
 
@@ -685,7 +685,7 @@ msgstr "Sprzedaj"
 #: src/gui/buyselldialog.cpp:71 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:120
 #: src/gui/connectiondialog.cpp:48 src/gui/editserverdialog.cpp:80
-#: src/gui/itemamountwindow.cpp:212 src/gui/npcpostdialog.cpp:64
+#: src/gui/itemamountwindow.cpp:206 src/gui/npcpostdialog.cpp:64
 #: src/gui/popupmenu.cpp:290 src/gui/popupmenu.cpp:324
 #: src/gui/popupmenu.cpp:411 src/gui/popupmenu.cpp:454
 #: src/gui/popupmenu.cpp:485 src/gui/popupmenu.cpp:512
@@ -701,7 +701,7 @@ msgstr "Sprzedaj"
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
 #: src/gui/setup.cpp:84 src/gui/socialwindow.cpp:1204
 #: src/gui/textcommandeditor.cpp:212 src/gui/textdialog.cpp:53
-#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:167
+#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:183
 msgid "Cancel"
 msgstr "Anuluj"
 
@@ -865,7 +865,7 @@ msgstr "Proszę wykorzystać %d punktów"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:570
+#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:581
 #: src/gui/socialwindow.cpp:1269
 msgid "Create"
 msgstr "Utwórz"
@@ -892,17 +892,17 @@ msgid "Please remove %d points"
 msgstr "Proszę usunąć %d punktów"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:60
+#: src/gui/charselectdialog.cpp:61
 msgid "Confirm Character Delete"
 msgstr "Potwierdź usunięcie postaci"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:62
+#: src/gui/charselectdialog.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "Czy jesteś pewny/a, że chcesz usunąć tę postać?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:86
+#: src/gui/charselectdialog.cpp:87
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
@@ -914,8 +914,8 @@ msgstr "Przeloguj się"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:565
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:576
+#: src/gui/updaterwindow.cpp:185
 msgid "Play"
 msgstr "Graj"
 
@@ -931,7 +931,7 @@ msgstr "Info"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:263
+#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:272
 #: src/gui/setupactiondata.h:1803 src/gui/setup_relations.cpp:262
 #: src/gui/shopwindow.cpp:96 src/gui/shopwindow.cpp:103
 #: src/gui/textcommandeditor.cpp:216
@@ -941,24 +941,24 @@ msgstr "Usuń"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/charselectdialog.cpp:129 src/gui/unregisterdialog.cpp:48
+#: src/gui/charselectdialog.cpp:130 src/gui/unregisterdialog.cpp:48
 #: src/gui/unregisterdialog.cpp:53
 msgid "Unregister"
 msgstr "Wyrejestruj"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/charselectdialog.cpp:141
+#: src/gui/charselectdialog.cpp:142
 msgid "Change Email"
 msgstr "Zmiana adresu e-mail"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:172
+#: src/gui/charselectdialog.cpp:175
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/charselectdialog.cpp:246
+#: src/gui/charselectdialog.cpp:248
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -968,16 +968,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:288
+#: src/gui/charselectdialog.cpp:290
 msgid "Incorrect password"
 msgstr "Nieprawidłowe hasło"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password for deleting character"
 msgstr "Wprowadź hasło aby usunąć postać"
 
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password:"
 msgstr "Wprowadź hasło:"
 
@@ -1064,13 +1064,13 @@ msgid "Chat"
 msgstr "Czat"
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:735
+#: src/gui/chatwindow.cpp:638
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "%s obecny/a. %d graczy online."
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1165
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Szepczesz do %s: %s"
@@ -1088,7 +1088,7 @@ msgstr "Nie"
 
 #. TRANSLATORS: confirm dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/confirmdialog.cpp:58 src/gui/popupmenu.cpp:2429
+#: src/gui/confirmdialog.cpp:55 src/gui/popupmenu.cpp:2429
 #: src/gui/popupmenu.cpp:2442 src/gui/popupmenu.cpp:2457
 #: src/gui/popupmenu.cpp:2483
 msgid "Ignore"
@@ -1097,7 +1097,7 @@ msgstr "Ignoruj"
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
 #. TRANSLATORS: settings group
-#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:109
+#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:108
 #: src/gui/setup_other.cpp:123 src/gui/windowmenu.cpp:106
 msgid "Map"
 msgstr "Mapa"
@@ -1113,190 +1113,190 @@ msgid "Net"
 msgstr "Sieć"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:265
-#: src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:268
+#: src/gui/debugwindow.cpp:311
 msgid "Music:"
 msgstr "Muzyka:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:153 src/gui/debugwindow.cpp:271
-#: src/gui/debugwindow.cpp:312
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:274
+#: src/gui/debugwindow.cpp:315
 msgid "Map:"
 msgstr "Mapa:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:155 src/gui/debugwindow.cpp:268
-#: src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:271
+#: src/gui/debugwindow.cpp:313
 msgid "Minimap:"
 msgstr "Mini-mapa:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:262
-#: src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:161 src/gui/debugwindow.cpp:265
+#: src/gui/debugwindow.cpp:309
 msgid "Cursor:"
 msgstr "Kursor:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:161
+#: src/gui/debugwindow.cpp:164
 msgid "Particle count:"
 msgstr "Licznik cząsteczek:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:284
-#: src/gui/debugwindow.cpp:316
+#: src/gui/debugwindow.cpp:167 src/gui/debugwindow.cpp:287
+#: src/gui/debugwindow.cpp:319
 msgid "Map actors count:"
 msgstr "Licznik aktorów na mapie:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:166 src/gui/debugwindow.cpp:243
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:169 src/gui/debugwindow.cpp:246
+#: src/gui/debugwindow.cpp:252
 msgid "Player Position:"
 msgstr "Pozycja gracza:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:172 src/gui/debugwindow.cpp:297
+#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:300
 msgid "Draw calls:"
 msgstr ""
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:175
+#. TRANSLATORS: debug window label, frames per second
+#: src/gui/debugwindow.cpp:178
 #, c-format
 msgid "%d FPS"
 msgstr "%d FPS"
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:177 src/gui/debugwindow.cpp:324
+#. TRANSLATORS: debug window label, logic per second
+#: src/gui/debugwindow.cpp:180 src/gui/debugwindow.cpp:327
 #, c-format
 msgid "%d LPS"
 msgstr "%d LPS"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:191 src/gui/debugwindow.cpp:209
 #, c-format
 msgid "%d FPS (Software)"
 msgstr "%d FPS (Software)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:193
+#: src/gui/debugwindow.cpp:196
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr "%d FPS (szybki OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:197
+#: src/gui/debugwindow.cpp:200
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr "%d FPS (stary OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:201
+#: src/gui/debugwindow.cpp:204
 #, c-format
 msgid "%d FPS (mobile OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:225 src/gui/debugwindow.cpp:290
+#: src/gui/debugwindow.cpp:228 src/gui/debugwindow.cpp:293
 msgid "Textures count:"
 msgstr "Licznik tekstur:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:279
+#: src/gui/debugwindow.cpp:282
 #, c-format
 msgid "Particle count: %d"
 msgstr "Licznik cząsteczek: %d"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:330 src/gui/debugwindow.cpp:380
-#: src/gui/debugwindow.cpp:442
+#: src/gui/debugwindow.cpp:333 src/gui/debugwindow.cpp:383
+#: src/gui/debugwindow.cpp:445
 msgid "Target:"
 msgstr "Cel:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:332 src/gui/debugwindow.cpp:386
-#: src/gui/debugwindow.cpp:444
+#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
+#: src/gui/debugwindow.cpp:447
 msgid "Target Id:"
 msgstr "ID celu:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
-#: src/gui/debugwindow.cpp:446
+#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:392
+#: src/gui/debugwindow.cpp:449
 msgid "Target type:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:337
+#: src/gui/debugwindow.cpp:340
 msgid "Target level:"
 msgstr "Poziom celu:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:339 src/gui/debugwindow.cpp:405
+#: src/gui/debugwindow.cpp:342 src/gui/debugwindow.cpp:408
 msgid "Target race:"
 msgstr "Rasa celu:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:341
+#: src/gui/debugwindow.cpp:344
 msgid "Target party:"
 msgstr "Drużyna celu:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:346
 msgid "Target guild:"
 msgstr "Gildia celu:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:430
-#: src/gui/debugwindow.cpp:436 src/gui/debugwindow.cpp:454
+#: src/gui/debugwindow.cpp:348 src/gui/debugwindow.cpp:433
+#: src/gui/debugwindow.cpp:439 src/gui/debugwindow.cpp:457
 msgid "Attack delay:"
 msgstr "Opóźnienie ataku:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:347 src/gui/debugwindow.cpp:417
-#: src/gui/debugwindow.cpp:456
+#: src/gui/debugwindow.cpp:350 src/gui/debugwindow.cpp:420
+#: src/gui/debugwindow.cpp:459
 msgid "Minimal hit:"
 msgstr "Najsłabsze uderzenie:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:349 src/gui/debugwindow.cpp:420
-#: src/gui/debugwindow.cpp:458
+#: src/gui/debugwindow.cpp:352 src/gui/debugwindow.cpp:423
+#: src/gui/debugwindow.cpp:461
 msgid "Maximum hit:"
 msgstr "Najmocniejsze uderzenie:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:351 src/gui/debugwindow.cpp:423
-#: src/gui/debugwindow.cpp:460
+#: src/gui/debugwindow.cpp:354 src/gui/debugwindow.cpp:426
+#: src/gui/debugwindow.cpp:463
 msgid "Critical hit:"
 msgstr "Uderzenie krytyczne:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:394 src/gui/debugwindow.cpp:400
-#: src/gui/debugwindow.cpp:448
+#: src/gui/debugwindow.cpp:397 src/gui/debugwindow.cpp:403
+#: src/gui/debugwindow.cpp:451
 msgid "Target Level:"
 msgstr "Poziom celu:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:408 src/gui/debugwindow.cpp:450
+#: src/gui/debugwindow.cpp:411 src/gui/debugwindow.cpp:453
 msgid "Target Party:"
 msgstr "Grupa celu:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:412 src/gui/debugwindow.cpp:452
+#: src/gui/debugwindow.cpp:415 src/gui/debugwindow.cpp:455
 msgid "Target Guild:"
 msgstr "Gildia celu:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:493
+#: src/gui/debugwindow.cpp:496
 #, c-format
 msgid "Ping: %s ms"
 msgstr "Ping: %s ms"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:496
+#: src/gui/debugwindow.cpp:499
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "Wejście: %d bajtów"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:499
+#: src/gui/debugwindow.cpp:502
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "Wyjście: %d bajtów"
@@ -1328,7 +1328,7 @@ msgstr "Otwieraj to okno automatycznie"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #: src/gui/editdialog.cpp:45 src/gui/editserverdialog.cpp:78
-#: src/gui/itemamountwindow.cpp:210 src/gui/okdialog.cpp:51
+#: src/gui/itemamountwindow.cpp:204 src/gui/okdialog.cpp:51
 #: src/gui/quitdialog.cpp:70 src/gui/textdialog.cpp:46
 msgid "OK"
 msgstr "Ok"
@@ -1340,7 +1340,7 @@ msgstr "Edytuj serwer"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:257
+#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:266
 msgid "Connect"
 msgstr "Połącz"
 
@@ -1370,7 +1370,7 @@ msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/editserverdialog.cpp:222
+#: src/gui/editserverdialog.cpp:218
 msgid "Please at least type both the address and the port of the server."
 msgstr "Wymagany zarówno adres jak i port serwera."
 
@@ -1422,7 +1422,7 @@ msgstr "Załóż"
 #: src/gui/inventorywindow.cpp:178 src/gui/inventorywindow.cpp:630
 #: src/gui/popupmenu.cpp:1843 src/gui/popupmenu.cpp:1922
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2041
-#: src/gui/skilldialog.cpp:277
+#: src/gui/skilldialog.cpp:279
 msgid "Use"
 msgstr "Użyj"
 
@@ -1456,7 +1456,7 @@ msgstr "Stroje"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: setup button
-#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:718
+#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:719
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1992
 #: src/gui/popupmenu.cpp:2066 src/gui/setup.cpp:86
 msgid "Store"
@@ -1478,47 +1478,47 @@ msgid "Drop"
 msgstr "Upuść"
 
 #. TRANSLATORS: item amount window button
-#: src/gui/itemamountwindow.cpp:214
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "wszystkie"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:264
 msgid "Select amount of items to trade."
 msgstr "Wybierz ilość przedmiotów do handlu."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:274
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to drop."
 msgstr "Wybierz ilość przedmiotów do upuszczenia."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:278
+#: src/gui/itemamountwindow.cpp:272
 msgid "Select amount of items to store."
 msgstr "Podaj ilość rzeczy do przechowania."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:276
 msgid "Select amount of items to retrieve."
 msgstr "Wybierz ilość przedmiotów do odbioru."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:286
+#: src/gui/itemamountwindow.cpp:280
 msgid "Select amount of items to split."
 msgstr "Wybierz ilość przedmiotów do podziału."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:290
+#: src/gui/itemamountwindow.cpp:284
 msgid "Add to buy shop."
 msgstr "Dodaj to sklepu (sprzedaj)"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:294
+#: src/gui/itemamountwindow.cpp:288
 msgid "Add to sell shop."
 msgstr "Dodaj do sklepu (kupuj)"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:298
+#: src/gui/itemamountwindow.cpp:292
 msgid "Unknown."
 msgstr "Nieznany obiekt"
 
@@ -1545,7 +1545,7 @@ msgstr "Zresetuj zegar"
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:58 src/gui/killstats.cpp:171
-#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:516
+#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:509
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr "Moby: %s, całk. exp: %s"
@@ -1553,7 +1553,7 @@ msgstr "Moby: %s, całk. exp: %s"
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:61 src/gui/killstats.cpp:173
 #: src/gui/killstats.cpp:253 src/gui/killstats.cpp:268
-#: src/gui/killstats.cpp:518
+#: src/gui/killstats.cpp:511
 #, c-format
 msgid "Avg Exp: %s"
 msgstr "Śr. Exp: %s"
@@ -1561,14 +1561,14 @@ msgstr "Śr. Exp: %s"
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:63 src/gui/killstats.cpp:176
 #: src/gui/killstats.cpp:258 src/gui/killstats.cpp:272
-#: src/gui/killstats.cpp:521
+#: src/gui/killstats.cpp:514
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr "Przeciętna il mobów do nast.: %s"
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:66 src/gui/killstats.cpp:187
-#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:524
+#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:517
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr "Mob/Min: %s, Exp/Min: %s"
@@ -1598,9 +1598,9 @@ msgid "Last kill exp:"
 msgstr "Ostatni exp:"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:414
-#: src/gui/killstats.cpp:421 src/gui/killstats.cpp:428
-#: src/gui/killstats.cpp:434
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:408
+#: src/gui/killstats.cpp:415 src/gui/killstats.cpp:422
+#: src/gui/killstats.cpp:428
 msgid "Time before jacko spawn:"
 msgstr "Następny spawn Jack-O:"
 
@@ -1632,12 +1632,12 @@ msgid "  Time for next level: %s"
 msgstr "  Czas do nast. poziomu: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:421
+#: src/gui/killstats.cpp:415
 #, c-format
 msgid "%s %d?"
 msgstr "%s %d?"
 
-#: src/gui/killstats.cpp:428
+#: src/gui/killstats.cpp:422
 msgid "jacko spawning"
 msgstr "Jack-O spawnuje się"
 
@@ -1743,32 +1743,32 @@ msgid "arrows bar"
 msgstr "pasek strzał"
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:88
+#: src/gui/ministatuswindow.cpp:89
 msgid "status bar"
 msgstr "pasek statusu"
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:108
+#: src/gui/ministatuswindow.cpp:109
 msgid "job bar"
 msgstr "pasek punktów umiejętności"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:306 src/gui/statuswindow.cpp:298
+#: src/gui/ministatuswindow.cpp:307 src/gui/statuswindow.cpp:298
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Poziom: %d (GM %d)"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:313 src/gui/statuswindow.cpp:141
+#: src/gui/ministatuswindow.cpp:314 src/gui/statuswindow.cpp:141
 #: src/gui/statuswindow.cpp:305 src/gui/statuswindow.cpp:375
 #, c-format
 msgid "Level: %d"
 msgstr "Poziom: %d"
 
 #. TRANSLATORS: status bar label
-#: src/gui/ministatuswindow.cpp:330 src/gui/ministatuswindow.cpp:367
+#: src/gui/ministatuswindow.cpp:331 src/gui/ministatuswindow.cpp:368
 msgid "Need"
 msgstr "Potrzeba"
 
@@ -2156,7 +2156,7 @@ msgstr "Skopiuj do czatu"
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2209 src/gui/popupmenu.cpp:2280
-#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:139
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
 #: src/gui/socialwindow.cpp:934
 msgid "(default)"
 msgstr "(domyślne)"
@@ -2339,7 +2339,7 @@ msgid "Passwords do not match."
 msgstr "Hasła nie zgadzają się."
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:257
 msgid "Choose Your Server"
 msgstr "Wybierz serwer"
 
@@ -2347,61 +2347,61 @@ msgstr "Wybierz serwer"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:259 src/gui/shopwindow.cpp:94
+#: src/gui/serverdialog.cpp:268 src/gui/shopwindow.cpp:94
 #: src/gui/shopwindow.cpp:101 src/gui/tradewindow.cpp:77
 msgid "Add"
 msgstr "Dodaj"
 
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
-#: src/gui/serverdialog.cpp:261 src/gui/widgets/setupitem.cpp:299
+#: src/gui/serverdialog.cpp:270 src/gui/widgets/setupitem.cpp:299
 #: src/gui/widgets/setupitem.cpp:426
 msgid "Edit"
 msgstr "Edycja"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:274
 msgid "Load"
 msgstr "Załaduj"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:279
+#: src/gui/serverdialog.cpp:288
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Wybierz serwer  ***TRYB BEZPIECZEŃSTWA***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:297
 msgid "Use same ip for game sub servers"
 msgstr "Użyj tego samego IP dla podserwerów"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:518
+#: src/gui/serverdialog.cpp:527
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Ściąganie listy serwerów... %2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:524
+#: src/gui/serverdialog.cpp:533
 msgid "Waiting for server..."
 msgstr "Czekanie na serwer..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:529
+#: src/gui/serverdialog.cpp:538
 msgid "Preparing download"
 msgstr "Przygotowanie ściągania"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:534
+#: src/gui/serverdialog.cpp:543
 msgid "Error retreiving server list!"
 msgstr "Błąd przy uzyskiwaniu listy serwerów!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:626
+#: src/gui/serverdialog.cpp:635
 msgid "requires a newer version"
 msgstr "wymaga nowszej wersji"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:631
+#: src/gui/serverdialog.cpp:640
 #, c-format
 msgid "requires v%s"
 msgstr "wymaga v%s"
@@ -3412,7 +3412,7 @@ msgid "Type:"
 msgstr "Typ:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:334
+#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:336
 msgid "Delay:"
 msgstr "Opóźnienie:"
 
@@ -3432,30 +3432,30 @@ msgid "Blue:"
 msgstr "Niebieski:"
 
 #. TRANSLATORS: color type
-#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:420
+#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:422
 msgid "Static"
 msgstr "Statyczny"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:107 src/gui/setup_colors.cpp:110
-#: src/gui/setup_colors.cpp:422
+#: src/gui/setup_colors.cpp:424
 msgid "Pulse"
 msgstr "Pulsujący"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:112 src/gui/setup_colors.cpp:115
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Rainbow"
 msgstr "Tęcza"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:117 src/gui/setup_colors.cpp:120
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Spectrum"
 msgstr "Widmo"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:328
+#: src/gui/setup_colors.cpp:330
 msgid "Alpha:"
 msgstr "Alfa:"
 
@@ -3623,7 +3623,7 @@ msgstr "Różne"
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: palette color
-#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:134
+#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:135
 msgid "Monsters"
 msgstr "Potwory"
 
@@ -4172,206 +4172,231 @@ msgstr "Gdy ignorowany:"
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:86
+msgid "Very small (8)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:88
 msgid "Very small (9)"
 msgstr "Bardzo mały (9)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:88
+#: src/gui/setup_theme.cpp:90
 msgid "Tiny (10)"
 msgstr "Bardzo mała (10)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:90
+#: src/gui/setup_theme.cpp:92
 msgid "Small (11)"
 msgstr "Mała (11)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:92
+#: src/gui/setup_theme.cpp:94
 msgid "Medium (12)"
 msgstr "Średnia (12)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:94
+#: src/gui/setup_theme.cpp:96
 msgid "Normal (13)"
 msgstr "Normalny (13)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:96
+#: src/gui/setup_theme.cpp:98
 msgid "Large (14)"
 msgstr "Duży (14)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:98
-msgid "Very large (15)"
-msgstr "Bardzo duży (15)"
-
-#. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:100
-msgid "Big (16)"
-msgstr "Wielki (16)"
+msgid "Large (15)"
+msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:102
-msgid "Very big (17)"
-msgstr "Niezmiernie wielki (17)"
+msgid "Large (16)"
+msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:104
-msgid "Huge (18)"
-msgstr "Ogromny (18)"
+msgid "Big (17)"
+msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:106
-msgid "Very huge (19)"
-msgstr "Niezmiernie ogromny (19)"
+msgid "Big (18)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:108
+msgid "Big (19)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:110
+msgid "Very big (20)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:112
+msgid "Very big (21)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:114
+msgid "Very big (22)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:116
+msgid "Huge (23)"
+msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:151
 msgid "Chinese (China)"
 msgstr "Chinese (China)"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:153
 msgid "Czech"
 msgstr "Czech"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:155
 msgid "English"
 msgstr "English"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:157
 msgid "Finnish"
 msgstr "Finnish"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:159
 msgid "French"
 msgstr "French"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:161
 msgid "German"
 msgstr "German"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:153
+#: src/gui/setup_theme.cpp:163
 msgid "Indonesian"
 msgstr "Indonesian"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:155
+#: src/gui/setup_theme.cpp:165
 msgid "Italian"
 msgstr "Włoski"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:157
+#: src/gui/setup_theme.cpp:167
 msgid "Polish"
 msgstr "Polish"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:159
+#: src/gui/setup_theme.cpp:169
 msgid "Japanese"
 msgstr "Japanese"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:161
+#: src/gui/setup_theme.cpp:171
 msgid "Dutch (Belgium/Flemish)"
 msgstr "Dutch (Belgium/Flemish)"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:163
+#: src/gui/setup_theme.cpp:173
 msgid "Portuguese"
 msgstr "Portuguese"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:165
+#: src/gui/setup_theme.cpp:175
 msgid "Portuguese (Brazilian)"
 msgstr "Portuguese (Brazilian)"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:167
+#: src/gui/setup_theme.cpp:177
 msgid "Russian"
 msgstr "Russian"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:169
+#: src/gui/setup_theme.cpp:179
 msgid "Spanish (Castilian)"
 msgstr "Spanish (Castilian)"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:171
+#: src/gui/setup_theme.cpp:181
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:223
+#: src/gui/setup_theme.cpp:233
 msgid "Gui theme"
 msgstr "Skórka GUI"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:230
+#: src/gui/setup_theme.cpp:240
 msgid "Main Font"
 msgstr "Główna czcionka"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:235
+#: src/gui/setup_theme.cpp:245
 msgid "Language"
 msgstr "Język"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:239
+#: src/gui/setup_theme.cpp:249
 msgid "Bold font"
 msgstr "Pogrubiona czcionka"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:243
+#: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr "Czcionka efektów"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:247
+#: src/gui/setup_theme.cpp:257
 msgid "Help font"
 msgstr "Czcionka pomocy"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:251
+#: src/gui/setup_theme.cpp:261
 msgid "Secure font"
 msgstr "Bezpieczna czcionka"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:255
+#: src/gui/setup_theme.cpp:265
 msgid "Japanese font"
 msgstr "Japońska czcionka"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:260
+#: src/gui/setup_theme.cpp:270
 msgid "Font size"
 msgstr "Rozmiar czcionki"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:265
+#: src/gui/setup_theme.cpp:275
 msgid "Npc font size"
 msgstr "Rozmiar czcionki Npc"
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/setup_theme.cpp:269
+#: src/gui/setup_theme.cpp:279
 msgid "i"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/setup_theme.cpp:442
+#: src/gui/setup_theme.cpp:452
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/setup_theme.cpp:467
+#: src/gui/setup_theme.cpp:477
 msgid "Theme Changed"
 msgstr "Skórka zmieniona"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/setup_theme.cpp:467 src/gui/setup_video.cpp:537
+#: src/gui/setup_theme.cpp:477 src/gui/setup_video.cpp:537
 #: src/gui/setup_video.cpp:546
 msgid "Restart your client for the change to take effect."
 msgstr "Uruchom ponownie program, aby mogły zajść zmiany."
@@ -4674,7 +4699,8 @@ msgid "Ambient FX"
 msgstr "Efekty otoczenia"
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_visual.cpp:140
+#. TRANSLATORS: palette color
+#: src/gui/setup_visual.cpp:140 src/gui/userpalette.cpp:146
 msgid "Particle effects"
 msgstr "Efekty cząsteczkowe"
 
@@ -4761,45 +4787,45 @@ msgid "%s wants to %s %s do you accept?"
 msgstr "%s chce %s%s, akceptujesz?"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/skilldialog.cpp:270 src/gui/windowmenu.cpp:112
+#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:112
 msgid "Skills"
 msgstr "Zdolności"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/skilldialog.cpp:279
+#: src/gui/skilldialog.cpp:281
 msgid "Up"
 msgstr "Podwyż"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/skilldialog.cpp:391
+#: src/gui/skilldialog.cpp:393
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Dostępne punkty umiejętności: %d"
 
 #. TRANSLATORS: skills dialog default skills tab
-#: src/gui/skilldialog.cpp:444
+#: src/gui/skilldialog.cpp:446
 msgid "basic"
 msgstr "podstawowy"
 
 #. TRANSLATORS: skills dialog default skill name
-#: src/gui/skilldialog.cpp:447
+#: src/gui/skilldialog.cpp:449
 msgid "basic, 1"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/skilldialog.cpp:484
+#: src/gui/skilldialog.cpp:486
 #, c-format
 msgid "Skill Set %d"
 msgstr "Zestaw umiejętności %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/skilldialog.cpp:518
+#: src/gui/skilldialog.cpp:520
 #, c-format
 msgid "Skill %d"
 msgstr "Umiejętność %d"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/skilldialog.cpp:612 src/gui/skilldialog.cpp:762
+#: src/gui/skilldialog.cpp:614 src/gui/skilldialog.cpp:764
 #, c-format
 msgid "Lvl: %d"
 msgstr "Poziom: %d"
@@ -5242,7 +5268,7 @@ msgid "Trade: You"
 msgstr "Handel: Ty"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:182
+#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:184
 #, c-format
 msgid "You get %s"
 msgstr "Otrzymujesz %s"
@@ -5258,12 +5284,12 @@ msgid "You give:"
 msgstr "Dajesz:"
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:393
+#: src/gui/tradewindow.cpp:396
 msgid "You don't have enough money."
 msgstr "Nie masz wystarczającej ilości pieniędzy."
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:475
+#: src/gui/tradewindow.cpp:479
 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 "
@@ -5276,224 +5302,224 @@ msgid "Name: %s"
 msgstr "Imię: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/updaterwindow.cpp:140
+#: src/gui/updaterwindow.cpp:156
 msgid "Updating..."
 msgstr "Aktualizacja..."
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:165
+#: src/gui/updaterwindow.cpp:181
 msgid "Connecting..."
 msgstr "Łączenie..."
 
 #. TRANSLATORS: update message
-#: src/gui/updaterwindow.cpp:656
+#: src/gui/updaterwindow.cpp:672
 msgid "##1  The update process is incomplete."
 msgstr "##1 Proces aktualizacji jest niekompletny."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/updaterwindow.cpp:658
+#: src/gui/updaterwindow.cpp:674
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Jest mocno zalecane abyś"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:660
+#: src/gui/updaterwindow.cpp:676
 msgid "##1  you try again later."
 msgstr "##1  Spróbuj ponownie później."
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:839
+#: src/gui/updaterwindow.cpp:855
 msgid "Completed"
 msgstr "Zakończono"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
 msgid "Being"
 msgstr "Byty"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:118
-msgid "Friend Names"
-msgstr "Imiona przyjaciół"
+#: src/gui/userpalette.cpp:119
+msgid "Friend names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:120
-msgid "Disregarded Names"
-msgstr "Imiona lekceważonych"
+#: src/gui/userpalette.cpp:121
+msgid "Disregarded names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:122
-msgid "Ignored Names"
-msgstr "Imiona ignorowanych"
+#: src/gui/userpalette.cpp:123
+msgid "Ignored names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:124
-msgid "Erased Names"
-msgstr "Imiona usuniętych"
+#: src/gui/userpalette.cpp:125
+msgid "Erased names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:126
-msgid "Other Players' Names"
-msgstr "Imiona Innych Graczy"
+#: src/gui/userpalette.cpp:127
+msgid "Other players names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:128
-msgid "Own Name"
-msgstr "Własne Imię"
+#: src/gui/userpalette.cpp:129
+msgid "Own name"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:130
-msgid "GM Names"
-msgstr "Imiona GM"
+#: src/gui/userpalette.cpp:131
+msgid "GM names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
 msgid "NPCs"
 msgstr "NPC"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
 msgid "Monster HP bar"
 msgstr "Pasek życia potwora"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:140
 msgid "Monster HP bar (second color)"
 msgstr "Pasek życia potwora (drugi kolor)"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:141
-msgid "Party Members"
-msgstr "Członkowie grupy"
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:143
-msgid "Guild Members"
-msgstr "Członkowie drużyny"
+#: src/gui/userpalette.cpp:142
+msgid "Party members"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:145
-msgid "Particle Effects"
-msgstr "Efekty cząsteczkowe"
+#: src/gui/userpalette.cpp:144
+msgid "Guild members"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:147
-msgid "Pickup Notification"
-msgstr "Powiadomienie o podniesieniu"
+#: src/gui/userpalette.cpp:148
+msgid "Pickup notification"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:149
-msgid "Exp Notification"
-msgstr "Powiadomienie o Exp"
+#: src/gui/userpalette.cpp:150
+msgid "Exp notification"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
 msgid "Player HP bar"
 msgstr "Pasek życia gracza"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
 msgid "Player HP bar (second color)"
 msgstr "Pasek życia gracza (drugi kolor)"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:157
-msgid "Player Hits Monster"
-msgstr "Inny gracz uderza potwora"
+#: src/gui/userpalette.cpp:158
+msgid "Player hits monster"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:159
-msgid "Monster Hits Player"
-msgstr "Potwór uderza gracza"
+#: src/gui/userpalette.cpp:160
+msgid "Monster hits player"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:163
-msgid "Other Player Hits Local Player"
-msgstr "Inny gracz uderza Ciebie"
+#: src/gui/userpalette.cpp:164
+msgid "Other player hits local player"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:166
 msgid "Critical Hit"
 msgstr "Uderzenie Krytyczne"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
-msgid "Local Player Hits Monster"
-msgstr "Uderzasz potwora"
+#: src/gui/userpalette.cpp:170
+msgid "Local player hits monster"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:172
-msgid "Local Player Critical Hit"
-msgstr "Zadajesz cios krytyczny"
+#: src/gui/userpalette.cpp:173
+msgid "Local player critical hit"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:175
-msgid "Local Player Miss"
-msgstr "Pudłujesz"
+#: src/gui/userpalette.cpp:176
+msgid "Local player miss"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:177
+#: src/gui/userpalette.cpp:178
 msgid "Misses"
 msgstr "Pudła"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
-msgid "Portal Highlight"
-msgstr "Podświetlenie portalu"
+#: src/gui/userpalette.cpp:180
+msgid "Portal highlight"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:183
+msgid "Default collision highlight"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:182
-msgid "Default collision Highlight"
-msgstr "Podświetlenie nieprzechadzalnych terenów"
+#: src/gui/userpalette.cpp:186
+msgid "Air collision highlight"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:185
-msgid "Air collision Highlight"
-msgstr "Podświetlenie przeszkód powietrznych"
+#: src/gui/userpalette.cpp:189
+msgid "Water collision highlight"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:188
-msgid "Water collision Highlight"
-msgstr "Podświetlenie przeszkód wodnych"
+#: src/gui/userpalette.cpp:192
+msgid "Special ground collision highlight"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:191
-msgid "Special ground collision Highlight"
-msgstr "Podświetlenie specjalnych terenów kolizyjnych"
+#: src/gui/userpalette.cpp:195
+msgid "Walkable highlight"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
-msgid "Walkable Highlight"
-msgstr "Podświetlenie miejsc, po których da się chodzić"
+#: src/gui/userpalette.cpp:198
+msgid "Local player attack range"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:197
-msgid "Local Player Attack Range"
-msgstr "Zasięg Twojego ataku"
+#: src/gui/userpalette.cpp:201
+msgid "Local player attack range border"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:200
-msgid "Local Player Attack Range Border"
-msgstr "Obwódka zasięgu Twojego ataku"
+#: src/gui/userpalette.cpp:204
+msgid "Monster attack range"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:203
-msgid "Monster Attack Range"
-msgstr "Zakres ataku potwora"
+#: src/gui/userpalette.cpp:208
+msgid "Floor item amount color"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:206
-msgid "Home Place"
-msgstr "Lokalizacja domowa"
+#: src/gui/userpalette.cpp:211
+msgid "Home place"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:209
-msgid "Home Place Border"
-msgstr "Obwódka lokalizacji domowej"
+#: src/gui/userpalette.cpp:214
+msgid "Home place border"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:212
-msgid "Road Point"
-msgstr "Drogowskaz"
+#: src/gui/userpalette.cpp:217
+msgid "Road point"
+msgstr ""
 
 #. TRANSLATORS: who is online window name
 #: src/gui/whoisonline.cpp:79 src/gui/whoisonline.cpp:623
@@ -5622,7 +5648,7 @@ msgid "/kick > Kick some one from the guild you are in"
 msgstr "/kick > Wyrzuć kogoś ze swojej gildii"
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:315
+#: src/gui/widgets/itemcontainer.cpp:317
 msgid "Eq."
 msgstr ""
 
diff --git a/po/pt.po b/po/pt.po
index 80d419c73..c3d12ecab 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-05-03 12:38+0300\n"
-"PO-Revision-Date: 2013-05-03 09:44+0000\n"
+"POT-Creation-Date: 2013-05-11 12:13+0300\n"
+"PO-Revision-Date: 2013-05-10 15:39+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (http://www.transifex.com/projects/p/manaplus/"
 "language/pt/)\n"
@@ -63,25 +63,25 @@ msgstr "l"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: full button name
-#: src/client.cpp:1136 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
+#: src/client.cpp:1137 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
 msgid "Setup"
 msgstr "Configurar"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1140 src/gui/setup_perfomance.cpp:61
+#: src/client.cpp:1141 src/gui/setup_perfomance.cpp:61
 msgid "Perfomance"
 msgstr "Performance"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:1143 src/gui/setup_video.cpp:258
+#: src/client.cpp:1144 src/gui/setup_video.cpp:258
 msgid "Video"
 msgstr "Vídeo"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1146 src/gui/setup_theme.cpp:273
+#: src/client.cpp:1147 src/gui/setup_theme.cpp:283
 msgid "Theme"
 msgstr "Tema"
 
@@ -92,7 +92,7 @@ msgstr "Tema"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1150 src/gui/didyouknowwindow.cpp:78
+#: src/client.cpp:1151 src/gui/didyouknowwindow.cpp:78
 #: src/gui/inventorywindow.cpp:228 src/gui/npcdialog.cpp:63
 #: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:574
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:80
@@ -100,32 +100,32 @@ msgid "Close"
 msgstr "Fechar"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1238
+#: src/client.cpp:1239
 msgid "Connecting to server"
 msgstr "Conectando ao servidor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1282
 msgid "Logging in"
 msgstr "Efetuando login"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1320
+#: src/client.cpp:1321
 msgid "Entering game world"
 msgstr "Entrando no domínio do jogo"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1431
+#: src/client.cpp:1432
 msgid "Requesting characters"
 msgstr "Requisitando personagens"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1471
 msgid "Connecting to the game server"
 msgstr "Conectando ao servidor do jogo"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1483
+#: src/client.cpp:1484
 msgid "Changing game servers"
 msgstr "Mudando servidores do jogo"
 
@@ -140,69 +140,69 @@ msgstr "Mudando servidores do jogo"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1540 src/client.cpp:1551 src/client.cpp:1721
+#: src/client.cpp:1541 src/client.cpp:1552 src/client.cpp:1722
 #: src/gui/changeemaildialog.cpp:168 src/gui/changepassworddialog.cpp:158
-#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:288
-#: src/gui/editserverdialog.cpp:220 src/gui/registerdialog.cpp:263
+#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:290
+#: src/gui/editserverdialog.cpp:216 src/gui/registerdialog.cpp:263
 #: src/gui/unregisterdialog.cpp:143 src/net/ea/charserverhandler.cpp:190
 #: src/net/ea/charserverhandler.cpp:210
 msgid "Error"
 msgstr "Erro"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1564
+#: src/client.cpp:1565
 msgid "Requesting registration details"
 msgstr "Requisitando detalhes do registro"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1601
+#: src/client.cpp:1602
 msgid "Password Change"
 msgstr "Mudar senha"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1603
+#: src/client.cpp:1604
 msgid "Password changed successfully!"
 msgstr "Senha modificada com sucesso!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1624
+#: src/client.cpp:1625
 msgid "Email Change"
 msgstr "Mudar email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1626
+#: src/client.cpp:1627
 msgid "Email changed successfully!"
 msgstr "Email modificado com sucesso!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1647
+#: src/client.cpp:1648
 msgid "Unregister Successful"
 msgstr "Registro cancelado com sucesso"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1649
+#: src/client.cpp:1650
 msgid "Farewell, come back any time..."
 msgstr "Tchau, volte sempre..."
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1902 src/client.cpp:1917 src/client.cpp:1960
-#: src/client.cpp:1976 src/client.cpp:2417 src/client.cpp:2425
+#: src/client.cpp:1903 src/client.cpp:1918 src/client.cpp:1961
+#: src/client.cpp:1977 src/client.cpp:2418 src/client.cpp:2426
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s não existe e não pode ser criado! Saindo."
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2113
+#: src/client.cpp:2114
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Host de atualização inválido: %s"
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2154 src/client.cpp:2161
+#: src/client.cpp:2155 src/client.cpp:2162
 msgid "Error creating updates directory!"
 msgstr "Erro ao criar pasta de atualizações!"
 
-#: src/client.cpp:2183 src/client.cpp:2196
+#: src/client.cpp:2184 src/client.cpp:2197
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Erro: %s não existe e não pode se criado! Saindo."
@@ -485,19 +485,19 @@ msgid "Comment: %s"
 msgstr "Comentário: %s"
 
 #. TRANSLATORS: bot checker window header
-#: src/gui/botcheckerwindow.cpp:269
+#: src/gui/botcheckerwindow.cpp:268
 msgid "Bot Checker"
 msgstr "Analizador de bot"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:102
+#: src/gui/botcheckerwindow.cpp:277 src/gui/npcdialog.cpp:102
 msgid "Reset"
 msgstr "Resetar"
 
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: relations table header
-#: src/gui/botcheckerwindow.cpp:305 src/gui/setup_relations.cpp:61
+#: src/gui/botcheckerwindow.cpp:304 src/gui/setup_relations.cpp:61
 msgid "Name"
 msgstr "Nome"
 
@@ -505,7 +505,7 @@ msgstr "Nome"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:145
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:145
 #: src/gui/popupmenu.cpp:241 src/gui/popupmenu.cpp:640
 #: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:257
 #: src/net/tmwa/generalhandler.cpp:292
@@ -515,7 +515,7 @@ msgstr "Atacar"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
-#: src/gui/botcheckerwindow.cpp:309 src/gui/popupmenu.cpp:225
+#: src/gui/botcheckerwindow.cpp:308 src/gui/popupmenu.cpp:225
 #: src/gui/setupactiondata.h:93
 msgid "Talk"
 msgstr "Falar"
@@ -523,7 +523,7 @@ msgstr "Falar"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/botcheckerwindow.cpp:311 src/gui/popupmenu.cpp:215
+#: src/gui/botcheckerwindow.cpp:310 src/gui/popupmenu.cpp:215
 #: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:371
 #: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:653
 #: src/gui/popupmenu.cpp:727 src/gui/setupactiondata.h:1856
@@ -531,7 +531,7 @@ msgid "Move"
 msgstr "Mover"
 
 #. TRANSLATORS: bot checker window table header
-#: src/gui/botcheckerwindow.cpp:313
+#: src/gui/botcheckerwindow.cpp:312
 msgid "Result"
 msgstr "Resultado"
 
@@ -587,7 +587,7 @@ msgstr "Comprar"
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:516
+#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:511
 #: src/gui/selldialog.cpp:94 src/gui/selldialog.cpp:342
 #, c-format
 msgid "Price: %s / Total: %s"
@@ -604,9 +604,9 @@ msgstr "Quantidade:"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:208
-#: src/gui/itemamountwindow.cpp:243 src/gui/npcdialog.cpp:93
-#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:833
+#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:202
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:93
+#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:821
 msgid "+"
 msgstr "+"
 
@@ -616,9 +616,9 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:240 src/gui/npcdialog.cpp:95
-#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:846
+#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:200
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:95
+#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:834
 msgid "-"
 msgstr "-"
 
@@ -630,7 +630,7 @@ msgstr "-"
 #. TRANSLATORS: input action name
 #: src/gui/buydialog.cpp:260 src/gui/quitdialog.cpp:54
 #: src/gui/quitdialog.cpp:59 src/gui/quitdialog.cpp:61
-#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:255
+#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:264
 #: src/gui/setupactiondata.h:177
 msgid "Quit"
 msgstr "Sair"
@@ -642,7 +642,7 @@ msgstr "Sair"
 #. TRANSLATORS: status bar label
 #: src/gui/buydialog.cpp:262 src/gui/selldialog.cpp:106
 #: src/gui/statuswindow.cpp:558 src/gui/statuswindow.cpp:615
-#: src/gui/statuswindow.cpp:830 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:852
 msgid "Max"
 msgstr "Máximo"
 
@@ -687,7 +687,7 @@ msgstr "Vender"
 #: src/gui/buyselldialog.cpp:71 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:120
 #: src/gui/connectiondialog.cpp:48 src/gui/editserverdialog.cpp:80
-#: src/gui/itemamountwindow.cpp:212 src/gui/npcpostdialog.cpp:64
+#: src/gui/itemamountwindow.cpp:206 src/gui/npcpostdialog.cpp:64
 #: src/gui/popupmenu.cpp:290 src/gui/popupmenu.cpp:324
 #: src/gui/popupmenu.cpp:411 src/gui/popupmenu.cpp:454
 #: src/gui/popupmenu.cpp:485 src/gui/popupmenu.cpp:512
@@ -703,7 +703,7 @@ msgstr "Vender"
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
 #: src/gui/setup.cpp:84 src/gui/socialwindow.cpp:1204
 #: src/gui/textcommandeditor.cpp:212 src/gui/textdialog.cpp:53
-#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:167
+#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:183
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -867,7 +867,7 @@ msgstr "Por favor distribua %d pontos"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:570
+#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:581
 #: src/gui/socialwindow.cpp:1269
 msgid "Create"
 msgstr "Criar"
@@ -894,17 +894,17 @@ msgid "Please remove %d points"
 msgstr "Por favor remova %d pontos"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:60
+#: src/gui/charselectdialog.cpp:61
 msgid "Confirm Character Delete"
 msgstr "Confimar exclusão do personagem"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:62
+#: src/gui/charselectdialog.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "Tem certeza que deseja excluir este personagem?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:86
+#: src/gui/charselectdialog.cpp:87
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
@@ -916,8 +916,8 @@ msgstr "Trocar Login"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:565
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:576
+#: src/gui/updaterwindow.cpp:185
 msgid "Play"
 msgstr "Jogar"
 
@@ -933,7 +933,7 @@ msgstr "Informações"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:263
+#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:272
 #: src/gui/setupactiondata.h:1803 src/gui/setup_relations.cpp:262
 #: src/gui/shopwindow.cpp:96 src/gui/shopwindow.cpp:103
 #: src/gui/textcommandeditor.cpp:216
@@ -943,24 +943,24 @@ msgstr "Excluir"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/charselectdialog.cpp:129 src/gui/unregisterdialog.cpp:48
+#: src/gui/charselectdialog.cpp:130 src/gui/unregisterdialog.cpp:48
 #: src/gui/unregisterdialog.cpp:53
 msgid "Unregister"
 msgstr "Cancelar Registro"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/charselectdialog.cpp:141
+#: src/gui/charselectdialog.cpp:142
 msgid "Change Email"
 msgstr "Alterar email"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:172
+#: src/gui/charselectdialog.cpp:175
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/charselectdialog.cpp:246
+#: src/gui/charselectdialog.cpp:248
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -970,16 +970,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:288
+#: src/gui/charselectdialog.cpp:290
 msgid "Incorrect password"
 msgstr "Senha Incorreta"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password for deleting character"
 msgstr "Entre com a Senha para Deletar o usuario"
 
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password:"
 msgstr "Entre com a senha"
 
@@ -1066,13 +1066,13 @@ msgid "Chat"
 msgstr "Chat"
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:735
+#: src/gui/chatwindow.cpp:638
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presentes: %s; %d jogadores estão presentes."
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1165
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Enviando MP para %s: %s"
@@ -1090,7 +1090,7 @@ msgstr "Não"
 
 #. TRANSLATORS: confirm dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/confirmdialog.cpp:58 src/gui/popupmenu.cpp:2429
+#: src/gui/confirmdialog.cpp:55 src/gui/popupmenu.cpp:2429
 #: src/gui/popupmenu.cpp:2442 src/gui/popupmenu.cpp:2457
 #: src/gui/popupmenu.cpp:2483
 msgid "Ignore"
@@ -1099,7 +1099,7 @@ msgstr "Ignora"
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
 #. TRANSLATORS: settings group
-#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:109
+#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:108
 #: src/gui/setup_other.cpp:123 src/gui/windowmenu.cpp:106
 msgid "Map"
 msgstr "Mapa"
@@ -1115,190 +1115,190 @@ msgid "Net"
 msgstr "Rede"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:265
-#: src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:268
+#: src/gui/debugwindow.cpp:311
 msgid "Music:"
 msgstr "Música:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:153 src/gui/debugwindow.cpp:271
-#: src/gui/debugwindow.cpp:312
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:274
+#: src/gui/debugwindow.cpp:315
 msgid "Map:"
 msgstr "Mapa:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:155 src/gui/debugwindow.cpp:268
-#: src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:271
+#: src/gui/debugwindow.cpp:313
 msgid "Minimap:"
 msgstr "Minimapa:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:262
-#: src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:161 src/gui/debugwindow.cpp:265
+#: src/gui/debugwindow.cpp:309
 msgid "Cursor:"
 msgstr "Cursor:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:161
+#: src/gui/debugwindow.cpp:164
 msgid "Particle count:"
 msgstr "Contador de Particulas:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:284
-#: src/gui/debugwindow.cpp:316
+#: src/gui/debugwindow.cpp:167 src/gui/debugwindow.cpp:287
+#: src/gui/debugwindow.cpp:319
 msgid "Map actors count:"
 msgstr "Jogadores no mapa:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:166 src/gui/debugwindow.cpp:243
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:169 src/gui/debugwindow.cpp:246
+#: src/gui/debugwindow.cpp:252
 msgid "Player Position:"
 msgstr "Sua posição:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:172 src/gui/debugwindow.cpp:297
+#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:300
 msgid "Draw calls:"
 msgstr "Marcar caminho:"
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:175
+#. TRANSLATORS: debug window label, frames per second
+#: src/gui/debugwindow.cpp:178
 #, c-format
 msgid "%d FPS"
 msgstr "%d FPS"
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:177 src/gui/debugwindow.cpp:324
+#. TRANSLATORS: debug window label, logic per second
+#: src/gui/debugwindow.cpp:180 src/gui/debugwindow.cpp:327
 #, c-format
 msgid "%d LPS"
 msgstr "%d LPS"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:191 src/gui/debugwindow.cpp:209
 #, c-format
 msgid "%d FPS (Software)"
 msgstr "%d FPS (software)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:193
+#: src/gui/debugwindow.cpp:196
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr "%d FPS (rápido OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:197
+#: src/gui/debugwindow.cpp:200
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr "%d FPS (velho OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:201
+#: src/gui/debugwindow.cpp:204
 #, c-format
 msgid "%d FPS (mobile OpenGL)"
 msgstr "%d FPS (OpenGL móvel)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:225 src/gui/debugwindow.cpp:290
+#: src/gui/debugwindow.cpp:228 src/gui/debugwindow.cpp:293
 msgid "Textures count:"
 msgstr "Contador de Texturas:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:279
+#: src/gui/debugwindow.cpp:282
 #, c-format
 msgid "Particle count: %d"
 msgstr "Contagem de partículas: %d"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:330 src/gui/debugwindow.cpp:380
-#: src/gui/debugwindow.cpp:442
+#: src/gui/debugwindow.cpp:333 src/gui/debugwindow.cpp:383
+#: src/gui/debugwindow.cpp:445
 msgid "Target:"
 msgstr "Alvo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:332 src/gui/debugwindow.cpp:386
-#: src/gui/debugwindow.cpp:444
+#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
+#: src/gui/debugwindow.cpp:447
 msgid "Target Id:"
 msgstr "ID do alvo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
-#: src/gui/debugwindow.cpp:446
+#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:392
+#: src/gui/debugwindow.cpp:449
 msgid "Target type:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:337
+#: src/gui/debugwindow.cpp:340
 msgid "Target level:"
 msgstr "Level do alvo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:339 src/gui/debugwindow.cpp:405
+#: src/gui/debugwindow.cpp:342 src/gui/debugwindow.cpp:408
 msgid "Target race:"
 msgstr "Corrida do alvo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:341
+#: src/gui/debugwindow.cpp:344
 msgid "Target party:"
 msgstr "Grupo do alvo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:346
 msgid "Target guild:"
 msgstr "Guilda de alvo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:430
-#: src/gui/debugwindow.cpp:436 src/gui/debugwindow.cpp:454
+#: src/gui/debugwindow.cpp:348 src/gui/debugwindow.cpp:433
+#: src/gui/debugwindow.cpp:439 src/gui/debugwindow.cpp:457
 msgid "Attack delay:"
 msgstr "Atraso de Ataque:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:347 src/gui/debugwindow.cpp:417
-#: src/gui/debugwindow.cpp:456
+#: src/gui/debugwindow.cpp:350 src/gui/debugwindow.cpp:420
+#: src/gui/debugwindow.cpp:459
 msgid "Minimal hit:"
 msgstr "Dano Minimo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:349 src/gui/debugwindow.cpp:420
-#: src/gui/debugwindow.cpp:458
+#: src/gui/debugwindow.cpp:352 src/gui/debugwindow.cpp:423
+#: src/gui/debugwindow.cpp:461
 msgid "Maximum hit:"
 msgstr "Dano Máximo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:351 src/gui/debugwindow.cpp:423
-#: src/gui/debugwindow.cpp:460
+#: src/gui/debugwindow.cpp:354 src/gui/debugwindow.cpp:426
+#: src/gui/debugwindow.cpp:463
 msgid "Critical hit:"
 msgstr "Dano Crítico:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:394 src/gui/debugwindow.cpp:400
-#: src/gui/debugwindow.cpp:448
+#: src/gui/debugwindow.cpp:397 src/gui/debugwindow.cpp:403
+#: src/gui/debugwindow.cpp:451
 msgid "Target Level:"
 msgstr "Nível do alvo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:408 src/gui/debugwindow.cpp:450
+#: src/gui/debugwindow.cpp:411 src/gui/debugwindow.cpp:453
 msgid "Target Party:"
 msgstr "Grupo do alvo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:412 src/gui/debugwindow.cpp:452
+#: src/gui/debugwindow.cpp:415 src/gui/debugwindow.cpp:455
 msgid "Target Guild:"
 msgstr "Guilda do alvo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:493
+#: src/gui/debugwindow.cpp:496
 #, c-format
 msgid "Ping: %s ms"
 msgstr "Ping: %s ms"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:496
+#: src/gui/debugwindow.cpp:499
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "Entrada: %d bytes/s"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:499
+#: src/gui/debugwindow.cpp:502
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "Saída: %d bytes/s"
@@ -1330,7 +1330,7 @@ msgstr "Abrir automaticamente esta janela"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #: src/gui/editdialog.cpp:45 src/gui/editserverdialog.cpp:78
-#: src/gui/itemamountwindow.cpp:210 src/gui/okdialog.cpp:51
+#: src/gui/itemamountwindow.cpp:204 src/gui/okdialog.cpp:51
 #: src/gui/quitdialog.cpp:70 src/gui/textdialog.cpp:46
 msgid "OK"
 msgstr "OK"
@@ -1342,7 +1342,7 @@ msgstr "Editar Servidor"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:257
+#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:266
 msgid "Connect"
 msgstr "Conectar"
 
@@ -1372,7 +1372,7 @@ msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/editserverdialog.cpp:222
+#: src/gui/editserverdialog.cpp:218
 msgid "Please at least type both the address and the port of the server."
 msgstr "Por favor coloque ao menos uma porta de servidor."
 
@@ -1424,7 +1424,7 @@ msgstr "Equipar"
 #: src/gui/inventorywindow.cpp:178 src/gui/inventorywindow.cpp:630
 #: src/gui/popupmenu.cpp:1843 src/gui/popupmenu.cpp:1922
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2041
-#: src/gui/skilldialog.cpp:277
+#: src/gui/skilldialog.cpp:279
 msgid "Use"
 msgstr "Usar"
 
@@ -1458,7 +1458,7 @@ msgstr "Roupas"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: setup button
-#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:718
+#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:719
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1992
 #: src/gui/popupmenu.cpp:2066 src/gui/setup.cpp:86
 msgid "Store"
@@ -1480,47 +1480,47 @@ msgid "Drop"
 msgstr "Descartar"
 
 #. TRANSLATORS: item amount window button
-#: src/gui/itemamountwindow.cpp:214
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "Tudo"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:264
 msgid "Select amount of items to trade."
 msgstr "Selecionar quantidade de itens para negociar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:274
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to drop."
 msgstr "Selecionar quantidade de itens para descartar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:278
+#: src/gui/itemamountwindow.cpp:272
 msgid "Select amount of items to store."
 msgstr "Escolha a quantidade de itens para armazenar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:276
 msgid "Select amount of items to retrieve."
 msgstr "Escolha a quantidade de itens para retirar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:286
+#: src/gui/itemamountwindow.cpp:280
 msgid "Select amount of items to split."
 msgstr "Selecionar quantidade de itens para dividir."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:290
+#: src/gui/itemamountwindow.cpp:284
 msgid "Add to buy shop."
 msgstr "Adicionar na loja de compra"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:294
+#: src/gui/itemamountwindow.cpp:288
 msgid "Add to sell shop."
 msgstr "Adicionar na loja de venda"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:298
+#: src/gui/itemamountwindow.cpp:292
 msgid "Unknown."
 msgstr "Desconhecido"
 
@@ -1547,7 +1547,7 @@ msgstr "Resetar tempo"
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:58 src/gui/killstats.cpp:171
-#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:516
+#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:509
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr "Mortes: %s, total exp: %s"
@@ -1555,7 +1555,7 @@ msgstr "Mortes: %s, total exp: %s"
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:61 src/gui/killstats.cpp:173
 #: src/gui/killstats.cpp:253 src/gui/killstats.cpp:268
-#: src/gui/killstats.cpp:518
+#: src/gui/killstats.cpp:511
 #, c-format
 msgid "Avg Exp: %s"
 msgstr "Média Exp: %s"
@@ -1563,14 +1563,14 @@ msgstr "Média Exp: %s"
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:63 src/gui/killstats.cpp:176
 #: src/gui/killstats.cpp:258 src/gui/killstats.cpp:272
-#: src/gui/killstats.cpp:521
+#: src/gui/killstats.cpp:514
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr "Nu. de mob para próximo level: %s"
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:66 src/gui/killstats.cpp:187
-#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:524
+#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:517
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr "Mortes/Min: %s Exp/Min: %s"
@@ -1598,9 +1598,9 @@ msgid "Last kill exp:"
 msgstr "Exp de última morte:"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:414
-#: src/gui/killstats.cpp:421 src/gui/killstats.cpp:428
-#: src/gui/killstats.cpp:434
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:408
+#: src/gui/killstats.cpp:415 src/gui/killstats.cpp:422
+#: src/gui/killstats.cpp:428
 msgid "Time before jacko spawn:"
 msgstr "Tempo para próximo JackO:"
 
@@ -1632,12 +1632,12 @@ msgid "  Time for next level: %s"
 msgstr "Tempo para próximo nível:  %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:421
+#: src/gui/killstats.cpp:415
 #, c-format
 msgid "%s %d?"
 msgstr "%s %d?"
 
-#: src/gui/killstats.cpp:428
+#: src/gui/killstats.cpp:422
 msgid "jacko spawning"
 msgstr "Aparição do JackO"
 
@@ -1743,32 +1743,32 @@ msgid "arrows bar"
 msgstr "Barra de flechas"
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:88
+#: src/gui/ministatuswindow.cpp:89
 msgid "status bar"
 msgstr "Barra de Status"
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:108
+#: src/gui/ministatuswindow.cpp:109
 msgid "job bar"
 msgstr "Barra de Job"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:306 src/gui/statuswindow.cpp:298
+#: src/gui/ministatuswindow.cpp:307 src/gui/statuswindow.cpp:298
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Nível: %d (GM %d)"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:313 src/gui/statuswindow.cpp:141
+#: src/gui/ministatuswindow.cpp:314 src/gui/statuswindow.cpp:141
 #: src/gui/statuswindow.cpp:305 src/gui/statuswindow.cpp:375
 #, c-format
 msgid "Level: %d"
 msgstr "Nível: %d"
 
 #. TRANSLATORS: status bar label
-#: src/gui/ministatuswindow.cpp:330 src/gui/ministatuswindow.cpp:367
+#: src/gui/ministatuswindow.cpp:331 src/gui/ministatuswindow.cpp:368
 msgid "Need"
 msgstr "Precisa"
 
@@ -2156,7 +2156,7 @@ msgstr "Copiar para o chat"
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2209 src/gui/popupmenu.cpp:2280
-#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:139
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
 #: src/gui/socialwindow.cpp:934
 msgid "(default)"
 msgstr "(padrão)"
@@ -2339,7 +2339,7 @@ msgid "Passwords do not match."
 msgstr "Senhas não conferem."
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:257
 msgid "Choose Your Server"
 msgstr "Escolha seu servidor"
 
@@ -2347,61 +2347,61 @@ msgstr "Escolha seu servidor"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:259 src/gui/shopwindow.cpp:94
+#: src/gui/serverdialog.cpp:268 src/gui/shopwindow.cpp:94
 #: src/gui/shopwindow.cpp:101 src/gui/tradewindow.cpp:77
 msgid "Add"
 msgstr "Adicionar"
 
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
-#: src/gui/serverdialog.cpp:261 src/gui/widgets/setupitem.cpp:299
+#: src/gui/serverdialog.cpp:270 src/gui/widgets/setupitem.cpp:299
 #: src/gui/widgets/setupitem.cpp:426
 msgid "Edit"
 msgstr "Editar"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:274
 msgid "Load"
 msgstr "Carregar"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:279
+#: src/gui/serverdialog.cpp:288
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Escolha seu servidor    *** MODO SEGURO ***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:297
 msgid "Use same ip for game sub servers"
 msgstr "Usar o mesmo ip para os sub servidores do jogo"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:518
+#: src/gui/serverdialog.cpp:527
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Baixando lista de servidores...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:524
+#: src/gui/serverdialog.cpp:533
 msgid "Waiting for server..."
 msgstr "Aguardando servidor..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:529
+#: src/gui/serverdialog.cpp:538
 msgid "Preparing download"
 msgstr "Preparando download"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:534
+#: src/gui/serverdialog.cpp:543
 msgid "Error retreiving server list!"
 msgstr "Erro ao recuperar lista!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:626
+#: src/gui/serverdialog.cpp:635
 msgid "requires a newer version"
 msgstr "requer uma versão mais nova"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:631
+#: src/gui/serverdialog.cpp:640
 #, c-format
 msgid "requires v%s"
 msgstr "requer v%s"
@@ -3412,7 +3412,7 @@ msgid "Type:"
 msgstr "Tipo:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:334
+#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:336
 msgid "Delay:"
 msgstr "Atraso:"
 
@@ -3432,30 +3432,30 @@ msgid "Blue:"
 msgstr "Azul:"
 
 #. TRANSLATORS: color type
-#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:420
+#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:422
 msgid "Static"
 msgstr "Estático"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:107 src/gui/setup_colors.cpp:110
-#: src/gui/setup_colors.cpp:422
+#: src/gui/setup_colors.cpp:424
 msgid "Pulse"
 msgstr "Pulso"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:112 src/gui/setup_colors.cpp:115
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Rainbow"
 msgstr "Arco-íris"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:117 src/gui/setup_colors.cpp:120
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Spectrum"
 msgstr "Espectro"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:328
+#: src/gui/setup_colors.cpp:330
 msgid "Alpha:"
 msgstr "Alpha:"
 
@@ -3623,7 +3623,7 @@ msgstr "Diversos"
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: palette color
-#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:134
+#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:135
 msgid "Monsters"
 msgstr "Monstros"
 
@@ -4172,206 +4172,231 @@ msgstr "Quando ignorar:"
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:86
+msgid "Very small (8)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:88
 msgid "Very small (9)"
 msgstr "Muito pequeno (9)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:88
+#: src/gui/setup_theme.cpp:90
 msgid "Tiny (10)"
 msgstr "Minúsculo (10)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:90
+#: src/gui/setup_theme.cpp:92
 msgid "Small (11)"
 msgstr "Pequeno (11)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:92
+#: src/gui/setup_theme.cpp:94
 msgid "Medium (12)"
 msgstr "Médio (12)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:94
+#: src/gui/setup_theme.cpp:96
 msgid "Normal (13)"
 msgstr "Normal (13)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:96
+#: src/gui/setup_theme.cpp:98
 msgid "Large (14)"
 msgstr "Largo (14)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:98
-msgid "Very large (15)"
-msgstr "Muito Largo (15)"
-
-#. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:100
-msgid "Big (16)"
-msgstr "Grande (16)"
+msgid "Large (15)"
+msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:102
-msgid "Very big (17)"
-msgstr "Muito Grande (17)"
+msgid "Large (16)"
+msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:104
-msgid "Huge (18)"
-msgstr "Enorme (18)"
+msgid "Big (17)"
+msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:106
-msgid "Very huge (19)"
-msgstr "Muito Enorme (19)"
+msgid "Big (18)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:108
+msgid "Big (19)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:110
+msgid "Very big (20)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:112
+msgid "Very big (21)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:114
+msgid "Very big (22)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:116
+msgid "Huge (23)"
+msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:151
 msgid "Chinese (China)"
 msgstr "Chinês (China)"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:153
 msgid "Czech"
 msgstr "Tcheco"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:155
 msgid "English"
 msgstr "Inglês"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:157
 msgid "Finnish"
 msgstr "Finlandês"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:159
 msgid "French"
 msgstr "Francês"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:161
 msgid "German"
 msgstr "Alemão"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:153
+#: src/gui/setup_theme.cpp:163
 msgid "Indonesian"
 msgstr "Indonésio"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:155
+#: src/gui/setup_theme.cpp:165
 msgid "Italian"
 msgstr "Italiano"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:157
+#: src/gui/setup_theme.cpp:167
 msgid "Polish"
 msgstr "Polonês"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:159
+#: src/gui/setup_theme.cpp:169
 msgid "Japanese"
 msgstr "Japonês"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:161
+#: src/gui/setup_theme.cpp:171
 msgid "Dutch (Belgium/Flemish)"
 msgstr "Holandês (Bélgica / Flandres)"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:163
+#: src/gui/setup_theme.cpp:173
 msgid "Portuguese"
 msgstr "Português"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:165
+#: src/gui/setup_theme.cpp:175
 msgid "Portuguese (Brazilian)"
 msgstr "Português (Brasileiro)"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:167
+#: src/gui/setup_theme.cpp:177
 msgid "Russian"
 msgstr "Russo"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:169
+#: src/gui/setup_theme.cpp:179
 msgid "Spanish (Castilian)"
 msgstr "Espanhol (castelhano)"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:171
+#: src/gui/setup_theme.cpp:181
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:223
+#: src/gui/setup_theme.cpp:233
 msgid "Gui theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:230
+#: src/gui/setup_theme.cpp:240
 msgid "Main Font"
 msgstr "Fonte"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:235
+#: src/gui/setup_theme.cpp:245
 msgid "Language"
 msgstr "Linguagem"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:239
+#: src/gui/setup_theme.cpp:249
 msgid "Bold font"
 msgstr "Fonte negrito"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:243
+#: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr "Fonte de particulas"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:247
+#: src/gui/setup_theme.cpp:257
 msgid "Help font"
 msgstr "Fonte de ajuda"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:251
+#: src/gui/setup_theme.cpp:261
 msgid "Secure font"
 msgstr "Fonte Segura"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:255
+#: src/gui/setup_theme.cpp:265
 msgid "Japanese font"
 msgstr "Font Jasponesa"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:260
+#: src/gui/setup_theme.cpp:270
 msgid "Font size"
 msgstr "Tamanho da fonte"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:265
+#: src/gui/setup_theme.cpp:275
 msgid "Npc font size"
 msgstr "Tamanho da fonte de NPC"
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/setup_theme.cpp:269
+#: src/gui/setup_theme.cpp:279
 msgid "i"
 msgstr "i"
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/setup_theme.cpp:442
+#: src/gui/setup_theme.cpp:452
 msgid "Theme info"
 msgstr "Informação de Temas"
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/setup_theme.cpp:467
+#: src/gui/setup_theme.cpp:477
 msgid "Theme Changed"
 msgstr "Tema alterado"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/setup_theme.cpp:467 src/gui/setup_video.cpp:537
+#: src/gui/setup_theme.cpp:477 src/gui/setup_video.cpp:537
 #: src/gui/setup_video.cpp:546
 msgid "Restart your client for the change to take effect."
 msgstr "Reincie o cliente para que as mudanças surtam efeito."
@@ -4673,7 +4698,8 @@ msgid "Ambient FX"
 msgstr "Ambiente FX"
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_visual.cpp:140
+#. TRANSLATORS: palette color
+#: src/gui/setup_visual.cpp:140 src/gui/userpalette.cpp:146
 msgid "Particle effects"
 msgstr "Efeitos de partícula"
 
@@ -4760,45 +4786,45 @@ msgid "%s wants to %s %s do you accept?"
 msgstr "%s quer %s %s você aceita?"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/skilldialog.cpp:270 src/gui/windowmenu.cpp:112
+#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:112
 msgid "Skills"
 msgstr "Habilidades"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/skilldialog.cpp:279
+#: src/gui/skilldialog.cpp:281
 msgid "Up"
 msgstr "+"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/skilldialog.cpp:391
+#: src/gui/skilldialog.cpp:393
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Pontos de habilidade disponíveis: %d"
 
 #. TRANSLATORS: skills dialog default skills tab
-#: src/gui/skilldialog.cpp:444
+#: src/gui/skilldialog.cpp:446
 msgid "basic"
 msgstr "básico"
 
 #. TRANSLATORS: skills dialog default skill name
-#: src/gui/skilldialog.cpp:447
+#: src/gui/skilldialog.cpp:449
 msgid "basic, 1"
 msgstr "básico, 1"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/skilldialog.cpp:484
+#: src/gui/skilldialog.cpp:486
 #, c-format
 msgid "Skill Set %d"
 msgstr "Habilidade %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/skilldialog.cpp:518
+#: src/gui/skilldialog.cpp:520
 #, c-format
 msgid "Skill %d"
 msgstr "Habilidade %d"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/skilldialog.cpp:612 src/gui/skilldialog.cpp:762
+#: src/gui/skilldialog.cpp:614 src/gui/skilldialog.cpp:764
 #, c-format
 msgid "Lvl: %d"
 msgstr "Nível: %d"
@@ -5241,7 +5267,7 @@ msgid "Trade: You"
 msgstr "Negócio: você"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:182
+#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:184
 #, c-format
 msgid "You get %s"
 msgstr "Você pegou %s"
@@ -5257,12 +5283,12 @@ msgid "You give:"
 msgstr "Você dá:"
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:393
+#: src/gui/tradewindow.cpp:396
 msgid "You don't have enough money."
 msgstr "Você não tem dinheiro suficiente."
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:475
+#: src/gui/tradewindow.cpp:479
 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."
@@ -5274,224 +5300,224 @@ msgid "Name: %s"
 msgstr "Nome: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/updaterwindow.cpp:140
+#: src/gui/updaterwindow.cpp:156
 msgid "Updating..."
 msgstr "Atualizando..."
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:165
+#: src/gui/updaterwindow.cpp:181
 msgid "Connecting..."
 msgstr "Conectando..."
 
 #. TRANSLATORS: update message
-#: src/gui/updaterwindow.cpp:656
+#: src/gui/updaterwindow.cpp:672
 msgid "##1  The update process is incomplete."
 msgstr "##1  O processo de update está incompleto."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/updaterwindow.cpp:658
+#: src/gui/updaterwindow.cpp:674
 msgid "##1  It is strongly recommended that"
 msgstr "##1  É altamente recomendado que"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:660
+#: src/gui/updaterwindow.cpp:676
 msgid "##1  you try again later."
 msgstr "##1  tente novamente mais tarde."
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:839
+#: src/gui/updaterwindow.cpp:855
 msgid "Completed"
 msgstr "Concluído"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
 msgid "Being"
 msgstr "Personagem"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:118
-msgid "Friend Names"
-msgstr "Nome de Amigos"
+#: src/gui/userpalette.cpp:119
+msgid "Friend names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:120
-msgid "Disregarded Names"
-msgstr "Nome de Desconsiderados"
+#: src/gui/userpalette.cpp:121
+msgid "Disregarded names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:122
-msgid "Ignored Names"
-msgstr "Nome de Ignorados"
+#: src/gui/userpalette.cpp:123
+msgid "Ignored names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:124
-msgid "Erased Names"
-msgstr "Nome de Apagados"
+#: src/gui/userpalette.cpp:125
+msgid "Erased names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:126
-msgid "Other Players' Names"
-msgstr "Nomes de outros jogadores"
+#: src/gui/userpalette.cpp:127
+msgid "Other players names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:128
-msgid "Own Name"
-msgstr "Próprio nome"
+#: src/gui/userpalette.cpp:129
+msgid "Own name"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:130
-msgid "GM Names"
-msgstr "Nomes dos GMs"
+#: src/gui/userpalette.cpp:131
+msgid "GM names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
 msgid "NPCs"
 msgstr "NPCs"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
 msgid "Monster HP bar"
 msgstr "Barra de HP"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:140
 msgid "Monster HP bar (second color)"
 msgstr "Barra de HP do inimigo (segunda cor)"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:141
-msgid "Party Members"
-msgstr "Membros do grupo"
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:143
-msgid "Guild Members"
-msgstr "Membros da guilda"
+#: src/gui/userpalette.cpp:142
+msgid "Party members"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:145
-msgid "Particle Effects"
-msgstr "Efeitos de partícula"
+#: src/gui/userpalette.cpp:144
+msgid "Guild members"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:147
-msgid "Pickup Notification"
-msgstr "Aviso ao pegar algum item"
+#: src/gui/userpalette.cpp:148
+msgid "Pickup notification"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:149
-msgid "Exp Notification"
-msgstr "Aviso de experiência"
+#: src/gui/userpalette.cpp:150
+msgid "Exp notification"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
 msgid "Player HP bar"
 msgstr "Barra de HP do jogador"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
 msgid "Player HP bar (second color)"
 msgstr "Barra de HP do jogador (segunda cor)"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:157
-msgid "Player Hits Monster"
-msgstr "Jogador acerta Monstro"
+#: src/gui/userpalette.cpp:158
+msgid "Player hits monster"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:159
-msgid "Monster Hits Player"
-msgstr "Monstro Acerta Jogador"
+#: src/gui/userpalette.cpp:160
+msgid "Monster hits player"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:163
-msgid "Other Player Hits Local Player"
-msgstr "Outro jogador(a) ataca você"
+#: src/gui/userpalette.cpp:164
+msgid "Other player hits local player"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:166
 msgid "Critical Hit"
 msgstr "Golpe crítico"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
-msgid "Local Player Hits Monster"
-msgstr "Jogador Acerta Monstro"
+#: src/gui/userpalette.cpp:170
+msgid "Local player hits monster"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:172
-msgid "Local Player Critical Hit"
-msgstr "Golpe Crítico do Jogador"
+#: src/gui/userpalette.cpp:173
+msgid "Local player critical hit"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:175
-msgid "Local Player Miss"
-msgstr "Jogador Erra o Golpe"
+#: src/gui/userpalette.cpp:176
+msgid "Local player miss"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:177
+#: src/gui/userpalette.cpp:178
 msgid "Misses"
 msgstr "Golpes errados"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
-msgid "Portal Highlight"
-msgstr "Destaque do portal"
+#: src/gui/userpalette.cpp:180
+msgid "Portal highlight"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:183
+msgid "Default collision highlight"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:182
-msgid "Default collision Highlight"
-msgstr "Destaque de colisão padrão"
+#: src/gui/userpalette.cpp:186
+msgid "Air collision highlight"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:185
-msgid "Air collision Highlight"
-msgstr "Detaque de colisão no ar"
+#: src/gui/userpalette.cpp:189
+msgid "Water collision highlight"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:188
-msgid "Water collision Highlight"
-msgstr "Destaque de colisão na água"
+#: src/gui/userpalette.cpp:192
+msgid "Special ground collision highlight"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:191
-msgid "Special ground collision Highlight"
-msgstr "Destaque especial em colisão de chão"
+#: src/gui/userpalette.cpp:195
+msgid "Walkable highlight"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
-msgid "Walkable Highlight"
-msgstr "Destaque de caminho"
+#: src/gui/userpalette.cpp:198
+msgid "Local player attack range"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:197
-msgid "Local Player Attack Range"
-msgstr "Alcance de ataque"
+#: src/gui/userpalette.cpp:201
+msgid "Local player attack range border"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:200
-msgid "Local Player Attack Range Border"
-msgstr "Borda de Alcance de ataque"
+#: src/gui/userpalette.cpp:204
+msgid "Monster attack range"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:203
-msgid "Monster Attack Range"
-msgstr "Alcance do monstro"
+#: src/gui/userpalette.cpp:208
+msgid "Floor item amount color"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:206
-msgid "Home Place"
-msgstr "Lugar Inicial"
+#: src/gui/userpalette.cpp:211
+msgid "Home place"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:209
-msgid "Home Place Border"
-msgstr "Borda do Lugar Inicial"
+#: src/gui/userpalette.cpp:214
+msgid "Home place border"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:212
-msgid "Road Point"
-msgstr "Ponto de estrada"
+#: src/gui/userpalette.cpp:217
+msgid "Road point"
+msgstr ""
 
 #. TRANSLATORS: who is online window name
 #: src/gui/whoisonline.cpp:79 src/gui/whoisonline.cpp:623
@@ -5620,7 +5646,7 @@ msgid "/kick > Kick some one from the guild you are in"
 msgstr "/kick > Expulsa alguém da guilda em que você está"
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:315
+#: src/gui/widgets/itemcontainer.cpp:317
 msgid "Eq."
 msgstr "Eq."
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index ba7ff2758..ecfcc9e68 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -17,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-05-03 12:38+0300\n"
-"PO-Revision-Date: 2013-05-03 09:44+0000\n"
+"POT-Creation-Date: 2013-05-11 12:13+0300\n"
+"PO-Revision-Date: 2013-05-10 15:39+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
 "manaplus/language/pt_BR/)\n"
@@ -69,25 +69,25 @@ msgstr "I"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: full button name
-#: src/client.cpp:1136 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
+#: src/client.cpp:1137 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
 msgid "Setup"
 msgstr "Configurar"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1140 src/gui/setup_perfomance.cpp:61
+#: src/client.cpp:1141 src/gui/setup_perfomance.cpp:61
 msgid "Perfomance"
 msgstr "Performance"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:1143 src/gui/setup_video.cpp:258
+#: src/client.cpp:1144 src/gui/setup_video.cpp:258
 msgid "Video"
 msgstr "Vídeo"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1146 src/gui/setup_theme.cpp:273
+#: src/client.cpp:1147 src/gui/setup_theme.cpp:283
 msgid "Theme"
 msgstr "Tema"
 
@@ -98,7 +98,7 @@ msgstr "Tema"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1150 src/gui/didyouknowwindow.cpp:78
+#: src/client.cpp:1151 src/gui/didyouknowwindow.cpp:78
 #: src/gui/inventorywindow.cpp:228 src/gui/npcdialog.cpp:63
 #: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:574
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:80
@@ -106,32 +106,32 @@ msgid "Close"
 msgstr "Fechar"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1238
+#: src/client.cpp:1239
 msgid "Connecting to server"
 msgstr "Conectando-se ao servidor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1282
 msgid "Logging in"
 msgstr "Fazendo login"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1320
+#: src/client.cpp:1321
 msgid "Entering game world"
 msgstr "Entrando no mundo do jogo"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1431
+#: src/client.cpp:1432
 msgid "Requesting characters"
 msgstr "Requerindo personagens"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1471
 msgid "Connecting to the game server"
 msgstr "Conectando ao servidor do jogo"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1483
+#: src/client.cpp:1484
 msgid "Changing game servers"
 msgstr "Mudando de servidor do jogo"
 
@@ -146,69 +146,69 @@ msgstr "Mudando de servidor do jogo"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1540 src/client.cpp:1551 src/client.cpp:1721
+#: src/client.cpp:1541 src/client.cpp:1552 src/client.cpp:1722
 #: src/gui/changeemaildialog.cpp:168 src/gui/changepassworddialog.cpp:158
-#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:288
-#: src/gui/editserverdialog.cpp:220 src/gui/registerdialog.cpp:263
+#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:290
+#: src/gui/editserverdialog.cpp:216 src/gui/registerdialog.cpp:263
 #: src/gui/unregisterdialog.cpp:143 src/net/ea/charserverhandler.cpp:190
 #: src/net/ea/charserverhandler.cpp:210
 msgid "Error"
 msgstr "Erro"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1564
+#: src/client.cpp:1565
 msgid "Requesting registration details"
 msgstr "Requisitando detalhes do registro"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1601
+#: src/client.cpp:1602
 msgid "Password Change"
 msgstr "Mudar senha"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1603
+#: src/client.cpp:1604
 msgid "Password changed successfully!"
 msgstr "Senha modificada com sucesso!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1624
+#: src/client.cpp:1625
 msgid "Email Change"
 msgstr "Mudar email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1626
+#: src/client.cpp:1627
 msgid "Email changed successfully!"
 msgstr "Email modificado com sucesso!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1647
+#: src/client.cpp:1648
 msgid "Unregister Successful"
 msgstr "Registro cancelado com sucesso"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1649
+#: src/client.cpp:1650
 msgid "Farewell, come back any time..."
 msgstr "Adeus, volte sempre..."
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1902 src/client.cpp:1917 src/client.cpp:1960
-#: src/client.cpp:1976 src/client.cpp:2417 src/client.cpp:2425
+#: src/client.cpp:1903 src/client.cpp:1918 src/client.cpp:1961
+#: src/client.cpp:1977 src/client.cpp:2418 src/client.cpp:2426
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s não existe e não pode ser criado! Saindo."
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2113
+#: src/client.cpp:2114
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Host de atualização inválido: %s"
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2154 src/client.cpp:2161
+#: src/client.cpp:2155 src/client.cpp:2162
 msgid "Error creating updates directory!"
 msgstr "Erro ao criar pasta de atualizações!"
 
-#: src/client.cpp:2183 src/client.cpp:2196
+#: src/client.cpp:2184 src/client.cpp:2197
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Erro: %s não existe e não pode se criado! Saindo."
@@ -491,19 +491,19 @@ msgid "Comment: %s"
 msgstr "Comentário: %s"
 
 #. TRANSLATORS: bot checker window header
-#: src/gui/botcheckerwindow.cpp:269
+#: src/gui/botcheckerwindow.cpp:268
 msgid "Bot Checker"
 msgstr "Analizador de bot"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:102
+#: src/gui/botcheckerwindow.cpp:277 src/gui/npcdialog.cpp:102
 msgid "Reset"
 msgstr "Resetar"
 
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: relations table header
-#: src/gui/botcheckerwindow.cpp:305 src/gui/setup_relations.cpp:61
+#: src/gui/botcheckerwindow.cpp:304 src/gui/setup_relations.cpp:61
 msgid "Name"
 msgstr "Nome"
 
@@ -511,7 +511,7 @@ msgstr "Nome"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:145
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:145
 #: src/gui/popupmenu.cpp:241 src/gui/popupmenu.cpp:640
 #: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:257
 #: src/net/tmwa/generalhandler.cpp:292
@@ -521,7 +521,7 @@ msgstr "Atacar"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
-#: src/gui/botcheckerwindow.cpp:309 src/gui/popupmenu.cpp:225
+#: src/gui/botcheckerwindow.cpp:308 src/gui/popupmenu.cpp:225
 #: src/gui/setupactiondata.h:93
 msgid "Talk"
 msgstr "Falar"
@@ -529,7 +529,7 @@ msgstr "Falar"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/botcheckerwindow.cpp:311 src/gui/popupmenu.cpp:215
+#: src/gui/botcheckerwindow.cpp:310 src/gui/popupmenu.cpp:215
 #: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:371
 #: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:653
 #: src/gui/popupmenu.cpp:727 src/gui/setupactiondata.h:1856
@@ -537,7 +537,7 @@ msgid "Move"
 msgstr "Mover"
 
 #. TRANSLATORS: bot checker window table header
-#: src/gui/botcheckerwindow.cpp:313
+#: src/gui/botcheckerwindow.cpp:312
 msgid "Result"
 msgstr "Resultado"
 
@@ -593,7 +593,7 @@ msgstr "Comprar"
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:516
+#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:511
 #: src/gui/selldialog.cpp:94 src/gui/selldialog.cpp:342
 #, c-format
 msgid "Price: %s / Total: %s"
@@ -610,9 +610,9 @@ msgstr "Quantidade:"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:208
-#: src/gui/itemamountwindow.cpp:243 src/gui/npcdialog.cpp:93
-#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:833
+#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:202
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:93
+#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:821
 msgid "+"
 msgstr "+"
 
@@ -622,9 +622,9 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:240 src/gui/npcdialog.cpp:95
-#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:846
+#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:200
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:95
+#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:834
 msgid "-"
 msgstr "-"
 
@@ -636,7 +636,7 @@ msgstr "-"
 #. TRANSLATORS: input action name
 #: src/gui/buydialog.cpp:260 src/gui/quitdialog.cpp:54
 #: src/gui/quitdialog.cpp:59 src/gui/quitdialog.cpp:61
-#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:255
+#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:264
 #: src/gui/setupactiondata.h:177
 msgid "Quit"
 msgstr "Sair"
@@ -648,7 +648,7 @@ msgstr "Sair"
 #. TRANSLATORS: status bar label
 #: src/gui/buydialog.cpp:262 src/gui/selldialog.cpp:106
 #: src/gui/statuswindow.cpp:558 src/gui/statuswindow.cpp:615
-#: src/gui/statuswindow.cpp:830 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:852
 msgid "Max"
 msgstr "Máximo"
 
@@ -693,7 +693,7 @@ msgstr "Vender"
 #: src/gui/buyselldialog.cpp:71 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:120
 #: src/gui/connectiondialog.cpp:48 src/gui/editserverdialog.cpp:80
-#: src/gui/itemamountwindow.cpp:212 src/gui/npcpostdialog.cpp:64
+#: src/gui/itemamountwindow.cpp:206 src/gui/npcpostdialog.cpp:64
 #: src/gui/popupmenu.cpp:290 src/gui/popupmenu.cpp:324
 #: src/gui/popupmenu.cpp:411 src/gui/popupmenu.cpp:454
 #: src/gui/popupmenu.cpp:485 src/gui/popupmenu.cpp:512
@@ -709,7 +709,7 @@ msgstr "Vender"
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
 #: src/gui/setup.cpp:84 src/gui/socialwindow.cpp:1204
 #: src/gui/textcommandeditor.cpp:212 src/gui/textdialog.cpp:53
-#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:167
+#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:183
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -873,7 +873,7 @@ msgstr "Por favor distribua %d pontos"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:570
+#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:581
 #: src/gui/socialwindow.cpp:1269
 msgid "Create"
 msgstr "Criar"
@@ -900,17 +900,17 @@ msgid "Please remove %d points"
 msgstr "Por favor remova %d pontos"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:60
+#: src/gui/charselectdialog.cpp:61
 msgid "Confirm Character Delete"
 msgstr "Confimar exclusão do personagem"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:62
+#: src/gui/charselectdialog.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "Tem certeza que deseja excluir este personagem?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:86
+#: src/gui/charselectdialog.cpp:87
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
@@ -922,8 +922,8 @@ msgstr "Trocar Login"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:565
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:576
+#: src/gui/updaterwindow.cpp:185
 msgid "Play"
 msgstr "Jogar"
 
@@ -939,7 +939,7 @@ msgstr "Informações"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:263
+#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:272
 #: src/gui/setupactiondata.h:1803 src/gui/setup_relations.cpp:262
 #: src/gui/shopwindow.cpp:96 src/gui/shopwindow.cpp:103
 #: src/gui/textcommandeditor.cpp:216
@@ -949,24 +949,24 @@ msgstr "Excluir"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/charselectdialog.cpp:129 src/gui/unregisterdialog.cpp:48
+#: src/gui/charselectdialog.cpp:130 src/gui/unregisterdialog.cpp:48
 #: src/gui/unregisterdialog.cpp:53
 msgid "Unregister"
 msgstr "Cancelar Registro"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/charselectdialog.cpp:141
+#: src/gui/charselectdialog.cpp:142
 msgid "Change Email"
 msgstr "Alterar email"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:172
+#: src/gui/charselectdialog.cpp:175
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/charselectdialog.cpp:246
+#: src/gui/charselectdialog.cpp:248
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -976,16 +976,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:288
+#: src/gui/charselectdialog.cpp:290
 msgid "Incorrect password"
 msgstr "Senha incorreta"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password for deleting character"
 msgstr "Entre com a senha para apagar o personagem"
 
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password:"
 msgstr "Entre com a senha:"
 
@@ -1072,13 +1072,13 @@ msgid "Chat"
 msgstr "Chat"
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:735
+#: src/gui/chatwindow.cpp:638
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presentes: %s; %d jogadores estão presentes."
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1165
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Enviando MP para %s: %s"
@@ -1096,7 +1096,7 @@ msgstr "Não"
 
 #. TRANSLATORS: confirm dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/confirmdialog.cpp:58 src/gui/popupmenu.cpp:2429
+#: src/gui/confirmdialog.cpp:55 src/gui/popupmenu.cpp:2429
 #: src/gui/popupmenu.cpp:2442 src/gui/popupmenu.cpp:2457
 #: src/gui/popupmenu.cpp:2483
 msgid "Ignore"
@@ -1105,7 +1105,7 @@ msgstr "Ignora"
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
 #. TRANSLATORS: settings group
-#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:109
+#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:108
 #: src/gui/setup_other.cpp:123 src/gui/windowmenu.cpp:106
 msgid "Map"
 msgstr "Mapa"
@@ -1121,190 +1121,190 @@ msgid "Net"
 msgstr "Rede"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:265
-#: src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:268
+#: src/gui/debugwindow.cpp:311
 msgid "Music:"
 msgstr "Música:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:153 src/gui/debugwindow.cpp:271
-#: src/gui/debugwindow.cpp:312
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:274
+#: src/gui/debugwindow.cpp:315
 msgid "Map:"
 msgstr "Mapa:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:155 src/gui/debugwindow.cpp:268
-#: src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:271
+#: src/gui/debugwindow.cpp:313
 msgid "Minimap:"
 msgstr "Minimapa:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:262
-#: src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:161 src/gui/debugwindow.cpp:265
+#: src/gui/debugwindow.cpp:309
 msgid "Cursor:"
 msgstr "Cursor:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:161
+#: src/gui/debugwindow.cpp:164
 msgid "Particle count:"
 msgstr "Contador de particulas:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:284
-#: src/gui/debugwindow.cpp:316
+#: src/gui/debugwindow.cpp:167 src/gui/debugwindow.cpp:287
+#: src/gui/debugwindow.cpp:319
 msgid "Map actors count:"
 msgstr "Jogadores no mapa:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:166 src/gui/debugwindow.cpp:243
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:169 src/gui/debugwindow.cpp:246
+#: src/gui/debugwindow.cpp:252
 msgid "Player Position:"
 msgstr "Sua posição:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:172 src/gui/debugwindow.cpp:297
+#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:300
 msgid "Draw calls:"
 msgstr "Chamadas de desenho:"
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:175
+#. TRANSLATORS: debug window label, frames per second
+#: src/gui/debugwindow.cpp:178
 #, c-format
 msgid "%d FPS"
 msgstr "%d FPS"
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:177 src/gui/debugwindow.cpp:324
+#. TRANSLATORS: debug window label, logic per second
+#: src/gui/debugwindow.cpp:180 src/gui/debugwindow.cpp:327
 #, c-format
 msgid "%d LPS"
 msgstr "%d LPS"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:191 src/gui/debugwindow.cpp:209
 #, c-format
 msgid "%d FPS (Software)"
 msgstr "%d FPS (software)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:193
+#: src/gui/debugwindow.cpp:196
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr "%d FPS (rápido OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:197
+#: src/gui/debugwindow.cpp:200
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr "%d FPS (velho OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:201
+#: src/gui/debugwindow.cpp:204
 #, c-format
 msgid "%d FPS (mobile OpenGL)"
 msgstr "%d FPS (mobile OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:225 src/gui/debugwindow.cpp:290
+#: src/gui/debugwindow.cpp:228 src/gui/debugwindow.cpp:293
 msgid "Textures count:"
 msgstr "Contador de texturas:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:279
+#: src/gui/debugwindow.cpp:282
 #, c-format
 msgid "Particle count: %d"
 msgstr "Contagem de partículas: %d"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:330 src/gui/debugwindow.cpp:380
-#: src/gui/debugwindow.cpp:442
+#: src/gui/debugwindow.cpp:333 src/gui/debugwindow.cpp:383
+#: src/gui/debugwindow.cpp:445
 msgid "Target:"
 msgstr "Alvo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:332 src/gui/debugwindow.cpp:386
-#: src/gui/debugwindow.cpp:444
+#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
+#: src/gui/debugwindow.cpp:447
 msgid "Target Id:"
 msgstr "ID do alvo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
-#: src/gui/debugwindow.cpp:446
+#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:392
+#: src/gui/debugwindow.cpp:449
 msgid "Target type:"
 msgstr "Tipo de alvo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:337
+#: src/gui/debugwindow.cpp:340
 msgid "Target level:"
 msgstr "Level do alvo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:339 src/gui/debugwindow.cpp:405
+#: src/gui/debugwindow.cpp:342 src/gui/debugwindow.cpp:408
 msgid "Target race:"
 msgstr "Raça do alvo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:341
+#: src/gui/debugwindow.cpp:344
 msgid "Target party:"
 msgstr "Grupo do alvo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:346
 msgid "Target guild:"
 msgstr "Guilda do alvo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:430
-#: src/gui/debugwindow.cpp:436 src/gui/debugwindow.cpp:454
+#: src/gui/debugwindow.cpp:348 src/gui/debugwindow.cpp:433
+#: src/gui/debugwindow.cpp:439 src/gui/debugwindow.cpp:457
 msgid "Attack delay:"
 msgstr "Atarso de ataque:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:347 src/gui/debugwindow.cpp:417
-#: src/gui/debugwindow.cpp:456
+#: src/gui/debugwindow.cpp:350 src/gui/debugwindow.cpp:420
+#: src/gui/debugwindow.cpp:459
 msgid "Minimal hit:"
 msgstr "Hit minimo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:349 src/gui/debugwindow.cpp:420
-#: src/gui/debugwindow.cpp:458
+#: src/gui/debugwindow.cpp:352 src/gui/debugwindow.cpp:423
+#: src/gui/debugwindow.cpp:461
 msgid "Maximum hit:"
 msgstr "Hit máximo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:351 src/gui/debugwindow.cpp:423
-#: src/gui/debugwindow.cpp:460
+#: src/gui/debugwindow.cpp:354 src/gui/debugwindow.cpp:426
+#: src/gui/debugwindow.cpp:463
 msgid "Critical hit:"
 msgstr "Hit crítico:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:394 src/gui/debugwindow.cpp:400
-#: src/gui/debugwindow.cpp:448
+#: src/gui/debugwindow.cpp:397 src/gui/debugwindow.cpp:403
+#: src/gui/debugwindow.cpp:451
 msgid "Target Level:"
 msgstr "Nível do alvo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:408 src/gui/debugwindow.cpp:450
+#: src/gui/debugwindow.cpp:411 src/gui/debugwindow.cpp:453
 msgid "Target Party:"
 msgstr "Grupo do alvo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:412 src/gui/debugwindow.cpp:452
+#: src/gui/debugwindow.cpp:415 src/gui/debugwindow.cpp:455
 msgid "Target Guild:"
 msgstr "Guilda do alvo:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:493
+#: src/gui/debugwindow.cpp:496
 #, c-format
 msgid "Ping: %s ms"
 msgstr "Ping: %s ms"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:496
+#: src/gui/debugwindow.cpp:499
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "Entrada: %d bytes/s"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:499
+#: src/gui/debugwindow.cpp:502
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "Saída: %d bytes/s"
@@ -1336,7 +1336,7 @@ msgstr "Auto abrir esta janela"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #: src/gui/editdialog.cpp:45 src/gui/editserverdialog.cpp:78
-#: src/gui/itemamountwindow.cpp:210 src/gui/okdialog.cpp:51
+#: src/gui/itemamountwindow.cpp:204 src/gui/okdialog.cpp:51
 #: src/gui/quitdialog.cpp:70 src/gui/textdialog.cpp:46
 msgid "OK"
 msgstr "OK"
@@ -1348,7 +1348,7 @@ msgstr "Editar Servidor"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:257
+#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:266
 msgid "Connect"
 msgstr "Conectar"
 
@@ -1378,7 +1378,7 @@ msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/editserverdialog.cpp:222
+#: src/gui/editserverdialog.cpp:218
 msgid "Please at least type both the address and the port of the server."
 msgstr "Por favor, pelo menos um dos dois tipos de portas de servidor."
 
@@ -1430,7 +1430,7 @@ msgstr "Equipar"
 #: src/gui/inventorywindow.cpp:178 src/gui/inventorywindow.cpp:630
 #: src/gui/popupmenu.cpp:1843 src/gui/popupmenu.cpp:1922
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2041
-#: src/gui/skilldialog.cpp:277
+#: src/gui/skilldialog.cpp:279
 msgid "Use"
 msgstr "Usar"
 
@@ -1464,7 +1464,7 @@ msgstr "Roupas"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: setup button
-#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:718
+#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:719
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1992
 #: src/gui/popupmenu.cpp:2066 src/gui/setup.cpp:86
 msgid "Store"
@@ -1486,47 +1486,47 @@ msgid "Drop"
 msgstr "Descartar"
 
 #. TRANSLATORS: item amount window button
-#: src/gui/itemamountwindow.cpp:214
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "Tudo"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:264
 msgid "Select amount of items to trade."
 msgstr "Selecionar quantidade de itens para negociar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:274
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to drop."
 msgstr "Selecionar quantidade de itens para descartar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:278
+#: src/gui/itemamountwindow.cpp:272
 msgid "Select amount of items to store."
 msgstr "Escolha a quantidade de itens para armazenar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:276
 msgid "Select amount of items to retrieve."
 msgstr "Escolha a quantidade de itens para retirar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:286
+#: src/gui/itemamountwindow.cpp:280
 msgid "Select amount of items to split."
 msgstr "Selecionar quantidade de itens para dividir."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:290
+#: src/gui/itemamountwindow.cpp:284
 msgid "Add to buy shop."
 msgstr "Adicionar na loja de compra"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:294
+#: src/gui/itemamountwindow.cpp:288
 msgid "Add to sell shop."
 msgstr "Adicionar na loja de venda"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:298
+#: src/gui/itemamountwindow.cpp:292
 msgid "Unknown."
 msgstr "Desconhecido"
 
@@ -1553,7 +1553,7 @@ msgstr "Resetar tempo"
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:58 src/gui/killstats.cpp:171
-#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:516
+#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:509
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr "Mortes: %s Total exp: %s"
@@ -1561,7 +1561,7 @@ msgstr "Mortes: %s Total exp: %s"
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:61 src/gui/killstats.cpp:173
 #: src/gui/killstats.cpp:253 src/gui/killstats.cpp:268
-#: src/gui/killstats.cpp:518
+#: src/gui/killstats.cpp:511
 #, c-format
 msgid "Avg Exp: %s"
 msgstr "Média Exp: %s"
@@ -1569,14 +1569,14 @@ msgstr "Média Exp: %s"
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:63 src/gui/killstats.cpp:176
 #: src/gui/killstats.cpp:258 src/gui/killstats.cpp:272
-#: src/gui/killstats.cpp:521
+#: src/gui/killstats.cpp:514
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr "Média de mob para próximo level: %s"
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:66 src/gui/killstats.cpp:187
-#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:524
+#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:517
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr "Mortes/Min: %s Exp/Min: %s"
@@ -1604,9 +1604,9 @@ msgid "Last kill exp:"
 msgstr "Ultima exp por morte:"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:414
-#: src/gui/killstats.cpp:421 src/gui/killstats.cpp:428
-#: src/gui/killstats.cpp:434
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:408
+#: src/gui/killstats.cpp:415 src/gui/killstats.cpp:422
+#: src/gui/killstats.cpp:428
 msgid "Time before jacko spawn:"
 msgstr "Tempo para próxima aparição do JackO:"
 
@@ -1638,12 +1638,12 @@ msgid "  Time for next level: %s"
 msgstr "Tempo para próximo nível: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:421
+#: src/gui/killstats.cpp:415
 #, c-format
 msgid "%s %d?"
 msgstr "%s %d?"
 
-#: src/gui/killstats.cpp:428
+#: src/gui/killstats.cpp:422
 msgid "jacko spawning"
 msgstr "Aparição do JackO"
 
@@ -1749,32 +1749,32 @@ msgid "arrows bar"
 msgstr "Barra de flechas"
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:88
+#: src/gui/ministatuswindow.cpp:89
 msgid "status bar"
 msgstr "Barra de Status"
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:108
+#: src/gui/ministatuswindow.cpp:109
 msgid "job bar"
 msgstr "Barra de Job"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:306 src/gui/statuswindow.cpp:298
+#: src/gui/ministatuswindow.cpp:307 src/gui/statuswindow.cpp:298
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Nível: %d (GM %d)"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:313 src/gui/statuswindow.cpp:141
+#: src/gui/ministatuswindow.cpp:314 src/gui/statuswindow.cpp:141
 #: src/gui/statuswindow.cpp:305 src/gui/statuswindow.cpp:375
 #, c-format
 msgid "Level: %d"
 msgstr "Nível: %d"
 
 #. TRANSLATORS: status bar label
-#: src/gui/ministatuswindow.cpp:330 src/gui/ministatuswindow.cpp:367
+#: src/gui/ministatuswindow.cpp:331 src/gui/ministatuswindow.cpp:368
 msgid "Need"
 msgstr "Precisa"
 
@@ -2162,7 +2162,7 @@ msgstr "Copiar para chat"
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2209 src/gui/popupmenu.cpp:2280
-#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:139
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
 #: src/gui/socialwindow.cpp:934
 msgid "(default)"
 msgstr "(padrão)"
@@ -2345,7 +2345,7 @@ msgid "Passwords do not match."
 msgstr "Senhas não conferem."
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:257
 msgid "Choose Your Server"
 msgstr "Escolha seu servidor"
 
@@ -2353,61 +2353,61 @@ msgstr "Escolha seu servidor"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:259 src/gui/shopwindow.cpp:94
+#: src/gui/serverdialog.cpp:268 src/gui/shopwindow.cpp:94
 #: src/gui/shopwindow.cpp:101 src/gui/tradewindow.cpp:77
 msgid "Add"
 msgstr "Adicionar"
 
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
-#: src/gui/serverdialog.cpp:261 src/gui/widgets/setupitem.cpp:299
+#: src/gui/serverdialog.cpp:270 src/gui/widgets/setupitem.cpp:299
 #: src/gui/widgets/setupitem.cpp:426
 msgid "Edit"
 msgstr "Editar"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:274
 msgid "Load"
 msgstr "Carregar"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:279
+#: src/gui/serverdialog.cpp:288
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Escolha seu servidor    *** MODO SEGURO ***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:297
 msgid "Use same ip for game sub servers"
 msgstr "Usar o mesmo ip para os sub servidores do jogo"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:518
+#: src/gui/serverdialog.cpp:527
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Baixando lista de servidores...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:524
+#: src/gui/serverdialog.cpp:533
 msgid "Waiting for server..."
 msgstr "Aguardando servidor..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:529
+#: src/gui/serverdialog.cpp:538
 msgid "Preparing download"
 msgstr "Preparando download"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:534
+#: src/gui/serverdialog.cpp:543
 msgid "Error retreiving server list!"
 msgstr "Erro ao recuperar lista!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:626
+#: src/gui/serverdialog.cpp:635
 msgid "requires a newer version"
 msgstr "requer uma versão mais nova"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:631
+#: src/gui/serverdialog.cpp:640
 #, c-format
 msgid "requires v%s"
 msgstr "requer v%s"
@@ -3418,7 +3418,7 @@ msgid "Type:"
 msgstr "Tipo:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:334
+#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:336
 msgid "Delay:"
 msgstr "Atraso:"
 
@@ -3438,30 +3438,30 @@ msgid "Blue:"
 msgstr "Azul:"
 
 #. TRANSLATORS: color type
-#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:420
+#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:422
 msgid "Static"
 msgstr "Estático"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:107 src/gui/setup_colors.cpp:110
-#: src/gui/setup_colors.cpp:422
+#: src/gui/setup_colors.cpp:424
 msgid "Pulse"
 msgstr "Pulso"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:112 src/gui/setup_colors.cpp:115
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Rainbow"
 msgstr "Arco-íris"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:117 src/gui/setup_colors.cpp:120
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Spectrum"
 msgstr "Espectro"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:328
+#: src/gui/setup_colors.cpp:330
 msgid "Alpha:"
 msgstr "Alpha:"
 
@@ -3629,7 +3629,7 @@ msgstr "Diversos"
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: palette color
-#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:134
+#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:135
 msgid "Monsters"
 msgstr "Monstros"
 
@@ -4181,206 +4181,231 @@ msgstr "Quando ignorar:"
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:86
+msgid "Very small (8)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:88
 msgid "Very small (9)"
 msgstr "Muito pequeno (9)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:88
+#: src/gui/setup_theme.cpp:90
 msgid "Tiny (10)"
 msgstr "Minúsculo (10)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:90
+#: src/gui/setup_theme.cpp:92
 msgid "Small (11)"
 msgstr "Pequeno (11)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:92
+#: src/gui/setup_theme.cpp:94
 msgid "Medium (12)"
 msgstr "Médio (12)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:94
+#: src/gui/setup_theme.cpp:96
 msgid "Normal (13)"
 msgstr "Normal (13)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:96
+#: src/gui/setup_theme.cpp:98
 msgid "Large (14)"
 msgstr "Largo (14)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:98
-msgid "Very large (15)"
-msgstr "Muito Largo (15)"
-
-#. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:100
-msgid "Big (16)"
-msgstr "Grande (16)"
+msgid "Large (15)"
+msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:102
-msgid "Very big (17)"
-msgstr "Muito Grande (17)"
+msgid "Large (16)"
+msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:104
-msgid "Huge (18)"
-msgstr "Enorme (18)"
+msgid "Big (17)"
+msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:106
-msgid "Very huge (19)"
-msgstr "Muito Enorme (19)"
+msgid "Big (18)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:108
+msgid "Big (19)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:110
+msgid "Very big (20)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:112
+msgid "Very big (21)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:114
+msgid "Very big (22)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:116
+msgid "Huge (23)"
+msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:151
 msgid "Chinese (China)"
 msgstr "Chinês(China)"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:153
 msgid "Czech"
 msgstr "Tcheco"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:155
 msgid "English"
 msgstr "Inglês"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:157
 msgid "Finnish"
 msgstr "Finlandês"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:159
 msgid "French"
 msgstr "Francês"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:161
 msgid "German"
 msgstr "Alemão"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:153
+#: src/gui/setup_theme.cpp:163
 msgid "Indonesian"
 msgstr "Indonésio"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:155
+#: src/gui/setup_theme.cpp:165
 msgid "Italian"
 msgstr "Italiano"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:157
+#: src/gui/setup_theme.cpp:167
 msgid "Polish"
 msgstr "Polonês"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:159
+#: src/gui/setup_theme.cpp:169
 msgid "Japanese"
 msgstr "Japonês"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:161
+#: src/gui/setup_theme.cpp:171
 msgid "Dutch (Belgium/Flemish)"
 msgstr "Holandês"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:163
+#: src/gui/setup_theme.cpp:173
 msgid "Portuguese"
 msgstr "Português"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:165
+#: src/gui/setup_theme.cpp:175
 msgid "Portuguese (Brazilian)"
 msgstr "Português (Brasileiro)"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:167
+#: src/gui/setup_theme.cpp:177
 msgid "Russian"
 msgstr "Russo"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:169
+#: src/gui/setup_theme.cpp:179
 msgid "Spanish (Castilian)"
 msgstr "Espanhol"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:171
+#: src/gui/setup_theme.cpp:181
 msgid "Turkish"
 msgstr "Turco"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:223
+#: src/gui/setup_theme.cpp:233
 msgid "Gui theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:230
+#: src/gui/setup_theme.cpp:240
 msgid "Main Font"
 msgstr "Fonte"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:235
+#: src/gui/setup_theme.cpp:245
 msgid "Language"
 msgstr "Linguagem"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:239
+#: src/gui/setup_theme.cpp:249
 msgid "Bold font"
 msgstr "Fonte negrito"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:243
+#: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr "Fonte de particulas"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:247
+#: src/gui/setup_theme.cpp:257
 msgid "Help font"
 msgstr "Fonte de ajuda"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:251
+#: src/gui/setup_theme.cpp:261
 msgid "Secure font"
 msgstr "Fonte segura"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:255
+#: src/gui/setup_theme.cpp:265
 msgid "Japanese font"
 msgstr "Fontes japonesas"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:260
+#: src/gui/setup_theme.cpp:270
 msgid "Font size"
 msgstr "Tamanho da fonte"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:265
+#: src/gui/setup_theme.cpp:275
 msgid "Npc font size"
 msgstr "Tamanho de fonte de NPC"
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/setup_theme.cpp:269
+#: src/gui/setup_theme.cpp:279
 msgid "i"
 msgstr "i"
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/setup_theme.cpp:442
+#: src/gui/setup_theme.cpp:452
 msgid "Theme info"
 msgstr "Informação de Tema"
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/setup_theme.cpp:467
+#: src/gui/setup_theme.cpp:477
 msgid "Theme Changed"
 msgstr "Tema alterado"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/setup_theme.cpp:467 src/gui/setup_video.cpp:537
+#: src/gui/setup_theme.cpp:477 src/gui/setup_video.cpp:537
 #: src/gui/setup_video.cpp:546
 msgid "Restart your client for the change to take effect."
 msgstr "Reincie o cliente para que as mudanças surtam efeito."
@@ -4682,7 +4707,8 @@ msgid "Ambient FX"
 msgstr "Ambiente FX"
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_visual.cpp:140
+#. TRANSLATORS: palette color
+#: src/gui/setup_visual.cpp:140 src/gui/userpalette.cpp:146
 msgid "Particle effects"
 msgstr "Efeitos de partícula"
 
@@ -4769,45 +4795,45 @@ msgid "%s wants to %s %s do you accept?"
 msgstr "%s quer %s %s você aceita?"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/skilldialog.cpp:270 src/gui/windowmenu.cpp:112
+#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:112
 msgid "Skills"
 msgstr "Habilidades"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/skilldialog.cpp:279
+#: src/gui/skilldialog.cpp:281
 msgid "Up"
 msgstr "+"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/skilldialog.cpp:391
+#: src/gui/skilldialog.cpp:393
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Pontos de habilidade disponíveis: %d"
 
 #. TRANSLATORS: skills dialog default skills tab
-#: src/gui/skilldialog.cpp:444
+#: src/gui/skilldialog.cpp:446
 msgid "basic"
 msgstr "básico"
 
 #. TRANSLATORS: skills dialog default skill name
-#: src/gui/skilldialog.cpp:447
+#: src/gui/skilldialog.cpp:449
 msgid "basic, 1"
 msgstr "básico, 1"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/skilldialog.cpp:484
+#: src/gui/skilldialog.cpp:486
 #, c-format
 msgid "Skill Set %d"
 msgstr "Habilidade %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/skilldialog.cpp:518
+#: src/gui/skilldialog.cpp:520
 #, c-format
 msgid "Skill %d"
 msgstr "Habilidade %d"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/skilldialog.cpp:612 src/gui/skilldialog.cpp:762
+#: src/gui/skilldialog.cpp:614 src/gui/skilldialog.cpp:764
 #, c-format
 msgid "Lvl: %d"
 msgstr "Nível: %d"
@@ -5250,7 +5276,7 @@ msgid "Trade: You"
 msgstr "Negócio: você"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:182
+#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:184
 #, c-format
 msgid "You get %s"
 msgstr "Você pegou %s"
@@ -5266,12 +5292,12 @@ msgid "You give:"
 msgstr "Você dá:"
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:393
+#: src/gui/tradewindow.cpp:396
 msgid "You don't have enough money."
 msgstr "Você não tem dinheiro suficiente."
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:475
+#: src/gui/tradewindow.cpp:479
 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."
@@ -5283,224 +5309,224 @@ msgid "Name: %s"
 msgstr "Nome: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/updaterwindow.cpp:140
+#: src/gui/updaterwindow.cpp:156
 msgid "Updating..."
 msgstr "Atualizando..."
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:165
+#: src/gui/updaterwindow.cpp:181
 msgid "Connecting..."
 msgstr "Conectando..."
 
 #. TRANSLATORS: update message
-#: src/gui/updaterwindow.cpp:656
+#: src/gui/updaterwindow.cpp:672
 msgid "##1  The update process is incomplete."
 msgstr "##1  O processo de update está incompleto."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/updaterwindow.cpp:658
+#: src/gui/updaterwindow.cpp:674
 msgid "##1  It is strongly recommended that"
 msgstr "##1  É altamente recomendado que"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:660
+#: src/gui/updaterwindow.cpp:676
 msgid "##1  you try again later."
 msgstr "##1  tente novamente mais tarde."
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:839
+#: src/gui/updaterwindow.cpp:855
 msgid "Completed"
 msgstr "Concluído"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
 msgid "Being"
 msgstr "Personagem"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:118
-msgid "Friend Names"
-msgstr "Nome de Amigos"
+#: src/gui/userpalette.cpp:119
+msgid "Friend names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:120
-msgid "Disregarded Names"
-msgstr "Nome de Desconsiderados"
+#: src/gui/userpalette.cpp:121
+msgid "Disregarded names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:122
-msgid "Ignored Names"
-msgstr "Nome de Ignorados"
+#: src/gui/userpalette.cpp:123
+msgid "Ignored names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:124
-msgid "Erased Names"
-msgstr "Nome de Apagados"
+#: src/gui/userpalette.cpp:125
+msgid "Erased names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:126
-msgid "Other Players' Names"
-msgstr "Nomes de outros jogadores"
+#: src/gui/userpalette.cpp:127
+msgid "Other players names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:128
-msgid "Own Name"
-msgstr "Próprio nome"
+#: src/gui/userpalette.cpp:129
+msgid "Own name"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:130
-msgid "GM Names"
-msgstr "Nomes dos GMs"
+#: src/gui/userpalette.cpp:131
+msgid "GM names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
 msgid "NPCs"
 msgstr "NPCs"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
 msgid "Monster HP bar"
 msgstr "Barra de HP"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:140
 msgid "Monster HP bar (second color)"
 msgstr "Barra de HP do inimigo (segunda cor)"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:141
-msgid "Party Members"
-msgstr "Membros do grupo"
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:143
-msgid "Guild Members"
-msgstr "Membros da guilda"
+#: src/gui/userpalette.cpp:142
+msgid "Party members"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:145
-msgid "Particle Effects"
-msgstr "Efeitos de partícula"
+#: src/gui/userpalette.cpp:144
+msgid "Guild members"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:147
-msgid "Pickup Notification"
-msgstr "Aviso ao pegar algum item"
+#: src/gui/userpalette.cpp:148
+msgid "Pickup notification"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:149
-msgid "Exp Notification"
-msgstr "Aviso de experiência"
+#: src/gui/userpalette.cpp:150
+msgid "Exp notification"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
 msgid "Player HP bar"
 msgstr "Barra de HP do jogador"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
 msgid "Player HP bar (second color)"
 msgstr "Barra de HP do jogador (segunda cor)"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:157
-msgid "Player Hits Monster"
-msgstr "Jogador acerta Monstro"
+#: src/gui/userpalette.cpp:158
+msgid "Player hits monster"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:159
-msgid "Monster Hits Player"
-msgstr "Monstro Acerta Jogador"
+#: src/gui/userpalette.cpp:160
+msgid "Monster hits player"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:163
-msgid "Other Player Hits Local Player"
-msgstr "Outro jogador(a) ataca você"
+#: src/gui/userpalette.cpp:164
+msgid "Other player hits local player"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:166
 msgid "Critical Hit"
 msgstr "Golpe crítico"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
-msgid "Local Player Hits Monster"
-msgstr "Jogador Acerta Monstro"
+#: src/gui/userpalette.cpp:170
+msgid "Local player hits monster"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:172
-msgid "Local Player Critical Hit"
-msgstr "Golpe Crítico do Jogador"
+#: src/gui/userpalette.cpp:173
+msgid "Local player critical hit"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:175
-msgid "Local Player Miss"
-msgstr "Jogador Erra o Golpe"
+#: src/gui/userpalette.cpp:176
+msgid "Local player miss"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:177
+#: src/gui/userpalette.cpp:178
 msgid "Misses"
 msgstr "Golpes errados"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
-msgid "Portal Highlight"
-msgstr "Destaque do portal"
+#: src/gui/userpalette.cpp:180
+msgid "Portal highlight"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:183
+msgid "Default collision highlight"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:182
-msgid "Default collision Highlight"
-msgstr "Destaque de colisão padrão"
+#: src/gui/userpalette.cpp:186
+msgid "Air collision highlight"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:185
-msgid "Air collision Highlight"
-msgstr "Destaque de colisão de ar"
+#: src/gui/userpalette.cpp:189
+msgid "Water collision highlight"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:188
-msgid "Water collision Highlight"
-msgstr "Destaque de colisão de água"
+#: src/gui/userpalette.cpp:192
+msgid "Special ground collision highlight"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:191
-msgid "Special ground collision Highlight"
-msgstr "Destaque especial colisão de chão"
+#: src/gui/userpalette.cpp:195
+msgid "Walkable highlight"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
-msgid "Walkable Highlight"
-msgstr "Destaque de caminho"
+#: src/gui/userpalette.cpp:198
+msgid "Local player attack range"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:197
-msgid "Local Player Attack Range"
-msgstr "Alcance de ataque"
+#: src/gui/userpalette.cpp:201
+msgid "Local player attack range border"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:200
-msgid "Local Player Attack Range Border"
-msgstr "Borda de Alcance de ataque"
+#: src/gui/userpalette.cpp:204
+msgid "Monster attack range"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:203
-msgid "Monster Attack Range"
-msgstr "Alcance do monstro"
+#: src/gui/userpalette.cpp:208
+msgid "Floor item amount color"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:206
-msgid "Home Place"
-msgstr "Lugar Inicial"
+#: src/gui/userpalette.cpp:211
+msgid "Home place"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:209
-msgid "Home Place Border"
-msgstr "Borda do Lugar Inicial"
+#: src/gui/userpalette.cpp:214
+msgid "Home place border"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:212
-msgid "Road Point"
-msgstr "Ponto de estrada"
+#: src/gui/userpalette.cpp:217
+msgid "Road point"
+msgstr ""
 
 #. TRANSLATORS: who is online window name
 #: src/gui/whoisonline.cpp:79 src/gui/whoisonline.cpp:623
@@ -5629,7 +5655,7 @@ msgid "/kick > Kick some one from the guild you are in"
 msgstr "/kick > Expulsa alguém da guilda em que você está"
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:315
+#: src/gui/widgets/itemcontainer.cpp:317
 msgid "Eq."
 msgstr "Eq."
 
diff --git a/po/ru.po b/po/ru.po
index c54503c16..0aa9007a3 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-05-03 12:38+0300\n"
-"PO-Revision-Date: 2013-05-03 09:47+0000\n"
+"POT-Creation-Date: 2013-05-11 12:13+0300\n"
+"PO-Revision-Date: 2013-05-10 15:55+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/manaplus/"
 "language/ru/)\n"
@@ -64,25 +64,25 @@ msgstr "Б"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: full button name
-#: src/client.cpp:1136 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
+#: src/client.cpp:1137 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
 msgid "Setup"
 msgstr "Настройка"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1140 src/gui/setup_perfomance.cpp:61
+#: src/client.cpp:1141 src/gui/setup_perfomance.cpp:61
 msgid "Perfomance"
 msgstr "Производительность"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:1143 src/gui/setup_video.cpp:258
+#: src/client.cpp:1144 src/gui/setup_video.cpp:258
 msgid "Video"
 msgstr "Видео"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1146 src/gui/setup_theme.cpp:273
+#: src/client.cpp:1147 src/gui/setup_theme.cpp:283
 msgid "Theme"
 msgstr "Тема"
 
@@ -93,7 +93,7 @@ msgstr "Тема"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1150 src/gui/didyouknowwindow.cpp:78
+#: src/client.cpp:1151 src/gui/didyouknowwindow.cpp:78
 #: src/gui/inventorywindow.cpp:228 src/gui/npcdialog.cpp:63
 #: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:574
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:80
@@ -101,32 +101,32 @@ msgid "Close"
 msgstr "Закрыть"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1238
+#: src/client.cpp:1239
 msgid "Connecting to server"
 msgstr "Идет подключение к серверу..."
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1282
 msgid "Logging in"
 msgstr "Авторизация"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1320
+#: src/client.cpp:1321
 msgid "Entering game world"
 msgstr "Входим в игровой мир"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1431
+#: src/client.cpp:1432
 msgid "Requesting characters"
 msgstr "Получение списка персонажей"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1471
 msgid "Connecting to the game server"
 msgstr "Подключение к игровому серверу"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1483
+#: src/client.cpp:1484
 msgid "Changing game servers"
 msgstr "Смена игрового сервера"
 
@@ -141,69 +141,69 @@ msgstr "Смена игрового сервера"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1540 src/client.cpp:1551 src/client.cpp:1721
+#: src/client.cpp:1541 src/client.cpp:1552 src/client.cpp:1722
 #: src/gui/changeemaildialog.cpp:168 src/gui/changepassworddialog.cpp:158
-#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:288
-#: src/gui/editserverdialog.cpp:220 src/gui/registerdialog.cpp:263
+#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:290
+#: src/gui/editserverdialog.cpp:216 src/gui/registerdialog.cpp:263
 #: src/gui/unregisterdialog.cpp:143 src/net/ea/charserverhandler.cpp:190
 #: src/net/ea/charserverhandler.cpp:210
 msgid "Error"
 msgstr "Ошибка"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1564
+#: src/client.cpp:1565
 msgid "Requesting registration details"
 msgstr "Запрос регистрационных данных"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1601
+#: src/client.cpp:1602
 msgid "Password Change"
 msgstr "Изменить Пароль"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1603
+#: src/client.cpp:1604
 msgid "Password changed successfully!"
 msgstr "Пароль изменен!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1624
+#: src/client.cpp:1625
 msgid "Email Change"
 msgstr "Сменить Email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1626
+#: src/client.cpp:1627
 msgid "Email changed successfully!"
 msgstr "Email изменен!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1647
+#: src/client.cpp:1648
 msgid "Unregister Successful"
 msgstr "Регистрация удалена"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1649
+#: src/client.cpp:1650
 msgid "Farewell, come back any time..."
 msgstr "Хорошо, возвращайтесь в любое время..."
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1902 src/client.cpp:1917 src/client.cpp:1960
-#: src/client.cpp:1976 src/client.cpp:2417 src/client.cpp:2425
+#: src/client.cpp:1903 src/client.cpp:1918 src/client.cpp:1961
+#: src/client.cpp:1977 src/client.cpp:2418 src/client.cpp:2426
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s не существует, и не может быть создано! Выход."
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2113
+#: src/client.cpp:2114
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Некорректный сервер обновлений: %s"
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2154 src/client.cpp:2161
+#: src/client.cpp:2155 src/client.cpp:2162
 msgid "Error creating updates directory!"
 msgstr "Ошибка создания директории для обновлений!"
 
-#: src/client.cpp:2183 src/client.cpp:2196
+#: src/client.cpp:2184 src/client.cpp:2197
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Ошибка: %s не существует, и не может быть создан! Выход."
@@ -487,19 +487,19 @@ msgid "Comment: %s"
 msgstr "Комментарий: %s"
 
 #. TRANSLATORS: bot checker window header
-#: src/gui/botcheckerwindow.cpp:269
+#: src/gui/botcheckerwindow.cpp:268
 msgid "Bot Checker"
 msgstr "Окно детектора ботов"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:102
+#: src/gui/botcheckerwindow.cpp:277 src/gui/npcdialog.cpp:102
 msgid "Reset"
 msgstr "Сбросить"
 
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: relations table header
-#: src/gui/botcheckerwindow.cpp:305 src/gui/setup_relations.cpp:61
+#: src/gui/botcheckerwindow.cpp:304 src/gui/setup_relations.cpp:61
 msgid "Name"
 msgstr "Имя"
 
@@ -507,7 +507,7 @@ msgstr "Имя"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:145
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:145
 #: src/gui/popupmenu.cpp:241 src/gui/popupmenu.cpp:640
 #: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:257
 #: src/net/tmwa/generalhandler.cpp:292
@@ -517,7 +517,7 @@ msgstr "Атака"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
-#: src/gui/botcheckerwindow.cpp:309 src/gui/popupmenu.cpp:225
+#: src/gui/botcheckerwindow.cpp:308 src/gui/popupmenu.cpp:225
 #: src/gui/setupactiondata.h:93
 msgid "Talk"
 msgstr "Разговор"
@@ -525,7 +525,7 @@ msgstr "Разговор"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/botcheckerwindow.cpp:311 src/gui/popupmenu.cpp:215
+#: src/gui/botcheckerwindow.cpp:310 src/gui/popupmenu.cpp:215
 #: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:371
 #: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:653
 #: src/gui/popupmenu.cpp:727 src/gui/setupactiondata.h:1856
@@ -533,7 +533,7 @@ msgid "Move"
 msgstr "Движение"
 
 #. TRANSLATORS: bot checker window table header
-#: src/gui/botcheckerwindow.cpp:313
+#: src/gui/botcheckerwindow.cpp:312
 msgid "Result"
 msgstr "Результат"
 
@@ -589,7 +589,7 @@ msgstr "Купить"
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:516
+#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:511
 #: src/gui/selldialog.cpp:94 src/gui/selldialog.cpp:342
 #, c-format
 msgid "Price: %s / Total: %s"
@@ -606,9 +606,9 @@ msgstr "Количество:"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:208
-#: src/gui/itemamountwindow.cpp:243 src/gui/npcdialog.cpp:93
-#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:833
+#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:202
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:93
+#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:821
 msgid "+"
 msgstr "+"
 
@@ -618,9 +618,9 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:240 src/gui/npcdialog.cpp:95
-#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:846
+#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:200
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:95
+#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:834
 msgid "-"
 msgstr "-"
 
@@ -632,7 +632,7 @@ msgstr "-"
 #. TRANSLATORS: input action name
 #: src/gui/buydialog.cpp:260 src/gui/quitdialog.cpp:54
 #: src/gui/quitdialog.cpp:59 src/gui/quitdialog.cpp:61
-#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:255
+#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:264
 #: src/gui/setupactiondata.h:177
 msgid "Quit"
 msgstr "Выход"
@@ -644,7 +644,7 @@ msgstr "Выход"
 #. TRANSLATORS: status bar label
 #: src/gui/buydialog.cpp:262 src/gui/selldialog.cpp:106
 #: src/gui/statuswindow.cpp:558 src/gui/statuswindow.cpp:615
-#: src/gui/statuswindow.cpp:830 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:852
 msgid "Max"
 msgstr "Макс"
 
@@ -689,7 +689,7 @@ msgstr "Продать"
 #: src/gui/buyselldialog.cpp:71 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:120
 #: src/gui/connectiondialog.cpp:48 src/gui/editserverdialog.cpp:80
-#: src/gui/itemamountwindow.cpp:212 src/gui/npcpostdialog.cpp:64
+#: src/gui/itemamountwindow.cpp:206 src/gui/npcpostdialog.cpp:64
 #: src/gui/popupmenu.cpp:290 src/gui/popupmenu.cpp:324
 #: src/gui/popupmenu.cpp:411 src/gui/popupmenu.cpp:454
 #: src/gui/popupmenu.cpp:485 src/gui/popupmenu.cpp:512
@@ -705,7 +705,7 @@ msgstr "Продать"
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
 #: src/gui/setup.cpp:84 src/gui/socialwindow.cpp:1204
 #: src/gui/textcommandeditor.cpp:212 src/gui/textdialog.cpp:53
-#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:167
+#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:183
 msgid "Cancel"
 msgstr "Отмена"
 
@@ -869,7 +869,7 @@ msgstr "Распределите очки (%d)"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:570
+#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:581
 #: src/gui/socialwindow.cpp:1269
 msgid "Create"
 msgstr "Создать"
@@ -896,17 +896,17 @@ msgid "Please remove %d points"
 msgstr "Снимите очки (%d)"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:60
+#: src/gui/charselectdialog.cpp:61
 msgid "Confirm Character Delete"
 msgstr "Подтвердите удаление героя"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:62
+#: src/gui/charselectdialog.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "Вы уверены, что хотите удалить этого персонажа?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:86
+#: src/gui/charselectdialog.cpp:87
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr "Аккаунт %s (последний вход %s)"
@@ -918,8 +918,8 @@ msgstr "Сменить героя"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:565
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:576
+#: src/gui/updaterwindow.cpp:185
 msgid "Play"
 msgstr "Играть"
 
@@ -935,7 +935,7 @@ msgstr "Сведения"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:263
+#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:272
 #: src/gui/setupactiondata.h:1803 src/gui/setup_relations.cpp:262
 #: src/gui/shopwindow.cpp:96 src/gui/shopwindow.cpp:103
 #: src/gui/textcommandeditor.cpp:216
@@ -945,24 +945,24 @@ msgstr "Удалить"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/charselectdialog.cpp:129 src/gui/unregisterdialog.cpp:48
+#: src/gui/charselectdialog.cpp:130 src/gui/unregisterdialog.cpp:48
 #: src/gui/unregisterdialog.cpp:53
 msgid "Unregister"
 msgstr "Удалить регистрацию"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/charselectdialog.cpp:141
+#: src/gui/charselectdialog.cpp:142
 msgid "Change Email"
 msgstr "Сменить адрес E-mail"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:172
+#: src/gui/charselectdialog.cpp:175
 #, c-format
 msgid "Account %s"
 msgstr "Аккаунт %s"
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/charselectdialog.cpp:246
+#: src/gui/charselectdialog.cpp:248
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -977,16 +977,16 @@ msgstr ""
 "Опыт: %u\n"
 "Деньги: %s"
 
-#: src/gui/charselectdialog.cpp:288
+#: src/gui/charselectdialog.cpp:290
 msgid "Incorrect password"
 msgstr "Нправильный пароль"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password for deleting character"
 msgstr "Введите пароль для удаления персонажа"
 
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password:"
 msgstr "Введите пароль:"
 
@@ -1073,13 +1073,13 @@ msgid "Chat"
 msgstr "Чат"
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:735
+#: src/gui/chatwindow.cpp:638
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Присутствуют: %s; Всего %d игроков."
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1165
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Вы прошептали %s: %s"
@@ -1097,7 +1097,7 @@ msgstr "Нет"
 
 #. TRANSLATORS: confirm dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/confirmdialog.cpp:58 src/gui/popupmenu.cpp:2429
+#: src/gui/confirmdialog.cpp:55 src/gui/popupmenu.cpp:2429
 #: src/gui/popupmenu.cpp:2442 src/gui/popupmenu.cpp:2457
 #: src/gui/popupmenu.cpp:2483
 msgid "Ignore"
@@ -1106,7 +1106,7 @@ msgstr "Игнорировать"
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
 #. TRANSLATORS: settings group
-#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:109
+#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:108
 #: src/gui/setup_other.cpp:123 src/gui/windowmenu.cpp:106
 msgid "Map"
 msgstr "Карта"
@@ -1122,190 +1122,190 @@ msgid "Net"
 msgstr "Сеть"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:265
-#: src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:268
+#: src/gui/debugwindow.cpp:311
 msgid "Music:"
 msgstr "Музыка:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:153 src/gui/debugwindow.cpp:271
-#: src/gui/debugwindow.cpp:312
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:274
+#: src/gui/debugwindow.cpp:315
 msgid "Map:"
 msgstr "Карта:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:155 src/gui/debugwindow.cpp:268
-#: src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:271
+#: src/gui/debugwindow.cpp:313
 msgid "Minimap:"
 msgstr "МиниКарта:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:262
-#: src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:161 src/gui/debugwindow.cpp:265
+#: src/gui/debugwindow.cpp:309
 msgid "Cursor:"
 msgstr "Курсор:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:161
+#: src/gui/debugwindow.cpp:164
 msgid "Particle count:"
 msgstr "Количество эффектов:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:284
-#: src/gui/debugwindow.cpp:316
+#: src/gui/debugwindow.cpp:167 src/gui/debugwindow.cpp:287
+#: src/gui/debugwindow.cpp:319
 msgid "Map actors count:"
 msgstr "Кол-во. объектов:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:166 src/gui/debugwindow.cpp:243
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:169 src/gui/debugwindow.cpp:246
+#: src/gui/debugwindow.cpp:252
 msgid "Player Position:"
 msgstr "Позиция игрока:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:172 src/gui/debugwindow.cpp:297
+#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:300
 msgid "Draw calls:"
 msgstr "Вызовов рис.:"
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:175
+#. TRANSLATORS: debug window label, frames per second
+#: src/gui/debugwindow.cpp:178
 #, c-format
 msgid "%d FPS"
 msgstr "%d FPS"
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:177 src/gui/debugwindow.cpp:324
+#. TRANSLATORS: debug window label, logic per second
+#: src/gui/debugwindow.cpp:180 src/gui/debugwindow.cpp:327
 #, c-format
 msgid "%d LPS"
 msgstr "%d Лог./сек."
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:191 src/gui/debugwindow.cpp:209
 #, c-format
 msgid "%d FPS (Software)"
 msgstr "%d FPS (Программно)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:193
+#: src/gui/debugwindow.cpp:196
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr "%d FPS (быстрый OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:197
+#: src/gui/debugwindow.cpp:200
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr "%d FPS (старый OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:201
+#: src/gui/debugwindow.cpp:204
 #, c-format
 msgid "%d FPS (mobile OpenGL)"
 msgstr "%d FPS (мобильный OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:225 src/gui/debugwindow.cpp:290
+#: src/gui/debugwindow.cpp:228 src/gui/debugwindow.cpp:293
 msgid "Textures count:"
 msgstr "Количество текстур:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:279
+#: src/gui/debugwindow.cpp:282
 #, c-format
 msgid "Particle count: %d"
 msgstr "Количество частиц: %d"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:330 src/gui/debugwindow.cpp:380
-#: src/gui/debugwindow.cpp:442
+#: src/gui/debugwindow.cpp:333 src/gui/debugwindow.cpp:383
+#: src/gui/debugwindow.cpp:445
 msgid "Target:"
 msgstr "Цель:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:332 src/gui/debugwindow.cpp:386
-#: src/gui/debugwindow.cpp:444
+#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
+#: src/gui/debugwindow.cpp:447
 msgid "Target Id:"
 msgstr "Id цели:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
-#: src/gui/debugwindow.cpp:446
+#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:392
+#: src/gui/debugwindow.cpp:449
 msgid "Target type:"
 msgstr "Тип цели:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:337
+#: src/gui/debugwindow.cpp:340
 msgid "Target level:"
 msgstr "Уровень цели:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:339 src/gui/debugwindow.cpp:405
+#: src/gui/debugwindow.cpp:342 src/gui/debugwindow.cpp:408
 msgid "Target race:"
 msgstr "Расса цели:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:341
+#: src/gui/debugwindow.cpp:344
 msgid "Target party:"
 msgstr "Группа цели:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:346
 msgid "Target guild:"
 msgstr "Гильдия цели:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:430
-#: src/gui/debugwindow.cpp:436 src/gui/debugwindow.cpp:454
+#: src/gui/debugwindow.cpp:348 src/gui/debugwindow.cpp:433
+#: src/gui/debugwindow.cpp:439 src/gui/debugwindow.cpp:457
 msgid "Attack delay:"
 msgstr "Задержка атаки:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:347 src/gui/debugwindow.cpp:417
-#: src/gui/debugwindow.cpp:456
+#: src/gui/debugwindow.cpp:350 src/gui/debugwindow.cpp:420
+#: src/gui/debugwindow.cpp:459
 msgid "Minimal hit:"
 msgstr "Минимальный удар:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:349 src/gui/debugwindow.cpp:420
-#: src/gui/debugwindow.cpp:458
+#: src/gui/debugwindow.cpp:352 src/gui/debugwindow.cpp:423
+#: src/gui/debugwindow.cpp:461
 msgid "Maximum hit:"
 msgstr "Максимальный удар:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:351 src/gui/debugwindow.cpp:423
-#: src/gui/debugwindow.cpp:460
+#: src/gui/debugwindow.cpp:354 src/gui/debugwindow.cpp:426
+#: src/gui/debugwindow.cpp:463
 msgid "Critical hit:"
 msgstr "Критический удар:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:394 src/gui/debugwindow.cpp:400
-#: src/gui/debugwindow.cpp:448
+#: src/gui/debugwindow.cpp:397 src/gui/debugwindow.cpp:403
+#: src/gui/debugwindow.cpp:451
 msgid "Target Level:"
 msgstr "Уровень цели:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:408 src/gui/debugwindow.cpp:450
+#: src/gui/debugwindow.cpp:411 src/gui/debugwindow.cpp:453
 msgid "Target Party:"
 msgstr "Группа цели:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:412 src/gui/debugwindow.cpp:452
+#: src/gui/debugwindow.cpp:415 src/gui/debugwindow.cpp:455
 msgid "Target Guild:"
 msgstr "Гильдия цели:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:493
+#: src/gui/debugwindow.cpp:496
 #, c-format
 msgid "Ping: %s ms"
 msgstr "Пинг: %s мс."
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:496
+#: src/gui/debugwindow.cpp:499
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "Вх.: %d байт/сек."
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:499
+#: src/gui/debugwindow.cpp:502
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "Исх.: %d байт/сек."
@@ -1337,7 +1337,7 @@ msgstr "Автоматически открывать это окно"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #: src/gui/editdialog.cpp:45 src/gui/editserverdialog.cpp:78
-#: src/gui/itemamountwindow.cpp:210 src/gui/okdialog.cpp:51
+#: src/gui/itemamountwindow.cpp:204 src/gui/okdialog.cpp:51
 #: src/gui/quitdialog.cpp:70 src/gui/textdialog.cpp:46
 msgid "OK"
 msgstr "ОК"
@@ -1349,7 +1349,7 @@ msgstr "Редактирование сервера"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:257
+#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:266
 msgid "Connect"
 msgstr "Соединиться"
 
@@ -1379,7 +1379,7 @@ msgid "Online list url:"
 msgstr "Онлайн список:"
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/editserverdialog.cpp:222
+#: src/gui/editserverdialog.cpp:218
 msgid "Please at least type both the address and the port of the server."
 msgstr "Пожалуйста введите хотябы адрес и порт сервера"
 
@@ -1431,7 +1431,7 @@ msgstr "Надеть"
 #: src/gui/inventorywindow.cpp:178 src/gui/inventorywindow.cpp:630
 #: src/gui/popupmenu.cpp:1843 src/gui/popupmenu.cpp:1922
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2041
-#: src/gui/skilldialog.cpp:277
+#: src/gui/skilldialog.cpp:279
 msgid "Use"
 msgstr "Использовать"
 
@@ -1465,7 +1465,7 @@ msgstr "Наряды"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: setup button
-#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:718
+#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:719
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1992
 #: src/gui/popupmenu.cpp:2066 src/gui/setup.cpp:86
 msgid "Store"
@@ -1487,47 +1487,47 @@ msgid "Drop"
 msgstr "Бросить"
 
 #. TRANSLATORS: item amount window button
-#: src/gui/itemamountwindow.cpp:214
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "Всё"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:264
 msgid "Select amount of items to trade."
 msgstr "Сколько предметов продать."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:274
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to drop."
 msgstr "Сколько предметов сбросить."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:278
+#: src/gui/itemamountwindow.cpp:272
 msgid "Select amount of items to store."
 msgstr "Укажите количество вещей для хранения."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:276
 msgid "Select amount of items to retrieve."
 msgstr "Укажите количество вещей для изъятия."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:286
+#: src/gui/itemamountwindow.cpp:280
 msgid "Select amount of items to split."
 msgstr "Сколько предметов разделить."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:290
+#: src/gui/itemamountwindow.cpp:284
 msgid "Add to buy shop."
 msgstr "Добавить в список покупки."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:294
+#: src/gui/itemamountwindow.cpp:288
 msgid "Add to sell shop."
 msgstr "Добавить в список продажи."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:298
+#: src/gui/itemamountwindow.cpp:292
 msgid "Unknown."
 msgstr "Неизвестно."
 
@@ -1554,7 +1554,7 @@ msgstr "Сбросить таймер"
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:58 src/gui/killstats.cpp:171
-#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:516
+#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:509
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr "Убийств: %s, опыта: %s"
@@ -1562,7 +1562,7 @@ msgstr "Убийств: %s, опыта: %s"
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:61 src/gui/killstats.cpp:173
 #: src/gui/killstats.cpp:253 src/gui/killstats.cpp:268
-#: src/gui/killstats.cpp:518
+#: src/gui/killstats.cpp:511
 #, c-format
 msgid "Avg Exp: %s"
 msgstr "Средний опып: %s"
@@ -1570,14 +1570,14 @@ msgstr "Средний опып: %s"
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:63 src/gui/killstats.cpp:176
 #: src/gui/killstats.cpp:258 src/gui/killstats.cpp:272
-#: src/gui/killstats.cpp:521
+#: src/gui/killstats.cpp:514
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr "Средн. кол-во монстров до след. уров.: %s"
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:66 src/gui/killstats.cpp:187
-#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:524
+#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:517
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr "Убийств в минуту: %s, Опыта в минуту: %s"
@@ -1607,9 +1607,9 @@ msgid "Last kill exp:"
 msgstr "Опыт за последнее убийство:"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:414
-#: src/gui/killstats.cpp:421 src/gui/killstats.cpp:428
-#: src/gui/killstats.cpp:434
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:408
+#: src/gui/killstats.cpp:415 src/gui/killstats.cpp:422
+#: src/gui/killstats.cpp:428
 msgid "Time before jacko spawn:"
 msgstr "Время до появления jacko:"
 
@@ -1641,12 +1641,12 @@ msgid "  Time for next level: %s"
 msgstr "  Время до следующего уровня: %s"
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:421
+#: src/gui/killstats.cpp:415
 #, c-format
 msgid "%s %d?"
 msgstr "%s %d?"
 
-#: src/gui/killstats.cpp:428
+#: src/gui/killstats.cpp:422
 msgid "jacko spawning"
 msgstr "jacko появляется"
 
@@ -1752,32 +1752,32 @@ msgid "arrows bar"
 msgstr "стрелы"
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:88
+#: src/gui/ministatuswindow.cpp:89
 msgid "status bar"
 msgstr "статус"
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:108
+#: src/gui/ministatuswindow.cpp:109
 msgid "job bar"
 msgstr "работа"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:306 src/gui/statuswindow.cpp:298
+#: src/gui/ministatuswindow.cpp:307 src/gui/statuswindow.cpp:298
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Уровень: %d (GM %d)"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:313 src/gui/statuswindow.cpp:141
+#: src/gui/ministatuswindow.cpp:314 src/gui/statuswindow.cpp:141
 #: src/gui/statuswindow.cpp:305 src/gui/statuswindow.cpp:375
 #, c-format
 msgid "Level: %d"
 msgstr "Уровень: %d"
 
 #. TRANSLATORS: status bar label
-#: src/gui/ministatuswindow.cpp:330 src/gui/ministatuswindow.cpp:367
+#: src/gui/ministatuswindow.cpp:331 src/gui/ministatuswindow.cpp:368
 msgid "Need"
 msgstr "Нужно"
 
@@ -2165,7 +2165,7 @@ msgstr "Скопировать в чат"
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2209 src/gui/popupmenu.cpp:2280
-#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:139
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
 #: src/gui/socialwindow.cpp:934
 msgid "(default)"
 msgstr "(по умолчанию)"
@@ -2348,7 +2348,7 @@ msgid "Passwords do not match."
 msgstr "Пароли не совпадают."
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:257
 msgid "Choose Your Server"
 msgstr "Выберите сервер"
 
@@ -2356,61 +2356,61 @@ msgstr "Выберите сервер"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:259 src/gui/shopwindow.cpp:94
+#: src/gui/serverdialog.cpp:268 src/gui/shopwindow.cpp:94
 #: src/gui/shopwindow.cpp:101 src/gui/tradewindow.cpp:77
 msgid "Add"
 msgstr "Добавить"
 
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
-#: src/gui/serverdialog.cpp:261 src/gui/widgets/setupitem.cpp:299
+#: src/gui/serverdialog.cpp:270 src/gui/widgets/setupitem.cpp:299
 #: src/gui/widgets/setupitem.cpp:426
 msgid "Edit"
 msgstr "Изменить"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:274
 msgid "Load"
 msgstr "Загрузить"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:279
+#: src/gui/serverdialog.cpp:288
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "Выбор сервера  *** БЕЗОПАСНЫЙ РЕЖИМ ***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:297
 msgid "Use same ip for game sub servers"
 msgstr "Использовать одинаковый IP для игровых суб-серверов"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:518
+#: src/gui/serverdialog.cpp:527
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Получение списка серверов...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:524
+#: src/gui/serverdialog.cpp:533
 msgid "Waiting for server..."
 msgstr "Ожидание ответа от сервера"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:529
+#: src/gui/serverdialog.cpp:538
 msgid "Preparing download"
 msgstr "Подготовка к загрузке"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:534
+#: src/gui/serverdialog.cpp:543
 msgid "Error retreiving server list!"
 msgstr "Не удалось получить список серверов!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:626
+#: src/gui/serverdialog.cpp:635
 msgid "requires a newer version"
 msgstr "требуется более новая версия"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:631
+#: src/gui/serverdialog.cpp:640
 #, c-format
 msgid "requires v%s"
 msgstr "требуется v%s"
@@ -3421,7 +3421,7 @@ msgid "Type:"
 msgstr "Введите: "
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:334
+#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:336
 msgid "Delay:"
 msgstr "Задержка:"
 
@@ -3441,30 +3441,30 @@ msgid "Blue:"
 msgstr "Синий:"
 
 #. TRANSLATORS: color type
-#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:420
+#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:422
 msgid "Static"
 msgstr "Статичный"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:107 src/gui/setup_colors.cpp:110
-#: src/gui/setup_colors.cpp:422
+#: src/gui/setup_colors.cpp:424
 msgid "Pulse"
 msgstr "Пульсирующий"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:112 src/gui/setup_colors.cpp:115
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Rainbow"
 msgstr "Радуга"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:117 src/gui/setup_colors.cpp:120
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Spectrum"
 msgstr "Спектр"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:328
+#: src/gui/setup_colors.cpp:330
 msgid "Alpha:"
 msgstr "Прозрачность:"
 
@@ -3632,7 +3632,7 @@ msgstr "Разное"
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: palette color
-#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:134
+#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:135
 msgid "Monsters"
 msgstr "Монстры"
 
@@ -4187,206 +4187,231 @@ msgstr "Когда игнорируется:"
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:86
+msgid "Very small (8)"
+msgstr "Очень маленький (8)"
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:88
 msgid "Very small (9)"
 msgstr "Очень маленький (9)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:88
+#: src/gui/setup_theme.cpp:90
 msgid "Tiny (10)"
 msgstr "Маленький (10)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:90
+#: src/gui/setup_theme.cpp:92
 msgid "Small (11)"
 msgstr "Маленький (11)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:92
+#: src/gui/setup_theme.cpp:94
 msgid "Medium (12)"
 msgstr "Средний (12)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:94
+#: src/gui/setup_theme.cpp:96
 msgid "Normal (13)"
 msgstr "Нормальный (13)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:96
+#: src/gui/setup_theme.cpp:98
 msgid "Large (14)"
 msgstr "Большой (14)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:98
-msgid "Very large (15)"
-msgstr "Очень большой (15)"
-
-#. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:100
-msgid "Big (16)"
-msgstr "Огромный (16)"
+msgid "Large (15)"
+msgstr "Большой (15)"
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:102
-msgid "Very big (17)"
-msgstr "Очень огромный (17)"
+msgid "Large (16)"
+msgstr "Большой (16)"
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:104
-msgid "Huge (18)"
-msgstr "Громадный (18)"
+msgid "Big (17)"
+msgstr "Большой (17)"
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:106
-msgid "Very huge (19)"
-msgstr "Очень громадный (19)"
+msgid "Big (18)"
+msgstr "Большой (18)"
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:108
+msgid "Big (19)"
+msgstr "Большой (19("
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:110
+msgid "Very big (20)"
+msgstr "Очень большой (20)"
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:112
+msgid "Very big (21)"
+msgstr "Очень большой (21)"
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:114
+msgid "Very big (22)"
+msgstr "Очень большой (22)"
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:116
+msgid "Huge (23)"
+msgstr "Огромный (23)"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:151
 msgid "Chinese (China)"
 msgstr "Китайский"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:153
 msgid "Czech"
 msgstr "Чешский"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:155
 msgid "English"
 msgstr "Английский"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:157
 msgid "Finnish"
 msgstr "Финский"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:159
 msgid "French"
 msgstr "Французский"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:161
 msgid "German"
 msgstr "Немецкий"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:153
+#: src/gui/setup_theme.cpp:163
 msgid "Indonesian"
 msgstr "Индонезийский"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:155
+#: src/gui/setup_theme.cpp:165
 msgid "Italian"
 msgstr "Итальянский"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:157
+#: src/gui/setup_theme.cpp:167
 msgid "Polish"
 msgstr "Польский"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:159
+#: src/gui/setup_theme.cpp:169
 msgid "Japanese"
 msgstr "Японский"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:161
+#: src/gui/setup_theme.cpp:171
 msgid "Dutch (Belgium/Flemish)"
 msgstr "Голландский (Бельгийский / Фламандский)"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:163
+#: src/gui/setup_theme.cpp:173
 msgid "Portuguese"
 msgstr "Португальский"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:165
+#: src/gui/setup_theme.cpp:175
 msgid "Portuguese (Brazilian)"
 msgstr "Португальский (Бразильский)"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:167
+#: src/gui/setup_theme.cpp:177
 msgid "Russian"
 msgstr "Русский"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:169
+#: src/gui/setup_theme.cpp:179
 msgid "Spanish (Castilian)"
 msgstr "Испанский (Кастильский)"
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:171
+#: src/gui/setup_theme.cpp:181
 msgid "Turkish"
 msgstr "Турецкий"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:223
+#: src/gui/setup_theme.cpp:233
 msgid "Gui theme"
 msgstr "Тема интерфейса"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:230
+#: src/gui/setup_theme.cpp:240
 msgid "Main Font"
 msgstr "Основной шрифт"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:235
+#: src/gui/setup_theme.cpp:245
 msgid "Language"
 msgstr "Язык"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:239
+#: src/gui/setup_theme.cpp:249
 msgid "Bold font"
 msgstr "Жирный шрифт"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:243
+#: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr "Шрифт частиц"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:247
+#: src/gui/setup_theme.cpp:257
 msgid "Help font"
 msgstr "Шрифт помощи"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:251
+#: src/gui/setup_theme.cpp:261
 msgid "Secure font"
 msgstr "Безопасный шрифт"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:255
+#: src/gui/setup_theme.cpp:265
 msgid "Japanese font"
 msgstr "Японский шрифт"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:260
+#: src/gui/setup_theme.cpp:270
 msgid "Font size"
 msgstr "Размер шрифта"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:265
+#: src/gui/setup_theme.cpp:275
 msgid "Npc font size"
 msgstr "Размер шрифта НИП (NPC)"
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/setup_theme.cpp:269
+#: src/gui/setup_theme.cpp:279
 msgid "i"
 msgstr "i"
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/setup_theme.cpp:442
+#: src/gui/setup_theme.cpp:452
 msgid "Theme info"
 msgstr "Информация о теме"
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/setup_theme.cpp:467
+#: src/gui/setup_theme.cpp:477
 msgid "Theme Changed"
 msgstr "Тема изменена"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/setup_theme.cpp:467 src/gui/setup_video.cpp:537
+#: src/gui/setup_theme.cpp:477 src/gui/setup_video.cpp:537
 #: src/gui/setup_video.cpp:546
 msgid "Restart your client for the change to take effect."
 msgstr "Перезегрузите игру дабы изменения вступили в силу."
@@ -4690,7 +4715,8 @@ msgid "Ambient FX"
 msgstr "Эффекты окружающей среды"
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_visual.cpp:140
+#. TRANSLATORS: palette color
+#: src/gui/setup_visual.cpp:140 src/gui/userpalette.cpp:146
 msgid "Particle effects"
 msgstr "Эффекты частиц"
 
@@ -4777,45 +4803,45 @@ msgid "%s wants to %s %s do you accept?"
 msgstr "%s хочет %s %s, вы принимаете предложение?"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/skilldialog.cpp:270 src/gui/windowmenu.cpp:112
+#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:112
 msgid "Skills"
 msgstr "Умения"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/skilldialog.cpp:279
+#: src/gui/skilldialog.cpp:281
 msgid "Up"
 msgstr "Верх"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/skilldialog.cpp:391
+#: src/gui/skilldialog.cpp:393
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Очков навыков осталось: %d"
 
 #. TRANSLATORS: skills dialog default skills tab
-#: src/gui/skilldialog.cpp:444
+#: src/gui/skilldialog.cpp:446
 msgid "basic"
 msgstr "базовые"
 
 #. TRANSLATORS: skills dialog default skill name
-#: src/gui/skilldialog.cpp:447
+#: src/gui/skilldialog.cpp:449
 msgid "basic, 1"
 msgstr "основной, 1"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/skilldialog.cpp:484
+#: src/gui/skilldialog.cpp:486
 #, c-format
 msgid "Skill Set %d"
 msgstr "Умение %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/skilldialog.cpp:518
+#: src/gui/skilldialog.cpp:520
 #, c-format
 msgid "Skill %d"
 msgstr "Умение %d"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/skilldialog.cpp:612 src/gui/skilldialog.cpp:762
+#: src/gui/skilldialog.cpp:614 src/gui/skilldialog.cpp:764
 #, c-format
 msgid "Lvl: %d"
 msgstr "Уровень: %d"
@@ -5258,7 +5284,7 @@ msgid "Trade: You"
 msgstr "Торговля: Вы"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:182
+#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:184
 #, c-format
 msgid "You get %s"
 msgstr "Вы получаете %s."
@@ -5274,12 +5300,12 @@ msgid "You give:"
 msgstr "Вы отдаете:"
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:393
+#: src/gui/tradewindow.cpp:396
 msgid "You don't have enough money."
 msgstr "У вас недостаточно денег"
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:475
+#: src/gui/tradewindow.cpp:479
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Отказано в добавлении предмета. Вы не можете добавить какой-либо вид "
@@ -5292,223 +5318,223 @@ msgid "Name: %s"
 msgstr "Имя: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/updaterwindow.cpp:140
+#: src/gui/updaterwindow.cpp:156
 msgid "Updating..."
 msgstr "Обновление..."
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:165
+#: src/gui/updaterwindow.cpp:181
 msgid "Connecting..."
 msgstr "Соединение..."
 
 #. TRANSLATORS: update message
-#: src/gui/updaterwindow.cpp:656
+#: src/gui/updaterwindow.cpp:672
 msgid "##1  The update process is incomplete."
 msgstr "##1  Процесс обновления не завершен!"
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/updaterwindow.cpp:658
+#: src/gui/updaterwindow.cpp:674
 msgid "##1  It is strongly recommended that"
 msgstr "##1  Настоятельно рекомендуется"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:660
+#: src/gui/updaterwindow.cpp:676
 msgid "##1  you try again later."
 msgstr "##1  попытаться еще раз немного погодя."
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:839
+#: src/gui/updaterwindow.cpp:855
 msgid "Completed"
 msgstr "Завершено"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
 msgid "Being"
 msgstr "Существо"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:118
-msgid "Friend Names"
-msgstr "Имена Друзей"
+#: src/gui/userpalette.cpp:119
+msgid "Friend names"
+msgstr "Имена друзей"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:120
-msgid "Disregarded Names"
+#: src/gui/userpalette.cpp:121
+msgid "Disregarded names"
 msgstr "Имена пренебрегаемых"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:122
-msgid "Ignored Names"
-msgstr "Игнорируемые имена"
+#: src/gui/userpalette.cpp:123
+msgid "Ignored names"
+msgstr "Имена игнорируемых"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:124
-msgid "Erased Names"
-msgstr "Стертые имена"
+#: src/gui/userpalette.cpp:125
+msgid "Erased names"
+msgstr "Имена стертых"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:126
-msgid "Other Players' Names"
+#: src/gui/userpalette.cpp:127
+msgid "Other players names"
 msgstr "Имена других игроков"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:128
-msgid "Own Name"
+#: src/gui/userpalette.cpp:129
+msgid "Own name"
 msgstr "Собственное имя"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:130
-msgid "GM Names"
+#: src/gui/userpalette.cpp:131
+msgid "GM names"
 msgstr "Имена ГМ"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
 msgid "NPCs"
 msgstr "Боты"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
 msgid "Monster HP bar"
 msgstr "Полоса жизни монстров"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:140
 msgid "Monster HP bar (second color)"
 msgstr "Полоса жизни монстров (второй цвет)"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:141
-msgid "Party Members"
+#: src/gui/userpalette.cpp:142
+msgid "Party members"
 msgstr "Члены группы"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:143
-msgid "Guild Members"
+#: src/gui/userpalette.cpp:144
+msgid "Guild members"
 msgstr "Члены гильдии"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:145
-msgid "Particle Effects"
-msgstr "Эффекты частиц"
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:147
-msgid "Pickup Notification"
+#: src/gui/userpalette.cpp:148
+msgid "Pickup notification"
 msgstr "Сообщение о подборе предмета"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:149
-msgid "Exp Notification"
+#: src/gui/userpalette.cpp:150
+msgid "Exp notification"
 msgstr "Сообщение об изменении опыта"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
 msgid "Player HP bar"
 msgstr "Полоса жизни игрока"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
 msgid "Player HP bar (second color)"
 msgstr "Полоса жизни игрока (второй цвет)"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:157
-msgid "Player Hits Monster"
-msgstr "Удары игрока по монстру"
+#: src/gui/userpalette.cpp:158
+msgid "Player hits monster"
+msgstr "Удар игрока по монстру"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:159
-msgid "Monster Hits Player"
-msgstr "Удары монстра по игроку"
+#: src/gui/userpalette.cpp:160
+msgid "Monster hits player"
+msgstr "Удар монстра по игроку"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:163
-msgid "Other Player Hits Local Player"
-msgstr "Другой игрок бъет локального игрока"
+#: src/gui/userpalette.cpp:164
+msgid "Other player hits local player"
+msgstr "Удар другого игрока по локальному игроку"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:166
 msgid "Critical Hit"
 msgstr "Критический удар"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
-msgid "Local Player Hits Monster"
-msgstr "Удары игроков вокруг по монстру"
+#: src/gui/userpalette.cpp:170
+msgid "Local player hits monster"
+msgstr "Удар игрока по монстру"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:172
-msgid "Local Player Critical Hit"
+#: src/gui/userpalette.cpp:173
+msgid "Local player critical hit"
 msgstr "Критический удар игрока"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:175
-msgid "Local Player Miss"
-msgstr "Промах соседнего игрока"
+#: src/gui/userpalette.cpp:176
+msgid "Local player miss"
+msgstr "Промах локального игрока"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:177
+#: src/gui/userpalette.cpp:178
 msgid "Misses"
 msgstr "Промахи"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
-msgid "Portal Highlight"
+#: src/gui/userpalette.cpp:180
+msgid "Portal highlight"
 msgstr "Подсветка переходов"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:182
-msgid "Default collision Highlight"
+#: src/gui/userpalette.cpp:183
+msgid "Default collision highlight"
 msgstr "Подсветка непроходимых клеток"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:185
-msgid "Air collision Highlight"
+#: src/gui/userpalette.cpp:186
+msgid "Air collision highlight"
 msgstr "Подстветка только воздушных клетов"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:188
-msgid "Water collision Highlight"
+#: src/gui/userpalette.cpp:189
+msgid "Water collision highlight"
 msgstr "Подсветка клеток с водой"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:191
-msgid "Special ground collision Highlight"
+#: src/gui/userpalette.cpp:192
+msgid "Special ground collision highlight"
 msgstr "Подсветка спец. областей"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
-msgid "Walkable Highlight"
-msgstr "Подсветка доступных участков карты"
+#: src/gui/userpalette.cpp:195
+msgid "Walkable highlight"
+msgstr "Подсветка доступных клеток карты"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:197
-msgid "Local Player Attack Range"
-msgstr "Зона атаки соседнего игрока"
+#: src/gui/userpalette.cpp:198
+msgid "Local player attack range"
+msgstr "Подсветка радиуса атаки игрока"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:200
-msgid "Local Player Attack Range Border"
-msgstr "Граница зоны атаки соседнего игрока"
+#: src/gui/userpalette.cpp:201
+msgid "Local player attack range border"
+msgstr "Подсветка границы атаки игрока"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:203
-msgid "Monster Attack Range"
+#: src/gui/userpalette.cpp:204
+msgid "Monster attack range"
 msgstr "Зона атаки монстра"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:206
-msgid "Home Place"
+#: src/gui/userpalette.cpp:208
+msgid "Floor item amount color"
+msgstr "кол-во на предмете на земле"
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:211
+msgid "Home place"
 msgstr "Домашняя позиция"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:209
-msgid "Home Place Border"
-msgstr "Бордюр домашней позиции"
+#: src/gui/userpalette.cpp:214
+msgid "Home place border"
+msgstr "Граница домашней позиции"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:212
-msgid "Road Point"
+#: src/gui/userpalette.cpp:217
+msgid "Road point"
 msgstr "Точка дороги"
 
 #. TRANSLATORS: who is online window name
@@ -5638,7 +5664,7 @@ msgid "/kick > Kick some one from the guild you are in"
 msgstr "/kick > Вышвырнуть кого-либо из Вашей текущей группы"
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:315
+#: src/gui/widgets/itemcontainer.cpp:317
 msgid "Eq."
 msgstr "Од."
 
diff --git a/po/sk.po b/po/sk.po
index 64b4dcf90..961217e8c 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-05-03 12:38+0300\n"
-"PO-Revision-Date: 2013-05-03 09:44+0000\n"
+"POT-Creation-Date: 2013-05-10 18:34+0300\n"
+"PO-Revision-Date: 2013-05-10 15:39+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -59,25 +59,25 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: full button name
-#: src/client.cpp:1136 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
+#: src/client.cpp:1137 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
 msgid "Setup"
 msgstr "Nastavenie"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1140 src/gui/setup_perfomance.cpp:61
+#: src/client.cpp:1141 src/gui/setup_perfomance.cpp:61
 msgid "Perfomance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:1143 src/gui/setup_video.cpp:258
+#: src/client.cpp:1144 src/gui/setup_video.cpp:258
 msgid "Video"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1146 src/gui/setup_theme.cpp:273
+#: src/client.cpp:1147 src/gui/setup_theme.cpp:283
 msgid "Theme"
 msgstr ""
 
@@ -88,7 +88,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1150 src/gui/didyouknowwindow.cpp:78
+#: src/client.cpp:1151 src/gui/didyouknowwindow.cpp:78
 #: src/gui/inventorywindow.cpp:228 src/gui/npcdialog.cpp:63
 #: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:574
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:80
@@ -96,32 +96,32 @@ msgid "Close"
 msgstr "Zatvoriť"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1238
+#: src/client.cpp:1239
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1282
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1320
+#: src/client.cpp:1321
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1431
+#: src/client.cpp:1432
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1471
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1483
+#: src/client.cpp:1484
 msgid "Changing game servers"
 msgstr ""
 
@@ -136,69 +136,69 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1540 src/client.cpp:1551 src/client.cpp:1721
+#: src/client.cpp:1541 src/client.cpp:1552 src/client.cpp:1722
 #: src/gui/changeemaildialog.cpp:168 src/gui/changepassworddialog.cpp:158
-#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:288
-#: src/gui/editserverdialog.cpp:220 src/gui/registerdialog.cpp:263
+#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:290
+#: src/gui/editserverdialog.cpp:216 src/gui/registerdialog.cpp:263
 #: src/gui/unregisterdialog.cpp:143 src/net/ea/charserverhandler.cpp:190
 #: src/net/ea/charserverhandler.cpp:210
 msgid "Error"
 msgstr "Chyba"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1564
+#: src/client.cpp:1565
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1601
+#: src/client.cpp:1602
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1603
+#: src/client.cpp:1604
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1624
+#: src/client.cpp:1625
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1626
+#: src/client.cpp:1627
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1647
+#: src/client.cpp:1648
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1649
+#: src/client.cpp:1650
 msgid "Farewell, come back any time..."
 msgstr ""
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1902 src/client.cpp:1917 src/client.cpp:1960
-#: src/client.cpp:1976 src/client.cpp:2417 src/client.cpp:2425
+#: src/client.cpp:1903 src/client.cpp:1918 src/client.cpp:1961
+#: src/client.cpp:1977 src/client.cpp:2418 src/client.cpp:2426
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2113
+#: src/client.cpp:2114
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2154 src/client.cpp:2161
+#: src/client.cpp:2155 src/client.cpp:2162
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:2183 src/client.cpp:2196
+#: src/client.cpp:2184 src/client.cpp:2197
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -478,19 +478,19 @@ msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: bot checker window header
-#: src/gui/botcheckerwindow.cpp:269
+#: src/gui/botcheckerwindow.cpp:268
 msgid "Bot Checker"
 msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:102
+#: src/gui/botcheckerwindow.cpp:277 src/gui/npcdialog.cpp:102
 msgid "Reset"
 msgstr ""
 
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: relations table header
-#: src/gui/botcheckerwindow.cpp:305 src/gui/setup_relations.cpp:61
+#: src/gui/botcheckerwindow.cpp:304 src/gui/setup_relations.cpp:61
 msgid "Name"
 msgstr ""
 
@@ -498,7 +498,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:145
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:145
 #: src/gui/popupmenu.cpp:241 src/gui/popupmenu.cpp:640
 #: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:257
 #: src/net/tmwa/generalhandler.cpp:292
@@ -508,7 +508,7 @@ msgstr ""
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
-#: src/gui/botcheckerwindow.cpp:309 src/gui/popupmenu.cpp:225
+#: src/gui/botcheckerwindow.cpp:308 src/gui/popupmenu.cpp:225
 #: src/gui/setupactiondata.h:93
 msgid "Talk"
 msgstr ""
@@ -516,7 +516,7 @@ msgstr ""
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/botcheckerwindow.cpp:311 src/gui/popupmenu.cpp:215
+#: src/gui/botcheckerwindow.cpp:310 src/gui/popupmenu.cpp:215
 #: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:371
 #: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:653
 #: src/gui/popupmenu.cpp:727 src/gui/setupactiondata.h:1856
@@ -524,7 +524,7 @@ msgid "Move"
 msgstr ""
 
 #. TRANSLATORS: bot checker window table header
-#: src/gui/botcheckerwindow.cpp:313
+#: src/gui/botcheckerwindow.cpp:312
 msgid "Result"
 msgstr ""
 
@@ -580,7 +580,7 @@ msgstr "Kúpiť"
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:516
+#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:511
 #: src/gui/selldialog.cpp:94 src/gui/selldialog.cpp:342
 #, c-format
 msgid "Price: %s / Total: %s"
@@ -597,9 +597,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:208
-#: src/gui/itemamountwindow.cpp:243 src/gui/npcdialog.cpp:93
-#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:833
+#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:202
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:93
+#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:821
 msgid "+"
 msgstr ""
 
@@ -609,9 +609,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:240 src/gui/npcdialog.cpp:95
-#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:846
+#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:200
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:95
+#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:834
 msgid "-"
 msgstr ""
 
@@ -623,7 +623,7 @@ msgstr ""
 #. TRANSLATORS: input action name
 #: src/gui/buydialog.cpp:260 src/gui/quitdialog.cpp:54
 #: src/gui/quitdialog.cpp:59 src/gui/quitdialog.cpp:61
-#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:255
+#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:264
 #: src/gui/setupactiondata.h:177
 msgid "Quit"
 msgstr "Ukončiť"
@@ -635,7 +635,7 @@ msgstr "Ukončiť"
 #. TRANSLATORS: status bar label
 #: src/gui/buydialog.cpp:262 src/gui/selldialog.cpp:106
 #: src/gui/statuswindow.cpp:558 src/gui/statuswindow.cpp:615
-#: src/gui/statuswindow.cpp:830 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:852
 msgid "Max"
 msgstr ""
 
@@ -680,7 +680,7 @@ msgstr "Predaj"
 #: src/gui/buyselldialog.cpp:71 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:120
 #: src/gui/connectiondialog.cpp:48 src/gui/editserverdialog.cpp:80
-#: src/gui/itemamountwindow.cpp:212 src/gui/npcpostdialog.cpp:64
+#: src/gui/itemamountwindow.cpp:206 src/gui/npcpostdialog.cpp:64
 #: src/gui/popupmenu.cpp:290 src/gui/popupmenu.cpp:324
 #: src/gui/popupmenu.cpp:411 src/gui/popupmenu.cpp:454
 #: src/gui/popupmenu.cpp:485 src/gui/popupmenu.cpp:512
@@ -696,7 +696,7 @@ msgstr "Predaj"
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
 #: src/gui/setup.cpp:84 src/gui/socialwindow.cpp:1204
 #: src/gui/textcommandeditor.cpp:212 src/gui/textdialog.cpp:53
-#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:167
+#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:183
 msgid "Cancel"
 msgstr "Zrušiť"
 
@@ -860,7 +860,7 @@ msgstr "Prosím rozdeľ %d bodov"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:570
+#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:581
 #: src/gui/socialwindow.cpp:1269
 msgid "Create"
 msgstr "Vytvoriť"
@@ -887,17 +887,17 @@ msgid "Please remove %d points"
 msgstr "Prosím odstráň %d bodov"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:60
+#: src/gui/charselectdialog.cpp:61
 msgid "Confirm Character Delete"
 msgstr "Potvrďte zmazanie postavy"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:62
+#: src/gui/charselectdialog.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "Naozaj chcete odstrániť túto postavu?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:86
+#: src/gui/charselectdialog.cpp:87
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
@@ -909,8 +909,8 @@ msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:565
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:576
+#: src/gui/updaterwindow.cpp:185
 msgid "Play"
 msgstr ""
 
@@ -926,7 +926,7 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:263
+#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:272
 #: src/gui/setupactiondata.h:1803 src/gui/setup_relations.cpp:262
 #: src/gui/shopwindow.cpp:96 src/gui/shopwindow.cpp:103
 #: src/gui/textcommandeditor.cpp:216
@@ -936,24 +936,24 @@ msgstr "Vymazať"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/charselectdialog.cpp:129 src/gui/unregisterdialog.cpp:48
+#: src/gui/charselectdialog.cpp:130 src/gui/unregisterdialog.cpp:48
 #: src/gui/unregisterdialog.cpp:53
 msgid "Unregister"
 msgstr "Zrušiť registráciu"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/charselectdialog.cpp:141
+#: src/gui/charselectdialog.cpp:142
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:172
+#: src/gui/charselectdialog.cpp:175
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/charselectdialog.cpp:246
+#: src/gui/charselectdialog.cpp:248
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -963,16 +963,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:288
+#: src/gui/charselectdialog.cpp:290
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password:"
 msgstr ""
 
@@ -1059,13 +1059,13 @@ msgid "Chat"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:735
+#: src/gui/chatwindow.cpp:638
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1165
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Nápoveda pre %s: %s"
@@ -1083,7 +1083,7 @@ msgstr "Nie"
 
 #. TRANSLATORS: confirm dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/confirmdialog.cpp:58 src/gui/popupmenu.cpp:2429
+#: src/gui/confirmdialog.cpp:55 src/gui/popupmenu.cpp:2429
 #: src/gui/popupmenu.cpp:2442 src/gui/popupmenu.cpp:2457
 #: src/gui/popupmenu.cpp:2483
 msgid "Ignore"
@@ -1092,7 +1092,7 @@ msgstr ""
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
 #. TRANSLATORS: settings group
-#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:109
+#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:108
 #: src/gui/setup_other.cpp:123 src/gui/windowmenu.cpp:106
 msgid "Map"
 msgstr ""
@@ -1108,190 +1108,190 @@ msgid "Net"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:265
-#: src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:268
+#: src/gui/debugwindow.cpp:311
 msgid "Music:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:153 src/gui/debugwindow.cpp:271
-#: src/gui/debugwindow.cpp:312
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:274
+#: src/gui/debugwindow.cpp:315
 msgid "Map:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:155 src/gui/debugwindow.cpp:268
-#: src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:271
+#: src/gui/debugwindow.cpp:313
 msgid "Minimap:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:262
-#: src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:161 src/gui/debugwindow.cpp:265
+#: src/gui/debugwindow.cpp:309
 msgid "Cursor:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:161
+#: src/gui/debugwindow.cpp:164
 msgid "Particle count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:284
-#: src/gui/debugwindow.cpp:316
+#: src/gui/debugwindow.cpp:167 src/gui/debugwindow.cpp:287
+#: src/gui/debugwindow.cpp:319
 msgid "Map actors count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:166 src/gui/debugwindow.cpp:243
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:169 src/gui/debugwindow.cpp:246
+#: src/gui/debugwindow.cpp:252
 msgid "Player Position:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:172 src/gui/debugwindow.cpp:297
+#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:300
 msgid "Draw calls:"
 msgstr ""
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:175
+#. TRANSLATORS: debug window label, frames per second
+#: src/gui/debugwindow.cpp:178
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:177 src/gui/debugwindow.cpp:324
+#. TRANSLATORS: debug window label, logic per second
+#: src/gui/debugwindow.cpp:180 src/gui/debugwindow.cpp:327
 #, c-format
 msgid "%d LPS"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:191 src/gui/debugwindow.cpp:209
 #, c-format
 msgid "%d FPS (Software)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:193
+#: src/gui/debugwindow.cpp:196
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:197
+#: src/gui/debugwindow.cpp:200
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:201
+#: src/gui/debugwindow.cpp:204
 #, c-format
 msgid "%d FPS (mobile OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:225 src/gui/debugwindow.cpp:290
+#: src/gui/debugwindow.cpp:228 src/gui/debugwindow.cpp:293
 msgid "Textures count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:279
+#: src/gui/debugwindow.cpp:282
 #, c-format
 msgid "Particle count: %d"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:330 src/gui/debugwindow.cpp:380
-#: src/gui/debugwindow.cpp:442
+#: src/gui/debugwindow.cpp:333 src/gui/debugwindow.cpp:383
+#: src/gui/debugwindow.cpp:445
 msgid "Target:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:332 src/gui/debugwindow.cpp:386
-#: src/gui/debugwindow.cpp:444
+#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
+#: src/gui/debugwindow.cpp:447
 msgid "Target Id:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
-#: src/gui/debugwindow.cpp:446
+#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:392
+#: src/gui/debugwindow.cpp:449
 msgid "Target type:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:337
+#: src/gui/debugwindow.cpp:340
 msgid "Target level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:339 src/gui/debugwindow.cpp:405
+#: src/gui/debugwindow.cpp:342 src/gui/debugwindow.cpp:408
 msgid "Target race:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:341
+#: src/gui/debugwindow.cpp:344
 msgid "Target party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:346
 msgid "Target guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:430
-#: src/gui/debugwindow.cpp:436 src/gui/debugwindow.cpp:454
+#: src/gui/debugwindow.cpp:348 src/gui/debugwindow.cpp:433
+#: src/gui/debugwindow.cpp:439 src/gui/debugwindow.cpp:457
 msgid "Attack delay:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:347 src/gui/debugwindow.cpp:417
-#: src/gui/debugwindow.cpp:456
+#: src/gui/debugwindow.cpp:350 src/gui/debugwindow.cpp:420
+#: src/gui/debugwindow.cpp:459
 msgid "Minimal hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:349 src/gui/debugwindow.cpp:420
-#: src/gui/debugwindow.cpp:458
+#: src/gui/debugwindow.cpp:352 src/gui/debugwindow.cpp:423
+#: src/gui/debugwindow.cpp:461
 msgid "Maximum hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:351 src/gui/debugwindow.cpp:423
-#: src/gui/debugwindow.cpp:460
+#: src/gui/debugwindow.cpp:354 src/gui/debugwindow.cpp:426
+#: src/gui/debugwindow.cpp:463
 msgid "Critical hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:394 src/gui/debugwindow.cpp:400
-#: src/gui/debugwindow.cpp:448
+#: src/gui/debugwindow.cpp:397 src/gui/debugwindow.cpp:403
+#: src/gui/debugwindow.cpp:451
 msgid "Target Level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:408 src/gui/debugwindow.cpp:450
+#: src/gui/debugwindow.cpp:411 src/gui/debugwindow.cpp:453
 msgid "Target Party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:412 src/gui/debugwindow.cpp:452
+#: src/gui/debugwindow.cpp:415 src/gui/debugwindow.cpp:455
 msgid "Target Guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:493
+#: src/gui/debugwindow.cpp:496
 #, c-format
 msgid "Ping: %s ms"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:496
+#: src/gui/debugwindow.cpp:499
 #, c-format
 msgid "In: %d bytes/s"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:499
+#: src/gui/debugwindow.cpp:502
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
@@ -1323,7 +1323,7 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #: src/gui/editdialog.cpp:45 src/gui/editserverdialog.cpp:78
-#: src/gui/itemamountwindow.cpp:210 src/gui/okdialog.cpp:51
+#: src/gui/itemamountwindow.cpp:204 src/gui/okdialog.cpp:51
 #: src/gui/quitdialog.cpp:70 src/gui/textdialog.cpp:46
 msgid "OK"
 msgstr "Potvrdiť"
@@ -1335,7 +1335,7 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:257
+#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:266
 msgid "Connect"
 msgstr ""
 
@@ -1365,7 +1365,7 @@ msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/editserverdialog.cpp:222
+#: src/gui/editserverdialog.cpp:218
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -1417,7 +1417,7 @@ msgstr "Vystrojiť"
 #: src/gui/inventorywindow.cpp:178 src/gui/inventorywindow.cpp:630
 #: src/gui/popupmenu.cpp:1843 src/gui/popupmenu.cpp:1922
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2041
-#: src/gui/skilldialog.cpp:277
+#: src/gui/skilldialog.cpp:279
 msgid "Use"
 msgstr "Použiť"
 
@@ -1451,7 +1451,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: setup button
-#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:718
+#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:719
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1992
 #: src/gui/popupmenu.cpp:2066 src/gui/setup.cpp:86
 msgid "Store"
@@ -1473,47 +1473,47 @@ msgid "Drop"
 msgstr "Zahodiť"
 
 #. TRANSLATORS: item amount window button
-#: src/gui/itemamountwindow.cpp:214
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:264
 msgid "Select amount of items to trade."
 msgstr "Zvoľte množstvo vecí k predaju."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:274
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to drop."
 msgstr "Zvoľte množstvo vecí k zahodeniu."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:278
+#: src/gui/itemamountwindow.cpp:272
 msgid "Select amount of items to store."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:276
 msgid "Select amount of items to retrieve."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:286
+#: src/gui/itemamountwindow.cpp:280
 msgid "Select amount of items to split."
 msgstr "Zvoľte množstvo vecí k rozdeleniu."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:290
+#: src/gui/itemamountwindow.cpp:284
 msgid "Add to buy shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:294
+#: src/gui/itemamountwindow.cpp:288
 msgid "Add to sell shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:298
+#: src/gui/itemamountwindow.cpp:292
 msgid "Unknown."
 msgstr ""
 
@@ -1540,7 +1540,7 @@ msgstr ""
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:58 src/gui/killstats.cpp:171
-#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:516
+#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:509
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
@@ -1548,7 +1548,7 @@ msgstr ""
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:61 src/gui/killstats.cpp:173
 #: src/gui/killstats.cpp:253 src/gui/killstats.cpp:268
-#: src/gui/killstats.cpp:518
+#: src/gui/killstats.cpp:511
 #, c-format
 msgid "Avg Exp: %s"
 msgstr ""
@@ -1556,14 +1556,14 @@ msgstr ""
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:63 src/gui/killstats.cpp:176
 #: src/gui/killstats.cpp:258 src/gui/killstats.cpp:272
-#: src/gui/killstats.cpp:521
+#: src/gui/killstats.cpp:514
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:66 src/gui/killstats.cpp:187
-#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:524
+#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:517
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
@@ -1593,9 +1593,9 @@ msgid "Last kill exp:"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:414
-#: src/gui/killstats.cpp:421 src/gui/killstats.cpp:428
-#: src/gui/killstats.cpp:434
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:408
+#: src/gui/killstats.cpp:415 src/gui/killstats.cpp:422
+#: src/gui/killstats.cpp:428
 msgid "Time before jacko spawn:"
 msgstr ""
 
@@ -1627,12 +1627,12 @@ msgid "  Time for next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:421
+#: src/gui/killstats.cpp:415
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:428
+#: src/gui/killstats.cpp:422
 msgid "jacko spawning"
 msgstr ""
 
@@ -1738,32 +1738,32 @@ msgid "arrows bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:88
+#: src/gui/ministatuswindow.cpp:89
 msgid "status bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:108
+#: src/gui/ministatuswindow.cpp:109
 msgid "job bar"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:306 src/gui/statuswindow.cpp:298
+#: src/gui/ministatuswindow.cpp:307 src/gui/statuswindow.cpp:298
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:313 src/gui/statuswindow.cpp:141
+#: src/gui/ministatuswindow.cpp:314 src/gui/statuswindow.cpp:141
 #: src/gui/statuswindow.cpp:305 src/gui/statuswindow.cpp:375
 #, c-format
 msgid "Level: %d"
 msgstr "Level: %d"
 
 #. TRANSLATORS: status bar label
-#: src/gui/ministatuswindow.cpp:330 src/gui/ministatuswindow.cpp:367
+#: src/gui/ministatuswindow.cpp:331 src/gui/ministatuswindow.cpp:368
 msgid "Need"
 msgstr ""
 
@@ -2151,7 +2151,7 @@ msgstr ""
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2209 src/gui/popupmenu.cpp:2280
-#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:139
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
 #: src/gui/socialwindow.cpp:934
 msgid "(default)"
 msgstr ""
@@ -2334,7 +2334,7 @@ msgid "Passwords do not match."
 msgstr "Heslá sa nezhodujú."
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:257
 msgid "Choose Your Server"
 msgstr ""
 
@@ -2342,61 +2342,61 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:259 src/gui/shopwindow.cpp:94
+#: src/gui/serverdialog.cpp:268 src/gui/shopwindow.cpp:94
 #: src/gui/shopwindow.cpp:101 src/gui/tradewindow.cpp:77
 msgid "Add"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
-#: src/gui/serverdialog.cpp:261 src/gui/widgets/setupitem.cpp:299
+#: src/gui/serverdialog.cpp:270 src/gui/widgets/setupitem.cpp:299
 #: src/gui/widgets/setupitem.cpp:426
 msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:274
 msgid "Load"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:279
+#: src/gui/serverdialog.cpp:288
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:297
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:518
+#: src/gui/serverdialog.cpp:527
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:524
+#: src/gui/serverdialog.cpp:533
 msgid "Waiting for server..."
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:529
+#: src/gui/serverdialog.cpp:538
 msgid "Preparing download"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:534
+#: src/gui/serverdialog.cpp:543
 msgid "Error retreiving server list!"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:626
+#: src/gui/serverdialog.cpp:635
 msgid "requires a newer version"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:631
+#: src/gui/serverdialog.cpp:640
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -3407,7 +3407,7 @@ msgid "Type:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:334
+#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:336
 msgid "Delay:"
 msgstr ""
 
@@ -3427,30 +3427,30 @@ msgid "Blue:"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:420
+#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:422
 msgid "Static"
 msgstr ""
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:107 src/gui/setup_colors.cpp:110
-#: src/gui/setup_colors.cpp:422
+#: src/gui/setup_colors.cpp:424
 msgid "Pulse"
 msgstr ""
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:112 src/gui/setup_colors.cpp:115
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Rainbow"
 msgstr ""
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:117 src/gui/setup_colors.cpp:120
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Spectrum"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:328
+#: src/gui/setup_colors.cpp:330
 msgid "Alpha:"
 msgstr ""
 
@@ -3616,7 +3616,7 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: palette color
-#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:134
+#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:135
 msgid "Monsters"
 msgstr ""
 
@@ -4165,206 +4165,231 @@ msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:86
-msgid "Very small (9)"
+msgid "Very small (8)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:88
-msgid "Tiny (10)"
+msgid "Very small (9)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:90
-msgid "Small (11)"
+msgid "Tiny (10)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:92
-msgid "Medium (12)"
+msgid "Small (11)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:94
-msgid "Normal (13)"
+msgid "Medium (12)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:96
-msgid "Large (14)"
+msgid "Normal (13)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:98
-msgid "Very large (15)"
+msgid "Large (14)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:100
-msgid "Big (16)"
+msgid "Large (15)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:102
-msgid "Very big (17)"
+msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:104
-msgid "Huge (18)"
+msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:106
-msgid "Very huge (19)"
+msgid "Big (18)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:108
+msgid "Big (19)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:110
+msgid "Very big (20)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:112
+msgid "Very big (21)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:114
+msgid "Very big (22)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:116
+msgid "Huge (23)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:151
 msgid "Chinese (China)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:153
 msgid "Czech"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:155
 msgid "English"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:157
 msgid "Finnish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:159
 msgid "French"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:161
 msgid "German"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:153
+#: src/gui/setup_theme.cpp:163
 msgid "Indonesian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:155
+#: src/gui/setup_theme.cpp:165
 msgid "Italian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:157
+#: src/gui/setup_theme.cpp:167
 msgid "Polish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:159
+#: src/gui/setup_theme.cpp:169
 msgid "Japanese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:161
+#: src/gui/setup_theme.cpp:171
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:163
+#: src/gui/setup_theme.cpp:173
 msgid "Portuguese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:165
+#: src/gui/setup_theme.cpp:175
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:167
+#: src/gui/setup_theme.cpp:177
 msgid "Russian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:169
+#: src/gui/setup_theme.cpp:179
 msgid "Spanish (Castilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:171
+#: src/gui/setup_theme.cpp:181
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:223
+#: src/gui/setup_theme.cpp:233
 msgid "Gui theme"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:230
+#: src/gui/setup_theme.cpp:240
 msgid "Main Font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:235
+#: src/gui/setup_theme.cpp:245
 msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:239
+#: src/gui/setup_theme.cpp:249
 msgid "Bold font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:243
+#: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:247
+#: src/gui/setup_theme.cpp:257
 msgid "Help font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:251
+#: src/gui/setup_theme.cpp:261
 msgid "Secure font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:255
+#: src/gui/setup_theme.cpp:265
 msgid "Japanese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:260
+#: src/gui/setup_theme.cpp:270
 msgid "Font size"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:265
+#: src/gui/setup_theme.cpp:275
 msgid "Npc font size"
 msgstr ""
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/setup_theme.cpp:269
+#: src/gui/setup_theme.cpp:279
 msgid "i"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/setup_theme.cpp:442
+#: src/gui/setup_theme.cpp:452
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/setup_theme.cpp:467
+#: src/gui/setup_theme.cpp:477
 msgid "Theme Changed"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/setup_theme.cpp:467 src/gui/setup_video.cpp:537
+#: src/gui/setup_theme.cpp:477 src/gui/setup_video.cpp:537
 #: src/gui/setup_video.cpp:546
 msgid "Restart your client for the change to take effect."
 msgstr ""
@@ -4662,7 +4687,8 @@ msgid "Ambient FX"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_visual.cpp:140
+#. TRANSLATORS: palette color
+#: src/gui/setup_visual.cpp:140 src/gui/userpalette.cpp:146
 msgid "Particle effects"
 msgstr ""
 
@@ -4749,45 +4775,45 @@ msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/skilldialog.cpp:270 src/gui/windowmenu.cpp:112
+#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:112
 msgid "Skills"
 msgstr "Schopnosti"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/skilldialog.cpp:279
+#: src/gui/skilldialog.cpp:281
 msgid "Up"
 msgstr ""
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/skilldialog.cpp:391
+#: src/gui/skilldialog.cpp:393
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skills tab
-#: src/gui/skilldialog.cpp:444
+#: src/gui/skilldialog.cpp:446
 msgid "basic"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill name
-#: src/gui/skilldialog.cpp:447
+#: src/gui/skilldialog.cpp:449
 msgid "basic, 1"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/skilldialog.cpp:484
+#: src/gui/skilldialog.cpp:486
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/skilldialog.cpp:518
+#: src/gui/skilldialog.cpp:520
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/skilldialog.cpp:612 src/gui/skilldialog.cpp:762
+#: src/gui/skilldialog.cpp:614 src/gui/skilldialog.cpp:764
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -5230,7 +5256,7 @@ msgid "Trade: You"
 msgstr ""
 
 #. TRANSLATORS: trade window money label
-#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:182
+#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:184
 #, c-format
 msgid "You get %s"
 msgstr ""
@@ -5246,12 +5272,12 @@ msgid "You give:"
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:393
+#: src/gui/tradewindow.cpp:396
 msgid "You don't have enough money."
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:475
+#: src/gui/tradewindow.cpp:479
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
@@ -5263,223 +5289,223 @@ msgid "Name: %s"
 msgstr "Meno: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/updaterwindow.cpp:140
+#: src/gui/updaterwindow.cpp:156
 msgid "Updating..."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:165
+#: src/gui/updaterwindow.cpp:181
 msgid "Connecting..."
 msgstr "Pripájam sa..."
 
 #. TRANSLATORS: update message
-#: src/gui/updaterwindow.cpp:656
+#: src/gui/updaterwindow.cpp:672
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/updaterwindow.cpp:658
+#: src/gui/updaterwindow.cpp:674
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:660
+#: src/gui/updaterwindow.cpp:676
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:839
+#: src/gui/updaterwindow.cpp:855
 msgid "Completed"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
 msgid "Being"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:118
-msgid "Friend Names"
+#: src/gui/userpalette.cpp:119
+msgid "Friend names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:120
-msgid "Disregarded Names"
+#: src/gui/userpalette.cpp:121
+msgid "Disregarded names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:122
-msgid "Ignored Names"
+#: src/gui/userpalette.cpp:123
+msgid "Ignored names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:124
-msgid "Erased Names"
+#: src/gui/userpalette.cpp:125
+msgid "Erased names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:126
-msgid "Other Players' Names"
+#: src/gui/userpalette.cpp:127
+msgid "Other players names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:128
-msgid "Own Name"
+#: src/gui/userpalette.cpp:129
+msgid "Own name"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:130
-msgid "GM Names"
+#: src/gui/userpalette.cpp:131
+msgid "GM names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
 msgid "NPCs"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
 msgid "Monster HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:140
 msgid "Monster HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:141
-msgid "Party Members"
+#: src/gui/userpalette.cpp:142
+msgid "Party members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:143
-msgid "Guild Members"
+#: src/gui/userpalette.cpp:144
+msgid "Guild members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:145
-msgid "Particle Effects"
+#: src/gui/userpalette.cpp:148
+msgid "Pickup notification"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:147
-msgid "Pickup Notification"
+#: src/gui/userpalette.cpp:150
+msgid "Exp notification"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:149
-msgid "Exp Notification"
-msgstr ""
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
 msgid "Player HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
 msgid "Player HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:157
-msgid "Player Hits Monster"
+#: src/gui/userpalette.cpp:158
+msgid "Player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:159
-msgid "Monster Hits Player"
+#: src/gui/userpalette.cpp:160
+msgid "Monster hits player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:163
-msgid "Other Player Hits Local Player"
+#: src/gui/userpalette.cpp:164
+msgid "Other player hits local player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:166
 msgid "Critical Hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
-msgid "Local Player Hits Monster"
+#: src/gui/userpalette.cpp:170
+msgid "Local player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:172
-msgid "Local Player Critical Hit"
+#: src/gui/userpalette.cpp:173
+msgid "Local player critical hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:175
-msgid "Local Player Miss"
+#: src/gui/userpalette.cpp:176
+msgid "Local player miss"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:177
+#: src/gui/userpalette.cpp:178
 msgid "Misses"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
-msgid "Portal Highlight"
+#: src/gui/userpalette.cpp:180
+msgid "Portal highlight"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:183
+msgid "Default collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:182
-msgid "Default collision Highlight"
+#: src/gui/userpalette.cpp:186
+msgid "Air collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:185
-msgid "Air collision Highlight"
+#: src/gui/userpalette.cpp:189
+msgid "Water collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:188
-msgid "Water collision Highlight"
+#: src/gui/userpalette.cpp:192
+msgid "Special ground collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:191
-msgid "Special ground collision Highlight"
+#: src/gui/userpalette.cpp:195
+msgid "Walkable highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
-msgid "Walkable Highlight"
+#: src/gui/userpalette.cpp:198
+msgid "Local player attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:197
-msgid "Local Player Attack Range"
+#: src/gui/userpalette.cpp:201
+msgid "Local player attack range border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:200
-msgid "Local Player Attack Range Border"
+#: src/gui/userpalette.cpp:204
+msgid "Monster attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:203
-msgid "Monster Attack Range"
+#: src/gui/userpalette.cpp:208
+msgid "Floor item amount color"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:206
-msgid "Home Place"
+#: src/gui/userpalette.cpp:211
+msgid "Home place"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:209
-msgid "Home Place Border"
+#: src/gui/userpalette.cpp:214
+msgid "Home place border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:212
-msgid "Road Point"
+#: src/gui/userpalette.cpp:217
+msgid "Road point"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
@@ -5609,7 +5635,7 @@ msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:315
+#: src/gui/widgets/itemcontainer.cpp:317
 msgid "Eq."
 msgstr ""
 
diff --git a/po/sq.po b/po/sq.po
index 6e97d23fb..9b036d183 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-05-03 12:38+0300\n"
-"PO-Revision-Date: 2013-05-03 09:44+0000\n"
+"POT-Creation-Date: 2013-05-10 18:34+0300\n"
+"PO-Revision-Date: 2013-05-10 15:39+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -59,25 +59,25 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: full button name
-#: src/client.cpp:1136 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
+#: src/client.cpp:1137 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
 msgid "Setup"
 msgstr ""
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1140 src/gui/setup_perfomance.cpp:61
+#: src/client.cpp:1141 src/gui/setup_perfomance.cpp:61
 msgid "Perfomance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:1143 src/gui/setup_video.cpp:258
+#: src/client.cpp:1144 src/gui/setup_video.cpp:258
 msgid "Video"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1146 src/gui/setup_theme.cpp:273
+#: src/client.cpp:1147 src/gui/setup_theme.cpp:283
 msgid "Theme"
 msgstr ""
 
@@ -88,7 +88,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1150 src/gui/didyouknowwindow.cpp:78
+#: src/client.cpp:1151 src/gui/didyouknowwindow.cpp:78
 #: src/gui/inventorywindow.cpp:228 src/gui/npcdialog.cpp:63
 #: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:574
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:80
@@ -96,32 +96,32 @@ msgid "Close"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1238
+#: src/client.cpp:1239
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1282
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1320
+#: src/client.cpp:1321
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1431
+#: src/client.cpp:1432
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1471
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1483
+#: src/client.cpp:1484
 msgid "Changing game servers"
 msgstr ""
 
@@ -136,69 +136,69 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1540 src/client.cpp:1551 src/client.cpp:1721
+#: src/client.cpp:1541 src/client.cpp:1552 src/client.cpp:1722
 #: src/gui/changeemaildialog.cpp:168 src/gui/changepassworddialog.cpp:158
-#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:288
-#: src/gui/editserverdialog.cpp:220 src/gui/registerdialog.cpp:263
+#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:290
+#: src/gui/editserverdialog.cpp:216 src/gui/registerdialog.cpp:263
 #: src/gui/unregisterdialog.cpp:143 src/net/ea/charserverhandler.cpp:190
 #: src/net/ea/charserverhandler.cpp:210
 msgid "Error"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1564
+#: src/client.cpp:1565
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1601
+#: src/client.cpp:1602
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1603
+#: src/client.cpp:1604
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1624
+#: src/client.cpp:1625
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1626
+#: src/client.cpp:1627
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1647
+#: src/client.cpp:1648
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1649
+#: src/client.cpp:1650
 msgid "Farewell, come back any time..."
 msgstr ""
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1902 src/client.cpp:1917 src/client.cpp:1960
-#: src/client.cpp:1976 src/client.cpp:2417 src/client.cpp:2425
+#: src/client.cpp:1903 src/client.cpp:1918 src/client.cpp:1961
+#: src/client.cpp:1977 src/client.cpp:2418 src/client.cpp:2426
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2113
+#: src/client.cpp:2114
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2154 src/client.cpp:2161
+#: src/client.cpp:2155 src/client.cpp:2162
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:2183 src/client.cpp:2196
+#: src/client.cpp:2184 src/client.cpp:2197
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -478,19 +478,19 @@ msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: bot checker window header
-#: src/gui/botcheckerwindow.cpp:269
+#: src/gui/botcheckerwindow.cpp:268
 msgid "Bot Checker"
 msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:102
+#: src/gui/botcheckerwindow.cpp:277 src/gui/npcdialog.cpp:102
 msgid "Reset"
 msgstr ""
 
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: relations table header
-#: src/gui/botcheckerwindow.cpp:305 src/gui/setup_relations.cpp:61
+#: src/gui/botcheckerwindow.cpp:304 src/gui/setup_relations.cpp:61
 msgid "Name"
 msgstr ""
 
@@ -498,7 +498,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:145
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:145
 #: src/gui/popupmenu.cpp:241 src/gui/popupmenu.cpp:640
 #: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:257
 #: src/net/tmwa/generalhandler.cpp:292
@@ -508,7 +508,7 @@ msgstr ""
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
-#: src/gui/botcheckerwindow.cpp:309 src/gui/popupmenu.cpp:225
+#: src/gui/botcheckerwindow.cpp:308 src/gui/popupmenu.cpp:225
 #: src/gui/setupactiondata.h:93
 msgid "Talk"
 msgstr ""
@@ -516,7 +516,7 @@ msgstr ""
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/botcheckerwindow.cpp:311 src/gui/popupmenu.cpp:215
+#: src/gui/botcheckerwindow.cpp:310 src/gui/popupmenu.cpp:215
 #: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:371
 #: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:653
 #: src/gui/popupmenu.cpp:727 src/gui/setupactiondata.h:1856
@@ -524,7 +524,7 @@ msgid "Move"
 msgstr ""
 
 #. TRANSLATORS: bot checker window table header
-#: src/gui/botcheckerwindow.cpp:313
+#: src/gui/botcheckerwindow.cpp:312
 msgid "Result"
 msgstr ""
 
@@ -580,7 +580,7 @@ msgstr ""
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:516
+#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:511
 #: src/gui/selldialog.cpp:94 src/gui/selldialog.cpp:342
 #, c-format
 msgid "Price: %s / Total: %s"
@@ -597,9 +597,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:208
-#: src/gui/itemamountwindow.cpp:243 src/gui/npcdialog.cpp:93
-#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:833
+#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:202
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:93
+#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:821
 msgid "+"
 msgstr ""
 
@@ -609,9 +609,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:240 src/gui/npcdialog.cpp:95
-#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:846
+#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:200
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:95
+#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:834
 msgid "-"
 msgstr ""
 
@@ -623,7 +623,7 @@ msgstr ""
 #. TRANSLATORS: input action name
 #: src/gui/buydialog.cpp:260 src/gui/quitdialog.cpp:54
 #: src/gui/quitdialog.cpp:59 src/gui/quitdialog.cpp:61
-#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:255
+#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:264
 #: src/gui/setupactiondata.h:177
 msgid "Quit"
 msgstr ""
@@ -635,7 +635,7 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #: src/gui/buydialog.cpp:262 src/gui/selldialog.cpp:106
 #: src/gui/statuswindow.cpp:558 src/gui/statuswindow.cpp:615
-#: src/gui/statuswindow.cpp:830 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:852
 msgid "Max"
 msgstr ""
 
@@ -680,7 +680,7 @@ msgstr ""
 #: src/gui/buyselldialog.cpp:71 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:120
 #: src/gui/connectiondialog.cpp:48 src/gui/editserverdialog.cpp:80
-#: src/gui/itemamountwindow.cpp:212 src/gui/npcpostdialog.cpp:64
+#: src/gui/itemamountwindow.cpp:206 src/gui/npcpostdialog.cpp:64
 #: src/gui/popupmenu.cpp:290 src/gui/popupmenu.cpp:324
 #: src/gui/popupmenu.cpp:411 src/gui/popupmenu.cpp:454
 #: src/gui/popupmenu.cpp:485 src/gui/popupmenu.cpp:512
@@ -696,7 +696,7 @@ msgstr ""
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
 #: src/gui/setup.cpp:84 src/gui/socialwindow.cpp:1204
 #: src/gui/textcommandeditor.cpp:212 src/gui/textdialog.cpp:53
-#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:167
+#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:183
 msgid "Cancel"
 msgstr ""
 
@@ -860,7 +860,7 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:570
+#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:581
 #: src/gui/socialwindow.cpp:1269
 msgid "Create"
 msgstr ""
@@ -887,17 +887,17 @@ msgid "Please remove %d points"
 msgstr ""
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:60
+#: src/gui/charselectdialog.cpp:61
 msgid "Confirm Character Delete"
 msgstr ""
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:62
+#: src/gui/charselectdialog.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:86
+#: src/gui/charselectdialog.cpp:87
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
@@ -909,8 +909,8 @@ msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:565
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:576
+#: src/gui/updaterwindow.cpp:185
 msgid "Play"
 msgstr ""
 
@@ -926,7 +926,7 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:263
+#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:272
 #: src/gui/setupactiondata.h:1803 src/gui/setup_relations.cpp:262
 #: src/gui/shopwindow.cpp:96 src/gui/shopwindow.cpp:103
 #: src/gui/textcommandeditor.cpp:216
@@ -936,24 +936,24 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/charselectdialog.cpp:129 src/gui/unregisterdialog.cpp:48
+#: src/gui/charselectdialog.cpp:130 src/gui/unregisterdialog.cpp:48
 #: src/gui/unregisterdialog.cpp:53
 msgid "Unregister"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/charselectdialog.cpp:141
+#: src/gui/charselectdialog.cpp:142
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:172
+#: src/gui/charselectdialog.cpp:175
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/charselectdialog.cpp:246
+#: src/gui/charselectdialog.cpp:248
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -963,16 +963,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:288
+#: src/gui/charselectdialog.cpp:290
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password:"
 msgstr ""
 
@@ -1059,13 +1059,13 @@ msgid "Chat"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:735
+#: src/gui/chatwindow.cpp:638
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1165
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -1083,7 +1083,7 @@ msgstr ""
 
 #. TRANSLATORS: confirm dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/confirmdialog.cpp:58 src/gui/popupmenu.cpp:2429
+#: src/gui/confirmdialog.cpp:55 src/gui/popupmenu.cpp:2429
 #: src/gui/popupmenu.cpp:2442 src/gui/popupmenu.cpp:2457
 #: src/gui/popupmenu.cpp:2483
 msgid "Ignore"
@@ -1092,7 +1092,7 @@ msgstr ""
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
 #. TRANSLATORS: settings group
-#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:109
+#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:108
 #: src/gui/setup_other.cpp:123 src/gui/windowmenu.cpp:106
 msgid "Map"
 msgstr ""
@@ -1108,190 +1108,190 @@ msgid "Net"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:265
-#: src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:268
+#: src/gui/debugwindow.cpp:311
 msgid "Music:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:153 src/gui/debugwindow.cpp:271
-#: src/gui/debugwindow.cpp:312
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:274
+#: src/gui/debugwindow.cpp:315
 msgid "Map:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:155 src/gui/debugwindow.cpp:268
-#: src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:271
+#: src/gui/debugwindow.cpp:313
 msgid "Minimap:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:262
-#: src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:161 src/gui/debugwindow.cpp:265
+#: src/gui/debugwindow.cpp:309
 msgid "Cursor:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:161
+#: src/gui/debugwindow.cpp:164
 msgid "Particle count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:284
-#: src/gui/debugwindow.cpp:316
+#: src/gui/debugwindow.cpp:167 src/gui/debugwindow.cpp:287
+#: src/gui/debugwindow.cpp:319
 msgid "Map actors count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:166 src/gui/debugwindow.cpp:243
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:169 src/gui/debugwindow.cpp:246
+#: src/gui/debugwindow.cpp:252
 msgid "Player Position:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:172 src/gui/debugwindow.cpp:297
+#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:300
 msgid "Draw calls:"
 msgstr ""
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:175
+#. TRANSLATORS: debug window label, frames per second
+#: src/gui/debugwindow.cpp:178
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:177 src/gui/debugwindow.cpp:324
+#. TRANSLATORS: debug window label, logic per second
+#: src/gui/debugwindow.cpp:180 src/gui/debugwindow.cpp:327
 #, c-format
 msgid "%d LPS"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:191 src/gui/debugwindow.cpp:209
 #, c-format
 msgid "%d FPS (Software)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:193
+#: src/gui/debugwindow.cpp:196
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:197
+#: src/gui/debugwindow.cpp:200
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:201
+#: src/gui/debugwindow.cpp:204
 #, c-format
 msgid "%d FPS (mobile OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:225 src/gui/debugwindow.cpp:290
+#: src/gui/debugwindow.cpp:228 src/gui/debugwindow.cpp:293
 msgid "Textures count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:279
+#: src/gui/debugwindow.cpp:282
 #, c-format
 msgid "Particle count: %d"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:330 src/gui/debugwindow.cpp:380
-#: src/gui/debugwindow.cpp:442
+#: src/gui/debugwindow.cpp:333 src/gui/debugwindow.cpp:383
+#: src/gui/debugwindow.cpp:445
 msgid "Target:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:332 src/gui/debugwindow.cpp:386
-#: src/gui/debugwindow.cpp:444
+#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
+#: src/gui/debugwindow.cpp:447
 msgid "Target Id:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
-#: src/gui/debugwindow.cpp:446
+#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:392
+#: src/gui/debugwindow.cpp:449
 msgid "Target type:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:337
+#: src/gui/debugwindow.cpp:340
 msgid "Target level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:339 src/gui/debugwindow.cpp:405
+#: src/gui/debugwindow.cpp:342 src/gui/debugwindow.cpp:408
 msgid "Target race:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:341
+#: src/gui/debugwindow.cpp:344
 msgid "Target party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:346
 msgid "Target guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:430
-#: src/gui/debugwindow.cpp:436 src/gui/debugwindow.cpp:454
+#: src/gui/debugwindow.cpp:348 src/gui/debugwindow.cpp:433
+#: src/gui/debugwindow.cpp:439 src/gui/debugwindow.cpp:457
 msgid "Attack delay:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:347 src/gui/debugwindow.cpp:417
-#: src/gui/debugwindow.cpp:456
+#: src/gui/debugwindow.cpp:350 src/gui/debugwindow.cpp:420
+#: src/gui/debugwindow.cpp:459
 msgid "Minimal hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:349 src/gui/debugwindow.cpp:420
-#: src/gui/debugwindow.cpp:458
+#: src/gui/debugwindow.cpp:352 src/gui/debugwindow.cpp:423
+#: src/gui/debugwindow.cpp:461
 msgid "Maximum hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:351 src/gui/debugwindow.cpp:423
-#: src/gui/debugwindow.cpp:460
+#: src/gui/debugwindow.cpp:354 src/gui/debugwindow.cpp:426
+#: src/gui/debugwindow.cpp:463
 msgid "Critical hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:394 src/gui/debugwindow.cpp:400
-#: src/gui/debugwindow.cpp:448
+#: src/gui/debugwindow.cpp:397 src/gui/debugwindow.cpp:403
+#: src/gui/debugwindow.cpp:451
 msgid "Target Level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:408 src/gui/debugwindow.cpp:450
+#: src/gui/debugwindow.cpp:411 src/gui/debugwindow.cpp:453
 msgid "Target Party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:412 src/gui/debugwindow.cpp:452
+#: src/gui/debugwindow.cpp:415 src/gui/debugwindow.cpp:455
 msgid "Target Guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:493
+#: src/gui/debugwindow.cpp:496
 #, c-format
 msgid "Ping: %s ms"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:496
+#: src/gui/debugwindow.cpp:499
 #, c-format
 msgid "In: %d bytes/s"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:499
+#: src/gui/debugwindow.cpp:502
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
@@ -1323,7 +1323,7 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #: src/gui/editdialog.cpp:45 src/gui/editserverdialog.cpp:78
-#: src/gui/itemamountwindow.cpp:210 src/gui/okdialog.cpp:51
+#: src/gui/itemamountwindow.cpp:204 src/gui/okdialog.cpp:51
 #: src/gui/quitdialog.cpp:70 src/gui/textdialog.cpp:46
 msgid "OK"
 msgstr ""
@@ -1335,7 +1335,7 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:257
+#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:266
 msgid "Connect"
 msgstr ""
 
@@ -1365,7 +1365,7 @@ msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/editserverdialog.cpp:222
+#: src/gui/editserverdialog.cpp:218
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -1417,7 +1417,7 @@ msgstr ""
 #: src/gui/inventorywindow.cpp:178 src/gui/inventorywindow.cpp:630
 #: src/gui/popupmenu.cpp:1843 src/gui/popupmenu.cpp:1922
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2041
-#: src/gui/skilldialog.cpp:277
+#: src/gui/skilldialog.cpp:279
 msgid "Use"
 msgstr ""
 
@@ -1451,7 +1451,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: setup button
-#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:718
+#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:719
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1992
 #: src/gui/popupmenu.cpp:2066 src/gui/setup.cpp:86
 msgid "Store"
@@ -1473,47 +1473,47 @@ msgid "Drop"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/itemamountwindow.cpp:214
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:264
 msgid "Select amount of items to trade."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:274
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to drop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:278
+#: src/gui/itemamountwindow.cpp:272
 msgid "Select amount of items to store."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:276
 msgid "Select amount of items to retrieve."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:286
+#: src/gui/itemamountwindow.cpp:280
 msgid "Select amount of items to split."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:290
+#: src/gui/itemamountwindow.cpp:284
 msgid "Add to buy shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:294
+#: src/gui/itemamountwindow.cpp:288
 msgid "Add to sell shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:298
+#: src/gui/itemamountwindow.cpp:292
 msgid "Unknown."
 msgstr ""
 
@@ -1540,7 +1540,7 @@ msgstr ""
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:58 src/gui/killstats.cpp:171
-#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:516
+#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:509
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
@@ -1548,7 +1548,7 @@ msgstr ""
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:61 src/gui/killstats.cpp:173
 #: src/gui/killstats.cpp:253 src/gui/killstats.cpp:268
-#: src/gui/killstats.cpp:518
+#: src/gui/killstats.cpp:511
 #, c-format
 msgid "Avg Exp: %s"
 msgstr ""
@@ -1556,14 +1556,14 @@ msgstr ""
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:63 src/gui/killstats.cpp:176
 #: src/gui/killstats.cpp:258 src/gui/killstats.cpp:272
-#: src/gui/killstats.cpp:521
+#: src/gui/killstats.cpp:514
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:66 src/gui/killstats.cpp:187
-#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:524
+#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:517
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
@@ -1591,9 +1591,9 @@ msgid "Last kill exp:"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:414
-#: src/gui/killstats.cpp:421 src/gui/killstats.cpp:428
-#: src/gui/killstats.cpp:434
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:408
+#: src/gui/killstats.cpp:415 src/gui/killstats.cpp:422
+#: src/gui/killstats.cpp:428
 msgid "Time before jacko spawn:"
 msgstr ""
 
@@ -1625,12 +1625,12 @@ msgid "  Time for next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:421
+#: src/gui/killstats.cpp:415
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:428
+#: src/gui/killstats.cpp:422
 msgid "jacko spawning"
 msgstr ""
 
@@ -1736,32 +1736,32 @@ msgid "arrows bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:88
+#: src/gui/ministatuswindow.cpp:89
 msgid "status bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:108
+#: src/gui/ministatuswindow.cpp:109
 msgid "job bar"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:306 src/gui/statuswindow.cpp:298
+#: src/gui/ministatuswindow.cpp:307 src/gui/statuswindow.cpp:298
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:313 src/gui/statuswindow.cpp:141
+#: src/gui/ministatuswindow.cpp:314 src/gui/statuswindow.cpp:141
 #: src/gui/statuswindow.cpp:305 src/gui/statuswindow.cpp:375
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
 #. TRANSLATORS: status bar label
-#: src/gui/ministatuswindow.cpp:330 src/gui/ministatuswindow.cpp:367
+#: src/gui/ministatuswindow.cpp:331 src/gui/ministatuswindow.cpp:368
 msgid "Need"
 msgstr ""
 
@@ -2149,7 +2149,7 @@ msgstr ""
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2209 src/gui/popupmenu.cpp:2280
-#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:139
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
 #: src/gui/socialwindow.cpp:934
 msgid "(default)"
 msgstr ""
@@ -2332,7 +2332,7 @@ msgid "Passwords do not match."
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:257
 msgid "Choose Your Server"
 msgstr ""
 
@@ -2340,61 +2340,61 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:259 src/gui/shopwindow.cpp:94
+#: src/gui/serverdialog.cpp:268 src/gui/shopwindow.cpp:94
 #: src/gui/shopwindow.cpp:101 src/gui/tradewindow.cpp:77
 msgid "Add"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
-#: src/gui/serverdialog.cpp:261 src/gui/widgets/setupitem.cpp:299
+#: src/gui/serverdialog.cpp:270 src/gui/widgets/setupitem.cpp:299
 #: src/gui/widgets/setupitem.cpp:426
 msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:274
 msgid "Load"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:279
+#: src/gui/serverdialog.cpp:288
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:297
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:518
+#: src/gui/serverdialog.cpp:527
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:524
+#: src/gui/serverdialog.cpp:533
 msgid "Waiting for server..."
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:529
+#: src/gui/serverdialog.cpp:538
 msgid "Preparing download"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:534
+#: src/gui/serverdialog.cpp:543
 msgid "Error retreiving server list!"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:626
+#: src/gui/serverdialog.cpp:635
 msgid "requires a newer version"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:631
+#: src/gui/serverdialog.cpp:640
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -3405,7 +3405,7 @@ msgid "Type:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:334
+#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:336
 msgid "Delay:"
 msgstr ""
 
@@ -3425,30 +3425,30 @@ msgid "Blue:"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:420
+#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:422
 msgid "Static"
 msgstr ""
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:107 src/gui/setup_colors.cpp:110
-#: src/gui/setup_colors.cpp:422
+#: src/gui/setup_colors.cpp:424
 msgid "Pulse"
 msgstr ""
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:112 src/gui/setup_colors.cpp:115
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Rainbow"
 msgstr ""
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:117 src/gui/setup_colors.cpp:120
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Spectrum"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:328
+#: src/gui/setup_colors.cpp:330
 msgid "Alpha:"
 msgstr ""
 
@@ -3614,7 +3614,7 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: palette color
-#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:134
+#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:135
 msgid "Monsters"
 msgstr ""
 
@@ -4163,206 +4163,231 @@ msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:86
-msgid "Very small (9)"
+msgid "Very small (8)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:88
-msgid "Tiny (10)"
+msgid "Very small (9)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:90
-msgid "Small (11)"
+msgid "Tiny (10)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:92
-msgid "Medium (12)"
+msgid "Small (11)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:94
-msgid "Normal (13)"
+msgid "Medium (12)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:96
-msgid "Large (14)"
+msgid "Normal (13)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:98
-msgid "Very large (15)"
+msgid "Large (14)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:100
-msgid "Big (16)"
+msgid "Large (15)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:102
-msgid "Very big (17)"
+msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:104
-msgid "Huge (18)"
+msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:106
-msgid "Very huge (19)"
+msgid "Big (18)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:108
+msgid "Big (19)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:110
+msgid "Very big (20)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:112
+msgid "Very big (21)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:114
+msgid "Very big (22)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:116
+msgid "Huge (23)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:151
 msgid "Chinese (China)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:153
 msgid "Czech"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:155
 msgid "English"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:157
 msgid "Finnish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:159
 msgid "French"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:161
 msgid "German"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:153
+#: src/gui/setup_theme.cpp:163
 msgid "Indonesian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:155
+#: src/gui/setup_theme.cpp:165
 msgid "Italian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:157
+#: src/gui/setup_theme.cpp:167
 msgid "Polish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:159
+#: src/gui/setup_theme.cpp:169
 msgid "Japanese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:161
+#: src/gui/setup_theme.cpp:171
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:163
+#: src/gui/setup_theme.cpp:173
 msgid "Portuguese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:165
+#: src/gui/setup_theme.cpp:175
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:167
+#: src/gui/setup_theme.cpp:177
 msgid "Russian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:169
+#: src/gui/setup_theme.cpp:179
 msgid "Spanish (Castilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:171
+#: src/gui/setup_theme.cpp:181
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:223
+#: src/gui/setup_theme.cpp:233
 msgid "Gui theme"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:230
+#: src/gui/setup_theme.cpp:240
 msgid "Main Font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:235
+#: src/gui/setup_theme.cpp:245
 msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:239
+#: src/gui/setup_theme.cpp:249
 msgid "Bold font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:243
+#: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:247
+#: src/gui/setup_theme.cpp:257
 msgid "Help font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:251
+#: src/gui/setup_theme.cpp:261
 msgid "Secure font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:255
+#: src/gui/setup_theme.cpp:265
 msgid "Japanese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:260
+#: src/gui/setup_theme.cpp:270
 msgid "Font size"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:265
+#: src/gui/setup_theme.cpp:275
 msgid "Npc font size"
 msgstr ""
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/setup_theme.cpp:269
+#: src/gui/setup_theme.cpp:279
 msgid "i"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/setup_theme.cpp:442
+#: src/gui/setup_theme.cpp:452
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/setup_theme.cpp:467
+#: src/gui/setup_theme.cpp:477
 msgid "Theme Changed"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/setup_theme.cpp:467 src/gui/setup_video.cpp:537
+#: src/gui/setup_theme.cpp:477 src/gui/setup_video.cpp:537
 #: src/gui/setup_video.cpp:546
 msgid "Restart your client for the change to take effect."
 msgstr ""
@@ -4660,7 +4685,8 @@ msgid "Ambient FX"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_visual.cpp:140
+#. TRANSLATORS: palette color
+#: src/gui/setup_visual.cpp:140 src/gui/userpalette.cpp:146
 msgid "Particle effects"
 msgstr ""
 
@@ -4747,45 +4773,45 @@ msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/skilldialog.cpp:270 src/gui/windowmenu.cpp:112
+#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:112
 msgid "Skills"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/skilldialog.cpp:279
+#: src/gui/skilldialog.cpp:281
 msgid "Up"
 msgstr ""
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/skilldialog.cpp:391
+#: src/gui/skilldialog.cpp:393
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skills tab
-#: src/gui/skilldialog.cpp:444
+#: src/gui/skilldialog.cpp:446
 msgid "basic"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill name
-#: src/gui/skilldialog.cpp:447
+#: src/gui/skilldialog.cpp:449
 msgid "basic, 1"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/skilldialog.cpp:484
+#: src/gui/skilldialog.cpp:486
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/skilldialog.cpp:518
+#: src/gui/skilldialog.cpp:520
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/skilldialog.cpp:612 src/gui/skilldialog.cpp:762
+#: src/gui/skilldialog.cpp:614 src/gui/skilldialog.cpp:764
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -5228,7 +5254,7 @@ msgid "Trade: You"
 msgstr ""
 
 #. TRANSLATORS: trade window money label
-#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:182
+#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:184
 #, c-format
 msgid "You get %s"
 msgstr ""
@@ -5244,12 +5270,12 @@ msgid "You give:"
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:393
+#: src/gui/tradewindow.cpp:396
 msgid "You don't have enough money."
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:475
+#: src/gui/tradewindow.cpp:479
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
@@ -5261,223 +5287,223 @@ msgid "Name: %s"
 msgstr ""
 
 #. TRANSLATORS: updater window name
-#: src/gui/updaterwindow.cpp:140
+#: src/gui/updaterwindow.cpp:156
 msgid "Updating..."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:165
+#: src/gui/updaterwindow.cpp:181
 msgid "Connecting..."
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/updaterwindow.cpp:656
+#: src/gui/updaterwindow.cpp:672
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/updaterwindow.cpp:658
+#: src/gui/updaterwindow.cpp:674
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:660
+#: src/gui/updaterwindow.cpp:676
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:839
+#: src/gui/updaterwindow.cpp:855
 msgid "Completed"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
 msgid "Being"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:118
-msgid "Friend Names"
+#: src/gui/userpalette.cpp:119
+msgid "Friend names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:120
-msgid "Disregarded Names"
+#: src/gui/userpalette.cpp:121
+msgid "Disregarded names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:122
-msgid "Ignored Names"
+#: src/gui/userpalette.cpp:123
+msgid "Ignored names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:124
-msgid "Erased Names"
+#: src/gui/userpalette.cpp:125
+msgid "Erased names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:126
-msgid "Other Players' Names"
+#: src/gui/userpalette.cpp:127
+msgid "Other players names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:128
-msgid "Own Name"
+#: src/gui/userpalette.cpp:129
+msgid "Own name"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:130
-msgid "GM Names"
+#: src/gui/userpalette.cpp:131
+msgid "GM names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
 msgid "NPCs"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
 msgid "Monster HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:140
 msgid "Monster HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:141
-msgid "Party Members"
+#: src/gui/userpalette.cpp:142
+msgid "Party members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:143
-msgid "Guild Members"
+#: src/gui/userpalette.cpp:144
+msgid "Guild members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:145
-msgid "Particle Effects"
+#: src/gui/userpalette.cpp:148
+msgid "Pickup notification"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:147
-msgid "Pickup Notification"
+#: src/gui/userpalette.cpp:150
+msgid "Exp notification"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:149
-msgid "Exp Notification"
-msgstr ""
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
 msgid "Player HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
 msgid "Player HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:157
-msgid "Player Hits Monster"
+#: src/gui/userpalette.cpp:158
+msgid "Player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:159
-msgid "Monster Hits Player"
+#: src/gui/userpalette.cpp:160
+msgid "Monster hits player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:163
-msgid "Other Player Hits Local Player"
+#: src/gui/userpalette.cpp:164
+msgid "Other player hits local player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:166
 msgid "Critical Hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
-msgid "Local Player Hits Monster"
+#: src/gui/userpalette.cpp:170
+msgid "Local player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:172
-msgid "Local Player Critical Hit"
+#: src/gui/userpalette.cpp:173
+msgid "Local player critical hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:175
-msgid "Local Player Miss"
+#: src/gui/userpalette.cpp:176
+msgid "Local player miss"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:177
+#: src/gui/userpalette.cpp:178
 msgid "Misses"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
-msgid "Portal Highlight"
+#: src/gui/userpalette.cpp:180
+msgid "Portal highlight"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:183
+msgid "Default collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:182
-msgid "Default collision Highlight"
+#: src/gui/userpalette.cpp:186
+msgid "Air collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:185
-msgid "Air collision Highlight"
+#: src/gui/userpalette.cpp:189
+msgid "Water collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:188
-msgid "Water collision Highlight"
+#: src/gui/userpalette.cpp:192
+msgid "Special ground collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:191
-msgid "Special ground collision Highlight"
+#: src/gui/userpalette.cpp:195
+msgid "Walkable highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
-msgid "Walkable Highlight"
+#: src/gui/userpalette.cpp:198
+msgid "Local player attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:197
-msgid "Local Player Attack Range"
+#: src/gui/userpalette.cpp:201
+msgid "Local player attack range border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:200
-msgid "Local Player Attack Range Border"
+#: src/gui/userpalette.cpp:204
+msgid "Monster attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:203
-msgid "Monster Attack Range"
+#: src/gui/userpalette.cpp:208
+msgid "Floor item amount color"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:206
-msgid "Home Place"
+#: src/gui/userpalette.cpp:211
+msgid "Home place"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:209
-msgid "Home Place Border"
+#: src/gui/userpalette.cpp:214
+msgid "Home place border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:212
-msgid "Road Point"
+#: src/gui/userpalette.cpp:217
+msgid "Road point"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
@@ -5607,7 +5633,7 @@ msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:315
+#: src/gui/widgets/itemcontainer.cpp:317
 msgid "Eq."
 msgstr ""
 
diff --git a/po/sv.po b/po/sv.po
index 35897ee67..3711c8117 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-05-03 12:38+0300\n"
-"PO-Revision-Date: 2013-05-03 09:44+0000\n"
+"POT-Creation-Date: 2013-05-10 18:34+0300\n"
+"PO-Revision-Date: 2013-05-10 15:39+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -59,25 +59,25 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: full button name
-#: src/client.cpp:1136 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
+#: src/client.cpp:1137 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
 msgid "Setup"
 msgstr "Inställningar"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1140 src/gui/setup_perfomance.cpp:61
+#: src/client.cpp:1141 src/gui/setup_perfomance.cpp:61
 msgid "Perfomance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:1143 src/gui/setup_video.cpp:258
+#: src/client.cpp:1144 src/gui/setup_video.cpp:258
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1146 src/gui/setup_theme.cpp:273
+#: src/client.cpp:1147 src/gui/setup_theme.cpp:283
 msgid "Theme"
 msgstr ""
 
@@ -88,7 +88,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1150 src/gui/didyouknowwindow.cpp:78
+#: src/client.cpp:1151 src/gui/didyouknowwindow.cpp:78
 #: src/gui/inventorywindow.cpp:228 src/gui/npcdialog.cpp:63
 #: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:574
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:80
@@ -96,32 +96,32 @@ msgid "Close"
 msgstr "Stäng"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1238
+#: src/client.cpp:1239
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1282
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1320
+#: src/client.cpp:1321
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1431
+#: src/client.cpp:1432
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1471
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1483
+#: src/client.cpp:1484
 msgid "Changing game servers"
 msgstr ""
 
@@ -136,69 +136,69 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1540 src/client.cpp:1551 src/client.cpp:1721
+#: src/client.cpp:1541 src/client.cpp:1552 src/client.cpp:1722
 #: src/gui/changeemaildialog.cpp:168 src/gui/changepassworddialog.cpp:158
-#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:288
-#: src/gui/editserverdialog.cpp:220 src/gui/registerdialog.cpp:263
+#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:290
+#: src/gui/editserverdialog.cpp:216 src/gui/registerdialog.cpp:263
 #: src/gui/unregisterdialog.cpp:143 src/net/ea/charserverhandler.cpp:190
 #: src/net/ea/charserverhandler.cpp:210
 msgid "Error"
 msgstr "Fel"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1564
+#: src/client.cpp:1565
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1601
+#: src/client.cpp:1602
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1603
+#: src/client.cpp:1604
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1624
+#: src/client.cpp:1625
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1626
+#: src/client.cpp:1627
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1647
+#: src/client.cpp:1648
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1649
+#: src/client.cpp:1650
 msgid "Farewell, come back any time..."
 msgstr ""
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1902 src/client.cpp:1917 src/client.cpp:1960
-#: src/client.cpp:1976 src/client.cpp:2417 src/client.cpp:2425
+#: src/client.cpp:1903 src/client.cpp:1918 src/client.cpp:1961
+#: src/client.cpp:1977 src/client.cpp:2418 src/client.cpp:2426
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2113
+#: src/client.cpp:2114
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2154 src/client.cpp:2161
+#: src/client.cpp:2155 src/client.cpp:2162
 msgid "Error creating updates directory!"
 msgstr "Kunde inte skapa katalog för uppdateringar!"
 
-#: src/client.cpp:2183 src/client.cpp:2196
+#: src/client.cpp:2184 src/client.cpp:2197
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -478,19 +478,19 @@ msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: bot checker window header
-#: src/gui/botcheckerwindow.cpp:269
+#: src/gui/botcheckerwindow.cpp:268
 msgid "Bot Checker"
 msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:102
+#: src/gui/botcheckerwindow.cpp:277 src/gui/npcdialog.cpp:102
 msgid "Reset"
 msgstr "Återställ"
 
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: relations table header
-#: src/gui/botcheckerwindow.cpp:305 src/gui/setup_relations.cpp:61
+#: src/gui/botcheckerwindow.cpp:304 src/gui/setup_relations.cpp:61
 msgid "Name"
 msgstr "Namn"
 
@@ -498,7 +498,7 @@ msgstr "Namn"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:145
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:145
 #: src/gui/popupmenu.cpp:241 src/gui/popupmenu.cpp:640
 #: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:257
 #: src/net/tmwa/generalhandler.cpp:292
@@ -508,7 +508,7 @@ msgstr "Attackera"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
-#: src/gui/botcheckerwindow.cpp:309 src/gui/popupmenu.cpp:225
+#: src/gui/botcheckerwindow.cpp:308 src/gui/popupmenu.cpp:225
 #: src/gui/setupactiondata.h:93
 msgid "Talk"
 msgstr "Prata"
@@ -516,7 +516,7 @@ msgstr "Prata"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/botcheckerwindow.cpp:311 src/gui/popupmenu.cpp:215
+#: src/gui/botcheckerwindow.cpp:310 src/gui/popupmenu.cpp:215
 #: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:371
 #: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:653
 #: src/gui/popupmenu.cpp:727 src/gui/setupactiondata.h:1856
@@ -524,7 +524,7 @@ msgid "Move"
 msgstr ""
 
 #. TRANSLATORS: bot checker window table header
-#: src/gui/botcheckerwindow.cpp:313
+#: src/gui/botcheckerwindow.cpp:312
 msgid "Result"
 msgstr ""
 
@@ -580,7 +580,7 @@ msgstr "Köp"
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:516
+#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:511
 #: src/gui/selldialog.cpp:94 src/gui/selldialog.cpp:342
 #, c-format
 msgid "Price: %s / Total: %s"
@@ -597,9 +597,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:208
-#: src/gui/itemamountwindow.cpp:243 src/gui/npcdialog.cpp:93
-#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:833
+#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:202
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:93
+#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:821
 msgid "+"
 msgstr ""
 
@@ -609,9 +609,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:240 src/gui/npcdialog.cpp:95
-#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:846
+#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:200
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:95
+#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:834
 msgid "-"
 msgstr ""
 
@@ -623,7 +623,7 @@ msgstr ""
 #. TRANSLATORS: input action name
 #: src/gui/buydialog.cpp:260 src/gui/quitdialog.cpp:54
 #: src/gui/quitdialog.cpp:59 src/gui/quitdialog.cpp:61
-#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:255
+#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:264
 #: src/gui/setupactiondata.h:177
 msgid "Quit"
 msgstr "Avsluta"
@@ -635,7 +635,7 @@ msgstr "Avsluta"
 #. TRANSLATORS: status bar label
 #: src/gui/buydialog.cpp:262 src/gui/selldialog.cpp:106
 #: src/gui/statuswindow.cpp:558 src/gui/statuswindow.cpp:615
-#: src/gui/statuswindow.cpp:830 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:852
 msgid "Max"
 msgstr "Max"
 
@@ -680,7 +680,7 @@ msgstr "Sälj"
 #: src/gui/buyselldialog.cpp:71 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:120
 #: src/gui/connectiondialog.cpp:48 src/gui/editserverdialog.cpp:80
-#: src/gui/itemamountwindow.cpp:212 src/gui/npcpostdialog.cpp:64
+#: src/gui/itemamountwindow.cpp:206 src/gui/npcpostdialog.cpp:64
 #: src/gui/popupmenu.cpp:290 src/gui/popupmenu.cpp:324
 #: src/gui/popupmenu.cpp:411 src/gui/popupmenu.cpp:454
 #: src/gui/popupmenu.cpp:485 src/gui/popupmenu.cpp:512
@@ -696,7 +696,7 @@ msgstr "Sälj"
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
 #: src/gui/setup.cpp:84 src/gui/socialwindow.cpp:1204
 #: src/gui/textcommandeditor.cpp:212 src/gui/textdialog.cpp:53
-#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:167
+#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:183
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -860,7 +860,7 @@ msgstr "Var vänlig fördela %d poäng"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:570
+#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:581
 #: src/gui/socialwindow.cpp:1269
 msgid "Create"
 msgstr "Skapa"
@@ -887,17 +887,17 @@ msgid "Please remove %d points"
 msgstr "Var vänlig ta bort %d poäng"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:60
+#: src/gui/charselectdialog.cpp:61
 msgid "Confirm Character Delete"
 msgstr "Bekräfta borttagning av karaktär"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:62
+#: src/gui/charselectdialog.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "Är du säker på att du vill ta bort den här karaktären?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:86
+#: src/gui/charselectdialog.cpp:87
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
@@ -909,8 +909,8 @@ msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:565
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:576
+#: src/gui/updaterwindow.cpp:185
 msgid "Play"
 msgstr "Spela"
 
@@ -926,7 +926,7 @@ msgstr "Information"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:263
+#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:272
 #: src/gui/setupactiondata.h:1803 src/gui/setup_relations.cpp:262
 #: src/gui/shopwindow.cpp:96 src/gui/shopwindow.cpp:103
 #: src/gui/textcommandeditor.cpp:216
@@ -936,24 +936,24 @@ msgstr "Ta bort"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/charselectdialog.cpp:129 src/gui/unregisterdialog.cpp:48
+#: src/gui/charselectdialog.cpp:130 src/gui/unregisterdialog.cpp:48
 #: src/gui/unregisterdialog.cpp:53
 msgid "Unregister"
 msgstr "Avregistrera"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/charselectdialog.cpp:141
+#: src/gui/charselectdialog.cpp:142
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:172
+#: src/gui/charselectdialog.cpp:175
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/charselectdialog.cpp:246
+#: src/gui/charselectdialog.cpp:248
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -963,16 +963,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:288
+#: src/gui/charselectdialog.cpp:290
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password:"
 msgstr ""
 
@@ -1059,13 +1059,13 @@ msgid "Chat"
 msgstr "Chatt"
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:735
+#: src/gui/chatwindow.cpp:638
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1165
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Viskar till %s: %s"
@@ -1083,7 +1083,7 @@ msgstr "Nej"
 
 #. TRANSLATORS: confirm dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/confirmdialog.cpp:58 src/gui/popupmenu.cpp:2429
+#: src/gui/confirmdialog.cpp:55 src/gui/popupmenu.cpp:2429
 #: src/gui/popupmenu.cpp:2442 src/gui/popupmenu.cpp:2457
 #: src/gui/popupmenu.cpp:2483
 msgid "Ignore"
@@ -1092,7 +1092,7 @@ msgstr ""
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
 #. TRANSLATORS: settings group
-#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:109
+#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:108
 #: src/gui/setup_other.cpp:123 src/gui/windowmenu.cpp:106
 msgid "Map"
 msgstr "Karta"
@@ -1108,190 +1108,190 @@ msgid "Net"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:265
-#: src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:268
+#: src/gui/debugwindow.cpp:311
 msgid "Music:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:153 src/gui/debugwindow.cpp:271
-#: src/gui/debugwindow.cpp:312
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:274
+#: src/gui/debugwindow.cpp:315
 msgid "Map:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:155 src/gui/debugwindow.cpp:268
-#: src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:271
+#: src/gui/debugwindow.cpp:313
 msgid "Minimap:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:262
-#: src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:161 src/gui/debugwindow.cpp:265
+#: src/gui/debugwindow.cpp:309
 msgid "Cursor:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:161
+#: src/gui/debugwindow.cpp:164
 msgid "Particle count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:284
-#: src/gui/debugwindow.cpp:316
+#: src/gui/debugwindow.cpp:167 src/gui/debugwindow.cpp:287
+#: src/gui/debugwindow.cpp:319
 msgid "Map actors count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:166 src/gui/debugwindow.cpp:243
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:169 src/gui/debugwindow.cpp:246
+#: src/gui/debugwindow.cpp:252
 msgid "Player Position:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:172 src/gui/debugwindow.cpp:297
+#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:300
 msgid "Draw calls:"
 msgstr ""
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:175
+#. TRANSLATORS: debug window label, frames per second
+#: src/gui/debugwindow.cpp:178
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:177 src/gui/debugwindow.cpp:324
+#. TRANSLATORS: debug window label, logic per second
+#: src/gui/debugwindow.cpp:180 src/gui/debugwindow.cpp:327
 #, c-format
 msgid "%d LPS"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:191 src/gui/debugwindow.cpp:209
 #, c-format
 msgid "%d FPS (Software)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:193
+#: src/gui/debugwindow.cpp:196
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:197
+#: src/gui/debugwindow.cpp:200
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:201
+#: src/gui/debugwindow.cpp:204
 #, c-format
 msgid "%d FPS (mobile OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:225 src/gui/debugwindow.cpp:290
+#: src/gui/debugwindow.cpp:228 src/gui/debugwindow.cpp:293
 msgid "Textures count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:279
+#: src/gui/debugwindow.cpp:282
 #, c-format
 msgid "Particle count: %d"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:330 src/gui/debugwindow.cpp:380
-#: src/gui/debugwindow.cpp:442
+#: src/gui/debugwindow.cpp:333 src/gui/debugwindow.cpp:383
+#: src/gui/debugwindow.cpp:445
 msgid "Target:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:332 src/gui/debugwindow.cpp:386
-#: src/gui/debugwindow.cpp:444
+#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
+#: src/gui/debugwindow.cpp:447
 msgid "Target Id:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
-#: src/gui/debugwindow.cpp:446
+#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:392
+#: src/gui/debugwindow.cpp:449
 msgid "Target type:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:337
+#: src/gui/debugwindow.cpp:340
 msgid "Target level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:339 src/gui/debugwindow.cpp:405
+#: src/gui/debugwindow.cpp:342 src/gui/debugwindow.cpp:408
 msgid "Target race:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:341
+#: src/gui/debugwindow.cpp:344
 msgid "Target party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:346
 msgid "Target guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:430
-#: src/gui/debugwindow.cpp:436 src/gui/debugwindow.cpp:454
+#: src/gui/debugwindow.cpp:348 src/gui/debugwindow.cpp:433
+#: src/gui/debugwindow.cpp:439 src/gui/debugwindow.cpp:457
 msgid "Attack delay:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:347 src/gui/debugwindow.cpp:417
-#: src/gui/debugwindow.cpp:456
+#: src/gui/debugwindow.cpp:350 src/gui/debugwindow.cpp:420
+#: src/gui/debugwindow.cpp:459
 msgid "Minimal hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:349 src/gui/debugwindow.cpp:420
-#: src/gui/debugwindow.cpp:458
+#: src/gui/debugwindow.cpp:352 src/gui/debugwindow.cpp:423
+#: src/gui/debugwindow.cpp:461
 msgid "Maximum hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:351 src/gui/debugwindow.cpp:423
-#: src/gui/debugwindow.cpp:460
+#: src/gui/debugwindow.cpp:354 src/gui/debugwindow.cpp:426
+#: src/gui/debugwindow.cpp:463
 msgid "Critical hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:394 src/gui/debugwindow.cpp:400
-#: src/gui/debugwindow.cpp:448
+#: src/gui/debugwindow.cpp:397 src/gui/debugwindow.cpp:403
+#: src/gui/debugwindow.cpp:451
 msgid "Target Level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:408 src/gui/debugwindow.cpp:450
+#: src/gui/debugwindow.cpp:411 src/gui/debugwindow.cpp:453
 msgid "Target Party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:412 src/gui/debugwindow.cpp:452
+#: src/gui/debugwindow.cpp:415 src/gui/debugwindow.cpp:455
 msgid "Target Guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:493
+#: src/gui/debugwindow.cpp:496
 #, c-format
 msgid "Ping: %s ms"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:496
+#: src/gui/debugwindow.cpp:499
 #, c-format
 msgid "In: %d bytes/s"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:499
+#: src/gui/debugwindow.cpp:502
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
@@ -1323,7 +1323,7 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #: src/gui/editdialog.cpp:45 src/gui/editserverdialog.cpp:78
-#: src/gui/itemamountwindow.cpp:210 src/gui/okdialog.cpp:51
+#: src/gui/itemamountwindow.cpp:204 src/gui/okdialog.cpp:51
 #: src/gui/quitdialog.cpp:70 src/gui/textdialog.cpp:46
 msgid "OK"
 msgstr "Okej"
@@ -1335,7 +1335,7 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:257
+#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:266
 msgid "Connect"
 msgstr ""
 
@@ -1365,7 +1365,7 @@ msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/editserverdialog.cpp:222
+#: src/gui/editserverdialog.cpp:218
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -1417,7 +1417,7 @@ msgstr "Utrusta"
 #: src/gui/inventorywindow.cpp:178 src/gui/inventorywindow.cpp:630
 #: src/gui/popupmenu.cpp:1843 src/gui/popupmenu.cpp:1922
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2041
-#: src/gui/skilldialog.cpp:277
+#: src/gui/skilldialog.cpp:279
 msgid "Use"
 msgstr "Använd"
 
@@ -1451,7 +1451,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: setup button
-#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:718
+#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:719
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1992
 #: src/gui/popupmenu.cpp:2066 src/gui/setup.cpp:86
 msgid "Store"
@@ -1473,47 +1473,47 @@ msgid "Drop"
 msgstr "Släpp"
 
 #. TRANSLATORS: item amount window button
-#: src/gui/itemamountwindow.cpp:214
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "Alla"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:264
 msgid "Select amount of items to trade."
 msgstr "Välj antal föremål att handla med."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:274
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to drop."
 msgstr "Välj antal föremål att släppa."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:278
+#: src/gui/itemamountwindow.cpp:272
 msgid "Select amount of items to store."
 msgstr "Välj antal att lagra."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:276
 msgid "Select amount of items to retrieve."
 msgstr "Välj antal att hämta."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:286
+#: src/gui/itemamountwindow.cpp:280
 msgid "Select amount of items to split."
 msgstr "Välj antal föremål att dela."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:290
+#: src/gui/itemamountwindow.cpp:284
 msgid "Add to buy shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:294
+#: src/gui/itemamountwindow.cpp:288
 msgid "Add to sell shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:298
+#: src/gui/itemamountwindow.cpp:292
 msgid "Unknown."
 msgstr ""
 
@@ -1540,7 +1540,7 @@ msgstr ""
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:58 src/gui/killstats.cpp:171
-#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:516
+#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:509
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
@@ -1548,7 +1548,7 @@ msgstr ""
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:61 src/gui/killstats.cpp:173
 #: src/gui/killstats.cpp:253 src/gui/killstats.cpp:268
-#: src/gui/killstats.cpp:518
+#: src/gui/killstats.cpp:511
 #, c-format
 msgid "Avg Exp: %s"
 msgstr ""
@@ -1556,14 +1556,14 @@ msgstr ""
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:63 src/gui/killstats.cpp:176
 #: src/gui/killstats.cpp:258 src/gui/killstats.cpp:272
-#: src/gui/killstats.cpp:521
+#: src/gui/killstats.cpp:514
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:66 src/gui/killstats.cpp:187
-#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:524
+#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:517
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
@@ -1591,9 +1591,9 @@ msgid "Last kill exp:"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:414
-#: src/gui/killstats.cpp:421 src/gui/killstats.cpp:428
-#: src/gui/killstats.cpp:434
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:408
+#: src/gui/killstats.cpp:415 src/gui/killstats.cpp:422
+#: src/gui/killstats.cpp:428
 msgid "Time before jacko spawn:"
 msgstr ""
 
@@ -1625,12 +1625,12 @@ msgid "  Time for next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:421
+#: src/gui/killstats.cpp:415
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:428
+#: src/gui/killstats.cpp:422
 msgid "jacko spawning"
 msgstr ""
 
@@ -1736,32 +1736,32 @@ msgid "arrows bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:88
+#: src/gui/ministatuswindow.cpp:89
 msgid "status bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:108
+#: src/gui/ministatuswindow.cpp:109
 msgid "job bar"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:306 src/gui/statuswindow.cpp:298
+#: src/gui/ministatuswindow.cpp:307 src/gui/statuswindow.cpp:298
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:313 src/gui/statuswindow.cpp:141
+#: src/gui/ministatuswindow.cpp:314 src/gui/statuswindow.cpp:141
 #: src/gui/statuswindow.cpp:305 src/gui/statuswindow.cpp:375
 #, c-format
 msgid "Level: %d"
 msgstr "Nivå: %d"
 
 #. TRANSLATORS: status bar label
-#: src/gui/ministatuswindow.cpp:330 src/gui/ministatuswindow.cpp:367
+#: src/gui/ministatuswindow.cpp:331 src/gui/ministatuswindow.cpp:368
 msgid "Need"
 msgstr ""
 
@@ -2149,7 +2149,7 @@ msgstr ""
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2209 src/gui/popupmenu.cpp:2280
-#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:139
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
 #: src/gui/socialwindow.cpp:934
 msgid "(default)"
 msgstr ""
@@ -2332,7 +2332,7 @@ msgid "Passwords do not match."
 msgstr "Lösenorden stämmer inte överens."
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:257
 msgid "Choose Your Server"
 msgstr ""
 
@@ -2340,61 +2340,61 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:259 src/gui/shopwindow.cpp:94
+#: src/gui/serverdialog.cpp:268 src/gui/shopwindow.cpp:94
 #: src/gui/shopwindow.cpp:101 src/gui/tradewindow.cpp:77
 msgid "Add"
 msgstr "Lägg till"
 
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
-#: src/gui/serverdialog.cpp:261 src/gui/widgets/setupitem.cpp:299
+#: src/gui/serverdialog.cpp:270 src/gui/widgets/setupitem.cpp:299
 #: src/gui/widgets/setupitem.cpp:426
 msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:274
 msgid "Load"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:279
+#: src/gui/serverdialog.cpp:288
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:297
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:518
+#: src/gui/serverdialog.cpp:527
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:524
+#: src/gui/serverdialog.cpp:533
 msgid "Waiting for server..."
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:529
+#: src/gui/serverdialog.cpp:538
 msgid "Preparing download"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:534
+#: src/gui/serverdialog.cpp:543
 msgid "Error retreiving server list!"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:626
+#: src/gui/serverdialog.cpp:635
 msgid "requires a newer version"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:631
+#: src/gui/serverdialog.cpp:640
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -3405,7 +3405,7 @@ msgid "Type:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:334
+#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:336
 msgid "Delay:"
 msgstr ""
 
@@ -3425,30 +3425,30 @@ msgid "Blue:"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:420
+#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:422
 msgid "Static"
 msgstr "Statisk"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:107 src/gui/setup_colors.cpp:110
-#: src/gui/setup_colors.cpp:422
+#: src/gui/setup_colors.cpp:424
 msgid "Pulse"
 msgstr "Pulserande"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:112 src/gui/setup_colors.cpp:115
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Rainbow"
 msgstr "Regnbåge"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:117 src/gui/setup_colors.cpp:120
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Spectrum"
 msgstr "Spektrum"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:328
+#: src/gui/setup_colors.cpp:330
 msgid "Alpha:"
 msgstr ""
 
@@ -3614,7 +3614,7 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: palette color
-#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:134
+#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:135
 msgid "Monsters"
 msgstr "Monster"
 
@@ -4163,206 +4163,231 @@ msgstr "Vid ignorering:"
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:86
-msgid "Very small (9)"
+msgid "Very small (8)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:88
-msgid "Tiny (10)"
+msgid "Very small (9)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:90
-msgid "Small (11)"
+msgid "Tiny (10)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:92
-msgid "Medium (12)"
+msgid "Small (11)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:94
-msgid "Normal (13)"
+msgid "Medium (12)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:96
-msgid "Large (14)"
+msgid "Normal (13)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:98
-msgid "Very large (15)"
+msgid "Large (14)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:100
-msgid "Big (16)"
+msgid "Large (15)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:102
-msgid "Very big (17)"
+msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:104
-msgid "Huge (18)"
+msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:106
-msgid "Very huge (19)"
+msgid "Big (18)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:108
+msgid "Big (19)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:110
+msgid "Very big (20)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:112
+msgid "Very big (21)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:114
+msgid "Very big (22)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:116
+msgid "Huge (23)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:151
 msgid "Chinese (China)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:153
 msgid "Czech"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:155
 msgid "English"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:157
 msgid "Finnish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:159
 msgid "French"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:161
 msgid "German"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:153
+#: src/gui/setup_theme.cpp:163
 msgid "Indonesian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:155
+#: src/gui/setup_theme.cpp:165
 msgid "Italian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:157
+#: src/gui/setup_theme.cpp:167
 msgid "Polish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:159
+#: src/gui/setup_theme.cpp:169
 msgid "Japanese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:161
+#: src/gui/setup_theme.cpp:171
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:163
+#: src/gui/setup_theme.cpp:173
 msgid "Portuguese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:165
+#: src/gui/setup_theme.cpp:175
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:167
+#: src/gui/setup_theme.cpp:177
 msgid "Russian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:169
+#: src/gui/setup_theme.cpp:179
 msgid "Spanish (Castilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:171
+#: src/gui/setup_theme.cpp:181
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:223
+#: src/gui/setup_theme.cpp:233
 msgid "Gui theme"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:230
+#: src/gui/setup_theme.cpp:240
 msgid "Main Font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:235
+#: src/gui/setup_theme.cpp:245
 msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:239
+#: src/gui/setup_theme.cpp:249
 msgid "Bold font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:243
+#: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:247
+#: src/gui/setup_theme.cpp:257
 msgid "Help font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:251
+#: src/gui/setup_theme.cpp:261
 msgid "Secure font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:255
+#: src/gui/setup_theme.cpp:265
 msgid "Japanese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:260
+#: src/gui/setup_theme.cpp:270
 msgid "Font size"
 msgstr "Typsnittsgrad"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:265
+#: src/gui/setup_theme.cpp:275
 msgid "Npc font size"
 msgstr ""
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/setup_theme.cpp:269
+#: src/gui/setup_theme.cpp:279
 msgid "i"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/setup_theme.cpp:442
+#: src/gui/setup_theme.cpp:452
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/setup_theme.cpp:467
+#: src/gui/setup_theme.cpp:477
 msgid "Theme Changed"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/setup_theme.cpp:467 src/gui/setup_video.cpp:537
+#: src/gui/setup_theme.cpp:477 src/gui/setup_video.cpp:537
 #: src/gui/setup_video.cpp:546
 msgid "Restart your client for the change to take effect."
 msgstr "Starta om din klient för att ändringen ska börja gälla."
@@ -4660,7 +4685,8 @@ msgid "Ambient FX"
 msgstr "Omgivande FX"
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_visual.cpp:140
+#. TRANSLATORS: palette color
+#: src/gui/setup_visual.cpp:140 src/gui/userpalette.cpp:146
 msgid "Particle effects"
 msgstr "Partikeleffekter"
 
@@ -4747,45 +4773,45 @@ msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/skilldialog.cpp:270 src/gui/windowmenu.cpp:112
+#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:112
 msgid "Skills"
 msgstr "Färdigheter"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/skilldialog.cpp:279
+#: src/gui/skilldialog.cpp:281
 msgid "Up"
 msgstr "Upp"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/skilldialog.cpp:391
+#: src/gui/skilldialog.cpp:393
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skills tab
-#: src/gui/skilldialog.cpp:444
+#: src/gui/skilldialog.cpp:446
 msgid "basic"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill name
-#: src/gui/skilldialog.cpp:447
+#: src/gui/skilldialog.cpp:449
 msgid "basic, 1"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/skilldialog.cpp:484
+#: src/gui/skilldialog.cpp:486
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/skilldialog.cpp:518
+#: src/gui/skilldialog.cpp:520
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/skilldialog.cpp:612 src/gui/skilldialog.cpp:762
+#: src/gui/skilldialog.cpp:614 src/gui/skilldialog.cpp:764
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -5228,7 +5254,7 @@ msgid "Trade: You"
 msgstr "Byteshandel: du"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:182
+#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:184
 #, c-format
 msgid "You get %s"
 msgstr ""
@@ -5244,12 +5270,12 @@ msgid "You give:"
 msgstr "Du ger:"
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:393
+#: src/gui/tradewindow.cpp:396
 msgid "You don't have enough money."
 msgstr "Du har inte tillräckligt med pengar."
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:475
+#: src/gui/tradewindow.cpp:479
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "Kan inte lägga till vald sak. Det går inte att byteshandla med samma slags sak flera gånger."
@@ -5261,223 +5287,223 @@ msgid "Name: %s"
 msgstr "Namn: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/updaterwindow.cpp:140
+#: src/gui/updaterwindow.cpp:156
 msgid "Updating..."
 msgstr "Uppdaterar..."
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:165
+#: src/gui/updaterwindow.cpp:181
 msgid "Connecting..."
 msgstr "Ansluter..."
 
 #. TRANSLATORS: update message
-#: src/gui/updaterwindow.cpp:656
+#: src/gui/updaterwindow.cpp:672
 msgid "##1  The update process is incomplete."
 msgstr "##1  Uppdateringsprocessen är inte avslutad."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/updaterwindow.cpp:658
+#: src/gui/updaterwindow.cpp:674
 msgid "##1  It is strongly recommended that"
 msgstr "##1  Det rekommenderar verkligen att"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:660
+#: src/gui/updaterwindow.cpp:676
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:839
+#: src/gui/updaterwindow.cpp:855
 msgid "Completed"
 msgstr "Färdig"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
 msgid "Being"
 msgstr "Varelse"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:118
-msgid "Friend Names"
+#: src/gui/userpalette.cpp:119
+msgid "Friend names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:120
-msgid "Disregarded Names"
+#: src/gui/userpalette.cpp:121
+msgid "Disregarded names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:122
-msgid "Ignored Names"
+#: src/gui/userpalette.cpp:123
+msgid "Ignored names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:124
-msgid "Erased Names"
+#: src/gui/userpalette.cpp:125
+msgid "Erased names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:126
-msgid "Other Players' Names"
-msgstr "Andra spelares namn"
+#: src/gui/userpalette.cpp:127
+msgid "Other players names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:128
-msgid "Own Name"
-msgstr "Eget namn"
+#: src/gui/userpalette.cpp:129
+msgid "Own name"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:130
-msgid "GM Names"
-msgstr "GM-namn"
+#: src/gui/userpalette.cpp:131
+msgid "GM names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
 msgid "NPCs"
 msgstr "NPC:er"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
 msgid "Monster HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:140
 msgid "Monster HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:141
-msgid "Party Members"
+#: src/gui/userpalette.cpp:142
+msgid "Party members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:143
-msgid "Guild Members"
+#: src/gui/userpalette.cpp:144
+msgid "Guild members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:145
-msgid "Particle Effects"
-msgstr "Partikeleffekter"
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:147
-msgid "Pickup Notification"
-msgstr "Upplocksnotis"
+#: src/gui/userpalette.cpp:148
+msgid "Pickup notification"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:149
-msgid "Exp Notification"
-msgstr "XP-notifiering"
+#: src/gui/userpalette.cpp:150
+msgid "Exp notification"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
 msgid "Player HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
 msgid "Player HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:157
-msgid "Player Hits Monster"
+#: src/gui/userpalette.cpp:158
+msgid "Player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:159
-msgid "Monster Hits Player"
+#: src/gui/userpalette.cpp:160
+msgid "Monster hits player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:163
-msgid "Other Player Hits Local Player"
+#: src/gui/userpalette.cpp:164
+msgid "Other player hits local player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:166
 msgid "Critical Hit"
 msgstr "Kritisk träff"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
-msgid "Local Player Hits Monster"
+#: src/gui/userpalette.cpp:170
+msgid "Local player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:172
-msgid "Local Player Critical Hit"
+#: src/gui/userpalette.cpp:173
+msgid "Local player critical hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:175
-msgid "Local Player Miss"
+#: src/gui/userpalette.cpp:176
+msgid "Local player miss"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:177
+#: src/gui/userpalette.cpp:178
 msgid "Misses"
 msgstr "Missar"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
-msgid "Portal Highlight"
+#: src/gui/userpalette.cpp:180
+msgid "Portal highlight"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:183
+msgid "Default collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:182
-msgid "Default collision Highlight"
+#: src/gui/userpalette.cpp:186
+msgid "Air collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:185
-msgid "Air collision Highlight"
+#: src/gui/userpalette.cpp:189
+msgid "Water collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:188
-msgid "Water collision Highlight"
+#: src/gui/userpalette.cpp:192
+msgid "Special ground collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:191
-msgid "Special ground collision Highlight"
+#: src/gui/userpalette.cpp:195
+msgid "Walkable highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
-msgid "Walkable Highlight"
+#: src/gui/userpalette.cpp:198
+msgid "Local player attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:197
-msgid "Local Player Attack Range"
+#: src/gui/userpalette.cpp:201
+msgid "Local player attack range border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:200
-msgid "Local Player Attack Range Border"
+#: src/gui/userpalette.cpp:204
+msgid "Monster attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:203
-msgid "Monster Attack Range"
+#: src/gui/userpalette.cpp:208
+msgid "Floor item amount color"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:206
-msgid "Home Place"
+#: src/gui/userpalette.cpp:211
+msgid "Home place"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:209
-msgid "Home Place Border"
+#: src/gui/userpalette.cpp:214
+msgid "Home place border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:212
-msgid "Road Point"
+#: src/gui/userpalette.cpp:217
+msgid "Road point"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
@@ -5607,7 +5633,7 @@ msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:315
+#: src/gui/widgets/itemcontainer.cpp:317
 msgid "Eq."
 msgstr ""
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 7c173b81e..fe3010352 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-05-03 12:38+0300\n"
-"PO-Revision-Date: 2013-05-03 09:44+0000\n"
+"POT-Creation-Date: 2013-05-10 18:34+0300\n"
+"PO-Revision-Date: 2013-05-10 15:39+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Swedish (Sweden) (http://www.transifex.com/projects/p/manaplus/language/sv_SE/)\n"
 "MIME-Version: 1.0\n"
@@ -58,25 +58,25 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: full button name
-#: src/client.cpp:1136 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
+#: src/client.cpp:1137 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
 msgid "Setup"
 msgstr ""
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1140 src/gui/setup_perfomance.cpp:61
+#: src/client.cpp:1141 src/gui/setup_perfomance.cpp:61
 msgid "Perfomance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:1143 src/gui/setup_video.cpp:258
+#: src/client.cpp:1144 src/gui/setup_video.cpp:258
 msgid "Video"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1146 src/gui/setup_theme.cpp:273
+#: src/client.cpp:1147 src/gui/setup_theme.cpp:283
 msgid "Theme"
 msgstr ""
 
@@ -87,7 +87,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1150 src/gui/didyouknowwindow.cpp:78
+#: src/client.cpp:1151 src/gui/didyouknowwindow.cpp:78
 #: src/gui/inventorywindow.cpp:228 src/gui/npcdialog.cpp:63
 #: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:574
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:80
@@ -95,32 +95,32 @@ msgid "Close"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1238
+#: src/client.cpp:1239
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1282
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1320
+#: src/client.cpp:1321
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1431
+#: src/client.cpp:1432
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1471
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1483
+#: src/client.cpp:1484
 msgid "Changing game servers"
 msgstr ""
 
@@ -135,69 +135,69 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1540 src/client.cpp:1551 src/client.cpp:1721
+#: src/client.cpp:1541 src/client.cpp:1552 src/client.cpp:1722
 #: src/gui/changeemaildialog.cpp:168 src/gui/changepassworddialog.cpp:158
-#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:288
-#: src/gui/editserverdialog.cpp:220 src/gui/registerdialog.cpp:263
+#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:290
+#: src/gui/editserverdialog.cpp:216 src/gui/registerdialog.cpp:263
 #: src/gui/unregisterdialog.cpp:143 src/net/ea/charserverhandler.cpp:190
 #: src/net/ea/charserverhandler.cpp:210
 msgid "Error"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1564
+#: src/client.cpp:1565
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1601
+#: src/client.cpp:1602
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1603
+#: src/client.cpp:1604
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1624
+#: src/client.cpp:1625
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1626
+#: src/client.cpp:1627
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1647
+#: src/client.cpp:1648
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1649
+#: src/client.cpp:1650
 msgid "Farewell, come back any time..."
 msgstr ""
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1902 src/client.cpp:1917 src/client.cpp:1960
-#: src/client.cpp:1976 src/client.cpp:2417 src/client.cpp:2425
+#: src/client.cpp:1903 src/client.cpp:1918 src/client.cpp:1961
+#: src/client.cpp:1977 src/client.cpp:2418 src/client.cpp:2426
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2113
+#: src/client.cpp:2114
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2154 src/client.cpp:2161
+#: src/client.cpp:2155 src/client.cpp:2162
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:2183 src/client.cpp:2196
+#: src/client.cpp:2184 src/client.cpp:2197
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -477,19 +477,19 @@ msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: bot checker window header
-#: src/gui/botcheckerwindow.cpp:269
+#: src/gui/botcheckerwindow.cpp:268
 msgid "Bot Checker"
 msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:102
+#: src/gui/botcheckerwindow.cpp:277 src/gui/npcdialog.cpp:102
 msgid "Reset"
 msgstr ""
 
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: relations table header
-#: src/gui/botcheckerwindow.cpp:305 src/gui/setup_relations.cpp:61
+#: src/gui/botcheckerwindow.cpp:304 src/gui/setup_relations.cpp:61
 msgid "Name"
 msgstr ""
 
@@ -497,7 +497,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:145
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:145
 #: src/gui/popupmenu.cpp:241 src/gui/popupmenu.cpp:640
 #: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:257
 #: src/net/tmwa/generalhandler.cpp:292
@@ -507,7 +507,7 @@ msgstr ""
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
-#: src/gui/botcheckerwindow.cpp:309 src/gui/popupmenu.cpp:225
+#: src/gui/botcheckerwindow.cpp:308 src/gui/popupmenu.cpp:225
 #: src/gui/setupactiondata.h:93
 msgid "Talk"
 msgstr ""
@@ -515,7 +515,7 @@ msgstr ""
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/botcheckerwindow.cpp:311 src/gui/popupmenu.cpp:215
+#: src/gui/botcheckerwindow.cpp:310 src/gui/popupmenu.cpp:215
 #: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:371
 #: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:653
 #: src/gui/popupmenu.cpp:727 src/gui/setupactiondata.h:1856
@@ -523,7 +523,7 @@ msgid "Move"
 msgstr ""
 
 #. TRANSLATORS: bot checker window table header
-#: src/gui/botcheckerwindow.cpp:313
+#: src/gui/botcheckerwindow.cpp:312
 msgid "Result"
 msgstr ""
 
@@ -579,7 +579,7 @@ msgstr ""
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:516
+#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:511
 #: src/gui/selldialog.cpp:94 src/gui/selldialog.cpp:342
 #, c-format
 msgid "Price: %s / Total: %s"
@@ -596,9 +596,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:208
-#: src/gui/itemamountwindow.cpp:243 src/gui/npcdialog.cpp:93
-#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:833
+#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:202
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:93
+#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:821
 msgid "+"
 msgstr ""
 
@@ -608,9 +608,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:240 src/gui/npcdialog.cpp:95
-#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:846
+#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:200
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:95
+#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:834
 msgid "-"
 msgstr ""
 
@@ -622,7 +622,7 @@ msgstr ""
 #. TRANSLATORS: input action name
 #: src/gui/buydialog.cpp:260 src/gui/quitdialog.cpp:54
 #: src/gui/quitdialog.cpp:59 src/gui/quitdialog.cpp:61
-#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:255
+#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:264
 #: src/gui/setupactiondata.h:177
 msgid "Quit"
 msgstr ""
@@ -634,7 +634,7 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #: src/gui/buydialog.cpp:262 src/gui/selldialog.cpp:106
 #: src/gui/statuswindow.cpp:558 src/gui/statuswindow.cpp:615
-#: src/gui/statuswindow.cpp:830 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:852
 msgid "Max"
 msgstr ""
 
@@ -679,7 +679,7 @@ msgstr ""
 #: src/gui/buyselldialog.cpp:71 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:120
 #: src/gui/connectiondialog.cpp:48 src/gui/editserverdialog.cpp:80
-#: src/gui/itemamountwindow.cpp:212 src/gui/npcpostdialog.cpp:64
+#: src/gui/itemamountwindow.cpp:206 src/gui/npcpostdialog.cpp:64
 #: src/gui/popupmenu.cpp:290 src/gui/popupmenu.cpp:324
 #: src/gui/popupmenu.cpp:411 src/gui/popupmenu.cpp:454
 #: src/gui/popupmenu.cpp:485 src/gui/popupmenu.cpp:512
@@ -695,7 +695,7 @@ msgstr ""
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
 #: src/gui/setup.cpp:84 src/gui/socialwindow.cpp:1204
 #: src/gui/textcommandeditor.cpp:212 src/gui/textdialog.cpp:53
-#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:167
+#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:183
 msgid "Cancel"
 msgstr ""
 
@@ -859,7 +859,7 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:570
+#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:581
 #: src/gui/socialwindow.cpp:1269
 msgid "Create"
 msgstr ""
@@ -886,17 +886,17 @@ msgid "Please remove %d points"
 msgstr ""
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:60
+#: src/gui/charselectdialog.cpp:61
 msgid "Confirm Character Delete"
 msgstr ""
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:62
+#: src/gui/charselectdialog.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:86
+#: src/gui/charselectdialog.cpp:87
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
@@ -908,8 +908,8 @@ msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:565
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:576
+#: src/gui/updaterwindow.cpp:185
 msgid "Play"
 msgstr ""
 
@@ -925,7 +925,7 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:263
+#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:272
 #: src/gui/setupactiondata.h:1803 src/gui/setup_relations.cpp:262
 #: src/gui/shopwindow.cpp:96 src/gui/shopwindow.cpp:103
 #: src/gui/textcommandeditor.cpp:216
@@ -935,24 +935,24 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/charselectdialog.cpp:129 src/gui/unregisterdialog.cpp:48
+#: src/gui/charselectdialog.cpp:130 src/gui/unregisterdialog.cpp:48
 #: src/gui/unregisterdialog.cpp:53
 msgid "Unregister"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/charselectdialog.cpp:141
+#: src/gui/charselectdialog.cpp:142
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:172
+#: src/gui/charselectdialog.cpp:175
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/charselectdialog.cpp:246
+#: src/gui/charselectdialog.cpp:248
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -962,16 +962,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:288
+#: src/gui/charselectdialog.cpp:290
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password:"
 msgstr ""
 
@@ -1058,13 +1058,13 @@ msgid "Chat"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:735
+#: src/gui/chatwindow.cpp:638
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1165
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -1082,7 +1082,7 @@ msgstr ""
 
 #. TRANSLATORS: confirm dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/confirmdialog.cpp:58 src/gui/popupmenu.cpp:2429
+#: src/gui/confirmdialog.cpp:55 src/gui/popupmenu.cpp:2429
 #: src/gui/popupmenu.cpp:2442 src/gui/popupmenu.cpp:2457
 #: src/gui/popupmenu.cpp:2483
 msgid "Ignore"
@@ -1091,7 +1091,7 @@ msgstr ""
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
 #. TRANSLATORS: settings group
-#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:109
+#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:108
 #: src/gui/setup_other.cpp:123 src/gui/windowmenu.cpp:106
 msgid "Map"
 msgstr ""
@@ -1107,190 +1107,190 @@ msgid "Net"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:265
-#: src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:268
+#: src/gui/debugwindow.cpp:311
 msgid "Music:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:153 src/gui/debugwindow.cpp:271
-#: src/gui/debugwindow.cpp:312
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:274
+#: src/gui/debugwindow.cpp:315
 msgid "Map:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:155 src/gui/debugwindow.cpp:268
-#: src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:271
+#: src/gui/debugwindow.cpp:313
 msgid "Minimap:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:262
-#: src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:161 src/gui/debugwindow.cpp:265
+#: src/gui/debugwindow.cpp:309
 msgid "Cursor:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:161
+#: src/gui/debugwindow.cpp:164
 msgid "Particle count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:284
-#: src/gui/debugwindow.cpp:316
+#: src/gui/debugwindow.cpp:167 src/gui/debugwindow.cpp:287
+#: src/gui/debugwindow.cpp:319
 msgid "Map actors count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:166 src/gui/debugwindow.cpp:243
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:169 src/gui/debugwindow.cpp:246
+#: src/gui/debugwindow.cpp:252
 msgid "Player Position:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:172 src/gui/debugwindow.cpp:297
+#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:300
 msgid "Draw calls:"
 msgstr ""
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:175
+#. TRANSLATORS: debug window label, frames per second
+#: src/gui/debugwindow.cpp:178
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:177 src/gui/debugwindow.cpp:324
+#. TRANSLATORS: debug window label, logic per second
+#: src/gui/debugwindow.cpp:180 src/gui/debugwindow.cpp:327
 #, c-format
 msgid "%d LPS"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:191 src/gui/debugwindow.cpp:209
 #, c-format
 msgid "%d FPS (Software)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:193
+#: src/gui/debugwindow.cpp:196
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:197
+#: src/gui/debugwindow.cpp:200
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:201
+#: src/gui/debugwindow.cpp:204
 #, c-format
 msgid "%d FPS (mobile OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:225 src/gui/debugwindow.cpp:290
+#: src/gui/debugwindow.cpp:228 src/gui/debugwindow.cpp:293
 msgid "Textures count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:279
+#: src/gui/debugwindow.cpp:282
 #, c-format
 msgid "Particle count: %d"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:330 src/gui/debugwindow.cpp:380
-#: src/gui/debugwindow.cpp:442
+#: src/gui/debugwindow.cpp:333 src/gui/debugwindow.cpp:383
+#: src/gui/debugwindow.cpp:445
 msgid "Target:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:332 src/gui/debugwindow.cpp:386
-#: src/gui/debugwindow.cpp:444
+#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
+#: src/gui/debugwindow.cpp:447
 msgid "Target Id:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
-#: src/gui/debugwindow.cpp:446
+#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:392
+#: src/gui/debugwindow.cpp:449
 msgid "Target type:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:337
+#: src/gui/debugwindow.cpp:340
 msgid "Target level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:339 src/gui/debugwindow.cpp:405
+#: src/gui/debugwindow.cpp:342 src/gui/debugwindow.cpp:408
 msgid "Target race:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:341
+#: src/gui/debugwindow.cpp:344
 msgid "Target party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:346
 msgid "Target guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:430
-#: src/gui/debugwindow.cpp:436 src/gui/debugwindow.cpp:454
+#: src/gui/debugwindow.cpp:348 src/gui/debugwindow.cpp:433
+#: src/gui/debugwindow.cpp:439 src/gui/debugwindow.cpp:457
 msgid "Attack delay:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:347 src/gui/debugwindow.cpp:417
-#: src/gui/debugwindow.cpp:456
+#: src/gui/debugwindow.cpp:350 src/gui/debugwindow.cpp:420
+#: src/gui/debugwindow.cpp:459
 msgid "Minimal hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:349 src/gui/debugwindow.cpp:420
-#: src/gui/debugwindow.cpp:458
+#: src/gui/debugwindow.cpp:352 src/gui/debugwindow.cpp:423
+#: src/gui/debugwindow.cpp:461
 msgid "Maximum hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:351 src/gui/debugwindow.cpp:423
-#: src/gui/debugwindow.cpp:460
+#: src/gui/debugwindow.cpp:354 src/gui/debugwindow.cpp:426
+#: src/gui/debugwindow.cpp:463
 msgid "Critical hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:394 src/gui/debugwindow.cpp:400
-#: src/gui/debugwindow.cpp:448
+#: src/gui/debugwindow.cpp:397 src/gui/debugwindow.cpp:403
+#: src/gui/debugwindow.cpp:451
 msgid "Target Level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:408 src/gui/debugwindow.cpp:450
+#: src/gui/debugwindow.cpp:411 src/gui/debugwindow.cpp:453
 msgid "Target Party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:412 src/gui/debugwindow.cpp:452
+#: src/gui/debugwindow.cpp:415 src/gui/debugwindow.cpp:455
 msgid "Target Guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:493
+#: src/gui/debugwindow.cpp:496
 #, c-format
 msgid "Ping: %s ms"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:496
+#: src/gui/debugwindow.cpp:499
 #, c-format
 msgid "In: %d bytes/s"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:499
+#: src/gui/debugwindow.cpp:502
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
@@ -1322,7 +1322,7 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #: src/gui/editdialog.cpp:45 src/gui/editserverdialog.cpp:78
-#: src/gui/itemamountwindow.cpp:210 src/gui/okdialog.cpp:51
+#: src/gui/itemamountwindow.cpp:204 src/gui/okdialog.cpp:51
 #: src/gui/quitdialog.cpp:70 src/gui/textdialog.cpp:46
 msgid "OK"
 msgstr ""
@@ -1334,7 +1334,7 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:257
+#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:266
 msgid "Connect"
 msgstr ""
 
@@ -1364,7 +1364,7 @@ msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/editserverdialog.cpp:222
+#: src/gui/editserverdialog.cpp:218
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -1416,7 +1416,7 @@ msgstr ""
 #: src/gui/inventorywindow.cpp:178 src/gui/inventorywindow.cpp:630
 #: src/gui/popupmenu.cpp:1843 src/gui/popupmenu.cpp:1922
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2041
-#: src/gui/skilldialog.cpp:277
+#: src/gui/skilldialog.cpp:279
 msgid "Use"
 msgstr ""
 
@@ -1450,7 +1450,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: setup button
-#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:718
+#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:719
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1992
 #: src/gui/popupmenu.cpp:2066 src/gui/setup.cpp:86
 msgid "Store"
@@ -1472,47 +1472,47 @@ msgid "Drop"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/itemamountwindow.cpp:214
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:264
 msgid "Select amount of items to trade."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:274
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to drop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:278
+#: src/gui/itemamountwindow.cpp:272
 msgid "Select amount of items to store."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:276
 msgid "Select amount of items to retrieve."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:286
+#: src/gui/itemamountwindow.cpp:280
 msgid "Select amount of items to split."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:290
+#: src/gui/itemamountwindow.cpp:284
 msgid "Add to buy shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:294
+#: src/gui/itemamountwindow.cpp:288
 msgid "Add to sell shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:298
+#: src/gui/itemamountwindow.cpp:292
 msgid "Unknown."
 msgstr ""
 
@@ -1539,7 +1539,7 @@ msgstr ""
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:58 src/gui/killstats.cpp:171
-#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:516
+#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:509
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
@@ -1547,7 +1547,7 @@ msgstr ""
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:61 src/gui/killstats.cpp:173
 #: src/gui/killstats.cpp:253 src/gui/killstats.cpp:268
-#: src/gui/killstats.cpp:518
+#: src/gui/killstats.cpp:511
 #, c-format
 msgid "Avg Exp: %s"
 msgstr ""
@@ -1555,14 +1555,14 @@ msgstr ""
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:63 src/gui/killstats.cpp:176
 #: src/gui/killstats.cpp:258 src/gui/killstats.cpp:272
-#: src/gui/killstats.cpp:521
+#: src/gui/killstats.cpp:514
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:66 src/gui/killstats.cpp:187
-#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:524
+#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:517
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
@@ -1590,9 +1590,9 @@ msgid "Last kill exp:"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:414
-#: src/gui/killstats.cpp:421 src/gui/killstats.cpp:428
-#: src/gui/killstats.cpp:434
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:408
+#: src/gui/killstats.cpp:415 src/gui/killstats.cpp:422
+#: src/gui/killstats.cpp:428
 msgid "Time before jacko spawn:"
 msgstr ""
 
@@ -1624,12 +1624,12 @@ msgid "  Time for next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:421
+#: src/gui/killstats.cpp:415
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:428
+#: src/gui/killstats.cpp:422
 msgid "jacko spawning"
 msgstr ""
 
@@ -1735,32 +1735,32 @@ msgid "arrows bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:88
+#: src/gui/ministatuswindow.cpp:89
 msgid "status bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:108
+#: src/gui/ministatuswindow.cpp:109
 msgid "job bar"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:306 src/gui/statuswindow.cpp:298
+#: src/gui/ministatuswindow.cpp:307 src/gui/statuswindow.cpp:298
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:313 src/gui/statuswindow.cpp:141
+#: src/gui/ministatuswindow.cpp:314 src/gui/statuswindow.cpp:141
 #: src/gui/statuswindow.cpp:305 src/gui/statuswindow.cpp:375
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
 #. TRANSLATORS: status bar label
-#: src/gui/ministatuswindow.cpp:330 src/gui/ministatuswindow.cpp:367
+#: src/gui/ministatuswindow.cpp:331 src/gui/ministatuswindow.cpp:368
 msgid "Need"
 msgstr ""
 
@@ -2148,7 +2148,7 @@ msgstr ""
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2209 src/gui/popupmenu.cpp:2280
-#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:139
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
 #: src/gui/socialwindow.cpp:934
 msgid "(default)"
 msgstr ""
@@ -2331,7 +2331,7 @@ msgid "Passwords do not match."
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:257
 msgid "Choose Your Server"
 msgstr ""
 
@@ -2339,61 +2339,61 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:259 src/gui/shopwindow.cpp:94
+#: src/gui/serverdialog.cpp:268 src/gui/shopwindow.cpp:94
 #: src/gui/shopwindow.cpp:101 src/gui/tradewindow.cpp:77
 msgid "Add"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
-#: src/gui/serverdialog.cpp:261 src/gui/widgets/setupitem.cpp:299
+#: src/gui/serverdialog.cpp:270 src/gui/widgets/setupitem.cpp:299
 #: src/gui/widgets/setupitem.cpp:426
 msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:274
 msgid "Load"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:279
+#: src/gui/serverdialog.cpp:288
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:297
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:518
+#: src/gui/serverdialog.cpp:527
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:524
+#: src/gui/serverdialog.cpp:533
 msgid "Waiting for server..."
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:529
+#: src/gui/serverdialog.cpp:538
 msgid "Preparing download"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:534
+#: src/gui/serverdialog.cpp:543
 msgid "Error retreiving server list!"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:626
+#: src/gui/serverdialog.cpp:635
 msgid "requires a newer version"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:631
+#: src/gui/serverdialog.cpp:640
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -3404,7 +3404,7 @@ msgid "Type:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:334
+#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:336
 msgid "Delay:"
 msgstr ""
 
@@ -3424,30 +3424,30 @@ msgid "Blue:"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:420
+#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:422
 msgid "Static"
 msgstr ""
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:107 src/gui/setup_colors.cpp:110
-#: src/gui/setup_colors.cpp:422
+#: src/gui/setup_colors.cpp:424
 msgid "Pulse"
 msgstr ""
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:112 src/gui/setup_colors.cpp:115
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Rainbow"
 msgstr ""
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:117 src/gui/setup_colors.cpp:120
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Spectrum"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:328
+#: src/gui/setup_colors.cpp:330
 msgid "Alpha:"
 msgstr ""
 
@@ -3613,7 +3613,7 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: palette color
-#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:134
+#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:135
 msgid "Monsters"
 msgstr ""
 
@@ -4162,206 +4162,231 @@ msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:86
-msgid "Very small (9)"
+msgid "Very small (8)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:88
-msgid "Tiny (10)"
+msgid "Very small (9)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:90
-msgid "Small (11)"
+msgid "Tiny (10)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:92
-msgid "Medium (12)"
+msgid "Small (11)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:94
-msgid "Normal (13)"
+msgid "Medium (12)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:96
-msgid "Large (14)"
+msgid "Normal (13)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:98
-msgid "Very large (15)"
+msgid "Large (14)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:100
-msgid "Big (16)"
+msgid "Large (15)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:102
-msgid "Very big (17)"
+msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:104
-msgid "Huge (18)"
+msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:106
-msgid "Very huge (19)"
+msgid "Big (18)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:108
+msgid "Big (19)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:110
+msgid "Very big (20)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:112
+msgid "Very big (21)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:114
+msgid "Very big (22)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:116
+msgid "Huge (23)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:151
 msgid "Chinese (China)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:153
 msgid "Czech"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:155
 msgid "English"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:157
 msgid "Finnish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:159
 msgid "French"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:161
 msgid "German"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:153
+#: src/gui/setup_theme.cpp:163
 msgid "Indonesian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:155
+#: src/gui/setup_theme.cpp:165
 msgid "Italian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:157
+#: src/gui/setup_theme.cpp:167
 msgid "Polish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:159
+#: src/gui/setup_theme.cpp:169
 msgid "Japanese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:161
+#: src/gui/setup_theme.cpp:171
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:163
+#: src/gui/setup_theme.cpp:173
 msgid "Portuguese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:165
+#: src/gui/setup_theme.cpp:175
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:167
+#: src/gui/setup_theme.cpp:177
 msgid "Russian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:169
+#: src/gui/setup_theme.cpp:179
 msgid "Spanish (Castilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:171
+#: src/gui/setup_theme.cpp:181
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:223
+#: src/gui/setup_theme.cpp:233
 msgid "Gui theme"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:230
+#: src/gui/setup_theme.cpp:240
 msgid "Main Font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:235
+#: src/gui/setup_theme.cpp:245
 msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:239
+#: src/gui/setup_theme.cpp:249
 msgid "Bold font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:243
+#: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:247
+#: src/gui/setup_theme.cpp:257
 msgid "Help font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:251
+#: src/gui/setup_theme.cpp:261
 msgid "Secure font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:255
+#: src/gui/setup_theme.cpp:265
 msgid "Japanese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:260
+#: src/gui/setup_theme.cpp:270
 msgid "Font size"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:265
+#: src/gui/setup_theme.cpp:275
 msgid "Npc font size"
 msgstr ""
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/setup_theme.cpp:269
+#: src/gui/setup_theme.cpp:279
 msgid "i"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/setup_theme.cpp:442
+#: src/gui/setup_theme.cpp:452
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/setup_theme.cpp:467
+#: src/gui/setup_theme.cpp:477
 msgid "Theme Changed"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/setup_theme.cpp:467 src/gui/setup_video.cpp:537
+#: src/gui/setup_theme.cpp:477 src/gui/setup_video.cpp:537
 #: src/gui/setup_video.cpp:546
 msgid "Restart your client for the change to take effect."
 msgstr ""
@@ -4659,7 +4684,8 @@ msgid "Ambient FX"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_visual.cpp:140
+#. TRANSLATORS: palette color
+#: src/gui/setup_visual.cpp:140 src/gui/userpalette.cpp:146
 msgid "Particle effects"
 msgstr ""
 
@@ -4746,45 +4772,45 @@ msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/skilldialog.cpp:270 src/gui/windowmenu.cpp:112
+#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:112
 msgid "Skills"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/skilldialog.cpp:279
+#: src/gui/skilldialog.cpp:281
 msgid "Up"
 msgstr ""
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/skilldialog.cpp:391
+#: src/gui/skilldialog.cpp:393
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skills tab
-#: src/gui/skilldialog.cpp:444
+#: src/gui/skilldialog.cpp:446
 msgid "basic"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill name
-#: src/gui/skilldialog.cpp:447
+#: src/gui/skilldialog.cpp:449
 msgid "basic, 1"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/skilldialog.cpp:484
+#: src/gui/skilldialog.cpp:486
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/skilldialog.cpp:518
+#: src/gui/skilldialog.cpp:520
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/skilldialog.cpp:612 src/gui/skilldialog.cpp:762
+#: src/gui/skilldialog.cpp:614 src/gui/skilldialog.cpp:764
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -5227,7 +5253,7 @@ msgid "Trade: You"
 msgstr ""
 
 #. TRANSLATORS: trade window money label
-#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:182
+#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:184
 #, c-format
 msgid "You get %s"
 msgstr ""
@@ -5243,12 +5269,12 @@ msgid "You give:"
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:393
+#: src/gui/tradewindow.cpp:396
 msgid "You don't have enough money."
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:475
+#: src/gui/tradewindow.cpp:479
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
@@ -5260,223 +5286,223 @@ msgid "Name: %s"
 msgstr ""
 
 #. TRANSLATORS: updater window name
-#: src/gui/updaterwindow.cpp:140
+#: src/gui/updaterwindow.cpp:156
 msgid "Updating..."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:165
+#: src/gui/updaterwindow.cpp:181
 msgid "Connecting..."
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/updaterwindow.cpp:656
+#: src/gui/updaterwindow.cpp:672
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/updaterwindow.cpp:658
+#: src/gui/updaterwindow.cpp:674
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:660
+#: src/gui/updaterwindow.cpp:676
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:839
+#: src/gui/updaterwindow.cpp:855
 msgid "Completed"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
 msgid "Being"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:118
-msgid "Friend Names"
+#: src/gui/userpalette.cpp:119
+msgid "Friend names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:120
-msgid "Disregarded Names"
+#: src/gui/userpalette.cpp:121
+msgid "Disregarded names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:122
-msgid "Ignored Names"
+#: src/gui/userpalette.cpp:123
+msgid "Ignored names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:124
-msgid "Erased Names"
+#: src/gui/userpalette.cpp:125
+msgid "Erased names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:126
-msgid "Other Players' Names"
+#: src/gui/userpalette.cpp:127
+msgid "Other players names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:128
-msgid "Own Name"
+#: src/gui/userpalette.cpp:129
+msgid "Own name"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:130
-msgid "GM Names"
+#: src/gui/userpalette.cpp:131
+msgid "GM names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
 msgid "NPCs"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
 msgid "Monster HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:140
 msgid "Monster HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:141
-msgid "Party Members"
+#: src/gui/userpalette.cpp:142
+msgid "Party members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:143
-msgid "Guild Members"
+#: src/gui/userpalette.cpp:144
+msgid "Guild members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:145
-msgid "Particle Effects"
+#: src/gui/userpalette.cpp:148
+msgid "Pickup notification"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:147
-msgid "Pickup Notification"
+#: src/gui/userpalette.cpp:150
+msgid "Exp notification"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:149
-msgid "Exp Notification"
-msgstr ""
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
 msgid "Player HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
 msgid "Player HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:157
-msgid "Player Hits Monster"
+#: src/gui/userpalette.cpp:158
+msgid "Player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:159
-msgid "Monster Hits Player"
+#: src/gui/userpalette.cpp:160
+msgid "Monster hits player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:163
-msgid "Other Player Hits Local Player"
+#: src/gui/userpalette.cpp:164
+msgid "Other player hits local player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:166
 msgid "Critical Hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
-msgid "Local Player Hits Monster"
+#: src/gui/userpalette.cpp:170
+msgid "Local player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:172
-msgid "Local Player Critical Hit"
+#: src/gui/userpalette.cpp:173
+msgid "Local player critical hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:175
-msgid "Local Player Miss"
+#: src/gui/userpalette.cpp:176
+msgid "Local player miss"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:177
+#: src/gui/userpalette.cpp:178
 msgid "Misses"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
-msgid "Portal Highlight"
+#: src/gui/userpalette.cpp:180
+msgid "Portal highlight"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:183
+msgid "Default collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:182
-msgid "Default collision Highlight"
+#: src/gui/userpalette.cpp:186
+msgid "Air collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:185
-msgid "Air collision Highlight"
+#: src/gui/userpalette.cpp:189
+msgid "Water collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:188
-msgid "Water collision Highlight"
+#: src/gui/userpalette.cpp:192
+msgid "Special ground collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:191
-msgid "Special ground collision Highlight"
+#: src/gui/userpalette.cpp:195
+msgid "Walkable highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
-msgid "Walkable Highlight"
+#: src/gui/userpalette.cpp:198
+msgid "Local player attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:197
-msgid "Local Player Attack Range"
+#: src/gui/userpalette.cpp:201
+msgid "Local player attack range border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:200
-msgid "Local Player Attack Range Border"
+#: src/gui/userpalette.cpp:204
+msgid "Monster attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:203
-msgid "Monster Attack Range"
+#: src/gui/userpalette.cpp:208
+msgid "Floor item amount color"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:206
-msgid "Home Place"
+#: src/gui/userpalette.cpp:211
+msgid "Home place"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:209
-msgid "Home Place Border"
+#: src/gui/userpalette.cpp:214
+msgid "Home place border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:212
-msgid "Road Point"
+#: src/gui/userpalette.cpp:217
+msgid "Road point"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
@@ -5606,7 +5632,7 @@ msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:315
+#: src/gui/widgets/itemcontainer.cpp:317
 msgid "Eq."
 msgstr ""
 
diff --git a/po/te.po b/po/te.po
index 3c602cbb1..58843f84e 100644
--- a/po/te.po
+++ b/po/te.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-05-03 12:38+0300\n"
-"PO-Revision-Date: 2013-05-03 09:44+0000\n"
+"POT-Creation-Date: 2013-05-10 18:34+0300\n"
+"PO-Revision-Date: 2013-05-10 15:39+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -59,25 +59,25 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: full button name
-#: src/client.cpp:1136 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
+#: src/client.cpp:1137 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
 msgid "Setup"
 msgstr ""
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1140 src/gui/setup_perfomance.cpp:61
+#: src/client.cpp:1141 src/gui/setup_perfomance.cpp:61
 msgid "Perfomance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:1143 src/gui/setup_video.cpp:258
+#: src/client.cpp:1144 src/gui/setup_video.cpp:258
 msgid "Video"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1146 src/gui/setup_theme.cpp:273
+#: src/client.cpp:1147 src/gui/setup_theme.cpp:283
 msgid "Theme"
 msgstr ""
 
@@ -88,7 +88,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1150 src/gui/didyouknowwindow.cpp:78
+#: src/client.cpp:1151 src/gui/didyouknowwindow.cpp:78
 #: src/gui/inventorywindow.cpp:228 src/gui/npcdialog.cpp:63
 #: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:574
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:80
@@ -96,32 +96,32 @@ msgid "Close"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1238
+#: src/client.cpp:1239
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1282
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1320
+#: src/client.cpp:1321
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1431
+#: src/client.cpp:1432
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1471
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1483
+#: src/client.cpp:1484
 msgid "Changing game servers"
 msgstr ""
 
@@ -136,69 +136,69 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1540 src/client.cpp:1551 src/client.cpp:1721
+#: src/client.cpp:1541 src/client.cpp:1552 src/client.cpp:1722
 #: src/gui/changeemaildialog.cpp:168 src/gui/changepassworddialog.cpp:158
-#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:288
-#: src/gui/editserverdialog.cpp:220 src/gui/registerdialog.cpp:263
+#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:290
+#: src/gui/editserverdialog.cpp:216 src/gui/registerdialog.cpp:263
 #: src/gui/unregisterdialog.cpp:143 src/net/ea/charserverhandler.cpp:190
 #: src/net/ea/charserverhandler.cpp:210
 msgid "Error"
 msgstr "పొరపాటు"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1564
+#: src/client.cpp:1565
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1601
+#: src/client.cpp:1602
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1603
+#: src/client.cpp:1604
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1624
+#: src/client.cpp:1625
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1626
+#: src/client.cpp:1627
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1647
+#: src/client.cpp:1648
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1649
+#: src/client.cpp:1650
 msgid "Farewell, come back any time..."
 msgstr ""
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1902 src/client.cpp:1917 src/client.cpp:1960
-#: src/client.cpp:1976 src/client.cpp:2417 src/client.cpp:2425
+#: src/client.cpp:1903 src/client.cpp:1918 src/client.cpp:1961
+#: src/client.cpp:1977 src/client.cpp:2418 src/client.cpp:2426
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2113
+#: src/client.cpp:2114
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2154 src/client.cpp:2161
+#: src/client.cpp:2155 src/client.cpp:2162
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:2183 src/client.cpp:2196
+#: src/client.cpp:2184 src/client.cpp:2197
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -478,19 +478,19 @@ msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: bot checker window header
-#: src/gui/botcheckerwindow.cpp:269
+#: src/gui/botcheckerwindow.cpp:268
 msgid "Bot Checker"
 msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:102
+#: src/gui/botcheckerwindow.cpp:277 src/gui/npcdialog.cpp:102
 msgid "Reset"
 msgstr ""
 
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: relations table header
-#: src/gui/botcheckerwindow.cpp:305 src/gui/setup_relations.cpp:61
+#: src/gui/botcheckerwindow.cpp:304 src/gui/setup_relations.cpp:61
 msgid "Name"
 msgstr "పేరు"
 
@@ -498,7 +498,7 @@ msgstr "పేరు"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:145
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:145
 #: src/gui/popupmenu.cpp:241 src/gui/popupmenu.cpp:640
 #: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:257
 #: src/net/tmwa/generalhandler.cpp:292
@@ -508,7 +508,7 @@ msgstr ""
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
-#: src/gui/botcheckerwindow.cpp:309 src/gui/popupmenu.cpp:225
+#: src/gui/botcheckerwindow.cpp:308 src/gui/popupmenu.cpp:225
 #: src/gui/setupactiondata.h:93
 msgid "Talk"
 msgstr ""
@@ -516,7 +516,7 @@ msgstr ""
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/botcheckerwindow.cpp:311 src/gui/popupmenu.cpp:215
+#: src/gui/botcheckerwindow.cpp:310 src/gui/popupmenu.cpp:215
 #: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:371
 #: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:653
 #: src/gui/popupmenu.cpp:727 src/gui/setupactiondata.h:1856
@@ -524,7 +524,7 @@ msgid "Move"
 msgstr ""
 
 #. TRANSLATORS: bot checker window table header
-#: src/gui/botcheckerwindow.cpp:313
+#: src/gui/botcheckerwindow.cpp:312
 msgid "Result"
 msgstr ""
 
@@ -580,7 +580,7 @@ msgstr ""
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:516
+#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:511
 #: src/gui/selldialog.cpp:94 src/gui/selldialog.cpp:342
 #, c-format
 msgid "Price: %s / Total: %s"
@@ -597,9 +597,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:208
-#: src/gui/itemamountwindow.cpp:243 src/gui/npcdialog.cpp:93
-#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:833
+#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:202
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:93
+#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:821
 msgid "+"
 msgstr ""
 
@@ -609,9 +609,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:240 src/gui/npcdialog.cpp:95
-#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:846
+#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:200
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:95
+#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:834
 msgid "-"
 msgstr ""
 
@@ -623,7 +623,7 @@ msgstr ""
 #. TRANSLATORS: input action name
 #: src/gui/buydialog.cpp:260 src/gui/quitdialog.cpp:54
 #: src/gui/quitdialog.cpp:59 src/gui/quitdialog.cpp:61
-#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:255
+#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:264
 #: src/gui/setupactiondata.h:177
 msgid "Quit"
 msgstr "నిష్క్రమించు"
@@ -635,7 +635,7 @@ msgstr "నిష్క్రమించు"
 #. TRANSLATORS: status bar label
 #: src/gui/buydialog.cpp:262 src/gui/selldialog.cpp:106
 #: src/gui/statuswindow.cpp:558 src/gui/statuswindow.cpp:615
-#: src/gui/statuswindow.cpp:830 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:852
 msgid "Max"
 msgstr "గరిష్ఠ"
 
@@ -680,7 +680,7 @@ msgstr ""
 #: src/gui/buyselldialog.cpp:71 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:120
 #: src/gui/connectiondialog.cpp:48 src/gui/editserverdialog.cpp:80
-#: src/gui/itemamountwindow.cpp:212 src/gui/npcpostdialog.cpp:64
+#: src/gui/itemamountwindow.cpp:206 src/gui/npcpostdialog.cpp:64
 #: src/gui/popupmenu.cpp:290 src/gui/popupmenu.cpp:324
 #: src/gui/popupmenu.cpp:411 src/gui/popupmenu.cpp:454
 #: src/gui/popupmenu.cpp:485 src/gui/popupmenu.cpp:512
@@ -696,7 +696,7 @@ msgstr ""
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
 #: src/gui/setup.cpp:84 src/gui/socialwindow.cpp:1204
 #: src/gui/textcommandeditor.cpp:212 src/gui/textdialog.cpp:53
-#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:167
+#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:183
 msgid "Cancel"
 msgstr "రద్దుచేయి"
 
@@ -860,7 +860,7 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:570
+#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:581
 #: src/gui/socialwindow.cpp:1269
 msgid "Create"
 msgstr "సృష్టించు"
@@ -887,17 +887,17 @@ msgid "Please remove %d points"
 msgstr ""
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:60
+#: src/gui/charselectdialog.cpp:61
 msgid "Confirm Character Delete"
 msgstr ""
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:62
+#: src/gui/charselectdialog.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:86
+#: src/gui/charselectdialog.cpp:87
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
@@ -909,8 +909,8 @@ msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:565
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:576
+#: src/gui/updaterwindow.cpp:185
 msgid "Play"
 msgstr ""
 
@@ -926,7 +926,7 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:263
+#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:272
 #: src/gui/setupactiondata.h:1803 src/gui/setup_relations.cpp:262
 #: src/gui/shopwindow.cpp:96 src/gui/shopwindow.cpp:103
 #: src/gui/textcommandeditor.cpp:216
@@ -936,24 +936,24 @@ msgstr "తొలగించు"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/charselectdialog.cpp:129 src/gui/unregisterdialog.cpp:48
+#: src/gui/charselectdialog.cpp:130 src/gui/unregisterdialog.cpp:48
 #: src/gui/unregisterdialog.cpp:53
 msgid "Unregister"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/charselectdialog.cpp:141
+#: src/gui/charselectdialog.cpp:142
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:172
+#: src/gui/charselectdialog.cpp:175
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/charselectdialog.cpp:246
+#: src/gui/charselectdialog.cpp:248
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -963,16 +963,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:288
+#: src/gui/charselectdialog.cpp:290
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password:"
 msgstr ""
 
@@ -1059,13 +1059,13 @@ msgid "Chat"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:735
+#: src/gui/chatwindow.cpp:638
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1165
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -1083,7 +1083,7 @@ msgstr "కాదు"
 
 #. TRANSLATORS: confirm dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/confirmdialog.cpp:58 src/gui/popupmenu.cpp:2429
+#: src/gui/confirmdialog.cpp:55 src/gui/popupmenu.cpp:2429
 #: src/gui/popupmenu.cpp:2442 src/gui/popupmenu.cpp:2457
 #: src/gui/popupmenu.cpp:2483
 msgid "Ignore"
@@ -1092,7 +1092,7 @@ msgstr ""
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
 #. TRANSLATORS: settings group
-#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:109
+#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:108
 #: src/gui/setup_other.cpp:123 src/gui/windowmenu.cpp:106
 msgid "Map"
 msgstr "పటం"
@@ -1108,190 +1108,190 @@ msgid "Net"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:265
-#: src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:268
+#: src/gui/debugwindow.cpp:311
 msgid "Music:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:153 src/gui/debugwindow.cpp:271
-#: src/gui/debugwindow.cpp:312
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:274
+#: src/gui/debugwindow.cpp:315
 msgid "Map:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:155 src/gui/debugwindow.cpp:268
-#: src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:271
+#: src/gui/debugwindow.cpp:313
 msgid "Minimap:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:262
-#: src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:161 src/gui/debugwindow.cpp:265
+#: src/gui/debugwindow.cpp:309
 msgid "Cursor:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:161
+#: src/gui/debugwindow.cpp:164
 msgid "Particle count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:284
-#: src/gui/debugwindow.cpp:316
+#: src/gui/debugwindow.cpp:167 src/gui/debugwindow.cpp:287
+#: src/gui/debugwindow.cpp:319
 msgid "Map actors count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:166 src/gui/debugwindow.cpp:243
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:169 src/gui/debugwindow.cpp:246
+#: src/gui/debugwindow.cpp:252
 msgid "Player Position:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:172 src/gui/debugwindow.cpp:297
+#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:300
 msgid "Draw calls:"
 msgstr ""
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:175
+#. TRANSLATORS: debug window label, frames per second
+#: src/gui/debugwindow.cpp:178
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:177 src/gui/debugwindow.cpp:324
+#. TRANSLATORS: debug window label, logic per second
+#: src/gui/debugwindow.cpp:180 src/gui/debugwindow.cpp:327
 #, c-format
 msgid "%d LPS"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:191 src/gui/debugwindow.cpp:209
 #, c-format
 msgid "%d FPS (Software)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:193
+#: src/gui/debugwindow.cpp:196
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:197
+#: src/gui/debugwindow.cpp:200
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:201
+#: src/gui/debugwindow.cpp:204
 #, c-format
 msgid "%d FPS (mobile OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:225 src/gui/debugwindow.cpp:290
+#: src/gui/debugwindow.cpp:228 src/gui/debugwindow.cpp:293
 msgid "Textures count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:279
+#: src/gui/debugwindow.cpp:282
 #, c-format
 msgid "Particle count: %d"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:330 src/gui/debugwindow.cpp:380
-#: src/gui/debugwindow.cpp:442
+#: src/gui/debugwindow.cpp:333 src/gui/debugwindow.cpp:383
+#: src/gui/debugwindow.cpp:445
 msgid "Target:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:332 src/gui/debugwindow.cpp:386
-#: src/gui/debugwindow.cpp:444
+#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
+#: src/gui/debugwindow.cpp:447
 msgid "Target Id:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
-#: src/gui/debugwindow.cpp:446
+#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:392
+#: src/gui/debugwindow.cpp:449
 msgid "Target type:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:337
+#: src/gui/debugwindow.cpp:340
 msgid "Target level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:339 src/gui/debugwindow.cpp:405
+#: src/gui/debugwindow.cpp:342 src/gui/debugwindow.cpp:408
 msgid "Target race:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:341
+#: src/gui/debugwindow.cpp:344
 msgid "Target party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:346
 msgid "Target guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:430
-#: src/gui/debugwindow.cpp:436 src/gui/debugwindow.cpp:454
+#: src/gui/debugwindow.cpp:348 src/gui/debugwindow.cpp:433
+#: src/gui/debugwindow.cpp:439 src/gui/debugwindow.cpp:457
 msgid "Attack delay:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:347 src/gui/debugwindow.cpp:417
-#: src/gui/debugwindow.cpp:456
+#: src/gui/debugwindow.cpp:350 src/gui/debugwindow.cpp:420
+#: src/gui/debugwindow.cpp:459
 msgid "Minimal hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:349 src/gui/debugwindow.cpp:420
-#: src/gui/debugwindow.cpp:458
+#: src/gui/debugwindow.cpp:352 src/gui/debugwindow.cpp:423
+#: src/gui/debugwindow.cpp:461
 msgid "Maximum hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:351 src/gui/debugwindow.cpp:423
-#: src/gui/debugwindow.cpp:460
+#: src/gui/debugwindow.cpp:354 src/gui/debugwindow.cpp:426
+#: src/gui/debugwindow.cpp:463
 msgid "Critical hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:394 src/gui/debugwindow.cpp:400
-#: src/gui/debugwindow.cpp:448
+#: src/gui/debugwindow.cpp:397 src/gui/debugwindow.cpp:403
+#: src/gui/debugwindow.cpp:451
 msgid "Target Level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:408 src/gui/debugwindow.cpp:450
+#: src/gui/debugwindow.cpp:411 src/gui/debugwindow.cpp:453
 msgid "Target Party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:412 src/gui/debugwindow.cpp:452
+#: src/gui/debugwindow.cpp:415 src/gui/debugwindow.cpp:455
 msgid "Target Guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:493
+#: src/gui/debugwindow.cpp:496
 #, c-format
 msgid "Ping: %s ms"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:496
+#: src/gui/debugwindow.cpp:499
 #, c-format
 msgid "In: %d bytes/s"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:499
+#: src/gui/debugwindow.cpp:502
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
@@ -1323,7 +1323,7 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #: src/gui/editdialog.cpp:45 src/gui/editserverdialog.cpp:78
-#: src/gui/itemamountwindow.cpp:210 src/gui/okdialog.cpp:51
+#: src/gui/itemamountwindow.cpp:204 src/gui/okdialog.cpp:51
 #: src/gui/quitdialog.cpp:70 src/gui/textdialog.cpp:46
 msgid "OK"
 msgstr "సరే"
@@ -1335,7 +1335,7 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:257
+#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:266
 msgid "Connect"
 msgstr ""
 
@@ -1365,7 +1365,7 @@ msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/editserverdialog.cpp:222
+#: src/gui/editserverdialog.cpp:218
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -1417,7 +1417,7 @@ msgstr ""
 #: src/gui/inventorywindow.cpp:178 src/gui/inventorywindow.cpp:630
 #: src/gui/popupmenu.cpp:1843 src/gui/popupmenu.cpp:1922
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2041
-#: src/gui/skilldialog.cpp:277
+#: src/gui/skilldialog.cpp:279
 msgid "Use"
 msgstr ""
 
@@ -1451,7 +1451,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: setup button
-#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:718
+#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:719
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1992
 #: src/gui/popupmenu.cpp:2066 src/gui/setup.cpp:86
 msgid "Store"
@@ -1473,47 +1473,47 @@ msgid "Drop"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/itemamountwindow.cpp:214
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "అన్నీ"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:264
 msgid "Select amount of items to trade."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:274
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to drop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:278
+#: src/gui/itemamountwindow.cpp:272
 msgid "Select amount of items to store."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:276
 msgid "Select amount of items to retrieve."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:286
+#: src/gui/itemamountwindow.cpp:280
 msgid "Select amount of items to split."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:290
+#: src/gui/itemamountwindow.cpp:284
 msgid "Add to buy shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:294
+#: src/gui/itemamountwindow.cpp:288
 msgid "Add to sell shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:298
+#: src/gui/itemamountwindow.cpp:292
 msgid "Unknown."
 msgstr ""
 
@@ -1540,7 +1540,7 @@ msgstr ""
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:58 src/gui/killstats.cpp:171
-#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:516
+#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:509
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
@@ -1548,7 +1548,7 @@ msgstr ""
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:61 src/gui/killstats.cpp:173
 #: src/gui/killstats.cpp:253 src/gui/killstats.cpp:268
-#: src/gui/killstats.cpp:518
+#: src/gui/killstats.cpp:511
 #, c-format
 msgid "Avg Exp: %s"
 msgstr ""
@@ -1556,14 +1556,14 @@ msgstr ""
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:63 src/gui/killstats.cpp:176
 #: src/gui/killstats.cpp:258 src/gui/killstats.cpp:272
-#: src/gui/killstats.cpp:521
+#: src/gui/killstats.cpp:514
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:66 src/gui/killstats.cpp:187
-#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:524
+#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:517
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
@@ -1591,9 +1591,9 @@ msgid "Last kill exp:"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:414
-#: src/gui/killstats.cpp:421 src/gui/killstats.cpp:428
-#: src/gui/killstats.cpp:434
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:408
+#: src/gui/killstats.cpp:415 src/gui/killstats.cpp:422
+#: src/gui/killstats.cpp:428
 msgid "Time before jacko spawn:"
 msgstr ""
 
@@ -1625,12 +1625,12 @@ msgid "  Time for next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:421
+#: src/gui/killstats.cpp:415
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:428
+#: src/gui/killstats.cpp:422
 msgid "jacko spawning"
 msgstr ""
 
@@ -1736,32 +1736,32 @@ msgid "arrows bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:88
+#: src/gui/ministatuswindow.cpp:89
 msgid "status bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:108
+#: src/gui/ministatuswindow.cpp:109
 msgid "job bar"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:306 src/gui/statuswindow.cpp:298
+#: src/gui/ministatuswindow.cpp:307 src/gui/statuswindow.cpp:298
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:313 src/gui/statuswindow.cpp:141
+#: src/gui/ministatuswindow.cpp:314 src/gui/statuswindow.cpp:141
 #: src/gui/statuswindow.cpp:305 src/gui/statuswindow.cpp:375
 #, c-format
 msgid "Level: %d"
 msgstr "స్థాయి: %d"
 
 #. TRANSLATORS: status bar label
-#: src/gui/ministatuswindow.cpp:330 src/gui/ministatuswindow.cpp:367
+#: src/gui/ministatuswindow.cpp:331 src/gui/ministatuswindow.cpp:368
 msgid "Need"
 msgstr ""
 
@@ -2149,7 +2149,7 @@ msgstr ""
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2209 src/gui/popupmenu.cpp:2280
-#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:139
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
 #: src/gui/socialwindow.cpp:934
 msgid "(default)"
 msgstr ""
@@ -2332,7 +2332,7 @@ msgid "Passwords do not match."
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:257
 msgid "Choose Your Server"
 msgstr ""
 
@@ -2340,61 +2340,61 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:259 src/gui/shopwindow.cpp:94
+#: src/gui/serverdialog.cpp:268 src/gui/shopwindow.cpp:94
 #: src/gui/shopwindow.cpp:101 src/gui/tradewindow.cpp:77
 msgid "Add"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
-#: src/gui/serverdialog.cpp:261 src/gui/widgets/setupitem.cpp:299
+#: src/gui/serverdialog.cpp:270 src/gui/widgets/setupitem.cpp:299
 #: src/gui/widgets/setupitem.cpp:426
 msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:274
 msgid "Load"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:279
+#: src/gui/serverdialog.cpp:288
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:297
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:518
+#: src/gui/serverdialog.cpp:527
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:524
+#: src/gui/serverdialog.cpp:533
 msgid "Waiting for server..."
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:529
+#: src/gui/serverdialog.cpp:538
 msgid "Preparing download"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:534
+#: src/gui/serverdialog.cpp:543
 msgid "Error retreiving server list!"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:626
+#: src/gui/serverdialog.cpp:635
 msgid "requires a newer version"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:631
+#: src/gui/serverdialog.cpp:640
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -3405,7 +3405,7 @@ msgid "Type:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:334
+#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:336
 msgid "Delay:"
 msgstr ""
 
@@ -3425,30 +3425,30 @@ msgid "Blue:"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:420
+#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:422
 msgid "Static"
 msgstr ""
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:107 src/gui/setup_colors.cpp:110
-#: src/gui/setup_colors.cpp:422
+#: src/gui/setup_colors.cpp:424
 msgid "Pulse"
 msgstr ""
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:112 src/gui/setup_colors.cpp:115
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Rainbow"
 msgstr "ఇంద్ర ధనస్సు"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:117 src/gui/setup_colors.cpp:120
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Spectrum"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:328
+#: src/gui/setup_colors.cpp:330
 msgid "Alpha:"
 msgstr ""
 
@@ -3614,7 +3614,7 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: palette color
-#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:134
+#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:135
 msgid "Monsters"
 msgstr ""
 
@@ -4163,206 +4163,231 @@ msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:86
-msgid "Very small (9)"
+msgid "Very small (8)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:88
-msgid "Tiny (10)"
+msgid "Very small (9)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:90
-msgid "Small (11)"
+msgid "Tiny (10)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:92
-msgid "Medium (12)"
+msgid "Small (11)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:94
-msgid "Normal (13)"
+msgid "Medium (12)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:96
-msgid "Large (14)"
+msgid "Normal (13)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:98
-msgid "Very large (15)"
+msgid "Large (14)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:100
-msgid "Big (16)"
+msgid "Large (15)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:102
-msgid "Very big (17)"
+msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:104
-msgid "Huge (18)"
+msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:106
-msgid "Very huge (19)"
+msgid "Big (18)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:108
+msgid "Big (19)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:110
+msgid "Very big (20)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:112
+msgid "Very big (21)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:114
+msgid "Very big (22)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:116
+msgid "Huge (23)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:151
 msgid "Chinese (China)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:153
 msgid "Czech"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:155
 msgid "English"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:157
 msgid "Finnish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:159
 msgid "French"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:161
 msgid "German"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:153
+#: src/gui/setup_theme.cpp:163
 msgid "Indonesian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:155
+#: src/gui/setup_theme.cpp:165
 msgid "Italian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:157
+#: src/gui/setup_theme.cpp:167
 msgid "Polish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:159
+#: src/gui/setup_theme.cpp:169
 msgid "Japanese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:161
+#: src/gui/setup_theme.cpp:171
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:163
+#: src/gui/setup_theme.cpp:173
 msgid "Portuguese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:165
+#: src/gui/setup_theme.cpp:175
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:167
+#: src/gui/setup_theme.cpp:177
 msgid "Russian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:169
+#: src/gui/setup_theme.cpp:179
 msgid "Spanish (Castilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:171
+#: src/gui/setup_theme.cpp:181
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:223
+#: src/gui/setup_theme.cpp:233
 msgid "Gui theme"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:230
+#: src/gui/setup_theme.cpp:240
 msgid "Main Font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:235
+#: src/gui/setup_theme.cpp:245
 msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:239
+#: src/gui/setup_theme.cpp:249
 msgid "Bold font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:243
+#: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:247
+#: src/gui/setup_theme.cpp:257
 msgid "Help font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:251
+#: src/gui/setup_theme.cpp:261
 msgid "Secure font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:255
+#: src/gui/setup_theme.cpp:265
 msgid "Japanese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:260
+#: src/gui/setup_theme.cpp:270
 msgid "Font size"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:265
+#: src/gui/setup_theme.cpp:275
 msgid "Npc font size"
 msgstr ""
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/setup_theme.cpp:269
+#: src/gui/setup_theme.cpp:279
 msgid "i"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/setup_theme.cpp:442
+#: src/gui/setup_theme.cpp:452
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/setup_theme.cpp:467
+#: src/gui/setup_theme.cpp:477
 msgid "Theme Changed"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/setup_theme.cpp:467 src/gui/setup_video.cpp:537
+#: src/gui/setup_theme.cpp:477 src/gui/setup_video.cpp:537
 #: src/gui/setup_video.cpp:546
 msgid "Restart your client for the change to take effect."
 msgstr ""
@@ -4660,7 +4685,8 @@ msgid "Ambient FX"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_visual.cpp:140
+#. TRANSLATORS: palette color
+#: src/gui/setup_visual.cpp:140 src/gui/userpalette.cpp:146
 msgid "Particle effects"
 msgstr ""
 
@@ -4747,45 +4773,45 @@ msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/skilldialog.cpp:270 src/gui/windowmenu.cpp:112
+#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:112
 msgid "Skills"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/skilldialog.cpp:279
+#: src/gui/skilldialog.cpp:281
 msgid "Up"
 msgstr ""
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/skilldialog.cpp:391
+#: src/gui/skilldialog.cpp:393
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skills tab
-#: src/gui/skilldialog.cpp:444
+#: src/gui/skilldialog.cpp:446
 msgid "basic"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill name
-#: src/gui/skilldialog.cpp:447
+#: src/gui/skilldialog.cpp:449
 msgid "basic, 1"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/skilldialog.cpp:484
+#: src/gui/skilldialog.cpp:486
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/skilldialog.cpp:518
+#: src/gui/skilldialog.cpp:520
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/skilldialog.cpp:612 src/gui/skilldialog.cpp:762
+#: src/gui/skilldialog.cpp:614 src/gui/skilldialog.cpp:764
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -5228,7 +5254,7 @@ msgid "Trade: You"
 msgstr ""
 
 #. TRANSLATORS: trade window money label
-#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:182
+#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:184
 #, c-format
 msgid "You get %s"
 msgstr ""
@@ -5244,12 +5270,12 @@ msgid "You give:"
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:393
+#: src/gui/tradewindow.cpp:396
 msgid "You don't have enough money."
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:475
+#: src/gui/tradewindow.cpp:479
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
@@ -5261,223 +5287,223 @@ msgid "Name: %s"
 msgstr "పేరు: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/updaterwindow.cpp:140
+#: src/gui/updaterwindow.cpp:156
 msgid "Updating..."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:165
+#: src/gui/updaterwindow.cpp:181
 msgid "Connecting..."
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/updaterwindow.cpp:656
+#: src/gui/updaterwindow.cpp:672
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/updaterwindow.cpp:658
+#: src/gui/updaterwindow.cpp:674
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:660
+#: src/gui/updaterwindow.cpp:676
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:839
+#: src/gui/updaterwindow.cpp:855
 msgid "Completed"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
 msgid "Being"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:118
-msgid "Friend Names"
+#: src/gui/userpalette.cpp:119
+msgid "Friend names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:120
-msgid "Disregarded Names"
+#: src/gui/userpalette.cpp:121
+msgid "Disregarded names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:122
-msgid "Ignored Names"
+#: src/gui/userpalette.cpp:123
+msgid "Ignored names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:124
-msgid "Erased Names"
+#: src/gui/userpalette.cpp:125
+msgid "Erased names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:126
-msgid "Other Players' Names"
+#: src/gui/userpalette.cpp:127
+msgid "Other players names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:128
-msgid "Own Name"
+#: src/gui/userpalette.cpp:129
+msgid "Own name"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:130
-msgid "GM Names"
+#: src/gui/userpalette.cpp:131
+msgid "GM names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
 msgid "NPCs"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
 msgid "Monster HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:140
 msgid "Monster HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:141
-msgid "Party Members"
+#: src/gui/userpalette.cpp:142
+msgid "Party members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:143
-msgid "Guild Members"
+#: src/gui/userpalette.cpp:144
+msgid "Guild members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:145
-msgid "Particle Effects"
+#: src/gui/userpalette.cpp:148
+msgid "Pickup notification"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:147
-msgid "Pickup Notification"
+#: src/gui/userpalette.cpp:150
+msgid "Exp notification"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:149
-msgid "Exp Notification"
-msgstr ""
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
 msgid "Player HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
 msgid "Player HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:157
-msgid "Player Hits Monster"
+#: src/gui/userpalette.cpp:158
+msgid "Player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:159
-msgid "Monster Hits Player"
+#: src/gui/userpalette.cpp:160
+msgid "Monster hits player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:163
-msgid "Other Player Hits Local Player"
+#: src/gui/userpalette.cpp:164
+msgid "Other player hits local player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:166
 msgid "Critical Hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
-msgid "Local Player Hits Monster"
+#: src/gui/userpalette.cpp:170
+msgid "Local player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:172
-msgid "Local Player Critical Hit"
+#: src/gui/userpalette.cpp:173
+msgid "Local player critical hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:175
-msgid "Local Player Miss"
+#: src/gui/userpalette.cpp:176
+msgid "Local player miss"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:177
+#: src/gui/userpalette.cpp:178
 msgid "Misses"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
-msgid "Portal Highlight"
+#: src/gui/userpalette.cpp:180
+msgid "Portal highlight"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:183
+msgid "Default collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:182
-msgid "Default collision Highlight"
+#: src/gui/userpalette.cpp:186
+msgid "Air collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:185
-msgid "Air collision Highlight"
+#: src/gui/userpalette.cpp:189
+msgid "Water collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:188
-msgid "Water collision Highlight"
+#: src/gui/userpalette.cpp:192
+msgid "Special ground collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:191
-msgid "Special ground collision Highlight"
+#: src/gui/userpalette.cpp:195
+msgid "Walkable highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
-msgid "Walkable Highlight"
+#: src/gui/userpalette.cpp:198
+msgid "Local player attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:197
-msgid "Local Player Attack Range"
+#: src/gui/userpalette.cpp:201
+msgid "Local player attack range border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:200
-msgid "Local Player Attack Range Border"
+#: src/gui/userpalette.cpp:204
+msgid "Monster attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:203
-msgid "Monster Attack Range"
+#: src/gui/userpalette.cpp:208
+msgid "Floor item amount color"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:206
-msgid "Home Place"
+#: src/gui/userpalette.cpp:211
+msgid "Home place"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:209
-msgid "Home Place Border"
+#: src/gui/userpalette.cpp:214
+msgid "Home place border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:212
-msgid "Road Point"
+#: src/gui/userpalette.cpp:217
+msgid "Road point"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
@@ -5607,7 +5633,7 @@ msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:315
+#: src/gui/widgets/itemcontainer.cpp:317
 msgid "Eq."
 msgstr ""
 
diff --git a/po/th.po b/po/th.po
index 291d289a6..4d9a49961 100644
--- a/po/th.po
+++ b/po/th.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-05-03 12:38+0300\n"
-"PO-Revision-Date: 2013-05-03 09:44+0000\n"
+"POT-Creation-Date: 2013-05-10 18:34+0300\n"
+"PO-Revision-Date: 2013-05-10 15:39+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -59,25 +59,25 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: full button name
-#: src/client.cpp:1136 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
+#: src/client.cpp:1137 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
 msgid "Setup"
 msgstr "ตั้งค่า"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1140 src/gui/setup_perfomance.cpp:61
+#: src/client.cpp:1141 src/gui/setup_perfomance.cpp:61
 msgid "Perfomance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:1143 src/gui/setup_video.cpp:258
+#: src/client.cpp:1144 src/gui/setup_video.cpp:258
 msgid "Video"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1146 src/gui/setup_theme.cpp:273
+#: src/client.cpp:1147 src/gui/setup_theme.cpp:283
 msgid "Theme"
 msgstr ""
 
@@ -88,7 +88,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1150 src/gui/didyouknowwindow.cpp:78
+#: src/client.cpp:1151 src/gui/didyouknowwindow.cpp:78
 #: src/gui/inventorywindow.cpp:228 src/gui/npcdialog.cpp:63
 #: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:574
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:80
@@ -96,32 +96,32 @@ msgid "Close"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1238
+#: src/client.cpp:1239
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1282
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1320
+#: src/client.cpp:1321
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1431
+#: src/client.cpp:1432
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1471
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1483
+#: src/client.cpp:1484
 msgid "Changing game servers"
 msgstr ""
 
@@ -136,69 +136,69 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1540 src/client.cpp:1551 src/client.cpp:1721
+#: src/client.cpp:1541 src/client.cpp:1552 src/client.cpp:1722
 #: src/gui/changeemaildialog.cpp:168 src/gui/changepassworddialog.cpp:158
-#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:288
-#: src/gui/editserverdialog.cpp:220 src/gui/registerdialog.cpp:263
+#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:290
+#: src/gui/editserverdialog.cpp:216 src/gui/registerdialog.cpp:263
 #: src/gui/unregisterdialog.cpp:143 src/net/ea/charserverhandler.cpp:190
 #: src/net/ea/charserverhandler.cpp:210
 msgid "Error"
 msgstr "ผิดพลาด"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1564
+#: src/client.cpp:1565
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1601
+#: src/client.cpp:1602
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1603
+#: src/client.cpp:1604
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1624
+#: src/client.cpp:1625
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1626
+#: src/client.cpp:1627
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1647
+#: src/client.cpp:1648
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1649
+#: src/client.cpp:1650
 msgid "Farewell, come back any time..."
 msgstr ""
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1902 src/client.cpp:1917 src/client.cpp:1960
-#: src/client.cpp:1976 src/client.cpp:2417 src/client.cpp:2425
+#: src/client.cpp:1903 src/client.cpp:1918 src/client.cpp:1961
+#: src/client.cpp:1977 src/client.cpp:2418 src/client.cpp:2426
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2113
+#: src/client.cpp:2114
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2154 src/client.cpp:2161
+#: src/client.cpp:2155 src/client.cpp:2162
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:2183 src/client.cpp:2196
+#: src/client.cpp:2184 src/client.cpp:2197
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -478,19 +478,19 @@ msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: bot checker window header
-#: src/gui/botcheckerwindow.cpp:269
+#: src/gui/botcheckerwindow.cpp:268
 msgid "Bot Checker"
 msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:102
+#: src/gui/botcheckerwindow.cpp:277 src/gui/npcdialog.cpp:102
 msgid "Reset"
 msgstr ""
 
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: relations table header
-#: src/gui/botcheckerwindow.cpp:305 src/gui/setup_relations.cpp:61
+#: src/gui/botcheckerwindow.cpp:304 src/gui/setup_relations.cpp:61
 msgid "Name"
 msgstr ""
 
@@ -498,7 +498,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:145
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:145
 #: src/gui/popupmenu.cpp:241 src/gui/popupmenu.cpp:640
 #: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:257
 #: src/net/tmwa/generalhandler.cpp:292
@@ -508,7 +508,7 @@ msgstr ""
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
-#: src/gui/botcheckerwindow.cpp:309 src/gui/popupmenu.cpp:225
+#: src/gui/botcheckerwindow.cpp:308 src/gui/popupmenu.cpp:225
 #: src/gui/setupactiondata.h:93
 msgid "Talk"
 msgstr ""
@@ -516,7 +516,7 @@ msgstr ""
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/botcheckerwindow.cpp:311 src/gui/popupmenu.cpp:215
+#: src/gui/botcheckerwindow.cpp:310 src/gui/popupmenu.cpp:215
 #: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:371
 #: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:653
 #: src/gui/popupmenu.cpp:727 src/gui/setupactiondata.h:1856
@@ -524,7 +524,7 @@ msgid "Move"
 msgstr ""
 
 #. TRANSLATORS: bot checker window table header
-#: src/gui/botcheckerwindow.cpp:313
+#: src/gui/botcheckerwindow.cpp:312
 msgid "Result"
 msgstr ""
 
@@ -580,7 +580,7 @@ msgstr "ซื้อ"
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:516
+#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:511
 #: src/gui/selldialog.cpp:94 src/gui/selldialog.cpp:342
 #, c-format
 msgid "Price: %s / Total: %s"
@@ -597,9 +597,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:208
-#: src/gui/itemamountwindow.cpp:243 src/gui/npcdialog.cpp:93
-#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:833
+#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:202
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:93
+#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:821
 msgid "+"
 msgstr ""
 
@@ -609,9 +609,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:240 src/gui/npcdialog.cpp:95
-#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:846
+#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:200
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:95
+#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:834
 msgid "-"
 msgstr ""
 
@@ -623,7 +623,7 @@ msgstr ""
 #. TRANSLATORS: input action name
 #: src/gui/buydialog.cpp:260 src/gui/quitdialog.cpp:54
 #: src/gui/quitdialog.cpp:59 src/gui/quitdialog.cpp:61
-#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:255
+#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:264
 #: src/gui/setupactiondata.h:177
 msgid "Quit"
 msgstr "ออก"
@@ -635,7 +635,7 @@ msgstr "ออก"
 #. TRANSLATORS: status bar label
 #: src/gui/buydialog.cpp:262 src/gui/selldialog.cpp:106
 #: src/gui/statuswindow.cpp:558 src/gui/statuswindow.cpp:615
-#: src/gui/statuswindow.cpp:830 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:852
 msgid "Max"
 msgstr ""
 
@@ -680,7 +680,7 @@ msgstr ""
 #: src/gui/buyselldialog.cpp:71 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:120
 #: src/gui/connectiondialog.cpp:48 src/gui/editserverdialog.cpp:80
-#: src/gui/itemamountwindow.cpp:212 src/gui/npcpostdialog.cpp:64
+#: src/gui/itemamountwindow.cpp:206 src/gui/npcpostdialog.cpp:64
 #: src/gui/popupmenu.cpp:290 src/gui/popupmenu.cpp:324
 #: src/gui/popupmenu.cpp:411 src/gui/popupmenu.cpp:454
 #: src/gui/popupmenu.cpp:485 src/gui/popupmenu.cpp:512
@@ -696,7 +696,7 @@ msgstr ""
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
 #: src/gui/setup.cpp:84 src/gui/socialwindow.cpp:1204
 #: src/gui/textcommandeditor.cpp:212 src/gui/textdialog.cpp:53
-#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:167
+#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:183
 msgid "Cancel"
 msgstr "ยกเลิก"
 
@@ -860,7 +860,7 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:570
+#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:581
 #: src/gui/socialwindow.cpp:1269
 msgid "Create"
 msgstr "สร้าง"
@@ -887,17 +887,17 @@ msgid "Please remove %d points"
 msgstr ""
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:60
+#: src/gui/charselectdialog.cpp:61
 msgid "Confirm Character Delete"
 msgstr "ยืนยันการลบตัวละคร"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:62
+#: src/gui/charselectdialog.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "คุณแน่ใจแล้วหรือที่จะลบตัวละครนี้?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:86
+#: src/gui/charselectdialog.cpp:87
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
@@ -909,8 +909,8 @@ msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:565
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:576
+#: src/gui/updaterwindow.cpp:185
 msgid "Play"
 msgstr ""
 
@@ -926,7 +926,7 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:263
+#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:272
 #: src/gui/setupactiondata.h:1803 src/gui/setup_relations.cpp:262
 #: src/gui/shopwindow.cpp:96 src/gui/shopwindow.cpp:103
 #: src/gui/textcommandeditor.cpp:216
@@ -936,24 +936,24 @@ msgstr "ลบทิ้ง"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/charselectdialog.cpp:129 src/gui/unregisterdialog.cpp:48
+#: src/gui/charselectdialog.cpp:130 src/gui/unregisterdialog.cpp:48
 #: src/gui/unregisterdialog.cpp:53
 msgid "Unregister"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/charselectdialog.cpp:141
+#: src/gui/charselectdialog.cpp:142
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:172
+#: src/gui/charselectdialog.cpp:175
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/charselectdialog.cpp:246
+#: src/gui/charselectdialog.cpp:248
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -963,16 +963,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:288
+#: src/gui/charselectdialog.cpp:290
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password:"
 msgstr ""
 
@@ -1059,13 +1059,13 @@ msgid "Chat"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:735
+#: src/gui/chatwindow.cpp:638
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1165
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -1083,7 +1083,7 @@ msgstr "ไม่"
 
 #. TRANSLATORS: confirm dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/confirmdialog.cpp:58 src/gui/popupmenu.cpp:2429
+#: src/gui/confirmdialog.cpp:55 src/gui/popupmenu.cpp:2429
 #: src/gui/popupmenu.cpp:2442 src/gui/popupmenu.cpp:2457
 #: src/gui/popupmenu.cpp:2483
 msgid "Ignore"
@@ -1092,7 +1092,7 @@ msgstr ""
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
 #. TRANSLATORS: settings group
-#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:109
+#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:108
 #: src/gui/setup_other.cpp:123 src/gui/windowmenu.cpp:106
 msgid "Map"
 msgstr ""
@@ -1108,190 +1108,190 @@ msgid "Net"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:265
-#: src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:268
+#: src/gui/debugwindow.cpp:311
 msgid "Music:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:153 src/gui/debugwindow.cpp:271
-#: src/gui/debugwindow.cpp:312
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:274
+#: src/gui/debugwindow.cpp:315
 msgid "Map:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:155 src/gui/debugwindow.cpp:268
-#: src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:271
+#: src/gui/debugwindow.cpp:313
 msgid "Minimap:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:262
-#: src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:161 src/gui/debugwindow.cpp:265
+#: src/gui/debugwindow.cpp:309
 msgid "Cursor:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:161
+#: src/gui/debugwindow.cpp:164
 msgid "Particle count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:284
-#: src/gui/debugwindow.cpp:316
+#: src/gui/debugwindow.cpp:167 src/gui/debugwindow.cpp:287
+#: src/gui/debugwindow.cpp:319
 msgid "Map actors count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:166 src/gui/debugwindow.cpp:243
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:169 src/gui/debugwindow.cpp:246
+#: src/gui/debugwindow.cpp:252
 msgid "Player Position:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:172 src/gui/debugwindow.cpp:297
+#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:300
 msgid "Draw calls:"
 msgstr ""
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:175
+#. TRANSLATORS: debug window label, frames per second
+#: src/gui/debugwindow.cpp:178
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:177 src/gui/debugwindow.cpp:324
+#. TRANSLATORS: debug window label, logic per second
+#: src/gui/debugwindow.cpp:180 src/gui/debugwindow.cpp:327
 #, c-format
 msgid "%d LPS"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:191 src/gui/debugwindow.cpp:209
 #, c-format
 msgid "%d FPS (Software)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:193
+#: src/gui/debugwindow.cpp:196
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:197
+#: src/gui/debugwindow.cpp:200
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:201
+#: src/gui/debugwindow.cpp:204
 #, c-format
 msgid "%d FPS (mobile OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:225 src/gui/debugwindow.cpp:290
+#: src/gui/debugwindow.cpp:228 src/gui/debugwindow.cpp:293
 msgid "Textures count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:279
+#: src/gui/debugwindow.cpp:282
 #, c-format
 msgid "Particle count: %d"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:330 src/gui/debugwindow.cpp:380
-#: src/gui/debugwindow.cpp:442
+#: src/gui/debugwindow.cpp:333 src/gui/debugwindow.cpp:383
+#: src/gui/debugwindow.cpp:445
 msgid "Target:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:332 src/gui/debugwindow.cpp:386
-#: src/gui/debugwindow.cpp:444
+#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
+#: src/gui/debugwindow.cpp:447
 msgid "Target Id:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
-#: src/gui/debugwindow.cpp:446
+#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:392
+#: src/gui/debugwindow.cpp:449
 msgid "Target type:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:337
+#: src/gui/debugwindow.cpp:340
 msgid "Target level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:339 src/gui/debugwindow.cpp:405
+#: src/gui/debugwindow.cpp:342 src/gui/debugwindow.cpp:408
 msgid "Target race:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:341
+#: src/gui/debugwindow.cpp:344
 msgid "Target party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:346
 msgid "Target guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:430
-#: src/gui/debugwindow.cpp:436 src/gui/debugwindow.cpp:454
+#: src/gui/debugwindow.cpp:348 src/gui/debugwindow.cpp:433
+#: src/gui/debugwindow.cpp:439 src/gui/debugwindow.cpp:457
 msgid "Attack delay:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:347 src/gui/debugwindow.cpp:417
-#: src/gui/debugwindow.cpp:456
+#: src/gui/debugwindow.cpp:350 src/gui/debugwindow.cpp:420
+#: src/gui/debugwindow.cpp:459
 msgid "Minimal hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:349 src/gui/debugwindow.cpp:420
-#: src/gui/debugwindow.cpp:458
+#: src/gui/debugwindow.cpp:352 src/gui/debugwindow.cpp:423
+#: src/gui/debugwindow.cpp:461
 msgid "Maximum hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:351 src/gui/debugwindow.cpp:423
-#: src/gui/debugwindow.cpp:460
+#: src/gui/debugwindow.cpp:354 src/gui/debugwindow.cpp:426
+#: src/gui/debugwindow.cpp:463
 msgid "Critical hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:394 src/gui/debugwindow.cpp:400
-#: src/gui/debugwindow.cpp:448
+#: src/gui/debugwindow.cpp:397 src/gui/debugwindow.cpp:403
+#: src/gui/debugwindow.cpp:451
 msgid "Target Level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:408 src/gui/debugwindow.cpp:450
+#: src/gui/debugwindow.cpp:411 src/gui/debugwindow.cpp:453
 msgid "Target Party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:412 src/gui/debugwindow.cpp:452
+#: src/gui/debugwindow.cpp:415 src/gui/debugwindow.cpp:455
 msgid "Target Guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:493
+#: src/gui/debugwindow.cpp:496
 #, c-format
 msgid "Ping: %s ms"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:496
+#: src/gui/debugwindow.cpp:499
 #, c-format
 msgid "In: %d bytes/s"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:499
+#: src/gui/debugwindow.cpp:502
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
@@ -1323,7 +1323,7 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #: src/gui/editdialog.cpp:45 src/gui/editserverdialog.cpp:78
-#: src/gui/itemamountwindow.cpp:210 src/gui/okdialog.cpp:51
+#: src/gui/itemamountwindow.cpp:204 src/gui/okdialog.cpp:51
 #: src/gui/quitdialog.cpp:70 src/gui/textdialog.cpp:46
 msgid "OK"
 msgstr ""
@@ -1335,7 +1335,7 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:257
+#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:266
 msgid "Connect"
 msgstr ""
 
@@ -1365,7 +1365,7 @@ msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/editserverdialog.cpp:222
+#: src/gui/editserverdialog.cpp:218
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -1417,7 +1417,7 @@ msgstr ""
 #: src/gui/inventorywindow.cpp:178 src/gui/inventorywindow.cpp:630
 #: src/gui/popupmenu.cpp:1843 src/gui/popupmenu.cpp:1922
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2041
-#: src/gui/skilldialog.cpp:277
+#: src/gui/skilldialog.cpp:279
 msgid "Use"
 msgstr "ใช้"
 
@@ -1451,7 +1451,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: setup button
-#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:718
+#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:719
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1992
 #: src/gui/popupmenu.cpp:2066 src/gui/setup.cpp:86
 msgid "Store"
@@ -1473,47 +1473,47 @@ msgid "Drop"
 msgstr "ทิ้ง"
 
 #. TRANSLATORS: item amount window button
-#: src/gui/itemamountwindow.cpp:214
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:264
 msgid "Select amount of items to trade."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:274
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to drop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:278
+#: src/gui/itemamountwindow.cpp:272
 msgid "Select amount of items to store."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:276
 msgid "Select amount of items to retrieve."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:286
+#: src/gui/itemamountwindow.cpp:280
 msgid "Select amount of items to split."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:290
+#: src/gui/itemamountwindow.cpp:284
 msgid "Add to buy shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:294
+#: src/gui/itemamountwindow.cpp:288
 msgid "Add to sell shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:298
+#: src/gui/itemamountwindow.cpp:292
 msgid "Unknown."
 msgstr ""
 
@@ -1540,7 +1540,7 @@ msgstr ""
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:58 src/gui/killstats.cpp:171
-#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:516
+#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:509
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
@@ -1548,7 +1548,7 @@ msgstr ""
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:61 src/gui/killstats.cpp:173
 #: src/gui/killstats.cpp:253 src/gui/killstats.cpp:268
-#: src/gui/killstats.cpp:518
+#: src/gui/killstats.cpp:511
 #, c-format
 msgid "Avg Exp: %s"
 msgstr ""
@@ -1556,14 +1556,14 @@ msgstr ""
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:63 src/gui/killstats.cpp:176
 #: src/gui/killstats.cpp:258 src/gui/killstats.cpp:272
-#: src/gui/killstats.cpp:521
+#: src/gui/killstats.cpp:514
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:66 src/gui/killstats.cpp:187
-#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:524
+#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:517
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
@@ -1589,9 +1589,9 @@ msgid "Last kill exp:"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:414
-#: src/gui/killstats.cpp:421 src/gui/killstats.cpp:428
-#: src/gui/killstats.cpp:434
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:408
+#: src/gui/killstats.cpp:415 src/gui/killstats.cpp:422
+#: src/gui/killstats.cpp:428
 msgid "Time before jacko spawn:"
 msgstr ""
 
@@ -1623,12 +1623,12 @@ msgid "  Time for next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:421
+#: src/gui/killstats.cpp:415
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:428
+#: src/gui/killstats.cpp:422
 msgid "jacko spawning"
 msgstr ""
 
@@ -1734,32 +1734,32 @@ msgid "arrows bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:88
+#: src/gui/ministatuswindow.cpp:89
 msgid "status bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:108
+#: src/gui/ministatuswindow.cpp:109
 msgid "job bar"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:306 src/gui/statuswindow.cpp:298
+#: src/gui/ministatuswindow.cpp:307 src/gui/statuswindow.cpp:298
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:313 src/gui/statuswindow.cpp:141
+#: src/gui/ministatuswindow.cpp:314 src/gui/statuswindow.cpp:141
 #: src/gui/statuswindow.cpp:305 src/gui/statuswindow.cpp:375
 #, c-format
 msgid "Level: %d"
 msgstr "เลเวล: %d"
 
 #. TRANSLATORS: status bar label
-#: src/gui/ministatuswindow.cpp:330 src/gui/ministatuswindow.cpp:367
+#: src/gui/ministatuswindow.cpp:331 src/gui/ministatuswindow.cpp:368
 msgid "Need"
 msgstr ""
 
@@ -2147,7 +2147,7 @@ msgstr ""
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2209 src/gui/popupmenu.cpp:2280
-#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:139
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
 #: src/gui/socialwindow.cpp:934
 msgid "(default)"
 msgstr ""
@@ -2330,7 +2330,7 @@ msgid "Passwords do not match."
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:257
 msgid "Choose Your Server"
 msgstr ""
 
@@ -2338,61 +2338,61 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:259 src/gui/shopwindow.cpp:94
+#: src/gui/serverdialog.cpp:268 src/gui/shopwindow.cpp:94
 #: src/gui/shopwindow.cpp:101 src/gui/tradewindow.cpp:77
 msgid "Add"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
-#: src/gui/serverdialog.cpp:261 src/gui/widgets/setupitem.cpp:299
+#: src/gui/serverdialog.cpp:270 src/gui/widgets/setupitem.cpp:299
 #: src/gui/widgets/setupitem.cpp:426
 msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:274
 msgid "Load"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:279
+#: src/gui/serverdialog.cpp:288
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:297
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:518
+#: src/gui/serverdialog.cpp:527
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:524
+#: src/gui/serverdialog.cpp:533
 msgid "Waiting for server..."
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:529
+#: src/gui/serverdialog.cpp:538
 msgid "Preparing download"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:534
+#: src/gui/serverdialog.cpp:543
 msgid "Error retreiving server list!"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:626
+#: src/gui/serverdialog.cpp:635
 msgid "requires a newer version"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:631
+#: src/gui/serverdialog.cpp:640
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -3403,7 +3403,7 @@ msgid "Type:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:334
+#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:336
 msgid "Delay:"
 msgstr ""
 
@@ -3423,30 +3423,30 @@ msgid "Blue:"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:420
+#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:422
 msgid "Static"
 msgstr ""
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:107 src/gui/setup_colors.cpp:110
-#: src/gui/setup_colors.cpp:422
+#: src/gui/setup_colors.cpp:424
 msgid "Pulse"
 msgstr ""
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:112 src/gui/setup_colors.cpp:115
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Rainbow"
 msgstr ""
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:117 src/gui/setup_colors.cpp:120
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Spectrum"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:328
+#: src/gui/setup_colors.cpp:330
 msgid "Alpha:"
 msgstr ""
 
@@ -3612,7 +3612,7 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: palette color
-#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:134
+#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:135
 msgid "Monsters"
 msgstr ""
 
@@ -4161,206 +4161,231 @@ msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:86
-msgid "Very small (9)"
+msgid "Very small (8)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:88
-msgid "Tiny (10)"
+msgid "Very small (9)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:90
-msgid "Small (11)"
+msgid "Tiny (10)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:92
-msgid "Medium (12)"
+msgid "Small (11)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:94
-msgid "Normal (13)"
+msgid "Medium (12)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:96
-msgid "Large (14)"
+msgid "Normal (13)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:98
-msgid "Very large (15)"
+msgid "Large (14)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:100
-msgid "Big (16)"
+msgid "Large (15)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:102
-msgid "Very big (17)"
+msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:104
-msgid "Huge (18)"
+msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:106
-msgid "Very huge (19)"
+msgid "Big (18)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:108
+msgid "Big (19)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:110
+msgid "Very big (20)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:112
+msgid "Very big (21)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:114
+msgid "Very big (22)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:116
+msgid "Huge (23)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:151
 msgid "Chinese (China)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:153
 msgid "Czech"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:155
 msgid "English"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:157
 msgid "Finnish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:159
 msgid "French"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:161
 msgid "German"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:153
+#: src/gui/setup_theme.cpp:163
 msgid "Indonesian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:155
+#: src/gui/setup_theme.cpp:165
 msgid "Italian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:157
+#: src/gui/setup_theme.cpp:167
 msgid "Polish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:159
+#: src/gui/setup_theme.cpp:169
 msgid "Japanese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:161
+#: src/gui/setup_theme.cpp:171
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:163
+#: src/gui/setup_theme.cpp:173
 msgid "Portuguese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:165
+#: src/gui/setup_theme.cpp:175
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:167
+#: src/gui/setup_theme.cpp:177
 msgid "Russian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:169
+#: src/gui/setup_theme.cpp:179
 msgid "Spanish (Castilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:171
+#: src/gui/setup_theme.cpp:181
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:223
+#: src/gui/setup_theme.cpp:233
 msgid "Gui theme"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:230
+#: src/gui/setup_theme.cpp:240
 msgid "Main Font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:235
+#: src/gui/setup_theme.cpp:245
 msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:239
+#: src/gui/setup_theme.cpp:249
 msgid "Bold font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:243
+#: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:247
+#: src/gui/setup_theme.cpp:257
 msgid "Help font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:251
+#: src/gui/setup_theme.cpp:261
 msgid "Secure font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:255
+#: src/gui/setup_theme.cpp:265
 msgid "Japanese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:260
+#: src/gui/setup_theme.cpp:270
 msgid "Font size"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:265
+#: src/gui/setup_theme.cpp:275
 msgid "Npc font size"
 msgstr ""
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/setup_theme.cpp:269
+#: src/gui/setup_theme.cpp:279
 msgid "i"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/setup_theme.cpp:442
+#: src/gui/setup_theme.cpp:452
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/setup_theme.cpp:467
+#: src/gui/setup_theme.cpp:477
 msgid "Theme Changed"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/setup_theme.cpp:467 src/gui/setup_video.cpp:537
+#: src/gui/setup_theme.cpp:477 src/gui/setup_video.cpp:537
 #: src/gui/setup_video.cpp:546
 msgid "Restart your client for the change to take effect."
 msgstr ""
@@ -4658,7 +4683,8 @@ msgid "Ambient FX"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_visual.cpp:140
+#. TRANSLATORS: palette color
+#: src/gui/setup_visual.cpp:140 src/gui/userpalette.cpp:146
 msgid "Particle effects"
 msgstr ""
 
@@ -4745,45 +4771,45 @@ msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/skilldialog.cpp:270 src/gui/windowmenu.cpp:112
+#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:112
 msgid "Skills"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/skilldialog.cpp:279
+#: src/gui/skilldialog.cpp:281
 msgid "Up"
 msgstr ""
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/skilldialog.cpp:391
+#: src/gui/skilldialog.cpp:393
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skills tab
-#: src/gui/skilldialog.cpp:444
+#: src/gui/skilldialog.cpp:446
 msgid "basic"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill name
-#: src/gui/skilldialog.cpp:447
+#: src/gui/skilldialog.cpp:449
 msgid "basic, 1"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/skilldialog.cpp:484
+#: src/gui/skilldialog.cpp:486
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/skilldialog.cpp:518
+#: src/gui/skilldialog.cpp:520
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/skilldialog.cpp:612 src/gui/skilldialog.cpp:762
+#: src/gui/skilldialog.cpp:614 src/gui/skilldialog.cpp:764
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -5226,7 +5252,7 @@ msgid "Trade: You"
 msgstr ""
 
 #. TRANSLATORS: trade window money label
-#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:182
+#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:184
 #, c-format
 msgid "You get %s"
 msgstr ""
@@ -5242,12 +5268,12 @@ msgid "You give:"
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:393
+#: src/gui/tradewindow.cpp:396
 msgid "You don't have enough money."
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:475
+#: src/gui/tradewindow.cpp:479
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
@@ -5259,223 +5285,223 @@ msgid "Name: %s"
 msgstr "ชื่อ: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/updaterwindow.cpp:140
+#: src/gui/updaterwindow.cpp:156
 msgid "Updating..."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:165
+#: src/gui/updaterwindow.cpp:181
 msgid "Connecting..."
 msgstr "กำลังเชื่อมต่อ..."
 
 #. TRANSLATORS: update message
-#: src/gui/updaterwindow.cpp:656
+#: src/gui/updaterwindow.cpp:672
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/updaterwindow.cpp:658
+#: src/gui/updaterwindow.cpp:674
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:660
+#: src/gui/updaterwindow.cpp:676
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:839
+#: src/gui/updaterwindow.cpp:855
 msgid "Completed"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
 msgid "Being"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:118
-msgid "Friend Names"
+#: src/gui/userpalette.cpp:119
+msgid "Friend names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:120
-msgid "Disregarded Names"
+#: src/gui/userpalette.cpp:121
+msgid "Disregarded names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:122
-msgid "Ignored Names"
+#: src/gui/userpalette.cpp:123
+msgid "Ignored names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:124
-msgid "Erased Names"
+#: src/gui/userpalette.cpp:125
+msgid "Erased names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:126
-msgid "Other Players' Names"
+#: src/gui/userpalette.cpp:127
+msgid "Other players names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:128
-msgid "Own Name"
+#: src/gui/userpalette.cpp:129
+msgid "Own name"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:130
-msgid "GM Names"
+#: src/gui/userpalette.cpp:131
+msgid "GM names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
 msgid "NPCs"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
 msgid "Monster HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:140
 msgid "Monster HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:141
-msgid "Party Members"
+#: src/gui/userpalette.cpp:142
+msgid "Party members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:143
-msgid "Guild Members"
+#: src/gui/userpalette.cpp:144
+msgid "Guild members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:145
-msgid "Particle Effects"
+#: src/gui/userpalette.cpp:148
+msgid "Pickup notification"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:147
-msgid "Pickup Notification"
+#: src/gui/userpalette.cpp:150
+msgid "Exp notification"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:149
-msgid "Exp Notification"
-msgstr ""
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
 msgid "Player HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
 msgid "Player HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:157
-msgid "Player Hits Monster"
+#: src/gui/userpalette.cpp:158
+msgid "Player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:159
-msgid "Monster Hits Player"
+#: src/gui/userpalette.cpp:160
+msgid "Monster hits player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:163
-msgid "Other Player Hits Local Player"
+#: src/gui/userpalette.cpp:164
+msgid "Other player hits local player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:166
 msgid "Critical Hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
-msgid "Local Player Hits Monster"
+#: src/gui/userpalette.cpp:170
+msgid "Local player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:172
-msgid "Local Player Critical Hit"
+#: src/gui/userpalette.cpp:173
+msgid "Local player critical hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:175
-msgid "Local Player Miss"
+#: src/gui/userpalette.cpp:176
+msgid "Local player miss"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:177
+#: src/gui/userpalette.cpp:178
 msgid "Misses"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
-msgid "Portal Highlight"
+#: src/gui/userpalette.cpp:180
+msgid "Portal highlight"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:183
+msgid "Default collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:182
-msgid "Default collision Highlight"
+#: src/gui/userpalette.cpp:186
+msgid "Air collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:185
-msgid "Air collision Highlight"
+#: src/gui/userpalette.cpp:189
+msgid "Water collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:188
-msgid "Water collision Highlight"
+#: src/gui/userpalette.cpp:192
+msgid "Special ground collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:191
-msgid "Special ground collision Highlight"
+#: src/gui/userpalette.cpp:195
+msgid "Walkable highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
-msgid "Walkable Highlight"
+#: src/gui/userpalette.cpp:198
+msgid "Local player attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:197
-msgid "Local Player Attack Range"
+#: src/gui/userpalette.cpp:201
+msgid "Local player attack range border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:200
-msgid "Local Player Attack Range Border"
+#: src/gui/userpalette.cpp:204
+msgid "Monster attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:203
-msgid "Monster Attack Range"
+#: src/gui/userpalette.cpp:208
+msgid "Floor item amount color"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:206
-msgid "Home Place"
+#: src/gui/userpalette.cpp:211
+msgid "Home place"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:209
-msgid "Home Place Border"
+#: src/gui/userpalette.cpp:214
+msgid "Home place border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:212
-msgid "Road Point"
+#: src/gui/userpalette.cpp:217
+msgid "Road point"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
@@ -5605,7 +5631,7 @@ msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:315
+#: src/gui/widgets/itemcontainer.cpp:317
 msgid "Eq."
 msgstr ""
 
diff --git a/po/tr.po b/po/tr.po
index 22394afc6..447837682 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-05-03 12:38+0300\n"
-"PO-Revision-Date: 2013-05-03 09:44+0000\n"
+"POT-Creation-Date: 2013-05-11 12:13+0300\n"
+"PO-Revision-Date: 2013-05-10 15:39+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/manaplus/"
 "language/tr/)\n"
@@ -62,25 +62,25 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: full button name
-#: src/client.cpp:1136 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
+#: src/client.cpp:1137 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
 msgid "Setup"
 msgstr "Ayarlar"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1140 src/gui/setup_perfomance.cpp:61
+#: src/client.cpp:1141 src/gui/setup_perfomance.cpp:61
 msgid "Perfomance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:1143 src/gui/setup_video.cpp:258
+#: src/client.cpp:1144 src/gui/setup_video.cpp:258
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1146 src/gui/setup_theme.cpp:273
+#: src/client.cpp:1147 src/gui/setup_theme.cpp:283
 msgid "Theme"
 msgstr "Tema"
 
@@ -91,7 +91,7 @@ msgstr "Tema"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1150 src/gui/didyouknowwindow.cpp:78
+#: src/client.cpp:1151 src/gui/didyouknowwindow.cpp:78
 #: src/gui/inventorywindow.cpp:228 src/gui/npcdialog.cpp:63
 #: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:574
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:80
@@ -99,32 +99,32 @@ msgid "Close"
 msgstr "Kapat"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1238
+#: src/client.cpp:1239
 msgid "Connecting to server"
 msgstr "Bağlanılıyor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1282
 msgid "Logging in"
 msgstr "Bağlanılıyor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1320
+#: src/client.cpp:1321
 msgid "Entering game world"
 msgstr "Oyun dünyasına giriliyor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1431
+#: src/client.cpp:1432
 msgid "Requesting characters"
 msgstr "Karakterler isteniliyor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1471
 msgid "Connecting to the game server"
 msgstr "Oyun sunucusuna bağlanılıyor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1483
+#: src/client.cpp:1484
 msgid "Changing game servers"
 msgstr "Oyun sunucusu değiştiriliyor"
 
@@ -139,69 +139,69 @@ msgstr "Oyun sunucusu değiştiriliyor"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1540 src/client.cpp:1551 src/client.cpp:1721
+#: src/client.cpp:1541 src/client.cpp:1552 src/client.cpp:1722
 #: src/gui/changeemaildialog.cpp:168 src/gui/changepassworddialog.cpp:158
-#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:288
-#: src/gui/editserverdialog.cpp:220 src/gui/registerdialog.cpp:263
+#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:290
+#: src/gui/editserverdialog.cpp:216 src/gui/registerdialog.cpp:263
 #: src/gui/unregisterdialog.cpp:143 src/net/ea/charserverhandler.cpp:190
 #: src/net/ea/charserverhandler.cpp:210
 msgid "Error"
 msgstr "Hata"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1564
+#: src/client.cpp:1565
 msgid "Requesting registration details"
 msgstr "Kayıt detayları isteniyor"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1601
+#: src/client.cpp:1602
 msgid "Password Change"
 msgstr "Şifre Değiştir"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1603
+#: src/client.cpp:1604
 msgid "Password changed successfully!"
 msgstr "Şifreniz başarı ile değiştirildi!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1624
+#: src/client.cpp:1625
 msgid "Email Change"
 msgstr "E-posta Değiştir"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1626
+#: src/client.cpp:1627
 msgid "Email changed successfully!"
 msgstr "E-posta başarı ile değiştirildi!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1647
+#: src/client.cpp:1648
 msgid "Unregister Successful"
 msgstr "Hesap kapatma başarılı"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1649
+#: src/client.cpp:1650
 msgid "Farewell, come back any time..."
 msgstr "Hoşçakal, tekrar bekleriz..."
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1902 src/client.cpp:1917 src/client.cpp:1960
-#: src/client.cpp:1976 src/client.cpp:2417 src/client.cpp:2425
+#: src/client.cpp:1903 src/client.cpp:1918 src/client.cpp:1961
+#: src/client.cpp:1977 src/client.cpp:2418 src/client.cpp:2426
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s yok ve yaratılamıyor! Çıkış yapılıyor."
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2113
+#: src/client.cpp:2114
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Sunucu güncellenemedi: %s"
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2154 src/client.cpp:2161
+#: src/client.cpp:2155 src/client.cpp:2162
 msgid "Error creating updates directory!"
 msgstr "Hata! Güncelleme klasörü oluşturulamadı!"
 
-#: src/client.cpp:2183 src/client.cpp:2196
+#: src/client.cpp:2184 src/client.cpp:2197
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Hata: %s bulunamadı ve yaratılamıyor! Çıkış yapılıyor."
@@ -484,19 +484,19 @@ msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: bot checker window header
-#: src/gui/botcheckerwindow.cpp:269
+#: src/gui/botcheckerwindow.cpp:268
 msgid "Bot Checker"
 msgstr "Bot Kontrolörü"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:102
+#: src/gui/botcheckerwindow.cpp:277 src/gui/npcdialog.cpp:102
 msgid "Reset"
 msgstr "Sıfırla"
 
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: relations table header
-#: src/gui/botcheckerwindow.cpp:305 src/gui/setup_relations.cpp:61
+#: src/gui/botcheckerwindow.cpp:304 src/gui/setup_relations.cpp:61
 msgid "Name"
 msgstr "İsim"
 
@@ -504,7 +504,7 @@ msgstr "İsim"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:145
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:145
 #: src/gui/popupmenu.cpp:241 src/gui/popupmenu.cpp:640
 #: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:257
 #: src/net/tmwa/generalhandler.cpp:292
@@ -514,7 +514,7 @@ msgstr "Saldırı"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
-#: src/gui/botcheckerwindow.cpp:309 src/gui/popupmenu.cpp:225
+#: src/gui/botcheckerwindow.cpp:308 src/gui/popupmenu.cpp:225
 #: src/gui/setupactiondata.h:93
 msgid "Talk"
 msgstr "Konuş"
@@ -522,7 +522,7 @@ msgstr "Konuş"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/botcheckerwindow.cpp:311 src/gui/popupmenu.cpp:215
+#: src/gui/botcheckerwindow.cpp:310 src/gui/popupmenu.cpp:215
 #: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:371
 #: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:653
 #: src/gui/popupmenu.cpp:727 src/gui/setupactiondata.h:1856
@@ -530,7 +530,7 @@ msgid "Move"
 msgstr "Taşı"
 
 #. TRANSLATORS: bot checker window table header
-#: src/gui/botcheckerwindow.cpp:313
+#: src/gui/botcheckerwindow.cpp:312
 msgid "Result"
 msgstr "Sonuç"
 
@@ -586,7 +586,7 @@ msgstr "Satın al"
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:516
+#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:511
 #: src/gui/selldialog.cpp:94 src/gui/selldialog.cpp:342
 #, c-format
 msgid "Price: %s / Total: %s"
@@ -603,9 +603,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:208
-#: src/gui/itemamountwindow.cpp:243 src/gui/npcdialog.cpp:93
-#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:833
+#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:202
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:93
+#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:821
 msgid "+"
 msgstr "+"
 
@@ -615,9 +615,9 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:240 src/gui/npcdialog.cpp:95
-#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:846
+#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:200
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:95
+#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:834
 msgid "-"
 msgstr "-"
 
@@ -629,7 +629,7 @@ msgstr "-"
 #. TRANSLATORS: input action name
 #: src/gui/buydialog.cpp:260 src/gui/quitdialog.cpp:54
 #: src/gui/quitdialog.cpp:59 src/gui/quitdialog.cpp:61
-#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:255
+#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:264
 #: src/gui/setupactiondata.h:177
 msgid "Quit"
 msgstr "Çıkış"
@@ -641,7 +641,7 @@ msgstr "Çıkış"
 #. TRANSLATORS: status bar label
 #: src/gui/buydialog.cpp:262 src/gui/selldialog.cpp:106
 #: src/gui/statuswindow.cpp:558 src/gui/statuswindow.cpp:615
-#: src/gui/statuswindow.cpp:830 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:852
 msgid "Max"
 msgstr "En Fazla"
 
@@ -686,7 +686,7 @@ msgstr "Satış"
 #: src/gui/buyselldialog.cpp:71 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:120
 #: src/gui/connectiondialog.cpp:48 src/gui/editserverdialog.cpp:80
-#: src/gui/itemamountwindow.cpp:212 src/gui/npcpostdialog.cpp:64
+#: src/gui/itemamountwindow.cpp:206 src/gui/npcpostdialog.cpp:64
 #: src/gui/popupmenu.cpp:290 src/gui/popupmenu.cpp:324
 #: src/gui/popupmenu.cpp:411 src/gui/popupmenu.cpp:454
 #: src/gui/popupmenu.cpp:485 src/gui/popupmenu.cpp:512
@@ -702,7 +702,7 @@ msgstr "Satış"
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
 #: src/gui/setup.cpp:84 src/gui/socialwindow.cpp:1204
 #: src/gui/textcommandeditor.cpp:212 src/gui/textdialog.cpp:53
-#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:167
+#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:183
 msgid "Cancel"
 msgstr "İptal"
 
@@ -866,7 +866,7 @@ msgstr "Lütfen %d puanı dağıt"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:570
+#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:581
 #: src/gui/socialwindow.cpp:1269
 msgid "Create"
 msgstr "Oluştur"
@@ -893,17 +893,17 @@ msgid "Please remove %d points"
 msgstr "Lütfen %d puanı eksilt"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:60
+#: src/gui/charselectdialog.cpp:61
 msgid "Confirm Character Delete"
 msgstr "Karakter Silmeyi Onayla"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:62
+#: src/gui/charselectdialog.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "Bu karakteri silmek istediğinize emin misiniz?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:86
+#: src/gui/charselectdialog.cpp:87
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
@@ -915,8 +915,8 @@ msgstr "Hesap Değiştir"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:565
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:576
+#: src/gui/updaterwindow.cpp:185
 msgid "Play"
 msgstr "Oyna"
 
@@ -932,7 +932,7 @@ msgstr "Bilgi"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:263
+#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:272
 #: src/gui/setupactiondata.h:1803 src/gui/setup_relations.cpp:262
 #: src/gui/shopwindow.cpp:96 src/gui/shopwindow.cpp:103
 #: src/gui/textcommandeditor.cpp:216
@@ -942,24 +942,24 @@ msgstr "Sil"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/charselectdialog.cpp:129 src/gui/unregisterdialog.cpp:48
+#: src/gui/charselectdialog.cpp:130 src/gui/unregisterdialog.cpp:48
 #: src/gui/unregisterdialog.cpp:53
 msgid "Unregister"
 msgstr "Kaydı Sil"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/charselectdialog.cpp:141
+#: src/gui/charselectdialog.cpp:142
 msgid "Change Email"
 msgstr "E-posta Değiştir"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:172
+#: src/gui/charselectdialog.cpp:175
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/charselectdialog.cpp:246
+#: src/gui/charselectdialog.cpp:248
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -969,16 +969,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:288
+#: src/gui/charselectdialog.cpp:290
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password:"
 msgstr ""
 
@@ -1065,13 +1065,13 @@ msgid "Chat"
 msgstr "Sohbet"
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:735
+#: src/gui/chatwindow.cpp:638
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Mevcut: %s; %d oyuncu mevcut."
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1165
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "%s 'e fısıldanıyor: %s"
@@ -1089,7 +1089,7 @@ msgstr "Hayır"
 
 #. TRANSLATORS: confirm dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/confirmdialog.cpp:58 src/gui/popupmenu.cpp:2429
+#: src/gui/confirmdialog.cpp:55 src/gui/popupmenu.cpp:2429
 #: src/gui/popupmenu.cpp:2442 src/gui/popupmenu.cpp:2457
 #: src/gui/popupmenu.cpp:2483
 msgid "Ignore"
@@ -1098,7 +1098,7 @@ msgstr "Görmezden gel"
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
 #. TRANSLATORS: settings group
-#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:109
+#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:108
 #: src/gui/setup_other.cpp:123 src/gui/windowmenu.cpp:106
 msgid "Map"
 msgstr "Harita"
@@ -1114,190 +1114,190 @@ msgid "Net"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:265
-#: src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:268
+#: src/gui/debugwindow.cpp:311
 msgid "Music:"
 msgstr "Müzik:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:153 src/gui/debugwindow.cpp:271
-#: src/gui/debugwindow.cpp:312
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:274
+#: src/gui/debugwindow.cpp:315
 msgid "Map:"
 msgstr "Harita:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:155 src/gui/debugwindow.cpp:268
-#: src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:271
+#: src/gui/debugwindow.cpp:313
 msgid "Minimap:"
 msgstr "Harita:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:262
-#: src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:161 src/gui/debugwindow.cpp:265
+#: src/gui/debugwindow.cpp:309
 msgid "Cursor:"
 msgstr "İşaretçi:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:161
+#: src/gui/debugwindow.cpp:164
 msgid "Particle count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:284
-#: src/gui/debugwindow.cpp:316
+#: src/gui/debugwindow.cpp:167 src/gui/debugwindow.cpp:287
+#: src/gui/debugwindow.cpp:319
 msgid "Map actors count:"
 msgstr "Haritadaki oyuncu sayısı:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:166 src/gui/debugwindow.cpp:243
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:169 src/gui/debugwindow.cpp:246
+#: src/gui/debugwindow.cpp:252
 msgid "Player Position:"
 msgstr "Oyuncu Konumu:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:172 src/gui/debugwindow.cpp:297
+#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:300
 msgid "Draw calls:"
 msgstr ""
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:175
+#. TRANSLATORS: debug window label, frames per second
+#: src/gui/debugwindow.cpp:178
 #, c-format
 msgid "%d FPS"
 msgstr "%d FPS"
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:177 src/gui/debugwindow.cpp:324
+#. TRANSLATORS: debug window label, logic per second
+#: src/gui/debugwindow.cpp:180 src/gui/debugwindow.cpp:327
 #, c-format
 msgid "%d LPS"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:191 src/gui/debugwindow.cpp:209
 #, c-format
 msgid "%d FPS (Software)"
 msgstr "%d FPS (Yazılım)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:193
+#: src/gui/debugwindow.cpp:196
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr "%d FPS (hızlı OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:197
+#: src/gui/debugwindow.cpp:200
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr "%d FPS (eski OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:201
+#: src/gui/debugwindow.cpp:204
 #, c-format
 msgid "%d FPS (mobile OpenGL)"
 msgstr "%d FPS (mobil OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:225 src/gui/debugwindow.cpp:290
+#: src/gui/debugwindow.cpp:228 src/gui/debugwindow.cpp:293
 msgid "Textures count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:279
+#: src/gui/debugwindow.cpp:282
 #, c-format
 msgid "Particle count: %d"
 msgstr "Partikül sayısı: %d"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:330 src/gui/debugwindow.cpp:380
-#: src/gui/debugwindow.cpp:442
+#: src/gui/debugwindow.cpp:333 src/gui/debugwindow.cpp:383
+#: src/gui/debugwindow.cpp:445
 msgid "Target:"
 msgstr "Hedef:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:332 src/gui/debugwindow.cpp:386
-#: src/gui/debugwindow.cpp:444
+#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
+#: src/gui/debugwindow.cpp:447
 msgid "Target Id:"
 msgstr "Hedef Adı:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
-#: src/gui/debugwindow.cpp:446
+#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:392
+#: src/gui/debugwindow.cpp:449
 msgid "Target type:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:337
+#: src/gui/debugwindow.cpp:340
 msgid "Target level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:339 src/gui/debugwindow.cpp:405
+#: src/gui/debugwindow.cpp:342 src/gui/debugwindow.cpp:408
 msgid "Target race:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:341
+#: src/gui/debugwindow.cpp:344
 msgid "Target party:"
 msgstr "Hedef grup:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:346
 msgid "Target guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:430
-#: src/gui/debugwindow.cpp:436 src/gui/debugwindow.cpp:454
+#: src/gui/debugwindow.cpp:348 src/gui/debugwindow.cpp:433
+#: src/gui/debugwindow.cpp:439 src/gui/debugwindow.cpp:457
 msgid "Attack delay:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:347 src/gui/debugwindow.cpp:417
-#: src/gui/debugwindow.cpp:456
+#: src/gui/debugwindow.cpp:350 src/gui/debugwindow.cpp:420
+#: src/gui/debugwindow.cpp:459
 msgid "Minimal hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:349 src/gui/debugwindow.cpp:420
-#: src/gui/debugwindow.cpp:458
+#: src/gui/debugwindow.cpp:352 src/gui/debugwindow.cpp:423
+#: src/gui/debugwindow.cpp:461
 msgid "Maximum hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:351 src/gui/debugwindow.cpp:423
-#: src/gui/debugwindow.cpp:460
+#: src/gui/debugwindow.cpp:354 src/gui/debugwindow.cpp:426
+#: src/gui/debugwindow.cpp:463
 msgid "Critical hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:394 src/gui/debugwindow.cpp:400
-#: src/gui/debugwindow.cpp:448
+#: src/gui/debugwindow.cpp:397 src/gui/debugwindow.cpp:403
+#: src/gui/debugwindow.cpp:451
 msgid "Target Level:"
 msgstr "Hedef Seviyesi:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:408 src/gui/debugwindow.cpp:450
+#: src/gui/debugwindow.cpp:411 src/gui/debugwindow.cpp:453
 msgid "Target Party:"
 msgstr "Hedef Grup:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:412 src/gui/debugwindow.cpp:452
+#: src/gui/debugwindow.cpp:415 src/gui/debugwindow.cpp:455
 msgid "Target Guild:"
 msgstr "Lonca Hedefle:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:493
+#: src/gui/debugwindow.cpp:496
 #, c-format
 msgid "Ping: %s ms"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:496
+#: src/gui/debugwindow.cpp:499
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "Gelen: %d bytes/s"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:499
+#: src/gui/debugwindow.cpp:502
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "Giden: %d bytes/s"
@@ -1329,7 +1329,7 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #: src/gui/editdialog.cpp:45 src/gui/editserverdialog.cpp:78
-#: src/gui/itemamountwindow.cpp:210 src/gui/okdialog.cpp:51
+#: src/gui/itemamountwindow.cpp:204 src/gui/okdialog.cpp:51
 #: src/gui/quitdialog.cpp:70 src/gui/textdialog.cpp:46
 msgid "OK"
 msgstr "TAMAM"
@@ -1341,7 +1341,7 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:257
+#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:266
 msgid "Connect"
 msgstr "Bağlan"
 
@@ -1371,7 +1371,7 @@ msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/editserverdialog.cpp:222
+#: src/gui/editserverdialog.cpp:218
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -1423,7 +1423,7 @@ msgstr "Donatmak"
 #: src/gui/inventorywindow.cpp:178 src/gui/inventorywindow.cpp:630
 #: src/gui/popupmenu.cpp:1843 src/gui/popupmenu.cpp:1922
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2041
-#: src/gui/skilldialog.cpp:277
+#: src/gui/skilldialog.cpp:279
 msgid "Use"
 msgstr "Kullan"
 
@@ -1457,7 +1457,7 @@ msgstr "Kıyafetler"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: setup button
-#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:718
+#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:719
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1992
 #: src/gui/popupmenu.cpp:2066 src/gui/setup.cpp:86
 msgid "Store"
@@ -1479,47 +1479,47 @@ msgid "Drop"
 msgstr "Bırak"
 
 #. TRANSLATORS: item amount window button
-#: src/gui/itemamountwindow.cpp:214
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "Hepsi"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:264
 msgid "Select amount of items to trade."
 msgstr "Takas yapılacak nesne miktarını seç."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:274
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to drop."
 msgstr "Bırakılacak nesne miktarını seç."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:278
+#: src/gui/itemamountwindow.cpp:272
 msgid "Select amount of items to store."
 msgstr "Depolanacak nesne miktarını seç."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:276
 msgid "Select amount of items to retrieve."
 msgstr "Depodan alınacak nesne miktarını seç."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:286
+#: src/gui/itemamountwindow.cpp:280
 msgid "Select amount of items to split."
 msgstr "Bölünecek nesne miktarını seç."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:290
+#: src/gui/itemamountwindow.cpp:284
 msgid "Add to buy shop."
 msgstr "Satın alma mağazasına ekle."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:294
+#: src/gui/itemamountwindow.cpp:288
 msgid "Add to sell shop."
 msgstr "Satış mağazasına ekle."
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:298
+#: src/gui/itemamountwindow.cpp:292
 msgid "Unknown."
 msgstr "Bilinmeyen."
 
@@ -1546,7 +1546,7 @@ msgstr "Sayacı sıfırla"
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:58 src/gui/killstats.cpp:171
-#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:516
+#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:509
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
@@ -1554,7 +1554,7 @@ msgstr ""
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:61 src/gui/killstats.cpp:173
 #: src/gui/killstats.cpp:253 src/gui/killstats.cpp:268
-#: src/gui/killstats.cpp:518
+#: src/gui/killstats.cpp:511
 #, c-format
 msgid "Avg Exp: %s"
 msgstr ""
@@ -1562,14 +1562,14 @@ msgstr ""
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:63 src/gui/killstats.cpp:176
 #: src/gui/killstats.cpp:258 src/gui/killstats.cpp:272
-#: src/gui/killstats.cpp:521
+#: src/gui/killstats.cpp:514
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr "Bir üst levele kadar ortalama canavar sayısı: %s"
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:66 src/gui/killstats.cpp:187
-#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:524
+#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:517
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
@@ -1597,9 +1597,9 @@ msgid "Last kill exp:"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:414
-#: src/gui/killstats.cpp:421 src/gui/killstats.cpp:428
-#: src/gui/killstats.cpp:434
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:408
+#: src/gui/killstats.cpp:415 src/gui/killstats.cpp:422
+#: src/gui/killstats.cpp:428
 msgid "Time before jacko spawn:"
 msgstr ""
 
@@ -1631,12 +1631,12 @@ msgid "  Time for next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:421
+#: src/gui/killstats.cpp:415
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:428
+#: src/gui/killstats.cpp:422
 msgid "jacko spawning"
 msgstr ""
 
@@ -1742,32 +1742,32 @@ msgid "arrows bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:88
+#: src/gui/ministatuswindow.cpp:89
 msgid "status bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:108
+#: src/gui/ministatuswindow.cpp:109
 msgid "job bar"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:306 src/gui/statuswindow.cpp:298
+#: src/gui/ministatuswindow.cpp:307 src/gui/statuswindow.cpp:298
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Level: %d (GM %d)"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:313 src/gui/statuswindow.cpp:141
+#: src/gui/ministatuswindow.cpp:314 src/gui/statuswindow.cpp:141
 #: src/gui/statuswindow.cpp:305 src/gui/statuswindow.cpp:375
 #, c-format
 msgid "Level: %d"
 msgstr "Seviye: %d"
 
 #. TRANSLATORS: status bar label
-#: src/gui/ministatuswindow.cpp:330 src/gui/ministatuswindow.cpp:367
+#: src/gui/ministatuswindow.cpp:331 src/gui/ministatuswindow.cpp:368
 msgid "Need"
 msgstr "Gereklilik"
 
@@ -2155,7 +2155,7 @@ msgstr ""
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2209 src/gui/popupmenu.cpp:2280
-#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:139
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
 #: src/gui/socialwindow.cpp:934
 msgid "(default)"
 msgstr ""
@@ -2338,7 +2338,7 @@ msgid "Passwords do not match."
 msgstr "Parolalar uyuşmuyor."
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:257
 msgid "Choose Your Server"
 msgstr "Sunucunu Seç"
 
@@ -2346,61 +2346,61 @@ msgstr "Sunucunu Seç"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:259 src/gui/shopwindow.cpp:94
+#: src/gui/serverdialog.cpp:268 src/gui/shopwindow.cpp:94
 #: src/gui/shopwindow.cpp:101 src/gui/tradewindow.cpp:77
 msgid "Add"
 msgstr "Ekle"
 
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
-#: src/gui/serverdialog.cpp:261 src/gui/widgets/setupitem.cpp:299
+#: src/gui/serverdialog.cpp:270 src/gui/widgets/setupitem.cpp:299
 #: src/gui/widgets/setupitem.cpp:426
 msgid "Edit"
 msgstr "Dünzenle"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:274
 msgid "Load"
 msgstr "Yükle"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:279
+#: src/gui/serverdialog.cpp:288
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:297
 msgid "Use same ip for game sub servers"
 msgstr "Alt oyun sunucuları için aynı IP' yi kullan"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:518
+#: src/gui/serverdialog.cpp:527
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Sunucu listesi indiriliyor...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:524
+#: src/gui/serverdialog.cpp:533
 msgid "Waiting for server..."
 msgstr "Sunucu bekleniyor..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:529
+#: src/gui/serverdialog.cpp:538
 msgid "Preparing download"
 msgstr "İndirmeye hazırlanılıyor"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:534
+#: src/gui/serverdialog.cpp:543
 msgid "Error retreiving server list!"
 msgstr "Sunucu listesi alma hatası!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:626
+#: src/gui/serverdialog.cpp:635
 msgid "requires a newer version"
 msgstr "daha yeni bir sürüm gerektirir"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:631
+#: src/gui/serverdialog.cpp:640
 #, c-format
 msgid "requires v%s"
 msgstr "v%s gerektirir"
@@ -3412,7 +3412,7 @@ msgid "Type:"
 msgstr "Tip:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:334
+#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:336
 msgid "Delay:"
 msgstr "Gecikme:"
 
@@ -3432,30 +3432,30 @@ msgid "Blue:"
 msgstr "Mavi:"
 
 #. TRANSLATORS: color type
-#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:420
+#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:422
 msgid "Static"
 msgstr "Sabit"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:107 src/gui/setup_colors.cpp:110
-#: src/gui/setup_colors.cpp:422
+#: src/gui/setup_colors.cpp:424
 msgid "Pulse"
 msgstr "Darbe"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:112 src/gui/setup_colors.cpp:115
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Rainbow"
 msgstr "Gökkuşağı"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:117 src/gui/setup_colors.cpp:120
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Spectrum"
 msgstr "Spektrum"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:328
+#: src/gui/setup_colors.cpp:330
 msgid "Alpha:"
 msgstr "Alfa:"
 
@@ -3623,7 +3623,7 @@ msgstr "Çeşitli"
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: palette color
-#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:134
+#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:135
 msgid "Monsters"
 msgstr "Canavarlar"
 
@@ -4172,206 +4172,231 @@ msgstr "Görmezden gelirken:"
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:86
-msgid "Very small (9)"
+msgid "Very small (8)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:88
+msgid "Very small (9)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:90
 msgid "Tiny (10)"
 msgstr "Minik (10)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:90
+#: src/gui/setup_theme.cpp:92
 msgid "Small (11)"
 msgstr "Küçük (11)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:92
+#: src/gui/setup_theme.cpp:94
 msgid "Medium (12)"
 msgstr "Orta (12)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:94
-msgid "Normal (13)"
-msgstr ""
-
-#. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:96
-msgid "Large (14)"
+msgid "Normal (13)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:98
-msgid "Very large (15)"
+msgid "Large (14)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:100
-msgid "Big (16)"
+msgid "Large (15)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:102
-msgid "Very big (17)"
+msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:104
-msgid "Huge (18)"
+msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:106
-msgid "Very huge (19)"
+msgid "Big (18)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:108
+msgid "Big (19)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:110
+msgid "Very big (20)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:112
+msgid "Very big (21)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:114
+msgid "Very big (22)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:116
+msgid "Huge (23)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:151
 msgid "Chinese (China)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:153
 msgid "Czech"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:155
 msgid "English"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:157
 msgid "Finnish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:159
 msgid "French"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:161
 msgid "German"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:153
+#: src/gui/setup_theme.cpp:163
 msgid "Indonesian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:155
+#: src/gui/setup_theme.cpp:165
 msgid "Italian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:157
+#: src/gui/setup_theme.cpp:167
 msgid "Polish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:159
+#: src/gui/setup_theme.cpp:169
 msgid "Japanese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:161
+#: src/gui/setup_theme.cpp:171
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:163
+#: src/gui/setup_theme.cpp:173
 msgid "Portuguese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:165
+#: src/gui/setup_theme.cpp:175
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:167
+#: src/gui/setup_theme.cpp:177
 msgid "Russian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:169
+#: src/gui/setup_theme.cpp:179
 msgid "Spanish (Castilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:171
+#: src/gui/setup_theme.cpp:181
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:223
+#: src/gui/setup_theme.cpp:233
 msgid "Gui theme"
 msgstr "Gui teması"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:230
+#: src/gui/setup_theme.cpp:240
 msgid "Main Font"
 msgstr "Ana Yazı Tipi"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:235
+#: src/gui/setup_theme.cpp:245
 msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:239
+#: src/gui/setup_theme.cpp:249
 msgid "Bold font"
 msgstr "Kalın Yazı Tipi"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:243
+#: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr "Partikül yazı tipi"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:247
+#: src/gui/setup_theme.cpp:257
 msgid "Help font"
 msgstr "Yardım yazı tipi"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:251
+#: src/gui/setup_theme.cpp:261
 msgid "Secure font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:255
+#: src/gui/setup_theme.cpp:265
 msgid "Japanese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:260
+#: src/gui/setup_theme.cpp:270
 msgid "Font size"
 msgstr "Yazı tipi boyutu"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:265
+#: src/gui/setup_theme.cpp:275
 msgid "Npc font size"
 msgstr ""
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/setup_theme.cpp:269
+#: src/gui/setup_theme.cpp:279
 msgid "i"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/setup_theme.cpp:442
+#: src/gui/setup_theme.cpp:452
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/setup_theme.cpp:467
+#: src/gui/setup_theme.cpp:477
 msgid "Theme Changed"
 msgstr "Tema Değiştirildi"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/setup_theme.cpp:467 src/gui/setup_video.cpp:537
+#: src/gui/setup_theme.cpp:477 src/gui/setup_video.cpp:537
 #: src/gui/setup_video.cpp:546
 msgid "Restart your client for the change to take effect."
 msgstr "Değişikliklerin etkinleşmesi için istemcinizi tekrar başlatın."
@@ -4669,7 +4694,8 @@ msgid "Ambient FX"
 msgstr "Çevresel grafikler"
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_visual.cpp:140
+#. TRANSLATORS: palette color
+#: src/gui/setup_visual.cpp:140 src/gui/userpalette.cpp:146
 msgid "Particle effects"
 msgstr "Partikül efektleri"
 
@@ -4756,45 +4782,45 @@ msgid "%s wants to %s %s do you accept?"
 msgstr "%s sizden %s %s istiyor, kabul ediyor musunuz?"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/skilldialog.cpp:270 src/gui/windowmenu.cpp:112
+#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:112
 msgid "Skills"
 msgstr "Yetenekler"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/skilldialog.cpp:279
+#: src/gui/skilldialog.cpp:281
 msgid "Up"
 msgstr "Yukarı"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/skilldialog.cpp:391
+#: src/gui/skilldialog.cpp:393
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Mevcut yetenek puanları: %d"
 
 #. TRANSLATORS: skills dialog default skills tab
-#: src/gui/skilldialog.cpp:444
+#: src/gui/skilldialog.cpp:446
 msgid "basic"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill name
-#: src/gui/skilldialog.cpp:447
+#: src/gui/skilldialog.cpp:449
 msgid "basic, 1"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/skilldialog.cpp:484
+#: src/gui/skilldialog.cpp:486
 #, c-format
 msgid "Skill Set %d"
 msgstr "Yetenek Seti %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/skilldialog.cpp:518
+#: src/gui/skilldialog.cpp:520
 #, c-format
 msgid "Skill %d"
 msgstr "Yetenek %d"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/skilldialog.cpp:612 src/gui/skilldialog.cpp:762
+#: src/gui/skilldialog.cpp:614 src/gui/skilldialog.cpp:764
 #, c-format
 msgid "Lvl: %d"
 msgstr "Level: %d"
@@ -5237,7 +5263,7 @@ msgid "Trade: You"
 msgstr "Takas: Sen"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:182
+#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:184
 #, c-format
 msgid "You get %s"
 msgstr "%s alıyorsun"
@@ -5253,12 +5279,12 @@ msgid "You give:"
 msgstr "Verdiğin:"
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:393
+#: src/gui/tradewindow.cpp:396
 msgid "You don't have enough money."
 msgstr "Yeterli paran yok."
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:475
+#: src/gui/tradewindow.cpp:479
 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 "
@@ -5271,224 +5297,224 @@ msgid "Name: %s"
 msgstr "İsim: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/updaterwindow.cpp:140
+#: src/gui/updaterwindow.cpp:156
 msgid "Updating..."
 msgstr "Güncelleniyor..."
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:165
+#: src/gui/updaterwindow.cpp:181
 msgid "Connecting..."
 msgstr "Bağlanıyor..."
 
 #. TRANSLATORS: update message
-#: src/gui/updaterwindow.cpp:656
+#: src/gui/updaterwindow.cpp:672
 msgid "##1  The update process is incomplete."
 msgstr "##1 Güncelleme işlemi tamamlanamadı."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/updaterwindow.cpp:658
+#: src/gui/updaterwindow.cpp:674
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Şiddetle tavsiye edilir ki"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:660
+#: src/gui/updaterwindow.cpp:676
 msgid "##1  you try again later."
 msgstr "##1 daha sonra tekrar deneyiniz."
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:839
+#: src/gui/updaterwindow.cpp:855
 msgid "Completed"
 msgstr "Tamamlandı"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
 msgid "Being"
 msgstr "Var olma"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:118
-msgid "Friend Names"
-msgstr "Arkadaş İsimleri"
+#: src/gui/userpalette.cpp:119
+msgid "Friend names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:120
-msgid "Disregarded Names"
-msgstr "İhmal edilmiş İsimler"
+#: src/gui/userpalette.cpp:121
+msgid "Disregarded names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:122
-msgid "Ignored Names"
-msgstr "Görmezden gelinen İsimler"
+#: src/gui/userpalette.cpp:123
+msgid "Ignored names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:124
-msgid "Erased Names"
-msgstr "Silinmiş İsimler"
+#: src/gui/userpalette.cpp:125
+msgid "Erased names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:126
-msgid "Other Players' Names"
-msgstr "Diğer oyuncuların isimleri"
+#: src/gui/userpalette.cpp:127
+msgid "Other players names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:128
-msgid "Own Name"
-msgstr "Kendi Adın"
+#: src/gui/userpalette.cpp:129
+msgid "Own name"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:130
-msgid "GM Names"
-msgstr "GM isimleri"
+#: src/gui/userpalette.cpp:131
+msgid "GM names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
 msgid "NPCs"
 msgstr "NPCs"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
 msgid "Monster HP bar"
 msgstr "Canavar HP çubuğu"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:140
 msgid "Monster HP bar (second color)"
 msgstr "Canavar HP çubuğu (ikinci renk)"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:141
-msgid "Party Members"
-msgstr "Grup Üyeleri"
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:143
-msgid "Guild Members"
-msgstr "Lonca Üyeleri"
+#: src/gui/userpalette.cpp:142
+msgid "Party members"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:145
-msgid "Particle Effects"
-msgstr "Partikül Efektleri"
+#: src/gui/userpalette.cpp:144
+msgid "Guild members"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:147
-msgid "Pickup Notification"
-msgstr "Toplama Bildirimi"
+#: src/gui/userpalette.cpp:148
+msgid "Pickup notification"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:149
-msgid "Exp Notification"
-msgstr "Tecrübe Bildirimi"
+#: src/gui/userpalette.cpp:150
+msgid "Exp notification"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
 msgid "Player HP bar"
 msgstr "Oyuncu HP çubuğu"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
 msgid "Player HP bar (second color)"
 msgstr "Oyuncu HP çubuğu (ikinci renk)"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:157
-msgid "Player Hits Monster"
-msgstr "Oyuncu canavara vurur"
+#: src/gui/userpalette.cpp:158
+msgid "Player hits monster"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:159
-msgid "Monster Hits Player"
-msgstr "Canavar oyuncuya vurur"
+#: src/gui/userpalette.cpp:160
+msgid "Monster hits player"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:163
-msgid "Other Player Hits Local Player"
-msgstr "Diğer Oyuncu Yerel Oyuncuya Vurur"
+#: src/gui/userpalette.cpp:164
+msgid "Other player hits local player"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:166
 msgid "Critical Hit"
 msgstr "Kritik Vuruş"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
-msgid "Local Player Hits Monster"
-msgstr "Yerel oyuncu canavara vurur"
+#: src/gui/userpalette.cpp:170
+msgid "Local player hits monster"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:172
-msgid "Local Player Critical Hit"
-msgstr "Yerel Oyuncu Kritik Vuruş"
+#: src/gui/userpalette.cpp:173
+msgid "Local player critical hit"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:175
-msgid "Local Player Miss"
-msgstr "Yerel Oyuncu Kaçırır"
+#: src/gui/userpalette.cpp:176
+msgid "Local player miss"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:177
+#: src/gui/userpalette.cpp:178
 msgid "Misses"
 msgstr "Kaçırmalar"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
-msgid "Portal Highlight"
-msgstr "Portal Vurgulama"
+#: src/gui/userpalette.cpp:180
+msgid "Portal highlight"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:182
-msgid "Default collision Highlight"
+#: src/gui/userpalette.cpp:183
+msgid "Default collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:185
-msgid "Air collision Highlight"
+#: src/gui/userpalette.cpp:186
+msgid "Air collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:188
-msgid "Water collision Highlight"
+#: src/gui/userpalette.cpp:189
+msgid "Water collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:191
-msgid "Special ground collision Highlight"
+#: src/gui/userpalette.cpp:192
+msgid "Special ground collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
-msgid "Walkable Highlight"
-msgstr "Yürünebilir Vurgulama"
+#: src/gui/userpalette.cpp:195
+msgid "Walkable highlight"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:197
-msgid "Local Player Attack Range"
-msgstr "Yerel Oyuncu Saldırı Menzili"
+#: src/gui/userpalette.cpp:198
+msgid "Local player attack range"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:200
-msgid "Local Player Attack Range Border"
-msgstr "Yerel Oyuncu Saldırı Menzil Sınırı"
+#: src/gui/userpalette.cpp:201
+msgid "Local player attack range border"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:203
-msgid "Monster Attack Range"
-msgstr "Canavar Saldırı Menzili"
+#: src/gui/userpalette.cpp:204
+msgid "Monster attack range"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:206
-msgid "Home Place"
-msgstr "Ev Alanı"
+#: src/gui/userpalette.cpp:208
+msgid "Floor item amount color"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:211
+msgid "Home place"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:209
-msgid "Home Place Border"
-msgstr "Ev Alanı Sınırı"
+#: src/gui/userpalette.cpp:214
+msgid "Home place border"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:212
-msgid "Road Point"
-msgstr "Yol Puanı"
+#: src/gui/userpalette.cpp:217
+msgid "Road point"
+msgstr ""
 
 #. TRANSLATORS: who is online window name
 #: src/gui/whoisonline.cpp:79 src/gui/whoisonline.cpp:623
@@ -5619,7 +5645,7 @@ msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:315
+#: src/gui/widgets/itemcontainer.cpp:317
 msgid "Eq."
 msgstr ""
 
diff --git a/po/vls.po b/po/vls.po
index 221ba0378..f3624cb48 100644
--- a/po/vls.po
+++ b/po/vls.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-05-03 12:38+0300\n"
-"PO-Revision-Date: 2013-05-03 09:44+0000\n"
+"POT-Creation-Date: 2013-05-10 18:34+0300\n"
+"PO-Revision-Date: 2013-05-10 15:39+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Vlaams (http://www.transifex.com/projects/p/manaplus/language/vls/)\n"
 "MIME-Version: 1.0\n"
@@ -58,25 +58,25 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: full button name
-#: src/client.cpp:1136 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
+#: src/client.cpp:1137 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
 msgid "Setup"
 msgstr ""
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1140 src/gui/setup_perfomance.cpp:61
+#: src/client.cpp:1141 src/gui/setup_perfomance.cpp:61
 msgid "Perfomance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:1143 src/gui/setup_video.cpp:258
+#: src/client.cpp:1144 src/gui/setup_video.cpp:258
 msgid "Video"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1146 src/gui/setup_theme.cpp:273
+#: src/client.cpp:1147 src/gui/setup_theme.cpp:283
 msgid "Theme"
 msgstr ""
 
@@ -87,7 +87,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1150 src/gui/didyouknowwindow.cpp:78
+#: src/client.cpp:1151 src/gui/didyouknowwindow.cpp:78
 #: src/gui/inventorywindow.cpp:228 src/gui/npcdialog.cpp:63
 #: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:574
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:80
@@ -95,32 +95,32 @@ msgid "Close"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1238
+#: src/client.cpp:1239
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1282
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1320
+#: src/client.cpp:1321
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1431
+#: src/client.cpp:1432
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1471
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1483
+#: src/client.cpp:1484
 msgid "Changing game servers"
 msgstr ""
 
@@ -135,69 +135,69 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1540 src/client.cpp:1551 src/client.cpp:1721
+#: src/client.cpp:1541 src/client.cpp:1552 src/client.cpp:1722
 #: src/gui/changeemaildialog.cpp:168 src/gui/changepassworddialog.cpp:158
-#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:288
-#: src/gui/editserverdialog.cpp:220 src/gui/registerdialog.cpp:263
+#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:290
+#: src/gui/editserverdialog.cpp:216 src/gui/registerdialog.cpp:263
 #: src/gui/unregisterdialog.cpp:143 src/net/ea/charserverhandler.cpp:190
 #: src/net/ea/charserverhandler.cpp:210
 msgid "Error"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1564
+#: src/client.cpp:1565
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1601
+#: src/client.cpp:1602
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1603
+#: src/client.cpp:1604
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1624
+#: src/client.cpp:1625
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1626
+#: src/client.cpp:1627
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1647
+#: src/client.cpp:1648
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1649
+#: src/client.cpp:1650
 msgid "Farewell, come back any time..."
 msgstr ""
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1902 src/client.cpp:1917 src/client.cpp:1960
-#: src/client.cpp:1976 src/client.cpp:2417 src/client.cpp:2425
+#: src/client.cpp:1903 src/client.cpp:1918 src/client.cpp:1961
+#: src/client.cpp:1977 src/client.cpp:2418 src/client.cpp:2426
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2113
+#: src/client.cpp:2114
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2154 src/client.cpp:2161
+#: src/client.cpp:2155 src/client.cpp:2162
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:2183 src/client.cpp:2196
+#: src/client.cpp:2184 src/client.cpp:2197
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -477,19 +477,19 @@ msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: bot checker window header
-#: src/gui/botcheckerwindow.cpp:269
+#: src/gui/botcheckerwindow.cpp:268
 msgid "Bot Checker"
 msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:102
+#: src/gui/botcheckerwindow.cpp:277 src/gui/npcdialog.cpp:102
 msgid "Reset"
 msgstr ""
 
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: relations table header
-#: src/gui/botcheckerwindow.cpp:305 src/gui/setup_relations.cpp:61
+#: src/gui/botcheckerwindow.cpp:304 src/gui/setup_relations.cpp:61
 msgid "Name"
 msgstr ""
 
@@ -497,7 +497,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:145
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:145
 #: src/gui/popupmenu.cpp:241 src/gui/popupmenu.cpp:640
 #: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:257
 #: src/net/tmwa/generalhandler.cpp:292
@@ -507,7 +507,7 @@ msgstr ""
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
-#: src/gui/botcheckerwindow.cpp:309 src/gui/popupmenu.cpp:225
+#: src/gui/botcheckerwindow.cpp:308 src/gui/popupmenu.cpp:225
 #: src/gui/setupactiondata.h:93
 msgid "Talk"
 msgstr ""
@@ -515,7 +515,7 @@ msgstr ""
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/botcheckerwindow.cpp:311 src/gui/popupmenu.cpp:215
+#: src/gui/botcheckerwindow.cpp:310 src/gui/popupmenu.cpp:215
 #: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:371
 #: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:653
 #: src/gui/popupmenu.cpp:727 src/gui/setupactiondata.h:1856
@@ -523,7 +523,7 @@ msgid "Move"
 msgstr ""
 
 #. TRANSLATORS: bot checker window table header
-#: src/gui/botcheckerwindow.cpp:313
+#: src/gui/botcheckerwindow.cpp:312
 msgid "Result"
 msgstr ""
 
@@ -579,7 +579,7 @@ msgstr ""
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:516
+#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:511
 #: src/gui/selldialog.cpp:94 src/gui/selldialog.cpp:342
 #, c-format
 msgid "Price: %s / Total: %s"
@@ -596,9 +596,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:208
-#: src/gui/itemamountwindow.cpp:243 src/gui/npcdialog.cpp:93
-#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:833
+#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:202
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:93
+#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:821
 msgid "+"
 msgstr ""
 
@@ -608,9 +608,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:240 src/gui/npcdialog.cpp:95
-#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:846
+#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:200
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:95
+#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:834
 msgid "-"
 msgstr ""
 
@@ -622,7 +622,7 @@ msgstr ""
 #. TRANSLATORS: input action name
 #: src/gui/buydialog.cpp:260 src/gui/quitdialog.cpp:54
 #: src/gui/quitdialog.cpp:59 src/gui/quitdialog.cpp:61
-#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:255
+#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:264
 #: src/gui/setupactiondata.h:177
 msgid "Quit"
 msgstr ""
@@ -634,7 +634,7 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #: src/gui/buydialog.cpp:262 src/gui/selldialog.cpp:106
 #: src/gui/statuswindow.cpp:558 src/gui/statuswindow.cpp:615
-#: src/gui/statuswindow.cpp:830 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:852
 msgid "Max"
 msgstr ""
 
@@ -679,7 +679,7 @@ msgstr ""
 #: src/gui/buyselldialog.cpp:71 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:120
 #: src/gui/connectiondialog.cpp:48 src/gui/editserverdialog.cpp:80
-#: src/gui/itemamountwindow.cpp:212 src/gui/npcpostdialog.cpp:64
+#: src/gui/itemamountwindow.cpp:206 src/gui/npcpostdialog.cpp:64
 #: src/gui/popupmenu.cpp:290 src/gui/popupmenu.cpp:324
 #: src/gui/popupmenu.cpp:411 src/gui/popupmenu.cpp:454
 #: src/gui/popupmenu.cpp:485 src/gui/popupmenu.cpp:512
@@ -695,7 +695,7 @@ msgstr ""
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
 #: src/gui/setup.cpp:84 src/gui/socialwindow.cpp:1204
 #: src/gui/textcommandeditor.cpp:212 src/gui/textdialog.cpp:53
-#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:167
+#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:183
 msgid "Cancel"
 msgstr ""
 
@@ -859,7 +859,7 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:570
+#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:581
 #: src/gui/socialwindow.cpp:1269
 msgid "Create"
 msgstr ""
@@ -886,17 +886,17 @@ msgid "Please remove %d points"
 msgstr ""
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:60
+#: src/gui/charselectdialog.cpp:61
 msgid "Confirm Character Delete"
 msgstr ""
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:62
+#: src/gui/charselectdialog.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:86
+#: src/gui/charselectdialog.cpp:87
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
@@ -908,8 +908,8 @@ msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:565
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:576
+#: src/gui/updaterwindow.cpp:185
 msgid "Play"
 msgstr ""
 
@@ -925,7 +925,7 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:263
+#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:272
 #: src/gui/setupactiondata.h:1803 src/gui/setup_relations.cpp:262
 #: src/gui/shopwindow.cpp:96 src/gui/shopwindow.cpp:103
 #: src/gui/textcommandeditor.cpp:216
@@ -935,24 +935,24 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/charselectdialog.cpp:129 src/gui/unregisterdialog.cpp:48
+#: src/gui/charselectdialog.cpp:130 src/gui/unregisterdialog.cpp:48
 #: src/gui/unregisterdialog.cpp:53
 msgid "Unregister"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/charselectdialog.cpp:141
+#: src/gui/charselectdialog.cpp:142
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:172
+#: src/gui/charselectdialog.cpp:175
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/charselectdialog.cpp:246
+#: src/gui/charselectdialog.cpp:248
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -962,16 +962,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:288
+#: src/gui/charselectdialog.cpp:290
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password:"
 msgstr ""
 
@@ -1058,13 +1058,13 @@ msgid "Chat"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:735
+#: src/gui/chatwindow.cpp:638
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1165
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -1082,7 +1082,7 @@ msgstr ""
 
 #. TRANSLATORS: confirm dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/confirmdialog.cpp:58 src/gui/popupmenu.cpp:2429
+#: src/gui/confirmdialog.cpp:55 src/gui/popupmenu.cpp:2429
 #: src/gui/popupmenu.cpp:2442 src/gui/popupmenu.cpp:2457
 #: src/gui/popupmenu.cpp:2483
 msgid "Ignore"
@@ -1091,7 +1091,7 @@ msgstr ""
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
 #. TRANSLATORS: settings group
-#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:109
+#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:108
 #: src/gui/setup_other.cpp:123 src/gui/windowmenu.cpp:106
 msgid "Map"
 msgstr ""
@@ -1107,190 +1107,190 @@ msgid "Net"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:265
-#: src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:268
+#: src/gui/debugwindow.cpp:311
 msgid "Music:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:153 src/gui/debugwindow.cpp:271
-#: src/gui/debugwindow.cpp:312
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:274
+#: src/gui/debugwindow.cpp:315
 msgid "Map:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:155 src/gui/debugwindow.cpp:268
-#: src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:271
+#: src/gui/debugwindow.cpp:313
 msgid "Minimap:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:262
-#: src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:161 src/gui/debugwindow.cpp:265
+#: src/gui/debugwindow.cpp:309
 msgid "Cursor:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:161
+#: src/gui/debugwindow.cpp:164
 msgid "Particle count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:284
-#: src/gui/debugwindow.cpp:316
+#: src/gui/debugwindow.cpp:167 src/gui/debugwindow.cpp:287
+#: src/gui/debugwindow.cpp:319
 msgid "Map actors count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:166 src/gui/debugwindow.cpp:243
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:169 src/gui/debugwindow.cpp:246
+#: src/gui/debugwindow.cpp:252
 msgid "Player Position:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:172 src/gui/debugwindow.cpp:297
+#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:300
 msgid "Draw calls:"
 msgstr ""
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:175
+#. TRANSLATORS: debug window label, frames per second
+#: src/gui/debugwindow.cpp:178
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:177 src/gui/debugwindow.cpp:324
+#. TRANSLATORS: debug window label, logic per second
+#: src/gui/debugwindow.cpp:180 src/gui/debugwindow.cpp:327
 #, c-format
 msgid "%d LPS"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:191 src/gui/debugwindow.cpp:209
 #, c-format
 msgid "%d FPS (Software)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:193
+#: src/gui/debugwindow.cpp:196
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:197
+#: src/gui/debugwindow.cpp:200
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:201
+#: src/gui/debugwindow.cpp:204
 #, c-format
 msgid "%d FPS (mobile OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:225 src/gui/debugwindow.cpp:290
+#: src/gui/debugwindow.cpp:228 src/gui/debugwindow.cpp:293
 msgid "Textures count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:279
+#: src/gui/debugwindow.cpp:282
 #, c-format
 msgid "Particle count: %d"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:330 src/gui/debugwindow.cpp:380
-#: src/gui/debugwindow.cpp:442
+#: src/gui/debugwindow.cpp:333 src/gui/debugwindow.cpp:383
+#: src/gui/debugwindow.cpp:445
 msgid "Target:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:332 src/gui/debugwindow.cpp:386
-#: src/gui/debugwindow.cpp:444
+#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
+#: src/gui/debugwindow.cpp:447
 msgid "Target Id:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
-#: src/gui/debugwindow.cpp:446
+#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:392
+#: src/gui/debugwindow.cpp:449
 msgid "Target type:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:337
+#: src/gui/debugwindow.cpp:340
 msgid "Target level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:339 src/gui/debugwindow.cpp:405
+#: src/gui/debugwindow.cpp:342 src/gui/debugwindow.cpp:408
 msgid "Target race:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:341
+#: src/gui/debugwindow.cpp:344
 msgid "Target party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:346
 msgid "Target guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:430
-#: src/gui/debugwindow.cpp:436 src/gui/debugwindow.cpp:454
+#: src/gui/debugwindow.cpp:348 src/gui/debugwindow.cpp:433
+#: src/gui/debugwindow.cpp:439 src/gui/debugwindow.cpp:457
 msgid "Attack delay:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:347 src/gui/debugwindow.cpp:417
-#: src/gui/debugwindow.cpp:456
+#: src/gui/debugwindow.cpp:350 src/gui/debugwindow.cpp:420
+#: src/gui/debugwindow.cpp:459
 msgid "Minimal hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:349 src/gui/debugwindow.cpp:420
-#: src/gui/debugwindow.cpp:458
+#: src/gui/debugwindow.cpp:352 src/gui/debugwindow.cpp:423
+#: src/gui/debugwindow.cpp:461
 msgid "Maximum hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:351 src/gui/debugwindow.cpp:423
-#: src/gui/debugwindow.cpp:460
+#: src/gui/debugwindow.cpp:354 src/gui/debugwindow.cpp:426
+#: src/gui/debugwindow.cpp:463
 msgid "Critical hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:394 src/gui/debugwindow.cpp:400
-#: src/gui/debugwindow.cpp:448
+#: src/gui/debugwindow.cpp:397 src/gui/debugwindow.cpp:403
+#: src/gui/debugwindow.cpp:451
 msgid "Target Level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:408 src/gui/debugwindow.cpp:450
+#: src/gui/debugwindow.cpp:411 src/gui/debugwindow.cpp:453
 msgid "Target Party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:412 src/gui/debugwindow.cpp:452
+#: src/gui/debugwindow.cpp:415 src/gui/debugwindow.cpp:455
 msgid "Target Guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:493
+#: src/gui/debugwindow.cpp:496
 #, c-format
 msgid "Ping: %s ms"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:496
+#: src/gui/debugwindow.cpp:499
 #, c-format
 msgid "In: %d bytes/s"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:499
+#: src/gui/debugwindow.cpp:502
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
@@ -1322,7 +1322,7 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #: src/gui/editdialog.cpp:45 src/gui/editserverdialog.cpp:78
-#: src/gui/itemamountwindow.cpp:210 src/gui/okdialog.cpp:51
+#: src/gui/itemamountwindow.cpp:204 src/gui/okdialog.cpp:51
 #: src/gui/quitdialog.cpp:70 src/gui/textdialog.cpp:46
 msgid "OK"
 msgstr ""
@@ -1334,7 +1334,7 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:257
+#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:266
 msgid "Connect"
 msgstr ""
 
@@ -1364,7 +1364,7 @@ msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/editserverdialog.cpp:222
+#: src/gui/editserverdialog.cpp:218
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -1416,7 +1416,7 @@ msgstr ""
 #: src/gui/inventorywindow.cpp:178 src/gui/inventorywindow.cpp:630
 #: src/gui/popupmenu.cpp:1843 src/gui/popupmenu.cpp:1922
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2041
-#: src/gui/skilldialog.cpp:277
+#: src/gui/skilldialog.cpp:279
 msgid "Use"
 msgstr ""
 
@@ -1450,7 +1450,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: setup button
-#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:718
+#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:719
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1992
 #: src/gui/popupmenu.cpp:2066 src/gui/setup.cpp:86
 msgid "Store"
@@ -1472,47 +1472,47 @@ msgid "Drop"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/itemamountwindow.cpp:214
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:264
 msgid "Select amount of items to trade."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:274
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to drop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:278
+#: src/gui/itemamountwindow.cpp:272
 msgid "Select amount of items to store."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:276
 msgid "Select amount of items to retrieve."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:286
+#: src/gui/itemamountwindow.cpp:280
 msgid "Select amount of items to split."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:290
+#: src/gui/itemamountwindow.cpp:284
 msgid "Add to buy shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:294
+#: src/gui/itemamountwindow.cpp:288
 msgid "Add to sell shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:298
+#: src/gui/itemamountwindow.cpp:292
 msgid "Unknown."
 msgstr ""
 
@@ -1539,7 +1539,7 @@ msgstr ""
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:58 src/gui/killstats.cpp:171
-#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:516
+#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:509
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
@@ -1547,7 +1547,7 @@ msgstr ""
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:61 src/gui/killstats.cpp:173
 #: src/gui/killstats.cpp:253 src/gui/killstats.cpp:268
-#: src/gui/killstats.cpp:518
+#: src/gui/killstats.cpp:511
 #, c-format
 msgid "Avg Exp: %s"
 msgstr ""
@@ -1555,14 +1555,14 @@ msgstr ""
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:63 src/gui/killstats.cpp:176
 #: src/gui/killstats.cpp:258 src/gui/killstats.cpp:272
-#: src/gui/killstats.cpp:521
+#: src/gui/killstats.cpp:514
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:66 src/gui/killstats.cpp:187
-#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:524
+#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:517
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
@@ -1590,9 +1590,9 @@ msgid "Last kill exp:"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:414
-#: src/gui/killstats.cpp:421 src/gui/killstats.cpp:428
-#: src/gui/killstats.cpp:434
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:408
+#: src/gui/killstats.cpp:415 src/gui/killstats.cpp:422
+#: src/gui/killstats.cpp:428
 msgid "Time before jacko spawn:"
 msgstr ""
 
@@ -1624,12 +1624,12 @@ msgid "  Time for next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:421
+#: src/gui/killstats.cpp:415
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:428
+#: src/gui/killstats.cpp:422
 msgid "jacko spawning"
 msgstr ""
 
@@ -1735,32 +1735,32 @@ msgid "arrows bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:88
+#: src/gui/ministatuswindow.cpp:89
 msgid "status bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:108
+#: src/gui/ministatuswindow.cpp:109
 msgid "job bar"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:306 src/gui/statuswindow.cpp:298
+#: src/gui/ministatuswindow.cpp:307 src/gui/statuswindow.cpp:298
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:313 src/gui/statuswindow.cpp:141
+#: src/gui/ministatuswindow.cpp:314 src/gui/statuswindow.cpp:141
 #: src/gui/statuswindow.cpp:305 src/gui/statuswindow.cpp:375
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
 #. TRANSLATORS: status bar label
-#: src/gui/ministatuswindow.cpp:330 src/gui/ministatuswindow.cpp:367
+#: src/gui/ministatuswindow.cpp:331 src/gui/ministatuswindow.cpp:368
 msgid "Need"
 msgstr ""
 
@@ -2148,7 +2148,7 @@ msgstr ""
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2209 src/gui/popupmenu.cpp:2280
-#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:139
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
 #: src/gui/socialwindow.cpp:934
 msgid "(default)"
 msgstr ""
@@ -2331,7 +2331,7 @@ msgid "Passwords do not match."
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:257
 msgid "Choose Your Server"
 msgstr ""
 
@@ -2339,61 +2339,61 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:259 src/gui/shopwindow.cpp:94
+#: src/gui/serverdialog.cpp:268 src/gui/shopwindow.cpp:94
 #: src/gui/shopwindow.cpp:101 src/gui/tradewindow.cpp:77
 msgid "Add"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
-#: src/gui/serverdialog.cpp:261 src/gui/widgets/setupitem.cpp:299
+#: src/gui/serverdialog.cpp:270 src/gui/widgets/setupitem.cpp:299
 #: src/gui/widgets/setupitem.cpp:426
 msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:274
 msgid "Load"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:279
+#: src/gui/serverdialog.cpp:288
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:297
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:518
+#: src/gui/serverdialog.cpp:527
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:524
+#: src/gui/serverdialog.cpp:533
 msgid "Waiting for server..."
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:529
+#: src/gui/serverdialog.cpp:538
 msgid "Preparing download"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:534
+#: src/gui/serverdialog.cpp:543
 msgid "Error retreiving server list!"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:626
+#: src/gui/serverdialog.cpp:635
 msgid "requires a newer version"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:631
+#: src/gui/serverdialog.cpp:640
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -3404,7 +3404,7 @@ msgid "Type:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:334
+#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:336
 msgid "Delay:"
 msgstr ""
 
@@ -3424,30 +3424,30 @@ msgid "Blue:"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:420
+#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:422
 msgid "Static"
 msgstr ""
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:107 src/gui/setup_colors.cpp:110
-#: src/gui/setup_colors.cpp:422
+#: src/gui/setup_colors.cpp:424
 msgid "Pulse"
 msgstr ""
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:112 src/gui/setup_colors.cpp:115
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Rainbow"
 msgstr ""
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:117 src/gui/setup_colors.cpp:120
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Spectrum"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:328
+#: src/gui/setup_colors.cpp:330
 msgid "Alpha:"
 msgstr ""
 
@@ -3613,7 +3613,7 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: palette color
-#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:134
+#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:135
 msgid "Monsters"
 msgstr ""
 
@@ -4162,206 +4162,231 @@ msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:86
-msgid "Very small (9)"
+msgid "Very small (8)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:88
-msgid "Tiny (10)"
+msgid "Very small (9)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:90
-msgid "Small (11)"
+msgid "Tiny (10)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:92
-msgid "Medium (12)"
+msgid "Small (11)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:94
-msgid "Normal (13)"
+msgid "Medium (12)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:96
-msgid "Large (14)"
+msgid "Normal (13)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:98
-msgid "Very large (15)"
+msgid "Large (14)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:100
-msgid "Big (16)"
+msgid "Large (15)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:102
-msgid "Very big (17)"
+msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:104
-msgid "Huge (18)"
+msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:106
-msgid "Very huge (19)"
+msgid "Big (18)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:108
+msgid "Big (19)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:110
+msgid "Very big (20)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:112
+msgid "Very big (21)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:114
+msgid "Very big (22)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:116
+msgid "Huge (23)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:151
 msgid "Chinese (China)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:153
 msgid "Czech"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:155
 msgid "English"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:157
 msgid "Finnish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:159
 msgid "French"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:161
 msgid "German"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:153
+#: src/gui/setup_theme.cpp:163
 msgid "Indonesian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:155
+#: src/gui/setup_theme.cpp:165
 msgid "Italian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:157
+#: src/gui/setup_theme.cpp:167
 msgid "Polish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:159
+#: src/gui/setup_theme.cpp:169
 msgid "Japanese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:161
+#: src/gui/setup_theme.cpp:171
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:163
+#: src/gui/setup_theme.cpp:173
 msgid "Portuguese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:165
+#: src/gui/setup_theme.cpp:175
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:167
+#: src/gui/setup_theme.cpp:177
 msgid "Russian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:169
+#: src/gui/setup_theme.cpp:179
 msgid "Spanish (Castilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:171
+#: src/gui/setup_theme.cpp:181
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:223
+#: src/gui/setup_theme.cpp:233
 msgid "Gui theme"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:230
+#: src/gui/setup_theme.cpp:240
 msgid "Main Font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:235
+#: src/gui/setup_theme.cpp:245
 msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:239
+#: src/gui/setup_theme.cpp:249
 msgid "Bold font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:243
+#: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:247
+#: src/gui/setup_theme.cpp:257
 msgid "Help font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:251
+#: src/gui/setup_theme.cpp:261
 msgid "Secure font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:255
+#: src/gui/setup_theme.cpp:265
 msgid "Japanese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:260
+#: src/gui/setup_theme.cpp:270
 msgid "Font size"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:265
+#: src/gui/setup_theme.cpp:275
 msgid "Npc font size"
 msgstr ""
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/setup_theme.cpp:269
+#: src/gui/setup_theme.cpp:279
 msgid "i"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/setup_theme.cpp:442
+#: src/gui/setup_theme.cpp:452
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/setup_theme.cpp:467
+#: src/gui/setup_theme.cpp:477
 msgid "Theme Changed"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/setup_theme.cpp:467 src/gui/setup_video.cpp:537
+#: src/gui/setup_theme.cpp:477 src/gui/setup_video.cpp:537
 #: src/gui/setup_video.cpp:546
 msgid "Restart your client for the change to take effect."
 msgstr ""
@@ -4659,7 +4684,8 @@ msgid "Ambient FX"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_visual.cpp:140
+#. TRANSLATORS: palette color
+#: src/gui/setup_visual.cpp:140 src/gui/userpalette.cpp:146
 msgid "Particle effects"
 msgstr ""
 
@@ -4746,45 +4772,45 @@ msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/skilldialog.cpp:270 src/gui/windowmenu.cpp:112
+#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:112
 msgid "Skills"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/skilldialog.cpp:279
+#: src/gui/skilldialog.cpp:281
 msgid "Up"
 msgstr ""
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/skilldialog.cpp:391
+#: src/gui/skilldialog.cpp:393
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skills tab
-#: src/gui/skilldialog.cpp:444
+#: src/gui/skilldialog.cpp:446
 msgid "basic"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill name
-#: src/gui/skilldialog.cpp:447
+#: src/gui/skilldialog.cpp:449
 msgid "basic, 1"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/skilldialog.cpp:484
+#: src/gui/skilldialog.cpp:486
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/skilldialog.cpp:518
+#: src/gui/skilldialog.cpp:520
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/skilldialog.cpp:612 src/gui/skilldialog.cpp:762
+#: src/gui/skilldialog.cpp:614 src/gui/skilldialog.cpp:764
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -5227,7 +5253,7 @@ msgid "Trade: You"
 msgstr ""
 
 #. TRANSLATORS: trade window money label
-#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:182
+#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:184
 #, c-format
 msgid "You get %s"
 msgstr ""
@@ -5243,12 +5269,12 @@ msgid "You give:"
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:393
+#: src/gui/tradewindow.cpp:396
 msgid "You don't have enough money."
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:475
+#: src/gui/tradewindow.cpp:479
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
@@ -5260,223 +5286,223 @@ msgid "Name: %s"
 msgstr ""
 
 #. TRANSLATORS: updater window name
-#: src/gui/updaterwindow.cpp:140
+#: src/gui/updaterwindow.cpp:156
 msgid "Updating..."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:165
+#: src/gui/updaterwindow.cpp:181
 msgid "Connecting..."
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/updaterwindow.cpp:656
+#: src/gui/updaterwindow.cpp:672
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/updaterwindow.cpp:658
+#: src/gui/updaterwindow.cpp:674
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:660
+#: src/gui/updaterwindow.cpp:676
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:839
+#: src/gui/updaterwindow.cpp:855
 msgid "Completed"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
 msgid "Being"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:118
-msgid "Friend Names"
+#: src/gui/userpalette.cpp:119
+msgid "Friend names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:120
-msgid "Disregarded Names"
+#: src/gui/userpalette.cpp:121
+msgid "Disregarded names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:122
-msgid "Ignored Names"
+#: src/gui/userpalette.cpp:123
+msgid "Ignored names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:124
-msgid "Erased Names"
+#: src/gui/userpalette.cpp:125
+msgid "Erased names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:126
-msgid "Other Players' Names"
+#: src/gui/userpalette.cpp:127
+msgid "Other players names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:128
-msgid "Own Name"
+#: src/gui/userpalette.cpp:129
+msgid "Own name"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:130
-msgid "GM Names"
+#: src/gui/userpalette.cpp:131
+msgid "GM names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
 msgid "NPCs"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
 msgid "Monster HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:140
 msgid "Monster HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:141
-msgid "Party Members"
+#: src/gui/userpalette.cpp:142
+msgid "Party members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:143
-msgid "Guild Members"
+#: src/gui/userpalette.cpp:144
+msgid "Guild members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:145
-msgid "Particle Effects"
+#: src/gui/userpalette.cpp:148
+msgid "Pickup notification"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:147
-msgid "Pickup Notification"
+#: src/gui/userpalette.cpp:150
+msgid "Exp notification"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:149
-msgid "Exp Notification"
-msgstr ""
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
 msgid "Player HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
 msgid "Player HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:157
-msgid "Player Hits Monster"
+#: src/gui/userpalette.cpp:158
+msgid "Player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:159
-msgid "Monster Hits Player"
+#: src/gui/userpalette.cpp:160
+msgid "Monster hits player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:163
-msgid "Other Player Hits Local Player"
+#: src/gui/userpalette.cpp:164
+msgid "Other player hits local player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:166
 msgid "Critical Hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
-msgid "Local Player Hits Monster"
+#: src/gui/userpalette.cpp:170
+msgid "Local player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:172
-msgid "Local Player Critical Hit"
+#: src/gui/userpalette.cpp:173
+msgid "Local player critical hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:175
-msgid "Local Player Miss"
+#: src/gui/userpalette.cpp:176
+msgid "Local player miss"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:177
+#: src/gui/userpalette.cpp:178
 msgid "Misses"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
-msgid "Portal Highlight"
+#: src/gui/userpalette.cpp:180
+msgid "Portal highlight"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:183
+msgid "Default collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:182
-msgid "Default collision Highlight"
+#: src/gui/userpalette.cpp:186
+msgid "Air collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:185
-msgid "Air collision Highlight"
+#: src/gui/userpalette.cpp:189
+msgid "Water collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:188
-msgid "Water collision Highlight"
+#: src/gui/userpalette.cpp:192
+msgid "Special ground collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:191
-msgid "Special ground collision Highlight"
+#: src/gui/userpalette.cpp:195
+msgid "Walkable highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
-msgid "Walkable Highlight"
+#: src/gui/userpalette.cpp:198
+msgid "Local player attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:197
-msgid "Local Player Attack Range"
+#: src/gui/userpalette.cpp:201
+msgid "Local player attack range border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:200
-msgid "Local Player Attack Range Border"
+#: src/gui/userpalette.cpp:204
+msgid "Monster attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:203
-msgid "Monster Attack Range"
+#: src/gui/userpalette.cpp:208
+msgid "Floor item amount color"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:206
-msgid "Home Place"
+#: src/gui/userpalette.cpp:211
+msgid "Home place"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:209
-msgid "Home Place Border"
+#: src/gui/userpalette.cpp:214
+msgid "Home place border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:212
-msgid "Road Point"
+#: src/gui/userpalette.cpp:217
+msgid "Road point"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
@@ -5606,7 +5632,7 @@ msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:315
+#: src/gui/widgets/itemcontainer.cpp:317
 msgid "Eq."
 msgstr ""
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index a716068e4..cedc96862 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-05-03 12:38+0300\n"
-"PO-Revision-Date: 2013-05-03 09:44+0000\n"
+"POT-Creation-Date: 2013-05-11 12:13+0300\n"
+"PO-Revision-Date: 2013-05-10 15:39+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/manaplus/"
 "language/zh_CN/)\n"
@@ -63,25 +63,25 @@ msgstr "I"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: full button name
-#: src/client.cpp:1136 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
+#: src/client.cpp:1137 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
 msgid "Setup"
 msgstr "设置"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1140 src/gui/setup_perfomance.cpp:61
+#: src/client.cpp:1141 src/gui/setup_perfomance.cpp:61
 msgid "Perfomance"
 msgstr "性能"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:1143 src/gui/setup_video.cpp:258
+#: src/client.cpp:1144 src/gui/setup_video.cpp:258
 msgid "Video"
 msgstr "视频"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1146 src/gui/setup_theme.cpp:273
+#: src/client.cpp:1147 src/gui/setup_theme.cpp:283
 msgid "Theme"
 msgstr "主题"
 
@@ -92,7 +92,7 @@ msgstr "主题"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1150 src/gui/didyouknowwindow.cpp:78
+#: src/client.cpp:1151 src/gui/didyouknowwindow.cpp:78
 #: src/gui/inventorywindow.cpp:228 src/gui/npcdialog.cpp:63
 #: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:574
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:80
@@ -100,32 +100,32 @@ msgid "Close"
 msgstr "关闭"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1238
+#: src/client.cpp:1239
 msgid "Connecting to server"
 msgstr "正在连接服务器"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1282
 msgid "Logging in"
 msgstr "登录中"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1320
+#: src/client.cpp:1321
 msgid "Entering game world"
 msgstr "进入游戏世界"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1431
+#: src/client.cpp:1432
 msgid "Requesting characters"
 msgstr "请求角色"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1471
 msgid "Connecting to the game server"
 msgstr "正在连接游戏服务器"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1483
+#: src/client.cpp:1484
 msgid "Changing game servers"
 msgstr "正在更改游戏服务器"
 
@@ -140,69 +140,69 @@ msgstr "正在更改游戏服务器"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1540 src/client.cpp:1551 src/client.cpp:1721
+#: src/client.cpp:1541 src/client.cpp:1552 src/client.cpp:1722
 #: src/gui/changeemaildialog.cpp:168 src/gui/changepassworddialog.cpp:158
-#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:288
-#: src/gui/editserverdialog.cpp:220 src/gui/registerdialog.cpp:263
+#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:290
+#: src/gui/editserverdialog.cpp:216 src/gui/registerdialog.cpp:263
 #: src/gui/unregisterdialog.cpp:143 src/net/ea/charserverhandler.cpp:190
 #: src/net/ea/charserverhandler.cpp:210
 msgid "Error"
 msgstr "错误"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1564
+#: src/client.cpp:1565
 msgid "Requesting registration details"
 msgstr "正在请求详细注册信息"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1601
+#: src/client.cpp:1602
 msgid "Password Change"
 msgstr "更改密码"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1603
+#: src/client.cpp:1604
 msgid "Password changed successfully!"
 msgstr "密码更改成功！"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1624
+#: src/client.cpp:1625
 msgid "Email Change"
 msgstr "更改电子邮箱地址"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1626
+#: src/client.cpp:1627
 msgid "Email changed successfully!"
 msgstr "电子邮箱地址更改成功！"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1647
+#: src/client.cpp:1648
 msgid "Unregister Successful"
 msgstr "取消注册成功"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1649
+#: src/client.cpp:1650
 msgid "Farewell, come back any time..."
 msgstr "再见，欢迎随时回来... ..."
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1902 src/client.cpp:1917 src/client.cpp:1960
-#: src/client.cpp:1976 src/client.cpp:2417 src/client.cpp:2425
+#: src/client.cpp:1903 src/client.cpp:1918 src/client.cpp:1961
+#: src/client.cpp:1977 src/client.cpp:2418 src/client.cpp:2426
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s 不存在，且无法创建！正在退出。"
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2113
+#: src/client.cpp:2114
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "主机更新无效：%s"
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2154 src/client.cpp:2161
+#: src/client.cpp:2155 src/client.cpp:2162
 msgid "Error creating updates directory!"
 msgstr "创建更新目录错误！"
 
-#: src/client.cpp:2183 src/client.cpp:2196
+#: src/client.cpp:2184 src/client.cpp:2197
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "错误：%s 不存在且无法创建！正在退出。"
@@ -482,19 +482,19 @@ msgid "Comment: %s"
 msgstr "评论: %s"
 
 #. TRANSLATORS: bot checker window header
-#: src/gui/botcheckerwindow.cpp:269
+#: src/gui/botcheckerwindow.cpp:268
 msgid "Bot Checker"
 msgstr "挂机检查"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:102
+#: src/gui/botcheckerwindow.cpp:277 src/gui/npcdialog.cpp:102
 msgid "Reset"
 msgstr "重置"
 
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: relations table header
-#: src/gui/botcheckerwindow.cpp:305 src/gui/setup_relations.cpp:61
+#: src/gui/botcheckerwindow.cpp:304 src/gui/setup_relations.cpp:61
 msgid "Name"
 msgstr "姓名"
 
@@ -502,7 +502,7 @@ msgstr "姓名"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:145
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:145
 #: src/gui/popupmenu.cpp:241 src/gui/popupmenu.cpp:640
 #: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:257
 #: src/net/tmwa/generalhandler.cpp:292
@@ -512,7 +512,7 @@ msgstr "攻击"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
-#: src/gui/botcheckerwindow.cpp:309 src/gui/popupmenu.cpp:225
+#: src/gui/botcheckerwindow.cpp:308 src/gui/popupmenu.cpp:225
 #: src/gui/setupactiondata.h:93
 msgid "Talk"
 msgstr "说话"
@@ -520,7 +520,7 @@ msgstr "说话"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/botcheckerwindow.cpp:311 src/gui/popupmenu.cpp:215
+#: src/gui/botcheckerwindow.cpp:310 src/gui/popupmenu.cpp:215
 #: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:371
 #: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:653
 #: src/gui/popupmenu.cpp:727 src/gui/setupactiondata.h:1856
@@ -528,7 +528,7 @@ msgid "Move"
 msgstr "移动"
 
 #. TRANSLATORS: bot checker window table header
-#: src/gui/botcheckerwindow.cpp:313
+#: src/gui/botcheckerwindow.cpp:312
 msgid "Result"
 msgstr "结果"
 
@@ -584,7 +584,7 @@ msgstr "购买"
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:516
+#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:511
 #: src/gui/selldialog.cpp:94 src/gui/selldialog.cpp:342
 #, c-format
 msgid "Price: %s / Total: %s"
@@ -601,9 +601,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:208
-#: src/gui/itemamountwindow.cpp:243 src/gui/npcdialog.cpp:93
-#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:833
+#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:202
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:93
+#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:821
 msgid "+"
 msgstr "+"
 
@@ -613,9 +613,9 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:240 src/gui/npcdialog.cpp:95
-#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:846
+#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:200
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:95
+#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:834
 msgid "-"
 msgstr "-"
 
@@ -627,7 +627,7 @@ msgstr "-"
 #. TRANSLATORS: input action name
 #: src/gui/buydialog.cpp:260 src/gui/quitdialog.cpp:54
 #: src/gui/quitdialog.cpp:59 src/gui/quitdialog.cpp:61
-#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:255
+#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:264
 #: src/gui/setupactiondata.h:177
 msgid "Quit"
 msgstr "退出"
@@ -639,7 +639,7 @@ msgstr "退出"
 #. TRANSLATORS: status bar label
 #: src/gui/buydialog.cpp:262 src/gui/selldialog.cpp:106
 #: src/gui/statuswindow.cpp:558 src/gui/statuswindow.cpp:615
-#: src/gui/statuswindow.cpp:830 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:852
 msgid "Max"
 msgstr "最大"
 
@@ -684,7 +684,7 @@ msgstr "出售"
 #: src/gui/buyselldialog.cpp:71 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:120
 #: src/gui/connectiondialog.cpp:48 src/gui/editserverdialog.cpp:80
-#: src/gui/itemamountwindow.cpp:212 src/gui/npcpostdialog.cpp:64
+#: src/gui/itemamountwindow.cpp:206 src/gui/npcpostdialog.cpp:64
 #: src/gui/popupmenu.cpp:290 src/gui/popupmenu.cpp:324
 #: src/gui/popupmenu.cpp:411 src/gui/popupmenu.cpp:454
 #: src/gui/popupmenu.cpp:485 src/gui/popupmenu.cpp:512
@@ -700,7 +700,7 @@ msgstr "出售"
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
 #: src/gui/setup.cpp:84 src/gui/socialwindow.cpp:1204
 #: src/gui/textcommandeditor.cpp:212 src/gui/textdialog.cpp:53
-#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:167
+#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:183
 msgid "Cancel"
 msgstr "取消"
 
@@ -864,7 +864,7 @@ msgstr "请分发%d点数"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:570
+#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:581
 #: src/gui/socialwindow.cpp:1269
 msgid "Create"
 msgstr "建立"
@@ -891,17 +891,17 @@ msgid "Please remove %d points"
 msgstr "请删除%d点数"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:60
+#: src/gui/charselectdialog.cpp:61
 msgid "Confirm Character Delete"
 msgstr "确认删除角色"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:62
+#: src/gui/charselectdialog.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "你确定想删除这个角色？"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:86
+#: src/gui/charselectdialog.cpp:87
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
@@ -913,8 +913,8 @@ msgstr "登录"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:565
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:576
+#: src/gui/updaterwindow.cpp:185
 msgid "Play"
 msgstr "开始"
 
@@ -930,7 +930,7 @@ msgstr "信息"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:263
+#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:272
 #: src/gui/setupactiondata.h:1803 src/gui/setup_relations.cpp:262
 #: src/gui/shopwindow.cpp:96 src/gui/shopwindow.cpp:103
 #: src/gui/textcommandeditor.cpp:216
@@ -940,24 +940,24 @@ msgstr "删除"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/charselectdialog.cpp:129 src/gui/unregisterdialog.cpp:48
+#: src/gui/charselectdialog.cpp:130 src/gui/unregisterdialog.cpp:48
 #: src/gui/unregisterdialog.cpp:53
 msgid "Unregister"
 msgstr "注销"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/charselectdialog.cpp:141
+#: src/gui/charselectdialog.cpp:142
 msgid "Change Email"
 msgstr "变更电子邮件"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:172
+#: src/gui/charselectdialog.cpp:175
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/charselectdialog.cpp:246
+#: src/gui/charselectdialog.cpp:248
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -967,16 +967,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:288
+#: src/gui/charselectdialog.cpp:290
 msgid "Incorrect password"
 msgstr "不正确的密码"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password for deleting character"
 msgstr "删除字符输入的密码"
 
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password:"
 msgstr "输入密码："
 
@@ -1063,13 +1063,13 @@ msgid "Chat"
 msgstr "聊天"
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:735
+#: src/gui/chatwindow.cpp:638
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1165
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "对%s密语到：%s"
@@ -1087,7 +1087,7 @@ msgstr "否"
 
 #. TRANSLATORS: confirm dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/confirmdialog.cpp:58 src/gui/popupmenu.cpp:2429
+#: src/gui/confirmdialog.cpp:55 src/gui/popupmenu.cpp:2429
 #: src/gui/popupmenu.cpp:2442 src/gui/popupmenu.cpp:2457
 #: src/gui/popupmenu.cpp:2483
 msgid "Ignore"
@@ -1096,7 +1096,7 @@ msgstr "忽略"
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
 #. TRANSLATORS: settings group
-#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:109
+#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:108
 #: src/gui/setup_other.cpp:123 src/gui/windowmenu.cpp:106
 msgid "Map"
 msgstr "地图"
@@ -1112,190 +1112,190 @@ msgid "Net"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:265
-#: src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:268
+#: src/gui/debugwindow.cpp:311
 msgid "Music:"
 msgstr "音乐："
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:153 src/gui/debugwindow.cpp:271
-#: src/gui/debugwindow.cpp:312
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:274
+#: src/gui/debugwindow.cpp:315
 msgid "Map:"
 msgstr "地图："
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:155 src/gui/debugwindow.cpp:268
-#: src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:271
+#: src/gui/debugwindow.cpp:313
 msgid "Minimap:"
 msgstr "小地图："
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:262
-#: src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:161 src/gui/debugwindow.cpp:265
+#: src/gui/debugwindow.cpp:309
 msgid "Cursor:"
 msgstr "光标："
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:161
+#: src/gui/debugwindow.cpp:164
 msgid "Particle count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:284
-#: src/gui/debugwindow.cpp:316
+#: src/gui/debugwindow.cpp:167 src/gui/debugwindow.cpp:287
+#: src/gui/debugwindow.cpp:319
 msgid "Map actors count:"
 msgstr "地图演员数："
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:166 src/gui/debugwindow.cpp:243
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:169 src/gui/debugwindow.cpp:246
+#: src/gui/debugwindow.cpp:252
 msgid "Player Position:"
 msgstr "的位置："
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:172 src/gui/debugwindow.cpp:297
+#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:300
 msgid "Draw calls:"
 msgstr ""
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:175
+#. TRANSLATORS: debug window label, frames per second
+#: src/gui/debugwindow.cpp:178
 #, c-format
 msgid "%d FPS"
 msgstr "%d的FPS"
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:177 src/gui/debugwindow.cpp:324
+#. TRANSLATORS: debug window label, logic per second
+#: src/gui/debugwindow.cpp:180 src/gui/debugwindow.cpp:327
 #, c-format
 msgid "%d LPS"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:191 src/gui/debugwindow.cpp:209
 #, c-format
 msgid "%d FPS (Software)"
 msgstr "%d FPS (软件)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:193
+#: src/gui/debugwindow.cpp:196
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr "%d的FPS (快速 OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:197
+#: src/gui/debugwindow.cpp:200
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr "%d FPS (旧的OpenGL)"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:201
+#: src/gui/debugwindow.cpp:204
 #, c-format
 msgid "%d FPS (mobile OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:225 src/gui/debugwindow.cpp:290
+#: src/gui/debugwindow.cpp:228 src/gui/debugwindow.cpp:293
 msgid "Textures count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:279
+#: src/gui/debugwindow.cpp:282
 #, c-format
 msgid "Particle count: %d"
 msgstr "粒子数：%d个"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:330 src/gui/debugwindow.cpp:380
-#: src/gui/debugwindow.cpp:442
+#: src/gui/debugwindow.cpp:333 src/gui/debugwindow.cpp:383
+#: src/gui/debugwindow.cpp:445
 msgid "Target:"
 msgstr "目标："
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:332 src/gui/debugwindow.cpp:386
-#: src/gui/debugwindow.cpp:444
+#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
+#: src/gui/debugwindow.cpp:447
 msgid "Target Id:"
 msgstr "目标ID："
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
-#: src/gui/debugwindow.cpp:446
+#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:392
+#: src/gui/debugwindow.cpp:449
 msgid "Target type:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:337
+#: src/gui/debugwindow.cpp:340
 msgid "Target level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:339 src/gui/debugwindow.cpp:405
+#: src/gui/debugwindow.cpp:342 src/gui/debugwindow.cpp:408
 msgid "Target race:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:341
+#: src/gui/debugwindow.cpp:344
 msgid "Target party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:346
 msgid "Target guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:430
-#: src/gui/debugwindow.cpp:436 src/gui/debugwindow.cpp:454
+#: src/gui/debugwindow.cpp:348 src/gui/debugwindow.cpp:433
+#: src/gui/debugwindow.cpp:439 src/gui/debugwindow.cpp:457
 msgid "Attack delay:"
 msgstr "攻击延迟："
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:347 src/gui/debugwindow.cpp:417
-#: src/gui/debugwindow.cpp:456
+#: src/gui/debugwindow.cpp:350 src/gui/debugwindow.cpp:420
+#: src/gui/debugwindow.cpp:459
 msgid "Minimal hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:349 src/gui/debugwindow.cpp:420
-#: src/gui/debugwindow.cpp:458
+#: src/gui/debugwindow.cpp:352 src/gui/debugwindow.cpp:423
+#: src/gui/debugwindow.cpp:461
 msgid "Maximum hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:351 src/gui/debugwindow.cpp:423
-#: src/gui/debugwindow.cpp:460
+#: src/gui/debugwindow.cpp:354 src/gui/debugwindow.cpp:426
+#: src/gui/debugwindow.cpp:463
 msgid "Critical hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:394 src/gui/debugwindow.cpp:400
-#: src/gui/debugwindow.cpp:448
+#: src/gui/debugwindow.cpp:397 src/gui/debugwindow.cpp:403
+#: src/gui/debugwindow.cpp:451
 msgid "Target Level:"
 msgstr "目标水平："
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:408 src/gui/debugwindow.cpp:450
+#: src/gui/debugwindow.cpp:411 src/gui/debugwindow.cpp:453
 msgid "Target Party:"
 msgstr "目标："
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:412 src/gui/debugwindow.cpp:452
+#: src/gui/debugwindow.cpp:415 src/gui/debugwindow.cpp:455
 msgid "Target Guild:"
 msgstr "目标公会："
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:493
+#: src/gui/debugwindow.cpp:496
 #, c-format
 msgid "Ping: %s ms"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:496
+#: src/gui/debugwindow.cpp:499
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "输入:%d 字节/"
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:499
+#: src/gui/debugwindow.cpp:502
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
@@ -1327,7 +1327,7 @@ msgstr "自动打开这个窗口"
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #: src/gui/editdialog.cpp:45 src/gui/editserverdialog.cpp:78
-#: src/gui/itemamountwindow.cpp:210 src/gui/okdialog.cpp:51
+#: src/gui/itemamountwindow.cpp:204 src/gui/okdialog.cpp:51
 #: src/gui/quitdialog.cpp:70 src/gui/textdialog.cpp:46
 msgid "OK"
 msgstr "确定"
@@ -1339,7 +1339,7 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:257
+#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:266
 msgid "Connect"
 msgstr "连接"
 
@@ -1369,7 +1369,7 @@ msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/editserverdialog.cpp:222
+#: src/gui/editserverdialog.cpp:218
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -1421,7 +1421,7 @@ msgstr "装备"
 #: src/gui/inventorywindow.cpp:178 src/gui/inventorywindow.cpp:630
 #: src/gui/popupmenu.cpp:1843 src/gui/popupmenu.cpp:1922
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2041
-#: src/gui/skilldialog.cpp:277
+#: src/gui/skilldialog.cpp:279
 msgid "Use"
 msgstr "使用"
 
@@ -1455,7 +1455,7 @@ msgstr "套装"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: setup button
-#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:718
+#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:719
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1992
 #: src/gui/popupmenu.cpp:2066 src/gui/setup.cpp:86
 msgid "Store"
@@ -1477,47 +1477,47 @@ msgid "Drop"
 msgstr "丢弃"
 
 #. TRANSLATORS: item amount window button
-#: src/gui/itemamountwindow.cpp:214
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "全部"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:264
 msgid "Select amount of items to trade."
 msgstr "请选择交易的物品数量。"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:274
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to drop."
 msgstr "请选择丢弃的物品数量。"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:278
+#: src/gui/itemamountwindow.cpp:272
 msgid "Select amount of items to store."
 msgstr "请选择存储的物品数量。"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:276
 msgid "Select amount of items to retrieve."
 msgstr "请选择取回的物品数量。"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:286
+#: src/gui/itemamountwindow.cpp:280
 msgid "Select amount of items to split."
 msgstr "请选择你分离的物品的数量"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:290
+#: src/gui/itemamountwindow.cpp:284
 msgid "Add to buy shop."
 msgstr "添加到购买商店。"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:294
+#: src/gui/itemamountwindow.cpp:288
 msgid "Add to sell shop."
 msgstr "添加到出售商店。"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:298
+#: src/gui/itemamountwindow.cpp:292
 msgid "Unknown."
 msgstr "未知。"
 
@@ -1544,7 +1544,7 @@ msgstr "复位定时器"
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:58 src/gui/killstats.cpp:171
-#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:516
+#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:509
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
@@ -1552,7 +1552,7 @@ msgstr ""
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:61 src/gui/killstats.cpp:173
 #: src/gui/killstats.cpp:253 src/gui/killstats.cpp:268
-#: src/gui/killstats.cpp:518
+#: src/gui/killstats.cpp:511
 #, c-format
 msgid "Avg Exp: %s"
 msgstr ""
@@ -1560,14 +1560,14 @@ msgstr ""
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:63 src/gui/killstats.cpp:176
 #: src/gui/killstats.cpp:258 src/gui/killstats.cpp:272
-#: src/gui/killstats.cpp:521
+#: src/gui/killstats.cpp:514
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:66 src/gui/killstats.cpp:187
-#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:524
+#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:517
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
@@ -1593,9 +1593,9 @@ msgid "Last kill exp:"
 msgstr "最后EXP："
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:414
-#: src/gui/killstats.cpp:421 src/gui/killstats.cpp:428
-#: src/gui/killstats.cpp:434
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:408
+#: src/gui/killstats.cpp:415 src/gui/killstats.cpp:422
+#: src/gui/killstats.cpp:428
 msgid "Time before jacko spawn:"
 msgstr ""
 
@@ -1627,12 +1627,12 @@ msgid "  Time for next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:421
+#: src/gui/killstats.cpp:415
 #, c-format
 msgid "%s %d?"
 msgstr "%s %d?"
 
-#: src/gui/killstats.cpp:428
+#: src/gui/killstats.cpp:422
 msgid "jacko spawning"
 msgstr ""
 
@@ -1738,32 +1738,32 @@ msgid "arrows bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:88
+#: src/gui/ministatuswindow.cpp:89
 msgid "status bar"
 msgstr "状态栏"
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:108
+#: src/gui/ministatuswindow.cpp:109
 msgid "job bar"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:306 src/gui/statuswindow.cpp:298
+#: src/gui/ministatuswindow.cpp:307 src/gui/statuswindow.cpp:298
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "级别:%d (GM %d)"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:313 src/gui/statuswindow.cpp:141
+#: src/gui/ministatuswindow.cpp:314 src/gui/statuswindow.cpp:141
 #: src/gui/statuswindow.cpp:305 src/gui/statuswindow.cpp:375
 #, c-format
 msgid "Level: %d"
 msgstr "等级：%d"
 
 #. TRANSLATORS: status bar label
-#: src/gui/ministatuswindow.cpp:330 src/gui/ministatuswindow.cpp:367
+#: src/gui/ministatuswindow.cpp:331 src/gui/ministatuswindow.cpp:368
 msgid "Need"
 msgstr "需要"
 
@@ -2151,7 +2151,7 @@ msgstr ""
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2209 src/gui/popupmenu.cpp:2280
-#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:139
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
 #: src/gui/socialwindow.cpp:934
 msgid "(default)"
 msgstr "(默认)"
@@ -2334,7 +2334,7 @@ msgid "Passwords do not match."
 msgstr "密码不一致."
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:257
 msgid "Choose Your Server"
 msgstr "选择您的服务器"
 
@@ -2342,61 +2342,61 @@ msgstr "选择您的服务器"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:259 src/gui/shopwindow.cpp:94
+#: src/gui/serverdialog.cpp:268 src/gui/shopwindow.cpp:94
 #: src/gui/shopwindow.cpp:101 src/gui/tradewindow.cpp:77
 msgid "Add"
 msgstr "添加"
 
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
-#: src/gui/serverdialog.cpp:261 src/gui/widgets/setupitem.cpp:299
+#: src/gui/serverdialog.cpp:270 src/gui/widgets/setupitem.cpp:299
 #: src/gui/widgets/setupitem.cpp:426
 msgid "Edit"
 msgstr "编辑"
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:274
 msgid "Load"
 msgstr "负载"
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:279
+#: src/gui/serverdialog.cpp:288
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "选择你的服务器***安全模式***"
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:297
 msgid "Use same ip for game sub servers"
 msgstr "游戏分服务器使用相同的IP"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:518
+#: src/gui/serverdialog.cpp:527
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "下载服务器列表...%2.2f%%"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:524
+#: src/gui/serverdialog.cpp:533
 msgid "Waiting for server..."
 msgstr "等待服务器..."
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:529
+#: src/gui/serverdialog.cpp:538
 msgid "Preparing download"
 msgstr "准备下载"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:534
+#: src/gui/serverdialog.cpp:543
 msgid "Error retreiving server list!"
 msgstr "恢复服务器列表错误！"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:626
+#: src/gui/serverdialog.cpp:635
 msgid "requires a newer version"
 msgstr "需要较新版本"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:631
+#: src/gui/serverdialog.cpp:640
 #, c-format
 msgid "requires v%s"
 msgstr "需要 v%s"
@@ -3407,7 +3407,7 @@ msgid "Type:"
 msgstr "类型:"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:334
+#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:336
 msgid "Delay:"
 msgstr "延迟："
 
@@ -3427,30 +3427,30 @@ msgid "Blue:"
 msgstr "蓝色："
 
 #. TRANSLATORS: color type
-#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:420
+#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:422
 msgid "Static"
 msgstr "静止的"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:107 src/gui/setup_colors.cpp:110
-#: src/gui/setup_colors.cpp:422
+#: src/gui/setup_colors.cpp:424
 msgid "Pulse"
 msgstr "脉冲"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:112 src/gui/setup_colors.cpp:115
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Rainbow"
 msgstr "彩虹"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:117 src/gui/setup_colors.cpp:120
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Spectrum"
 msgstr "色谱"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:328
+#: src/gui/setup_colors.cpp:330
 msgid "Alpha:"
 msgstr "阿尔法："
 
@@ -3616,7 +3616,7 @@ msgstr "杂项"
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: palette color
-#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:134
+#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:135
 msgid "Monsters"
 msgstr "怪物"
 
@@ -4165,206 +4165,231 @@ msgstr "当忽略时："
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:86
-msgid "Very small (9)"
+msgid "Very small (8)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:88
+msgid "Very small (9)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:90
 msgid "Tiny (10)"
 msgstr "小（10）"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:90
+#: src/gui/setup_theme.cpp:92
 msgid "Small (11)"
 msgstr "小 (11)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:92
+#: src/gui/setup_theme.cpp:94
 msgid "Medium (12)"
 msgstr "中 (12)"
 
 #. TRANSLATORS: font size
-#: src/gui/setup_theme.cpp:94
-msgid "Normal (13)"
-msgstr ""
-
-#. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:96
-msgid "Large (14)"
+msgid "Normal (13)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:98
-msgid "Very large (15)"
+msgid "Large (14)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:100
-msgid "Big (16)"
+msgid "Large (15)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:102
-msgid "Very big (17)"
+msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:104
-msgid "Huge (18)"
+msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:106
-msgid "Very huge (19)"
+msgid "Big (18)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:108
+msgid "Big (19)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:110
+msgid "Very big (20)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:112
+msgid "Very big (21)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:114
+msgid "Very big (22)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:116
+msgid "Huge (23)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:151
 msgid "Chinese (China)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:153
 msgid "Czech"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:155
 msgid "English"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:157
 msgid "Finnish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:159
 msgid "French"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:161
 msgid "German"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:153
+#: src/gui/setup_theme.cpp:163
 msgid "Indonesian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:155
+#: src/gui/setup_theme.cpp:165
 msgid "Italian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:157
+#: src/gui/setup_theme.cpp:167
 msgid "Polish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:159
+#: src/gui/setup_theme.cpp:169
 msgid "Japanese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:161
+#: src/gui/setup_theme.cpp:171
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:163
+#: src/gui/setup_theme.cpp:173
 msgid "Portuguese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:165
+#: src/gui/setup_theme.cpp:175
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:167
+#: src/gui/setup_theme.cpp:177
 msgid "Russian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:169
+#: src/gui/setup_theme.cpp:179
 msgid "Spanish (Castilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:171
+#: src/gui/setup_theme.cpp:181
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:223
+#: src/gui/setup_theme.cpp:233
 msgid "Gui theme"
 msgstr "桂主题"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:230
+#: src/gui/setup_theme.cpp:240
 msgid "Main Font"
 msgstr "主要字体"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:235
+#: src/gui/setup_theme.cpp:245
 msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:239
+#: src/gui/setup_theme.cpp:249
 msgid "Bold font"
 msgstr "加粗字体"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:243
+#: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr "粒子字体"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:247
+#: src/gui/setup_theme.cpp:257
 msgid "Help font"
 msgstr "帮助字体"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:251
+#: src/gui/setup_theme.cpp:261
 msgid "Secure font"
 msgstr "安全字体"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:255
+#: src/gui/setup_theme.cpp:265
 msgid "Japanese font"
 msgstr "日文字体"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:260
+#: src/gui/setup_theme.cpp:270
 msgid "Font size"
 msgstr "字体大小"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:265
+#: src/gui/setup_theme.cpp:275
 msgid "Npc font size"
 msgstr ""
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/setup_theme.cpp:269
+#: src/gui/setup_theme.cpp:279
 msgid "i"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/setup_theme.cpp:442
+#: src/gui/setup_theme.cpp:452
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/setup_theme.cpp:467
+#: src/gui/setup_theme.cpp:477
 msgid "Theme Changed"
 msgstr "主题更改"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/setup_theme.cpp:467 src/gui/setup_video.cpp:537
+#: src/gui/setup_theme.cpp:477 src/gui/setup_video.cpp:537
 #: src/gui/setup_video.cpp:546
 msgid "Restart your client for the change to take effect."
 msgstr "重启您的游戏客户端以使变更生效。"
@@ -4662,7 +4687,8 @@ msgid "Ambient FX"
 msgstr "环境音效"
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_visual.cpp:140
+#. TRANSLATORS: palette color
+#: src/gui/setup_visual.cpp:140 src/gui/userpalette.cpp:146
 msgid "Particle effects"
 msgstr "粒子效果"
 
@@ -4749,45 +4775,45 @@ msgid "%s wants to %s %s do you accept?"
 msgstr "%s想要%s %s 你接受吗？"
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/skilldialog.cpp:270 src/gui/windowmenu.cpp:112
+#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:112
 msgid "Skills"
 msgstr "技能"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/skilldialog.cpp:279
+#: src/gui/skilldialog.cpp:281
 msgid "Up"
 msgstr "升级"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/skilldialog.cpp:391
+#: src/gui/skilldialog.cpp:393
 #, c-format
 msgid "Skill points available: %d"
 msgstr "技能点：%d个"
 
 #. TRANSLATORS: skills dialog default skills tab
-#: src/gui/skilldialog.cpp:444
+#: src/gui/skilldialog.cpp:446
 msgid "basic"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill name
-#: src/gui/skilldialog.cpp:447
+#: src/gui/skilldialog.cpp:449
 msgid "basic, 1"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/skilldialog.cpp:484
+#: src/gui/skilldialog.cpp:486
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/skilldialog.cpp:518
+#: src/gui/skilldialog.cpp:520
 #, c-format
 msgid "Skill %d"
 msgstr "技能为%d"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/skilldialog.cpp:612 src/gui/skilldialog.cpp:762
+#: src/gui/skilldialog.cpp:614 src/gui/skilldialog.cpp:764
 #, c-format
 msgid "Lvl: %d"
 msgstr "等级: %d"
@@ -5230,7 +5256,7 @@ msgid "Trade: You"
 msgstr "交易：你"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:182
+#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:184
 #, c-format
 msgid "You get %s"
 msgstr "你得到%s"
@@ -5246,12 +5272,12 @@ msgid "You give:"
 msgstr "你给予："
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:393
+#: src/gui/tradewindow.cpp:396
 msgid "You don't have enough money."
 msgstr "你没有足够的钱币."
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:475
+#: src/gui/tradewindow.cpp:479
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "添加物品失败。你不能覆盖窗口中的该类物品。"
 
@@ -5262,224 +5288,224 @@ msgid "Name: %s"
 msgstr "姓名：%s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/updaterwindow.cpp:140
+#: src/gui/updaterwindow.cpp:156
 msgid "Updating..."
 msgstr "更新..."
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:165
+#: src/gui/updaterwindow.cpp:181
 msgid "Connecting..."
 msgstr "连接中..."
 
 #. TRANSLATORS: update message
-#: src/gui/updaterwindow.cpp:656
+#: src/gui/updaterwindow.cpp:672
 msgid "##1  The update process is incomplete."
 msgstr "##1 更新过程不完整。"
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/updaterwindow.cpp:658
+#: src/gui/updaterwindow.cpp:674
 msgid "##1  It is strongly recommended that"
 msgstr "##1 强烈建议"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:660
+#: src/gui/updaterwindow.cpp:676
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:839
+#: src/gui/updaterwindow.cpp:855
 msgid "Completed"
 msgstr "已完成"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
 msgid "Being"
 msgstr "存在"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:118
-msgid "Friend Names"
+#: src/gui/userpalette.cpp:119
+msgid "Friend names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:120
-msgid "Disregarded Names"
-msgstr "豁免计算名称"
+#: src/gui/userpalette.cpp:121
+msgid "Disregarded names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:122
-msgid "Ignored Names"
-msgstr "忽略名称"
+#: src/gui/userpalette.cpp:123
+msgid "Ignored names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:124
-msgid "Erased Names"
+#: src/gui/userpalette.cpp:125
+msgid "Erased names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:126
-msgid "Other Players' Names"
-msgstr "其他玩家名"
+#: src/gui/userpalette.cpp:127
+msgid "Other players names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:128
-msgid "Own Name"
-msgstr "自己的名字"
+#: src/gui/userpalette.cpp:129
+msgid "Own name"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:130
-msgid "GM Names"
-msgstr "GM名"
+#: src/gui/userpalette.cpp:131
+msgid "GM names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
 msgid "NPCs"
 msgstr "NPCs"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
 msgid "Monster HP bar"
 msgstr "怪物的HPl"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:140
 msgid "Monster HP bar (second color)"
 msgstr "怪物的HP指示栏(第二个颜色)"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:141
-msgid "Party Members"
-msgstr "党的议员"
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:143
-msgid "Guild Members"
-msgstr "公会成员"
+#: src/gui/userpalette.cpp:142
+msgid "Party members"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:145
-msgid "Particle Effects"
-msgstr "粒子效果"
+#: src/gui/userpalette.cpp:144
+msgid "Guild members"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:147
-msgid "Pickup Notification"
-msgstr "拾起通知"
+#: src/gui/userpalette.cpp:148
+msgid "Pickup notification"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:149
-msgid "Exp Notification"
-msgstr "到期通知"
+#: src/gui/userpalette.cpp:150
+msgid "Exp notification"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
 msgid "Player HP bar"
 msgstr "玩家惠普酒吧"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
 msgid "Player HP bar (second color)"
 msgstr "玩家HP指示栏(第二个颜色)"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:157
-msgid "Player Hits Monster"
-msgstr "玩家怪物"
+#: src/gui/userpalette.cpp:158
+msgid "Player hits monster"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:159
-msgid "Monster Hits Player"
-msgstr "怪物点击播放器"
+#: src/gui/userpalette.cpp:160
+msgid "Monster hits player"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:163
-msgid "Other Player Hits Local Player"
-msgstr "其他玩家点击本土球员"
+#: src/gui/userpalette.cpp:164
+msgid "Other player hits local player"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:166
 msgid "Critical Hit"
 msgstr "会心一击"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
-msgid "Local Player Hits Monster"
+#: src/gui/userpalette.cpp:170
+msgid "Local player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:172
-msgid "Local Player Critical Hit"
-msgstr "当前玩家"
+#: src/gui/userpalette.cpp:173
+msgid "Local player critical hit"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:175
-msgid "Local Player Miss"
+#: src/gui/userpalette.cpp:176
+msgid "Local player miss"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:177
+#: src/gui/userpalette.cpp:178
 msgid "Misses"
 msgstr "失误"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
-msgid "Portal Highlight"
-msgstr "门户高亮"
+#: src/gui/userpalette.cpp:180
+msgid "Portal highlight"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:183
+msgid "Default collision highlight"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:182
-msgid "Default collision Highlight"
+#: src/gui/userpalette.cpp:186
+msgid "Air collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:185
-msgid "Air collision Highlight"
+#: src/gui/userpalette.cpp:189
+msgid "Water collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:188
-msgid "Water collision Highlight"
+#: src/gui/userpalette.cpp:192
+msgid "Special ground collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:191
-msgid "Special ground collision Highlight"
+#: src/gui/userpalette.cpp:195
+msgid "Walkable highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
-msgid "Walkable Highlight"
-msgstr "步行高亮"
+#: src/gui/userpalette.cpp:198
+msgid "Local player attack range"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:197
-msgid "Local Player Attack Range"
+#: src/gui/userpalette.cpp:201
+msgid "Local player attack range border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:200
-msgid "Local Player Attack Range Border"
+#: src/gui/userpalette.cpp:204
+msgid "Monster attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:203
-msgid "Monster Attack Range"
-msgstr "怪物攻击范围"
+#: src/gui/userpalette.cpp:208
+msgid "Floor item amount color"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:206
-msgid "Home Place"
-msgstr "家居广场"
+#: src/gui/userpalette.cpp:211
+msgid "Home place"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:209
-msgid "Home Place Border"
-msgstr "家居广场边界"
+#: src/gui/userpalette.cpp:214
+msgid "Home place border"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:212
-msgid "Road Point"
-msgstr "路点"
+#: src/gui/userpalette.cpp:217
+msgid "Road point"
+msgstr ""
 
 #. TRANSLATORS: who is online window name
 #: src/gui/whoisonline.cpp:79 src/gui/whoisonline.cpp:623
@@ -5608,7 +5634,7 @@ msgid "/kick > Kick some one from the guild you are in"
 msgstr "/kick >"
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:315
+#: src/gui/widgets/itemcontainer.cpp:317
 msgid "Eq."
 msgstr ""
 
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 9be48d5c0..e469ccdc6 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-05-03 12:38+0300\n"
-"PO-Revision-Date: 2013-05-03 09:44+0000\n"
+"POT-Creation-Date: 2013-05-10 18:34+0300\n"
+"PO-Revision-Date: 2013-05-10 15:39+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -59,25 +59,25 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: full button name
-#: src/client.cpp:1136 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
+#: src/client.cpp:1137 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
 msgid "Setup"
 msgstr "設定"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1140 src/gui/setup_perfomance.cpp:61
+#: src/client.cpp:1141 src/gui/setup_perfomance.cpp:61
 msgid "Perfomance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:1143 src/gui/setup_video.cpp:258
+#: src/client.cpp:1144 src/gui/setup_video.cpp:258
 msgid "Video"
 msgstr "顯示"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1146 src/gui/setup_theme.cpp:273
+#: src/client.cpp:1147 src/gui/setup_theme.cpp:283
 msgid "Theme"
 msgstr ""
 
@@ -88,7 +88,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1150 src/gui/didyouknowwindow.cpp:78
+#: src/client.cpp:1151 src/gui/didyouknowwindow.cpp:78
 #: src/gui/inventorywindow.cpp:228 src/gui/npcdialog.cpp:63
 #: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:574
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:80
@@ -96,32 +96,32 @@ msgid "Close"
 msgstr "關閉"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1238
+#: src/client.cpp:1239
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1282
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1320
+#: src/client.cpp:1321
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1431
+#: src/client.cpp:1432
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1471
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1483
+#: src/client.cpp:1484
 msgid "Changing game servers"
 msgstr ""
 
@@ -136,69 +136,69 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1540 src/client.cpp:1551 src/client.cpp:1721
+#: src/client.cpp:1541 src/client.cpp:1552 src/client.cpp:1722
 #: src/gui/changeemaildialog.cpp:168 src/gui/changepassworddialog.cpp:158
-#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:288
-#: src/gui/editserverdialog.cpp:220 src/gui/registerdialog.cpp:263
+#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:290
+#: src/gui/editserverdialog.cpp:216 src/gui/registerdialog.cpp:263
 #: src/gui/unregisterdialog.cpp:143 src/net/ea/charserverhandler.cpp:190
 #: src/net/ea/charserverhandler.cpp:210
 msgid "Error"
 msgstr "錯誤"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1564
+#: src/client.cpp:1565
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1601
+#: src/client.cpp:1602
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1603
+#: src/client.cpp:1604
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1624
+#: src/client.cpp:1625
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1626
+#: src/client.cpp:1627
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1647
+#: src/client.cpp:1648
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1649
+#: src/client.cpp:1650
 msgid "Farewell, come back any time..."
 msgstr ""
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1902 src/client.cpp:1917 src/client.cpp:1960
-#: src/client.cpp:1976 src/client.cpp:2417 src/client.cpp:2425
+#: src/client.cpp:1903 src/client.cpp:1918 src/client.cpp:1961
+#: src/client.cpp:1977 src/client.cpp:2418 src/client.cpp:2426
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2113
+#: src/client.cpp:2114
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2154 src/client.cpp:2161
+#: src/client.cpp:2155 src/client.cpp:2162
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:2183 src/client.cpp:2196
+#: src/client.cpp:2184 src/client.cpp:2197
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -478,19 +478,19 @@ msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: bot checker window header
-#: src/gui/botcheckerwindow.cpp:269
+#: src/gui/botcheckerwindow.cpp:268
 msgid "Bot Checker"
 msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:102
+#: src/gui/botcheckerwindow.cpp:277 src/gui/npcdialog.cpp:102
 msgid "Reset"
 msgstr ""
 
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: relations table header
-#: src/gui/botcheckerwindow.cpp:305 src/gui/setup_relations.cpp:61
+#: src/gui/botcheckerwindow.cpp:304 src/gui/setup_relations.cpp:61
 msgid "Name"
 msgstr "名字"
 
@@ -498,7 +498,7 @@ msgstr "名字"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:145
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:145
 #: src/gui/popupmenu.cpp:241 src/gui/popupmenu.cpp:640
 #: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:257
 #: src/net/tmwa/generalhandler.cpp:292
@@ -508,7 +508,7 @@ msgstr ""
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
-#: src/gui/botcheckerwindow.cpp:309 src/gui/popupmenu.cpp:225
+#: src/gui/botcheckerwindow.cpp:308 src/gui/popupmenu.cpp:225
 #: src/gui/setupactiondata.h:93
 msgid "Talk"
 msgstr ""
@@ -516,7 +516,7 @@ msgstr ""
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/botcheckerwindow.cpp:311 src/gui/popupmenu.cpp:215
+#: src/gui/botcheckerwindow.cpp:310 src/gui/popupmenu.cpp:215
 #: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:371
 #: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:653
 #: src/gui/popupmenu.cpp:727 src/gui/setupactiondata.h:1856
@@ -524,7 +524,7 @@ msgid "Move"
 msgstr ""
 
 #. TRANSLATORS: bot checker window table header
-#: src/gui/botcheckerwindow.cpp:313
+#: src/gui/botcheckerwindow.cpp:312
 msgid "Result"
 msgstr ""
 
@@ -580,7 +580,7 @@ msgstr "購買"
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:516
+#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:511
 #: src/gui/selldialog.cpp:94 src/gui/selldialog.cpp:342
 #, c-format
 msgid "Price: %s / Total: %s"
@@ -597,9 +597,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:208
-#: src/gui/itemamountwindow.cpp:243 src/gui/npcdialog.cpp:93
-#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:833
+#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:202
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:93
+#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:821
 msgid "+"
 msgstr ""
 
@@ -609,9 +609,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:240 src/gui/npcdialog.cpp:95
-#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:846
+#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:200
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:95
+#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:834
 msgid "-"
 msgstr ""
 
@@ -623,7 +623,7 @@ msgstr ""
 #. TRANSLATORS: input action name
 #: src/gui/buydialog.cpp:260 src/gui/quitdialog.cpp:54
 #: src/gui/quitdialog.cpp:59 src/gui/quitdialog.cpp:61
-#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:255
+#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:264
 #: src/gui/setupactiondata.h:177
 msgid "Quit"
 msgstr "離開"
@@ -635,7 +635,7 @@ msgstr "離開"
 #. TRANSLATORS: status bar label
 #: src/gui/buydialog.cpp:262 src/gui/selldialog.cpp:106
 #: src/gui/statuswindow.cpp:558 src/gui/statuswindow.cpp:615
-#: src/gui/statuswindow.cpp:830 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:852
 msgid "Max"
 msgstr ""
 
@@ -680,7 +680,7 @@ msgstr "出售"
 #: src/gui/buyselldialog.cpp:71 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:120
 #: src/gui/connectiondialog.cpp:48 src/gui/editserverdialog.cpp:80
-#: src/gui/itemamountwindow.cpp:212 src/gui/npcpostdialog.cpp:64
+#: src/gui/itemamountwindow.cpp:206 src/gui/npcpostdialog.cpp:64
 #: src/gui/popupmenu.cpp:290 src/gui/popupmenu.cpp:324
 #: src/gui/popupmenu.cpp:411 src/gui/popupmenu.cpp:454
 #: src/gui/popupmenu.cpp:485 src/gui/popupmenu.cpp:512
@@ -696,7 +696,7 @@ msgstr "出售"
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
 #: src/gui/setup.cpp:84 src/gui/socialwindow.cpp:1204
 #: src/gui/textcommandeditor.cpp:212 src/gui/textdialog.cpp:53
-#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:167
+#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:183
 msgid "Cancel"
 msgstr "取消"
 
@@ -860,7 +860,7 @@ msgstr "請分配%d點數"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:570
+#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:581
 #: src/gui/socialwindow.cpp:1269
 msgid "Create"
 msgstr "創造"
@@ -887,17 +887,17 @@ msgid "Please remove %d points"
 msgstr "請移除%d點數"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:60
+#: src/gui/charselectdialog.cpp:61
 msgid "Confirm Character Delete"
 msgstr "確認刪除角色"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:62
+#: src/gui/charselectdialog.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "你確定想刪除這個角色？"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:86
+#: src/gui/charselectdialog.cpp:87
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
@@ -909,8 +909,8 @@ msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:565
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:576
+#: src/gui/updaterwindow.cpp:185
 msgid "Play"
 msgstr "開始"
 
@@ -926,7 +926,7 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:263
+#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:272
 #: src/gui/setupactiondata.h:1803 src/gui/setup_relations.cpp:262
 #: src/gui/shopwindow.cpp:96 src/gui/shopwindow.cpp:103
 #: src/gui/textcommandeditor.cpp:216
@@ -936,24 +936,24 @@ msgstr "刪除"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/charselectdialog.cpp:129 src/gui/unregisterdialog.cpp:48
+#: src/gui/charselectdialog.cpp:130 src/gui/unregisterdialog.cpp:48
 #: src/gui/unregisterdialog.cpp:53
 msgid "Unregister"
 msgstr "註冊"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/charselectdialog.cpp:141
+#: src/gui/charselectdialog.cpp:142
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:172
+#: src/gui/charselectdialog.cpp:175
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/charselectdialog.cpp:246
+#: src/gui/charselectdialog.cpp:248
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -963,16 +963,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:288
+#: src/gui/charselectdialog.cpp:290
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password:"
 msgstr ""
 
@@ -1059,13 +1059,13 @@ msgid "Chat"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:735
+#: src/gui/chatwindow.cpp:638
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1165
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "對%s竊竊私語：%s"
@@ -1083,7 +1083,7 @@ msgstr "否"
 
 #. TRANSLATORS: confirm dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/confirmdialog.cpp:58 src/gui/popupmenu.cpp:2429
+#: src/gui/confirmdialog.cpp:55 src/gui/popupmenu.cpp:2429
 #: src/gui/popupmenu.cpp:2442 src/gui/popupmenu.cpp:2457
 #: src/gui/popupmenu.cpp:2483
 msgid "Ignore"
@@ -1092,7 +1092,7 @@ msgstr ""
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
 #. TRANSLATORS: settings group
-#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:109
+#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:108
 #: src/gui/setup_other.cpp:123 src/gui/windowmenu.cpp:106
 msgid "Map"
 msgstr ""
@@ -1108,190 +1108,190 @@ msgid "Net"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:265
-#: src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:268
+#: src/gui/debugwindow.cpp:311
 msgid "Music:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:153 src/gui/debugwindow.cpp:271
-#: src/gui/debugwindow.cpp:312
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:274
+#: src/gui/debugwindow.cpp:315
 msgid "Map:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:155 src/gui/debugwindow.cpp:268
-#: src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:271
+#: src/gui/debugwindow.cpp:313
 msgid "Minimap:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:262
-#: src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:161 src/gui/debugwindow.cpp:265
+#: src/gui/debugwindow.cpp:309
 msgid "Cursor:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:161
+#: src/gui/debugwindow.cpp:164
 msgid "Particle count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:284
-#: src/gui/debugwindow.cpp:316
+#: src/gui/debugwindow.cpp:167 src/gui/debugwindow.cpp:287
+#: src/gui/debugwindow.cpp:319
 msgid "Map actors count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:166 src/gui/debugwindow.cpp:243
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:169 src/gui/debugwindow.cpp:246
+#: src/gui/debugwindow.cpp:252
 msgid "Player Position:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:172 src/gui/debugwindow.cpp:297
+#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:300
 msgid "Draw calls:"
 msgstr ""
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:175
+#. TRANSLATORS: debug window label, frames per second
+#: src/gui/debugwindow.cpp:178
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:177 src/gui/debugwindow.cpp:324
+#. TRANSLATORS: debug window label, logic per second
+#: src/gui/debugwindow.cpp:180 src/gui/debugwindow.cpp:327
 #, c-format
 msgid "%d LPS"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:191 src/gui/debugwindow.cpp:209
 #, c-format
 msgid "%d FPS (Software)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:193
+#: src/gui/debugwindow.cpp:196
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:197
+#: src/gui/debugwindow.cpp:200
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:201
+#: src/gui/debugwindow.cpp:204
 #, c-format
 msgid "%d FPS (mobile OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:225 src/gui/debugwindow.cpp:290
+#: src/gui/debugwindow.cpp:228 src/gui/debugwindow.cpp:293
 msgid "Textures count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:279
+#: src/gui/debugwindow.cpp:282
 #, c-format
 msgid "Particle count: %d"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:330 src/gui/debugwindow.cpp:380
-#: src/gui/debugwindow.cpp:442
+#: src/gui/debugwindow.cpp:333 src/gui/debugwindow.cpp:383
+#: src/gui/debugwindow.cpp:445
 msgid "Target:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:332 src/gui/debugwindow.cpp:386
-#: src/gui/debugwindow.cpp:444
+#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
+#: src/gui/debugwindow.cpp:447
 msgid "Target Id:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
-#: src/gui/debugwindow.cpp:446
+#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:392
+#: src/gui/debugwindow.cpp:449
 msgid "Target type:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:337
+#: src/gui/debugwindow.cpp:340
 msgid "Target level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:339 src/gui/debugwindow.cpp:405
+#: src/gui/debugwindow.cpp:342 src/gui/debugwindow.cpp:408
 msgid "Target race:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:341
+#: src/gui/debugwindow.cpp:344
 msgid "Target party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:346
 msgid "Target guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:430
-#: src/gui/debugwindow.cpp:436 src/gui/debugwindow.cpp:454
+#: src/gui/debugwindow.cpp:348 src/gui/debugwindow.cpp:433
+#: src/gui/debugwindow.cpp:439 src/gui/debugwindow.cpp:457
 msgid "Attack delay:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:347 src/gui/debugwindow.cpp:417
-#: src/gui/debugwindow.cpp:456
+#: src/gui/debugwindow.cpp:350 src/gui/debugwindow.cpp:420
+#: src/gui/debugwindow.cpp:459
 msgid "Minimal hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:349 src/gui/debugwindow.cpp:420
-#: src/gui/debugwindow.cpp:458
+#: src/gui/debugwindow.cpp:352 src/gui/debugwindow.cpp:423
+#: src/gui/debugwindow.cpp:461
 msgid "Maximum hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:351 src/gui/debugwindow.cpp:423
-#: src/gui/debugwindow.cpp:460
+#: src/gui/debugwindow.cpp:354 src/gui/debugwindow.cpp:426
+#: src/gui/debugwindow.cpp:463
 msgid "Critical hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:394 src/gui/debugwindow.cpp:400
-#: src/gui/debugwindow.cpp:448
+#: src/gui/debugwindow.cpp:397 src/gui/debugwindow.cpp:403
+#: src/gui/debugwindow.cpp:451
 msgid "Target Level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:408 src/gui/debugwindow.cpp:450
+#: src/gui/debugwindow.cpp:411 src/gui/debugwindow.cpp:453
 msgid "Target Party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:412 src/gui/debugwindow.cpp:452
+#: src/gui/debugwindow.cpp:415 src/gui/debugwindow.cpp:455
 msgid "Target Guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:493
+#: src/gui/debugwindow.cpp:496
 #, c-format
 msgid "Ping: %s ms"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:496
+#: src/gui/debugwindow.cpp:499
 #, c-format
 msgid "In: %d bytes/s"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:499
+#: src/gui/debugwindow.cpp:502
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
@@ -1323,7 +1323,7 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #: src/gui/editdialog.cpp:45 src/gui/editserverdialog.cpp:78
-#: src/gui/itemamountwindow.cpp:210 src/gui/okdialog.cpp:51
+#: src/gui/itemamountwindow.cpp:204 src/gui/okdialog.cpp:51
 #: src/gui/quitdialog.cpp:70 src/gui/textdialog.cpp:46
 msgid "OK"
 msgstr "確定"
@@ -1335,7 +1335,7 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:257
+#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:266
 msgid "Connect"
 msgstr ""
 
@@ -1365,7 +1365,7 @@ msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/editserverdialog.cpp:222
+#: src/gui/editserverdialog.cpp:218
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -1417,7 +1417,7 @@ msgstr "裝備"
 #: src/gui/inventorywindow.cpp:178 src/gui/inventorywindow.cpp:630
 #: src/gui/popupmenu.cpp:1843 src/gui/popupmenu.cpp:1922
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2041
-#: src/gui/skilldialog.cpp:277
+#: src/gui/skilldialog.cpp:279
 msgid "Use"
 msgstr "使用"
 
@@ -1451,7 +1451,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: setup button
-#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:718
+#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:719
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1992
 #: src/gui/popupmenu.cpp:2066 src/gui/setup.cpp:86
 msgid "Store"
@@ -1473,47 +1473,47 @@ msgid "Drop"
 msgstr "丟棄"
 
 #. TRANSLATORS: item amount window button
-#: src/gui/itemamountwindow.cpp:214
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:264
 msgid "Select amount of items to trade."
 msgstr "請選擇交易的物品數量"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:274
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to drop."
 msgstr "請選擇丟棄的物品數量"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:278
+#: src/gui/itemamountwindow.cpp:272
 msgid "Select amount of items to store."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:276
 msgid "Select amount of items to retrieve."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:286
+#: src/gui/itemamountwindow.cpp:280
 msgid "Select amount of items to split."
 msgstr "請選擇你要分離的物品數量"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:290
+#: src/gui/itemamountwindow.cpp:284
 msgid "Add to buy shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:294
+#: src/gui/itemamountwindow.cpp:288
 msgid "Add to sell shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:298
+#: src/gui/itemamountwindow.cpp:292
 msgid "Unknown."
 msgstr ""
 
@@ -1540,7 +1540,7 @@ msgstr ""
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:58 src/gui/killstats.cpp:171
-#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:516
+#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:509
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
@@ -1548,7 +1548,7 @@ msgstr ""
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:61 src/gui/killstats.cpp:173
 #: src/gui/killstats.cpp:253 src/gui/killstats.cpp:268
-#: src/gui/killstats.cpp:518
+#: src/gui/killstats.cpp:511
 #, c-format
 msgid "Avg Exp: %s"
 msgstr ""
@@ -1556,14 +1556,14 @@ msgstr ""
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:63 src/gui/killstats.cpp:176
 #: src/gui/killstats.cpp:258 src/gui/killstats.cpp:272
-#: src/gui/killstats.cpp:521
+#: src/gui/killstats.cpp:514
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:66 src/gui/killstats.cpp:187
-#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:524
+#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:517
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
@@ -1589,9 +1589,9 @@ msgid "Last kill exp:"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:414
-#: src/gui/killstats.cpp:421 src/gui/killstats.cpp:428
-#: src/gui/killstats.cpp:434
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:408
+#: src/gui/killstats.cpp:415 src/gui/killstats.cpp:422
+#: src/gui/killstats.cpp:428
 msgid "Time before jacko spawn:"
 msgstr ""
 
@@ -1623,12 +1623,12 @@ msgid "  Time for next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:421
+#: src/gui/killstats.cpp:415
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:428
+#: src/gui/killstats.cpp:422
 msgid "jacko spawning"
 msgstr ""
 
@@ -1734,32 +1734,32 @@ msgid "arrows bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:88
+#: src/gui/ministatuswindow.cpp:89
 msgid "status bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:108
+#: src/gui/ministatuswindow.cpp:109
 msgid "job bar"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:306 src/gui/statuswindow.cpp:298
+#: src/gui/ministatuswindow.cpp:307 src/gui/statuswindow.cpp:298
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:313 src/gui/statuswindow.cpp:141
+#: src/gui/ministatuswindow.cpp:314 src/gui/statuswindow.cpp:141
 #: src/gui/statuswindow.cpp:305 src/gui/statuswindow.cpp:375
 #, c-format
 msgid "Level: %d"
 msgstr "等級：%d"
 
 #. TRANSLATORS: status bar label
-#: src/gui/ministatuswindow.cpp:330 src/gui/ministatuswindow.cpp:367
+#: src/gui/ministatuswindow.cpp:331 src/gui/ministatuswindow.cpp:368
 msgid "Need"
 msgstr ""
 
@@ -2147,7 +2147,7 @@ msgstr ""
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2209 src/gui/popupmenu.cpp:2280
-#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:139
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
 #: src/gui/socialwindow.cpp:934
 msgid "(default)"
 msgstr ""
@@ -2330,7 +2330,7 @@ msgid "Passwords do not match."
 msgstr "密碼不一樣."
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:257
 msgid "Choose Your Server"
 msgstr ""
 
@@ -2338,61 +2338,61 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:259 src/gui/shopwindow.cpp:94
+#: src/gui/serverdialog.cpp:268 src/gui/shopwindow.cpp:94
 #: src/gui/shopwindow.cpp:101 src/gui/tradewindow.cpp:77
 msgid "Add"
 msgstr "增加"
 
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
-#: src/gui/serverdialog.cpp:261 src/gui/widgets/setupitem.cpp:299
+#: src/gui/serverdialog.cpp:270 src/gui/widgets/setupitem.cpp:299
 #: src/gui/widgets/setupitem.cpp:426
 msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:274
 msgid "Load"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:279
+#: src/gui/serverdialog.cpp:288
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:297
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:518
+#: src/gui/serverdialog.cpp:527
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:524
+#: src/gui/serverdialog.cpp:533
 msgid "Waiting for server..."
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:529
+#: src/gui/serverdialog.cpp:538
 msgid "Preparing download"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:534
+#: src/gui/serverdialog.cpp:543
 msgid "Error retreiving server list!"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:626
+#: src/gui/serverdialog.cpp:635
 msgid "requires a newer version"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:631
+#: src/gui/serverdialog.cpp:640
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -3403,7 +3403,7 @@ msgid "Type:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:334
+#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:336
 msgid "Delay:"
 msgstr ""
 
@@ -3423,30 +3423,30 @@ msgid "Blue:"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:420
+#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:422
 msgid "Static"
 msgstr ""
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:107 src/gui/setup_colors.cpp:110
-#: src/gui/setup_colors.cpp:422
+#: src/gui/setup_colors.cpp:424
 msgid "Pulse"
 msgstr ""
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:112 src/gui/setup_colors.cpp:115
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Rainbow"
 msgstr ""
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:117 src/gui/setup_colors.cpp:120
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Spectrum"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:328
+#: src/gui/setup_colors.cpp:330
 msgid "Alpha:"
 msgstr ""
 
@@ -3612,7 +3612,7 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: palette color
-#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:134
+#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:135
 msgid "Monsters"
 msgstr ""
 
@@ -4161,206 +4161,231 @@ msgstr "當忽略時："
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:86
-msgid "Very small (9)"
+msgid "Very small (8)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:88
-msgid "Tiny (10)"
+msgid "Very small (9)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:90
-msgid "Small (11)"
+msgid "Tiny (10)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:92
-msgid "Medium (12)"
+msgid "Small (11)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:94
-msgid "Normal (13)"
+msgid "Medium (12)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:96
-msgid "Large (14)"
+msgid "Normal (13)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:98
-msgid "Very large (15)"
+msgid "Large (14)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:100
-msgid "Big (16)"
+msgid "Large (15)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:102
-msgid "Very big (17)"
+msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:104
-msgid "Huge (18)"
+msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:106
-msgid "Very huge (19)"
+msgid "Big (18)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:108
+msgid "Big (19)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:110
+msgid "Very big (20)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:112
+msgid "Very big (21)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:114
+msgid "Very big (22)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:116
+msgid "Huge (23)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:151
 msgid "Chinese (China)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:153
 msgid "Czech"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:155
 msgid "English"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:157
 msgid "Finnish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:159
 msgid "French"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:161
 msgid "German"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:153
+#: src/gui/setup_theme.cpp:163
 msgid "Indonesian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:155
+#: src/gui/setup_theme.cpp:165
 msgid "Italian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:157
+#: src/gui/setup_theme.cpp:167
 msgid "Polish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:159
+#: src/gui/setup_theme.cpp:169
 msgid "Japanese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:161
+#: src/gui/setup_theme.cpp:171
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:163
+#: src/gui/setup_theme.cpp:173
 msgid "Portuguese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:165
+#: src/gui/setup_theme.cpp:175
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:167
+#: src/gui/setup_theme.cpp:177
 msgid "Russian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:169
+#: src/gui/setup_theme.cpp:179
 msgid "Spanish (Castilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:171
+#: src/gui/setup_theme.cpp:181
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:223
+#: src/gui/setup_theme.cpp:233
 msgid "Gui theme"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:230
+#: src/gui/setup_theme.cpp:240
 msgid "Main Font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:235
+#: src/gui/setup_theme.cpp:245
 msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:239
+#: src/gui/setup_theme.cpp:249
 msgid "Bold font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:243
+#: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:247
+#: src/gui/setup_theme.cpp:257
 msgid "Help font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:251
+#: src/gui/setup_theme.cpp:261
 msgid "Secure font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:255
+#: src/gui/setup_theme.cpp:265
 msgid "Japanese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:260
+#: src/gui/setup_theme.cpp:270
 msgid "Font size"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:265
+#: src/gui/setup_theme.cpp:275
 msgid "Npc font size"
 msgstr ""
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/setup_theme.cpp:269
+#: src/gui/setup_theme.cpp:279
 msgid "i"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/setup_theme.cpp:442
+#: src/gui/setup_theme.cpp:452
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/setup_theme.cpp:467
+#: src/gui/setup_theme.cpp:477
 msgid "Theme Changed"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/setup_theme.cpp:467 src/gui/setup_video.cpp:537
+#: src/gui/setup_theme.cpp:477 src/gui/setup_video.cpp:537
 #: src/gui/setup_video.cpp:546
 msgid "Restart your client for the change to take effect."
 msgstr ""
@@ -4658,7 +4683,8 @@ msgid "Ambient FX"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_visual.cpp:140
+#. TRANSLATORS: palette color
+#: src/gui/setup_visual.cpp:140 src/gui/userpalette.cpp:146
 msgid "Particle effects"
 msgstr ""
 
@@ -4745,45 +4771,45 @@ msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/skilldialog.cpp:270 src/gui/windowmenu.cpp:112
+#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:112
 msgid "Skills"
 msgstr "技能"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/skilldialog.cpp:279
+#: src/gui/skilldialog.cpp:281
 msgid "Up"
 msgstr "升級"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/skilldialog.cpp:391
+#: src/gui/skilldialog.cpp:393
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skills tab
-#: src/gui/skilldialog.cpp:444
+#: src/gui/skilldialog.cpp:446
 msgid "basic"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill name
-#: src/gui/skilldialog.cpp:447
+#: src/gui/skilldialog.cpp:449
 msgid "basic, 1"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/skilldialog.cpp:484
+#: src/gui/skilldialog.cpp:486
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/skilldialog.cpp:518
+#: src/gui/skilldialog.cpp:520
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/skilldialog.cpp:612 src/gui/skilldialog.cpp:762
+#: src/gui/skilldialog.cpp:614 src/gui/skilldialog.cpp:764
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -5226,7 +5252,7 @@ msgid "Trade: You"
 msgstr ""
 
 #. TRANSLATORS: trade window money label
-#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:182
+#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:184
 #, c-format
 msgid "You get %s"
 msgstr ""
@@ -5242,12 +5268,12 @@ msgid "You give:"
 msgstr "你付出:"
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:393
+#: src/gui/tradewindow.cpp:396
 msgid "You don't have enough money."
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:475
+#: src/gui/tradewindow.cpp:479
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "增加物品失敗。你不能覆蓋視窗中的該類物品能。"
@@ -5259,223 +5285,223 @@ msgid "Name: %s"
 msgstr "名字：%s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/updaterwindow.cpp:140
+#: src/gui/updaterwindow.cpp:156
 msgid "Updating..."
 msgstr "更新中..."
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:165
+#: src/gui/updaterwindow.cpp:181
 msgid "Connecting..."
 msgstr "連線中..."
 
 #. TRANSLATORS: update message
-#: src/gui/updaterwindow.cpp:656
+#: src/gui/updaterwindow.cpp:672
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/updaterwindow.cpp:658
+#: src/gui/updaterwindow.cpp:674
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:660
+#: src/gui/updaterwindow.cpp:676
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:839
+#: src/gui/updaterwindow.cpp:855
 msgid "Completed"
 msgstr "已完成"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
 msgid "Being"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:118
-msgid "Friend Names"
+#: src/gui/userpalette.cpp:119
+msgid "Friend names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:120
-msgid "Disregarded Names"
+#: src/gui/userpalette.cpp:121
+msgid "Disregarded names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:122
-msgid "Ignored Names"
+#: src/gui/userpalette.cpp:123
+msgid "Ignored names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:124
-msgid "Erased Names"
+#: src/gui/userpalette.cpp:125
+msgid "Erased names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:126
-msgid "Other Players' Names"
+#: src/gui/userpalette.cpp:127
+msgid "Other players names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:128
-msgid "Own Name"
+#: src/gui/userpalette.cpp:129
+msgid "Own name"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:130
-msgid "GM Names"
+#: src/gui/userpalette.cpp:131
+msgid "GM names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
 msgid "NPCs"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
 msgid "Monster HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:140
 msgid "Monster HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:141
-msgid "Party Members"
+#: src/gui/userpalette.cpp:142
+msgid "Party members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:143
-msgid "Guild Members"
+#: src/gui/userpalette.cpp:144
+msgid "Guild members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:145
-msgid "Particle Effects"
+#: src/gui/userpalette.cpp:148
+msgid "Pickup notification"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:147
-msgid "Pickup Notification"
+#: src/gui/userpalette.cpp:150
+msgid "Exp notification"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:149
-msgid "Exp Notification"
-msgstr ""
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
 msgid "Player HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
 msgid "Player HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:157
-msgid "Player Hits Monster"
+#: src/gui/userpalette.cpp:158
+msgid "Player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:159
-msgid "Monster Hits Player"
+#: src/gui/userpalette.cpp:160
+msgid "Monster hits player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:163
-msgid "Other Player Hits Local Player"
+#: src/gui/userpalette.cpp:164
+msgid "Other player hits local player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:166
 msgid "Critical Hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
-msgid "Local Player Hits Monster"
+#: src/gui/userpalette.cpp:170
+msgid "Local player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:172
-msgid "Local Player Critical Hit"
+#: src/gui/userpalette.cpp:173
+msgid "Local player critical hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:175
-msgid "Local Player Miss"
+#: src/gui/userpalette.cpp:176
+msgid "Local player miss"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:177
+#: src/gui/userpalette.cpp:178
 msgid "Misses"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
-msgid "Portal Highlight"
+#: src/gui/userpalette.cpp:180
+msgid "Portal highlight"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:183
+msgid "Default collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:182
-msgid "Default collision Highlight"
+#: src/gui/userpalette.cpp:186
+msgid "Air collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:185
-msgid "Air collision Highlight"
+#: src/gui/userpalette.cpp:189
+msgid "Water collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:188
-msgid "Water collision Highlight"
+#: src/gui/userpalette.cpp:192
+msgid "Special ground collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:191
-msgid "Special ground collision Highlight"
+#: src/gui/userpalette.cpp:195
+msgid "Walkable highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
-msgid "Walkable Highlight"
+#: src/gui/userpalette.cpp:198
+msgid "Local player attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:197
-msgid "Local Player Attack Range"
+#: src/gui/userpalette.cpp:201
+msgid "Local player attack range border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:200
-msgid "Local Player Attack Range Border"
+#: src/gui/userpalette.cpp:204
+msgid "Monster attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:203
-msgid "Monster Attack Range"
+#: src/gui/userpalette.cpp:208
+msgid "Floor item amount color"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:206
-msgid "Home Place"
+#: src/gui/userpalette.cpp:211
+msgid "Home place"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:209
-msgid "Home Place Border"
+#: src/gui/userpalette.cpp:214
+msgid "Home place border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:212
-msgid "Road Point"
+#: src/gui/userpalette.cpp:217
+msgid "Road point"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
@@ -5605,7 +5631,7 @@ msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:315
+#: src/gui/widgets/itemcontainer.cpp:317
 msgid "Eq."
 msgstr ""
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 2188c63ee..8f50eb7a8 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-05-03 12:38+0300\n"
-"PO-Revision-Date: 2013-05-03 09:44+0000\n"
+"POT-Creation-Date: 2013-05-10 18:34+0300\n"
+"PO-Revision-Date: 2013-05-10 15:39+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -59,25 +59,25 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: setup window name
 #. TRANSLATORS: full button name
-#: src/client.cpp:1136 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
+#: src/client.cpp:1137 src/gui/setup.cpp:56 src/gui/windowmenu.cpp:168
 msgid "Setup"
 msgstr "設定"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1140 src/gui/setup_perfomance.cpp:61
+#: src/client.cpp:1141 src/gui/setup_perfomance.cpp:61
 msgid "Perfomance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:1143 src/gui/setup_video.cpp:258
+#: src/client.cpp:1144 src/gui/setup_video.cpp:258
 msgid "Video"
 msgstr "顯示"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1146 src/gui/setup_theme.cpp:273
+#: src/client.cpp:1147 src/gui/setup_theme.cpp:283
 msgid "Theme"
 msgstr ""
 
@@ -88,7 +88,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1150 src/gui/didyouknowwindow.cpp:78
+#: src/client.cpp:1151 src/gui/didyouknowwindow.cpp:78
 #: src/gui/inventorywindow.cpp:228 src/gui/npcdialog.cpp:63
 #: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:574
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:80
@@ -96,32 +96,32 @@ msgid "Close"
 msgstr "關閉"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1238
+#: src/client.cpp:1239
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1282
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1320
+#: src/client.cpp:1321
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1431
+#: src/client.cpp:1432
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1470
+#: src/client.cpp:1471
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1483
+#: src/client.cpp:1484
 msgid "Changing game servers"
 msgstr ""
 
@@ -136,69 +136,69 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1540 src/client.cpp:1551 src/client.cpp:1721
+#: src/client.cpp:1541 src/client.cpp:1552 src/client.cpp:1722
 #: src/gui/changeemaildialog.cpp:168 src/gui/changepassworddialog.cpp:158
-#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:288
-#: src/gui/editserverdialog.cpp:220 src/gui/registerdialog.cpp:263
+#: src/gui/charcreatedialog.cpp:316 src/gui/charselectdialog.cpp:290
+#: src/gui/editserverdialog.cpp:216 src/gui/registerdialog.cpp:263
 #: src/gui/unregisterdialog.cpp:143 src/net/ea/charserverhandler.cpp:190
 #: src/net/ea/charserverhandler.cpp:210
 msgid "Error"
 msgstr "錯誤"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1564
+#: src/client.cpp:1565
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1601
+#: src/client.cpp:1602
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1603
+#: src/client.cpp:1604
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1624
+#: src/client.cpp:1625
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1626
+#: src/client.cpp:1627
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1647
+#: src/client.cpp:1648
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1649
+#: src/client.cpp:1650
 msgid "Farewell, come back any time..."
 msgstr ""
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1902 src/client.cpp:1917 src/client.cpp:1960
-#: src/client.cpp:1976 src/client.cpp:2417 src/client.cpp:2425
+#: src/client.cpp:1903 src/client.cpp:1918 src/client.cpp:1961
+#: src/client.cpp:1977 src/client.cpp:2418 src/client.cpp:2426
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2113
+#: src/client.cpp:2114
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2154 src/client.cpp:2161
+#: src/client.cpp:2155 src/client.cpp:2162
 msgid "Error creating updates directory!"
 msgstr "建立更新目錄失敗！"
 
-#: src/client.cpp:2183 src/client.cpp:2196
+#: src/client.cpp:2184 src/client.cpp:2197
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -478,19 +478,19 @@ msgid "Comment: %s"
 msgstr ""
 
 #. TRANSLATORS: bot checker window header
-#: src/gui/botcheckerwindow.cpp:269
+#: src/gui/botcheckerwindow.cpp:268
 msgid "Bot Checker"
 msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:102
+#: src/gui/botcheckerwindow.cpp:277 src/gui/npcdialog.cpp:102
 msgid "Reset"
 msgstr "重設"
 
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: relations table header
-#: src/gui/botcheckerwindow.cpp:305 src/gui/setup_relations.cpp:61
+#: src/gui/botcheckerwindow.cpp:304 src/gui/setup_relations.cpp:61
 msgid "Name"
 msgstr "名字"
 
@@ -498,7 +498,7 @@ msgstr "名字"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/botcheckerwindow.cpp:307 src/gui/popupmenu.cpp:145
+#: src/gui/botcheckerwindow.cpp:306 src/gui/popupmenu.cpp:145
 #: src/gui/popupmenu.cpp:241 src/gui/popupmenu.cpp:640
 #: src/gui/setupactiondata.h:51 src/net/eathena/generalhandler.cpp:257
 #: src/net/tmwa/generalhandler.cpp:292
@@ -508,7 +508,7 @@ msgstr "攻擊"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input action name
-#: src/gui/botcheckerwindow.cpp:309 src/gui/popupmenu.cpp:225
+#: src/gui/botcheckerwindow.cpp:308 src/gui/popupmenu.cpp:225
 #: src/gui/setupactiondata.h:93
 msgid "Talk"
 msgstr "說話"
@@ -516,7 +516,7 @@ msgstr "說話"
 #. TRANSLATORS: bot checker window table header
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/botcheckerwindow.cpp:311 src/gui/popupmenu.cpp:215
+#: src/gui/botcheckerwindow.cpp:310 src/gui/popupmenu.cpp:215
 #: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:371
 #: src/gui/popupmenu.cpp:507 src/gui/popupmenu.cpp:653
 #: src/gui/popupmenu.cpp:727 src/gui/setupactiondata.h:1856
@@ -524,7 +524,7 @@ msgid "Move"
 msgstr ""
 
 #. TRANSLATORS: bot checker window table header
-#: src/gui/botcheckerwindow.cpp:313
+#: src/gui/botcheckerwindow.cpp:312
 msgid "Result"
 msgstr ""
 
@@ -580,7 +580,7 @@ msgstr "購買"
 
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
-#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:516
+#: src/gui/buydialog.cpp:239 src/gui/buydialog.cpp:511
 #: src/gui/selldialog.cpp:94 src/gui/selldialog.cpp:342
 #, c-format
 msgid "Price: %s / Total: %s"
@@ -597,9 +597,9 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
-#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:208
-#: src/gui/itemamountwindow.cpp:243 src/gui/npcdialog.cpp:93
-#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:833
+#: src/gui/buydialog.cpp:253 src/gui/itemamountwindow.cpp:202
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:93
+#: src/gui/selldialog.cpp:98 src/gui/statuswindow.cpp:821
 msgid "+"
 msgstr "增加"
 
@@ -609,9 +609,9 @@ msgstr "增加"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
-#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:240 src/gui/npcdialog.cpp:95
-#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:846
+#: src/gui/buydialog.cpp:256 src/gui/itemamountwindow.cpp:200
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:95
+#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:834
 msgid "-"
 msgstr "減少"
 
@@ -623,7 +623,7 @@ msgstr "減少"
 #. TRANSLATORS: input action name
 #: src/gui/buydialog.cpp:260 src/gui/quitdialog.cpp:54
 #: src/gui/quitdialog.cpp:59 src/gui/quitdialog.cpp:61
-#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:255
+#: src/gui/selldialog.cpp:104 src/gui/serverdialog.cpp:264
 #: src/gui/setupactiondata.h:177
 msgid "Quit"
 msgstr "離開"
@@ -635,7 +635,7 @@ msgstr "離開"
 #. TRANSLATORS: status bar label
 #: src/gui/buydialog.cpp:262 src/gui/selldialog.cpp:106
 #: src/gui/statuswindow.cpp:558 src/gui/statuswindow.cpp:615
-#: src/gui/statuswindow.cpp:830 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:818 src/gui/statuswindow.cpp:852
 msgid "Max"
 msgstr "最大"
 
@@ -680,7 +680,7 @@ msgstr "出售"
 #: src/gui/buyselldialog.cpp:71 src/gui/changeemaildialog.cpp:55
 #: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:120
 #: src/gui/connectiondialog.cpp:48 src/gui/editserverdialog.cpp:80
-#: src/gui/itemamountwindow.cpp:212 src/gui/npcpostdialog.cpp:64
+#: src/gui/itemamountwindow.cpp:206 src/gui/npcpostdialog.cpp:64
 #: src/gui/popupmenu.cpp:290 src/gui/popupmenu.cpp:324
 #: src/gui/popupmenu.cpp:411 src/gui/popupmenu.cpp:454
 #: src/gui/popupmenu.cpp:485 src/gui/popupmenu.cpp:512
@@ -696,7 +696,7 @@ msgstr "出售"
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
 #: src/gui/setup.cpp:84 src/gui/socialwindow.cpp:1204
 #: src/gui/textcommandeditor.cpp:212 src/gui/textdialog.cpp:53
-#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:167
+#: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:183
 msgid "Cancel"
 msgstr "取消"
 
@@ -860,7 +860,7 @@ msgstr "請分配%d點數"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:570
+#: src/gui/charcreatedialog.cpp:118 src/gui/charselectdialog.cpp:581
 #: src/gui/socialwindow.cpp:1269
 msgid "Create"
 msgstr "創造"
@@ -887,17 +887,17 @@ msgid "Please remove %d points"
 msgstr "請移除%d點數"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:60
+#: src/gui/charselectdialog.cpp:61
 msgid "Confirm Character Delete"
 msgstr "確認刪除角色"
 
 #. TRANSLATORS: char deletion message
-#: src/gui/charselectdialog.cpp:62
+#: src/gui/charselectdialog.cpp:63
 msgid "Are you sure you want to delete this character?"
 msgstr "你確定想刪除這個角色？"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:86
+#: src/gui/charselectdialog.cpp:87
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
@@ -909,8 +909,8 @@ msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:565
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/charselectdialog.cpp:101 src/gui/charselectdialog.cpp:576
+#: src/gui/updaterwindow.cpp:185
 msgid "Play"
 msgstr "開始"
 
@@ -926,7 +926,7 @@ msgstr "資訊"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: command editor button
-#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:263
+#: src/gui/charselectdialog.cpp:105 src/gui/serverdialog.cpp:272
 #: src/gui/setupactiondata.h:1803 src/gui/setup_relations.cpp:262
 #: src/gui/shopwindow.cpp:96 src/gui/shopwindow.cpp:103
 #: src/gui/textcommandeditor.cpp:216
@@ -936,24 +936,24 @@ msgstr "刪除"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/charselectdialog.cpp:129 src/gui/unregisterdialog.cpp:48
+#: src/gui/charselectdialog.cpp:130 src/gui/unregisterdialog.cpp:48
 #: src/gui/unregisterdialog.cpp:53
 msgid "Unregister"
 msgstr "取消註冊"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/charselectdialog.cpp:141
+#: src/gui/charselectdialog.cpp:142
 msgid "Change Email"
 msgstr ""
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/charselectdialog.cpp:172
+#: src/gui/charselectdialog.cpp:175
 #, c-format
 msgid "Account %s"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/charselectdialog.cpp:246
+#: src/gui/charselectdialog.cpp:248
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -963,16 +963,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:288
+#: src/gui/charselectdialog.cpp:290
 msgid "Incorrect password"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:417
+#: src/gui/charselectdialog.cpp:426
 msgid "Enter password:"
 msgstr ""
 
@@ -1059,13 +1059,13 @@ msgid "Chat"
 msgstr "聊天"
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:735
+#: src/gui/chatwindow.cpp:638
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1165
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "對%s竊竊私語：%s"
@@ -1083,7 +1083,7 @@ msgstr "否"
 
 #. TRANSLATORS: confirm dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/confirmdialog.cpp:58 src/gui/popupmenu.cpp:2429
+#: src/gui/confirmdialog.cpp:55 src/gui/popupmenu.cpp:2429
 #: src/gui/popupmenu.cpp:2442 src/gui/popupmenu.cpp:2457
 #: src/gui/popupmenu.cpp:2483
 msgid "Ignore"
@@ -1092,7 +1092,7 @@ msgstr ""
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
 #. TRANSLATORS: settings group
-#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:109
+#: src/gui/debugwindow.cpp:69 src/gui/minimap.cpp:49 src/gui/minimap.cpp:108
 #: src/gui/setup_other.cpp:123 src/gui/windowmenu.cpp:106
 msgid "Map"
 msgstr "地圖"
@@ -1108,190 +1108,190 @@ msgid "Net"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:265
-#: src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:268
+#: src/gui/debugwindow.cpp:311
 msgid "Music:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:153 src/gui/debugwindow.cpp:271
-#: src/gui/debugwindow.cpp:312
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:274
+#: src/gui/debugwindow.cpp:315
 msgid "Map:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:155 src/gui/debugwindow.cpp:268
-#: src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:271
+#: src/gui/debugwindow.cpp:313
 msgid "Minimap:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:158 src/gui/debugwindow.cpp:262
-#: src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:161 src/gui/debugwindow.cpp:265
+#: src/gui/debugwindow.cpp:309
 msgid "Cursor:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:161
+#: src/gui/debugwindow.cpp:164
 msgid "Particle count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:284
-#: src/gui/debugwindow.cpp:316
+#: src/gui/debugwindow.cpp:167 src/gui/debugwindow.cpp:287
+#: src/gui/debugwindow.cpp:319
 msgid "Map actors count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:166 src/gui/debugwindow.cpp:243
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:169 src/gui/debugwindow.cpp:246
+#: src/gui/debugwindow.cpp:252
 msgid "Player Position:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:172 src/gui/debugwindow.cpp:297
+#: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:300
 msgid "Draw calls:"
 msgstr ""
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:175
+#. TRANSLATORS: debug window label, frames per second
+#: src/gui/debugwindow.cpp:178
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
-#. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:177 src/gui/debugwindow.cpp:324
+#. TRANSLATORS: debug window label, logic per second
+#: src/gui/debugwindow.cpp:180 src/gui/debugwindow.cpp:327
 #, c-format
 msgid "%d LPS"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:191 src/gui/debugwindow.cpp:209
 #, c-format
 msgid "%d FPS (Software)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:193
+#: src/gui/debugwindow.cpp:196
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:197
+#: src/gui/debugwindow.cpp:200
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:201
+#: src/gui/debugwindow.cpp:204
 #, c-format
 msgid "%d FPS (mobile OpenGL)"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:225 src/gui/debugwindow.cpp:290
+#: src/gui/debugwindow.cpp:228 src/gui/debugwindow.cpp:293
 msgid "Textures count:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:279
+#: src/gui/debugwindow.cpp:282
 #, c-format
 msgid "Particle count: %d"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:330 src/gui/debugwindow.cpp:380
-#: src/gui/debugwindow.cpp:442
+#: src/gui/debugwindow.cpp:333 src/gui/debugwindow.cpp:383
+#: src/gui/debugwindow.cpp:445
 msgid "Target:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:332 src/gui/debugwindow.cpp:386
-#: src/gui/debugwindow.cpp:444
+#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
+#: src/gui/debugwindow.cpp:447
 msgid "Target Id:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:335 src/gui/debugwindow.cpp:389
-#: src/gui/debugwindow.cpp:446
+#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:392
+#: src/gui/debugwindow.cpp:449
 msgid "Target type:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:337
+#: src/gui/debugwindow.cpp:340
 msgid "Target level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:339 src/gui/debugwindow.cpp:405
+#: src/gui/debugwindow.cpp:342 src/gui/debugwindow.cpp:408
 msgid "Target race:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:341
+#: src/gui/debugwindow.cpp:344
 msgid "Target party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:346
 msgid "Target guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:430
-#: src/gui/debugwindow.cpp:436 src/gui/debugwindow.cpp:454
+#: src/gui/debugwindow.cpp:348 src/gui/debugwindow.cpp:433
+#: src/gui/debugwindow.cpp:439 src/gui/debugwindow.cpp:457
 msgid "Attack delay:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:347 src/gui/debugwindow.cpp:417
-#: src/gui/debugwindow.cpp:456
+#: src/gui/debugwindow.cpp:350 src/gui/debugwindow.cpp:420
+#: src/gui/debugwindow.cpp:459
 msgid "Minimal hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:349 src/gui/debugwindow.cpp:420
-#: src/gui/debugwindow.cpp:458
+#: src/gui/debugwindow.cpp:352 src/gui/debugwindow.cpp:423
+#: src/gui/debugwindow.cpp:461
 msgid "Maximum hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:351 src/gui/debugwindow.cpp:423
-#: src/gui/debugwindow.cpp:460
+#: src/gui/debugwindow.cpp:354 src/gui/debugwindow.cpp:426
+#: src/gui/debugwindow.cpp:463
 msgid "Critical hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:394 src/gui/debugwindow.cpp:400
-#: src/gui/debugwindow.cpp:448
+#: src/gui/debugwindow.cpp:397 src/gui/debugwindow.cpp:403
+#: src/gui/debugwindow.cpp:451
 msgid "Target Level:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:408 src/gui/debugwindow.cpp:450
+#: src/gui/debugwindow.cpp:411 src/gui/debugwindow.cpp:453
 msgid "Target Party:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:412 src/gui/debugwindow.cpp:452
+#: src/gui/debugwindow.cpp:415 src/gui/debugwindow.cpp:455
 msgid "Target Guild:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:493
+#: src/gui/debugwindow.cpp:496
 #, c-format
 msgid "Ping: %s ms"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:496
+#: src/gui/debugwindow.cpp:499
 #, c-format
 msgid "In: %d bytes/s"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/debugwindow.cpp:499
+#: src/gui/debugwindow.cpp:502
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
@@ -1323,7 +1323,7 @@ msgstr ""
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: text dialog button
 #: src/gui/editdialog.cpp:45 src/gui/editserverdialog.cpp:78
-#: src/gui/itemamountwindow.cpp:210 src/gui/okdialog.cpp:51
+#: src/gui/itemamountwindow.cpp:204 src/gui/okdialog.cpp:51
 #: src/gui/quitdialog.cpp:70 src/gui/textdialog.cpp:46
 msgid "OK"
 msgstr "確定"
@@ -1335,7 +1335,7 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:257
+#: src/gui/editserverdialog.cpp:76 src/gui/serverdialog.cpp:266
 msgid "Connect"
 msgstr ""
 
@@ -1365,7 +1365,7 @@ msgid "Online list url:"
 msgstr ""
 
 #. TRANSLATORS: edit server dialog error message
-#: src/gui/editserverdialog.cpp:222
+#: src/gui/editserverdialog.cpp:218
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -1417,7 +1417,7 @@ msgstr "裝備"
 #: src/gui/inventorywindow.cpp:178 src/gui/inventorywindow.cpp:630
 #: src/gui/popupmenu.cpp:1843 src/gui/popupmenu.cpp:1922
 #: src/gui/popupmenu.cpp:1967 src/gui/popupmenu.cpp:2041
-#: src/gui/skilldialog.cpp:277
+#: src/gui/skilldialog.cpp:279
 msgid "Use"
 msgstr "使用"
 
@@ -1451,7 +1451,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: setup button
-#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:718
+#: src/gui/inventorywindow.cpp:224 src/gui/inventorywindow.cpp:719
 #: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1992
 #: src/gui/popupmenu.cpp:2066 src/gui/setup.cpp:86
 msgid "Store"
@@ -1473,47 +1473,47 @@ msgid "Drop"
 msgstr "丟棄"
 
 #. TRANSLATORS: item amount window button
-#: src/gui/itemamountwindow.cpp:214
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "全部"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:264
 msgid "Select amount of items to trade."
 msgstr "請選擇交易的物品數量"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:274
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to drop."
 msgstr "請選擇丟棄的物品數量"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:278
+#: src/gui/itemamountwindow.cpp:272
 msgid "Select amount of items to store."
 msgstr "選擇要儲存的物品數量。"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:276
 msgid "Select amount of items to retrieve."
 msgstr "選擇要取回的物品數量。"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:286
+#: src/gui/itemamountwindow.cpp:280
 msgid "Select amount of items to split."
 msgstr "請選擇你要分離的物品數量"
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:290
+#: src/gui/itemamountwindow.cpp:284
 msgid "Add to buy shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:294
+#: src/gui/itemamountwindow.cpp:288
 msgid "Add to sell shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/itemamountwindow.cpp:298
+#: src/gui/itemamountwindow.cpp:292
 msgid "Unknown."
 msgstr ""
 
@@ -1540,7 +1540,7 @@ msgstr ""
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:58 src/gui/killstats.cpp:171
-#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:516
+#: src/gui/killstats.cpp:276 src/gui/killstats.cpp:509
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
@@ -1548,7 +1548,7 @@ msgstr ""
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:61 src/gui/killstats.cpp:173
 #: src/gui/killstats.cpp:253 src/gui/killstats.cpp:268
-#: src/gui/killstats.cpp:518
+#: src/gui/killstats.cpp:511
 #, c-format
 msgid "Avg Exp: %s"
 msgstr ""
@@ -1556,14 +1556,14 @@ msgstr ""
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:63 src/gui/killstats.cpp:176
 #: src/gui/killstats.cpp:258 src/gui/killstats.cpp:272
-#: src/gui/killstats.cpp:521
+#: src/gui/killstats.cpp:514
 #, c-format
 msgid "No. of avg mob to next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
 #: src/gui/killstats.cpp:66 src/gui/killstats.cpp:187
-#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:524
+#: src/gui/killstats.cpp:280 src/gui/killstats.cpp:517
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
@@ -1589,9 +1589,9 @@ msgid "Last kill exp:"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:414
-#: src/gui/killstats.cpp:421 src/gui/killstats.cpp:428
-#: src/gui/killstats.cpp:434
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:408
+#: src/gui/killstats.cpp:415 src/gui/killstats.cpp:422
+#: src/gui/killstats.cpp:428
 msgid "Time before jacko spawn:"
 msgstr ""
 
@@ -1623,12 +1623,12 @@ msgid "  Time for next level: %s"
 msgstr ""
 
 #. TRANSLATORS: kill stats window label
-#: src/gui/killstats.cpp:421
+#: src/gui/killstats.cpp:415
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:428
+#: src/gui/killstats.cpp:422
 msgid "jacko spawning"
 msgstr ""
 
@@ -1734,32 +1734,32 @@ msgid "arrows bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:88
+#: src/gui/ministatuswindow.cpp:89
 msgid "status bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/ministatuswindow.cpp:108
+#: src/gui/ministatuswindow.cpp:109
 msgid "job bar"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:306 src/gui/statuswindow.cpp:298
+#: src/gui/ministatuswindow.cpp:307 src/gui/statuswindow.cpp:298
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:313 src/gui/statuswindow.cpp:141
+#: src/gui/ministatuswindow.cpp:314 src/gui/statuswindow.cpp:141
 #: src/gui/statuswindow.cpp:305 src/gui/statuswindow.cpp:375
 #, c-format
 msgid "Level: %d"
 msgstr "等級：%d"
 
 #. TRANSLATORS: status bar label
-#: src/gui/ministatuswindow.cpp:330 src/gui/ministatuswindow.cpp:367
+#: src/gui/ministatuswindow.cpp:331 src/gui/ministatuswindow.cpp:368
 msgid "Need"
 msgstr ""
 
@@ -2147,7 +2147,7 @@ msgstr ""
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2209 src/gui/popupmenu.cpp:2280
-#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:139
+#: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
 #: src/gui/socialwindow.cpp:934
 msgid "(default)"
 msgstr ""
@@ -2330,7 +2330,7 @@ msgid "Passwords do not match."
 msgstr "密碼不一樣."
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:257
 msgid "Choose Your Server"
 msgstr ""
 
@@ -2338,61 +2338,61 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:259 src/gui/shopwindow.cpp:94
+#: src/gui/serverdialog.cpp:268 src/gui/shopwindow.cpp:94
 #: src/gui/shopwindow.cpp:101 src/gui/tradewindow.cpp:77
 msgid "Add"
 msgstr "增加"
 
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
-#: src/gui/serverdialog.cpp:261 src/gui/widgets/setupitem.cpp:299
+#: src/gui/serverdialog.cpp:270 src/gui/widgets/setupitem.cpp:299
 #: src/gui/widgets/setupitem.cpp:426
 msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:274
 msgid "Load"
 msgstr ""
 
 #. TRANSLATORS: servers dialog name
-#: src/gui/serverdialog.cpp:279
+#: src/gui/serverdialog.cpp:288
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
 #. TRANSLATORS: servers dialog checkbox
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:297
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:518
+#: src/gui/serverdialog.cpp:527
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:524
+#: src/gui/serverdialog.cpp:533
 msgid "Waiting for server..."
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:529
+#: src/gui/serverdialog.cpp:538
 msgid "Preparing download"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:534
+#: src/gui/serverdialog.cpp:543
 msgid "Error retreiving server list!"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:626
+#: src/gui/serverdialog.cpp:635
 msgid "requires a newer version"
 msgstr ""
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/serverdialog.cpp:631
+#: src/gui/serverdialog.cpp:640
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -3403,7 +3403,7 @@ msgid "Type:"
 msgstr ""
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:334
+#: src/gui/setup_colors.cpp:66 src/gui/setup_colors.cpp:336
 msgid "Delay:"
 msgstr ""
 
@@ -3423,30 +3423,30 @@ msgid "Blue:"
 msgstr ""
 
 #. TRANSLATORS: color type
-#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:420
+#: src/gui/setup_colors.cpp:105 src/gui/setup_colors.cpp:422
 msgid "Static"
 msgstr "狀態"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:107 src/gui/setup_colors.cpp:110
-#: src/gui/setup_colors.cpp:422
+#: src/gui/setup_colors.cpp:424
 msgid "Pulse"
 msgstr "暫停"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:112 src/gui/setup_colors.cpp:115
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Rainbow"
 msgstr "彩虹"
 
 #. TRANSLATORS: color type
 #: src/gui/setup_colors.cpp:117 src/gui/setup_colors.cpp:120
-#: src/gui/setup_colors.cpp:424
+#: src/gui/setup_colors.cpp:426
 msgid "Spectrum"
 msgstr "光譜"
 
 #. TRANSLATORS: colors tab. label.
-#: src/gui/setup_colors.cpp:328
+#: src/gui/setup_colors.cpp:330
 msgid "Alpha:"
 msgstr ""
 
@@ -3612,7 +3612,7 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: palette color
-#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:134
+#: src/gui/setup_other.cpp:98 src/gui/userpalette.cpp:135
 msgid "Monsters"
 msgstr "怪物"
 
@@ -4161,206 +4161,231 @@ msgstr "當忽略時："
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:86
-msgid "Very small (9)"
+msgid "Very small (8)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:88
-msgid "Tiny (10)"
+msgid "Very small (9)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:90
-msgid "Small (11)"
+msgid "Tiny (10)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:92
-msgid "Medium (12)"
+msgid "Small (11)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:94
-msgid "Normal (13)"
+msgid "Medium (12)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:96
-msgid "Large (14)"
+msgid "Normal (13)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:98
-msgid "Very large (15)"
+msgid "Large (14)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:100
-msgid "Big (16)"
+msgid "Large (15)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:102
-msgid "Very big (17)"
+msgid "Large (16)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:104
-msgid "Huge (18)"
+msgid "Big (17)"
 msgstr ""
 
 #. TRANSLATORS: font size
 #: src/gui/setup_theme.cpp:106
-msgid "Very huge (19)"
+msgid "Big (18)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:108
+msgid "Big (19)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:110
+msgid "Very big (20)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:112
+msgid "Very big (21)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:114
+msgid "Very big (22)"
+msgstr ""
+
+#. TRANSLATORS: font size
+#: src/gui/setup_theme.cpp:116
+msgid "Huge (23)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:151
 msgid "Chinese (China)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:153
 msgid "Czech"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:155
 msgid "English"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:157
 msgid "Finnish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:159
 msgid "French"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:161
 msgid "German"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:153
+#: src/gui/setup_theme.cpp:163
 msgid "Indonesian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:155
+#: src/gui/setup_theme.cpp:165
 msgid "Italian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:157
+#: src/gui/setup_theme.cpp:167
 msgid "Polish"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:159
+#: src/gui/setup_theme.cpp:169
 msgid "Japanese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:161
+#: src/gui/setup_theme.cpp:171
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:163
+#: src/gui/setup_theme.cpp:173
 msgid "Portuguese"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:165
+#: src/gui/setup_theme.cpp:175
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:167
+#: src/gui/setup_theme.cpp:177
 msgid "Russian"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:169
+#: src/gui/setup_theme.cpp:179
 msgid "Spanish (Castilian)"
 msgstr ""
 
 #. TRANSLATORS: language
-#: src/gui/setup_theme.cpp:171
+#: src/gui/setup_theme.cpp:181
 msgid "Turkish"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:223
+#: src/gui/setup_theme.cpp:233
 msgid "Gui theme"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:230
+#: src/gui/setup_theme.cpp:240
 msgid "Main Font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:235
+#: src/gui/setup_theme.cpp:245
 msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:239
+#: src/gui/setup_theme.cpp:249
 msgid "Bold font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:243
+#: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:247
+#: src/gui/setup_theme.cpp:257
 msgid "Help font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:251
+#: src/gui/setup_theme.cpp:261
 msgid "Secure font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:255
+#: src/gui/setup_theme.cpp:265
 msgid "Japanese font"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:260
+#: src/gui/setup_theme.cpp:270
 msgid "Font size"
 msgstr "字型大小"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:265
+#: src/gui/setup_theme.cpp:275
 msgid "Npc font size"
 msgstr ""
 
 #. TRANSLATORS: button name with information about selected theme
-#: src/gui/setup_theme.cpp:269
+#: src/gui/setup_theme.cpp:279
 msgid "i"
 msgstr ""
 
 #. TRANSLATORS: theme info dialog header
-#: src/gui/setup_theme.cpp:442
+#: src/gui/setup_theme.cpp:452
 msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/setup_theme.cpp:467
+#: src/gui/setup_theme.cpp:477
 msgid "Theme Changed"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/setup_theme.cpp:467 src/gui/setup_video.cpp:537
+#: src/gui/setup_theme.cpp:477 src/gui/setup_video.cpp:537
 #: src/gui/setup_video.cpp:546
 msgid "Restart your client for the change to take effect."
 msgstr "請重新啟動您的客戶端讓變更生效。"
@@ -4658,7 +4683,8 @@ msgid "Ambient FX"
 msgstr "環境效果"
 
 #. TRANSLATORS: settings option
-#: src/gui/setup_visual.cpp:140
+#. TRANSLATORS: palette color
+#: src/gui/setup_visual.cpp:140 src/gui/userpalette.cpp:146
 msgid "Particle effects"
 msgstr "粒子效果"
 
@@ -4745,45 +4771,45 @@ msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: skills dialog name
-#: src/gui/skilldialog.cpp:270 src/gui/windowmenu.cpp:112
+#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:112
 msgid "Skills"
 msgstr "技能"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/skilldialog.cpp:279
+#: src/gui/skilldialog.cpp:281
 msgid "Up"
 msgstr "升級"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/skilldialog.cpp:391
+#: src/gui/skilldialog.cpp:393
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skills tab
-#: src/gui/skilldialog.cpp:444
+#: src/gui/skilldialog.cpp:446
 msgid "basic"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill name
-#: src/gui/skilldialog.cpp:447
+#: src/gui/skilldialog.cpp:449
 msgid "basic, 1"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/skilldialog.cpp:484
+#: src/gui/skilldialog.cpp:486
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/skilldialog.cpp:518
+#: src/gui/skilldialog.cpp:520
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/skilldialog.cpp:612 src/gui/skilldialog.cpp:762
+#: src/gui/skilldialog.cpp:614 src/gui/skilldialog.cpp:764
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -5226,7 +5252,7 @@ msgid "Trade: You"
 msgstr "交易：您"
 
 #. TRANSLATORS: trade window money label
-#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:182
+#: src/gui/tradewindow.cpp:75 src/gui/tradewindow.cpp:184
 #, c-format
 msgid "You get %s"
 msgstr ""
@@ -5242,12 +5268,12 @@ msgid "You give:"
 msgstr "你付出:"
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:393
+#: src/gui/tradewindow.cpp:396
 msgid "You don't have enough money."
 msgstr "你沒有足夠的金錢."
 
 #. TRANSLATORS: trade error
-#: src/gui/tradewindow.cpp:475
+#: src/gui/tradewindow.cpp:479
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "增加物品失敗。你不能覆蓋視窗中的該類物品能。"
@@ -5259,223 +5285,223 @@ msgid "Name: %s"
 msgstr "名字：%s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/updaterwindow.cpp:140
+#: src/gui/updaterwindow.cpp:156
 msgid "Updating..."
 msgstr "更新中..."
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:165
+#: src/gui/updaterwindow.cpp:181
 msgid "Connecting..."
 msgstr "連線中..."
 
 #. TRANSLATORS: update message
-#: src/gui/updaterwindow.cpp:656
+#: src/gui/updaterwindow.cpp:672
 msgid "##1  The update process is incomplete."
 msgstr "##1  更新的程序不完整。"
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/updaterwindow.cpp:658
+#: src/gui/updaterwindow.cpp:674
 msgid "##1  It is strongly recommended that"
 msgstr "##1  強烈建議"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:660
+#: src/gui/updaterwindow.cpp:676
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/updaterwindow.cpp:839
+#: src/gui/updaterwindow.cpp:855
 msgid "Completed"
 msgstr "已完成"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:116
+#: src/gui/userpalette.cpp:117
 msgid "Being"
 msgstr "物件"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:118
-msgid "Friend Names"
+#: src/gui/userpalette.cpp:119
+msgid "Friend names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:120
-msgid "Disregarded Names"
+#: src/gui/userpalette.cpp:121
+msgid "Disregarded names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:122
-msgid "Ignored Names"
+#: src/gui/userpalette.cpp:123
+msgid "Ignored names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:124
-msgid "Erased Names"
+#: src/gui/userpalette.cpp:125
+msgid "Erased names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:126
-msgid "Other Players' Names"
-msgstr "其他使用者名字"
+#: src/gui/userpalette.cpp:127
+msgid "Other players names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:128
-msgid "Own Name"
-msgstr "我的名字"
+#: src/gui/userpalette.cpp:129
+msgid "Own name"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:130
-msgid "GM Names"
-msgstr "遊戲管理者名字"
+#: src/gui/userpalette.cpp:131
+msgid "GM names"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:132
+#: src/gui/userpalette.cpp:133
 msgid "NPCs"
 msgstr "電腦"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:137
 msgid "Monster HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:139
+#: src/gui/userpalette.cpp:140
 msgid "Monster HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:141
-msgid "Party Members"
+#: src/gui/userpalette.cpp:142
+msgid "Party members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:143
-msgid "Guild Members"
+#: src/gui/userpalette.cpp:144
+msgid "Guild members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:145
-msgid "Particle Effects"
-msgstr "粒子效果"
-
-#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:147
-msgid "Pickup Notification"
-msgstr "撿拾通知"
+#: src/gui/userpalette.cpp:148
+msgid "Pickup notification"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:149
-msgid "Exp Notification"
-msgstr "經驗值通知"
+#: src/gui/userpalette.cpp:150
+msgid "Exp notification"
+msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:151
+#: src/gui/userpalette.cpp:152
 msgid "Player HP bar"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:155
+#: src/gui/userpalette.cpp:156
 msgid "Player HP bar (second color)"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:157
-msgid "Player Hits Monster"
+#: src/gui/userpalette.cpp:158
+msgid "Player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:159
-msgid "Monster Hits Player"
+#: src/gui/userpalette.cpp:160
+msgid "Monster hits player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:163
-msgid "Other Player Hits Local Player"
+#: src/gui/userpalette.cpp:164
+msgid "Other player hits local player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:165
+#: src/gui/userpalette.cpp:166
 msgid "Critical Hit"
 msgstr "致命一擊"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
-msgid "Local Player Hits Monster"
+#: src/gui/userpalette.cpp:170
+msgid "Local player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:172
-msgid "Local Player Critical Hit"
+#: src/gui/userpalette.cpp:173
+msgid "Local player critical hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:175
-msgid "Local Player Miss"
+#: src/gui/userpalette.cpp:176
+msgid "Local player miss"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:177
+#: src/gui/userpalette.cpp:178
 msgid "Misses"
 msgstr "失誤"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
-msgid "Portal Highlight"
+#: src/gui/userpalette.cpp:180
+msgid "Portal highlight"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:183
+msgid "Default collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:182
-msgid "Default collision Highlight"
+#: src/gui/userpalette.cpp:186
+msgid "Air collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:185
-msgid "Air collision Highlight"
+#: src/gui/userpalette.cpp:189
+msgid "Water collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:188
-msgid "Water collision Highlight"
+#: src/gui/userpalette.cpp:192
+msgid "Special ground collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:191
-msgid "Special ground collision Highlight"
+#: src/gui/userpalette.cpp:195
+msgid "Walkable highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
-msgid "Walkable Highlight"
+#: src/gui/userpalette.cpp:198
+msgid "Local player attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:197
-msgid "Local Player Attack Range"
+#: src/gui/userpalette.cpp:201
+msgid "Local player attack range border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:200
-msgid "Local Player Attack Range Border"
+#: src/gui/userpalette.cpp:204
+msgid "Monster attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:203
-msgid "Monster Attack Range"
+#: src/gui/userpalette.cpp:208
+msgid "Floor item amount color"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:206
-msgid "Home Place"
+#: src/gui/userpalette.cpp:211
+msgid "Home place"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:209
-msgid "Home Place Border"
+#: src/gui/userpalette.cpp:214
+msgid "Home place border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:212
-msgid "Road Point"
+#: src/gui/userpalette.cpp:217
+msgid "Road point"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
@@ -5605,7 +5631,7 @@ msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:315
+#: src/gui/widgets/itemcontainer.cpp:317
 msgid "Eq."
 msgstr ""
author	Andrei Karas <akaras@inbox.ru>	2013-05-11 12:19:16 +0300
committer	Andrei Karas <akaras@inbox.ru>	2013-05-11 12:19:16 +0300
commit	8b74148d038ae9ed5e102bf52d218c3f59cfd624 (patch)
tree	15b87f56d886ab6657d88e04aa2bd093a6792c2f /po
parent	7553637ed9d1f6f6116493ab4367f4cff53fe2cc (diff)
download	mv-8b74148d038ae9ed5e102bf52d218c3f59cfd624.tar.gz mv-8b74148d038ae9ed5e102bf52d218c3f59cfd624.tar.bz2 mv-8b74148d038ae9ed5e102bf52d218c3f59cfd624.tar.xz mv-8b74148d038ae9ed5e102bf52d218c3f59cfd624.zip