Update translations.

23 files changed, 7197 insertions, 7290 deletions

diff --git a/po/ca.po b/po/ca.po
index 25724e419..0e7082693 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011
 # Arnau Mas <thealchemist886@gmail.com>, 2013-2016
@@ -9,14 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-06-18 18:53+0300\n"
+"POT-Creation-Date: 2016-07-02 19:47+0300\n"
 "PO-Revision-Date: 2016-06-19 09:21+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Catalan (http://www.transifex.com/akaras/manaplus/language/ca/)\n"
+"Language-Team: Catalan (http://www.transifex.com/akaras/manaplus/language/"
+"ca/)\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
@@ -33,7 +34,7 @@ msgstr "Arxiu enviat"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:171 src/client.cpp:1569 src/client.cpp:1604
+#: src/actions/actions.cpp:171 src/client.cpp:1572 src/client.cpp:1607
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
@@ -44,7 +45,7 @@ msgstr "Arxiu enviat"
 #: src/gui/widgets/tabs/setup_video.cpp:420
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:476
+#: src/gui/windows/charcreatedialog.cpp:475
 #: src/gui/windows/charselectdialog.cpp:262
 #: src/gui/windows/charselectdialog.cpp:310 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:59
@@ -53,9 +54,9 @@ msgstr "Arxiu enviat"
 #: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:531
 #: src/gui/windows/textdialog.cpp:53 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:456
-#: src/net/eathena/charserverrecv.cpp:491
-#: src/net/eathena/charserverrecv.cpp:519 src/net/tmwa/charserverrecv.cpp:341
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:423
+#: src/net/eathena/charserverrecv.cpp:458
+#: src/net/eathena/charserverrecv.cpp:486 src/net/tmwa/charserverrecv.cpp:305
 msgid "OK"
 msgstr "OK"
 
@@ -127,7 +128,8 @@ msgstr ""
 #: src/actions/chat.cpp:315
 #, c-format
 msgid "Cannot create a whisper tab \"%s\"! It probably already exists."
-msgstr "No s'ha pogut crear una taula de xiuxiueig  \"%s\"! Probablement ja existeix."
+msgstr ""
+"No s'ha pogut crear una taula de xiuxiueig  \"%s\"! Probablement ja existeix."
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
@@ -302,26 +304,26 @@ msgid "Visible on map"
 msgstr "Visible al mapa"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:496
+#: src/being/being.cpp:494
 msgid "Human"
 msgstr "Humà"
 
 #. TRANSLATORS: dodge or miss message in attacks
-#: src/being/being.cpp:683
+#: src/being/being.cpp:676
 msgid "dodge"
 msgstr "esquiva"
 
-#: src/being/being.cpp:683
+#: src/being/being.cpp:676
 msgid "miss"
 msgstr "falla"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2282 src/gui/windows/whoisonline.cpp:882
+#: src/being/being.cpp:2275 src/gui/windows/whoisonline.cpp:882
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2287 src/gui/windows/whoisonline.cpp:887
+#: src/being/being.cpp:2280 src/gui/windows/whoisonline.cpp:887
 msgid "I"
 msgstr "I"
 
@@ -472,41 +474,41 @@ msgstr "Bombolla flotant"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:870 src/dyetool/client.cpp:491 src/gui/windowmenu.cpp:189
+#: src/client.cpp:872 src/dyetool/client.cpp:491 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:66
 msgid "Setup"
 msgstr "Configuració"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:873 src/dyetool/client.cpp:494
+#: src/client.cpp:875 src/dyetool/client.cpp:494
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:876 src/dyetool/client.cpp:497
+#: src/client.cpp:878 src/dyetool/client.cpp:497
 #: src/gui/widgets/tabs/setup_video.cpp:110
 msgid "Video"
 msgstr "Vídeo"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:879 src/dyetool/client.cpp:500
+#: src/client.cpp:881 src/dyetool/client.cpp:500
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:882 src/dyetool/client.cpp:503
+#: src/client.cpp:884 src/dyetool/client.cpp:503
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:885 src/dyetool/client.cpp:506 src/gui/windowmenu.cpp:74
+#: src/client.cpp:887 src/dyetool/client.cpp:506 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Ajuda"
@@ -527,7 +529,7 @@ msgstr "Ajuda"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:889 src/client.cpp:1483 src/client.cpp:1502
+#: src/client.cpp:891 src/client.cpp:1486 src/client.cpp:1505
 #: src/dyetool/client.cpp:510 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:756 src/gui/popups/popupmenu.cpp:833
 #: src/gui/popups/popupmenu.cpp:1087 src/gui/windows/didyouknowwindow.cpp:81
@@ -540,32 +542,32 @@ msgid "Close"
 msgstr "Tancar"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1115 src/gui/windowmanager_unittest.cc:156
+#: src/client.cpp:1117 src/gui/windowmanager_unittest.cc:156
 msgid "Connecting to server"
 msgstr "Connectant al servidor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1172 src/gui/windowmanager_unittest.cc:173
+#: src/client.cpp:1174 src/gui/windowmanager_unittest.cc:173
 msgid "Logging in"
 msgstr "Iniciant sessió"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1221
+#: src/client.cpp:1223
 msgid "Entering game world"
 msgstr "Entrant al mon de joc"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1369
+#: src/client.cpp:1372
 msgid "Requesting characters"
 msgstr "Sol·licitant personatges"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1412
+#: src/client.cpp:1415
 msgid "Connecting to the game server"
 msgstr "Connectant al servidor de joc"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1424
+#: src/client.cpp:1427
 msgid "Changing game servers"
 msgstr "Canviant servidors de joc"
 
@@ -582,52 +584,52 @@ msgstr "Canviant servidors de joc"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1480 src/client.cpp:1499 src/client.cpp:1738
+#: src/client.cpp:1483 src/client.cpp:1502 src/client.cpp:1741
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:472
+#: src/gui/windows/charcreatedialog.cpp:471
 #: src/gui/windows/charselectdialog.cpp:306
 #: src/gui/windows/editserverdialog.cpp:212
 #: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:429
-#: src/net/eathena/charserverrecv.cpp:433
-#: src/net/eathena/charserverrecv.cpp:515 src/net/tmwa/charserverrecv.cpp:337
+#: src/net/eathena/charserverrecv.cpp:396
+#: src/net/eathena/charserverrecv.cpp:400
+#: src/net/eathena/charserverrecv.cpp:482 src/net/tmwa/charserverrecv.cpp:301
 msgid "Error"
 msgstr "Error"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1518
+#: src/client.cpp:1521
 msgid "Requesting registration details"
 msgstr "Sol·licitant detalls de registre"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1565
+#: src/client.cpp:1568
 msgid "Password Change"
 msgstr "Canvi de contrasenya"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1567
+#: src/client.cpp:1570
 msgid "Password changed successfully!"
 msgstr "Contrasenya canviada amb èxit!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1600
+#: src/client.cpp:1603
 msgid "Email Change"
 msgstr "Canvi de correu"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1602
+#: src/client.cpp:1605
 msgid "Email changed successfully!"
 msgstr "Correu canviat amb èxit!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1638
+#: src/client.cpp:1641
 msgid "Unregister Successful"
 msgstr "Registre anul·lat amb èxit"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1640
+#: src/client.cpp:1643
 msgid "Farewell, come back any time..."
 msgstr "Adéu, torna quan vulguis..."
 
@@ -820,23 +822,23 @@ msgid "Debug"
 msgstr "Depurador"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:598
+#: src/game.cpp:600
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:608
+#: src/game.cpp:610
 msgid "Saving screenshot failed!"
 msgstr "Error al guardar la captura de pantalla!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:695
+#: src/game.cpp:697
 msgid "The connection to the server was lost."
 msgstr "S'ha perdut la connexió amb el servidor."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:698
+#: src/game.cpp:700
 msgid "Network Error"
 msgstr "Error de xarxa"
 
@@ -1251,8 +1253,7 @@ msgstr ""
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
+"You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
 #. TRANSLATORS: weight message
@@ -1269,8 +1270,7 @@ msgstr ""
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:671
-#: src/gui/windows/serverdialog.cpp:603
+#: src/gui/windows/equipmentwindow.cpp:671 src/gui/windows/serverdialog.cpp:603
 msgid "default"
 msgstr "Per defecte"
 
@@ -1822,11 +1822,9 @@ msgstr "Intercanvi"
 #. TRANSLATORS: attack player
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
-#. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:180 src/gui/popups/popupmenu.cpp:304
 #: src/gui/popups/popupmenu.cpp:912 src/gui/widgets/skillinfo.cpp:125
-#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
-#: src/net/tmwa/generalhandler.cpp:251
+#: src/input/pages/basic.cpp:40
 msgid "Attack"
 msgstr "Atacar"
 
@@ -1902,7 +1900,7 @@ msgstr "Moure"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:270 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:152
+#: src/resources/db/npcdb.cpp:151
 msgid "Talk"
 msgstr "Parlar"
 
@@ -1920,7 +1918,7 @@ msgstr "Parlar"
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:154
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:153
 msgid "Buy"
 msgstr "Comprar"
 
@@ -1938,7 +1936,7 @@ msgstr "Comprar"
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
 #: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:256
-#: src/resources/db/npcdb.cpp:156
+#: src/resources/db/npcdb.cpp:155
 msgid "Sell"
 msgstr "Vendre"
 
@@ -2040,7 +2038,7 @@ msgstr "Des-equipar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:408 src/resources/db/petdb.cpp:160
+#: src/gui/popups/popupmenu.cpp:408 src/resources/db/petdb.cpp:159
 msgid "Return to egg"
 msgstr ""
 
@@ -2437,7 +2435,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2125 src/gui/windows/statuswindow.cpp:90
 msgid "Copy to chat"
 msgstr ""
 
@@ -2489,9 +2487,8 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/popups/popupmenu.cpp:2386 src/gui/popups/skillpopup.cpp:127
-#: src/gui/windows/ministatuswindow.cpp:363
-#: src/gui/windows/statuswindow.cpp:68 src/gui/windows/statuswindow.cpp:243
-#: src/gui/windows/statuswindow.cpp:367
+#: src/gui/windows/ministatuswindow.cpp:363 src/gui/windows/statuswindow.cpp:70
+#: src/gui/windows/statuswindow.cpp:268 src/gui/windows/statuswindow.cpp:392
 #, c-format
 msgid "Level: %d"
 msgstr "Nivell: %d"
@@ -2910,8 +2907,8 @@ msgstr ""
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3100 src/gui/popups/popupmenu.cpp:3119
 #: src/gui/popups/popupmenu.cpp:3132 src/gui/windows/charselectdialog.cpp:76
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:452
-#: src/net/eathena/charserverrecv.cpp:488
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:419
+#: src/net/eathena/charserverrecv.cpp:455
 msgid "Info"
 msgstr "Informació"
 
@@ -3302,8 +3299,8 @@ msgstr ""
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/statuswindow.cpp:70
-#: src/gui/windows/statuswindow.cpp:220 src/gui/windows/statuswindow.cpp:334
+#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/statuswindow.cpp:72
+#: src/gui/windows/statuswindow.cpp:222 src/gui/windows/statuswindow.cpp:359
 #, c-format
 msgid "Money: %s"
 msgstr "Diners: %s"
@@ -3359,7 +3356,7 @@ msgstr "Sortir"
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:194
 #: src/gui/windows/itemamountwindow.cpp:230 src/gui/windows/npcdialog.cpp:123
-#: src/gui/windows/statuswindow.cpp:746
+#: src/gui/windows/statuswindow.cpp:771
 msgid "+"
 msgstr "+"
 
@@ -3380,8 +3377,8 @@ msgstr "-"
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/selldialog.cpp:133 src/gui/windows/buydialog.cpp:299
-#: src/gui/windows/statuswindow.cpp:483 src/gui/windows/statuswindow.cpp:539
-#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:766
+#: src/gui/windows/statuswindow.cpp:508 src/gui/windows/statuswindow.cpp:564
+#: src/gui/windows/statuswindow.cpp:769 src/gui/windows/statuswindow.cpp:791
 msgid "Max"
 msgstr "Max"
 
@@ -3537,15 +3534,13 @@ msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104
-#: src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109
-#: src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr ""
 
@@ -3556,22 +3551,19 @@ msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150
-#: src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155
-#: src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160
-#: src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr ""
 
@@ -4005,15 +3997,15 @@ msgstr ""
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
+"Note: no other text inputs will be allowed to receive text input when you "
+"typing in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86
-#: src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr "Colors"
 
@@ -4037,9 +4029,11 @@ msgstr "Mostra llista de colors del xat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat "
+"window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4066,9 +4060,11 @@ msgstr "Limitar màxim de caràcters en línia de xat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed "
+"in chat.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will be truncated."
+"Note: long lines can make client slower. Lines longer than this limit will "
+"be truncated."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4079,7 +4075,9 @@ msgstr "Limitar màxim de lines de xat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
+"specified number of last lines of text. Oldest lines exceeding this limit "
+"are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
 msgstr ""
@@ -4120,8 +4118,8 @@ msgstr "Mostra historial de xat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on"
-" startup instead of starting with empty chat tabs."
+"If this setting enabled, client will load old chat tabs content from logs on "
+"startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4132,9 +4130,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be "
+"shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4145,9 +4145,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be "
+"shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4163,9 +4165,13 @@ msgstr "Amaga missatges de botiga"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will "
+"be displayed in chat. Disable this setting if you want to see shop-related "
+"messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
+"Note: technically, ManaPlus shop implemented as usual private messages with "
+"special content. If you disable this setting, you will be able to see these "
+"messages and get idea when other players are looking at your shop."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4178,7 +4184,8 @@ msgstr ""
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
+"usually makes little difference."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4197,9 +4204,12 @@ msgstr "Col·loca tots els xiuxiueigs en pestanyes"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in "
+"separate tabs, separate tab for each player. If this setting disabled, all "
+"whispers will appear in General tab.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
+"Note: putting all whispers to single General tab is known to be confusing. "
+"Think twice before disabling this feature."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4210,7 +4220,8 @@ msgstr "Registra els missatges de màgia en la pestanya del depurador"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If "
+"disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
 msgstr ""
@@ -4223,9 +4234,11 @@ msgstr "Mostra els missatges del servidor en la finestra del depurador"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of "
+"chat. If disabled, server messages will appear in General chat instead.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
+"Note: according to 4144, disabling this could also make you to lose some "
+"debug messages from client in Debug tab since these are fake server messages."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4250,9 +4263,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM "
+"activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
+"Note: this setting only makes difference for GMs (Game Masters) since this "
+"tab only appears for GMs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4263,7 +4278,8 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this feature.\n"
+"If this feature enabled, language tab will appear if server supports this "
+"feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
 msgstr ""
@@ -4276,7 +4292,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
+"If this setting enabled and server supports different chats for different "
+"languages, you will see messages for all languages, regardless of your "
+"language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
 msgstr ""
@@ -4289,7 +4307,9 @@ msgstr "Permet pestanya de batalla"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will "
+"contain messages related to battles, like damage and experience gain, if "
+"battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
 msgstr ""
@@ -4315,7 +4335,10 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to "
+"adapt to appearance of chat input field when you typing message and when "
+"input field of chat disappears. If disabled, chat input area will always "
+"occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
@@ -4350,7 +4373,8 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. "
+"Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
 msgstr ""
@@ -4363,7 +4387,8 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender "
+"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
 msgstr ""
@@ -4376,9 +4401,12 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This "
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by "
+"default."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4492,7 +4520,9 @@ msgstr "Conflicte de tecla(es) detectat."
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr "Conflicte entre les tecles \"%s\" i \"%s\". Resol-lo, o la jugabilitat por resultar afectada."
+msgstr ""
+"Conflicte entre les tecles \"%s\" i \"%s\". Resol-lo, o la jugabilitat por "
+"resultar afectada."
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
@@ -5540,13 +5570,17 @@ msgstr "Res"
 #: src/gui/widgets/tabs/setup_video.cpp:233
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr "Error al canviar al mode finestra, la restauració al mode anterior també ha fallat!"
+msgstr ""
+"Error al canviar al mode finestra, la restauració al mode anterior també ha "
+"fallat!"
 
 #. TRANSLATORS: video error message
 #: src/gui/widgets/tabs/setup_video.cpp:240
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr "Error al canviar al mode pantalla completa, la restauració al mode anterior també ha fallat!"
+msgstr ""
+"Error al canviar al mode pantalla completa, la restauració al mode anterior "
+"també ha fallat!"
 
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -5587,7 +5621,8 @@ msgstr "La resolució de la pantalla ha canviat"
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:401
 msgid "Some windows may be moved to fit the lowered resolution."
-msgstr "Algunes finestres poden ser mogudes per adaptar-se a la resolució més baixa."
+msgstr ""
+"Algunes finestres poden ser mogudes per adaptar-se a la resolució més baixa."
 
 #. TRANSLATORS: speach type
 #: src/gui/widgets/tabs/setup_visual.cpp:43
@@ -6122,8 +6157,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:618
-#: src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:618 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Crear"
 
@@ -6239,17 +6273,16 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:104
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:210
-#: src/gui/windows/charcreatedialog.cpp:221
-#: src/gui/windows/charcreatedialog.cpp:231
-#: src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:196
+#: src/gui/windows/charcreatedialog.cpp:209
+#: src/gui/windows/charcreatedialog.cpp:220
+#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:110
-#: src/gui/windows/charcreatedialog.cpp:600
+#: src/gui/windows/charcreatedialog.cpp:599
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Distribueix %d punts"
@@ -6258,73 +6291,71 @@ msgstr "Distribueix %d punts"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:201
-#: src/gui/windows/charcreatedialog.cpp:212
-#: src/gui/windows/charcreatedialog.cpp:223
-#: src/gui/windows/charcreatedialog.cpp:233
-#: src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:200
+#: src/gui/windows/charcreatedialog.cpp:211
+#: src/gui/windows/charcreatedialog.cpp:222
+#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:202
 msgid "Hair color:"
 msgstr "Color de cabells:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:213
 msgid "Hair style:"
 msgstr "Pentinat:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:224
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:234
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:252
-#: src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:258
-#: src/gui/windows/charcreatedialog.cpp:265
-#: src/gui/windows/charcreatedialog.cpp:273
+#: src/gui/windows/charcreatedialog.cpp:257
+#: src/gui/windows/charcreatedialog.cpp:264
+#: src/gui/windows/charcreatedialog.cpp:272
 msgid "M"
 msgstr ""
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:260
-#: src/gui/windows/charcreatedialog.cpp:277
+#: src/gui/windows/charcreatedialog.cpp:259
+#: src/gui/windows/charcreatedialog.cpp:276
 #: src/gui/windows/inventorywindow.cpp:223
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:267
+#: src/gui/windows/charcreatedialog.cpp:266
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:474
+#: src/gui/windows/charcreatedialog.cpp:473
 msgid "Your name needs to be at least 4 characters."
 msgstr "El nom ha de tenir com a mínim 4 caràcters."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:590
+#: src/gui/windows/charcreatedialog.cpp:589
 msgid "Character stats OK"
 msgstr "Estadístiques de personatge correctes"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:606
+#: src/gui/windows/charcreatedialog.cpp:605
 #, c-format
 msgid "Please remove %d points"
 msgstr "Has de treure %d punts"
@@ -6490,8 +6521,7 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57
-#: src/gui/windows/serverdialog.cpp:112
+#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:112
 msgid "Connect"
 msgstr "Connectar"
 
@@ -6849,15 +6879,13 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61
-#: src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr ""
@@ -6966,7 +6994,7 @@ msgstr "Barra de treball"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/windows/ministatuswindow.cpp:356
-#: src/gui/windows/statuswindow.cpp:236
+#: src/gui/windows/statuswindow.cpp:261
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Nivell: %d (GM %d)"
@@ -7418,33 +7446,33 @@ msgid "Choose your party's name."
 msgstr "Tria el nom del teu grup."
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:72
+#: src/gui/windows/statuswindow.cpp:74
 msgid "HP:"
 msgstr "HP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:75
+#: src/gui/windows/statuswindow.cpp:77
 msgid "Exp:"
 msgstr "Experiència:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:136
+#: src/gui/windows/statuswindow.cpp:138
 msgid "MP:"
 msgstr "MP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:173 src/gui/windows/statuswindow.cpp:294
+#: src/gui/windows/statuswindow.cpp:175 src/gui/windows/statuswindow.cpp:319
 #, c-format
 msgid "Job: %d"
 msgstr "Treball: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:175
+#: src/gui/windows/statuswindow.cpp:177
 msgid "Job:"
 msgstr "Treball:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:224 src/gui/windows/statuswindow.cpp:342
+#: src/gui/windows/statuswindow.cpp:226 src/gui/windows/statuswindow.cpp:367
 #, c-format
 msgid "Character points: %d"
 msgstr "Punts de personatge: %d"
@@ -7562,9 +7590,10 @@ msgstr "No tens diners suficients."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
-msgstr "No s'ha pogut afegir objecte. No es pot afegir més d'un mateix tipus d'objecte a la finestra."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+"No s'ha pogut afegir objecte. No es pot afegir més d'un mateix tipus "
+"d'objecte a la finestra."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:539
@@ -9042,33 +9071,33 @@ msgstr "Connexió interrompuda amb el servidor. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:431
-#: src/net/eathena/charserverrecv.cpp:479
+#: src/net/eathena/charserverrecv.cpp:398
+#: src/net/eathena/charserverrecv.cpp:446
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:454
+#: src/net/eathena/charserverrecv.cpp:421
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:470
+#: src/net/eathena/charserverrecv.cpp:437
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:474
+#: src/net/eathena/charserverrecv.cpp:441
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:483
+#: src/net/eathena/charserverrecv.cpp:450
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:517 src/net/tmwa/charserverrecv.cpp:339
+#: src/net/eathena/charserverrecv.cpp:484 src/net/tmwa/charserverrecv.cpp:303
 msgid "Failed to delete character."
 msgstr ""
 
@@ -9120,140 +9149,11 @@ msgstr ""
 msgid "Do you accept %s and %s as parents?"
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:130
-#, c-format
-msgid "Strength %s"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:132
-#, c-format
-msgid "Agility %s"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:134
-#, c-format
-msgid "Vitality %s"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:136
-#, c-format
-msgid "Intelligence %s"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:138
-#, c-format
-msgid "Dexterity %s"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:140
-#, c-format
-msgid "Luck %s"
-msgstr ""
-
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:197 src/net/tmwa/generalhandler.cpp:207
+#: src/net/eathena/generalhandler.cpp:179 src/net/tmwa/generalhandler.cpp:189
 msgid "Got disconnected from server!"
 msgstr "Has estat desconnectat del servidor!"
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:223 src/net/tmwa/generalhandler.cpp:234
-msgid "Strength"
-msgstr "Força"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:237
-msgid "Agility"
-msgstr "Agilitat"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:229 src/net/tmwa/generalhandler.cpp:240
-msgid "Vitality"
-msgstr "Vitalitat"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:243
-msgid "Intelligence"
-msgstr "Intel·ligència"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:246
-msgid "Dexterity"
-msgstr "Destresa"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:238 src/net/tmwa/generalhandler.cpp:249
-msgid "Luck"
-msgstr "Sort"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:253
-msgid "Defense"
-msgstr "Defensa"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:255
-msgid "M.Attack"
-msgstr "Atac màgic"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:257
-msgid "M.Defense"
-msgstr "Defensa màgica"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:260
-#, no-c-format
-msgid "% Accuracy"
-msgstr "% de Precisió"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:263
-#, no-c-format
-msgid "% Evade"
-msgstr "% de Evasió"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:266
-#, no-c-format
-msgid "% Critical"
-msgstr "% de Crític"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:268
-msgid "Attack Delay"
-msgstr "Retard d'atac"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:270
-msgid "Walk Delay"
-msgstr "Demora a peu"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:272
-msgid "Attack Range"
-msgstr "Distància d'atac"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:274
-msgid "Damage per sec."
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266
-msgid "Karma"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268
-msgid "Manner"
-msgstr ""
-
 #. TRANSLATORS: error message
 #: src/net/eathena/generalrecv.cpp:49 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
@@ -9409,7 +9309,7 @@ msgstr ""
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:199
+#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:190
 msgid "Unknown item"
 msgstr "Objecte desconegut"
 
@@ -9685,21 +9585,52 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:93
-#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
-#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
+#: src/resources/db/itemdb.cpp:377 src/resources/db/itemdb.cpp:381
+#: src/resources/db/moddb.cpp:79 src/resources/db/monsterdb.cpp:101
+#: src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "sense nom"
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:104
+#: src/resources/db/petdb.cpp:103
 msgid "pet"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:103
+#: src/resources/db/skillunitdb.cpp:102
 msgid "skill"
 msgstr ""
 
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:45
+msgid "Strength"
+msgstr "Força"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:49
+msgid "Agility"
+msgstr "Agilitat"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:53
+msgid "Vitality"
+msgstr "Vitalitat"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:57
+msgid "Intelligence"
+msgstr "Intel·ligència"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:61
+msgid "Dexterity"
+msgstr "Destresa"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:65
+msgid "Luck"
+msgstr "Sort"
+
 #. TRANSLATORS: inventory type name
 #: src/resources/inventory/inventory.cpp:340
 msgid "Npc"
@@ -10351,8 +10282,9 @@ msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:556
-msgid "Room join failed. Not enought money."
-msgstr ""
+#, fuzzy
+msgid "Room join failed. Not enough money."
+msgstr "No tens diners suficients."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:560
@@ -10619,33 +10551,34 @@ msgstr ""
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:796
 #, c-format
-msgid "You and %s was divorced."
+msgid "You and %s are now divorced."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:800
-msgid "You was called by partner."
+msgid "You were called by your partner."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:804
 #, c-format
-msgid "You calling partner %s."
+msgid "You are calling your partner, %s."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:808
-msgid "Adoption child error. You already have baby."
+msgid "Child adoption failed. You already have a baby."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:812
-msgid "Adoption child error. You level too small for have baby."
+msgid "Child adoption failed. Your level is too low."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:816
-msgid "Adoption child error. This player already married and can't be baby."
+msgid ""
+"Child adoption failed. This player is already married and can't be a baby."
 msgstr ""
 
 #. TRANSLATORS: notification message
@@ -10655,19 +10588,20 @@ msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:825
-msgid "Error saving location. Not enought skill level."
+msgid "Error saving location. Not enough skill level."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:829
-msgid "Error saving location. You not have warp skill."
+msgid "Error saving location. You do not have warp skill."
 msgstr ""
 
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:29
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "Les opcions per a /%s son \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+"Les opcions per a /%s son \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
 #. TRANSLATORS: uptime command
 #: src/utils/stringutils.cpp:946
@@ -10723,3 +10657,30 @@ msgstr "Segon  %d"
 #, c-format
 msgid "%d seconds"
 msgstr "%d segons"
+
+#~ msgid "Defense"
+#~ msgstr "Defensa"
+
+#~ msgid "M.Attack"
+#~ msgstr "Atac màgic"
+
+#~ msgid "M.Defense"
+#~ msgstr "Defensa màgica"
+
+#~ msgid "% Accuracy"
+#~ msgstr "% de Precisió"
+
+#~ msgid "% Evade"
+#~ msgstr "% de Evasió"
+
+#~ msgid "% Critical"
+#~ msgstr "% de Crític"
+
+#~ msgid "Attack Delay"
+#~ msgstr "Retard d'atac"
+
+#~ msgid "Walk Delay"
+#~ msgstr "Demora a peu"
+
+#~ msgid "Attack Range"
+#~ msgstr "Distància d'atac"
diff --git a/po/cs.po b/po/cs.po
index 4830fa091..0485afb81 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011
 # Pitriss <chytrex@wjake.com>, 2011
@@ -14,14 +14,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-06-18 18:53+0300\n"
+"POT-Creation-Date: 2016-07-02 19:47+0300\n"
 "PO-Revision-Date: 2016-06-19 09:21+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Czech (http://www.transifex.com/akaras/manaplus/language/cs/)\n"
+"Language-Team: Czech (http://www.transifex.com/akaras/manaplus/language/"
+"cs/)\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: cs\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #. TRANSLATORS: file uploaded message
@@ -38,7 +39,7 @@ msgstr "Soubor byl uploadován"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:171 src/client.cpp:1569 src/client.cpp:1604
+#: src/actions/actions.cpp:171 src/client.cpp:1572 src/client.cpp:1607
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
@@ -49,7 +50,7 @@ msgstr "Soubor byl uploadován"
 #: src/gui/widgets/tabs/setup_video.cpp:420
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:476
+#: src/gui/windows/charcreatedialog.cpp:475
 #: src/gui/windows/charselectdialog.cpp:262
 #: src/gui/windows/charselectdialog.cpp:310 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:59
@@ -58,9 +59,9 @@ msgstr "Soubor byl uploadován"
 #: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:531
 #: src/gui/windows/textdialog.cpp:53 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:456
-#: src/net/eathena/charserverrecv.cpp:491
-#: src/net/eathena/charserverrecv.cpp:519 src/net/tmwa/charserverrecv.cpp:341
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:423
+#: src/net/eathena/charserverrecv.cpp:458
+#: src/net/eathena/charserverrecv.cpp:486 src/net/tmwa/charserverrecv.cpp:305
 msgid "OK"
 msgstr "OK"
 
@@ -307,26 +308,26 @@ msgid "Visible on map"
 msgstr "Viditelný na mapě"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:496
+#: src/being/being.cpp:494
 msgid "Human"
 msgstr "Člověk"
 
 #. TRANSLATORS: dodge or miss message in attacks
-#: src/being/being.cpp:683
+#: src/being/being.cpp:676
 msgid "dodge"
 msgstr "uskočení"
 
-#: src/being/being.cpp:683
+#: src/being/being.cpp:676
 msgid "miss"
 msgstr "minutí"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2282 src/gui/windows/whoisonline.cpp:882
+#: src/being/being.cpp:2275 src/gui/windows/whoisonline.cpp:882
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2287 src/gui/windows/whoisonline.cpp:887
+#: src/being/being.cpp:2280 src/gui/windows/whoisonline.cpp:887
 msgid "I"
 msgstr "I"
 
@@ -478,41 +479,41 @@ msgstr "Plovoucí bublina"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:870 src/dyetool/client.cpp:491 src/gui/windowmenu.cpp:189
+#: src/client.cpp:872 src/dyetool/client.cpp:491 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:66
 msgid "Setup"
 msgstr "Nastavení"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:873 src/dyetool/client.cpp:494
+#: src/client.cpp:875 src/dyetool/client.cpp:494
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Výkon"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:876 src/dyetool/client.cpp:497
+#: src/client.cpp:878 src/dyetool/client.cpp:497
 #: src/gui/widgets/tabs/setup_video.cpp:110
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:879 src/dyetool/client.cpp:500
+#: src/client.cpp:881 src/dyetool/client.cpp:500
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Téma"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:882 src/dyetool/client.cpp:503
+#: src/client.cpp:884 src/dyetool/client.cpp:503
 msgid "About"
 msgstr "O ManaPlus"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:885 src/dyetool/client.cpp:506 src/gui/windowmenu.cpp:74
+#: src/client.cpp:887 src/dyetool/client.cpp:506 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Nápověda"
@@ -533,7 +534,7 @@ msgstr "Nápověda"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:889 src/client.cpp:1483 src/client.cpp:1502
+#: src/client.cpp:891 src/client.cpp:1486 src/client.cpp:1505
 #: src/dyetool/client.cpp:510 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:756 src/gui/popups/popupmenu.cpp:833
 #: src/gui/popups/popupmenu.cpp:1087 src/gui/windows/didyouknowwindow.cpp:81
@@ -546,32 +547,32 @@ msgid "Close"
 msgstr "Zavřít"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1115 src/gui/windowmanager_unittest.cc:156
+#: src/client.cpp:1117 src/gui/windowmanager_unittest.cc:156
 msgid "Connecting to server"
 msgstr "Připojuji se k serveru"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1172 src/gui/windowmanager_unittest.cc:173
+#: src/client.cpp:1174 src/gui/windowmanager_unittest.cc:173
 msgid "Logging in"
 msgstr "Přihlašuji se"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1221
+#: src/client.cpp:1223
 msgid "Entering game world"
 msgstr "Vstupuji do herního světa"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1369
+#: src/client.cpp:1372
 msgid "Requesting characters"
 msgstr "Vyžaduji postavy"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1412
+#: src/client.cpp:1415
 msgid "Connecting to the game server"
 msgstr "Připojuji se k hernímu serveru"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1424
+#: src/client.cpp:1427
 msgid "Changing game servers"
 msgstr "Vyměňuji herní servery"
 
@@ -588,52 +589,52 @@ msgstr "Vyměňuji herní servery"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1480 src/client.cpp:1499 src/client.cpp:1738
+#: src/client.cpp:1483 src/client.cpp:1502 src/client.cpp:1741
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:472
+#: src/gui/windows/charcreatedialog.cpp:471
 #: src/gui/windows/charselectdialog.cpp:306
 #: src/gui/windows/editserverdialog.cpp:212
 #: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:429
-#: src/net/eathena/charserverrecv.cpp:433
-#: src/net/eathena/charserverrecv.cpp:515 src/net/tmwa/charserverrecv.cpp:337
+#: src/net/eathena/charserverrecv.cpp:396
+#: src/net/eathena/charserverrecv.cpp:400
+#: src/net/eathena/charserverrecv.cpp:482 src/net/tmwa/charserverrecv.cpp:301
 msgid "Error"
 msgstr "Chyba"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1518
+#: src/client.cpp:1521
 msgid "Requesting registration details"
 msgstr "Požaduji registrační detaily"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1565
+#: src/client.cpp:1568
 msgid "Password Change"
 msgstr "Změna hesla"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1567
+#: src/client.cpp:1570
 msgid "Password changed successfully!"
 msgstr "Heslo úspěšně změněno!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1600
+#: src/client.cpp:1603
 msgid "Email Change"
 msgstr "Změna emailu"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1602
+#: src/client.cpp:1605
 msgid "Email changed successfully!"
 msgstr "Email úspěšně změněn!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1638
+#: src/client.cpp:1641
 msgid "Unregister Successful"
 msgstr "Zrušení registrace úspěšné"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1640
+#: src/client.cpp:1643
 msgid "Farewell, come back any time..."
 msgstr "Nashledanou, vraťte se kdykoli..."
 
@@ -760,7 +761,8 @@ msgstr "     --renderer       : Nastaví typ vykreslování"
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:112
 msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr "  -T --tests          : Spustit testování ovladačů a automatickou konfiguraci"
+msgstr ""
+"  -T --tests          : Spustit testování ovladačů a automatickou konfiguraci"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:118
@@ -826,23 +828,23 @@ msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:598
+#: src/game.cpp:600
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Snímek obrazovky uložen jako %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:608
+#: src/game.cpp:610
 msgid "Saving screenshot failed!"
 msgstr "Ukládání snímku obrazovky selhalo!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:695
+#: src/game.cpp:697
 msgid "The connection to the server was lost."
 msgstr "Spojení se serverem bylo ztraceno."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:698
+#: src/game.cpp:700
 msgid "Network Error"
 msgstr "Chyba sítě"
 
@@ -1257,14 +1259,14 @@ msgstr "Oživ"
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
+"You are carrying more than half your weight. You are unable to regain health."
 msgstr "Nesete více než polovinu vaší váhy. Regenerace života nyní není možná."
 
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:198
 msgid "You are carrying less than half your weight. You can regain health."
-msgstr "Nesete méně než polovinu vaší váhy. Regenerace života je nyní opět možná."
+msgstr ""
+"Nesete méně než polovinu vaší váhy. Regenerace života je nyní opět možná."
 
 #. TRANSLATORS: chat color
 #. TRANSLATORS: inventory sort mode
@@ -1275,8 +1277,7 @@ msgstr "Nesete méně než polovinu vaší váhy. Regenerace života je nyní op
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:671
-#: src/gui/windows/serverdialog.cpp:603
+#: src/gui/windows/equipmentwindow.cpp:671 src/gui/windows/serverdialog.cpp:603
 msgid "default"
 msgstr "výchozí"
 
@@ -1828,11 +1829,9 @@ msgstr "Obchod"
 #. TRANSLATORS: attack player
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
-#. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:180 src/gui/popups/popupmenu.cpp:304
 #: src/gui/popups/popupmenu.cpp:912 src/gui/widgets/skillinfo.cpp:125
-#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
-#: src/net/tmwa/generalhandler.cpp:251
+#: src/input/pages/basic.cpp:40
 msgid "Attack"
 msgstr "Útok"
 
@@ -1908,7 +1907,7 @@ msgstr "Jdi sem"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:270 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:152
+#: src/resources/db/npcdb.cpp:151
 msgid "Talk"
 msgstr "Promluv"
 
@@ -1926,7 +1925,7 @@ msgstr "Promluv"
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:154
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:153
 msgid "Buy"
 msgstr "Nákup"
 
@@ -1944,7 +1943,7 @@ msgstr "Nákup"
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
 #: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:256
-#: src/resources/db/npcdb.cpp:156
+#: src/resources/db/npcdb.cpp:155
 msgid "Sell"
 msgstr "Prodej"
 
@@ -2046,7 +2045,7 @@ msgstr "Odebrat z vybavení"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:408 src/resources/db/petdb.cpp:160
+#: src/gui/popups/popupmenu.cpp:408 src/resources/db/petdb.cpp:159
 msgid "Return to egg"
 msgstr "Vrátit k vejci"
 
@@ -2443,7 +2442,7 @@ msgstr "Resetovat žlutý pruh"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2125 src/gui/windows/statuswindow.cpp:90
 msgid "Copy to chat"
 msgstr "Zkopírovat do chatu"
 
@@ -2495,9 +2494,8 @@ msgstr "Zobrazit okno"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/popups/popupmenu.cpp:2386 src/gui/popups/skillpopup.cpp:127
-#: src/gui/windows/ministatuswindow.cpp:363
-#: src/gui/windows/statuswindow.cpp:68 src/gui/windows/statuswindow.cpp:243
-#: src/gui/windows/statuswindow.cpp:367
+#: src/gui/windows/ministatuswindow.cpp:363 src/gui/windows/statuswindow.cpp:70
+#: src/gui/windows/statuswindow.cpp:268 src/gui/windows/statuswindow.cpp:392
 #, c-format
 msgid "Level: %d"
 msgstr "Úroveň: %d"
@@ -2916,8 +2914,8 @@ msgstr ""
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3100 src/gui/popups/popupmenu.cpp:3119
 #: src/gui/popups/popupmenu.cpp:3132 src/gui/windows/charselectdialog.cpp:76
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:452
-#: src/net/eathena/charserverrecv.cpp:488
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:419
+#: src/net/eathena/charserverrecv.cpp:455
 msgid "Info"
 msgstr "Informace"
 
@@ -3308,8 +3306,8 @@ msgstr "Úroveň: %u"
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/statuswindow.cpp:70
-#: src/gui/windows/statuswindow.cpp:220 src/gui/windows/statuswindow.cpp:334
+#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/statuswindow.cpp:72
+#: src/gui/windows/statuswindow.cpp:222 src/gui/windows/statuswindow.cpp:359
 #, c-format
 msgid "Money: %s"
 msgstr "Peníze: %s"
@@ -3365,7 +3363,7 @@ msgstr "Ukončit"
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:194
 #: src/gui/windows/itemamountwindow.cpp:230 src/gui/windows/npcdialog.cpp:123
-#: src/gui/windows/statuswindow.cpp:746
+#: src/gui/windows/statuswindow.cpp:771
 msgid "+"
 msgstr "+"
 
@@ -3386,8 +3384,8 @@ msgstr "-"
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/selldialog.cpp:133 src/gui/windows/buydialog.cpp:299
-#: src/gui/windows/statuswindow.cpp:483 src/gui/windows/statuswindow.cpp:539
-#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:766
+#: src/gui/windows/statuswindow.cpp:508 src/gui/windows/statuswindow.cpp:564
+#: src/gui/windows/statuswindow.cpp:769 src/gui/windows/statuswindow.cpp:791
 msgid "Max"
 msgstr "Vše"
 
@@ -3543,15 +3541,13 @@ msgstr "Sdílení předmětů povoleno."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104
-#: src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr "Sdílení předmětů zakázáno."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109
-#: src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr "Sdílení předmětů není možné."
 
@@ -3562,22 +3558,19 @@ msgstr "Stav sdílení předmětů neznámý."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150
-#: src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr "Sdílení zkušeností povoleno."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155
-#: src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr "Sdílení zkušeností zakázáno."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160
-#: src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr "Sdílení zkušeností není možné."
 
@@ -4011,15 +4004,15 @@ msgstr "Chránít zaměření chatu"
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
+"Note: no other text inputs will be allowed to receive text input when you "
+"typing in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86
-#: src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr "Barvy"
 
@@ -4043,9 +4036,11 @@ msgstr "Zobrazit seznam barev"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat "
+"window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4072,9 +4067,11 @@ msgstr "Omezit maximum znaků na řádek"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed "
+"in chat.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will be truncated."
+"Note: long lines can make client slower. Lines longer than this limit will "
+"be truncated."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4085,7 +4082,9 @@ msgstr "Omezit počet řádků chatu"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
+"specified number of last lines of text. Oldest lines exceeding this limit "
+"are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
 msgstr ""
@@ -4126,8 +4125,8 @@ msgstr "Zobrazovat historii chatu"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on"
-" startup instead of starting with empty chat tabs."
+"If this setting enabled, client will load old chat tabs content from logs on "
+"startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4138,9 +4137,11 @@ msgstr "Zobrazit zprávy o připojení party"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be "
+"shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4151,9 +4152,11 @@ msgstr "Zobrazit zprávy o připojení gildy"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be "
+"shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4169,9 +4172,13 @@ msgstr "Skrýt obchodní zprávy"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will "
+"be displayed in chat. Disable this setting if you want to see shop-related "
+"messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
+"Note: technically, ManaPlus shop implemented as usual private messages with "
+"special content. If you disable this setting, you will be able to see these "
+"messages and get idea when other players are looking at your shop."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4184,7 +4191,8 @@ msgstr "Zobrazit MVP zprávy"
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
+"usually makes little difference."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4203,9 +4211,12 @@ msgstr "Všecha šeptání jako záložky"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in "
+"separate tabs, separate tab for each player. If this setting disabled, all "
+"whispers will appear in General tab.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
+"Note: putting all whispers to single General tab is known to be confusing. "
+"Think twice before disabling this feature."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4216,7 +4227,8 @@ msgstr "Zaznamenávat zprávy o magii v debug záložce"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If "
+"disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
 msgstr ""
@@ -4229,9 +4241,11 @@ msgstr "Zobrazovat serverové zprávy v debug záložce"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of "
+"chat. If disabled, server messages will appear in General chat instead.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
+"Note: according to 4144, disabling this could also make you to lose some "
+"debug messages from client in Debug tab since these are fake server messages."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4256,9 +4270,11 @@ msgstr "Povolit GM záložku"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM "
+"activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
+"Note: this setting only makes difference for GMs (Game Masters) since this "
+"tab only appears for GMs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4269,7 +4285,8 @@ msgstr "Povolit záložku jazyka"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this feature.\n"
+"If this feature enabled, language tab will appear if server supports this "
+"feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
 msgstr ""
@@ -4282,7 +4299,9 @@ msgstr "Zobrazit zprávy všech jazyků"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
+"If this setting enabled and server supports different chats for different "
+"languages, you will see messages for all languages, regardless of your "
+"language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
 msgstr ""
@@ -4295,7 +4314,9 @@ msgstr "Zapnout bitevní záložku"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will "
+"contain messages related to battles, like damage and experience gain, if "
+"battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
 msgstr ""
@@ -4321,7 +4342,10 @@ msgstr "Změnit velikost záložek pokud nutno"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to "
+"adapt to appearance of chat input field when you typing message and when "
+"input field of chat disappears. If disabled, chat input area will always "
+"occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
@@ -4356,7 +4380,8 @@ msgstr "Zvýrazňovaná slova (oddělená čárkou)"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. "
+"Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
 msgstr ""
@@ -4369,7 +4394,8 @@ msgstr "Globálně ignorovaná jména (oddělená čárkou)"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender "
+"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
 msgstr ""
@@ -4382,9 +4408,12 @@ msgstr "Zobrazit knoflík pro smajlíky v chatu"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This "
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by "
+"default."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4498,7 +4527,9 @@ msgstr "Kolize kláves detekována/y."
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr "Konflikt klávesy \"%s\" a klávesy \"%s\". Vyřeš jej, neboť se hra může chovat podivně."
+msgstr ""
+"Konflikt klávesy \"%s\" a klávesy \"%s\". Vyřeš jej, neboť se hra může "
+"chovat podivně."
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
@@ -5046,7 +5077,9 @@ msgstr "HW akcelerace"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:74
 msgid "Enable opacity cache (Software, can use much memory)"
-msgstr "Povolit vyrovnávací pamět průhlednosti (Softwarově, může používat hodně paměti)"
+msgstr ""
+"Povolit vyrovnávací pamět průhlednosti (Softwarově, může používat hodně "
+"paměti)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:79
@@ -5131,12 +5164,15 @@ msgstr "Zapni atlasy textur (OpenGL)"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:150
 msgid "Cache all sprites per map (can use additional memory)"
-msgstr "Načítat veškeré obrázky pro mapu do vyrovnávací paměti (může používat více paměti)"
+msgstr ""
+"Načítat veškeré obrázky pro mapu do vyrovnávací paměti (může používat více "
+"paměti)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:155
 msgid "Cache all sounds (can use additional memory)"
-msgstr "Uchovávat všechny zvuky ve vyrovnávací paměti (může používat více paměti)"
+msgstr ""
+"Uchovávat všechny zvuky ve vyrovnávací paměti (může používat více paměti)"
 
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_perfomance.cpp:160
@@ -5267,7 +5303,9 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_players.cpp:143
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
-msgstr "Emulovat prave kliknutí tlačítka myši dlouhým klinutím myši (užitečné pro dotyková rozhraní)"
+msgstr ""
+"Emulovat prave kliknutí tlačítka myši dlouhým klinutím myši (užitečné pro "
+"dotyková rozhraní)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:148
@@ -5546,13 +5584,16 @@ msgstr "Žádné"
 #: src/gui/widgets/tabs/setup_video.cpp:233
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr "Selhalo přepnutí do módu v okně a obnovení předchozího módu taktéž selhalo!"
+msgstr ""
+"Selhalo přepnutí do módu v okně a obnovení předchozího módu taktéž selhalo!"
 
 #. TRANSLATORS: video error message
 #: src/gui/widgets/tabs/setup_video.cpp:240
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr "Selhalo přepnutí do módu celé obrazovky a obnovení předchozího módu taktéž selhalo!"
+msgstr ""
+"Selhalo přepnutí do módu celé obrazovky a obnovení předchozího módu taktéž "
+"selhalo!"
 
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -6128,8 +6169,7 @@ msgstr "Počet:"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:618
-#: src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:618 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Vytvořit"
 
@@ -6245,17 +6285,16 @@ msgstr "^"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:104
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:210
-#: src/gui/windows/charcreatedialog.cpp:221
-#: src/gui/windows/charcreatedialog.cpp:231
-#: src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:196
+#: src/gui/windows/charcreatedialog.cpp:209
+#: src/gui/windows/charcreatedialog.cpp:220
+#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:110
-#: src/gui/windows/charcreatedialog.cpp:600
+#: src/gui/windows/charcreatedialog.cpp:599
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Rozdělte prosím %d bodů"
@@ -6264,73 +6303,71 @@ msgstr "Rozdělte prosím %d bodů"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:201
-#: src/gui/windows/charcreatedialog.cpp:212
-#: src/gui/windows/charcreatedialog.cpp:223
-#: src/gui/windows/charcreatedialog.cpp:233
-#: src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:200
+#: src/gui/windows/charcreatedialog.cpp:211
+#: src/gui/windows/charcreatedialog.cpp:222
+#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:202
 msgid "Hair color:"
 msgstr "Barva vlasů:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:213
 msgid "Hair style:"
 msgstr "Účes:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:224
 msgid "Race:"
 msgstr "Rasa:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:234
 msgid "Look:"
 msgstr "Vzhled:"
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:252
-#: src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr "P"
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:258
-#: src/gui/windows/charcreatedialog.cpp:265
-#: src/gui/windows/charcreatedialog.cpp:273
+#: src/gui/windows/charcreatedialog.cpp:257
+#: src/gui/windows/charcreatedialog.cpp:264
+#: src/gui/windows/charcreatedialog.cpp:272
 msgid "M"
 msgstr ""
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:260
-#: src/gui/windows/charcreatedialog.cpp:277
+#: src/gui/windows/charcreatedialog.cpp:259
+#: src/gui/windows/charcreatedialog.cpp:276
 #: src/gui/windows/inventorywindow.cpp:223
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:267
+#: src/gui/windows/charcreatedialog.cpp:266
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:474
+#: src/gui/windows/charcreatedialog.cpp:473
 msgid "Your name needs to be at least 4 characters."
 msgstr "Vaše jméno musí mít nejméně 4 znaky."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:590
+#: src/gui/windows/charcreatedialog.cpp:589
 msgid "Character stats OK"
 msgstr "Stav postavy je v pořádku"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:606
+#: src/gui/windows/charcreatedialog.cpp:605
 #, c-format
 msgid "Please remove %d points"
 msgstr "Odstraňte prosím %d bodů"
@@ -6394,7 +6431,12 @@ msgid ""
 "Level: %u\n"
 "Experience: %u\n"
 "Money: %s"
-msgstr "Život: %u/%u\nMana: %u/%u\nÚroveň: %u\nZkušenost: %u\nPeníze: %s"
+msgstr ""
+"Život: %u/%u\n"
+"Mana: %u/%u\n"
+"Úroveň: %u\n"
+"Zkušenost: %u\n"
+"Peníze: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/charselectdialog.cpp:308
@@ -6496,8 +6538,7 @@ msgstr "Upravit server"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57
-#: src/gui/windows/serverdialog.cpp:112
+#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:112
 msgid "Connect"
 msgstr "Připojit"
 
@@ -6857,15 +6898,13 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61
-#: src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr ""
@@ -6974,7 +7013,7 @@ msgstr "pruh práce"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/windows/ministatuswindow.cpp:356
-#: src/gui/windows/statuswindow.cpp:236
+#: src/gui/windows/statuswindow.cpp:261
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Úroveň: %d (GM %d)"
@@ -7426,33 +7465,33 @@ msgid "Choose your party's name."
 msgstr "Zvolte jméno vaší party."
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:72
+#: src/gui/windows/statuswindow.cpp:74
 msgid "HP:"
 msgstr "BŽ:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:75
+#: src/gui/windows/statuswindow.cpp:77
 msgid "Exp:"
 msgstr "Zk:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:136
+#: src/gui/windows/statuswindow.cpp:138
 msgid "MP:"
 msgstr "MB:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:173 src/gui/windows/statuswindow.cpp:294
+#: src/gui/windows/statuswindow.cpp:175 src/gui/windows/statuswindow.cpp:319
 #, c-format
 msgid "Job: %d"
 msgstr "Práce: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:175
+#: src/gui/windows/statuswindow.cpp:177
 msgid "Job:"
 msgstr "Práce:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:224 src/gui/windows/statuswindow.cpp:342
+#: src/gui/windows/statuswindow.cpp:226 src/gui/windows/statuswindow.cpp:367
 #, c-format
 msgid "Character points: %d"
 msgstr "Bodů postavy: %d"
@@ -7570,8 +7609,7 @@ msgstr "Nemáš dost peněz."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "Přidání věci selhalo. Nelze předávat stejný předmět v jednom okně."
 
 #. TRANSLATORS: trade error
@@ -8525,7 +8563,9 @@ msgstr "Vypsat verzi OpenGL do chatu"
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:370
 msgid "Print enabled mods in chat"
-msgstr "Vypsa\nt povolené mody do chatu"
+msgstr ""
+"Vypsa\n"
+"t povolené mody do chatu"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:376
@@ -8854,7 +8894,9 @@ msgstr "Neznámá chyba postavy na serveru."
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:75
 msgid "Failed to create character. Most likely the name is already taken."
-msgstr "Nelze vytvořit postavu. Nejpravděpodobněji její jméno již na serveru existuje."
+msgstr ""
+"Nelze vytvořit postavu. Nejpravděpodobněji její jméno již na serveru "
+"existuje."
 
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:80 src/net/ea/loginrecv.cpp:159
@@ -9010,7 +9052,9 @@ msgstr ""
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
-msgstr "Byl jste dočasně vyloučen ze hry do %s.\nProsím kontaktujte GM team přes fórum."
+msgstr ""
+"Byl jste dočasně vyloučen ze hry do %s.\n"
+"Prosím kontaktujte GM team přes fórum."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:151 src/net/eathena/loginrecv.cpp:92
@@ -9050,33 +9094,33 @@ msgstr "Spojení se serverem ukončeno. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:431
-#: src/net/eathena/charserverrecv.cpp:479
+#: src/net/eathena/charserverrecv.cpp:398
+#: src/net/eathena/charserverrecv.cpp:446
 msgid "Character rename error."
 msgstr "Chyba přejmenování postavy."
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:454
+#: src/net/eathena/charserverrecv.cpp:421
 msgid "Character renamed."
 msgstr "Postava přejmenována."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:470
+#: src/net/eathena/charserverrecv.cpp:437
 msgid "Rename not allowed."
 msgstr "Přejmenování není povoleno."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:474
+#: src/net/eathena/charserverrecv.cpp:441
 msgid "New name is not set."
 msgstr "Nové jméno nebylo nastaveno."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:483
+#: src/net/eathena/charserverrecv.cpp:450
 msgid "Character not found."
 msgstr "Postava nenalezena."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:517 src/net/tmwa/charserverrecv.cpp:339
+#: src/net/eathena/charserverrecv.cpp:484 src/net/tmwa/charserverrecv.cpp:303
 msgid "Failed to delete character."
 msgstr "Nepodařilo se odstranit postavu."
 
@@ -9128,140 +9172,11 @@ msgstr ""
 msgid "Do you accept %s and %s as parents?"
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:130
-#, c-format
-msgid "Strength %s"
-msgstr "Síla %s"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:132
-#, c-format
-msgid "Agility %s"
-msgstr "Hbitost %s"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:134
-#, c-format
-msgid "Vitality %s"
-msgstr "Vitalita %s"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:136
-#, c-format
-msgid "Intelligence %s"
-msgstr "Inteligence %s"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:138
-#, c-format
-msgid "Dexterity %s"
-msgstr "Obratnost %s"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:140
-#, c-format
-msgid "Luck %s"
-msgstr "Štěstí %s"
-
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:197 src/net/tmwa/generalhandler.cpp:207
+#: src/net/eathena/generalhandler.cpp:179 src/net/tmwa/generalhandler.cpp:189
 msgid "Got disconnected from server!"
 msgstr "Byl jsem odpojen od server!"
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:223 src/net/tmwa/generalhandler.cpp:234
-msgid "Strength"
-msgstr "Síla"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:237
-msgid "Agility"
-msgstr "Hbitost"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:229 src/net/tmwa/generalhandler.cpp:240
-msgid "Vitality"
-msgstr "Vitalita"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:243
-msgid "Intelligence"
-msgstr "Inteligence"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:246
-msgid "Dexterity"
-msgstr "Obratnost"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:238 src/net/tmwa/generalhandler.cpp:249
-msgid "Luck"
-msgstr "Štěstí"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:253
-msgid "Defense"
-msgstr "Obrana"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:255
-msgid "M.Attack"
-msgstr "Magický útok"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:257
-msgid "M.Defense"
-msgstr "Magická Obr."
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:260
-#, no-c-format
-msgid "% Accuracy"
-msgstr "% Přesnost"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:263
-#, no-c-format
-msgid "% Evade"
-msgstr "% Uhnutí"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:266
-#, no-c-format
-msgid "% Critical"
-msgstr "% Kritický zásah"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:268
-msgid "Attack Delay"
-msgstr "Zpoždění útoku"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:270
-msgid "Walk Delay"
-msgstr "Zpoždění chůze"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:272
-msgid "Attack Range"
-msgstr "Dosah útoku"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:274
-msgid "Damage per sec."
-msgstr "Poškození za vteř."
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266
-msgid "Karma"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268
-msgid "Manner"
-msgstr ""
-
 #. TRANSLATORS: error message
 #: src/net/eathena/generalrecv.cpp:49 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
@@ -9417,7 +9332,7 @@ msgstr ""
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:199
+#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:190
 msgid "Unknown item"
 msgstr "Neznámý předmět"
 
@@ -9693,21 +9608,52 @@ msgstr "Moderní OpenGL"
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:93
-#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
-#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
+#: src/resources/db/itemdb.cpp:377 src/resources/db/itemdb.cpp:381
+#: src/resources/db/moddb.cpp:79 src/resources/db/monsterdb.cpp:101
+#: src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "nepojmenovaný"
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:104
+#: src/resources/db/petdb.cpp:103
 msgid "pet"
 msgstr "mazlíček"
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:103
+#: src/resources/db/skillunitdb.cpp:102
 msgid "skill"
 msgstr ""
 
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:45
+msgid "Strength"
+msgstr "Síla"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:49
+msgid "Agility"
+msgstr "Hbitost"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:53
+msgid "Vitality"
+msgstr "Vitalita"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:57
+msgid "Intelligence"
+msgstr "Inteligence"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:61
+msgid "Dexterity"
+msgstr "Obratnost"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:65
+msgid "Luck"
+msgstr "Štěstí"
+
 #. TRANSLATORS: inventory type name
 #: src/resources/inventory/inventory.cpp:340
 msgid "Npc"
@@ -10359,8 +10305,9 @@ msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:556
-msgid "Room join failed. Not enought money."
-msgstr ""
+#, fuzzy
+msgid "Room join failed. Not enough money."
+msgstr "Nemáš dost peněz."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:560
@@ -10627,33 +10574,35 @@ msgstr ""
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:796
 #, c-format
-msgid "You and %s was divorced."
+msgid "You and %s are now divorced."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:800
-msgid "You was called by partner."
-msgstr ""
+#, fuzzy
+msgid "You were called by your partner."
+msgstr "Byl jsi zabit %s."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:804
 #, c-format
-msgid "You calling partner %s."
+msgid "You are calling your partner, %s."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:808
-msgid "Adoption child error. You already have baby."
+msgid "Child adoption failed. You already have a baby."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:812
-msgid "Adoption child error. You level too small for have baby."
+msgid "Child adoption failed. Your level is too low."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:816
-msgid "Adoption child error. This player already married and can't be baby."
+msgid ""
+"Child adoption failed. This player is already married and can't be a baby."
 msgstr ""
 
 #. TRANSLATORS: notification message
@@ -10663,12 +10612,12 @@ msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:825
-msgid "Error saving location. Not enought skill level."
+msgid "Error saving location. Not enough skill level."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:829
-msgid "Error saving location. You not have warp skill."
+msgid "Error saving location. You do not have warp skill."
 msgstr ""
 
 #. TRANSLATORS: chat option changed message
@@ -10731,3 +10680,51 @@ msgstr "%d vteřinu"
 #, c-format
 msgid "%d seconds"
 msgstr "%d vteřin"
+
+#~ msgid "Strength %s"
+#~ msgstr "Síla %s"
+
+#~ msgid "Agility %s"
+#~ msgstr "Hbitost %s"
+
+#~ msgid "Vitality %s"
+#~ msgstr "Vitalita %s"
+
+#~ msgid "Intelligence %s"
+#~ msgstr "Inteligence %s"
+
+#~ msgid "Dexterity %s"
+#~ msgstr "Obratnost %s"
+
+#~ msgid "Luck %s"
+#~ msgstr "Štěstí %s"
+
+#~ msgid "Defense"
+#~ msgstr "Obrana"
+
+#~ msgid "M.Attack"
+#~ msgstr "Magický útok"
+
+#~ msgid "M.Defense"
+#~ msgstr "Magická Obr."
+
+#~ msgid "% Accuracy"
+#~ msgstr "% Přesnost"
+
+#~ msgid "% Evade"
+#~ msgstr "% Uhnutí"
+
+#~ msgid "% Critical"
+#~ msgstr "% Kritický zásah"
+
+#~ msgid "Attack Delay"
+#~ msgstr "Zpoždění útoku"
+
+#~ msgid "Walk Delay"
+#~ msgstr "Zpoždění chůze"
+
+#~ msgid "Attack Range"
+#~ msgstr "Dosah útoku"
+
+#~ msgid "Damage per sec."
+#~ msgstr "Poškození za vteř."
diff --git a/po/de.po b/po/de.po
index f8c46deb0..f447ad9e0 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # 3_0_3 <jack@krass.com>, 2011
 # Andrei Karas <akaras@inbox.ru>, 2011
@@ -37,14 +37,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-06-18 18:53+0300\n"
+"POT-Creation-Date: 2016-07-02 19:47+0300\n"
 "PO-Revision-Date: 2016-06-19 11:57+0000\n"
 "Last-Translator: The Micksha\n"
-"Language-Team: German (http://www.transifex.com/akaras/manaplus/language/de/)\n"
+"Language-Team: German (http://www.transifex.com/akaras/manaplus/language/"
+"de/)\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
@@ -61,7 +62,7 @@ msgstr "Datei hochgeladen"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:171 src/client.cpp:1569 src/client.cpp:1604
+#: src/actions/actions.cpp:171 src/client.cpp:1572 src/client.cpp:1607
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
@@ -72,7 +73,7 @@ msgstr "Datei hochgeladen"
 #: src/gui/widgets/tabs/setup_video.cpp:420
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:476
+#: src/gui/windows/charcreatedialog.cpp:475
 #: src/gui/windows/charselectdialog.cpp:262
 #: src/gui/windows/charselectdialog.cpp:310 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:59
@@ -81,9 +82,9 @@ msgstr "Datei hochgeladen"
 #: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:531
 #: src/gui/windows/textdialog.cpp:53 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:456
-#: src/net/eathena/charserverrecv.cpp:491
-#: src/net/eathena/charserverrecv.cpp:519 src/net/tmwa/charserverrecv.cpp:341
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:423
+#: src/net/eathena/charserverrecv.cpp:458
+#: src/net/eathena/charserverrecv.cpp:486 src/net/tmwa/charserverrecv.cpp:305
 msgid "OK"
 msgstr "OK"
 
@@ -133,7 +134,9 @@ msgstr "Log hoch geladen zu:"
 #: src/actions/actions.cpp:1748
 msgid ""
 "Last seen disabled. Enable in players / collect players id and seen log."
-msgstr "Zuletzt deaktiviert gesehen. Aktiviere in Spieler / Rufe Player ID ab und prüfe Log."
+msgstr ""
+"Zuletzt deaktiviert gesehen. Aktiviere in Spieler / Rufe Player ID ab und "
+"prüfe Log."
 
 #. TRANSLATORS: last seen error
 #: src/actions/actions.cpp:1767 src/actions/actions.cpp:1781
@@ -155,7 +158,9 @@ msgstr "Kann keine leeren Flüster- oder Channelnachrichten versenden!"
 #: src/actions/chat.cpp:315
 #, c-format
 msgid "Cannot create a whisper tab \"%s\"! It probably already exists."
-msgstr "Kann keinen Flüsterreiter \"%s\" erstellen!  Möglicherweise existiert der Reiter bereits."
+msgstr ""
+"Kann keinen Flüsterreiter \"%s\" erstellen!  Möglicherweise existiert der "
+"Reiter bereits."
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
@@ -330,26 +335,26 @@ msgid "Visible on map"
 msgstr "Auf der Karte sichtbar"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:496
+#: src/being/being.cpp:494
 msgid "Human"
 msgstr "Mensch"
 
 #. TRANSLATORS: dodge or miss message in attacks
-#: src/being/being.cpp:683
+#: src/being/being.cpp:676
 msgid "dodge"
 msgstr "ausweichen"
 
-#: src/being/being.cpp:683
+#: src/being/being.cpp:676
 msgid "miss"
 msgstr "verfehlt"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2282 src/gui/windows/whoisonline.cpp:882
+#: src/being/being.cpp:2275 src/gui/windows/whoisonline.cpp:882
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2287 src/gui/windows/whoisonline.cpp:887
+#: src/being/being.cpp:2280 src/gui/windows/whoisonline.cpp:887
 msgid "I"
 msgstr "I"
 
@@ -500,41 +505,41 @@ msgstr "Schwebende Blase"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:870 src/dyetool/client.cpp:491 src/gui/windowmenu.cpp:189
+#: src/client.cpp:872 src/dyetool/client.cpp:491 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:66
 msgid "Setup"
 msgstr "Einstellungen"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:873 src/dyetool/client.cpp:494
+#: src/client.cpp:875 src/dyetool/client.cpp:494
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Leistung"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:876 src/dyetool/client.cpp:497
+#: src/client.cpp:878 src/dyetool/client.cpp:497
 #: src/gui/widgets/tabs/setup_video.cpp:110
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:879 src/dyetool/client.cpp:500
+#: src/client.cpp:881 src/dyetool/client.cpp:500
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Theme"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:882 src/dyetool/client.cpp:503
+#: src/client.cpp:884 src/dyetool/client.cpp:503
 msgid "About"
 msgstr "Über"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:885 src/dyetool/client.cpp:506 src/gui/windowmenu.cpp:74
+#: src/client.cpp:887 src/dyetool/client.cpp:506 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Hilfe"
@@ -555,7 +560,7 @@ msgstr "Hilfe"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:889 src/client.cpp:1483 src/client.cpp:1502
+#: src/client.cpp:891 src/client.cpp:1486 src/client.cpp:1505
 #: src/dyetool/client.cpp:510 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:756 src/gui/popups/popupmenu.cpp:833
 #: src/gui/popups/popupmenu.cpp:1087 src/gui/windows/didyouknowwindow.cpp:81
@@ -568,32 +573,32 @@ msgid "Close"
 msgstr "Schließen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1115 src/gui/windowmanager_unittest.cc:156
+#: src/client.cpp:1117 src/gui/windowmanager_unittest.cc:156
 msgid "Connecting to server"
 msgstr "Verbinde zum Server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1172 src/gui/windowmanager_unittest.cc:173
+#: src/client.cpp:1174 src/gui/windowmanager_unittest.cc:173
 msgid "Logging in"
 msgstr "Anmelden"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1221
+#: src/client.cpp:1223
 msgid "Entering game world"
 msgstr "Betrete die Spielwelt"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1369
+#: src/client.cpp:1372
 msgid "Requesting characters"
 msgstr "Spielfiguren werden abgefragt"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1412
+#: src/client.cpp:1415
 msgid "Connecting to the game server"
 msgstr "Verbinde zum Spielserver"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1424
+#: src/client.cpp:1427
 msgid "Changing game servers"
 msgstr "Spielserver wechseln"
 
@@ -610,52 +615,52 @@ msgstr "Spielserver wechseln"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1480 src/client.cpp:1499 src/client.cpp:1738
+#: src/client.cpp:1483 src/client.cpp:1502 src/client.cpp:1741
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:472
+#: src/gui/windows/charcreatedialog.cpp:471
 #: src/gui/windows/charselectdialog.cpp:306
 #: src/gui/windows/editserverdialog.cpp:212
 #: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:429
-#: src/net/eathena/charserverrecv.cpp:433
-#: src/net/eathena/charserverrecv.cpp:515 src/net/tmwa/charserverrecv.cpp:337
+#: src/net/eathena/charserverrecv.cpp:396
+#: src/net/eathena/charserverrecv.cpp:400
+#: src/net/eathena/charserverrecv.cpp:482 src/net/tmwa/charserverrecv.cpp:301
 msgid "Error"
 msgstr "Fehler"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1518
+#: src/client.cpp:1521
 msgid "Requesting registration details"
 msgstr "Anfrage der Registrierungsdetails"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1565
+#: src/client.cpp:1568
 msgid "Password Change"
 msgstr "Passwort ändern"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1567
+#: src/client.cpp:1570
 msgid "Password changed successfully!"
 msgstr "Passwort erfolgreich geändert!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1600
+#: src/client.cpp:1603
 msgid "Email Change"
 msgstr "E-Mail ändern"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1602
+#: src/client.cpp:1605
 msgid "Email changed successfully!"
 msgstr "E-Mail erfolgreich geändert!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1638
+#: src/client.cpp:1641
 msgid "Unregister Successful"
 msgstr "Erfolgreich abgemeldet."
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1640
+#: src/client.cpp:1643
 msgid "Farewell, come back any time..."
 msgstr "Leb wohl und komme jeder Zeit wieder..."
 
@@ -747,7 +752,8 @@ msgstr "  -H --update-host    : Update host benutzen"
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:89
 msgid "  -D --default        : Choose default character server and character"
-msgstr "  -D --default        : Voreingestellten Charakterserver und Charakter wählen"
+msgstr ""
+"  -D --default        : Voreingestellten Charakterserver und Charakter wählen"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:93
@@ -757,12 +763,15 @@ msgstr "  -u --skip-update    :  Herunterladen von Updates überspringen"
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:96
 msgid "  -d --data           : Directory to load game data from"
-msgstr "  -d --data           : Verzeichnis von dem Spieldaten geladen werden sollen"
+msgstr ""
+"  -d --data           : Verzeichnis von dem Spieldaten geladen werden sollen"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:99
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr "  -L --localdata-dir  : Verzeichnis das als Lokales Verzeichnis benutzt werden soll"
+msgstr ""
+"  -L --localdata-dir  : Verzeichnis das als Lokales Verzeichnis benutzt "
+"werden soll"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:103
@@ -782,7 +791,8 @@ msgstr "     --renderer       : Renderer-Typ setzen"
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:112
 msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr "  -T --Tests          : Treibertest und automatische Konfiguration starten"
+msgstr ""
+"  -T --Tests          : Treibertest und automatische Konfiguration starten"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:118
@@ -848,23 +858,23 @@ msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:598
+#: src/game.cpp:600
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Screenshot gespeichert unter %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:608
+#: src/game.cpp:610
 msgid "Saving screenshot failed!"
 msgstr "Screenshot konnte nicht gespeichert werden!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:695
+#: src/game.cpp:697
 msgid "The connection to the server was lost."
 msgstr "Die Verbindung zum Server wurde getrennt."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:698
+#: src/game.cpp:700
 msgid "Network Error"
 msgstr "Netzwerkfehler"
 
@@ -1279,14 +1289,17 @@ msgstr "Wiederbeleben"
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
-msgstr "Du trägst mehr als die Hälfte die du tragen kannst. Du kannst nun deine Gesundheit nicht mehr regenerieren."
+"You are carrying more than half your weight. You are unable to regain health."
+msgstr ""
+"Du trägst mehr als die Hälfte die du tragen kannst. Du kannst nun deine "
+"Gesundheit nicht mehr regenerieren."
 
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:198
 msgid "You are carrying less than half your weight. You can regain health."
-msgstr "Du trägst weniger als die Hälfte des Gewichts. Du kannst nun deine Gesundheit regenerieren."
+msgstr ""
+"Du trägst weniger als die Hälfte des Gewichts. Du kannst nun deine "
+"Gesundheit regenerieren."
 
 #. TRANSLATORS: chat color
 #. TRANSLATORS: inventory sort mode
@@ -1297,8 +1310,7 @@ msgstr "Du trägst weniger als die Hälfte des Gewichts. Du kannst nun deine Ges
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:671
-#: src/gui/windows/serverdialog.cpp:603
+#: src/gui/windows/equipmentwindow.cpp:671 src/gui/windows/serverdialog.cpp:603
 msgid "default"
 msgstr "Standard"
 
@@ -1850,11 +1862,9 @@ msgstr "Handeln"
 #. TRANSLATORS: attack player
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
-#. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:180 src/gui/popups/popupmenu.cpp:304
 #: src/gui/popups/popupmenu.cpp:912 src/gui/widgets/skillinfo.cpp:125
-#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
-#: src/net/tmwa/generalhandler.cpp:251
+#: src/input/pages/basic.cpp:40
 msgid "Attack"
 msgstr "Angriff"
 
@@ -1930,7 +1940,7 @@ msgstr "Bewegen"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:270 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:152
+#: src/resources/db/npcdb.cpp:151
 msgid "Talk"
 msgstr "Sprechen"
 
@@ -1948,7 +1958,7 @@ msgstr "Sprechen"
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:154
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:153
 msgid "Buy"
 msgstr "Kaufen"
 
@@ -1966,7 +1976,7 @@ msgstr "Kaufen"
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
 #: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:256
-#: src/resources/db/npcdb.cpp:156
+#: src/resources/db/npcdb.cpp:155
 msgid "Sell"
 msgstr "Verkaufen"
 
@@ -2068,7 +2078,7 @@ msgstr "Ablegen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:408 src/resources/db/petdb.cpp:160
+#: src/gui/popups/popupmenu.cpp:408 src/resources/db/petdb.cpp:159
 msgid "Return to egg"
 msgstr "Zum Ei zurückkehren"
 
@@ -2465,7 +2475,7 @@ msgstr "Gelben Balken zurücksetzen"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2125 src/gui/windows/statuswindow.cpp:90
 msgid "Copy to chat"
 msgstr "Zu Chat kopieren"
 
@@ -2517,9 +2527,8 @@ msgstr "Fenster anzeigen"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/popups/popupmenu.cpp:2386 src/gui/popups/skillpopup.cpp:127
-#: src/gui/windows/ministatuswindow.cpp:363
-#: src/gui/windows/statuswindow.cpp:68 src/gui/windows/statuswindow.cpp:243
-#: src/gui/windows/statuswindow.cpp:367
+#: src/gui/windows/ministatuswindow.cpp:363 src/gui/windows/statuswindow.cpp:70
+#: src/gui/windows/statuswindow.cpp:268 src/gui/windows/statuswindow.cpp:392
 #, c-format
 msgid "Level: %d"
 msgstr "Stufe: %d"
@@ -2938,8 +2947,8 @@ msgstr "Sklave erzeugen"
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3100 src/gui/popups/popupmenu.cpp:3119
 #: src/gui/popups/popupmenu.cpp:3132 src/gui/windows/charselectdialog.cpp:76
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:452
-#: src/net/eathena/charserverrecv.cpp:488
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:419
+#: src/net/eathena/charserverrecv.cpp:455
 msgid "Info"
 msgstr "Info"
 
@@ -3330,8 +3339,8 @@ msgstr "Level: %u"
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/statuswindow.cpp:70
-#: src/gui/windows/statuswindow.cpp:220 src/gui/windows/statuswindow.cpp:334
+#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/statuswindow.cpp:72
+#: src/gui/windows/statuswindow.cpp:222 src/gui/windows/statuswindow.cpp:359
 #, c-format
 msgid "Money: %s"
 msgstr "Geld: %s"
@@ -3387,7 +3396,7 @@ msgstr "Beenden"
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:194
 #: src/gui/windows/itemamountwindow.cpp:230 src/gui/windows/npcdialog.cpp:123
-#: src/gui/windows/statuswindow.cpp:746
+#: src/gui/windows/statuswindow.cpp:771
 msgid "+"
 msgstr "+"
 
@@ -3408,8 +3417,8 @@ msgstr "-"
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/selldialog.cpp:133 src/gui/windows/buydialog.cpp:299
-#: src/gui/windows/statuswindow.cpp:483 src/gui/windows/statuswindow.cpp:539
-#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:766
+#: src/gui/windows/statuswindow.cpp:508 src/gui/windows/statuswindow.cpp:564
+#: src/gui/windows/statuswindow.cpp:769 src/gui/windows/statuswindow.cpp:791
 msgid "Max"
 msgstr "Max"
 
@@ -3565,15 +3574,13 @@ msgstr "Teilen von Gegenständen aktiviert."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104
-#: src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr "Teilen von Gegenständen deaktiviert."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109
-#: src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr "Teilen von Gegenständen nicht möglich."
 
@@ -3584,22 +3591,19 @@ msgstr "Teilen von Gegenständen unbekannt."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150
-#: src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr "Teilen von Erfahrung aktiviert."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155
-#: src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr "Teilen von Erfahrung deaktiviert."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160
-#: src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr "Teilen von Erfahrung nicht möglich."
 
@@ -4021,7 +4025,11 @@ msgid ""
 "Chat window will be automatically hidden when not in use.\n"
 "\n"
 "Hit Enter or hover mouse to show chat again."
-msgstr "Chatfenster wird automatisch versteckt, wenn es nicht benutzt wird.\n\nDrücke Enter oder fahre mit der Maus darüber, um es wieder sichtbar zu machen."
+msgstr ""
+"Chatfenster wird automatisch versteckt, wenn es nicht benutzt wird.\n"
+"\n"
+"Drücke Enter oder fahre mit der Maus darüber, um es wieder sichtbar zu "
+"machen."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:58
@@ -4033,15 +4041,19 @@ msgstr "Chatfokus schützen"
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
-msgstr "Aktiviert den aggressiven Schutz des Eingabefokuses im Chatfenster.\n\nHinweis: Keine anderen Texteingaben können empfangen werden, wenn du im Chateingabefeld schreibst."
+"Note: no other text inputs will be allowed to receive text input when you "
+"typing in chat window."
+msgstr ""
+"Aktiviert den aggressiven Schutz des Eingabefokuses im Chatfenster.\n"
+"\n"
+"Hinweis: Keine anderen Texteingaben können empfangen werden, wenn du im "
+"Chateingabefeld schreibst."
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86
-#: src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr "Farben"
 
@@ -4055,7 +4067,10 @@ msgstr "Farben von eingehenden Chatnachrichten entfernen"
 msgid ""
 "Enable this setting to strip colors from incoming chat messages. All "
 "messages will use default chat text color if this enabled."
-msgstr "Diese Einstellung aktivieren um Farben von eingehenden Chat zu entfernen. Alle Nachrichten werden die voreingestellte Chattextfarbe benutzen, falls dies aktiviert ist."
+msgstr ""
+"Diese Einstellung aktivieren um Farben von eingehenden Chat zu entfernen. "
+"Alle Nachrichten werden die voreingestellte Chattextfarbe benutzen, falls "
+"dies aktiviert ist."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:77
@@ -4065,10 +4080,18 @@ msgstr "Chatfarben-Liste anzeigen"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat "
+"window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
-msgstr "Diese Einstellung aktivieren um die Farbauswahl Dropdown-Liste im Chatfenster anzuzeigen. Das Chatfenster wird die Farbauswahl Dropdown-Liste anzeigen.\n\nDies erlaubt die einfache Einstellung für die Farbe von ausgehenden Nachrichten, aber belegt auch etwas Platz im Chatfenster."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
+msgstr ""
+"Diese Einstellung aktivieren um die Farbauswahl Dropdown-Liste im "
+"Chatfenster anzuzeigen. Das Chatfenster wird die Farbauswahl Dropdown-Liste "
+"anzeigen.\n"
+"\n"
+"Dies erlaubt die einfache Einstellung für die Farbe von ausgehenden "
+"Nachrichten, aber belegt auch etwas Platz im Chatfenster."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:90
@@ -4079,7 +4102,9 @@ msgstr "Magie- und GM-Befehle in jedem Chatreiter erlauben"
 #: src/gui/widgets/tabs/setup_chat.cpp:92
 msgid ""
 "Enable this setting to be able to type spells and GM commands in any tab."
-msgstr "Diese Einstellung aktivieren, um Zaubersprüche und GM-Befehle in jedem Reiter ausführen zu können."
+msgstr ""
+"Diese Einstellung aktivieren, um Zaubersprüche und GM-Befehle in jedem "
+"Reiter ausführen zu können."
 
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_chat.cpp:98
@@ -4094,10 +4119,17 @@ msgstr "Maximale Zeichen in Chatzeile begrenzen"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed "
+"in chat.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will be truncated."
-msgstr "Begrenzt die Anzahl an Buchstaben welche als längste Zeile als Text im Chat angezeigt werden können.\n\nHinweis: Lange Zeilen können den Klienten langsamer machen. Zeilen die länger als die Begrenzung sind werden abgeschnitten."
+"Note: long lines can make client slower. Lines longer than this limit will "
+"be truncated."
+msgstr ""
+"Begrenzt die Anzahl an Buchstaben welche als längste Zeile als Text im Chat "
+"angezeigt werden können.\n"
+"\n"
+"Hinweis: Lange Zeilen können den Klienten langsamer machen. Zeilen die "
+"länger als die Begrenzung sind werden abgeschnitten."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:110
@@ -4107,10 +4139,15 @@ msgstr "Maximale Zeilen im Chat begrenzen"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
+"specified number of last lines of text. Oldest lines exceeding this limit "
+"are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
-msgstr "Begrenzt, wieviele Chatzeilen im Rückholspeicher bleiben. Der Chat speichert angegebene Anzahl von letzten Textzeilen. Die ältesten Zeilen, welche die Begrenzung überschreiten, werden aus dem Rückholspeicher verworfen."
+msgstr ""
+"Begrenzt, wieviele Chatzeilen im Rückholspeicher bleiben. Der Chat speichert "
+"angegebene Anzahl von letzten Textzeilen. Die ältesten Zeilen, welche die "
+"Begrenzung überschreiten, werden aus dem Rückholspeicher verworfen."
 
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_chat.cpp:120
@@ -4128,7 +4165,12 @@ msgid ""
 "If you enable this setting, chat logs will be written to disk.\n"
 "\n"
 "Note: chat logs can take noticeable amount of disk space over time."
-msgstr "Falls du diese Einstellung aktivierst, werden Chatlogs auf die Festplatte geschrieben.\n\nHinweis: Chatlogs können über die Zeit eine deutliche Menge an Festplattenspeicher einnehmen."
+msgstr ""
+"Falls du diese Einstellung aktivierst, werden Chatlogs auf die Festplatte "
+"geschrieben.\n"
+"\n"
+"Hinweis: Chatlogs können über die Zeit eine deutliche Menge an "
+"Festplattenspeicher einnehmen."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:131
@@ -4138,7 +4180,9 @@ msgstr "Debug-Chatlog aktivieren"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:133
 msgid "If you enable this, debug chat tab also will be logged to disk."
-msgstr "Wenn du dies aktivierst, wird der Debug Chatreiter ebenfalls auf der Festplatte geloggt."
+msgstr ""
+"Wenn du dies aktivierst, wird der Debug Chatreiter ebenfalls auf der "
+"Festplatte geloggt."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:137
@@ -4148,9 +4192,11 @@ msgstr "Chatverlauf anzeigen"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on"
-" startup instead of starting with empty chat tabs."
-msgstr "Falls diese Einstellung aktivert ist, wird der Klient alte Logs beim Start laden anstatt das leere Chatreiter angezeigt werden."
+"If this setting enabled, client will load old chat tabs content from logs on "
+"startup instead of starting with empty chat tabs."
+msgstr ""
+"Falls diese Einstellung aktivert ist, wird der Klient alte Logs beim Start "
+"laden anstatt das leere Chatreiter angezeigt werden."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:144
@@ -4160,10 +4206,17 @@ msgstr "Gruppennachrichten über Anwesenheit anzeigen"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be "
+"shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
-msgstr "Falls diese Einstellung aktivert ist, werden Statusänderungen der Gruppenmitglieder im Gruppenreiter des Chats angezeigt. \n\nDies fügt etwas Tumult zum Chat hinzu, aber erlaubt es auch zu sehen, wenn deine Freunde online kommen."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
+msgstr ""
+"Falls diese Einstellung aktivert ist, werden Statusänderungen der "
+"Gruppenmitglieder im Gruppenreiter des Chats angezeigt. \n"
+"\n"
+"Dies fügt etwas Tumult zum Chat hinzu, aber erlaubt es auch zu sehen, wenn "
+"deine Freunde online kommen."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:152
@@ -4173,10 +4226,17 @@ msgstr "Gildennachrichten über Anwesenheit anzeigen"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be "
+"shown in guild tab of chat.\n"
+"\n"
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
+msgstr ""
+"Falls diese Einstellung aktivert ist, werden Statusänderungen der "
+"Gildenmitglieder im Gildenreiter des Chats angezeigt. \n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
-msgstr "Falls diese Einstellung aktivert ist, werden Statusänderungen der Gildenmitglieder im Gildenreiter des Chats angezeigt. \n\nDies fügt etwas Tumult zum Chat hinzu, aber erlaubt es auch zu sehen, wenn deine Freunde online kommen."
+"Dies fügt etwas Tumult zum Chat hinzu, aber erlaubt es auch zu sehen, wenn "
+"deine Freunde online kommen."
 
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_chat.cpp:161
@@ -4191,10 +4251,22 @@ msgstr "Mitteilungen über Laden verstecken"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will "
+"be displayed in chat. Disable this setting if you want to see shop-related "
+"messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
-msgstr "Falls diese Einstellung aktiviert ist werden keine Nachrichten in Bezug auf den eingebauten ManaPlus-Shop im Chat angezeigt. Aktiviere diese Einstellung falls du Shop bezogene Nachrichten sehen willst.\n\nHinweis: Technisch gesehen, wird der ManaPlus-Shop mit gewöhnlichen Nachrichten mit besonderen Inhalt realisiert. Falls du diese Einstellung, deaktivierst kannst du diese Nachrichten sehen und  eine Idee davon bekommen wenn andere Spieler deinen Laden ansehen."
+"Note: technically, ManaPlus shop implemented as usual private messages with "
+"special content. If you disable this setting, you will be able to see these "
+"messages and get idea when other players are looking at your shop."
+msgstr ""
+"Falls diese Einstellung aktiviert ist werden keine Nachrichten in Bezug auf "
+"den eingebauten ManaPlus-Shop im Chat angezeigt. Aktiviere diese Einstellung "
+"falls du Shop bezogene Nachrichten sehen willst.\n"
+"\n"
+"Hinweis: Technisch gesehen, wird der ManaPlus-Shop mit gewöhnlichen "
+"Nachrichten mit besonderen Inhalt realisiert. Falls du diese Einstellung, "
+"deaktivierst kannst du diese Nachrichten sehen und  eine Idee davon bekommen "
+"wenn andere Spieler deinen Laden ansehen."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:175
@@ -4206,8 +4278,13 @@ msgstr "MVP-Mitteilungen anzeigen"
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
-msgstr "Aktviere diese Einstellung um MVP-Nachrichten vom Server zu erhalten.\n\nHinweis: MVP Nachrichten werden auf den TMV/Evol und ähnlichen Server nicht benutzt, deshalb macht diese Funktion wenig unterschied."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
+"usually makes little difference."
+msgstr ""
+"Aktviere diese Einstellung um MVP-Nachrichten vom Server zu erhalten.\n"
+"\n"
+"Hinweis: MVP Nachrichten werden auf den TMV/Evol und ähnlichen Server nicht "
+"benutzt, deshalb macht diese Funktion wenig unterschied."
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: input action group
@@ -4225,10 +4302,21 @@ msgstr "Alle Flüsternachrichten in Reitern anzeigen"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in "
+"separate tabs, separate tab for each player. If this setting disabled, all "
+"whispers will appear in General tab.\n"
+"\n"
+"Note: putting all whispers to single General tab is known to be confusing. "
+"Think twice before disabling this feature."
+msgstr ""
+"Falls diese Einstellung aktiviert ist werden alle Flüsternachrichten "
+"(private Nachrichten) in getrennten Reitern, - einen getrennten Reiter für "
+"jeden Spieler -, angezeigt. Falls diese Einstellung deaktivert ist, "
+"erscheinen alle Flüsternachrichten im globalen Reiter.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
-msgstr "Falls diese Einstellung aktiviert ist werden alle Flüsternachrichten (private Nachrichten) in getrennten Reitern, - einen getrennten Reiter für jeden Spieler -, angezeigt. Falls diese Einstellung deaktivert ist, erscheinen alle Flüsternachrichten im globalen Reiter.\n\nHinweis:Es ist bekannt, dass es sehr verwirrend sein kann, wenn alle Flüsternachrichten in einem globalen Reiter angezeigt werden. Überlege also zweimal ob du diese Funktion deaktivierst."
+"Hinweis:Es ist bekannt, dass es sehr verwirrend sein kann, wenn alle "
+"Flüsternachrichten in einem globalen Reiter angezeigt werden. Überlege also "
+"zweimal ob du diese Funktion deaktivierst."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:197
@@ -4238,10 +4326,17 @@ msgstr "Magische Nachrichten im Debugreiter aufzeichnen"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If "
+"disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
-msgstr "Falls diese Einstellung aktiviert ist werden Zauberspruch aufrufe im Debugreiter angezeigt. Wenn deaktiviert werden sie stattdessen im globalen Reiter angezeigt.\n\nHinweis: Dies hat keinen Einfluss darauf wie der Server auf zusamenhängende Zaubersprüche antwortet."
+msgstr ""
+"Falls diese Einstellung aktiviert ist werden Zauberspruch aufrufe im "
+"Debugreiter angezeigt. Wenn deaktiviert werden sie stattdessen im globalen "
+"Reiter angezeigt.\n"
+"\n"
+"Hinweis: Dies hat keinen Einfluss darauf wie der Server auf zusamenhängende "
+"Zaubersprüche antwortet."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:205
@@ -4251,10 +4346,19 @@ msgstr "Servermitteilungen im Debugreiter anzeigen"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of "
+"chat. If disabled, server messages will appear in General chat instead.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
-msgstr "Falls diese Einstellung aktiviert ist, werden Servernachrichten im Debugreiter des Chats angezeigt. Falls deaktiviert, zeigen Servernachrichten stattdessen im globalen Chat angezeigt. \n\nHinweis: Bezugnehmend auf 4144 - Falls dies deaktiviert wird, könnte es sein dass du einige Debugnachrichten im Debugreiter vom Klienten verlieren könntest,  da es sich um gefälschte Servernachrichten handelt."
+"Note: according to 4144, disabling this could also make you to lose some "
+"debug messages from client in Debug tab since these are fake server messages."
+msgstr ""
+"Falls diese Einstellung aktiviert ist, werden Servernachrichten im "
+"Debugreiter des Chats angezeigt. Falls deaktiviert, zeigen Servernachrichten "
+"stattdessen im globalen Chat angezeigt. \n"
+"\n"
+"Hinweis: Bezugnehmend auf 4144 - Falls dies deaktiviert wird, könnte es sein "
+"dass du einige Debugnachrichten im Debugreiter vom Klienten verlieren "
+"könntest,  da es sich um gefälschte Servernachrichten handelt."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:215
@@ -4268,7 +4372,12 @@ msgid ""
 "words typical for trades will go to Trade tab. This will make General tab "
 "less noisy. If this setting is disabled, all trade related players messages "
 "will stay in General tab."
-msgstr "Aktiviert den Handelsreiter. Der Handelsreiter ist einfach gesagt ein Filter. Nachrichten, die typische Wörter zu handeln beinhalten werden im Handelsreiter angezeigt. Die macht den globalen Reiter ruhiger. Falls diese Einstellung deaktiviert wird bleiben handelsbezogene Nachrichten im globalen Reiter."
+msgstr ""
+"Aktiviert den Handelsreiter. Der Handelsreiter ist einfach gesagt ein "
+"Filter. Nachrichten, die typische Wörter zu handeln beinhalten werden im "
+"Handelsreiter angezeigt. Die macht den globalen Reiter ruhiger. Falls diese "
+"Einstellung deaktiviert wird bleiben handelsbezogene Nachrichten im globalen "
+"Reiter."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:224
@@ -4278,10 +4387,17 @@ msgstr "GM-Reiter einschalten"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM "
+"activity.\n"
+"\n"
+"Note: this setting only makes difference for GMs (Game Masters) since this "
+"tab only appears for GMs."
+msgstr ""
+"Falls aktiviert, wird der GM-Reiter im Chat auftauchen. Es zeigt Text im "
+"Bezug auf GM-Aktivitäten an.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
-msgstr "Falls aktiviert, wird der GM-Reiter im Chat auftauchen. Es zeigt Text im Bezug auf GM-Aktivitäten an.\n\nHinweis: Diese Einstellung macht einen Unterschied für GMs (Game Master) seit dieser Reiter nur für GMs angezeigt wird."
+"Hinweis: Diese Einstellung macht einen Unterschied für GMs (Game Master) "
+"seit dieser Reiter nur für GMs angezeigt wird."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:232
@@ -4291,10 +4407,13 @@ msgstr "Sprachenreiter einschalten"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this feature.\n"
+"If this feature enabled, language tab will appear if server supports this "
+"feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
-msgstr "Wenn du dieses Feature aktivierst, wird der Sprachenreiter auftauchen, falls der Server dieses Merkmal unterstützt."
+msgstr ""
+"Wenn du dieses Feature aktivierst, wird der Sprachenreiter auftauchen, falls "
+"der Server dieses Merkmal unterstützt."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:240
@@ -4304,10 +4423,18 @@ msgstr "Alle Sprachnachrichten anzeigen"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
+"If this setting enabled and server supports different chats for different "
+"languages, you will see messages for all languages, regardless of your "
+"language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
-msgstr "Falls diese Einstellung aktiviert ist und der Server verschiedene Reiter für verschiedene Sprachen unterstützt, wirst du Nachrichten in allen Sprachen sehen, ungeachtet deiner Spracheinstellungen.\n\nHinweis: Dies funktioniert nur auf Servern die, die Sprachenreiterfunktion unterstüzen."
+msgstr ""
+"Falls diese Einstellung aktiviert ist und der Server verschiedene Reiter für "
+"verschiedene Sprachen unterstützt, wirst du Nachrichten in allen Sprachen "
+"sehen, ungeachtet deiner Spracheinstellungen.\n"
+"\n"
+"Hinweis: Dies funktioniert nur auf Servern die, die Sprachenreiterfunktion "
+"unterstüzen."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:250
@@ -4317,10 +4444,17 @@ msgstr "Kampfreiter aktivieren"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will "
+"contain messages related to battles, like damage and experience gain, if "
+"battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
-msgstr "Falls dies aktiviert ist, wird der Kampfreiter im Chat erscheinen. Dieser Reiter zeigt kampfbezogene Nachrichten an wie Erhalt von Schaden und Erfahrung, falls Kampfnachrichten aktiviert sind.\n\nHinweis: Klient muss neu gestartet werden um diese Funktion zu aktivieren."
+msgstr ""
+"Falls dies aktiviert ist, wird der Kampfreiter im Chat erscheinen. Dieser "
+"Reiter zeigt kampfbezogene Nachrichten an wie Erhalt von Schaden und "
+"Erfahrung, falls Kampfnachrichten aktiviert sind.\n"
+"\n"
+"Hinweis: Klient muss neu gestartet werden um diese Funktion zu aktivieren."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:259
@@ -4333,7 +4467,10 @@ msgid ""
 "If this setting enabled, messages related to battle like damage or "
 "experience gain will be displayed in Debug or Battle tab. If disabled, no "
 "battle messages will be displayed."
-msgstr "Wenn diese Einstellung aktiviert ist werden Nachrichten in Bezug zum Kampf wie Erhalt von Schaden oder Erfahrung im Debug- oder im Kampfreiter angezeigt. Falls deaktiviert werden keine Nachrichten zum Kampf angezeigt."
+msgstr ""
+"Wenn diese Einstellung aktiviert ist werden Nachrichten in Bezug zum Kampf "
+"wie Erhalt von Schaden oder Erfahrung im Debug- oder im Kampfreiter "
+"angezeigt. Falls deaktiviert werden keine Nachrichten zum Kampf angezeigt."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:267
@@ -4343,10 +4480,19 @@ msgstr "Falls nötig Chatreiter Größe ändern"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to "
+"adapt to appearance of chat input field when you typing message and when "
+"input field of chat disappears. If disabled, chat input area will always "
+"occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
-msgstr "Falls diese Funktion aktiviert ist, wird der Text im Chat automatisch an das Aussehen des Chateingabefeldes angepasst sobald du etwas schreibst oder das Chateingabefeld verschwindet. Wenn deaktiviert, wird das Chateingabefeld immer seinen Platz belegen, was sonst für Text nützlich sein könnte. Hinweis: Es geht um sprunghaftes Verhalten des Chats gegen weniger nutzbaren Platz für Text."
+msgstr ""
+"Falls diese Funktion aktiviert ist, wird der Text im Chat automatisch an das "
+"Aussehen des Chateingabefeldes angepasst sobald du etwas schreibst oder das "
+"Chateingabefeld verschwindet. Wenn deaktiviert, wird das Chateingabefeld "
+"immer seinen Platz belegen, was sonst für Text nützlich sein könnte. "
+"Hinweis: Es geht um sprunghaftes Verhalten des Chats gegen weniger nutzbaren "
+"Platz für Text."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:279
@@ -4368,7 +4514,9 @@ msgstr "Lokale Zeit benutzen"
 msgid ""
 "If this feature enabled, timestamps in chat will use local times. If "
 "disabled, server time will be used (often it is GMT+0)."
-msgstr "Wenn dieses Funktion aktiviert ist, benutzen Zeitstempel im Chat die lokale Zeit. Wenn deaktiviert, wird die Serverzeit benutzt (oftmals ist das GMT+0)."
+msgstr ""
+"Wenn dieses Funktion aktiviert ist, benutzen Zeitstempel im Chat die lokale "
+"Zeit. Wenn deaktiviert, wird die Serverzeit benutzt (oftmals ist das GMT+0)."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:297
@@ -4378,10 +4526,15 @@ msgstr "Wörter hervorheben (Mit Komma trennen)"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. "
+"Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
-msgstr "Hier kannst du ein einige zusätzliche Wörter zur Hervorhebung bestimmen . Benutze durch Komma getrennte Wörter. \n\nHinweis: Häufige Hervorhebungen sind lästig - benutze sie mit Bedacht."
+msgstr ""
+"Hier kannst du ein einige zusätzliche Wörter zur Hervorhebung bestimmen . "
+"Benutze durch Komma getrennte Wörter. \n"
+"\n"
+"Hinweis: Häufige Hervorhebungen sind lästig - benutze sie mit Bedacht."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:305
@@ -4391,10 +4544,17 @@ msgstr "Globale Nachrichten von Name ignorieren (Mit Komma trennen)"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender "
+"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
-msgstr "Diese Einstellung erlaubt dir einige globale Nachrichten zu ignorieren falls der bestimmte Sender (NPC, GM) dich zu sehr nervt. Globale Nachrichten werden stattdessen zum Debugreiter verschoben.\n\nHinweis: Unvorsichtige Verwendung dieser Funktion, kann dazu führen, dass du wichtige Ankündigungen verpasst!"
+msgstr ""
+"Diese Einstellung erlaubt dir einige globale Nachrichten zu ignorieren falls "
+"der bestimmte Sender (NPC, GM) dich zu sehr nervt. Globale Nachrichten "
+"werden stattdessen zum Debugreiter verschoben.\n"
+"\n"
+"Hinweis: Unvorsichtige Verwendung dieser Funktion, kann dazu führen, dass du "
+"wichtige Ankündigungen verpasst!"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:314
@@ -4404,10 +4564,20 @@ msgstr "Emotes im Chat anzeigen"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This "
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
-msgstr "Falls diese Einstellung aktivert ist wird eine Schaltfläche in der Nähe des Texteingabefeldes erscheinen. Diese Schaltfläche ruft das Gestaltungsfenster auf. Dies erlaubt dir Smilies in den Chat einzufügen und deinen Text zu formatieren.\n\nHinweis: Das Fenster kann auch durch die F1 Taste, während du im Chat schreibst, aufgerufen werden."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by "
+"default."
+msgstr ""
+"Falls diese Einstellung aktivert ist wird eine Schaltfläche in der Nähe des "
+"Texteingabefeldes erscheinen. Diese Schaltfläche ruft das Gestaltungsfenster "
+"auf. Dies erlaubt dir Smilies in den Chat einzufügen und deinen Text zu "
+"formatieren.\n"
+"\n"
+"Hinweis: Das Fenster kann auch durch die F1 Taste, während du im Chat "
+"schreibst, aufgerufen werden."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:324
@@ -4419,7 +4589,10 @@ msgstr "NdT Servernachricht beim Start anzeigen"
 msgid ""
 "If this setting enabled, client will display server MOTD (message of the "
 "day) once you connect to server. Disable it to hide MOTD."
-msgstr "Wenn diese Einstellung ausgewählt ist, wird der Klient die Server NdT (Nachricht des Tages) anzeigen, sobald du auf dem Server bist. Deaktiveren, um die NdT nicht anzuzeigen."
+msgstr ""
+"Wenn diese Einstellung ausgewählt ist, wird der Klient die Server NdT "
+"(Nachricht des Tages) anzeigen, sobald du auf dem Server bist. Deaktiveren, "
+"um die NdT nicht anzuzeigen."
 
 #. TRANSLATORS: color selection preview message
 #: src/gui/widgets/tabs/setup_colors.cpp:50
@@ -4520,7 +4693,9 @@ msgstr "Tastenkonflikt erkannt."
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr "Konflikt zwischen \"%s\" und \"%s\" Tasten. Ändere die Tastenbelegung oder das Spiel lässt sich nicht richtig steuern."
+msgstr ""
+"Konflikt zwischen \"%s\" und \"%s\" Tasten. Ändere die Tastenbelegung oder "
+"das Spiel lässt sich nicht richtig steuern."
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
@@ -4905,7 +5080,9 @@ msgstr "Unterstützung für Bots"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_other.cpp:307
 msgid "Enable guild bot support and disable native guild support"
-msgstr "Botunterstützung von Gilden aktivieren und serverseitige Gildenunterstüzung deaktiveren"
+msgstr ""
+"Botunterstützung von Gilden aktivieren und serverseitige Gildenunterstüzung "
+"deaktiveren"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_other.cpp:313
@@ -5068,7 +5245,9 @@ msgstr "Hardwarebeschleunigung"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:74
 msgid "Enable opacity cache (Software, can use much memory)"
-msgstr "Transparenz des Zwischenspeichers aktivieren (Software, kann viel Speicher verbrauchen)"
+msgstr ""
+"Transparenz des Zwischenspeichers aktivieren (Software, kann viel Speicher "
+"verbrauchen)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:79
@@ -5128,7 +5307,9 @@ msgstr "Zwischenspeicher für Wesen deaktivieren (Software)"
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_perfomance.cpp:129
 msgid "Different options (enable or disable can improve performance)"
-msgstr "Verschiedene Optionen (Aktivieren oder deaktivieren kann die Leistung verbessern)"
+msgstr ""
+"Verschiedene Optionen (Aktivieren oder deaktivieren kann die Leistung "
+"verbessern)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:134
@@ -5153,12 +5334,15 @@ msgstr "Texturenatlas aktiveren (OpenGL)"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:150
 msgid "Cache all sprites per map (can use additional memory)"
-msgstr "Alle Sprites pro Karte zwischenspeichern (Kann zusätzlichen Speicher verbrauchen)"
+msgstr ""
+"Alle Sprites pro Karte zwischenspeichern (Kann zusätzlichen Speicher "
+"verbrauchen)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:155
 msgid "Cache all sounds (can use additional memory)"
-msgstr "Alle Klänge zwischenspeichern (Kann zusätzlichen Speicher  verbrauchen)"
+msgstr ""
+"Alle Klänge zwischenspeichern (Kann zusätzlichen Speicher  verbrauchen)"
 
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_perfomance.cpp:160
@@ -5568,13 +5752,17 @@ msgstr "Kein(e)"
 #: src/gui/widgets/tabs/setup_video.cpp:233
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr "Das Wechseln in den Fenstermodus sowie das Wiederherstellen der vorherigen Auflösung schlug fehl!"
+msgstr ""
+"Das Wechseln in den Fenstermodus sowie das Wiederherstellen der vorherigen "
+"Auflösung schlug fehl!"
 
 #. TRANSLATORS: video error message
 #: src/gui/widgets/tabs/setup_video.cpp:240
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr "Das Wechseln in den Vollbildmodus sowie das Wiederherstellen der vorherigen Auflösung schlug fehl!"
+msgstr ""
+"Das Wechseln in den Vollbildmodus sowie das Wiederherstellen der vorherigen "
+"Auflösung schlug fehl!"
 
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -5594,7 +5782,9 @@ msgstr "Wechsle zu OpenGL"
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:283
 msgid "Applying change to OpenGL requires restart."
-msgstr "Änderungen an OpenGL werden erst nach einem Neustart der Anwendung übernommen."
+msgstr ""
+"Änderungen an OpenGL werden erst nach einem Neustart der Anwendung "
+"übernommen."
 
 #. TRANSLATORS: resolution question dialog
 #: src/gui/widgets/tabs/setup_video.cpp:368
@@ -5615,7 +5805,9 @@ msgstr "Bildschirmauflösung wurde geändert"
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:401
 msgid "Some windows may be moved to fit the lowered resolution."
-msgstr "Einige Fenster könnten verschoben werden um in die herabgesetzte Auflösung zu passen."
+msgstr ""
+"Einige Fenster könnten verschoben werden um in die herabgesetzte Auflösung "
+"zu passen."
 
 #. TRANSLATORS: speach type
 #: src/gui/widgets/tabs/setup_visual.cpp:43
@@ -6150,8 +6342,7 @@ msgstr "Menge:"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:618
-#: src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:618 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Erstellen"
 
@@ -6267,17 +6458,16 @@ msgstr "^"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:104
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:210
-#: src/gui/windows/charcreatedialog.cpp:221
-#: src/gui/windows/charcreatedialog.cpp:231
-#: src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:196
+#: src/gui/windows/charcreatedialog.cpp:209
+#: src/gui/windows/charcreatedialog.cpp:220
+#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:110
-#: src/gui/windows/charcreatedialog.cpp:600
+#: src/gui/windows/charcreatedialog.cpp:599
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Bitte verteile %d Punkte"
@@ -6286,73 +6476,71 @@ msgstr "Bitte verteile %d Punkte"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:201
-#: src/gui/windows/charcreatedialog.cpp:212
-#: src/gui/windows/charcreatedialog.cpp:223
-#: src/gui/windows/charcreatedialog.cpp:233
-#: src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:200
+#: src/gui/windows/charcreatedialog.cpp:211
+#: src/gui/windows/charcreatedialog.cpp:222
+#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:202
 msgid "Hair color:"
 msgstr "Haarfarbe:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:213
 msgid "Hair style:"
 msgstr "Frisur:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:224
 msgid "Race:"
 msgstr "Rasse:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:234
 msgid "Look:"
 msgstr "Schau:"
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:252
-#: src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr "W"
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:258
-#: src/gui/windows/charcreatedialog.cpp:265
-#: src/gui/windows/charcreatedialog.cpp:273
+#: src/gui/windows/charcreatedialog.cpp:257
+#: src/gui/windows/charcreatedialog.cpp:264
+#: src/gui/windows/charcreatedialog.cpp:272
 msgid "M"
 msgstr "M"
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:260
-#: src/gui/windows/charcreatedialog.cpp:277
+#: src/gui/windows/charcreatedialog.cpp:259
+#: src/gui/windows/charcreatedialog.cpp:276
 #: src/gui/windows/inventorywindow.cpp:223
 msgid "O"
 msgstr "O"
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:267
+#: src/gui/windows/charcreatedialog.cpp:266
 msgid "U"
 msgstr "U"
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:474
+#: src/gui/windows/charcreatedialog.cpp:473
 msgid "Your name needs to be at least 4 characters."
 msgstr "Dein Name muss aus mindestens 4 Zeichen bestehen."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:590
+#: src/gui/windows/charcreatedialog.cpp:589
 msgid "Character stats OK"
 msgstr "Charakterattribute OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:606
+#: src/gui/windows/charcreatedialog.cpp:605
 #, c-format
 msgid "Please remove %d points"
 msgstr "Bitte entferne %d Punkte"
@@ -6416,7 +6604,12 @@ msgid ""
 "Level: %u\n"
 "Experience: %u\n"
 "Money: %s"
-msgstr "HP: %u/%u\nMP: %u/%u\nLevel: %u\nErfahrung: %u\nGeld: %s"
+msgstr ""
+"HP: %u/%u\n"
+"MP: %u/%u\n"
+"Level: %u\n"
+"Erfahrung: %u\n"
+"Geld: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/charselectdialog.cpp:308
@@ -6518,8 +6711,7 @@ msgstr "Server bearbeiten"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57
-#: src/gui/windows/serverdialog.cpp:112
+#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:112
 msgid "Connect"
 msgstr "Verbinden"
 
@@ -6877,15 +7069,13 @@ msgstr "Betreff:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61
-#: src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr "Geld:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr "Gegenstand:"
@@ -6994,7 +7184,7 @@ msgstr "Balken: Job"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/windows/ministatuswindow.cpp:356
-#: src/gui/windows/statuswindow.cpp:236
+#: src/gui/windows/statuswindow.cpp:261
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Level: %d (GM %d)"
@@ -7446,33 +7636,33 @@ msgid "Choose your party's name."
 msgstr "Name deiner Gruppe wählen."
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:72
+#: src/gui/windows/statuswindow.cpp:74
 msgid "HP:"
 msgstr "HP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:75
+#: src/gui/windows/statuswindow.cpp:77
 msgid "Exp:"
 msgstr "EP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:136
+#: src/gui/windows/statuswindow.cpp:138
 msgid "MP:"
 msgstr "MP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:173 src/gui/windows/statuswindow.cpp:294
+#: src/gui/windows/statuswindow.cpp:175 src/gui/windows/statuswindow.cpp:319
 #, c-format
 msgid "Job: %d"
 msgstr "Job: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:175
+#: src/gui/windows/statuswindow.cpp:177
 msgid "Job:"
 msgstr "Job:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:224 src/gui/windows/statuswindow.cpp:342
+#: src/gui/windows/statuswindow.cpp:226 src/gui/windows/statuswindow.cpp:367
 #, c-format
 msgid "Character points: %d"
 msgstr "Charakterpunkte: %d"
@@ -7590,14 +7780,17 @@ msgstr "Du hast nicht genügend Geld."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
-msgstr "Gegenstand konnte nicht hinzugefügt werden. Du kannst keinen weiteren dieser Gegenstände hinzufügen."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+"Gegenstand konnte nicht hinzugefügt werden. Du kannst keinen weiteren dieser "
+"Gegenstände hinzufügen."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:539
 msgid "Failed adding item. You can not trade equipped items."
-msgstr "Gegenstand hinzufügen fehlgeschlagen. Du kannst micht mit ausgerüsteten Gegenständen handeln."
+msgstr ""
+"Gegenstand hinzufügen fehlgeschlagen. Du kannst micht mit ausgerüsteten "
+"Gegenständen handeln."
 
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
@@ -8859,7 +9052,8 @@ msgstr "Fenster: Wegwerfen leeren"
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:50
 msgid "Access denied. Most likely, there are too many players on this server."
-msgstr "Zugriff verweigert. Wahrscheinlich sind zu viele Spieler auf dem Server."
+msgstr ""
+"Zugriff verweigert. Wahrscheinlich sind zu viele Spieler auf dem Server."
 
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:55
@@ -8874,7 +9068,9 @@ msgstr "Unbekannter Charakterserver Fehler."
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:75
 msgid "Failed to create character. Most likely the name is already taken."
-msgstr "Fehlschlag beim Erstellen des Charakters. Wahrscheinlich wird der Name schon benutzt."
+msgstr ""
+"Fehlschlag beim Erstellen des Charakters. Wahrscheinlich wird der Name schon "
+"benutzt."
 
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:80 src/net/ea/loginrecv.cpp:159
@@ -8927,7 +9123,9 @@ msgstr "Konnte nicht flüstern. Ignoriert von %s."
 #. TRANSLATORS: chat message
 #: src/net/ea/chatrecv.cpp:114
 msgid "Whisper could not be sent, you ignored by all players."
-msgstr "Flüsternachricht konnte nicht gesendet werden. Du wirst von allen Spielern ignoriert."
+msgstr ""
+"Flüsternachricht konnte nicht gesendet werden. Du wirst von allen Spielern "
+"ignoriert."
 
 #. TRANSLATORS: error header
 #: src/net/ea/gamerecv.cpp:67
@@ -9030,7 +9228,9 @@ msgstr "Klient ist zu alt oder falscher Servertyp."
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
-msgstr "Du wurdest bis %s gebannt.\nBitte kontaktiere das GM-Team via der Foren."
+msgstr ""
+"Du wurdest bis %s gebannt.\n"
+"Bitte kontaktiere das GM-Team via der Foren."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:151 src/net/eathena/loginrecv.cpp:92
@@ -9070,33 +9270,33 @@ msgstr "Verbindung mit Server abgebrochen. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:431
-#: src/net/eathena/charserverrecv.cpp:479
+#: src/net/eathena/charserverrecv.cpp:398
+#: src/net/eathena/charserverrecv.cpp:446
 msgid "Character rename error."
 msgstr "Fehler beim Umbennen des Charakters."
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:454
+#: src/net/eathena/charserverrecv.cpp:421
 msgid "Character renamed."
 msgstr "Charakter umbenannt."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:470
+#: src/net/eathena/charserverrecv.cpp:437
 msgid "Rename not allowed."
 msgstr "Umbennen ist nicht erlaubt."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:474
+#: src/net/eathena/charserverrecv.cpp:441
 msgid "New name is not set."
 msgstr "Neuer Name ist nicht gesetzt."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:483
+#: src/net/eathena/charserverrecv.cpp:450
 msgid "Character not found."
 msgstr "Charakter nicht gefunden."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:517 src/net/tmwa/charserverrecv.cpp:339
+#: src/net/eathena/charserverrecv.cpp:484 src/net/tmwa/charserverrecv.cpp:303
 msgid "Failed to delete character."
 msgstr "Konnte Charakter nicht löschen."
 
@@ -9148,140 +9348,11 @@ msgstr "Eltern erfragen"
 msgid "Do you accept %s and %s as parents?"
 msgstr "Akzeptierst Du %s und %s als deine Eltern?"
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:130
-#, c-format
-msgid "Strength %s"
-msgstr "Stärke %s"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:132
-#, c-format
-msgid "Agility %s"
-msgstr "Beweglichkeit %s"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:134
-#, c-format
-msgid "Vitality %s"
-msgstr "Gesundheit %s"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:136
-#, c-format
-msgid "Intelligence %s"
-msgstr "Intelligenz %s"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:138
-#, c-format
-msgid "Dexterity %s"
-msgstr "Geschick %s"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:140
-#, c-format
-msgid "Luck %s"
-msgstr "Glück %s"
-
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:197 src/net/tmwa/generalhandler.cpp:207
+#: src/net/eathena/generalhandler.cpp:179 src/net/tmwa/generalhandler.cpp:189
 msgid "Got disconnected from server!"
 msgstr "Verbindung zum Server unterbrochen!"
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:223 src/net/tmwa/generalhandler.cpp:234
-msgid "Strength"
-msgstr "Stärke"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:237
-msgid "Agility"
-msgstr "Beweglichkeit"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:229 src/net/tmwa/generalhandler.cpp:240
-msgid "Vitality"
-msgstr "Gesundheit"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:243
-msgid "Intelligence"
-msgstr "Intelligenz"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:246
-msgid "Dexterity"
-msgstr "Geschick"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:238 src/net/tmwa/generalhandler.cpp:249
-msgid "Luck"
-msgstr "Glück"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:253
-msgid "Defense"
-msgstr "Verteidigung:"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:255
-msgid "M.Attack"
-msgstr "M.Angriff:"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:257
-msgid "M.Defense"
-msgstr "M.Verteidigung:"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:260
-#, no-c-format
-msgid "% Accuracy"
-msgstr "% Genauigkeit"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:263
-#, no-c-format
-msgid "% Evade"
-msgstr "% Ausweichen"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:266
-#, no-c-format
-msgid "% Critical"
-msgstr "% Kritisch"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:268
-msgid "Attack Delay"
-msgstr "Angriffsverzug"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:270
-msgid "Walk Delay"
-msgstr "Laufverzug:"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:272
-msgid "Attack Range"
-msgstr "Angriffsbereich"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:274
-msgid "Damage per sec."
-msgstr "Schaden/Sek."
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266
-msgid "Karma"
-msgstr "Karma"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268
-msgid "Manner"
-msgstr "Verhalten"
-
 #. TRANSLATORS: error message
 #: src/net/eathena/generalrecv.cpp:49 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
@@ -9437,7 +9508,7 @@ msgstr "Verbleibend %s Vermietungszeit für Gegenstand %s."
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:199
+#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:190
 msgid "Unknown item"
 msgstr "Unbekannter Gegenstand"
 
@@ -9713,21 +9784,52 @@ msgstr "Modernes OpenGL"
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:93
-#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
-#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
+#: src/resources/db/itemdb.cpp:377 src/resources/db/itemdb.cpp:381
+#: src/resources/db/moddb.cpp:79 src/resources/db/monsterdb.cpp:101
+#: src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "Unbenannt"
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:104
+#: src/resources/db/petdb.cpp:103
 msgid "pet"
 msgstr "Haustier"
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:103
+#: src/resources/db/skillunitdb.cpp:102
 msgid "skill"
 msgstr "Fähigkeit"
 
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:45
+msgid "Strength"
+msgstr "Stärke"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:49
+msgid "Agility"
+msgstr "Beweglichkeit"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:53
+msgid "Vitality"
+msgstr "Gesundheit"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:57
+msgid "Intelligence"
+msgstr "Intelligenz"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:61
+msgid "Dexterity"
+msgstr "Geschick"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:65
+msgid "Luck"
+msgstr "Glück"
+
 #. TRANSLATORS: inventory type name
 #: src/resources/inventory/inventory.cpp:340
 msgid "Npc"
@@ -10038,17 +10140,23 @@ msgstr "Unbehandelter Pakethandelabbruch mit %s"
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:287
 msgid "Failed adding item. Trade partner is over weighted."
-msgstr "Gegenstand hinzufügen fehlgeschlagen: Der Handelspartner kann nichts mehr tragen."
+msgstr ""
+"Gegenstand hinzufügen fehlgeschlagen: Der Handelspartner kann nichts mehr "
+"tragen."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:291
 msgid "Failed adding item. Trade partner has no free slot."
-msgstr "Gegenstand hinzufügen fehlgeschlagen. Handelspartner hat keinen freien Platz in seinem Inventar."
+msgstr ""
+"Gegenstand hinzufügen fehlgeschlagen. Handelspartner hat keinen freien Platz "
+"in seinem Inventar."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:295
 msgid "Failed adding item. You can't trade this item."
-msgstr "Gegenstand hinzufügen fehlgeschlagen. Du kannst diesen Gegenstand nicht handeln."
+msgstr ""
+"Gegenstand hinzufügen fehlgeschlagen. Du kannst diesen Gegenstand nicht "
+"handeln."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:299
@@ -10210,14 +10318,18 @@ msgstr "Karte eingesteckt."
 msgid ""
 "Deposit failed. You probably don't have this amount of money with you right "
 "now."
-msgstr "Einzahlen fehlgeschlagen. Vielleicht hast du diese Menge an Geld gerade nicht dabei."
+msgstr ""
+"Einzahlen fehlgeschlagen. Vielleicht hast du diese Menge an Geld gerade "
+"nicht dabei."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:427
 msgid ""
 "Withdraw failed. You probably don't have this amount of money in the bank "
 "right now."
-msgstr "Abheben fehlgeschlagen. Vielleicht hast du gerade diese Menge an Geld nicht auf der Bank."
+msgstr ""
+"Abheben fehlgeschlagen. Vielleicht hast du gerade diese Menge an Geld nicht "
+"auf der Bank."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:432
@@ -10232,7 +10344,8 @@ msgstr "Erstellen des Verkaufsstandes fehlgeschlagen. Zu viel Gewicht."
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:440
 msgid "Buying store create failed. No items in store."
-msgstr "Erstellen des Verkaufsstandes fehlgeschlagen. Keine Gegenstände im Laden."
+msgstr ""
+"Erstellen des Verkaufsstandes fehlgeschlagen. Keine Gegenstände im Laden."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:444
@@ -10259,7 +10372,9 @@ msgstr "Der Handel ist fehlgeschlagen."
 msgid ""
 "The trade failed, because the entered amount of item is higher, than the "
 "buyer is willing to buy."
-msgstr "Der Handel ist fehlgeschlagen, da die eingegebene Anzahl von Gegenständen höher ist, als die Anzahl, die der Käufer kaufen will."
+msgstr ""
+"Der Handel ist fehlgeschlagen, da die eingegebene Anzahl von Gegenständen "
+"höher ist, als die Anzahl, die der Käufer kaufen will."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:465
@@ -10284,7 +10399,8 @@ msgstr "Keine passenden Läden wurden gefunden."
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:483
 msgid "There are too many results. Please enter more detailed search term."
-msgstr "Es gibt zu viele Ergebnisse. Bitte einen genaueren Suchbegriff eingeben."
+msgstr ""
+"Es gibt zu viele Ergebnisse. Bitte einen genaueren Suchbegriff eingeben."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:488
@@ -10379,7 +10495,8 @@ msgstr "Beitreten fehlgeschlagen. Aus dem Chatrooom gekickt."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:556
-msgid "Room join failed. Not enought money."
+#, fuzzy
+msgid "Room join failed. Not enough money."
 msgstr "Beitreten fehlgeschlagen. Nicht genug Geld."
 
 #. TRANSLATORS: notification message
@@ -10496,12 +10613,15 @@ msgstr "Verbesserung unbekannt für Gegenstand %s."
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:650
 msgid "You can't add item to card because weight too high."
-msgstr "Gegenstand kann nicht zu Karte hinzugefügt werden, da das Gewicht zu hoch ist."
+msgstr ""
+"Gegenstand kann nicht zu Karte hinzugefügt werden, da das Gewicht zu hoch "
+"ist."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:654
 msgid "You can't add item to card because too many items."
-msgstr "Gegenstand kann nicht zu Karte hinzugefügt werden - zu viele Gegenstände."
+msgstr ""
+"Gegenstand kann nicht zu Karte hinzugefügt werden - zu viele Gegenstände."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:658
@@ -10646,35 +10766,41 @@ msgstr "Unbekannte Entfernung von Spieler %s."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:796
-#, c-format
-msgid "You and %s was divorced."
+#, fuzzy, c-format
+msgid "You and %s are now divorced."
 msgstr "Du wurdest von %s geschieden."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:800
-msgid "You was called by partner."
+#, fuzzy
+msgid "You were called by your partner."
 msgstr "Dein Partner hat dich gerufen."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:804
-#, c-format
-msgid "You calling partner %s."
+#, fuzzy, c-format
+msgid "You are calling your partner, %s."
 msgstr "Du rufst Partner %s."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:808
-msgid "Adoption child error. You already have baby."
+#, fuzzy
+msgid "Child adoption failed. You already have a baby."
 msgstr "Adoption fehlgeschlagen. Du hast bereits ein Baby."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:812
-msgid "Adoption child error. You level too small for have baby."
-msgstr "Adoption fehlgeschlagen. Dein Level ist zu gering, um ein Baby zu haben."
+msgid "Child adoption failed. Your level is too low."
+msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:816
-msgid "Adoption child error. This player already married and can't be baby."
-msgstr "Adoption fehlgeschlagen. Dieser Spieler ist bereits verheiratet und kann kein Baby mehr sein."
+#, fuzzy
+msgid ""
+"Child adoption failed. This player is already married and can't be a baby."
+msgstr ""
+"Adoption fehlgeschlagen. Dieser Spieler ist bereits verheiratet und kann "
+"kein Baby mehr sein."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:821
@@ -10683,19 +10809,24 @@ msgstr "Standort für Warp Fähigkeit gespeichert."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:825
-msgid "Error saving location. Not enought skill level."
+#, fuzzy
+msgid "Error saving location. Not enough skill level."
 msgstr "Standort konnte nicht gespeichert werden. Skill Level ungenügend."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:829
-msgid "Error saving location. You not have warp skill."
-msgstr "Standort konnte nicht gespeichert werden. Du verfügst nicht über die Warp Fähigkeit."
+#, fuzzy
+msgid "Error saving location. You do not have warp skill."
+msgstr ""
+"Standort konnte nicht gespeichert werden. Du verfügst nicht über die Warp "
+"Fähigkeit."
 
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:29
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "Gültige Optionen für /%s sind \"yes\",\"no\",\"true\",\"false\",\"1\",\"0\"."
+msgstr ""
+"Gültige Optionen für /%s sind \"yes\",\"no\",\"true\",\"false\",\"1\",\"0\"."
 
 #. TRANSLATORS: uptime command
 #: src/utils/stringutils.cpp:946
@@ -10751,3 +10882,61 @@ msgstr "%d Sekunden"
 #, c-format
 msgid "%d seconds"
 msgstr "%d Sekunden"
+
+#~ msgid "Strength %s"
+#~ msgstr "Stärke %s"
+
+#~ msgid "Agility %s"
+#~ msgstr "Beweglichkeit %s"
+
+#~ msgid "Vitality %s"
+#~ msgstr "Gesundheit %s"
+
+#~ msgid "Intelligence %s"
+#~ msgstr "Intelligenz %s"
+
+#~ msgid "Dexterity %s"
+#~ msgstr "Geschick %s"
+
+#~ msgid "Luck %s"
+#~ msgstr "Glück %s"
+
+#~ msgid "Defense"
+#~ msgstr "Verteidigung:"
+
+#~ msgid "M.Attack"
+#~ msgstr "M.Angriff:"
+
+#~ msgid "M.Defense"
+#~ msgstr "M.Verteidigung:"
+
+#~ msgid "% Accuracy"
+#~ msgstr "% Genauigkeit"
+
+#~ msgid "% Evade"
+#~ msgstr "% Ausweichen"
+
+#~ msgid "% Critical"
+#~ msgstr "% Kritisch"
+
+#~ msgid "Attack Delay"
+#~ msgstr "Angriffsverzug"
+
+#~ msgid "Walk Delay"
+#~ msgstr "Laufverzug:"
+
+#~ msgid "Attack Range"
+#~ msgstr "Angriffsbereich"
+
+#~ msgid "Damage per sec."
+#~ msgstr "Schaden/Sek."
+
+#~ msgid "Karma"
+#~ msgstr "Karma"
+
+#~ msgid "Manner"
+#~ msgstr "Verhalten"
+
+#~ msgid "Adoption child error. You level too small for have baby."
+#~ msgstr ""
+#~ "Adoption fehlgeschlagen. Dein Level ist zu gering, um ein Baby zu haben."
diff --git a/po/es.po b/po/es.po
index 75542236b..057f3ea8d 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # 0x0Eddine <salahbubuli44@gmail.com>, 2012,2014-2015
 # Andrei Karas <akaras@inbox.ru>, 2011
@@ -18,18 +18,20 @@
 # osuka <oscar-u2011@hotmail.com>, 2012-2013
 # 0x0Eddine <salahbubuli44@gmail.com>, 2012,2014
 # Scall, 2016
+# Scall, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-06-18 18:53+0300\n"
-"PO-Revision-Date: 2016-07-01 11:14+0000\n"
-"Last-Translator: Nelson Martell <nelson6e65-manaplus@yahoo.es>\n"
-"Language-Team: Spanish (http://www.transifex.com/akaras/manaplus/language/es/)\n"
+"POT-Creation-Date: 2016-07-02 19:47+0300\n"
+"PO-Revision-Date: 2016-07-01 11:54+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"Language-Team: Spanish (http://www.transifex.com/akaras/manaplus/language/"
+"es/)\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
@@ -46,7 +48,7 @@ msgstr "Archivo subido"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:171 src/client.cpp:1569 src/client.cpp:1604
+#: src/actions/actions.cpp:171 src/client.cpp:1572 src/client.cpp:1607
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
@@ -57,7 +59,7 @@ msgstr "Archivo subido"
 #: src/gui/widgets/tabs/setup_video.cpp:420
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:476
+#: src/gui/windows/charcreatedialog.cpp:475
 #: src/gui/windows/charselectdialog.cpp:262
 #: src/gui/windows/charselectdialog.cpp:310 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:59
@@ -66,9 +68,9 @@ msgstr "Archivo subido"
 #: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:531
 #: src/gui/windows/textdialog.cpp:53 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:456
-#: src/net/eathena/charserverrecv.cpp:491
-#: src/net/eathena/charserverrecv.cpp:519 src/net/tmwa/charserverrecv.cpp:341
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:423
+#: src/net/eathena/charserverrecv.cpp:458
+#: src/net/eathena/charserverrecv.cpp:486 src/net/tmwa/charserverrecv.cpp:305
 msgid "OK"
 msgstr "OK"
 
@@ -118,7 +120,9 @@ msgstr "Registro subido a:"
 #: src/actions/actions.cpp:1748
 msgid ""
 "Last seen disabled. Enable in players / collect players id and seen log."
-msgstr "Deshabilitada opción para mostrar última vez visto. Habilítala en Jugadores / \"Registrar ID de jugador y última vez visto\"."
+msgstr ""
+"Deshabilitada opción para mostrar última vez visto. Habilítala en "
+"Jugadores / \"Registrar ID de jugador y última vez visto\"."
 
 #. TRANSLATORS: last seen error
 #: src/actions/actions.cpp:1767 src/actions/actions.cpp:1781
@@ -140,7 +144,8 @@ msgstr "¡No se puede enviar un mensaje vacío como susurro ni al canal!"
 #: src/actions/chat.cpp:315
 #, c-format
 msgid "Cannot create a whisper tab \"%s\"! It probably already exists."
-msgstr "¡No se puede crear la pestaña de susurro \"%s\"! Probablemente ya existe."
+msgstr ""
+"¡No se puede crear la pestaña de susurro \"%s\"! Probablemente ya existe."
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
@@ -315,26 +320,26 @@ msgid "Visible on map"
 msgstr "Visibles en el mapa"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:496
+#: src/being/being.cpp:494
 msgid "Human"
 msgstr "Humano"
 
 #. TRANSLATORS: dodge or miss message in attacks
-#: src/being/being.cpp:683
+#: src/being/being.cpp:676
 msgid "dodge"
 msgstr "evade"
 
-#: src/being/being.cpp:683
+#: src/being/being.cpp:676
 msgid "miss"
 msgstr "falla"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2282 src/gui/windows/whoisonline.cpp:882
+#: src/being/being.cpp:2275 src/gui/windows/whoisonline.cpp:882
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2287 src/gui/windows/whoisonline.cpp:887
+#: src/being/being.cpp:2280 src/gui/windows/whoisonline.cpp:887
 msgid "I"
 msgstr "I"
 
@@ -485,41 +490,41 @@ msgstr "Burbuja flotante"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:870 src/dyetool/client.cpp:491 src/gui/windowmenu.cpp:189
+#: src/client.cpp:872 src/dyetool/client.cpp:491 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:66
 msgid "Setup"
 msgstr "Configuración"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:873 src/dyetool/client.cpp:494
+#: src/client.cpp:875 src/dyetool/client.cpp:494
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Rendimiento"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:876 src/dyetool/client.cpp:497
+#: src/client.cpp:878 src/dyetool/client.cpp:497
 #: src/gui/widgets/tabs/setup_video.cpp:110
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:879 src/dyetool/client.cpp:500
+#: src/client.cpp:881 src/dyetool/client.cpp:500
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:882 src/dyetool/client.cpp:503
+#: src/client.cpp:884 src/dyetool/client.cpp:503
 msgid "About"
 msgstr "Acerca de..."
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:885 src/dyetool/client.cpp:506 src/gui/windowmenu.cpp:74
+#: src/client.cpp:887 src/dyetool/client.cpp:506 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Ayuda"
@@ -540,7 +545,7 @@ msgstr "Ayuda"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:889 src/client.cpp:1483 src/client.cpp:1502
+#: src/client.cpp:891 src/client.cpp:1486 src/client.cpp:1505
 #: src/dyetool/client.cpp:510 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:756 src/gui/popups/popupmenu.cpp:833
 #: src/gui/popups/popupmenu.cpp:1087 src/gui/windows/didyouknowwindow.cpp:81
@@ -553,32 +558,32 @@ msgid "Close"
 msgstr "Cerrar"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1115 src/gui/windowmanager_unittest.cc:156
+#: src/client.cpp:1117 src/gui/windowmanager_unittest.cc:156
 msgid "Connecting to server"
 msgstr "Conectando al servidor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1172 src/gui/windowmanager_unittest.cc:173
+#: src/client.cpp:1174 src/gui/windowmanager_unittest.cc:173
 msgid "Logging in"
 msgstr "Accediendo a la cuenta"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1221
+#: src/client.cpp:1223
 msgid "Entering game world"
 msgstr "Entrando al mundo del juego"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1369
+#: src/client.cpp:1372
 msgid "Requesting characters"
 msgstr "Cargando personajes"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1412
+#: src/client.cpp:1415
 msgid "Connecting to the game server"
 msgstr "Conectando al servidor del juego"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1424
+#: src/client.cpp:1427
 msgid "Changing game servers"
 msgstr "Cambiando servidores del juego"
 
@@ -595,52 +600,52 @@ msgstr "Cambiando servidores del juego"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1480 src/client.cpp:1499 src/client.cpp:1738
+#: src/client.cpp:1483 src/client.cpp:1502 src/client.cpp:1741
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:472
+#: src/gui/windows/charcreatedialog.cpp:471
 #: src/gui/windows/charselectdialog.cpp:306
 #: src/gui/windows/editserverdialog.cpp:212
 #: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:429
-#: src/net/eathena/charserverrecv.cpp:433
-#: src/net/eathena/charserverrecv.cpp:515 src/net/tmwa/charserverrecv.cpp:337
+#: src/net/eathena/charserverrecv.cpp:396
+#: src/net/eathena/charserverrecv.cpp:400
+#: src/net/eathena/charserverrecv.cpp:482 src/net/tmwa/charserverrecv.cpp:301
 msgid "Error"
 msgstr "Error"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1518
+#: src/client.cpp:1521
 msgid "Requesting registration details"
 msgstr "Solicitando detalles de registro"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1565
+#: src/client.cpp:1568
 msgid "Password Change"
 msgstr "Cambio de contraseña"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1567
+#: src/client.cpp:1570
 msgid "Password changed successfully!"
 msgstr "¡Contraseña cambiada exitosamente!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1600
+#: src/client.cpp:1603
 msgid "Email Change"
 msgstr "Cambio de Email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1602
+#: src/client.cpp:1605
 msgid "Email changed successfully!"
 msgstr "¡Email modificado exitosamente!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1638
+#: src/client.cpp:1641
 msgid "Unregister Successful"
 msgstr "Registro cancelado"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1640
+#: src/client.cpp:1643
 msgid "Farewell, come back any time..."
 msgstr "Adiós, vuelve cuando quieras..."
 
@@ -742,7 +747,8 @@ msgstr "  -u --skip-update    : Saltarse las descargas de actualización"
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:96
 msgid "  -d --data           : Directory to load game data from"
-msgstr "  -d --data           : Carpeta desde la que se cargan los datos del juego"
+msgstr ""
+"  -d --data           : Carpeta desde la que se cargan los datos del juego"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:99
@@ -752,7 +758,8 @@ msgstr "  -L --localdata-dir  : Carpeta para usar los datos locales"
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:103
 msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr "     --screenshot-dir : Carpeta donde se guardan las capturas de pantalla"
+msgstr ""
+"     --screenshot-dir : Carpeta donde se guardan las capturas de pantalla"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:106
@@ -767,7 +774,8 @@ msgstr "     --renderer: Establecer tipo de renderizador"
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:112
 msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr "  -T --tests          : Comenzar a probar controladores y auto configurar"
+msgstr ""
+"  -T --tests          : Comenzar a probar controladores y auto configurar"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:118
@@ -833,23 +841,23 @@ msgid "Debug"
 msgstr "Depurador"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:598
+#: src/game.cpp:600
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Captura de pantalla guardada como %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:608
+#: src/game.cpp:610
 msgid "Saving screenshot failed!"
 msgstr "¡El guardado de la captura de pantalla ha fallado!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:695
+#: src/game.cpp:697
 msgid "The connection to the server was lost."
 msgstr "Se ha perdido la conexión con el servidor."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:698
+#: src/game.cpp:700
 msgid "Network Error"
 msgstr "Error de Red"
 
@@ -1264,14 +1272,16 @@ msgstr "Revivir"
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
-msgstr "Estás cargando con más de la mitad de tu peso. Eres incapaz de recobrar la salud."
+"You are carrying more than half your weight. You are unable to regain health."
+msgstr ""
+"Estás cargando con más de la mitad de tu peso. Eres incapaz de recobrar la "
+"salud."
 
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:198
 msgid "You are carrying less than half your weight. You can regain health."
-msgstr "Estás cargando menos de la mitad de tu peso. Ahora puedes recobrar la salud."
+msgstr ""
+"Estás cargando menos de la mitad de tu peso. Ahora puedes recobrar la salud."
 
 #. TRANSLATORS: chat color
 #. TRANSLATORS: inventory sort mode
@@ -1282,8 +1292,7 @@ msgstr "Estás cargando menos de la mitad de tu peso. Ahora puedes recobrar la s
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:671
-#: src/gui/windows/serverdialog.cpp:603
+#: src/gui/windows/equipmentwindow.cpp:671 src/gui/windows/serverdialog.cpp:603
 msgid "default"
 msgstr "predeterminado"
 
@@ -1835,11 +1844,9 @@ msgstr "Intercambio"
 #. TRANSLATORS: attack player
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
-#. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:180 src/gui/popups/popupmenu.cpp:304
 #: src/gui/popups/popupmenu.cpp:912 src/gui/widgets/skillinfo.cpp:125
-#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
-#: src/net/tmwa/generalhandler.cpp:251
+#: src/input/pages/basic.cpp:40
 msgid "Attack"
 msgstr "Atacar"
 
@@ -1915,7 +1922,7 @@ msgstr "Mover"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:270 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:152
+#: src/resources/db/npcdb.cpp:151
 msgid "Talk"
 msgstr "Hablar"
 
@@ -1933,7 +1940,7 @@ msgstr "Hablar"
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:154
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:153
 msgid "Buy"
 msgstr "Comprar"
 
@@ -1951,7 +1958,7 @@ msgstr "Comprar"
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
 #: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:256
-#: src/resources/db/npcdb.cpp:156
+#: src/resources/db/npcdb.cpp:155
 msgid "Sell"
 msgstr "Vender"
 
@@ -2053,7 +2060,7 @@ msgstr "Quitárselo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:408 src/resources/db/petdb.cpp:160
+#: src/gui/popups/popupmenu.cpp:408 src/resources/db/petdb.cpp:159
 msgid "Return to egg"
 msgstr "Regresar al huevo"
 
@@ -2450,7 +2457,7 @@ msgstr "Restablecer barra amarilla"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2125 src/gui/windows/statuswindow.cpp:90
 msgid "Copy to chat"
 msgstr "Copiar al chat"
 
@@ -2502,9 +2509,8 @@ msgstr "Mostrar ventana"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/popups/popupmenu.cpp:2386 src/gui/popups/skillpopup.cpp:127
-#: src/gui/windows/ministatuswindow.cpp:363
-#: src/gui/windows/statuswindow.cpp:68 src/gui/windows/statuswindow.cpp:243
-#: src/gui/windows/statuswindow.cpp:367
+#: src/gui/windows/ministatuswindow.cpp:363 src/gui/windows/statuswindow.cpp:70
+#: src/gui/windows/statuswindow.cpp:268 src/gui/windows/statuswindow.cpp:392
 #, c-format
 msgid "Level: %d"
 msgstr "Nivel: %d"
@@ -2923,8 +2929,8 @@ msgstr ""
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3100 src/gui/popups/popupmenu.cpp:3119
 #: src/gui/popups/popupmenu.cpp:3132 src/gui/windows/charselectdialog.cpp:76
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:452
-#: src/net/eathena/charserverrecv.cpp:488
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:419
+#: src/net/eathena/charserverrecv.cpp:455
 msgid "Info"
 msgstr "Información"
 
@@ -3315,8 +3321,8 @@ msgstr "Nivel: %u"
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/statuswindow.cpp:70
-#: src/gui/windows/statuswindow.cpp:220 src/gui/windows/statuswindow.cpp:334
+#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/statuswindow.cpp:72
+#: src/gui/windows/statuswindow.cpp:222 src/gui/windows/statuswindow.cpp:359
 #, c-format
 msgid "Money: %s"
 msgstr "Dinero: %s"
@@ -3372,7 +3378,7 @@ msgstr "Salir"
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:194
 #: src/gui/windows/itemamountwindow.cpp:230 src/gui/windows/npcdialog.cpp:123
-#: src/gui/windows/statuswindow.cpp:746
+#: src/gui/windows/statuswindow.cpp:771
 msgid "+"
 msgstr "+"
 
@@ -3393,8 +3399,8 @@ msgstr "-"
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/selldialog.cpp:133 src/gui/windows/buydialog.cpp:299
-#: src/gui/windows/statuswindow.cpp:483 src/gui/windows/statuswindow.cpp:539
-#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:766
+#: src/gui/windows/statuswindow.cpp:508 src/gui/windows/statuswindow.cpp:564
+#: src/gui/windows/statuswindow.cpp:769 src/gui/windows/statuswindow.cpp:791
 msgid "Max"
 msgstr "Máx"
 
@@ -3550,15 +3556,13 @@ msgstr "Compartir artículos habilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104
-#: src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr "Compartir artículos deshabilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109
-#: src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr "No se puede compartir artículos."
 
@@ -3569,22 +3573,19 @@ msgstr "Compartir artículos desconocido."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150
-#: src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr "Compartir experiencia habilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155
-#: src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr "Compartir experiencia deshabilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160
-#: src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr "No se puede compartir experiencia."
 
@@ -4006,7 +4007,10 @@ msgid ""
 "Chat window will be automatically hidden when not in use.\n"
 "\n"
 "Hit Enter or hover mouse to show chat again."
-msgstr "La ventana del chat será ocultada automáticamente cuando no esté en uso.\n\nPresiona Enter o pasa el ratón por encima para mostrarla nuevamente."
+msgstr ""
+"La ventana del chat será ocultada automáticamente cuando no esté en uso.\n"
+"\n"
+"Presiona Enter o pasa el ratón por encima para mostrarla nuevamente."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:58
@@ -4018,15 +4022,19 @@ msgstr "Proteger foco del chat"
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
-msgstr "Habilita la protección agresiva del foco de entrada en la ventana del chat.\n\nNota: A ninguna otra entrada de texto se le permitirá recibir el foco de entrada mientras estés escribiendo en la ventana del chat."
+"Note: no other text inputs will be allowed to receive text input when you "
+"typing in chat window."
+msgstr ""
+"Habilita la protección agresiva del foco de entrada en la ventana del chat.\n"
+"\n"
+"Nota: A ninguna otra entrada de texto se le permitirá recibir el foco de "
+"entrada mientras estés escribiendo en la ventana del chat."
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86
-#: src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr "Colores"
 
@@ -4040,7 +4048,10 @@ msgstr "Remover los colores de los mensajes recibidos en el chat"
 msgid ""
 "Enable this setting to strip colors from incoming chat messages. All "
 "messages will use default chat text color if this enabled."
-msgstr "Habilita este ajuste para desnudar los colores de los mensajes que llegan al chat. Si está habilitado, todos los mensajes usarán el color de texto predeterminado."
+msgstr ""
+"Habilita este ajuste para desnudar los colores de los mensajes que llegan al "
+"chat. Si está habilitado, todos los mensajes usarán el color de texto "
+"predeterminado."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:77
@@ -4050,21 +4061,26 @@ msgstr "Mostrar lista de colores del chat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat "
+"window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:90
 msgid "Allow magic and GM commands in all chat tabs"
-msgstr "Permitir utilizar los comandos de magia y GM en todas las pestañas del chat"
+msgstr ""
+"Permitir utilizar los comandos de magia y GM en todas las pestañas del chat"
 
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:92
 msgid ""
 "Enable this setting to be able to type spells and GM commands in any tab."
-msgstr "Habilita esta configuración para poder escribir hechizos y comandos GM en cualquier pestaña."
+msgstr ""
+"Habilita esta configuración para poder escribir hechizos y comandos GM en "
+"cualquier pestaña."
 
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_chat.cpp:98
@@ -4079,9 +4095,11 @@ msgstr "Límite máx. de caracteres por línea en el chat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed "
+"in chat.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will be truncated."
+"Note: long lines can make client slower. Lines longer than this limit will "
+"be truncated."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4092,7 +4110,9 @@ msgstr "Límite máx. de líneas en el chat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
+"specified number of last lines of text. Oldest lines exceeding this limit "
+"are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
 msgstr ""
@@ -4123,7 +4143,9 @@ msgstr "Habilitar registro del chat de depuración"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:133
 msgid "If you enable this, debug chat tab also will be logged to disk."
-msgstr "Si habilitas esto, el historial de la pestaña de depuración también será registrada en el disco."
+msgstr ""
+"Si habilitas esto, el historial de la pestaña de depuración también será "
+"registrada en el disco."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:137
@@ -4133,9 +4155,12 @@ msgstr "Mostrar historial del chat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on"
-" startup instead of starting with empty chat tabs."
-msgstr "Si esta configuración es habilitada, el cliente cargará el contenido de viejas pestañas del chat desde los registros al inicio en vez de iniciar con pestañas vacías."
+"If this setting enabled, client will load old chat tabs content from logs on "
+"startup instead of starting with empty chat tabs."
+msgstr ""
+"Si esta configuración es habilitada, el cliente cargará el contenido de "
+"viejas pestañas del chat desde los registros al inicio en vez de iniciar con "
+"pestañas vacías."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:144
@@ -4145,9 +4170,11 @@ msgstr "Mostrar mensajes de conexión de miembros del grupo"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be "
+"shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4158,10 +4185,17 @@ msgstr "Mostrar mensajes de conexión de miembros del gremio"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be "
+"shown in guild tab of chat.\n"
+"\n"
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
+msgstr ""
+"Si este ajuste se habilita, se mostrarán los cambios de estado de conexión "
+"de los miembros del gremio en la pestaña Gremio del chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
-msgstr "Si este ajuste se habilita, se mostrarán los cambios de estado de conexión de los miembros del gremio en la pestaña Gremio del chat.\n\nEsto agrega algunos sonidos extra al chat, pero te permite notar cuando tus compañeros se conectan."
+"Esto agrega algunos sonidos extra al chat, pero te permite notar cuando tus "
+"compañeros se conectan."
 
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_chat.cpp:161
@@ -4176,9 +4210,13 @@ msgstr "Ocultar mensajes de la tienda"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will "
+"be displayed in chat. Disable this setting if you want to see shop-related "
+"messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
+"Note: technically, ManaPlus shop implemented as usual private messages with "
+"special content. If you disable this setting, you will be able to see these "
+"messages and get idea when other players are looking at your shop."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4191,7 +4229,8 @@ msgstr "Mostrar mensajes MVP"
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
+"usually makes little difference."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4210,9 +4249,12 @@ msgstr "Poner todos los susurros en pestañas"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in "
+"separate tabs, separate tab for each player. If this setting disabled, all "
+"whispers will appear in General tab.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
+"Note: putting all whispers to single General tab is known to be confusing. "
+"Think twice before disabling this feature."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4223,7 +4265,8 @@ msgstr "Registrar mensajes de magia en la pestaña del depurador"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If "
+"disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
 msgstr ""
@@ -4236,9 +4279,11 @@ msgstr "Mostrar los mensajes del servidor en la pestaña del depurador"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of "
+"chat. If disabled, server messages will appear in General chat instead.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
+"Note: according to 4144, disabling this could also make you to lose some "
+"debug messages from client in Debug tab since these are fake server messages."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4263,9 +4308,11 @@ msgstr "Habilitar pestaña para GM"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM "
+"activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
+"Note: this setting only makes difference for GMs (Game Masters) since this "
+"tab only appears for GMs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4276,10 +4323,15 @@ msgstr "Habilitar pestaña de lenguaje"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this feature.\n"
+"If this feature enabled, language tab will appear if server supports this "
+"feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
-msgstr "Si esta característica es habilitada, la pestaña de lenguaje aparecerá si el servidor la soporta.\n\nNota: Por ahora, sólo es soportado por el servidor Evol."
+msgstr ""
+"Si esta característica es habilitada, la pestaña de lenguaje aparecerá si el "
+"servidor la soporta.\n"
+"\n"
+"Nota: Por ahora, sólo es soportado por el servidor Evol."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:240
@@ -4289,7 +4341,9 @@ msgstr "Mostrar mensajes de todos los lenguajes"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
+"If this setting enabled and server supports different chats for different "
+"languages, you will see messages for all languages, regardless of your "
+"language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
 msgstr ""
@@ -4302,7 +4356,9 @@ msgstr "Habilitar pestaña de batalla"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will "
+"contain messages related to battles, like damage and experience gain, if "
+"battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
 msgstr ""
@@ -4318,7 +4374,11 @@ msgid ""
 "If this setting enabled, messages related to battle like damage or "
 "experience gain will be displayed in Debug or Battle tab. If disabled, no "
 "battle messages will be displayed."
-msgstr "Si se habilitada esta preferencia, los mensajes relacionados a las batallas, como el daño o ganancia de experiencia, serán mostrados en la pestaña Depuración o Batalla. Si está deshabilitado, ningún mensaje de batalla será mostrado."
+msgstr ""
+"Si se habilitada esta preferencia, los mensajes relacionados a las batallas, "
+"como el daño o ganancia de experiencia, serán mostrados en la pestaña "
+"Depuración o Batalla. Si está deshabilitado, ningún mensaje de batalla será "
+"mostrado."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:267
@@ -4328,7 +4388,10 @@ msgstr "Si hace falta, cambia el tamaño de las pestañas del chat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to "
+"adapt to appearance of chat input field when you typing message and when "
+"input field of chat disappears. If disabled, chat input area will always "
+"occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
@@ -4353,7 +4416,10 @@ msgstr "Usar hora local"
 msgid ""
 "If this feature enabled, timestamps in chat will use local times. If "
 "disabled, server time will be used (often it is GMT+0)."
-msgstr "Si esta función es habilitada, las marcas de tiempo en el chat usarán la hora local. Si es deshabilitado, se usará la hora del servidor (mayormente es GTM+0)."
+msgstr ""
+"Si esta función es habilitada, las marcas de tiempo en el chat usarán la "
+"hora local. Si es deshabilitado, se usará la hora del servidor (mayormente "
+"es GTM+0)."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:297
@@ -4363,10 +4429,15 @@ msgstr "Resaltar palabras (separadas por coma)"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. "
+"Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
-msgstr "Aquí puedes especificar algunas palabras extra que también serán resaltadas. Usa comas para separar las palabras.\n\nNota: Los resaltados frecuentes pueden ser molestos; úsalo con precaución."
+msgstr ""
+"Aquí puedes especificar algunas palabras extra que también serán resaltadas. "
+"Usa comas para separar las palabras.\n"
+"\n"
+"Nota: Los resaltados frecuentes pueden ser molestos; úsalo con precaución."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:305
@@ -4376,7 +4447,8 @@ msgstr "Ignorar nombres globalmente (separados por coma)"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender "
+"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
 msgstr ""
@@ -4389,9 +4461,12 @@ msgstr "Mostrar botón de emoticonos en el chat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This "
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by "
+"default."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4404,7 +4479,10 @@ msgstr "Mostrar el mensaje motd del servidor al iniciar"
 msgid ""
 "If this setting enabled, client will display server MOTD (message of the "
 "day) once you connect to server. Disable it to hide MOTD."
-msgstr "Si esta configuración es habilitada, el cliente mostrará el MOTD (MDD, mensaje del día) una vez que te conectes al servidor. Deshabilita para ocultar el MOTD."
+msgstr ""
+"Si esta configuración es habilitada, el cliente mostrará el MOTD (MDD, "
+"mensaje del día) una vez que te conectes al servidor. Deshabilita para "
+"ocultar el MOTD."
 
 #. TRANSLATORS: color selection preview message
 #: src/gui/widgets/tabs/setup_colors.cpp:50
@@ -4505,7 +4583,9 @@ msgstr "Detectado conflicto de teclas."
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr "Conflicto con las teclas \"%s\" e \"%s\" . Resuélvelo, o el juego podría comportarse en un modo extraño."
+msgstr ""
+"Conflicto con las teclas \"%s\" e \"%s\" . Resuélvelo, o el juego podría "
+"comportarse en un modo extraño."
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
@@ -4875,7 +4955,9 @@ msgstr "NPC"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_other.cpp:295
 msgid "Cycle npc targets"
-msgstr "Seleccionar cíclicamente los npcs en derredor, no necesariamente al más cercano"
+msgstr ""
+"Seleccionar cíclicamente los npcs en derredor, no necesariamente al más "
+"cercano"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_other.cpp:299
@@ -4890,7 +4972,8 @@ msgstr "Soporte de bots"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_other.cpp:307
 msgid "Enable guild bot support and disable native guild support"
-msgstr "Habilitar soporte para el bot 'guild' y deshabilitar soporte de gremio nativo"
+msgstr ""
+"Habilitar soporte para el bot 'guild' y deshabilitar soporte de gremio nativo"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_other.cpp:313
@@ -5113,7 +5196,8 @@ msgstr "Deshabilitar caché de criaturas (Software)"
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_perfomance.cpp:129
 msgid "Different options (enable or disable can improve performance)"
-msgstr "Opciones diferentes (habitar o deshabilitar puede mejorar el rendimiento)"
+msgstr ""
+"Opciones diferentes (habitar o deshabilitar puede mejorar el rendimiento)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:134
@@ -5138,7 +5222,8 @@ msgstr "Habilitar atlas de texturas (OpenGL)"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:150
 msgid "Cache all sprites per map (can use additional memory)"
-msgstr "Almacenar en caché todos los sprites por mapa (puede usar memoria adicional)"
+msgstr ""
+"Almacenar en caché todos los sprites por mapa (puede usar memoria adicional)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:155
@@ -5274,7 +5359,9 @@ msgstr "Crear capturas de pantalla para cada intercambio completado"
 #: src/gui/widgets/tabs/setup_players.cpp:143
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
-msgstr "Emular botón derecho del ratón al mantener clic presionado (útil para interfaces táctiles)"
+msgstr ""
+"Emular botón derecho del ratón al mantener clic presionado (útil para "
+"interfaces táctiles)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:148
@@ -5553,13 +5640,17 @@ msgstr "Nada"
 #: src/gui/widgets/tabs/setup_video.cpp:233
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr "¡Fallo al intercambiar al modo de ventana! ¡La restauración al modo anterior también falló!"
+msgstr ""
+"¡Fallo al intercambiar al modo de ventana! ¡La restauración al modo anterior "
+"también falló!"
 
 #. TRANSLATORS: video error message
 #: src/gui/widgets/tabs/setup_video.cpp:240
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr "¡Fallo al intercambiar al modo de pantalla completa!  ¡La restauración al modo anterior también falló!"
+msgstr ""
+"¡Fallo al intercambiar al modo de pantalla completa!  ¡La restauración al "
+"modo anterior también falló!"
 
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -5600,7 +5691,8 @@ msgstr "Resolución de pantalla cambiada"
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:401
 msgid "Some windows may be moved to fit the lowered resolution."
-msgstr "Algunas ventanas pueden ser movidas para adaptarlas a la resolución más baja."
+msgstr ""
+"Algunas ventanas pueden ser movidas para adaptarlas a la resolución más baja."
 
 #. TRANSLATORS: speach type
 #: src/gui/widgets/tabs/setup_visual.cpp:43
@@ -6135,8 +6227,7 @@ msgstr "Cantidad:"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:618
-#: src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:618 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Crear"
 
@@ -6169,13 +6260,17 @@ msgstr "Escribe el nuevo correo dos veces:"
 #: src/gui/windows/changeemaildialog.cpp:137
 #, c-format
 msgid "The new email address needs to be at least %u characters long."
-msgstr "El nuevo correo electrónico necesita tener al menos %u caracteres de largitud."
+msgstr ""
+"El nuevo correo electrónico necesita tener al menos %u caracteres de "
+"largitud."
 
 #. TRANSLATORS: change email error
 #: src/gui/windows/changeemaildialog.cpp:145
 #, c-format
 msgid "The new email address needs to be less than %u characters long."
-msgstr "El nuevo correo electrónicao necesita tener menos de %u caracteres de longitud."
+msgstr ""
+"El nuevo correo electrónicao necesita tener menos de %u caracteres de "
+"longitud."
 
 #. TRANSLATORS: change email error
 #: src/gui/windows/changeemaildialog.cpp:153
@@ -6252,17 +6347,16 @@ msgstr "^"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:104
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:210
-#: src/gui/windows/charcreatedialog.cpp:221
-#: src/gui/windows/charcreatedialog.cpp:231
-#: src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:196
+#: src/gui/windows/charcreatedialog.cpp:209
+#: src/gui/windows/charcreatedialog.cpp:220
+#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:110
-#: src/gui/windows/charcreatedialog.cpp:600
+#: src/gui/windows/charcreatedialog.cpp:599
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Por favor, distribuye %d puntos"
@@ -6271,73 +6365,71 @@ msgstr "Por favor, distribuye %d puntos"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:201
-#: src/gui/windows/charcreatedialog.cpp:212
-#: src/gui/windows/charcreatedialog.cpp:223
-#: src/gui/windows/charcreatedialog.cpp:233
-#: src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:200
+#: src/gui/windows/charcreatedialog.cpp:211
+#: src/gui/windows/charcreatedialog.cpp:222
+#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:202
 msgid "Hair color:"
 msgstr "Color de cabello:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:213
 msgid "Hair style:"
 msgstr "Peinado:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:224
 msgid "Race:"
 msgstr "Raza:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:234
 msgid "Look:"
 msgstr "Apariencia:"
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:252
-#: src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr "F"
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:258
-#: src/gui/windows/charcreatedialog.cpp:265
-#: src/gui/windows/charcreatedialog.cpp:273
+#: src/gui/windows/charcreatedialog.cpp:257
+#: src/gui/windows/charcreatedialog.cpp:264
+#: src/gui/windows/charcreatedialog.cpp:272
 msgid "M"
 msgstr "M"
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:260
-#: src/gui/windows/charcreatedialog.cpp:277
+#: src/gui/windows/charcreatedialog.cpp:259
+#: src/gui/windows/charcreatedialog.cpp:276
 #: src/gui/windows/inventorywindow.cpp:223
 msgid "O"
 msgstr "O"
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:267
+#: src/gui/windows/charcreatedialog.cpp:266
 msgid "U"
 msgstr "D"
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:474
+#: src/gui/windows/charcreatedialog.cpp:473
 msgid "Your name needs to be at least 4 characters."
 msgstr "Tu nombre debe tener como mínimo 4 caracteres."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:590
+#: src/gui/windows/charcreatedialog.cpp:589
 msgid "Character stats OK"
 msgstr "Atributos del personaje OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:606
+#: src/gui/windows/charcreatedialog.cpp:605
 #, c-format
 msgid "Please remove %d points"
 msgstr "Por favor, borra %d puntos"
@@ -6401,7 +6493,12 @@ msgid ""
 "Level: %u\n"
 "Experience: %u\n"
 "Money: %s"
-msgstr "HP: %u/%u\nMp: %u/%u\nNivel: %u\nExperiencia: %u\nDinero: %s"
+msgstr ""
+"HP: %u/%u\n"
+"Mp: %u/%u\n"
+"Nivel: %u\n"
+"Experiencia: %u\n"
+"Dinero: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/charselectdialog.cpp:308
@@ -6503,8 +6600,7 @@ msgstr "Editar Servidor"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57
-#: src/gui/windows/serverdialog.cpp:112
+#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:112
 msgid "Connect"
 msgstr "Conectar"
 
@@ -6546,7 +6642,8 @@ msgstr ""
 #. TRANSLATORS: edit server dialog error message
 #: src/gui/windows/editserverdialog.cpp:214
 msgid "Please at least type both the address and the port of the server."
-msgstr "Por favor, por lo menos especifique el nombre y el puerto del servidor."
+msgstr ""
+"Por favor, por lo menos especifique el nombre y el puerto del servidor."
 
 #. TRANSLATORS: egg selection dialog name
 #: src/gui/windows/eggselectiondialog.cpp:42
@@ -6862,15 +6959,13 @@ msgstr "Asunto:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61
-#: src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr "Dinero:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr "Artículo:"
@@ -6979,7 +7074,7 @@ msgstr "barra de trabajo"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/windows/ministatuswindow.cpp:356
-#: src/gui/windows/statuswindow.cpp:236
+#: src/gui/windows/statuswindow.cpp:261
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Nivel: %d (GM %d)"
@@ -7097,13 +7192,15 @@ msgstr "Correo:"
 #: src/gui/windows/registerdialog.cpp:188
 #, c-format
 msgid "The username needs to be at least %u characters long."
-msgstr "El nombre de usuario necesita tener al menos %u caracteres de longitud."
+msgstr ""
+"El nombre de usuario necesita tener al menos %u caracteres de longitud."
 
 #. TRANSLATORS: error message
 #: src/gui/windows/registerdialog.cpp:197
 #, c-format
 msgid "The username needs to be less than %u characters long."
-msgstr "El nombre de usuario necesita tener menos de %u caracteres de longitud."
+msgstr ""
+"El nombre de usuario necesita tener menos de %u caracteres de longitud."
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: unregister dialog. error message.
@@ -7431,33 +7528,33 @@ msgid "Choose your party's name."
 msgstr "Escoge el nombre de tu grupo."
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:72
+#: src/gui/windows/statuswindow.cpp:74
 msgid "HP:"
 msgstr "HP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:75
+#: src/gui/windows/statuswindow.cpp:77
 msgid "Exp:"
 msgstr "Exp:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:136
+#: src/gui/windows/statuswindow.cpp:138
 msgid "MP:"
 msgstr "MP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:173 src/gui/windows/statuswindow.cpp:294
+#: src/gui/windows/statuswindow.cpp:175 src/gui/windows/statuswindow.cpp:319
 #, c-format
 msgid "Job: %d"
 msgstr "Trabajo: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:175
+#: src/gui/windows/statuswindow.cpp:177
 msgid "Job:"
 msgstr "Trabajo:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:224 src/gui/windows/statuswindow.cpp:342
+#: src/gui/windows/statuswindow.cpp:226 src/gui/windows/statuswindow.cpp:367
 #, c-format
 msgid "Character points: %d"
 msgstr "Puntos del personaje: %d"
@@ -7575,9 +7672,10 @@ msgstr "No tienes suficiente dinero."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
-msgstr "Fallo al añadir objeto. No puedes añadir más de un mismo tipo de objeto en la ventana."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+"Fallo al añadir objeto. No puedes añadir más de un mismo tipo de objeto en "
+"la ventana."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:539
@@ -8844,7 +8942,9 @@ msgstr "Limpiar ventana de drops"
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:50
 msgid "Access denied. Most likely, there are too many players on this server."
-msgstr "Acceso denegado. Lo más probable es que hayan muchos jugadores en este servidor."
+msgstr ""
+"Acceso denegado. Lo más probable es que hayan muchos jugadores en este "
+"servidor."
 
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:55
@@ -8912,7 +9012,9 @@ msgstr "No pudo ser enviado el Susurro, ya que es ignorado por %s."
 #. TRANSLATORS: chat message
 #: src/net/ea/chatrecv.cpp:114
 msgid "Whisper could not be sent, you ignored by all players."
-msgstr "El susurro no pudo ser enviado. Estás siendo ignorado por todos los jugadores."
+msgstr ""
+"El susurro no pudo ser enviado. Estás siendo ignorado por todos los "
+"jugadores."
 
 #. TRANSLATORS: error header
 #: src/net/ea/gamerecv.cpp:67
@@ -9002,7 +9104,9 @@ msgstr "Rechazado del servidor."
 #: src/net/ea/loginrecv.cpp:136 src/net/eathena/loginrecv.cpp:74
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
-msgstr "Has sido proscrito permanentemente del juego. Por favor contacta con el equipo de GM."
+msgstr ""
+"Has sido proscrito permanentemente del juego. Por favor contacta con el "
+"equipo de GM."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:141 src/net/eathena/loginrecv.cpp:79
@@ -9015,7 +9119,9 @@ msgstr "El cliente es muy viejo o el tipo de servidor es incorrecto."
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
-msgstr "Has sido proscrito temporalmente del juego hasta %s.\nPor favor contacta al equipo de GM a través de los foros."
+msgstr ""
+"Has sido proscrito temporalmente del juego hasta %s.\n"
+"Por favor contacta al equipo de GM a través de los foros."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:151 src/net/eathena/loginrecv.cpp:92
@@ -9055,33 +9161,33 @@ msgstr "Conexión al servidor terminada. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:431
-#: src/net/eathena/charserverrecv.cpp:479
+#: src/net/eathena/charserverrecv.cpp:398
+#: src/net/eathena/charserverrecv.cpp:446
 msgid "Character rename error."
 msgstr "Error de renombrado del personaje."
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:454
+#: src/net/eathena/charserverrecv.cpp:421
 msgid "Character renamed."
 msgstr "Personaje renombrado."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:470
+#: src/net/eathena/charserverrecv.cpp:437
 msgid "Rename not allowed."
 msgstr "No se permite renombrar."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:474
+#: src/net/eathena/charserverrecv.cpp:441
 msgid "New name is not set."
 msgstr "El nuevo nombre no está establecido."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:483
+#: src/net/eathena/charserverrecv.cpp:450
 msgid "Character not found."
 msgstr "Personaje no encontrado."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:517 src/net/tmwa/charserverrecv.cpp:339
+#: src/net/eathena/charserverrecv.cpp:484 src/net/tmwa/charserverrecv.cpp:303
 msgid "Failed to delete character."
 msgstr "Fallo al borrar el personaje."
 
@@ -9133,140 +9239,11 @@ msgstr ""
 msgid "Do you accept %s and %s as parents?"
 msgstr "¿Aceptas a %s y %s como tus padres?"
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:130
-#, c-format
-msgid "Strength %s"
-msgstr "Fuerza %s"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:132
-#, c-format
-msgid "Agility %s"
-msgstr "Agilidad %s"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:134
-#, c-format
-msgid "Vitality %s"
-msgstr "Vitalidad %s"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:136
-#, c-format
-msgid "Intelligence %s"
-msgstr "Inteligencia %s"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:138
-#, c-format
-msgid "Dexterity %s"
-msgstr "Destreza %s"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:140
-#, c-format
-msgid "Luck %s"
-msgstr "Suerte %s"
-
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:197 src/net/tmwa/generalhandler.cpp:207
+#: src/net/eathena/generalhandler.cpp:179 src/net/tmwa/generalhandler.cpp:189
 msgid "Got disconnected from server!"
 msgstr "¡Desconectado del servidor!"
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:223 src/net/tmwa/generalhandler.cpp:234
-msgid "Strength"
-msgstr "Fuerza"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:237
-msgid "Agility"
-msgstr "Agilidad"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:229 src/net/tmwa/generalhandler.cpp:240
-msgid "Vitality"
-msgstr "Vitalidad"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:243
-msgid "Intelligence"
-msgstr "Inteligencia"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:246
-msgid "Dexterity"
-msgstr "Destreza"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:238 src/net/tmwa/generalhandler.cpp:249
-msgid "Luck"
-msgstr "Suerte"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:253
-msgid "Defense"
-msgstr "Defensa"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:255
-msgid "M.Attack"
-msgstr "Ataque M."
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:257
-msgid "M.Defense"
-msgstr "Defensa M."
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:260
-#, no-c-format
-msgid "% Accuracy"
-msgstr "% de Precisión"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:263
-#, no-c-format
-msgid "% Evade"
-msgstr "% de Evasión"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:266
-#, no-c-format
-msgid "% Critical"
-msgstr "% de Críticos"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:268
-msgid "Attack Delay"
-msgstr "Retraso de Ataque"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:270
-msgid "Walk Delay"
-msgstr "Retraso de Marcha"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:272
-msgid "Attack Range"
-msgstr "Rango de Ataque"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:274
-msgid "Damage per sec."
-msgstr "Daño por segundo."
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266
-msgid "Karma"
-msgstr "Karma"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268
-msgid "Manner"
-msgstr "Comportamiento"
-
 #. TRANSLATORS: error message
 #: src/net/eathena/generalrecv.cpp:49 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
@@ -9422,7 +9399,7 @@ msgstr "Falta %s de tiempo de renta para el artículo %s."
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:199
+#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:190
 msgid "Unknown item"
 msgstr "Elemento desconocido"
 
@@ -9698,21 +9675,52 @@ msgstr "OpenGL Moderno"
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:93
-#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
-#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
+#: src/resources/db/itemdb.cpp:377 src/resources/db/itemdb.cpp:381
+#: src/resources/db/moddb.cpp:79 src/resources/db/monsterdb.cpp:101
+#: src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "anónimo"
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:104
+#: src/resources/db/petdb.cpp:103
 msgid "pet"
 msgstr "mascota"
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:103
+#: src/resources/db/skillunitdb.cpp:102
 msgid "skill"
 msgstr "habilidad"
 
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:45
+msgid "Strength"
+msgstr "Fuerza"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:49
+msgid "Agility"
+msgstr "Agilidad"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:53
+msgid "Vitality"
+msgstr "Vitalidad"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:57
+msgid "Intelligence"
+msgstr "Inteligencia"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:61
+msgid "Dexterity"
+msgstr "Destreza"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:65
+msgid "Luck"
+msgstr "Suerte"
+
 #. TRANSLATORS: inventory type name
 #: src/resources/inventory/inventory.cpp:340
 msgid "Npc"
@@ -10195,14 +10203,18 @@ msgstr "Tarjeta insertada."
 msgid ""
 "Deposit failed. You probably don't have this amount of money with you right "
 "now."
-msgstr "Deposito fallido. Probablemente no tengas esta cantidad de dinero contigo en este momento."
+msgstr ""
+"Deposito fallido. Probablemente no tengas esta cantidad de dinero contigo en "
+"este momento."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:427
 msgid ""
 "Withdraw failed. You probably don't have this amount of money in the bank "
 "right now."
-msgstr "Retiro fallido. Probablemente no tengas esta cantidad de dinero en el banco en este momento."
+msgstr ""
+"Retiro fallido. Probablemente no tengas esta cantidad de dinero en el banco "
+"en este momento."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:432
@@ -10244,12 +10256,15 @@ msgstr "El convenio ha fallado."
 msgid ""
 "The trade failed, because the entered amount of item is higher, than the "
 "buyer is willing to buy."
-msgstr "El intercambio falló, porque la cantidad de artículos ingresado es más alto que la que el comprador está dispuesto a comprar."
+msgstr ""
+"El intercambio falló, porque la cantidad de artículos ingresado es más alto "
+"que la que el comprador está dispuesto a comprar."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:465
 msgid "The trade failed, because the buyer is lacking required balance."
-msgstr "El intercambio falló, porque el comprador carece del balance requerido."
+msgstr ""
+"El intercambio falló, porque el comprador carece del balance requerido."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:470
@@ -10269,7 +10284,9 @@ msgstr "No se encontraron almacenes coincidentes."
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:483
 msgid "There are too many results. Please enter more detailed search term."
-msgstr "Hay muchos resultados. Por favor, ingresa términos de búsqueda más detallados."
+msgstr ""
+"Hay muchos resultados. Por favor, ingresa términos de búsqueda más "
+"detallados."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:488
@@ -10364,7 +10381,8 @@ msgstr "Error al unirse a la sala. Expulsado de la sala."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:556
-msgid "Room join failed. Not enought money."
+#, fuzzy
+msgid "Room join failed. Not enough money."
 msgstr "Error al unirse a la sala. Sin dinero suficiente."
 
 #. TRANSLATORS: notification message
@@ -10486,7 +10504,8 @@ msgstr "No puedes agregar el artículo a la tarjeta porque pesa demasiado."
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:654
 msgid "You can't add item to card because too many items."
-msgstr "No puedes agregar el artículo a la tarjeta porque hay muchos artículos."
+msgstr ""
+"No puedes agregar el artículo a la tarjeta porque hay muchos artículos."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:658
@@ -10631,34 +10650,38 @@ msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:796
-#, c-format
-msgid "You and %s was divorced."
+#, fuzzy, c-format
+msgid "You and %s are now divorced."
 msgstr "%s y tú se divorciaron."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:800
-msgid "You was called by partner."
+#, fuzzy
+msgid "You were called by your partner."
 msgstr "Fuiste llamado por tu pareja."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:804
-#, c-format
-msgid "You calling partner %s."
+#, fuzzy, c-format
+msgid "You are calling your partner, %s."
 msgstr "Has llamado a tu pareja %s."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:808
-msgid "Adoption child error. You already have baby."
+#, fuzzy
+msgid "Child adoption failed. You already have a baby."
 msgstr "Error al adoptar. Ya tienes un bebé."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:812
-msgid "Adoption child error. You level too small for have baby."
-msgstr "Error al adoptar. Tu nivel es muy bajo como para tener bebés."
+msgid "Child adoption failed. Your level is too low."
+msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:816
-msgid "Adoption child error. This player already married and can't be baby."
+#, fuzzy
+msgid ""
+"Child adoption failed. This player is already married and can't be a baby."
 msgstr "Error al adoptar. Este jugador ya está casado y no puede ser un bebé."
 
 #. TRANSLATORS: notification message
@@ -10668,19 +10691,22 @@ msgstr "Lugar guardado para la habilidad de teletransporte."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:825
-msgid "Error saving location. Not enought skill level."
+#, fuzzy
+msgid "Error saving location. Not enough skill level."
 msgstr "Error al guardar lugar. Nivel de habilidad insuficiente."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:829
-msgid "Error saving location. You not have warp skill."
+#, fuzzy
+msgid "Error saving location. You do not have warp skill."
 msgstr "Error al guardar lugar. No tienes la habilidad de teletransporte."
 
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:29
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "Opciones para /%s son \"yes\" | \"no\", \"true\" | \"false\", \"1\" | \"0\"."
+msgstr ""
+"Opciones para /%s son \"yes\" | \"no\", \"true\" | \"false\", \"1\" | \"0\"."
 
 #. TRANSLATORS: uptime command
 #: src/utils/stringutils.cpp:946
@@ -10736,3 +10762,60 @@ msgstr "%d segundos"
 #, c-format
 msgid "%d seconds"
 msgstr "%d segundos"
+
+#~ msgid "Strength %s"
+#~ msgstr "Fuerza %s"
+
+#~ msgid "Agility %s"
+#~ msgstr "Agilidad %s"
+
+#~ msgid "Vitality %s"
+#~ msgstr "Vitalidad %s"
+
+#~ msgid "Intelligence %s"
+#~ msgstr "Inteligencia %s"
+
+#~ msgid "Dexterity %s"
+#~ msgstr "Destreza %s"
+
+#~ msgid "Luck %s"
+#~ msgstr "Suerte %s"
+
+#~ msgid "Defense"
+#~ msgstr "Defensa"
+
+#~ msgid "M.Attack"
+#~ msgstr "Ataque M."
+
+#~ msgid "M.Defense"
+#~ msgstr "Defensa M."
+
+#~ msgid "% Accuracy"
+#~ msgstr "% de Precisión"
+
+#~ msgid "% Evade"
+#~ msgstr "% de Evasión"
+
+#~ msgid "% Critical"
+#~ msgstr "% de Críticos"
+
+#~ msgid "Attack Delay"
+#~ msgstr "Retraso de Ataque"
+
+#~ msgid "Walk Delay"
+#~ msgstr "Retraso de Marcha"
+
+#~ msgid "Attack Range"
+#~ msgstr "Rango de Ataque"
+
+#~ msgid "Damage per sec."
+#~ msgstr "Daño por segundo."
+
+#~ msgid "Karma"
+#~ msgstr "Karma"
+
+#~ msgid "Manner"
+#~ msgstr "Comportamiento"
+
+#~ msgid "Adoption child error. You level too small for have baby."
+#~ msgstr "Error al adoptar. Tu nivel es muy bajo como para tener bebés."
diff --git a/po/fi.po b/po/fi.po
index 9fa98b28f..1659178af 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011
 # Sini Ruohomaa <sini.ruohomaa@iki.fi>, 2011
@@ -9,14 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-06-18 18:53+0300\n"
+"POT-Creation-Date: 2016-07-02 19:47+0300\n"
 "PO-Revision-Date: 2016-06-19 09:21+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Finnish (http://www.transifex.com/akaras/manaplus/language/fi/)\n"
+"Language-Team: Finnish (http://www.transifex.com/akaras/manaplus/language/"
+"fi/)\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
@@ -33,7 +34,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:171 src/client.cpp:1569 src/client.cpp:1604
+#: src/actions/actions.cpp:171 src/client.cpp:1572 src/client.cpp:1607
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
@@ -44,7 +45,7 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_video.cpp:420
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:476
+#: src/gui/windows/charcreatedialog.cpp:475
 #: src/gui/windows/charselectdialog.cpp:262
 #: src/gui/windows/charselectdialog.cpp:310 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:59
@@ -53,9 +54,9 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:531
 #: src/gui/windows/textdialog.cpp:53 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:456
-#: src/net/eathena/charserverrecv.cpp:491
-#: src/net/eathena/charserverrecv.cpp:519 src/net/tmwa/charserverrecv.cpp:341
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:423
+#: src/net/eathena/charserverrecv.cpp:458
+#: src/net/eathena/charserverrecv.cpp:486 src/net/tmwa/charserverrecv.cpp:305
 msgid "OK"
 msgstr "Ok"
 
@@ -302,26 +303,26 @@ msgid "Visible on map"
 msgstr "Näkyvillä kartalla"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:496
+#: src/being/being.cpp:494
 msgid "Human"
 msgstr ""
 
 #. TRANSLATORS: dodge or miss message in attacks
-#: src/being/being.cpp:683
+#: src/being/being.cpp:676
 msgid "dodge"
 msgstr "väistö"
 
-#: src/being/being.cpp:683
+#: src/being/being.cpp:676
 msgid "miss"
 msgstr "huti"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2282 src/gui/windows/whoisonline.cpp:882
+#: src/being/being.cpp:2275 src/gui/windows/whoisonline.cpp:882
 msgid "A"
 msgstr "P"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2287 src/gui/windows/whoisonline.cpp:887
+#: src/being/being.cpp:2280 src/gui/windows/whoisonline.cpp:887
 msgid "I"
 msgstr "-"
 
@@ -472,41 +473,41 @@ msgstr "Leijuva puhekupla"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:870 src/dyetool/client.cpp:491 src/gui/windowmenu.cpp:189
+#: src/client.cpp:872 src/dyetool/client.cpp:491 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:66
 msgid "Setup"
 msgstr "Asetukset"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:873 src/dyetool/client.cpp:494
+#: src/client.cpp:875 src/dyetool/client.cpp:494
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:876 src/dyetool/client.cpp:497
+#: src/client.cpp:878 src/dyetool/client.cpp:497
 #: src/gui/widgets/tabs/setup_video.cpp:110
 msgid "Video"
 msgstr "Kuva"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:879 src/dyetool/client.cpp:500
+#: src/client.cpp:881 src/dyetool/client.cpp:500
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Teema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:882 src/dyetool/client.cpp:503
+#: src/client.cpp:884 src/dyetool/client.cpp:503
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:885 src/dyetool/client.cpp:506 src/gui/windowmenu.cpp:74
+#: src/client.cpp:887 src/dyetool/client.cpp:506 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Apua"
@@ -527,7 +528,7 @@ msgstr "Apua"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:889 src/client.cpp:1483 src/client.cpp:1502
+#: src/client.cpp:891 src/client.cpp:1486 src/client.cpp:1505
 #: src/dyetool/client.cpp:510 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:756 src/gui/popups/popupmenu.cpp:833
 #: src/gui/popups/popupmenu.cpp:1087 src/gui/windows/didyouknowwindow.cpp:81
@@ -540,32 +541,32 @@ msgid "Close"
 msgstr "Sulje"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1115 src/gui/windowmanager_unittest.cc:156
+#: src/client.cpp:1117 src/gui/windowmanager_unittest.cc:156
 msgid "Connecting to server"
 msgstr "Yhdistän palvelimeen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1172 src/gui/windowmanager_unittest.cc:173
+#: src/client.cpp:1174 src/gui/windowmanager_unittest.cc:173
 msgid "Logging in"
 msgstr "Kirjaudun sisään"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1221
+#: src/client.cpp:1223
 msgid "Entering game world"
 msgstr "Siirryn pelimaailmaan"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1369
+#: src/client.cpp:1372
 msgid "Requesting characters"
 msgstr "Pyydän hahmoja"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1412
+#: src/client.cpp:1415
 msgid "Connecting to the game server"
 msgstr "Yhdistän pelipalvelimeen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1424
+#: src/client.cpp:1427
 msgid "Changing game servers"
 msgstr "Vaihdan pelipalvelinta"
 
@@ -582,52 +583,52 @@ msgstr "Vaihdan pelipalvelinta"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1480 src/client.cpp:1499 src/client.cpp:1738
+#: src/client.cpp:1483 src/client.cpp:1502 src/client.cpp:1741
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:472
+#: src/gui/windows/charcreatedialog.cpp:471
 #: src/gui/windows/charselectdialog.cpp:306
 #: src/gui/windows/editserverdialog.cpp:212
 #: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:429
-#: src/net/eathena/charserverrecv.cpp:433
-#: src/net/eathena/charserverrecv.cpp:515 src/net/tmwa/charserverrecv.cpp:337
+#: src/net/eathena/charserverrecv.cpp:396
+#: src/net/eathena/charserverrecv.cpp:400
+#: src/net/eathena/charserverrecv.cpp:482 src/net/tmwa/charserverrecv.cpp:301
 msgid "Error"
 msgstr "Virhe"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1518
+#: src/client.cpp:1521
 msgid "Requesting registration details"
 msgstr "Pyydän rekisteröitymisen yksityiskohtia"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1565
+#: src/client.cpp:1568
 msgid "Password Change"
 msgstr "Salasanan vaihto"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1567
+#: src/client.cpp:1570
 msgid "Password changed successfully!"
 msgstr "Salasana vaihdettu onnistuneesti!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1600
+#: src/client.cpp:1603
 msgid "Email Change"
 msgstr "Sähköpostin vaihto"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1602
+#: src/client.cpp:1605
 msgid "Email changed successfully!"
 msgstr "Sähköpostiosoite vaihdettu onnistuneesti!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1638
+#: src/client.cpp:1641
 msgid "Unregister Successful"
 msgstr "Tietojen poisto onnistui"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1640
+#: src/client.cpp:1643
 msgid "Farewell, come back any time..."
 msgstr "Näkemisiin, tule pian takaisin..."
 
@@ -699,7 +700,8 @@ msgstr "  -c --character      : Hahmo sisäänkirjautumiseen"
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:77
 msgid "  -s --server         : Login server name or IP"
-msgstr "  -s --server         : Palvelinnimi tai IP-osoite sisäänkirjautumiseen"
+msgstr ""
+"  -s --server         : Palvelinnimi tai IP-osoite sisäänkirjautumiseen"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:80
@@ -820,23 +822,23 @@ msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:598
+#: src/game.cpp:600
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:608
+#: src/game.cpp:610
 msgid "Saving screenshot failed!"
 msgstr "Ruutukaappauksen tallentaminen epäonnistui!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:695
+#: src/game.cpp:697
 msgid "The connection to the server was lost."
 msgstr "Yhteys palvelimeen katkesi."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:698
+#: src/game.cpp:700
 msgid "Network Error"
 msgstr "Verkkovirhe"
 
@@ -1251,8 +1253,7 @@ msgstr ""
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
+"You are carrying more than half your weight. You are unable to regain health."
 msgstr "Kannat roinaa yli puolen elopainoasi. Rasitus estää sinua paranemasta."
 
 #. TRANSLATORS: weight message
@@ -1269,8 +1270,7 @@ msgstr "Kannat roinaa alle puolet elopainoasi, ja paranet jälleen."
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:671
-#: src/gui/windows/serverdialog.cpp:603
+#: src/gui/windows/equipmentwindow.cpp:671 src/gui/windows/serverdialog.cpp:603
 msgid "default"
 msgstr "oletus"
 
@@ -1822,11 +1822,9 @@ msgstr "Tee kaupat"
 #. TRANSLATORS: attack player
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
-#. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:180 src/gui/popups/popupmenu.cpp:304
 #: src/gui/popups/popupmenu.cpp:912 src/gui/widgets/skillinfo.cpp:125
-#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
-#: src/net/tmwa/generalhandler.cpp:251
+#: src/input/pages/basic.cpp:40
 msgid "Attack"
 msgstr "Hyökkää"
 
@@ -1902,7 +1900,7 @@ msgstr "Liiku"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:270 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:152
+#: src/resources/db/npcdb.cpp:151
 msgid "Talk"
 msgstr "Keskustele"
 
@@ -1920,7 +1918,7 @@ msgstr "Keskustele"
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:154
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:153
 msgid "Buy"
 msgstr "Osta"
 
@@ -1938,7 +1936,7 @@ msgstr "Osta"
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
 #: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:256
-#: src/resources/db/npcdb.cpp:156
+#: src/resources/db/npcdb.cpp:155
 msgid "Sell"
 msgstr "Myy"
 
@@ -2040,7 +2038,7 @@ msgstr "Poista varuste käytöstä"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:408 src/resources/db/petdb.cpp:160
+#: src/gui/popups/popupmenu.cpp:408 src/resources/db/petdb.cpp:159
 msgid "Return to egg"
 msgstr ""
 
@@ -2437,7 +2435,7 @@ msgstr "Palauta oletusmuokkaimet (keltainen palkki)"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2125 src/gui/windows/statuswindow.cpp:90
 msgid "Copy to chat"
 msgstr "Kopioi keskusteluun"
 
@@ -2489,9 +2487,8 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/popups/popupmenu.cpp:2386 src/gui/popups/skillpopup.cpp:127
-#: src/gui/windows/ministatuswindow.cpp:363
-#: src/gui/windows/statuswindow.cpp:68 src/gui/windows/statuswindow.cpp:243
-#: src/gui/windows/statuswindow.cpp:367
+#: src/gui/windows/ministatuswindow.cpp:363 src/gui/windows/statuswindow.cpp:70
+#: src/gui/windows/statuswindow.cpp:268 src/gui/windows/statuswindow.cpp:392
 #, c-format
 msgid "Level: %d"
 msgstr "Taso: %d"
@@ -2910,8 +2907,8 @@ msgstr ""
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3100 src/gui/popups/popupmenu.cpp:3119
 #: src/gui/popups/popupmenu.cpp:3132 src/gui/windows/charselectdialog.cpp:76
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:452
-#: src/net/eathena/charserverrecv.cpp:488
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:419
+#: src/net/eathena/charserverrecv.cpp:455
 msgid "Info"
 msgstr "Tietoja"
 
@@ -3302,8 +3299,8 @@ msgstr ""
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/statuswindow.cpp:70
-#: src/gui/windows/statuswindow.cpp:220 src/gui/windows/statuswindow.cpp:334
+#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/statuswindow.cpp:72
+#: src/gui/windows/statuswindow.cpp:222 src/gui/windows/statuswindow.cpp:359
 #, c-format
 msgid "Money: %s"
 msgstr "Rahat: %s"
@@ -3359,7 +3356,7 @@ msgstr "Sulje"
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:194
 #: src/gui/windows/itemamountwindow.cpp:230 src/gui/windows/npcdialog.cpp:123
-#: src/gui/windows/statuswindow.cpp:746
+#: src/gui/windows/statuswindow.cpp:771
 msgid "+"
 msgstr "+"
 
@@ -3380,8 +3377,8 @@ msgstr "-"
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/selldialog.cpp:133 src/gui/windows/buydialog.cpp:299
-#: src/gui/windows/statuswindow.cpp:483 src/gui/windows/statuswindow.cpp:539
-#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:766
+#: src/gui/windows/statuswindow.cpp:508 src/gui/windows/statuswindow.cpp:564
+#: src/gui/windows/statuswindow.cpp:769 src/gui/windows/statuswindow.cpp:791
 msgid "Max"
 msgstr "Max"
 
@@ -3537,15 +3534,13 @@ msgstr "Saaliinjako käytössä."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104
-#: src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr "Saaliinjako poistettu käytöstä."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109
-#: src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr "Saaliinjako ei ole mahdollista."
 
@@ -3556,22 +3551,19 @@ msgstr "Saaliinjaon tila on tuntematon."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150
-#: src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr "Kokemuksen jako käytössä."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155
-#: src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr "Kokemuksen jako pois käytöstä."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160
-#: src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr "Kokemuksen jako ei ole mahdollista."
 
@@ -4005,15 +3997,15 @@ msgstr ""
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
+"Note: no other text inputs will be allowed to receive text input when you "
+"typing in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86
-#: src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr "Värit"
 
@@ -4037,9 +4029,11 @@ msgstr "Näytä keskustelun värilista"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat "
+"window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4066,9 +4060,11 @@ msgstr "Keskusteluviestin pituusraja"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed "
+"in chat.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will be truncated."
+"Note: long lines can make client slower. Lines longer than this limit will "
+"be truncated."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4079,7 +4075,9 @@ msgstr "Keskusteluvälilehden riviraja"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
+"specified number of last lines of text. Oldest lines exceeding this limit "
+"are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
 msgstr ""
@@ -4120,8 +4118,8 @@ msgstr "Näytä keskusteluhistoria"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on"
-" startup instead of starting with empty chat tabs."
+"If this setting enabled, client will load old chat tabs content from logs on "
+"startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4132,9 +4130,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be "
+"shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4145,9 +4145,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be "
+"shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4163,9 +4165,13 @@ msgstr "Piilota kauppaviestit"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will "
+"be displayed in chat. Disable this setting if you want to see shop-related "
+"messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
+"Note: technically, ManaPlus shop implemented as usual private messages with "
+"special content. If you disable this setting, you will be able to see these "
+"messages and get idea when other players are looking at your shop."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4178,7 +4184,8 @@ msgstr "Näytä MVP-viestit"
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
+"usually makes little difference."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4197,9 +4204,12 @@ msgstr "Laita kaikki kuiskaukset välilehtiin"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in "
+"separate tabs, separate tab for each player. If this setting disabled, all "
+"whispers will appear in General tab.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
+"Note: putting all whispers to single General tab is known to be confusing. "
+"Think twice before disabling this feature."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4210,7 +4220,8 @@ msgstr "Kirjaa magiaviestit debug-välilehdelle"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If "
+"disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
 msgstr ""
@@ -4223,9 +4234,11 @@ msgstr "Näytä palvelinviestit debug-välilehdellä"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of "
+"chat. If disabled, server messages will appear in General chat instead.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
+"Note: according to 4144, disabling this could also make you to lose some "
+"debug messages from client in Debug tab since these are fake server messages."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4250,9 +4263,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM "
+"activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
+"Note: this setting only makes difference for GMs (Game Masters) since this "
+"tab only appears for GMs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4263,7 +4278,8 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this feature.\n"
+"If this feature enabled, language tab will appear if server supports this "
+"feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
 msgstr ""
@@ -4276,7 +4292,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
+"If this setting enabled and server supports different chats for different "
+"languages, you will see messages for all languages, regardless of your "
+"language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
 msgstr ""
@@ -4289,7 +4307,9 @@ msgstr "Ota taisteluvälilehti käyttöön"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will "
+"contain messages related to battles, like damage and experience gain, if "
+"battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
 msgstr ""
@@ -4315,7 +4335,10 @@ msgstr "Muuta välilehden kokoa tarpeen mukaan"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to "
+"adapt to appearance of chat input field when you typing message and when "
+"input field of chat disappears. If disabled, chat input area will always "
+"occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
@@ -4350,7 +4373,8 @@ msgstr "Korosta sanat (pilkuin erotettu)"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. "
+"Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
 msgstr ""
@@ -4363,7 +4387,8 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender "
+"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
 msgstr ""
@@ -4376,9 +4401,12 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This "
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by "
+"default."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4492,7 +4520,9 @@ msgstr "Päällekkäisiä näppäinoikopolkuja löytyi."
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr "Päällekkäiset näppäinoikotiet \"%s\" ja \"%s\" voivat aiheuttaa outouksia; ole hyvä ja poista päällekkäisyydet."
+msgstr ""
+"Päällekkäiset näppäinoikotiet \"%s\" ja \"%s\" voivat aiheuttaa outouksia; "
+"ole hyvä ja poista päällekkäisyydet."
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
@@ -5587,7 +5617,8 @@ msgstr "Ikkunan koko vaihdettu"
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:401
 msgid "Some windows may be moved to fit the lowered resolution."
-msgstr "Joitakin ikkunoita on siirretty, jotta ne mahtuvat pienemmälle ruudulle."
+msgstr ""
+"Joitakin ikkunoita on siirretty, jotta ne mahtuvat pienemmälle ruudulle."
 
 #. TRANSLATORS: speach type
 #: src/gui/widgets/tabs/setup_visual.cpp:43
@@ -6122,8 +6153,7 @@ msgstr "Määrä:"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:618
-#: src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:618 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Luo"
 
@@ -6239,17 +6269,16 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:104
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:210
-#: src/gui/windows/charcreatedialog.cpp:221
-#: src/gui/windows/charcreatedialog.cpp:231
-#: src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:196
+#: src/gui/windows/charcreatedialog.cpp:209
+#: src/gui/windows/charcreatedialog.cpp:220
+#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:110
-#: src/gui/windows/charcreatedialog.cpp:600
+#: src/gui/windows/charcreatedialog.cpp:599
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Jaa %d pistettä"
@@ -6258,73 +6287,71 @@ msgstr "Jaa %d pistettä"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:201
-#: src/gui/windows/charcreatedialog.cpp:212
-#: src/gui/windows/charcreatedialog.cpp:223
-#: src/gui/windows/charcreatedialog.cpp:233
-#: src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:200
+#: src/gui/windows/charcreatedialog.cpp:211
+#: src/gui/windows/charcreatedialog.cpp:222
+#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:202
 msgid "Hair color:"
 msgstr "Hiusten väri:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:213
 msgid "Hair style:"
 msgstr "Hiustyyli:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:224
 msgid "Race:"
 msgstr "Rotu:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:234
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:252
-#: src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:258
-#: src/gui/windows/charcreatedialog.cpp:265
-#: src/gui/windows/charcreatedialog.cpp:273
+#: src/gui/windows/charcreatedialog.cpp:257
+#: src/gui/windows/charcreatedialog.cpp:264
+#: src/gui/windows/charcreatedialog.cpp:272
 msgid "M"
 msgstr ""
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:260
-#: src/gui/windows/charcreatedialog.cpp:277
+#: src/gui/windows/charcreatedialog.cpp:259
+#: src/gui/windows/charcreatedialog.cpp:276
 #: src/gui/windows/inventorywindow.cpp:223
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:267
+#: src/gui/windows/charcreatedialog.cpp:266
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:474
+#: src/gui/windows/charcreatedialog.cpp:473
 msgid "Your name needs to be at least 4 characters."
 msgstr "Nimessäsi täytyy olla ainakin 4 merkkiä."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:590
+#: src/gui/windows/charcreatedialog.cpp:589
 msgid "Character stats OK"
 msgstr "Hahmon pistejako OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:606
+#: src/gui/windows/charcreatedialog.cpp:605
 #, c-format
 msgid "Please remove %d points"
 msgstr "%d pistettä liikaa, ole hyvä ja poista ylimäärä"
@@ -6490,8 +6517,7 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57
-#: src/gui/windows/serverdialog.cpp:112
+#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:112
 msgid "Connect"
 msgstr "Yhdistä"
 
@@ -6849,15 +6875,13 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61
-#: src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr ""
@@ -6966,7 +6990,7 @@ msgstr "työpalkki"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/windows/ministatuswindow.cpp:356
-#: src/gui/windows/statuswindow.cpp:236
+#: src/gui/windows/statuswindow.cpp:261
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Taso: %d (GM %d)"
@@ -7418,33 +7442,33 @@ msgid "Choose your party's name."
 msgstr "Anna ryhmällesi nimi."
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:72
+#: src/gui/windows/statuswindow.cpp:74
 msgid "HP:"
 msgstr "VP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:75
+#: src/gui/windows/statuswindow.cpp:77
 msgid "Exp:"
 msgstr "Kok:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:136
+#: src/gui/windows/statuswindow.cpp:138
 msgid "MP:"
 msgstr "MP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:173 src/gui/windows/statuswindow.cpp:294
+#: src/gui/windows/statuswindow.cpp:175 src/gui/windows/statuswindow.cpp:319
 #, c-format
 msgid "Job: %d"
 msgstr "Työ: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:175
+#: src/gui/windows/statuswindow.cpp:177
 msgid "Job:"
 msgstr "Työ:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:224 src/gui/windows/statuswindow.cpp:342
+#: src/gui/windows/statuswindow.cpp:226 src/gui/windows/statuswindow.cpp:367
 #, c-format
 msgid "Character points: %d"
 msgstr "Hahmopisteitä: %d"
@@ -7562,8 +7586,7 @@ msgstr "Sinulla ei ole tarpeeksi rahaa."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "Tavaran lisääminen epäonnistui, limittämisongelma."
 
 #. TRANSLATORS: trade error
@@ -8989,7 +9012,8 @@ msgstr "Palvelin ei kelpuuttanut yhteydenottoasi."
 #: src/net/ea/loginrecv.cpp:136 src/net/eathena/loginrecv.cpp:74
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
-msgstr "Pääsysi peliin on pysyvästi estetty. Ole hyvä ja ota yhteyttä GM-tiimiin."
+msgstr ""
+"Pääsysi peliin on pysyvästi estetty. Ole hyvä ja ota yhteyttä GM-tiimiin."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:141 src/net/eathena/loginrecv.cpp:79
@@ -9002,7 +9026,9 @@ msgstr ""
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
-msgstr "Pääsysi peliin on väliaikaisesti estetty %s asti.\nOle hyvä ja ota yhteyttä GM-tiimiin keskustelufoorumin kautta."
+msgstr ""
+"Pääsysi peliin on väliaikaisesti estetty %s asti.\n"
+"Ole hyvä ja ota yhteyttä GM-tiimiin keskustelufoorumin kautta."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:151 src/net/eathena/loginrecv.cpp:92
@@ -9042,33 +9068,33 @@ msgstr "Yhteys palvelimeen katkaistu. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:431
-#: src/net/eathena/charserverrecv.cpp:479
+#: src/net/eathena/charserverrecv.cpp:398
+#: src/net/eathena/charserverrecv.cpp:446
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:454
+#: src/net/eathena/charserverrecv.cpp:421
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:470
+#: src/net/eathena/charserverrecv.cpp:437
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:474
+#: src/net/eathena/charserverrecv.cpp:441
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:483
+#: src/net/eathena/charserverrecv.cpp:450
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:517 src/net/tmwa/charserverrecv.cpp:339
+#: src/net/eathena/charserverrecv.cpp:484 src/net/tmwa/charserverrecv.cpp:303
 msgid "Failed to delete character."
 msgstr "Hahmon poisto epäonnistui."
 
@@ -9120,140 +9146,11 @@ msgstr ""
 msgid "Do you accept %s and %s as parents?"
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:130
-#, c-format
-msgid "Strength %s"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:132
-#, c-format
-msgid "Agility %s"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:134
-#, c-format
-msgid "Vitality %s"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:136
-#, c-format
-msgid "Intelligence %s"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:138
-#, c-format
-msgid "Dexterity %s"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:140
-#, c-format
-msgid "Luck %s"
-msgstr ""
-
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:197 src/net/tmwa/generalhandler.cpp:207
+#: src/net/eathena/generalhandler.cpp:179 src/net/tmwa/generalhandler.cpp:189
 msgid "Got disconnected from server!"
 msgstr "Yhteys palvelimeen katkesi!"
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:223 src/net/tmwa/generalhandler.cpp:234
-msgid "Strength"
-msgstr "Voima"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:237
-msgid "Agility"
-msgstr "Ketteryys"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:229 src/net/tmwa/generalhandler.cpp:240
-msgid "Vitality"
-msgstr "Elinvoima"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:243
-msgid "Intelligence"
-msgstr "Älykkyys"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:246
-msgid "Dexterity"
-msgstr "Näppäryys"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:238 src/net/tmwa/generalhandler.cpp:249
-msgid "Luck"
-msgstr "Tuuri"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:253
-msgid "Defense"
-msgstr "Puolustus"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:255
-msgid "M.Attack"
-msgstr "T.-hyökkäys"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:257
-msgid "M.Defense"
-msgstr "T.-puolustus"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:260
-#, no-c-format
-msgid "% Accuracy"
-msgstr "% Tarkkuus"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:263
-#, no-c-format
-msgid "% Evade"
-msgstr "% Välttö"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:266
-#, no-c-format
-msgid "% Critical"
-msgstr "% Täysosuma"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:268
-msgid "Attack Delay"
-msgstr "Hyökkäysviive"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:270
-msgid "Walk Delay"
-msgstr "Kävelyviive"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:272
-msgid "Attack Range"
-msgstr "Hyökkäyskantama"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:274
-msgid "Damage per sec."
-msgstr "Vahinko sekunnissa."
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266
-msgid "Karma"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268
-msgid "Manner"
-msgstr ""
-
 #. TRANSLATORS: error message
 #: src/net/eathena/generalrecv.cpp:49 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
@@ -9409,7 +9306,7 @@ msgstr ""
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:199
+#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:190
 msgid "Unknown item"
 msgstr "Tuntematon tavara"
 
@@ -9685,21 +9582,52 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:93
-#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
-#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
+#: src/resources/db/itemdb.cpp:377 src/resources/db/itemdb.cpp:381
+#: src/resources/db/moddb.cpp:79 src/resources/db/monsterdb.cpp:101
+#: src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "nimetön"
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:104
+#: src/resources/db/petdb.cpp:103
 msgid "pet"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:103
+#: src/resources/db/skillunitdb.cpp:102
 msgid "skill"
 msgstr ""
 
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:45
+msgid "Strength"
+msgstr "Voima"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:49
+msgid "Agility"
+msgstr "Ketteryys"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:53
+msgid "Vitality"
+msgstr "Elinvoima"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:57
+msgid "Intelligence"
+msgstr "Älykkyys"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:61
+msgid "Dexterity"
+msgstr "Näppäryys"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:65
+msgid "Luck"
+msgstr "Tuuri"
+
 #. TRANSLATORS: inventory type name
 #: src/resources/inventory/inventory.cpp:340
 msgid "Npc"
@@ -10010,7 +9938,8 @@ msgstr ""
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:287
 msgid "Failed adding item. Trade partner is over weighted."
-msgstr "Tavaran lisääminen epäonnistui; kauppakumppanilla on liian painava lasti."
+msgstr ""
+"Tavaran lisääminen epäonnistui; kauppakumppanilla on liian painava lasti."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:291
@@ -10351,8 +10280,9 @@ msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:556
-msgid "Room join failed. Not enought money."
-msgstr ""
+#, fuzzy
+msgid "Room join failed. Not enough money."
+msgstr "Sinulla ei ole tarpeeksi rahaa."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:560
@@ -10619,33 +10549,34 @@ msgstr ""
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:796
 #, c-format
-msgid "You and %s was divorced."
+msgid "You and %s are now divorced."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:800
-msgid "You was called by partner."
+msgid "You were called by your partner."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:804
 #, c-format
-msgid "You calling partner %s."
+msgid "You are calling your partner, %s."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:808
-msgid "Adoption child error. You already have baby."
+msgid "Child adoption failed. You already have a baby."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:812
-msgid "Adoption child error. You level too small for have baby."
+msgid "Child adoption failed. Your level is too low."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:816
-msgid "Adoption child error. This player already married and can't be baby."
+msgid ""
+"Child adoption failed. This player is already married and can't be a baby."
 msgstr ""
 
 #. TRANSLATORS: notification message
@@ -10655,19 +10586,21 @@ msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:825
-msgid "Error saving location. Not enought skill level."
+msgid "Error saving location. Not enough skill level."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:829
-msgid "Error saving location. You not have warp skill."
+msgid "Error saving location. You do not have warp skill."
 msgstr ""
 
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:29
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "Vaihtoehdot komennolle /%s ovat \"yes\" (kyllä), \"no\" (ei) tai vastaavasti \"true\", \"false\", \"1\" tai \"0\"."
+msgstr ""
+"Vaihtoehdot komennolle /%s ovat \"yes\" (kyllä), \"no\" (ei) tai vastaavasti "
+"\"true\", \"false\", \"1\" tai \"0\"."
 
 #. TRANSLATORS: uptime command
 #: src/utils/stringutils.cpp:946
@@ -10723,3 +10656,33 @@ msgstr "%d sekuntia"
 #, c-format
 msgid "%d seconds"
 msgstr ""
+
+#~ msgid "Defense"
+#~ msgstr "Puolustus"
+
+#~ msgid "M.Attack"
+#~ msgstr "T.-hyökkäys"
+
+#~ msgid "M.Defense"
+#~ msgstr "T.-puolustus"
+
+#~ msgid "% Accuracy"
+#~ msgstr "% Tarkkuus"
+
+#~ msgid "% Evade"
+#~ msgstr "% Välttö"
+
+#~ msgid "% Critical"
+#~ msgstr "% Täysosuma"
+
+#~ msgid "Attack Delay"
+#~ msgstr "Hyökkäysviive"
+
+#~ msgid "Walk Delay"
+#~ msgstr "Kävelyviive"
+
+#~ msgid "Attack Range"
+#~ msgstr "Hyökkäyskantama"
+
+#~ msgid "Damage per sec."
+#~ msgstr "Vahinko sekunnissa."
diff --git a/po/fr.po b/po/fr.po
index 1eac364c2..9dc892a67 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # adrien vigneron <adrienvigneron@ml1.net>, 2016
 # Alige <aligetmw@hotmail.fr>, 2013-2016
@@ -27,14 +27,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-06-18 18:53+0300\n"
+"POT-Creation-Date: 2016-07-02 19:47+0300\n"
 "PO-Revision-Date: 2016-06-30 22:32+0000\n"
 "Last-Translator: Alige <aligetmw@hotmail.fr>\n"
-"Language-Team: French (http://www.transifex.com/akaras/manaplus/language/fr/)\n"
+"Language-Team: French (http://www.transifex.com/akaras/manaplus/language/"
+"fr/)\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. TRANSLATORS: file uploaded message
@@ -51,7 +52,7 @@ msgstr "Fichier mis en ligne"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:171 src/client.cpp:1569 src/client.cpp:1604
+#: src/actions/actions.cpp:171 src/client.cpp:1572 src/client.cpp:1607
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
@@ -62,7 +63,7 @@ msgstr "Fichier mis en ligne"
 #: src/gui/widgets/tabs/setup_video.cpp:420
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:476
+#: src/gui/windows/charcreatedialog.cpp:475
 #: src/gui/windows/charselectdialog.cpp:262
 #: src/gui/windows/charselectdialog.cpp:310 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:59
@@ -71,9 +72,9 @@ msgstr "Fichier mis en ligne"
 #: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:531
 #: src/gui/windows/textdialog.cpp:53 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:456
-#: src/net/eathena/charserverrecv.cpp:491
-#: src/net/eathena/charserverrecv.cpp:519 src/net/tmwa/charserverrecv.cpp:341
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:423
+#: src/net/eathena/charserverrecv.cpp:458
+#: src/net/eathena/charserverrecv.cpp:486 src/net/tmwa/charserverrecv.cpp:305
 msgid "OK"
 msgstr "Ok"
 
@@ -123,7 +124,9 @@ msgstr "Historique ajouté dans :"
 #: src/actions/actions.cpp:1748
 msgid ""
 "Last seen disabled. Enable in players / collect players id and seen log."
-msgstr "Dernière fois vu désactivé. Activer dans joueurs / collecter les id des joueurs et l'historique de vue."
+msgstr ""
+"Dernière fois vu désactivé. Activer dans joueurs / collecter les id des "
+"joueurs et l'historique de vue."
 
 #. TRANSLATORS: last seen error
 #: src/actions/actions.cpp:1767 src/actions/actions.cpp:1781
@@ -145,7 +148,9 @@ msgstr "Impossible d'envoyer un message privé vide ou un message de chaîne !"
 #: src/actions/chat.cpp:315
 #, c-format
 msgid "Cannot create a whisper tab \"%s\"! It probably already exists."
-msgstr "Impossible de créer un onglet de discussion privée \"%s\". Il existe probablement déjà."
+msgstr ""
+"Impossible de créer un onglet de discussion privée \"%s\". Il existe "
+"probablement déjà."
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
@@ -180,7 +185,8 @@ msgstr "Le message ferme la conversation."
 #. TRANSLATORS: message from toggle chat command
 #: src/actions/chat.cpp:457
 msgid "Return now toggles chat."
-msgstr "La touche <Entrée> ferme maintenant la ligne d'entrée de la conversation."
+msgstr ""
+"La touche <Entrée> ferme maintenant la ligne d'entrée de la conversation."
 
 #. TRANSLATORS: message from toggle chat command
 #: src/actions/chat.cpp:467
@@ -320,26 +326,26 @@ msgid "Visible on map"
 msgstr "Visible sur la carte"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:496
+#: src/being/being.cpp:494
 msgid "Human"
 msgstr "Humain"
 
 #. TRANSLATORS: dodge or miss message in attacks
-#: src/being/being.cpp:683
+#: src/being/being.cpp:676
 msgid "dodge"
 msgstr "esquive"
 
-#: src/being/being.cpp:683
+#: src/being/being.cpp:676
 msgid "miss"
 msgstr "raté"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2282 src/gui/windows/whoisonline.cpp:882
+#: src/being/being.cpp:2275 src/gui/windows/whoisonline.cpp:882
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2287 src/gui/windows/whoisonline.cpp:887
+#: src/being/being.cpp:2280 src/gui/windows/whoisonline.cpp:887
 msgid "I"
 msgstr "I"
 
@@ -490,41 +496,41 @@ msgstr "Bulle flottante"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:870 src/dyetool/client.cpp:491 src/gui/windowmenu.cpp:189
+#: src/client.cpp:872 src/dyetool/client.cpp:491 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:66
 msgid "Setup"
 msgstr "Configuration"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:873 src/dyetool/client.cpp:494
+#: src/client.cpp:875 src/dyetool/client.cpp:494
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Performance"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:876 src/dyetool/client.cpp:497
+#: src/client.cpp:878 src/dyetool/client.cpp:497
 #: src/gui/widgets/tabs/setup_video.cpp:110
 msgid "Video"
 msgstr "Vidéo"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:879 src/dyetool/client.cpp:500
+#: src/client.cpp:881 src/dyetool/client.cpp:500
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Thème"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:882 src/dyetool/client.cpp:503
+#: src/client.cpp:884 src/dyetool/client.cpp:503
 msgid "About"
 msgstr "À propos"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:885 src/dyetool/client.cpp:506 src/gui/windowmenu.cpp:74
+#: src/client.cpp:887 src/dyetool/client.cpp:506 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Aide"
@@ -545,7 +551,7 @@ msgstr "Aide"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:889 src/client.cpp:1483 src/client.cpp:1502
+#: src/client.cpp:891 src/client.cpp:1486 src/client.cpp:1505
 #: src/dyetool/client.cpp:510 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:756 src/gui/popups/popupmenu.cpp:833
 #: src/gui/popups/popupmenu.cpp:1087 src/gui/windows/didyouknowwindow.cpp:81
@@ -558,32 +564,32 @@ msgid "Close"
 msgstr "Fermer"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1115 src/gui/windowmanager_unittest.cc:156
+#: src/client.cpp:1117 src/gui/windowmanager_unittest.cc:156
 msgid "Connecting to server"
 msgstr "Connexion au serveur"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1172 src/gui/windowmanager_unittest.cc:173
+#: src/client.cpp:1174 src/gui/windowmanager_unittest.cc:173
 msgid "Logging in"
 msgstr "Connexion"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1221
+#: src/client.cpp:1223
 msgid "Entering game world"
 msgstr "Entrée dans le monde de jeu"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1369
+#: src/client.cpp:1372
 msgid "Requesting characters"
 msgstr "Téléchargement des personnages"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1412
+#: src/client.cpp:1415
 msgid "Connecting to the game server"
 msgstr "Connexion au serveur de jeu"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1424
+#: src/client.cpp:1427
 msgid "Changing game servers"
 msgstr "Changement de serveur de jeu"
 
@@ -600,52 +606,52 @@ msgstr "Changement de serveur de jeu"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1480 src/client.cpp:1499 src/client.cpp:1738
+#: src/client.cpp:1483 src/client.cpp:1502 src/client.cpp:1741
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:472
+#: src/gui/windows/charcreatedialog.cpp:471
 #: src/gui/windows/charselectdialog.cpp:306
 #: src/gui/windows/editserverdialog.cpp:212
 #: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:429
-#: src/net/eathena/charserverrecv.cpp:433
-#: src/net/eathena/charserverrecv.cpp:515 src/net/tmwa/charserverrecv.cpp:337
+#: src/net/eathena/charserverrecv.cpp:396
+#: src/net/eathena/charserverrecv.cpp:400
+#: src/net/eathena/charserverrecv.cpp:482 src/net/tmwa/charserverrecv.cpp:301
 msgid "Error"
 msgstr "Erreur"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1518
+#: src/client.cpp:1521
 msgid "Requesting registration details"
 msgstr "Demande des paramètres d'inscription"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1565
+#: src/client.cpp:1568
 msgid "Password Change"
 msgstr "Changement de mot de passe"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1567
+#: src/client.cpp:1570
 msgid "Password changed successfully!"
 msgstr "Le mot de passe a été changé avec succès !"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1600
+#: src/client.cpp:1603
 msgid "Email Change"
 msgstr "Changer d'e-mail"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1602
+#: src/client.cpp:1605
 msgid "Email changed successfully!"
 msgstr "L'adresse e-mail a été changée avec succès !"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1638
+#: src/client.cpp:1641
 msgid "Unregister Successful"
 msgstr "Désinscription réussie"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1640
+#: src/client.cpp:1643
 msgid "Farewell, come back any time..."
 msgstr "À bientôt, Revenez quand vous voulez..."
 
@@ -682,7 +688,8 @@ msgstr "  -l --log-file       : fichier journal à utiliser"
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:59
 msgid "  -a --chat-log-dir   : Chat log dir to use"
-msgstr "  -a --chat-log-dir   : Répertoire de l'historique de conversation à utiliser"
+msgstr ""
+"  -a --chat-log-dir   : Répertoire de l'historique de conversation à utiliser"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:61
@@ -737,12 +744,15 @@ msgstr "  -H --update-host    : Utilise cet hôte de mise à jour"
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:89
 msgid "  -D --default        : Choose default character server and character"
-msgstr "  -D --default        : Choisir le serveur de personnages et le personnage par défaut"
+msgstr ""
+"  -D --default        : Choisir le serveur de personnages et le personnage "
+"par défaut"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:93
 msgid "  -u --skip-update    : Skip the update downloads"
-msgstr "  -u --skip-update    : Ne pas effectuer le téléchargement des mises à jour"
+msgstr ""
+"  -u --skip-update    : Ne pas effectuer le téléchargement des mises à jour"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:96
@@ -752,7 +762,8 @@ msgstr "  -d --data           : Répertoire des données du jeu à charger"
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:99
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr "  -L --localdata-dir  : Répertoire à utiliser comme répertoire principal"
+msgstr ""
+"  -L --localdata-dir  : Répertoire à utiliser comme répertoire principal"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:103
@@ -772,7 +783,9 @@ msgstr "     --renderer       : Définir le type de rendu"
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:112
 msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr "  -T --tests          : Commencer le test des drivers et la configuration automatique"
+msgstr ""
+"  -T --tests          : Commencer le test des drivers et la configuration "
+"automatique"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:118
@@ -800,7 +813,8 @@ msgstr "Impossible de créer le dossier de mises à jour !"
 #: src/dirs.cpp:537 src/dirs.cpp:558
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
-msgstr "Erreur : %s n'existe pas et ne peut pas être créé ! Fermeture du programme."
+msgstr ""
+"Erreur : %s n'existe pas et ne peut pas être créé ! Fermeture du programme."
 
 #. TRANSLATORS: directory creation error
 #: src/dirs.cpp:589 src/dirs.cpp:597 src/dirs.cpp:605
@@ -838,23 +852,24 @@ msgid "Debug"
 msgstr "Débogage"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:598
+#: src/game.cpp:600
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Capture d'écran sauvegardée sous %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:608
+#: src/game.cpp:610
 msgid "Saving screenshot failed!"
 msgstr "La  capture d'écran a échoué !"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:695
+#: src/game.cpp:697
 msgid "The connection to the server was lost."
-msgstr "La connexion au serveur a été coupée, le programme va maintenant se fermer."
+msgstr ""
+"La connexion au serveur a été coupée, le programme va maintenant se fermer."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:698
+#: src/game.cpp:700
 msgid "Network Error"
 msgstr "Erreur Réseau"
 
@@ -1269,14 +1284,17 @@ msgstr "Ressusciter"
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
-msgstr "Vous portez plus de la moitié du poids maximal de votre inventaire. Vous n'êtes plus en mesure de récupérer votre santé."
+"You are carrying more than half your weight. You are unable to regain health."
+msgstr ""
+"Vous portez plus de la moitié du poids maximal de votre inventaire. Vous "
+"n'êtes plus en mesure de récupérer votre santé."
 
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:198
 msgid "You are carrying less than half your weight. You can regain health."
-msgstr "Vous portez moins de la moitié du poids maximal de votre inventaire. Vous pouvez maintenant récupérer ta santé."
+msgstr ""
+"Vous portez moins de la moitié du poids maximal de votre inventaire. Vous "
+"pouvez maintenant récupérer ta santé."
 
 #. TRANSLATORS: chat color
 #. TRANSLATORS: inventory sort mode
@@ -1287,8 +1305,7 @@ msgstr "Vous portez moins de la moitié du poids maximal de votre inventaire. Vo
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:671
-#: src/gui/windows/serverdialog.cpp:603
+#: src/gui/windows/equipmentwindow.cpp:671 src/gui/windows/serverdialog.cpp:603
 msgid "default"
 msgstr "défaut"
 
@@ -1840,11 +1857,9 @@ msgstr "Échange"
 #. TRANSLATORS: attack player
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
-#. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:180 src/gui/popups/popupmenu.cpp:304
 #: src/gui/popups/popupmenu.cpp:912 src/gui/widgets/skillinfo.cpp:125
-#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
-#: src/net/tmwa/generalhandler.cpp:251
+#: src/input/pages/basic.cpp:40
 msgid "Attack"
 msgstr "Attaque"
 
@@ -1920,7 +1935,7 @@ msgstr "Déplacement"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:270 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:152
+#: src/resources/db/npcdb.cpp:151
 msgid "Talk"
 msgstr "Parler"
 
@@ -1938,7 +1953,7 @@ msgstr "Parler"
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:154
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:153
 msgid "Buy"
 msgstr "Acheter"
 
@@ -1956,7 +1971,7 @@ msgstr "Acheter"
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
 #: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:256
-#: src/resources/db/npcdb.cpp:156
+#: src/resources/db/npcdb.cpp:155
 msgid "Sell"
 msgstr "Vendre"
 
@@ -2058,7 +2073,7 @@ msgstr "Retirer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:408 src/resources/db/petdb.cpp:160
+#: src/gui/popups/popupmenu.cpp:408 src/resources/db/petdb.cpp:159
 msgid "Return to egg"
 msgstr "Retourner à l'œuf"
 
@@ -2455,7 +2470,7 @@ msgstr "Remise à zéro des valeurs de la barre jaune"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2125 src/gui/windows/statuswindow.cpp:90
 msgid "Copy to chat"
 msgstr "Copier dans la conversation"
 
@@ -2507,9 +2522,8 @@ msgstr "Afficher la fenêtre"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/popups/popupmenu.cpp:2386 src/gui/popups/skillpopup.cpp:127
-#: src/gui/windows/ministatuswindow.cpp:363
-#: src/gui/windows/statuswindow.cpp:68 src/gui/windows/statuswindow.cpp:243
-#: src/gui/windows/statuswindow.cpp:367
+#: src/gui/windows/ministatuswindow.cpp:363 src/gui/windows/statuswindow.cpp:70
+#: src/gui/windows/statuswindow.cpp:268 src/gui/windows/statuswindow.cpp:392
 #, c-format
 msgid "Level: %d"
 msgstr "Niveau : %d"
@@ -2928,8 +2942,8 @@ msgstr "Faire apparaître un esclave"
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3100 src/gui/popups/popupmenu.cpp:3119
 #: src/gui/popups/popupmenu.cpp:3132 src/gui/windows/charselectdialog.cpp:76
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:452
-#: src/net/eathena/charserverrecv.cpp:488
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:419
+#: src/net/eathena/charserverrecv.cpp:455
 msgid "Info"
 msgstr "Informations"
 
@@ -3320,8 +3334,8 @@ msgstr "Niveau : %u"
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/statuswindow.cpp:70
-#: src/gui/windows/statuswindow.cpp:220 src/gui/windows/statuswindow.cpp:334
+#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/statuswindow.cpp:72
+#: src/gui/windows/statuswindow.cpp:222 src/gui/windows/statuswindow.cpp:359
 #, c-format
 msgid "Money: %s"
 msgstr "Argent : %s"
@@ -3377,7 +3391,7 @@ msgstr "Quitter"
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:194
 #: src/gui/windows/itemamountwindow.cpp:230 src/gui/windows/npcdialog.cpp:123
-#: src/gui/windows/statuswindow.cpp:746
+#: src/gui/windows/statuswindow.cpp:771
 msgid "+"
 msgstr "+"
 
@@ -3398,8 +3412,8 @@ msgstr "-"
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/selldialog.cpp:133 src/gui/windows/buydialog.cpp:299
-#: src/gui/windows/statuswindow.cpp:483 src/gui/windows/statuswindow.cpp:539
-#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:766
+#: src/gui/windows/statuswindow.cpp:508 src/gui/windows/statuswindow.cpp:564
+#: src/gui/windows/statuswindow.cpp:769 src/gui/windows/statuswindow.cpp:791
 msgid "Max"
 msgstr "Max."
 
@@ -3555,15 +3569,13 @@ msgstr "Partage d'objet activé."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104
-#: src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr "Partage d'objet désactivé."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109
-#: src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr "Partage d'objet impossible."
 
@@ -3574,22 +3586,19 @@ msgstr "Paramètre de partage d'objets inconnu."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150
-#: src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr "Partage d'expérience autorisé."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155
-#: src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr "Partage d'expérience non autorisé."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160
-#: src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr "Partage d'expérience impossible."
 
@@ -4011,7 +4020,10 @@ msgid ""
 "Chat window will be automatically hidden when not in use.\n"
 "\n"
 "Hit Enter or hover mouse to show chat again."
-msgstr "La fenêtre de chat sera automatiquement cachée quand inutilisée.\n\nPresser Entrée ou passer la souris sur le chat pour l'afficher."
+msgstr ""
+"La fenêtre de chat sera automatiquement cachée quand inutilisée.\n"
+"\n"
+"Presser Entrée ou passer la souris sur le chat pour l'afficher."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:58
@@ -4023,15 +4035,15 @@ msgstr "Protéger la concentration de la conversation"
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
+"Note: no other text inputs will be allowed to receive text input when you "
+"typing in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86
-#: src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr "Couleurs"
 
@@ -4055,21 +4067,27 @@ msgstr "Afficher la liste des couleurs de conversation"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat "
+"window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:90
 msgid "Allow magic and GM commands in all chat tabs"
-msgstr "Autoriser les messages de magie et commandes des MJ dans tous les onglets de conversation"
+msgstr ""
+"Autoriser les messages de magie et commandes des MJ dans tous les onglets de "
+"conversation"
 
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:92
 msgid ""
 "Enable this setting to be able to type spells and GM commands in any tab."
-msgstr "Activer ce paramètre pour être autoriser à écrire Sorts et commande MJ dans tous les onglets."
+msgstr ""
+"Activer ce paramètre pour être autoriser à écrire Sorts et commande MJ dans "
+"tous les onglets."
 
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_chat.cpp:98
@@ -4084,9 +4102,11 @@ msgstr "Limiter le nombre max de car de la ligne de conversation"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed "
+"in chat.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will be truncated."
+"Note: long lines can make client slower. Lines longer than this limit will "
+"be truncated."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4097,7 +4117,9 @@ msgstr "Limiter le nombre max de lignes dans les conversations"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
+"specified number of last lines of text. Oldest lines exceeding this limit "
+"are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
 msgstr ""
@@ -4138,8 +4160,8 @@ msgstr "Afficher l'historique de conversation"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on"
-" startup instead of starting with empty chat tabs."
+"If this setting enabled, client will load old chat tabs content from logs on "
+"startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4150,9 +4172,11 @@ msgstr "Afficher les messages de connexion du groupe"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be "
+"shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4163,9 +4187,11 @@ msgstr "Afficher les messages en ligne de la guilde"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be "
+"shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4181,9 +4207,13 @@ msgstr "Masquer les messages liés à la boutique"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will "
+"be displayed in chat. Disable this setting if you want to see shop-related "
+"messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
+"Note: technically, ManaPlus shop implemented as usual private messages with "
+"special content. If you disable this setting, you will be able to see these "
+"messages and get idea when other players are looking at your shop."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4196,7 +4226,8 @@ msgstr "Montrer les messages MVP"
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
+"usually makes little difference."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4215,10 +4246,19 @@ msgstr "Placer tous les messages privés dans des onglets"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in "
+"separate tabs, separate tab for each player. If this setting disabled, all "
+"whispers will appear in General tab.\n"
+"\n"
+"Note: putting all whispers to single General tab is known to be confusing. "
+"Think twice before disabling this feature."
+msgstr ""
+"Si cette option est activée, tous les messages privés seront placés dans des "
+"onglets séparés pour chaque joueur. Si cette option est activée, tous les "
+"murmures seront placés dans l'onglet Général.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
-msgstr "Si cette option est activée, tous les messages privés seront placés dans des onglets séparés pour chaque joueur. Si cette option est activée, tous les murmures seront placés dans l'onglet Général.\n\nNote : placer tous les murmures dans un seul onglet est connu pour être troublant. Pensez-y à deux fois avant de désactiver cette option."
+"Note : placer tous les murmures dans un seul onglet est connu pour être "
+"troublant. Pensez-y à deux fois avant de désactiver cette option."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:197
@@ -4228,10 +4268,15 @@ msgstr "Effectuer l'historique des messages de magie dans l'onglet de débogage"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If "
+"disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
-msgstr "Si cette option est activée, les messages de sorts seront montrés dans Debug. Si elle est désactivée, ils apparaîtront dans l'onglet Général.\n\nNote : cela n'affecte pas les réponses du serveur en lien avec les sorts."
+msgstr ""
+"Si cette option est activée, les messages de sorts seront montrés dans "
+"Debug. Si elle est désactivée, ils apparaîtront dans l'onglet Général.\n"
+"\n"
+"Note : cela n'affecte pas les réponses du serveur en lien avec les sorts."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:205
@@ -4241,10 +4286,18 @@ msgstr "Afficher les messages du serveur dans l'onglet de débogage"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of "
+"chat. If disabled, server messages will appear in General chat instead.\n"
+"\n"
+"Note: according to 4144, disabling this could also make you to lose some "
+"debug messages from client in Debug tab since these are fake server messages."
+msgstr ""
+"Si cette option est activée, les messages du serveur seront montrés dans "
+"l'onglet Debug. Si elle est désactivée, ils apparaîtront dans l'onglet "
+"Général.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
-msgstr "Si cette option est activée, les messages du serveur seront montrés dans l'onglet Debug. Si elle est désactivée, ils apparaîtront dans l'onglet Général.\n\nNote : selon 4144, désactiver ceci ferait disparaître certains messages du serveur, puisque ceux-ci sont de faux messages."
+"Note : selon 4144, désactiver ceci ferait disparaître certains messages du "
+"serveur, puisque ceux-ci sont de faux messages."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:215
@@ -4268,9 +4321,11 @@ msgstr "Activer l'onglet de MJ"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM "
+"activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
+"Note: this setting only makes difference for GMs (Game Masters) since this "
+"tab only appears for GMs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4281,7 +4336,8 @@ msgstr "Activer l'onglet des langues"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this feature.\n"
+"If this feature enabled, language tab will appear if server supports this "
+"feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
 msgstr ""
@@ -4294,7 +4350,9 @@ msgstr "Afficher tous les messages de langue"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
+"If this setting enabled and server supports different chats for different "
+"languages, you will see messages for all languages, regardless of your "
+"language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
 msgstr ""
@@ -4307,7 +4365,9 @@ msgstr "Activer l'onglet de combat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will "
+"contain messages related to battles, like damage and experience gain, if "
+"battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
 msgstr ""
@@ -4333,7 +4393,10 @@ msgstr "Si besoin est, changer la taille des onglets de conversation"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to "
+"adapt to appearance of chat input field when you typing message and when "
+"input field of chat disappears. If disabled, chat input area will always "
+"occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
@@ -4368,7 +4431,8 @@ msgstr "Mots en surbrillance (séparés par une virgule)"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. "
+"Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
 msgstr ""
@@ -4381,7 +4445,8 @@ msgstr "Ignorer de multiples noms (séparés par une virgule)"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender "
+"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
 msgstr ""
@@ -4394,9 +4459,12 @@ msgstr "Afficher le bouton des émoticônes dans la conversation"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This "
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by "
+"default."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4510,7 +4578,9 @@ msgstr "Conflit(s) de touche détecté(s)."
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr "Conflit entre les touches \"%s\" and \"%s\". Changes au moins l'une de celles-ci ou bien attends-toi à un possible comportement étrange du jeu."
+msgstr ""
+"Conflit entre les touches \"%s\" and \"%s\". Changes au moins l'une de "
+"celles-ci ou bien attends-toi à un possible comportement étrange du jeu."
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
@@ -4895,7 +4965,8 @@ msgstr "Support des bots"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_other.cpp:307
 msgid "Enable guild bot support and disable native guild support"
-msgstr "Activer le support du bot de guilde et désactiver le support par défault"
+msgstr ""
+"Activer le support du bot de guilde et désactiver le support par défault"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_other.cpp:313
@@ -5058,7 +5129,8 @@ msgstr "Accélération matérielle"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:74
 msgid "Enable opacity cache (Software, can use much memory)"
-msgstr "Activer le cache d'opacité (Logiciel, peut utiliser beaucoup de mémoire)"
+msgstr ""
+"Activer le cache d'opacité (Logiciel, peut utiliser beaucoup de mémoire)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:79
@@ -5088,7 +5160,8 @@ msgstr "Meilleure qualité (désactiver pour une meilleure performance)"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:101
 msgid "Enable alpha channel fix (Software, can be very slow)"
-msgstr "Autoriser les correction des champs alpha ( Programme, cela peut être lent)"
+msgstr ""
+"Autoriser les correction des champs alpha ( Programme, cela peut être lent)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:106
@@ -5118,7 +5191,8 @@ msgstr "Désactiver la mise en cache des créatures"
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_perfomance.cpp:129
 msgid "Different options (enable or disable can improve performance)"
-msgstr "Différentes options (activer ou désactiver peut améliorer les performances)"
+msgstr ""
+"Différentes options (activer ou désactiver peut améliorer les performances)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:134
@@ -5143,7 +5217,9 @@ msgstr "Activer les atlas de textures (OpenGL)"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:150
 msgid "Cache all sprites per map (can use additional memory)"
-msgstr "Mettre en cache tous les sprites par carte (peut utiliser de la mémoire supplémentaire)"
+msgstr ""
+"Mettre en cache tous les sprites par carte (peut utiliser de la mémoire "
+"supplémentaire)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:155
@@ -5153,7 +5229,9 @@ msgstr "Mettre tous les sons en cache (peut utiliser plus de mémoire)"
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_perfomance.cpp:160
 msgid "Critical options (DO NOT change if you don't know what you're doing)"
-msgstr "Options critiques (NE change PAS si tu ne sais pas ce que tu es en train de faire)"
+msgstr ""
+"Options critiques (NE change PAS si tu ne sais pas ce que tu es en train de "
+"faire)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:164
@@ -5263,7 +5341,8 @@ msgstr ""
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:131
 msgid "Use special diagonal speed in players moving"
-msgstr "Utiliser une vitesse spéciale pour les déplacements diagonaux des joueurs"
+msgstr ""
+"Utiliser une vitesse spéciale pour les déplacements diagonaux des joueurs"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:135
@@ -5279,7 +5358,9 @@ msgstr "Créer un imprimé écran pour chaque échange réussi"
 #: src/gui/widgets/tabs/setup_players.cpp:143
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
-msgstr "Imiter le clique droit de la souris par un clique long (utile pour les interfaces tactiles)"
+msgstr ""
+"Imiter le clique droit de la souris par un clique long (utile pour les "
+"interfaces tactiles)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:148
@@ -5558,13 +5639,17 @@ msgstr "Aucun"
 #: src/gui/widgets/tabs/setup_video.cpp:233
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr "Impossible de passer en mode fenêtré, et l'ancienne résolution n'est également pas accessible !"
+msgstr ""
+"Impossible de passer en mode fenêtré, et l'ancienne résolution n'est "
+"également pas accessible !"
 
 #. TRANSLATORS: video error message
 #: src/gui/widgets/tabs/setup_video.cpp:240
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr "Impossible de passer en mode plein-écran, et l'ancienne résolution n'est également pas accessible !"
+msgstr ""
+"Impossible de passer en mode plein-écran, et l'ancienne résolution n'est "
+"également pas accessible !"
 
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -5574,7 +5659,8 @@ msgstr "Passage en plein écran"
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:255
 msgid "Restart needed for changes to take effect."
-msgstr "Les changements ne seront pris en compte qu'au prochain démarrage du jeu."
+msgstr ""
+"Les changements ne seront pris en compte qu'au prochain démarrage du jeu."
 
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:281
@@ -5584,7 +5670,8 @@ msgstr "Activation d'OpenGL"
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:283
 msgid "Applying change to OpenGL requires restart."
-msgstr "Le changement OpenGL ne sera pris en compte qu'au prochain démarrage du jeu."
+msgstr ""
+"Le changement OpenGL ne sera pris en compte qu'au prochain démarrage du jeu."
 
 #. TRANSLATORS: resolution question dialog
 #: src/gui/widgets/tabs/setup_video.cpp:368
@@ -5605,7 +5692,9 @@ msgstr "Résolution de l'écran modifiée"
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:401
 msgid "Some windows may be moved to fit the lowered resolution."
-msgstr "Certaines fenêtres pourraient être modifiées pour coïncider à la résolution réduite."
+msgstr ""
+"Certaines fenêtres pourraient être modifiées pour coïncider à la résolution "
+"réduite."
 
 #. TRANSLATORS: speach type
 #: src/gui/widgets/tabs/setup_visual.cpp:43
@@ -6140,8 +6229,7 @@ msgstr "Montant :"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:618
-#: src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:618 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Créer"
 
@@ -6257,17 +6345,16 @@ msgstr "^"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:104
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:210
-#: src/gui/windows/charcreatedialog.cpp:221
-#: src/gui/windows/charcreatedialog.cpp:231
-#: src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:196
+#: src/gui/windows/charcreatedialog.cpp:209
+#: src/gui/windows/charcreatedialog.cpp:220
+#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:110
-#: src/gui/windows/charcreatedialog.cpp:600
+#: src/gui/windows/charcreatedialog.cpp:599
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Distribues %d points"
@@ -6276,73 +6363,71 @@ msgstr "Distribues %d points"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:201
-#: src/gui/windows/charcreatedialog.cpp:212
-#: src/gui/windows/charcreatedialog.cpp:223
-#: src/gui/windows/charcreatedialog.cpp:233
-#: src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:200
+#: src/gui/windows/charcreatedialog.cpp:211
+#: src/gui/windows/charcreatedialog.cpp:222
+#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:202
 msgid "Hair color:"
 msgstr "Couleur :"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:213
 msgid "Hair style:"
 msgstr "Coupe :"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:224
 msgid "Race:"
 msgstr "Race :"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:234
 msgid "Look:"
 msgstr "Apparence :"
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:252
-#: src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr "F"
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:258
-#: src/gui/windows/charcreatedialog.cpp:265
-#: src/gui/windows/charcreatedialog.cpp:273
+#: src/gui/windows/charcreatedialog.cpp:257
+#: src/gui/windows/charcreatedialog.cpp:264
+#: src/gui/windows/charcreatedialog.cpp:272
 msgid "M"
 msgstr "H"
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:260
-#: src/gui/windows/charcreatedialog.cpp:277
+#: src/gui/windows/charcreatedialog.cpp:259
+#: src/gui/windows/charcreatedialog.cpp:276
 #: src/gui/windows/inventorywindow.cpp:223
 msgid "O"
 msgstr "O"
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:267
+#: src/gui/windows/charcreatedialog.cpp:266
 msgid "U"
 msgstr "I"
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:474
+#: src/gui/windows/charcreatedialog.cpp:473
 msgid "Your name needs to be at least 4 characters."
 msgstr "Ton nom doit comporter un minimum de 4 caractères."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:590
+#: src/gui/windows/charcreatedialog.cpp:589
 msgid "Character stats OK"
 msgstr "Caractéristiques du personnage Ok"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:606
+#: src/gui/windows/charcreatedialog.cpp:605
 #, c-format
 msgid "Please remove %d points"
 msgstr "Retires %d points"
@@ -6406,7 +6491,12 @@ msgid ""
 "Level: %u\n"
 "Experience: %u\n"
 "Money: %s"
-msgstr "PV : %u/%u\nPM : %u/%u\nNiveau : %u\nExpérience : %u\nArgent : %s"
+msgstr ""
+"PV : %u/%u\n"
+"PM : %u/%u\n"
+"Niveau : %u\n"
+"Expérience : %u\n"
+"Argent : %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/charselectdialog.cpp:308
@@ -6508,8 +6598,7 @@ msgstr "Éditer le Serveur"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57
-#: src/gui/windows/serverdialog.cpp:112
+#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:112
 msgid "Connect"
 msgstr "Connexion..."
 
@@ -6867,15 +6956,13 @@ msgstr "Sujet:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61
-#: src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr "Argent:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr "Objet:"
@@ -6984,7 +7071,7 @@ msgstr "Barre de compétences"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/windows/ministatuswindow.cpp:356
-#: src/gui/windows/statuswindow.cpp:236
+#: src/gui/windows/statuswindow.cpp:261
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Niveau : %d (MJ %d)"
@@ -7374,7 +7461,9 @@ msgstr "Choisis le nom de la guilde."
 #. TRANSLATORS: chat message
 #: src/gui/windows/socialwindow.cpp:426
 msgid "Received guild request, but one already exists."
-msgstr "Vous avez reçu une invitation pour rejoindre une guilde, mais vous êtes déjà membre d'une autre."
+msgstr ""
+"Vous avez reçu une invitation pour rejoindre une guilde, mais vous êtes déjà "
+"membre d'une autre."
 
 #. TRANSLATORS: chat message
 #: src/gui/windows/socialwindow.cpp:435
@@ -7390,7 +7479,9 @@ msgstr "Accepter l'invitation dans cette guilde"
 #. TRANSLATORS: chat message
 #: src/gui/windows/socialwindow.cpp:463
 msgid "Received party request, but one already exists."
-msgstr "Vous avez reçu une invitation pour rejoindre un groupe, mais vous êtes déjà membre d'une autre."
+msgstr ""
+"Vous avez reçu une invitation pour rejoindre un groupe, mais vous êtes déjà "
+"membre d'une autre."
 
 #. TRANSLATORS: party invite message
 #: src/gui/windows/socialwindow.cpp:476
@@ -7436,33 +7527,33 @@ msgid "Choose your party's name."
 msgstr "Choisis le nom du groupe."
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:72
+#: src/gui/windows/statuswindow.cpp:74
 msgid "HP:"
 msgstr "Vie :"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:75
+#: src/gui/windows/statuswindow.cpp:77
 msgid "Exp:"
 msgstr "Exp :"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:136
+#: src/gui/windows/statuswindow.cpp:138
 msgid "MP:"
 msgstr "PM :"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:173 src/gui/windows/statuswindow.cpp:294
+#: src/gui/windows/statuswindow.cpp:175 src/gui/windows/statuswindow.cpp:319
 #, c-format
 msgid "Job: %d"
 msgstr "Métier : %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:175
+#: src/gui/windows/statuswindow.cpp:177
 msgid "Job:"
 msgstr "Compétence :"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:224 src/gui/windows/statuswindow.cpp:342
+#: src/gui/windows/statuswindow.cpp:226 src/gui/windows/statuswindow.cpp:367
 #, c-format
 msgid "Character points: %d"
 msgstr "Points de caractéristiques du personnage : %d"
@@ -7580,9 +7671,10 @@ msgstr "Bous n'avez pas assez d'argent."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
-msgstr "L'objet ne peux être ajouté. Vous ne pouvez pas ajouter deux fois le même objet dans cette fenêtre."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+"L'objet ne peux être ajouté. Vous ne pouvez pas ajouter deux fois le même "
+"objet dans cette fenêtre."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:539
@@ -8864,7 +8956,9 @@ msgstr "Erreur inconnue du serveur de personnage."
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:75
 msgid "Failed to create character. Most likely the name is already taken."
-msgstr "Impossible de créer ce personnage. Il est probable que ce nom soit déjà utilisé."
+msgstr ""
+"Impossible de créer ce personnage. Il est probable que ce nom soit déjà "
+"utilisé."
 
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:80 src/net/ea/loginrecv.cpp:159
@@ -8917,7 +9011,9 @@ msgstr "Le message privé n'a pu être envoyé, tu es ignoré par %s."
 #. TRANSLATORS: chat message
 #: src/net/ea/chatrecv.cpp:114
 msgid "Whisper could not be sent, you ignored by all players."
-msgstr "Le message privé n'a pas pu être envoyé, tu as été ignoré par tous les joueurs."
+msgstr ""
+"Le message privé n'a pas pu être envoyé, tu as été ignoré par tous les "
+"joueurs."
 
 #. TRANSLATORS: error header
 #: src/net/ea/gamerecv.cpp:67
@@ -9007,7 +9103,9 @@ msgstr "Rejeté par le serveur."
 #: src/net/ea/loginrecv.cpp:136 src/net/eathena/loginrecv.cpp:74
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
-msgstr "Tu as été banni de façon permanente du jeu. Merci de contacter l'équipe des MJs."
+msgstr ""
+"Tu as été banni de façon permanente du jeu. Merci de contacter l'équipe des "
+"MJs."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:141 src/net/eathena/loginrecv.cpp:79
@@ -9020,7 +9118,9 @@ msgstr "Le client est trop ancien où le type de serveur n'est pas bon."
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
-msgstr "Tu as temporairement été banni du jeu jusqu'au %s.\nMerci de contacter l'équipe des MJs sur le forum."
+msgstr ""
+"Tu as temporairement été banni du jeu jusqu'au %s.\n"
+"Merci de contacter l'équipe des MJs sur le forum."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:151 src/net/eathena/loginrecv.cpp:92
@@ -9060,33 +9160,33 @@ msgstr "Connexion au serveur terminée. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:431
-#: src/net/eathena/charserverrecv.cpp:479
+#: src/net/eathena/charserverrecv.cpp:398
+#: src/net/eathena/charserverrecv.cpp:446
 msgid "Character rename error."
 msgstr "Erreur du renommage du personnage."
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:454
+#: src/net/eathena/charserverrecv.cpp:421
 msgid "Character renamed."
 msgstr "Personnage renommé."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:470
+#: src/net/eathena/charserverrecv.cpp:437
 msgid "Rename not allowed."
 msgstr "Renommage non permis."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:474
+#: src/net/eathena/charserverrecv.cpp:441
 msgid "New name is not set."
 msgstr "Le nouveau nom n'est pas appliqué."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:483
+#: src/net/eathena/charserverrecv.cpp:450
 msgid "Character not found."
 msgstr "Personnage non trouvé."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:517 src/net/tmwa/charserverrecv.cpp:339
+#: src/net/eathena/charserverrecv.cpp:484 src/net/tmwa/charserverrecv.cpp:303
 msgid "Failed to delete character."
 msgstr "La suppression du personnage n'a pu s'effectuer."
 
@@ -9138,140 +9238,11 @@ msgstr ""
 msgid "Do you accept %s and %s as parents?"
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:130
-#, c-format
-msgid "Strength %s"
-msgstr "Force %s"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:132
-#, c-format
-msgid "Agility %s"
-msgstr "Agilité %s"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:134
-#, c-format
-msgid "Vitality %s"
-msgstr "Vitalité %s"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:136
-#, c-format
-msgid "Intelligence %s"
-msgstr "Intelligence %s"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:138
-#, c-format
-msgid "Dexterity %s"
-msgstr "Dextérité %s"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:140
-#, c-format
-msgid "Luck %s"
-msgstr "Chance %s"
-
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:197 src/net/tmwa/generalhandler.cpp:207
+#: src/net/eathena/generalhandler.cpp:179 src/net/tmwa/generalhandler.cpp:189
 msgid "Got disconnected from server!"
 msgstr "Vous avez été déconnecté du serveur !"
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:223 src/net/tmwa/generalhandler.cpp:234
-msgid "Strength"
-msgstr "Force"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:237
-msgid "Agility"
-msgstr "Agilité"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:229 src/net/tmwa/generalhandler.cpp:240
-msgid "Vitality"
-msgstr "Vitalité"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:243
-msgid "Intelligence"
-msgstr "Intelligence"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:246
-msgid "Dexterity"
-msgstr "Dextérité"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:238 src/net/tmwa/generalhandler.cpp:249
-msgid "Luck"
-msgstr "Chance"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:253
-msgid "Defense"
-msgstr "Défense"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:255
-msgid "M.Attack"
-msgstr "Attaque M."
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:257
-msgid "M.Defense"
-msgstr "Défense M."
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:260
-#, no-c-format
-msgid "% Accuracy"
-msgstr "% Précision"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:263
-#, no-c-format
-msgid "% Evade"
-msgstr "% Esquive"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:266
-#, no-c-format
-msgid "% Critical"
-msgstr "% Coup critique"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:268
-msgid "Attack Delay"
-msgstr "Temps de l'attaque"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:270
-msgid "Walk Delay"
-msgstr "Temps de déplacement"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:272
-msgid "Attack Range"
-msgstr "Portée de l'attaque"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:274
-msgid "Damage per sec."
-msgstr "Dégâts par s."
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266
-msgid "Karma"
-msgstr "Karma"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268
-msgid "Manner"
-msgstr "Manière"
-
 #. TRANSLATORS: error message
 #: src/net/eathena/generalrecv.cpp:49 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
@@ -9427,7 +9398,7 @@ msgstr ""
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:199
+#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:190
 msgid "Unknown item"
 msgstr "Objet inconnu"
 
@@ -9703,21 +9674,52 @@ msgstr "OpenGL Moderne"
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:93
-#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
-#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
+#: src/resources/db/itemdb.cpp:377 src/resources/db/itemdb.cpp:381
+#: src/resources/db/moddb.cpp:79 src/resources/db/monsterdb.cpp:101
+#: src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "anonyme"
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:104
+#: src/resources/db/petdb.cpp:103
 msgid "pet"
 msgstr "familier"
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:103
+#: src/resources/db/skillunitdb.cpp:102
 msgid "skill"
 msgstr "Compétence"
 
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:45
+msgid "Strength"
+msgstr "Force"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:49
+msgid "Agility"
+msgstr "Agilité"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:53
+msgid "Vitality"
+msgstr "Vitalité"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:57
+msgid "Intelligence"
+msgstr "Intelligence"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:61
+msgid "Dexterity"
+msgstr "Dextérité"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:65
+msgid "Luck"
+msgstr "Chance"
+
 #. TRANSLATORS: inventory type name
 #: src/resources/inventory/inventory.cpp:340
 msgid "Npc"
@@ -10033,7 +10035,8 @@ msgstr "Impossible de rajouter un objet. Ton partenaire est surchargé."
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:291
 msgid "Failed adding item. Trade partner has no free slot."
-msgstr "Impossible de rajouter un objet. Ton partenaire n'a plus de place libre."
+msgstr ""
+"Impossible de rajouter un objet. Ton partenaire n'a plus de place libre."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:295
@@ -10200,14 +10203,18 @@ msgstr "Carte insérée."
 msgid ""
 "Deposit failed. You probably don't have this amount of money with you right "
 "now."
-msgstr "Le dépôt a échoué. Tu n'as probablement pas cette quantité d'argent avec toi en ce moment."
+msgstr ""
+"Le dépôt a échoué. Tu n'as probablement pas cette quantité d'argent avec toi "
+"en ce moment."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:427
 msgid ""
 "Withdraw failed. You probably don't have this amount of money in the bank "
 "right now."
-msgstr "Le retrait a échoué. Tu n'a probablement pas cette quantité d'argent dans la banque en ce moment."
+msgstr ""
+"Le retrait a échoué. Tu n'a probablement pas cette quantité d'argent dans la "
+"banque en ce moment."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:432
@@ -10222,7 +10229,9 @@ msgstr "La création de magasin d'achat a échoué. Trop de poids."
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:440
 msgid "Buying store create failed. No items in store."
-msgstr "La création de magasin d'achat a échoué. Il n'y aucun article dans le magasin."
+msgstr ""
+"La création de magasin d'achat a échoué. Il n'y aucun article dans le "
+"magasin."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:444
@@ -10249,7 +10258,9 @@ msgstr "L'échange a échoué."
 msgid ""
 "The trade failed, because the entered amount of item is higher, than the "
 "buyer is willing to buy."
-msgstr "L'échange a échoué, parce que le montant de l'article est supérieure à se que l'acheteur est prêt à acheter."
+msgstr ""
+"L'échange a échoué, parce que le montant de l'article est supérieure à se "
+"que l'acheteur est prêt à acheter."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:465
@@ -10369,7 +10380,8 @@ msgstr "Vous ne pouvez rejoindre ce salon :vous avez été expulsé."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:556
-msgid "Room join failed. Not enought money."
+#, fuzzy
+msgid "Room join failed. Not enough money."
 msgstr "Vous ne pouvez rejoindre ce salon : vous n'avez pas assez d'argent."
 
 #. TRANSLATORS: notification message
@@ -10572,7 +10584,9 @@ msgstr "La tentative d'ignorer le joueur a échoué."
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:718
 msgid "Player ignore failed. Because too many ignores."
-msgstr "La tentative d'ignorer le joueur a échoué pour cette raison: vous ignorez déjà beaucoup trop de joueurs."
+msgstr ""
+"La tentative d'ignorer le joueur a échoué pour cette raison: vous ignorez "
+"déjà beaucoup trop de joueurs."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:722
@@ -10592,7 +10606,9 @@ msgstr "La tentative de retirer le joueur de votre liste d'ignorés a échoué."
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:734
 msgid "Unknown player unignore failure."
-msgstr "La tentative de retirer le joueur de votre liste d'ignorés a échoué pour une raison inconnue."
+msgstr ""
+"La tentative de retirer le joueur de votre liste d'ignorés a échoué pour une "
+"raison inconnue."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:738
@@ -10637,33 +10653,35 @@ msgstr "Joueur %s inconnu retiré."
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:796
 #, c-format
-msgid "You and %s was divorced."
+msgid "You and %s are now divorced."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:800
-msgid "You was called by partner."
-msgstr ""
+#, fuzzy
+msgid "You were called by your partner."
+msgstr "Tu as été éjecté du groupe."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:804
 #, c-format
-msgid "You calling partner %s."
+msgid "You are calling your partner, %s."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:808
-msgid "Adoption child error. You already have baby."
+msgid "Child adoption failed. You already have a baby."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:812
-msgid "Adoption child error. You level too small for have baby."
+msgid "Child adoption failed. Your level is too low."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:816
-msgid "Adoption child error. This player already married and can't be baby."
+msgid ""
+"Child adoption failed. This player is already married and can't be a baby."
 msgstr ""
 
 #. TRANSLATORS: notification message
@@ -10673,19 +10691,24 @@ msgstr "Position sauvegardée pour la compétence warp."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:825
-msgid "Error saving location. Not enought skill level."
-msgstr "Erreur en sauvegardant la position. Tu n'as pas assez de niveaux de compétences."
+#, fuzzy
+msgid "Error saving location. Not enough skill level."
+msgstr ""
+"Erreur en sauvegardant la position. Tu n'as pas assez de niveaux de "
+"compétences."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:829
-msgid "Error saving location. You not have warp skill."
+#, fuzzy
+msgid "Error saving location. You do not have warp skill."
 msgstr "Erreur en sauvegardant la position. Tu n'as pas la compétence de warp."
 
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:29
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "Les options de /%s sont \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+"Les options de /%s sont \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
 #. TRANSLATORS: uptime command
 #: src/utils/stringutils.cpp:946
@@ -10741,3 +10764,57 @@ msgstr "%d secondes"
 #, c-format
 msgid "%d seconds"
 msgstr "%d secondes"
+
+#~ msgid "Strength %s"
+#~ msgstr "Force %s"
+
+#~ msgid "Agility %s"
+#~ msgstr "Agilité %s"
+
+#~ msgid "Vitality %s"
+#~ msgstr "Vitalité %s"
+
+#~ msgid "Intelligence %s"
+#~ msgstr "Intelligence %s"
+
+#~ msgid "Dexterity %s"
+#~ msgstr "Dextérité %s"
+
+#~ msgid "Luck %s"
+#~ msgstr "Chance %s"
+
+#~ msgid "Defense"
+#~ msgstr "Défense"
+
+#~ msgid "M.Attack"
+#~ msgstr "Attaque M."
+
+#~ msgid "M.Defense"
+#~ msgstr "Défense M."
+
+#~ msgid "% Accuracy"
+#~ msgstr "% Précision"
+
+#~ msgid "% Evade"
+#~ msgstr "% Esquive"
+
+#~ msgid "% Critical"
+#~ msgstr "% Coup critique"
+
+#~ msgid "Attack Delay"
+#~ msgstr "Temps de l'attaque"
+
+#~ msgid "Walk Delay"
+#~ msgstr "Temps de déplacement"
+
+#~ msgid "Attack Range"
+#~ msgstr "Portée de l'attaque"
+
+#~ msgid "Damage per sec."
+#~ msgstr "Dégâts par s."
+
+#~ msgid "Karma"
+#~ msgstr "Karma"
+
+#~ msgid "Manner"
+#~ msgstr "Manière"
diff --git a/po/id.po b/po/id.po
index 52ff3a2e2..6e3526a72 100644
--- a/po/id.po
+++ b/po/id.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # adjieps <adjieps@yahoo.com>, 2011
 # adjieps <adjieps@yahoo.com>, 2011
@@ -13,14 +13,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-06-18 18:53+0300\n"
+"POT-Creation-Date: 2016-07-02 19:47+0300\n"
 "PO-Revision-Date: 2016-06-19 09:21+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Indonesian (http://www.transifex.com/akaras/manaplus/language/id/)\n"
+"Language-Team: Indonesian (http://www.transifex.com/akaras/manaplus/language/"
+"id/)\n"
+"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANSLATORS: file uploaded message
@@ -37,7 +38,7 @@ msgstr "Data telah terunggah"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:171 src/client.cpp:1569 src/client.cpp:1604
+#: src/actions/actions.cpp:171 src/client.cpp:1572 src/client.cpp:1607
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
@@ -48,7 +49,7 @@ msgstr "Data telah terunggah"
 #: src/gui/widgets/tabs/setup_video.cpp:420
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:476
+#: src/gui/windows/charcreatedialog.cpp:475
 #: src/gui/windows/charselectdialog.cpp:262
 #: src/gui/windows/charselectdialog.cpp:310 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:59
@@ -57,9 +58,9 @@ msgstr "Data telah terunggah"
 #: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:531
 #: src/gui/windows/textdialog.cpp:53 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:456
-#: src/net/eathena/charserverrecv.cpp:491
-#: src/net/eathena/charserverrecv.cpp:519 src/net/tmwa/charserverrecv.cpp:341
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:423
+#: src/net/eathena/charserverrecv.cpp:458
+#: src/net/eathena/charserverrecv.cpp:486 src/net/tmwa/charserverrecv.cpp:305
 msgid "OK"
 msgstr "OK"
 
@@ -131,7 +132,8 @@ msgstr ""
 #: src/actions/chat.cpp:315
 #, c-format
 msgid "Cannot create a whisper tab \"%s\"! It probably already exists."
-msgstr "Tidak dapat membuat tab pesan pribadi \"%s\"! Kemungkinan tab sudah ada."
+msgstr ""
+"Tidak dapat membuat tab pesan pribadi \"%s\"! Kemungkinan tab sudah ada."
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
@@ -306,26 +308,26 @@ msgid "Visible on map"
 msgstr "Terlihat di peta"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:496
+#: src/being/being.cpp:494
 msgid "Human"
 msgstr "Manusia"
 
 #. TRANSLATORS: dodge or miss message in attacks
-#: src/being/being.cpp:683
+#: src/being/being.cpp:676
 msgid "dodge"
 msgstr "menghindar"
 
-#: src/being/being.cpp:683
+#: src/being/being.cpp:676
 msgid "miss"
 msgstr "luput"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2282 src/gui/windows/whoisonline.cpp:882
+#: src/being/being.cpp:2275 src/gui/windows/whoisonline.cpp:882
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2287 src/gui/windows/whoisonline.cpp:887
+#: src/being/being.cpp:2280 src/gui/windows/whoisonline.cpp:887
 msgid "I"
 msgstr "I"
 
@@ -475,41 +477,41 @@ msgstr "Gelembung mengambang"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:870 src/dyetool/client.cpp:491 src/gui/windowmenu.cpp:189
+#: src/client.cpp:872 src/dyetool/client.cpp:491 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:66
 msgid "Setup"
 msgstr "Pengaturan"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:873 src/dyetool/client.cpp:494
+#: src/client.cpp:875 src/dyetool/client.cpp:494
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Performa"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:876 src/dyetool/client.cpp:497
+#: src/client.cpp:878 src/dyetool/client.cpp:497
 #: src/gui/widgets/tabs/setup_video.cpp:110
 msgid "Video"
 msgstr "Vidio"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:879 src/dyetool/client.cpp:500
+#: src/client.cpp:881 src/dyetool/client.cpp:500
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:882 src/dyetool/client.cpp:503
+#: src/client.cpp:884 src/dyetool/client.cpp:503
 msgid "About"
 msgstr "Tentang"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:885 src/dyetool/client.cpp:506 src/gui/windowmenu.cpp:74
+#: src/client.cpp:887 src/dyetool/client.cpp:506 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Bantuan"
@@ -530,7 +532,7 @@ msgstr "Bantuan"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:889 src/client.cpp:1483 src/client.cpp:1502
+#: src/client.cpp:891 src/client.cpp:1486 src/client.cpp:1505
 #: src/dyetool/client.cpp:510 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:756 src/gui/popups/popupmenu.cpp:833
 #: src/gui/popups/popupmenu.cpp:1087 src/gui/windows/didyouknowwindow.cpp:81
@@ -543,32 +545,32 @@ msgid "Close"
 msgstr "Tutup"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1115 src/gui/windowmanager_unittest.cc:156
+#: src/client.cpp:1117 src/gui/windowmanager_unittest.cc:156
 msgid "Connecting to server"
 msgstr "Terhubung ke server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1172 src/gui/windowmanager_unittest.cc:173
+#: src/client.cpp:1174 src/gui/windowmanager_unittest.cc:173
 msgid "Logging in"
 msgstr "Masuk"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1221
+#: src/client.cpp:1223
 msgid "Entering game world"
 msgstr "Memasuki arena permainan"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1369
+#: src/client.cpp:1372
 msgid "Requesting characters"
 msgstr "Mengambil karakter"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1412
+#: src/client.cpp:1415
 msgid "Connecting to the game server"
 msgstr "Terhubung ke server permainan"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1424
+#: src/client.cpp:1427
 msgid "Changing game servers"
 msgstr "Mengganti server"
 
@@ -585,52 +587,52 @@ msgstr "Mengganti server"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1480 src/client.cpp:1499 src/client.cpp:1738
+#: src/client.cpp:1483 src/client.cpp:1502 src/client.cpp:1741
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:472
+#: src/gui/windows/charcreatedialog.cpp:471
 #: src/gui/windows/charselectdialog.cpp:306
 #: src/gui/windows/editserverdialog.cpp:212
 #: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:429
-#: src/net/eathena/charserverrecv.cpp:433
-#: src/net/eathena/charserverrecv.cpp:515 src/net/tmwa/charserverrecv.cpp:337
+#: src/net/eathena/charserverrecv.cpp:396
+#: src/net/eathena/charserverrecv.cpp:400
+#: src/net/eathena/charserverrecv.cpp:482 src/net/tmwa/charserverrecv.cpp:301
 msgid "Error"
 msgstr "Kesalahan"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1518
+#: src/client.cpp:1521
 msgid "Requesting registration details"
 msgstr "Meminta detail registrasi"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1565
+#: src/client.cpp:1568
 msgid "Password Change"
 msgstr "Perubahan Sandi"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1567
+#: src/client.cpp:1570
 msgid "Password changed successfully!"
 msgstr "Perubahan sandi berhasil!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1600
+#: src/client.cpp:1603
 msgid "Email Change"
 msgstr "Perubahan email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1602
+#: src/client.cpp:1605
 msgid "Email changed successfully!"
 msgstr "Perubahan email berhasil!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1638
+#: src/client.cpp:1641
 msgid "Unregister Successful"
 msgstr "Telah tidak terdaftar"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1640
+#: src/client.cpp:1643
 msgid "Farewell, come back any time..."
 msgstr "Selamat tinggal, datang kembali setiap saat..."
 
@@ -823,23 +825,23 @@ msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:598
+#: src/game.cpp:600
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Tangkapan layar disimpan sebagai %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:608
+#: src/game.cpp:610
 msgid "Saving screenshot failed!"
 msgstr "Gagal menyimpan tangkapan layar!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:695
+#: src/game.cpp:697
 msgid "The connection to the server was lost."
 msgstr "Koneksi ke server hilang."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:698
+#: src/game.cpp:700
 msgid "Network Error"
 msgstr "Kesalahan jaringan"
 
@@ -1254,9 +1256,9 @@ msgstr "Hidupkan"
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
-msgstr "Kamu memmbawa lebih dari separuh beratmu. Kamu tidak bisa regenerasidarah."
+"You are carrying more than half your weight. You are unable to regain health."
+msgstr ""
+"Kamu memmbawa lebih dari separuh beratmu. Kamu tidak bisa regenerasidarah."
 
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:198
@@ -1272,8 +1274,7 @@ msgstr "Kamu membawa kurang dari separuh beratmu. Kamu bisa regenerasi darah."
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:671
-#: src/gui/windows/serverdialog.cpp:603
+#: src/gui/windows/equipmentwindow.cpp:671 src/gui/windows/serverdialog.cpp:603
 msgid "default"
 msgstr "dasar"
 
@@ -1825,11 +1826,9 @@ msgstr "Dagang"
 #. TRANSLATORS: attack player
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
-#. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:180 src/gui/popups/popupmenu.cpp:304
 #: src/gui/popups/popupmenu.cpp:912 src/gui/widgets/skillinfo.cpp:125
-#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
-#: src/net/tmwa/generalhandler.cpp:251
+#: src/input/pages/basic.cpp:40
 msgid "Attack"
 msgstr "Serang"
 
@@ -1905,7 +1904,7 @@ msgstr "Jalan"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:270 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:152
+#: src/resources/db/npcdb.cpp:151
 msgid "Talk"
 msgstr "Berbicara"
 
@@ -1923,7 +1922,7 @@ msgstr "Berbicara"
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:154
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:153
 msgid "Buy"
 msgstr "Beli"
 
@@ -1941,7 +1940,7 @@ msgstr "Beli"
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
 #: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:256
-#: src/resources/db/npcdb.cpp:156
+#: src/resources/db/npcdb.cpp:155
 msgid "Sell"
 msgstr "Jual"
 
@@ -2043,7 +2042,7 @@ msgstr "Lepaskan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:408 src/resources/db/petdb.cpp:160
+#: src/gui/popups/popupmenu.cpp:408 src/resources/db/petdb.cpp:159
 msgid "Return to egg"
 msgstr "Kembali ke telur"
 
@@ -2440,7 +2439,7 @@ msgstr "Atur ulang bar kuning"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2125 src/gui/windows/statuswindow.cpp:90
 msgid "Copy to chat"
 msgstr "Salin ke obrolan"
 
@@ -2492,9 +2491,8 @@ msgstr "Tampil jendela"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/popups/popupmenu.cpp:2386 src/gui/popups/skillpopup.cpp:127
-#: src/gui/windows/ministatuswindow.cpp:363
-#: src/gui/windows/statuswindow.cpp:68 src/gui/windows/statuswindow.cpp:243
-#: src/gui/windows/statuswindow.cpp:367
+#: src/gui/windows/ministatuswindow.cpp:363 src/gui/windows/statuswindow.cpp:70
+#: src/gui/windows/statuswindow.cpp:268 src/gui/windows/statuswindow.cpp:392
 #, c-format
 msgid "Level: %d"
 msgstr "Tingkatan: %d"
@@ -2913,8 +2911,8 @@ msgstr ""
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3100 src/gui/popups/popupmenu.cpp:3119
 #: src/gui/popups/popupmenu.cpp:3132 src/gui/windows/charselectdialog.cpp:76
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:452
-#: src/net/eathena/charserverrecv.cpp:488
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:419
+#: src/net/eathena/charserverrecv.cpp:455
 msgid "Info"
 msgstr ""
 
@@ -3305,8 +3303,8 @@ msgstr "Level: %u"
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/statuswindow.cpp:70
-#: src/gui/windows/statuswindow.cpp:220 src/gui/windows/statuswindow.cpp:334
+#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/statuswindow.cpp:72
+#: src/gui/windows/statuswindow.cpp:222 src/gui/windows/statuswindow.cpp:359
 #, c-format
 msgid "Money: %s"
 msgstr "Uang: %s"
@@ -3362,7 +3360,7 @@ msgstr "Keluar"
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:194
 #: src/gui/windows/itemamountwindow.cpp:230 src/gui/windows/npcdialog.cpp:123
-#: src/gui/windows/statuswindow.cpp:746
+#: src/gui/windows/statuswindow.cpp:771
 msgid "+"
 msgstr "+"
 
@@ -3383,8 +3381,8 @@ msgstr "-"
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/selldialog.cpp:133 src/gui/windows/buydialog.cpp:299
-#: src/gui/windows/statuswindow.cpp:483 src/gui/windows/statuswindow.cpp:539
-#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:766
+#: src/gui/windows/statuswindow.cpp:508 src/gui/windows/statuswindow.cpp:564
+#: src/gui/windows/statuswindow.cpp:769 src/gui/windows/statuswindow.cpp:791
 msgid "Max"
 msgstr "Maks"
 
@@ -3540,15 +3538,13 @@ msgstr "Berbagi item diaktifkan."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104
-#: src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr "Berbagi item dimatikan."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109
-#: src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr "Tidak bisa berbagi item."
 
@@ -3559,22 +3555,19 @@ msgstr "Berbagi item tidak diketahui."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150
-#: src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr "Berbagi pengalaman diaktifkan."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155
-#: src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr "Berbagi pengalaman dimatikan."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160
-#: src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr "Tidak bisa berbagi pengalaman."
 
@@ -4008,15 +4001,15 @@ msgstr "Proteksi fokus obrolan"
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
+"Note: no other text inputs will be allowed to receive text input when you "
+"typing in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86
-#: src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr "Warna"
 
@@ -4040,9 +4033,11 @@ msgstr "Tampil daftar warna obrolan"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat "
+"window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4069,9 +4064,11 @@ msgstr "Batas maksimal karakter di garis obrolan"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed "
+"in chat.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will be truncated."
+"Note: long lines can make client slower. Lines longer than this limit will "
+"be truncated."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4082,7 +4079,9 @@ msgstr "Batas maksimal baris di obrolan"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
+"specified number of last lines of text. Oldest lines exceeding this limit "
+"are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
 msgstr ""
@@ -4123,8 +4122,8 @@ msgstr "Tampil riwayat obrolan"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on"
-" startup instead of starting with empty chat tabs."
+"If this setting enabled, client will load old chat tabs content from logs on "
+"startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4135,9 +4134,11 @@ msgstr "Tampil pesan kelompok online"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be "
+"shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4148,9 +4149,11 @@ msgstr "Tampil pesan guild online"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be "
+"shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4166,9 +4169,13 @@ msgstr "Sembunyi pesan toko"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will "
+"be displayed in chat. Disable this setting if you want to see shop-related "
+"messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
+"Note: technically, ManaPlus shop implemented as usual private messages with "
+"special content. If you disable this setting, you will be able to see these "
+"messages and get idea when other players are looking at your shop."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4181,7 +4188,8 @@ msgstr "Tampilkan pesan MVP"
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
+"usually makes little difference."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4200,9 +4208,12 @@ msgstr "Masukkan semua bisikan kedalam tab"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in "
+"separate tabs, separate tab for each player. If this setting disabled, all "
+"whispers will appear in General tab.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
+"Note: putting all whispers to single General tab is known to be confusing. "
+"Think twice before disabling this feature."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4213,7 +4224,8 @@ msgstr "Riwayat pesan sihir di jendela debug"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If "
+"disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
 msgstr ""
@@ -4226,9 +4238,11 @@ msgstr "Tujukkan pesan server di jendela debug"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of "
+"chat. If disabled, server messages will appear in General chat instead.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
+"Note: according to 4144, disabling this could also make you to lose some "
+"debug messages from client in Debug tab since these are fake server messages."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4253,9 +4267,11 @@ msgstr "Aktifkan tab gm"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM "
+"activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
+"Note: this setting only makes difference for GMs (Game Masters) since this "
+"tab only appears for GMs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4266,7 +4282,8 @@ msgstr "Aktifkan tab bahasa"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this feature.\n"
+"If this feature enabled, language tab will appear if server supports this "
+"feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
 msgstr ""
@@ -4279,7 +4296,9 @@ msgstr "Tampilkan semua bahasa pesan"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
+"If this setting enabled and server supports different chats for different "
+"languages, you will see messages for all languages, regardless of your "
+"language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
 msgstr ""
@@ -4292,7 +4311,9 @@ msgstr "Perbolehkan jendela pertarungan"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will "
+"contain messages related to battles, like damage and experience gain, if "
+"battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
 msgstr ""
@@ -4318,7 +4339,10 @@ msgstr "Atur besar tab obrolan bila dibutuhkan"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to "
+"adapt to appearance of chat input field when you typing message and when "
+"input field of chat disappears. If disabled, chat input area will always "
+"occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
@@ -4353,7 +4377,8 @@ msgstr "Sorot kata (dipisan dengan koma)"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. "
+"Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
 msgstr ""
@@ -4366,7 +4391,8 @@ msgstr "Nama abaikan global (dipisah dengan koma)"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender "
+"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
 msgstr ""
@@ -4379,9 +4405,12 @@ msgstr "Tampil tombol emosi di obrolan"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This "
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by "
+"default."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -6125,8 +6154,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:618
-#: src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:618 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Buat"
 
@@ -6242,17 +6270,16 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:104
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:210
-#: src/gui/windows/charcreatedialog.cpp:221
-#: src/gui/windows/charcreatedialog.cpp:231
-#: src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:196
+#: src/gui/windows/charcreatedialog.cpp:209
+#: src/gui/windows/charcreatedialog.cpp:220
+#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:110
-#: src/gui/windows/charcreatedialog.cpp:600
+#: src/gui/windows/charcreatedialog.cpp:599
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Tolong distribusikan %d point"
@@ -6261,73 +6288,71 @@ msgstr "Tolong distribusikan %d point"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:201
-#: src/gui/windows/charcreatedialog.cpp:212
-#: src/gui/windows/charcreatedialog.cpp:223
-#: src/gui/windows/charcreatedialog.cpp:233
-#: src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:200
+#: src/gui/windows/charcreatedialog.cpp:211
+#: src/gui/windows/charcreatedialog.cpp:222
+#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:202
 msgid "Hair color:"
 msgstr "Warna rambut:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:213
 msgid "Hair style:"
 msgstr "Gaya rambut:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:224
 msgid "Race:"
 msgstr "Ras:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:234
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:252
-#: src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:258
-#: src/gui/windows/charcreatedialog.cpp:265
-#: src/gui/windows/charcreatedialog.cpp:273
+#: src/gui/windows/charcreatedialog.cpp:257
+#: src/gui/windows/charcreatedialog.cpp:264
+#: src/gui/windows/charcreatedialog.cpp:272
 msgid "M"
 msgstr ""
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:260
-#: src/gui/windows/charcreatedialog.cpp:277
+#: src/gui/windows/charcreatedialog.cpp:259
+#: src/gui/windows/charcreatedialog.cpp:276
 #: src/gui/windows/inventorywindow.cpp:223
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:267
+#: src/gui/windows/charcreatedialog.cpp:266
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:474
+#: src/gui/windows/charcreatedialog.cpp:473
 msgid "Your name needs to be at least 4 characters."
 msgstr "Nama anda paling sedikit harus mengandung 4 karakter."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:590
+#: src/gui/windows/charcreatedialog.cpp:589
 msgid "Character stats OK"
 msgstr "Stats Karakter OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:606
+#: src/gui/windows/charcreatedialog.cpp:605
 #, c-format
 msgid "Please remove %d points"
 msgstr "Tolong hilangkan %d poin"
@@ -6493,8 +6518,7 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57
-#: src/gui/windows/serverdialog.cpp:112
+#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:112
 msgid "Connect"
 msgstr "Menyambung"
 
@@ -6850,15 +6874,13 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61
-#: src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr ""
@@ -6967,7 +6989,7 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/windows/ministatuswindow.cpp:356
-#: src/gui/windows/statuswindow.cpp:236
+#: src/gui/windows/statuswindow.cpp:261
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
@@ -7419,33 +7441,33 @@ msgid "Choose your party's name."
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:72
+#: src/gui/windows/statuswindow.cpp:74
 msgid "HP:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:75
+#: src/gui/windows/statuswindow.cpp:77
 msgid "Exp:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:136
+#: src/gui/windows/statuswindow.cpp:138
 msgid "MP:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:173 src/gui/windows/statuswindow.cpp:294
+#: src/gui/windows/statuswindow.cpp:175 src/gui/windows/statuswindow.cpp:319
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:175
+#: src/gui/windows/statuswindow.cpp:177
 msgid "Job:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:224 src/gui/windows/statuswindow.cpp:342
+#: src/gui/windows/statuswindow.cpp:226 src/gui/windows/statuswindow.cpp:367
 #, c-format
 msgid "Character points: %d"
 msgstr ""
@@ -7563,8 +7585,7 @@ msgstr "Anda tidak memiliki cukup uang."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
 #. TRANSLATORS: trade error
@@ -9043,33 +9064,33 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:431
-#: src/net/eathena/charserverrecv.cpp:479
+#: src/net/eathena/charserverrecv.cpp:398
+#: src/net/eathena/charserverrecv.cpp:446
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:454
+#: src/net/eathena/charserverrecv.cpp:421
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:470
+#: src/net/eathena/charserverrecv.cpp:437
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:474
+#: src/net/eathena/charserverrecv.cpp:441
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:483
+#: src/net/eathena/charserverrecv.cpp:450
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:517 src/net/tmwa/charserverrecv.cpp:339
+#: src/net/eathena/charserverrecv.cpp:484 src/net/tmwa/charserverrecv.cpp:303
 msgid "Failed to delete character."
 msgstr ""
 
@@ -9121,140 +9142,11 @@ msgstr ""
 msgid "Do you accept %s and %s as parents?"
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:130
-#, c-format
-msgid "Strength %s"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:132
-#, c-format
-msgid "Agility %s"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:134
-#, c-format
-msgid "Vitality %s"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:136
-#, c-format
-msgid "Intelligence %s"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:138
-#, c-format
-msgid "Dexterity %s"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:140
-#, c-format
-msgid "Luck %s"
-msgstr ""
-
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:197 src/net/tmwa/generalhandler.cpp:207
+#: src/net/eathena/generalhandler.cpp:179 src/net/tmwa/generalhandler.cpp:189
 msgid "Got disconnected from server!"
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:223 src/net/tmwa/generalhandler.cpp:234
-msgid "Strength"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:237
-msgid "Agility"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:229 src/net/tmwa/generalhandler.cpp:240
-msgid "Vitality"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:243
-msgid "Intelligence"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:246
-msgid "Dexterity"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:238 src/net/tmwa/generalhandler.cpp:249
-msgid "Luck"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:253
-msgid "Defense"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:255
-msgid "M.Attack"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:257
-msgid "M.Defense"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:260
-#, no-c-format
-msgid "% Accuracy"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:263
-#, no-c-format
-msgid "% Evade"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:266
-#, no-c-format
-msgid "% Critical"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:268
-msgid "Attack Delay"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:270
-msgid "Walk Delay"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:272
-msgid "Attack Range"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:274
-msgid "Damage per sec."
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266
-msgid "Karma"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268
-msgid "Manner"
-msgstr ""
-
 #. TRANSLATORS: error message
 #: src/net/eathena/generalrecv.cpp:49 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
@@ -9410,7 +9302,7 @@ msgstr ""
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:199
+#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:190
 msgid "Unknown item"
 msgstr ""
 
@@ -9686,21 +9578,52 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:93
-#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
-#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
+#: src/resources/db/itemdb.cpp:377 src/resources/db/itemdb.cpp:381
+#: src/resources/db/moddb.cpp:79 src/resources/db/monsterdb.cpp:101
+#: src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:104
+#: src/resources/db/petdb.cpp:103
 msgid "pet"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:103
+#: src/resources/db/skillunitdb.cpp:102
 msgid "skill"
 msgstr ""
 
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:45
+msgid "Strength"
+msgstr ""
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:49
+msgid "Agility"
+msgstr ""
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:53
+msgid "Vitality"
+msgstr ""
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:57
+msgid "Intelligence"
+msgstr ""
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:61
+msgid "Dexterity"
+msgstr ""
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:65
+msgid "Luck"
+msgstr ""
+
 #. TRANSLATORS: inventory type name
 #: src/resources/inventory/inventory.cpp:340
 msgid "Npc"
@@ -10352,8 +10275,9 @@ msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:556
-msgid "Room join failed. Not enought money."
-msgstr ""
+#, fuzzy
+msgid "Room join failed. Not enough money."
+msgstr "Anda tidak memiliki cukup uang."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:560
@@ -10620,33 +10544,35 @@ msgstr ""
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:796
 #, c-format
-msgid "You and %s was divorced."
+msgid "You and %s are now divorced."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:800
-msgid "You was called by partner."
-msgstr ""
+#, fuzzy
+msgid "You were called by your partner."
+msgstr "Kamu dibunuh oleh %s."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:804
 #, c-format
-msgid "You calling partner %s."
+msgid "You are calling your partner, %s."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:808
-msgid "Adoption child error. You already have baby."
+msgid "Child adoption failed. You already have a baby."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:812
-msgid "Adoption child error. You level too small for have baby."
+msgid "Child adoption failed. Your level is too low."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:816
-msgid "Adoption child error. This player already married and can't be baby."
+msgid ""
+"Child adoption failed. This player is already married and can't be a baby."
 msgstr ""
 
 #. TRANSLATORS: notification message
@@ -10656,19 +10582,20 @@ msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:825
-msgid "Error saving location. Not enought skill level."
+msgid "Error saving location. Not enough skill level."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:829
-msgid "Error saving location. You not have warp skill."
+msgid "Error saving location. You do not have warp skill."
 msgstr ""
 
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:29
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "Pilihan untuk /%s adalah \"ya\", \"tidak\", \"benar\",\"salah\", \"1\",\"0\"."
+msgstr ""
+"Pilihan untuk /%s adalah \"ya\", \"tidak\", \"benar\",\"salah\", \"1\",\"0\"."
 
 #. TRANSLATORS: uptime command
 #: src/utils/stringutils.cpp:946
diff --git a/po/it.po b/po/it.po
index 6c2b1e4e2..f0b073673 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Alessandro Camplese <ale.camplese@gmail.com>, 2013
 # Alessandro Camplese <ale.camplese@gmail.com>, 2013
@@ -19,14 +19,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-06-18 18:53+0300\n"
+"POT-Creation-Date: 2016-07-02 19:47+0300\n"
 "PO-Revision-Date: 2016-06-19 09:21+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Italian (http://www.transifex.com/akaras/manaplus/language/it/)\n"
+"Language-Team: Italian (http://www.transifex.com/akaras/manaplus/language/"
+"it/)\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
@@ -43,7 +44,7 @@ msgstr "File caricato"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:171 src/client.cpp:1569 src/client.cpp:1604
+#: src/actions/actions.cpp:171 src/client.cpp:1572 src/client.cpp:1607
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
@@ -54,7 +55,7 @@ msgstr "File caricato"
 #: src/gui/widgets/tabs/setup_video.cpp:420
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:476
+#: src/gui/windows/charcreatedialog.cpp:475
 #: src/gui/windows/charselectdialog.cpp:262
 #: src/gui/windows/charselectdialog.cpp:310 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:59
@@ -63,9 +64,9 @@ msgstr "File caricato"
 #: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:531
 #: src/gui/windows/textdialog.cpp:53 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:456
-#: src/net/eathena/charserverrecv.cpp:491
-#: src/net/eathena/charserverrecv.cpp:519 src/net/tmwa/charserverrecv.cpp:341
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:423
+#: src/net/eathena/charserverrecv.cpp:458
+#: src/net/eathena/charserverrecv.cpp:486 src/net/tmwa/charserverrecv.cpp:305
 msgid "OK"
 msgstr "OK"
 
@@ -137,7 +138,8 @@ msgstr ""
 #: src/actions/chat.cpp:315
 #, c-format
 msgid "Cannot create a whisper tab \"%s\"! It probably already exists."
-msgstr "Impossibile creare una scheda sussurro \"%s\"! Probabilmente esiste già."
+msgstr ""
+"Impossibile creare una scheda sussurro \"%s\"! Probabilmente esiste già."
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
@@ -312,26 +314,26 @@ msgid "Visible on map"
 msgstr "Visibile nella mappa"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:496
+#: src/being/being.cpp:494
 msgid "Human"
 msgstr "Umano"
 
 #. TRANSLATORS: dodge or miss message in attacks
-#: src/being/being.cpp:683
+#: src/being/being.cpp:676
 msgid "dodge"
 msgstr "Schivato"
 
-#: src/being/being.cpp:683
+#: src/being/being.cpp:676
 msgid "miss"
 msgstr "Mancato"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2282 src/gui/windows/whoisonline.cpp:882
+#: src/being/being.cpp:2275 src/gui/windows/whoisonline.cpp:882
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2287 src/gui/windows/whoisonline.cpp:887
+#: src/being/being.cpp:2280 src/gui/windows/whoisonline.cpp:887
 msgid "I"
 msgstr "I"
 
@@ -482,41 +484,41 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:870 src/dyetool/client.cpp:491 src/gui/windowmenu.cpp:189
+#: src/client.cpp:872 src/dyetool/client.cpp:491 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:66
 msgid "Setup"
 msgstr "Impostazioni"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:873 src/dyetool/client.cpp:494
+#: src/client.cpp:875 src/dyetool/client.cpp:494
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:876 src/dyetool/client.cpp:497
+#: src/client.cpp:878 src/dyetool/client.cpp:497
 #: src/gui/widgets/tabs/setup_video.cpp:110
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:879 src/dyetool/client.cpp:500
+#: src/client.cpp:881 src/dyetool/client.cpp:500
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:882 src/dyetool/client.cpp:503
+#: src/client.cpp:884 src/dyetool/client.cpp:503
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:885 src/dyetool/client.cpp:506 src/gui/windowmenu.cpp:74
+#: src/client.cpp:887 src/dyetool/client.cpp:506 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Aiuto"
@@ -537,7 +539,7 @@ msgstr "Aiuto"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:889 src/client.cpp:1483 src/client.cpp:1502
+#: src/client.cpp:891 src/client.cpp:1486 src/client.cpp:1505
 #: src/dyetool/client.cpp:510 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:756 src/gui/popups/popupmenu.cpp:833
 #: src/gui/popups/popupmenu.cpp:1087 src/gui/windows/didyouknowwindow.cpp:81
@@ -550,32 +552,32 @@ msgid "Close"
 msgstr "Chiudi"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1115 src/gui/windowmanager_unittest.cc:156
+#: src/client.cpp:1117 src/gui/windowmanager_unittest.cc:156
 msgid "Connecting to server"
 msgstr "Connessione al server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1172 src/gui/windowmanager_unittest.cc:173
+#: src/client.cpp:1174 src/gui/windowmanager_unittest.cc:173
 msgid "Logging in"
 msgstr "Accesso all'account"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1221
+#: src/client.cpp:1223
 msgid "Entering game world"
 msgstr "Accesso al gioco"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1369
+#: src/client.cpp:1372
 msgid "Requesting characters"
 msgstr "Caricamento personaggi"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1412
+#: src/client.cpp:1415
 msgid "Connecting to the game server"
 msgstr "Connessione al server del gioco"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1424
+#: src/client.cpp:1427
 msgid "Changing game servers"
 msgstr "Cambiamento server del gioco"
 
@@ -592,52 +594,52 @@ msgstr "Cambiamento server del gioco"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1480 src/client.cpp:1499 src/client.cpp:1738
+#: src/client.cpp:1483 src/client.cpp:1502 src/client.cpp:1741
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:472
+#: src/gui/windows/charcreatedialog.cpp:471
 #: src/gui/windows/charselectdialog.cpp:306
 #: src/gui/windows/editserverdialog.cpp:212
 #: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:429
-#: src/net/eathena/charserverrecv.cpp:433
-#: src/net/eathena/charserverrecv.cpp:515 src/net/tmwa/charserverrecv.cpp:337
+#: src/net/eathena/charserverrecv.cpp:396
+#: src/net/eathena/charserverrecv.cpp:400
+#: src/net/eathena/charserverrecv.cpp:482 src/net/tmwa/charserverrecv.cpp:301
 msgid "Error"
 msgstr "Errore"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1518
+#: src/client.cpp:1521
 msgid "Requesting registration details"
 msgstr "Richiesta dettagli di registrazione"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1565
+#: src/client.cpp:1568
 msgid "Password Change"
 msgstr "Cambia password"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1567
+#: src/client.cpp:1570
 msgid "Password changed successfully!"
 msgstr "Password modificata con successo!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1600
+#: src/client.cpp:1603
 msgid "Email Change"
 msgstr "Cambia Email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1602
+#: src/client.cpp:1605
 msgid "Email changed successfully!"
 msgstr "Email cambiata con successo!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1638
+#: src/client.cpp:1641
 msgid "Unregister Successful"
 msgstr "Annullamento registrazione effettuato con successo"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1640
+#: src/client.cpp:1643
 msgid "Farewell, come back any time..."
 msgstr "Addio, torna quando vuoi..."
 
@@ -709,7 +711,9 @@ msgstr "  -c --character      : Effettua il Login con questo personaggio"
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:77
 msgid "  -s --server         : Login server name or IP"
-msgstr "  -s --server         : Effettua il Login con questo nome Server o a questo indirizzo IP"
+msgstr ""
+"  -s --server         : Effettua il Login con questo nome Server o a questo "
+"indirizzo IP"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:80
@@ -749,7 +753,8 @@ msgstr "  -L --localdata-dir  : Directory da usare per i dati locali"
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:103
 msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr "     --screenshot-dir : Scegli la Directory per salvare gli Screenshots"
+msgstr ""
+"     --screenshot-dir : Scegli la Directory per salvare gli Screenshots"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:106
@@ -830,23 +835,23 @@ msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:598
+#: src/game.cpp:600
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Screenshot salvato come %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:608
+#: src/game.cpp:610
 msgid "Saving screenshot failed!"
 msgstr "Salvataggio immagine fallito!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:695
+#: src/game.cpp:697
 msgid "The connection to the server was lost."
 msgstr "La connessione al server è caduta."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:698
+#: src/game.cpp:700
 msgid "Network Error"
 msgstr "Errore di rete"
 
@@ -1261,14 +1266,16 @@ msgstr ""
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
-msgstr "Stai trasportando piu' della meta' del tuo peso. Non puoi piu' rigenerare vita."
+"You are carrying more than half your weight. You are unable to regain health."
+msgstr ""
+"Stai trasportando piu' della meta' del tuo peso. Non puoi piu' rigenerare "
+"vita."
 
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:198
 msgid "You are carrying less than half your weight. You can regain health."
-msgstr "Stai trasportando meno della meta' del tuo peso. Ora puoi rigenerare vita."
+msgstr ""
+"Stai trasportando meno della meta' del tuo peso. Ora puoi rigenerare vita."
 
 #. TRANSLATORS: chat color
 #. TRANSLATORS: inventory sort mode
@@ -1279,8 +1286,7 @@ msgstr "Stai trasportando meno della meta' del tuo peso. Ora puoi rigenerare vit
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:671
-#: src/gui/windows/serverdialog.cpp:603
+#: src/gui/windows/equipmentwindow.cpp:671 src/gui/windows/serverdialog.cpp:603
 msgid "default"
 msgstr "Predefinito"
 
@@ -1832,11 +1838,9 @@ msgstr "Commercia"
 #. TRANSLATORS: attack player
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
-#. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:180 src/gui/popups/popupmenu.cpp:304
 #: src/gui/popups/popupmenu.cpp:912 src/gui/widgets/skillinfo.cpp:125
-#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
-#: src/net/tmwa/generalhandler.cpp:251
+#: src/input/pages/basic.cpp:40
 msgid "Attack"
 msgstr "Attacco"
 
@@ -1912,7 +1916,7 @@ msgstr "Movimento"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:270 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:152
+#: src/resources/db/npcdb.cpp:151
 msgid "Talk"
 msgstr "Parla"
 
@@ -1930,7 +1934,7 @@ msgstr "Parla"
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:154
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:153
 msgid "Buy"
 msgstr "Compra"
 
@@ -1948,7 +1952,7 @@ msgstr "Compra"
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
 #: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:256
-#: src/resources/db/npcdb.cpp:156
+#: src/resources/db/npcdb.cpp:155
 msgid "Sell"
 msgstr "Vendi"
 
@@ -2050,7 +2054,7 @@ msgstr "Togli"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:408 src/resources/db/petdb.cpp:160
+#: src/gui/popups/popupmenu.cpp:408 src/resources/db/petdb.cpp:159
 msgid "Return to egg"
 msgstr ""
 
@@ -2447,7 +2451,7 @@ msgstr "Reset barra gialla"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2125 src/gui/windows/statuswindow.cpp:90
 msgid "Copy to chat"
 msgstr "Copia in Chat"
 
@@ -2499,9 +2503,8 @@ msgstr "Mostra Finestra"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/popups/popupmenu.cpp:2386 src/gui/popups/skillpopup.cpp:127
-#: src/gui/windows/ministatuswindow.cpp:363
-#: src/gui/windows/statuswindow.cpp:68 src/gui/windows/statuswindow.cpp:243
-#: src/gui/windows/statuswindow.cpp:367
+#: src/gui/windows/ministatuswindow.cpp:363 src/gui/windows/statuswindow.cpp:70
+#: src/gui/windows/statuswindow.cpp:268 src/gui/windows/statuswindow.cpp:392
 #, c-format
 msgid "Level: %d"
 msgstr "Livello: %d"
@@ -2920,8 +2923,8 @@ msgstr ""
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3100 src/gui/popups/popupmenu.cpp:3119
 #: src/gui/popups/popupmenu.cpp:3132 src/gui/windows/charselectdialog.cpp:76
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:452
-#: src/net/eathena/charserverrecv.cpp:488
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:419
+#: src/net/eathena/charserverrecv.cpp:455
 msgid "Info"
 msgstr "Informazioni"
 
@@ -3312,8 +3315,8 @@ msgstr "Livello: %u"
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/statuswindow.cpp:70
-#: src/gui/windows/statuswindow.cpp:220 src/gui/windows/statuswindow.cpp:334
+#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/statuswindow.cpp:72
+#: src/gui/windows/statuswindow.cpp:222 src/gui/windows/statuswindow.cpp:359
 #, c-format
 msgid "Money: %s"
 msgstr "Soldi: %s"
@@ -3369,7 +3372,7 @@ msgstr "Esci"
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:194
 #: src/gui/windows/itemamountwindow.cpp:230 src/gui/windows/npcdialog.cpp:123
-#: src/gui/windows/statuswindow.cpp:746
+#: src/gui/windows/statuswindow.cpp:771
 msgid "+"
 msgstr "+"
 
@@ -3390,8 +3393,8 @@ msgstr "-"
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/selldialog.cpp:133 src/gui/windows/buydialog.cpp:299
-#: src/gui/windows/statuswindow.cpp:483 src/gui/windows/statuswindow.cpp:539
-#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:766
+#: src/gui/windows/statuswindow.cpp:508 src/gui/windows/statuswindow.cpp:564
+#: src/gui/windows/statuswindow.cpp:769 src/gui/windows/statuswindow.cpp:791
 msgid "Max"
 msgstr "Massimo"
 
@@ -3547,15 +3550,13 @@ msgstr "Gestione in comune oggetti attivata."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104
-#: src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr "Gestione in comune oggetti disattivata."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109
-#: src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr "Gestione in comune oggetti non puo' essere attivata."
 
@@ -3566,22 +3567,19 @@ msgstr "Oggetti in comune sconosciuti."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150
-#: src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr "Esperienza in comune attivata."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155
-#: src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr "Esperienza in comune disattivata."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160
-#: src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr "Esperienza in comune non puo' essere attivata."
 
@@ -4015,15 +4013,15 @@ msgstr ""
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
+"Note: no other text inputs will be allowed to receive text input when you "
+"typing in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86
-#: src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr "Colori"
 
@@ -4047,9 +4045,11 @@ msgstr "Mostra colori per la chat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat "
+"window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4076,9 +4076,11 @@ msgstr "Limita un massimo di caratteri per messaggio"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed "
+"in chat.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will be truncated."
+"Note: long lines can make client slower. Lines longer than this limit will "
+"be truncated."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4089,7 +4091,9 @@ msgstr "Limita un massimo di messaggi per la chat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
+"specified number of last lines of text. Oldest lines exceeding this limit "
+"are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
 msgstr ""
@@ -4130,8 +4134,8 @@ msgstr "Mostra la storia della chat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on"
-" startup instead of starting with empty chat tabs."
+"If this setting enabled, client will load old chat tabs content from logs on "
+"startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4142,9 +4146,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be "
+"shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4155,9 +4161,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be "
+"shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4173,9 +4181,13 @@ msgstr "Nascondi i messaggi del negozio"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will "
+"be displayed in chat. Disable this setting if you want to see shop-related "
+"messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
+"Note: technically, ManaPlus shop implemented as usual private messages with "
+"special content. If you disable this setting, you will be able to see these "
+"messages and get idea when other players are looking at your shop."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4188,7 +4200,8 @@ msgstr ""
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
+"usually makes little difference."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4207,9 +4220,12 @@ msgstr "Sposta tutti i sussurri in schede"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in "
+"separate tabs, separate tab for each player. If this setting disabled, all "
+"whispers will appear in General tab.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
+"Note: putting all whispers to single General tab is known to be confusing. "
+"Think twice before disabling this feature."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4220,7 +4236,8 @@ msgstr "Salva i messaggi delle magie nella debug tab"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If "
+"disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
 msgstr ""
@@ -4233,9 +4250,11 @@ msgstr "Mostra i messaggi del server nella chat di debug"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of "
+"chat. If disabled, server messages will appear in General chat instead.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
+"Note: according to 4144, disabling this could also make you to lose some "
+"debug messages from client in Debug tab since these are fake server messages."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4260,9 +4279,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM "
+"activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
+"Note: this setting only makes difference for GMs (Game Masters) since this "
+"tab only appears for GMs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4273,7 +4294,8 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this feature.\n"
+"If this feature enabled, language tab will appear if server supports this "
+"feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
 msgstr ""
@@ -4286,7 +4308,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
+"If this setting enabled and server supports different chats for different "
+"languages, you will see messages for all languages, regardless of your "
+"language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
 msgstr ""
@@ -4299,7 +4323,9 @@ msgstr "Abilita la chat di battaglia"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will "
+"contain messages related to battles, like damage and experience gain, if "
+"battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
 msgstr ""
@@ -4325,7 +4351,10 @@ msgstr "Dimensione finestra dialogo dinamica"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to "
+"adapt to appearance of chat input field when you typing message and when "
+"input field of chat disappears. If disabled, chat input area will always "
+"occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
@@ -4360,7 +4389,8 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. "
+"Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
 msgstr ""
@@ -4373,7 +4403,8 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender "
+"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
 msgstr ""
@@ -4386,9 +4417,12 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This "
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by "
+"default."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4502,7 +4536,9 @@ msgstr "Sono stati rilevati conflitti nei tasti."
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr "Conflitto tra le chiavi \"%s\" e \"%s\". Risolvi, o potrebbero capitare inconvenienti."
+msgstr ""
+"Conflitto tra le chiavi \"%s\" e \"%s\". Risolvi, o potrebbero capitare "
+"inconvenienti."
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
@@ -5550,13 +5586,17 @@ msgstr "Nessuno"
 #: src/gui/widgets/tabs/setup_video.cpp:233
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr "Cambio verso la modalità finestra fallito e anche il ripristino modalità precedente è fallito!"
+msgstr ""
+"Cambio verso la modalità finestra fallito e anche il ripristino modalità "
+"precedente è fallito!"
 
 #. TRANSLATORS: video error message
 #: src/gui/widgets/tabs/setup_video.cpp:240
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr "Cambio verso la modalità schermo intero fallito e anche il ripristino della modalità precedente è fallito!"
+msgstr ""
+"Cambio verso la modalità schermo intero fallito e anche il ripristino della "
+"modalità precedente è fallito!"
 
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -5597,7 +5637,9 @@ msgstr "RIsoluzione schermo cambiata"
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:401
 msgid "Some windows may be moved to fit the lowered resolution."
-msgstr "Alcune finestre potrebbero essere spostate per addattarsi alla risoluzione ridotta."
+msgstr ""
+"Alcune finestre potrebbero essere spostate per addattarsi alla risoluzione "
+"ridotta."
 
 #. TRANSLATORS: speach type
 #: src/gui/widgets/tabs/setup_visual.cpp:43
@@ -6132,8 +6174,7 @@ msgstr "Quantita':"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:618
-#: src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:618 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Crea"
 
@@ -6249,17 +6290,16 @@ msgstr "^"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:104
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:210
-#: src/gui/windows/charcreatedialog.cpp:221
-#: src/gui/windows/charcreatedialog.cpp:231
-#: src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:196
+#: src/gui/windows/charcreatedialog.cpp:209
+#: src/gui/windows/charcreatedialog.cpp:220
+#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:110
-#: src/gui/windows/charcreatedialog.cpp:600
+#: src/gui/windows/charcreatedialog.cpp:599
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Distribuire %d punti"
@@ -6268,73 +6308,71 @@ msgstr "Distribuire %d punti"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:201
-#: src/gui/windows/charcreatedialog.cpp:212
-#: src/gui/windows/charcreatedialog.cpp:223
-#: src/gui/windows/charcreatedialog.cpp:233
-#: src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:200
+#: src/gui/windows/charcreatedialog.cpp:211
+#: src/gui/windows/charcreatedialog.cpp:222
+#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:202
 msgid "Hair color:"
 msgstr "Colore dei capelli:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:213
 msgid "Hair style:"
 msgstr "Taglio di capelli:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:224
 msgid "Race:"
 msgstr "Razza:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:234
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:252
-#: src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr "F"
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:258
-#: src/gui/windows/charcreatedialog.cpp:265
-#: src/gui/windows/charcreatedialog.cpp:273
+#: src/gui/windows/charcreatedialog.cpp:257
+#: src/gui/windows/charcreatedialog.cpp:264
+#: src/gui/windows/charcreatedialog.cpp:272
 msgid "M"
 msgstr ""
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:260
-#: src/gui/windows/charcreatedialog.cpp:277
+#: src/gui/windows/charcreatedialog.cpp:259
+#: src/gui/windows/charcreatedialog.cpp:276
 #: src/gui/windows/inventorywindow.cpp:223
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:267
+#: src/gui/windows/charcreatedialog.cpp:266
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:474
+#: src/gui/windows/charcreatedialog.cpp:473
 msgid "Your name needs to be at least 4 characters."
 msgstr "Il tuo nome deve contenere almeno 4 caratteri."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:590
+#: src/gui/windows/charcreatedialog.cpp:589
 msgid "Character stats OK"
 msgstr "Statistiche personaggio OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:606
+#: src/gui/windows/charcreatedialog.cpp:605
 #, c-format
 msgid "Please remove %d points"
 msgstr "Rimuovere %d punti"
@@ -6398,7 +6436,12 @@ msgid ""
 "Level: %u\n"
 "Experience: %u\n"
 "Money: %s"
-msgstr "Hp: %u%u\nMp: %u%u\nLivello: %u\nEsperienza: %u\nSoldi: %s"
+msgstr ""
+"Hp: %u%u\n"
+"Mp: %u%u\n"
+"Livello: %u\n"
+"Esperienza: %u\n"
+"Soldi: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/charselectdialog.cpp:308
@@ -6500,8 +6543,7 @@ msgstr "Modifica Server"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57
-#: src/gui/windows/serverdialog.cpp:112
+#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:112
 msgid "Connect"
 msgstr "Connetti"
 
@@ -6859,15 +6901,13 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61
-#: src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr ""
@@ -6976,7 +7016,7 @@ msgstr "Barra dei punti lavoro"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/windows/ministatuswindow.cpp:356
-#: src/gui/windows/statuswindow.cpp:236
+#: src/gui/windows/statuswindow.cpp:261
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Livello: %d (GM:%d)"
@@ -7428,33 +7468,33 @@ msgid "Choose your party's name."
 msgstr "Scegli un nome per il tuo party."
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:72
+#: src/gui/windows/statuswindow.cpp:74
 msgid "HP:"
 msgstr "HP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:75
+#: src/gui/windows/statuswindow.cpp:77
 msgid "Exp:"
 msgstr "Esperienza:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:136
+#: src/gui/windows/statuswindow.cpp:138
 msgid "MP:"
 msgstr "MP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:173 src/gui/windows/statuswindow.cpp:294
+#: src/gui/windows/statuswindow.cpp:175 src/gui/windows/statuswindow.cpp:319
 #, c-format
 msgid "Job: %d"
 msgstr "Lavoro: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:175
+#: src/gui/windows/statuswindow.cpp:177
 msgid "Job:"
 msgstr "Lavoro:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:224 src/gui/windows/statuswindow.cpp:342
+#: src/gui/windows/statuswindow.cpp:226 src/gui/windows/statuswindow.cpp:367
 #, c-format
 msgid "Character points: %d"
 msgstr "Punti personaggio: %d"
@@ -7572,9 +7612,10 @@ msgstr "Non hai abbastanza denaro."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
-msgstr "Aggiunta dell'oggetto fallita. Non puoi sovrapporre un tipo di oggetto sulla finestra."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+"Aggiunta dell'oggetto fallita. Non puoi sovrapporre un tipo di oggetto sulla "
+"finestra."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:539
@@ -8999,7 +9040,9 @@ msgstr "Rifiutato dal server."
 #: src/net/ea/loginrecv.cpp:136 src/net/eathena/loginrecv.cpp:74
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
-msgstr "Il tuo account è stato bandito permanentemente dal gioco. Contattare il GM per maggiori informazioni."
+msgstr ""
+"Il tuo account è stato bandito permanentemente dal gioco. Contattare il GM "
+"per maggiori informazioni."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:141 src/net/eathena/loginrecv.cpp:79
@@ -9012,7 +9055,9 @@ msgstr ""
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
-msgstr "Sei stato temporaneamente bannato dal gioco fino a %s.\nContatta il team GM sul forum."
+msgstr ""
+"Sei stato temporaneamente bannato dal gioco fino a %s.\n"
+"Contatta il team GM sul forum."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:151 src/net/eathena/loginrecv.cpp:92
@@ -9052,33 +9097,33 @@ msgstr "Connessione al server terminata. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:431
-#: src/net/eathena/charserverrecv.cpp:479
+#: src/net/eathena/charserverrecv.cpp:398
+#: src/net/eathena/charserverrecv.cpp:446
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:454
+#: src/net/eathena/charserverrecv.cpp:421
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:470
+#: src/net/eathena/charserverrecv.cpp:437
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:474
+#: src/net/eathena/charserverrecv.cpp:441
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:483
+#: src/net/eathena/charserverrecv.cpp:450
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:517 src/net/tmwa/charserverrecv.cpp:339
+#: src/net/eathena/charserverrecv.cpp:484 src/net/tmwa/charserverrecv.cpp:303
 msgid "Failed to delete character."
 msgstr "Eliminazione personaggio fallita."
 
@@ -9130,140 +9175,11 @@ msgstr ""
 msgid "Do you accept %s and %s as parents?"
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:130
-#, c-format
-msgid "Strength %s"
-msgstr "Forza %s"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:132
-#, c-format
-msgid "Agility %s"
-msgstr "Agilità %s"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:134
-#, c-format
-msgid "Vitality %s"
-msgstr "Vitalità %s"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:136
-#, c-format
-msgid "Intelligence %s"
-msgstr "Intelligenza %s"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:138
-#, c-format
-msgid "Dexterity %s"
-msgstr "Destrezza %s"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:140
-#, c-format
-msgid "Luck %s"
-msgstr "Fortuna %s"
-
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:197 src/net/tmwa/generalhandler.cpp:207
+#: src/net/eathena/generalhandler.cpp:179 src/net/tmwa/generalhandler.cpp:189
 msgid "Got disconnected from server!"
 msgstr "Disconnesso dal server!"
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:223 src/net/tmwa/generalhandler.cpp:234
-msgid "Strength"
-msgstr "Forza"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:237
-msgid "Agility"
-msgstr "Agilità"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:229 src/net/tmwa/generalhandler.cpp:240
-msgid "Vitality"
-msgstr "Vitalità"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:243
-msgid "Intelligence"
-msgstr "Intelligenza"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:246
-msgid "Dexterity"
-msgstr "Destrezza"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:238 src/net/tmwa/generalhandler.cpp:249
-msgid "Luck"
-msgstr "Fortuna"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:253
-msgid "Defense"
-msgstr "Difesa"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:255
-msgid "M.Attack"
-msgstr "Attacco M."
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:257
-msgid "M.Defense"
-msgstr "Difesa M."
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:260
-#, no-c-format
-msgid "% Accuracy"
-msgstr "% Accuratezza"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:263
-#, no-c-format
-msgid "% Evade"
-msgstr "% Evasione"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:266
-#, no-c-format
-msgid "% Critical"
-msgstr "% Colpo critico"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:268
-msgid "Attack Delay"
-msgstr "Ritardo Attacco"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:270
-msgid "Walk Delay"
-msgstr "Ritardo Movimento"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:272
-msgid "Attack Range"
-msgstr "Range d'attacco"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:274
-msgid "Damage per sec."
-msgstr "Danno per secondo."
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266
-msgid "Karma"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268
-msgid "Manner"
-msgstr ""
-
 #. TRANSLATORS: error message
 #: src/net/eathena/generalrecv.cpp:49 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
@@ -9419,7 +9335,7 @@ msgstr ""
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:199
+#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:190
 msgid "Unknown item"
 msgstr "Oggetto sconosciuto"
 
@@ -9695,21 +9611,52 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:93
-#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
-#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
+#: src/resources/db/itemdb.cpp:377 src/resources/db/itemdb.cpp:381
+#: src/resources/db/moddb.cpp:79 src/resources/db/monsterdb.cpp:101
+#: src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "senza nome"
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:104
+#: src/resources/db/petdb.cpp:103
 msgid "pet"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:103
+#: src/resources/db/skillunitdb.cpp:102
 msgid "skill"
 msgstr ""
 
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:45
+msgid "Strength"
+msgstr "Forza"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:49
+msgid "Agility"
+msgstr "Agilità"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:53
+msgid "Vitality"
+msgstr "Vitalità"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:57
+msgid "Intelligence"
+msgstr "Intelligenza"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:61
+msgid "Dexterity"
+msgstr "Destrezza"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:65
+msgid "Luck"
+msgstr "Fortuna"
+
 #. TRANSLATORS: inventory type name
 #: src/resources/inventory/inventory.cpp:340
 msgid "Npc"
@@ -10361,8 +10308,9 @@ msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:556
-msgid "Room join failed. Not enought money."
-msgstr ""
+#, fuzzy
+msgid "Room join failed. Not enough money."
+msgstr "Non hai abbastanza denaro."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:560
@@ -10629,33 +10577,35 @@ msgstr ""
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:796
 #, c-format
-msgid "You and %s was divorced."
+msgid "You and %s are now divorced."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:800
-msgid "You was called by partner."
-msgstr ""
+#, fuzzy
+msgid "You were called by your partner."
+msgstr "Sei stato ucciso da %s."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:804
 #, c-format
-msgid "You calling partner %s."
+msgid "You are calling your partner, %s."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:808
-msgid "Adoption child error. You already have baby."
+msgid "Child adoption failed. You already have a baby."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:812
-msgid "Adoption child error. You level too small for have baby."
+msgid "Child adoption failed. Your level is too low."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:816
-msgid "Adoption child error. This player already married and can't be baby."
+msgid ""
+"Child adoption failed. This player is already married and can't be a baby."
 msgstr ""
 
 #. TRANSLATORS: notification message
@@ -10665,19 +10615,21 @@ msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:825
-msgid "Error saving location. Not enought skill level."
+msgid "Error saving location. Not enough skill level."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:829
-msgid "Error saving location. You not have warp skill."
+msgid "Error saving location. You do not have warp skill."
 msgstr ""
 
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:29
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "Le opzioni per /%s sono \"yes\" (sì), \"no\", \"true\" (vero), \"false\" (falso), \"1\", \"0\"."
+msgstr ""
+"Le opzioni per /%s sono \"yes\" (sì), \"no\", \"true\" (vero), \"false"
+"\" (falso), \"1\", \"0\"."
 
 #. TRANSLATORS: uptime command
 #: src/utils/stringutils.cpp:946
@@ -10733,3 +10685,51 @@ msgstr "%d secondi"
 #, c-format
 msgid "%d seconds"
 msgstr "%d secondi"
+
+#~ msgid "Strength %s"
+#~ msgstr "Forza %s"
+
+#~ msgid "Agility %s"
+#~ msgstr "Agilità %s"
+
+#~ msgid "Vitality %s"
+#~ msgstr "Vitalità %s"
+
+#~ msgid "Intelligence %s"
+#~ msgstr "Intelligenza %s"
+
+#~ msgid "Dexterity %s"
+#~ msgstr "Destrezza %s"
+
+#~ msgid "Luck %s"
+#~ msgstr "Fortuna %s"
+
+#~ msgid "Defense"
+#~ msgstr "Difesa"
+
+#~ msgid "M.Attack"
+#~ msgstr "Attacco M."
+
+#~ msgid "M.Defense"
+#~ msgstr "Difesa M."
+
+#~ msgid "% Accuracy"
+#~ msgstr "% Accuratezza"
+
+#~ msgid "% Evade"
+#~ msgstr "% Evasione"
+
+#~ msgid "% Critical"
+#~ msgstr "% Colpo critico"
+
+#~ msgid "Attack Delay"
+#~ msgstr "Ritardo Attacco"
+
+#~ msgid "Walk Delay"
+#~ msgstr "Ritardo Movimento"
+
+#~ msgid "Attack Range"
+#~ msgstr "Range d'attacco"
+
+#~ msgid "Damage per sec."
+#~ msgstr "Danno per secondo."
diff --git a/po/ja.po b/po/ja.po
index 788cb684f..30a4e6ec1 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011
 # Candy <HarajukuCupcakes@gmail.com>, 2013
@@ -14,14 +14,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-06-18 18:53+0300\n"
+"POT-Creation-Date: 2016-07-02 19:47+0300\n"
 "PO-Revision-Date: 2016-06-19 09:21+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Japanese (http://www.transifex.com/akaras/manaplus/language/ja/)\n"
+"Language-Team: Japanese (http://www.transifex.com/akaras/manaplus/language/"
+"ja/)\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANSLATORS: file uploaded message
@@ -38,7 +39,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:171 src/client.cpp:1569 src/client.cpp:1604
+#: src/actions/actions.cpp:171 src/client.cpp:1572 src/client.cpp:1607
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
@@ -49,7 +50,7 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_video.cpp:420
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:476
+#: src/gui/windows/charcreatedialog.cpp:475
 #: src/gui/windows/charselectdialog.cpp:262
 #: src/gui/windows/charselectdialog.cpp:310 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:59
@@ -58,9 +59,9 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:531
 #: src/gui/windows/textdialog.cpp:53 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:456
-#: src/net/eathena/charserverrecv.cpp:491
-#: src/net/eathena/charserverrecv.cpp:519 src/net/tmwa/charserverrecv.cpp:341
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:423
+#: src/net/eathena/charserverrecv.cpp:458
+#: src/net/eathena/charserverrecv.cpp:486 src/net/tmwa/charserverrecv.cpp:305
 msgid "OK"
 msgstr "OK"
 
@@ -307,26 +308,26 @@ msgid "Visible on map"
 msgstr "マップに表示させる"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:496
+#: src/being/being.cpp:494
 msgid "Human"
 msgstr "人間"
 
 #. TRANSLATORS: dodge or miss message in attacks
-#: src/being/being.cpp:683
+#: src/being/being.cpp:676
 msgid "dodge"
 msgstr "ドッジ"
 
-#: src/being/being.cpp:683
+#: src/being/being.cpp:676
 msgid "miss"
 msgstr "ミス"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2282 src/gui/windows/whoisonline.cpp:882
+#: src/being/being.cpp:2275 src/gui/windows/whoisonline.cpp:882
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2287 src/gui/windows/whoisonline.cpp:887
+#: src/being/being.cpp:2280 src/gui/windows/whoisonline.cpp:887
 msgid "I"
 msgstr "I"
 
@@ -476,41 +477,41 @@ msgstr "吹出し"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:870 src/dyetool/client.cpp:491 src/gui/windowmenu.cpp:189
+#: src/client.cpp:872 src/dyetool/client.cpp:491 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:66
 msgid "Setup"
 msgstr "設定"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:873 src/dyetool/client.cpp:494
+#: src/client.cpp:875 src/dyetool/client.cpp:494
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:876 src/dyetool/client.cpp:497
+#: src/client.cpp:878 src/dyetool/client.cpp:497
 #: src/gui/widgets/tabs/setup_video.cpp:110
 msgid "Video"
 msgstr "ビデオ"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:879 src/dyetool/client.cpp:500
+#: src/client.cpp:881 src/dyetool/client.cpp:500
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "テーマ"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:882 src/dyetool/client.cpp:503
+#: src/client.cpp:884 src/dyetool/client.cpp:503
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:885 src/dyetool/client.cpp:506 src/gui/windowmenu.cpp:74
+#: src/client.cpp:887 src/dyetool/client.cpp:506 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "ヘルプ"
@@ -531,7 +532,7 @@ msgstr "ヘルプ"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:889 src/client.cpp:1483 src/client.cpp:1502
+#: src/client.cpp:891 src/client.cpp:1486 src/client.cpp:1505
 #: src/dyetool/client.cpp:510 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:756 src/gui/popups/popupmenu.cpp:833
 #: src/gui/popups/popupmenu.cpp:1087 src/gui/windows/didyouknowwindow.cpp:81
@@ -544,32 +545,32 @@ msgid "Close"
 msgstr "閉じる"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1115 src/gui/windowmanager_unittest.cc:156
+#: src/client.cpp:1117 src/gui/windowmanager_unittest.cc:156
 msgid "Connecting to server"
 msgstr "サーバーに接続しています"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1172 src/gui/windowmanager_unittest.cc:173
+#: src/client.cpp:1174 src/gui/windowmanager_unittest.cc:173
 msgid "Logging in"
 msgstr "ログインしています"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1221
+#: src/client.cpp:1223
 msgid "Entering game world"
 msgstr "ゲームの世界に移動しています"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1369
+#: src/client.cpp:1372
 msgid "Requesting characters"
 msgstr "キャラクターを呼び出しています"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1412
+#: src/client.cpp:1415
 msgid "Connecting to the game server"
 msgstr "ゲームサーバーに接続しています"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1424
+#: src/client.cpp:1427
 msgid "Changing game servers"
 msgstr "ゲームサーバーを変更しています"
 
@@ -586,52 +587,52 @@ msgstr "ゲームサーバーを変更しています"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1480 src/client.cpp:1499 src/client.cpp:1738
+#: src/client.cpp:1483 src/client.cpp:1502 src/client.cpp:1741
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:472
+#: src/gui/windows/charcreatedialog.cpp:471
 #: src/gui/windows/charselectdialog.cpp:306
 #: src/gui/windows/editserverdialog.cpp:212
 #: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:429
-#: src/net/eathena/charserverrecv.cpp:433
-#: src/net/eathena/charserverrecv.cpp:515 src/net/tmwa/charserverrecv.cpp:337
+#: src/net/eathena/charserverrecv.cpp:396
+#: src/net/eathena/charserverrecv.cpp:400
+#: src/net/eathena/charserverrecv.cpp:482 src/net/tmwa/charserverrecv.cpp:301
 msgid "Error"
 msgstr "エラー"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1518
+#: src/client.cpp:1521
 msgid "Requesting registration details"
 msgstr "登録内容を呼び出しています"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1565
+#: src/client.cpp:1568
 msgid "Password Change"
 msgstr "パスワード変更"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1567
+#: src/client.cpp:1570
 msgid "Password changed successfully!"
 msgstr "パスワードを変更しました!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1600
+#: src/client.cpp:1603
 msgid "Email Change"
 msgstr "メールアドレス変更"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1602
+#: src/client.cpp:1605
 msgid "Email changed successfully!"
 msgstr "メールアドレスを変更しました!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1638
+#: src/client.cpp:1641
 msgid "Unregister Successful"
 msgstr "登録を解除しました"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1640
+#: src/client.cpp:1643
 msgid "Farewell, come back any time..."
 msgstr "さようなら　また会いましょう..."
 
@@ -723,7 +724,9 @@ msgstr ""
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:89
 msgid "  -D --default        : Choose default character server and character"
-msgstr "  -D --default        : デフォルトで使用するキャラクターサーバーとキャラクターを選択する"
+msgstr ""
+"  -D --default        : デフォルトで使用するキャラクターサーバーとキャラク"
+"ターを選択する"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:93
@@ -758,7 +761,8 @@ msgstr ""
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:112
 msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr "  -T --tests          : ドライバーと自動コンフィグレーションのテストを始める"
+msgstr ""
+"  -T --tests          : ドライバーと自動コンフィグレーションのテストを始める"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:118
@@ -824,23 +828,23 @@ msgid "Debug"
 msgstr "デバッグ"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:598
+#: src/game.cpp:600
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:608
+#: src/game.cpp:610
 msgid "Saving screenshot failed!"
 msgstr "スクリーンショットを保存できませんでした!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:695
+#: src/game.cpp:697
 msgid "The connection to the server was lost."
 msgstr "サーバーへの接続が切断されました."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:698
+#: src/game.cpp:700
 msgid "Network Error"
 msgstr "ネットワークエラー"
 
@@ -1255,8 +1259,7 @@ msgstr ""
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
+"You are carrying more than half your weight. You are unable to regain health."
 msgstr "インベントリーが体重の半分以上の為、体力は回復できません."
 
 #. TRANSLATORS: weight message
@@ -1273,8 +1276,7 @@ msgstr "インベントリーが体重の半分以下になった為、体力は
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:671
-#: src/gui/windows/serverdialog.cpp:603
+#: src/gui/windows/equipmentwindow.cpp:671 src/gui/windows/serverdialog.cpp:603
 msgid "default"
 msgstr "デフォルト"
 
@@ -1826,11 +1828,9 @@ msgstr "トレード"
 #. TRANSLATORS: attack player
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
-#. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:180 src/gui/popups/popupmenu.cpp:304
 #: src/gui/popups/popupmenu.cpp:912 src/gui/widgets/skillinfo.cpp:125
-#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
-#: src/net/tmwa/generalhandler.cpp:251
+#: src/input/pages/basic.cpp:40
 msgid "Attack"
 msgstr "攻撃"
 
@@ -1906,7 +1906,7 @@ msgstr "動く"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:270 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:152
+#: src/resources/db/npcdb.cpp:151
 msgid "Talk"
 msgstr "話す"
 
@@ -1924,7 +1924,7 @@ msgstr "話す"
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:154
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:153
 msgid "Buy"
 msgstr "買う"
 
@@ -1942,7 +1942,7 @@ msgstr "買う"
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
 #: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:256
-#: src/resources/db/npcdb.cpp:156
+#: src/resources/db/npcdb.cpp:155
 msgid "Sell"
 msgstr "売る"
 
@@ -2044,7 +2044,7 @@ msgstr "取外す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:408 src/resources/db/petdb.cpp:160
+#: src/gui/popups/popupmenu.cpp:408 src/resources/db/petdb.cpp:159
 msgid "Return to egg"
 msgstr ""
 
@@ -2441,7 +2441,7 @@ msgstr "黄色バーをリセットする"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2125 src/gui/windows/statuswindow.cpp:90
 msgid "Copy to chat"
 msgstr "チャットへコピーする"
 
@@ -2493,9 +2493,8 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/popups/popupmenu.cpp:2386 src/gui/popups/skillpopup.cpp:127
-#: src/gui/windows/ministatuswindow.cpp:363
-#: src/gui/windows/statuswindow.cpp:68 src/gui/windows/statuswindow.cpp:243
-#: src/gui/windows/statuswindow.cpp:367
+#: src/gui/windows/ministatuswindow.cpp:363 src/gui/windows/statuswindow.cpp:70
+#: src/gui/windows/statuswindow.cpp:268 src/gui/windows/statuswindow.cpp:392
 #, c-format
 msgid "Level: %d"
 msgstr "レベル: %d"
@@ -2914,8 +2913,8 @@ msgstr ""
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3100 src/gui/popups/popupmenu.cpp:3119
 #: src/gui/popups/popupmenu.cpp:3132 src/gui/windows/charselectdialog.cpp:76
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:452
-#: src/net/eathena/charserverrecv.cpp:488
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:419
+#: src/net/eathena/charserverrecv.cpp:455
 msgid "Info"
 msgstr "情報"
 
@@ -3306,8 +3305,8 @@ msgstr ""
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/statuswindow.cpp:70
-#: src/gui/windows/statuswindow.cpp:220 src/gui/windows/statuswindow.cpp:334
+#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/statuswindow.cpp:72
+#: src/gui/windows/statuswindow.cpp:222 src/gui/windows/statuswindow.cpp:359
 #, c-format
 msgid "Money: %s"
 msgstr "GP: %s"
@@ -3363,7 +3362,7 @@ msgstr "終了"
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:194
 #: src/gui/windows/itemamountwindow.cpp:230 src/gui/windows/npcdialog.cpp:123
-#: src/gui/windows/statuswindow.cpp:746
+#: src/gui/windows/statuswindow.cpp:771
 msgid "+"
 msgstr "+"
 
@@ -3384,8 +3383,8 @@ msgstr "-"
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/selldialog.cpp:133 src/gui/windows/buydialog.cpp:299
-#: src/gui/windows/statuswindow.cpp:483 src/gui/windows/statuswindow.cpp:539
-#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:766
+#: src/gui/windows/statuswindow.cpp:508 src/gui/windows/statuswindow.cpp:564
+#: src/gui/windows/statuswindow.cpp:769 src/gui/windows/statuswindow.cpp:791
 msgid "Max"
 msgstr "最大"
 
@@ -3541,15 +3540,13 @@ msgstr "アイテム共有モード有効."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104
-#: src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr "アイテム共有モード無効."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109
-#: src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr "アイテム共有モード不可能."
 
@@ -3560,22 +3557,19 @@ msgstr "アイテム共有モード不明."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150
-#: src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr "Expシェアモード有効."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155
-#: src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr "Expシェアモード無効."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160
-#: src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr "Expシェアモード不可能."
 
@@ -4009,15 +4003,15 @@ msgstr ""
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
+"Note: no other text inputs will be allowed to receive text input when you "
+"typing in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86
-#: src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr "色"
 
@@ -4041,9 +4035,11 @@ msgstr "チャットの文字色リストを表示"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat "
+"window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4070,9 +4066,11 @@ msgstr "チャットで一行に表示する最大文字数を制限する"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed "
+"in chat.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will be truncated."
+"Note: long lines can make client slower. Lines longer than this limit will "
+"be truncated."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4083,7 +4081,9 @@ msgstr "チャットで表示する最大行数を制限する"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
+"specified number of last lines of text. Oldest lines exceeding this limit "
+"are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
 msgstr ""
@@ -4124,8 +4124,8 @@ msgstr "チャット履歴を表示"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on"
-" startup instead of starting with empty chat tabs."
+"If this setting enabled, client will load old chat tabs content from logs on "
+"startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4136,9 +4136,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be "
+"shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4149,9 +4151,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be "
+"shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4167,9 +4171,13 @@ msgstr "売買メッセージを隠す"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will "
+"be displayed in chat. Disable this setting if you want to see shop-related "
+"messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
+"Note: technically, ManaPlus shop implemented as usual private messages with "
+"special content. If you disable this setting, you will be able to see these "
+"messages and get idea when other players are looking at your shop."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4182,7 +4190,8 @@ msgstr "MVPメッセージを表示する"
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
+"usually makes little difference."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4201,9 +4210,12 @@ msgstr "ささやきををタブで表示する"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in "
+"separate tabs, separate tab for each player. If this setting disabled, all "
+"whispers will appear in General tab.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
+"Note: putting all whispers to single General tab is known to be confusing. "
+"Think twice before disabling this feature."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4214,7 +4226,8 @@ msgstr "デバッグタブに呪文をログする"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If "
+"disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
 msgstr ""
@@ -4227,9 +4240,11 @@ msgstr "デバッグタブにサーバーメッセージをログする"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of "
+"chat. If disabled, server messages will appear in General chat instead.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
+"Note: according to 4144, disabling this could also make you to lose some "
+"debug messages from client in Debug tab since these are fake server messages."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4254,9 +4269,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM "
+"activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
+"Note: this setting only makes difference for GMs (Game Masters) since this "
+"tab only appears for GMs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4267,7 +4284,8 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this feature.\n"
+"If this feature enabled, language tab will appear if server supports this "
+"feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
 msgstr ""
@@ -4280,7 +4298,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
+"If this setting enabled and server supports different chats for different "
+"languages, you will see messages for all languages, regardless of your "
+"language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
 msgstr ""
@@ -4293,7 +4313,9 @@ msgstr "バトルタブを有効"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will "
+"contain messages related to battles, like damage and experience gain, if "
+"battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
 msgstr ""
@@ -4319,7 +4341,10 @@ msgstr "チャットタブをリサイズする"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to "
+"adapt to appearance of chat input field when you typing message and when "
+"input field of chat disappears. If disabled, chat input area will always "
+"occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
@@ -4354,7 +4379,8 @@ msgstr "文字をハイライト (コンマで区切る)"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. "
+"Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
 msgstr ""
@@ -4367,7 +4393,8 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender "
+"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
 msgstr ""
@@ -4380,9 +4407,12 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This "
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by "
+"default."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4496,7 +4526,9 @@ msgstr "ショートカットキーが重複しています."
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr "\"%s\"と\"%s\"キーが重複しています。 ゲームプレイに悪い影響が出るかもしれません."
+msgstr ""
+"\"%s\"と\"%s\"キーが重複しています。 ゲームプレイに悪い影響が出るかもしれませ"
+"ん."
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
@@ -6126,8 +6158,7 @@ msgstr "量:"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:618
-#: src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:618 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "作成"
 
@@ -6243,17 +6274,16 @@ msgstr "^"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:104
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:210
-#: src/gui/windows/charcreatedialog.cpp:221
-#: src/gui/windows/charcreatedialog.cpp:231
-#: src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:196
+#: src/gui/windows/charcreatedialog.cpp:209
+#: src/gui/windows/charcreatedialog.cpp:220
+#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:110
-#: src/gui/windows/charcreatedialog.cpp:600
+#: src/gui/windows/charcreatedialog.cpp:599
 #, c-format
 msgid "Please distribute %d points"
 msgstr "%d ポイントを振り分けてください"
@@ -6262,73 +6292,71 @@ msgstr "%d ポイントを振り分けてください"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:201
-#: src/gui/windows/charcreatedialog.cpp:212
-#: src/gui/windows/charcreatedialog.cpp:223
-#: src/gui/windows/charcreatedialog.cpp:233
-#: src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:200
+#: src/gui/windows/charcreatedialog.cpp:211
+#: src/gui/windows/charcreatedialog.cpp:222
+#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:202
 msgid "Hair color:"
 msgstr "髪色:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:213
 msgid "Hair style:"
 msgstr "ヘアスタイル:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:224
 msgid "Race:"
 msgstr "人種:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:234
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:252
-#: src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr "友達"
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:258
-#: src/gui/windows/charcreatedialog.cpp:265
-#: src/gui/windows/charcreatedialog.cpp:273
+#: src/gui/windows/charcreatedialog.cpp:257
+#: src/gui/windows/charcreatedialog.cpp:264
+#: src/gui/windows/charcreatedialog.cpp:272
 msgid "M"
 msgstr ""
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:260
-#: src/gui/windows/charcreatedialog.cpp:277
+#: src/gui/windows/charcreatedialog.cpp:259
+#: src/gui/windows/charcreatedialog.cpp:276
 #: src/gui/windows/inventorywindow.cpp:223
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:267
+#: src/gui/windows/charcreatedialog.cpp:266
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:474
+#: src/gui/windows/charcreatedialog.cpp:473
 msgid "Your name needs to be at least 4 characters."
 msgstr "名前は４文字以上必要です."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:590
+#: src/gui/windows/charcreatedialog.cpp:589
 msgid "Character stats OK"
 msgstr "能力ポイント配分量は問題ありません"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:606
+#: src/gui/windows/charcreatedialog.cpp:605
 #, c-format
 msgid "Please remove %d points"
 msgstr "%dポイントを取り除いてください"
@@ -6494,8 +6522,7 @@ msgstr "サーバー編集"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57
-#: src/gui/windows/serverdialog.cpp:112
+#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:112
 msgid "Connect"
 msgstr "接続"
 
@@ -6851,15 +6878,13 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61
-#: src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr ""
@@ -6968,7 +6993,7 @@ msgstr "職"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/windows/ministatuswindow.cpp:356
-#: src/gui/windows/statuswindow.cpp:236
+#: src/gui/windows/statuswindow.cpp:261
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "レベル: %d (GM %d)"
@@ -7420,33 +7445,33 @@ msgid "Choose your party's name."
 msgstr "パーティ名を選んでください."
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:72
+#: src/gui/windows/statuswindow.cpp:74
 msgid "HP:"
 msgstr "HP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:75
+#: src/gui/windows/statuswindow.cpp:77
 msgid "Exp:"
 msgstr "Exp:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:136
+#: src/gui/windows/statuswindow.cpp:138
 msgid "MP:"
 msgstr "MP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:173 src/gui/windows/statuswindow.cpp:294
+#: src/gui/windows/statuswindow.cpp:175 src/gui/windows/statuswindow.cpp:319
 #, c-format
 msgid "Job: %d"
 msgstr "ジョブ: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:175
+#: src/gui/windows/statuswindow.cpp:177
 msgid "Job:"
 msgstr "ジョブポイント:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:224 src/gui/windows/statuswindow.cpp:342
+#: src/gui/windows/statuswindow.cpp:226 src/gui/windows/statuswindow.cpp:367
 #, c-format
 msgid "Character points: %d"
 msgstr "キャラクターポイント: %d"
@@ -7564,9 +7589,10 @@ msgstr "GP不足です."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
-msgstr "アイテムの追加に失敗しました。アイテム一種類を一つのウインドウ上で重複して追加することは出来ません."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+"アイテムの追加に失敗しました。アイテム一種類を一つのウインドウ上で重複して追"
+"加することは出来ません."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:539
@@ -8848,7 +8874,9 @@ msgstr "不明なキャラクターサーバーエラー."
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:75
 msgid "Failed to create character. Most likely the name is already taken."
-msgstr "キャラクター作成に失敗しました。既に使われている名前もしくは無効な文字が含まれています."
+msgstr ""
+"キャラクター作成に失敗しました。既に使われている名前もしくは無効な文字が含ま"
+"れています."
 
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:80 src/net/ea/loginrecv.cpp:159
@@ -9004,7 +9032,9 @@ msgstr ""
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
-msgstr "あなたは%sまでゲームから追放されました。\nGMにご連絡下さい."
+msgstr ""
+"あなたは%sまでゲームから追放されました。\n"
+"GMにご連絡下さい."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:151 src/net/eathena/loginrecv.cpp:92
@@ -9044,33 +9074,33 @@ msgstr "サーバーへの接続が切断されました. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:431
-#: src/net/eathena/charserverrecv.cpp:479
+#: src/net/eathena/charserverrecv.cpp:398
+#: src/net/eathena/charserverrecv.cpp:446
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:454
+#: src/net/eathena/charserverrecv.cpp:421
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:470
+#: src/net/eathena/charserverrecv.cpp:437
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:474
+#: src/net/eathena/charserverrecv.cpp:441
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:483
+#: src/net/eathena/charserverrecv.cpp:450
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:517 src/net/tmwa/charserverrecv.cpp:339
+#: src/net/eathena/charserverrecv.cpp:484 src/net/tmwa/charserverrecv.cpp:303
 msgid "Failed to delete character."
 msgstr "キャラクター削除に失敗しました."
 
@@ -9122,140 +9152,11 @@ msgstr ""
 msgid "Do you accept %s and %s as parents?"
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:130
-#, c-format
-msgid "Strength %s"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:132
-#, c-format
-msgid "Agility %s"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:134
-#, c-format
-msgid "Vitality %s"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:136
-#, c-format
-msgid "Intelligence %s"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:138
-#, c-format
-msgid "Dexterity %s"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:140
-#, c-format
-msgid "Luck %s"
-msgstr ""
-
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:197 src/net/tmwa/generalhandler.cpp:207
+#: src/net/eathena/generalhandler.cpp:179 src/net/tmwa/generalhandler.cpp:189
 msgid "Got disconnected from server!"
 msgstr "サーバーから切断されました!"
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:223 src/net/tmwa/generalhandler.cpp:234
-msgid "Strength"
-msgstr "攻撃力"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:237
-msgid "Agility"
-msgstr "機敏さ"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:229 src/net/tmwa/generalhandler.cpp:240
-msgid "Vitality"
-msgstr "防御力"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:243
-msgid "Intelligence"
-msgstr "魔力"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:246
-msgid "Dexterity"
-msgstr "命中率"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:238 src/net/tmwa/generalhandler.cpp:249
-msgid "Luck"
-msgstr "幸運"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:253
-msgid "Defense"
-msgstr "Defense"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:255
-msgid "M.Attack"
-msgstr "M.Attack"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:257
-msgid "M.Defense"
-msgstr "M.Defense"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:260
-#, no-c-format
-msgid "% Accuracy"
-msgstr "% Accuracy"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:263
-#, no-c-format
-msgid "% Evade"
-msgstr "% Evade"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:266
-#, no-c-format
-msgid "% Critical"
-msgstr "% Critical"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:268
-msgid "Attack Delay"
-msgstr "攻撃遅延"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:270
-msgid "Walk Delay"
-msgstr "徒歩遅延"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:272
-msgid "Attack Range"
-msgstr "攻撃距離"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:274
-msgid "Damage per sec."
-msgstr "ダメージ/秒."
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266
-msgid "Karma"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268
-msgid "Manner"
-msgstr ""
-
 #. TRANSLATORS: error message
 #: src/net/eathena/generalrecv.cpp:49 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
@@ -9411,7 +9312,7 @@ msgstr ""
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:199
+#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:190
 msgid "Unknown item"
 msgstr "不明なアイテム"
 
@@ -9687,21 +9588,52 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:93
-#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
-#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
+#: src/resources/db/itemdb.cpp:377 src/resources/db/itemdb.cpp:381
+#: src/resources/db/moddb.cpp:79 src/resources/db/monsterdb.cpp:101
+#: src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "名前なし"
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:104
+#: src/resources/db/petdb.cpp:103
 msgid "pet"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:103
+#: src/resources/db/skillunitdb.cpp:102
 msgid "skill"
 msgstr ""
 
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:45
+msgid "Strength"
+msgstr "攻撃力"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:49
+msgid "Agility"
+msgstr "機敏さ"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:53
+msgid "Vitality"
+msgstr "防御力"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:57
+msgid "Intelligence"
+msgstr "魔力"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:61
+msgid "Dexterity"
+msgstr "命中率"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:65
+msgid "Luck"
+msgstr "幸運"
+
 #. TRANSLATORS: inventory type name
 #: src/resources/inventory/inventory.cpp:340
 msgid "Npc"
@@ -10353,8 +10285,9 @@ msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:556
-msgid "Room join failed. Not enought money."
-msgstr ""
+#, fuzzy
+msgid "Room join failed. Not enough money."
+msgstr "GP不足です."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:560
@@ -10621,33 +10554,34 @@ msgstr ""
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:796
 #, c-format
-msgid "You and %s was divorced."
+msgid "You and %s are now divorced."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:800
-msgid "You was called by partner."
+msgid "You were called by your partner."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:804
 #, c-format
-msgid "You calling partner %s."
+msgid "You are calling your partner, %s."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:808
-msgid "Adoption child error. You already have baby."
+msgid "Child adoption failed. You already have a baby."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:812
-msgid "Adoption child error. You level too small for have baby."
+msgid "Child adoption failed. Your level is too low."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:816
-msgid "Adoption child error. This player already married and can't be baby."
+msgid ""
+"Child adoption failed. This player is already married and can't be a baby."
 msgstr ""
 
 #. TRANSLATORS: notification message
@@ -10657,19 +10591,21 @@ msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:825
-msgid "Error saving location. Not enought skill level."
+msgid "Error saving location. Not enough skill level."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:829
-msgid "Error saving location. You not have warp skill."
+msgid "Error saving location. You do not have warp skill."
 msgstr ""
 
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:29
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "/%sへの可能なオプションは：\"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+"/%sへの可能なオプションは：\"yes\", \"no\", \"true\", \"false\", \"1\", "
+"\"0\"."
 
 #. TRANSLATORS: uptime command
 #: src/utils/stringutils.cpp:946
@@ -10725,3 +10661,33 @@ msgstr "%d秒"
 #, c-format
 msgid "%d seconds"
 msgstr ""
+
+#~ msgid "Defense"
+#~ msgstr "Defense"
+
+#~ msgid "M.Attack"
+#~ msgstr "M.Attack"
+
+#~ msgid "M.Defense"
+#~ msgstr "M.Defense"
+
+#~ msgid "% Accuracy"
+#~ msgstr "% Accuracy"
+
+#~ msgid "% Evade"
+#~ msgstr "% Evade"
+
+#~ msgid "% Critical"
+#~ msgstr "% Critical"
+
+#~ msgid "Attack Delay"
+#~ msgstr "攻撃遅延"
+
+#~ msgid "Walk Delay"
+#~ msgstr "徒歩遅延"
+
+#~ msgid "Attack Range"
+#~ msgstr "攻撃距離"
+
+#~ msgid "Damage per sec."
+#~ msgstr "ダメージ/秒."
diff --git a/po/manaplus.pot b/po/manaplus.pot
index c8e5266ac..80e368810 100644
--- a/po/manaplus.pot
+++ b/po/manaplus.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-06-18 18:53+0300\n"
+"POT-Creation-Date: 2016-07-02 19:47+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"
@@ -32,7 +32,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:171 src/client.cpp:1569 src/client.cpp:1604
+#: src/actions/actions.cpp:171 src/client.cpp:1572 src/client.cpp:1607
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
@@ -43,7 +43,7 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_video.cpp:420
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:476
+#: src/gui/windows/charcreatedialog.cpp:475
 #: src/gui/windows/charselectdialog.cpp:262
 #: src/gui/windows/charselectdialog.cpp:310 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:59
@@ -52,9 +52,9 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:531
 #: src/gui/windows/textdialog.cpp:53 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:456
-#: src/net/eathena/charserverrecv.cpp:491
-#: src/net/eathena/charserverrecv.cpp:519 src/net/tmwa/charserverrecv.cpp:341
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:423
+#: src/net/eathena/charserverrecv.cpp:458
+#: src/net/eathena/charserverrecv.cpp:486 src/net/tmwa/charserverrecv.cpp:305
 msgid "OK"
 msgstr ""
 
@@ -301,26 +301,26 @@ msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:496
+#: src/being/being.cpp:494
 msgid "Human"
 msgstr ""
 
 #. TRANSLATORS: dodge or miss message in attacks
-#: src/being/being.cpp:683
+#: src/being/being.cpp:676
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:683
+#: src/being/being.cpp:676
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2282 src/gui/windows/whoisonline.cpp:882
+#: src/being/being.cpp:2275 src/gui/windows/whoisonline.cpp:882
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2287 src/gui/windows/whoisonline.cpp:887
+#: src/being/being.cpp:2280 src/gui/windows/whoisonline.cpp:887
 msgid "I"
 msgstr ""
 
@@ -471,41 +471,41 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:870 src/dyetool/client.cpp:491 src/gui/windowmenu.cpp:189
+#: src/client.cpp:872 src/dyetool/client.cpp:491 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:66
 msgid "Setup"
 msgstr ""
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:873 src/dyetool/client.cpp:494
+#: src/client.cpp:875 src/dyetool/client.cpp:494
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:876 src/dyetool/client.cpp:497
+#: src/client.cpp:878 src/dyetool/client.cpp:497
 #: src/gui/widgets/tabs/setup_video.cpp:110
 msgid "Video"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:879 src/dyetool/client.cpp:500
+#: src/client.cpp:881 src/dyetool/client.cpp:500
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:882 src/dyetool/client.cpp:503
+#: src/client.cpp:884 src/dyetool/client.cpp:503
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:885 src/dyetool/client.cpp:506 src/gui/windowmenu.cpp:74
+#: src/client.cpp:887 src/dyetool/client.cpp:506 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr ""
@@ -526,7 +526,7 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:889 src/client.cpp:1483 src/client.cpp:1502
+#: src/client.cpp:891 src/client.cpp:1486 src/client.cpp:1505
 #: src/dyetool/client.cpp:510 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:756 src/gui/popups/popupmenu.cpp:833
 #: src/gui/popups/popupmenu.cpp:1087 src/gui/windows/didyouknowwindow.cpp:81
@@ -539,32 +539,32 @@ msgid "Close"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1115 src/gui/windowmanager_unittest.cc:156
+#: src/client.cpp:1117 src/gui/windowmanager_unittest.cc:156
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1172 src/gui/windowmanager_unittest.cc:173
+#: src/client.cpp:1174 src/gui/windowmanager_unittest.cc:173
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1221
+#: src/client.cpp:1223
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1369
+#: src/client.cpp:1372
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1412
+#: src/client.cpp:1415
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1424
+#: src/client.cpp:1427
 msgid "Changing game servers"
 msgstr ""
 
@@ -581,52 +581,52 @@ msgstr ""
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1480 src/client.cpp:1499 src/client.cpp:1738
+#: src/client.cpp:1483 src/client.cpp:1502 src/client.cpp:1741
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:472
+#: src/gui/windows/charcreatedialog.cpp:471
 #: src/gui/windows/charselectdialog.cpp:306
 #: src/gui/windows/editserverdialog.cpp:212
 #: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:429
-#: src/net/eathena/charserverrecv.cpp:433
-#: src/net/eathena/charserverrecv.cpp:515 src/net/tmwa/charserverrecv.cpp:337
+#: src/net/eathena/charserverrecv.cpp:396
+#: src/net/eathena/charserverrecv.cpp:400
+#: src/net/eathena/charserverrecv.cpp:482 src/net/tmwa/charserverrecv.cpp:301
 msgid "Error"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1518
+#: src/client.cpp:1521
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1565
+#: src/client.cpp:1568
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1567
+#: src/client.cpp:1570
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1600
+#: src/client.cpp:1603
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1602
+#: src/client.cpp:1605
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1638
+#: src/client.cpp:1641
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1640
+#: src/client.cpp:1643
 msgid "Farewell, come back any time..."
 msgstr ""
 
@@ -819,23 +819,23 @@ msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:598
+#: src/game.cpp:600
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:608
+#: src/game.cpp:610
 msgid "Saving screenshot failed!"
 msgstr ""
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:695
+#: src/game.cpp:697
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:698
+#: src/game.cpp:700
 msgid "Network Error"
 msgstr ""
 
@@ -1819,11 +1819,9 @@ msgstr ""
 #. TRANSLATORS: attack player
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
-#. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:180 src/gui/popups/popupmenu.cpp:304
 #: src/gui/popups/popupmenu.cpp:912 src/gui/widgets/skillinfo.cpp:125
-#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
-#: src/net/tmwa/generalhandler.cpp:251
+#: src/input/pages/basic.cpp:40
 msgid "Attack"
 msgstr ""
 
@@ -1899,7 +1897,7 @@ msgstr ""
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:270 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:152
+#: src/resources/db/npcdb.cpp:151
 msgid "Talk"
 msgstr ""
 
@@ -1917,7 +1915,7 @@ msgstr ""
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:154
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:153
 msgid "Buy"
 msgstr ""
 
@@ -1935,7 +1933,7 @@ msgstr ""
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
 #: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:256
-#: src/resources/db/npcdb.cpp:156
+#: src/resources/db/npcdb.cpp:155
 msgid "Sell"
 msgstr ""
 
@@ -2037,7 +2035,7 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:408 src/resources/db/petdb.cpp:160
+#: src/gui/popups/popupmenu.cpp:408 src/resources/db/petdb.cpp:159
 msgid "Return to egg"
 msgstr ""
 
@@ -2434,7 +2432,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2125 src/gui/windows/statuswindow.cpp:90
 msgid "Copy to chat"
 msgstr ""
 
@@ -2486,8 +2484,8 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/popups/popupmenu.cpp:2386 src/gui/popups/skillpopup.cpp:127
-#: src/gui/windows/ministatuswindow.cpp:363 src/gui/windows/statuswindow.cpp:68
-#: src/gui/windows/statuswindow.cpp:243 src/gui/windows/statuswindow.cpp:367
+#: src/gui/windows/ministatuswindow.cpp:363 src/gui/windows/statuswindow.cpp:70
+#: src/gui/windows/statuswindow.cpp:268 src/gui/windows/statuswindow.cpp:392
 #, c-format
 msgid "Level: %d"
 msgstr ""
@@ -2906,8 +2904,8 @@ msgstr ""
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3100 src/gui/popups/popupmenu.cpp:3119
 #: src/gui/popups/popupmenu.cpp:3132 src/gui/windows/charselectdialog.cpp:76
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:452
-#: src/net/eathena/charserverrecv.cpp:488
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:419
+#: src/net/eathena/charserverrecv.cpp:455
 msgid "Info"
 msgstr ""
 
@@ -3298,8 +3296,8 @@ msgstr ""
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/statuswindow.cpp:70
-#: src/gui/windows/statuswindow.cpp:220 src/gui/windows/statuswindow.cpp:334
+#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/statuswindow.cpp:72
+#: src/gui/windows/statuswindow.cpp:222 src/gui/windows/statuswindow.cpp:359
 #, c-format
 msgid "Money: %s"
 msgstr ""
@@ -3355,7 +3353,7 @@ msgstr ""
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:194
 #: src/gui/windows/itemamountwindow.cpp:230 src/gui/windows/npcdialog.cpp:123
-#: src/gui/windows/statuswindow.cpp:746
+#: src/gui/windows/statuswindow.cpp:771
 msgid "+"
 msgstr ""
 
@@ -3376,8 +3374,8 @@ msgstr ""
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/selldialog.cpp:133 src/gui/windows/buydialog.cpp:299
-#: src/gui/windows/statuswindow.cpp:483 src/gui/windows/statuswindow.cpp:539
-#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:766
+#: src/gui/windows/statuswindow.cpp:508 src/gui/windows/statuswindow.cpp:564
+#: src/gui/windows/statuswindow.cpp:769 src/gui/windows/statuswindow.cpp:791
 msgid "Max"
 msgstr ""
 
@@ -6265,16 +6263,16 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:104
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:210
-#: src/gui/windows/charcreatedialog.cpp:221
-#: src/gui/windows/charcreatedialog.cpp:231 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:196
+#: src/gui/windows/charcreatedialog.cpp:209
+#: src/gui/windows/charcreatedialog.cpp:220
+#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:110
-#: src/gui/windows/charcreatedialog.cpp:600
+#: src/gui/windows/charcreatedialog.cpp:599
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
@@ -6283,71 +6281,71 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:201
-#: src/gui/windows/charcreatedialog.cpp:212
-#: src/gui/windows/charcreatedialog.cpp:223
-#: src/gui/windows/charcreatedialog.cpp:233 src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:200
+#: src/gui/windows/charcreatedialog.cpp:211
+#: src/gui/windows/charcreatedialog.cpp:222
+#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:202
 msgid "Hair color:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:213
 msgid "Hair style:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:224
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:234
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:252 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:258
-#: src/gui/windows/charcreatedialog.cpp:265
-#: src/gui/windows/charcreatedialog.cpp:273
+#: src/gui/windows/charcreatedialog.cpp:257
+#: src/gui/windows/charcreatedialog.cpp:264
+#: src/gui/windows/charcreatedialog.cpp:272
 msgid "M"
 msgstr ""
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:260
-#: src/gui/windows/charcreatedialog.cpp:277
+#: src/gui/windows/charcreatedialog.cpp:259
+#: src/gui/windows/charcreatedialog.cpp:276
 #: src/gui/windows/inventorywindow.cpp:223
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:267
+#: src/gui/windows/charcreatedialog.cpp:266
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:474
+#: src/gui/windows/charcreatedialog.cpp:473
 msgid "Your name needs to be at least 4 characters."
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:590
+#: src/gui/windows/charcreatedialog.cpp:589
 msgid "Character stats OK"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:606
+#: src/gui/windows/charcreatedialog.cpp:605
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
@@ -6986,7 +6984,7 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/windows/ministatuswindow.cpp:356
-#: src/gui/windows/statuswindow.cpp:236
+#: src/gui/windows/statuswindow.cpp:261
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
@@ -7438,33 +7436,33 @@ msgid "Choose your party's name."
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:72
+#: src/gui/windows/statuswindow.cpp:74
 msgid "HP:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:75
+#: src/gui/windows/statuswindow.cpp:77
 msgid "Exp:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:136
+#: src/gui/windows/statuswindow.cpp:138
 msgid "MP:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:173 src/gui/windows/statuswindow.cpp:294
+#: src/gui/windows/statuswindow.cpp:175 src/gui/windows/statuswindow.cpp:319
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:175
+#: src/gui/windows/statuswindow.cpp:177
 msgid "Job:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:224 src/gui/windows/statuswindow.cpp:342
+#: src/gui/windows/statuswindow.cpp:226 src/gui/windows/statuswindow.cpp:367
 #, c-format
 msgid "Character points: %d"
 msgstr ""
@@ -9061,33 +9059,33 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:431
-#: src/net/eathena/charserverrecv.cpp:479
+#: src/net/eathena/charserverrecv.cpp:398
+#: src/net/eathena/charserverrecv.cpp:446
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:454
+#: src/net/eathena/charserverrecv.cpp:421
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:470
+#: src/net/eathena/charserverrecv.cpp:437
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:474
+#: src/net/eathena/charserverrecv.cpp:441
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:483
+#: src/net/eathena/charserverrecv.cpp:450
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:517 src/net/tmwa/charserverrecv.cpp:339
+#: src/net/eathena/charserverrecv.cpp:484 src/net/tmwa/charserverrecv.cpp:303
 msgid "Failed to delete character."
 msgstr ""
 
@@ -9139,140 +9137,11 @@ msgstr ""
 msgid "Do you accept %s and %s as parents?"
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:130
-#, c-format
-msgid "Strength %s"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:132
-#, c-format
-msgid "Agility %s"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:134
-#, c-format
-msgid "Vitality %s"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:136
-#, c-format
-msgid "Intelligence %s"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:138
-#, c-format
-msgid "Dexterity %s"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:140
-#, c-format
-msgid "Luck %s"
-msgstr ""
-
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:197 src/net/tmwa/generalhandler.cpp:207
+#: src/net/eathena/generalhandler.cpp:179 src/net/tmwa/generalhandler.cpp:189
 msgid "Got disconnected from server!"
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:223 src/net/tmwa/generalhandler.cpp:234
-msgid "Strength"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:237
-msgid "Agility"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:229 src/net/tmwa/generalhandler.cpp:240
-msgid "Vitality"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:243
-msgid "Intelligence"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:246
-msgid "Dexterity"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:238 src/net/tmwa/generalhandler.cpp:249
-msgid "Luck"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:253
-msgid "Defense"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:255
-msgid "M.Attack"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:257
-msgid "M.Defense"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:260
-#, no-c-format
-msgid "% Accuracy"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:263
-#, no-c-format
-msgid "% Evade"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:266
-#, no-c-format
-msgid "% Critical"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:268
-msgid "Attack Delay"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:270
-msgid "Walk Delay"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:272
-msgid "Attack Range"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:274
-msgid "Damage per sec."
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266
-msgid "Karma"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268
-msgid "Manner"
-msgstr ""
-
 #. TRANSLATORS: error message
 #: src/net/eathena/generalrecv.cpp:49 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
@@ -9428,7 +9297,7 @@ msgstr ""
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:199
+#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:190
 msgid "Unknown item"
 msgstr ""
 
@@ -9704,21 +9573,52 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:93
-#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
-#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
+#: src/resources/db/itemdb.cpp:377 src/resources/db/itemdb.cpp:381
+#: src/resources/db/moddb.cpp:79 src/resources/db/monsterdb.cpp:101
+#: src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:104
+#: src/resources/db/petdb.cpp:103
 msgid "pet"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:103
+#: src/resources/db/skillunitdb.cpp:102
 msgid "skill"
 msgstr ""
 
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:45
+msgid "Strength"
+msgstr ""
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:49
+msgid "Agility"
+msgstr ""
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:53
+msgid "Vitality"
+msgstr ""
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:57
+msgid "Intelligence"
+msgstr ""
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:61
+msgid "Dexterity"
+msgstr ""
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:65
+msgid "Luck"
+msgstr ""
+
 #. TRANSLATORS: inventory type name
 #: src/resources/inventory/inventory.cpp:340
 msgid "Npc"
@@ -10370,7 +10270,7 @@ msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:556
-msgid "Room join failed. Not enought money."
+msgid "Room join failed. Not enough money."
 msgstr ""
 
 #. TRANSLATORS: notification message
@@ -10638,33 +10538,34 @@ msgstr ""
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:796
 #, c-format
-msgid "You and %s was divorced."
+msgid "You and %s are now divorced."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:800
-msgid "You was called by partner."
+msgid "You were called by your partner."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:804
 #, c-format
-msgid "You calling partner %s."
+msgid "You are calling your partner, %s."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:808
-msgid "Adoption child error. You already have baby."
+msgid "Child adoption failed. You already have a baby."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:812
-msgid "Adoption child error. You level too small for have baby."
+msgid "Child adoption failed. Your level is too low."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:816
-msgid "Adoption child error. This player already married and can't be baby."
+msgid ""
+"Child adoption failed. This player is already married and can't be a baby."
 msgstr ""
 
 #. TRANSLATORS: notification message
@@ -10674,12 +10575,12 @@ msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:825
-msgid "Error saving location. Not enought skill level."
+msgid "Error saving location. Not enough skill level."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:829
-msgid "Error saving location. You not have warp skill."
+msgid "Error saving location. You do not have warp skill."
 msgstr ""
 
 #. TRANSLATORS: chat option changed message
diff --git a/po/nl.po b/po/nl.po
index 83c682e46..606cfb85f 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Elvano Miok <prd.studio@gmail.com>, 2012,2015
 # Jeroen De Meerleer <jeroen.de.meerleer@telenet.be>, 2011
@@ -11,14 +11,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-06-18 18:53+0300\n"
+"POT-Creation-Date: 2016-07-02 19:47+0300\n"
 "PO-Revision-Date: 2016-06-19 09:21+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Dutch (Belgium) (http://www.transifex.com/akaras/manaplus/language/nl_BE/)\n"
+"Language-Team: Dutch (Belgium) (http://www.transifex.com/akaras/manaplus/"
+"language/nl_BE/)\n"
+"Language: nl_BE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nl_BE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
@@ -35,7 +36,7 @@ msgstr "Bestand is opgeladen"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:171 src/client.cpp:1569 src/client.cpp:1604
+#: src/actions/actions.cpp:171 src/client.cpp:1572 src/client.cpp:1607
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
@@ -46,7 +47,7 @@ msgstr "Bestand is opgeladen"
 #: src/gui/widgets/tabs/setup_video.cpp:420
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:476
+#: src/gui/windows/charcreatedialog.cpp:475
 #: src/gui/windows/charselectdialog.cpp:262
 #: src/gui/windows/charselectdialog.cpp:310 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:59
@@ -55,9 +56,9 @@ msgstr "Bestand is opgeladen"
 #: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:531
 #: src/gui/windows/textdialog.cpp:53 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:456
-#: src/net/eathena/charserverrecv.cpp:491
-#: src/net/eathena/charserverrecv.cpp:519 src/net/tmwa/charserverrecv.cpp:341
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:423
+#: src/net/eathena/charserverrecv.cpp:458
+#: src/net/eathena/charserverrecv.cpp:486 src/net/tmwa/charserverrecv.cpp:305
 msgid "OK"
 msgstr "Oké"
 
@@ -304,26 +305,26 @@ msgid "Visible on map"
 msgstr "Zichtbaar op de map"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:496
+#: src/being/being.cpp:494
 msgid "Human"
 msgstr "Mens"
 
 #. TRANSLATORS: dodge or miss message in attacks
-#: src/being/being.cpp:683
+#: src/being/being.cpp:676
 msgid "dodge"
 msgstr "ontwijkt"
 
-#: src/being/being.cpp:683
+#: src/being/being.cpp:676
 msgid "miss"
 msgstr "mist"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2282 src/gui/windows/whoisonline.cpp:882
+#: src/being/being.cpp:2275 src/gui/windows/whoisonline.cpp:882
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2287 src/gui/windows/whoisonline.cpp:887
+#: src/being/being.cpp:2280 src/gui/windows/whoisonline.cpp:887
 msgid "I"
 msgstr "I"
 
@@ -474,41 +475,41 @@ msgstr "Zwevende bel"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:870 src/dyetool/client.cpp:491 src/gui/windowmenu.cpp:189
+#: src/client.cpp:872 src/dyetool/client.cpp:491 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:66
 msgid "Setup"
 msgstr "Configureren"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:873 src/dyetool/client.cpp:494
+#: src/client.cpp:875 src/dyetool/client.cpp:494
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Performantie"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:876 src/dyetool/client.cpp:497
+#: src/client.cpp:878 src/dyetool/client.cpp:497
 #: src/gui/widgets/tabs/setup_video.cpp:110
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:879 src/dyetool/client.cpp:500
+#: src/client.cpp:881 src/dyetool/client.cpp:500
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Thema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:882 src/dyetool/client.cpp:503
+#: src/client.cpp:884 src/dyetool/client.cpp:503
 msgid "About"
 msgstr "Over"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:885 src/dyetool/client.cpp:506 src/gui/windowmenu.cpp:74
+#: src/client.cpp:887 src/dyetool/client.cpp:506 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Help"
@@ -529,7 +530,7 @@ msgstr "Help"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:889 src/client.cpp:1483 src/client.cpp:1502
+#: src/client.cpp:891 src/client.cpp:1486 src/client.cpp:1505
 #: src/dyetool/client.cpp:510 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:756 src/gui/popups/popupmenu.cpp:833
 #: src/gui/popups/popupmenu.cpp:1087 src/gui/windows/didyouknowwindow.cpp:81
@@ -542,32 +543,32 @@ msgid "Close"
 msgstr "Sluiten"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1115 src/gui/windowmanager_unittest.cc:156
+#: src/client.cpp:1117 src/gui/windowmanager_unittest.cc:156
 msgid "Connecting to server"
 msgstr "Verbinden met server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1172 src/gui/windowmanager_unittest.cc:173
+#: src/client.cpp:1174 src/gui/windowmanager_unittest.cc:173
 msgid "Logging in"
 msgstr "Inloggen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1221
+#: src/client.cpp:1223
 msgid "Entering game world"
 msgstr "Spelwereld binnenkomen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1369
+#: src/client.cpp:1372
 msgid "Requesting characters"
 msgstr "Aanvragen personage"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1412
+#: src/client.cpp:1415
 msgid "Connecting to the game server"
 msgstr "Verbinden met de spelserver"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1424
+#: src/client.cpp:1427
 msgid "Changing game servers"
 msgstr "Wijzigen spelservers"
 
@@ -584,52 +585,52 @@ msgstr "Wijzigen spelservers"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1480 src/client.cpp:1499 src/client.cpp:1738
+#: src/client.cpp:1483 src/client.cpp:1502 src/client.cpp:1741
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:472
+#: src/gui/windows/charcreatedialog.cpp:471
 #: src/gui/windows/charselectdialog.cpp:306
 #: src/gui/windows/editserverdialog.cpp:212
 #: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:429
-#: src/net/eathena/charserverrecv.cpp:433
-#: src/net/eathena/charserverrecv.cpp:515 src/net/tmwa/charserverrecv.cpp:337
+#: src/net/eathena/charserverrecv.cpp:396
+#: src/net/eathena/charserverrecv.cpp:400
+#: src/net/eathena/charserverrecv.cpp:482 src/net/tmwa/charserverrecv.cpp:301
 msgid "Error"
 msgstr "Fout"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1518
+#: src/client.cpp:1521
 msgid "Requesting registration details"
 msgstr "Aanvragen registratie details"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1565
+#: src/client.cpp:1568
 msgid "Password Change"
 msgstr "Paswoord Wijziging"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1567
+#: src/client.cpp:1570
 msgid "Password changed successfully!"
 msgstr "Paswoord is gewijzigd!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1600
+#: src/client.cpp:1603
 msgid "Email Change"
 msgstr "Email Wijziging"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1602
+#: src/client.cpp:1605
 msgid "Email changed successfully!"
 msgstr "Email is gewijzigd!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1638
+#: src/client.cpp:1641
 msgid "Unregister Successful"
 msgstr "Registratie ongedaan gemaakt!"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1640
+#: src/client.cpp:1643
 msgid "Farewell, come back any time..."
 msgstr "Tot ziens..."
 
@@ -822,23 +823,23 @@ msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:598
+#: src/game.cpp:600
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Schermafdruk opgeslagen als %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:608
+#: src/game.cpp:610
 msgid "Saving screenshot failed!"
 msgstr "Opslaan van screenshot mislukt!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:695
+#: src/game.cpp:697
 msgid "The connection to the server was lost."
 msgstr "De verbinding met de server is verbroken."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:698
+#: src/game.cpp:700
 msgid "Network Error"
 msgstr "Netwerkfout"
 
@@ -1253,9 +1254,10 @@ msgstr ""
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
-msgstr "Je draagt meer dan de helft van jouw eigen gewicht. Je kan geen leven herstellen."
+"You are carrying more than half your weight. You are unable to regain health."
+msgstr ""
+"Je draagt meer dan de helft van jouw eigen gewicht. Je kan geen leven "
+"herstellen."
 
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:198
@@ -1271,8 +1273,7 @@ msgstr ""
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:671
-#: src/gui/windows/serverdialog.cpp:603
+#: src/gui/windows/equipmentwindow.cpp:671 src/gui/windows/serverdialog.cpp:603
 msgid "default"
 msgstr "standaard"
 
@@ -1824,11 +1825,9 @@ msgstr "Handel"
 #. TRANSLATORS: attack player
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
-#. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:180 src/gui/popups/popupmenu.cpp:304
 #: src/gui/popups/popupmenu.cpp:912 src/gui/widgets/skillinfo.cpp:125
-#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
-#: src/net/tmwa/generalhandler.cpp:251
+#: src/input/pages/basic.cpp:40
 msgid "Attack"
 msgstr "Aanvallen"
 
@@ -1904,7 +1903,7 @@ msgstr "Beweeg"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:270 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:152
+#: src/resources/db/npcdb.cpp:151
 msgid "Talk"
 msgstr "Spreken"
 
@@ -1922,7 +1921,7 @@ msgstr "Spreken"
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:154
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:153
 msgid "Buy"
 msgstr "Kopen"
 
@@ -1940,7 +1939,7 @@ msgstr "Kopen"
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
 #: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:256
-#: src/resources/db/npcdb.cpp:156
+#: src/resources/db/npcdb.cpp:155
 msgid "Sell"
 msgstr "Verkopen"
 
@@ -2042,7 +2041,7 @@ msgstr "Afdoen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:408 src/resources/db/petdb.cpp:160
+#: src/gui/popups/popupmenu.cpp:408 src/resources/db/petdb.cpp:159
 msgid "Return to egg"
 msgstr ""
 
@@ -2439,7 +2438,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2125 src/gui/windows/statuswindow.cpp:90
 msgid "Copy to chat"
 msgstr "Kopieer naar chat"
 
@@ -2491,9 +2490,8 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/popups/popupmenu.cpp:2386 src/gui/popups/skillpopup.cpp:127
-#: src/gui/windows/ministatuswindow.cpp:363
-#: src/gui/windows/statuswindow.cpp:68 src/gui/windows/statuswindow.cpp:243
-#: src/gui/windows/statuswindow.cpp:367
+#: src/gui/windows/ministatuswindow.cpp:363 src/gui/windows/statuswindow.cpp:70
+#: src/gui/windows/statuswindow.cpp:268 src/gui/windows/statuswindow.cpp:392
 #, c-format
 msgid "Level: %d"
 msgstr "Level: %d"
@@ -2912,8 +2910,8 @@ msgstr ""
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3100 src/gui/popups/popupmenu.cpp:3119
 #: src/gui/popups/popupmenu.cpp:3132 src/gui/windows/charselectdialog.cpp:76
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:452
-#: src/net/eathena/charserverrecv.cpp:488
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:419
+#: src/net/eathena/charserverrecv.cpp:455
 msgid "Info"
 msgstr "Info"
 
@@ -3304,8 +3302,8 @@ msgstr ""
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/statuswindow.cpp:70
-#: src/gui/windows/statuswindow.cpp:220 src/gui/windows/statuswindow.cpp:334
+#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/statuswindow.cpp:72
+#: src/gui/windows/statuswindow.cpp:222 src/gui/windows/statuswindow.cpp:359
 #, c-format
 msgid "Money: %s"
 msgstr "Geld: %s"
@@ -3361,7 +3359,7 @@ msgstr "Afsluiten"
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:194
 #: src/gui/windows/itemamountwindow.cpp:230 src/gui/windows/npcdialog.cpp:123
-#: src/gui/windows/statuswindow.cpp:746
+#: src/gui/windows/statuswindow.cpp:771
 msgid "+"
 msgstr "+"
 
@@ -3382,8 +3380,8 @@ msgstr "-"
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/selldialog.cpp:133 src/gui/windows/buydialog.cpp:299
-#: src/gui/windows/statuswindow.cpp:483 src/gui/windows/statuswindow.cpp:539
-#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:766
+#: src/gui/windows/statuswindow.cpp:508 src/gui/windows/statuswindow.cpp:564
+#: src/gui/windows/statuswindow.cpp:769 src/gui/windows/statuswindow.cpp:791
 msgid "Max"
 msgstr "Maximum"
 
@@ -3539,15 +3537,13 @@ msgstr "Voorwerpdeling ingeschakeld."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104
-#: src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr "Voorwerpdeling uitgeschakeld."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109
-#: src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr "Voorwerpdeling is niet mogelijk."
 
@@ -3558,22 +3554,19 @@ msgstr "Voorwerpdeling onbekend."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150
-#: src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr "Ervaringsdeling ingeschakeld."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155
-#: src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr "Ervaringsdeling uitgeschakeld."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160
-#: src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr "Ervaringsdeling is niet mogelijk."
 
@@ -4007,15 +4000,15 @@ msgstr ""
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
+"Note: no other text inputs will be allowed to receive text input when you "
+"typing in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86
-#: src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr "Kleuren"
 
@@ -4039,9 +4032,11 @@ msgstr "Toon chat kleurenlijst"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat "
+"window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4068,9 +4063,11 @@ msgstr "Limiteer max karakters in chat lijn"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed "
+"in chat.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will be truncated."
+"Note: long lines can make client slower. Lines longer than this limit will "
+"be truncated."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4081,7 +4078,9 @@ msgstr "Limiteer max lijnen in chat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
+"specified number of last lines of text. Oldest lines exceeding this limit "
+"are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
 msgstr ""
@@ -4122,8 +4121,8 @@ msgstr "Toon chat geschiedenis"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on"
-" startup instead of starting with empty chat tabs."
+"If this setting enabled, client will load old chat tabs content from logs on "
+"startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4134,9 +4133,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be "
+"shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4147,9 +4148,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be "
+"shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4165,9 +4168,13 @@ msgstr "Verberg verkoop boodschappen"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will "
+"be displayed in chat. Disable this setting if you want to see shop-related "
+"messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
+"Note: technically, ManaPlus shop implemented as usual private messages with "
+"special content. If you disable this setting, you will be able to see these "
+"messages and get idea when other players are looking at your shop."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4180,7 +4187,8 @@ msgstr ""
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
+"usually makes little difference."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4199,9 +4207,12 @@ msgstr "Plaats alle persoonlijke berichten in tabs"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in "
+"separate tabs, separate tab for each player. If this setting disabled, all "
+"whispers will appear in General tab.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
+"Note: putting all whispers to single General tab is known to be confusing. "
+"Think twice before disabling this feature."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4212,7 +4223,8 @@ msgstr "Hou magie berichten bij in de 'Debug' tab"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If "
+"disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
 msgstr ""
@@ -4225,9 +4237,11 @@ msgstr "Toon server berichten in de debug tab"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of "
+"chat. If disabled, server messages will appear in General chat instead.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
+"Note: according to 4144, disabling this could also make you to lose some "
+"debug messages from client in Debug tab since these are fake server messages."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4252,9 +4266,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM "
+"activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
+"Note: this setting only makes difference for GMs (Game Masters) since this "
+"tab only appears for GMs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4265,7 +4281,8 @@ msgstr "Taal tab aanzetten"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this feature.\n"
+"If this feature enabled, language tab will appear if server supports this "
+"feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
 msgstr ""
@@ -4278,7 +4295,9 @@ msgstr "Toon alle taal berichten"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
+"If this setting enabled and server supports different chats for different "
+"languages, you will see messages for all languages, regardless of your "
+"language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
 msgstr ""
@@ -4291,7 +4310,9 @@ msgstr "Schakel de gevechtstab in"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will "
+"contain messages related to battles, like damage and experience gain, if "
+"battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
 msgstr ""
@@ -4317,7 +4338,10 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to "
+"adapt to appearance of chat input field when you typing message and when "
+"input field of chat disappears. If disabled, chat input area will always "
+"occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
@@ -4352,7 +4376,8 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. "
+"Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
 msgstr ""
@@ -4365,7 +4390,8 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender "
+"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
 msgstr ""
@@ -4378,9 +4404,12 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This "
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by "
+"default."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -5542,13 +5571,17 @@ msgstr "Geen"
 #: src/gui/widgets/tabs/setup_video.cpp:233
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr "Gefaald om te wisselen naar venstermodus en terugkeren naar oude modus faalde ook!"
+msgstr ""
+"Gefaald om te wisselen naar venstermodus en terugkeren naar oude modus "
+"faalde ook!"
 
 #. TRANSLATORS: video error message
 #: src/gui/widgets/tabs/setup_video.cpp:240
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr "Gefaald om te wisselen naar volledigscherm modus en terugkeren naar oude modus faalde ook!"
+msgstr ""
+"Gefaald om te wisselen naar volledigscherm modus en terugkeren naar oude "
+"modus faalde ook!"
 
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -5589,7 +5622,9 @@ msgstr "Scherm Resolutie is gewijzigd"
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:401
 msgid "Some windows may be moved to fit the lowered resolution."
-msgstr "Enkele vensters kunnen verplaatst worden om te passen in de omlaag gebrachte resolutie."
+msgstr ""
+"Enkele vensters kunnen verplaatst worden om te passen in de omlaag gebrachte "
+"resolutie."
 
 #. TRANSLATORS: speach type
 #: src/gui/widgets/tabs/setup_visual.cpp:43
@@ -6124,8 +6159,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:618
-#: src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:618 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Aanmaken"
 
@@ -6241,17 +6275,16 @@ msgstr "^"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:104
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:210
-#: src/gui/windows/charcreatedialog.cpp:221
-#: src/gui/windows/charcreatedialog.cpp:231
-#: src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:196
+#: src/gui/windows/charcreatedialog.cpp:209
+#: src/gui/windows/charcreatedialog.cpp:220
+#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:110
-#: src/gui/windows/charcreatedialog.cpp:600
+#: src/gui/windows/charcreatedialog.cpp:599
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Nog %d punten te verdelen"
@@ -6260,73 +6293,71 @@ msgstr "Nog %d punten te verdelen"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:201
-#: src/gui/windows/charcreatedialog.cpp:212
-#: src/gui/windows/charcreatedialog.cpp:223
-#: src/gui/windows/charcreatedialog.cpp:233
-#: src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:200
+#: src/gui/windows/charcreatedialog.cpp:211
+#: src/gui/windows/charcreatedialog.cpp:222
+#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:202
 msgid "Hair color:"
 msgstr "Haarkleur:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:213
 msgid "Hair style:"
 msgstr "Haarstijl:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:224
 msgid "Race:"
 msgstr "Ras:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:234
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:252
-#: src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr "F"
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:258
-#: src/gui/windows/charcreatedialog.cpp:265
-#: src/gui/windows/charcreatedialog.cpp:273
+#: src/gui/windows/charcreatedialog.cpp:257
+#: src/gui/windows/charcreatedialog.cpp:264
+#: src/gui/windows/charcreatedialog.cpp:272
 msgid "M"
 msgstr ""
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:260
-#: src/gui/windows/charcreatedialog.cpp:277
+#: src/gui/windows/charcreatedialog.cpp:259
+#: src/gui/windows/charcreatedialog.cpp:276
 #: src/gui/windows/inventorywindow.cpp:223
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:267
+#: src/gui/windows/charcreatedialog.cpp:266
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:474
+#: src/gui/windows/charcreatedialog.cpp:473
 msgid "Your name needs to be at least 4 characters."
 msgstr "Je naam moet uit tenminste 4 tekens bestaan."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:590
+#: src/gui/windows/charcreatedialog.cpp:589
 msgid "Character stats OK"
 msgstr "Attributen van personage OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:606
+#: src/gui/windows/charcreatedialog.cpp:605
 #, c-format
 msgid "Please remove %d points"
 msgstr "Verwijder alstublieft %d punten"
@@ -6492,8 +6523,7 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57
-#: src/gui/windows/serverdialog.cpp:112
+#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:112
 msgid "Connect"
 msgstr "Verbinden"
 
@@ -6851,15 +6881,13 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61
-#: src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr ""
@@ -6968,7 +6996,7 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/windows/ministatuswindow.cpp:356
-#: src/gui/windows/statuswindow.cpp:236
+#: src/gui/windows/statuswindow.cpp:261
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Niveau: %d (GM %d)"
@@ -7420,33 +7448,33 @@ msgid "Choose your party's name."
 msgstr "Kies uw groepsnaam."
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:72
+#: src/gui/windows/statuswindow.cpp:74
 msgid "HP:"
 msgstr "Leven:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:75
+#: src/gui/windows/statuswindow.cpp:77
 msgid "Exp:"
 msgstr "Ervaring:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:136
+#: src/gui/windows/statuswindow.cpp:138
 msgid "MP:"
 msgstr "Magie:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:173 src/gui/windows/statuswindow.cpp:294
+#: src/gui/windows/statuswindow.cpp:175 src/gui/windows/statuswindow.cpp:319
 #, c-format
 msgid "Job: %d"
 msgstr "Job: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:175
+#: src/gui/windows/statuswindow.cpp:177
 msgid "Job:"
 msgstr "Job:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:224 src/gui/windows/statuswindow.cpp:342
+#: src/gui/windows/statuswindow.cpp:226 src/gui/windows/statuswindow.cpp:367
 #, c-format
 msgid "Character points: %d"
 msgstr "Personagepunten: %d"
@@ -7564,9 +7592,10 @@ msgstr "Je hebt niet genoeg geld."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
-msgstr "Kan dat voorwerp niet toevoegen. Je kan één type voorwerp niet overlappen in het venster."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+"Kan dat voorwerp niet toevoegen. Je kan één type voorwerp niet overlappen in "
+"het venster."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:539
@@ -8833,7 +8862,9 @@ msgstr ""
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:50
 msgid "Access denied. Most likely, there are too many players on this server."
-msgstr "Toegang geweigerd. Hoogstwaarschijnlijk zijn er teveel spelers op deze server."
+msgstr ""
+"Toegang geweigerd. Hoogstwaarschijnlijk zijn er teveel spelers op deze "
+"server."
 
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:55
@@ -9004,7 +9035,9 @@ msgstr ""
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
-msgstr "Je bent tijdelijk geband van het spel tot %s.\nNeem aub contact op met het GM team via de forums."
+msgstr ""
+"Je bent tijdelijk geband van het spel tot %s.\n"
+"Neem aub contact op met het GM team via de forums."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:151 src/net/eathena/loginrecv.cpp:92
@@ -9044,33 +9077,33 @@ msgstr "Verbinding met server beëindigd. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:431
-#: src/net/eathena/charserverrecv.cpp:479
+#: src/net/eathena/charserverrecv.cpp:398
+#: src/net/eathena/charserverrecv.cpp:446
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:454
+#: src/net/eathena/charserverrecv.cpp:421
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:470
+#: src/net/eathena/charserverrecv.cpp:437
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:474
+#: src/net/eathena/charserverrecv.cpp:441
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:483
+#: src/net/eathena/charserverrecv.cpp:450
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:517 src/net/tmwa/charserverrecv.cpp:339
+#: src/net/eathena/charserverrecv.cpp:484 src/net/tmwa/charserverrecv.cpp:303
 msgid "Failed to delete character."
 msgstr "Kon personage niet verwijderen."
 
@@ -9122,140 +9155,11 @@ msgstr ""
 msgid "Do you accept %s and %s as parents?"
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:130
-#, c-format
-msgid "Strength %s"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:132
-#, c-format
-msgid "Agility %s"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:134
-#, c-format
-msgid "Vitality %s"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:136
-#, c-format
-msgid "Intelligence %s"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:138
-#, c-format
-msgid "Dexterity %s"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:140
-#, c-format
-msgid "Luck %s"
-msgstr ""
-
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:197 src/net/tmwa/generalhandler.cpp:207
+#: src/net/eathena/generalhandler.cpp:179 src/net/tmwa/generalhandler.cpp:189
 msgid "Got disconnected from server!"
 msgstr "De verbinding met de server werd verbroken!"
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:223 src/net/tmwa/generalhandler.cpp:234
-msgid "Strength"
-msgstr "Kracht"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:237
-msgid "Agility"
-msgstr "Behendigheid"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:229 src/net/tmwa/generalhandler.cpp:240
-msgid "Vitality"
-msgstr "Vitaliteit"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:243
-msgid "Intelligence"
-msgstr "Intelligentie"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:246
-msgid "Dexterity"
-msgstr "Handigheid"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:238 src/net/tmwa/generalhandler.cpp:249
-msgid "Luck"
-msgstr "Geluk"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:253
-msgid "Defense"
-msgstr "Verdediging"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:255
-msgid "M.Attack"
-msgstr "M.Aanval"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:257
-msgid "M.Defense"
-msgstr "M.Verdediging"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:260
-#, no-c-format
-msgid "% Accuracy"
-msgstr "% Nauwkeurigheid"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:263
-#, no-c-format
-msgid "% Evade"
-msgstr "% Ontwijking"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:266
-#, no-c-format
-msgid "% Critical"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:268
-msgid "Attack Delay"
-msgstr "Aanvalsvertraging"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:270
-msgid "Walk Delay"
-msgstr "Wandelvertraging"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:272
-msgid "Attack Range"
-msgstr "Aanvalsbereik"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:274
-msgid "Damage per sec."
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266
-msgid "Karma"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268
-msgid "Manner"
-msgstr ""
-
 #. TRANSLATORS: error message
 #: src/net/eathena/generalrecv.cpp:49 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
@@ -9411,7 +9315,7 @@ msgstr ""
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:199
+#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:190
 msgid "Unknown item"
 msgstr "Onbekend voorwerp"
 
@@ -9687,21 +9591,52 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:93
-#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
-#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
+#: src/resources/db/itemdb.cpp:377 src/resources/db/itemdb.cpp:381
+#: src/resources/db/moddb.cpp:79 src/resources/db/monsterdb.cpp:101
+#: src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "naamloos"
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:104
+#: src/resources/db/petdb.cpp:103
 msgid "pet"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:103
+#: src/resources/db/skillunitdb.cpp:102
 msgid "skill"
 msgstr ""
 
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:45
+msgid "Strength"
+msgstr "Kracht"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:49
+msgid "Agility"
+msgstr "Behendigheid"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:53
+msgid "Vitality"
+msgstr "Vitaliteit"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:57
+msgid "Intelligence"
+msgstr "Intelligentie"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:61
+msgid "Dexterity"
+msgstr "Handigheid"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:65
+msgid "Luck"
+msgstr "Geluk"
+
 #. TRANSLATORS: inventory type name
 #: src/resources/inventory/inventory.cpp:340
 msgid "Npc"
@@ -10022,7 +9957,8 @@ msgstr "Kan voorwerp niet toevoegen. Handelspartner heeft geen vrij slot."
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:295
 msgid "Failed adding item. You can't trade this item."
-msgstr "Gefaald om voorwerp toe te voegen. U kan dit voorwerp niet verhandelen."
+msgstr ""
+"Gefaald om voorwerp toe te voegen. U kan dit voorwerp niet verhandelen."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:299
@@ -10353,8 +10289,9 @@ msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:556
-msgid "Room join failed. Not enought money."
-msgstr ""
+#, fuzzy
+msgid "Room join failed. Not enough money."
+msgstr "Je hebt niet genoeg geld."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:560
@@ -10621,33 +10558,35 @@ msgstr ""
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:796
 #, c-format
-msgid "You and %s was divorced."
+msgid "You and %s are now divorced."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:800
-msgid "You was called by partner."
-msgstr ""
+#, fuzzy
+msgid "You were called by your partner."
+msgstr "U bent gedood door %s."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:804
 #, c-format
-msgid "You calling partner %s."
+msgid "You are calling your partner, %s."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:808
-msgid "Adoption child error. You already have baby."
+msgid "Child adoption failed. You already have a baby."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:812
-msgid "Adoption child error. You level too small for have baby."
+msgid "Child adoption failed. Your level is too low."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:816
-msgid "Adoption child error. This player already married and can't be baby."
+msgid ""
+"Child adoption failed. This player is already married and can't be a baby."
 msgstr ""
 
 #. TRANSLATORS: notification message
@@ -10657,19 +10596,20 @@ msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:825
-msgid "Error saving location. Not enought skill level."
+msgid "Error saving location. Not enough skill level."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:829
-msgid "Error saving location. You not have warp skill."
+msgid "Error saving location. You do not have warp skill."
 msgstr ""
 
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:29
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "Opties voor /%s zijn \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+"Opties voor /%s zijn \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
 #. TRANSLATORS: uptime command
 #: src/utils/stringutils.cpp:946
@@ -10725,3 +10665,27 @@ msgstr "%d seconden"
 #, c-format
 msgid "%d seconds"
 msgstr "%d seconden"
+
+#~ msgid "Defense"
+#~ msgstr "Verdediging"
+
+#~ msgid "M.Attack"
+#~ msgstr "M.Aanval"
+
+#~ msgid "M.Defense"
+#~ msgstr "M.Verdediging"
+
+#~ msgid "% Accuracy"
+#~ msgstr "% Nauwkeurigheid"
+
+#~ msgid "% Evade"
+#~ msgstr "% Ontwijking"
+
+#~ msgid "Attack Delay"
+#~ msgstr "Aanvalsvertraging"
+
+#~ msgid "Walk Delay"
+#~ msgstr "Wandelvertraging"
+
+#~ msgid "Attack Range"
+#~ msgstr "Aanvalsbereik"
diff --git a/po/nl_BE.po b/po/nl_BE.po
index 83c682e46..606cfb85f 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Elvano Miok <prd.studio@gmail.com>, 2012,2015
 # Jeroen De Meerleer <jeroen.de.meerleer@telenet.be>, 2011
@@ -11,14 +11,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-06-18 18:53+0300\n"
+"POT-Creation-Date: 2016-07-02 19:47+0300\n"
 "PO-Revision-Date: 2016-06-19 09:21+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Dutch (Belgium) (http://www.transifex.com/akaras/manaplus/language/nl_BE/)\n"
+"Language-Team: Dutch (Belgium) (http://www.transifex.com/akaras/manaplus/"
+"language/nl_BE/)\n"
+"Language: nl_BE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nl_BE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
@@ -35,7 +36,7 @@ msgstr "Bestand is opgeladen"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:171 src/client.cpp:1569 src/client.cpp:1604
+#: src/actions/actions.cpp:171 src/client.cpp:1572 src/client.cpp:1607
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
@@ -46,7 +47,7 @@ msgstr "Bestand is opgeladen"
 #: src/gui/widgets/tabs/setup_video.cpp:420
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:476
+#: src/gui/windows/charcreatedialog.cpp:475
 #: src/gui/windows/charselectdialog.cpp:262
 #: src/gui/windows/charselectdialog.cpp:310 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:59
@@ -55,9 +56,9 @@ msgstr "Bestand is opgeladen"
 #: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:531
 #: src/gui/windows/textdialog.cpp:53 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:456
-#: src/net/eathena/charserverrecv.cpp:491
-#: src/net/eathena/charserverrecv.cpp:519 src/net/tmwa/charserverrecv.cpp:341
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:423
+#: src/net/eathena/charserverrecv.cpp:458
+#: src/net/eathena/charserverrecv.cpp:486 src/net/tmwa/charserverrecv.cpp:305
 msgid "OK"
 msgstr "Oké"
 
@@ -304,26 +305,26 @@ msgid "Visible on map"
 msgstr "Zichtbaar op de map"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:496
+#: src/being/being.cpp:494
 msgid "Human"
 msgstr "Mens"
 
 #. TRANSLATORS: dodge or miss message in attacks
-#: src/being/being.cpp:683
+#: src/being/being.cpp:676
 msgid "dodge"
 msgstr "ontwijkt"
 
-#: src/being/being.cpp:683
+#: src/being/being.cpp:676
 msgid "miss"
 msgstr "mist"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2282 src/gui/windows/whoisonline.cpp:882
+#: src/being/being.cpp:2275 src/gui/windows/whoisonline.cpp:882
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2287 src/gui/windows/whoisonline.cpp:887
+#: src/being/being.cpp:2280 src/gui/windows/whoisonline.cpp:887
 msgid "I"
 msgstr "I"
 
@@ -474,41 +475,41 @@ msgstr "Zwevende bel"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:870 src/dyetool/client.cpp:491 src/gui/windowmenu.cpp:189
+#: src/client.cpp:872 src/dyetool/client.cpp:491 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:66
 msgid "Setup"
 msgstr "Configureren"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:873 src/dyetool/client.cpp:494
+#: src/client.cpp:875 src/dyetool/client.cpp:494
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Performantie"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:876 src/dyetool/client.cpp:497
+#: src/client.cpp:878 src/dyetool/client.cpp:497
 #: src/gui/widgets/tabs/setup_video.cpp:110
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:879 src/dyetool/client.cpp:500
+#: src/client.cpp:881 src/dyetool/client.cpp:500
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Thema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:882 src/dyetool/client.cpp:503
+#: src/client.cpp:884 src/dyetool/client.cpp:503
 msgid "About"
 msgstr "Over"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:885 src/dyetool/client.cpp:506 src/gui/windowmenu.cpp:74
+#: src/client.cpp:887 src/dyetool/client.cpp:506 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Help"
@@ -529,7 +530,7 @@ msgstr "Help"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:889 src/client.cpp:1483 src/client.cpp:1502
+#: src/client.cpp:891 src/client.cpp:1486 src/client.cpp:1505
 #: src/dyetool/client.cpp:510 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:756 src/gui/popups/popupmenu.cpp:833
 #: src/gui/popups/popupmenu.cpp:1087 src/gui/windows/didyouknowwindow.cpp:81
@@ -542,32 +543,32 @@ msgid "Close"
 msgstr "Sluiten"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1115 src/gui/windowmanager_unittest.cc:156
+#: src/client.cpp:1117 src/gui/windowmanager_unittest.cc:156
 msgid "Connecting to server"
 msgstr "Verbinden met server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1172 src/gui/windowmanager_unittest.cc:173
+#: src/client.cpp:1174 src/gui/windowmanager_unittest.cc:173
 msgid "Logging in"
 msgstr "Inloggen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1221
+#: src/client.cpp:1223
 msgid "Entering game world"
 msgstr "Spelwereld binnenkomen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1369
+#: src/client.cpp:1372
 msgid "Requesting characters"
 msgstr "Aanvragen personage"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1412
+#: src/client.cpp:1415
 msgid "Connecting to the game server"
 msgstr "Verbinden met de spelserver"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1424
+#: src/client.cpp:1427
 msgid "Changing game servers"
 msgstr "Wijzigen spelservers"
 
@@ -584,52 +585,52 @@ msgstr "Wijzigen spelservers"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1480 src/client.cpp:1499 src/client.cpp:1738
+#: src/client.cpp:1483 src/client.cpp:1502 src/client.cpp:1741
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:472
+#: src/gui/windows/charcreatedialog.cpp:471
 #: src/gui/windows/charselectdialog.cpp:306
 #: src/gui/windows/editserverdialog.cpp:212
 #: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:429
-#: src/net/eathena/charserverrecv.cpp:433
-#: src/net/eathena/charserverrecv.cpp:515 src/net/tmwa/charserverrecv.cpp:337
+#: src/net/eathena/charserverrecv.cpp:396
+#: src/net/eathena/charserverrecv.cpp:400
+#: src/net/eathena/charserverrecv.cpp:482 src/net/tmwa/charserverrecv.cpp:301
 msgid "Error"
 msgstr "Fout"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1518
+#: src/client.cpp:1521
 msgid "Requesting registration details"
 msgstr "Aanvragen registratie details"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1565
+#: src/client.cpp:1568
 msgid "Password Change"
 msgstr "Paswoord Wijziging"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1567
+#: src/client.cpp:1570
 msgid "Password changed successfully!"
 msgstr "Paswoord is gewijzigd!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1600
+#: src/client.cpp:1603
 msgid "Email Change"
 msgstr "Email Wijziging"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1602
+#: src/client.cpp:1605
 msgid "Email changed successfully!"
 msgstr "Email is gewijzigd!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1638
+#: src/client.cpp:1641
 msgid "Unregister Successful"
 msgstr "Registratie ongedaan gemaakt!"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1640
+#: src/client.cpp:1643
 msgid "Farewell, come back any time..."
 msgstr "Tot ziens..."
 
@@ -822,23 +823,23 @@ msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:598
+#: src/game.cpp:600
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Schermafdruk opgeslagen als %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:608
+#: src/game.cpp:610
 msgid "Saving screenshot failed!"
 msgstr "Opslaan van screenshot mislukt!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:695
+#: src/game.cpp:697
 msgid "The connection to the server was lost."
 msgstr "De verbinding met de server is verbroken."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:698
+#: src/game.cpp:700
 msgid "Network Error"
 msgstr "Netwerkfout"
 
@@ -1253,9 +1254,10 @@ msgstr ""
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
-msgstr "Je draagt meer dan de helft van jouw eigen gewicht. Je kan geen leven herstellen."
+"You are carrying more than half your weight. You are unable to regain health."
+msgstr ""
+"Je draagt meer dan de helft van jouw eigen gewicht. Je kan geen leven "
+"herstellen."
 
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:198
@@ -1271,8 +1273,7 @@ msgstr ""
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:671
-#: src/gui/windows/serverdialog.cpp:603
+#: src/gui/windows/equipmentwindow.cpp:671 src/gui/windows/serverdialog.cpp:603
 msgid "default"
 msgstr "standaard"
 
@@ -1824,11 +1825,9 @@ msgstr "Handel"
 #. TRANSLATORS: attack player
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
-#. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:180 src/gui/popups/popupmenu.cpp:304
 #: src/gui/popups/popupmenu.cpp:912 src/gui/widgets/skillinfo.cpp:125
-#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
-#: src/net/tmwa/generalhandler.cpp:251
+#: src/input/pages/basic.cpp:40
 msgid "Attack"
 msgstr "Aanvallen"
 
@@ -1904,7 +1903,7 @@ msgstr "Beweeg"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:270 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:152
+#: src/resources/db/npcdb.cpp:151
 msgid "Talk"
 msgstr "Spreken"
 
@@ -1922,7 +1921,7 @@ msgstr "Spreken"
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:154
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:153
 msgid "Buy"
 msgstr "Kopen"
 
@@ -1940,7 +1939,7 @@ msgstr "Kopen"
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
 #: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:256
-#: src/resources/db/npcdb.cpp:156
+#: src/resources/db/npcdb.cpp:155
 msgid "Sell"
 msgstr "Verkopen"
 
@@ -2042,7 +2041,7 @@ msgstr "Afdoen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:408 src/resources/db/petdb.cpp:160
+#: src/gui/popups/popupmenu.cpp:408 src/resources/db/petdb.cpp:159
 msgid "Return to egg"
 msgstr ""
 
@@ -2439,7 +2438,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2125 src/gui/windows/statuswindow.cpp:90
 msgid "Copy to chat"
 msgstr "Kopieer naar chat"
 
@@ -2491,9 +2490,8 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/popups/popupmenu.cpp:2386 src/gui/popups/skillpopup.cpp:127
-#: src/gui/windows/ministatuswindow.cpp:363
-#: src/gui/windows/statuswindow.cpp:68 src/gui/windows/statuswindow.cpp:243
-#: src/gui/windows/statuswindow.cpp:367
+#: src/gui/windows/ministatuswindow.cpp:363 src/gui/windows/statuswindow.cpp:70
+#: src/gui/windows/statuswindow.cpp:268 src/gui/windows/statuswindow.cpp:392
 #, c-format
 msgid "Level: %d"
 msgstr "Level: %d"
@@ -2912,8 +2910,8 @@ msgstr ""
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3100 src/gui/popups/popupmenu.cpp:3119
 #: src/gui/popups/popupmenu.cpp:3132 src/gui/windows/charselectdialog.cpp:76
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:452
-#: src/net/eathena/charserverrecv.cpp:488
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:419
+#: src/net/eathena/charserverrecv.cpp:455
 msgid "Info"
 msgstr "Info"
 
@@ -3304,8 +3302,8 @@ msgstr ""
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/statuswindow.cpp:70
-#: src/gui/windows/statuswindow.cpp:220 src/gui/windows/statuswindow.cpp:334
+#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/statuswindow.cpp:72
+#: src/gui/windows/statuswindow.cpp:222 src/gui/windows/statuswindow.cpp:359
 #, c-format
 msgid "Money: %s"
 msgstr "Geld: %s"
@@ -3361,7 +3359,7 @@ msgstr "Afsluiten"
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:194
 #: src/gui/windows/itemamountwindow.cpp:230 src/gui/windows/npcdialog.cpp:123
-#: src/gui/windows/statuswindow.cpp:746
+#: src/gui/windows/statuswindow.cpp:771
 msgid "+"
 msgstr "+"
 
@@ -3382,8 +3380,8 @@ msgstr "-"
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/selldialog.cpp:133 src/gui/windows/buydialog.cpp:299
-#: src/gui/windows/statuswindow.cpp:483 src/gui/windows/statuswindow.cpp:539
-#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:766
+#: src/gui/windows/statuswindow.cpp:508 src/gui/windows/statuswindow.cpp:564
+#: src/gui/windows/statuswindow.cpp:769 src/gui/windows/statuswindow.cpp:791
 msgid "Max"
 msgstr "Maximum"
 
@@ -3539,15 +3537,13 @@ msgstr "Voorwerpdeling ingeschakeld."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104
-#: src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr "Voorwerpdeling uitgeschakeld."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109
-#: src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr "Voorwerpdeling is niet mogelijk."
 
@@ -3558,22 +3554,19 @@ msgstr "Voorwerpdeling onbekend."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150
-#: src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr "Ervaringsdeling ingeschakeld."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155
-#: src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr "Ervaringsdeling uitgeschakeld."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160
-#: src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr "Ervaringsdeling is niet mogelijk."
 
@@ -4007,15 +4000,15 @@ msgstr ""
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
+"Note: no other text inputs will be allowed to receive text input when you "
+"typing in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86
-#: src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr "Kleuren"
 
@@ -4039,9 +4032,11 @@ msgstr "Toon chat kleurenlijst"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat "
+"window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4068,9 +4063,11 @@ msgstr "Limiteer max karakters in chat lijn"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed "
+"in chat.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will be truncated."
+"Note: long lines can make client slower. Lines longer than this limit will "
+"be truncated."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4081,7 +4078,9 @@ msgstr "Limiteer max lijnen in chat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
+"specified number of last lines of text. Oldest lines exceeding this limit "
+"are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
 msgstr ""
@@ -4122,8 +4121,8 @@ msgstr "Toon chat geschiedenis"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on"
-" startup instead of starting with empty chat tabs."
+"If this setting enabled, client will load old chat tabs content from logs on "
+"startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4134,9 +4133,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be "
+"shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4147,9 +4148,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be "
+"shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4165,9 +4168,13 @@ msgstr "Verberg verkoop boodschappen"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will "
+"be displayed in chat. Disable this setting if you want to see shop-related "
+"messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
+"Note: technically, ManaPlus shop implemented as usual private messages with "
+"special content. If you disable this setting, you will be able to see these "
+"messages and get idea when other players are looking at your shop."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4180,7 +4187,8 @@ msgstr ""
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
+"usually makes little difference."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4199,9 +4207,12 @@ msgstr "Plaats alle persoonlijke berichten in tabs"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in "
+"separate tabs, separate tab for each player. If this setting disabled, all "
+"whispers will appear in General tab.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
+"Note: putting all whispers to single General tab is known to be confusing. "
+"Think twice before disabling this feature."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4212,7 +4223,8 @@ msgstr "Hou magie berichten bij in de 'Debug' tab"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If "
+"disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
 msgstr ""
@@ -4225,9 +4237,11 @@ msgstr "Toon server berichten in de debug tab"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of "
+"chat. If disabled, server messages will appear in General chat instead.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
+"Note: according to 4144, disabling this could also make you to lose some "
+"debug messages from client in Debug tab since these are fake server messages."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4252,9 +4266,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM "
+"activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
+"Note: this setting only makes difference for GMs (Game Masters) since this "
+"tab only appears for GMs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4265,7 +4281,8 @@ msgstr "Taal tab aanzetten"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this feature.\n"
+"If this feature enabled, language tab will appear if server supports this "
+"feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
 msgstr ""
@@ -4278,7 +4295,9 @@ msgstr "Toon alle taal berichten"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
+"If this setting enabled and server supports different chats for different "
+"languages, you will see messages for all languages, regardless of your "
+"language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
 msgstr ""
@@ -4291,7 +4310,9 @@ msgstr "Schakel de gevechtstab in"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will "
+"contain messages related to battles, like damage and experience gain, if "
+"battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
 msgstr ""
@@ -4317,7 +4338,10 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to "
+"adapt to appearance of chat input field when you typing message and when "
+"input field of chat disappears. If disabled, chat input area will always "
+"occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
@@ -4352,7 +4376,8 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. "
+"Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
 msgstr ""
@@ -4365,7 +4390,8 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender "
+"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
 msgstr ""
@@ -4378,9 +4404,12 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This "
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by "
+"default."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -5542,13 +5571,17 @@ msgstr "Geen"
 #: src/gui/widgets/tabs/setup_video.cpp:233
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr "Gefaald om te wisselen naar venstermodus en terugkeren naar oude modus faalde ook!"
+msgstr ""
+"Gefaald om te wisselen naar venstermodus en terugkeren naar oude modus "
+"faalde ook!"
 
 #. TRANSLATORS: video error message
 #: src/gui/widgets/tabs/setup_video.cpp:240
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr "Gefaald om te wisselen naar volledigscherm modus en terugkeren naar oude modus faalde ook!"
+msgstr ""
+"Gefaald om te wisselen naar volledigscherm modus en terugkeren naar oude "
+"modus faalde ook!"
 
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -5589,7 +5622,9 @@ msgstr "Scherm Resolutie is gewijzigd"
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:401
 msgid "Some windows may be moved to fit the lowered resolution."
-msgstr "Enkele vensters kunnen verplaatst worden om te passen in de omlaag gebrachte resolutie."
+msgstr ""
+"Enkele vensters kunnen verplaatst worden om te passen in de omlaag gebrachte "
+"resolutie."
 
 #. TRANSLATORS: speach type
 #: src/gui/widgets/tabs/setup_visual.cpp:43
@@ -6124,8 +6159,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:618
-#: src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:618 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Aanmaken"
 
@@ -6241,17 +6275,16 @@ msgstr "^"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:104
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:210
-#: src/gui/windows/charcreatedialog.cpp:221
-#: src/gui/windows/charcreatedialog.cpp:231
-#: src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:196
+#: src/gui/windows/charcreatedialog.cpp:209
+#: src/gui/windows/charcreatedialog.cpp:220
+#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:110
-#: src/gui/windows/charcreatedialog.cpp:600
+#: src/gui/windows/charcreatedialog.cpp:599
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Nog %d punten te verdelen"
@@ -6260,73 +6293,71 @@ msgstr "Nog %d punten te verdelen"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:201
-#: src/gui/windows/charcreatedialog.cpp:212
-#: src/gui/windows/charcreatedialog.cpp:223
-#: src/gui/windows/charcreatedialog.cpp:233
-#: src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:200
+#: src/gui/windows/charcreatedialog.cpp:211
+#: src/gui/windows/charcreatedialog.cpp:222
+#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:202
 msgid "Hair color:"
 msgstr "Haarkleur:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:213
 msgid "Hair style:"
 msgstr "Haarstijl:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:224
 msgid "Race:"
 msgstr "Ras:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:234
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:252
-#: src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr "F"
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:258
-#: src/gui/windows/charcreatedialog.cpp:265
-#: src/gui/windows/charcreatedialog.cpp:273
+#: src/gui/windows/charcreatedialog.cpp:257
+#: src/gui/windows/charcreatedialog.cpp:264
+#: src/gui/windows/charcreatedialog.cpp:272
 msgid "M"
 msgstr ""
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:260
-#: src/gui/windows/charcreatedialog.cpp:277
+#: src/gui/windows/charcreatedialog.cpp:259
+#: src/gui/windows/charcreatedialog.cpp:276
 #: src/gui/windows/inventorywindow.cpp:223
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:267
+#: src/gui/windows/charcreatedialog.cpp:266
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:474
+#: src/gui/windows/charcreatedialog.cpp:473
 msgid "Your name needs to be at least 4 characters."
 msgstr "Je naam moet uit tenminste 4 tekens bestaan."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:590
+#: src/gui/windows/charcreatedialog.cpp:589
 msgid "Character stats OK"
 msgstr "Attributen van personage OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:606
+#: src/gui/windows/charcreatedialog.cpp:605
 #, c-format
 msgid "Please remove %d points"
 msgstr "Verwijder alstublieft %d punten"
@@ -6492,8 +6523,7 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57
-#: src/gui/windows/serverdialog.cpp:112
+#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:112
 msgid "Connect"
 msgstr "Verbinden"
 
@@ -6851,15 +6881,13 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61
-#: src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr ""
@@ -6968,7 +6996,7 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/windows/ministatuswindow.cpp:356
-#: src/gui/windows/statuswindow.cpp:236
+#: src/gui/windows/statuswindow.cpp:261
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Niveau: %d (GM %d)"
@@ -7420,33 +7448,33 @@ msgid "Choose your party's name."
 msgstr "Kies uw groepsnaam."
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:72
+#: src/gui/windows/statuswindow.cpp:74
 msgid "HP:"
 msgstr "Leven:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:75
+#: src/gui/windows/statuswindow.cpp:77
 msgid "Exp:"
 msgstr "Ervaring:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:136
+#: src/gui/windows/statuswindow.cpp:138
 msgid "MP:"
 msgstr "Magie:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:173 src/gui/windows/statuswindow.cpp:294
+#: src/gui/windows/statuswindow.cpp:175 src/gui/windows/statuswindow.cpp:319
 #, c-format
 msgid "Job: %d"
 msgstr "Job: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:175
+#: src/gui/windows/statuswindow.cpp:177
 msgid "Job:"
 msgstr "Job:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:224 src/gui/windows/statuswindow.cpp:342
+#: src/gui/windows/statuswindow.cpp:226 src/gui/windows/statuswindow.cpp:367
 #, c-format
 msgid "Character points: %d"
 msgstr "Personagepunten: %d"
@@ -7564,9 +7592,10 @@ msgstr "Je hebt niet genoeg geld."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
-msgstr "Kan dat voorwerp niet toevoegen. Je kan één type voorwerp niet overlappen in het venster."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+"Kan dat voorwerp niet toevoegen. Je kan één type voorwerp niet overlappen in "
+"het venster."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:539
@@ -8833,7 +8862,9 @@ msgstr ""
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:50
 msgid "Access denied. Most likely, there are too many players on this server."
-msgstr "Toegang geweigerd. Hoogstwaarschijnlijk zijn er teveel spelers op deze server."
+msgstr ""
+"Toegang geweigerd. Hoogstwaarschijnlijk zijn er teveel spelers op deze "
+"server."
 
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:55
@@ -9004,7 +9035,9 @@ msgstr ""
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
-msgstr "Je bent tijdelijk geband van het spel tot %s.\nNeem aub contact op met het GM team via de forums."
+msgstr ""
+"Je bent tijdelijk geband van het spel tot %s.\n"
+"Neem aub contact op met het GM team via de forums."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:151 src/net/eathena/loginrecv.cpp:92
@@ -9044,33 +9077,33 @@ msgstr "Verbinding met server beëindigd. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:431
-#: src/net/eathena/charserverrecv.cpp:479
+#: src/net/eathena/charserverrecv.cpp:398
+#: src/net/eathena/charserverrecv.cpp:446
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:454
+#: src/net/eathena/charserverrecv.cpp:421
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:470
+#: src/net/eathena/charserverrecv.cpp:437
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:474
+#: src/net/eathena/charserverrecv.cpp:441
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:483
+#: src/net/eathena/charserverrecv.cpp:450
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:517 src/net/tmwa/charserverrecv.cpp:339
+#: src/net/eathena/charserverrecv.cpp:484 src/net/tmwa/charserverrecv.cpp:303
 msgid "Failed to delete character."
 msgstr "Kon personage niet verwijderen."
 
@@ -9122,140 +9155,11 @@ msgstr ""
 msgid "Do you accept %s and %s as parents?"
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:130
-#, c-format
-msgid "Strength %s"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:132
-#, c-format
-msgid "Agility %s"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:134
-#, c-format
-msgid "Vitality %s"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:136
-#, c-format
-msgid "Intelligence %s"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:138
-#, c-format
-msgid "Dexterity %s"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:140
-#, c-format
-msgid "Luck %s"
-msgstr ""
-
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:197 src/net/tmwa/generalhandler.cpp:207
+#: src/net/eathena/generalhandler.cpp:179 src/net/tmwa/generalhandler.cpp:189
 msgid "Got disconnected from server!"
 msgstr "De verbinding met de server werd verbroken!"
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:223 src/net/tmwa/generalhandler.cpp:234
-msgid "Strength"
-msgstr "Kracht"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:237
-msgid "Agility"
-msgstr "Behendigheid"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:229 src/net/tmwa/generalhandler.cpp:240
-msgid "Vitality"
-msgstr "Vitaliteit"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:243
-msgid "Intelligence"
-msgstr "Intelligentie"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:246
-msgid "Dexterity"
-msgstr "Handigheid"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:238 src/net/tmwa/generalhandler.cpp:249
-msgid "Luck"
-msgstr "Geluk"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:253
-msgid "Defense"
-msgstr "Verdediging"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:255
-msgid "M.Attack"
-msgstr "M.Aanval"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:257
-msgid "M.Defense"
-msgstr "M.Verdediging"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:260
-#, no-c-format
-msgid "% Accuracy"
-msgstr "% Nauwkeurigheid"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:263
-#, no-c-format
-msgid "% Evade"
-msgstr "% Ontwijking"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:266
-#, no-c-format
-msgid "% Critical"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:268
-msgid "Attack Delay"
-msgstr "Aanvalsvertraging"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:270
-msgid "Walk Delay"
-msgstr "Wandelvertraging"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:272
-msgid "Attack Range"
-msgstr "Aanvalsbereik"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:274
-msgid "Damage per sec."
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266
-msgid "Karma"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268
-msgid "Manner"
-msgstr ""
-
 #. TRANSLATORS: error message
 #: src/net/eathena/generalrecv.cpp:49 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
@@ -9411,7 +9315,7 @@ msgstr ""
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:199
+#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:190
 msgid "Unknown item"
 msgstr "Onbekend voorwerp"
 
@@ -9687,21 +9591,52 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:93
-#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
-#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
+#: src/resources/db/itemdb.cpp:377 src/resources/db/itemdb.cpp:381
+#: src/resources/db/moddb.cpp:79 src/resources/db/monsterdb.cpp:101
+#: src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "naamloos"
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:104
+#: src/resources/db/petdb.cpp:103
 msgid "pet"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:103
+#: src/resources/db/skillunitdb.cpp:102
 msgid "skill"
 msgstr ""
 
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:45
+msgid "Strength"
+msgstr "Kracht"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:49
+msgid "Agility"
+msgstr "Behendigheid"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:53
+msgid "Vitality"
+msgstr "Vitaliteit"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:57
+msgid "Intelligence"
+msgstr "Intelligentie"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:61
+msgid "Dexterity"
+msgstr "Handigheid"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:65
+msgid "Luck"
+msgstr "Geluk"
+
 #. TRANSLATORS: inventory type name
 #: src/resources/inventory/inventory.cpp:340
 msgid "Npc"
@@ -10022,7 +9957,8 @@ msgstr "Kan voorwerp niet toevoegen. Handelspartner heeft geen vrij slot."
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:295
 msgid "Failed adding item. You can't trade this item."
-msgstr "Gefaald om voorwerp toe te voegen. U kan dit voorwerp niet verhandelen."
+msgstr ""
+"Gefaald om voorwerp toe te voegen. U kan dit voorwerp niet verhandelen."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:299
@@ -10353,8 +10289,9 @@ msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:556
-msgid "Room join failed. Not enought money."
-msgstr ""
+#, fuzzy
+msgid "Room join failed. Not enough money."
+msgstr "Je hebt niet genoeg geld."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:560
@@ -10621,33 +10558,35 @@ msgstr ""
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:796
 #, c-format
-msgid "You and %s was divorced."
+msgid "You and %s are now divorced."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:800
-msgid "You was called by partner."
-msgstr ""
+#, fuzzy
+msgid "You were called by your partner."
+msgstr "U bent gedood door %s."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:804
 #, c-format
-msgid "You calling partner %s."
+msgid "You are calling your partner, %s."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:808
-msgid "Adoption child error. You already have baby."
+msgid "Child adoption failed. You already have a baby."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:812
-msgid "Adoption child error. You level too small for have baby."
+msgid "Child adoption failed. Your level is too low."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:816
-msgid "Adoption child error. This player already married and can't be baby."
+msgid ""
+"Child adoption failed. This player is already married and can't be a baby."
 msgstr ""
 
 #. TRANSLATORS: notification message
@@ -10657,19 +10596,20 @@ msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:825
-msgid "Error saving location. Not enought skill level."
+msgid "Error saving location. Not enough skill level."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:829
-msgid "Error saving location. You not have warp skill."
+msgid "Error saving location. You do not have warp skill."
 msgstr ""
 
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:29
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "Opties voor /%s zijn \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+"Opties voor /%s zijn \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
 #. TRANSLATORS: uptime command
 #: src/utils/stringutils.cpp:946
@@ -10725,3 +10665,27 @@ msgstr "%d seconden"
 #, c-format
 msgid "%d seconds"
 msgstr "%d seconden"
+
+#~ msgid "Defense"
+#~ msgstr "Verdediging"
+
+#~ msgid "M.Attack"
+#~ msgstr "M.Aanval"
+
+#~ msgid "M.Defense"
+#~ msgstr "M.Verdediging"
+
+#~ msgid "% Accuracy"
+#~ msgstr "% Nauwkeurigheid"
+
+#~ msgid "% Evade"
+#~ msgstr "% Ontwijking"
+
+#~ msgid "Attack Delay"
+#~ msgstr "Aanvalsvertraging"
+
+#~ msgid "Walk Delay"
+#~ msgstr "Wandelvertraging"
+
+#~ msgid "Attack Range"
+#~ msgstr "Aanvalsbereik"
diff --git a/po/pl.po b/po/pl.po
index c44cc6f93..a8b8d5eeb 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011
 # Avenn <avenn3@gmail.com>, 2013-2014
@@ -14,15 +14,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-06-18 18:53+0300\n"
+"POT-Creation-Date: 2016-07-02 19:47+0300\n"
 "PO-Revision-Date: 2016-06-19 09:21+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Polish (http://www.transifex.com/akaras/manaplus/language/pl/)\n"
+"Language-Team: Polish (http://www.transifex.com/akaras/manaplus/language/"
+"pl/)\n"
+"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pl\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
 
 #. TRANSLATORS: file uploaded message
 #: src/actions/actions.cpp:168
@@ -38,7 +40,7 @@ msgstr "Plik wysłano"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:171 src/client.cpp:1569 src/client.cpp:1604
+#: src/actions/actions.cpp:171 src/client.cpp:1572 src/client.cpp:1607
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
@@ -49,7 +51,7 @@ msgstr "Plik wysłano"
 #: src/gui/widgets/tabs/setup_video.cpp:420
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:476
+#: src/gui/windows/charcreatedialog.cpp:475
 #: src/gui/windows/charselectdialog.cpp:262
 #: src/gui/windows/charselectdialog.cpp:310 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:59
@@ -58,9 +60,9 @@ msgstr "Plik wysłano"
 #: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:531
 #: src/gui/windows/textdialog.cpp:53 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:456
-#: src/net/eathena/charserverrecv.cpp:491
-#: src/net/eathena/charserverrecv.cpp:519 src/net/tmwa/charserverrecv.cpp:341
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:423
+#: src/net/eathena/charserverrecv.cpp:458
+#: src/net/eathena/charserverrecv.cpp:486 src/net/tmwa/charserverrecv.cpp:305
 msgid "OK"
 msgstr "Ok"
 
@@ -307,26 +309,26 @@ msgid "Visible on map"
 msgstr "Widoczne na mapie"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:496
+#: src/being/being.cpp:494
 msgid "Human"
 msgstr "Człowiek"
 
 #. TRANSLATORS: dodge or miss message in attacks
-#: src/being/being.cpp:683
+#: src/being/being.cpp:676
 msgid "dodge"
 msgstr "Unik!"
 
-#: src/being/being.cpp:683
+#: src/being/being.cpp:676
 msgid "miss"
 msgstr "Pudło!"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2282 src/gui/windows/whoisonline.cpp:882
+#: src/being/being.cpp:2275 src/gui/windows/whoisonline.cpp:882
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2287 src/gui/windows/whoisonline.cpp:887
+#: src/being/being.cpp:2280 src/gui/windows/whoisonline.cpp:887
 msgid "I"
 msgstr "I"
 
@@ -478,41 +480,41 @@ msgstr "Bąbelek nad głową"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:870 src/dyetool/client.cpp:491 src/gui/windowmenu.cpp:189
+#: src/client.cpp:872 src/dyetool/client.cpp:491 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:66
 msgid "Setup"
 msgstr "Konfiguracja"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:873 src/dyetool/client.cpp:494
+#: src/client.cpp:875 src/dyetool/client.cpp:494
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Wydajność"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:876 src/dyetool/client.cpp:497
+#: src/client.cpp:878 src/dyetool/client.cpp:497
 #: src/gui/widgets/tabs/setup_video.cpp:110
 msgid "Video"
 msgstr "Ekran"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:879 src/dyetool/client.cpp:500
+#: src/client.cpp:881 src/dyetool/client.cpp:500
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Skórka"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:882 src/dyetool/client.cpp:503
+#: src/client.cpp:884 src/dyetool/client.cpp:503
 msgid "About"
 msgstr "O..."
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:885 src/dyetool/client.cpp:506 src/gui/windowmenu.cpp:74
+#: src/client.cpp:887 src/dyetool/client.cpp:506 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Pomoc"
@@ -533,7 +535,7 @@ msgstr "Pomoc"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:889 src/client.cpp:1483 src/client.cpp:1502
+#: src/client.cpp:891 src/client.cpp:1486 src/client.cpp:1505
 #: src/dyetool/client.cpp:510 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:756 src/gui/popups/popupmenu.cpp:833
 #: src/gui/popups/popupmenu.cpp:1087 src/gui/windows/didyouknowwindow.cpp:81
@@ -546,32 +548,32 @@ msgid "Close"
 msgstr "Zamknij"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1115 src/gui/windowmanager_unittest.cc:156
+#: src/client.cpp:1117 src/gui/windowmanager_unittest.cc:156
 msgid "Connecting to server"
 msgstr "Łączenie z serwerem"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1172 src/gui/windowmanager_unittest.cc:173
+#: src/client.cpp:1174 src/gui/windowmanager_unittest.cc:173
 msgid "Logging in"
 msgstr "Logowanie"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1221
+#: src/client.cpp:1223
 msgid "Entering game world"
 msgstr "Wchodzenie do świata gry"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1369
+#: src/client.cpp:1372
 msgid "Requesting characters"
 msgstr "Sprawdzanie postaci"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1412
+#: src/client.cpp:1415
 msgid "Connecting to the game server"
 msgstr "Łączenie się z serwerem gry"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1424
+#: src/client.cpp:1427
 msgid "Changing game servers"
 msgstr "Zmiana serwera"
 
@@ -588,52 +590,52 @@ msgstr "Zmiana serwera"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1480 src/client.cpp:1499 src/client.cpp:1738
+#: src/client.cpp:1483 src/client.cpp:1502 src/client.cpp:1741
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:472
+#: src/gui/windows/charcreatedialog.cpp:471
 #: src/gui/windows/charselectdialog.cpp:306
 #: src/gui/windows/editserverdialog.cpp:212
 #: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:429
-#: src/net/eathena/charserverrecv.cpp:433
-#: src/net/eathena/charserverrecv.cpp:515 src/net/tmwa/charserverrecv.cpp:337
+#: src/net/eathena/charserverrecv.cpp:396
+#: src/net/eathena/charserverrecv.cpp:400
+#: src/net/eathena/charserverrecv.cpp:482 src/net/tmwa/charserverrecv.cpp:301
 msgid "Error"
 msgstr "Błąd"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1518
+#: src/client.cpp:1521
 msgid "Requesting registration details"
 msgstr "Sprawdzanie szczegółów rejestracji"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1565
+#: src/client.cpp:1568
 msgid "Password Change"
 msgstr "Zmiana hasła"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1567
+#: src/client.cpp:1570
 msgid "Password changed successfully!"
 msgstr "Hasło zmienione z powodzeniem!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1600
+#: src/client.cpp:1603
 msgid "Email Change"
 msgstr "Zmiana adresu e-mail"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1602
+#: src/client.cpp:1605
 msgid "Email changed successfully!"
 msgstr "Adres e-mail zmieniony z powodzeniem!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1638
+#: src/client.cpp:1641
 msgid "Unregister Successful"
 msgstr "Wyrejestrowano z powodzeniem"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1640
+#: src/client.cpp:1643
 msgid "Farewell, come back any time..."
 msgstr "Żegnaj, będziemy czekać na Twój powrót..."
 
@@ -826,23 +828,23 @@ msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:598
+#: src/game.cpp:600
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Zrzut ekranu zapisany jako %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:608
+#: src/game.cpp:610
 msgid "Saving screenshot failed!"
 msgstr "Zapisywanie zrzutu ekranu nie powiodło się!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:695
+#: src/game.cpp:697
 msgid "The connection to the server was lost."
 msgstr "Połączenie z serwerem zostało zerwane."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:698
+#: src/game.cpp:700
 msgid "Network Error"
 msgstr "Błąd sieci"
 
@@ -1257,14 +1259,16 @@ msgstr "Wskrześ"
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
-msgstr "Niesiesz więcej niż połowę dopuszczalnego ciężaru. Nie odzyskujesz zdrowia."
+"You are carrying more than half your weight. You are unable to regain health."
+msgstr ""
+"Niesiesz więcej niż połowę dopuszczalnego ciężaru. Nie odzyskujesz zdrowia."
 
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:198
 msgid "You are carrying less than half your weight. You can regain health."
-msgstr "Niesiesz mniej niż połowę dopuszczalnego ciężaru. Możesz znowu odzyskiwać zdrowie."
+msgstr ""
+"Niesiesz mniej niż połowę dopuszczalnego ciężaru. Możesz znowu odzyskiwać "
+"zdrowie."
 
 #. TRANSLATORS: chat color
 #. TRANSLATORS: inventory sort mode
@@ -1275,8 +1279,7 @@ msgstr "Niesiesz mniej niż połowę dopuszczalnego ciężaru. Możesz znowu odz
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:671
-#: src/gui/windows/serverdialog.cpp:603
+#: src/gui/windows/equipmentwindow.cpp:671 src/gui/windows/serverdialog.cpp:603
 msgid "default"
 msgstr "domyślnie"
 
@@ -1828,11 +1831,9 @@ msgstr "Handel"
 #. TRANSLATORS: attack player
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
-#. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:180 src/gui/popups/popupmenu.cpp:304
 #: src/gui/popups/popupmenu.cpp:912 src/gui/widgets/skillinfo.cpp:125
-#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
-#: src/net/tmwa/generalhandler.cpp:251
+#: src/input/pages/basic.cpp:40
 msgid "Attack"
 msgstr "Atak"
 
@@ -1908,7 +1909,7 @@ msgstr "Podejdź"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:270 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:152
+#: src/resources/db/npcdb.cpp:151
 msgid "Talk"
 msgstr "Rozmowa"
 
@@ -1926,7 +1927,7 @@ msgstr "Rozmowa"
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:154
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:153
 msgid "Buy"
 msgstr "Kup"
 
@@ -1944,7 +1945,7 @@ msgstr "Kup"
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
 #: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:256
-#: src/resources/db/npcdb.cpp:156
+#: src/resources/db/npcdb.cpp:155
 msgid "Sell"
 msgstr "Sprzedaj"
 
@@ -2046,7 +2047,7 @@ msgstr "Zdejmij"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:408 src/resources/db/petdb.cpp:160
+#: src/gui/popups/popupmenu.cpp:408 src/resources/db/petdb.cpp:159
 msgid "Return to egg"
 msgstr ""
 
@@ -2443,7 +2444,7 @@ msgstr "Zresetuj żółty pasek"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2125 src/gui/windows/statuswindow.cpp:90
 msgid "Copy to chat"
 msgstr "Skopiuj do czatu"
 
@@ -2495,9 +2496,8 @@ msgstr "Pokaż okno"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/popups/popupmenu.cpp:2386 src/gui/popups/skillpopup.cpp:127
-#: src/gui/windows/ministatuswindow.cpp:363
-#: src/gui/windows/statuswindow.cpp:68 src/gui/windows/statuswindow.cpp:243
-#: src/gui/windows/statuswindow.cpp:367
+#: src/gui/windows/ministatuswindow.cpp:363 src/gui/windows/statuswindow.cpp:70
+#: src/gui/windows/statuswindow.cpp:268 src/gui/windows/statuswindow.cpp:392
 #, c-format
 msgid "Level: %d"
 msgstr "Poziom: %d"
@@ -2916,8 +2916,8 @@ msgstr ""
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3100 src/gui/popups/popupmenu.cpp:3119
 #: src/gui/popups/popupmenu.cpp:3132 src/gui/windows/charselectdialog.cpp:76
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:452
-#: src/net/eathena/charserverrecv.cpp:488
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:419
+#: src/net/eathena/charserverrecv.cpp:455
 msgid "Info"
 msgstr "Info"
 
@@ -3308,8 +3308,8 @@ msgstr "Poziom: %u"
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/statuswindow.cpp:70
-#: src/gui/windows/statuswindow.cpp:220 src/gui/windows/statuswindow.cpp:334
+#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/statuswindow.cpp:72
+#: src/gui/windows/statuswindow.cpp:222 src/gui/windows/statuswindow.cpp:359
 #, c-format
 msgid "Money: %s"
 msgstr "Pieniądze: %s"
@@ -3365,7 +3365,7 @@ msgstr "Wyjdź"
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:194
 #: src/gui/windows/itemamountwindow.cpp:230 src/gui/windows/npcdialog.cpp:123
-#: src/gui/windows/statuswindow.cpp:746
+#: src/gui/windows/statuswindow.cpp:771
 msgid "+"
 msgstr "+"
 
@@ -3386,8 +3386,8 @@ msgstr "-"
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/selldialog.cpp:133 src/gui/windows/buydialog.cpp:299
-#: src/gui/windows/statuswindow.cpp:483 src/gui/windows/statuswindow.cpp:539
-#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:766
+#: src/gui/windows/statuswindow.cpp:508 src/gui/windows/statuswindow.cpp:564
+#: src/gui/windows/statuswindow.cpp:769 src/gui/windows/statuswindow.cpp:791
 msgid "Max"
 msgstr "Maks."
 
@@ -3543,15 +3543,13 @@ msgstr "Włączono dzielenie się przedmiotami."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104
-#: src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr "Wyłączono dzielenie się przedmiotami."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109
-#: src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr "Nie można włączyć dzielenia się przedmiotami."
 
@@ -3562,24 +3560,23 @@ msgstr "Stan dzielenia się przedmiotami nieznany."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150
-#: src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr "Podział doświadczenia włączony."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155
-#: src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr "Podział doświadczenia wyłączony."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160
-#: src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
 msgid "Experience sharing not possible."
-msgstr "Podział doświadczenia nie jest możliwy- prawdopodobnie maksymalna róznica poziomów jest większa niż 10."
+msgstr ""
+"Podział doświadczenia nie jest możliwy- prawdopodobnie maksymalna róznica "
+"poziomów jest większa niż 10."
 
 #. TRANSLATORS: chat message
 #: src/gui/widgets/tabs/chat/partytab.cpp:165
@@ -4011,15 +4008,15 @@ msgstr "Podtrzymuj skupienie na pasek czatu."
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
+"Note: no other text inputs will be allowed to receive text input when you "
+"typing in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86
-#: src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr "Kolory"
 
@@ -4043,9 +4040,11 @@ msgstr "Pokazuj listę kolorów czatu"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat "
+"window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4072,9 +4071,11 @@ msgstr "Limit znaków w wierszu czatu"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed "
+"in chat.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will be truncated."
+"Note: long lines can make client slower. Lines longer than this limit will "
+"be truncated."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4085,7 +4086,9 @@ msgstr "Limit wierszy w czacie"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
+"specified number of last lines of text. Oldest lines exceeding this limit "
+"are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
 msgstr ""
@@ -4126,8 +4129,8 @@ msgstr "Pokazuj historię czatu"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on"
-" startup instead of starting with empty chat tabs."
+"If this setting enabled, client will load old chat tabs content from logs on "
+"startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4138,9 +4141,11 @@ msgstr "Pokazuj wiadomości online drużyny"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be "
+"shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4151,9 +4156,11 @@ msgstr "Pokazuj wiadomości online gildii"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be "
+"shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4169,9 +4176,13 @@ msgstr "Ukryj wiadomości od sklepów"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will "
+"be displayed in chat. Disable this setting if you want to see shop-related "
+"messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
+"Note: technically, ManaPlus shop implemented as usual private messages with "
+"special content. If you disable this setting, you will be able to see these "
+"messages and get idea when other players are looking at your shop."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4184,7 +4195,8 @@ msgstr "Pokazuj wiadomości MVP"
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
+"usually makes little difference."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4203,9 +4215,12 @@ msgstr "Umieść wszystkie szepty w zakładkach"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in "
+"separate tabs, separate tab for each player. If this setting disabled, all "
+"whispers will appear in General tab.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
+"Note: putting all whispers to single General tab is known to be confusing. "
+"Think twice before disabling this feature."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4216,7 +4231,8 @@ msgstr "Loguj powiadomienia o magii w zakładce Debug"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If "
+"disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
 msgstr ""
@@ -4229,9 +4245,11 @@ msgstr "Pokazuj wiadomości serwera w zakładce Debug"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of "
+"chat. If disabled, server messages will appear in General chat instead.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
+"Note: according to 4144, disabling this could also make you to lose some "
+"debug messages from client in Debug tab since these are fake server messages."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4256,9 +4274,11 @@ msgstr "Aktywuj zakładkę GM"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM "
+"activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
+"Note: this setting only makes difference for GMs (Game Masters) since this "
+"tab only appears for GMs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4269,7 +4289,8 @@ msgstr "Aktywuj zakładkę \"języki\""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this feature.\n"
+"If this feature enabled, language tab will appear if server supports this "
+"feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
 msgstr ""
@@ -4282,7 +4303,9 @@ msgstr "Pokaż wiadomości ze wszystkich języków"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
+"If this setting enabled and server supports different chats for different "
+"languages, you will see messages for all languages, regardless of your "
+"language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
 msgstr ""
@@ -4295,7 +4318,9 @@ msgstr "Włącz zakładkę bitewną"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will "
+"contain messages related to battles, like damage and experience gain, if "
+"battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
 msgstr ""
@@ -4321,7 +4346,10 @@ msgstr "Jeśli potrzeba, zmień rozmiar zakładek czatu"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to "
+"adapt to appearance of chat input field when you typing message and when "
+"input field of chat disappears. If disabled, chat input area will always "
+"occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
@@ -4356,7 +4384,8 @@ msgstr "Podświetlaj słowa (oddzielaj przecinkiem)"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. "
+"Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
 msgstr ""
@@ -4369,7 +4398,8 @@ msgstr "Ignoruj imienia globalnie (oddzielone przecinkiem)"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender "
+"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
 msgstr ""
@@ -4382,9 +4412,12 @@ msgstr "Pokazuj przycisk emotek w czacie"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This "
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by "
+"default."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4498,7 +4531,9 @@ msgstr "Wykryto konflikt klawiszy."
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr "Konflikt pomiędzy klawiszami \"%s\" i \"%s\". Rozwiąż go, albo mogą pojawić się problemy."
+msgstr ""
+"Konflikt pomiędzy klawiszami \"%s\" i \"%s\". Rozwiąż go, albo mogą pojawić "
+"się problemy."
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
@@ -5267,7 +5302,9 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_players.cpp:143
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
-msgstr "Emuluj prawy przycisk myszki poprzez długie wciśnięcie lewego przycisku (przydatne dla ekranów dotykowych)"
+msgstr ""
+"Emuluj prawy przycisk myszki poprzez długie wciśnięcie lewego przycisku "
+"(przydatne dla ekranów dotykowych)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:148
@@ -5546,13 +5583,16 @@ msgstr "Brak"
 #: src/gui/widgets/tabs/setup_video.cpp:233
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr "Nie udało się zmienić na tryb w oknie, ani przywrócić do poprzedniego stanu!"
+msgstr ""
+"Nie udało się zmienić na tryb w oknie, ani przywrócić do poprzedniego stanu!"
 
 #. TRANSLATORS: video error message
 #: src/gui/widgets/tabs/setup_video.cpp:240
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr "Nie udało się zmienić na tryb pełnoekranowy ani przywrócić do poprzedniego stanu!"
+msgstr ""
+"Nie udało się zmienić na tryb pełnoekranowy ani przywrócić do poprzedniego "
+"stanu!"
 
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -5593,7 +5633,9 @@ msgstr "Rozdzielczość zmieniona"
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:401
 msgid "Some windows may be moved to fit the lowered resolution."
-msgstr "Niektóre okna mogą być przesunięte aby dopasować się do niższej rozdzielczości."
+msgstr ""
+"Niektóre okna mogą być przesunięte aby dopasować się do niższej "
+"rozdzielczości."
 
 #. TRANSLATORS: speach type
 #: src/gui/widgets/tabs/setup_visual.cpp:43
@@ -6128,8 +6170,7 @@ msgstr "Ilość:"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:618
-#: src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:618 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Utwórz"
 
@@ -6245,17 +6286,16 @@ msgstr "^"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:104
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:210
-#: src/gui/windows/charcreatedialog.cpp:221
-#: src/gui/windows/charcreatedialog.cpp:231
-#: src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:196
+#: src/gui/windows/charcreatedialog.cpp:209
+#: src/gui/windows/charcreatedialog.cpp:220
+#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:110
-#: src/gui/windows/charcreatedialog.cpp:600
+#: src/gui/windows/charcreatedialog.cpp:599
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Proszę wykorzystać %d punktów"
@@ -6264,73 +6304,71 @@ msgstr "Proszę wykorzystać %d punktów"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:201
-#: src/gui/windows/charcreatedialog.cpp:212
-#: src/gui/windows/charcreatedialog.cpp:223
-#: src/gui/windows/charcreatedialog.cpp:233
-#: src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:200
+#: src/gui/windows/charcreatedialog.cpp:211
+#: src/gui/windows/charcreatedialog.cpp:222
+#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:202
 msgid "Hair color:"
 msgstr "Kolor włosów:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:213
 msgid "Hair style:"
 msgstr "Fryzura:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:224
 msgid "Race:"
 msgstr "Rasa:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:234
 msgid "Look:"
 msgstr "Wygląd:"
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:252
-#: src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr "F"
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:258
-#: src/gui/windows/charcreatedialog.cpp:265
-#: src/gui/windows/charcreatedialog.cpp:273
+#: src/gui/windows/charcreatedialog.cpp:257
+#: src/gui/windows/charcreatedialog.cpp:264
+#: src/gui/windows/charcreatedialog.cpp:272
 msgid "M"
 msgstr ""
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:260
-#: src/gui/windows/charcreatedialog.cpp:277
+#: src/gui/windows/charcreatedialog.cpp:259
+#: src/gui/windows/charcreatedialog.cpp:276
 #: src/gui/windows/inventorywindow.cpp:223
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:267
+#: src/gui/windows/charcreatedialog.cpp:266
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:474
+#: src/gui/windows/charcreatedialog.cpp:473
 msgid "Your name needs to be at least 4 characters."
 msgstr "Twoje imię musi mieć co najmniej 4 znaki."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:590
+#: src/gui/windows/charcreatedialog.cpp:589
 msgid "Character stats OK"
 msgstr "Statystyki postaci w porządku."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:606
+#: src/gui/windows/charcreatedialog.cpp:605
 #, c-format
 msgid "Please remove %d points"
 msgstr "Proszę usunąć %d punktów"
@@ -6394,7 +6432,12 @@ msgid ""
 "Level: %u\n"
 "Experience: %u\n"
 "Money: %s"
-msgstr "PŻ: %u/%u\nPM: %u/%u\nPoziom: %u\nDoświadczenie: %u\nPieniądze: %s"
+msgstr ""
+"PŻ: %u/%u\n"
+"PM: %u/%u\n"
+"Poziom: %u\n"
+"Doświadczenie: %u\n"
+"Pieniądze: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/charselectdialog.cpp:308
@@ -6496,8 +6539,7 @@ msgstr "Edytuj serwer"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57
-#: src/gui/windows/serverdialog.cpp:112
+#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:112
 msgid "Connect"
 msgstr "Połącz"
 
@@ -6857,15 +6899,13 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61
-#: src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr ""
@@ -6974,7 +7014,7 @@ msgstr "pasek punktów umiejętności"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/windows/ministatuswindow.cpp:356
-#: src/gui/windows/statuswindow.cpp:236
+#: src/gui/windows/statuswindow.cpp:261
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Poziom: %d (GM %d)"
@@ -7426,33 +7466,33 @@ msgid "Choose your party's name."
 msgstr "Wybierz nazwę grupy."
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:72
+#: src/gui/windows/statuswindow.cpp:74
 msgid "HP:"
 msgstr "HP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:75
+#: src/gui/windows/statuswindow.cpp:77
 msgid "Exp:"
 msgstr "Exp:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:136
+#: src/gui/windows/statuswindow.cpp:138
 msgid "MP:"
 msgstr "MP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:173 src/gui/windows/statuswindow.cpp:294
+#: src/gui/windows/statuswindow.cpp:175 src/gui/windows/statuswindow.cpp:319
 #, c-format
 msgid "Job: %d"
 msgstr "Praca: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:175
+#: src/gui/windows/statuswindow.cpp:177
 msgid "Job:"
 msgstr "Praca:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:224 src/gui/windows/statuswindow.cpp:342
+#: src/gui/windows/statuswindow.cpp:226 src/gui/windows/statuswindow.cpp:367
 #, c-format
 msgid "Character points: %d"
 msgstr "Punkty postaci: %d"
@@ -7570,9 +7610,10 @@ msgstr "Nie masz wystarczającej ilości pieniędzy."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
-msgstr "Dodanie przedmiotu nie powiodło się. Nie może zachodzić na siebie ten sam rodzaj przedmiotu w okienku."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+"Dodanie przedmiotu nie powiodło się. Nie może zachodzić na siebie ten sam "
+"rodzaj przedmiotu w okienku."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:539
@@ -9010,7 +9051,9 @@ msgstr ""
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
-msgstr "Dostałeś/aś tymczasowego bana do %s.\nProsimy o kontakt z drużyną GM-ów przez fora."
+msgstr ""
+"Dostałeś/aś tymczasowego bana do %s.\n"
+"Prosimy o kontakt z drużyną GM-ów przez fora."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:151 src/net/eathena/loginrecv.cpp:92
@@ -9050,33 +9093,33 @@ msgstr "Połączenie z serwerem przerwane. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:431
-#: src/net/eathena/charserverrecv.cpp:479
+#: src/net/eathena/charserverrecv.cpp:398
+#: src/net/eathena/charserverrecv.cpp:446
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:454
+#: src/net/eathena/charserverrecv.cpp:421
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:470
+#: src/net/eathena/charserverrecv.cpp:437
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:474
+#: src/net/eathena/charserverrecv.cpp:441
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:483
+#: src/net/eathena/charserverrecv.cpp:450
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:517 src/net/tmwa/charserverrecv.cpp:339
+#: src/net/eathena/charserverrecv.cpp:484 src/net/tmwa/charserverrecv.cpp:303
 msgid "Failed to delete character."
 msgstr "Nie udało się skasować postaci."
 
@@ -9128,140 +9171,11 @@ msgstr ""
 msgid "Do you accept %s and %s as parents?"
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:130
-#, c-format
-msgid "Strength %s"
-msgstr "Siła %s"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:132
-#, c-format
-msgid "Agility %s"
-msgstr "Zwinność %s"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:134
-#, c-format
-msgid "Vitality %s"
-msgstr "Żywotność %s"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:136
-#, c-format
-msgid "Intelligence %s"
-msgstr "Inteligencja %s"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:138
-#, c-format
-msgid "Dexterity %s"
-msgstr "Celność %s"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:140
-#, c-format
-msgid "Luck %s"
-msgstr "Szczęście %s"
-
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:197 src/net/tmwa/generalhandler.cpp:207
+#: src/net/eathena/generalhandler.cpp:179 src/net/tmwa/generalhandler.cpp:189
 msgid "Got disconnected from server!"
 msgstr "Rozłączono z serwerem!"
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:223 src/net/tmwa/generalhandler.cpp:234
-msgid "Strength"
-msgstr "Siła"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:237
-msgid "Agility"
-msgstr "Zwinność"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:229 src/net/tmwa/generalhandler.cpp:240
-msgid "Vitality"
-msgstr "Witalność"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:243
-msgid "Intelligence"
-msgstr "Inteligencja"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:246
-msgid "Dexterity"
-msgstr "Celność"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:238 src/net/tmwa/generalhandler.cpp:249
-msgid "Luck"
-msgstr "Szczęście"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:253
-msgid "Defense"
-msgstr "Obrona"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:255
-msgid "M.Attack"
-msgstr "Atak mag."
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:257
-msgid "M.Defense"
-msgstr "Obrona mag."
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:260
-#, no-c-format
-msgid "% Accuracy"
-msgstr "% celności"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:263
-#, no-c-format
-msgid "% Evade"
-msgstr "% uników"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:266
-#, no-c-format
-msgid "% Critical"
-msgstr "% ciosów kryt."
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:268
-msgid "Attack Delay"
-msgstr "Opóźnienie ataku"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:270
-msgid "Walk Delay"
-msgstr "Opóźnienie chodu"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:272
-msgid "Attack Range"
-msgstr "Zasięg ataku"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:274
-msgid "Damage per sec."
-msgstr "Obrażenia na sek."
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266
-msgid "Karma"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268
-msgid "Manner"
-msgstr ""
-
 #. TRANSLATORS: error message
 #: src/net/eathena/generalrecv.cpp:49 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
@@ -9417,7 +9331,7 @@ msgstr ""
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:199
+#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:190
 msgid "Unknown item"
 msgstr "Nieznany przedmiot"
 
@@ -9693,21 +9607,52 @@ msgstr "Nowoczesny OpenGL"
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:93
-#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
-#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
+#: src/resources/db/itemdb.cpp:377 src/resources/db/itemdb.cpp:381
+#: src/resources/db/moddb.cpp:79 src/resources/db/monsterdb.cpp:101
+#: src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "nienazwany"
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:104
+#: src/resources/db/petdb.cpp:103
 msgid "pet"
 msgstr "zwierzątko"
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:103
+#: src/resources/db/skillunitdb.cpp:102
 msgid "skill"
 msgstr ""
 
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:45
+msgid "Strength"
+msgstr "Siła"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:49
+msgid "Agility"
+msgstr "Zwinność"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:53
+msgid "Vitality"
+msgstr "Witalność"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:57
+msgid "Intelligence"
+msgstr "Inteligencja"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:61
+msgid "Dexterity"
+msgstr "Celność"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:65
+msgid "Luck"
+msgstr "Szczęście"
+
 #. TRANSLATORS: inventory type name
 #: src/resources/inventory/inventory.cpp:340
 msgid "Npc"
@@ -9984,7 +9929,9 @@ msgstr "Dodaj amunicję do ekwipunku."
 #: src/resources/notifications.h:262
 #, c-format
 msgid "Trading with %s isn't possible. Trade partner is too far away."
-msgstr "Handlowania z %s nie jest możliwe. Postać z którą handlujesz jest zbyt daleko."
+msgstr ""
+"Handlowania z %s nie jest możliwe. Postać z którą handlujesz jest zbyt "
+"daleko."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:267
@@ -10023,7 +9970,9 @@ msgstr "Nie można dodać przedmiotu. Osoba z którą handlujesz jest przeciąż
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:291
 msgid "Failed adding item. Trade partner has no free slot."
-msgstr "Nie można dodać przedmiotu. Osoba z którą handlujesz nie ma wolnych miejsc w inwentarzu."
+msgstr ""
+"Nie można dodać przedmiotu. Osoba z którą handlujesz nie ma wolnych miejsc w "
+"inwentarzu."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:295
@@ -10359,8 +10308,9 @@ msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:556
-msgid "Room join failed. Not enought money."
-msgstr ""
+#, fuzzy
+msgid "Room join failed. Not enough money."
+msgstr "Nie masz wystarczającej ilości pieniędzy."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:560
@@ -10627,33 +10577,34 @@ msgstr ""
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:796
 #, c-format
-msgid "You and %s was divorced."
+msgid "You and %s are now divorced."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:800
-msgid "You was called by partner."
+msgid "You were called by your partner."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:804
 #, c-format
-msgid "You calling partner %s."
+msgid "You are calling your partner, %s."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:808
-msgid "Adoption child error. You already have baby."
+msgid "Child adoption failed. You already have a baby."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:812
-msgid "Adoption child error. You level too small for have baby."
+msgid "Child adoption failed. Your level is too low."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:816
-msgid "Adoption child error. This player already married and can't be baby."
+msgid ""
+"Child adoption failed. This player is already married and can't be a baby."
 msgstr ""
 
 #. TRANSLATORS: notification message
@@ -10663,12 +10614,12 @@ msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:825
-msgid "Error saving location. Not enought skill level."
+msgid "Error saving location. Not enough skill level."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:829
-msgid "Error saving location. You not have warp skill."
+msgid "Error saving location. You do not have warp skill."
 msgstr ""
 
 #. TRANSLATORS: chat option changed message
@@ -10731,3 +10682,51 @@ msgstr "%d sekund/y"
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekund/y"
+
+#~ msgid "Strength %s"
+#~ msgstr "Siła %s"
+
+#~ msgid "Agility %s"
+#~ msgstr "Zwinność %s"
+
+#~ msgid "Vitality %s"
+#~ msgstr "Żywotność %s"
+
+#~ msgid "Intelligence %s"
+#~ msgstr "Inteligencja %s"
+
+#~ msgid "Dexterity %s"
+#~ msgstr "Celność %s"
+
+#~ msgid "Luck %s"
+#~ msgstr "Szczęście %s"
+
+#~ msgid "Defense"
+#~ msgstr "Obrona"
+
+#~ msgid "M.Attack"
+#~ msgstr "Atak mag."
+
+#~ msgid "M.Defense"
+#~ msgstr "Obrona mag."
+
+#~ msgid "% Accuracy"
+#~ msgstr "% celności"
+
+#~ msgid "% Evade"
+#~ msgstr "% uników"
+
+#~ msgid "% Critical"
+#~ msgstr "% ciosów kryt."
+
+#~ msgid "Attack Delay"
+#~ msgstr "Opóźnienie ataku"
+
+#~ msgid "Walk Delay"
+#~ msgstr "Opóźnienie chodu"
+
+#~ msgid "Attack Range"
+#~ msgstr "Zasięg ataku"
+
+#~ msgid "Damage per sec."
+#~ msgstr "Obrażenia na sek."
diff --git a/po/pt.po b/po/pt.po
index e4f791d93..204d2d66f 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011
 # freya <freya.df@gmail.com>, 2013
@@ -13,14 +13,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-06-18 18:53+0300\n"
+"POT-Creation-Date: 2016-07-02 19:47+0300\n"
 "PO-Revision-Date: 2016-06-19 09:21+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Portuguese (http://www.transifex.com/akaras/manaplus/language/pt/)\n"
+"Language-Team: Portuguese (http://www.transifex.com/akaras/manaplus/language/"
+"pt/)\n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
@@ -37,7 +38,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:171 src/client.cpp:1569 src/client.cpp:1604
+#: src/actions/actions.cpp:171 src/client.cpp:1572 src/client.cpp:1607
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
@@ -48,7 +49,7 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_video.cpp:420
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:476
+#: src/gui/windows/charcreatedialog.cpp:475
 #: src/gui/windows/charselectdialog.cpp:262
 #: src/gui/windows/charselectdialog.cpp:310 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:59
@@ -57,9 +58,9 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:531
 #: src/gui/windows/textdialog.cpp:53 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:456
-#: src/net/eathena/charserverrecv.cpp:491
-#: src/net/eathena/charserverrecv.cpp:519 src/net/tmwa/charserverrecv.cpp:341
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:423
+#: src/net/eathena/charserverrecv.cpp:458
+#: src/net/eathena/charserverrecv.cpp:486 src/net/tmwa/charserverrecv.cpp:305
 msgid "OK"
 msgstr "OK"
 
@@ -306,26 +307,26 @@ msgid "Visible on map"
 msgstr "Visivel no mapa"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:496
+#: src/being/being.cpp:494
 msgid "Human"
 msgstr "Humano"
 
 #. TRANSLATORS: dodge or miss message in attacks
-#: src/being/being.cpp:683
+#: src/being/being.cpp:676
 msgid "dodge"
 msgstr "desviou"
 
-#: src/being/being.cpp:683
+#: src/being/being.cpp:676
 msgid "miss"
 msgstr "errou"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2282 src/gui/windows/whoisonline.cpp:882
+#: src/being/being.cpp:2275 src/gui/windows/whoisonline.cpp:882
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2287 src/gui/windows/whoisonline.cpp:887
+#: src/being/being.cpp:2280 src/gui/windows/whoisonline.cpp:887
 msgid "I"
 msgstr "l"
 
@@ -476,41 +477,41 @@ msgstr "Bolha Flutuante"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:870 src/dyetool/client.cpp:491 src/gui/windowmenu.cpp:189
+#: src/client.cpp:872 src/dyetool/client.cpp:491 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:66
 msgid "Setup"
 msgstr "Configurar"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:873 src/dyetool/client.cpp:494
+#: src/client.cpp:875 src/dyetool/client.cpp:494
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:876 src/dyetool/client.cpp:497
+#: src/client.cpp:878 src/dyetool/client.cpp:497
 #: src/gui/widgets/tabs/setup_video.cpp:110
 msgid "Video"
 msgstr "Vídeo"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:879 src/dyetool/client.cpp:500
+#: src/client.cpp:881 src/dyetool/client.cpp:500
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:882 src/dyetool/client.cpp:503
+#: src/client.cpp:884 src/dyetool/client.cpp:503
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:885 src/dyetool/client.cpp:506 src/gui/windowmenu.cpp:74
+#: src/client.cpp:887 src/dyetool/client.cpp:506 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Ajuda"
@@ -531,7 +532,7 @@ msgstr "Ajuda"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:889 src/client.cpp:1483 src/client.cpp:1502
+#: src/client.cpp:891 src/client.cpp:1486 src/client.cpp:1505
 #: src/dyetool/client.cpp:510 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:756 src/gui/popups/popupmenu.cpp:833
 #: src/gui/popups/popupmenu.cpp:1087 src/gui/windows/didyouknowwindow.cpp:81
@@ -544,32 +545,32 @@ msgid "Close"
 msgstr "Fechar"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1115 src/gui/windowmanager_unittest.cc:156
+#: src/client.cpp:1117 src/gui/windowmanager_unittest.cc:156
 msgid "Connecting to server"
 msgstr "Conectando ao servidor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1172 src/gui/windowmanager_unittest.cc:173
+#: src/client.cpp:1174 src/gui/windowmanager_unittest.cc:173
 msgid "Logging in"
 msgstr "Efetuando login"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1221
+#: src/client.cpp:1223
 msgid "Entering game world"
 msgstr "Entrando no domínio do jogo"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1369
+#: src/client.cpp:1372
 msgid "Requesting characters"
 msgstr "Requisitando personagens"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1412
+#: src/client.cpp:1415
 msgid "Connecting to the game server"
 msgstr "Conectando ao servidor do jogo"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1424
+#: src/client.cpp:1427
 msgid "Changing game servers"
 msgstr "Mudando servidores do jogo"
 
@@ -586,52 +587,52 @@ msgstr "Mudando servidores do jogo"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1480 src/client.cpp:1499 src/client.cpp:1738
+#: src/client.cpp:1483 src/client.cpp:1502 src/client.cpp:1741
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:472
+#: src/gui/windows/charcreatedialog.cpp:471
 #: src/gui/windows/charselectdialog.cpp:306
 #: src/gui/windows/editserverdialog.cpp:212
 #: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:429
-#: src/net/eathena/charserverrecv.cpp:433
-#: src/net/eathena/charserverrecv.cpp:515 src/net/tmwa/charserverrecv.cpp:337
+#: src/net/eathena/charserverrecv.cpp:396
+#: src/net/eathena/charserverrecv.cpp:400
+#: src/net/eathena/charserverrecv.cpp:482 src/net/tmwa/charserverrecv.cpp:301
 msgid "Error"
 msgstr "Erro"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1518
+#: src/client.cpp:1521
 msgid "Requesting registration details"
 msgstr "Requisitando detalhes do registro"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1565
+#: src/client.cpp:1568
 msgid "Password Change"
 msgstr "Mudar senha"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1567
+#: src/client.cpp:1570
 msgid "Password changed successfully!"
 msgstr "Senha modificada com sucesso!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1600
+#: src/client.cpp:1603
 msgid "Email Change"
 msgstr "Mudar email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1602
+#: src/client.cpp:1605
 msgid "Email changed successfully!"
 msgstr "Email modificado com sucesso!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1638
+#: src/client.cpp:1641
 msgid "Unregister Successful"
 msgstr "Registro cancelado com sucesso"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1640
+#: src/client.cpp:1643
 msgid "Farewell, come back any time..."
 msgstr "Tchau, volte sempre..."
 
@@ -723,7 +724,9 @@ msgstr "  -H --update-host : Usar este host de update"
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:89
 msgid "  -D --default        : Choose default character server and character"
-msgstr "  -D --default        : Escolhe um personagem e um servidor de personagem padrão"
+msgstr ""
+"  -D --default        : Escolhe um personagem e um servidor de personagem "
+"padrão"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:93
@@ -733,12 +736,14 @@ msgstr "  -u --skip-update    : Não faz downloads de atualização"
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:96
 msgid "  -d --data           : Directory to load game data from"
-msgstr "  -d --data           : Pasta de onde os dados do jogo vão ser carregados"
+msgstr ""
+"  -d --data           : Pasta de onde os dados do jogo vão ser carregados"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:99
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr "  -L --localdata-dir  : Diretório a ser usado como pasta de dados local"
+msgstr ""
+"  -L --localdata-dir  : Diretório a ser usado como pasta de dados local"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:103
@@ -758,7 +763,8 @@ msgstr ""
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:112
 msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr "  -T --testes          : Começar a testar drivers para auto configuração"
+msgstr ""
+"  -T --testes          : Começar a testar drivers para auto configuração"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:118
@@ -824,23 +830,23 @@ msgid "Debug"
 msgstr "Depurador"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:598
+#: src/game.cpp:600
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Captura de Tela salva em: %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:608
+#: src/game.cpp:610
 msgid "Saving screenshot failed!"
 msgstr "Falha ao salvar screenshot!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:695
+#: src/game.cpp:697
 msgid "The connection to the server was lost."
 msgstr "A conexão com o servidor caiu."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:698
+#: src/game.cpp:700
 msgid "Network Error"
 msgstr "Erro de conexão"
 
@@ -1255,14 +1261,17 @@ msgstr ""
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
-msgstr "Você está carregando mais que a metade de seu peso. Você não poderá mais recuperar HP."
+"You are carrying more than half your weight. You are unable to regain health."
+msgstr ""
+"Você está carregando mais que a metade de seu peso. Você não poderá mais "
+"recuperar HP."
 
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:198
 msgid "You are carrying less than half your weight. You can regain health."
-msgstr "Você está carregando menos da metade de seu peso. Você vai recuperar-se novamente."
+msgstr ""
+"Você está carregando menos da metade de seu peso. Você vai recuperar-se "
+"novamente."
 
 #. TRANSLATORS: chat color
 #. TRANSLATORS: inventory sort mode
@@ -1273,8 +1282,7 @@ msgstr "Você está carregando menos da metade de seu peso. Você vai recuperar-
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:671
-#: src/gui/windows/serverdialog.cpp:603
+#: src/gui/windows/equipmentwindow.cpp:671 src/gui/windows/serverdialog.cpp:603
 msgid "default"
 msgstr "padrão"
 
@@ -1826,11 +1834,9 @@ msgstr "Negócios"
 #. TRANSLATORS: attack player
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
-#. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:180 src/gui/popups/popupmenu.cpp:304
 #: src/gui/popups/popupmenu.cpp:912 src/gui/widgets/skillinfo.cpp:125
-#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
-#: src/net/tmwa/generalhandler.cpp:251
+#: src/input/pages/basic.cpp:40
 msgid "Attack"
 msgstr "Ataque"
 
@@ -1906,7 +1912,7 @@ msgstr "Mover"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:270 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:152
+#: src/resources/db/npcdb.cpp:151
 msgid "Talk"
 msgstr "Falar"
 
@@ -1924,7 +1930,7 @@ msgstr "Falar"
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:154
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:153
 msgid "Buy"
 msgstr "Comprar"
 
@@ -1942,7 +1948,7 @@ msgstr "Comprar"
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
 #: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:256
-#: src/resources/db/npcdb.cpp:156
+#: src/resources/db/npcdb.cpp:155
 msgid "Sell"
 msgstr "Vender"
 
@@ -2044,7 +2050,7 @@ msgstr "Desequipar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:408 src/resources/db/petdb.cpp:160
+#: src/gui/popups/popupmenu.cpp:408 src/resources/db/petdb.cpp:159
 msgid "Return to egg"
 msgstr ""
 
@@ -2441,7 +2447,7 @@ msgstr "Resetar barra amarela"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2125 src/gui/windows/statuswindow.cpp:90
 msgid "Copy to chat"
 msgstr "Copiar para o chat"
 
@@ -2493,9 +2499,8 @@ msgstr "Mostrar janela"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/popups/popupmenu.cpp:2386 src/gui/popups/skillpopup.cpp:127
-#: src/gui/windows/ministatuswindow.cpp:363
-#: src/gui/windows/statuswindow.cpp:68 src/gui/windows/statuswindow.cpp:243
-#: src/gui/windows/statuswindow.cpp:367
+#: src/gui/windows/ministatuswindow.cpp:363 src/gui/windows/statuswindow.cpp:70
+#: src/gui/windows/statuswindow.cpp:268 src/gui/windows/statuswindow.cpp:392
 #, c-format
 msgid "Level: %d"
 msgstr "Nível: %d"
@@ -2914,8 +2919,8 @@ msgstr ""
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3100 src/gui/popups/popupmenu.cpp:3119
 #: src/gui/popups/popupmenu.cpp:3132 src/gui/windows/charselectdialog.cpp:76
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:452
-#: src/net/eathena/charserverrecv.cpp:488
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:419
+#: src/net/eathena/charserverrecv.cpp:455
 msgid "Info"
 msgstr "Informações"
 
@@ -3306,8 +3311,8 @@ msgstr "Level: %u"
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/statuswindow.cpp:70
-#: src/gui/windows/statuswindow.cpp:220 src/gui/windows/statuswindow.cpp:334
+#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/statuswindow.cpp:72
+#: src/gui/windows/statuswindow.cpp:222 src/gui/windows/statuswindow.cpp:359
 #, c-format
 msgid "Money: %s"
 msgstr "Dinheiro: %s"
@@ -3363,7 +3368,7 @@ msgstr "Sair"
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:194
 #: src/gui/windows/itemamountwindow.cpp:230 src/gui/windows/npcdialog.cpp:123
-#: src/gui/windows/statuswindow.cpp:746
+#: src/gui/windows/statuswindow.cpp:771
 msgid "+"
 msgstr "+"
 
@@ -3384,8 +3389,8 @@ msgstr "-"
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/selldialog.cpp:133 src/gui/windows/buydialog.cpp:299
-#: src/gui/windows/statuswindow.cpp:483 src/gui/windows/statuswindow.cpp:539
-#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:766
+#: src/gui/windows/statuswindow.cpp:508 src/gui/windows/statuswindow.cpp:564
+#: src/gui/windows/statuswindow.cpp:769 src/gui/windows/statuswindow.cpp:791
 msgid "Max"
 msgstr "Máximo"
 
@@ -3541,15 +3546,13 @@ msgstr "Compartilhamento de itens habilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104
-#: src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr "Compartilhamento de itens desabilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109
-#: src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr "Não é possível compartilhar itens."
 
@@ -3560,22 +3563,19 @@ msgstr "Compartilhamento de itens desconhecido."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150
-#: src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr "Compartilhamento de experiência habilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155
-#: src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr "Compartilhamento de experiência desabilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160
-#: src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr "Não é possível compartilhar experiência."
 
@@ -4009,15 +4009,15 @@ msgstr ""
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
+"Note: no other text inputs will be allowed to receive text input when you "
+"typing in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86
-#: src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr "Cores"
 
@@ -4041,9 +4041,11 @@ msgstr "Mostrar lista de cores do chat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat "
+"window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4070,9 +4072,11 @@ msgstr "Limite de caracteres na linha de chat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed "
+"in chat.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will be truncated."
+"Note: long lines can make client slower. Lines longer than this limit will "
+"be truncated."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4083,7 +4087,9 @@ msgstr "Limite de linhas máximas no chat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
+"specified number of last lines of text. Oldest lines exceeding this limit "
+"are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
 msgstr ""
@@ -4124,8 +4130,8 @@ msgstr "Mostrar mensagens antigas"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on"
-" startup instead of starting with empty chat tabs."
+"If this setting enabled, client will load old chat tabs content from logs on "
+"startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4136,9 +4142,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be "
+"shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4149,9 +4157,11 @@ msgstr "Mostrar mensagens online da Guilda"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be "
+"shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4167,9 +4177,13 @@ msgstr "Esconder mensagens de loja"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will "
+"be displayed in chat. Disable this setting if you want to see shop-related "
+"messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
+"Note: technically, ManaPlus shop implemented as usual private messages with "
+"special content. If you disable this setting, you will be able to see these "
+"messages and get idea when other players are looking at your shop."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4182,7 +4196,8 @@ msgstr "Ver mensagens MVP"
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
+"usually makes little difference."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4201,9 +4216,12 @@ msgstr "Deixar as mensagens privadas em abas"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in "
+"separate tabs, separate tab for each player. If this setting disabled, all "
+"whispers will appear in General tab.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
+"Note: putting all whispers to single General tab is known to be confusing. "
+"Think twice before disabling this feature."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4214,7 +4232,8 @@ msgstr "Salvar comandos de feitiços na aba do Depurador"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If "
+"disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
 msgstr ""
@@ -4227,9 +4246,11 @@ msgstr "Mostrar as mensagens do servidor na aba do Depurador"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of "
+"chat. If disabled, server messages will appear in General chat instead.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
+"Note: according to 4144, disabling this could also make you to lose some "
+"debug messages from client in Debug tab since these are fake server messages."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4254,9 +4275,11 @@ msgstr "Habilitar aba de gm"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM "
+"activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
+"Note: this setting only makes difference for GMs (Game Masters) since this "
+"tab only appears for GMs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4267,7 +4290,8 @@ msgstr "Habilitar aba de linguagem"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this feature.\n"
+"If this feature enabled, language tab will appear if server supports this "
+"feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
 msgstr ""
@@ -4280,7 +4304,9 @@ msgstr "Mostrar todas mensagens de linguagem"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
+"If this setting enabled and server supports different chats for different "
+"languages, you will see messages for all languages, regardless of your "
+"language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
 msgstr ""
@@ -4293,7 +4319,9 @@ msgstr "Habilitar aba de batalha"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will "
+"contain messages related to battles, like damage and experience gain, if "
+"battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
 msgstr ""
@@ -4319,7 +4347,10 @@ msgstr "Redimensionar as abas de chat caso precisar"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to "
+"adapt to appearance of chat input field when you typing message and when "
+"input field of chat disappears. If disabled, chat input area will always "
+"occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
@@ -4354,7 +4385,8 @@ msgstr "Palavras Destacadas (separadas por vírgulas)"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. "
+"Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
 msgstr ""
@@ -4367,7 +4399,8 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender "
+"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
 msgstr ""
@@ -4380,9 +4413,12 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This "
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by "
+"default."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4496,7 +4532,9 @@ msgstr "Conflitos de teclas detectado."
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr "Conflito com as teclas \"%s\" e \"%s\" . Resolva o conflito para não comprometer a jogabilidade."
+msgstr ""
+"Conflito com as teclas \"%s\" e \"%s\" . Resolva o conflito para não "
+"comprometer a jogabilidade."
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
@@ -5544,13 +5582,16 @@ msgstr "Nenhum"
 #: src/gui/widgets/tabs/setup_video.cpp:233
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr "Falha ao mudar para o modo janela e falha na restauração do modo anterior!"
+msgstr ""
+"Falha ao mudar para o modo janela e falha na restauração do modo anterior!"
 
 #. TRANSLATORS: video error message
 #: src/gui/widgets/tabs/setup_video.cpp:240
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr "Falha ao mudar para o modo tela cheia e falha na restauração do modo anterior!"
+msgstr ""
+"Falha ao mudar para o modo tela cheia e falha na restauração do modo "
+"anterior!"
 
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -5591,7 +5632,8 @@ msgstr "Resolução de tela alterada"
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:401
 msgid "Some windows may be moved to fit the lowered resolution."
-msgstr "Algumas janelas podem ser movidas para se adequar à resolução mais baixa."
+msgstr ""
+"Algumas janelas podem ser movidas para se adequar à resolução mais baixa."
 
 #. TRANSLATORS: speach type
 #: src/gui/widgets/tabs/setup_visual.cpp:43
@@ -6126,8 +6168,7 @@ msgstr "Quantidade:"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:618
-#: src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:618 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Criar"
 
@@ -6243,17 +6284,16 @@ msgstr "^"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:104
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:210
-#: src/gui/windows/charcreatedialog.cpp:221
-#: src/gui/windows/charcreatedialog.cpp:231
-#: src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:196
+#: src/gui/windows/charcreatedialog.cpp:209
+#: src/gui/windows/charcreatedialog.cpp:220
+#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:110
-#: src/gui/windows/charcreatedialog.cpp:600
+#: src/gui/windows/charcreatedialog.cpp:599
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Por favor distribua %d pontos"
@@ -6262,73 +6302,71 @@ msgstr "Por favor distribua %d pontos"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:201
-#: src/gui/windows/charcreatedialog.cpp:212
-#: src/gui/windows/charcreatedialog.cpp:223
-#: src/gui/windows/charcreatedialog.cpp:233
-#: src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:200
+#: src/gui/windows/charcreatedialog.cpp:211
+#: src/gui/windows/charcreatedialog.cpp:222
+#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:202
 msgid "Hair color:"
 msgstr "Cor do Cabelo:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:213
 msgid "Hair style:"
 msgstr "Estilo do Cabelo:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:224
 msgid "Race:"
 msgstr "Corrida:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:234
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:252
-#: src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr "A"
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:258
-#: src/gui/windows/charcreatedialog.cpp:265
-#: src/gui/windows/charcreatedialog.cpp:273
+#: src/gui/windows/charcreatedialog.cpp:257
+#: src/gui/windows/charcreatedialog.cpp:264
+#: src/gui/windows/charcreatedialog.cpp:272
 msgid "M"
 msgstr ""
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:260
-#: src/gui/windows/charcreatedialog.cpp:277
+#: src/gui/windows/charcreatedialog.cpp:259
+#: src/gui/windows/charcreatedialog.cpp:276
 #: src/gui/windows/inventorywindow.cpp:223
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:267
+#: src/gui/windows/charcreatedialog.cpp:266
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:474
+#: src/gui/windows/charcreatedialog.cpp:473
 msgid "Your name needs to be at least 4 characters."
 msgstr "Seu nome deve ter pelo menos 4 caracteres."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:590
+#: src/gui/windows/charcreatedialog.cpp:589
 msgid "Character stats OK"
 msgstr "Atributos do personagem OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:606
+#: src/gui/windows/charcreatedialog.cpp:605
 #, c-format
 msgid "Please remove %d points"
 msgstr "Por favor remova %d pontos"
@@ -6392,7 +6430,12 @@ msgid ""
 "Level: %u\n"
 "Experience: %u\n"
 "Money: %s"
-msgstr "Hp: %u/%u\nMp: %u/%u\nNível: %u\nExperiência: %u\nDinheiro: %s"
+msgstr ""
+"Hp: %u/%u\n"
+"Mp: %u/%u\n"
+"Nível: %u\n"
+"Experiência: %u\n"
+"Dinheiro: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/charselectdialog.cpp:308
@@ -6494,8 +6537,7 @@ msgstr "Editar Servidor"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57
-#: src/gui/windows/serverdialog.cpp:112
+#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:112
 msgid "Connect"
 msgstr "Conectar"
 
@@ -6853,15 +6895,13 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61
-#: src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr ""
@@ -6970,7 +7010,7 @@ msgstr "Barra de Job"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/windows/ministatuswindow.cpp:356
-#: src/gui/windows/statuswindow.cpp:236
+#: src/gui/windows/statuswindow.cpp:261
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Nível: %d (GM %d)"
@@ -7422,33 +7462,33 @@ msgid "Choose your party's name."
 msgstr "Escolha o nome do seu grupo."
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:72
+#: src/gui/windows/statuswindow.cpp:74
 msgid "HP:"
 msgstr "HP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:75
+#: src/gui/windows/statuswindow.cpp:77
 msgid "Exp:"
 msgstr "Exp:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:136
+#: src/gui/windows/statuswindow.cpp:138
 msgid "MP:"
 msgstr "MP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:173 src/gui/windows/statuswindow.cpp:294
+#: src/gui/windows/statuswindow.cpp:175 src/gui/windows/statuswindow.cpp:319
 #, c-format
 msgid "Job: %d"
 msgstr "Job: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:175
+#: src/gui/windows/statuswindow.cpp:177
 msgid "Job:"
 msgstr "Job:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:224 src/gui/windows/statuswindow.cpp:342
+#: src/gui/windows/statuswindow.cpp:226 src/gui/windows/statuswindow.cpp:367
 #, c-format
 msgid "Character points: %d"
 msgstr "Pontos do personagem: %d"
@@ -7566,9 +7606,9 @@ msgstr "Você não tem dinheiro suficiente."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
-msgstr "Falha ao adicionar item. Você não pode duplicar este tipo de item na janela."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+"Falha ao adicionar item. Você não pode duplicar este tipo de item na janela."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:539
@@ -8993,7 +9033,9 @@ msgstr "Rejeitado pelo servidor."
 #: src/net/ea/loginrecv.cpp:136 src/net/eathena/loginrecv.cpp:74
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
-msgstr "Você foi permanentemente banido(a) do jogo. Por favor entre em contato com algum GM."
+msgstr ""
+"Você foi permanentemente banido(a) do jogo. Por favor entre em contato com "
+"algum GM."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:141 src/net/eathena/loginrecv.cpp:79
@@ -9006,7 +9048,9 @@ msgstr ""
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
-msgstr "Você banido(a) do jogo até %s.\nPor favor entre em contato com algum GM através do fórum."
+msgstr ""
+"Você banido(a) do jogo até %s.\n"
+"Por favor entre em contato com algum GM através do fórum."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:151 src/net/eathena/loginrecv.cpp:92
@@ -9046,33 +9090,33 @@ msgstr "Conexão com o servidor interrompida. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:431
-#: src/net/eathena/charserverrecv.cpp:479
+#: src/net/eathena/charserverrecv.cpp:398
+#: src/net/eathena/charserverrecv.cpp:446
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:454
+#: src/net/eathena/charserverrecv.cpp:421
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:470
+#: src/net/eathena/charserverrecv.cpp:437
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:474
+#: src/net/eathena/charserverrecv.cpp:441
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:483
+#: src/net/eathena/charserverrecv.cpp:450
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:517 src/net/tmwa/charserverrecv.cpp:339
+#: src/net/eathena/charserverrecv.cpp:484 src/net/tmwa/charserverrecv.cpp:303
 msgid "Failed to delete character."
 msgstr "Falha ao deletar personagem."
 
@@ -9124,140 +9168,11 @@ msgstr ""
 msgid "Do you accept %s and %s as parents?"
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:130
-#, c-format
-msgid "Strength %s"
-msgstr "Força %s"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:132
-#, c-format
-msgid "Agility %s"
-msgstr "Agilidade %s"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:134
-#, c-format
-msgid "Vitality %s"
-msgstr "Vitalidade %s"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:136
-#, c-format
-msgid "Intelligence %s"
-msgstr "Inteligência %s"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:138
-#, c-format
-msgid "Dexterity %s"
-msgstr "Destreza %s"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:140
-#, c-format
-msgid "Luck %s"
-msgstr "Sorte %s"
-
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:197 src/net/tmwa/generalhandler.cpp:207
+#: src/net/eathena/generalhandler.cpp:179 src/net/tmwa/generalhandler.cpp:189
 msgid "Got disconnected from server!"
 msgstr "Você foi desconectado(a) do servidor!"
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:223 src/net/tmwa/generalhandler.cpp:234
-msgid "Strength"
-msgstr "Força"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:237
-msgid "Agility"
-msgstr "Agilidade"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:229 src/net/tmwa/generalhandler.cpp:240
-msgid "Vitality"
-msgstr "Vitalidade"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:243
-msgid "Intelligence"
-msgstr "Inteligência"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:246
-msgid "Dexterity"
-msgstr "Destreza"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:238 src/net/tmwa/generalhandler.cpp:249
-msgid "Luck"
-msgstr "Sorte"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:253
-msgid "Defense"
-msgstr "Defesa"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:255
-msgid "M.Attack"
-msgstr "Ataque M."
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:257
-msgid "M.Defense"
-msgstr "Def. Mágica"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:260
-#, no-c-format
-msgid "% Accuracy"
-msgstr "% Exatidão"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:263
-#, no-c-format
-msgid "% Evade"
-msgstr "% Evasão"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:266
-#, no-c-format
-msgid "% Critical"
-msgstr "% Críticos"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:268
-msgid "Attack Delay"
-msgstr "Atraso de ataque"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:270
-msgid "Walk Delay"
-msgstr "Atraso de movimento"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:272
-msgid "Attack Range"
-msgstr "Atraso de alcance"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:274
-msgid "Damage per sec."
-msgstr "Dano por seg."
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266
-msgid "Karma"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268
-msgid "Manner"
-msgstr ""
-
 #. TRANSLATORS: error message
 #: src/net/eathena/generalrecv.cpp:49 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
@@ -9413,7 +9328,7 @@ msgstr ""
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:199
+#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:190
 msgid "Unknown item"
 msgstr "Item desconhecido"
 
@@ -9689,21 +9604,52 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:93
-#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
-#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
+#: src/resources/db/itemdb.cpp:377 src/resources/db/itemdb.cpp:381
+#: src/resources/db/moddb.cpp:79 src/resources/db/monsterdb.cpp:101
+#: src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "sem nome"
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:104
+#: src/resources/db/petdb.cpp:103
 msgid "pet"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:103
+#: src/resources/db/skillunitdb.cpp:102
 msgid "skill"
 msgstr ""
 
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:45
+msgid "Strength"
+msgstr "Força"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:49
+msgid "Agility"
+msgstr "Agilidade"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:53
+msgid "Vitality"
+msgstr "Vitalidade"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:57
+msgid "Intelligence"
+msgstr "Inteligência"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:61
+msgid "Dexterity"
+msgstr "Destreza"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:65
+msgid "Luck"
+msgstr "Sorte"
+
 #. TRANSLATORS: inventory type name
 #: src/resources/inventory/inventory.cpp:340
 msgid "Npc"
@@ -9980,7 +9926,8 @@ msgstr ""
 #: src/resources/notifications.h:262
 #, c-format
 msgid "Trading with %s isn't possible. Trade partner is too far away."
-msgstr "Negociação com %s é impossível. O parceiro de negócios está muito longe."
+msgstr ""
+"Negociação com %s é impossível. O parceiro de negócios está muito longe."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:267
@@ -10355,8 +10302,9 @@ msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:556
-msgid "Room join failed. Not enought money."
-msgstr ""
+#, fuzzy
+msgid "Room join failed. Not enough money."
+msgstr "Você não tem dinheiro suficiente."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:560
@@ -10623,33 +10571,35 @@ msgstr ""
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:796
 #, c-format
-msgid "You and %s was divorced."
+msgid "You and %s are now divorced."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:800
-msgid "You was called by partner."
-msgstr ""
+#, fuzzy
+msgid "You were called by your partner."
+msgstr "Foste morto(a) por %s."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:804
 #, c-format
-msgid "You calling partner %s."
+msgid "You are calling your partner, %s."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:808
-msgid "Adoption child error. You already have baby."
+msgid "Child adoption failed. You already have a baby."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:812
-msgid "Adoption child error. You level too small for have baby."
+msgid "Child adoption failed. Your level is too low."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:816
-msgid "Adoption child error. This player already married and can't be baby."
+msgid ""
+"Child adoption failed. This player is already married and can't be a baby."
 msgstr ""
 
 #. TRANSLATORS: notification message
@@ -10659,19 +10609,20 @@ msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:825
-msgid "Error saving location. Not enought skill level."
+msgid "Error saving location. Not enough skill level."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:829
-msgid "Error saving location. You not have warp skill."
+msgid "Error saving location. You do not have warp skill."
 msgstr ""
 
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:29
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
+msgstr ""
+"Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
 
 #. TRANSLATORS: uptime command
 #: src/utils/stringutils.cpp:946
@@ -10727,3 +10678,51 @@ msgstr "%d segundos"
 #, c-format
 msgid "%d seconds"
 msgstr "%d segundos"
+
+#~ msgid "Strength %s"
+#~ msgstr "Força %s"
+
+#~ msgid "Agility %s"
+#~ msgstr "Agilidade %s"
+
+#~ msgid "Vitality %s"
+#~ msgstr "Vitalidade %s"
+
+#~ msgid "Intelligence %s"
+#~ msgstr "Inteligência %s"
+
+#~ msgid "Dexterity %s"
+#~ msgstr "Destreza %s"
+
+#~ msgid "Luck %s"
+#~ msgstr "Sorte %s"
+
+#~ msgid "Defense"
+#~ msgstr "Defesa"
+
+#~ msgid "M.Attack"
+#~ msgstr "Ataque M."
+
+#~ msgid "M.Defense"
+#~ msgstr "Def. Mágica"
+
+#~ msgid "% Accuracy"
+#~ msgstr "% Exatidão"
+
+#~ msgid "% Evade"
+#~ msgstr "% Evasão"
+
+#~ msgid "% Critical"
+#~ msgstr "% Críticos"
+
+#~ msgid "Attack Delay"
+#~ msgstr "Atraso de ataque"
+
+#~ msgid "Walk Delay"
+#~ msgstr "Atraso de movimento"
+
+#~ msgid "Attack Range"
+#~ msgstr "Atraso de alcance"
+
+#~ msgid "Damage per sec."
+#~ msgstr "Dano por seg."
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 27484457e..c4b70446a 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # alastrim <alasmirt@gmail.com>, 2013
 # alastrim <alasmirt@gmail.com>, 2011-2012
@@ -25,14 +25,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-06-18 18:53+0300\n"
+"POT-Creation-Date: 2016-07-02 19:47+0300\n"
 "PO-Revision-Date: 2016-06-19 09:21+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/akaras/manaplus/language/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/akaras/manaplus/"
+"language/pt_BR/)\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. TRANSLATORS: file uploaded message
@@ -49,7 +50,7 @@ msgstr "Arquivo enviado"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:171 src/client.cpp:1569 src/client.cpp:1604
+#: src/actions/actions.cpp:171 src/client.cpp:1572 src/client.cpp:1607
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
@@ -60,7 +61,7 @@ msgstr "Arquivo enviado"
 #: src/gui/widgets/tabs/setup_video.cpp:420
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:476
+#: src/gui/windows/charcreatedialog.cpp:475
 #: src/gui/windows/charselectdialog.cpp:262
 #: src/gui/windows/charselectdialog.cpp:310 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:59
@@ -69,9 +70,9 @@ msgstr "Arquivo enviado"
 #: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:531
 #: src/gui/windows/textdialog.cpp:53 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:456
-#: src/net/eathena/charserverrecv.cpp:491
-#: src/net/eathena/charserverrecv.cpp:519 src/net/tmwa/charserverrecv.cpp:341
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:423
+#: src/net/eathena/charserverrecv.cpp:458
+#: src/net/eathena/charserverrecv.cpp:486 src/net/tmwa/charserverrecv.cpp:305
 msgid "OK"
 msgstr "OK"
 
@@ -121,7 +122,9 @@ msgstr "Registro enviado em:"
 #: src/actions/actions.cpp:1748
 msgid ""
 "Last seen disabled. Enable in players / collect players id and seen log."
-msgstr "Visto pela última vez desativado. Ativar em jogadores / recolher id de jogadores e log visto."
+msgstr ""
+"Visto pela última vez desativado. Ativar em jogadores / recolher id de "
+"jogadores e log visto."
 
 #. TRANSLATORS: last seen error
 #: src/actions/actions.cpp:1767 src/actions/actions.cpp:1781
@@ -143,7 +146,9 @@ msgstr ""
 #: src/actions/chat.cpp:315
 #, c-format
 msgid "Cannot create a whisper tab \"%s\"! It probably already exists."
-msgstr "Não foi possível criar uma aba de mensagem privada \"%s\"! Provavelmente ela já existe."
+msgstr ""
+"Não foi possível criar uma aba de mensagem privada \"%s\"! Provavelmente ela "
+"já existe."
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
@@ -318,26 +323,26 @@ msgid "Visible on map"
 msgstr "Mapa visivel"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:496
+#: src/being/being.cpp:494
 msgid "Human"
 msgstr "Humano"
 
 #. TRANSLATORS: dodge or miss message in attacks
-#: src/being/being.cpp:683
+#: src/being/being.cpp:676
 msgid "dodge"
 msgstr "desviou"
 
-#: src/being/being.cpp:683
+#: src/being/being.cpp:676
 msgid "miss"
 msgstr "errou"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2282 src/gui/windows/whoisonline.cpp:882
+#: src/being/being.cpp:2275 src/gui/windows/whoisonline.cpp:882
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2287 src/gui/windows/whoisonline.cpp:887
+#: src/being/being.cpp:2280 src/gui/windows/whoisonline.cpp:887
 msgid "I"
 msgstr "I"
 
@@ -488,41 +493,41 @@ msgstr "Bolha Flutuante"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:870 src/dyetool/client.cpp:491 src/gui/windowmenu.cpp:189
+#: src/client.cpp:872 src/dyetool/client.cpp:491 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:66
 msgid "Setup"
 msgstr "Configurar"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:873 src/dyetool/client.cpp:494
+#: src/client.cpp:875 src/dyetool/client.cpp:494
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Desempenho"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:876 src/dyetool/client.cpp:497
+#: src/client.cpp:878 src/dyetool/client.cpp:497
 #: src/gui/widgets/tabs/setup_video.cpp:110
 msgid "Video"
 msgstr "Vídeo"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:879 src/dyetool/client.cpp:500
+#: src/client.cpp:881 src/dyetool/client.cpp:500
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:882 src/dyetool/client.cpp:503
+#: src/client.cpp:884 src/dyetool/client.cpp:503
 msgid "About"
 msgstr "Sobre"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:885 src/dyetool/client.cpp:506 src/gui/windowmenu.cpp:74
+#: src/client.cpp:887 src/dyetool/client.cpp:506 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Ajuda"
@@ -543,7 +548,7 @@ msgstr "Ajuda"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:889 src/client.cpp:1483 src/client.cpp:1502
+#: src/client.cpp:891 src/client.cpp:1486 src/client.cpp:1505
 #: src/dyetool/client.cpp:510 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:756 src/gui/popups/popupmenu.cpp:833
 #: src/gui/popups/popupmenu.cpp:1087 src/gui/windows/didyouknowwindow.cpp:81
@@ -556,32 +561,32 @@ msgid "Close"
 msgstr "Fechar"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1115 src/gui/windowmanager_unittest.cc:156
+#: src/client.cpp:1117 src/gui/windowmanager_unittest.cc:156
 msgid "Connecting to server"
 msgstr "Conectando-se ao servidor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1172 src/gui/windowmanager_unittest.cc:173
+#: src/client.cpp:1174 src/gui/windowmanager_unittest.cc:173
 msgid "Logging in"
 msgstr "Fazendo login"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1221
+#: src/client.cpp:1223
 msgid "Entering game world"
 msgstr "Entrando no mundo do jogo"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1369
+#: src/client.cpp:1372
 msgid "Requesting characters"
 msgstr "Requerindo personagens"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1412
+#: src/client.cpp:1415
 msgid "Connecting to the game server"
 msgstr "Conectando ao servidor do jogo"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1424
+#: src/client.cpp:1427
 msgid "Changing game servers"
 msgstr "Mudando de servidor do jogo"
 
@@ -598,52 +603,52 @@ msgstr "Mudando de servidor do jogo"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1480 src/client.cpp:1499 src/client.cpp:1738
+#: src/client.cpp:1483 src/client.cpp:1502 src/client.cpp:1741
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:472
+#: src/gui/windows/charcreatedialog.cpp:471
 #: src/gui/windows/charselectdialog.cpp:306
 #: src/gui/windows/editserverdialog.cpp:212
 #: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:429
-#: src/net/eathena/charserverrecv.cpp:433
-#: src/net/eathena/charserverrecv.cpp:515 src/net/tmwa/charserverrecv.cpp:337
+#: src/net/eathena/charserverrecv.cpp:396
+#: src/net/eathena/charserverrecv.cpp:400
+#: src/net/eathena/charserverrecv.cpp:482 src/net/tmwa/charserverrecv.cpp:301
 msgid "Error"
 msgstr "Erro"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1518
+#: src/client.cpp:1521
 msgid "Requesting registration details"
 msgstr "Requisitando detalhes do registro"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1565
+#: src/client.cpp:1568
 msgid "Password Change"
 msgstr "Mudar senha"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1567
+#: src/client.cpp:1570
 msgid "Password changed successfully!"
 msgstr "Senha modificada com sucesso!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1600
+#: src/client.cpp:1603
 msgid "Email Change"
 msgstr "Mudar email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1602
+#: src/client.cpp:1605
 msgid "Email changed successfully!"
 msgstr "Email modificado com sucesso!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1638
+#: src/client.cpp:1641
 msgid "Unregister Successful"
 msgstr "Registro cancelado com sucesso"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1640
+#: src/client.cpp:1643
 msgid "Farewell, come back any time..."
 msgstr "Adeus, volte sempre..."
 
@@ -735,7 +740,9 @@ msgstr "  -H --update-host    : Usar este host de update"
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:89
 msgid "  -D --default        : Choose default character server and character"
-msgstr "  -D --default        : Escolhe um personagem e um servidor de personagem padrão"
+msgstr ""
+"  -D --default        : Escolhe um personagem e um servidor de personagem "
+"padrão"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:93
@@ -745,12 +752,14 @@ msgstr "  -u --skip-update    : Não faz downloads de atualização"
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:96
 msgid "  -d --data           : Directory to load game data from"
-msgstr "  -d --data           : Pasta de onde os dados do jogo vão ser carregados"
+msgstr ""
+"  -d --data           : Pasta de onde os dados do jogo vão ser carregados"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:99
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr "  -L --localdata-dir  : Diretório a ser usado como pasta de dados local"
+msgstr ""
+"  -L --localdata-dir  : Diretório a ser usado como pasta de dados local"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:103
@@ -836,23 +845,23 @@ msgid "Debug"
 msgstr "Depurador"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:598
+#: src/game.cpp:600
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Captura de Tela salva em %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:608
+#: src/game.cpp:610
 msgid "Saving screenshot failed!"
 msgstr "Falha ao salvar screenshot!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:695
+#: src/game.cpp:697
 msgid "The connection to the server was lost."
 msgstr "A conexão com o servidor caiu."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:698
+#: src/game.cpp:700
 msgid "Network Error"
 msgstr "Erro de conexão"
 
@@ -1267,14 +1276,17 @@ msgstr "Reviver"
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
-msgstr "Você está carregando mais que a metade de seu peso. Você não poderá mais recuperar HP."
+"You are carrying more than half your weight. You are unable to regain health."
+msgstr ""
+"Você está carregando mais que a metade de seu peso. Você não poderá mais "
+"recuperar HP."
 
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:198
 msgid "You are carrying less than half your weight. You can regain health."
-msgstr "Você está carregando menos ou metade de seu peso. Você pode recuperar-se novamente."
+msgstr ""
+"Você está carregando menos ou metade de seu peso. Você pode recuperar-se "
+"novamente."
 
 #. TRANSLATORS: chat color
 #. TRANSLATORS: inventory sort mode
@@ -1285,8 +1297,7 @@ msgstr "Você está carregando menos ou metade de seu peso. Você pode recuperar
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:671
-#: src/gui/windows/serverdialog.cpp:603
+#: src/gui/windows/equipmentwindow.cpp:671 src/gui/windows/serverdialog.cpp:603
 msgid "default"
 msgstr "padrão"
 
@@ -1838,11 +1849,9 @@ msgstr "Negociação"
 #. TRANSLATORS: attack player
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
-#. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:180 src/gui/popups/popupmenu.cpp:304
 #: src/gui/popups/popupmenu.cpp:912 src/gui/widgets/skillinfo.cpp:125
-#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
-#: src/net/tmwa/generalhandler.cpp:251
+#: src/input/pages/basic.cpp:40
 msgid "Attack"
 msgstr "Ataque"
 
@@ -1918,7 +1927,7 @@ msgstr "Mover"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:270 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:152
+#: src/resources/db/npcdb.cpp:151
 msgid "Talk"
 msgstr "Falar"
 
@@ -1936,7 +1945,7 @@ msgstr "Falar"
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:154
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:153
 msgid "Buy"
 msgstr "Comprar"
 
@@ -1954,7 +1963,7 @@ msgstr "Comprar"
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
 #: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:256
-#: src/resources/db/npcdb.cpp:156
+#: src/resources/db/npcdb.cpp:155
 msgid "Sell"
 msgstr "Vender"
 
@@ -2056,7 +2065,7 @@ msgstr "Desequipar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:408 src/resources/db/petdb.cpp:160
+#: src/gui/popups/popupmenu.cpp:408 src/resources/db/petdb.cpp:159
 msgid "Return to egg"
 msgstr "Retornar ao ovo"
 
@@ -2453,7 +2462,7 @@ msgstr "Zerar barra amarela"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2125 src/gui/windows/statuswindow.cpp:90
 msgid "Copy to chat"
 msgstr "Copiar para chat"
 
@@ -2505,9 +2514,8 @@ msgstr "Mostrar Janela"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/popups/popupmenu.cpp:2386 src/gui/popups/skillpopup.cpp:127
-#: src/gui/windows/ministatuswindow.cpp:363
-#: src/gui/windows/statuswindow.cpp:68 src/gui/windows/statuswindow.cpp:243
-#: src/gui/windows/statuswindow.cpp:367
+#: src/gui/windows/ministatuswindow.cpp:363 src/gui/windows/statuswindow.cpp:70
+#: src/gui/windows/statuswindow.cpp:268 src/gui/windows/statuswindow.cpp:392
 #, c-format
 msgid "Level: %d"
 msgstr "Nível: %d"
@@ -2926,8 +2934,8 @@ msgstr ""
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3100 src/gui/popups/popupmenu.cpp:3119
 #: src/gui/popups/popupmenu.cpp:3132 src/gui/windows/charselectdialog.cpp:76
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:452
-#: src/net/eathena/charserverrecv.cpp:488
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:419
+#: src/net/eathena/charserverrecv.cpp:455
 msgid "Info"
 msgstr "Informações"
 
@@ -3318,8 +3326,8 @@ msgstr "Nível: %u"
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/statuswindow.cpp:70
-#: src/gui/windows/statuswindow.cpp:220 src/gui/windows/statuswindow.cpp:334
+#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/statuswindow.cpp:72
+#: src/gui/windows/statuswindow.cpp:222 src/gui/windows/statuswindow.cpp:359
 #, c-format
 msgid "Money: %s"
 msgstr "Dinheiro: %s"
@@ -3375,7 +3383,7 @@ msgstr "Sair"
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:194
 #: src/gui/windows/itemamountwindow.cpp:230 src/gui/windows/npcdialog.cpp:123
-#: src/gui/windows/statuswindow.cpp:746
+#: src/gui/windows/statuswindow.cpp:771
 msgid "+"
 msgstr "+"
 
@@ -3396,8 +3404,8 @@ msgstr "-"
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/selldialog.cpp:133 src/gui/windows/buydialog.cpp:299
-#: src/gui/windows/statuswindow.cpp:483 src/gui/windows/statuswindow.cpp:539
-#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:766
+#: src/gui/windows/statuswindow.cpp:508 src/gui/windows/statuswindow.cpp:564
+#: src/gui/windows/statuswindow.cpp:769 src/gui/windows/statuswindow.cpp:791
 msgid "Max"
 msgstr "Máximo"
 
@@ -3553,15 +3561,13 @@ msgstr "Compartilhamento de itens habilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104
-#: src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr "Compartilhamento de itens desabilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109
-#: src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr "Não é possível compartilhar itens."
 
@@ -3572,22 +3578,19 @@ msgstr "Compartilhamento de itens desconhecido."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150
-#: src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr "Compartilhamento de experiência habilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155
-#: src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr "Compartilhamento de experiência desabilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160
-#: src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr "Não é possível compartilhar experiência."
 
@@ -4009,7 +4012,10 @@ msgid ""
 "Chat window will be automatically hidden when not in use.\n"
 "\n"
 "Hit Enter or hover mouse to show chat again."
-msgstr "O bate-papo será automaticamente fechado quando não estiver em uso.\n\nPressione enter ou passe o cursor para exibir o bate-papo novamente."
+msgstr ""
+"O bate-papo será automaticamente fechado quando não estiver em uso.\n"
+"\n"
+"Pressione enter ou passe o cursor para exibir o bate-papo novamente."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:58
@@ -4021,15 +4027,19 @@ msgstr "Proteger foco do chat"
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
-msgstr "Permite a proteção agressiva de foco de entrada na janela de bate-papo.\n\nNota: não há outras entradas de texto serão autorizados a receber a entrada de texto quando você digitar na janela de bate-papo."
+"Note: no other text inputs will be allowed to receive text input when you "
+"typing in chat window."
+msgstr ""
+"Permite a proteção agressiva de foco de entrada na janela de bate-papo.\n"
+"\n"
+"Nota: não há outras entradas de texto serão autorizados a receber a entrada "
+"de texto quando você digitar na janela de bate-papo."
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86
-#: src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr "Cores"
 
@@ -4043,7 +4053,10 @@ msgstr "Remover mensagens coloridas do chat"
 msgid ""
 "Enable this setting to strip colors from incoming chat messages. All "
 "messages will use default chat text color if this enabled."
-msgstr "Ative esta configuração para tirar as cores de mensagens de bate-papo recebidas. Todas as mensagens de bate-papo irão usar a cor padrão caso seja habilitado."
+msgstr ""
+"Ative esta configuração para tirar as cores de mensagens de bate-papo "
+"recebidas. Todas as mensagens de bate-papo irão usar a cor padrão caso seja "
+"habilitado."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:77
@@ -4053,10 +4066,17 @@ msgstr "Mostrar lista de cores do chat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat "
+"window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
-msgstr "Ative esta configuração para mostrar a seleção de cor drop-down na janela de bate-papo. A janela de chat irá exibir a seleção de cor drop-down.\n\nIsto permite selecionar a cor padrão de mensagens de bate-papo de saída facilmente, mas também ocupa algum espaço na janela de bate-papo."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
+msgstr ""
+"Ative esta configuração para mostrar a seleção de cor drop-down na janela de "
+"bate-papo. A janela de chat irá exibir a seleção de cor drop-down.\n"
+"\n"
+"Isto permite selecionar a cor padrão de mensagens de bate-papo de saída "
+"facilmente, mas também ocupa algum espaço na janela de bate-papo."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:90
@@ -4067,7 +4087,9 @@ msgstr "Permitir feitiços e comandos de GM em todas abas"
 #: src/gui/widgets/tabs/setup_chat.cpp:92
 msgid ""
 "Enable this setting to be able to type spells and GM commands in any tab."
-msgstr "Habilite essa configuração para ser capaz de escrever magias e comandos da GM em qualquer guia."
+msgstr ""
+"Habilite essa configuração para ser capaz de escrever magias e comandos da "
+"GM em qualquer guia."
 
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_chat.cpp:98
@@ -4082,10 +4104,16 @@ msgstr "Limite de caracteres na linha de chat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed "
+"in chat.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will be truncated."
-msgstr "Limite quantos caracteres serão exibidos em linhas de texto no bate-papo.\n\nNota: linhas longas podem deixar o cliente mais lento. Linhas mais longas do que esse limite serão cortadas."
+"Note: long lines can make client slower. Lines longer than this limit will "
+"be truncated."
+msgstr ""
+"Limite quantos caracteres serão exibidos em linhas de texto no bate-papo.\n"
+"\n"
+"Nota: linhas longas podem deixar o cliente mais lento. Linhas mais longas do "
+"que esse limite serão cortadas."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:110
@@ -4095,10 +4123,17 @@ msgstr "Limite de linhas máximas no chat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
+"specified number of last lines of text. Oldest lines exceeding this limit "
+"are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
-msgstr "Limita o número de linhas de bate-papo que ficam no rolamento da aba de bate-papo. Mantém o número especificado de últimas linhas do texto. Linhas mais antigas que excedem esse limite são descartadas.\n\nNota: mantendo muitas linhas na rolagem podem deixar o cliente lento."
+msgstr ""
+"Limita o número de linhas de bate-papo que ficam no rolamento da aba de bate-"
+"papo. Mantém o número especificado de últimas linhas do texto. Linhas mais "
+"antigas que excedem esse limite são descartadas.\n"
+"\n"
+"Nota: mantendo muitas linhas na rolagem podem deixar o cliente lento."
 
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_chat.cpp:120
@@ -4116,7 +4151,11 @@ msgid ""
 "If you enable this setting, chat logs will be written to disk.\n"
 "\n"
 "Note: chat logs can take noticeable amount of disk space over time."
-msgstr "Caso habilite esta configuração, os registros de bate-papo serão gravados no disco.\n\nNota: Com o passar do tempo isto pode consumir muito espaço do disco."
+msgstr ""
+"Caso habilite esta configuração, os registros de bate-papo serão gravados no "
+"disco.\n"
+"\n"
+"Nota: Com o passar do tempo isto pode consumir muito espaço do disco."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:131
@@ -4136,9 +4175,12 @@ msgstr "Mostrar mensagens antigas"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on"
-" startup instead of starting with empty chat tabs."
-msgstr "Caso esta configuração esteja ativada, o cliente irá carregar conteúdo de abas de bate-papo a partir de registros em vez de começar com abas de bate-papo vazias."
+"If this setting enabled, client will load old chat tabs content from logs on "
+"startup instead of starting with empty chat tabs."
+msgstr ""
+"Caso esta configuração esteja ativada, o cliente irá carregar conteúdo de "
+"abas de bate-papo a partir de registros em vez de começar com abas de bate-"
+"papo vazias."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:144
@@ -4148,10 +4190,17 @@ msgstr "Mostrar mensagens de membros do grupo online"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be "
+"shown in party tab of chat.\n"
+"\n"
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
+msgstr ""
+"Caso esta configuração seja habilitada, sempre que um membro do seu grupo "
+"entrar ou sair do jogo uma mensagem será exibida na aba de grupo .\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
-msgstr "Caso esta configuração seja habilitada, sempre que um membro do seu grupo entrar ou sair do jogo uma mensagem será exibida na aba de grupo .\n\nIsso adiciona alguma interferência na conversa, mas permite ver quando seus amigos estão online."
+"Isso adiciona alguma interferência na conversa, mas permite ver quando seus "
+"amigos estão online."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:152
@@ -4161,10 +4210,17 @@ msgstr "Mostrar mensagens de guildas online"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be "
+"shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
-msgstr "Caso esta configuração seja habilitada, sempre que um membro da sua guilda entrar ou sair do jogo uma mensagem será exibida na aba de guilda .\n\nIsso adiciona alguma interferência na conversa, mas permite ver quando seus amigos estão online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
+msgstr ""
+"Caso esta configuração seja habilitada, sempre que um membro da sua guilda "
+"entrar ou sair do jogo uma mensagem será exibida na aba de guilda .\n"
+"\n"
+"Isso adiciona alguma interferência na conversa, mas permite ver quando seus "
+"amigos estão online."
 
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_chat.cpp:161
@@ -4179,10 +4235,21 @@ msgstr "Esconder mensagens de loja"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will "
+"be displayed in chat. Disable this setting if you want to see shop-related "
+"messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
-msgstr "Se essa configuração for ativada, não serão exibidas mensagens relacionadas a loja pessoal do ManaPlus será exibido no chat. Desabilite esta configuração caso queira ver as mensagens relacionadas a loja.\nNota: tecnicamente, a loja do ManaPlus foi implementado como mensagens privadas habituais com conteúdo especial. Se você desabilitar essa configuração, você será capaz de ver essas mensagens e obter uma ideia de quando os jogadores estão  olhando sua loja."
+"Note: technically, ManaPlus shop implemented as usual private messages with "
+"special content. If you disable this setting, you will be able to see these "
+"messages and get idea when other players are looking at your shop."
+msgstr ""
+"Se essa configuração for ativada, não serão exibidas mensagens relacionadas "
+"a loja pessoal do ManaPlus será exibido no chat. Desabilite esta "
+"configuração caso queira ver as mensagens relacionadas a loja.\n"
+"Nota: tecnicamente, a loja do ManaPlus foi implementado como mensagens "
+"privadas habituais com conteúdo especial. Se você desabilitar essa "
+"configuração, você será capaz de ver essas mensagens e obter uma ideia de "
+"quando os jogadores estão  olhando sua loja."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:175
@@ -4194,8 +4261,13 @@ msgstr "Ver Mensagens MVP"
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
-msgstr "Habilite essa configuração para ver as mensagens de MVP server..\n\nNota: As mensagens MVP não são usados no TMW / Evol / etc servidores, por isso este recurso geralmente faz pouca diferença."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
+"usually makes little difference."
+msgstr ""
+"Habilite essa configuração para ver as mensagens de MVP server..\n"
+"\n"
+"Nota: As mensagens MVP não são usados no TMW / Evol / etc servidores, por "
+"isso este recurso geralmente faz pouca diferença."
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: input action group
@@ -4213,10 +4285,20 @@ msgstr "Deixar as mensagens privadas em abas"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in "
+"separate tabs, separate tab for each player. If this setting disabled, all "
+"whispers will appear in General tab.\n"
+"\n"
+"Note: putting all whispers to single General tab is known to be confusing. "
+"Think twice before disabling this feature."
+msgstr ""
+"Caso esta configuração esteja ativa, todos os whispers (mensagens privadas) "
+"serão colocados em abas separadas, uma aba para cada jogador. Se essa "
+"configuração for desativada, todos os whispers aparecerão na aba geral "
+"Geral.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
-msgstr "Caso esta configuração esteja ativa, todos os whispers (mensagens privadas) serão colocados em abas separadas, uma aba para cada jogador. Se essa configuração for desativada, todos os whispers aparecerão na aba geral Geral.\n\nNota: Pense duas vezes antes de desabilitar esse recurso. Receber todos os whispers na aba geral pode ser bastante confuso."
+"Nota: Pense duas vezes antes de desabilitar esse recurso. Receber todos os "
+"whispers na aba geral pode ser bastante confuso."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:197
@@ -4226,10 +4308,16 @@ msgstr "Salvar comandos de feitiços na aba do Depurador"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If "
+"disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
-msgstr "Se essa configuração for habilitada, a conjuração de feitiço será exibido na aba Debug. Se desativado, eles serão exibidos na aba Geral.\n\nNota: Isto não afeta no feitiço, apenas muda a aba que ele é exibido quando conjurado.."
+msgstr ""
+"Se essa configuração for habilitada, a conjuração de feitiço será exibido na "
+"aba Debug. Se desativado, eles serão exibidos na aba Geral.\n"
+"\n"
+"Nota: Isto não afeta no feitiço, apenas muda a aba que ele é exibido quando "
+"conjurado.."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:205
@@ -4239,10 +4327,19 @@ msgstr "Mostrar as mensagens do servidor na aba do Depurador"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of "
+"chat. If disabled, server messages will appear in General chat instead.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
-msgstr "Se essa configuração for habilitada, as mensagens do servidor serão exibidas na aba de depuração do bate-papo. Se desativada, as mensagens do servidor irão aparecer na aba geral do bate-papo.\n\nNota: de acordo com o 4144, a desativação disto também poderia fazer com que você perca algumas mensagens de depuração do cliente uma vez que estas são as mensagens do servidor falso."
+"Note: according to 4144, disabling this could also make you to lose some "
+"debug messages from client in Debug tab since these are fake server messages."
+msgstr ""
+"Se essa configuração for habilitada, as mensagens do servidor serão exibidas "
+"na aba de depuração do bate-papo. Se desativada, as mensagens do servidor "
+"irão aparecer na aba geral do bate-papo.\n"
+"\n"
+"Nota: de acordo com o 4144, a desativação disto também poderia fazer com que "
+"você perca algumas mensagens de depuração do cliente uma vez que estas são "
+"as mensagens do servidor falso."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:215
@@ -4256,7 +4353,12 @@ msgid ""
 "words typical for trades will go to Trade tab. This will make General tab "
 "less noisy. If this setting is disabled, all trade related players messages "
 "will stay in General tab."
-msgstr "Permite a aba de comércio. A aba de comércio é basicamente um filtro. Mensagens contendo palavras típicas de comércio vão automaticamente para a aba de comércio. Isso fará com que a aba geral fique menos poluída. Se essa configuração for desativada, todas as mensagens relacionadas com o comércio irão ser exibidas na aba geral."
+msgstr ""
+"Permite a aba de comércio. A aba de comércio é basicamente um filtro. "
+"Mensagens contendo palavras típicas de comércio vão automaticamente para a "
+"aba de comércio. Isso fará com que a aba geral fique menos poluída. Se essa "
+"configuração for desativada, todas as mensagens relacionadas com o comércio "
+"irão ser exibidas na aba geral."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:224
@@ -4266,10 +4368,17 @@ msgstr "Habilitar aba de gm"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM "
+"activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
-msgstr "Se ativado, a aba GM irá aparecer no chat. Ela exibe o texto relacionado a GMs.\n\nNota: essa configuração só faz diferença para GMs (Game Masters) já que esta aba só aparece para GMs."
+"Note: this setting only makes difference for GMs (Game Masters) since this "
+"tab only appears for GMs."
+msgstr ""
+"Se ativado, a aba GM irá aparecer no chat. Ela exibe o texto relacionado a "
+"GMs.\n"
+"\n"
+"Nota: essa configuração só faz diferença para GMs (Game Masters) já que esta "
+"aba só aparece para GMs."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:232
@@ -4279,10 +4388,15 @@ msgstr "Habilitar aba de idiomas"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this feature.\n"
+"If this feature enabled, language tab will appear if server supports this "
+"feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
-msgstr "Se esse recurso for ativado, a aba idioma ira aparecer se o servidor tiver suporte para idiomas.\n\nNota: apenas o servidor Evol tem suporte para isto ate o momento."
+msgstr ""
+"Se esse recurso for ativado, a aba idioma ira aparecer se o servidor tiver "
+"suporte para idiomas.\n"
+"\n"
+"Nota: apenas o servidor Evol tem suporte para isto ate o momento."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:240
@@ -4292,10 +4406,18 @@ msgstr "Mostrar mensagens de todos idiomas"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
+"If this setting enabled and server supports different chats for different "
+"languages, you will see messages for all languages, regardless of your "
+"language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
-msgstr "0Se essa configuração ativada e o  servidor tiver suporte para diferentes idiomas, você verá mensagens para todos os idiomas, independentemente do idioma preferencial.\n\nNota: isto só funciona em servidores que suportam múltiplos abas de idiomas, como o Evol."
+msgstr ""
+"0Se essa configuração ativada e o  servidor tiver suporte para diferentes "
+"idiomas, você verá mensagens para todos os idiomas, independentemente do "
+"idioma preferencial.\n"
+"\n"
+"Nota: isto só funciona em servidores que suportam múltiplos abas de idiomas, "
+"como o Evol."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:250
@@ -4305,10 +4427,17 @@ msgstr "Habilitar aba de batalha"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will "
+"contain messages related to battles, like damage and experience gain, if "
+"battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
-msgstr "Se essa configuração for ativada, a aba Batalha aparecerá no chat. Esta aba irá conter mensagens relacionadas a batalhas, como ganho de danos e experiência, se as mensagens de batalha  forem ativadas.\n\nNota: É necessário reiniciar o cliente para as alterações terem efeito."
+msgstr ""
+"Se essa configuração for ativada, a aba Batalha aparecerá no chat. Esta aba "
+"irá conter mensagens relacionadas a batalhas, como ganho de danos e "
+"experiência, se as mensagens de batalha  forem ativadas.\n"
+"\n"
+"Nota: É necessário reiniciar o cliente para as alterações terem efeito."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:259
@@ -4321,7 +4450,10 @@ msgid ""
 "If this setting enabled, messages related to battle like damage or "
 "experience gain will be displayed in Debug or Battle tab. If disabled, no "
 "battle messages will be displayed."
-msgstr "Se essa configuração for ativada, mensagens relacionadas a batalha como danos ou ganho de experiência será exibido na aba de depuração ou Batalha. Se desativado, nenhuma mensagem de batalha será exibida."
+msgstr ""
+"Se essa configuração for ativada, mensagens relacionadas a batalha como "
+"danos ou ganho de experiência será exibido na aba de depuração ou Batalha. "
+"Se desativado, nenhuma mensagem de batalha será exibida."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:267
@@ -4331,7 +4463,10 @@ msgstr "Redimensionar aba de chat caso precisar"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to "
+"adapt to appearance of chat input field when you typing message and when "
+"input field of chat disappears. If disabled, chat input area will always "
+"occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
@@ -4356,7 +4491,10 @@ msgstr "Usar tempo local"
 msgid ""
 "If this feature enabled, timestamps in chat will use local times. If "
 "disabled, server time will be used (often it is GMT+0)."
-msgstr "Se esse recurso for ativado, o bate-papo irá utilizar o hora local quando for exibir a hora que a mensagem foi recebida ou enviada. Se desativado, o tempo do servidor será usado (normalmente é o GMT+0)."
+msgstr ""
+"Se esse recurso for ativado, o bate-papo irá utilizar o hora local quando "
+"for exibir a hora que a mensagem foi recebida ou enviada. Se desativado, o "
+"tempo do servidor será usado (normalmente é o GMT+0)."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:297
@@ -4366,10 +4504,15 @@ msgstr "Palavras destacadas (separadas em vírgulas)"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. "
+"Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
-msgstr "Aqui você pode especificar algumas palavras extras que também serão exibidas com destaque. Use vírgula para separar uma palavra de outra.\n\nNota: Isto pode ser irritante - use este recurso com sabedoria."
+msgstr ""
+"Aqui você pode especificar algumas palavras extras que também serão exibidas "
+"com destaque. Use vírgula para separar uma palavra de outra.\n"
+"\n"
+"Nota: Isto pode ser irritante - use este recurso com sabedoria."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:305
@@ -4379,10 +4522,17 @@ msgstr "Nomes globais à ignorar (separados por virgula)"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender "
+"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
-msgstr "Esta configuração permite ignorar algumas mensagens globais se determinado remetente (NPC, GM) é muito irritante. O anuncio será movido para a aba de depuração instantaneamente.\n\nNota: o uso descuidado deste recurso pode fazer com que você perca anúncios importantes!"
+msgstr ""
+"Esta configuração permite ignorar algumas mensagens globais se determinado "
+"remetente (NPC, GM) é muito irritante. O anuncio será movido para a aba de "
+"depuração instantaneamente.\n"
+"\n"
+"Nota: o uso descuidado deste recurso pode fazer com que você perca anúncios "
+"importantes!"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:314
@@ -4392,10 +4542,19 @@ msgstr "Mostrar botão de emoticon no chat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This "
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
+"\n"
+"Note: same window can also be invoked by hotkey when typing, usually F1 by "
+"default."
+msgstr ""
+"Se essa configuração for ativada, o botão aparecerá perto do campo de "
+"entrada de texto. Este botão permite abrir a janela de edição, o que permite "
+"a inclusão de sorrisos e formatação de texto facilmente.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
-msgstr "Se essa configuração for ativada, o botão aparecerá perto do campo de entrada de texto. Este botão permite abrir a janela de edição, o que permite a inclusão de sorrisos e formatação de texto facilmente.\n\nNota: mesma janela também pode ser aberta pelo atalho durante a digitação, normalmente F1 por padrão."
+"Nota: mesma janela também pode ser aberta pelo atalho durante a digitação, "
+"normalmente F1 por padrão."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:324
@@ -4407,7 +4566,10 @@ msgstr "Mostrar mensagem do dia ao começar"
 msgid ""
 "If this setting enabled, client will display server MOTD (message of the "
 "day) once you connect to server. Disable it to hide MOTD."
-msgstr "Se essa configuração for ativada, o cliente irá exibir MOTD  do servidor (mensagem do dia) uma vez que você se conectar ao servidor. Desative-a para esconder não ter a MOTD exibida."
+msgstr ""
+"Se essa configuração for ativada, o cliente irá exibir MOTD  do servidor "
+"(mensagem do dia) uma vez que você se conectar ao servidor. Desative-a para "
+"esconder não ter a MOTD exibida."
 
 #. TRANSLATORS: color selection preview message
 #: src/gui/widgets/tabs/setup_colors.cpp:50
@@ -4508,7 +4670,9 @@ msgstr "Conflitos de teclas detectado."
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr "Conflito com as teclas \"%s\" e \"%s\" . Resolva o conflito para não comprometer a jogabilidade."
+msgstr ""
+"Conflito com as teclas \"%s\" e \"%s\" . Resolva o conflito para não "
+"comprometer a jogabilidade."
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
@@ -5056,7 +5220,8 @@ msgstr "Aceleração por HW"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:74
 msgid "Enable opacity cache (Software, can use much memory)"
-msgstr "Habilitar cache de transparência (Software, pode se usar muita memória)"
+msgstr ""
+"Habilitar cache de transparência (Software, pode se usar muita memória)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:79
@@ -5141,7 +5306,8 @@ msgstr "Ativar atlas de textura (OpenGL)"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:150
 msgid "Cache all sprites per map (can use additional memory)"
-msgstr "Guardar todos os sprites do mapa em cache (pode usar memória adicional)"
+msgstr ""
+"Guardar todos os sprites do mapa em cache (pode usar memória adicional)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:155
@@ -5277,7 +5443,9 @@ msgstr "Tira uma foto da tela a cada negociação completa."
 #: src/gui/widgets/tabs/setup_players.cpp:143
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
-msgstr "Simular clique com o botão direito por clique prolongado com o botão esquerdo (útil para interfaces de toque)"
+msgstr ""
+"Simular clique com o botão direito por clique prolongado com o botão "
+"esquerdo (útil para interfaces de toque)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:148
@@ -5556,13 +5724,16 @@ msgstr "Nenhum"
 #: src/gui/widgets/tabs/setup_video.cpp:233
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr "Falha ao mudar para o modo janela e falha na restauração do modo anterior!"
+msgstr ""
+"Falha ao mudar para o modo janela e falha na restauração do modo anterior!"
 
 #. TRANSLATORS: video error message
 #: src/gui/widgets/tabs/setup_video.cpp:240
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr "Falha ao mudar para o modo tela cheia e falha na restauração do modo anterior!"
+msgstr ""
+"Falha ao mudar para o modo tela cheia e falha na restauração do modo "
+"anterior!"
 
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -5603,7 +5774,8 @@ msgstr "Resolução de tela alterada"
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:401
 msgid "Some windows may be moved to fit the lowered resolution."
-msgstr "Algumas janelas podem ser movidas para se adequar à resolução mais baixa."
+msgstr ""
+"Algumas janelas podem ser movidas para se adequar à resolução mais baixa."
 
 #. TRANSLATORS: speach type
 #: src/gui/widgets/tabs/setup_visual.cpp:43
@@ -6138,8 +6310,7 @@ msgstr "Quantidade:"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:618
-#: src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:618 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Criar"
 
@@ -6255,17 +6426,16 @@ msgstr "^"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:104
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:210
-#: src/gui/windows/charcreatedialog.cpp:221
-#: src/gui/windows/charcreatedialog.cpp:231
-#: src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:196
+#: src/gui/windows/charcreatedialog.cpp:209
+#: src/gui/windows/charcreatedialog.cpp:220
+#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:110
-#: src/gui/windows/charcreatedialog.cpp:600
+#: src/gui/windows/charcreatedialog.cpp:599
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Por favor distribua %d pontos"
@@ -6274,73 +6444,71 @@ msgstr "Por favor distribua %d pontos"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:201
-#: src/gui/windows/charcreatedialog.cpp:212
-#: src/gui/windows/charcreatedialog.cpp:223
-#: src/gui/windows/charcreatedialog.cpp:233
-#: src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:200
+#: src/gui/windows/charcreatedialog.cpp:211
+#: src/gui/windows/charcreatedialog.cpp:222
+#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:202
 msgid "Hair color:"
 msgstr "Cor do Cabelo:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:213
 msgid "Hair style:"
 msgstr "Estilo do Cabelo:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:224
 msgid "Race:"
 msgstr "Corrida:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:234
 msgid "Look:"
 msgstr "Aparência:"
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:252
-#: src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr "A"
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:258
-#: src/gui/windows/charcreatedialog.cpp:265
-#: src/gui/windows/charcreatedialog.cpp:273
+#: src/gui/windows/charcreatedialog.cpp:257
+#: src/gui/windows/charcreatedialog.cpp:264
+#: src/gui/windows/charcreatedialog.cpp:272
 msgid "M"
 msgstr "M"
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:260
-#: src/gui/windows/charcreatedialog.cpp:277
+#: src/gui/windows/charcreatedialog.cpp:259
+#: src/gui/windows/charcreatedialog.cpp:276
 #: src/gui/windows/inventorywindow.cpp:223
 msgid "O"
 msgstr "O"
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:267
+#: src/gui/windows/charcreatedialog.cpp:266
 msgid "U"
 msgstr "U"
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:474
+#: src/gui/windows/charcreatedialog.cpp:473
 msgid "Your name needs to be at least 4 characters."
 msgstr "Seu nome deve ter pelo menos 4 caracteres."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:590
+#: src/gui/windows/charcreatedialog.cpp:589
 msgid "Character stats OK"
 msgstr "Atributos do personagem OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:606
+#: src/gui/windows/charcreatedialog.cpp:605
 #, c-format
 msgid "Please remove %d points"
 msgstr "Por favor remova %d pontos"
@@ -6404,7 +6572,12 @@ msgid ""
 "Level: %u\n"
 "Experience: %u\n"
 "Money: %s"
-msgstr "Hp: %u/%u\nMp: %u/%u\nNível: %u\nExperiência: %u\nDinheiro: %s"
+msgstr ""
+"Hp: %u/%u\n"
+"Mp: %u/%u\n"
+"Nível: %u\n"
+"Experiência: %u\n"
+"Dinheiro: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/charselectdialog.cpp:308
@@ -6506,8 +6679,7 @@ msgstr "Editar Servidor"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57
-#: src/gui/windows/serverdialog.cpp:112
+#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:112
 msgid "Connect"
 msgstr "Conectar"
 
@@ -6865,15 +7037,13 @@ msgstr "Assunto:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61
-#: src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr "Dinheiro:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr "Item:"
@@ -6982,7 +7152,7 @@ msgstr "Barra de Job"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/windows/ministatuswindow.cpp:356
-#: src/gui/windows/statuswindow.cpp:236
+#: src/gui/windows/statuswindow.cpp:261
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Nível: %d (GM %d)"
@@ -7434,33 +7604,33 @@ msgid "Choose your party's name."
 msgstr "Escolha o nome do seu grupo."
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:72
+#: src/gui/windows/statuswindow.cpp:74
 msgid "HP:"
 msgstr "HP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:75
+#: src/gui/windows/statuswindow.cpp:77
 msgid "Exp:"
 msgstr "Exp:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:136
+#: src/gui/windows/statuswindow.cpp:138
 msgid "MP:"
 msgstr "MP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:173 src/gui/windows/statuswindow.cpp:294
+#: src/gui/windows/statuswindow.cpp:175 src/gui/windows/statuswindow.cpp:319
 #, c-format
 msgid "Job: %d"
 msgstr "Job: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:175
+#: src/gui/windows/statuswindow.cpp:177
 msgid "Job:"
 msgstr "Job:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:224 src/gui/windows/statuswindow.cpp:342
+#: src/gui/windows/statuswindow.cpp:226 src/gui/windows/statuswindow.cpp:367
 #, c-format
 msgid "Character points: %d"
 msgstr "Pontos do personagem: %d"
@@ -7578,9 +7748,9 @@ msgstr "Você não tem dinheiro suficiente."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
-msgstr "Falha ao adicionar item. Você não pode duplicar este tipo de item na janela."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+"Falha ao adicionar item. Você não pode duplicar este tipo de item na janela."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:539
@@ -8915,7 +9085,8 @@ msgstr "Mensagem privada não pode ser enviada, ignorado por %s."
 #. TRANSLATORS: chat message
 #: src/net/ea/chatrecv.cpp:114
 msgid "Whisper could not be sent, you ignored by all players."
-msgstr "Mensagem privada não pode ser enviada, ignorado por todos os jogadores."
+msgstr ""
+"Mensagem privada não pode ser enviada, ignorado por todos os jogadores."
 
 #. TRANSLATORS: error header
 #: src/net/ea/gamerecv.cpp:67
@@ -9005,7 +9176,9 @@ msgstr "Rejeitado pelo servidor."
 #: src/net/ea/loginrecv.cpp:136 src/net/eathena/loginrecv.cpp:74
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
-msgstr "Você foi permanentemente banido(a) do jogo. Por favor entre em contato com algum GM."
+msgstr ""
+"Você foi permanentemente banido(a) do jogo. Por favor entre em contato com "
+"algum GM."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:141 src/net/eathena/loginrecv.cpp:79
@@ -9018,7 +9191,9 @@ msgstr "Cliente muito antigo ou tipo errado de servidor."
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
-msgstr "Você banido do jogo até %s.\nPor favor entre em contato com algum GM através do fórum."
+msgstr ""
+"Você banido do jogo até %s.\n"
+"Por favor entre em contato com algum GM através do fórum."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:151 src/net/eathena/loginrecv.cpp:92
@@ -9058,33 +9233,33 @@ msgstr "Conexão com o servidor interrompida. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:431
-#: src/net/eathena/charserverrecv.cpp:479
+#: src/net/eathena/charserverrecv.cpp:398
+#: src/net/eathena/charserverrecv.cpp:446
 msgid "Character rename error."
 msgstr "Erro ao renomear personagem."
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:454
+#: src/net/eathena/charserverrecv.cpp:421
 msgid "Character renamed."
 msgstr "Personagem renomeado."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:470
+#: src/net/eathena/charserverrecv.cpp:437
 msgid "Rename not allowed."
 msgstr "Não é permitido renomear."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:474
+#: src/net/eathena/charserverrecv.cpp:441
 msgid "New name is not set."
 msgstr "Novo nome não definido."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:483
+#: src/net/eathena/charserverrecv.cpp:450
 msgid "Character not found."
 msgstr "Personagem não encontrado."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:517 src/net/tmwa/charserverrecv.cpp:339
+#: src/net/eathena/charserverrecv.cpp:484 src/net/tmwa/charserverrecv.cpp:303
 msgid "Failed to delete character."
 msgstr "Falha ao deletar personagem."
 
@@ -9136,140 +9311,11 @@ msgstr ""
 msgid "Do you accept %s and %s as parents?"
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:130
-#, c-format
-msgid "Strength %s"
-msgstr "Força %s"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:132
-#, c-format
-msgid "Agility %s"
-msgstr "Agilidade %s"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:134
-#, c-format
-msgid "Vitality %s"
-msgstr "Vitalidade %s"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:136
-#, c-format
-msgid "Intelligence %s"
-msgstr "Inteligência %s"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:138
-#, c-format
-msgid "Dexterity %s"
-msgstr "Destreza %s"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:140
-#, c-format
-msgid "Luck %s"
-msgstr "Sorte %s"
-
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:197 src/net/tmwa/generalhandler.cpp:207
+#: src/net/eathena/generalhandler.cpp:179 src/net/tmwa/generalhandler.cpp:189
 msgid "Got disconnected from server!"
 msgstr "Você foi desconectado(a) do servidor!"
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:223 src/net/tmwa/generalhandler.cpp:234
-msgid "Strength"
-msgstr "Força"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:237
-msgid "Agility"
-msgstr "Agilidade"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:229 src/net/tmwa/generalhandler.cpp:240
-msgid "Vitality"
-msgstr "Vitalidade"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:243
-msgid "Intelligence"
-msgstr "Inteligência"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:246
-msgid "Dexterity"
-msgstr "Destreza"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:238 src/net/tmwa/generalhandler.cpp:249
-msgid "Luck"
-msgstr "Sorte"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:253
-msgid "Defense"
-msgstr "Defesa"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:255
-msgid "M.Attack"
-msgstr "Ataque M."
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:257
-msgid "M.Defense"
-msgstr "Defesa M."
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:260
-#, no-c-format
-msgid "% Accuracy"
-msgstr "% Precisão"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:263
-#, no-c-format
-msgid "% Evade"
-msgstr "% Evasão"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:266
-#, no-c-format
-msgid "% Critical"
-msgstr "% Críticos"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:268
-msgid "Attack Delay"
-msgstr "Atraso de ataque"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:270
-msgid "Walk Delay"
-msgstr "Atraso de movimento"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:272
-msgid "Attack Range"
-msgstr "Distância de ataque"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:274
-msgid "Damage per sec."
-msgstr "Dano por seg."
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266
-msgid "Karma"
-msgstr "Carma"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268
-msgid "Manner"
-msgstr "Etiqueta"
-
 #. TRANSLATORS: error message
 #: src/net/eathena/generalrecv.cpp:49 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
@@ -9425,7 +9471,7 @@ msgstr "Faltam %s tempo de aluguel pelo item %s."
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:199
+#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:190
 msgid "Unknown item"
 msgstr "Item desconhecido"
 
@@ -9701,21 +9747,52 @@ msgstr "OpenGL Moderno"
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:93
-#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
-#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
+#: src/resources/db/itemdb.cpp:377 src/resources/db/itemdb.cpp:381
+#: src/resources/db/moddb.cpp:79 src/resources/db/monsterdb.cpp:101
+#: src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "sem nome"
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:104
+#: src/resources/db/petdb.cpp:103
 msgid "pet"
 msgstr "animal de estimação"
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:103
+#: src/resources/db/skillunitdb.cpp:102
 msgid "skill"
 msgstr "Habilidade"
 
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:45
+msgid "Strength"
+msgstr "Força"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:49
+msgid "Agility"
+msgstr "Agilidade"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:53
+msgid "Vitality"
+msgstr "Vitalidade"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:57
+msgid "Intelligence"
+msgstr "Inteligência"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:61
+msgid "Dexterity"
+msgstr "Destreza"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:65
+msgid "Luck"
+msgstr "Sorte"
+
 #. TRANSLATORS: inventory type name
 #: src/resources/inventory/inventory.cpp:340
 msgid "Npc"
@@ -9992,7 +10069,8 @@ msgstr "Equipe a munição primeiro."
 #: src/resources/notifications.h:262
 #, c-format
 msgid "Trading with %s isn't possible. Trade partner is too far away."
-msgstr "Negociação com %s não é possível. O parceiro de negócios está muito longe."
+msgstr ""
+"Negociação com %s não é possível. O parceiro de negócios está muito longe."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:267
@@ -10198,14 +10276,18 @@ msgstr "Carta inserida."
 msgid ""
 "Deposit failed. You probably don't have this amount of money with you right "
 "now."
-msgstr "Depósito falhou. Você provavelmente não tem esta quantia de dinheiro com você no momento."
+msgstr ""
+"Depósito falhou. Você provavelmente não tem esta quantia de dinheiro com "
+"você no momento."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:427
 msgid ""
 "Withdraw failed. You probably don't have this amount of money in the bank "
 "right now."
-msgstr "Saque falhou. Você provavelmente não tem esta quantia de dinheiro no banco neste momento."
+msgstr ""
+"Saque falhou. Você provavelmente não tem esta quantia de dinheiro no banco "
+"neste momento."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:432
@@ -10247,7 +10329,9 @@ msgstr "A negociação falhou."
 msgid ""
 "The trade failed, because the entered amount of item is higher, than the "
 "buyer is willing to buy."
-msgstr "A negociação falhou, porque a quantidade de itens digitada é maior do que o comprador pretende adquirir."
+msgstr ""
+"A negociação falhou, porque a quantidade de itens digitada é maior do que o "
+"comprador pretende adquirir."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:465
@@ -10367,7 +10451,8 @@ msgstr "Sua entrada na sala falhou. Você foi dispensado."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:556
-msgid "Room join failed. Not enought money."
+#, fuzzy
+msgid "Room join failed. Not enough money."
 msgstr "Sua entrada na sala falhou. Dinheiro insuficiente."
 
 #. TRANSLATORS: notification message
@@ -10634,35 +10719,41 @@ msgstr "Jogador %s desconhecido removido."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:796
-#, c-format
-msgid "You and %s was divorced."
+#, fuzzy, c-format
+msgid "You and %s are now divorced."
 msgstr "Você e %s se divorciaram."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:800
-msgid "You was called by partner."
+#, fuzzy
+msgid "You were called by your partner."
 msgstr "Você foi chamado pelo seu cônjuge."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:804
-#, c-format
-msgid "You calling partner %s."
+#, fuzzy, c-format
+msgid "You are calling your partner, %s."
 msgstr "Você esta chamando seu cônjuge %s."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:808
-msgid "Adoption child error. You already have baby."
+#, fuzzy
+msgid "Child adoption failed. You already have a baby."
 msgstr "Erro na adoção da criança. Você já tem um bebê."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:812
-msgid "Adoption child error. You level too small for have baby."
-msgstr "Erro na adoção da criança. Seu level é muito baixo para ter um bebê."
+msgid "Child adoption failed. Your level is too low."
+msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:816
-msgid "Adoption child error. This player already married and can't be baby."
-msgstr "Erro na adoção da criança. Esse jogador já esta casado e não pode ter um bebê."
+#, fuzzy
+msgid ""
+"Child adoption failed. This player is already married and can't be a baby."
+msgstr ""
+"Erro na adoção da criança. Esse jogador já esta casado e não pode ter um "
+"bebê."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:821
@@ -10671,19 +10762,22 @@ msgstr "Localização salva para uso com a habilidade warp."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:825
-msgid "Error saving location. Not enought skill level."
+#, fuzzy
+msgid "Error saving location. Not enough skill level."
 msgstr "Erro ao salvar localização. Nível de habilidade insuficiente."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:829
-msgid "Error saving location. You not have warp skill."
+#, fuzzy
+msgid "Error saving location. You do not have warp skill."
 msgstr "Erro ao salvar localização. Você não possui a habilidade warp."
 
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:29
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
+msgstr ""
+"Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
 
 #. TRANSLATORS: uptime command
 #: src/utils/stringutils.cpp:946
@@ -10739,3 +10833,61 @@ msgstr "%d segundos"
 #, c-format
 msgid "%d seconds"
 msgstr "%d Segundos"
+
+#~ msgid "Strength %s"
+#~ msgstr "Força %s"
+
+#~ msgid "Agility %s"
+#~ msgstr "Agilidade %s"
+
+#~ msgid "Vitality %s"
+#~ msgstr "Vitalidade %s"
+
+#~ msgid "Intelligence %s"
+#~ msgstr "Inteligência %s"
+
+#~ msgid "Dexterity %s"
+#~ msgstr "Destreza %s"
+
+#~ msgid "Luck %s"
+#~ msgstr "Sorte %s"
+
+#~ msgid "Defense"
+#~ msgstr "Defesa"
+
+#~ msgid "M.Attack"
+#~ msgstr "Ataque M."
+
+#~ msgid "M.Defense"
+#~ msgstr "Defesa M."
+
+#~ msgid "% Accuracy"
+#~ msgstr "% Precisão"
+
+#~ msgid "% Evade"
+#~ msgstr "% Evasão"
+
+#~ msgid "% Critical"
+#~ msgstr "% Críticos"
+
+#~ msgid "Attack Delay"
+#~ msgstr "Atraso de ataque"
+
+#~ msgid "Walk Delay"
+#~ msgstr "Atraso de movimento"
+
+#~ msgid "Attack Range"
+#~ msgstr "Distância de ataque"
+
+#~ msgid "Damage per sec."
+#~ msgstr "Dano por seg."
+
+#~ msgid "Karma"
+#~ msgstr "Carma"
+
+#~ msgid "Manner"
+#~ msgstr "Etiqueta"
+
+#~ msgid "Adoption child error. You level too small for have baby."
+#~ msgstr ""
+#~ "Erro na adoção da criança. Seu level é muito baixo para ter um bebê."
diff --git a/po/ru.po b/po/ru.po
index 9436f8e79..257b7c0b9 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Alexandr Uspensky <AlexandrUSP@yandex.com>, 2015
 # Alexsl <alexlsh@mail.ru>, 2013-2015
@@ -21,15 +21,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-06-18 18:53+0300\n"
+"POT-Creation-Date: 2016-07-02 19:47+0300\n"
 "PO-Revision-Date: 2016-06-24 23:18+0000\n"
 "Last-Translator: Victor <ratrex@mail.ru>\n"
-"Language-Team: Russian (http://www.transifex.com/akaras/manaplus/language/ru/)\n"
+"Language-Team: Russian (http://www.transifex.com/akaras/manaplus/language/"
+"ru/)\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n"
+"%100>=11 && n%100<=14)? 2 : 3);\n"
 
 #. TRANSLATORS: file uploaded message
 #: src/actions/actions.cpp:168
@@ -45,7 +48,7 @@ msgstr "Файл выгружен"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:171 src/client.cpp:1569 src/client.cpp:1604
+#: src/actions/actions.cpp:171 src/client.cpp:1572 src/client.cpp:1607
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
@@ -56,7 +59,7 @@ msgstr "Файл выгружен"
 #: src/gui/widgets/tabs/setup_video.cpp:420
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:476
+#: src/gui/windows/charcreatedialog.cpp:475
 #: src/gui/windows/charselectdialog.cpp:262
 #: src/gui/windows/charselectdialog.cpp:310 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:59
@@ -65,9 +68,9 @@ msgstr "Файл выгружен"
 #: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:531
 #: src/gui/windows/textdialog.cpp:53 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:456
-#: src/net/eathena/charserverrecv.cpp:491
-#: src/net/eathena/charserverrecv.cpp:519 src/net/tmwa/charserverrecv.cpp:341
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:423
+#: src/net/eathena/charserverrecv.cpp:458
+#: src/net/eathena/charserverrecv.cpp:486 src/net/tmwa/charserverrecv.cpp:305
 msgid "OK"
 msgstr "ОК"
 
@@ -117,7 +120,9 @@ msgstr "Информация о выгруженном логе:"
 #: src/actions/actions.cpp:1748
 msgid ""
 "Last seen disabled. Enable in players / collect players id and seen log."
-msgstr "Сбор информации о пользователя отключен. Включите его в игроки / собирать ид игроков и лог встреч."
+msgstr ""
+"Сбор информации о пользователя отключен. Включите его в игроки / собирать ид "
+"игроков и лог встреч."
 
 #. TRANSLATORS: last seen error
 #: src/actions/actions.cpp:1767 src/actions/actions.cpp:1781
@@ -314,26 +319,26 @@ msgid "Visible on map"
 msgstr "Видимые на карте"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:496
+#: src/being/being.cpp:494
 msgid "Human"
 msgstr "Человек"
 
 #. TRANSLATORS: dodge or miss message in attacks
-#: src/being/being.cpp:683
+#: src/being/being.cpp:676
 msgid "dodge"
 msgstr "уклонение"
 
-#: src/being/being.cpp:683
+#: src/being/being.cpp:676
 msgid "miss"
 msgstr "промах"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2282 src/gui/windows/whoisonline.cpp:882
+#: src/being/being.cpp:2275 src/gui/windows/whoisonline.cpp:882
 msgid "A"
 msgstr "О"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2287 src/gui/windows/whoisonline.cpp:887
+#: src/being/being.cpp:2280 src/gui/windows/whoisonline.cpp:887
 msgid "I"
 msgstr "Б"
 
@@ -486,41 +491,41 @@ msgstr "Плавающий пузырек"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:870 src/dyetool/client.cpp:491 src/gui/windowmenu.cpp:189
+#: src/client.cpp:872 src/dyetool/client.cpp:491 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:66
 msgid "Setup"
 msgstr "Настройка"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:873 src/dyetool/client.cpp:494
+#: src/client.cpp:875 src/dyetool/client.cpp:494
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Производительность"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:876 src/dyetool/client.cpp:497
+#: src/client.cpp:878 src/dyetool/client.cpp:497
 #: src/gui/widgets/tabs/setup_video.cpp:110
 msgid "Video"
 msgstr "Видео"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:879 src/dyetool/client.cpp:500
+#: src/client.cpp:881 src/dyetool/client.cpp:500
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Тема"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:882 src/dyetool/client.cpp:503
+#: src/client.cpp:884 src/dyetool/client.cpp:503
 msgid "About"
 msgstr "О Программе"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:885 src/dyetool/client.cpp:506 src/gui/windowmenu.cpp:74
+#: src/client.cpp:887 src/dyetool/client.cpp:506 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Помощь"
@@ -541,7 +546,7 @@ msgstr "Помощь"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:889 src/client.cpp:1483 src/client.cpp:1502
+#: src/client.cpp:891 src/client.cpp:1486 src/client.cpp:1505
 #: src/dyetool/client.cpp:510 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:756 src/gui/popups/popupmenu.cpp:833
 #: src/gui/popups/popupmenu.cpp:1087 src/gui/windows/didyouknowwindow.cpp:81
@@ -554,32 +559,32 @@ msgid "Close"
 msgstr "Закрыть"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1115 src/gui/windowmanager_unittest.cc:156
+#: src/client.cpp:1117 src/gui/windowmanager_unittest.cc:156
 msgid "Connecting to server"
 msgstr "Идет подключение к серверу..."
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1172 src/gui/windowmanager_unittest.cc:173
+#: src/client.cpp:1174 src/gui/windowmanager_unittest.cc:173
 msgid "Logging in"
 msgstr "Авторизация"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1221
+#: src/client.cpp:1223
 msgid "Entering game world"
 msgstr "Входим в игровой мир"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1369
+#: src/client.cpp:1372
 msgid "Requesting characters"
 msgstr "Получение списка персонажей"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1412
+#: src/client.cpp:1415
 msgid "Connecting to the game server"
 msgstr "Подключение к игровому серверу"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1424
+#: src/client.cpp:1427
 msgid "Changing game servers"
 msgstr "Смена игрового сервера"
 
@@ -596,52 +601,52 @@ msgstr "Смена игрового сервера"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1480 src/client.cpp:1499 src/client.cpp:1738
+#: src/client.cpp:1483 src/client.cpp:1502 src/client.cpp:1741
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:472
+#: src/gui/windows/charcreatedialog.cpp:471
 #: src/gui/windows/charselectdialog.cpp:306
 #: src/gui/windows/editserverdialog.cpp:212
 #: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:429
-#: src/net/eathena/charserverrecv.cpp:433
-#: src/net/eathena/charserverrecv.cpp:515 src/net/tmwa/charserverrecv.cpp:337
+#: src/net/eathena/charserverrecv.cpp:396
+#: src/net/eathena/charserverrecv.cpp:400
+#: src/net/eathena/charserverrecv.cpp:482 src/net/tmwa/charserverrecv.cpp:301
 msgid "Error"
 msgstr "Ошибка"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1518
+#: src/client.cpp:1521
 msgid "Requesting registration details"
 msgstr "Запрос регистрационных данных"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1565
+#: src/client.cpp:1568
 msgid "Password Change"
 msgstr "Изменить Пароль"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1567
+#: src/client.cpp:1570
 msgid "Password changed successfully!"
 msgstr "Пароль изменен!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1600
+#: src/client.cpp:1603
 msgid "Email Change"
 msgstr "Сменить Email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1602
+#: src/client.cpp:1605
 msgid "Email changed successfully!"
 msgstr "Email изменен!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1638
+#: src/client.cpp:1641
 msgid "Unregister Successful"
 msgstr "Регистрация удалена"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1640
+#: src/client.cpp:1643
 msgid "Farewell, come back any time..."
 msgstr "Хорошо, возвращайтесь в любое время..."
 
@@ -733,7 +738,8 @@ msgstr "  -H --update-host    : Использовать этот узел об�
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:89
 msgid "  -D --default        : Choose default character server and character"
-msgstr "  -D --default        : Выбрать персонаж и сервер персонажей по умолчанию"
+msgstr ""
+"  -D --default        : Выбрать персонаж и сервер персонажей по умолчанию"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:93
@@ -768,7 +774,8 @@ msgstr "     --renderer       : Устанавливает тип рендера
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:112
 msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr "  -T --tests          : Запускает проверку драйверов и автоконфигурацию"
+msgstr ""
+"  -T --tests          : Запускает проверку драйверов и автоконфигурацию"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:118
@@ -834,23 +841,23 @@ msgid "Debug"
 msgstr "Отладка"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:598
+#: src/game.cpp:600
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Снимок экрана сохранен как %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:608
+#: src/game.cpp:610
 msgid "Saving screenshot failed!"
 msgstr "Ошибка при сохранении снимка экрана!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:695
+#: src/game.cpp:697
 msgid "The connection to the server was lost."
 msgstr "Соединение с сервером потеряно."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:698
+#: src/game.cpp:700
 msgid "Network Error"
 msgstr "Ошибка сети"
 
@@ -1265,14 +1272,17 @@ msgstr "Оживить"
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
-msgstr "Вы несете груз больший, чем половина вашей грузоподъемности. Здоровье восстанавливаться не будет."
+"You are carrying more than half your weight. You are unable to regain health."
+msgstr ""
+"Вы несете груз больший, чем половина вашей грузоподъемности. Здоровье "
+"восстанавливаться не будет."
 
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:198
 msgid "You are carrying less than half your weight. You can regain health."
-msgstr "Вес предметов составляет менее половины допустимого. Теперь Вы можете восстанавливаться."
+msgstr ""
+"Вес предметов составляет менее половины допустимого. Теперь Вы можете "
+"восстанавливаться."
 
 #. TRANSLATORS: chat color
 #. TRANSLATORS: inventory sort mode
@@ -1283,8 +1293,7 @@ msgstr "Вес предметов составляет менее половин
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:671
-#: src/gui/windows/serverdialog.cpp:603
+#: src/gui/windows/equipmentwindow.cpp:671 src/gui/windows/serverdialog.cpp:603
 msgid "default"
 msgstr "По умолчанию"
 
@@ -1836,11 +1845,9 @@ msgstr "Торговать"
 #. TRANSLATORS: attack player
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
-#. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:180 src/gui/popups/popupmenu.cpp:304
 #: src/gui/popups/popupmenu.cpp:912 src/gui/widgets/skillinfo.cpp:125
-#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
-#: src/net/tmwa/generalhandler.cpp:251
+#: src/input/pages/basic.cpp:40
 msgid "Attack"
 msgstr "Атака"
 
@@ -1916,7 +1923,7 @@ msgstr "Движение"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:270 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:152
+#: src/resources/db/npcdb.cpp:151
 msgid "Talk"
 msgstr "Разговор"
 
@@ -1934,7 +1941,7 @@ msgstr "Разговор"
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:154
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:153
 msgid "Buy"
 msgstr "Купить"
 
@@ -1952,7 +1959,7 @@ msgstr "Купить"
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
 #: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:256
-#: src/resources/db/npcdb.cpp:156
+#: src/resources/db/npcdb.cpp:155
 msgid "Sell"
 msgstr "Продать"
 
@@ -2054,7 +2061,7 @@ msgstr "Снять"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:408 src/resources/db/petdb.cpp:160
+#: src/gui/popups/popupmenu.cpp:408 src/resources/db/petdb.cpp:159
 msgid "Return to egg"
 msgstr "Вернут в яйцо"
 
@@ -2451,7 +2458,7 @@ msgstr "сбросить настройки"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2125 src/gui/windows/statuswindow.cpp:90
 msgid "Copy to chat"
 msgstr "Скопировать в чат"
 
@@ -2503,9 +2510,8 @@ msgstr "Показать окно"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/popups/popupmenu.cpp:2386 src/gui/popups/skillpopup.cpp:127
-#: src/gui/windows/ministatuswindow.cpp:363
-#: src/gui/windows/statuswindow.cpp:68 src/gui/windows/statuswindow.cpp:243
-#: src/gui/windows/statuswindow.cpp:367
+#: src/gui/windows/ministatuswindow.cpp:363 src/gui/windows/statuswindow.cpp:70
+#: src/gui/windows/statuswindow.cpp:268 src/gui/windows/statuswindow.cpp:392
 #, c-format
 msgid "Level: %d"
 msgstr "Уровень: %d"
@@ -2924,8 +2930,8 @@ msgstr "Создать подчиненного"
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3100 src/gui/popups/popupmenu.cpp:3119
 #: src/gui/popups/popupmenu.cpp:3132 src/gui/windows/charselectdialog.cpp:76
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:452
-#: src/net/eathena/charserverrecv.cpp:488
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:419
+#: src/net/eathena/charserverrecv.cpp:455
 msgid "Info"
 msgstr "Сведения"
 
@@ -3316,8 +3322,8 @@ msgstr "Уровень: %u"
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/statuswindow.cpp:70
-#: src/gui/windows/statuswindow.cpp:220 src/gui/windows/statuswindow.cpp:334
+#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/statuswindow.cpp:72
+#: src/gui/windows/statuswindow.cpp:222 src/gui/windows/statuswindow.cpp:359
 #, c-format
 msgid "Money: %s"
 msgstr "Деньги: %s"
@@ -3373,7 +3379,7 @@ msgstr "Выход"
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:194
 #: src/gui/windows/itemamountwindow.cpp:230 src/gui/windows/npcdialog.cpp:123
-#: src/gui/windows/statuswindow.cpp:746
+#: src/gui/windows/statuswindow.cpp:771
 msgid "+"
 msgstr "+"
 
@@ -3394,8 +3400,8 @@ msgstr "-"
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/selldialog.cpp:133 src/gui/windows/buydialog.cpp:299
-#: src/gui/windows/statuswindow.cpp:483 src/gui/windows/statuswindow.cpp:539
-#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:766
+#: src/gui/windows/statuswindow.cpp:508 src/gui/windows/statuswindow.cpp:564
+#: src/gui/windows/statuswindow.cpp:769 src/gui/windows/statuswindow.cpp:791
 msgid "Max"
 msgstr "Макс"
 
@@ -3551,15 +3557,13 @@ msgstr "Обмен предметами включен."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104
-#: src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr "Обмен предметами выключен."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109
-#: src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr "Обмен предметами невозможен."
 
@@ -3570,22 +3574,19 @@ msgstr "Статус обмена предметами неизвестен."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150
-#: src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr "Обмен опытом включен."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155
-#: src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr "Обмен опытом выключен."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160
-#: src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr "Обмен опытом невозможен."
 
@@ -4007,7 +4008,10 @@ msgid ""
 "Chat window will be automatically hidden when not in use.\n"
 "\n"
 "Hit Enter or hover mouse to show chat again."
-msgstr "Окно чата будет автоматически скрыто, когда не используется.\n\nНажмите Enter или наведите курсор, чтобы показать чат снова."
+msgstr ""
+"Окно чата будет автоматически скрыто, когда не используется.\n"
+"\n"
+"Нажмите Enter или наведите курсор, чтобы показать чат снова."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:58
@@ -4019,15 +4023,19 @@ msgstr "Защитить фокус чата"
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
-msgstr "Включает принудительную защиту ввода в окне чата.\n\nПримечание: другие текстовые поля будут недоступны для ввода пока Вы набираете текст в окне чата."
+"Note: no other text inputs will be allowed to receive text input when you "
+"typing in chat window."
+msgstr ""
+"Включает принудительную защиту ввода в окне чата.\n"
+"\n"
+"Примечание: другие текстовые поля будут недоступны для ввода пока Вы "
+"набираете текст в окне чата."
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86
-#: src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr "Цвета"
 
@@ -4041,7 +4049,9 @@ msgstr "Удалить цвета из полученных сообщений �
 msgid ""
 "Enable this setting to strip colors from incoming chat messages. All "
 "messages will use default chat text color if this enabled."
-msgstr "Отключает цветные сообщения чата. Если опция включена, все сообщения будут такого же цвета как и основной текст чата."
+msgstr ""
+"Отключает цветные сообщения чата. Если опция включена, все сообщения будут "
+"такого же цвета как и основной текст чата."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:77
@@ -4051,9 +4061,11 @@ msgstr "Показать список цветов чата"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat "
+"window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4065,7 +4077,8 @@ msgstr "Разрешить магические и администраторс�
 #: src/gui/widgets/tabs/setup_chat.cpp:92
 msgid ""
 "Enable this setting to be able to type spells and GM commands in any tab."
-msgstr "Включите эту опцию, чтобы писать заклинания и GM команды в любой вкладке."
+msgstr ""
+"Включите эту опцию, чтобы писать заклинания и GM команды в любой вкладке."
 
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_chat.cpp:98
@@ -4080,9 +4093,11 @@ msgstr "Ограничить число символов в строке чат�
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed "
+"in chat.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will be truncated."
+"Note: long lines can make client slower. Lines longer than this limit will "
+"be truncated."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4093,7 +4108,9 @@ msgstr "Ограничить число строк в чате"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
+"specified number of last lines of text. Oldest lines exceeding this limit "
+"are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
 msgstr ""
@@ -4134,8 +4151,8 @@ msgstr "Показать историю чата"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on"
-" startup instead of starting with empty chat tabs."
+"If this setting enabled, client will load old chat tabs content from logs on "
+"startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4146,9 +4163,11 @@ msgstr "Показывать информацию о подключениях в
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be "
+"shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4159,9 +4178,11 @@ msgstr "Показывать информацию о подключениях в
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be "
+"shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4177,9 +4198,13 @@ msgstr "Скрыть сообщения магазина"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will "
+"be displayed in chat. Disable this setting if you want to see shop-related "
+"messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
+"Note: technically, ManaPlus shop implemented as usual private messages with "
+"special content. If you disable this setting, you will be able to see these "
+"messages and get idea when other players are looking at your shop."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4192,7 +4217,8 @@ msgstr "Показывать MVP сообщения"
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
+"usually makes little difference."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4211,9 +4237,12 @@ msgstr "Личные сообщения во вкладках"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in "
+"separate tabs, separate tab for each player. If this setting disabled, all "
+"whispers will appear in General tab.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
+"Note: putting all whispers to single General tab is known to be confusing. "
+"Think twice before disabling this feature."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4224,7 +4253,8 @@ msgstr "Оставлять сообщения магии на вкладке о�
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If "
+"disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
 msgstr ""
@@ -4237,9 +4267,11 @@ msgstr "Показывать сообщения сервера на вкладк
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of "
+"chat. If disabled, server messages will appear in General chat instead.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
+"Note: according to 4144, disabling this could also make you to lose some "
+"debug messages from client in Debug tab since these are fake server messages."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4264,9 +4296,11 @@ msgstr "Включить страницу чата для гм"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM "
+"activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
+"Note: this setting only makes difference for GMs (Game Masters) since this "
+"tab only appears for GMs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4277,7 +4311,8 @@ msgstr "Включить в чате закладку для языка"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this feature.\n"
+"If this feature enabled, language tab will appear if server supports this "
+"feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
 msgstr ""
@@ -4290,7 +4325,9 @@ msgstr "Показывать сообщения на всех языках"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
+"If this setting enabled and server supports different chats for different "
+"languages, you will see messages for all languages, regardless of your "
+"language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
 msgstr ""
@@ -4303,7 +4340,9 @@ msgstr "Включить вкладку боя"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will "
+"contain messages related to battles, like damage and experience gain, if "
+"battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
 msgstr ""
@@ -4329,7 +4368,10 @@ msgstr "Подгонять размер чата"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to "
+"adapt to appearance of chat input field when you typing message and when "
+"input field of chat disappears. If disabled, chat input area will always "
+"occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
@@ -4364,7 +4406,8 @@ msgstr "Подсвечиваемые слова (разделенные запя
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. "
+"Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
 msgstr ""
@@ -4377,7 +4420,8 @@ msgstr "Игнорировать глобальные сообщения с им
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender "
+"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
 msgstr ""
@@ -4390,9 +4434,12 @@ msgstr "Показывать кнопку эмоций в чате"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This "
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by "
+"default."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4405,7 +4452,9 @@ msgstr "Показывать motd сообщение сервера"
 msgid ""
 "If this setting enabled, client will display server MOTD (message of the "
 "day) once you connect to server. Disable it to hide MOTD."
-msgstr "Если включена эта опция, то при подключении к серверу будет отображаться MOTD - сообщение/совет дня. Отключите, чтобы не показывать MOTD."
+msgstr ""
+"Если включена эта опция, то при подключении к серверу будет отображаться "
+"MOTD - сообщение/совет дня. Отключите, чтобы не показывать MOTD."
 
 #. TRANSLATORS: color selection preview message
 #: src/gui/widgets/tabs/setup_colors.cpp:50
@@ -4506,7 +4555,9 @@ msgstr "Обнаружен(ы) конфликт(ы) клавиш."
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr "Конфликт клавиш \"%s\" и \"%s\".Исправьте их, или игра может себя странно вести."
+msgstr ""
+"Конфликт клавиш \"%s\" и \"%s\".Исправьте их, или игра может себя странно "
+"вести."
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
@@ -5054,7 +5105,9 @@ msgstr "Аппаратное ускорение"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:74
 msgid "Enable opacity cache (Software, can use much memory)"
-msgstr "Включить кеш прозрачности (программный режим, может использовать много памяти)"
+msgstr ""
+"Включить кеш прозрачности (программный режим, может использовать много "
+"памяти)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:79
@@ -5084,7 +5137,9 @@ msgstr "Улучшение качества (выключите для лучш�
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:101
 msgid "Enable alpha channel fix (Software, can be very slow)"
-msgstr "Включить исправление альфа канала (программный режим, может быть очень медленным)"
+msgstr ""
+"Включить исправление альфа канала (программный режим, может быть очень "
+"медленным)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:106
@@ -5099,7 +5154,8 @@ msgstr "Включить перестановку спрайтов (нужен �
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:115
 msgid "Small memory (enable for lower memory usage)"
-msgstr "Уменьшенное потребление памяти (включите для меньшего потребления памяти)"
+msgstr ""
+"Уменьшенное потребление памяти (включите для меньшего потребления памяти)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:120
@@ -5114,7 +5170,8 @@ msgstr "Выключить кеширование сущностей (прогр
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_perfomance.cpp:129
 msgid "Different options (enable or disable can improve performance)"
-msgstr "Разные настройки (включение или выключение может улучшить производительность)"
+msgstr ""
+"Разные настройки (включение или выключение может улучшить производительность)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:134
@@ -5149,7 +5206,8 @@ msgstr "Кешировать все звуки (может использова�
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_perfomance.cpp:160
 msgid "Critical options (DO NOT change if you don't know what you're doing)"
-msgstr "Очень важные настройки (НЕ МЕНЯЙТЕ если вы не уверены в том, что вы делаете)"
+msgstr ""
+"Очень важные настройки (НЕ МЕНЯЙТЕ если вы не уверены в том, что вы делаете)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:164
@@ -5554,13 +5612,17 @@ msgstr "Нет"
 #: src/gui/widgets/tabs/setup_video.cpp:233
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr "Не удалось переключиться в оконный режим. Восстановить старый режим также не удалось!"
+msgstr ""
+"Не удалось переключиться в оконный режим. Восстановить старый режим также не "
+"удалось!"
 
 #. TRANSLATORS: video error message
 #: src/gui/widgets/tabs/setup_video.cpp:240
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr "Не удалось переключиться в полноэкранный режим. Восстановить старый режим также не удалось!"
+msgstr ""
+"Не удалось переключиться в полноэкранный режим. Восстановить старый режим "
+"также не удалось!"
 
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -5601,7 +5663,9 @@ msgstr "Разрешение экрана изменено"
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:401
 msgid "Some windows may be moved to fit the lowered resolution."
-msgstr "Некоторые окна могут быть сдвинуты, чтобы уместиться на экране при меньшем разрешении."
+msgstr ""
+"Некоторые окна могут быть сдвинуты, чтобы уместиться на экране при меньшем "
+"разрешении."
 
 #. TRANSLATORS: speach type
 #: src/gui/widgets/tabs/setup_visual.cpp:43
@@ -6136,8 +6200,7 @@ msgstr "Количество:"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:618
-#: src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:618 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Создать"
 
@@ -6253,17 +6316,16 @@ msgstr "^"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:104
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:210
-#: src/gui/windows/charcreatedialog.cpp:221
-#: src/gui/windows/charcreatedialog.cpp:231
-#: src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:196
+#: src/gui/windows/charcreatedialog.cpp:209
+#: src/gui/windows/charcreatedialog.cpp:220
+#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:110
-#: src/gui/windows/charcreatedialog.cpp:600
+#: src/gui/windows/charcreatedialog.cpp:599
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Распределите очки (%d)"
@@ -6272,73 +6334,71 @@ msgstr "Распределите очки (%d)"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:201
-#: src/gui/windows/charcreatedialog.cpp:212
-#: src/gui/windows/charcreatedialog.cpp:223
-#: src/gui/windows/charcreatedialog.cpp:233
-#: src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:200
+#: src/gui/windows/charcreatedialog.cpp:211
+#: src/gui/windows/charcreatedialog.cpp:222
+#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:202
 msgid "Hair color:"
 msgstr "Цвет волос:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:213
 msgid "Hair style:"
 msgstr "Стрижка:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:224
 msgid "Race:"
 msgstr "Раса:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:234
 msgid "Look:"
 msgstr "Внешность:"
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:252
-#: src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr "Д"
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:258
-#: src/gui/windows/charcreatedialog.cpp:265
-#: src/gui/windows/charcreatedialog.cpp:273
+#: src/gui/windows/charcreatedialog.cpp:257
+#: src/gui/windows/charcreatedialog.cpp:264
+#: src/gui/windows/charcreatedialog.cpp:272
 msgid "M"
 msgstr "М"
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:260
-#: src/gui/windows/charcreatedialog.cpp:277
+#: src/gui/windows/charcreatedialog.cpp:259
+#: src/gui/windows/charcreatedialog.cpp:276
 #: src/gui/windows/inventorywindow.cpp:223
 msgid "O"
 msgstr "Н"
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:267
+#: src/gui/windows/charcreatedialog.cpp:266
 msgid "U"
 msgstr "?"
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:474
+#: src/gui/windows/charcreatedialog.cpp:473
 msgid "Your name needs to be at least 4 characters."
 msgstr "Имя должно содержать не менее четырех символов."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:590
+#: src/gui/windows/charcreatedialog.cpp:589
 msgid "Character stats OK"
 msgstr "Данные персонажа в порядке"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:606
+#: src/gui/windows/charcreatedialog.cpp:605
 #, c-format
 msgid "Please remove %d points"
 msgstr "Снимите очки (%d)"
@@ -6402,7 +6462,12 @@ msgid ""
 "Level: %u\n"
 "Experience: %u\n"
 "Money: %s"
-msgstr "Hp: %u/%u\nMp: %u/%u\nУровень: %u\nОпыт: %u\nДеньги: %s"
+msgstr ""
+"Hp: %u/%u\n"
+"Mp: %u/%u\n"
+"Уровень: %u\n"
+"Опыт: %u\n"
+"Деньги: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/charselectdialog.cpp:308
@@ -6504,8 +6569,7 @@ msgstr "Редактирование сервера"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57
-#: src/gui/windows/serverdialog.cpp:112
+#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:112
 msgid "Connect"
 msgstr "Соединиться"
 
@@ -6867,15 +6931,13 @@ msgstr "Заголовок:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61
-#: src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr "Деньги:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr "Премет:"
@@ -6984,7 +7046,7 @@ msgstr "работа"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/windows/ministatuswindow.cpp:356
-#: src/gui/windows/statuswindow.cpp:236
+#: src/gui/windows/statuswindow.cpp:261
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Уровень: %d (GM %d)"
@@ -7436,33 +7498,33 @@ msgid "Choose your party's name."
 msgstr "Выберите имя будущей группы."
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:72
+#: src/gui/windows/statuswindow.cpp:74
 msgid "HP:"
 msgstr "Жизнь:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:75
+#: src/gui/windows/statuswindow.cpp:77
 msgid "Exp:"
 msgstr "Опыт:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:136
+#: src/gui/windows/statuswindow.cpp:138
 msgid "MP:"
 msgstr "Мана:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:173 src/gui/windows/statuswindow.cpp:294
+#: src/gui/windows/statuswindow.cpp:175 src/gui/windows/statuswindow.cpp:319
 #, c-format
 msgid "Job: %d"
 msgstr "Профессия: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:175
+#: src/gui/windows/statuswindow.cpp:177
 msgid "Job:"
 msgstr "Профессия:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:224 src/gui/windows/statuswindow.cpp:342
+#: src/gui/windows/statuswindow.cpp:226 src/gui/windows/statuswindow.cpp:367
 #, c-format
 msgid "Character points: %d"
 msgstr "Очки персонажа: %d"
@@ -7580,9 +7642,10 @@ msgstr "У вас недостаточно денег."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
-msgstr "Отказано в добавлении предмета. Вы не можете добавить какой-либо вид объектов более одного раза."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+"Отказано в добавлении предмета. Вы не можете добавить какой-либо вид "
+"объектов более одного раза."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:539
@@ -8849,7 +8912,8 @@ msgstr "Очистить окно бросания"
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:50
 msgid "Access denied. Most likely, there are too many players on this server."
-msgstr "В доступе отказано. Скорее всего, на этом сервере слишком много игроков."
+msgstr ""
+"В доступе отказано. Скорее всего, на этом сервере слишком много игроков."
 
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:55
@@ -8864,7 +8928,8 @@ msgstr "Неизвестная ошибка сервера персонажей.
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:75
 msgid "Failed to create character. Most likely the name is already taken."
-msgstr "Невозможно создать персонажа. Скорее всего, такое имя уже используется."
+msgstr ""
+"Невозможно создать персонажа. Скорее всего, такое имя уже используется."
 
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:80 src/net/ea/loginrecv.cpp:159
@@ -9020,7 +9085,8 @@ msgstr "Клиент устарел или неправильный тип се�
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
-msgstr "Вас забанили до %s. Пожалуйста, свяжитесь с командой ГМ-ов через форум."
+msgstr ""
+"Вас забанили до %s. Пожалуйста, свяжитесь с командой ГМ-ов через форум."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:151 src/net/eathena/loginrecv.cpp:92
@@ -9060,33 +9126,33 @@ msgstr "Подключение к серверу прервано. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:431
-#: src/net/eathena/charserverrecv.cpp:479
+#: src/net/eathena/charserverrecv.cpp:398
+#: src/net/eathena/charserverrecv.cpp:446
 msgid "Character rename error."
 msgstr "Ошибка изменения имени персонажа."
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:454
+#: src/net/eathena/charserverrecv.cpp:421
 msgid "Character renamed."
 msgstr "Персонаж переименован."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:470
+#: src/net/eathena/charserverrecv.cpp:437
 msgid "Rename not allowed."
 msgstr "Изменение имени запрещено."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:474
+#: src/net/eathena/charserverrecv.cpp:441
 msgid "New name is not set."
 msgstr "Новое имя не указано."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:483
+#: src/net/eathena/charserverrecv.cpp:450
 msgid "Character not found."
 msgstr "Персонаж не найден."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:517 src/net/tmwa/charserverrecv.cpp:339
+#: src/net/eathena/charserverrecv.cpp:484 src/net/tmwa/charserverrecv.cpp:303
 msgid "Failed to delete character."
 msgstr "Невозможно удалить персонажа."
 
@@ -9138,140 +9204,11 @@ msgstr "Вопрос о родителях"
 msgid "Do you accept %s and %s as parents?"
 msgstr "Вы принимаете %s и %s как своих родителей?"
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:130
-#, c-format
-msgid "Strength %s"
-msgstr "Сила (str) %s"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:132
-#, c-format
-msgid "Agility %s"
-msgstr "Выносливость (agi) %s"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:134
-#, c-format
-msgid "Vitality %s"
-msgstr "Живучесть (vit) %s"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:136
-#, c-format
-msgid "Intelligence %s"
-msgstr "Интеллект (int) %s"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:138
-#, c-format
-msgid "Dexterity %s"
-msgstr "Ловкость (dex) %s"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:140
-#, c-format
-msgid "Luck %s"
-msgstr "Удача (luk) %s"
-
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:197 src/net/tmwa/generalhandler.cpp:207
+#: src/net/eathena/generalhandler.cpp:179 src/net/tmwa/generalhandler.cpp:189
 msgid "Got disconnected from server!"
 msgstr "Отключено от сервера!"
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:223 src/net/tmwa/generalhandler.cpp:234
-msgid "Strength"
-msgstr "Сила (str)"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:237
-msgid "Agility"
-msgstr "Выносливость (agi)"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:229 src/net/tmwa/generalhandler.cpp:240
-msgid "Vitality"
-msgstr "Живучесть (vit)"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:243
-msgid "Intelligence"
-msgstr "Интеллект (int)"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:246
-msgid "Dexterity"
-msgstr "Ловкость (dex)"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:238 src/net/tmwa/generalhandler.cpp:249
-msgid "Luck"
-msgstr "Удача (luk)"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:253
-msgid "Defense"
-msgstr "Защита"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:255
-msgid "M.Attack"
-msgstr "Маг. Атака"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:257
-msgid "M.Defense"
-msgstr "Маг.Защита"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:260
-#, no-c-format
-msgid "% Accuracy"
-msgstr "% Точности"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:263
-#, no-c-format
-msgid "% Evade"
-msgstr "% Уклонения"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:266
-#, no-c-format
-msgid "% Critical"
-msgstr "% Критический удар"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:268
-msgid "Attack Delay"
-msgstr "Задержка атаки"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:270
-msgid "Walk Delay"
-msgstr "Задержка движения"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:272
-msgid "Attack Range"
-msgstr "Зона атаки"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:274
-msgid "Damage per sec."
-msgstr "Урон в сек."
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266
-msgid "Karma"
-msgstr "Карма"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268
-msgid "Manner"
-msgstr "Манеры"
-
 #. TRANSLATORS: error message
 #: src/net/eathena/generalrecv.cpp:49 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
@@ -9427,7 +9364,7 @@ msgstr "Осталось %s арендного времени для %s."
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:199
+#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:190
 msgid "Unknown item"
 msgstr "Неизвестный предмет"
 
@@ -9703,21 +9640,52 @@ msgstr "Новый OpenGL"
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:93
-#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
-#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
+#: src/resources/db/itemdb.cpp:377 src/resources/db/itemdb.cpp:381
+#: src/resources/db/moddb.cpp:79 src/resources/db/monsterdb.cpp:101
+#: src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "безымянный"
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:104
+#: src/resources/db/petdb.cpp:103
 msgid "pet"
 msgstr "животное"
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:103
+#: src/resources/db/skillunitdb.cpp:102
 msgid "skill"
 msgstr "Скил"
 
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:45
+msgid "Strength"
+msgstr "Сила (str)"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:49
+msgid "Agility"
+msgstr "Выносливость (agi)"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:53
+msgid "Vitality"
+msgstr "Живучесть (vit)"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:57
+msgid "Intelligence"
+msgstr "Интеллект (int)"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:61
+msgid "Dexterity"
+msgstr "Ловкость (dex)"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:65
+msgid "Luck"
+msgstr "Удача (luk)"
+
 #. TRANSLATORS: inventory type name
 #: src/resources/inventory/inventory.cpp:340
 msgid "Npc"
@@ -10207,7 +10175,8 @@ msgstr "Ошибка перемещения денег в банк. Возмож
 msgid ""
 "Withdraw failed. You probably don't have this amount of money in the bank "
 "right now."
-msgstr "Ошибка перемещения денег из банка. Возможно у вас нет столько денег в банке."
+msgstr ""
+"Ошибка перемещения денег из банка. Возможно у вас нет столько денег в банке."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:432
@@ -10249,7 +10218,9 @@ msgstr "Сделка провалена."
 msgid ""
 "The trade failed, because the entered amount of item is higher, than the "
 "buyer is willing to buy."
-msgstr "Сделка провалена потому, что указанное количество больще чем покупатель хочет купить."
+msgstr ""
+"Сделка провалена потому, что указанное количество больще чем покупатель "
+"хочет купить."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:465
@@ -10369,7 +10340,8 @@ msgstr "Ошибка входа в комнату. Вы кикнуты из ко
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:556
-msgid "Room join failed. Not enought money."
+#, fuzzy
+msgid "Room join failed. Not enough money."
 msgstr "Ошибка входа в комнату. Недостаточно денег."
 
 #. TRANSLATORS: notification message
@@ -10572,7 +10544,8 @@ msgstr "Ошибка игнорирования игрока."
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:718
 msgid "Player ignore failed. Because too many ignores."
-msgstr "Ошибка игнорирования игрока потому, что слишком много игнорируемых игроков."
+msgstr ""
+"Ошибка игнорирования игрока потому, что слишком много игнорируемых игроков."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:722
@@ -10636,35 +10609,40 @@ msgstr "Игрок %s был убран по неизвестной причин
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:796
-#, c-format
-msgid "You and %s was divorced."
+#, fuzzy, c-format
+msgid "You and %s are now divorced."
 msgstr "Вы и %s развелись."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:800
-msgid "You was called by partner."
+#, fuzzy
+msgid "You were called by your partner."
 msgstr "Вы были вызваны своим партнером."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:804
-#, c-format
-msgid "You calling partner %s."
+#, fuzzy, c-format
+msgid "You are calling your partner, %s."
 msgstr "Вы вызываете партнера %s."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:808
-msgid "Adoption child error. You already have baby."
+#, fuzzy
+msgid "Child adoption failed. You already have a baby."
 msgstr "Ошибка принятия ребенка: у вас уже есть ребенок."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:812
-msgid "Adoption child error. You level too small for have baby."
-msgstr "Ошибка принятия ребенка: ваш уровень слишком мал чтобы иметь детей."
+msgid "Child adoption failed. Your level is too low."
+msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:816
-msgid "Adoption child error. This player already married and can't be baby."
-msgstr "Ошибка принятия ребенка: этот игрок уже женат, и не может быть ребенком."
+#, fuzzy
+msgid ""
+"Child adoption failed. This player is already married and can't be a baby."
+msgstr ""
+"Ошибка принятия ребенка: этот игрок уже женат, и не может быть ребенком."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:821
@@ -10673,19 +10651,23 @@ msgstr "Позиция сохранена для умения телепорта
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:825
-msgid "Error saving location. Not enought skill level."
+#, fuzzy
+msgid "Error saving location. Not enough skill level."
 msgstr "Ошибка сохранения позиции. Слишком маленький уровень умения."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:829
-msgid "Error saving location. You not have warp skill."
+#, fuzzy
+msgid "Error saving location. You do not have warp skill."
 msgstr "Ошибка сохранения позиции. У вас нет умения телепортации."
 
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:29
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "/%s может принимать значение \"yes\", \"no\", \"true\", \"false\", \"1\" или \"0\"."
+msgstr ""
+"/%s может принимать значение \"yes\", \"no\", \"true\", \"false\", \"1\" или "
+"\"0\"."
 
 #. TRANSLATORS: uptime command
 #: src/utils/stringutils.cpp:946
@@ -10741,3 +10723,60 @@ msgstr "%d секунда"
 #, c-format
 msgid "%d seconds"
 msgstr "%d секунд"
+
+#~ msgid "Strength %s"
+#~ msgstr "Сила (str) %s"
+
+#~ msgid "Agility %s"
+#~ msgstr "Выносливость (agi) %s"
+
+#~ msgid "Vitality %s"
+#~ msgstr "Живучесть (vit) %s"
+
+#~ msgid "Intelligence %s"
+#~ msgstr "Интеллект (int) %s"
+
+#~ msgid "Dexterity %s"
+#~ msgstr "Ловкость (dex) %s"
+
+#~ msgid "Luck %s"
+#~ msgstr "Удача (luk) %s"
+
+#~ msgid "Defense"
+#~ msgstr "Защита"
+
+#~ msgid "M.Attack"
+#~ msgstr "Маг. Атака"
+
+#~ msgid "M.Defense"
+#~ msgstr "Маг.Защита"
+
+#~ msgid "% Accuracy"
+#~ msgstr "% Точности"
+
+#~ msgid "% Evade"
+#~ msgstr "% Уклонения"
+
+#~ msgid "% Critical"
+#~ msgstr "% Критический удар"
+
+#~ msgid "Attack Delay"
+#~ msgstr "Задержка атаки"
+
+#~ msgid "Walk Delay"
+#~ msgstr "Задержка движения"
+
+#~ msgid "Attack Range"
+#~ msgstr "Зона атаки"
+
+#~ msgid "Damage per sec."
+#~ msgstr "Урон в сек."
+
+#~ msgid "Karma"
+#~ msgstr "Карма"
+
+#~ msgid "Manner"
+#~ msgstr "Манеры"
+
+#~ msgid "Adoption child error. You level too small for have baby."
+#~ msgstr "Ошибка принятия ребенка: ваш уровень слишком мал чтобы иметь детей."
diff --git a/po/sr.po b/po/sr.po
index 8dfe67889..1400f9dbf 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Aleksandar Djokic <inactive+Cyberdjox@transifex.com>, 2013
 # Aleksandar Djokic <inactive+Cyberdjox@transifex.com>, 2013
@@ -9,15 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-06-18 18:53+0300\n"
+"POT-Creation-Date: 2016-07-02 19:47+0300\n"
 "PO-Revision-Date: 2016-06-19 09:21+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Serbian (http://www.transifex.com/akaras/manaplus/language/sr/)\n"
+"Language-Team: Serbian (http://www.transifex.com/akaras/manaplus/language/"
+"sr/)\n"
+"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sr\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. TRANSLATORS: file uploaded message
 #: src/actions/actions.cpp:168
@@ -33,7 +35,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:171 src/client.cpp:1569 src/client.cpp:1604
+#: src/actions/actions.cpp:171 src/client.cpp:1572 src/client.cpp:1607
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
@@ -44,7 +46,7 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_video.cpp:420
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:476
+#: src/gui/windows/charcreatedialog.cpp:475
 #: src/gui/windows/charselectdialog.cpp:262
 #: src/gui/windows/charselectdialog.cpp:310 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:59
@@ -53,9 +55,9 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:531
 #: src/gui/windows/textdialog.cpp:53 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:456
-#: src/net/eathena/charserverrecv.cpp:491
-#: src/net/eathena/charserverrecv.cpp:519 src/net/tmwa/charserverrecv.cpp:341
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:423
+#: src/net/eathena/charserverrecv.cpp:458
+#: src/net/eathena/charserverrecv.cpp:486 src/net/tmwa/charserverrecv.cpp:305
 msgid "OK"
 msgstr "U redu"
 
@@ -302,26 +304,26 @@ msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:496
+#: src/being/being.cpp:494
 msgid "Human"
 msgstr ""
 
 #. TRANSLATORS: dodge or miss message in attacks
-#: src/being/being.cpp:683
+#: src/being/being.cpp:676
 msgid "dodge"
 msgstr "izbegnuto"
 
-#: src/being/being.cpp:683
+#: src/being/being.cpp:676
 msgid "miss"
 msgstr "promašaj"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2282 src/gui/windows/whoisonline.cpp:882
+#: src/being/being.cpp:2275 src/gui/windows/whoisonline.cpp:882
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2287 src/gui/windows/whoisonline.cpp:887
+#: src/being/being.cpp:2280 src/gui/windows/whoisonline.cpp:887
 msgid "I"
 msgstr ""
 
@@ -473,41 +475,41 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:870 src/dyetool/client.cpp:491 src/gui/windowmenu.cpp:189
+#: src/client.cpp:872 src/dyetool/client.cpp:491 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:66
 msgid "Setup"
 msgstr "Podešavanje"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:873 src/dyetool/client.cpp:494
+#: src/client.cpp:875 src/dyetool/client.cpp:494
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:876 src/dyetool/client.cpp:497
+#: src/client.cpp:878 src/dyetool/client.cpp:497
 #: src/gui/widgets/tabs/setup_video.cpp:110
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:879 src/dyetool/client.cpp:500
+#: src/client.cpp:881 src/dyetool/client.cpp:500
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Stil"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:882 src/dyetool/client.cpp:503
+#: src/client.cpp:884 src/dyetool/client.cpp:503
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:885 src/dyetool/client.cpp:506 src/gui/windowmenu.cpp:74
+#: src/client.cpp:887 src/dyetool/client.cpp:506 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Pomoć"
@@ -528,7 +530,7 @@ msgstr "Pomoć"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:889 src/client.cpp:1483 src/client.cpp:1502
+#: src/client.cpp:891 src/client.cpp:1486 src/client.cpp:1505
 #: src/dyetool/client.cpp:510 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:756 src/gui/popups/popupmenu.cpp:833
 #: src/gui/popups/popupmenu.cpp:1087 src/gui/windows/didyouknowwindow.cpp:81
@@ -541,32 +543,32 @@ msgid "Close"
 msgstr "Zatvori"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1115 src/gui/windowmanager_unittest.cc:156
+#: src/client.cpp:1117 src/gui/windowmanager_unittest.cc:156
 msgid "Connecting to server"
 msgstr "Povezivanje sa serverom"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1172 src/gui/windowmanager_unittest.cc:173
+#: src/client.cpp:1174 src/gui/windowmanager_unittest.cc:173
 msgid "Logging in"
 msgstr "Prijavljivanje"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1221
+#: src/client.cpp:1223
 msgid "Entering game world"
 msgstr "Ulaz u svet"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1369
+#: src/client.cpp:1372
 msgid "Requesting characters"
 msgstr "Tražim karaktere"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1412
+#: src/client.cpp:1415
 msgid "Connecting to the game server"
 msgstr "Poverzujem se sa serverom za igru"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1424
+#: src/client.cpp:1427
 msgid "Changing game servers"
 msgstr "Menjam server igre"
 
@@ -583,52 +585,52 @@ msgstr "Menjam server igre"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1480 src/client.cpp:1499 src/client.cpp:1738
+#: src/client.cpp:1483 src/client.cpp:1502 src/client.cpp:1741
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:472
+#: src/gui/windows/charcreatedialog.cpp:471
 #: src/gui/windows/charselectdialog.cpp:306
 #: src/gui/windows/editserverdialog.cpp:212
 #: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:429
-#: src/net/eathena/charserverrecv.cpp:433
-#: src/net/eathena/charserverrecv.cpp:515 src/net/tmwa/charserverrecv.cpp:337
+#: src/net/eathena/charserverrecv.cpp:396
+#: src/net/eathena/charserverrecv.cpp:400
+#: src/net/eathena/charserverrecv.cpp:482 src/net/tmwa/charserverrecv.cpp:301
 msgid "Error"
 msgstr "Greška"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1518
+#: src/client.cpp:1521
 msgid "Requesting registration details"
 msgstr "Zahtevam detalje registracije"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1565
+#: src/client.cpp:1568
 msgid "Password Change"
 msgstr "Promena lozinke"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1567
+#: src/client.cpp:1570
 msgid "Password changed successfully!"
 msgstr "Lozinka je uspešno promenjena!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1600
+#: src/client.cpp:1603
 msgid "Email Change"
 msgstr "Izmena e-mail adrese"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1602
+#: src/client.cpp:1605
 msgid "Email changed successfully!"
 msgstr "E-mail adresa je uspešno promenjena!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1638
+#: src/client.cpp:1641
 msgid "Unregister Successful"
 msgstr "De-registracija je uspela"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1640
+#: src/client.cpp:1643
 msgid "Farewell, come back any time..."
 msgstr "Zbogom, vrati se kad god poželiš..."
 
@@ -821,23 +823,23 @@ msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:598
+#: src/game.cpp:600
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:608
+#: src/game.cpp:610
 msgid "Saving screenshot failed!"
 msgstr ""
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:695
+#: src/game.cpp:697
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:698
+#: src/game.cpp:700
 msgid "Network Error"
 msgstr ""
 
@@ -1252,8 +1254,7 @@ msgstr ""
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
+"You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
 #. TRANSLATORS: weight message
@@ -1270,8 +1271,7 @@ msgstr ""
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:671
-#: src/gui/windows/serverdialog.cpp:603
+#: src/gui/windows/equipmentwindow.cpp:671 src/gui/windows/serverdialog.cpp:603
 msgid "default"
 msgstr "standardno"
 
@@ -1823,11 +1823,9 @@ msgstr ""
 #. TRANSLATORS: attack player
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
-#. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:180 src/gui/popups/popupmenu.cpp:304
 #: src/gui/popups/popupmenu.cpp:912 src/gui/widgets/skillinfo.cpp:125
-#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
-#: src/net/tmwa/generalhandler.cpp:251
+#: src/input/pages/basic.cpp:40
 msgid "Attack"
 msgstr ""
 
@@ -1903,7 +1901,7 @@ msgstr ""
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:270 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:152
+#: src/resources/db/npcdb.cpp:151
 msgid "Talk"
 msgstr ""
 
@@ -1921,7 +1919,7 @@ msgstr ""
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:154
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:153
 msgid "Buy"
 msgstr ""
 
@@ -1939,7 +1937,7 @@ msgstr ""
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
 #: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:256
-#: src/resources/db/npcdb.cpp:156
+#: src/resources/db/npcdb.cpp:155
 msgid "Sell"
 msgstr ""
 
@@ -2041,7 +2039,7 @@ msgstr "Skini"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:408 src/resources/db/petdb.cpp:160
+#: src/gui/popups/popupmenu.cpp:408 src/resources/db/petdb.cpp:159
 msgid "Return to egg"
 msgstr ""
 
@@ -2438,7 +2436,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2125 src/gui/windows/statuswindow.cpp:90
 msgid "Copy to chat"
 msgstr ""
 
@@ -2490,9 +2488,8 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/popups/popupmenu.cpp:2386 src/gui/popups/skillpopup.cpp:127
-#: src/gui/windows/ministatuswindow.cpp:363
-#: src/gui/windows/statuswindow.cpp:68 src/gui/windows/statuswindow.cpp:243
-#: src/gui/windows/statuswindow.cpp:367
+#: src/gui/windows/ministatuswindow.cpp:363 src/gui/windows/statuswindow.cpp:70
+#: src/gui/windows/statuswindow.cpp:268 src/gui/windows/statuswindow.cpp:392
 #, c-format
 msgid "Level: %d"
 msgstr "Nivo: %d"
@@ -2911,8 +2908,8 @@ msgstr ""
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3100 src/gui/popups/popupmenu.cpp:3119
 #: src/gui/popups/popupmenu.cpp:3132 src/gui/windows/charselectdialog.cpp:76
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:452
-#: src/net/eathena/charserverrecv.cpp:488
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:419
+#: src/net/eathena/charserverrecv.cpp:455
 msgid "Info"
 msgstr ""
 
@@ -3303,8 +3300,8 @@ msgstr ""
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/statuswindow.cpp:70
-#: src/gui/windows/statuswindow.cpp:220 src/gui/windows/statuswindow.cpp:334
+#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/statuswindow.cpp:72
+#: src/gui/windows/statuswindow.cpp:222 src/gui/windows/statuswindow.cpp:359
 #, c-format
 msgid "Money: %s"
 msgstr "Novac: %s"
@@ -3360,7 +3357,7 @@ msgstr ""
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:194
 #: src/gui/windows/itemamountwindow.cpp:230 src/gui/windows/npcdialog.cpp:123
-#: src/gui/windows/statuswindow.cpp:746
+#: src/gui/windows/statuswindow.cpp:771
 msgid "+"
 msgstr ""
 
@@ -3381,8 +3378,8 @@ msgstr ""
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/selldialog.cpp:133 src/gui/windows/buydialog.cpp:299
-#: src/gui/windows/statuswindow.cpp:483 src/gui/windows/statuswindow.cpp:539
-#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:766
+#: src/gui/windows/statuswindow.cpp:508 src/gui/windows/statuswindow.cpp:564
+#: src/gui/windows/statuswindow.cpp:769 src/gui/windows/statuswindow.cpp:791
 msgid "Max"
 msgstr ""
 
@@ -3538,15 +3535,13 @@ msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104
-#: src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109
-#: src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr ""
 
@@ -3557,22 +3552,19 @@ msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150
-#: src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155
-#: src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160
-#: src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr ""
 
@@ -4006,15 +3998,15 @@ msgstr ""
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
+"Note: no other text inputs will be allowed to receive text input when you "
+"typing in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86
-#: src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr "Boje"
 
@@ -4038,9 +4030,11 @@ msgstr "Prikaži listu boja za ćaskanje"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat "
+"window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4067,9 +4061,11 @@ msgstr "Ograniči maksimalan broj karaktera u jednoj liniji za ćaskanje"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed "
+"in chat.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will be truncated."
+"Note: long lines can make client slower. Lines longer than this limit will "
+"be truncated."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4080,7 +4076,9 @@ msgstr "Ograniči maksimalan broj linija za ćaskanje"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
+"specified number of last lines of text. Oldest lines exceeding this limit "
+"are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
 msgstr ""
@@ -4121,8 +4119,8 @@ msgstr "Prikaži istoriju ćaskanja"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on"
-" startup instead of starting with empty chat tabs."
+"If this setting enabled, client will load old chat tabs content from logs on "
+"startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4133,9 +4131,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be "
+"shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4146,9 +4146,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be "
+"shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4164,9 +4166,13 @@ msgstr "Sakrij poruke prodavnica"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will "
+"be displayed in chat. Disable this setting if you want to see shop-related "
+"messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
+"Note: technically, ManaPlus shop implemented as usual private messages with "
+"special content. If you disable this setting, you will be able to see these "
+"messages and get idea when other players are looking at your shop."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4179,7 +4185,8 @@ msgstr ""
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
+"usually makes little difference."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4198,9 +4205,12 @@ msgstr "Stavi sva šaputanja u kartice"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in "
+"separate tabs, separate tab for each player. If this setting disabled, all "
+"whispers will appear in General tab.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
+"Note: putting all whispers to single General tab is known to be confusing. "
+"Think twice before disabling this feature."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4211,7 +4221,8 @@ msgstr "Spasi poruke vezane za magiju u debug kartici"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If "
+"disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
 msgstr ""
@@ -4224,9 +4235,11 @@ msgstr "Prikaži serverske poruke na debug kartici"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of "
+"chat. If disabled, server messages will appear in General chat instead.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
+"Note: according to 4144, disabling this could also make you to lose some "
+"debug messages from client in Debug tab since these are fake server messages."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4251,9 +4264,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM "
+"activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
+"Note: this setting only makes difference for GMs (Game Masters) since this "
+"tab only appears for GMs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4264,7 +4279,8 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this feature.\n"
+"If this feature enabled, language tab will appear if server supports this "
+"feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
 msgstr ""
@@ -4277,7 +4293,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
+"If this setting enabled and server supports different chats for different "
+"languages, you will see messages for all languages, regardless of your "
+"language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
 msgstr ""
@@ -4290,7 +4308,9 @@ msgstr "Uključi karticu za bitku"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will "
+"contain messages related to battles, like damage and experience gain, if "
+"battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
 msgstr ""
@@ -4316,7 +4336,10 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to "
+"adapt to appearance of chat input field when you typing message and when "
+"input field of chat disappears. If disabled, chat input area will always "
+"occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
@@ -4351,7 +4374,8 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. "
+"Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
 msgstr ""
@@ -4364,7 +4388,8 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender "
+"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
 msgstr ""
@@ -4377,9 +4402,12 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This "
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by "
+"default."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4493,7 +4521,9 @@ msgstr ""
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr "Konflikt tastera između \"%s\" i \"%s\". Treba da se reši ovo, u suprotnom tok igre će biti čudan i nedefinisan."
+msgstr ""
+"Konflikt tastera između \"%s\" i \"%s\". Treba da se reši ovo, u suprotnom "
+"tok igre će biti čudan i nedefinisan."
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
@@ -6123,8 +6153,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:618
-#: src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:618 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr ""
 
@@ -6240,17 +6269,16 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:104
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:210
-#: src/gui/windows/charcreatedialog.cpp:221
-#: src/gui/windows/charcreatedialog.cpp:231
-#: src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:196
+#: src/gui/windows/charcreatedialog.cpp:209
+#: src/gui/windows/charcreatedialog.cpp:220
+#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:110
-#: src/gui/windows/charcreatedialog.cpp:600
+#: src/gui/windows/charcreatedialog.cpp:599
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
@@ -6259,73 +6287,71 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:201
-#: src/gui/windows/charcreatedialog.cpp:212
-#: src/gui/windows/charcreatedialog.cpp:223
-#: src/gui/windows/charcreatedialog.cpp:233
-#: src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:200
+#: src/gui/windows/charcreatedialog.cpp:211
+#: src/gui/windows/charcreatedialog.cpp:222
+#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:202
 msgid "Hair color:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:213
 msgid "Hair style:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:224
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:234
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:252
-#: src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:258
-#: src/gui/windows/charcreatedialog.cpp:265
-#: src/gui/windows/charcreatedialog.cpp:273
+#: src/gui/windows/charcreatedialog.cpp:257
+#: src/gui/windows/charcreatedialog.cpp:264
+#: src/gui/windows/charcreatedialog.cpp:272
 msgid "M"
 msgstr ""
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:260
-#: src/gui/windows/charcreatedialog.cpp:277
+#: src/gui/windows/charcreatedialog.cpp:259
+#: src/gui/windows/charcreatedialog.cpp:276
 #: src/gui/windows/inventorywindow.cpp:223
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:267
+#: src/gui/windows/charcreatedialog.cpp:266
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:474
+#: src/gui/windows/charcreatedialog.cpp:473
 msgid "Your name needs to be at least 4 characters."
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:590
+#: src/gui/windows/charcreatedialog.cpp:589
 msgid "Character stats OK"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:606
+#: src/gui/windows/charcreatedialog.cpp:605
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
@@ -6491,8 +6517,7 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57
-#: src/gui/windows/serverdialog.cpp:112
+#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:112
 msgid "Connect"
 msgstr "Koncija"
 
@@ -6852,15 +6877,13 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61
-#: src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr ""
@@ -6969,7 +6992,7 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/windows/ministatuswindow.cpp:356
-#: src/gui/windows/statuswindow.cpp:236
+#: src/gui/windows/statuswindow.cpp:261
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Nivo: %d (GM %d)"
@@ -7421,33 +7444,33 @@ msgid "Choose your party's name."
 msgstr "Izaberi ime svoje partije."
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:72
+#: src/gui/windows/statuswindow.cpp:74
 msgid "HP:"
 msgstr "Zdravlje:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:75
+#: src/gui/windows/statuswindow.cpp:77
 msgid "Exp:"
 msgstr "Iskustvo:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:136
+#: src/gui/windows/statuswindow.cpp:138
 msgid "MP:"
 msgstr "Magija:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:173 src/gui/windows/statuswindow.cpp:294
+#: src/gui/windows/statuswindow.cpp:175 src/gui/windows/statuswindow.cpp:319
 #, c-format
 msgid "Job: %d"
 msgstr "Posao: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:175
+#: src/gui/windows/statuswindow.cpp:177
 msgid "Job:"
 msgstr "Posao:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:224 src/gui/windows/statuswindow.cpp:342
+#: src/gui/windows/statuswindow.cpp:226 src/gui/windows/statuswindow.cpp:367
 #, c-format
 msgid "Character points: %d"
 msgstr "Bodovi karaktera: %d"
@@ -7565,8 +7588,7 @@ msgstr ""
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
 #. TRANSLATORS: trade error
@@ -9045,33 +9067,33 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:431
-#: src/net/eathena/charserverrecv.cpp:479
+#: src/net/eathena/charserverrecv.cpp:398
+#: src/net/eathena/charserverrecv.cpp:446
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:454
+#: src/net/eathena/charserverrecv.cpp:421
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:470
+#: src/net/eathena/charserverrecv.cpp:437
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:474
+#: src/net/eathena/charserverrecv.cpp:441
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:483
+#: src/net/eathena/charserverrecv.cpp:450
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:517 src/net/tmwa/charserverrecv.cpp:339
+#: src/net/eathena/charserverrecv.cpp:484 src/net/tmwa/charserverrecv.cpp:303
 msgid "Failed to delete character."
 msgstr ""
 
@@ -9123,140 +9145,11 @@ msgstr ""
 msgid "Do you accept %s and %s as parents?"
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:130
-#, c-format
-msgid "Strength %s"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:132
-#, c-format
-msgid "Agility %s"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:134
-#, c-format
-msgid "Vitality %s"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:136
-#, c-format
-msgid "Intelligence %s"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:138
-#, c-format
-msgid "Dexterity %s"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:140
-#, c-format
-msgid "Luck %s"
-msgstr ""
-
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:197 src/net/tmwa/generalhandler.cpp:207
+#: src/net/eathena/generalhandler.cpp:179 src/net/tmwa/generalhandler.cpp:189
 msgid "Got disconnected from server!"
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:223 src/net/tmwa/generalhandler.cpp:234
-msgid "Strength"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:237
-msgid "Agility"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:229 src/net/tmwa/generalhandler.cpp:240
-msgid "Vitality"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:243
-msgid "Intelligence"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:246
-msgid "Dexterity"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:238 src/net/tmwa/generalhandler.cpp:249
-msgid "Luck"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:253
-msgid "Defense"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:255
-msgid "M.Attack"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:257
-msgid "M.Defense"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:260
-#, no-c-format
-msgid "% Accuracy"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:263
-#, no-c-format
-msgid "% Evade"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:266
-#, no-c-format
-msgid "% Critical"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:268
-msgid "Attack Delay"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:270
-msgid "Walk Delay"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:272
-msgid "Attack Range"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:274
-msgid "Damage per sec."
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266
-msgid "Karma"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268
-msgid "Manner"
-msgstr ""
-
 #. TRANSLATORS: error message
 #: src/net/eathena/generalrecv.cpp:49 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
@@ -9412,7 +9305,7 @@ msgstr ""
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:199
+#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:190
 msgid "Unknown item"
 msgstr ""
 
@@ -9688,21 +9581,52 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:93
-#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
-#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
+#: src/resources/db/itemdb.cpp:377 src/resources/db/itemdb.cpp:381
+#: src/resources/db/moddb.cpp:79 src/resources/db/monsterdb.cpp:101
+#: src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:104
+#: src/resources/db/petdb.cpp:103
 msgid "pet"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:103
+#: src/resources/db/skillunitdb.cpp:102
 msgid "skill"
 msgstr ""
 
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:45
+msgid "Strength"
+msgstr ""
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:49
+msgid "Agility"
+msgstr ""
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:53
+msgid "Vitality"
+msgstr ""
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:57
+msgid "Intelligence"
+msgstr ""
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:61
+msgid "Dexterity"
+msgstr ""
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:65
+msgid "Luck"
+msgstr ""
+
 #. TRANSLATORS: inventory type name
 #: src/resources/inventory/inventory.cpp:340
 msgid "Npc"
@@ -10354,7 +10278,7 @@ msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:556
-msgid "Room join failed. Not enought money."
+msgid "Room join failed. Not enough money."
 msgstr ""
 
 #. TRANSLATORS: notification message
@@ -10622,33 +10546,34 @@ msgstr ""
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:796
 #, c-format
-msgid "You and %s was divorced."
+msgid "You and %s are now divorced."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:800
-msgid "You was called by partner."
+msgid "You were called by your partner."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:804
 #, c-format
-msgid "You calling partner %s."
+msgid "You are calling your partner, %s."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:808
-msgid "Adoption child error. You already have baby."
+msgid "Child adoption failed. You already have a baby."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:812
-msgid "Adoption child error. You level too small for have baby."
+msgid "Child adoption failed. Your level is too low."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:816
-msgid "Adoption child error. This player already married and can't be baby."
+msgid ""
+"Child adoption failed. This player is already married and can't be a baby."
 msgstr ""
 
 #. TRANSLATORS: notification message
@@ -10658,12 +10583,12 @@ msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:825
-msgid "Error saving location. Not enought skill level."
+msgid "Error saving location. Not enough skill level."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:829
-msgid "Error saving location. You not have warp skill."
+msgid "Error saving location. You do not have warp skill."
 msgstr ""
 
 #. TRANSLATORS: chat option changed message
diff --git a/po/sv.po b/po/sv.po
index fd9eb2028..df4d89661 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,21 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Kristoffer Frisell <kristoffer@frisell.it>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-06-18 18:53+0300\n"
+"POT-Creation-Date: 2016-07-02 19:47+0300\n"
 "PO-Revision-Date: 2016-06-19 09:21+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Swedish (Sweden) (http://www.transifex.com/akaras/manaplus/language/sv_SE/)\n"
+"Language-Team: Swedish (Sweden) (http://www.transifex.com/akaras/manaplus/"
+"language/sv_SE/)\n"
+"Language: sv_SE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sv_SE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
@@ -32,7 +33,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:171 src/client.cpp:1569 src/client.cpp:1604
+#: src/actions/actions.cpp:171 src/client.cpp:1572 src/client.cpp:1607
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
@@ -43,7 +44,7 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_video.cpp:420
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:476
+#: src/gui/windows/charcreatedialog.cpp:475
 #: src/gui/windows/charselectdialog.cpp:262
 #: src/gui/windows/charselectdialog.cpp:310 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:59
@@ -52,9 +53,9 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:531
 #: src/gui/windows/textdialog.cpp:53 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:456
-#: src/net/eathena/charserverrecv.cpp:491
-#: src/net/eathena/charserverrecv.cpp:519 src/net/tmwa/charserverrecv.cpp:341
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:423
+#: src/net/eathena/charserverrecv.cpp:458
+#: src/net/eathena/charserverrecv.cpp:486 src/net/tmwa/charserverrecv.cpp:305
 msgid "OK"
 msgstr "OK"
 
@@ -301,26 +302,26 @@ msgid "Visible on map"
 msgstr "Synlig på karta"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:496
+#: src/being/being.cpp:494
 msgid "Human"
 msgstr "Människa"
 
 #. TRANSLATORS: dodge or miss message in attacks
-#: src/being/being.cpp:683
+#: src/being/being.cpp:676
 msgid "dodge"
 msgstr "undvika"
 
-#: src/being/being.cpp:683
+#: src/being/being.cpp:676
 msgid "miss"
 msgstr "missa"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2282 src/gui/windows/whoisonline.cpp:882
+#: src/being/being.cpp:2275 src/gui/windows/whoisonline.cpp:882
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2287 src/gui/windows/whoisonline.cpp:887
+#: src/being/being.cpp:2280 src/gui/windows/whoisonline.cpp:887
 msgid "I"
 msgstr "I"
 
@@ -471,41 +472,41 @@ msgstr "Floating bubble"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:870 src/dyetool/client.cpp:491 src/gui/windowmenu.cpp:189
+#: src/client.cpp:872 src/dyetool/client.cpp:491 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:66
 msgid "Setup"
 msgstr "Inställningar"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:873 src/dyetool/client.cpp:494
+#: src/client.cpp:875 src/dyetool/client.cpp:494
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:876 src/dyetool/client.cpp:497
+#: src/client.cpp:878 src/dyetool/client.cpp:497
 #: src/gui/widgets/tabs/setup_video.cpp:110
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:879 src/dyetool/client.cpp:500
+#: src/client.cpp:881 src/dyetool/client.cpp:500
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:882 src/dyetool/client.cpp:503
+#: src/client.cpp:884 src/dyetool/client.cpp:503
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:885 src/dyetool/client.cpp:506 src/gui/windowmenu.cpp:74
+#: src/client.cpp:887 src/dyetool/client.cpp:506 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Hjälp"
@@ -526,7 +527,7 @@ msgstr "Hjälp"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:889 src/client.cpp:1483 src/client.cpp:1502
+#: src/client.cpp:891 src/client.cpp:1486 src/client.cpp:1505
 #: src/dyetool/client.cpp:510 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:756 src/gui/popups/popupmenu.cpp:833
 #: src/gui/popups/popupmenu.cpp:1087 src/gui/windows/didyouknowwindow.cpp:81
@@ -539,32 +540,32 @@ msgid "Close"
 msgstr "Stäng"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1115 src/gui/windowmanager_unittest.cc:156
+#: src/client.cpp:1117 src/gui/windowmanager_unittest.cc:156
 msgid "Connecting to server"
 msgstr "Ansluter till server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1172 src/gui/windowmanager_unittest.cc:173
+#: src/client.cpp:1174 src/gui/windowmanager_unittest.cc:173
 msgid "Logging in"
 msgstr "Loggar in"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1221
+#: src/client.cpp:1223
 msgid "Entering game world"
 msgstr "Går in i spelvärld"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1369
+#: src/client.cpp:1372
 msgid "Requesting characters"
 msgstr "Begär karaktärer"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1412
+#: src/client.cpp:1415
 msgid "Connecting to the game server"
 msgstr "Ansluter till spelservern"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1424
+#: src/client.cpp:1427
 msgid "Changing game servers"
 msgstr "Ändrar spelserver"
 
@@ -581,52 +582,52 @@ msgstr "Ändrar spelserver"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1480 src/client.cpp:1499 src/client.cpp:1738
+#: src/client.cpp:1483 src/client.cpp:1502 src/client.cpp:1741
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:472
+#: src/gui/windows/charcreatedialog.cpp:471
 #: src/gui/windows/charselectdialog.cpp:306
 #: src/gui/windows/editserverdialog.cpp:212
 #: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:429
-#: src/net/eathena/charserverrecv.cpp:433
-#: src/net/eathena/charserverrecv.cpp:515 src/net/tmwa/charserverrecv.cpp:337
+#: src/net/eathena/charserverrecv.cpp:396
+#: src/net/eathena/charserverrecv.cpp:400
+#: src/net/eathena/charserverrecv.cpp:482 src/net/tmwa/charserverrecv.cpp:301
 msgid "Error"
 msgstr "Error"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1518
+#: src/client.cpp:1521
 msgid "Requesting registration details"
 msgstr "Begär registreringsuppgifter"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1565
+#: src/client.cpp:1568
 msgid "Password Change"
 msgstr "Lösenordsändring"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1567
+#: src/client.cpp:1570
 msgid "Password changed successfully!"
 msgstr "Lösenordsändring har lyckats!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1600
+#: src/client.cpp:1603
 msgid "Email Change"
 msgstr "Byte av E-post"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1602
+#: src/client.cpp:1605
 msgid "Email changed successfully!"
 msgstr "E-posten har ändrats!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1638
+#: src/client.cpp:1641
 msgid "Unregister Successful"
 msgstr "Avregistrering lyckad"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1640
+#: src/client.cpp:1643
 msgid "Farewell, come back any time..."
 msgstr "Farväl, kom gärna tillbaka snart igen..."
 
@@ -678,7 +679,8 @@ msgstr "  -h --help           : Visa hjälp"
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:65
 msgid "  -C --config-dir     : Configuration directory to use"
-msgstr "  -C --config-dir     : Konfiguration för vilken katalog som ska användas"
+msgstr ""
+"  -C --config-dir     : Konfiguration för vilken katalog som ska användas"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:68
@@ -753,7 +755,9 @@ msgstr ""
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:112
 msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr "  -T --tests          : Börja testning av drivrutiner och automat-configurering"
+msgstr ""
+"  -T --tests          : Börja testning av drivrutiner och automat-"
+"configurering"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:118
@@ -819,23 +823,23 @@ msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:598
+#: src/game.cpp:600
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Skärmdump sparades som %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:608
+#: src/game.cpp:610
 msgid "Saving screenshot failed!"
 msgstr "Spara skärmdump misslyckades!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:695
+#: src/game.cpp:697
 msgid "The connection to the server was lost."
 msgstr "Anslutningen till servern förlorades."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:698
+#: src/game.cpp:700
 msgid "Network Error"
 msgstr "Nätverksfel"
 
@@ -1250,8 +1254,7 @@ msgstr "Återuppliva"
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
+"You are carrying more than half your weight. You are unable to regain health."
 msgstr "Du bär på mer än halva din vikt. Du kan inte återfå health."
 
 #. TRANSLATORS: weight message
@@ -1268,8 +1271,7 @@ msgstr "Du bär på mindre än hälften av din vikt. Du kan återfå health."
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:671
-#: src/gui/windows/serverdialog.cpp:603
+#: src/gui/windows/equipmentwindow.cpp:671 src/gui/windows/serverdialog.cpp:603
 msgid "default"
 msgstr "standard"
 
@@ -1821,11 +1823,9 @@ msgstr "Trade"
 #. TRANSLATORS: attack player
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
-#. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:180 src/gui/popups/popupmenu.cpp:304
 #: src/gui/popups/popupmenu.cpp:912 src/gui/widgets/skillinfo.cpp:125
-#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
-#: src/net/tmwa/generalhandler.cpp:251
+#: src/input/pages/basic.cpp:40
 msgid "Attack"
 msgstr "Attackera"
 
@@ -1901,7 +1901,7 @@ msgstr "Flytta"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:270 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:152
+#: src/resources/db/npcdb.cpp:151
 msgid "Talk"
 msgstr "Prata med"
 
@@ -1919,7 +1919,7 @@ msgstr "Prata med"
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:154
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:153
 msgid "Buy"
 msgstr "Köp"
 
@@ -1937,7 +1937,7 @@ msgstr "Köp"
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
 #: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:256
-#: src/resources/db/npcdb.cpp:156
+#: src/resources/db/npcdb.cpp:155
 msgid "Sell"
 msgstr "Sälj"
 
@@ -2039,7 +2039,7 @@ msgstr "Unequip"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:408 src/resources/db/petdb.cpp:160
+#: src/gui/popups/popupmenu.cpp:408 src/resources/db/petdb.cpp:159
 msgid "Return to egg"
 msgstr ""
 
@@ -2436,7 +2436,7 @@ msgstr "Återställ yellow bar"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2125 src/gui/windows/statuswindow.cpp:90
 msgid "Copy to chat"
 msgstr "Kopiera till chat"
 
@@ -2488,9 +2488,8 @@ msgstr "Visa fönster"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/popups/popupmenu.cpp:2386 src/gui/popups/skillpopup.cpp:127
-#: src/gui/windows/ministatuswindow.cpp:363
-#: src/gui/windows/statuswindow.cpp:68 src/gui/windows/statuswindow.cpp:243
-#: src/gui/windows/statuswindow.cpp:367
+#: src/gui/windows/ministatuswindow.cpp:363 src/gui/windows/statuswindow.cpp:70
+#: src/gui/windows/statuswindow.cpp:268 src/gui/windows/statuswindow.cpp:392
 #, c-format
 msgid "Level: %d"
 msgstr "Level: %d"
@@ -2909,8 +2908,8 @@ msgstr ""
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3100 src/gui/popups/popupmenu.cpp:3119
 #: src/gui/popups/popupmenu.cpp:3132 src/gui/windows/charselectdialog.cpp:76
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:452
-#: src/net/eathena/charserverrecv.cpp:488
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:419
+#: src/net/eathena/charserverrecv.cpp:455
 msgid "Info"
 msgstr "Info"
 
@@ -3301,8 +3300,8 @@ msgstr "Level: %u"
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/statuswindow.cpp:70
-#: src/gui/windows/statuswindow.cpp:220 src/gui/windows/statuswindow.cpp:334
+#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/statuswindow.cpp:72
+#: src/gui/windows/statuswindow.cpp:222 src/gui/windows/statuswindow.cpp:359
 #, c-format
 msgid "Money: %s"
 msgstr "Money: %s"
@@ -3358,7 +3357,7 @@ msgstr "Avsluta"
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:194
 #: src/gui/windows/itemamountwindow.cpp:230 src/gui/windows/npcdialog.cpp:123
-#: src/gui/windows/statuswindow.cpp:746
+#: src/gui/windows/statuswindow.cpp:771
 msgid "+"
 msgstr "+"
 
@@ -3379,8 +3378,8 @@ msgstr "-"
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/selldialog.cpp:133 src/gui/windows/buydialog.cpp:299
-#: src/gui/windows/statuswindow.cpp:483 src/gui/windows/statuswindow.cpp:539
-#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:766
+#: src/gui/windows/statuswindow.cpp:508 src/gui/windows/statuswindow.cpp:564
+#: src/gui/windows/statuswindow.cpp:769 src/gui/windows/statuswindow.cpp:791
 msgid "Max"
 msgstr "Max"
 
@@ -3536,15 +3535,13 @@ msgstr "Item-delning aktiverad."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104
-#: src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr "Item-delning avaktiverad."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109
-#: src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr "Item-delning är inte möjlig."
 
@@ -3555,22 +3552,19 @@ msgstr "Item-delning okänd."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150
-#: src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr "Exp-delning är aktiverad."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155
-#: src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr "Exp-delning avaktiverad."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160
-#: src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr "Exp-delning är inte möjlig."
 
@@ -4004,15 +3998,15 @@ msgstr ""
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
+"Note: no other text inputs will be allowed to receive text input when you "
+"typing in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86
-#: src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr "Färger"
 
@@ -4036,9 +4030,11 @@ msgstr "Visa chat-färglistan"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat "
+"window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4065,9 +4061,11 @@ msgstr "Begränsa max-tecken i chatten"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed "
+"in chat.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will be truncated."
+"Note: long lines can make client slower. Lines longer than this limit will "
+"be truncated."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4078,7 +4076,9 @@ msgstr "Begränsa max-rader i chatten"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
+"specified number of last lines of text. Oldest lines exceeding this limit "
+"are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
 msgstr ""
@@ -4119,8 +4119,8 @@ msgstr "Visa chat-historik"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on"
-" startup instead of starting with empty chat tabs."
+"If this setting enabled, client will load old chat tabs content from logs on "
+"startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4131,9 +4131,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be "
+"shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4144,9 +4146,11 @@ msgstr "Visa online-meddelande för guild"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be "
+"shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4162,9 +4166,13 @@ msgstr "Dölj shop-meddelanden"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will "
+"be displayed in chat. Disable this setting if you want to see shop-related "
+"messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
+"Note: technically, ManaPlus shop implemented as usual private messages with "
+"special content. If you disable this setting, you will be able to see these "
+"messages and get idea when other players are looking at your shop."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4177,7 +4185,8 @@ msgstr "Visa MVP-meddelanden"
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
+"usually makes little difference."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4196,9 +4205,12 @@ msgstr "Lägg alla viskningar i flikar"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in "
+"separate tabs, separate tab for each player. If this setting disabled, all "
+"whispers will appear in General tab.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
+"Note: putting all whispers to single General tab is known to be confusing. "
+"Think twice before disabling this feature."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4209,7 +4221,8 @@ msgstr "Logga magic messages i log-tabben"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If "
+"disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
 msgstr ""
@@ -4222,9 +4235,11 @@ msgstr "Visa servermeddelanden i log-fliken"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of "
+"chat. If disabled, server messages will appear in General chat instead.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
+"Note: according to 4144, disabling this could also make you to lose some "
+"debug messages from client in Debug tab since these are fake server messages."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4249,9 +4264,11 @@ msgstr "Aktivera GM-flik"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM "
+"activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
+"Note: this setting only makes difference for GMs (Game Masters) since this "
+"tab only appears for GMs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4262,7 +4279,8 @@ msgstr "Aktivera språk-flik"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this feature.\n"
+"If this feature enabled, language tab will appear if server supports this "
+"feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
 msgstr ""
@@ -4275,7 +4293,9 @@ msgstr "Visa alla språk-meddelanden"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
+"If this setting enabled and server supports different chats for different "
+"languages, you will see messages for all languages, regardless of your "
+"language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
 msgstr ""
@@ -4288,7 +4308,9 @@ msgstr "Aktivera battle-flik"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will "
+"contain messages related to battles, like damage and experience gain, if "
+"battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
 msgstr ""
@@ -4314,7 +4336,10 @@ msgstr "Ändra storlek på chat-flikarna om det behövs"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to "
+"adapt to appearance of chat input field when you typing message and when "
+"input field of chat disappears. If disabled, chat input area will always "
+"occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
@@ -4349,7 +4374,8 @@ msgstr "Highlighta ord (separerat med komma)"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. "
+"Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
 msgstr ""
@@ -4362,7 +4388,8 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender "
+"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
 msgstr ""
@@ -4375,9 +4402,12 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This "
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by "
+"default."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4491,7 +4521,9 @@ msgstr "Tangent-konflikt(er) uppmärksammade."
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr "Konflikt mellan knapparna \"%s\" och \"%s\". Om detta inte löses kan spelet uppföra sig konstigt."
+msgstr ""
+"Konflikt mellan knapparna \"%s\" och \"%s\". Om detta inte löses kan spelet "
+"uppföra sig konstigt."
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
@@ -4876,7 +4908,8 @@ msgstr "Bots support"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_other.cpp:307
 msgid "Enable guild bot support and disable native guild support"
-msgstr "Aktivera support för guild-bot och avaktivera grund-supporten för guild"
+msgstr ""
+"Aktivera support för guild-bot och avaktivera grund-supporten för guild"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_other.cpp:313
@@ -5539,13 +5572,17 @@ msgstr "Ingen"
 #: src/gui/widgets/tabs/setup_video.cpp:233
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr "Misslyckades att ändra till fönster-läge och återställandet av det gamla läget misslyckades också!"
+msgstr ""
+"Misslyckades att ändra till fönster-läge och återställandet av det gamla "
+"läget misslyckades också!"
 
 #. TRANSLATORS: video error message
 #: src/gui/widgets/tabs/setup_video.cpp:240
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr "Misslyckades att ändra till fullskärms-läge och återställandet av det gamla läget misslyckades också!"
+msgstr ""
+"Misslyckades att ändra till fullskärms-läge och återställandet av det gamla "
+"läget misslyckades också!"
 
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -6121,8 +6158,7 @@ msgstr "Antal:"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:618
-#: src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:618 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Skapa"
 
@@ -6238,17 +6274,16 @@ msgstr "^"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:104
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:210
-#: src/gui/windows/charcreatedialog.cpp:221
-#: src/gui/windows/charcreatedialog.cpp:231
-#: src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:196
+#: src/gui/windows/charcreatedialog.cpp:209
+#: src/gui/windows/charcreatedialog.cpp:220
+#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:110
-#: src/gui/windows/charcreatedialog.cpp:600
+#: src/gui/windows/charcreatedialog.cpp:599
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Vänligen distribuera %d poäng"
@@ -6257,73 +6292,71 @@ msgstr "Vänligen distribuera %d poäng"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:201
-#: src/gui/windows/charcreatedialog.cpp:212
-#: src/gui/windows/charcreatedialog.cpp:223
-#: src/gui/windows/charcreatedialog.cpp:233
-#: src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:200
+#: src/gui/windows/charcreatedialog.cpp:211
+#: src/gui/windows/charcreatedialog.cpp:222
+#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:202
 msgid "Hair color:"
 msgstr "Hårfärg:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:213
 msgid "Hair style:"
 msgstr "Hårstil:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:224
 msgid "Race:"
 msgstr "Race:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:234
 msgid "Look:"
 msgstr "Utseende:"
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:252
-#: src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr "F"
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:258
-#: src/gui/windows/charcreatedialog.cpp:265
-#: src/gui/windows/charcreatedialog.cpp:273
+#: src/gui/windows/charcreatedialog.cpp:257
+#: src/gui/windows/charcreatedialog.cpp:264
+#: src/gui/windows/charcreatedialog.cpp:272
 msgid "M"
 msgstr ""
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:260
-#: src/gui/windows/charcreatedialog.cpp:277
+#: src/gui/windows/charcreatedialog.cpp:259
+#: src/gui/windows/charcreatedialog.cpp:276
 #: src/gui/windows/inventorywindow.cpp:223
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:267
+#: src/gui/windows/charcreatedialog.cpp:266
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:474
+#: src/gui/windows/charcreatedialog.cpp:473
 msgid "Your name needs to be at least 4 characters."
 msgstr "Ditt namn måste vara minst 4 tecken långt."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:590
+#: src/gui/windows/charcreatedialog.cpp:589
 msgid "Character stats OK"
 msgstr "Karaktär-stats OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:606
+#: src/gui/windows/charcreatedialog.cpp:605
 #, c-format
 msgid "Please remove %d points"
 msgstr "Vänligen ta bort %d poäng"
@@ -6387,7 +6420,12 @@ msgid ""
 "Level: %u\n"
 "Experience: %u\n"
 "Money: %s"
-msgstr "Hp: %u/%u⏎\nMp: %u/%u⏎\nLevel: %u⏎\nExperience: %u⏎\nMoney: %s"
+msgstr ""
+"Hp: %u/%u⏎\n"
+"Mp: %u/%u⏎\n"
+"Level: %u⏎\n"
+"Experience: %u⏎\n"
+"Money: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/charselectdialog.cpp:308
@@ -6489,8 +6527,7 @@ msgstr "Editera Server"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57
-#: src/gui/windows/serverdialog.cpp:112
+#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:112
 msgid "Connect"
 msgstr "Anslut"
 
@@ -6532,7 +6569,9 @@ msgstr ""
 #. TRANSLATORS: edit server dialog error message
 #: src/gui/windows/editserverdialog.cpp:214
 msgid "Please at least type both the address and the port of the server."
-msgstr "Snälla, kan du inte bara vara vänlig och skriva in både adress och port till servern."
+msgstr ""
+"Snälla, kan du inte bara vara vänlig och skriva in både adress och port till "
+"servern."
 
 #. TRANSLATORS: egg selection dialog name
 #: src/gui/windows/eggselectiondialog.cpp:42
@@ -6848,15 +6887,13 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61
-#: src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr ""
@@ -6965,7 +7002,7 @@ msgstr "job bar"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/windows/ministatuswindow.cpp:356
-#: src/gui/windows/statuswindow.cpp:236
+#: src/gui/windows/statuswindow.cpp:261
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Level: %d (GM %d)"
@@ -7417,33 +7454,33 @@ msgid "Choose your party's name."
 msgstr "Välj ditt party-namn."
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:72
+#: src/gui/windows/statuswindow.cpp:74
 msgid "HP:"
 msgstr "HP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:75
+#: src/gui/windows/statuswindow.cpp:77
 msgid "Exp:"
 msgstr "Exp:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:136
+#: src/gui/windows/statuswindow.cpp:138
 msgid "MP:"
 msgstr "MP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:173 src/gui/windows/statuswindow.cpp:294
+#: src/gui/windows/statuswindow.cpp:175 src/gui/windows/statuswindow.cpp:319
 #, c-format
 msgid "Job: %d"
 msgstr "Jobb: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:175
+#: src/gui/windows/statuswindow.cpp:177
 msgid "Job:"
 msgstr "Jobb:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:224 src/gui/windows/statuswindow.cpp:342
+#: src/gui/windows/statuswindow.cpp:226 src/gui/windows/statuswindow.cpp:367
 #, c-format
 msgid "Character points: %d"
 msgstr "Karaktär-points: %d"
@@ -7561,9 +7598,10 @@ msgstr "Du har inte tillräckligt med pengar."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
-msgstr "Misslyckades att lägga till item. Du kan inte överlappa ens sorts item i fönstret."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+"Misslyckades att lägga till item. Du kan inte överlappa ens sorts item i "
+"fönstret."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:539
@@ -8845,7 +8883,9 @@ msgstr ""
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:75
 msgid "Failed to create character. Most likely the name is already taken."
-msgstr "Misslyckades att skapa karaktär. Troligen på grund av att namnet redan är taget."
+msgstr ""
+"Misslyckades att skapa karaktär. Troligen på grund av att namnet redan är "
+"taget."
 
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:80 src/net/ea/loginrecv.cpp:159
@@ -8988,7 +9028,8 @@ msgstr "Nekad från servern."
 #: src/net/ea/loginrecv.cpp:136 src/net/eathena/loginrecv.cpp:74
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
-msgstr "Du har blivit permanent bannad från spelet. Vänligen kontakta GM-teamet."
+msgstr ""
+"Du har blivit permanent bannad från spelet. Vänligen kontakta GM-teamet."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:141 src/net/eathena/loginrecv.cpp:79
@@ -9001,7 +9042,9 @@ msgstr ""
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
-msgstr "Du har blivit temporärt bannad från spelet tills %s.⏎ Vänligen kontakta GM-teamet via forumet."
+msgstr ""
+"Du har blivit temporärt bannad från spelet tills %s.⏎ Vänligen kontakta GM-"
+"teamet via forumet."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:151 src/net/eathena/loginrecv.cpp:92
@@ -9041,33 +9084,33 @@ msgstr "Anslutningen till servern avslutad. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:431
-#: src/net/eathena/charserverrecv.cpp:479
+#: src/net/eathena/charserverrecv.cpp:398
+#: src/net/eathena/charserverrecv.cpp:446
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:454
+#: src/net/eathena/charserverrecv.cpp:421
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:470
+#: src/net/eathena/charserverrecv.cpp:437
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:474
+#: src/net/eathena/charserverrecv.cpp:441
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:483
+#: src/net/eathena/charserverrecv.cpp:450
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:517 src/net/tmwa/charserverrecv.cpp:339
+#: src/net/eathena/charserverrecv.cpp:484 src/net/tmwa/charserverrecv.cpp:303
 msgid "Failed to delete character."
 msgstr "Misslyckades att radera karaktär."
 
@@ -9119,140 +9162,11 @@ msgstr ""
 msgid "Do you accept %s and %s as parents?"
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:130
-#, c-format
-msgid "Strength %s"
-msgstr "Strength %s"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:132
-#, c-format
-msgid "Agility %s"
-msgstr "Agility %s"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:134
-#, c-format
-msgid "Vitality %s"
-msgstr "Vitality %s"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:136
-#, c-format
-msgid "Intelligence %s"
-msgstr "Intelligence %s"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:138
-#, c-format
-msgid "Dexterity %s"
-msgstr "Dexterity %s"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:140
-#, c-format
-msgid "Luck %s"
-msgstr "Luck %s"
-
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:197 src/net/tmwa/generalhandler.cpp:207
+#: src/net/eathena/generalhandler.cpp:179 src/net/tmwa/generalhandler.cpp:189
 msgid "Got disconnected from server!"
 msgstr "Du blev frånkopplad från servern!"
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:223 src/net/tmwa/generalhandler.cpp:234
-msgid "Strength"
-msgstr "Strength"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:237
-msgid "Agility"
-msgstr "Agility"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:229 src/net/tmwa/generalhandler.cpp:240
-msgid "Vitality"
-msgstr "Vitality"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:243
-msgid "Intelligence"
-msgstr "Intelligence"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:246
-msgid "Dexterity"
-msgstr "Dexterity"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:238 src/net/tmwa/generalhandler.cpp:249
-msgid "Luck"
-msgstr "Luck"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:253
-msgid "Defense"
-msgstr "Defense"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:255
-msgid "M.Attack"
-msgstr "M.Attack"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:257
-msgid "M.Defense"
-msgstr "M.Defense"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:260
-#, no-c-format
-msgid "% Accuracy"
-msgstr "% Accuracy"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:263
-#, no-c-format
-msgid "% Evade"
-msgstr "% Evade"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:266
-#, no-c-format
-msgid "% Critical"
-msgstr "% Critical Hit"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:268
-msgid "Attack Delay"
-msgstr "Attack Delay"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:270
-msgid "Walk Delay"
-msgstr "Walk Delay"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:272
-msgid "Attack Range"
-msgstr "Attack Range"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:274
-msgid "Damage per sec."
-msgstr "Damage per sec."
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266
-msgid "Karma"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268
-msgid "Manner"
-msgstr ""
-
 #. TRANSLATORS: error message
 #: src/net/eathena/generalrecv.cpp:49 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
@@ -9408,7 +9322,7 @@ msgstr ""
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:199
+#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:190
 msgid "Unknown item"
 msgstr "Okänt item"
 
@@ -9684,21 +9598,52 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:93
-#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
-#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
+#: src/resources/db/itemdb.cpp:377 src/resources/db/itemdb.cpp:381
+#: src/resources/db/moddb.cpp:79 src/resources/db/monsterdb.cpp:101
+#: src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "Inte namngiven"
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:104
+#: src/resources/db/petdb.cpp:103
 msgid "pet"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:103
+#: src/resources/db/skillunitdb.cpp:102
 msgid "skill"
 msgstr ""
 
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:45
+msgid "Strength"
+msgstr "Strength"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:49
+msgid "Agility"
+msgstr "Agility"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:53
+msgid "Vitality"
+msgstr "Vitality"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:57
+msgid "Intelligence"
+msgstr "Intelligence"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:61
+msgid "Dexterity"
+msgstr "Dexterity"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:65
+msgid "Luck"
+msgstr "Luck"
+
 #. TRANSLATORS: inventory type name
 #: src/resources/inventory/inventory.cpp:340
 msgid "Npc"
@@ -10350,8 +10295,9 @@ msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:556
-msgid "Room join failed. Not enought money."
-msgstr ""
+#, fuzzy
+msgid "Room join failed. Not enough money."
+msgstr "Du har inte tillräckligt med pengar."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:560
@@ -10618,33 +10564,34 @@ msgstr ""
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:796
 #, c-format
-msgid "You and %s was divorced."
+msgid "You and %s are now divorced."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:800
-msgid "You was called by partner."
+msgid "You were called by your partner."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:804
 #, c-format
-msgid "You calling partner %s."
+msgid "You are calling your partner, %s."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:808
-msgid "Adoption child error. You already have baby."
+msgid "Child adoption failed. You already have a baby."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:812
-msgid "Adoption child error. You level too small for have baby."
+msgid "Child adoption failed. Your level is too low."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:816
-msgid "Adoption child error. This player already married and can't be baby."
+msgid ""
+"Child adoption failed. This player is already married and can't be a baby."
 msgstr ""
 
 #. TRANSLATORS: notification message
@@ -10654,19 +10601,21 @@ msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:825
-msgid "Error saving location. Not enought skill level."
+msgid "Error saving location. Not enough skill level."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:829
-msgid "Error saving location. You not have warp skill."
+msgid "Error saving location. You do not have warp skill."
 msgstr ""
 
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:29
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "Valmöjligheter till /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+"Valmöjligheter till /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", "
+"\"0\"."
 
 #. TRANSLATORS: uptime command
 #: src/utils/stringutils.cpp:946
@@ -10722,3 +10671,51 @@ msgstr "%d sekund"
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekunder"
+
+#~ msgid "Strength %s"
+#~ msgstr "Strength %s"
+
+#~ msgid "Agility %s"
+#~ msgstr "Agility %s"
+
+#~ msgid "Vitality %s"
+#~ msgstr "Vitality %s"
+
+#~ msgid "Intelligence %s"
+#~ msgstr "Intelligence %s"
+
+#~ msgid "Dexterity %s"
+#~ msgstr "Dexterity %s"
+
+#~ msgid "Luck %s"
+#~ msgstr "Luck %s"
+
+#~ msgid "Defense"
+#~ msgstr "Defense"
+
+#~ msgid "M.Attack"
+#~ msgstr "M.Attack"
+
+#~ msgid "M.Defense"
+#~ msgstr "M.Defense"
+
+#~ msgid "% Accuracy"
+#~ msgstr "% Accuracy"
+
+#~ msgid "% Evade"
+#~ msgstr "% Evade"
+
+#~ msgid "% Critical"
+#~ msgstr "% Critical Hit"
+
+#~ msgid "Attack Delay"
+#~ msgstr "Attack Delay"
+
+#~ msgid "Walk Delay"
+#~ msgstr "Walk Delay"
+
+#~ msgid "Attack Range"
+#~ msgstr "Attack Range"
+
+#~ msgid "Damage per sec."
+#~ msgstr "Damage per sec."
diff --git a/po/sv_SE.po b/po/sv_SE.po
index fd9eb2028..df4d89661 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -1,21 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Kristoffer Frisell <kristoffer@frisell.it>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-06-18 18:53+0300\n"
+"POT-Creation-Date: 2016-07-02 19:47+0300\n"
 "PO-Revision-Date: 2016-06-19 09:21+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Swedish (Sweden) (http://www.transifex.com/akaras/manaplus/language/sv_SE/)\n"
+"Language-Team: Swedish (Sweden) (http://www.transifex.com/akaras/manaplus/"
+"language/sv_SE/)\n"
+"Language: sv_SE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sv_SE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
@@ -32,7 +33,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:171 src/client.cpp:1569 src/client.cpp:1604
+#: src/actions/actions.cpp:171 src/client.cpp:1572 src/client.cpp:1607
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
@@ -43,7 +44,7 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_video.cpp:420
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:476
+#: src/gui/windows/charcreatedialog.cpp:475
 #: src/gui/windows/charselectdialog.cpp:262
 #: src/gui/windows/charselectdialog.cpp:310 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:59
@@ -52,9 +53,9 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:531
 #: src/gui/windows/textdialog.cpp:53 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:456
-#: src/net/eathena/charserverrecv.cpp:491
-#: src/net/eathena/charserverrecv.cpp:519 src/net/tmwa/charserverrecv.cpp:341
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:423
+#: src/net/eathena/charserverrecv.cpp:458
+#: src/net/eathena/charserverrecv.cpp:486 src/net/tmwa/charserverrecv.cpp:305
 msgid "OK"
 msgstr "OK"
 
@@ -301,26 +302,26 @@ msgid "Visible on map"
 msgstr "Synlig på karta"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:496
+#: src/being/being.cpp:494
 msgid "Human"
 msgstr "Människa"
 
 #. TRANSLATORS: dodge or miss message in attacks
-#: src/being/being.cpp:683
+#: src/being/being.cpp:676
 msgid "dodge"
 msgstr "undvika"
 
-#: src/being/being.cpp:683
+#: src/being/being.cpp:676
 msgid "miss"
 msgstr "missa"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2282 src/gui/windows/whoisonline.cpp:882
+#: src/being/being.cpp:2275 src/gui/windows/whoisonline.cpp:882
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2287 src/gui/windows/whoisonline.cpp:887
+#: src/being/being.cpp:2280 src/gui/windows/whoisonline.cpp:887
 msgid "I"
 msgstr "I"
 
@@ -471,41 +472,41 @@ msgstr "Floating bubble"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:870 src/dyetool/client.cpp:491 src/gui/windowmenu.cpp:189
+#: src/client.cpp:872 src/dyetool/client.cpp:491 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:66
 msgid "Setup"
 msgstr "Inställningar"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:873 src/dyetool/client.cpp:494
+#: src/client.cpp:875 src/dyetool/client.cpp:494
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:876 src/dyetool/client.cpp:497
+#: src/client.cpp:878 src/dyetool/client.cpp:497
 #: src/gui/widgets/tabs/setup_video.cpp:110
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:879 src/dyetool/client.cpp:500
+#: src/client.cpp:881 src/dyetool/client.cpp:500
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:882 src/dyetool/client.cpp:503
+#: src/client.cpp:884 src/dyetool/client.cpp:503
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:885 src/dyetool/client.cpp:506 src/gui/windowmenu.cpp:74
+#: src/client.cpp:887 src/dyetool/client.cpp:506 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Hjälp"
@@ -526,7 +527,7 @@ msgstr "Hjälp"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:889 src/client.cpp:1483 src/client.cpp:1502
+#: src/client.cpp:891 src/client.cpp:1486 src/client.cpp:1505
 #: src/dyetool/client.cpp:510 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:756 src/gui/popups/popupmenu.cpp:833
 #: src/gui/popups/popupmenu.cpp:1087 src/gui/windows/didyouknowwindow.cpp:81
@@ -539,32 +540,32 @@ msgid "Close"
 msgstr "Stäng"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1115 src/gui/windowmanager_unittest.cc:156
+#: src/client.cpp:1117 src/gui/windowmanager_unittest.cc:156
 msgid "Connecting to server"
 msgstr "Ansluter till server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1172 src/gui/windowmanager_unittest.cc:173
+#: src/client.cpp:1174 src/gui/windowmanager_unittest.cc:173
 msgid "Logging in"
 msgstr "Loggar in"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1221
+#: src/client.cpp:1223
 msgid "Entering game world"
 msgstr "Går in i spelvärld"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1369
+#: src/client.cpp:1372
 msgid "Requesting characters"
 msgstr "Begär karaktärer"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1412
+#: src/client.cpp:1415
 msgid "Connecting to the game server"
 msgstr "Ansluter till spelservern"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1424
+#: src/client.cpp:1427
 msgid "Changing game servers"
 msgstr "Ändrar spelserver"
 
@@ -581,52 +582,52 @@ msgstr "Ändrar spelserver"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1480 src/client.cpp:1499 src/client.cpp:1738
+#: src/client.cpp:1483 src/client.cpp:1502 src/client.cpp:1741
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:472
+#: src/gui/windows/charcreatedialog.cpp:471
 #: src/gui/windows/charselectdialog.cpp:306
 #: src/gui/windows/editserverdialog.cpp:212
 #: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:429
-#: src/net/eathena/charserverrecv.cpp:433
-#: src/net/eathena/charserverrecv.cpp:515 src/net/tmwa/charserverrecv.cpp:337
+#: src/net/eathena/charserverrecv.cpp:396
+#: src/net/eathena/charserverrecv.cpp:400
+#: src/net/eathena/charserverrecv.cpp:482 src/net/tmwa/charserverrecv.cpp:301
 msgid "Error"
 msgstr "Error"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1518
+#: src/client.cpp:1521
 msgid "Requesting registration details"
 msgstr "Begär registreringsuppgifter"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1565
+#: src/client.cpp:1568
 msgid "Password Change"
 msgstr "Lösenordsändring"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1567
+#: src/client.cpp:1570
 msgid "Password changed successfully!"
 msgstr "Lösenordsändring har lyckats!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1600
+#: src/client.cpp:1603
 msgid "Email Change"
 msgstr "Byte av E-post"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1602
+#: src/client.cpp:1605
 msgid "Email changed successfully!"
 msgstr "E-posten har ändrats!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1638
+#: src/client.cpp:1641
 msgid "Unregister Successful"
 msgstr "Avregistrering lyckad"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1640
+#: src/client.cpp:1643
 msgid "Farewell, come back any time..."
 msgstr "Farväl, kom gärna tillbaka snart igen..."
 
@@ -678,7 +679,8 @@ msgstr "  -h --help           : Visa hjälp"
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:65
 msgid "  -C --config-dir     : Configuration directory to use"
-msgstr "  -C --config-dir     : Konfiguration för vilken katalog som ska användas"
+msgstr ""
+"  -C --config-dir     : Konfiguration för vilken katalog som ska användas"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:68
@@ -753,7 +755,9 @@ msgstr ""
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:112
 msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr "  -T --tests          : Börja testning av drivrutiner och automat-configurering"
+msgstr ""
+"  -T --tests          : Börja testning av drivrutiner och automat-"
+"configurering"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:118
@@ -819,23 +823,23 @@ msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:598
+#: src/game.cpp:600
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Skärmdump sparades som %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:608
+#: src/game.cpp:610
 msgid "Saving screenshot failed!"
 msgstr "Spara skärmdump misslyckades!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:695
+#: src/game.cpp:697
 msgid "The connection to the server was lost."
 msgstr "Anslutningen till servern förlorades."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:698
+#: src/game.cpp:700
 msgid "Network Error"
 msgstr "Nätverksfel"
 
@@ -1250,8 +1254,7 @@ msgstr "Återuppliva"
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
+"You are carrying more than half your weight. You are unable to regain health."
 msgstr "Du bär på mer än halva din vikt. Du kan inte återfå health."
 
 #. TRANSLATORS: weight message
@@ -1268,8 +1271,7 @@ msgstr "Du bär på mindre än hälften av din vikt. Du kan återfå health."
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:671
-#: src/gui/windows/serverdialog.cpp:603
+#: src/gui/windows/equipmentwindow.cpp:671 src/gui/windows/serverdialog.cpp:603
 msgid "default"
 msgstr "standard"
 
@@ -1821,11 +1823,9 @@ msgstr "Trade"
 #. TRANSLATORS: attack player
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
-#. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:180 src/gui/popups/popupmenu.cpp:304
 #: src/gui/popups/popupmenu.cpp:912 src/gui/widgets/skillinfo.cpp:125
-#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
-#: src/net/tmwa/generalhandler.cpp:251
+#: src/input/pages/basic.cpp:40
 msgid "Attack"
 msgstr "Attackera"
 
@@ -1901,7 +1901,7 @@ msgstr "Flytta"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:270 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:152
+#: src/resources/db/npcdb.cpp:151
 msgid "Talk"
 msgstr "Prata med"
 
@@ -1919,7 +1919,7 @@ msgstr "Prata med"
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:154
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:153
 msgid "Buy"
 msgstr "Köp"
 
@@ -1937,7 +1937,7 @@ msgstr "Köp"
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
 #: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:256
-#: src/resources/db/npcdb.cpp:156
+#: src/resources/db/npcdb.cpp:155
 msgid "Sell"
 msgstr "Sälj"
 
@@ -2039,7 +2039,7 @@ msgstr "Unequip"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:408 src/resources/db/petdb.cpp:160
+#: src/gui/popups/popupmenu.cpp:408 src/resources/db/petdb.cpp:159
 msgid "Return to egg"
 msgstr ""
 
@@ -2436,7 +2436,7 @@ msgstr "Återställ yellow bar"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2125 src/gui/windows/statuswindow.cpp:90
 msgid "Copy to chat"
 msgstr "Kopiera till chat"
 
@@ -2488,9 +2488,8 @@ msgstr "Visa fönster"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/popups/popupmenu.cpp:2386 src/gui/popups/skillpopup.cpp:127
-#: src/gui/windows/ministatuswindow.cpp:363
-#: src/gui/windows/statuswindow.cpp:68 src/gui/windows/statuswindow.cpp:243
-#: src/gui/windows/statuswindow.cpp:367
+#: src/gui/windows/ministatuswindow.cpp:363 src/gui/windows/statuswindow.cpp:70
+#: src/gui/windows/statuswindow.cpp:268 src/gui/windows/statuswindow.cpp:392
 #, c-format
 msgid "Level: %d"
 msgstr "Level: %d"
@@ -2909,8 +2908,8 @@ msgstr ""
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3100 src/gui/popups/popupmenu.cpp:3119
 #: src/gui/popups/popupmenu.cpp:3132 src/gui/windows/charselectdialog.cpp:76
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:452
-#: src/net/eathena/charserverrecv.cpp:488
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:419
+#: src/net/eathena/charserverrecv.cpp:455
 msgid "Info"
 msgstr "Info"
 
@@ -3301,8 +3300,8 @@ msgstr "Level: %u"
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/statuswindow.cpp:70
-#: src/gui/windows/statuswindow.cpp:220 src/gui/windows/statuswindow.cpp:334
+#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/statuswindow.cpp:72
+#: src/gui/windows/statuswindow.cpp:222 src/gui/windows/statuswindow.cpp:359
 #, c-format
 msgid "Money: %s"
 msgstr "Money: %s"
@@ -3358,7 +3357,7 @@ msgstr "Avsluta"
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:194
 #: src/gui/windows/itemamountwindow.cpp:230 src/gui/windows/npcdialog.cpp:123
-#: src/gui/windows/statuswindow.cpp:746
+#: src/gui/windows/statuswindow.cpp:771
 msgid "+"
 msgstr "+"
 
@@ -3379,8 +3378,8 @@ msgstr "-"
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/selldialog.cpp:133 src/gui/windows/buydialog.cpp:299
-#: src/gui/windows/statuswindow.cpp:483 src/gui/windows/statuswindow.cpp:539
-#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:766
+#: src/gui/windows/statuswindow.cpp:508 src/gui/windows/statuswindow.cpp:564
+#: src/gui/windows/statuswindow.cpp:769 src/gui/windows/statuswindow.cpp:791
 msgid "Max"
 msgstr "Max"
 
@@ -3536,15 +3535,13 @@ msgstr "Item-delning aktiverad."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104
-#: src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr "Item-delning avaktiverad."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109
-#: src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr "Item-delning är inte möjlig."
 
@@ -3555,22 +3552,19 @@ msgstr "Item-delning okänd."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150
-#: src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr "Exp-delning är aktiverad."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155
-#: src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr "Exp-delning avaktiverad."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160
-#: src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr "Exp-delning är inte möjlig."
 
@@ -4004,15 +3998,15 @@ msgstr ""
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
+"Note: no other text inputs will be allowed to receive text input when you "
+"typing in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86
-#: src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr "Färger"
 
@@ -4036,9 +4030,11 @@ msgstr "Visa chat-färglistan"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat "
+"window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4065,9 +4061,11 @@ msgstr "Begränsa max-tecken i chatten"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed "
+"in chat.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will be truncated."
+"Note: long lines can make client slower. Lines longer than this limit will "
+"be truncated."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4078,7 +4076,9 @@ msgstr "Begränsa max-rader i chatten"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
+"specified number of last lines of text. Oldest lines exceeding this limit "
+"are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
 msgstr ""
@@ -4119,8 +4119,8 @@ msgstr "Visa chat-historik"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on"
-" startup instead of starting with empty chat tabs."
+"If this setting enabled, client will load old chat tabs content from logs on "
+"startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4131,9 +4131,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be "
+"shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4144,9 +4146,11 @@ msgstr "Visa online-meddelande för guild"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be "
+"shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4162,9 +4166,13 @@ msgstr "Dölj shop-meddelanden"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will "
+"be displayed in chat. Disable this setting if you want to see shop-related "
+"messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
+"Note: technically, ManaPlus shop implemented as usual private messages with "
+"special content. If you disable this setting, you will be able to see these "
+"messages and get idea when other players are looking at your shop."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4177,7 +4185,8 @@ msgstr "Visa MVP-meddelanden"
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
+"usually makes little difference."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4196,9 +4205,12 @@ msgstr "Lägg alla viskningar i flikar"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in "
+"separate tabs, separate tab for each player. If this setting disabled, all "
+"whispers will appear in General tab.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
+"Note: putting all whispers to single General tab is known to be confusing. "
+"Think twice before disabling this feature."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4209,7 +4221,8 @@ msgstr "Logga magic messages i log-tabben"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If "
+"disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
 msgstr ""
@@ -4222,9 +4235,11 @@ msgstr "Visa servermeddelanden i log-fliken"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of "
+"chat. If disabled, server messages will appear in General chat instead.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
+"Note: according to 4144, disabling this could also make you to lose some "
+"debug messages from client in Debug tab since these are fake server messages."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4249,9 +4264,11 @@ msgstr "Aktivera GM-flik"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM "
+"activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
+"Note: this setting only makes difference for GMs (Game Masters) since this "
+"tab only appears for GMs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4262,7 +4279,8 @@ msgstr "Aktivera språk-flik"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this feature.\n"
+"If this feature enabled, language tab will appear if server supports this "
+"feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
 msgstr ""
@@ -4275,7 +4293,9 @@ msgstr "Visa alla språk-meddelanden"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
+"If this setting enabled and server supports different chats for different "
+"languages, you will see messages for all languages, regardless of your "
+"language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
 msgstr ""
@@ -4288,7 +4308,9 @@ msgstr "Aktivera battle-flik"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will "
+"contain messages related to battles, like damage and experience gain, if "
+"battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
 msgstr ""
@@ -4314,7 +4336,10 @@ msgstr "Ändra storlek på chat-flikarna om det behövs"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to "
+"adapt to appearance of chat input field when you typing message and when "
+"input field of chat disappears. If disabled, chat input area will always "
+"occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
@@ -4349,7 +4374,8 @@ msgstr "Highlighta ord (separerat med komma)"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. "
+"Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
 msgstr ""
@@ -4362,7 +4388,8 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender "
+"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
 msgstr ""
@@ -4375,9 +4402,12 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This "
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by "
+"default."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4491,7 +4521,9 @@ msgstr "Tangent-konflikt(er) uppmärksammade."
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr "Konflikt mellan knapparna \"%s\" och \"%s\". Om detta inte löses kan spelet uppföra sig konstigt."
+msgstr ""
+"Konflikt mellan knapparna \"%s\" och \"%s\". Om detta inte löses kan spelet "
+"uppföra sig konstigt."
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
@@ -4876,7 +4908,8 @@ msgstr "Bots support"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_other.cpp:307
 msgid "Enable guild bot support and disable native guild support"
-msgstr "Aktivera support för guild-bot och avaktivera grund-supporten för guild"
+msgstr ""
+"Aktivera support för guild-bot och avaktivera grund-supporten för guild"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_other.cpp:313
@@ -5539,13 +5572,17 @@ msgstr "Ingen"
 #: src/gui/widgets/tabs/setup_video.cpp:233
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr "Misslyckades att ändra till fönster-läge och återställandet av det gamla läget misslyckades också!"
+msgstr ""
+"Misslyckades att ändra till fönster-läge och återställandet av det gamla "
+"läget misslyckades också!"
 
 #. TRANSLATORS: video error message
 #: src/gui/widgets/tabs/setup_video.cpp:240
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr "Misslyckades att ändra till fullskärms-läge och återställandet av det gamla läget misslyckades också!"
+msgstr ""
+"Misslyckades att ändra till fullskärms-läge och återställandet av det gamla "
+"läget misslyckades också!"
 
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -6121,8 +6158,7 @@ msgstr "Antal:"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:618
-#: src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:618 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Skapa"
 
@@ -6238,17 +6274,16 @@ msgstr "^"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:104
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:210
-#: src/gui/windows/charcreatedialog.cpp:221
-#: src/gui/windows/charcreatedialog.cpp:231
-#: src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:196
+#: src/gui/windows/charcreatedialog.cpp:209
+#: src/gui/windows/charcreatedialog.cpp:220
+#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:110
-#: src/gui/windows/charcreatedialog.cpp:600
+#: src/gui/windows/charcreatedialog.cpp:599
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Vänligen distribuera %d poäng"
@@ -6257,73 +6292,71 @@ msgstr "Vänligen distribuera %d poäng"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:201
-#: src/gui/windows/charcreatedialog.cpp:212
-#: src/gui/windows/charcreatedialog.cpp:223
-#: src/gui/windows/charcreatedialog.cpp:233
-#: src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:200
+#: src/gui/windows/charcreatedialog.cpp:211
+#: src/gui/windows/charcreatedialog.cpp:222
+#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:202
 msgid "Hair color:"
 msgstr "Hårfärg:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:213
 msgid "Hair style:"
 msgstr "Hårstil:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:224
 msgid "Race:"
 msgstr "Race:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:234
 msgid "Look:"
 msgstr "Utseende:"
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:252
-#: src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr "F"
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:258
-#: src/gui/windows/charcreatedialog.cpp:265
-#: src/gui/windows/charcreatedialog.cpp:273
+#: src/gui/windows/charcreatedialog.cpp:257
+#: src/gui/windows/charcreatedialog.cpp:264
+#: src/gui/windows/charcreatedialog.cpp:272
 msgid "M"
 msgstr ""
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:260
-#: src/gui/windows/charcreatedialog.cpp:277
+#: src/gui/windows/charcreatedialog.cpp:259
+#: src/gui/windows/charcreatedialog.cpp:276
 #: src/gui/windows/inventorywindow.cpp:223
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:267
+#: src/gui/windows/charcreatedialog.cpp:266
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:474
+#: src/gui/windows/charcreatedialog.cpp:473
 msgid "Your name needs to be at least 4 characters."
 msgstr "Ditt namn måste vara minst 4 tecken långt."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:590
+#: src/gui/windows/charcreatedialog.cpp:589
 msgid "Character stats OK"
 msgstr "Karaktär-stats OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:606
+#: src/gui/windows/charcreatedialog.cpp:605
 #, c-format
 msgid "Please remove %d points"
 msgstr "Vänligen ta bort %d poäng"
@@ -6387,7 +6420,12 @@ msgid ""
 "Level: %u\n"
 "Experience: %u\n"
 "Money: %s"
-msgstr "Hp: %u/%u⏎\nMp: %u/%u⏎\nLevel: %u⏎\nExperience: %u⏎\nMoney: %s"
+msgstr ""
+"Hp: %u/%u⏎\n"
+"Mp: %u/%u⏎\n"
+"Level: %u⏎\n"
+"Experience: %u⏎\n"
+"Money: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/charselectdialog.cpp:308
@@ -6489,8 +6527,7 @@ msgstr "Editera Server"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57
-#: src/gui/windows/serverdialog.cpp:112
+#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:112
 msgid "Connect"
 msgstr "Anslut"
 
@@ -6532,7 +6569,9 @@ msgstr ""
 #. TRANSLATORS: edit server dialog error message
 #: src/gui/windows/editserverdialog.cpp:214
 msgid "Please at least type both the address and the port of the server."
-msgstr "Snälla, kan du inte bara vara vänlig och skriva in både adress och port till servern."
+msgstr ""
+"Snälla, kan du inte bara vara vänlig och skriva in både adress och port till "
+"servern."
 
 #. TRANSLATORS: egg selection dialog name
 #: src/gui/windows/eggselectiondialog.cpp:42
@@ -6848,15 +6887,13 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61
-#: src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr ""
@@ -6965,7 +7002,7 @@ msgstr "job bar"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/windows/ministatuswindow.cpp:356
-#: src/gui/windows/statuswindow.cpp:236
+#: src/gui/windows/statuswindow.cpp:261
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Level: %d (GM %d)"
@@ -7417,33 +7454,33 @@ msgid "Choose your party's name."
 msgstr "Välj ditt party-namn."
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:72
+#: src/gui/windows/statuswindow.cpp:74
 msgid "HP:"
 msgstr "HP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:75
+#: src/gui/windows/statuswindow.cpp:77
 msgid "Exp:"
 msgstr "Exp:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:136
+#: src/gui/windows/statuswindow.cpp:138
 msgid "MP:"
 msgstr "MP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:173 src/gui/windows/statuswindow.cpp:294
+#: src/gui/windows/statuswindow.cpp:175 src/gui/windows/statuswindow.cpp:319
 #, c-format
 msgid "Job: %d"
 msgstr "Jobb: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:175
+#: src/gui/windows/statuswindow.cpp:177
 msgid "Job:"
 msgstr "Jobb:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:224 src/gui/windows/statuswindow.cpp:342
+#: src/gui/windows/statuswindow.cpp:226 src/gui/windows/statuswindow.cpp:367
 #, c-format
 msgid "Character points: %d"
 msgstr "Karaktär-points: %d"
@@ -7561,9 +7598,10 @@ msgstr "Du har inte tillräckligt med pengar."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
-msgstr "Misslyckades att lägga till item. Du kan inte överlappa ens sorts item i fönstret."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+"Misslyckades att lägga till item. Du kan inte överlappa ens sorts item i "
+"fönstret."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:539
@@ -8845,7 +8883,9 @@ msgstr ""
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:75
 msgid "Failed to create character. Most likely the name is already taken."
-msgstr "Misslyckades att skapa karaktär. Troligen på grund av att namnet redan är taget."
+msgstr ""
+"Misslyckades att skapa karaktär. Troligen på grund av att namnet redan är "
+"taget."
 
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:80 src/net/ea/loginrecv.cpp:159
@@ -8988,7 +9028,8 @@ msgstr "Nekad från servern."
 #: src/net/ea/loginrecv.cpp:136 src/net/eathena/loginrecv.cpp:74
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
-msgstr "Du har blivit permanent bannad från spelet. Vänligen kontakta GM-teamet."
+msgstr ""
+"Du har blivit permanent bannad från spelet. Vänligen kontakta GM-teamet."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:141 src/net/eathena/loginrecv.cpp:79
@@ -9001,7 +9042,9 @@ msgstr ""
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
-msgstr "Du har blivit temporärt bannad från spelet tills %s.⏎ Vänligen kontakta GM-teamet via forumet."
+msgstr ""
+"Du har blivit temporärt bannad från spelet tills %s.⏎ Vänligen kontakta GM-"
+"teamet via forumet."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:151 src/net/eathena/loginrecv.cpp:92
@@ -9041,33 +9084,33 @@ msgstr "Anslutningen till servern avslutad. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:431
-#: src/net/eathena/charserverrecv.cpp:479
+#: src/net/eathena/charserverrecv.cpp:398
+#: src/net/eathena/charserverrecv.cpp:446
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:454
+#: src/net/eathena/charserverrecv.cpp:421
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:470
+#: src/net/eathena/charserverrecv.cpp:437
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:474
+#: src/net/eathena/charserverrecv.cpp:441
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:483
+#: src/net/eathena/charserverrecv.cpp:450
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:517 src/net/tmwa/charserverrecv.cpp:339
+#: src/net/eathena/charserverrecv.cpp:484 src/net/tmwa/charserverrecv.cpp:303
 msgid "Failed to delete character."
 msgstr "Misslyckades att radera karaktär."
 
@@ -9119,140 +9162,11 @@ msgstr ""
 msgid "Do you accept %s and %s as parents?"
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:130
-#, c-format
-msgid "Strength %s"
-msgstr "Strength %s"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:132
-#, c-format
-msgid "Agility %s"
-msgstr "Agility %s"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:134
-#, c-format
-msgid "Vitality %s"
-msgstr "Vitality %s"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:136
-#, c-format
-msgid "Intelligence %s"
-msgstr "Intelligence %s"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:138
-#, c-format
-msgid "Dexterity %s"
-msgstr "Dexterity %s"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:140
-#, c-format
-msgid "Luck %s"
-msgstr "Luck %s"
-
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:197 src/net/tmwa/generalhandler.cpp:207
+#: src/net/eathena/generalhandler.cpp:179 src/net/tmwa/generalhandler.cpp:189
 msgid "Got disconnected from server!"
 msgstr "Du blev frånkopplad från servern!"
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:223 src/net/tmwa/generalhandler.cpp:234
-msgid "Strength"
-msgstr "Strength"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:237
-msgid "Agility"
-msgstr "Agility"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:229 src/net/tmwa/generalhandler.cpp:240
-msgid "Vitality"
-msgstr "Vitality"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:243
-msgid "Intelligence"
-msgstr "Intelligence"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:246
-msgid "Dexterity"
-msgstr "Dexterity"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:238 src/net/tmwa/generalhandler.cpp:249
-msgid "Luck"
-msgstr "Luck"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:253
-msgid "Defense"
-msgstr "Defense"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:255
-msgid "M.Attack"
-msgstr "M.Attack"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:257
-msgid "M.Defense"
-msgstr "M.Defense"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:260
-#, no-c-format
-msgid "% Accuracy"
-msgstr "% Accuracy"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:263
-#, no-c-format
-msgid "% Evade"
-msgstr "% Evade"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:266
-#, no-c-format
-msgid "% Critical"
-msgstr "% Critical Hit"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:268
-msgid "Attack Delay"
-msgstr "Attack Delay"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:270
-msgid "Walk Delay"
-msgstr "Walk Delay"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:272
-msgid "Attack Range"
-msgstr "Attack Range"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:274
-msgid "Damage per sec."
-msgstr "Damage per sec."
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266
-msgid "Karma"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268
-msgid "Manner"
-msgstr ""
-
 #. TRANSLATORS: error message
 #: src/net/eathena/generalrecv.cpp:49 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
@@ -9408,7 +9322,7 @@ msgstr ""
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:199
+#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:190
 msgid "Unknown item"
 msgstr "Okänt item"
 
@@ -9684,21 +9598,52 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:93
-#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
-#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
+#: src/resources/db/itemdb.cpp:377 src/resources/db/itemdb.cpp:381
+#: src/resources/db/moddb.cpp:79 src/resources/db/monsterdb.cpp:101
+#: src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "Inte namngiven"
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:104
+#: src/resources/db/petdb.cpp:103
 msgid "pet"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:103
+#: src/resources/db/skillunitdb.cpp:102
 msgid "skill"
 msgstr ""
 
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:45
+msgid "Strength"
+msgstr "Strength"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:49
+msgid "Agility"
+msgstr "Agility"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:53
+msgid "Vitality"
+msgstr "Vitality"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:57
+msgid "Intelligence"
+msgstr "Intelligence"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:61
+msgid "Dexterity"
+msgstr "Dexterity"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:65
+msgid "Luck"
+msgstr "Luck"
+
 #. TRANSLATORS: inventory type name
 #: src/resources/inventory/inventory.cpp:340
 msgid "Npc"
@@ -10350,8 +10295,9 @@ msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:556
-msgid "Room join failed. Not enought money."
-msgstr ""
+#, fuzzy
+msgid "Room join failed. Not enough money."
+msgstr "Du har inte tillräckligt med pengar."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:560
@@ -10618,33 +10564,34 @@ msgstr ""
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:796
 #, c-format
-msgid "You and %s was divorced."
+msgid "You and %s are now divorced."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:800
-msgid "You was called by partner."
+msgid "You were called by your partner."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:804
 #, c-format
-msgid "You calling partner %s."
+msgid "You are calling your partner, %s."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:808
-msgid "Adoption child error. You already have baby."
+msgid "Child adoption failed. You already have a baby."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:812
-msgid "Adoption child error. You level too small for have baby."
+msgid "Child adoption failed. Your level is too low."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:816
-msgid "Adoption child error. This player already married and can't be baby."
+msgid ""
+"Child adoption failed. This player is already married and can't be a baby."
 msgstr ""
 
 #. TRANSLATORS: notification message
@@ -10654,19 +10601,21 @@ msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:825
-msgid "Error saving location. Not enought skill level."
+msgid "Error saving location. Not enough skill level."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:829
-msgid "Error saving location. You not have warp skill."
+msgid "Error saving location. You do not have warp skill."
 msgstr ""
 
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:29
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "Valmöjligheter till /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+"Valmöjligheter till /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", "
+"\"0\"."
 
 #. TRANSLATORS: uptime command
 #: src/utils/stringutils.cpp:946
@@ -10722,3 +10671,51 @@ msgstr "%d sekund"
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekunder"
+
+#~ msgid "Strength %s"
+#~ msgstr "Strength %s"
+
+#~ msgid "Agility %s"
+#~ msgstr "Agility %s"
+
+#~ msgid "Vitality %s"
+#~ msgstr "Vitality %s"
+
+#~ msgid "Intelligence %s"
+#~ msgstr "Intelligence %s"
+
+#~ msgid "Dexterity %s"
+#~ msgstr "Dexterity %s"
+
+#~ msgid "Luck %s"
+#~ msgstr "Luck %s"
+
+#~ msgid "Defense"
+#~ msgstr "Defense"
+
+#~ msgid "M.Attack"
+#~ msgstr "M.Attack"
+
+#~ msgid "M.Defense"
+#~ msgstr "M.Defense"
+
+#~ msgid "% Accuracy"
+#~ msgstr "% Accuracy"
+
+#~ msgid "% Evade"
+#~ msgstr "% Evade"
+
+#~ msgid "% Critical"
+#~ msgstr "% Critical Hit"
+
+#~ msgid "Attack Delay"
+#~ msgstr "Attack Delay"
+
+#~ msgid "Walk Delay"
+#~ msgstr "Walk Delay"
+
+#~ msgid "Attack Range"
+#~ msgstr "Attack Range"
+
+#~ msgid "Damage per sec."
+#~ msgstr "Damage per sec."
diff --git a/po/tr.po b/po/tr.po
index c3324b276..00da72839 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011
 # Oben Devin Çetiner <hiironohige@gmail.com>, 2012
@@ -10,14 +10,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-06-18 18:53+0300\n"
+"POT-Creation-Date: 2016-07-02 19:47+0300\n"
 "PO-Revision-Date: 2016-06-19 09:21+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Turkish (http://www.transifex.com/akaras/manaplus/language/tr/)\n"
+"Language-Team: Turkish (http://www.transifex.com/akaras/manaplus/language/"
+"tr/)\n"
+"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. TRANSLATORS: file uploaded message
@@ -34,7 +35,7 @@ msgstr "Dosya yüklendi"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:171 src/client.cpp:1569 src/client.cpp:1604
+#: src/actions/actions.cpp:171 src/client.cpp:1572 src/client.cpp:1607
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
@@ -45,7 +46,7 @@ msgstr "Dosya yüklendi"
 #: src/gui/widgets/tabs/setup_video.cpp:420
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:476
+#: src/gui/windows/charcreatedialog.cpp:475
 #: src/gui/windows/charselectdialog.cpp:262
 #: src/gui/windows/charselectdialog.cpp:310 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:59
@@ -54,9 +55,9 @@ msgstr "Dosya yüklendi"
 #: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:531
 #: src/gui/windows/textdialog.cpp:53 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:456
-#: src/net/eathena/charserverrecv.cpp:491
-#: src/net/eathena/charserverrecv.cpp:519 src/net/tmwa/charserverrecv.cpp:341
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:423
+#: src/net/eathena/charserverrecv.cpp:458
+#: src/net/eathena/charserverrecv.cpp:486 src/net/tmwa/charserverrecv.cpp:305
 msgid "OK"
 msgstr "TAMAM"
 
@@ -303,26 +304,26 @@ msgid "Visible on map"
 msgstr "Haritada görünür"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:496
+#: src/being/being.cpp:494
 msgid "Human"
 msgstr "İnsan"
 
 #. TRANSLATORS: dodge or miss message in attacks
-#: src/being/being.cpp:683
+#: src/being/being.cpp:676
 msgid "dodge"
 msgstr "kaçınıldı"
 
-#: src/being/being.cpp:683
+#: src/being/being.cpp:676
 msgid "miss"
 msgstr "kaçırıldı"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2282 src/gui/windows/whoisonline.cpp:882
+#: src/being/being.cpp:2275 src/gui/windows/whoisonline.cpp:882
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2287 src/gui/windows/whoisonline.cpp:887
+#: src/being/being.cpp:2280 src/gui/windows/whoisonline.cpp:887
 msgid "I"
 msgstr "İ"
 
@@ -473,41 +474,41 @@ msgstr "Yüzen balon"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:870 src/dyetool/client.cpp:491 src/gui/windowmenu.cpp:189
+#: src/client.cpp:872 src/dyetool/client.cpp:491 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:66
 msgid "Setup"
 msgstr "Ayarlar"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:873 src/dyetool/client.cpp:494
+#: src/client.cpp:875 src/dyetool/client.cpp:494
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Performans"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:876 src/dyetool/client.cpp:497
+#: src/client.cpp:878 src/dyetool/client.cpp:497
 #: src/gui/widgets/tabs/setup_video.cpp:110
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:879 src/dyetool/client.cpp:500
+#: src/client.cpp:881 src/dyetool/client.cpp:500
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:882 src/dyetool/client.cpp:503
+#: src/client.cpp:884 src/dyetool/client.cpp:503
 msgid "About"
 msgstr "Hakkında"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:885 src/dyetool/client.cpp:506 src/gui/windowmenu.cpp:74
+#: src/client.cpp:887 src/dyetool/client.cpp:506 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Yardım"
@@ -528,7 +529,7 @@ msgstr "Yardım"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:889 src/client.cpp:1483 src/client.cpp:1502
+#: src/client.cpp:891 src/client.cpp:1486 src/client.cpp:1505
 #: src/dyetool/client.cpp:510 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:756 src/gui/popups/popupmenu.cpp:833
 #: src/gui/popups/popupmenu.cpp:1087 src/gui/windows/didyouknowwindow.cpp:81
@@ -541,32 +542,32 @@ msgid "Close"
 msgstr "Kapat"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1115 src/gui/windowmanager_unittest.cc:156
+#: src/client.cpp:1117 src/gui/windowmanager_unittest.cc:156
 msgid "Connecting to server"
 msgstr "Sunucuya bağlanılıyor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1172 src/gui/windowmanager_unittest.cc:173
+#: src/client.cpp:1174 src/gui/windowmanager_unittest.cc:173
 msgid "Logging in"
 msgstr "Giriş yapılıyor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1221
+#: src/client.cpp:1223
 msgid "Entering game world"
 msgstr "Oyun dünyasına giriliyor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1369
+#: src/client.cpp:1372
 msgid "Requesting characters"
 msgstr "Karakterler isteniliyor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1412
+#: src/client.cpp:1415
 msgid "Connecting to the game server"
 msgstr "Oyun sunucusuna bağlanılıyor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1424
+#: src/client.cpp:1427
 msgid "Changing game servers"
 msgstr "Oyun sunucusu değiştiriliyor"
 
@@ -583,52 +584,52 @@ msgstr "Oyun sunucusu değiştiriliyor"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1480 src/client.cpp:1499 src/client.cpp:1738
+#: src/client.cpp:1483 src/client.cpp:1502 src/client.cpp:1741
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:472
+#: src/gui/windows/charcreatedialog.cpp:471
 #: src/gui/windows/charselectdialog.cpp:306
 #: src/gui/windows/editserverdialog.cpp:212
 #: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:429
-#: src/net/eathena/charserverrecv.cpp:433
-#: src/net/eathena/charserverrecv.cpp:515 src/net/tmwa/charserverrecv.cpp:337
+#: src/net/eathena/charserverrecv.cpp:396
+#: src/net/eathena/charserverrecv.cpp:400
+#: src/net/eathena/charserverrecv.cpp:482 src/net/tmwa/charserverrecv.cpp:301
 msgid "Error"
 msgstr "Hata"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1518
+#: src/client.cpp:1521
 msgid "Requesting registration details"
 msgstr "Kayıt detayları isteniyor"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1565
+#: src/client.cpp:1568
 msgid "Password Change"
 msgstr "Şifre Değiştir"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1567
+#: src/client.cpp:1570
 msgid "Password changed successfully!"
 msgstr "Şifreniz başarı ile değiştirildi!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1600
+#: src/client.cpp:1603
 msgid "Email Change"
 msgstr "E-posta Değiştir"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1602
+#: src/client.cpp:1605
 msgid "Email changed successfully!"
 msgstr "E-posta başarı ile değiştirildi!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1638
+#: src/client.cpp:1641
 msgid "Unregister Successful"
 msgstr "Kayıt silme başarılı"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1640
+#: src/client.cpp:1643
 msgid "Farewell, come back any time..."
 msgstr "Hoşçakal, tekrar bekleriz..."
 
@@ -821,23 +822,23 @@ msgid "Debug"
 msgstr "Hata ayıklama"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:598
+#: src/game.cpp:600
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Ekran görüntüsü %s olarak kaydedildi"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:608
+#: src/game.cpp:610
 msgid "Saving screenshot failed!"
 msgstr "Ekran görüntüsü kaydı başarısız!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:695
+#: src/game.cpp:697
 msgid "The connection to the server was lost."
 msgstr "Sunucu bağlantısı koptu."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:698
+#: src/game.cpp:700
 msgid "Network Error"
 msgstr "Ağ Hatası"
 
@@ -1252,14 +1253,17 @@ msgstr "Dirilt"
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
-msgstr "Ağırlığının yarısından daha ağır eşya taşıyorsun. Kendiliğinden iyileşemiyorsun."
+"You are carrying more than half your weight. You are unable to regain health."
+msgstr ""
+"Ağırlığının yarısından daha ağır eşya taşıyorsun. Kendiliğinden "
+"iyileşemiyorsun."
 
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:198
 msgid "You are carrying less than half your weight. You can regain health."
-msgstr "Ağırlığının yarısından daha hafif eşya taşıyorsun. Kendiliğinden iyileşebiliyorsun."
+msgstr ""
+"Ağırlığının yarısından daha hafif eşya taşıyorsun. Kendiliğinden "
+"iyileşebiliyorsun."
 
 #. TRANSLATORS: chat color
 #. TRANSLATORS: inventory sort mode
@@ -1270,8 +1274,7 @@ msgstr "Ağırlığının yarısından daha hafif eşya taşıyorsun. Kendiliği
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:671
-#: src/gui/windows/serverdialog.cpp:603
+#: src/gui/windows/equipmentwindow.cpp:671 src/gui/windows/serverdialog.cpp:603
 msgid "default"
 msgstr "varsayılan"
 
@@ -1823,11 +1826,9 @@ msgstr "Takas"
 #. TRANSLATORS: attack player
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
-#. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:180 src/gui/popups/popupmenu.cpp:304
 #: src/gui/popups/popupmenu.cpp:912 src/gui/widgets/skillinfo.cpp:125
-#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
-#: src/net/tmwa/generalhandler.cpp:251
+#: src/input/pages/basic.cpp:40
 msgid "Attack"
 msgstr "Saldırı"
 
@@ -1903,7 +1904,7 @@ msgstr "Taşı"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:270 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:152
+#: src/resources/db/npcdb.cpp:151
 msgid "Talk"
 msgstr "Konuş"
 
@@ -1921,7 +1922,7 @@ msgstr "Konuş"
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:154
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:153
 msgid "Buy"
 msgstr "Satın Al"
 
@@ -1939,7 +1940,7 @@ msgstr "Satın Al"
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
 #: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:256
-#: src/resources/db/npcdb.cpp:156
+#: src/resources/db/npcdb.cpp:155
 msgid "Sell"
 msgstr "Sat"
 
@@ -2041,7 +2042,7 @@ msgstr "Çıkar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:408 src/resources/db/petdb.cpp:160
+#: src/gui/popups/popupmenu.cpp:408 src/resources/db/petdb.cpp:159
 msgid "Return to egg"
 msgstr "Yumurtaya dön"
 
@@ -2438,7 +2439,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2125 src/gui/windows/statuswindow.cpp:90
 msgid "Copy to chat"
 msgstr ""
 
@@ -2490,9 +2491,8 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/popups/popupmenu.cpp:2386 src/gui/popups/skillpopup.cpp:127
-#: src/gui/windows/ministatuswindow.cpp:363
-#: src/gui/windows/statuswindow.cpp:68 src/gui/windows/statuswindow.cpp:243
-#: src/gui/windows/statuswindow.cpp:367
+#: src/gui/windows/ministatuswindow.cpp:363 src/gui/windows/statuswindow.cpp:70
+#: src/gui/windows/statuswindow.cpp:268 src/gui/windows/statuswindow.cpp:392
 #, c-format
 msgid "Level: %d"
 msgstr "Seviye: %d"
@@ -2911,8 +2911,8 @@ msgstr ""
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3100 src/gui/popups/popupmenu.cpp:3119
 #: src/gui/popups/popupmenu.cpp:3132 src/gui/windows/charselectdialog.cpp:76
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:452
-#: src/net/eathena/charserverrecv.cpp:488
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:419
+#: src/net/eathena/charserverrecv.cpp:455
 msgid "Info"
 msgstr "Bilgi"
 
@@ -3303,8 +3303,8 @@ msgstr ""
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/statuswindow.cpp:70
-#: src/gui/windows/statuswindow.cpp:220 src/gui/windows/statuswindow.cpp:334
+#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/statuswindow.cpp:72
+#: src/gui/windows/statuswindow.cpp:222 src/gui/windows/statuswindow.cpp:359
 #, c-format
 msgid "Money: %s"
 msgstr "Para: %s"
@@ -3360,7 +3360,7 @@ msgstr "Çıkış"
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:194
 #: src/gui/windows/itemamountwindow.cpp:230 src/gui/windows/npcdialog.cpp:123
-#: src/gui/windows/statuswindow.cpp:746
+#: src/gui/windows/statuswindow.cpp:771
 msgid "+"
 msgstr "+"
 
@@ -3381,8 +3381,8 @@ msgstr "-"
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/selldialog.cpp:133 src/gui/windows/buydialog.cpp:299
-#: src/gui/windows/statuswindow.cpp:483 src/gui/windows/statuswindow.cpp:539
-#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:766
+#: src/gui/windows/statuswindow.cpp:508 src/gui/windows/statuswindow.cpp:564
+#: src/gui/windows/statuswindow.cpp:769 src/gui/windows/statuswindow.cpp:791
 msgid "Max"
 msgstr "En Fazla"
 
@@ -3538,15 +3538,13 @@ msgstr "Nesne paylaşımı etkinleştirildi."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104
-#: src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr "Nesne paylaşımı devre dışı bırakıldı."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109
-#: src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr "Nesne paylaşımı mümkün değil."
 
@@ -3557,22 +3555,19 @@ msgstr "Nesne paylaşımı bilinmiyor."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150
-#: src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155
-#: src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160
-#: src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr ""
 
@@ -4006,15 +4001,15 @@ msgstr ""
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
+"Note: no other text inputs will be allowed to receive text input when you "
+"typing in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86
-#: src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr "Renkler"
 
@@ -4038,15 +4033,18 @@ msgstr "Sohbet renkleri listesini göster"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat "
+"window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:90
 msgid "Allow magic and GM commands in all chat tabs"
-msgstr "Bütün sohbet pencerelerinde büyü ve GM komutlarının kullanılmasına izin ver"
+msgstr ""
+"Bütün sohbet pencerelerinde büyü ve GM komutlarının kullanılmasına izin ver"
 
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:92
@@ -4067,9 +4065,11 @@ msgstr "Sohbet satırında bulunacak en yüksek harf sayısını sınırla"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed "
+"in chat.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will be truncated."
+"Note: long lines can make client slower. Lines longer than this limit will "
+"be truncated."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4080,7 +4080,9 @@ msgstr "Sohbette görünülecek en yüksek satır sayısını sınırla"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
+"specified number of last lines of text. Oldest lines exceeding this limit "
+"are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
 msgstr ""
@@ -4121,8 +4123,8 @@ msgstr "Sohbet geçmişini göster"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on"
-" startup instead of starting with empty chat tabs."
+"If this setting enabled, client will load old chat tabs content from logs on "
+"startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4133,9 +4135,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be "
+"shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4146,9 +4150,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be "
+"shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4164,9 +4170,13 @@ msgstr "Alışveriş mesajlarını gizle"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will "
+"be displayed in chat. Disable this setting if you want to see shop-related "
+"messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
+"Note: technically, ManaPlus shop implemented as usual private messages with "
+"special content. If you disable this setting, you will be able to see these "
+"messages and get idea when other players are looking at your shop."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4179,7 +4189,8 @@ msgstr ""
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
+"usually makes little difference."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4198,9 +4209,12 @@ msgstr "Bütün fısıltıları sekmelere koy"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in "
+"separate tabs, separate tab for each player. If this setting disabled, all "
+"whispers will appear in General tab.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
+"Note: putting all whispers to single General tab is known to be confusing. "
+"Think twice before disabling this feature."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4211,7 +4225,8 @@ msgstr "Büyü mesajlarını hata ayıklama sekmesinde kayıt altına al"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If "
+"disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
 msgstr ""
@@ -4224,9 +4239,11 @@ msgstr "Sunucu mesajlarını hata ayıklama sekmesinde göster"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of "
+"chat. If disabled, server messages will appear in General chat instead.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
+"Note: according to 4144, disabling this could also make you to lose some "
+"debug messages from client in Debug tab since these are fake server messages."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4251,9 +4268,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM "
+"activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
+"Note: this setting only makes difference for GMs (Game Masters) since this "
+"tab only appears for GMs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4264,7 +4283,8 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this feature.\n"
+"If this feature enabled, language tab will appear if server supports this "
+"feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
 msgstr ""
@@ -4277,7 +4297,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
+"If this setting enabled and server supports different chats for different "
+"languages, you will see messages for all languages, regardless of your "
+"language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
 msgstr ""
@@ -4290,7 +4312,9 @@ msgstr "Savaş sekmesini etkinleştir"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will "
+"contain messages related to battles, like damage and experience gain, if "
+"battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
 msgstr ""
@@ -4316,7 +4340,10 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to "
+"adapt to appearance of chat input field when you typing message and when "
+"input field of chat disappears. If disabled, chat input area will always "
+"occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
@@ -4351,7 +4378,8 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. "
+"Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
 msgstr ""
@@ -4364,7 +4392,8 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender "
+"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
 msgstr ""
@@ -4377,9 +4406,12 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This "
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by "
+"default."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4493,7 +4525,9 @@ msgstr "Tuş çatışması tespit edildi."
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr "\"%s\" ve \"%s\" tuşları çakıştı. Çakışmayı giderin, yoksa oynanabilirlikte gariplikler meydana gelebilir."
+msgstr ""
+"\"%s\" ve \"%s\" tuşları çakıştı. Çakışmayı giderin, yoksa oynanabilirlikte "
+"gariplikler meydana gelebilir."
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
@@ -6123,8 +6157,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:618
-#: src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:618 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Oluştur"
 
@@ -6240,17 +6273,16 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:104
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:210
-#: src/gui/windows/charcreatedialog.cpp:221
-#: src/gui/windows/charcreatedialog.cpp:231
-#: src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:196
+#: src/gui/windows/charcreatedialog.cpp:209
+#: src/gui/windows/charcreatedialog.cpp:220
+#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:110
-#: src/gui/windows/charcreatedialog.cpp:600
+#: src/gui/windows/charcreatedialog.cpp:599
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Lütfen %d puanı dağıt"
@@ -6259,73 +6291,71 @@ msgstr "Lütfen %d puanı dağıt"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:201
-#: src/gui/windows/charcreatedialog.cpp:212
-#: src/gui/windows/charcreatedialog.cpp:223
-#: src/gui/windows/charcreatedialog.cpp:233
-#: src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:200
+#: src/gui/windows/charcreatedialog.cpp:211
+#: src/gui/windows/charcreatedialog.cpp:222
+#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:202
 msgid "Hair color:"
 msgstr "Saç Rengi:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:213
 msgid "Hair style:"
 msgstr "Saç Stili:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:224
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:234
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:252
-#: src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:258
-#: src/gui/windows/charcreatedialog.cpp:265
-#: src/gui/windows/charcreatedialog.cpp:273
+#: src/gui/windows/charcreatedialog.cpp:257
+#: src/gui/windows/charcreatedialog.cpp:264
+#: src/gui/windows/charcreatedialog.cpp:272
 msgid "M"
 msgstr ""
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:260
-#: src/gui/windows/charcreatedialog.cpp:277
+#: src/gui/windows/charcreatedialog.cpp:259
+#: src/gui/windows/charcreatedialog.cpp:276
 #: src/gui/windows/inventorywindow.cpp:223
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:267
+#: src/gui/windows/charcreatedialog.cpp:266
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:474
+#: src/gui/windows/charcreatedialog.cpp:473
 msgid "Your name needs to be at least 4 characters."
 msgstr "Adınızda en az 4 karakter olması gerekir."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:590
+#: src/gui/windows/charcreatedialog.cpp:589
 msgid "Character stats OK"
 msgstr "Karakter istatistikleri TAMAM"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:606
+#: src/gui/windows/charcreatedialog.cpp:605
 #, c-format
 msgid "Please remove %d points"
 msgstr "Lütfen %d puanı eksilt"
@@ -6491,8 +6521,7 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57
-#: src/gui/windows/serverdialog.cpp:112
+#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:112
 msgid "Connect"
 msgstr "Bağlan"
 
@@ -6850,15 +6879,13 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61
-#: src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr ""
@@ -6967,7 +6994,7 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/windows/ministatuswindow.cpp:356
-#: src/gui/windows/statuswindow.cpp:236
+#: src/gui/windows/statuswindow.cpp:261
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Level: %d (GM %d)"
@@ -7419,33 +7446,33 @@ msgid "Choose your party's name."
 msgstr "Grubunun adını seç."
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:72
+#: src/gui/windows/statuswindow.cpp:74
 msgid "HP:"
 msgstr "HP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:75
+#: src/gui/windows/statuswindow.cpp:77
 msgid "Exp:"
 msgstr "Exp:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:136
+#: src/gui/windows/statuswindow.cpp:138
 msgid "MP:"
 msgstr "MP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:173 src/gui/windows/statuswindow.cpp:294
+#: src/gui/windows/statuswindow.cpp:175 src/gui/windows/statuswindow.cpp:319
 #, c-format
 msgid "Job: %d"
 msgstr "İş: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:175
+#: src/gui/windows/statuswindow.cpp:177
 msgid "Job:"
 msgstr "İş:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:224 src/gui/windows/statuswindow.cpp:342
+#: src/gui/windows/statuswindow.cpp:226 src/gui/windows/statuswindow.cpp:367
 #, c-format
 msgid "Character points: %d"
 msgstr "Karakter Puanları: %d"
@@ -7563,9 +7590,10 @@ msgstr "Yeterli paran yok."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
-msgstr "Nesne eklemesi başarısız oldu. Pencerede aynı tür nesneyi üst üste koyamazsınız."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+"Nesne eklemesi başarısız oldu. Pencerede aynı tür nesneyi üst üste "
+"koyamazsınız."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:539
@@ -9043,33 +9071,33 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:431
-#: src/net/eathena/charserverrecv.cpp:479
+#: src/net/eathena/charserverrecv.cpp:398
+#: src/net/eathena/charserverrecv.cpp:446
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:454
+#: src/net/eathena/charserverrecv.cpp:421
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:470
+#: src/net/eathena/charserverrecv.cpp:437
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:474
+#: src/net/eathena/charserverrecv.cpp:441
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:483
+#: src/net/eathena/charserverrecv.cpp:450
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:517 src/net/tmwa/charserverrecv.cpp:339
+#: src/net/eathena/charserverrecv.cpp:484 src/net/tmwa/charserverrecv.cpp:303
 msgid "Failed to delete character."
 msgstr ""
 
@@ -9121,140 +9149,11 @@ msgstr ""
 msgid "Do you accept %s and %s as parents?"
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:130
-#, c-format
-msgid "Strength %s"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:132
-#, c-format
-msgid "Agility %s"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:134
-#, c-format
-msgid "Vitality %s"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:136
-#, c-format
-msgid "Intelligence %s"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:138
-#, c-format
-msgid "Dexterity %s"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:140
-#, c-format
-msgid "Luck %s"
-msgstr ""
-
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:197 src/net/tmwa/generalhandler.cpp:207
+#: src/net/eathena/generalhandler.cpp:179 src/net/tmwa/generalhandler.cpp:189
 msgid "Got disconnected from server!"
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:223 src/net/tmwa/generalhandler.cpp:234
-msgid "Strength"
-msgstr "Güç"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:237
-msgid "Agility"
-msgstr "Çeviklik"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:229 src/net/tmwa/generalhandler.cpp:240
-msgid "Vitality"
-msgstr "Yaşam Gücü"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:243
-msgid "Intelligence"
-msgstr "Zeka"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:246
-msgid "Dexterity"
-msgstr "Maharet"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:238 src/net/tmwa/generalhandler.cpp:249
-msgid "Luck"
-msgstr "Şans"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:253
-msgid "Defense"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:255
-msgid "M.Attack"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:257
-msgid "M.Defense"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:260
-#, no-c-format
-msgid "% Accuracy"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:263
-#, no-c-format
-msgid "% Evade"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:266
-#, no-c-format
-msgid "% Critical"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:268
-msgid "Attack Delay"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:270
-msgid "Walk Delay"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:272
-msgid "Attack Range"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:274
-msgid "Damage per sec."
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266
-msgid "Karma"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268
-msgid "Manner"
-msgstr ""
-
 #. TRANSLATORS: error message
 #: src/net/eathena/generalrecv.cpp:49 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
@@ -9410,7 +9309,7 @@ msgstr ""
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:199
+#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:190
 msgid "Unknown item"
 msgstr "Bilinmeyen nesne"
 
@@ -9686,21 +9585,52 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:93
-#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
-#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
+#: src/resources/db/itemdb.cpp:377 src/resources/db/itemdb.cpp:381
+#: src/resources/db/moddb.cpp:79 src/resources/db/monsterdb.cpp:101
+#: src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "isimsiz"
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:104
+#: src/resources/db/petdb.cpp:103
 msgid "pet"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:103
+#: src/resources/db/skillunitdb.cpp:102
 msgid "skill"
 msgstr ""
 
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:45
+msgid "Strength"
+msgstr "Güç"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:49
+msgid "Agility"
+msgstr "Çeviklik"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:53
+msgid "Vitality"
+msgstr "Yaşam Gücü"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:57
+msgid "Intelligence"
+msgstr "Zeka"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:61
+msgid "Dexterity"
+msgstr "Maharet"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:65
+msgid "Luck"
+msgstr "Şans"
+
 #. TRANSLATORS: inventory type name
 #: src/resources/inventory/inventory.cpp:340
 msgid "Npc"
@@ -10352,8 +10282,9 @@ msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:556
-msgid "Room join failed. Not enought money."
-msgstr ""
+#, fuzzy
+msgid "Room join failed. Not enough money."
+msgstr "Yeterli paran yok."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:560
@@ -10620,33 +10551,35 @@ msgstr ""
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:796
 #, c-format
-msgid "You and %s was divorced."
+msgid "You and %s are now divorced."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:800
-msgid "You was called by partner."
-msgstr ""
+#, fuzzy
+msgid "You were called by your partner."
+msgstr "%s tarafından öldürüldün."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:804
 #, c-format
-msgid "You calling partner %s."
+msgid "You are calling your partner, %s."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:808
-msgid "Adoption child error. You already have baby."
+msgid "Child adoption failed. You already have a baby."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:812
-msgid "Adoption child error. You level too small for have baby."
+msgid "Child adoption failed. Your level is too low."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:816
-msgid "Adoption child error. This player already married and can't be baby."
+msgid ""
+"Child adoption failed. This player is already married and can't be a baby."
 msgstr ""
 
 #. TRANSLATORS: notification message
@@ -10656,19 +10589,20 @@ msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:825
-msgid "Error saving location. Not enought skill level."
+msgid "Error saving location. Not enough skill level."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:829
-msgid "Error saving location. You not have warp skill."
+msgid "Error saving location. You do not have warp skill."
 msgstr ""
 
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:29
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "/%s ayar seçenekleri \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\" 'dir."
+msgstr ""
+"/%s ayar seçenekleri \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\" 'dir."
 
 #. TRANSLATORS: uptime command
 #: src/utils/stringutils.cpp:946
diff --git a/po/uk.po b/po/uk.po
index 0f37a83cb..a0b5ea04c 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # tivasyk <tivasyk@gmail.com>, 2010
 # William Lee <v4r@trioptimum.com>, 2014
@@ -10,15 +10,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-06-18 18:53+0300\n"
+"POT-Creation-Date: 2016-07-02 19:47+0300\n"
 "PO-Revision-Date: 2016-06-19 09:21+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Ukrainian (http://www.transifex.com/akaras/manaplus/language/uk/)\n"
+"Language-Team: Ukrainian (http://www.transifex.com/akaras/manaplus/language/"
+"uk/)\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: uk\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. TRANSLATORS: file uploaded message
 #: src/actions/actions.cpp:168
@@ -34,7 +36,7 @@ msgstr "Файл завантажено"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:171 src/client.cpp:1569 src/client.cpp:1604
+#: src/actions/actions.cpp:171 src/client.cpp:1572 src/client.cpp:1607
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
@@ -45,7 +47,7 @@ msgstr "Файл завантажено"
 #: src/gui/widgets/tabs/setup_video.cpp:420
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:476
+#: src/gui/windows/charcreatedialog.cpp:475
 #: src/gui/windows/charselectdialog.cpp:262
 #: src/gui/windows/charselectdialog.cpp:310 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:59
@@ -54,9 +56,9 @@ msgstr "Файл завантажено"
 #: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:531
 #: src/gui/windows/textdialog.cpp:53 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:456
-#: src/net/eathena/charserverrecv.cpp:491
-#: src/net/eathena/charserverrecv.cpp:519 src/net/tmwa/charserverrecv.cpp:341
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:423
+#: src/net/eathena/charserverrecv.cpp:458
+#: src/net/eathena/charserverrecv.cpp:486 src/net/tmwa/charserverrecv.cpp:305
 msgid "OK"
 msgstr "ОК"
 
@@ -128,7 +130,9 @@ msgstr ""
 #: src/actions/chat.cpp:315
 #, c-format
 msgid "Cannot create a whisper tab \"%s\"! It probably already exists."
-msgstr "Неможливо створити вкладку для спілкування з гравцем \"%s\" - або така вже існує, або ви намагаєтесь перешіптуватись сам із собою :P ."
+msgstr ""
+"Неможливо створити вкладку для спілкування з гравцем \"%s\" - або така вже "
+"існує, або ви намагаєтесь перешіптуватись сам із собою :P ."
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
@@ -303,26 +307,26 @@ msgid "Visible on map"
 msgstr "Видимий на мапі"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:496
+#: src/being/being.cpp:494
 msgid "Human"
 msgstr "Людина"
 
 #. TRANSLATORS: dodge or miss message in attacks
-#: src/being/being.cpp:683
+#: src/being/being.cpp:676
 msgid "dodge"
 msgstr "ухилення"
 
-#: src/being/being.cpp:683
+#: src/being/being.cpp:676
 msgid "miss"
 msgstr "промах"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2282 src/gui/windows/whoisonline.cpp:882
+#: src/being/being.cpp:2275 src/gui/windows/whoisonline.cpp:882
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2287 src/gui/windows/whoisonline.cpp:887
+#: src/being/being.cpp:2280 src/gui/windows/whoisonline.cpp:887
 msgid "I"
 msgstr "I"
 
@@ -474,41 +478,41 @@ msgstr "Плаваюча бульбашка"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:870 src/dyetool/client.cpp:491 src/gui/windowmenu.cpp:189
+#: src/client.cpp:872 src/dyetool/client.cpp:491 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:66
 msgid "Setup"
 msgstr "Налаштування"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:873 src/dyetool/client.cpp:494
+#: src/client.cpp:875 src/dyetool/client.cpp:494
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Продуктивність"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:876 src/dyetool/client.cpp:497
+#: src/client.cpp:878 src/dyetool/client.cpp:497
 #: src/gui/widgets/tabs/setup_video.cpp:110
 msgid "Video"
 msgstr "Відео"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:879 src/dyetool/client.cpp:500
+#: src/client.cpp:881 src/dyetool/client.cpp:500
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Теми"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:882 src/dyetool/client.cpp:503
+#: src/client.cpp:884 src/dyetool/client.cpp:503
 msgid "About"
 msgstr "Про програму"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:885 src/dyetool/client.cpp:506 src/gui/windowmenu.cpp:74
+#: src/client.cpp:887 src/dyetool/client.cpp:506 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Довідка"
@@ -529,7 +533,7 @@ msgstr "Довідка"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:889 src/client.cpp:1483 src/client.cpp:1502
+#: src/client.cpp:891 src/client.cpp:1486 src/client.cpp:1505
 #: src/dyetool/client.cpp:510 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:756 src/gui/popups/popupmenu.cpp:833
 #: src/gui/popups/popupmenu.cpp:1087 src/gui/windows/didyouknowwindow.cpp:81
@@ -542,32 +546,32 @@ msgid "Close"
 msgstr "Закрити"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1115 src/gui/windowmanager_unittest.cc:156
+#: src/client.cpp:1117 src/gui/windowmanager_unittest.cc:156
 msgid "Connecting to server"
 msgstr "Очікування відповіді сервера"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1172 src/gui/windowmanager_unittest.cc:173
+#: src/client.cpp:1174 src/gui/windowmanager_unittest.cc:173
 msgid "Logging in"
 msgstr "Авторизація..."
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1221
+#: src/client.cpp:1223
 msgid "Entering game world"
 msgstr "Поринаємо в ігровий всесвіт..."
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1369
+#: src/client.cpp:1372
 msgid "Requesting characters"
 msgstr "Завантаження списку персонажів..."
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1412
+#: src/client.cpp:1415
 msgid "Connecting to the game server"
 msgstr "Приєднання до серверу..."
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1424
+#: src/client.cpp:1427
 msgid "Changing game servers"
 msgstr "Зміна ігрового серверу..."
 
@@ -584,52 +588,52 @@ msgstr "Зміна ігрового серверу..."
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1480 src/client.cpp:1499 src/client.cpp:1738
+#: src/client.cpp:1483 src/client.cpp:1502 src/client.cpp:1741
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:472
+#: src/gui/windows/charcreatedialog.cpp:471
 #: src/gui/windows/charselectdialog.cpp:306
 #: src/gui/windows/editserverdialog.cpp:212
 #: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:429
-#: src/net/eathena/charserverrecv.cpp:433
-#: src/net/eathena/charserverrecv.cpp:515 src/net/tmwa/charserverrecv.cpp:337
+#: src/net/eathena/charserverrecv.cpp:396
+#: src/net/eathena/charserverrecv.cpp:400
+#: src/net/eathena/charserverrecv.cpp:482 src/net/tmwa/charserverrecv.cpp:301
 msgid "Error"
 msgstr "Помилка"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1518
+#: src/client.cpp:1521
 msgid "Requesting registration details"
 msgstr "Запитуємо деталі реєстрації"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1565
+#: src/client.cpp:1568
 msgid "Password Change"
 msgstr "Змінити пароль"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1567
+#: src/client.cpp:1570
 msgid "Password changed successfully!"
 msgstr "Пароль змінено!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1600
+#: src/client.cpp:1603
 msgid "Email Change"
 msgstr "Змінити імейл"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1602
+#: src/client.cpp:1605
 msgid "Email changed successfully!"
 msgstr "Імейл змінено!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1638
+#: src/client.cpp:1641
 msgid "Unregister Successful"
 msgstr "Акаунт видалено"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1640
+#: src/client.cpp:1643
 msgid "Farewell, come back any time..."
 msgstr "До побачення та вертайтесь."
 
@@ -681,7 +685,8 @@ msgstr "  -h --help           : Показати ще раз цю довідку
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:65
 msgid "  -C --config-dir     : Configuration directory to use"
-msgstr "  -C --config-file    : Файл, з якого необхідно завантажити налаштування"
+msgstr ""
+"  -C --config-file    : Файл, з якого необхідно завантажити налаштування"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:68
@@ -716,7 +721,8 @@ msgstr "  -p --port           : Порт логіну"
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:86
 msgid "  -H --update-host    : Use this update host"
-msgstr "  -H --update-host    : Сервер, з якого необхідно завантажити оновлення"
+msgstr ""
+"  -H --update-host    : Сервер, з якого необхідно завантажити оновлення"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:89
@@ -822,23 +828,23 @@ msgid "Debug"
 msgstr "Зневадження"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:598
+#: src/game.cpp:600
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Скріншот збережено як %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:608
+#: src/game.cpp:610
 msgid "Saving screenshot failed!"
 msgstr "Збереження скріншоту провалилось!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:695
+#: src/game.cpp:697
 msgid "The connection to the server was lost."
 msgstr "Втрачено з'єднання з сервером."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:698
+#: src/game.cpp:700
 msgid "Network Error"
 msgstr "Мережева помилка"
 
@@ -1253,9 +1259,10 @@ msgstr "Опритомнити"
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
-msgstr "Ви навантажені більше, ніж на половину максимально дозволенного. Тепер ви не зможете відновлюватися."
+"You are carrying more than half your weight. You are unable to regain health."
+msgstr ""
+"Ви навантажені більше, ніж на половину максимально дозволенного. Тепер ви не "
+"зможете відновлюватися."
 
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:198
@@ -1271,8 +1278,7 @@ msgstr "Ви навантажені менш, ніж на половину. Те
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:671
-#: src/gui/windows/serverdialog.cpp:603
+#: src/gui/windows/equipmentwindow.cpp:671 src/gui/windows/serverdialog.cpp:603
 msgid "default"
 msgstr "за замовчуванням"
 
@@ -1824,11 +1830,9 @@ msgstr "Торгівля"
 #. TRANSLATORS: attack player
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
-#. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:180 src/gui/popups/popupmenu.cpp:304
 #: src/gui/popups/popupmenu.cpp:912 src/gui/widgets/skillinfo.cpp:125
-#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
-#: src/net/tmwa/generalhandler.cpp:251
+#: src/input/pages/basic.cpp:40
 msgid "Attack"
 msgstr "Атака"
 
@@ -1904,7 +1908,7 @@ msgstr "Рух"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:270 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:152
+#: src/resources/db/npcdb.cpp:151
 msgid "Talk"
 msgstr "Діалог"
 
@@ -1922,7 +1926,7 @@ msgstr "Діалог"
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:154
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:153
 msgid "Buy"
 msgstr "Придбати"
 
@@ -1940,7 +1944,7 @@ msgstr "Придбати"
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
 #: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:256
-#: src/resources/db/npcdb.cpp:156
+#: src/resources/db/npcdb.cpp:155
 msgid "Sell"
 msgstr "Продати"
 
@@ -2042,7 +2046,7 @@ msgstr "Зняти"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:408 src/resources/db/petdb.cpp:160
+#: src/gui/popups/popupmenu.cpp:408 src/resources/db/petdb.cpp:159
 msgid "Return to egg"
 msgstr "Повернути до яйця"
 
@@ -2439,7 +2443,7 @@ msgstr "Скинути Жовтий рядок"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2125 src/gui/windows/statuswindow.cpp:90
 msgid "Copy to chat"
 msgstr "Додати до чату"
 
@@ -2491,9 +2495,8 @@ msgstr "Показати вікно"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/popups/popupmenu.cpp:2386 src/gui/popups/skillpopup.cpp:127
-#: src/gui/windows/ministatuswindow.cpp:363
-#: src/gui/windows/statuswindow.cpp:68 src/gui/windows/statuswindow.cpp:243
-#: src/gui/windows/statuswindow.cpp:367
+#: src/gui/windows/ministatuswindow.cpp:363 src/gui/windows/statuswindow.cpp:70
+#: src/gui/windows/statuswindow.cpp:268 src/gui/windows/statuswindow.cpp:392
 #, c-format
 msgid "Level: %d"
 msgstr "Рівень: %d"
@@ -2912,8 +2915,8 @@ msgstr ""
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3100 src/gui/popups/popupmenu.cpp:3119
 #: src/gui/popups/popupmenu.cpp:3132 src/gui/windows/charselectdialog.cpp:76
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:452
-#: src/net/eathena/charserverrecv.cpp:488
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:419
+#: src/net/eathena/charserverrecv.cpp:455
 msgid "Info"
 msgstr "Відомості"
 
@@ -3304,8 +3307,8 @@ msgstr "Рівень: %u"
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/statuswindow.cpp:70
-#: src/gui/windows/statuswindow.cpp:220 src/gui/windows/statuswindow.cpp:334
+#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/statuswindow.cpp:72
+#: src/gui/windows/statuswindow.cpp:222 src/gui/windows/statuswindow.cpp:359
 #, c-format
 msgid "Money: %s"
 msgstr "Кошти: %s"
@@ -3361,7 +3364,7 @@ msgstr "Вийти"
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:194
 #: src/gui/windows/itemamountwindow.cpp:230 src/gui/windows/npcdialog.cpp:123
-#: src/gui/windows/statuswindow.cpp:746
+#: src/gui/windows/statuswindow.cpp:771
 msgid "+"
 msgstr "+"
 
@@ -3382,8 +3385,8 @@ msgstr "-"
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/selldialog.cpp:133 src/gui/windows/buydialog.cpp:299
-#: src/gui/windows/statuswindow.cpp:483 src/gui/windows/statuswindow.cpp:539
-#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:766
+#: src/gui/windows/statuswindow.cpp:508 src/gui/windows/statuswindow.cpp:564
+#: src/gui/windows/statuswindow.cpp:769 src/gui/windows/statuswindow.cpp:791
 msgid "Max"
 msgstr "Все"
 
@@ -3539,15 +3542,13 @@ msgstr "Розподіл предметів увімкнено."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104
-#: src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr "Розподіл предметів вимкнено."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109
-#: src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr "Неможливо ввімкнути розподіл предметів."
 
@@ -3558,22 +3559,19 @@ msgstr "Невідомий стан розподілу предметів."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150
-#: src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr "Розподіл досвіду ввімкнено."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155
-#: src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr "Розподіл досвіду вимкнено."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160
-#: src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr "Неможливо ввімкнути розподіл досвіду."
 
@@ -4007,15 +4005,15 @@ msgstr "Захищати фокус чату"
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
+"Note: no other text inputs will be allowed to receive text input when you "
+"typing in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86
-#: src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr "Кольори"
 
@@ -4039,9 +4037,11 @@ msgstr "Показувати список кольорів чату"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat "
+"window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4068,9 +4068,11 @@ msgstr "Обмежити кількість символів у повідомл
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed "
+"in chat.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will be truncated."
+"Note: long lines can make client slower. Lines longer than this limit will "
+"be truncated."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4081,7 +4083,9 @@ msgstr "Обмежити кількість рядків вікна чату"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
+"specified number of last lines of text. Oldest lines exceeding this limit "
+"are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
 msgstr ""
@@ -4122,8 +4126,8 @@ msgstr "Показувати історію чату"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on"
-" startup instead of starting with empty chat tabs."
+"If this setting enabled, client will load old chat tabs content from logs on "
+"startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4134,9 +4138,11 @@ msgstr "Сповіщати про появлення членів групи"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be "
+"shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4147,9 +4153,11 @@ msgstr "Сповіщати про появлення членів гільдії
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be "
+"shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4165,9 +4173,13 @@ msgstr "Не показувати робочі повідомлення крам
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will "
+"be displayed in chat. Disable this setting if you want to see shop-related "
+"messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
+"Note: technically, ManaPlus shop implemented as usual private messages with "
+"special content. If you disable this setting, you will be able to see these "
+"messages and get idea when other players are looking at your shop."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4180,7 +4192,8 @@ msgstr "Показувати MVP повідомлення"
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
+"usually makes little difference."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4199,9 +4212,12 @@ msgstr "Шепіт (приватне спілкування) в окремих �
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in "
+"separate tabs, separate tab for each player. If this setting disabled, all "
+"whispers will appear in General tab.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
+"Note: putting all whispers to single General tab is known to be confusing. "
+"Think twice before disabling this feature."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4212,7 +4228,8 @@ msgstr "Лог магії у вкладці зневадження"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If "
+"disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
 msgstr ""
@@ -4225,9 +4242,11 @@ msgstr "Показувати сповіщення сервера у вкладц
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of "
+"chat. If disabled, server messages will appear in General chat instead.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
+"Note: according to 4144, disabling this could also make you to lose some "
+"debug messages from client in Debug tab since these are fake server messages."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4252,9 +4271,11 @@ msgstr "Ввімкнути ГМ вкладку"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM "
+"activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
+"Note: this setting only makes difference for GMs (Game Masters) since this "
+"tab only appears for GMs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4265,7 +4286,8 @@ msgstr "Ввімкнути вкладку для мови"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this feature.\n"
+"If this feature enabled, language tab will appear if server supports this "
+"feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
 msgstr ""
@@ -4278,7 +4300,9 @@ msgstr "Показувати повідомлення на всіх мовах"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
+"If this setting enabled and server supports different chats for different "
+"languages, you will see messages for all languages, regardless of your "
+"language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
 msgstr ""
@@ -4291,7 +4315,9 @@ msgstr "Ввімкнути вкладку бійки"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will "
+"contain messages related to battles, like damage and experience gain, if "
+"battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
 msgstr ""
@@ -4317,7 +4343,10 @@ msgstr "Змінювати розмір вкладок чату за потре�
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to "
+"adapt to appearance of chat input field when you typing message and when "
+"input field of chat disappears. If disabled, chat input area will always "
+"occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
@@ -4352,7 +4381,8 @@ msgstr "Підсвічувані слова (відокремлені комам
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. "
+"Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
 msgstr ""
@@ -4365,7 +4395,8 @@ msgstr "Ігнорування глобальні повідомлення ві�
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender "
+"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
 msgstr ""
@@ -4378,9 +4409,12 @@ msgstr "Показати кнопку смайликів у чаті"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This "
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by "
+"default."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4494,7 +4528,9 @@ msgstr "Деякі клавіші дублюють одна одну."
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr "Клавіші \"%s\" та \"%s\" конфліктують. Необхідно усунути повтори,інакше керування може бути ускладненим."
+msgstr ""
+"Клавіші \"%s\" та \"%s\" конфліктують. Необхідно усунути повтори,інакше "
+"керування може бути ускладненим."
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
@@ -5102,7 +5138,9 @@ msgstr "Вимкнути кешування істот"
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_perfomance.cpp:129
 msgid "Different options (enable or disable can improve performance)"
-msgstr "Різні налаштунки (ввімкнення чи вимкнення може призвести до кращої продуктивності)"
+msgstr ""
+"Різні налаштунки (ввімкнення чи вимкнення може призвести до кращої "
+"продуктивності)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:134
@@ -5137,7 +5175,8 @@ msgstr "Занести в кеш всі звуки (може забрати до
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_perfomance.cpp:160
 msgid "Critical options (DO NOT change if you don't know what you're doing)"
-msgstr "Критичні налаштунки (НІ В ЯКОМУ РАЗУ не чіпайте, якщо не впевнені, що робите)"
+msgstr ""
+"Критичні налаштунки (НІ В ЯКОМУ РАЗУ не чіпайте, якщо не впевнені, що робите)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:164
@@ -5263,7 +5302,9 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_players.cpp:143
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
-msgstr "Емуляція правого кліку миші подовженим лівим кліком (вживане на тач інтерфейсах)"
+msgstr ""
+"Емуляція правого кліку миші подовженим лівим кліком (вживане на тач "
+"інтерфейсах)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:148
@@ -6124,8 +6165,7 @@ msgstr "Кількість:"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:618
-#: src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:618 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Створити"
 
@@ -6241,17 +6281,16 @@ msgstr "^"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:104
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:210
-#: src/gui/windows/charcreatedialog.cpp:221
-#: src/gui/windows/charcreatedialog.cpp:231
-#: src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:196
+#: src/gui/windows/charcreatedialog.cpp:209
+#: src/gui/windows/charcreatedialog.cpp:220
+#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:110
-#: src/gui/windows/charcreatedialog.cpp:600
+#: src/gui/windows/charcreatedialog.cpp:599
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Будь ласка, розподіліть %d балів"
@@ -6260,73 +6299,71 @@ msgstr "Будь ласка, розподіліть %d балів"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:201
-#: src/gui/windows/charcreatedialog.cpp:212
-#: src/gui/windows/charcreatedialog.cpp:223
-#: src/gui/windows/charcreatedialog.cpp:233
-#: src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:200
+#: src/gui/windows/charcreatedialog.cpp:211
+#: src/gui/windows/charcreatedialog.cpp:222
+#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:202
 msgid "Hair color:"
 msgstr "Колір волосся:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:213
 msgid "Hair style:"
 msgstr "Зачіска:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:224
 msgid "Race:"
 msgstr "Раса:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:234
 msgid "Look:"
 msgstr "Вигляд:"
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:252
-#: src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr "П"
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:258
-#: src/gui/windows/charcreatedialog.cpp:265
-#: src/gui/windows/charcreatedialog.cpp:273
+#: src/gui/windows/charcreatedialog.cpp:257
+#: src/gui/windows/charcreatedialog.cpp:264
+#: src/gui/windows/charcreatedialog.cpp:272
 msgid "M"
 msgstr ""
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:260
-#: src/gui/windows/charcreatedialog.cpp:277
+#: src/gui/windows/charcreatedialog.cpp:259
+#: src/gui/windows/charcreatedialog.cpp:276
 #: src/gui/windows/inventorywindow.cpp:223
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:267
+#: src/gui/windows/charcreatedialog.cpp:266
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:474
+#: src/gui/windows/charcreatedialog.cpp:473
 msgid "Your name needs to be at least 4 characters."
 msgstr "Ім'я повинно містити принаймні 4 символи."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:590
+#: src/gui/windows/charcreatedialog.cpp:589
 msgid "Character stats OK"
 msgstr "Характеристики персонажа в нормі"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:606
+#: src/gui/windows/charcreatedialog.cpp:605
 #, c-format
 msgid "Please remove %d points"
 msgstr "Будь ласка, видаліть %d балів"
@@ -6390,7 +6427,12 @@ msgid ""
 "Level: %u\n"
 "Experience: %u\n"
 "Money: %s"
-msgstr "Hp: %u/%u\nMp: %u/%u\nРівень: %u\nДосвід: %u\nКошти: %s"
+msgstr ""
+"Hp: %u/%u\n"
+"Mp: %u/%u\n"
+"Рівень: %u\n"
+"Досвід: %u\n"
+"Кошти: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/charselectdialog.cpp:308
@@ -6492,8 +6534,7 @@ msgstr "Редагувати сервер"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57
-#: src/gui/windows/serverdialog.cpp:112
+#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:112
 msgid "Connect"
 msgstr "З'єднання"
 
@@ -6853,15 +6894,13 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61
-#: src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr ""
@@ -6970,7 +7009,7 @@ msgstr "рівень роботи"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/windows/ministatuswindow.cpp:356
-#: src/gui/windows/statuswindow.cpp:236
+#: src/gui/windows/statuswindow.cpp:261
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Рівень: %d (ГМ %d)"
@@ -7422,33 +7461,33 @@ msgid "Choose your party's name."
 msgstr "Оберіть назву групи."
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:72
+#: src/gui/windows/statuswindow.cpp:74
 msgid "HP:"
 msgstr "Здоров'я:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:75
+#: src/gui/windows/statuswindow.cpp:77
 msgid "Exp:"
 msgstr "Досвід:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:136
+#: src/gui/windows/statuswindow.cpp:138
 msgid "MP:"
 msgstr "Мана:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:173 src/gui/windows/statuswindow.cpp:294
+#: src/gui/windows/statuswindow.cpp:175 src/gui/windows/statuswindow.cpp:319
 #, c-format
 msgid "Job: %d"
 msgstr "Робота: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:175
+#: src/gui/windows/statuswindow.cpp:177
 msgid "Job:"
 msgstr "Робота:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:224 src/gui/windows/statuswindow.cpp:342
+#: src/gui/windows/statuswindow.cpp:226 src/gui/windows/statuswindow.cpp:367
 #, c-format
 msgid "Character points: %d"
 msgstr "Нерозподілених балів: %d"
@@ -7566,8 +7605,7 @@ msgstr "У тебе недостатньо коштів."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "Не вдається додати предмет. Не можна накладати предмети одного типу."
 
 #. TRANSLATORS: trade error
@@ -9006,7 +9044,9 @@ msgstr ""
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
-msgstr "Вас було тимчасово забанено до %s.\nЗвертайтесь до команди ГМ'ів на форумі."
+msgstr ""
+"Вас було тимчасово забанено до %s.\n"
+"Звертайтесь до команди ГМ'ів на форумі."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:151 src/net/eathena/loginrecv.cpp:92
@@ -9046,33 +9086,33 @@ msgstr "З'єднання з сервером припинене. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:431
-#: src/net/eathena/charserverrecv.cpp:479
+#: src/net/eathena/charserverrecv.cpp:398
+#: src/net/eathena/charserverrecv.cpp:446
 msgid "Character rename error."
 msgstr "Помилка переіменування персонажу."
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:454
+#: src/net/eathena/charserverrecv.cpp:421
 msgid "Character renamed."
 msgstr "Персонаж переіменовано."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:470
+#: src/net/eathena/charserverrecv.cpp:437
 msgid "Rename not allowed."
 msgstr "Переіменування не дозволене."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:474
+#: src/net/eathena/charserverrecv.cpp:441
 msgid "New name is not set."
 msgstr "Нове ім'я не вжито."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:483
+#: src/net/eathena/charserverrecv.cpp:450
 msgid "Character not found."
 msgstr "Персонаж не знайдено."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:517 src/net/tmwa/charserverrecv.cpp:339
+#: src/net/eathena/charserverrecv.cpp:484 src/net/tmwa/charserverrecv.cpp:303
 msgid "Failed to delete character."
 msgstr "Неможливо видалити персонаж."
 
@@ -9124,140 +9164,11 @@ msgstr ""
 msgid "Do you accept %s and %s as parents?"
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:130
-#, c-format
-msgid "Strength %s"
-msgstr "Сила %s"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:132
-#, c-format
-msgid "Agility %s"
-msgstr "Спритність %s"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:134
-#, c-format
-msgid "Vitality %s"
-msgstr "Витривалість %s"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:136
-#, c-format
-msgid "Intelligence %s"
-msgstr "Інтелект %s"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:138
-#, c-format
-msgid "Dexterity %s"
-msgstr "Вправність %s"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:140
-#, c-format
-msgid "Luck %s"
-msgstr "Талан %s"
-
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:197 src/net/tmwa/generalhandler.cpp:207
+#: src/net/eathena/generalhandler.cpp:179 src/net/tmwa/generalhandler.cpp:189
 msgid "Got disconnected from server!"
 msgstr "Відключений від серверу!"
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:223 src/net/tmwa/generalhandler.cpp:234
-msgid "Strength"
-msgstr "Сила"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:237
-msgid "Agility"
-msgstr "Спритність"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:229 src/net/tmwa/generalhandler.cpp:240
-msgid "Vitality"
-msgstr "Витривалість"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:243
-msgid "Intelligence"
-msgstr "Інтелект"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:246
-msgid "Dexterity"
-msgstr "Вправність"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:238 src/net/tmwa/generalhandler.cpp:249
-msgid "Luck"
-msgstr "Талан"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:253
-msgid "Defense"
-msgstr "Захист"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:255
-msgid "M.Attack"
-msgstr "Маг. напад"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:257
-msgid "M.Defense"
-msgstr "Маг. захист"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:260
-#, no-c-format
-msgid "% Accuracy"
-msgstr "Точність (%)"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:263
-#, no-c-format
-msgid "% Evade"
-msgstr "Ухиляння (%)"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:266
-#, no-c-format
-msgid "% Critical"
-msgstr "Критичний удар (%)"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:268
-msgid "Attack Delay"
-msgstr "Затримка атаки"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:270
-msgid "Walk Delay"
-msgstr "Затримка руху"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:272
-msgid "Attack Range"
-msgstr "Дальність атаки"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:274
-msgid "Damage per sec."
-msgstr "Ушкодження за секунду."
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266
-msgid "Karma"
-msgstr "Карма"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268
-msgid "Manner"
-msgstr "Манери"
-
 #. TRANSLATORS: error message
 #: src/net/eathena/generalrecv.cpp:49 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
@@ -9413,7 +9324,7 @@ msgstr ""
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:199
+#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:190
 msgid "Unknown item"
 msgstr "Невідомий предмет"
 
@@ -9689,21 +9600,52 @@ msgstr "Новітній OpenGL"
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:93
-#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
-#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
+#: src/resources/db/itemdb.cpp:377 src/resources/db/itemdb.cpp:381
+#: src/resources/db/moddb.cpp:79 src/resources/db/monsterdb.cpp:101
+#: src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "казна що"
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:104
+#: src/resources/db/petdb.cpp:103
 msgid "pet"
 msgstr "улюбленець"
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:103
+#: src/resources/db/skillunitdb.cpp:102
 msgid "skill"
 msgstr ""
 
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:45
+msgid "Strength"
+msgstr "Сила"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:49
+msgid "Agility"
+msgstr "Спритність"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:53
+msgid "Vitality"
+msgstr "Витривалість"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:57
+msgid "Intelligence"
+msgstr "Інтелект"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:61
+msgid "Dexterity"
+msgstr "Вправність"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:65
+msgid "Luck"
+msgstr "Талан"
+
 #. TRANSLATORS: inventory type name
 #: src/resources/inventory/inventory.cpp:340
 msgid "Npc"
@@ -10355,8 +10297,9 @@ msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:556
-msgid "Room join failed. Not enought money."
-msgstr ""
+#, fuzzy
+msgid "Room join failed. Not enough money."
+msgstr "У тебе недостатньо коштів."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:560
@@ -10623,33 +10566,35 @@ msgstr ""
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:796
 #, c-format
-msgid "You and %s was divorced."
+msgid "You and %s are now divorced."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:800
-msgid "You was called by partner."
-msgstr ""
+#, fuzzy
+msgid "You were called by your partner."
+msgstr "Вас виштовхали з групи."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:804
 #, c-format
-msgid "You calling partner %s."
+msgid "You are calling your partner, %s."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:808
-msgid "Adoption child error. You already have baby."
+msgid "Child adoption failed. You already have a baby."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:812
-msgid "Adoption child error. You level too small for have baby."
+msgid "Child adoption failed. Your level is too low."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:816
-msgid "Adoption child error. This player already married and can't be baby."
+msgid ""
+"Child adoption failed. This player is already married and can't be a baby."
 msgstr ""
 
 #. TRANSLATORS: notification message
@@ -10659,19 +10604,21 @@ msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:825
-msgid "Error saving location. Not enought skill level."
+msgid "Error saving location. Not enough skill level."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:829
-msgid "Error saving location. You not have warp skill."
+msgid "Error saving location. You do not have warp skill."
 msgstr ""
 
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:29
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "Можливими опціями для /%s є: \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+"Можливими опціями для /%s є: \"yes\", \"no\", \"true\", \"false\", \"1\", "
+"\"0\"."
 
 #. TRANSLATORS: uptime command
 #: src/utils/stringutils.cpp:946
@@ -10727,3 +10674,57 @@ msgstr "%d секунда"
 #, c-format
 msgid "%d seconds"
 msgstr "%d секунд"
+
+#~ msgid "Strength %s"
+#~ msgstr "Сила %s"
+
+#~ msgid "Agility %s"
+#~ msgstr "Спритність %s"
+
+#~ msgid "Vitality %s"
+#~ msgstr "Витривалість %s"
+
+#~ msgid "Intelligence %s"
+#~ msgstr "Інтелект %s"
+
+#~ msgid "Dexterity %s"
+#~ msgstr "Вправність %s"
+
+#~ msgid "Luck %s"
+#~ msgstr "Талан %s"
+
+#~ msgid "Defense"
+#~ msgstr "Захист"
+
+#~ msgid "M.Attack"
+#~ msgstr "Маг. напад"
+
+#~ msgid "M.Defense"
+#~ msgstr "Маг. захист"
+
+#~ msgid "% Accuracy"
+#~ msgstr "Точність (%)"
+
+#~ msgid "% Evade"
+#~ msgstr "Ухиляння (%)"
+
+#~ msgid "% Critical"
+#~ msgstr "Критичний удар (%)"
+
+#~ msgid "Attack Delay"
+#~ msgstr "Затримка атаки"
+
+#~ msgid "Walk Delay"
+#~ msgstr "Затримка руху"
+
+#~ msgid "Attack Range"
+#~ msgstr "Дальність атаки"
+
+#~ msgid "Damage per sec."
+#~ msgstr "Ушкодження за секунду."
+
+#~ msgid "Karma"
+#~ msgstr "Карма"
+
+#~ msgid "Manner"
+#~ msgstr "Манери"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 24539cd73..ecc5135a1 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011
 # colorful <colorfullife81@gmail.com>, 2011
@@ -15,14 +15,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-06-18 18:53+0300\n"
+"POT-Creation-Date: 2016-07-02 19:47+0300\n"
 "PO-Revision-Date: 2016-06-19 09:21+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/akaras/manaplus/language/zh_CN/)\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/akaras/manaplus/"
+"language/zh_CN/)\n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANSLATORS: file uploaded message
@@ -39,7 +40,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:171 src/client.cpp:1569 src/client.cpp:1604
+#: src/actions/actions.cpp:171 src/client.cpp:1572 src/client.cpp:1607
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
@@ -50,7 +51,7 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_video.cpp:420
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:476
+#: src/gui/windows/charcreatedialog.cpp:475
 #: src/gui/windows/charselectdialog.cpp:262
 #: src/gui/windows/charselectdialog.cpp:310 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:59
@@ -59,9 +60,9 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:531
 #: src/gui/windows/textdialog.cpp:53 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:456
-#: src/net/eathena/charserverrecv.cpp:491
-#: src/net/eathena/charserverrecv.cpp:519 src/net/tmwa/charserverrecv.cpp:341
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:423
+#: src/net/eathena/charserverrecv.cpp:458
+#: src/net/eathena/charserverrecv.cpp:486 src/net/tmwa/charserverrecv.cpp:305
 msgid "OK"
 msgstr "确定"
 
@@ -308,26 +309,26 @@ msgid "Visible on map"
 msgstr "在地图上可见"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:496
+#: src/being/being.cpp:494
 msgid "Human"
 msgstr ""
 
 #. TRANSLATORS: dodge or miss message in attacks
-#: src/being/being.cpp:683
+#: src/being/being.cpp:676
 msgid "dodge"
 msgstr "躲闪"
 
-#: src/being/being.cpp:683
+#: src/being/being.cpp:676
 msgid "miss"
 msgstr "失误"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2282 src/gui/windows/whoisonline.cpp:882
+#: src/being/being.cpp:2275 src/gui/windows/whoisonline.cpp:882
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2287 src/gui/windows/whoisonline.cpp:887
+#: src/being/being.cpp:2280 src/gui/windows/whoisonline.cpp:887
 msgid "I"
 msgstr "I"
 
@@ -477,41 +478,41 @@ msgstr "流动的泡沫"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:870 src/dyetool/client.cpp:491 src/gui/windowmenu.cpp:189
+#: src/client.cpp:872 src/dyetool/client.cpp:491 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:66
 msgid "Setup"
 msgstr "设置"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:873 src/dyetool/client.cpp:494
+#: src/client.cpp:875 src/dyetool/client.cpp:494
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:876 src/dyetool/client.cpp:497
+#: src/client.cpp:878 src/dyetool/client.cpp:497
 #: src/gui/widgets/tabs/setup_video.cpp:110
 msgid "Video"
 msgstr "视频"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:879 src/dyetool/client.cpp:500
+#: src/client.cpp:881 src/dyetool/client.cpp:500
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "主题"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:882 src/dyetool/client.cpp:503
+#: src/client.cpp:884 src/dyetool/client.cpp:503
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:885 src/dyetool/client.cpp:506 src/gui/windowmenu.cpp:74
+#: src/client.cpp:887 src/dyetool/client.cpp:506 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "帮助"
@@ -532,7 +533,7 @@ msgstr "帮助"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:889 src/client.cpp:1483 src/client.cpp:1502
+#: src/client.cpp:891 src/client.cpp:1486 src/client.cpp:1505
 #: src/dyetool/client.cpp:510 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:756 src/gui/popups/popupmenu.cpp:833
 #: src/gui/popups/popupmenu.cpp:1087 src/gui/windows/didyouknowwindow.cpp:81
@@ -545,32 +546,32 @@ msgid "Close"
 msgstr "关闭"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1115 src/gui/windowmanager_unittest.cc:156
+#: src/client.cpp:1117 src/gui/windowmanager_unittest.cc:156
 msgid "Connecting to server"
 msgstr "正在连接服务器"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1172 src/gui/windowmanager_unittest.cc:173
+#: src/client.cpp:1174 src/gui/windowmanager_unittest.cc:173
 msgid "Logging in"
 msgstr "登录中"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1221
+#: src/client.cpp:1223
 msgid "Entering game world"
 msgstr "进入游戏世界"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1369
+#: src/client.cpp:1372
 msgid "Requesting characters"
 msgstr "请求角色"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1412
+#: src/client.cpp:1415
 msgid "Connecting to the game server"
 msgstr "正在连接游戏服务器"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1424
+#: src/client.cpp:1427
 msgid "Changing game servers"
 msgstr "正在更改游戏服务器"
 
@@ -587,52 +588,52 @@ msgstr "正在更改游戏服务器"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1480 src/client.cpp:1499 src/client.cpp:1738
+#: src/client.cpp:1483 src/client.cpp:1502 src/client.cpp:1741
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:472
+#: src/gui/windows/charcreatedialog.cpp:471
 #: src/gui/windows/charselectdialog.cpp:306
 #: src/gui/windows/editserverdialog.cpp:212
 #: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:429
-#: src/net/eathena/charserverrecv.cpp:433
-#: src/net/eathena/charserverrecv.cpp:515 src/net/tmwa/charserverrecv.cpp:337
+#: src/net/eathena/charserverrecv.cpp:396
+#: src/net/eathena/charserverrecv.cpp:400
+#: src/net/eathena/charserverrecv.cpp:482 src/net/tmwa/charserverrecv.cpp:301
 msgid "Error"
 msgstr "错误"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1518
+#: src/client.cpp:1521
 msgid "Requesting registration details"
 msgstr "正在请求详细注册信息"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1565
+#: src/client.cpp:1568
 msgid "Password Change"
 msgstr "更改密码"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1567
+#: src/client.cpp:1570
 msgid "Password changed successfully!"
 msgstr "密码更改成功!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1600
+#: src/client.cpp:1603
 msgid "Email Change"
 msgstr "更改电子邮箱地址"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1602
+#: src/client.cpp:1605
 msgid "Email changed successfully!"
 msgstr "电子邮箱地址更改成功!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1638
+#: src/client.cpp:1641
 msgid "Unregister Successful"
 msgstr "取消注册成功"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1640
+#: src/client.cpp:1643
 msgid "Farewell, come back any time..."
 msgstr "再见，欢迎随时回来..."
 
@@ -825,23 +826,23 @@ msgid "Debug"
 msgstr "调试"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:598
+#: src/game.cpp:600
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:608
+#: src/game.cpp:610
 msgid "Saving screenshot failed!"
 msgstr "保存屏幕快照失败!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:695
+#: src/game.cpp:697
 msgid "The connection to the server was lost."
 msgstr "服务器的连接丢失."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:698
+#: src/game.cpp:700
 msgid "Network Error"
 msgstr "网络错误"
 
@@ -1256,8 +1257,7 @@ msgstr ""
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
+"You are carrying more than half your weight. You are unable to regain health."
 msgstr "你已携带超过半数负重。无法回复健康（体力）."
 
 #. TRANSLATORS: weight message
@@ -1274,8 +1274,7 @@ msgstr ""
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:671
-#: src/gui/windows/serverdialog.cpp:603
+#: src/gui/windows/equipmentwindow.cpp:671 src/gui/windows/serverdialog.cpp:603
 msgid "default"
 msgstr "默认"
 
@@ -1827,11 +1826,9 @@ msgstr "交易"
 #. TRANSLATORS: attack player
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
-#. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:180 src/gui/popups/popupmenu.cpp:304
 #: src/gui/popups/popupmenu.cpp:912 src/gui/widgets/skillinfo.cpp:125
-#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
-#: src/net/tmwa/generalhandler.cpp:251
+#: src/input/pages/basic.cpp:40
 msgid "Attack"
 msgstr "攻击"
 
@@ -1907,7 +1904,7 @@ msgstr "移动"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:270 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:152
+#: src/resources/db/npcdb.cpp:151
 msgid "Talk"
 msgstr "说话"
 
@@ -1925,7 +1922,7 @@ msgstr "说话"
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:154
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:153
 msgid "Buy"
 msgstr "购买"
 
@@ -1943,7 +1940,7 @@ msgstr "购买"
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
 #: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:256
-#: src/resources/db/npcdb.cpp:156
+#: src/resources/db/npcdb.cpp:155
 msgid "Sell"
 msgstr "出售"
 
@@ -2045,7 +2042,7 @@ msgstr "卸下装备"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:408 src/resources/db/petdb.cpp:160
+#: src/gui/popups/popupmenu.cpp:408 src/resources/db/petdb.cpp:159
 msgid "Return to egg"
 msgstr ""
 
@@ -2442,7 +2439,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2125 src/gui/windows/statuswindow.cpp:90
 msgid "Copy to chat"
 msgstr ""
 
@@ -2494,9 +2491,8 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/popups/popupmenu.cpp:2386 src/gui/popups/skillpopup.cpp:127
-#: src/gui/windows/ministatuswindow.cpp:363
-#: src/gui/windows/statuswindow.cpp:68 src/gui/windows/statuswindow.cpp:243
-#: src/gui/windows/statuswindow.cpp:367
+#: src/gui/windows/ministatuswindow.cpp:363 src/gui/windows/statuswindow.cpp:70
+#: src/gui/windows/statuswindow.cpp:268 src/gui/windows/statuswindow.cpp:392
 #, c-format
 msgid "Level: %d"
 msgstr "等级：%d"
@@ -2915,8 +2911,8 @@ msgstr ""
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3100 src/gui/popups/popupmenu.cpp:3119
 #: src/gui/popups/popupmenu.cpp:3132 src/gui/windows/charselectdialog.cpp:76
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:452
-#: src/net/eathena/charserverrecv.cpp:488
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:419
+#: src/net/eathena/charserverrecv.cpp:455
 msgid "Info"
 msgstr "信息"
 
@@ -3307,8 +3303,8 @@ msgstr ""
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/statuswindow.cpp:70
-#: src/gui/windows/statuswindow.cpp:220 src/gui/windows/statuswindow.cpp:334
+#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/statuswindow.cpp:72
+#: src/gui/windows/statuswindow.cpp:222 src/gui/windows/statuswindow.cpp:359
 #, c-format
 msgid "Money: %s"
 msgstr "金币: %s"
@@ -3364,7 +3360,7 @@ msgstr "退出"
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:194
 #: src/gui/windows/itemamountwindow.cpp:230 src/gui/windows/npcdialog.cpp:123
-#: src/gui/windows/statuswindow.cpp:746
+#: src/gui/windows/statuswindow.cpp:771
 msgid "+"
 msgstr "+"
 
@@ -3385,8 +3381,8 @@ msgstr "-"
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/selldialog.cpp:133 src/gui/windows/buydialog.cpp:299
-#: src/gui/windows/statuswindow.cpp:483 src/gui/windows/statuswindow.cpp:539
-#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:766
+#: src/gui/windows/statuswindow.cpp:508 src/gui/windows/statuswindow.cpp:564
+#: src/gui/windows/statuswindow.cpp:769 src/gui/windows/statuswindow.cpp:791
 msgid "Max"
 msgstr "最大"
 
@@ -3542,15 +3538,13 @@ msgstr "物品共享开启."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104
-#: src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr "物品共享关闭."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109
-#: src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr "物品共享不可能."
 
@@ -3561,22 +3555,19 @@ msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150
-#: src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr "经验共享开启."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155
-#: src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr "经验共享关闭."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160
-#: src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr "经验共享不可能."
 
@@ -4010,15 +4001,15 @@ msgstr ""
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
+"Note: no other text inputs will be allowed to receive text input when you "
+"typing in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86
-#: src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr "颜色"
 
@@ -4042,9 +4033,11 @@ msgstr "显示聊天颜色列表"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat "
+"window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4071,9 +4064,11 @@ msgstr "文字数量超过限制"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed "
+"in chat.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will be truncated."
+"Note: long lines can make client slower. Lines longer than this limit will "
+"be truncated."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4084,7 +4079,9 @@ msgstr "限制聊天的最大"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
+"specified number of last lines of text. Oldest lines exceeding this limit "
+"are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
 msgstr ""
@@ -4125,8 +4122,8 @@ msgstr "显示聊天记录"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on"
-" startup instead of starting with empty chat tabs."
+"If this setting enabled, client will load old chat tabs content from logs on "
+"startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4137,9 +4134,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be "
+"shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4150,9 +4149,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be "
+"shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4168,9 +4169,13 @@ msgstr "隐藏商店消息"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will "
+"be displayed in chat. Disable this setting if you want to see shop-related "
+"messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
+"Note: technically, ManaPlus shop implemented as usual private messages with "
+"special content. If you disable this setting, you will be able to see these "
+"messages and get idea when other players are looking at your shop."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4183,7 +4188,8 @@ msgstr ""
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
+"usually makes little difference."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4202,9 +4208,12 @@ msgstr "将所有密语放于标签夜"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in "
+"separate tabs, separate tab for each player. If this setting disabled, all "
+"whispers will appear in General tab.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
+"Note: putting all whispers to single General tab is known to be confusing. "
+"Think twice before disabling this feature."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4215,7 +4224,8 @@ msgstr "在调试页记录魔法信息"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If "
+"disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
 msgstr ""
@@ -4228,9 +4238,11 @@ msgstr "在调试选项卡中显示服务器的消息"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of "
+"chat. If disabled, server messages will appear in General chat instead.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
+"Note: according to 4144, disabling this could also make you to lose some "
+"debug messages from client in Debug tab since these are fake server messages."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4255,9 +4267,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM "
+"activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
+"Note: this setting only makes difference for GMs (Game Masters) since this "
+"tab only appears for GMs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4268,7 +4282,8 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this feature.\n"
+"If this feature enabled, language tab will appear if server supports this "
+"feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
 msgstr ""
@@ -4281,7 +4296,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
+"If this setting enabled and server supports different chats for different "
+"languages, you will see messages for all languages, regardless of your "
+"language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
 msgstr ""
@@ -4294,7 +4311,9 @@ msgstr "启用战斗“选项卡"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will "
+"contain messages related to battles, like damage and experience gain, if "
+"battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
 msgstr ""
@@ -4320,7 +4339,10 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to "
+"adapt to appearance of chat input field when you typing message and when "
+"input field of chat disappears. If disabled, chat input area will always "
+"occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
@@ -4355,7 +4377,8 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. "
+"Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
 msgstr ""
@@ -4368,7 +4391,8 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender "
+"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
 msgstr ""
@@ -4381,9 +4405,12 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This "
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by "
+"default."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -6127,8 +6154,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:618
-#: src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:618 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "建立"
 
@@ -6244,17 +6270,16 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:104
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:210
-#: src/gui/windows/charcreatedialog.cpp:221
-#: src/gui/windows/charcreatedialog.cpp:231
-#: src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:196
+#: src/gui/windows/charcreatedialog.cpp:209
+#: src/gui/windows/charcreatedialog.cpp:220
+#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:110
-#: src/gui/windows/charcreatedialog.cpp:600
+#: src/gui/windows/charcreatedialog.cpp:599
 #, c-format
 msgid "Please distribute %d points"
 msgstr "请分发%d点数"
@@ -6263,73 +6288,71 @@ msgstr "请分发%d点数"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:201
-#: src/gui/windows/charcreatedialog.cpp:212
-#: src/gui/windows/charcreatedialog.cpp:223
-#: src/gui/windows/charcreatedialog.cpp:233
-#: src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:200
+#: src/gui/windows/charcreatedialog.cpp:211
+#: src/gui/windows/charcreatedialog.cpp:222
+#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:202
 msgid "Hair color:"
 msgstr "头发颜色:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:213
 msgid "Hair style:"
 msgstr "发型:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:224
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:234
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:252
-#: src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:258
-#: src/gui/windows/charcreatedialog.cpp:265
-#: src/gui/windows/charcreatedialog.cpp:273
+#: src/gui/windows/charcreatedialog.cpp:257
+#: src/gui/windows/charcreatedialog.cpp:264
+#: src/gui/windows/charcreatedialog.cpp:272
 msgid "M"
 msgstr ""
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:260
-#: src/gui/windows/charcreatedialog.cpp:277
+#: src/gui/windows/charcreatedialog.cpp:259
+#: src/gui/windows/charcreatedialog.cpp:276
 #: src/gui/windows/inventorywindow.cpp:223
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:267
+#: src/gui/windows/charcreatedialog.cpp:266
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:474
+#: src/gui/windows/charcreatedialog.cpp:473
 msgid "Your name needs to be at least 4 characters."
 msgstr "你的名字需要至少4个字符."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:590
+#: src/gui/windows/charcreatedialog.cpp:589
 msgid "Character stats OK"
 msgstr "角色状态可以"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:606
+#: src/gui/windows/charcreatedialog.cpp:605
 #, c-format
 msgid "Please remove %d points"
 msgstr "请删除%d点数"
@@ -6495,8 +6518,7 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57
-#: src/gui/windows/serverdialog.cpp:112
+#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:112
 msgid "Connect"
 msgstr "连接"
 
@@ -6852,15 +6874,13 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61
-#: src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr ""
@@ -6969,7 +6989,7 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/windows/ministatuswindow.cpp:356
-#: src/gui/windows/statuswindow.cpp:236
+#: src/gui/windows/statuswindow.cpp:261
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "级别:%d (GM %d)"
@@ -7421,33 +7441,33 @@ msgid "Choose your party's name."
 msgstr "选择n的名称."
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:72
+#: src/gui/windows/statuswindow.cpp:74
 msgid "HP:"
 msgstr "HP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:75
+#: src/gui/windows/statuswindow.cpp:77
 msgid "Exp:"
 msgstr "经验:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:136
+#: src/gui/windows/statuswindow.cpp:138
 msgid "MP:"
 msgstr "MP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:173 src/gui/windows/statuswindow.cpp:294
+#: src/gui/windows/statuswindow.cpp:175 src/gui/windows/statuswindow.cpp:319
 #, c-format
 msgid "Job: %d"
 msgstr "职业：%d"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:175
+#: src/gui/windows/statuswindow.cpp:177
 msgid "Job:"
 msgstr "职业:"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:224 src/gui/windows/statuswindow.cpp:342
+#: src/gui/windows/statuswindow.cpp:226 src/gui/windows/statuswindow.cpp:367
 #, c-format
 msgid "Character points: %d"
 msgstr "角色可用点: %d"
@@ -7565,8 +7585,7 @@ msgstr "你没有足够的钱币."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "添加物品失败。你不能覆盖窗口中的该类物品."
 
 #. TRANSLATORS: trade error
@@ -9005,7 +9024,9 @@ msgstr ""
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
-msgstr "你被暂时禁止进入游戏直到%s.\n请通过论坛联系GM组."
+msgstr ""
+"你被暂时禁止进入游戏直到%s.\n"
+"请通过论坛联系GM组."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:151 src/net/eathena/loginrecv.cpp:92
@@ -9045,33 +9066,33 @@ msgstr "连接到服务器终止. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:431
-#: src/net/eathena/charserverrecv.cpp:479
+#: src/net/eathena/charserverrecv.cpp:398
+#: src/net/eathena/charserverrecv.cpp:446
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:454
+#: src/net/eathena/charserverrecv.cpp:421
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:470
+#: src/net/eathena/charserverrecv.cpp:437
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:474
+#: src/net/eathena/charserverrecv.cpp:441
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:483
+#: src/net/eathena/charserverrecv.cpp:450
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:517 src/net/tmwa/charserverrecv.cpp:339
+#: src/net/eathena/charserverrecv.cpp:484 src/net/tmwa/charserverrecv.cpp:303
 msgid "Failed to delete character."
 msgstr "删除角色失败."
 
@@ -9123,140 +9144,11 @@ msgstr ""
 msgid "Do you accept %s and %s as parents?"
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:130
-#, c-format
-msgid "Strength %s"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:132
-#, c-format
-msgid "Agility %s"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:134
-#, c-format
-msgid "Vitality %s"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:136
-#, c-format
-msgid "Intelligence %s"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:138
-#, c-format
-msgid "Dexterity %s"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:140
-#, c-format
-msgid "Luck %s"
-msgstr ""
-
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:197 src/net/tmwa/generalhandler.cpp:207
+#: src/net/eathena/generalhandler.cpp:179 src/net/tmwa/generalhandler.cpp:189
 msgid "Got disconnected from server!"
 msgstr "和服务器失去连接!"
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:223 src/net/tmwa/generalhandler.cpp:234
-msgid "Strength"
-msgstr "力量"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:237
-msgid "Agility"
-msgstr "敏捷"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:229 src/net/tmwa/generalhandler.cpp:240
-msgid "Vitality"
-msgstr "生命"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:243
-msgid "Intelligence"
-msgstr "智慧"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:246
-msgid "Dexterity"
-msgstr "敏捷"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:238 src/net/tmwa/generalhandler.cpp:249
-msgid "Luck"
-msgstr "幸运"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:253
-msgid "Defense"
-msgstr "防御"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:255
-msgid "M.Attack"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:257
-msgid "M.Defense"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:260
-#, no-c-format
-msgid "% Accuracy"
-msgstr "％精度"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:263
-#, no-c-format
-msgid "% Evade"
-msgstr "％闪避"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:266
-#, no-c-format
-msgid "% Critical"
-msgstr "％"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:268
-msgid "Attack Delay"
-msgstr "攻击延迟"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:270
-msgid "Walk Delay"
-msgstr "步行延迟"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:272
-msgid "Attack Range"
-msgstr "攻击范围"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:274
-msgid "Damage per sec."
-msgstr "每秒伤害."
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266
-msgid "Karma"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268
-msgid "Manner"
-msgstr ""
-
 #. TRANSLATORS: error message
 #: src/net/eathena/generalrecv.cpp:49 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
@@ -9412,7 +9304,7 @@ msgstr ""
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:199
+#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:190
 msgid "Unknown item"
 msgstr "未知物品"
 
@@ -9688,21 +9580,52 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:93
-#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
-#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
+#: src/resources/db/itemdb.cpp:377 src/resources/db/itemdb.cpp:381
+#: src/resources/db/moddb.cpp:79 src/resources/db/monsterdb.cpp:101
+#: src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "未知怪兽"
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:104
+#: src/resources/db/petdb.cpp:103
 msgid "pet"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:103
+#: src/resources/db/skillunitdb.cpp:102
 msgid "skill"
 msgstr ""
 
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:45
+msgid "Strength"
+msgstr "力量"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:49
+msgid "Agility"
+msgstr "敏捷"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:53
+msgid "Vitality"
+msgstr "生命"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:57
+msgid "Intelligence"
+msgstr "智慧"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:61
+msgid "Dexterity"
+msgstr "敏捷"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:65
+msgid "Luck"
+msgstr "幸运"
+
 #. TRANSLATORS: inventory type name
 #: src/resources/inventory/inventory.cpp:340
 msgid "Npc"
@@ -10354,8 +10277,9 @@ msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:556
-msgid "Room join failed. Not enought money."
-msgstr ""
+#, fuzzy
+msgid "Room join failed. Not enough money."
+msgstr "你没有足够的钱币."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:560
@@ -10622,33 +10546,34 @@ msgstr ""
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:796
 #, c-format
-msgid "You and %s was divorced."
+msgid "You and %s are now divorced."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:800
-msgid "You was called by partner."
+msgid "You were called by your partner."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:804
 #, c-format
-msgid "You calling partner %s."
+msgid "You are calling your partner, %s."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:808
-msgid "Adoption child error. You already have baby."
+msgid "Child adoption failed. You already have a baby."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:812
-msgid "Adoption child error. You level too small for have baby."
+msgid "Child adoption failed. Your level is too low."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:816
-msgid "Adoption child error. This player already married and can't be baby."
+msgid ""
+"Child adoption failed. This player is already married and can't be a baby."
 msgstr ""
 
 #. TRANSLATORS: notification message
@@ -10658,12 +10583,12 @@ msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:825
-msgid "Error saving location. Not enought skill level."
+msgid "Error saving location. Not enough skill level."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:829
-msgid "Error saving location. You not have warp skill."
+msgid "Error saving location. You do not have warp skill."
 msgstr ""
 
 #. TRANSLATORS: chat option changed message
@@ -10726,3 +10651,27 @@ msgstr ""
 #, c-format
 msgid "%d seconds"
 msgstr ""
+
+#~ msgid "Defense"
+#~ msgstr "防御"
+
+#~ msgid "% Accuracy"
+#~ msgstr "％精度"
+
+#~ msgid "% Evade"
+#~ msgstr "％闪避"
+
+#~ msgid "% Critical"
+#~ msgstr "％"
+
+#~ msgid "Attack Delay"
+#~ msgstr "攻击延迟"
+
+#~ msgid "Walk Delay"
+#~ msgstr "步行延迟"
+
+#~ msgid "Attack Range"
+#~ msgstr "攻击范围"
+
+#~ msgid "Damage per sec."
+#~ msgstr "每秒伤害."
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 6887ed7d2..bac350ea7 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011
 # Pak Long Wu <paklongwu1006@gmail.com>, 2015
@@ -9,14 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-06-18 18:53+0300\n"
+"POT-Creation-Date: 2016-07-02 19:47+0300\n"
 "PO-Revision-Date: 2016-06-19 09:21+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/akaras/manaplus/language/zh_HK/)\n"
+"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/akaras/manaplus/"
+"language/zh_HK/)\n"
+"Language: zh_HK\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh_HK\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANSLATORS: file uploaded message
@@ -33,7 +34,7 @@ msgstr "檔案上載成功"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:171 src/client.cpp:1569 src/client.cpp:1604
+#: src/actions/actions.cpp:171 src/client.cpp:1572 src/client.cpp:1607
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
@@ -44,7 +45,7 @@ msgstr "檔案上載成功"
 #: src/gui/widgets/tabs/setup_video.cpp:420
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:476
+#: src/gui/windows/charcreatedialog.cpp:475
 #: src/gui/windows/charselectdialog.cpp:262
 #: src/gui/windows/charselectdialog.cpp:310 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:59
@@ -53,9 +54,9 @@ msgstr "檔案上載成功"
 #: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:531
 #: src/gui/windows/textdialog.cpp:53 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:456
-#: src/net/eathena/charserverrecv.cpp:491
-#: src/net/eathena/charserverrecv.cpp:519 src/net/tmwa/charserverrecv.cpp:341
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:423
+#: src/net/eathena/charserverrecv.cpp:458
+#: src/net/eathena/charserverrecv.cpp:486 src/net/tmwa/charserverrecv.cpp:305
 msgid "OK"
 msgstr "確定"
 
@@ -302,26 +303,26 @@ msgid "Visible on map"
 msgstr "在地圖上可見"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:496
+#: src/being/being.cpp:494
 msgid "Human"
 msgstr "人類"
 
 #. TRANSLATORS: dodge or miss message in attacks
-#: src/being/being.cpp:683
+#: src/being/being.cpp:676
 msgid "dodge"
 msgstr "閃避"
 
-#: src/being/being.cpp:683
+#: src/being/being.cpp:676
 msgid "miss"
 msgstr "失誤"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2282 src/gui/windows/whoisonline.cpp:882
+#: src/being/being.cpp:2275 src/gui/windows/whoisonline.cpp:882
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2287 src/gui/windows/whoisonline.cpp:887
+#: src/being/being.cpp:2280 src/gui/windows/whoisonline.cpp:887
 msgid "I"
 msgstr "I"
 
@@ -471,41 +472,41 @@ msgstr "浮動的泡泡"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:870 src/dyetool/client.cpp:491 src/gui/windowmenu.cpp:189
+#: src/client.cpp:872 src/dyetool/client.cpp:491 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:66
 msgid "Setup"
 msgstr "設定"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:873 src/dyetool/client.cpp:494
+#: src/client.cpp:875 src/dyetool/client.cpp:494
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "性能"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:876 src/dyetool/client.cpp:497
+#: src/client.cpp:878 src/dyetool/client.cpp:497
 #: src/gui/widgets/tabs/setup_video.cpp:110
 msgid "Video"
 msgstr "顯示"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:879 src/dyetool/client.cpp:500
+#: src/client.cpp:881 src/dyetool/client.cpp:500
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "主題"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:882 src/dyetool/client.cpp:503
+#: src/client.cpp:884 src/dyetool/client.cpp:503
 msgid "About"
 msgstr "關於"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:885 src/dyetool/client.cpp:506 src/gui/windowmenu.cpp:74
+#: src/client.cpp:887 src/dyetool/client.cpp:506 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "說明"
@@ -526,7 +527,7 @@ msgstr "說明"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:889 src/client.cpp:1483 src/client.cpp:1502
+#: src/client.cpp:891 src/client.cpp:1486 src/client.cpp:1505
 #: src/dyetool/client.cpp:510 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:756 src/gui/popups/popupmenu.cpp:833
 #: src/gui/popups/popupmenu.cpp:1087 src/gui/windows/didyouknowwindow.cpp:81
@@ -539,32 +540,32 @@ msgid "Close"
 msgstr "關閉"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1115 src/gui/windowmanager_unittest.cc:156
+#: src/client.cpp:1117 src/gui/windowmanager_unittest.cc:156
 msgid "Connecting to server"
 msgstr "正在連接到伺服器"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1172 src/gui/windowmanager_unittest.cc:173
+#: src/client.cpp:1174 src/gui/windowmanager_unittest.cc:173
 msgid "Logging in"
 msgstr "正在登入"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1221
+#: src/client.cpp:1223
 msgid "Entering game world"
 msgstr "正在進入遊戲"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1369
+#: src/client.cpp:1372
 msgid "Requesting characters"
 msgstr "正在查詢角色"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1412
+#: src/client.cpp:1415
 msgid "Connecting to the game server"
 msgstr "正在連接到遊戲伺服器"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1424
+#: src/client.cpp:1427
 msgid "Changing game servers"
 msgstr "正在轉換遊戲伺服器"
 
@@ -581,52 +582,52 @@ msgstr "正在轉換遊戲伺服器"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1480 src/client.cpp:1499 src/client.cpp:1738
+#: src/client.cpp:1483 src/client.cpp:1502 src/client.cpp:1741
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:472
+#: src/gui/windows/charcreatedialog.cpp:471
 #: src/gui/windows/charselectdialog.cpp:306
 #: src/gui/windows/editserverdialog.cpp:212
 #: src/gui/windows/registerdialog.cpp:256
 #: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:429
-#: src/net/eathena/charserverrecv.cpp:433
-#: src/net/eathena/charserverrecv.cpp:515 src/net/tmwa/charserverrecv.cpp:337
+#: src/net/eathena/charserverrecv.cpp:396
+#: src/net/eathena/charserverrecv.cpp:400
+#: src/net/eathena/charserverrecv.cpp:482 src/net/tmwa/charserverrecv.cpp:301
 msgid "Error"
 msgstr "錯誤"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1518
+#: src/client.cpp:1521
 msgid "Requesting registration details"
 msgstr "正在查詢註冊的詳細信息"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1565
+#: src/client.cpp:1568
 msgid "Password Change"
 msgstr "更改密碼"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1567
+#: src/client.cpp:1570
 msgid "Password changed successfully!"
 msgstr "成功更改密碼!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1600
+#: src/client.cpp:1603
 msgid "Email Change"
 msgstr "更改電郵地址"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1602
+#: src/client.cpp:1605
 msgid "Email changed successfully!"
 msgstr "成功更改電郵地址!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1638
+#: src/client.cpp:1641
 msgid "Unregister Successful"
 msgstr "取消註冊成功"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1640
+#: src/client.cpp:1643
 msgid "Farewell, come back any time..."
 msgstr "再見了，隨時回來吧..."
 
@@ -819,23 +820,23 @@ msgid "Debug"
 msgstr "調試"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:598
+#: src/game.cpp:600
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "截圖已保存為 %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:608
+#: src/game.cpp:610
 msgid "Saving screenshot failed!"
 msgstr "保存截圖失敗!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:695
+#: src/game.cpp:697
 msgid "The connection to the server was lost."
 msgstr "與服務器的連接中斷."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:698
+#: src/game.cpp:700
 msgid "Network Error"
 msgstr "網絡錯誤"
 
@@ -1250,8 +1251,7 @@ msgstr "復活"
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
+"You are carrying more than half your weight. You are unable to regain health."
 msgstr "您在攜帶超過體重一半的物品.你將無法回復生命值."
 
 #. TRANSLATORS: weight message
@@ -1268,8 +1268,7 @@ msgstr "您在攜帶少於體重一半的物品.你可以回復生命值了."
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:671
-#: src/gui/windows/serverdialog.cpp:603
+#: src/gui/windows/equipmentwindow.cpp:671 src/gui/windows/serverdialog.cpp:603
 msgid "default"
 msgstr "默認"
 
@@ -1821,11 +1820,9 @@ msgstr "交易"
 #. TRANSLATORS: attack player
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
-#. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:180 src/gui/popups/popupmenu.cpp:304
 #: src/gui/popups/popupmenu.cpp:912 src/gui/widgets/skillinfo.cpp:125
-#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
-#: src/net/tmwa/generalhandler.cpp:251
+#: src/input/pages/basic.cpp:40
 msgid "Attack"
 msgstr "攻擊"
 
@@ -1901,7 +1898,7 @@ msgstr "移動"
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
 #: src/gui/popups/popupmenu.cpp:270 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:152
+#: src/resources/db/npcdb.cpp:151
 msgid "Talk"
 msgstr "對話"
 
@@ -1919,7 +1916,7 @@ msgstr "對話"
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:154
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:153
 msgid "Buy"
 msgstr "購買"
 
@@ -1937,7 +1934,7 @@ msgstr "購買"
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
 #: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:256
-#: src/resources/db/npcdb.cpp:156
+#: src/resources/db/npcdb.cpp:155
 msgid "Sell"
 msgstr "出售"
 
@@ -2039,7 +2036,7 @@ msgstr "卸下裝備"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:408 src/resources/db/petdb.cpp:160
+#: src/gui/popups/popupmenu.cpp:408 src/resources/db/petdb.cpp:159
 msgid "Return to egg"
 msgstr "返回蛋裏"
 
@@ -2436,7 +2433,7 @@ msgstr "重設黃色欄"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2125 src/gui/windows/statuswindow.cpp:90
 msgid "Copy to chat"
 msgstr "複製至對話"
 
@@ -2488,9 +2485,8 @@ msgstr "顯示視窗"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/popups/popupmenu.cpp:2386 src/gui/popups/skillpopup.cpp:127
-#: src/gui/windows/ministatuswindow.cpp:363
-#: src/gui/windows/statuswindow.cpp:68 src/gui/windows/statuswindow.cpp:243
-#: src/gui/windows/statuswindow.cpp:367
+#: src/gui/windows/ministatuswindow.cpp:363 src/gui/windows/statuswindow.cpp:70
+#: src/gui/windows/statuswindow.cpp:268 src/gui/windows/statuswindow.cpp:392
 #, c-format
 msgid "Level: %d"
 msgstr "等級:%d"
@@ -2909,8 +2905,8 @@ msgstr ""
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3100 src/gui/popups/popupmenu.cpp:3119
 #: src/gui/popups/popupmenu.cpp:3132 src/gui/windows/charselectdialog.cpp:76
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:452
-#: src/net/eathena/charserverrecv.cpp:488
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:419
+#: src/net/eathena/charserverrecv.cpp:455
 msgid "Info"
 msgstr ""
 
@@ -3301,8 +3297,8 @@ msgstr ""
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/statuswindow.cpp:70
-#: src/gui/windows/statuswindow.cpp:220 src/gui/windows/statuswindow.cpp:334
+#: src/gui/windows/inventorywindow.cpp:719 src/gui/windows/statuswindow.cpp:72
+#: src/gui/windows/statuswindow.cpp:222 src/gui/windows/statuswindow.cpp:359
 #, c-format
 msgid "Money: %s"
 msgstr ""
@@ -3358,7 +3354,7 @@ msgstr "離開"
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:194
 #: src/gui/windows/itemamountwindow.cpp:230 src/gui/windows/npcdialog.cpp:123
-#: src/gui/windows/statuswindow.cpp:746
+#: src/gui/windows/statuswindow.cpp:771
 msgid "+"
 msgstr ""
 
@@ -3379,8 +3375,8 @@ msgstr ""
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/selldialog.cpp:133 src/gui/windows/buydialog.cpp:299
-#: src/gui/windows/statuswindow.cpp:483 src/gui/windows/statuswindow.cpp:539
-#: src/gui/windows/statuswindow.cpp:744 src/gui/windows/statuswindow.cpp:766
+#: src/gui/windows/statuswindow.cpp:508 src/gui/windows/statuswindow.cpp:564
+#: src/gui/windows/statuswindow.cpp:769 src/gui/windows/statuswindow.cpp:791
 msgid "Max"
 msgstr ""
 
@@ -3536,15 +3532,13 @@ msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104
-#: src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109
-#: src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr ""
 
@@ -3555,22 +3549,19 @@ msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150
-#: src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155
-#: src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160
-#: src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr ""
 
@@ -4004,15 +3995,15 @@ msgstr ""
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
+"Note: no other text inputs will be allowed to receive text input when you "
+"typing in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86
-#: src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr ""
 
@@ -4036,9 +4027,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat "
+"window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4065,9 +4058,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed "
+"in chat.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will be truncated."
+"Note: long lines can make client slower. Lines longer than this limit will "
+"be truncated."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4078,7 +4073,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
+"specified number of last lines of text. Oldest lines exceeding this limit "
+"are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
 msgstr ""
@@ -4119,8 +4116,8 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on"
-" startup instead of starting with empty chat tabs."
+"If this setting enabled, client will load old chat tabs content from logs on "
+"startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4131,9 +4128,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be "
+"shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4144,9 +4143,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be "
+"shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4162,9 +4163,13 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will "
+"be displayed in chat. Disable this setting if you want to see shop-related "
+"messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
+"Note: technically, ManaPlus shop implemented as usual private messages with "
+"special content. If you disable this setting, you will be able to see these "
+"messages and get idea when other players are looking at your shop."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4177,7 +4182,8 @@ msgstr ""
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
+"usually makes little difference."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4196,9 +4202,12 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in "
+"separate tabs, separate tab for each player. If this setting disabled, all "
+"whispers will appear in General tab.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
+"Note: putting all whispers to single General tab is known to be confusing. "
+"Think twice before disabling this feature."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4209,7 +4218,8 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If "
+"disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
 msgstr ""
@@ -4222,9 +4232,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of "
+"chat. If disabled, server messages will appear in General chat instead.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
+"Note: according to 4144, disabling this could also make you to lose some "
+"debug messages from client in Debug tab since these are fake server messages."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4249,9 +4261,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM "
+"activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
+"Note: this setting only makes difference for GMs (Game Masters) since this "
+"tab only appears for GMs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4262,7 +4276,8 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this feature.\n"
+"If this feature enabled, language tab will appear if server supports this "
+"feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
 msgstr ""
@@ -4275,7 +4290,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
+"If this setting enabled and server supports different chats for different "
+"languages, you will see messages for all languages, regardless of your "
+"language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
 msgstr ""
@@ -4288,7 +4305,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will "
+"contain messages related to battles, like damage and experience gain, if "
+"battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
 msgstr ""
@@ -4314,7 +4333,10 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to "
+"adapt to appearance of chat input field when you typing message and when "
+"input field of chat disappears. If disabled, chat input area will always "
+"occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
@@ -4349,7 +4371,8 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. "
+"Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
 msgstr ""
@@ -4362,7 +4385,8 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender "
+"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
 msgstr ""
@@ -4375,9 +4399,12 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This "
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by "
+"default."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -6121,8 +6148,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:618
-#: src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:618 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "建立隊伍"
 
@@ -6238,17 +6264,16 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:104
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:210
-#: src/gui/windows/charcreatedialog.cpp:221
-#: src/gui/windows/charcreatedialog.cpp:231
-#: src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:196
+#: src/gui/windows/charcreatedialog.cpp:209
+#: src/gui/windows/charcreatedialog.cpp:220
+#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:110
-#: src/gui/windows/charcreatedialog.cpp:600
+#: src/gui/windows/charcreatedialog.cpp:599
 #, c-format
 msgid "Please distribute %d points"
 msgstr "請分配%d點數"
@@ -6257,73 +6282,71 @@ msgstr "請分配%d點數"
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:201
-#: src/gui/windows/charcreatedialog.cpp:212
-#: src/gui/windows/charcreatedialog.cpp:223
-#: src/gui/windows/charcreatedialog.cpp:233
-#: src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:200
+#: src/gui/windows/charcreatedialog.cpp:211
+#: src/gui/windows/charcreatedialog.cpp:222
+#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:202
 msgid "Hair color:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:213
 msgid "Hair style:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:224
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:234
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:252
-#: src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:258
-#: src/gui/windows/charcreatedialog.cpp:265
-#: src/gui/windows/charcreatedialog.cpp:273
+#: src/gui/windows/charcreatedialog.cpp:257
+#: src/gui/windows/charcreatedialog.cpp:264
+#: src/gui/windows/charcreatedialog.cpp:272
 msgid "M"
 msgstr ""
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:260
-#: src/gui/windows/charcreatedialog.cpp:277
+#: src/gui/windows/charcreatedialog.cpp:259
+#: src/gui/windows/charcreatedialog.cpp:276
 #: src/gui/windows/inventorywindow.cpp:223
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:267
+#: src/gui/windows/charcreatedialog.cpp:266
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:474
+#: src/gui/windows/charcreatedialog.cpp:473
 msgid "Your name needs to be at least 4 characters."
 msgstr "你的名字至少需要4個字元."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:590
+#: src/gui/windows/charcreatedialog.cpp:589
 msgid "Character stats OK"
 msgstr "角色狀態確定"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:606
+#: src/gui/windows/charcreatedialog.cpp:605
 #, c-format
 msgid "Please remove %d points"
 msgstr "請移除%d點數"
@@ -6489,8 +6512,7 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57
-#: src/gui/windows/serverdialog.cpp:112
+#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:112
 msgid "Connect"
 msgstr ""
 
@@ -6846,15 +6868,13 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61
-#: src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr ""
@@ -6963,7 +6983,7 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/windows/ministatuswindow.cpp:356
-#: src/gui/windows/statuswindow.cpp:236
+#: src/gui/windows/statuswindow.cpp:261
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
@@ -7415,33 +7435,33 @@ msgid "Choose your party's name."
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:72
+#: src/gui/windows/statuswindow.cpp:74
 msgid "HP:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:75
+#: src/gui/windows/statuswindow.cpp:77
 msgid "Exp:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:136
+#: src/gui/windows/statuswindow.cpp:138
 msgid "MP:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:173 src/gui/windows/statuswindow.cpp:294
+#: src/gui/windows/statuswindow.cpp:175 src/gui/windows/statuswindow.cpp:319
 #, c-format
 msgid "Job: %d"
 msgstr "職業:%d"
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:175
+#: src/gui/windows/statuswindow.cpp:177
 msgid "Job:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/windows/statuswindow.cpp:224 src/gui/windows/statuswindow.cpp:342
+#: src/gui/windows/statuswindow.cpp:226 src/gui/windows/statuswindow.cpp:367
 #, c-format
 msgid "Character points: %d"
 msgstr ""
@@ -7559,8 +7579,7 @@ msgstr ""
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "增加物品失敗。你不能覆蓋視窗中的物品."
 
 #. TRANSLATORS: trade error
@@ -9039,33 +9058,33 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:431
-#: src/net/eathena/charserverrecv.cpp:479
+#: src/net/eathena/charserverrecv.cpp:398
+#: src/net/eathena/charserverrecv.cpp:446
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:454
+#: src/net/eathena/charserverrecv.cpp:421
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:470
+#: src/net/eathena/charserverrecv.cpp:437
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:474
+#: src/net/eathena/charserverrecv.cpp:441
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:483
+#: src/net/eathena/charserverrecv.cpp:450
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:517 src/net/tmwa/charserverrecv.cpp:339
+#: src/net/eathena/charserverrecv.cpp:484 src/net/tmwa/charserverrecv.cpp:303
 msgid "Failed to delete character."
 msgstr ""
 
@@ -9117,140 +9136,11 @@ msgstr ""
 msgid "Do you accept %s and %s as parents?"
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:130
-#, c-format
-msgid "Strength %s"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:132
-#, c-format
-msgid "Agility %s"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:134
-#, c-format
-msgid "Vitality %s"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:136
-#, c-format
-msgid "Intelligence %s"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:138
-#, c-format
-msgid "Dexterity %s"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:140
-#, c-format
-msgid "Luck %s"
-msgstr ""
-
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:197 src/net/tmwa/generalhandler.cpp:207
+#: src/net/eathena/generalhandler.cpp:179 src/net/tmwa/generalhandler.cpp:189
 msgid "Got disconnected from server!"
 msgstr "和伺服器失去連線!"
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:223 src/net/tmwa/generalhandler.cpp:234
-msgid "Strength"
-msgstr "力量"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:226 src/net/tmwa/generalhandler.cpp:237
-msgid "Agility"
-msgstr "敏捷"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:229 src/net/tmwa/generalhandler.cpp:240
-msgid "Vitality"
-msgstr "體力"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:232 src/net/tmwa/generalhandler.cpp:243
-msgid "Intelligence"
-msgstr "智力"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:235 src/net/tmwa/generalhandler.cpp:246
-msgid "Dexterity"
-msgstr "靈巧"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:238 src/net/tmwa/generalhandler.cpp:249
-msgid "Luck"
-msgstr "幸運"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:253
-msgid "Defense"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:255
-msgid "M.Attack"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:257
-msgid "M.Defense"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:260
-#, no-c-format
-msgid "% Accuracy"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:263
-#, no-c-format
-msgid "% Evade"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:266
-#, no-c-format
-msgid "% Critical"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:268
-msgid "Attack Delay"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:270
-msgid "Walk Delay"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:272
-msgid "Attack Range"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:274
-msgid "Damage per sec."
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266
-msgid "Karma"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268
-msgid "Manner"
-msgstr ""
-
 #. TRANSLATORS: error message
 #: src/net/eathena/generalrecv.cpp:49 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
@@ -9406,7 +9296,7 @@ msgstr ""
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:199
+#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:190
 msgid "Unknown item"
 msgstr ""
 
@@ -9682,21 +9572,52 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:93
-#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
-#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
+#: src/resources/db/itemdb.cpp:377 src/resources/db/itemdb.cpp:381
+#: src/resources/db/moddb.cpp:79 src/resources/db/monsterdb.cpp:101
+#: src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:104
+#: src/resources/db/petdb.cpp:103
 msgid "pet"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:103
+#: src/resources/db/skillunitdb.cpp:102
 msgid "skill"
 msgstr ""
 
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:45
+msgid "Strength"
+msgstr "力量"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:49
+msgid "Agility"
+msgstr "敏捷"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:53
+msgid "Vitality"
+msgstr "體力"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:57
+msgid "Intelligence"
+msgstr "智力"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:61
+msgid "Dexterity"
+msgstr "靈巧"
+
+#. TRANSLATORS: player stat
+#: src/resources/db/statdb.cpp:65
+msgid "Luck"
+msgstr "幸運"
+
 #. TRANSLATORS: inventory type name
 #: src/resources/inventory/inventory.cpp:340
 msgid "Npc"
@@ -10348,7 +10269,7 @@ msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:556
-msgid "Room join failed. Not enought money."
+msgid "Room join failed. Not enough money."
 msgstr ""
 
 #. TRANSLATORS: notification message
@@ -10616,33 +10537,35 @@ msgstr ""
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:796
 #, c-format
-msgid "You and %s was divorced."
+msgid "You and %s are now divorced."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:800
-msgid "You was called by partner."
-msgstr ""
+#, fuzzy
+msgid "You were called by your partner."
+msgstr "你已被 %s 殺死."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:804
 #, c-format
-msgid "You calling partner %s."
+msgid "You are calling your partner, %s."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:808
-msgid "Adoption child error. You already have baby."
+msgid "Child adoption failed. You already have a baby."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:812
-msgid "Adoption child error. You level too small for have baby."
+msgid "Child adoption failed. Your level is too low."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:816
-msgid "Adoption child error. This player already married and can't be baby."
+msgid ""
+"Child adoption failed. This player is already married and can't be a baby."
 msgstr ""
 
 #. TRANSLATORS: notification message
@@ -10652,12 +10575,12 @@ msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:825
-msgid "Error saving location. Not enought skill level."
+msgid "Error saving location. Not enough skill level."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:829
-msgid "Error saving location. You not have warp skill."
+msgid "Error saving location. You do not have warp skill."
 msgstr ""
 
 #. TRANSLATORS: chat option changed message