Update translations.

22 files changed, 3791 insertions, 5112 deletions

diff --git a/po/ca.po b/po/ca.po
index 0f17b0754..3b695d3ef 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,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-05-29 14:56+0300\n"
+"POT-Creation-Date: 2016-05-20 19:25+0300\n"
 "PO-Revision-Date: 2016-05-21 09:33+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Catalan (http://www.transifex.com/akaras/manaplus/language/"
-"ca/)\n"
-"Language: ca\n"
+"Language-Team: Catalan (http://www.transifex.com/akaras/manaplus/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
-#: src/actions/actions.cpp:167
+#: src/actions/actions.cpp:166
 msgid "File uploaded"
 msgstr "Arxiu enviat"
 
@@ -34,7 +33,7 @@ msgstr "Arxiu enviat"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:170 src/client.cpp:1553 src/client.cpp:1588
+#: src/actions/actions.cpp:169 src/client.cpp:1549 src/client.cpp:1584
 #: 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,67 +53,67 @@ 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:412
-#: src/net/eathena/charserverrecv.cpp:447
-#: src/net/eathena/charserverrecv.cpp:475 src/net/tmwa/charserverrecv.cpp:296
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:405
+#: src/net/eathena/charserverrecv.cpp:440
+#: src/net/eathena/charserverrecv.cpp:468 src/net/tmwa/charserverrecv.cpp:286
 msgid "OK"
 msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1044 src/actions/actions.cpp:1057
+#: src/actions/actions.cpp:1043 src/actions/actions.cpp:1056
 msgid "Cache cleaned"
 msgstr "Memòria clau buidada"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1214 src/actions/actions.cpp:1220
+#: src/actions/actions.cpp:1213 src/actions/actions.cpp:1219
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Temps d'activitat del client: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1286
+#: src/actions/actions.cpp:1276 src/actions/actions.cpp:1285
 msgid "Resource images:"
 msgstr "Imatges de recurs:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1280 src/actions/actions.cpp:1290
+#: src/actions/actions.cpp:1279 src/actions/actions.cpp:1289
 msgid "Resource orphaned images:"
 msgstr "Imatges de recurs orfes:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1385
+#: src/actions/actions.cpp:1384
 msgid "Environment variables dumped"
 msgstr "Variables d'entorn abocades"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1502
+#: src/actions/actions.cpp:1501
 msgid "Uploaded config into:"
 msgstr "Configuració enviada a:"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1512
+#: src/actions/actions.cpp:1511
 msgid "Uploaded server config into:"
 msgstr "Configuració de servidor enviada a:"
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1522
+#: src/actions/actions.cpp:1521
 msgid "Uploaded log into:"
 msgstr "Registre pujat a:"
 
 #. TRANSLATORS: last seen disabled warning
-#: src/actions/actions.cpp:1747
+#: src/actions/actions.cpp:1746
 msgid ""
 "Last seen disabled. Enable in players / collect players id and seen log."
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/actions/actions.cpp:1766 src/actions/actions.cpp:1780
+#: src/actions/actions.cpp:1765 src/actions/actions.cpp:1779
 msgid "You not saw this nick."
 msgstr "No has vist aquest nick."
 
 #. TRANSLATORS: last seen message
-#: src/actions/actions.cpp:1772
+#: src/actions/actions.cpp:1771
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr ""
@@ -128,8 +127,7 @@ msgstr "No es poden enviar xiuxiueigs  buits!"
 #: src/actions/chat.cpp:309
 #, 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
@@ -474,41 +472,41 @@ msgstr "Bombolla flotant"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:856 src/dyetool/client.cpp:485 src/gui/windowmenu.cpp:189
+#: src/client.cpp:852 src/dyetool/client.cpp:482 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:65
 msgid "Setup"
 msgstr "Configuració"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:859 src/dyetool/client.cpp:488
+#: src/client.cpp:855 src/dyetool/client.cpp:485
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:862 src/dyetool/client.cpp:491
+#: src/client.cpp:858 src/dyetool/client.cpp:488
 #: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Vídeo"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:865 src/dyetool/client.cpp:494
+#: src/client.cpp:861 src/dyetool/client.cpp:491
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:868 src/dyetool/client.cpp:497
+#: src/client.cpp:864 src/dyetool/client.cpp:494
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:871 src/dyetool/client.cpp:500 src/gui/windowmenu.cpp:74
+#: src/client.cpp:867 src/dyetool/client.cpp:497 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Ajuda"
@@ -529,45 +527,45 @@ msgstr "Ajuda"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:875 src/client.cpp:1467 src/client.cpp:1486
-#: src/dyetool/client.cpp:504 src/gui/dialogsmanager.cpp:116
+#: src/client.cpp:871 src/client.cpp:1463 src/client.cpp:1482
+#: src/dyetool/client.cpp:501 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:749 src/gui/popups/popupmenu.cpp:826
 #: src/gui/popups/popupmenu.cpp:1080 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:273
 #: src/gui/windows/inventorywindow.cpp:297
-#: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:60
-#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:130
+#: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
+#: src/gui/windows/npcdialog.cpp:87 src/gui/windows/npcdialog.cpp:129
 #: src/gui/windows/questswindow.cpp:77 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Tancar"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1100 src/gui/windowmanager_unittest.cc:158
+#: src/client.cpp:1096 src/gui/windowmanager_unittest.cc:157
 msgid "Connecting to server"
 msgstr "Connectant al servidor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1157 src/gui/windowmanager_unittest.cc:175
+#: src/client.cpp:1153 src/gui/windowmanager_unittest.cc:174
 msgid "Logging in"
 msgstr "Iniciant sessió"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1206
+#: src/client.cpp:1202
 msgid "Entering game world"
 msgstr "Entrant al mon de joc"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1353
+#: src/client.cpp:1349
 msgid "Requesting characters"
 msgstr "Sol·licitant personatges"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1396
+#: src/client.cpp:1392
 msgid "Connecting to the game server"
 msgstr "Connectant al servidor de joc"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1408
+#: src/client.cpp:1404
 msgid "Changing game servers"
 msgstr "Canviant servidors de joc"
 
@@ -584,7 +582,7 @@ msgstr "Canviant servidors de joc"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1464 src/client.cpp:1483 src/client.cpp:1722
+#: src/client.cpp:1460 src/client.cpp:1479 src/client.cpp:1718
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:468
@@ -592,44 +590,44 @@ msgstr "Canviant servidors de joc"
 #: 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:385
-#: src/net/eathena/charserverrecv.cpp:389
-#: src/net/eathena/charserverrecv.cpp:471 src/net/tmwa/charserverrecv.cpp:292
+#: src/net/eathena/charserverrecv.cpp:378
+#: src/net/eathena/charserverrecv.cpp:382
+#: src/net/eathena/charserverrecv.cpp:464 src/net/tmwa/charserverrecv.cpp:282
 msgid "Error"
 msgstr "Error"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1502
+#: src/client.cpp:1498
 msgid "Requesting registration details"
 msgstr "Sol·licitant detalls de registre"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1549
+#: src/client.cpp:1545
 msgid "Password Change"
 msgstr "Canvi de contrasenya"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1551
+#: src/client.cpp:1547
 msgid "Password changed successfully!"
 msgstr "Contrasenya canviada amb èxit!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1584
+#: src/client.cpp:1580
 msgid "Email Change"
 msgstr "Canvi de correu"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1586
+#: src/client.cpp:1582
 msgid "Email changed successfully!"
 msgstr "Correu canviat amb èxit!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1622
+#: src/client.cpp:1618
 msgid "Unregister Successful"
 msgstr "Registre anul·lat amb èxit"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1624
+#: src/client.cpp:1620
 msgid "Farewell, come back any time..."
 msgstr "Adéu, torna quan vulguis..."
 
@@ -793,52 +791,52 @@ msgid "%s doesn't exist and can't be created!"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:51
+#: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:53
+#: src/dyetool/dyemain.cpp:50
 msgid "or"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:55
+#: src/dyetool/dyemain.cpp:52
 msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: chat tab name
-#: src/game.cpp:267 src/gui/windows/chatwindow.cpp:2222
+#: src/game.cpp:266 src/gui/windows/chatwindow.cpp:2222
 msgid "General"
 msgstr "General"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:274 src/gui/windowmenu.cpp:175
+#: src/game.cpp:273 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Depurador"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:582
+#: src/game.cpp:581
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:592
+#: src/game.cpp:591
 msgid "Saving screenshot failed!"
 msgstr "Error al guardar la captura de pantalla!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:679
+#: src/game.cpp:678
 msgid "The connection to the server was lost."
 msgstr "S'ha perdut la connexió amb el servidor."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:682
+#: src/game.cpp:681
 msgid "Network Error"
 msgstr "Error de xarxa"
 
@@ -1253,7 +1251,8 @@ 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,7 +1269,8 @@ 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:602
+#: src/gui/windows/equipmentwindow.cpp:671
+#: src/gui/windows/serverdialog.cpp:602
 msgid "default"
 msgstr "Per defecte"
 
@@ -1788,19 +1788,19 @@ msgid "Cancel"
 msgstr "Cancel·lar"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:223
+#: src/gui/popups/itempopup.cpp:222
 #, c-format
 msgid "Weight: %s"
 msgstr "Pes: %s"
 
 #. TRANSLATORS: named item description
-#: src/gui/popups/itempopup.cpp:290
+#: src/gui/popups/itempopup.cpp:289
 #, c-format
 msgid "Item named: %s"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:317
+#: src/gui/popups/itempopup.cpp:316
 msgid "Cards: "
 msgstr ""
 
@@ -2141,7 +2141,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:831 src/gui/windows/npcdialog.cpp:127
+#: src/gui/popups/popupmenu.cpp:831 src/gui/windows/npcdialog.cpp:126
 msgid "Clear"
 msgstr "Netejar"
 
@@ -2483,8 +2483,9 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/popups/popupmenu.cpp:2379 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:68 src/gui/windows/statuswindow.cpp:243
+#: src/gui/windows/statuswindow.cpp:367
 #, c-format
 msgid "Level: %d"
 msgstr "Nivell: %d"
@@ -2903,8 +2904,8 @@ msgstr ""
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3093 src/gui/popups/popupmenu.cpp:3112
 #: src/gui/popups/popupmenu.cpp:3125 src/gui/windows/charselectdialog.cpp:76
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:408
-#: src/net/eathena/charserverrecv.cpp:444
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:401
+#: src/net/eathena/charserverrecv.cpp:437
 msgid "Info"
 msgstr "Informació"
 
@@ -3323,7 +3324,7 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:132
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:131
 #: src/gui/windows/serverdialog.cpp:113 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:85
 msgid "Add"
@@ -3351,7 +3352,7 @@ msgstr "Sortir"
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:192
-#: src/gui/windows/itemamountwindow.cpp:228 src/gui/windows/npcdialog.cpp:123
+#: src/gui/windows/itemamountwindow.cpp:228 src/gui/windows/npcdialog.cpp:122
 #: src/gui/windows/statuswindow.cpp:746
 msgid "+"
 msgstr "+"
@@ -3363,7 +3364,7 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:190
-#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:125
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:124
 msgid "-"
 msgstr "-"
 
@@ -3530,13 +3531,15 @@ msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104
+#: src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109
+#: src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr ""
 
@@ -3547,19 +3550,22 @@ 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 ""
 
@@ -3993,15 +3999,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:116
+#: src/gui/widgets/tabs/setup_colors.cpp:86
+#: src/gui/windows/emotewindow.cpp:116
 msgid "Colors"
 msgstr "Colors"
 
@@ -4025,11 +4031,9 @@ 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
@@ -4056,11 +4060,9 @@ 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
@@ -4071,9 +4073,7 @@ 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 ""
@@ -4114,8 +4114,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
@@ -4126,11 +4126,9 @@ 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
@@ -4141,11 +4139,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be "
-"shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies "
-"are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4161,13 +4157,9 @@ 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
@@ -4180,8 +4172,7 @@ 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
@@ -4200,12 +4191,9 @@ 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
@@ -4216,8 +4204,7 @@ 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 ""
@@ -4230,11 +4217,9 @@ 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
@@ -4259,11 +4244,9 @@ 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
@@ -4274,8 +4257,7 @@ 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 ""
@@ -4288,9 +4270,7 @@ 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,9 +4283,7 @@ 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 ""
@@ -4331,10 +4309,7 @@ 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 ""
@@ -4369,8 +4344,7 @@ 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 ""
@@ -4383,8 +4357,7 @@ 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 ""
@@ -4397,12 +4370,9 @@ 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
@@ -4516,9 +4486,7 @@ 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
@@ -4689,8 +4657,8 @@ msgstr "Encercla objectiu del monstre"
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
 #: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:114
-#: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:60
-#: src/gui/windows/minimap.cpp:123
+#: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:59
+#: src/gui/windows/minimap.cpp:122
 msgid "Map"
 msgstr "Mapa"
 
@@ -4881,7 +4849,7 @@ msgstr "Permet mode botiga"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:292 src/gui/windows/npcdialog.cpp:99
+#: src/gui/widgets/tabs/setup_other.cpp:292 src/gui/windows/npcdialog.cpp:98
 msgid "NPC"
 msgstr "NPC"
 
@@ -5566,17 +5534,13 @@ msgstr "Res"
 #: src/gui/widgets/tabs/setup_video.cpp:229
 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:236
 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:249
@@ -5617,8 +5581,7 @@ msgstr "La resolució de la pantalla ha canviat"
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:397
 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
@@ -6153,7 +6116,8 @@ 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"
 
@@ -6272,7 +6236,8 @@ msgstr ""
 #: src/gui/windows/charcreatedialog.cpp:193
 #: src/gui/windows/charcreatedialog.cpp:206
 #: src/gui/windows/charcreatedialog.cpp:217
-#: src/gui/windows/charcreatedialog.cpp:227 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:227
+#: src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -6290,7 +6255,8 @@ msgstr "Distribueix %d punts"
 #: src/gui/windows/charcreatedialog.cpp:197
 #: src/gui/windows/charcreatedialog.cpp:208
 #: src/gui/windows/charcreatedialog.cpp:219
-#: src/gui/windows/charcreatedialog.cpp:229 src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:229
+#: src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -6316,7 +6282,8 @@ msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:248 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:248
+#: src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr ""
 
@@ -6518,7 +6485,8 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:111
+#: src/gui/windows/editserverdialog.cpp:57
+#: src/gui/windows/serverdialog.cpp:111
 msgid "Connect"
 msgstr "Connectar"
 
@@ -6870,26 +6838,28 @@ msgstr "Per a:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:73
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:72
 msgid "Subject:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:104
+#: src/gui/windows/maileditwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:103
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:123
-#: src/gui/windows/mailviewwindow.cpp:132
+#: src/gui/windows/maileditwindow.cpp:63
+#: src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:131
 msgid "Item:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:76
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:75
 msgid "Message:"
 msgstr ""
 
@@ -6899,27 +6869,27 @@ msgid "empty subject"
 msgstr ""
 
 #. TRANSLATORS: mail view window name
-#: src/gui/windows/mailviewwindow.cpp:54
+#: src/gui/windows/mailviewwindow.cpp:53
 msgid "View mail"
 msgstr ""
 
 #. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:64
+#: src/gui/windows/mailviewwindow.cpp:63
 msgid "Reply"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:65
 msgid "Time:"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:70
+#: src/gui/windows/mailviewwindow.cpp:69
 msgid "From:"
 msgstr ""
 
 #. TRANSLATORS: mail view attach button
-#: src/gui/windows/mailviewwindow.cpp:141
+#: src/gui/windows/mailviewwindow.cpp:140
 msgid "Get attach"
 msgstr ""
 
@@ -7009,22 +6979,22 @@ msgid "Job level: %d"
 msgstr "Nivell de treball: %d"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:84
+#: src/gui/windows/npcdialog.cpp:83
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:86
+#: src/gui/windows/npcdialog.cpp:85
 msgid "Next"
 msgstr "Següent"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:90
+#: src/gui/windows/npcdialog.cpp:89
 msgid "Submit"
 msgstr "Envia"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:134
+#: src/gui/windows/npcdialog.cpp:133
 msgid "Reset"
 msgstr "Reajustar"
 
@@ -7587,10 +7557,9 @@ 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
@@ -9068,33 +9037,33 @@ msgstr "Connexió interrompuda amb el servidor. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:387
-#: src/net/eathena/charserverrecv.cpp:435
+#: src/net/eathena/charserverrecv.cpp:380
+#: src/net/eathena/charserverrecv.cpp:428
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:410
+#: src/net/eathena/charserverrecv.cpp:403
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:419
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:423
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:439
+#: src/net/eathena/charserverrecv.cpp:432
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:473 src/net/tmwa/charserverrecv.cpp:294
+#: src/net/eathena/charserverrecv.cpp:466 src/net/tmwa/charserverrecv.cpp:284
 msgid "Failed to delete character."
 msgstr ""
 
@@ -9426,7 +9395,7 @@ msgid "Map not found"
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/net/eathena/inventoryrecv.cpp:844
+#: src/net/eathena/inventoryrecv.cpp:823
 #, c-format
 msgid "Left %s rental time for item %s."
 msgstr ""
@@ -9434,8 +9403,8 @@ msgstr ""
 #. TRANSLATORS: unknown item
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
-#: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:265
+#: src/net/eathena/inventoryrecv.cpp:1176
+#: src/net/eathena/inventoryrecv.cpp:1309 src/resources/db/itemdb.cpp:265
 msgid "Unknown item"
 msgstr "Objecte desconegut"
 
@@ -10885,8 +10854,7 @@ msgstr ""
 #: src/utils/booleanoptions.h:27
 #, 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
diff --git a/po/cs.po b/po/cs.po
index 0930394b9..e31dd6c73 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,19 +14,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-05-29 14:56+0300\n"
+"POT-Creation-Date: 2016-05-20 19:25+0300\n"
 "PO-Revision-Date: 2016-05-21 09:33+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Czech (http://www.transifex.com/akaras/manaplus/language/"
-"cs/)\n"
-"Language: cs\n"
+"Language-Team: Czech (http://www.transifex.com/akaras/manaplus/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
-#: src/actions/actions.cpp:167
+#: src/actions/actions.cpp:166
 msgid "File uploaded"
 msgstr "Soubor byl uploadován"
 
@@ -39,7 +38,7 @@ msgstr "Soubor byl uploadován"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:170 src/client.cpp:1553 src/client.cpp:1588
+#: src/actions/actions.cpp:169 src/client.cpp:1549 src/client.cpp:1584
 #: 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
@@ -59,67 +58,67 @@ 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:412
-#: src/net/eathena/charserverrecv.cpp:447
-#: src/net/eathena/charserverrecv.cpp:475 src/net/tmwa/charserverrecv.cpp:296
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:405
+#: src/net/eathena/charserverrecv.cpp:440
+#: src/net/eathena/charserverrecv.cpp:468 src/net/tmwa/charserverrecv.cpp:286
 msgid "OK"
 msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1044 src/actions/actions.cpp:1057
+#: src/actions/actions.cpp:1043 src/actions/actions.cpp:1056
 msgid "Cache cleaned"
 msgstr "Vyrovnávací paměť vyčištěna"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1214 src/actions/actions.cpp:1220
+#: src/actions/actions.cpp:1213 src/actions/actions.cpp:1219
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Doba běhu klienta: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1286
+#: src/actions/actions.cpp:1276 src/actions/actions.cpp:1285
 msgid "Resource images:"
 msgstr "Resource images:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1280 src/actions/actions.cpp:1290
+#: src/actions/actions.cpp:1279 src/actions/actions.cpp:1289
 msgid "Resource orphaned images:"
 msgstr "Resource orphaned images:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1385
+#: src/actions/actions.cpp:1384
 msgid "Environment variables dumped"
 msgstr "Systémové proměnné uloženy"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1502
+#: src/actions/actions.cpp:1501
 msgid "Uploaded config into:"
 msgstr "Nahráno nastavení do:"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1512
+#: src/actions/actions.cpp:1511
 msgid "Uploaded server config into:"
 msgstr "Nahráno nastavení serveru do:"
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1522
+#: src/actions/actions.cpp:1521
 msgid "Uploaded log into:"
 msgstr "Nahrány záznmy do:"
 
 #. TRANSLATORS: last seen disabled warning
-#: src/actions/actions.cpp:1747
+#: src/actions/actions.cpp:1746
 msgid ""
 "Last seen disabled. Enable in players / collect players id and seen log."
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/actions/actions.cpp:1766 src/actions/actions.cpp:1780
+#: src/actions/actions.cpp:1765 src/actions/actions.cpp:1779
 msgid "You not saw this nick."
 msgstr ""
 
 #. TRANSLATORS: last seen message
-#: src/actions/actions.cpp:1772
+#: src/actions/actions.cpp:1771
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr ""
@@ -479,41 +478,41 @@ msgstr "Plovoucí bublina"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:856 src/dyetool/client.cpp:485 src/gui/windowmenu.cpp:189
+#: src/client.cpp:852 src/dyetool/client.cpp:482 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:65
 msgid "Setup"
 msgstr "Nastavení"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:859 src/dyetool/client.cpp:488
+#: src/client.cpp:855 src/dyetool/client.cpp:485
 #: 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:862 src/dyetool/client.cpp:491
+#: src/client.cpp:858 src/dyetool/client.cpp:488
 #: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:865 src/dyetool/client.cpp:494
+#: src/client.cpp:861 src/dyetool/client.cpp:491
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Téma"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:868 src/dyetool/client.cpp:497
+#: src/client.cpp:864 src/dyetool/client.cpp:494
 msgid "About"
 msgstr "O ManaPlus"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:871 src/dyetool/client.cpp:500 src/gui/windowmenu.cpp:74
+#: src/client.cpp:867 src/dyetool/client.cpp:497 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Nápověda"
@@ -534,45 +533,45 @@ msgstr "Nápověda"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:875 src/client.cpp:1467 src/client.cpp:1486
-#: src/dyetool/client.cpp:504 src/gui/dialogsmanager.cpp:116
+#: src/client.cpp:871 src/client.cpp:1463 src/client.cpp:1482
+#: src/dyetool/client.cpp:501 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:749 src/gui/popups/popupmenu.cpp:826
 #: src/gui/popups/popupmenu.cpp:1080 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:273
 #: src/gui/windows/inventorywindow.cpp:297
-#: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:60
-#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:130
+#: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
+#: src/gui/windows/npcdialog.cpp:87 src/gui/windows/npcdialog.cpp:129
 #: src/gui/windows/questswindow.cpp:77 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Zavřít"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1100 src/gui/windowmanager_unittest.cc:158
+#: src/client.cpp:1096 src/gui/windowmanager_unittest.cc:157
 msgid "Connecting to server"
 msgstr "Připojuji se k serveru"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1157 src/gui/windowmanager_unittest.cc:175
+#: src/client.cpp:1153 src/gui/windowmanager_unittest.cc:174
 msgid "Logging in"
 msgstr "Přihlašuji se"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1206
+#: src/client.cpp:1202
 msgid "Entering game world"
 msgstr "Vstupuji do herního světa"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1353
+#: src/client.cpp:1349
 msgid "Requesting characters"
 msgstr "Vyžaduji postavy"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1396
+#: src/client.cpp:1392
 msgid "Connecting to the game server"
 msgstr "Připojuji se k hernímu serveru"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1408
+#: src/client.cpp:1404
 msgid "Changing game servers"
 msgstr "Vyměňuji herní servery"
 
@@ -589,7 +588,7 @@ msgstr "Vyměňuji herní servery"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1464 src/client.cpp:1483 src/client.cpp:1722
+#: src/client.cpp:1460 src/client.cpp:1479 src/client.cpp:1718
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:468
@@ -597,44 +596,44 @@ msgstr "Vyměňuji herní servery"
 #: 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:385
-#: src/net/eathena/charserverrecv.cpp:389
-#: src/net/eathena/charserverrecv.cpp:471 src/net/tmwa/charserverrecv.cpp:292
+#: src/net/eathena/charserverrecv.cpp:378
+#: src/net/eathena/charserverrecv.cpp:382
+#: src/net/eathena/charserverrecv.cpp:464 src/net/tmwa/charserverrecv.cpp:282
 msgid "Error"
 msgstr "Chyba"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1502
+#: src/client.cpp:1498
 msgid "Requesting registration details"
 msgstr "Požaduji registrační detaily"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1549
+#: src/client.cpp:1545
 msgid "Password Change"
 msgstr "Změna hesla"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1551
+#: src/client.cpp:1547
 msgid "Password changed successfully!"
 msgstr "Heslo úspěšně změněno!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1584
+#: src/client.cpp:1580
 msgid "Email Change"
 msgstr "Změna emailu"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1586
+#: src/client.cpp:1582
 msgid "Email changed successfully!"
 msgstr "Email úspěšně změněn!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1622
+#: src/client.cpp:1618
 msgid "Unregister Successful"
 msgstr "Zrušení registrace úspěšné"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1624
+#: src/client.cpp:1620
 msgid "Farewell, come back any time..."
 msgstr "Nashledanou, vraťte se kdykoli..."
 
@@ -761,8 +760,7 @@ 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
@@ -799,52 +797,52 @@ msgid "%s doesn't exist and can't be created!"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:51
+#: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr "dyecmd srcfile dyestring dstfile"
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:53
+#: src/dyetool/dyemain.cpp:50
 msgid "or"
 msgstr "nebo"
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:55
+#: src/dyetool/dyemain.cpp:52
 msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd srcdyestring dstfile"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: chat tab name
-#: src/game.cpp:267 src/gui/windows/chatwindow.cpp:2222
+#: src/game.cpp:266 src/gui/windows/chatwindow.cpp:2222
 msgid "General"
 msgstr "Obecný"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:274 src/gui/windowmenu.cpp:175
+#: src/game.cpp:273 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:582
+#: src/game.cpp:581
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Snímek obrazovky uložen jako %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:592
+#: src/game.cpp:591
 msgid "Saving screenshot failed!"
 msgstr "Ukládání snímku obrazovky selhalo!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:679
+#: src/game.cpp:678
 msgid "The connection to the server was lost."
 msgstr "Spojení se serverem bylo ztraceno."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:682
+#: src/game.cpp:681
 msgid "Network Error"
 msgstr "Chyba sítě"
 
@@ -1259,14 +1257,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
@@ -1277,7 +1275,8 @@ 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:602
+#: src/gui/windows/equipmentwindow.cpp:671
+#: src/gui/windows/serverdialog.cpp:602
 msgid "default"
 msgstr "výchozí"
 
@@ -1795,19 +1794,19 @@ msgid "Cancel"
 msgstr "Zrušit"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:223
+#: src/gui/popups/itempopup.cpp:222
 #, c-format
 msgid "Weight: %s"
 msgstr "Váha: %s"
 
 #. TRANSLATORS: named item description
-#: src/gui/popups/itempopup.cpp:290
+#: src/gui/popups/itempopup.cpp:289
 #, c-format
 msgid "Item named: %s"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:317
+#: src/gui/popups/itempopup.cpp:316
 msgid "Cards: "
 msgstr ""
 
@@ -2148,7 +2147,7 @@ msgstr "Upravit kouzlo"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:831 src/gui/windows/npcdialog.cpp:127
+#: src/gui/popups/popupmenu.cpp:831 src/gui/windows/npcdialog.cpp:126
 msgid "Clear"
 msgstr "Vymazat"
 
@@ -2490,8 +2489,9 @@ msgstr "Zobrazit okno"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/popups/popupmenu.cpp:2379 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:68 src/gui/windows/statuswindow.cpp:243
+#: src/gui/windows/statuswindow.cpp:367
 #, c-format
 msgid "Level: %d"
 msgstr "Úroveň: %d"
@@ -2910,8 +2910,8 @@ msgstr ""
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3093 src/gui/popups/popupmenu.cpp:3112
 #: src/gui/popups/popupmenu.cpp:3125 src/gui/windows/charselectdialog.cpp:76
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:408
-#: src/net/eathena/charserverrecv.cpp:444
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:401
+#: src/net/eathena/charserverrecv.cpp:437
 msgid "Info"
 msgstr "Informace"
 
@@ -3330,7 +3330,7 @@ msgstr "Otevři web adresu"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:132
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:131
 #: src/gui/windows/serverdialog.cpp:113 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:85
 msgid "Add"
@@ -3358,7 +3358,7 @@ msgstr "Ukončit"
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:192
-#: src/gui/windows/itemamountwindow.cpp:228 src/gui/windows/npcdialog.cpp:123
+#: src/gui/windows/itemamountwindow.cpp:228 src/gui/windows/npcdialog.cpp:122
 #: src/gui/windows/statuswindow.cpp:746
 msgid "+"
 msgstr "+"
@@ -3370,7 +3370,7 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:190
-#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:125
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:124
 msgid "-"
 msgstr "-"
 
@@ -3537,13 +3537,15 @@ msgstr "Sdílení předmětů povoleno."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104
+#: src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr "Sdílení předmětů zakázáno."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109
+#: src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr "Sdílení předmětů není možné."
 
@@ -3554,19 +3556,22 @@ 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é."
 
@@ -4000,15 +4005,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:116
+#: src/gui/widgets/tabs/setup_colors.cpp:86
+#: src/gui/windows/emotewindow.cpp:116
 msgid "Colors"
 msgstr "Barvy"
 
@@ -4032,11 +4037,9 @@ 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
@@ -4063,11 +4066,9 @@ 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
@@ -4078,9 +4079,7 @@ 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 ""
@@ -4121,8 +4120,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
@@ -4133,11 +4132,9 @@ 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
@@ -4148,11 +4145,9 @@ msgstr "Zobrazit zprávy o připojení gildy"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be "
-"shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies "
-"are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4168,13 +4163,9 @@ 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
@@ -4187,8 +4178,7 @@ 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
@@ -4207,12 +4197,9 @@ 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
@@ -4223,8 +4210,7 @@ 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 ""
@@ -4237,11 +4223,9 @@ 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
@@ -4266,11 +4250,9 @@ 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
@@ -4281,8 +4263,7 @@ 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 ""
@@ -4295,9 +4276,7 @@ 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 ""
@@ -4310,9 +4289,7 @@ 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 ""
@@ -4338,10 +4315,7 @@ 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 ""
@@ -4376,8 +4350,7 @@ 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 ""
@@ -4390,8 +4363,7 @@ 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 ""
@@ -4404,12 +4376,9 @@ 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
@@ -4523,9 +4492,7 @@ 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
@@ -4696,8 +4663,8 @@ msgstr "Cyklovat zaměřená monstra"
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
 #: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:114
-#: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:60
-#: src/gui/windows/minimap.cpp:123
+#: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:59
+#: src/gui/windows/minimap.cpp:122
 msgid "Map"
 msgstr "Mapa"
 
@@ -4888,7 +4855,7 @@ msgstr "Zapnout mód obchodu"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:292 src/gui/windows/npcdialog.cpp:99
+#: src/gui/widgets/tabs/setup_other.cpp:292 src/gui/windows/npcdialog.cpp:98
 msgid "NPC"
 msgstr "NPC"
 
@@ -5073,9 +5040,7 @@ 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
@@ -5160,15 +5125,12 @@ 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
@@ -5299,9 +5261,7 @@ 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
@@ -5580,16 +5540,13 @@ msgstr "Žádné"
 #: src/gui/widgets/tabs/setup_video.cpp:229
 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:236
 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:249
@@ -6165,7 +6122,8 @@ 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"
 
@@ -6284,7 +6242,8 @@ msgstr "^"
 #: src/gui/windows/charcreatedialog.cpp:193
 #: src/gui/windows/charcreatedialog.cpp:206
 #: src/gui/windows/charcreatedialog.cpp:217
-#: src/gui/windows/charcreatedialog.cpp:227 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:227
+#: src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -6302,7 +6261,8 @@ msgstr "Rozdělte prosím %d bodů"
 #: src/gui/windows/charcreatedialog.cpp:197
 #: src/gui/windows/charcreatedialog.cpp:208
 #: src/gui/windows/charcreatedialog.cpp:219
-#: src/gui/windows/charcreatedialog.cpp:229 src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:229
+#: src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -6328,7 +6288,8 @@ 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:248 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:248
+#: src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr "P"
 
@@ -6427,12 +6388,7 @@ msgid ""
 "Level: %u\n"
 "Experience: %u\n"
 "Money: %s"
-msgstr ""
-"Život: %u/%u\n"
-"Mana: %u/%u\n"
-"Úroveň: %u\n"
-"Zkušenost: %u\n"
-"Peníze: %s"
+msgstr "Život: %u/%u\nMana: %u/%u\nÚroveň: %u\nZkušenost: %u\nPeníze: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/charselectdialog.cpp:308
@@ -6535,7 +6491,8 @@ msgstr "Upravit server"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:111
+#: src/gui/windows/editserverdialog.cpp:57
+#: src/gui/windows/serverdialog.cpp:111
 msgid "Connect"
 msgstr "Připojit"
 
@@ -6889,26 +6846,28 @@ msgstr "Komu:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:73
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:72
 msgid "Subject:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:104
+#: src/gui/windows/maileditwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:103
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:123
-#: src/gui/windows/mailviewwindow.cpp:132
+#: src/gui/windows/maileditwindow.cpp:63
+#: src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:131
 msgid "Item:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:76
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:75
 msgid "Message:"
 msgstr ""
 
@@ -6918,27 +6877,27 @@ msgid "empty subject"
 msgstr ""
 
 #. TRANSLATORS: mail view window name
-#: src/gui/windows/mailviewwindow.cpp:54
+#: src/gui/windows/mailviewwindow.cpp:53
 msgid "View mail"
 msgstr ""
 
 #. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:64
+#: src/gui/windows/mailviewwindow.cpp:63
 msgid "Reply"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:65
 msgid "Time:"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:70
+#: src/gui/windows/mailviewwindow.cpp:69
 msgid "From:"
 msgstr ""
 
 #. TRANSLATORS: mail view attach button
-#: src/gui/windows/mailviewwindow.cpp:141
+#: src/gui/windows/mailviewwindow.cpp:140
 msgid "Get attach"
 msgstr ""
 
@@ -7028,22 +6987,22 @@ msgid "Job level: %d"
 msgstr "Prácovní úroveň: %d"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:84
+#: src/gui/windows/npcdialog.cpp:83
 msgid "Stop waiting"
 msgstr "Zastavit čekání"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:86
+#: src/gui/windows/npcdialog.cpp:85
 msgid "Next"
 msgstr "Další"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:90
+#: src/gui/windows/npcdialog.cpp:89
 msgid "Submit"
 msgstr "Odeslat"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:134
+#: src/gui/windows/npcdialog.cpp:133
 msgid "Reset"
 msgstr "Resetovat"
 
@@ -7606,7 +7565,8 @@ 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
@@ -8560,9 +8520,7 @@ msgstr "Vypsat verzi OpenGL do chatu"
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:370
 msgid "Print enabled mods in chat"
-msgstr ""
-"Vypsa\n"
-"t povolené mody do chatu"
+msgstr "Vypsa\nt povolené mody do chatu"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:376
@@ -8891,9 +8849,7 @@ 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
@@ -9049,9 +9005,7 @@ 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.\n"
-"Prosím kontaktujte GM team přes fórum."
+msgstr "Byl jste dočasně vyloučen ze hry do %s.\nProsím kontaktujte GM team přes fórum."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:151 src/net/eathena/loginrecv.cpp:92
@@ -9091,33 +9045,33 @@ msgstr "Spojení se serverem ukončeno. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:387
-#: src/net/eathena/charserverrecv.cpp:435
+#: src/net/eathena/charserverrecv.cpp:380
+#: src/net/eathena/charserverrecv.cpp:428
 msgid "Character rename error."
 msgstr "Chyba přejmenování postavy."
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:410
+#: src/net/eathena/charserverrecv.cpp:403
 msgid "Character renamed."
 msgstr "Postava přejmenována."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:419
 msgid "Rename not allowed."
 msgstr "Přejmenování není povoleno."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:423
 msgid "New name is not set."
 msgstr "Nové jméno nebylo nastaveno."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:439
+#: src/net/eathena/charserverrecv.cpp:432
 msgid "Character not found."
 msgstr "Postava nenalezena."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:473 src/net/tmwa/charserverrecv.cpp:294
+#: src/net/eathena/charserverrecv.cpp:466 src/net/tmwa/charserverrecv.cpp:284
 msgid "Failed to delete character."
 msgstr "Nepodařilo se odstranit postavu."
 
@@ -9449,7 +9403,7 @@ msgid "Map not found"
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/net/eathena/inventoryrecv.cpp:844
+#: src/net/eathena/inventoryrecv.cpp:823
 #, c-format
 msgid "Left %s rental time for item %s."
 msgstr ""
@@ -9457,8 +9411,8 @@ msgstr ""
 #. TRANSLATORS: unknown item
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
-#: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:265
+#: src/net/eathena/inventoryrecv.cpp:1176
+#: src/net/eathena/inventoryrecv.cpp:1309 src/resources/db/itemdb.cpp:265
 msgid "Unknown item"
 msgstr "Neznámý předmět"
 
diff --git a/po/de.po b/po/de.po
index 054c8a89d..62493f1a9 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
@@ -36,19 +36,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-05-29 14:56+0300\n"
+"POT-Creation-Date: 2016-05-20 19:25+0300\n"
 "PO-Revision-Date: 2016-05-21 10:23+0000\n"
 "Last-Translator: Kristin Joris <kristin.joris@gmail.com>\n"
-"Language-Team: German (http://www.transifex.com/akaras/manaplus/language/"
-"de/)\n"
-"Language: de\n"
+"Language-Team: German (http://www.transifex.com/akaras/manaplus/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
-#: src/actions/actions.cpp:167
+#: src/actions/actions.cpp:166
 msgid "File uploaded"
 msgstr "Datei hochgeladen"
 
@@ -61,7 +60,7 @@ msgstr "Datei hochgeladen"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:170 src/client.cpp:1553 src/client.cpp:1588
+#: src/actions/actions.cpp:169 src/client.cpp:1549 src/client.cpp:1584
 #: 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
@@ -81,67 +80,67 @@ 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:412
-#: src/net/eathena/charserverrecv.cpp:447
-#: src/net/eathena/charserverrecv.cpp:475 src/net/tmwa/charserverrecv.cpp:296
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:405
+#: src/net/eathena/charserverrecv.cpp:440
+#: src/net/eathena/charserverrecv.cpp:468 src/net/tmwa/charserverrecv.cpp:286
 msgid "OK"
 msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1044 src/actions/actions.cpp:1057
+#: src/actions/actions.cpp:1043 src/actions/actions.cpp:1056
 msgid "Cache cleaned"
 msgstr "Zwischenspeicher geleert"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1214 src/actions/actions.cpp:1220
+#: src/actions/actions.cpp:1213 src/actions/actions.cpp:1219
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Client läuft seit: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1286
+#: src/actions/actions.cpp:1276 src/actions/actions.cpp:1285
 msgid "Resource images:"
 msgstr "Bild-Quellen:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1280 src/actions/actions.cpp:1290
+#: src/actions/actions.cpp:1279 src/actions/actions.cpp:1289
 msgid "Resource orphaned images:"
 msgstr "Quelle verwaister Bilddataien:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1385
+#: src/actions/actions.cpp:1384
 msgid "Environment variables dumped"
 msgstr "Umgebungsvariablen ausgegeben"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1502
+#: src/actions/actions.cpp:1501
 msgid "Uploaded config into:"
 msgstr "Konfiguration hochgeladen zu:"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1512
+#: src/actions/actions.cpp:1511
 msgid "Uploaded server config into:"
 msgstr "Serverconfig hochgeladen zu:"
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1522
+#: src/actions/actions.cpp:1521
 msgid "Uploaded log into:"
 msgstr "Log hoch geladen zu:"
 
 #. TRANSLATORS: last seen disabled warning
-#: src/actions/actions.cpp:1747
+#: src/actions/actions.cpp:1746
 msgid ""
 "Last seen disabled. Enable in players / collect players id and seen log."
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/actions/actions.cpp:1766 src/actions/actions.cpp:1780
+#: src/actions/actions.cpp:1765 src/actions/actions.cpp:1779
 msgid "You not saw this nick."
 msgstr "Du hast diesen Spieler nicht gesehen."
 
 #. TRANSLATORS: last seen message
-#: src/actions/actions.cpp:1772
+#: src/actions/actions.cpp:1771
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr ""
@@ -155,9 +154,7 @@ msgstr "Kann keine leeren Flüsternachrichten versenden!"
 #: src/actions/chat.cpp:309
 #, 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
@@ -502,41 +499,41 @@ msgstr "Schwebende Blase"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:856 src/dyetool/client.cpp:485 src/gui/windowmenu.cpp:189
+#: src/client.cpp:852 src/dyetool/client.cpp:482 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:65
 msgid "Setup"
 msgstr "Einstellungen"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:859 src/dyetool/client.cpp:488
+#: src/client.cpp:855 src/dyetool/client.cpp:485
 #: 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:862 src/dyetool/client.cpp:491
+#: src/client.cpp:858 src/dyetool/client.cpp:488
 #: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:865 src/dyetool/client.cpp:494
+#: src/client.cpp:861 src/dyetool/client.cpp:491
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Theme"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:868 src/dyetool/client.cpp:497
+#: src/client.cpp:864 src/dyetool/client.cpp:494
 msgid "About"
 msgstr "Über"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:871 src/dyetool/client.cpp:500 src/gui/windowmenu.cpp:74
+#: src/client.cpp:867 src/dyetool/client.cpp:497 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Hilfe"
@@ -557,45 +554,45 @@ msgstr "Hilfe"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:875 src/client.cpp:1467 src/client.cpp:1486
-#: src/dyetool/client.cpp:504 src/gui/dialogsmanager.cpp:116
+#: src/client.cpp:871 src/client.cpp:1463 src/client.cpp:1482
+#: src/dyetool/client.cpp:501 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:749 src/gui/popups/popupmenu.cpp:826
 #: src/gui/popups/popupmenu.cpp:1080 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:273
 #: src/gui/windows/inventorywindow.cpp:297
-#: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:60
-#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:130
+#: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
+#: src/gui/windows/npcdialog.cpp:87 src/gui/windows/npcdialog.cpp:129
 #: src/gui/windows/questswindow.cpp:77 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Schließen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1100 src/gui/windowmanager_unittest.cc:158
+#: src/client.cpp:1096 src/gui/windowmanager_unittest.cc:157
 msgid "Connecting to server"
 msgstr "Verbinde zum Server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1157 src/gui/windowmanager_unittest.cc:175
+#: src/client.cpp:1153 src/gui/windowmanager_unittest.cc:174
 msgid "Logging in"
 msgstr "Anmelden"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1206
+#: src/client.cpp:1202
 msgid "Entering game world"
 msgstr "Betrete die Spielwelt"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1353
+#: src/client.cpp:1349
 msgid "Requesting characters"
 msgstr "Spielfiguren werden abgefragt"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1396
+#: src/client.cpp:1392
 msgid "Connecting to the game server"
 msgstr "Verbinde zum Spielserver"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1408
+#: src/client.cpp:1404
 msgid "Changing game servers"
 msgstr "Spielserver wechseln"
 
@@ -612,7 +609,7 @@ msgstr "Spielserver wechseln"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1464 src/client.cpp:1483 src/client.cpp:1722
+#: src/client.cpp:1460 src/client.cpp:1479 src/client.cpp:1718
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:468
@@ -620,44 +617,44 @@ msgstr "Spielserver wechseln"
 #: 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:385
-#: src/net/eathena/charserverrecv.cpp:389
-#: src/net/eathena/charserverrecv.cpp:471 src/net/tmwa/charserverrecv.cpp:292
+#: src/net/eathena/charserverrecv.cpp:378
+#: src/net/eathena/charserverrecv.cpp:382
+#: src/net/eathena/charserverrecv.cpp:464 src/net/tmwa/charserverrecv.cpp:282
 msgid "Error"
 msgstr "Fehler"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1502
+#: src/client.cpp:1498
 msgid "Requesting registration details"
 msgstr "Anfrage der Registrierungsdetails"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1549
+#: src/client.cpp:1545
 msgid "Password Change"
 msgstr "Passwort ändern"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1551
+#: src/client.cpp:1547
 msgid "Password changed successfully!"
 msgstr "Passwort erfolgreich geändert!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1584
+#: src/client.cpp:1580
 msgid "Email Change"
 msgstr "E-Mail ändern"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1586
+#: src/client.cpp:1582
 msgid "Email changed successfully!"
 msgstr "E-Mail erfolgreich geändert!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1622
+#: src/client.cpp:1618
 msgid "Unregister Successful"
 msgstr "Erfolgreich abgemeldet."
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1624
+#: src/client.cpp:1620
 msgid "Farewell, come back any time..."
 msgstr "Leb wohl und komme jeder Zeit wieder..."
 
@@ -749,8 +746,7 @@ 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
@@ -760,15 +756,12 @@ 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
@@ -788,8 +781,7 @@ 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
@@ -826,52 +818,52 @@ msgid "%s doesn't exist and can't be created!"
 msgstr "%s existiert nicht und kann nicht erstellt werden!"
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:51
+#: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr "dyecmd srcfile dyestring dstfile"
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:53
+#: src/dyetool/dyemain.cpp:50
 msgid "or"
 msgstr "oder"
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:55
+#: src/dyetool/dyemain.cpp:52
 msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd srcdyestring dstfile"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: chat tab name
-#: src/game.cpp:267 src/gui/windows/chatwindow.cpp:2222
+#: src/game.cpp:266 src/gui/windows/chatwindow.cpp:2222
 msgid "General"
 msgstr "Allgemein"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:274 src/gui/windowmenu.cpp:175
+#: src/game.cpp:273 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:582
+#: src/game.cpp:581
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Screenshot gespeichert unter %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:592
+#: src/game.cpp:591
 msgid "Saving screenshot failed!"
 msgstr "Screenshot konnte nicht gespeichert werden!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:679
+#: src/game.cpp:678
 msgid "The connection to the server was lost."
 msgstr "Die Verbindung zum Server wurde getrennt."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:682
+#: src/game.cpp:681
 msgid "Network Error"
 msgstr "Netzwerkfehler"
 
@@ -1286,17 +1278,14 @@ 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
@@ -1307,7 +1296,8 @@ 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:602
+#: src/gui/windows/equipmentwindow.cpp:671
+#: src/gui/windows/serverdialog.cpp:602
 msgid "default"
 msgstr "Standard"
 
@@ -1825,19 +1815,19 @@ msgid "Cancel"
 msgstr "Abbrechen"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:223
+#: src/gui/popups/itempopup.cpp:222
 #, c-format
 msgid "Weight: %s"
 msgstr "Gewicht: %s"
 
 #. TRANSLATORS: named item description
-#: src/gui/popups/itempopup.cpp:290
+#: src/gui/popups/itempopup.cpp:289
 #, c-format
 msgid "Item named: %s"
 msgstr "Objektname: %s"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:317
+#: src/gui/popups/itempopup.cpp:316
 msgid "Cards: "
 msgstr "Karten: "
 
@@ -2178,7 +2168,7 @@ msgstr "Zauberspruch bearbeiten"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:831 src/gui/windows/npcdialog.cpp:127
+#: src/gui/popups/popupmenu.cpp:831 src/gui/windows/npcdialog.cpp:126
 msgid "Clear"
 msgstr "Leeren"
 
@@ -2520,8 +2510,9 @@ msgstr "Fenster anzeigen"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/popups/popupmenu.cpp:2379 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:68 src/gui/windows/statuswindow.cpp:243
+#: src/gui/windows/statuswindow.cpp:367
 #, c-format
 msgid "Level: %d"
 msgstr "Stufe: %d"
@@ -2940,8 +2931,8 @@ msgstr ""
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3093 src/gui/popups/popupmenu.cpp:3112
 #: src/gui/popups/popupmenu.cpp:3125 src/gui/windows/charselectdialog.cpp:76
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:408
-#: src/net/eathena/charserverrecv.cpp:444
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:401
+#: src/net/eathena/charserverrecv.cpp:437
 msgid "Info"
 msgstr "Info"
 
@@ -3360,7 +3351,7 @@ msgstr "URL öffnen"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:132
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:131
 #: src/gui/windows/serverdialog.cpp:113 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:85
 msgid "Add"
@@ -3388,7 +3379,7 @@ msgstr "Beenden"
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:192
-#: src/gui/windows/itemamountwindow.cpp:228 src/gui/windows/npcdialog.cpp:123
+#: src/gui/windows/itemamountwindow.cpp:228 src/gui/windows/npcdialog.cpp:122
 #: src/gui/windows/statuswindow.cpp:746
 msgid "+"
 msgstr "+"
@@ -3400,7 +3391,7 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:190
-#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:125
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:124
 msgid "-"
 msgstr "-"
 
@@ -3567,13 +3558,15 @@ 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,19 +3577,22 @@ 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."
 
@@ -4018,11 +4014,7 @@ 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"
-"\n"
-"Drü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\nDrü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
@@ -4034,19 +4026,15 @@ 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"
-"\n"
-"Hinweis: 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\nHinweis: 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:116
+#: src/gui/widgets/tabs/setup_colors.cpp:86
+#: src/gui/windows/emotewindow.cpp:116
 msgid "Colors"
 msgstr "Farben"
 
@@ -4060,10 +4048,7 @@ 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
@@ -4073,18 +4058,10 @@ 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"
-"\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"
+"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
 "\n"
-"Dies 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\nDies 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
@@ -4095,9 +4072,7 @@ 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
@@ -4112,17 +4087,10 @@ 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"
-"\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"
+"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
 "\n"
-"Hinweis: 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\nHinweis: 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
@@ -4132,15 +4100,10 @@ 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
@@ -4158,12 +4121,7 @@ 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"
-"\n"
-"Hinweis: 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\nHinweis: Chatlogs können über die Zeit eine deutliche Menge an Festplattenspeicher einnehmen."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:131
@@ -4173,9 +4131,7 @@ 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
@@ -4185,11 +4141,9 @@ 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
@@ -4199,17 +4153,10 @@ msgstr "Gruppennachrichten über Anwesenheit anzeigen"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be "
-"shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies "
-"are coming online."
-msgstr ""
-"Falls diese Einstellung aktivert ist, werden Statusänderungen der "
-"Gruppenmitglieder im Gruppenreiter des Chats angezeigt. \n"
-"\n"
-"Dies 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\nDies 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
@@ -4219,17 +4166,10 @@ 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"
-"Dies fügt etwas Tumult zum Chat hinzu, aber erlaubt es auch zu sehen, wenn "
-"deine Freunde online kommen."
+"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+msgstr "Falls diese Einstellung aktivert ist, werden Statusänderungen der Gildenmitglieder im Gildenreiter des Chats angezeigt. \n\nDies 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
@@ -4244,22 +4184,10 @@ 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"
-"\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"
+"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"
-"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."
+"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."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:175
@@ -4271,13 +4199,8 @@ 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"
-"\n"
-"Hinweis: 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\nHinweis: 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
@@ -4295,21 +4218,10 @@ 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"
-"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."
+"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."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:197
@@ -4319,17 +4231,10 @@ 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"
-"\n"
-"Hinweis: 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\nHinweis: 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
@@ -4339,19 +4244,10 @@ 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"
-"\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"
+"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"
-"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."
+"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."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:215
@@ -4365,12 +4261,7 @@ 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
@@ -4380,17 +4271,10 @@ 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"
-"Hinweis: Diese Einstellung macht einen Unterschied für GMs (Game Master) "
-"seit dieser Reiter nur für GMs angezeigt wird."
+"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
+msgstr "Falls aktiviert, wird der GM-Reiter im Chat auftauchen. Es zeigt Text im Bezug auf GM-Aktivitäten an.\n\nHinweis: 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
@@ -4400,13 +4284,10 @@ 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
@@ -4416,18 +4297,10 @@ 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"
-"\n"
-"Hinweis: 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\nHinweis: Dies funktioniert nur auf Servern die, die Sprachenreiterfunktion unterstüzen."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:250
@@ -4437,17 +4310,10 @@ 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"
-"\n"
-"Hinweis: 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\nHinweis: Klient muss neu gestartet werden um diese Funktion zu aktivieren."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:259
@@ -4460,10 +4326,7 @@ 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
@@ -4473,10 +4336,7 @@ 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 ""
@@ -4501,9 +4361,7 @@ 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
@@ -4513,15 +4371,10 @@ 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"
-"\n"
-"Hinweis: 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\nHinweis: Häufige Hervorhebungen sind lästig - benutze sie mit Bedacht."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:305
@@ -4531,17 +4384,10 @@ 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"
-"\n"
-"Hinweis: 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\nHinweis: 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
@@ -4551,20 +4397,10 @@ msgstr "Emotes im Chat anzeigen"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This "
-"button allows one to invoke composing window, which allows one to insert "
-"smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by "
-"default."
-msgstr ""
-"Falls diese Einstellung aktivert ist wird eine Schaltfläche in der Nähe des "
-"Texteingabefeldes erscheinen. Diese Schaltfläche ruft das Gestaltungsfenster "
-"auf. Dies erlaubt dir Smilies in den Chat einzufügen und deinen Text zu "
-"formatieren.\n"
-"\n"
-"Hinweis: 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\nHinweis: 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
@@ -4576,10 +4412,7 @@ 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
@@ -4680,9 +4513,7 @@ 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
@@ -4853,8 +4684,8 @@ msgstr "Zwischen anvisierten Monstern wechseln"
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
 #: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:114
-#: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:60
-#: src/gui/windows/minimap.cpp:123
+#: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:59
+#: src/gui/windows/minimap.cpp:122
 msgid "Map"
 msgstr "Karte"
 
@@ -5045,7 +4876,7 @@ msgstr "Laden-Modus einschalten"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:292 src/gui/windows/npcdialog.cpp:99
+#: src/gui/widgets/tabs/setup_other.cpp:292 src/gui/windows/npcdialog.cpp:98
 msgid "NPC"
 msgstr "NPC"
 
@@ -5067,9 +4898,7 @@ 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
@@ -5232,9 +5061,7 @@ 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
@@ -5294,9 +5121,7 @@ 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
@@ -5321,15 +5146,12 @@ 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
@@ -5739,17 +5561,13 @@ msgstr "Kein(e)"
 #: src/gui/widgets/tabs/setup_video.cpp:229
 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:236
 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:249
@@ -5769,9 +5587,7 @@ msgstr "Wechsle zu OpenGL"
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:279
 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:364
@@ -5792,9 +5608,7 @@ msgstr "Bildschirmauflösung wurde geändert"
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:397
 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
@@ -6329,7 +6143,8 @@ 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"
 
@@ -6448,7 +6263,8 @@ msgstr "^"
 #: src/gui/windows/charcreatedialog.cpp:193
 #: src/gui/windows/charcreatedialog.cpp:206
 #: src/gui/windows/charcreatedialog.cpp:217
-#: src/gui/windows/charcreatedialog.cpp:227 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:227
+#: src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -6466,7 +6282,8 @@ msgstr "Bitte verteile %d Punkte"
 #: src/gui/windows/charcreatedialog.cpp:197
 #: src/gui/windows/charcreatedialog.cpp:208
 #: src/gui/windows/charcreatedialog.cpp:219
-#: src/gui/windows/charcreatedialog.cpp:229 src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:229
+#: src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -6492,7 +6309,8 @@ 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:248 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:248
+#: src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr "W"
 
@@ -6591,12 +6409,7 @@ msgid ""
 "Level: %u\n"
 "Experience: %u\n"
 "Money: %s"
-msgstr ""
-"HP: %u/%u\n"
-"MP: %u/%u\n"
-"Level: %u\n"
-"Erfahrung: %u\n"
-"Geld: %s"
+msgstr "HP: %u/%u\nMP: %u/%u\nLevel: %u\nErfahrung: %u\nGeld: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/charselectdialog.cpp:308
@@ -6699,7 +6512,8 @@ msgstr "Server bearbeiten"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:111
+#: src/gui/windows/editserverdialog.cpp:57
+#: src/gui/windows/serverdialog.cpp:111
 msgid "Connect"
 msgstr "Verbinden"
 
@@ -7051,26 +6865,28 @@ msgstr "Nach:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:73
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:72
 msgid "Subject:"
 msgstr "Betreff:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:104
+#: src/gui/windows/maileditwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:103
 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:123
-#: src/gui/windows/mailviewwindow.cpp:132
+#: src/gui/windows/maileditwindow.cpp:63
+#: src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:131
 msgid "Item:"
 msgstr "Gegenstand:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:76
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:75
 msgid "Message:"
 msgstr "Nachricht:"
 
@@ -7080,27 +6896,27 @@ msgid "empty subject"
 msgstr "leerer Betreff"
 
 #. TRANSLATORS: mail view window name
-#: src/gui/windows/mailviewwindow.cpp:54
+#: src/gui/windows/mailviewwindow.cpp:53
 msgid "View mail"
 msgstr "Nachricht anschauen"
 
 #. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:64
+#: src/gui/windows/mailviewwindow.cpp:63
 msgid "Reply"
 msgstr "Antworten"
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:65
 msgid "Time:"
 msgstr "Zeit:"
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:70
+#: src/gui/windows/mailviewwindow.cpp:69
 msgid "From:"
 msgstr "Von:"
 
 #. TRANSLATORS: mail view attach button
-#: src/gui/windows/mailviewwindow.cpp:141
+#: src/gui/windows/mailviewwindow.cpp:140
 msgid "Get attach"
 msgstr "Anhang herausnehmen"
 
@@ -7190,22 +7006,22 @@ msgid "Job level: %d"
 msgstr "Job Level: %d"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:84
+#: src/gui/windows/npcdialog.cpp:83
 msgid "Stop waiting"
 msgstr "Warten stoppen"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:86
+#: src/gui/windows/npcdialog.cpp:85
 msgid "Next"
 msgstr "Weiter"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:90
+#: src/gui/windows/npcdialog.cpp:89
 msgid "Submit"
 msgstr "Absenden"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:134
+#: src/gui/windows/npcdialog.cpp:133
 msgid "Reset"
 msgstr "Zurücksetzten"
 
@@ -7768,10 +7584,9 @@ 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
@@ -9038,8 +8853,7 @@ 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
@@ -9054,9 +8868,7 @@ 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
@@ -9109,9 +8921,7 @@ 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
@@ -9214,9 +9024,7 @@ 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.\n"
-"Bitte kontaktiere das GM-Team via der Foren."
+msgstr "Du wurdest bis %s gebannt.\nBitte kontaktiere das GM-Team via der Foren."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:151 src/net/eathena/loginrecv.cpp:92
@@ -9256,33 +9064,33 @@ msgstr "Verbindung mit Server abgebrochen. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:387
-#: src/net/eathena/charserverrecv.cpp:435
+#: src/net/eathena/charserverrecv.cpp:380
+#: src/net/eathena/charserverrecv.cpp:428
 msgid "Character rename error."
 msgstr "Fehler beim Umbennen des Charakters."
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:410
+#: src/net/eathena/charserverrecv.cpp:403
 msgid "Character renamed."
 msgstr "Charakter umbenannt."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:419
 msgid "Rename not allowed."
 msgstr "Umbennen ist nicht erlaubt."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:423
 msgid "New name is not set."
 msgstr "Neuer Name ist nicht gesetzt."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:439
+#: src/net/eathena/charserverrecv.cpp:432
 msgid "Character not found."
 msgstr "Charakter nicht gefunden."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:473 src/net/tmwa/charserverrecv.cpp:294
+#: src/net/eathena/charserverrecv.cpp:466 src/net/tmwa/charserverrecv.cpp:284
 msgid "Failed to delete character."
 msgstr "Konnte Charakter nicht löschen."
 
@@ -9614,7 +9422,7 @@ msgid "Map not found"
 msgstr "Karte nicht gefunden"
 
 #. TRANSLATORS: notification message
-#: src/net/eathena/inventoryrecv.cpp:844
+#: src/net/eathena/inventoryrecv.cpp:823
 #, c-format
 msgid "Left %s rental time for item %s."
 msgstr "Verbleibend %s Vermietungszeit für Gegenstand %s."
@@ -9622,8 +9430,8 @@ msgstr "Verbleibend %s Vermietungszeit für Gegenstand %s."
 #. TRANSLATORS: unknown item
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
-#: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:265
+#: src/net/eathena/inventoryrecv.cpp:1176
+#: src/net/eathena/inventoryrecv.cpp:1309 src/resources/db/itemdb.cpp:265
 msgid "Unknown item"
 msgstr "Unbekannter Gegenstand"
 
@@ -10416,23 +10224,17 @@ 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
@@ -10594,18 +10396,14 @@ 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
@@ -10620,8 +10418,7 @@ 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
@@ -10648,9 +10445,7 @@ 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
@@ -10675,8 +10470,7 @@ 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
@@ -10888,15 +10682,12 @@ 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
@@ -11090,8 +10881,7 @@ msgstr ""
 #: src/utils/booleanoptions.h:27
 #, 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
diff --git a/po/es.po b/po/es.po
index d94e6b895..48333d940 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
@@ -22,19 +22,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-05-29 14:56+0300\n"
+"POT-Creation-Date: 2016-05-20 19:25+0300\n"
 "PO-Revision-Date: 2016-05-21 09:33+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"
+"Language-Team: Spanish (http://www.transifex.com/akaras/manaplus/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
-#: src/actions/actions.cpp:167
+#: src/actions/actions.cpp:166
 msgid "File uploaded"
 msgstr "Archivo subido"
 
@@ -47,7 +46,7 @@ msgstr "Archivo subido"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:170 src/client.cpp:1553 src/client.cpp:1588
+#: src/actions/actions.cpp:169 src/client.cpp:1549 src/client.cpp:1584
 #: 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
@@ -67,67 +66,67 @@ 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:412
-#: src/net/eathena/charserverrecv.cpp:447
-#: src/net/eathena/charserverrecv.cpp:475 src/net/tmwa/charserverrecv.cpp:296
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:405
+#: src/net/eathena/charserverrecv.cpp:440
+#: src/net/eathena/charserverrecv.cpp:468 src/net/tmwa/charserverrecv.cpp:286
 msgid "OK"
 msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1044 src/actions/actions.cpp:1057
+#: src/actions/actions.cpp:1043 src/actions/actions.cpp:1056
 msgid "Cache cleaned"
 msgstr "Caché limpiada"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1214 src/actions/actions.cpp:1220
+#: src/actions/actions.cpp:1213 src/actions/actions.cpp:1219
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Tiempo de actividad del cliente: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1286
+#: src/actions/actions.cpp:1276 src/actions/actions.cpp:1285
 msgid "Resource images:"
 msgstr "Imágenes de recurso:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1280 src/actions/actions.cpp:1290
+#: src/actions/actions.cpp:1279 src/actions/actions.cpp:1289
 msgid "Resource orphaned images:"
 msgstr "Imágenes de recurso huérfano:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1385
+#: src/actions/actions.cpp:1384
 msgid "Environment variables dumped"
 msgstr "Variables de entorno vaciadas"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1502
+#: src/actions/actions.cpp:1501
 msgid "Uploaded config into:"
 msgstr "Configuraciones subidas a:"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1512
+#: src/actions/actions.cpp:1511
 msgid "Uploaded server config into:"
 msgstr "Configuraciones del servidor subidas a:"
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1522
+#: src/actions/actions.cpp:1521
 msgid "Uploaded log into:"
 msgstr "Registro subido a:"
 
 #. TRANSLATORS: last seen disabled warning
-#: src/actions/actions.cpp:1747
+#: src/actions/actions.cpp:1746
 msgid ""
 "Last seen disabled. Enable in players / collect players id and seen log."
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/actions/actions.cpp:1766 src/actions/actions.cpp:1780
+#: src/actions/actions.cpp:1765 src/actions/actions.cpp:1779
 msgid "You not saw this nick."
 msgstr ""
 
 #. TRANSLATORS: last seen message
-#: src/actions/actions.cpp:1772
+#: src/actions/actions.cpp:1771
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr ""
@@ -141,8 +140,7 @@ msgstr "¡No se pueden enviar susurros vacíos!"
 #: src/actions/chat.cpp:309
 #, 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
@@ -487,41 +485,41 @@ msgstr "Burbuja flotante"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:856 src/dyetool/client.cpp:485 src/gui/windowmenu.cpp:189
+#: src/client.cpp:852 src/dyetool/client.cpp:482 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:65
 msgid "Setup"
 msgstr "Configuración"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:859 src/dyetool/client.cpp:488
+#: src/client.cpp:855 src/dyetool/client.cpp:485
 #: 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:862 src/dyetool/client.cpp:491
+#: src/client.cpp:858 src/dyetool/client.cpp:488
 #: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:865 src/dyetool/client.cpp:494
+#: src/client.cpp:861 src/dyetool/client.cpp:491
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:868 src/dyetool/client.cpp:497
+#: src/client.cpp:864 src/dyetool/client.cpp:494
 msgid "About"
 msgstr "Acerca de..."
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:871 src/dyetool/client.cpp:500 src/gui/windowmenu.cpp:74
+#: src/client.cpp:867 src/dyetool/client.cpp:497 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Ayuda"
@@ -542,45 +540,45 @@ msgstr "Ayuda"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:875 src/client.cpp:1467 src/client.cpp:1486
-#: src/dyetool/client.cpp:504 src/gui/dialogsmanager.cpp:116
+#: src/client.cpp:871 src/client.cpp:1463 src/client.cpp:1482
+#: src/dyetool/client.cpp:501 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:749 src/gui/popups/popupmenu.cpp:826
 #: src/gui/popups/popupmenu.cpp:1080 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:273
 #: src/gui/windows/inventorywindow.cpp:297
-#: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:60
-#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:130
+#: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
+#: src/gui/windows/npcdialog.cpp:87 src/gui/windows/npcdialog.cpp:129
 #: src/gui/windows/questswindow.cpp:77 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Cerrar"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1100 src/gui/windowmanager_unittest.cc:158
+#: src/client.cpp:1096 src/gui/windowmanager_unittest.cc:157
 msgid "Connecting to server"
 msgstr "Conectando al servidor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1157 src/gui/windowmanager_unittest.cc:175
+#: src/client.cpp:1153 src/gui/windowmanager_unittest.cc:174
 msgid "Logging in"
 msgstr "Accediendo a la cuenta"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1206
+#: src/client.cpp:1202
 msgid "Entering game world"
 msgstr "Entrando al mundo del juego"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1353
+#: src/client.cpp:1349
 msgid "Requesting characters"
 msgstr "Cargando personajes"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1396
+#: src/client.cpp:1392
 msgid "Connecting to the game server"
 msgstr "Conectando al servidor del juego"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1408
+#: src/client.cpp:1404
 msgid "Changing game servers"
 msgstr "Cambiando servidores del juego"
 
@@ -597,7 +595,7 @@ msgstr "Cambiando servidores del juego"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1464 src/client.cpp:1483 src/client.cpp:1722
+#: src/client.cpp:1460 src/client.cpp:1479 src/client.cpp:1718
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:468
@@ -605,44 +603,44 @@ msgstr "Cambiando servidores del juego"
 #: 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:385
-#: src/net/eathena/charserverrecv.cpp:389
-#: src/net/eathena/charserverrecv.cpp:471 src/net/tmwa/charserverrecv.cpp:292
+#: src/net/eathena/charserverrecv.cpp:378
+#: src/net/eathena/charserverrecv.cpp:382
+#: src/net/eathena/charserverrecv.cpp:464 src/net/tmwa/charserverrecv.cpp:282
 msgid "Error"
 msgstr "Error"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1502
+#: src/client.cpp:1498
 msgid "Requesting registration details"
 msgstr "Solicitando detalles de registro"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1549
+#: src/client.cpp:1545
 msgid "Password Change"
 msgstr "Cambio de contraseña"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1551
+#: src/client.cpp:1547
 msgid "Password changed successfully!"
 msgstr "¡Contraseña cambiada exitosamente!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1584
+#: src/client.cpp:1580
 msgid "Email Change"
 msgstr "Cambio de Email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1586
+#: src/client.cpp:1582
 msgid "Email changed successfully!"
 msgstr "¡Email modificado exitosamente!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1622
+#: src/client.cpp:1618
 msgid "Unregister Successful"
 msgstr "Registro cancelado"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1624
+#: src/client.cpp:1620
 msgid "Farewell, come back any time..."
 msgstr "Adiós, vuelve cuando quieras..."
 
@@ -744,8 +742,7 @@ 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
@@ -755,8 +752,7 @@ 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
@@ -771,8 +767,7 @@ 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
@@ -809,52 +804,52 @@ msgid "%s doesn't exist and can't be created!"
 msgstr "¡%s no existe y no puede ser creado!"
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:51
+#: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr "dyecmd archivoOrigen colorTinte archivoDestino"
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:53
+#: src/dyetool/dyemain.cpp:50
 msgid "or"
 msgstr "o"
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:55
+#: src/dyetool/dyemain.cpp:52
 msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd archivoOrigen archivoDestino"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: chat tab name
-#: src/game.cpp:267 src/gui/windows/chatwindow.cpp:2222
+#: src/game.cpp:266 src/gui/windows/chatwindow.cpp:2222
 msgid "General"
 msgstr "General"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:274 src/gui/windowmenu.cpp:175
+#: src/game.cpp:273 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Depurador"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:582
+#: src/game.cpp:581
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Captura de pantalla guardada como %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:592
+#: src/game.cpp:591
 msgid "Saving screenshot failed!"
 msgstr "¡El guardado de la captura de pantalla ha fallado!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:679
+#: src/game.cpp:678
 msgid "The connection to the server was lost."
 msgstr "Se ha perdido la conexión con el servidor."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:682
+#: src/game.cpp:681
 msgid "Network Error"
 msgstr "Error de Red"
 
@@ -1269,16 +1264,14 @@ 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
@@ -1289,7 +1282,8 @@ 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:602
+#: src/gui/windows/equipmentwindow.cpp:671
+#: src/gui/windows/serverdialog.cpp:602
 msgid "default"
 msgstr "predeterminado"
 
@@ -1807,19 +1801,19 @@ msgid "Cancel"
 msgstr "Cancelar"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:223
+#: src/gui/popups/itempopup.cpp:222
 #, c-format
 msgid "Weight: %s"
 msgstr "Peso: %s"
 
 #. TRANSLATORS: named item description
-#: src/gui/popups/itempopup.cpp:290
+#: src/gui/popups/itempopup.cpp:289
 #, c-format
 msgid "Item named: %s"
 msgstr "Artículo nombrado: %s"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:317
+#: src/gui/popups/itempopup.cpp:316
 msgid "Cards: "
 msgstr "Tarjetas: "
 
@@ -2160,7 +2154,7 @@ msgstr "Editar hechizo"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:831 src/gui/windows/npcdialog.cpp:127
+#: src/gui/popups/popupmenu.cpp:831 src/gui/windows/npcdialog.cpp:126
 msgid "Clear"
 msgstr "Limpiar"
 
@@ -2502,8 +2496,9 @@ msgstr "Mostrar ventana"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/popups/popupmenu.cpp:2379 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:68 src/gui/windows/statuswindow.cpp:243
+#: src/gui/windows/statuswindow.cpp:367
 #, c-format
 msgid "Level: %d"
 msgstr "Nivel: %d"
@@ -2922,8 +2917,8 @@ msgstr ""
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3093 src/gui/popups/popupmenu.cpp:3112
 #: src/gui/popups/popupmenu.cpp:3125 src/gui/windows/charselectdialog.cpp:76
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:408
-#: src/net/eathena/charserverrecv.cpp:444
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:401
+#: src/net/eathena/charserverrecv.cpp:437
 msgid "Info"
 msgstr "Información"
 
@@ -3342,7 +3337,7 @@ msgstr "Abrir url"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:132
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:131
 #: src/gui/windows/serverdialog.cpp:113 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:85
 msgid "Add"
@@ -3370,7 +3365,7 @@ msgstr "Salir"
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:192
-#: src/gui/windows/itemamountwindow.cpp:228 src/gui/windows/npcdialog.cpp:123
+#: src/gui/windows/itemamountwindow.cpp:228 src/gui/windows/npcdialog.cpp:122
 #: src/gui/windows/statuswindow.cpp:746
 msgid "+"
 msgstr "+"
@@ -3382,7 +3377,7 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:190
-#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:125
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:124
 msgid "-"
 msgstr "-"
 
@@ -3549,13 +3544,15 @@ 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."
 
@@ -3566,19 +3563,22 @@ 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."
 
@@ -4000,10 +4000,7 @@ 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"
-"\n"
-"Presiona 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\nPresiona Enter o pasa el ratón por encima para mostrarla nuevamente."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:58
@@ -4015,19 +4012,15 @@ 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"
-"\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."
+"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."
 
 #. 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:116
+#: src/gui/widgets/tabs/setup_colors.cpp:86
+#: src/gui/windows/emotewindow.cpp:116
 msgid "Colors"
 msgstr "Colores"
 
@@ -4041,10 +4034,7 @@ 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
@@ -4054,26 +4044,21 @@ 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
@@ -4088,11 +4073,9 @@ 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
@@ -4103,9 +4086,7 @@ 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 ""
@@ -4136,9 +4117,7 @@ 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
@@ -4148,12 +4127,9 @@ 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
@@ -4163,11 +4139,9 @@ 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
@@ -4178,17 +4152,10 @@ 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"
-"Esto agrega algunos sonidos extra al chat, pero te permite notar cuando tus "
-"compañeros se conectan."
+"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+msgstr "Si este ajuste se habilita, se mostrarán los cambios de estado de conexión de los miembros del gremio en la pestaña Gremio del chat.\n\nEsto 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
@@ -4203,13 +4170,9 @@ 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
@@ -4222,8 +4185,7 @@ 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
@@ -4242,12 +4204,9 @@ 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
@@ -4258,8 +4217,7 @@ 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 ""
@@ -4272,11 +4230,9 @@ 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
@@ -4301,11 +4257,9 @@ 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
@@ -4316,15 +4270,10 @@ 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"
-"\n"
-"Nota: 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\nNota: Por ahora, sólo es soportado por el servidor Evol."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:240
@@ -4334,9 +4283,7 @@ 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 ""
@@ -4349,9 +4296,7 @@ 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 ""
@@ -4367,11 +4312,7 @@ 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
@@ -4381,10 +4322,7 @@ 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 ""
@@ -4409,10 +4347,7 @@ 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
@@ -4422,15 +4357,10 @@ 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"
-"\n"
-"Nota: 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\nNota: Los resaltados frecuentes pueden ser molestos; úsalo con precaución."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:305
@@ -4440,8 +4370,7 @@ 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 ""
@@ -4454,12 +4383,9 @@ 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
@@ -4472,10 +4398,7 @@ 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
@@ -4576,9 +4499,7 @@ 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
@@ -4749,8 +4670,8 @@ msgstr "Apuntar cíclicamente a los monstruos, no necesariamente al más cercano
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
 #: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:114
-#: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:60
-#: src/gui/windows/minimap.cpp:123
+#: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:59
+#: src/gui/windows/minimap.cpp:122
 msgid "Map"
 msgstr "Mapa"
 
@@ -4941,16 +4862,14 @@ msgstr "Habilitar la tienda"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:292 src/gui/windows/npcdialog.cpp:99
+#: src/gui/widgets/tabs/setup_other.cpp:292 src/gui/windows/npcdialog.cpp:98
 msgid "NPC"
 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
@@ -4965,8 +4884,7 @@ 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
@@ -5189,8 +5107,7 @@ 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
@@ -5215,8 +5132,7 @@ 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
@@ -5352,9 +5268,7 @@ 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
@@ -5633,17 +5547,13 @@ msgstr "Nada"
 #: src/gui/widgets/tabs/setup_video.cpp:229
 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:236
 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:249
@@ -5684,8 +5594,7 @@ msgstr "Resolución de pantalla cambiada"
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:397
 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
@@ -6220,7 +6129,8 @@ 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"
 
@@ -6253,17 +6163,13 @@ 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
@@ -6343,7 +6249,8 @@ msgstr "^"
 #: src/gui/windows/charcreatedialog.cpp:193
 #: src/gui/windows/charcreatedialog.cpp:206
 #: src/gui/windows/charcreatedialog.cpp:217
-#: src/gui/windows/charcreatedialog.cpp:227 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:227
+#: src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -6361,7 +6268,8 @@ msgstr "Por favor, distribuye %d puntos"
 #: src/gui/windows/charcreatedialog.cpp:197
 #: src/gui/windows/charcreatedialog.cpp:208
 #: src/gui/windows/charcreatedialog.cpp:219
-#: src/gui/windows/charcreatedialog.cpp:229 src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:229
+#: src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -6387,7 +6295,8 @@ 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:248 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:248
+#: src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr "F"
 
@@ -6486,12 +6395,7 @@ msgid ""
 "Level: %u\n"
 "Experience: %u\n"
 "Money: %s"
-msgstr ""
-"HP: %u/%u\n"
-"Mp: %u/%u\n"
-"Nivel: %u\n"
-"Experiencia: %u\n"
-"Dinero: %s"
+msgstr "HP: %u/%u\nMp: %u/%u\nNivel: %u\nExperiencia: %u\nDinero: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/charselectdialog.cpp:308
@@ -6594,7 +6498,8 @@ msgstr "Editar Servidor"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:111
+#: src/gui/windows/editserverdialog.cpp:57
+#: src/gui/windows/serverdialog.cpp:111
 msgid "Connect"
 msgstr "Conectar"
 
@@ -6636,8 +6541,7 @@ 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
@@ -6947,26 +6851,28 @@ msgstr "Para:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:73
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:72
 msgid "Subject:"
 msgstr "Asunto:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:104
+#: src/gui/windows/maileditwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:103
 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:123
-#: src/gui/windows/mailviewwindow.cpp:132
+#: src/gui/windows/maileditwindow.cpp:63
+#: src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:131
 msgid "Item:"
 msgstr "Artículo:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:76
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:75
 msgid "Message:"
 msgstr "Mensaje:"
 
@@ -6976,27 +6882,27 @@ msgid "empty subject"
 msgstr "asunto vacío"
 
 #. TRANSLATORS: mail view window name
-#: src/gui/windows/mailviewwindow.cpp:54
+#: src/gui/windows/mailviewwindow.cpp:53
 msgid "View mail"
 msgstr "Ver correo"
 
 #. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:64
+#: src/gui/windows/mailviewwindow.cpp:63
 msgid "Reply"
 msgstr "Contestar"
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:65
 msgid "Time:"
 msgstr "Tiempo:"
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:70
+#: src/gui/windows/mailviewwindow.cpp:69
 msgid "From:"
 msgstr "De:"
 
 #. TRANSLATORS: mail view attach button
-#: src/gui/windows/mailviewwindow.cpp:141
+#: src/gui/windows/mailviewwindow.cpp:140
 msgid "Get attach"
 msgstr ""
 
@@ -7086,22 +6992,22 @@ msgid "Job level: %d"
 msgstr "Nivel de trabajo: %d"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:84
+#: src/gui/windows/npcdialog.cpp:83
 msgid "Stop waiting"
 msgstr "Dejar de esperar"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:86
+#: src/gui/windows/npcdialog.cpp:85
 msgid "Next"
 msgstr "Siguiente"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:90
+#: src/gui/windows/npcdialog.cpp:89
 msgid "Submit"
 msgstr "Enviar"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:134
+#: src/gui/windows/npcdialog.cpp:133
 msgid "Reset"
 msgstr "Restablecer"
 
@@ -7186,15 +7092,13 @@ 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.
@@ -7666,10 +7570,9 @@ 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
@@ -8936,9 +8839,7 @@ 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
@@ -9006,9 +8907,7 @@ 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
@@ -9098,9 +8997,7 @@ 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
@@ -9113,9 +9010,7 @@ 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.\n"
-"Por favor contacta al equipo de GM a través de los foros."
+msgstr "Has sido proscrito temporalmente del juego hasta %s.\nPor 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
@@ -9155,33 +9050,33 @@ msgstr "Conexión al servidor terminada. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:387
-#: src/net/eathena/charserverrecv.cpp:435
+#: src/net/eathena/charserverrecv.cpp:380
+#: src/net/eathena/charserverrecv.cpp:428
 msgid "Character rename error."
 msgstr "Error de renombrado del personaje."
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:410
+#: src/net/eathena/charserverrecv.cpp:403
 msgid "Character renamed."
 msgstr "Personaje renombrado."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:419
 msgid "Rename not allowed."
 msgstr "No se permite renombrar."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:423
 msgid "New name is not set."
 msgstr "El nuevo nombre no está establecido."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:439
+#: src/net/eathena/charserverrecv.cpp:432
 msgid "Character not found."
 msgstr "Personaje no encontrado."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:473 src/net/tmwa/charserverrecv.cpp:294
+#: src/net/eathena/charserverrecv.cpp:466 src/net/tmwa/charserverrecv.cpp:284
 msgid "Failed to delete character."
 msgstr "Fallo al borrar el personaje."
 
@@ -9513,7 +9408,7 @@ msgid "Map not found"
 msgstr "Mapa no encontrado"
 
 #. TRANSLATORS: notification message
-#: src/net/eathena/inventoryrecv.cpp:844
+#: src/net/eathena/inventoryrecv.cpp:823
 #, c-format
 msgid "Left %s rental time for item %s."
 msgstr "Falta %s de tiempo de renta para el artículo %s."
@@ -9521,8 +9416,8 @@ msgstr "Falta %s de tiempo de renta para el artículo %s."
 #. TRANSLATORS: unknown item
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
-#: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:265
+#: src/net/eathena/inventoryrecv.cpp:1176
+#: src/net/eathena/inventoryrecv.cpp:1309 src/resources/db/itemdb.cpp:265
 msgid "Unknown item"
 msgstr "Elemento desconocido"
 
@@ -10487,18 +10382,14 @@ 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
@@ -10540,15 +10431,12 @@ 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
@@ -10568,9 +10456,7 @@ 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
@@ -10787,8 +10673,7 @@ 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
@@ -10982,8 +10867,7 @@ msgstr "Error al guardar lugar. No tienes la habilidad de teletransporte."
 #: src/utils/booleanoptions.h:27
 #, 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
diff --git a/po/fi.po b/po/fi.po
index dcf1de4cf..63953214f 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,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-05-29 14:56+0300\n"
+"POT-Creation-Date: 2016-05-20 19:25+0300\n"
 "PO-Revision-Date: 2016-05-21 09:33+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Finnish (http://www.transifex.com/akaras/manaplus/language/"
-"fi/)\n"
-"Language: fi\n"
+"Language-Team: Finnish (http://www.transifex.com/akaras/manaplus/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
-#: src/actions/actions.cpp:167
+#: src/actions/actions.cpp:166
 msgid "File uploaded"
 msgstr ""
 
@@ -34,7 +33,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:170 src/client.cpp:1553 src/client.cpp:1588
+#: src/actions/actions.cpp:169 src/client.cpp:1549 src/client.cpp:1584
 #: 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,67 +53,67 @@ 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:412
-#: src/net/eathena/charserverrecv.cpp:447
-#: src/net/eathena/charserverrecv.cpp:475 src/net/tmwa/charserverrecv.cpp:296
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:405
+#: src/net/eathena/charserverrecv.cpp:440
+#: src/net/eathena/charserverrecv.cpp:468 src/net/tmwa/charserverrecv.cpp:286
 msgid "OK"
 msgstr "Ok"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1044 src/actions/actions.cpp:1057
+#: src/actions/actions.cpp:1043 src/actions/actions.cpp:1056
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1214 src/actions/actions.cpp:1220
+#: src/actions/actions.cpp:1213 src/actions/actions.cpp:1219
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Ohjelma ollut käynnissä: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1286
+#: src/actions/actions.cpp:1276 src/actions/actions.cpp:1285
 msgid "Resource images:"
 msgstr "Resurssikuvat:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1280 src/actions/actions.cpp:1290
+#: src/actions/actions.cpp:1279 src/actions/actions.cpp:1289
 msgid "Resource orphaned images:"
 msgstr "Orvot resurssikuvat:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1385
+#: src/actions/actions.cpp:1384
 msgid "Environment variables dumped"
 msgstr ""
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1502
+#: src/actions/actions.cpp:1501
 msgid "Uploaded config into:"
 msgstr ""
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1512
+#: src/actions/actions.cpp:1511
 msgid "Uploaded server config into:"
 msgstr ""
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1522
+#: src/actions/actions.cpp:1521
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: last seen disabled warning
-#: src/actions/actions.cpp:1747
+#: src/actions/actions.cpp:1746
 msgid ""
 "Last seen disabled. Enable in players / collect players id and seen log."
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/actions/actions.cpp:1766 src/actions/actions.cpp:1780
+#: src/actions/actions.cpp:1765 src/actions/actions.cpp:1779
 msgid "You not saw this nick."
 msgstr ""
 
 #. TRANSLATORS: last seen message
-#: src/actions/actions.cpp:1772
+#: src/actions/actions.cpp:1771
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr ""
@@ -473,41 +472,41 @@ msgstr "Leijuva puhekupla"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:856 src/dyetool/client.cpp:485 src/gui/windowmenu.cpp:189
+#: src/client.cpp:852 src/dyetool/client.cpp:482 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:65
 msgid "Setup"
 msgstr "Asetukset"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:859 src/dyetool/client.cpp:488
+#: src/client.cpp:855 src/dyetool/client.cpp:485
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:862 src/dyetool/client.cpp:491
+#: src/client.cpp:858 src/dyetool/client.cpp:488
 #: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Kuva"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:865 src/dyetool/client.cpp:494
+#: src/client.cpp:861 src/dyetool/client.cpp:491
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Teema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:868 src/dyetool/client.cpp:497
+#: src/client.cpp:864 src/dyetool/client.cpp:494
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:871 src/dyetool/client.cpp:500 src/gui/windowmenu.cpp:74
+#: src/client.cpp:867 src/dyetool/client.cpp:497 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Apua"
@@ -528,45 +527,45 @@ msgstr "Apua"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:875 src/client.cpp:1467 src/client.cpp:1486
-#: src/dyetool/client.cpp:504 src/gui/dialogsmanager.cpp:116
+#: src/client.cpp:871 src/client.cpp:1463 src/client.cpp:1482
+#: src/dyetool/client.cpp:501 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:749 src/gui/popups/popupmenu.cpp:826
 #: src/gui/popups/popupmenu.cpp:1080 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:273
 #: src/gui/windows/inventorywindow.cpp:297
-#: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:60
-#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:130
+#: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
+#: src/gui/windows/npcdialog.cpp:87 src/gui/windows/npcdialog.cpp:129
 #: src/gui/windows/questswindow.cpp:77 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Sulje"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1100 src/gui/windowmanager_unittest.cc:158
+#: src/client.cpp:1096 src/gui/windowmanager_unittest.cc:157
 msgid "Connecting to server"
 msgstr "Yhdistän palvelimeen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1157 src/gui/windowmanager_unittest.cc:175
+#: src/client.cpp:1153 src/gui/windowmanager_unittest.cc:174
 msgid "Logging in"
 msgstr "Kirjaudun sisään"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1206
+#: src/client.cpp:1202
 msgid "Entering game world"
 msgstr "Siirryn pelimaailmaan"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1353
+#: src/client.cpp:1349
 msgid "Requesting characters"
 msgstr "Pyydän hahmoja"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1396
+#: src/client.cpp:1392
 msgid "Connecting to the game server"
 msgstr "Yhdistän pelipalvelimeen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1408
+#: src/client.cpp:1404
 msgid "Changing game servers"
 msgstr "Vaihdan pelipalvelinta"
 
@@ -583,7 +582,7 @@ msgstr "Vaihdan pelipalvelinta"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1464 src/client.cpp:1483 src/client.cpp:1722
+#: src/client.cpp:1460 src/client.cpp:1479 src/client.cpp:1718
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:468
@@ -591,44 +590,44 @@ msgstr "Vaihdan pelipalvelinta"
 #: 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:385
-#: src/net/eathena/charserverrecv.cpp:389
-#: src/net/eathena/charserverrecv.cpp:471 src/net/tmwa/charserverrecv.cpp:292
+#: src/net/eathena/charserverrecv.cpp:378
+#: src/net/eathena/charserverrecv.cpp:382
+#: src/net/eathena/charserverrecv.cpp:464 src/net/tmwa/charserverrecv.cpp:282
 msgid "Error"
 msgstr "Virhe"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1502
+#: src/client.cpp:1498
 msgid "Requesting registration details"
 msgstr "Pyydän rekisteröitymisen yksityiskohtia"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1549
+#: src/client.cpp:1545
 msgid "Password Change"
 msgstr "Salasanan vaihto"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1551
+#: src/client.cpp:1547
 msgid "Password changed successfully!"
 msgstr "Salasana vaihdettu onnistuneesti!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1584
+#: src/client.cpp:1580
 msgid "Email Change"
 msgstr "Sähköpostin vaihto"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1586
+#: src/client.cpp:1582
 msgid "Email changed successfully!"
 msgstr "Sähköpostiosoite vaihdettu onnistuneesti!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1622
+#: src/client.cpp:1618
 msgid "Unregister Successful"
 msgstr "Tietojen poisto onnistui"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1624
+#: src/client.cpp:1620
 msgid "Farewell, come back any time..."
 msgstr "Näkemisiin, tule pian takaisin..."
 
@@ -700,8 +699,7 @@ 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
@@ -793,52 +791,52 @@ msgid "%s doesn't exist and can't be created!"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:51
+#: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:53
+#: src/dyetool/dyemain.cpp:50
 msgid "or"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:55
+#: src/dyetool/dyemain.cpp:52
 msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: chat tab name
-#: src/game.cpp:267 src/gui/windows/chatwindow.cpp:2222
+#: src/game.cpp:266 src/gui/windows/chatwindow.cpp:2222
 msgid "General"
 msgstr "Yleiset"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:274 src/gui/windowmenu.cpp:175
+#: src/game.cpp:273 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:582
+#: src/game.cpp:581
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:592
+#: src/game.cpp:591
 msgid "Saving screenshot failed!"
 msgstr "Ruutukaappauksen tallentaminen epäonnistui!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:679
+#: src/game.cpp:678
 msgid "The connection to the server was lost."
 msgstr "Yhteys palvelimeen katkesi."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:682
+#: src/game.cpp:681
 msgid "Network Error"
 msgstr "Verkkovirhe"
 
@@ -1253,7 +1251,8 @@ 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
@@ -1270,7 +1269,8 @@ 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:602
+#: src/gui/windows/equipmentwindow.cpp:671
+#: src/gui/windows/serverdialog.cpp:602
 msgid "default"
 msgstr "oletus"
 
@@ -1788,19 +1788,19 @@ msgid "Cancel"
 msgstr "Peru"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:223
+#: src/gui/popups/itempopup.cpp:222
 #, c-format
 msgid "Weight: %s"
 msgstr "Paino: %s"
 
 #. TRANSLATORS: named item description
-#: src/gui/popups/itempopup.cpp:290
+#: src/gui/popups/itempopup.cpp:289
 #, c-format
 msgid "Item named: %s"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:317
+#: src/gui/popups/itempopup.cpp:316
 msgid "Cards: "
 msgstr ""
 
@@ -2141,7 +2141,7 @@ msgstr "Muokkaa loitsua"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:831 src/gui/windows/npcdialog.cpp:127
+#: src/gui/popups/popupmenu.cpp:831 src/gui/windows/npcdialog.cpp:126
 msgid "Clear"
 msgstr "Tyhjennä"
 
@@ -2483,8 +2483,9 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/popups/popupmenu.cpp:2379 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:68 src/gui/windows/statuswindow.cpp:243
+#: src/gui/windows/statuswindow.cpp:367
 #, c-format
 msgid "Level: %d"
 msgstr "Taso: %d"
@@ -2903,8 +2904,8 @@ msgstr ""
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3093 src/gui/popups/popupmenu.cpp:3112
 #: src/gui/popups/popupmenu.cpp:3125 src/gui/windows/charselectdialog.cpp:76
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:408
-#: src/net/eathena/charserverrecv.cpp:444
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:401
+#: src/net/eathena/charserverrecv.cpp:437
 msgid "Info"
 msgstr "Tietoja"
 
@@ -3323,7 +3324,7 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:132
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:131
 #: src/gui/windows/serverdialog.cpp:113 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:85
 msgid "Add"
@@ -3351,7 +3352,7 @@ msgstr "Sulje"
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:192
-#: src/gui/windows/itemamountwindow.cpp:228 src/gui/windows/npcdialog.cpp:123
+#: src/gui/windows/itemamountwindow.cpp:228 src/gui/windows/npcdialog.cpp:122
 #: src/gui/windows/statuswindow.cpp:746
 msgid "+"
 msgstr "+"
@@ -3363,7 +3364,7 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:190
-#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:125
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:124
 msgid "-"
 msgstr "-"
 
@@ -3530,13 +3531,15 @@ 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."
 
@@ -3547,19 +3550,22 @@ 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."
 
@@ -3993,15 +3999,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:116
+#: src/gui/widgets/tabs/setup_colors.cpp:86
+#: src/gui/windows/emotewindow.cpp:116
 msgid "Colors"
 msgstr "Värit"
 
@@ -4025,11 +4031,9 @@ 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
@@ -4056,11 +4060,9 @@ 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
@@ -4071,9 +4073,7 @@ 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 ""
@@ -4114,8 +4114,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
@@ -4126,11 +4126,9 @@ 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
@@ -4141,11 +4139,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be "
-"shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies "
-"are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4161,13 +4157,9 @@ 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
@@ -4180,8 +4172,7 @@ 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
@@ -4200,12 +4191,9 @@ 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
@@ -4216,8 +4204,7 @@ 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 ""
@@ -4230,11 +4217,9 @@ 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
@@ -4259,11 +4244,9 @@ 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
@@ -4274,8 +4257,7 @@ 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 ""
@@ -4288,9 +4270,7 @@ 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,9 +4283,7 @@ 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 ""
@@ -4331,10 +4309,7 @@ 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 ""
@@ -4369,8 +4344,7 @@ 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 ""
@@ -4383,8 +4357,7 @@ 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 ""
@@ -4397,12 +4370,9 @@ 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
@@ -4516,9 +4486,7 @@ 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
@@ -4689,8 +4657,8 @@ msgstr "Vaihda hirviökohteita syklissä"
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
 #: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:114
-#: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:60
-#: src/gui/windows/minimap.cpp:123
+#: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:59
+#: src/gui/windows/minimap.cpp:122
 msgid "Map"
 msgstr "Kartta"
 
@@ -4881,7 +4849,7 @@ msgstr "Ota kauppatila käyttöön"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:292 src/gui/windows/npcdialog.cpp:99
+#: src/gui/widgets/tabs/setup_other.cpp:292 src/gui/windows/npcdialog.cpp:98
 msgid "NPC"
 msgstr "Ei-pelaajahahmo (NPC)"
 
@@ -5613,8 +5581,7 @@ msgstr "Ikkunan koko vaihdettu"
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:397
 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
@@ -6149,7 +6116,8 @@ 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"
 
@@ -6268,7 +6236,8 @@ msgstr ""
 #: src/gui/windows/charcreatedialog.cpp:193
 #: src/gui/windows/charcreatedialog.cpp:206
 #: src/gui/windows/charcreatedialog.cpp:217
-#: src/gui/windows/charcreatedialog.cpp:227 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:227
+#: src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -6286,7 +6255,8 @@ msgstr "Jaa %d pistettä"
 #: src/gui/windows/charcreatedialog.cpp:197
 #: src/gui/windows/charcreatedialog.cpp:208
 #: src/gui/windows/charcreatedialog.cpp:219
-#: src/gui/windows/charcreatedialog.cpp:229 src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:229
+#: src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -6312,7 +6282,8 @@ msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:248 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:248
+#: src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr ""
 
@@ -6514,7 +6485,8 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:111
+#: src/gui/windows/editserverdialog.cpp:57
+#: src/gui/windows/serverdialog.cpp:111
 msgid "Connect"
 msgstr "Yhdistä"
 
@@ -6866,26 +6838,28 @@ msgstr "Vastaanottaja:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:73
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:72
 msgid "Subject:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:104
+#: src/gui/windows/maileditwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:103
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:123
-#: src/gui/windows/mailviewwindow.cpp:132
+#: src/gui/windows/maileditwindow.cpp:63
+#: src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:131
 msgid "Item:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:76
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:75
 msgid "Message:"
 msgstr ""
 
@@ -6895,27 +6869,27 @@ msgid "empty subject"
 msgstr ""
 
 #. TRANSLATORS: mail view window name
-#: src/gui/windows/mailviewwindow.cpp:54
+#: src/gui/windows/mailviewwindow.cpp:53
 msgid "View mail"
 msgstr ""
 
 #. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:64
+#: src/gui/windows/mailviewwindow.cpp:63
 msgid "Reply"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:65
 msgid "Time:"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:70
+#: src/gui/windows/mailviewwindow.cpp:69
 msgid "From:"
 msgstr ""
 
 #. TRANSLATORS: mail view attach button
-#: src/gui/windows/mailviewwindow.cpp:141
+#: src/gui/windows/mailviewwindow.cpp:140
 msgid "Get attach"
 msgstr ""
 
@@ -7005,22 +6979,22 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:84
+#: src/gui/windows/npcdialog.cpp:83
 msgid "Stop waiting"
 msgstr "Lakkaa odottamasta"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:86
+#: src/gui/windows/npcdialog.cpp:85
 msgid "Next"
 msgstr "Seuraava"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:90
+#: src/gui/windows/npcdialog.cpp:89
 msgid "Submit"
 msgstr "Lähetä"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:134
+#: src/gui/windows/npcdialog.cpp:133
 msgid "Reset"
 msgstr "Nollaa"
 
@@ -7583,7 +7557,8 @@ 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
@@ -9009,8 +8984,7 @@ 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
@@ -9023,9 +8997,7 @@ 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.\n"
-"Ole hyvä ja ota yhteyttä GM-tiimiin keskustelufoorumin kautta."
+msgstr "Pääsysi peliin on väliaikaisesti estetty %s asti.\nOle hyvä ja ota yhteyttä GM-tiimiin keskustelufoorumin kautta."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:151 src/net/eathena/loginrecv.cpp:92
@@ -9065,33 +9037,33 @@ msgstr "Yhteys palvelimeen katkaistu. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:387
-#: src/net/eathena/charserverrecv.cpp:435
+#: src/net/eathena/charserverrecv.cpp:380
+#: src/net/eathena/charserverrecv.cpp:428
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:410
+#: src/net/eathena/charserverrecv.cpp:403
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:419
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:423
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:439
+#: src/net/eathena/charserverrecv.cpp:432
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:473 src/net/tmwa/charserverrecv.cpp:294
+#: src/net/eathena/charserverrecv.cpp:466 src/net/tmwa/charserverrecv.cpp:284
 msgid "Failed to delete character."
 msgstr "Hahmon poisto epäonnistui."
 
@@ -9423,7 +9395,7 @@ msgid "Map not found"
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/net/eathena/inventoryrecv.cpp:844
+#: src/net/eathena/inventoryrecv.cpp:823
 #, c-format
 msgid "Left %s rental time for item %s."
 msgstr ""
@@ -9431,8 +9403,8 @@ msgstr ""
 #. TRANSLATORS: unknown item
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
-#: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:265
+#: src/net/eathena/inventoryrecv.cpp:1176
+#: src/net/eathena/inventoryrecv.cpp:1309 src/resources/db/itemdb.cpp:265
 msgid "Unknown item"
 msgstr "Tuntematon tavara"
 
@@ -10225,8 +10197,7 @@ 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
@@ -10883,9 +10854,7 @@ msgstr ""
 #: src/utils/booleanoptions.h:27
 #, 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
diff --git a/po/fr.po b/po/fr.po
index 01102d474..56991b566 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-2015
@@ -27,19 +27,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-05-29 14:56+0300\n"
+"POT-Creation-Date: 2016-05-20 19:25+0300\n"
 "PO-Revision-Date: 2016-05-21 09:33+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: French (http://www.transifex.com/akaras/manaplus/language/"
-"fr/)\n"
-"Language: fr\n"
+"Language-Team: French (http://www.transifex.com/akaras/manaplus/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
-#: src/actions/actions.cpp:167
+#: src/actions/actions.cpp:166
 msgid "File uploaded"
 msgstr "Fichier mis en ligne"
 
@@ -52,7 +51,7 @@ msgstr "Fichier mis en ligne"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:170 src/client.cpp:1553 src/client.cpp:1588
+#: src/actions/actions.cpp:169 src/client.cpp:1549 src/client.cpp:1584
 #: 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,67 +71,67 @@ 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:412
-#: src/net/eathena/charserverrecv.cpp:447
-#: src/net/eathena/charserverrecv.cpp:475 src/net/tmwa/charserverrecv.cpp:296
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:405
+#: src/net/eathena/charserverrecv.cpp:440
+#: src/net/eathena/charserverrecv.cpp:468 src/net/tmwa/charserverrecv.cpp:286
 msgid "OK"
 msgstr "Ok"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1044 src/actions/actions.cpp:1057
+#: src/actions/actions.cpp:1043 src/actions/actions.cpp:1056
 msgid "Cache cleaned"
 msgstr "Cache nettoyé"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1214 src/actions/actions.cpp:1220
+#: src/actions/actions.cpp:1213 src/actions/actions.cpp:1219
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Heure de lancement du client : %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1286
+#: src/actions/actions.cpp:1276 src/actions/actions.cpp:1285
 msgid "Resource images:"
 msgstr "Images des ressources :"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1280 src/actions/actions.cpp:1290
+#: src/actions/actions.cpp:1279 src/actions/actions.cpp:1289
 msgid "Resource orphaned images:"
 msgstr "Images des ressources non affectées :"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1385
+#: src/actions/actions.cpp:1384
 msgid "Environment variables dumped"
 msgstr "Variables d'environnement effacées"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1502
+#: src/actions/actions.cpp:1501
 msgid "Uploaded config into:"
 msgstr "Config ajouté dans :"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1512
+#: src/actions/actions.cpp:1511
 msgid "Uploaded server config into:"
 msgstr "Config serveur ajouté dans :"
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1522
+#: src/actions/actions.cpp:1521
 msgid "Uploaded log into:"
 msgstr "Historique ajouté dans :"
 
 #. TRANSLATORS: last seen disabled warning
-#: src/actions/actions.cpp:1747
+#: src/actions/actions.cpp:1746
 msgid ""
 "Last seen disabled. Enable in players / collect players id and seen log."
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/actions/actions.cpp:1766 src/actions/actions.cpp:1780
+#: src/actions/actions.cpp:1765 src/actions/actions.cpp:1779
 msgid "You not saw this nick."
 msgstr "Vous n'avez pas vu ce pseudo."
 
 #. TRANSLATORS: last seen message
-#: src/actions/actions.cpp:1772
+#: src/actions/actions.cpp:1771
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr ""
@@ -146,9 +145,7 @@ msgstr "Vous ne pouvez pas envoyer de messages privés vides !"
 #: src/actions/chat.cpp:309
 #, 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
@@ -183,8 +180,7 @@ msgstr "Le message ferme la conversation."
 #. TRANSLATORS: message from toggle chat command
 #: src/actions/chat.cpp:451
 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:461
@@ -494,41 +490,41 @@ msgstr "Bulle flottante"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:856 src/dyetool/client.cpp:485 src/gui/windowmenu.cpp:189
+#: src/client.cpp:852 src/dyetool/client.cpp:482 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:65
 msgid "Setup"
 msgstr "Configuration"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:859 src/dyetool/client.cpp:488
+#: src/client.cpp:855 src/dyetool/client.cpp:485
 #: 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:862 src/dyetool/client.cpp:491
+#: src/client.cpp:858 src/dyetool/client.cpp:488
 #: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Vidéo"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:865 src/dyetool/client.cpp:494
+#: src/client.cpp:861 src/dyetool/client.cpp:491
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Thème"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:868 src/dyetool/client.cpp:497
+#: src/client.cpp:864 src/dyetool/client.cpp:494
 msgid "About"
 msgstr "À propos"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:871 src/dyetool/client.cpp:500 src/gui/windowmenu.cpp:74
+#: src/client.cpp:867 src/dyetool/client.cpp:497 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Aide"
@@ -549,45 +545,45 @@ msgstr "Aide"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:875 src/client.cpp:1467 src/client.cpp:1486
-#: src/dyetool/client.cpp:504 src/gui/dialogsmanager.cpp:116
+#: src/client.cpp:871 src/client.cpp:1463 src/client.cpp:1482
+#: src/dyetool/client.cpp:501 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:749 src/gui/popups/popupmenu.cpp:826
 #: src/gui/popups/popupmenu.cpp:1080 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:273
 #: src/gui/windows/inventorywindow.cpp:297
-#: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:60
-#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:130
+#: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
+#: src/gui/windows/npcdialog.cpp:87 src/gui/windows/npcdialog.cpp:129
 #: src/gui/windows/questswindow.cpp:77 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Fermer"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1100 src/gui/windowmanager_unittest.cc:158
+#: src/client.cpp:1096 src/gui/windowmanager_unittest.cc:157
 msgid "Connecting to server"
 msgstr "Connexion au serveur"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1157 src/gui/windowmanager_unittest.cc:175
+#: src/client.cpp:1153 src/gui/windowmanager_unittest.cc:174
 msgid "Logging in"
 msgstr "Connexion"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1206
+#: src/client.cpp:1202
 msgid "Entering game world"
 msgstr "Entrée dans le monde de jeu"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1353
+#: src/client.cpp:1349
 msgid "Requesting characters"
 msgstr "Téléchargement des personnages"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1396
+#: src/client.cpp:1392
 msgid "Connecting to the game server"
 msgstr "Connexion au serveur de jeu"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1408
+#: src/client.cpp:1404
 msgid "Changing game servers"
 msgstr "Changement de serveur de jeu"
 
@@ -604,7 +600,7 @@ msgstr "Changement de serveur de jeu"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1464 src/client.cpp:1483 src/client.cpp:1722
+#: src/client.cpp:1460 src/client.cpp:1479 src/client.cpp:1718
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:468
@@ -612,44 +608,44 @@ msgstr "Changement de serveur de jeu"
 #: 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:385
-#: src/net/eathena/charserverrecv.cpp:389
-#: src/net/eathena/charserverrecv.cpp:471 src/net/tmwa/charserverrecv.cpp:292
+#: src/net/eathena/charserverrecv.cpp:378
+#: src/net/eathena/charserverrecv.cpp:382
+#: src/net/eathena/charserverrecv.cpp:464 src/net/tmwa/charserverrecv.cpp:282
 msgid "Error"
 msgstr "Erreur"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1502
+#: src/client.cpp:1498
 msgid "Requesting registration details"
 msgstr "Demande des paramètres d'inscription"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1549
+#: src/client.cpp:1545
 msgid "Password Change"
 msgstr "Changement de mot de passe"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1551
+#: src/client.cpp:1547
 msgid "Password changed successfully!"
 msgstr "Le mot de passe a été changé avec succès !"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1584
+#: src/client.cpp:1580
 msgid "Email Change"
 msgstr "Changer d'e-mail"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1586
+#: src/client.cpp:1582
 msgid "Email changed successfully!"
 msgstr "L'adresse e-mail a été changée avec succès !"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1622
+#: src/client.cpp:1618
 msgid "Unregister Successful"
 msgstr "Désinscription réussie"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1624
+#: src/client.cpp:1620
 msgid "Farewell, come back any time..."
 msgstr "À bientôt, Revenez quand vous voulez..."
 
@@ -686,8 +682,7 @@ 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
@@ -742,15 +737,12 @@ 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
@@ -760,8 +752,7 @@ 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
@@ -781,9 +772,7 @@ 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
@@ -811,8 +800,7 @@ msgstr "Impossible de créer le dossier de mises à jour !"
 #: src/dirs.cpp:534 src/dirs.cpp:555
 #, 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:586 src/dirs.cpp:594 src/dirs.cpp:602
@@ -821,53 +809,52 @@ msgid "%s doesn't exist and can't be created!"
 msgstr "%s n'existe pas et ne peut être crée!"
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:51
+#: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr "dyecmd srcfile dyestring dstfile"
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:53
+#: src/dyetool/dyemain.cpp:50
 msgid "or"
 msgstr "ou"
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:55
+#: src/dyetool/dyemain.cpp:52
 msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd srcdyestring dstfile"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: chat tab name
-#: src/game.cpp:267 src/gui/windows/chatwindow.cpp:2222
+#: src/game.cpp:266 src/gui/windows/chatwindow.cpp:2222
 msgid "General"
 msgstr "Général"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:274 src/gui/windowmenu.cpp:175
+#: src/game.cpp:273 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Débogage"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:582
+#: src/game.cpp:581
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Capture d'écran sauvegardée sous %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:592
+#: src/game.cpp:591
 msgid "Saving screenshot failed!"
 msgstr "La  capture d'écran a échoué !"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:679
+#: src/game.cpp:678
 msgid "The connection to the server was lost."
-msgstr ""
-"La connexion au serveur a été coupée, le programme va maintenant se fermer."
+msgstr "La connexion au serveur a été coupée, le programme va maintenant se fermer."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:682
+#: src/game.cpp:681
 msgid "Network Error"
 msgstr "Erreur Réseau"
 
@@ -1282,17 +1269,14 @@ 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
@@ -1303,7 +1287,8 @@ 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:602
+#: src/gui/windows/equipmentwindow.cpp:671
+#: src/gui/windows/serverdialog.cpp:602
 msgid "default"
 msgstr "défaut"
 
@@ -1821,19 +1806,19 @@ msgid "Cancel"
 msgstr "Annuler"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:223
+#: src/gui/popups/itempopup.cpp:222
 #, c-format
 msgid "Weight: %s"
 msgstr "Poids : %s"
 
 #. TRANSLATORS: named item description
-#: src/gui/popups/itempopup.cpp:290
+#: src/gui/popups/itempopup.cpp:289
 #, c-format
 msgid "Item named: %s"
 msgstr "Nom d'objet: %s"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:317
+#: src/gui/popups/itempopup.cpp:316
 msgid "Cards: "
 msgstr "Cartes: "
 
@@ -2174,7 +2159,7 @@ msgstr "Éditer le sortilège"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:831 src/gui/windows/npcdialog.cpp:127
+#: src/gui/popups/popupmenu.cpp:831 src/gui/windows/npcdialog.cpp:126
 msgid "Clear"
 msgstr "Effacer"
 
@@ -2516,8 +2501,9 @@ msgstr "Afficher la fenêtre"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/popups/popupmenu.cpp:2379 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:68 src/gui/windows/statuswindow.cpp:243
+#: src/gui/windows/statuswindow.cpp:367
 #, c-format
 msgid "Level: %d"
 msgstr "Niveau : %d"
@@ -2936,8 +2922,8 @@ msgstr "Faire apparaître un esclave"
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3093 src/gui/popups/popupmenu.cpp:3112
 #: src/gui/popups/popupmenu.cpp:3125 src/gui/windows/charselectdialog.cpp:76
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:408
-#: src/net/eathena/charserverrecv.cpp:444
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:401
+#: src/net/eathena/charserverrecv.cpp:437
 msgid "Info"
 msgstr "Informations"
 
@@ -3356,7 +3342,7 @@ msgstr "Ouvrir l'adresse"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:132
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:131
 #: src/gui/windows/serverdialog.cpp:113 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:85
 msgid "Add"
@@ -3384,7 +3370,7 @@ msgstr "Quitter"
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:192
-#: src/gui/windows/itemamountwindow.cpp:228 src/gui/windows/npcdialog.cpp:123
+#: src/gui/windows/itemamountwindow.cpp:228 src/gui/windows/npcdialog.cpp:122
 #: src/gui/windows/statuswindow.cpp:746
 msgid "+"
 msgstr "+"
@@ -3396,7 +3382,7 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:190
-#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:125
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:124
 msgid "-"
 msgstr "-"
 
@@ -3563,13 +3549,15 @@ 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."
 
@@ -3580,19 +3568,22 @@ 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."
 
@@ -4014,10 +4005,7 @@ 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"
-"\n"
-"Presser 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\nPresser Entrée ou passer la souris sur le chat pour l'afficher."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:58
@@ -4029,15 +4017,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:116
+#: src/gui/widgets/tabs/setup_colors.cpp:86
+#: src/gui/windows/emotewindow.cpp:116
 msgid "Colors"
 msgstr "Couleurs"
 
@@ -4061,27 +4049,21 @@ 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
@@ -4096,11 +4078,9 @@ 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
@@ -4111,9 +4091,7 @@ 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 ""
@@ -4154,8 +4132,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
@@ -4166,11 +4144,9 @@ 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
@@ -4181,11 +4157,9 @@ 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
@@ -4201,13 +4175,9 @@ 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
@@ -4220,8 +4190,7 @@ 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
@@ -4240,19 +4209,10 @@ 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 murmures (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: mettre tous les murmure dans un seul onglet est connu pour être "
-"troublant. Pensez-y à deux fois avant de désactiver cette option."
+"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 murmures (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: mettre tous les murmure 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
@@ -4262,15 +4222,10 @@ 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"
-"\n"
-"Note : 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\nNote : 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
@@ -4280,18 +4235,10 @@ 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 : selon 4144, désactiver ceci ferait disparaître certains messages du "
-"serveur, puisque ceux-ci sont de faux 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 "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."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:215
@@ -4315,11 +4262,9 @@ 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
@@ -4330,8 +4275,7 @@ 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 ""
@@ -4344,9 +4288,7 @@ 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 ""
@@ -4359,9 +4301,7 @@ 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 ""
@@ -4387,10 +4327,7 @@ 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 ""
@@ -4425,8 +4362,7 @@ 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 ""
@@ -4439,8 +4375,7 @@ 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 ""
@@ -4453,12 +4388,9 @@ 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
@@ -4572,9 +4504,7 @@ 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
@@ -4745,8 +4675,8 @@ msgstr "Sélectionner les monstres par ordre de distance"
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
 #: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:114
-#: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:60
-#: src/gui/windows/minimap.cpp:123
+#: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:59
+#: src/gui/windows/minimap.cpp:122
 msgid "Map"
 msgstr "Carte"
 
@@ -4937,7 +4867,7 @@ msgstr "Activer le mode boutique"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:292 src/gui/windows/npcdialog.cpp:99
+#: src/gui/widgets/tabs/setup_other.cpp:292 src/gui/windows/npcdialog.cpp:98
 msgid "NPC"
 msgstr "PNJ"
 
@@ -4959,8 +4889,7 @@ 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
@@ -5123,8 +5052,7 @@ 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
@@ -5154,8 +5082,7 @@ 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
@@ -5185,8 +5112,7 @@ 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
@@ -5211,9 +5137,7 @@ 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
@@ -5223,9 +5147,7 @@ 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
@@ -5335,8 +5257,7 @@ 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
@@ -5352,9 +5273,7 @@ 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
@@ -5633,17 +5552,13 @@ msgstr "Aucun"
 #: src/gui/widgets/tabs/setup_video.cpp:229
 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:236
 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:249
@@ -5653,8 +5568,7 @@ msgstr "Passage en plein écran"
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:251
 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:277
@@ -5664,8 +5578,7 @@ msgstr "Activation d'OpenGL"
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:279
 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:364
@@ -5686,9 +5599,7 @@ msgstr "Résolution de l'écran modifiée"
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:397
 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
@@ -6223,7 +6134,8 @@ 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"
 
@@ -6342,7 +6254,8 @@ msgstr "^"
 #: src/gui/windows/charcreatedialog.cpp:193
 #: src/gui/windows/charcreatedialog.cpp:206
 #: src/gui/windows/charcreatedialog.cpp:217
-#: src/gui/windows/charcreatedialog.cpp:227 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:227
+#: src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -6360,7 +6273,8 @@ msgstr "Distribues %d points"
 #: src/gui/windows/charcreatedialog.cpp:197
 #: src/gui/windows/charcreatedialog.cpp:208
 #: src/gui/windows/charcreatedialog.cpp:219
-#: src/gui/windows/charcreatedialog.cpp:229 src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:229
+#: src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -6386,7 +6300,8 @@ 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:248 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:248
+#: src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr "F"
 
@@ -6485,12 +6400,7 @@ msgid ""
 "Level: %u\n"
 "Experience: %u\n"
 "Money: %s"
-msgstr ""
-"PV : %u/%u\n"
-"PM : %u/%u\n"
-"Niveau : %u\n"
-"Expérience : %u\n"
-"Argent : %s"
+msgstr "PV : %u/%u\nPM : %u/%u\nNiveau : %u\nExpérience : %u\nArgent : %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/charselectdialog.cpp:308
@@ -6593,7 +6503,8 @@ msgstr "Éditer le Serveur"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:111
+#: src/gui/windows/editserverdialog.cpp:57
+#: src/gui/windows/serverdialog.cpp:111
 msgid "Connect"
 msgstr "Connexion..."
 
@@ -6945,26 +6856,28 @@ msgstr "Vers :"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:73
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:72
 msgid "Subject:"
 msgstr "Sujet:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:104
+#: src/gui/windows/maileditwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:103
 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:123
-#: src/gui/windows/mailviewwindow.cpp:132
+#: src/gui/windows/maileditwindow.cpp:63
+#: src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:131
 msgid "Item:"
 msgstr "Objet:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:76
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:75
 msgid "Message:"
 msgstr "Message:"
 
@@ -6974,27 +6887,27 @@ msgid "empty subject"
 msgstr "sujet vide"
 
 #. TRANSLATORS: mail view window name
-#: src/gui/windows/mailviewwindow.cpp:54
+#: src/gui/windows/mailviewwindow.cpp:53
 msgid "View mail"
 msgstr "Lire le mail"
 
 #. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:64
+#: src/gui/windows/mailviewwindow.cpp:63
 msgid "Reply"
 msgstr "Réponse"
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:65
 msgid "Time:"
 msgstr "Heure:"
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:70
+#: src/gui/windows/mailviewwindow.cpp:69
 msgid "From:"
 msgstr "De:"
 
 #. TRANSLATORS: mail view attach button
-#: src/gui/windows/mailviewwindow.cpp:141
+#: src/gui/windows/mailviewwindow.cpp:140
 msgid "Get attach"
 msgstr "Ajouter une pièce jointe"
 
@@ -7084,22 +6997,22 @@ msgid "Job level: %d"
 msgstr "Niveau de métier : %d"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:84
+#: src/gui/windows/npcdialog.cpp:83
 msgid "Stop waiting"
 msgstr "Arrêter d'attendre"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:86
+#: src/gui/windows/npcdialog.cpp:85
 msgid "Next"
 msgstr "Suivant"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:90
+#: src/gui/windows/npcdialog.cpp:89
 msgid "Submit"
 msgstr "Soumettre"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:134
+#: src/gui/windows/npcdialog.cpp:133
 msgid "Reset"
 msgstr "Réinitialiser"
 
@@ -7456,9 +7369,7 @@ 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
@@ -7474,9 +7385,7 @@ 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
@@ -7666,10 +7575,9 @@ 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
@@ -8951,9 +8859,7 @@ 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
@@ -9006,9 +8912,7 @@ 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
@@ -9098,9 +9002,7 @@ 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
@@ -9113,9 +9015,7 @@ 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.\n"
-"Merci de contacter l'équipe des MJs sur le forum."
+msgstr "Tu as temporairement été banni du jeu jusqu'au %s.\nMerci de contacter l'équipe des MJs sur le forum."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:151 src/net/eathena/loginrecv.cpp:92
@@ -9155,33 +9055,33 @@ msgstr "Connexion au serveur terminée. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:387
-#: src/net/eathena/charserverrecv.cpp:435
+#: src/net/eathena/charserverrecv.cpp:380
+#: src/net/eathena/charserverrecv.cpp:428
 msgid "Character rename error."
 msgstr "Erreur du renommage du personnage."
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:410
+#: src/net/eathena/charserverrecv.cpp:403
 msgid "Character renamed."
 msgstr "Personnage renommé."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:419
 msgid "Rename not allowed."
 msgstr "Renommage non permis."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:423
 msgid "New name is not set."
 msgstr "Le nouveau nom n'est pas appliqué."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:439
+#: src/net/eathena/charserverrecv.cpp:432
 msgid "Character not found."
 msgstr "Personnage non trouvé."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:473 src/net/tmwa/charserverrecv.cpp:294
+#: src/net/eathena/charserverrecv.cpp:466 src/net/tmwa/charserverrecv.cpp:284
 msgid "Failed to delete character."
 msgstr "La suppression du personnage n'a pu s'effectuer."
 
@@ -9513,7 +9413,7 @@ msgid "Map not found"
 msgstr "Carte non trouvée"
 
 #. TRANSLATORS: notification message
-#: src/net/eathena/inventoryrecv.cpp:844
+#: src/net/eathena/inventoryrecv.cpp:823
 #, c-format
 msgid "Left %s rental time for item %s."
 msgstr ""
@@ -9521,8 +9421,8 @@ msgstr ""
 #. TRANSLATORS: unknown item
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
-#: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:265
+#: src/net/eathena/inventoryrecv.cpp:1176
+#: src/net/eathena/inventoryrecv.cpp:1309 src/resources/db/itemdb.cpp:265
 msgid "Unknown item"
 msgstr "Objet inconnu"
 
@@ -10320,8 +10220,7 @@ 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
@@ -10488,18 +10387,14 @@ 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
@@ -10514,9 +10409,7 @@ 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
@@ -10543,9 +10436,7 @@ 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
@@ -10868,9 +10759,7 @@ 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
@@ -10890,9 +10779,7 @@ 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
@@ -10985,8 +10872,7 @@ msgstr ""
 #: src/utils/booleanoptions.h:27
 #, 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
diff --git a/po/id.po b/po/id.po
index 9d9660202..38f2b4fa9 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,19 +13,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-05-29 14:56+0300\n"
+"POT-Creation-Date: 2016-05-20 19:25+0300\n"
 "PO-Revision-Date: 2016-05-21 09:33+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Indonesian (http://www.transifex.com/akaras/manaplus/language/"
-"id/)\n"
-"Language: id\n"
+"Language-Team: Indonesian (http://www.transifex.com/akaras/manaplus/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
-#: src/actions/actions.cpp:167
+#: src/actions/actions.cpp:166
 msgid "File uploaded"
 msgstr "Data telah terunggah"
 
@@ -38,7 +37,7 @@ msgstr "Data telah terunggah"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:170 src/client.cpp:1553 src/client.cpp:1588
+#: src/actions/actions.cpp:169 src/client.cpp:1549 src/client.cpp:1584
 #: 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
@@ -58,67 +57,67 @@ 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:412
-#: src/net/eathena/charserverrecv.cpp:447
-#: src/net/eathena/charserverrecv.cpp:475 src/net/tmwa/charserverrecv.cpp:296
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:405
+#: src/net/eathena/charserverrecv.cpp:440
+#: src/net/eathena/charserverrecv.cpp:468 src/net/tmwa/charserverrecv.cpp:286
 msgid "OK"
 msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1044 src/actions/actions.cpp:1057
+#: src/actions/actions.cpp:1043 src/actions/actions.cpp:1056
 msgid "Cache cleaned"
 msgstr "Cache dibersihkan"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1214 src/actions/actions.cpp:1220
+#: src/actions/actions.cpp:1213 src/actions/actions.cpp:1219
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Klien hidup: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1286
+#: src/actions/actions.cpp:1276 src/actions/actions.cpp:1285
 msgid "Resource images:"
 msgstr "Sumber gambar:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1280 src/actions/actions.cpp:1290
+#: src/actions/actions.cpp:1279 src/actions/actions.cpp:1289
 msgid "Resource orphaned images:"
 msgstr "Sumber gambar tak diketahui:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1385
+#: src/actions/actions.cpp:1384
 msgid "Environment variables dumped"
 msgstr "Variabel sekitar dibuang"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1502
+#: src/actions/actions.cpp:1501
 msgid "Uploaded config into:"
 msgstr "Mengunggah setelan ke:"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1512
+#: src/actions/actions.cpp:1511
 msgid "Uploaded server config into:"
 msgstr "Mengunggah setelan server ke:"
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1522
+#: src/actions/actions.cpp:1521
 msgid "Uploaded log into:"
 msgstr "Mengunggah catatan ke:"
 
 #. TRANSLATORS: last seen disabled warning
-#: src/actions/actions.cpp:1747
+#: src/actions/actions.cpp:1746
 msgid ""
 "Last seen disabled. Enable in players / collect players id and seen log."
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/actions/actions.cpp:1766 src/actions/actions.cpp:1780
+#: src/actions/actions.cpp:1765 src/actions/actions.cpp:1779
 msgid "You not saw this nick."
 msgstr ""
 
 #. TRANSLATORS: last seen message
-#: src/actions/actions.cpp:1772
+#: src/actions/actions.cpp:1771
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr ""
@@ -132,8 +131,7 @@ msgstr "Tidak bisa mengirim pesan kosong!"
 #: src/actions/chat.cpp:309
 #, 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
@@ -477,41 +475,41 @@ msgstr "Gelembung mengambang"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:856 src/dyetool/client.cpp:485 src/gui/windowmenu.cpp:189
+#: src/client.cpp:852 src/dyetool/client.cpp:482 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:65
 msgid "Setup"
 msgstr "Pengaturan"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:859 src/dyetool/client.cpp:488
+#: src/client.cpp:855 src/dyetool/client.cpp:485
 #: 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:862 src/dyetool/client.cpp:491
+#: src/client.cpp:858 src/dyetool/client.cpp:488
 #: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Vidio"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:865 src/dyetool/client.cpp:494
+#: src/client.cpp:861 src/dyetool/client.cpp:491
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:868 src/dyetool/client.cpp:497
+#: src/client.cpp:864 src/dyetool/client.cpp:494
 msgid "About"
 msgstr "Tentang"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:871 src/dyetool/client.cpp:500 src/gui/windowmenu.cpp:74
+#: src/client.cpp:867 src/dyetool/client.cpp:497 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Bantuan"
@@ -532,45 +530,45 @@ msgstr "Bantuan"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:875 src/client.cpp:1467 src/client.cpp:1486
-#: src/dyetool/client.cpp:504 src/gui/dialogsmanager.cpp:116
+#: src/client.cpp:871 src/client.cpp:1463 src/client.cpp:1482
+#: src/dyetool/client.cpp:501 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:749 src/gui/popups/popupmenu.cpp:826
 #: src/gui/popups/popupmenu.cpp:1080 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:273
 #: src/gui/windows/inventorywindow.cpp:297
-#: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:60
-#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:130
+#: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
+#: src/gui/windows/npcdialog.cpp:87 src/gui/windows/npcdialog.cpp:129
 #: src/gui/windows/questswindow.cpp:77 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Tutup"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1100 src/gui/windowmanager_unittest.cc:158
+#: src/client.cpp:1096 src/gui/windowmanager_unittest.cc:157
 msgid "Connecting to server"
 msgstr "Terhubung ke server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1157 src/gui/windowmanager_unittest.cc:175
+#: src/client.cpp:1153 src/gui/windowmanager_unittest.cc:174
 msgid "Logging in"
 msgstr "Masuk"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1206
+#: src/client.cpp:1202
 msgid "Entering game world"
 msgstr "Memasuki arena permainan"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1353
+#: src/client.cpp:1349
 msgid "Requesting characters"
 msgstr "Mengambil karakter"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1396
+#: src/client.cpp:1392
 msgid "Connecting to the game server"
 msgstr "Terhubung ke server permainan"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1408
+#: src/client.cpp:1404
 msgid "Changing game servers"
 msgstr "Mengganti server"
 
@@ -587,7 +585,7 @@ msgstr "Mengganti server"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1464 src/client.cpp:1483 src/client.cpp:1722
+#: src/client.cpp:1460 src/client.cpp:1479 src/client.cpp:1718
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:468
@@ -595,44 +593,44 @@ msgstr "Mengganti server"
 #: 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:385
-#: src/net/eathena/charserverrecv.cpp:389
-#: src/net/eathena/charserverrecv.cpp:471 src/net/tmwa/charserverrecv.cpp:292
+#: src/net/eathena/charserverrecv.cpp:378
+#: src/net/eathena/charserverrecv.cpp:382
+#: src/net/eathena/charserverrecv.cpp:464 src/net/tmwa/charserverrecv.cpp:282
 msgid "Error"
 msgstr "Kesalahan"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1502
+#: src/client.cpp:1498
 msgid "Requesting registration details"
 msgstr "Meminta detail registrasi"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1549
+#: src/client.cpp:1545
 msgid "Password Change"
 msgstr "Perubahan Sandi"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1551
+#: src/client.cpp:1547
 msgid "Password changed successfully!"
 msgstr "Perubahan sandi berhasil!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1584
+#: src/client.cpp:1580
 msgid "Email Change"
 msgstr "Perubahan email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1586
+#: src/client.cpp:1582
 msgid "Email changed successfully!"
 msgstr "Perubahan email berhasil!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1622
+#: src/client.cpp:1618
 msgid "Unregister Successful"
 msgstr "Telah tidak terdaftar"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1624
+#: src/client.cpp:1620
 msgid "Farewell, come back any time..."
 msgstr "Selamat tinggal, datang kembali setiap saat..."
 
@@ -796,52 +794,52 @@ msgid "%s doesn't exist and can't be created!"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:51
+#: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr "pewarnacmd sumberdata pewarnastring datadst"
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:53
+#: src/dyetool/dyemain.cpp:50
 msgid "or"
 msgstr "atau"
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:55
+#: src/dyetool/dyemain.cpp:52
 msgid "dyecmd srcdyestring dstfile"
 msgstr "pewarnacmd sumberpewarnastring datadst"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: chat tab name
-#: src/game.cpp:267 src/gui/windows/chatwindow.cpp:2222
+#: src/game.cpp:266 src/gui/windows/chatwindow.cpp:2222
 msgid "General"
 msgstr "Umum"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:274 src/gui/windowmenu.cpp:175
+#: src/game.cpp:273 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:582
+#: src/game.cpp:581
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Tangkapan layar disimpan sebagai %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:592
+#: src/game.cpp:591
 msgid "Saving screenshot failed!"
 msgstr "Gagal menyimpan tangkapan layar!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:679
+#: src/game.cpp:678
 msgid "The connection to the server was lost."
 msgstr "Koneksi ke server hilang."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:682
+#: src/game.cpp:681
 msgid "Network Error"
 msgstr "Kesalahan jaringan"
 
@@ -1256,9 +1254,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
@@ -1274,7 +1272,8 @@ 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:602
+#: src/gui/windows/equipmentwindow.cpp:671
+#: src/gui/windows/serverdialog.cpp:602
 msgid "default"
 msgstr "dasar"
 
@@ -1792,19 +1791,19 @@ msgid "Cancel"
 msgstr "Batal"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:223
+#: src/gui/popups/itempopup.cpp:222
 #, c-format
 msgid "Weight: %s"
 msgstr "Berat: %s"
 
 #. TRANSLATORS: named item description
-#: src/gui/popups/itempopup.cpp:290
+#: src/gui/popups/itempopup.cpp:289
 #, c-format
 msgid "Item named: %s"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:317
+#: src/gui/popups/itempopup.cpp:316
 msgid "Cards: "
 msgstr ""
 
@@ -2145,7 +2144,7 @@ msgstr "Edit mantra"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:831 src/gui/windows/npcdialog.cpp:127
+#: src/gui/popups/popupmenu.cpp:831 src/gui/windows/npcdialog.cpp:126
 msgid "Clear"
 msgstr "Hapus"
 
@@ -2487,8 +2486,9 @@ msgstr "Tampil jendela"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/popups/popupmenu.cpp:2379 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:68 src/gui/windows/statuswindow.cpp:243
+#: src/gui/windows/statuswindow.cpp:367
 #, c-format
 msgid "Level: %d"
 msgstr "Tingkatan: %d"
@@ -2907,8 +2907,8 @@ msgstr ""
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3093 src/gui/popups/popupmenu.cpp:3112
 #: src/gui/popups/popupmenu.cpp:3125 src/gui/windows/charselectdialog.cpp:76
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:408
-#: src/net/eathena/charserverrecv.cpp:444
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:401
+#: src/net/eathena/charserverrecv.cpp:437
 msgid "Info"
 msgstr ""
 
@@ -3327,7 +3327,7 @@ msgstr "Buka url"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:132
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:131
 #: src/gui/windows/serverdialog.cpp:113 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:85
 msgid "Add"
@@ -3355,7 +3355,7 @@ msgstr "Keluar"
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:192
-#: src/gui/windows/itemamountwindow.cpp:228 src/gui/windows/npcdialog.cpp:123
+#: src/gui/windows/itemamountwindow.cpp:228 src/gui/windows/npcdialog.cpp:122
 #: src/gui/windows/statuswindow.cpp:746
 msgid "+"
 msgstr "+"
@@ -3367,7 +3367,7 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:190
-#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:125
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:124
 msgid "-"
 msgstr "-"
 
@@ -3534,13 +3534,15 @@ msgstr "Berbagi item diaktifkan."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104
+#: src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr "Berbagi item dimatikan."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109
+#: src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr "Tidak bisa berbagi item."
 
@@ -3551,19 +3553,22 @@ 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."
 
@@ -3997,15 +4002,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:116
+#: src/gui/widgets/tabs/setup_colors.cpp:86
+#: src/gui/windows/emotewindow.cpp:116
 msgid "Colors"
 msgstr "Warna"
 
@@ -4029,11 +4034,9 @@ 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
@@ -4060,11 +4063,9 @@ 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
@@ -4075,9 +4076,7 @@ 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 ""
@@ -4118,8 +4117,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
@@ -4130,11 +4129,9 @@ 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
@@ -4145,11 +4142,9 @@ msgstr "Tampil pesan guild online"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be "
-"shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies "
-"are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4165,13 +4160,9 @@ 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
@@ -4184,8 +4175,7 @@ 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
@@ -4204,12 +4194,9 @@ 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
@@ -4220,8 +4207,7 @@ 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 ""
@@ -4234,11 +4220,9 @@ 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
@@ -4263,11 +4247,9 @@ 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
@@ -4278,8 +4260,7 @@ 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 ""
@@ -4292,9 +4273,7 @@ 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 ""
@@ -4307,9 +4286,7 @@ 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 ""
@@ -4335,10 +4312,7 @@ 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 ""
@@ -4373,8 +4347,7 @@ 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 ""
@@ -4387,8 +4360,7 @@ 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 ""
@@ -4401,12 +4373,9 @@ 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
@@ -4691,8 +4660,8 @@ msgstr "Tandai target monster"
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
 #: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:114
-#: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:60
-#: src/gui/windows/minimap.cpp:123
+#: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:59
+#: src/gui/windows/minimap.cpp:122
 msgid "Map"
 msgstr "Peta"
 
@@ -4883,7 +4852,7 @@ msgstr "Perbolehkan mode Jual"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:292 src/gui/windows/npcdialog.cpp:99
+#: src/gui/widgets/tabs/setup_other.cpp:292 src/gui/windows/npcdialog.cpp:98
 msgid "NPC"
 msgstr "NPC"
 
@@ -6150,7 +6119,8 @@ 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"
 
@@ -6269,7 +6239,8 @@ msgstr ""
 #: src/gui/windows/charcreatedialog.cpp:193
 #: src/gui/windows/charcreatedialog.cpp:206
 #: src/gui/windows/charcreatedialog.cpp:217
-#: src/gui/windows/charcreatedialog.cpp:227 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:227
+#: src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -6287,7 +6258,8 @@ msgstr "Tolong distribusikan %d point"
 #: src/gui/windows/charcreatedialog.cpp:197
 #: src/gui/windows/charcreatedialog.cpp:208
 #: src/gui/windows/charcreatedialog.cpp:219
-#: src/gui/windows/charcreatedialog.cpp:229 src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:229
+#: src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -6313,7 +6285,8 @@ msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:248 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:248
+#: src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr ""
 
@@ -6515,7 +6488,8 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:111
+#: src/gui/windows/editserverdialog.cpp:57
+#: src/gui/windows/serverdialog.cpp:111
 msgid "Connect"
 msgstr "Menyambung"
 
@@ -6865,26 +6839,28 @@ msgstr "Kepada:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:73
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:72
 msgid "Subject:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:104
+#: src/gui/windows/maileditwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:103
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:123
-#: src/gui/windows/mailviewwindow.cpp:132
+#: src/gui/windows/maileditwindow.cpp:63
+#: src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:131
 msgid "Item:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:76
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:75
 msgid "Message:"
 msgstr ""
 
@@ -6894,27 +6870,27 @@ msgid "empty subject"
 msgstr ""
 
 #. TRANSLATORS: mail view window name
-#: src/gui/windows/mailviewwindow.cpp:54
+#: src/gui/windows/mailviewwindow.cpp:53
 msgid "View mail"
 msgstr ""
 
 #. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:64
+#: src/gui/windows/mailviewwindow.cpp:63
 msgid "Reply"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:65
 msgid "Time:"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:70
+#: src/gui/windows/mailviewwindow.cpp:69
 msgid "From:"
 msgstr ""
 
 #. TRANSLATORS: mail view attach button
-#: src/gui/windows/mailviewwindow.cpp:141
+#: src/gui/windows/mailviewwindow.cpp:140
 msgid "Get attach"
 msgstr ""
 
@@ -7004,22 +6980,22 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:84
+#: src/gui/windows/npcdialog.cpp:83
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:86
+#: src/gui/windows/npcdialog.cpp:85
 msgid "Next"
 msgstr "Berikutnya"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:90
+#: src/gui/windows/npcdialog.cpp:89
 msgid "Submit"
 msgstr "Masukan"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:134
+#: src/gui/windows/npcdialog.cpp:133
 msgid "Reset"
 msgstr "Reset"
 
@@ -7582,7 +7558,8 @@ 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
@@ -9061,33 +9038,33 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:387
-#: src/net/eathena/charserverrecv.cpp:435
+#: src/net/eathena/charserverrecv.cpp:380
+#: src/net/eathena/charserverrecv.cpp:428
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:410
+#: src/net/eathena/charserverrecv.cpp:403
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:419
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:423
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:439
+#: src/net/eathena/charserverrecv.cpp:432
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:473 src/net/tmwa/charserverrecv.cpp:294
+#: src/net/eathena/charserverrecv.cpp:466 src/net/tmwa/charserverrecv.cpp:284
 msgid "Failed to delete character."
 msgstr ""
 
@@ -9419,7 +9396,7 @@ msgid "Map not found"
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/net/eathena/inventoryrecv.cpp:844
+#: src/net/eathena/inventoryrecv.cpp:823
 #, c-format
 msgid "Left %s rental time for item %s."
 msgstr ""
@@ -9427,8 +9404,8 @@ msgstr ""
 #. TRANSLATORS: unknown item
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
-#: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:265
+#: src/net/eathena/inventoryrecv.cpp:1176
+#: src/net/eathena/inventoryrecv.cpp:1309 src/resources/db/itemdb.cpp:265
 msgid "Unknown item"
 msgstr ""
 
@@ -10878,8 +10855,7 @@ msgstr ""
 #: src/utils/booleanoptions.h:27
 #, 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 b921d0471..4e66d178d 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,19 +19,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-05-29 14:56+0300\n"
+"POT-Creation-Date: 2016-05-20 19:25+0300\n"
 "PO-Revision-Date: 2016-05-21 09:33+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Italian (http://www.transifex.com/akaras/manaplus/language/"
-"it/)\n"
-"Language: it\n"
+"Language-Team: Italian (http://www.transifex.com/akaras/manaplus/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
-#: src/actions/actions.cpp:167
+#: src/actions/actions.cpp:166
 msgid "File uploaded"
 msgstr "File caricato"
 
@@ -44,7 +43,7 @@ msgstr "File caricato"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:170 src/client.cpp:1553 src/client.cpp:1588
+#: src/actions/actions.cpp:169 src/client.cpp:1549 src/client.cpp:1584
 #: 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
@@ -64,67 +63,67 @@ 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:412
-#: src/net/eathena/charserverrecv.cpp:447
-#: src/net/eathena/charserverrecv.cpp:475 src/net/tmwa/charserverrecv.cpp:296
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:405
+#: src/net/eathena/charserverrecv.cpp:440
+#: src/net/eathena/charserverrecv.cpp:468 src/net/tmwa/charserverrecv.cpp:286
 msgid "OK"
 msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1044 src/actions/actions.cpp:1057
+#: src/actions/actions.cpp:1043 src/actions/actions.cpp:1056
 msgid "Cache cleaned"
 msgstr "Cache puliti"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1214 src/actions/actions.cpp:1220
+#: src/actions/actions.cpp:1213 src/actions/actions.cpp:1219
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Tempo online: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1286
+#: src/actions/actions.cpp:1276 src/actions/actions.cpp:1285
 msgid "Resource images:"
 msgstr "Risorsa immagine:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1280 src/actions/actions.cpp:1290
+#: src/actions/actions.cpp:1279 src/actions/actions.cpp:1289
 msgid "Resource orphaned images:"
 msgstr "Risorsa immagine orfana:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1385
+#: src/actions/actions.cpp:1384
 msgid "Environment variables dumped"
 msgstr "Variabile d'ambiente dumping"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1502
+#: src/actions/actions.cpp:1501
 msgid "Uploaded config into:"
 msgstr "Carica configurazione in:"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1512
+#: src/actions/actions.cpp:1511
 msgid "Uploaded server config into:"
 msgstr "Carica configurazione server in:"
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1522
+#: src/actions/actions.cpp:1521
 msgid "Uploaded log into:"
 msgstr "Carica log in:"
 
 #. TRANSLATORS: last seen disabled warning
-#: src/actions/actions.cpp:1747
+#: src/actions/actions.cpp:1746
 msgid ""
 "Last seen disabled. Enable in players / collect players id and seen log."
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/actions/actions.cpp:1766 src/actions/actions.cpp:1780
+#: src/actions/actions.cpp:1765 src/actions/actions.cpp:1779
 msgid "You not saw this nick."
 msgstr ""
 
 #. TRANSLATORS: last seen message
-#: src/actions/actions.cpp:1772
+#: src/actions/actions.cpp:1771
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr ""
@@ -138,8 +137,7 @@ msgstr "Impossibile inviare un sussurro vuoto!"
 #: src/actions/chat.cpp:309
 #, 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
@@ -484,41 +482,41 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:856 src/dyetool/client.cpp:485 src/gui/windowmenu.cpp:189
+#: src/client.cpp:852 src/dyetool/client.cpp:482 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:65
 msgid "Setup"
 msgstr "Impostazioni"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:859 src/dyetool/client.cpp:488
+#: src/client.cpp:855 src/dyetool/client.cpp:485
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:862 src/dyetool/client.cpp:491
+#: src/client.cpp:858 src/dyetool/client.cpp:488
 #: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:865 src/dyetool/client.cpp:494
+#: src/client.cpp:861 src/dyetool/client.cpp:491
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:868 src/dyetool/client.cpp:497
+#: src/client.cpp:864 src/dyetool/client.cpp:494
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:871 src/dyetool/client.cpp:500 src/gui/windowmenu.cpp:74
+#: src/client.cpp:867 src/dyetool/client.cpp:497 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Aiuto"
@@ -539,45 +537,45 @@ msgstr "Aiuto"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:875 src/client.cpp:1467 src/client.cpp:1486
-#: src/dyetool/client.cpp:504 src/gui/dialogsmanager.cpp:116
+#: src/client.cpp:871 src/client.cpp:1463 src/client.cpp:1482
+#: src/dyetool/client.cpp:501 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:749 src/gui/popups/popupmenu.cpp:826
 #: src/gui/popups/popupmenu.cpp:1080 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:273
 #: src/gui/windows/inventorywindow.cpp:297
-#: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:60
-#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:130
+#: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
+#: src/gui/windows/npcdialog.cpp:87 src/gui/windows/npcdialog.cpp:129
 #: src/gui/windows/questswindow.cpp:77 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Chiudi"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1100 src/gui/windowmanager_unittest.cc:158
+#: src/client.cpp:1096 src/gui/windowmanager_unittest.cc:157
 msgid "Connecting to server"
 msgstr "Connessione al server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1157 src/gui/windowmanager_unittest.cc:175
+#: src/client.cpp:1153 src/gui/windowmanager_unittest.cc:174
 msgid "Logging in"
 msgstr "Accesso all'account"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1206
+#: src/client.cpp:1202
 msgid "Entering game world"
 msgstr "Accesso al gioco"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1353
+#: src/client.cpp:1349
 msgid "Requesting characters"
 msgstr "Caricamento personaggi"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1396
+#: src/client.cpp:1392
 msgid "Connecting to the game server"
 msgstr "Connessione al server del gioco"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1408
+#: src/client.cpp:1404
 msgid "Changing game servers"
 msgstr "Cambiamento server del gioco"
 
@@ -594,7 +592,7 @@ msgstr "Cambiamento server del gioco"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1464 src/client.cpp:1483 src/client.cpp:1722
+#: src/client.cpp:1460 src/client.cpp:1479 src/client.cpp:1718
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:468
@@ -602,44 +600,44 @@ msgstr "Cambiamento server del gioco"
 #: 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:385
-#: src/net/eathena/charserverrecv.cpp:389
-#: src/net/eathena/charserverrecv.cpp:471 src/net/tmwa/charserverrecv.cpp:292
+#: src/net/eathena/charserverrecv.cpp:378
+#: src/net/eathena/charserverrecv.cpp:382
+#: src/net/eathena/charserverrecv.cpp:464 src/net/tmwa/charserverrecv.cpp:282
 msgid "Error"
 msgstr "Errore"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1502
+#: src/client.cpp:1498
 msgid "Requesting registration details"
 msgstr "Richiesta dettagli di registrazione"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1549
+#: src/client.cpp:1545
 msgid "Password Change"
 msgstr "Cambia password"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1551
+#: src/client.cpp:1547
 msgid "Password changed successfully!"
 msgstr "Password modificata con successo!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1584
+#: src/client.cpp:1580
 msgid "Email Change"
 msgstr "Cambia Email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1586
+#: src/client.cpp:1582
 msgid "Email changed successfully!"
 msgstr "Email cambiata con successo!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1622
+#: src/client.cpp:1618
 msgid "Unregister Successful"
 msgstr "Annullamento registrazione effettuato con successo"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1624
+#: src/client.cpp:1620
 msgid "Farewell, come back any time..."
 msgstr "Addio, torna quando vuoi..."
 
@@ -711,9 +709,7 @@ 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
@@ -753,8 +749,7 @@ 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
@@ -806,52 +801,52 @@ msgid "%s doesn't exist and can't be created!"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:51
+#: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:53
+#: src/dyetool/dyemain.cpp:50
 msgid "or"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:55
+#: src/dyetool/dyemain.cpp:52
 msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: chat tab name
-#: src/game.cpp:267 src/gui/windows/chatwindow.cpp:2222
+#: src/game.cpp:266 src/gui/windows/chatwindow.cpp:2222
 msgid "General"
 msgstr "Generale"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:274 src/gui/windowmenu.cpp:175
+#: src/game.cpp:273 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:582
+#: src/game.cpp:581
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Screenshot salvato come %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:592
+#: src/game.cpp:591
 msgid "Saving screenshot failed!"
 msgstr "Salvataggio immagine fallito!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:679
+#: src/game.cpp:678
 msgid "The connection to the server was lost."
 msgstr "La connessione al server è caduta."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:682
+#: src/game.cpp:681
 msgid "Network Error"
 msgstr "Errore di rete"
 
@@ -1266,16 +1261,14 @@ 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
@@ -1286,7 +1279,8 @@ 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:602
+#: src/gui/windows/equipmentwindow.cpp:671
+#: src/gui/windows/serverdialog.cpp:602
 msgid "default"
 msgstr "Predefinito"
 
@@ -1804,19 +1798,19 @@ msgid "Cancel"
 msgstr "Annulla"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:223
+#: src/gui/popups/itempopup.cpp:222
 #, c-format
 msgid "Weight: %s"
 msgstr "Peso: %s"
 
 #. TRANSLATORS: named item description
-#: src/gui/popups/itempopup.cpp:290
+#: src/gui/popups/itempopup.cpp:289
 #, c-format
 msgid "Item named: %s"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:317
+#: src/gui/popups/itempopup.cpp:316
 msgid "Cards: "
 msgstr ""
 
@@ -2157,7 +2151,7 @@ msgstr "Modifica Incantesimo"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:831 src/gui/windows/npcdialog.cpp:127
+#: src/gui/popups/popupmenu.cpp:831 src/gui/windows/npcdialog.cpp:126
 msgid "Clear"
 msgstr "Cancella"
 
@@ -2499,8 +2493,9 @@ msgstr "Mostra Finestra"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/popups/popupmenu.cpp:2379 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:68 src/gui/windows/statuswindow.cpp:243
+#: src/gui/windows/statuswindow.cpp:367
 #, c-format
 msgid "Level: %d"
 msgstr "Livello: %d"
@@ -2919,8 +2914,8 @@ msgstr ""
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3093 src/gui/popups/popupmenu.cpp:3112
 #: src/gui/popups/popupmenu.cpp:3125 src/gui/windows/charselectdialog.cpp:76
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:408
-#: src/net/eathena/charserverrecv.cpp:444
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:401
+#: src/net/eathena/charserverrecv.cpp:437
 msgid "Info"
 msgstr "Informazioni"
 
@@ -3339,7 +3334,7 @@ msgstr "Apri url"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:132
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:131
 #: src/gui/windows/serverdialog.cpp:113 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:85
 msgid "Add"
@@ -3367,7 +3362,7 @@ msgstr "Esci"
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:192
-#: src/gui/windows/itemamountwindow.cpp:228 src/gui/windows/npcdialog.cpp:123
+#: src/gui/windows/itemamountwindow.cpp:228 src/gui/windows/npcdialog.cpp:122
 #: src/gui/windows/statuswindow.cpp:746
 msgid "+"
 msgstr "+"
@@ -3379,7 +3374,7 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:190
-#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:125
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:124
 msgid "-"
 msgstr "-"
 
@@ -3546,13 +3541,15 @@ 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."
 
@@ -3563,19 +3560,22 @@ 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."
 
@@ -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:116
+#: src/gui/widgets/tabs/setup_colors.cpp:86
+#: src/gui/windows/emotewindow.cpp:116
 msgid "Colors"
 msgstr "Colori"
 
@@ -4041,11 +4041,9 @@ 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
@@ -4072,11 +4070,9 @@ 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
@@ -4087,9 +4083,7 @@ 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 +4124,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,11 +4136,9 @@ 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
@@ -4157,11 +4149,9 @@ 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,13 +4167,9 @@ 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
@@ -4196,8 +4182,7 @@ 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
@@ -4216,12 +4201,9 @@ 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
@@ -4232,8 +4214,7 @@ 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 ""
@@ -4246,11 +4227,9 @@ 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
@@ -4275,11 +4254,9 @@ 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
@@ -4290,8 +4267,7 @@ 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 ""
@@ -4304,9 +4280,7 @@ 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 ""
@@ -4319,9 +4293,7 @@ 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 ""
@@ -4347,10 +4319,7 @@ 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 ""
@@ -4385,8 +4354,7 @@ 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 ""
@@ -4399,8 +4367,7 @@ 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 ""
@@ -4413,12 +4380,9 @@ 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
@@ -4532,9 +4496,7 @@ 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
@@ -4705,8 +4667,8 @@ msgstr "Ciclo di target sui nemici"
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
 #: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:114
-#: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:60
-#: src/gui/windows/minimap.cpp:123
+#: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:59
+#: src/gui/windows/minimap.cpp:122
 msgid "Map"
 msgstr "Mappa"
 
@@ -4897,7 +4859,7 @@ msgstr "Abilita la modalità negozio"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:292 src/gui/windows/npcdialog.cpp:99
+#: src/gui/widgets/tabs/setup_other.cpp:292 src/gui/windows/npcdialog.cpp:98
 msgid "NPC"
 msgstr "NPC"
 
@@ -5582,17 +5544,13 @@ msgstr "Nessuno"
 #: src/gui/widgets/tabs/setup_video.cpp:229
 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:236
 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:249
@@ -5633,9 +5591,7 @@ msgstr "RIsoluzione schermo cambiata"
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:397
 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
@@ -6170,7 +6126,8 @@ 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"
 
@@ -6289,7 +6246,8 @@ msgstr "^"
 #: src/gui/windows/charcreatedialog.cpp:193
 #: src/gui/windows/charcreatedialog.cpp:206
 #: src/gui/windows/charcreatedialog.cpp:217
-#: src/gui/windows/charcreatedialog.cpp:227 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:227
+#: src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -6307,7 +6265,8 @@ msgstr "Distribuire %d punti"
 #: src/gui/windows/charcreatedialog.cpp:197
 #: src/gui/windows/charcreatedialog.cpp:208
 #: src/gui/windows/charcreatedialog.cpp:219
-#: src/gui/windows/charcreatedialog.cpp:229 src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:229
+#: src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -6333,7 +6292,8 @@ msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:248 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:248
+#: src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr "F"
 
@@ -6432,12 +6392,7 @@ msgid ""
 "Level: %u\n"
 "Experience: %u\n"
 "Money: %s"
-msgstr ""
-"Hp: %u%u\n"
-"Mp: %u%u\n"
-"Livello: %u\n"
-"Esperienza: %u\n"
-"Soldi: %s"
+msgstr "Hp: %u%u\nMp: %u%u\nLivello: %u\nEsperienza: %u\nSoldi: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/charselectdialog.cpp:308
@@ -6540,7 +6495,8 @@ msgstr "Modifica Server"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:111
+#: src/gui/windows/editserverdialog.cpp:57
+#: src/gui/windows/serverdialog.cpp:111
 msgid "Connect"
 msgstr "Connetti"
 
@@ -6892,26 +6848,28 @@ msgstr "A:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:73
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:72
 msgid "Subject:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:104
+#: src/gui/windows/maileditwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:103
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:123
-#: src/gui/windows/mailviewwindow.cpp:132
+#: src/gui/windows/maileditwindow.cpp:63
+#: src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:131
 msgid "Item:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:76
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:75
 msgid "Message:"
 msgstr ""
 
@@ -6921,27 +6879,27 @@ msgid "empty subject"
 msgstr ""
 
 #. TRANSLATORS: mail view window name
-#: src/gui/windows/mailviewwindow.cpp:54
+#: src/gui/windows/mailviewwindow.cpp:53
 msgid "View mail"
 msgstr ""
 
 #. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:64
+#: src/gui/windows/mailviewwindow.cpp:63
 msgid "Reply"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:65
 msgid "Time:"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:70
+#: src/gui/windows/mailviewwindow.cpp:69
 msgid "From:"
 msgstr ""
 
 #. TRANSLATORS: mail view attach button
-#: src/gui/windows/mailviewwindow.cpp:141
+#: src/gui/windows/mailviewwindow.cpp:140
 msgid "Get attach"
 msgstr ""
 
@@ -7031,22 +6989,22 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:84
+#: src/gui/windows/npcdialog.cpp:83
 msgid "Stop waiting"
 msgstr "Ferma attesa"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:86
+#: src/gui/windows/npcdialog.cpp:85
 msgid "Next"
 msgstr "Prossimo"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:90
+#: src/gui/windows/npcdialog.cpp:89
 msgid "Submit"
 msgstr "Invia"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:134
+#: src/gui/windows/npcdialog.cpp:133
 msgid "Reset"
 msgstr "Reimposta"
 
@@ -7609,10 +7567,9 @@ 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
@@ -9037,9 +8994,7 @@ 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
@@ -9052,9 +9007,7 @@ 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.\n"
-"Contatta il team GM sul forum."
+msgstr "Sei stato temporaneamente bannato dal gioco fino a %s.\nContatta il team GM sul forum."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:151 src/net/eathena/loginrecv.cpp:92
@@ -9094,33 +9047,33 @@ msgstr "Connessione al server terminata. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:387
-#: src/net/eathena/charserverrecv.cpp:435
+#: src/net/eathena/charserverrecv.cpp:380
+#: src/net/eathena/charserverrecv.cpp:428
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:410
+#: src/net/eathena/charserverrecv.cpp:403
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:419
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:423
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:439
+#: src/net/eathena/charserverrecv.cpp:432
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:473 src/net/tmwa/charserverrecv.cpp:294
+#: src/net/eathena/charserverrecv.cpp:466 src/net/tmwa/charserverrecv.cpp:284
 msgid "Failed to delete character."
 msgstr "Eliminazione personaggio fallita."
 
@@ -9452,7 +9405,7 @@ msgid "Map not found"
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/net/eathena/inventoryrecv.cpp:844
+#: src/net/eathena/inventoryrecv.cpp:823
 #, c-format
 msgid "Left %s rental time for item %s."
 msgstr ""
@@ -9460,8 +9413,8 @@ msgstr ""
 #. TRANSLATORS: unknown item
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
-#: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:265
+#: src/net/eathena/inventoryrecv.cpp:1176
+#: src/net/eathena/inventoryrecv.cpp:1309 src/resources/db/itemdb.cpp:265
 msgid "Unknown item"
 msgstr "Oggetto sconosciuto"
 
@@ -10911,9 +10864,7 @@ msgstr ""
 #: src/utils/booleanoptions.h:27
 #, 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
diff --git a/po/ja.po b/po/ja.po
index aee18d4cd..a2178466b 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,19 +14,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-05-29 14:56+0300\n"
+"POT-Creation-Date: 2016-05-20 19:25+0300\n"
 "PO-Revision-Date: 2016-05-21 09:33+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Japanese (http://www.transifex.com/akaras/manaplus/language/"
-"ja/)\n"
-"Language: ja\n"
+"Language-Team: Japanese (http://www.transifex.com/akaras/manaplus/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
-#: src/actions/actions.cpp:167
+#: src/actions/actions.cpp:166
 msgid "File uploaded"
 msgstr ""
 
@@ -39,7 +38,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:170 src/client.cpp:1553 src/client.cpp:1588
+#: src/actions/actions.cpp:169 src/client.cpp:1549 src/client.cpp:1584
 #: 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
@@ -59,67 +58,67 @@ 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:412
-#: src/net/eathena/charserverrecv.cpp:447
-#: src/net/eathena/charserverrecv.cpp:475 src/net/tmwa/charserverrecv.cpp:296
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:405
+#: src/net/eathena/charserverrecv.cpp:440
+#: src/net/eathena/charserverrecv.cpp:468 src/net/tmwa/charserverrecv.cpp:286
 msgid "OK"
 msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1044 src/actions/actions.cpp:1057
+#: src/actions/actions.cpp:1043 src/actions/actions.cpp:1056
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1214 src/actions/actions.cpp:1220
+#: src/actions/actions.cpp:1213 src/actions/actions.cpp:1219
 #, c-format
 msgid "Client uptime: %s"
 msgstr "クライアントの稼働時間: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1286
+#: src/actions/actions.cpp:1276 src/actions/actions.cpp:1285
 msgid "Resource images:"
 msgstr "リソースイメージ:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1280 src/actions/actions.cpp:1290
+#: src/actions/actions.cpp:1279 src/actions/actions.cpp:1289
 msgid "Resource orphaned images:"
 msgstr "リソース孤児イメージ:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1385
+#: src/actions/actions.cpp:1384
 msgid "Environment variables dumped"
 msgstr ""
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1502
+#: src/actions/actions.cpp:1501
 msgid "Uploaded config into:"
 msgstr ""
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1512
+#: src/actions/actions.cpp:1511
 msgid "Uploaded server config into:"
 msgstr ""
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1522
+#: src/actions/actions.cpp:1521
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: last seen disabled warning
-#: src/actions/actions.cpp:1747
+#: src/actions/actions.cpp:1746
 msgid ""
 "Last seen disabled. Enable in players / collect players id and seen log."
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/actions/actions.cpp:1766 src/actions/actions.cpp:1780
+#: src/actions/actions.cpp:1765 src/actions/actions.cpp:1779
 msgid "You not saw this nick."
 msgstr ""
 
 #. TRANSLATORS: last seen message
-#: src/actions/actions.cpp:1772
+#: src/actions/actions.cpp:1771
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr ""
@@ -477,41 +476,41 @@ msgstr "吹出し"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:856 src/dyetool/client.cpp:485 src/gui/windowmenu.cpp:189
+#: src/client.cpp:852 src/dyetool/client.cpp:482 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:65
 msgid "Setup"
 msgstr "設定"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:859 src/dyetool/client.cpp:488
+#: src/client.cpp:855 src/dyetool/client.cpp:485
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:862 src/dyetool/client.cpp:491
+#: src/client.cpp:858 src/dyetool/client.cpp:488
 #: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "ビデオ"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:865 src/dyetool/client.cpp:494
+#: src/client.cpp:861 src/dyetool/client.cpp:491
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "テーマ"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:868 src/dyetool/client.cpp:497
+#: src/client.cpp:864 src/dyetool/client.cpp:494
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:871 src/dyetool/client.cpp:500 src/gui/windowmenu.cpp:74
+#: src/client.cpp:867 src/dyetool/client.cpp:497 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "ヘルプ"
@@ -532,45 +531,45 @@ msgstr "ヘルプ"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:875 src/client.cpp:1467 src/client.cpp:1486
-#: src/dyetool/client.cpp:504 src/gui/dialogsmanager.cpp:116
+#: src/client.cpp:871 src/client.cpp:1463 src/client.cpp:1482
+#: src/dyetool/client.cpp:501 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:749 src/gui/popups/popupmenu.cpp:826
 #: src/gui/popups/popupmenu.cpp:1080 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:273
 #: src/gui/windows/inventorywindow.cpp:297
-#: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:60
-#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:130
+#: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
+#: src/gui/windows/npcdialog.cpp:87 src/gui/windows/npcdialog.cpp:129
 #: src/gui/windows/questswindow.cpp:77 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "閉じる"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1100 src/gui/windowmanager_unittest.cc:158
+#: src/client.cpp:1096 src/gui/windowmanager_unittest.cc:157
 msgid "Connecting to server"
 msgstr "サーバーに接続しています"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1157 src/gui/windowmanager_unittest.cc:175
+#: src/client.cpp:1153 src/gui/windowmanager_unittest.cc:174
 msgid "Logging in"
 msgstr "ログインしています"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1206
+#: src/client.cpp:1202
 msgid "Entering game world"
 msgstr "ゲームの世界に移動しています"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1353
+#: src/client.cpp:1349
 msgid "Requesting characters"
 msgstr "キャラクターを呼び出しています"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1396
+#: src/client.cpp:1392
 msgid "Connecting to the game server"
 msgstr "ゲームサーバーに接続しています"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1408
+#: src/client.cpp:1404
 msgid "Changing game servers"
 msgstr "ゲームサーバーを変更しています"
 
@@ -587,7 +586,7 @@ msgstr "ゲームサーバーを変更しています"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1464 src/client.cpp:1483 src/client.cpp:1722
+#: src/client.cpp:1460 src/client.cpp:1479 src/client.cpp:1718
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:468
@@ -595,44 +594,44 @@ msgstr "ゲームサーバーを変更しています"
 #: 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:385
-#: src/net/eathena/charserverrecv.cpp:389
-#: src/net/eathena/charserverrecv.cpp:471 src/net/tmwa/charserverrecv.cpp:292
+#: src/net/eathena/charserverrecv.cpp:378
+#: src/net/eathena/charserverrecv.cpp:382
+#: src/net/eathena/charserverrecv.cpp:464 src/net/tmwa/charserverrecv.cpp:282
 msgid "Error"
 msgstr "エラー"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1502
+#: src/client.cpp:1498
 msgid "Requesting registration details"
 msgstr "登録内容を呼び出しています"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1549
+#: src/client.cpp:1545
 msgid "Password Change"
 msgstr "パスワード変更"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1551
+#: src/client.cpp:1547
 msgid "Password changed successfully!"
 msgstr "パスワードを変更しました!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1584
+#: src/client.cpp:1580
 msgid "Email Change"
 msgstr "メールアドレス変更"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1586
+#: src/client.cpp:1582
 msgid "Email changed successfully!"
 msgstr "メールアドレスを変更しました!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1622
+#: src/client.cpp:1618
 msgid "Unregister Successful"
 msgstr "登録を解除しました"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1624
+#: src/client.cpp:1620
 msgid "Farewell, come back any time..."
 msgstr "さようなら　また会いましょう..."
 
@@ -724,9 +723,7 @@ 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
@@ -761,8 +758,7 @@ 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
@@ -799,52 +795,52 @@ msgid "%s doesn't exist and can't be created!"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:51
+#: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:53
+#: src/dyetool/dyemain.cpp:50
 msgid "or"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:55
+#: src/dyetool/dyemain.cpp:52
 msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: chat tab name
-#: src/game.cpp:267 src/gui/windows/chatwindow.cpp:2222
+#: src/game.cpp:266 src/gui/windows/chatwindow.cpp:2222
 msgid "General"
 msgstr "一般"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:274 src/gui/windowmenu.cpp:175
+#: src/game.cpp:273 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "デバッグ"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:582
+#: src/game.cpp:581
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:592
+#: src/game.cpp:591
 msgid "Saving screenshot failed!"
 msgstr "スクリーンショットを保存できませんでした!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:679
+#: src/game.cpp:678
 msgid "The connection to the server was lost."
 msgstr "サーバーへの接続が切断されました."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:682
+#: src/game.cpp:681
 msgid "Network Error"
 msgstr "ネットワークエラー"
 
@@ -1259,7 +1255,8 @@ 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
@@ -1276,7 +1273,8 @@ 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:602
+#: src/gui/windows/equipmentwindow.cpp:671
+#: src/gui/windows/serverdialog.cpp:602
 msgid "default"
 msgstr "デフォルト"
 
@@ -1794,19 +1792,19 @@ msgid "Cancel"
 msgstr "キャンセル"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:223
+#: src/gui/popups/itempopup.cpp:222
 #, c-format
 msgid "Weight: %s"
 msgstr "重力: %s"
 
 #. TRANSLATORS: named item description
-#: src/gui/popups/itempopup.cpp:290
+#: src/gui/popups/itempopup.cpp:289
 #, c-format
 msgid "Item named: %s"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:317
+#: src/gui/popups/itempopup.cpp:316
 msgid "Cards: "
 msgstr ""
 
@@ -2147,7 +2145,7 @@ msgstr "呪文を編集する"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:831 src/gui/windows/npcdialog.cpp:127
+#: src/gui/popups/popupmenu.cpp:831 src/gui/windows/npcdialog.cpp:126
 msgid "Clear"
 msgstr "クリア"
 
@@ -2489,8 +2487,9 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/popups/popupmenu.cpp:2379 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:68 src/gui/windows/statuswindow.cpp:243
+#: src/gui/windows/statuswindow.cpp:367
 #, c-format
 msgid "Level: %d"
 msgstr "レベル: %d"
@@ -2909,8 +2908,8 @@ msgstr ""
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3093 src/gui/popups/popupmenu.cpp:3112
 #: src/gui/popups/popupmenu.cpp:3125 src/gui/windows/charselectdialog.cpp:76
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:408
-#: src/net/eathena/charserverrecv.cpp:444
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:401
+#: src/net/eathena/charserverrecv.cpp:437
 msgid "Info"
 msgstr "情報"
 
@@ -3329,7 +3328,7 @@ msgstr "URLを開く"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:132
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:131
 #: src/gui/windows/serverdialog.cpp:113 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:85
 msgid "Add"
@@ -3357,7 +3356,7 @@ msgstr "終了"
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:192
-#: src/gui/windows/itemamountwindow.cpp:228 src/gui/windows/npcdialog.cpp:123
+#: src/gui/windows/itemamountwindow.cpp:228 src/gui/windows/npcdialog.cpp:122
 #: src/gui/windows/statuswindow.cpp:746
 msgid "+"
 msgstr "+"
@@ -3369,7 +3368,7 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:190
-#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:125
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:124
 msgid "-"
 msgstr "-"
 
@@ -3536,13 +3535,15 @@ msgstr "アイテム共有モード有効."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104
+#: src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr "アイテム共有モード無効."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109
+#: src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr "アイテム共有モード不可能."
 
@@ -3553,19 +3554,22 @@ 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シェアモード不可能."
 
@@ -3999,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:116
+#: src/gui/widgets/tabs/setup_colors.cpp:86
+#: src/gui/windows/emotewindow.cpp:116
 msgid "Colors"
 msgstr "色"
 
@@ -4031,11 +4035,9 @@ 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
@@ -4062,11 +4064,9 @@ msgstr "チャットで一行に表示する最大文字数を制限する"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed "
-"in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will "
-"be truncated."
+"Note: long lines can make client slower. Lines longer than this limit will be truncated."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4077,9 +4077,7 @@ 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 ""
@@ -4120,8 +4118,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
@@ -4132,11 +4130,9 @@ 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,11 +4143,9 @@ 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,13 +4161,9 @@ 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
@@ -4186,8 +4176,7 @@ 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
@@ -4206,12 +4195,9 @@ 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
@@ -4222,8 +4208,7 @@ msgstr "デバッグタブに呪文をログする"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If "
-"disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
 msgstr ""
@@ -4236,11 +4221,9 @@ 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
@@ -4265,11 +4248,9 @@ 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
@@ -4280,8 +4261,7 @@ 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 ""
@@ -4294,9 +4274,7 @@ 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 ""
@@ -4309,9 +4287,7 @@ 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 ""
@@ -4337,10 +4313,7 @@ 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 ""
@@ -4375,8 +4348,7 @@ 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 ""
@@ -4389,8 +4361,7 @@ 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 ""
@@ -4403,12 +4374,9 @@ 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
@@ -4522,9 +4490,7 @@ 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
@@ -4695,8 +4661,8 @@ msgstr "選択したモンスターを円で表示"
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
 #: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:114
-#: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:60
-#: src/gui/windows/minimap.cpp:123
+#: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:59
+#: src/gui/windows/minimap.cpp:122
 msgid "Map"
 msgstr "マップ"
 
@@ -4887,7 +4853,7 @@ msgstr "ショップモードを有効にする"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:292 src/gui/windows/npcdialog.cpp:99
+#: src/gui/widgets/tabs/setup_other.cpp:292 src/gui/windows/npcdialog.cpp:98
 msgid "NPC"
 msgstr "NPC"
 
@@ -6154,7 +6120,8 @@ 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 "作成"
 
@@ -6273,7 +6240,8 @@ msgstr "^"
 #: src/gui/windows/charcreatedialog.cpp:193
 #: src/gui/windows/charcreatedialog.cpp:206
 #: src/gui/windows/charcreatedialog.cpp:217
-#: src/gui/windows/charcreatedialog.cpp:227 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:227
+#: src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -6291,7 +6259,8 @@ msgstr "%d ポイントを振り分けてください"
 #: src/gui/windows/charcreatedialog.cpp:197
 #: src/gui/windows/charcreatedialog.cpp:208
 #: src/gui/windows/charcreatedialog.cpp:219
-#: src/gui/windows/charcreatedialog.cpp:229 src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:229
+#: src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -6317,7 +6286,8 @@ msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:248 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:248
+#: src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr "友達"
 
@@ -6519,7 +6489,8 @@ msgstr "サーバー編集"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:111
+#: src/gui/windows/editserverdialog.cpp:57
+#: src/gui/windows/serverdialog.cpp:111
 msgid "Connect"
 msgstr "接続"
 
@@ -6869,26 +6840,28 @@ msgstr "宛先:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:73
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:72
 msgid "Subject:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:104
+#: src/gui/windows/maileditwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:103
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:123
-#: src/gui/windows/mailviewwindow.cpp:132
+#: src/gui/windows/maileditwindow.cpp:63
+#: src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:131
 msgid "Item:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:76
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:75
 msgid "Message:"
 msgstr ""
 
@@ -6898,27 +6871,27 @@ msgid "empty subject"
 msgstr ""
 
 #. TRANSLATORS: mail view window name
-#: src/gui/windows/mailviewwindow.cpp:54
+#: src/gui/windows/mailviewwindow.cpp:53
 msgid "View mail"
 msgstr ""
 
 #. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:64
+#: src/gui/windows/mailviewwindow.cpp:63
 msgid "Reply"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:65
 msgid "Time:"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:70
+#: src/gui/windows/mailviewwindow.cpp:69
 msgid "From:"
 msgstr ""
 
 #. TRANSLATORS: mail view attach button
-#: src/gui/windows/mailviewwindow.cpp:141
+#: src/gui/windows/mailviewwindow.cpp:140
 msgid "Get attach"
 msgstr ""
 
@@ -7008,22 +6981,22 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:84
+#: src/gui/windows/npcdialog.cpp:83
 msgid "Stop waiting"
 msgstr "キャンセル"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:86
+#: src/gui/windows/npcdialog.cpp:85
 msgid "Next"
 msgstr "次"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:90
+#: src/gui/windows/npcdialog.cpp:89
 msgid "Submit"
 msgstr "決定"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:134
+#: src/gui/windows/npcdialog.cpp:133
 msgid "Reset"
 msgstr "リセット"
 
@@ -7586,10 +7559,9 @@ 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
@@ -8871,9 +8843,7 @@ 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
@@ -9029,9 +8999,7 @@ 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までゲームから追放されました。\nGMにご連絡下さい."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:151 src/net/eathena/loginrecv.cpp:92
@@ -9071,33 +9039,33 @@ msgstr "サーバーへの接続が切断されました. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:387
-#: src/net/eathena/charserverrecv.cpp:435
+#: src/net/eathena/charserverrecv.cpp:380
+#: src/net/eathena/charserverrecv.cpp:428
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:410
+#: src/net/eathena/charserverrecv.cpp:403
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:419
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:423
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:439
+#: src/net/eathena/charserverrecv.cpp:432
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:473 src/net/tmwa/charserverrecv.cpp:294
+#: src/net/eathena/charserverrecv.cpp:466 src/net/tmwa/charserverrecv.cpp:284
 msgid "Failed to delete character."
 msgstr "キャラクター削除に失敗しました."
 
@@ -9429,7 +9397,7 @@ msgid "Map not found"
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/net/eathena/inventoryrecv.cpp:844
+#: src/net/eathena/inventoryrecv.cpp:823
 #, c-format
 msgid "Left %s rental time for item %s."
 msgstr ""
@@ -9437,8 +9405,8 @@ msgstr ""
 #. TRANSLATORS: unknown item
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
-#: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:265
+#: src/net/eathena/inventoryrecv.cpp:1176
+#: src/net/eathena/inventoryrecv.cpp:1309 src/resources/db/itemdb.cpp:265
 msgid "Unknown item"
 msgstr "不明なアイテム"
 
@@ -10888,9 +10856,7 @@ msgstr ""
 #: src/utils/booleanoptions.h:27
 #, 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
diff --git a/po/nl.po b/po/nl.po
index 604ea2a0d..aad46f5af 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,19 +11,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-05-29 14:56+0300\n"
+"POT-Creation-Date: 2016-05-20 19:25+0300\n"
 "PO-Revision-Date: 2016-05-21 09:33+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: nl_BE\n"
+"Language-Team: Dutch (Belgium) (http://www.transifex.com/akaras/manaplus/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
-#: src/actions/actions.cpp:167
+#: src/actions/actions.cpp:166
 msgid "File uploaded"
 msgstr "Bestand is opgeladen"
 
@@ -36,7 +35,7 @@ msgstr "Bestand is opgeladen"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:170 src/client.cpp:1553 src/client.cpp:1588
+#: src/actions/actions.cpp:169 src/client.cpp:1549 src/client.cpp:1584
 #: 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,67 +55,67 @@ 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:412
-#: src/net/eathena/charserverrecv.cpp:447
-#: src/net/eathena/charserverrecv.cpp:475 src/net/tmwa/charserverrecv.cpp:296
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:405
+#: src/net/eathena/charserverrecv.cpp:440
+#: src/net/eathena/charserverrecv.cpp:468 src/net/tmwa/charserverrecv.cpp:286
 msgid "OK"
 msgstr "Oké"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1044 src/actions/actions.cpp:1057
+#: src/actions/actions.cpp:1043 src/actions/actions.cpp:1056
 msgid "Cache cleaned"
 msgstr "Cache gewist"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1214 src/actions/actions.cpp:1220
+#: src/actions/actions.cpp:1213 src/actions/actions.cpp:1219
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Client uptime: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1286
+#: src/actions/actions.cpp:1276 src/actions/actions.cpp:1285
 msgid "Resource images:"
 msgstr "Bron afbeeldingen:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1280 src/actions/actions.cpp:1290
+#: src/actions/actions.cpp:1279 src/actions/actions.cpp:1289
 msgid "Resource orphaned images:"
 msgstr "Bron verweesde afbeeldingen:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1385
+#: src/actions/actions.cpp:1384
 msgid "Environment variables dumped"
 msgstr "Omgevingsvariabelen gedumpt"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1502
+#: src/actions/actions.cpp:1501
 msgid "Uploaded config into:"
 msgstr "Configuratie opgeladen in:"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1512
+#: src/actions/actions.cpp:1511
 msgid "Uploaded server config into:"
 msgstr ""
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1522
+#: src/actions/actions.cpp:1521
 msgid "Uploaded log into:"
 msgstr "Log opgeladen in:"
 
 #. TRANSLATORS: last seen disabled warning
-#: src/actions/actions.cpp:1747
+#: src/actions/actions.cpp:1746
 msgid ""
 "Last seen disabled. Enable in players / collect players id and seen log."
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/actions/actions.cpp:1766 src/actions/actions.cpp:1780
+#: src/actions/actions.cpp:1765 src/actions/actions.cpp:1779
 msgid "You not saw this nick."
 msgstr ""
 
 #. TRANSLATORS: last seen message
-#: src/actions/actions.cpp:1772
+#: src/actions/actions.cpp:1771
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr ""
@@ -475,41 +474,41 @@ msgstr "Zwevende bel"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:856 src/dyetool/client.cpp:485 src/gui/windowmenu.cpp:189
+#: src/client.cpp:852 src/dyetool/client.cpp:482 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:65
 msgid "Setup"
 msgstr "Configureren"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:859 src/dyetool/client.cpp:488
+#: src/client.cpp:855 src/dyetool/client.cpp:485
 #: 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:862 src/dyetool/client.cpp:491
+#: src/client.cpp:858 src/dyetool/client.cpp:488
 #: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:865 src/dyetool/client.cpp:494
+#: src/client.cpp:861 src/dyetool/client.cpp:491
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Thema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:868 src/dyetool/client.cpp:497
+#: src/client.cpp:864 src/dyetool/client.cpp:494
 msgid "About"
 msgstr "Over"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:871 src/dyetool/client.cpp:500 src/gui/windowmenu.cpp:74
+#: src/client.cpp:867 src/dyetool/client.cpp:497 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Help"
@@ -530,45 +529,45 @@ msgstr "Help"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:875 src/client.cpp:1467 src/client.cpp:1486
-#: src/dyetool/client.cpp:504 src/gui/dialogsmanager.cpp:116
+#: src/client.cpp:871 src/client.cpp:1463 src/client.cpp:1482
+#: src/dyetool/client.cpp:501 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:749 src/gui/popups/popupmenu.cpp:826
 #: src/gui/popups/popupmenu.cpp:1080 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:273
 #: src/gui/windows/inventorywindow.cpp:297
-#: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:60
-#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:130
+#: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
+#: src/gui/windows/npcdialog.cpp:87 src/gui/windows/npcdialog.cpp:129
 #: src/gui/windows/questswindow.cpp:77 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Sluiten"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1100 src/gui/windowmanager_unittest.cc:158
+#: src/client.cpp:1096 src/gui/windowmanager_unittest.cc:157
 msgid "Connecting to server"
 msgstr "Verbinden met server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1157 src/gui/windowmanager_unittest.cc:175
+#: src/client.cpp:1153 src/gui/windowmanager_unittest.cc:174
 msgid "Logging in"
 msgstr "Inloggen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1206
+#: src/client.cpp:1202
 msgid "Entering game world"
 msgstr "Spelwereld binnenkomen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1353
+#: src/client.cpp:1349
 msgid "Requesting characters"
 msgstr "Aanvragen personage"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1396
+#: src/client.cpp:1392
 msgid "Connecting to the game server"
 msgstr "Verbinden met de spelserver"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1408
+#: src/client.cpp:1404
 msgid "Changing game servers"
 msgstr "Wijzigen spelservers"
 
@@ -585,7 +584,7 @@ msgstr "Wijzigen spelservers"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1464 src/client.cpp:1483 src/client.cpp:1722
+#: src/client.cpp:1460 src/client.cpp:1479 src/client.cpp:1718
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:468
@@ -593,44 +592,44 @@ msgstr "Wijzigen spelservers"
 #: 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:385
-#: src/net/eathena/charserverrecv.cpp:389
-#: src/net/eathena/charserverrecv.cpp:471 src/net/tmwa/charserverrecv.cpp:292
+#: src/net/eathena/charserverrecv.cpp:378
+#: src/net/eathena/charserverrecv.cpp:382
+#: src/net/eathena/charserverrecv.cpp:464 src/net/tmwa/charserverrecv.cpp:282
 msgid "Error"
 msgstr "Fout"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1502
+#: src/client.cpp:1498
 msgid "Requesting registration details"
 msgstr "Aanvragen registratie details"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1549
+#: src/client.cpp:1545
 msgid "Password Change"
 msgstr "Paswoord Wijziging"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1551
+#: src/client.cpp:1547
 msgid "Password changed successfully!"
 msgstr "Paswoord is gewijzigd!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1584
+#: src/client.cpp:1580
 msgid "Email Change"
 msgstr "Email Wijziging"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1586
+#: src/client.cpp:1582
 msgid "Email changed successfully!"
 msgstr "Email is gewijzigd!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1622
+#: src/client.cpp:1618
 msgid "Unregister Successful"
 msgstr "Registratie ongedaan gemaakt!"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1624
+#: src/client.cpp:1620
 msgid "Farewell, come back any time..."
 msgstr "Tot ziens..."
 
@@ -794,52 +793,52 @@ msgid "%s doesn't exist and can't be created!"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:51
+#: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:53
+#: src/dyetool/dyemain.cpp:50
 msgid "or"
 msgstr "of"
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:55
+#: src/dyetool/dyemain.cpp:52
 msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: chat tab name
-#: src/game.cpp:267 src/gui/windows/chatwindow.cpp:2222
+#: src/game.cpp:266 src/gui/windows/chatwindow.cpp:2222
 msgid "General"
 msgstr "Algemeen"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:274 src/gui/windowmenu.cpp:175
+#: src/game.cpp:273 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:582
+#: src/game.cpp:581
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Schermafdruk opgeslagen als %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:592
+#: src/game.cpp:591
 msgid "Saving screenshot failed!"
 msgstr "Opslaan van screenshot mislukt!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:679
+#: src/game.cpp:678
 msgid "The connection to the server was lost."
 msgstr "De verbinding met de server is verbroken."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:682
+#: src/game.cpp:681
 msgid "Network Error"
 msgstr "Netwerkfout"
 
@@ -1254,10 +1253,9 @@ 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
@@ -1273,7 +1271,8 @@ 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:602
+#: src/gui/windows/equipmentwindow.cpp:671
+#: src/gui/windows/serverdialog.cpp:602
 msgid "default"
 msgstr "standaard"
 
@@ -1791,19 +1790,19 @@ msgid "Cancel"
 msgstr "Annuleren"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:223
+#: src/gui/popups/itempopup.cpp:222
 #, c-format
 msgid "Weight: %s"
 msgstr "Gewicht: %s"
 
 #. TRANSLATORS: named item description
-#: src/gui/popups/itempopup.cpp:290
+#: src/gui/popups/itempopup.cpp:289
 #, c-format
 msgid "Item named: %s"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:317
+#: src/gui/popups/itempopup.cpp:316
 msgid "Cards: "
 msgstr ""
 
@@ -2144,7 +2143,7 @@ msgstr "Wijzig spreuk"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:831 src/gui/windows/npcdialog.cpp:127
+#: src/gui/popups/popupmenu.cpp:831 src/gui/windows/npcdialog.cpp:126
 msgid "Clear"
 msgstr "Wissen"
 
@@ -2486,8 +2485,9 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/popups/popupmenu.cpp:2379 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:68 src/gui/windows/statuswindow.cpp:243
+#: src/gui/windows/statuswindow.cpp:367
 #, c-format
 msgid "Level: %d"
 msgstr "Level: %d"
@@ -2906,8 +2906,8 @@ msgstr ""
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3093 src/gui/popups/popupmenu.cpp:3112
 #: src/gui/popups/popupmenu.cpp:3125 src/gui/windows/charselectdialog.cpp:76
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:408
-#: src/net/eathena/charserverrecv.cpp:444
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:401
+#: src/net/eathena/charserverrecv.cpp:437
 msgid "Info"
 msgstr "Info"
 
@@ -3326,7 +3326,7 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:132
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:131
 #: src/gui/windows/serverdialog.cpp:113 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:85
 msgid "Add"
@@ -3354,7 +3354,7 @@ msgstr "Afsluiten"
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:192
-#: src/gui/windows/itemamountwindow.cpp:228 src/gui/windows/npcdialog.cpp:123
+#: src/gui/windows/itemamountwindow.cpp:228 src/gui/windows/npcdialog.cpp:122
 #: src/gui/windows/statuswindow.cpp:746
 msgid "+"
 msgstr "+"
@@ -3366,7 +3366,7 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:190
-#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:125
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:124
 msgid "-"
 msgstr "-"
 
@@ -3533,13 +3533,15 @@ msgstr "Voorwerpdeling ingeschakeld."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104
+#: src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr "Voorwerpdeling uitgeschakeld."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109
+#: src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr "Voorwerpdeling is niet mogelijk."
 
@@ -3550,19 +3552,22 @@ 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."
 
@@ -3996,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:116
+#: src/gui/widgets/tabs/setup_colors.cpp:86
+#: src/gui/windows/emotewindow.cpp:116
 msgid "Colors"
 msgstr "Kleuren"
 
@@ -4028,11 +4033,9 @@ 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
@@ -4059,11 +4062,9 @@ 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
@@ -4074,9 +4075,7 @@ 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 ""
@@ -4117,8 +4116,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
@@ -4129,11 +4128,9 @@ 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,11 +4141,9 @@ 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,13 +4159,9 @@ 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
@@ -4183,8 +4174,7 @@ 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
@@ -4203,12 +4193,9 @@ 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
@@ -4219,8 +4206,7 @@ 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 ""
@@ -4233,11 +4219,9 @@ 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
@@ -4262,11 +4246,9 @@ 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,8 +4259,7 @@ 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 ""
@@ -4291,9 +4272,7 @@ 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 ""
@@ -4306,9 +4285,7 @@ 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 ""
@@ -4334,10 +4311,7 @@ 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 ""
@@ -4372,8 +4346,7 @@ 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 ""
@@ -4386,8 +4359,7 @@ 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 ""
@@ -4400,12 +4372,9 @@ 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
@@ -4690,8 +4659,8 @@ msgstr "Doorloop monsterdoelwitten"
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
 #: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:114
-#: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:60
-#: src/gui/windows/minimap.cpp:123
+#: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:59
+#: src/gui/windows/minimap.cpp:122
 msgid "Map"
 msgstr "Map"
 
@@ -4882,7 +4851,7 @@ msgstr "shop modus aanzetten"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:292 src/gui/windows/npcdialog.cpp:99
+#: src/gui/widgets/tabs/setup_other.cpp:292 src/gui/windows/npcdialog.cpp:98
 msgid "NPC"
 msgstr "NPC"
 
@@ -5567,17 +5536,13 @@ msgstr "Geen"
 #: src/gui/widgets/tabs/setup_video.cpp:229
 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:236
 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:249
@@ -5618,9 +5583,7 @@ msgstr "Scherm Resolutie is gewijzigd"
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:397
 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
@@ -6155,7 +6118,8 @@ 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"
 
@@ -6274,7 +6238,8 @@ msgstr "^"
 #: src/gui/windows/charcreatedialog.cpp:193
 #: src/gui/windows/charcreatedialog.cpp:206
 #: src/gui/windows/charcreatedialog.cpp:217
-#: src/gui/windows/charcreatedialog.cpp:227 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:227
+#: src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -6292,7 +6257,8 @@ msgstr "Nog %d punten te verdelen"
 #: src/gui/windows/charcreatedialog.cpp:197
 #: src/gui/windows/charcreatedialog.cpp:208
 #: src/gui/windows/charcreatedialog.cpp:219
-#: src/gui/windows/charcreatedialog.cpp:229 src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:229
+#: src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -6318,7 +6284,8 @@ msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:248 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:248
+#: src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr "F"
 
@@ -6520,7 +6487,8 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:111
+#: src/gui/windows/editserverdialog.cpp:57
+#: src/gui/windows/serverdialog.cpp:111
 msgid "Connect"
 msgstr "Verbinden"
 
@@ -6872,26 +6840,28 @@ msgstr "Aan:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:73
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:72
 msgid "Subject:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:104
+#: src/gui/windows/maileditwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:103
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:123
-#: src/gui/windows/mailviewwindow.cpp:132
+#: src/gui/windows/maileditwindow.cpp:63
+#: src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:131
 msgid "Item:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:76
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:75
 msgid "Message:"
 msgstr ""
 
@@ -6901,27 +6871,27 @@ msgid "empty subject"
 msgstr ""
 
 #. TRANSLATORS: mail view window name
-#: src/gui/windows/mailviewwindow.cpp:54
+#: src/gui/windows/mailviewwindow.cpp:53
 msgid "View mail"
 msgstr ""
 
 #. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:64
+#: src/gui/windows/mailviewwindow.cpp:63
 msgid "Reply"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:65
 msgid "Time:"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:70
+#: src/gui/windows/mailviewwindow.cpp:69
 msgid "From:"
 msgstr ""
 
 #. TRANSLATORS: mail view attach button
-#: src/gui/windows/mailviewwindow.cpp:141
+#: src/gui/windows/mailviewwindow.cpp:140
 msgid "Get attach"
 msgstr ""
 
@@ -7011,22 +6981,22 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:84
+#: src/gui/windows/npcdialog.cpp:83
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:86
+#: src/gui/windows/npcdialog.cpp:85
 msgid "Next"
 msgstr "Volgende"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:90
+#: src/gui/windows/npcdialog.cpp:89
 msgid "Submit"
 msgstr "Indienen"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:134
+#: src/gui/windows/npcdialog.cpp:133
 msgid "Reset"
 msgstr "Reset"
 
@@ -7589,10 +7559,9 @@ 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
@@ -8859,9 +8828,7 @@ 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
@@ -9032,9 +8999,7 @@ 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.\n"
-"Neem aub contact op met het GM team via de forums."
+msgstr "Je bent tijdelijk geband van het spel tot %s.\nNeem 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
@@ -9074,33 +9039,33 @@ msgstr "Verbinding met server beëindigd. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:387
-#: src/net/eathena/charserverrecv.cpp:435
+#: src/net/eathena/charserverrecv.cpp:380
+#: src/net/eathena/charserverrecv.cpp:428
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:410
+#: src/net/eathena/charserverrecv.cpp:403
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:419
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:423
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:439
+#: src/net/eathena/charserverrecv.cpp:432
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:473 src/net/tmwa/charserverrecv.cpp:294
+#: src/net/eathena/charserverrecv.cpp:466 src/net/tmwa/charserverrecv.cpp:284
 msgid "Failed to delete character."
 msgstr "Kon personage niet verwijderen."
 
@@ -9432,7 +9397,7 @@ msgid "Map not found"
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/net/eathena/inventoryrecv.cpp:844
+#: src/net/eathena/inventoryrecv.cpp:823
 #, c-format
 msgid "Left %s rental time for item %s."
 msgstr ""
@@ -9440,8 +9405,8 @@ msgstr ""
 #. TRANSLATORS: unknown item
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
-#: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:265
+#: src/net/eathena/inventoryrecv.cpp:1176
+#: src/net/eathena/inventoryrecv.cpp:1309 src/resources/db/itemdb.cpp:265
 msgid "Unknown item"
 msgstr "Onbekend voorwerp"
 
@@ -10244,8 +10209,7 @@ 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
@@ -10892,8 +10856,7 @@ msgstr ""
 #: src/utils/booleanoptions.h:27
 #, 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
diff --git a/po/nl_BE.po b/po/nl_BE.po
index 604ea2a0d..aad46f5af 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,19 +11,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-05-29 14:56+0300\n"
+"POT-Creation-Date: 2016-05-20 19:25+0300\n"
 "PO-Revision-Date: 2016-05-21 09:33+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: nl_BE\n"
+"Language-Team: Dutch (Belgium) (http://www.transifex.com/akaras/manaplus/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
-#: src/actions/actions.cpp:167
+#: src/actions/actions.cpp:166
 msgid "File uploaded"
 msgstr "Bestand is opgeladen"
 
@@ -36,7 +35,7 @@ msgstr "Bestand is opgeladen"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:170 src/client.cpp:1553 src/client.cpp:1588
+#: src/actions/actions.cpp:169 src/client.cpp:1549 src/client.cpp:1584
 #: 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,67 +55,67 @@ 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:412
-#: src/net/eathena/charserverrecv.cpp:447
-#: src/net/eathena/charserverrecv.cpp:475 src/net/tmwa/charserverrecv.cpp:296
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:405
+#: src/net/eathena/charserverrecv.cpp:440
+#: src/net/eathena/charserverrecv.cpp:468 src/net/tmwa/charserverrecv.cpp:286
 msgid "OK"
 msgstr "Oké"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1044 src/actions/actions.cpp:1057
+#: src/actions/actions.cpp:1043 src/actions/actions.cpp:1056
 msgid "Cache cleaned"
 msgstr "Cache gewist"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1214 src/actions/actions.cpp:1220
+#: src/actions/actions.cpp:1213 src/actions/actions.cpp:1219
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Client uptime: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1286
+#: src/actions/actions.cpp:1276 src/actions/actions.cpp:1285
 msgid "Resource images:"
 msgstr "Bron afbeeldingen:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1280 src/actions/actions.cpp:1290
+#: src/actions/actions.cpp:1279 src/actions/actions.cpp:1289
 msgid "Resource orphaned images:"
 msgstr "Bron verweesde afbeeldingen:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1385
+#: src/actions/actions.cpp:1384
 msgid "Environment variables dumped"
 msgstr "Omgevingsvariabelen gedumpt"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1502
+#: src/actions/actions.cpp:1501
 msgid "Uploaded config into:"
 msgstr "Configuratie opgeladen in:"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1512
+#: src/actions/actions.cpp:1511
 msgid "Uploaded server config into:"
 msgstr ""
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1522
+#: src/actions/actions.cpp:1521
 msgid "Uploaded log into:"
 msgstr "Log opgeladen in:"
 
 #. TRANSLATORS: last seen disabled warning
-#: src/actions/actions.cpp:1747
+#: src/actions/actions.cpp:1746
 msgid ""
 "Last seen disabled. Enable in players / collect players id and seen log."
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/actions/actions.cpp:1766 src/actions/actions.cpp:1780
+#: src/actions/actions.cpp:1765 src/actions/actions.cpp:1779
 msgid "You not saw this nick."
 msgstr ""
 
 #. TRANSLATORS: last seen message
-#: src/actions/actions.cpp:1772
+#: src/actions/actions.cpp:1771
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr ""
@@ -475,41 +474,41 @@ msgstr "Zwevende bel"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:856 src/dyetool/client.cpp:485 src/gui/windowmenu.cpp:189
+#: src/client.cpp:852 src/dyetool/client.cpp:482 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:65
 msgid "Setup"
 msgstr "Configureren"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:859 src/dyetool/client.cpp:488
+#: src/client.cpp:855 src/dyetool/client.cpp:485
 #: 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:862 src/dyetool/client.cpp:491
+#: src/client.cpp:858 src/dyetool/client.cpp:488
 #: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:865 src/dyetool/client.cpp:494
+#: src/client.cpp:861 src/dyetool/client.cpp:491
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Thema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:868 src/dyetool/client.cpp:497
+#: src/client.cpp:864 src/dyetool/client.cpp:494
 msgid "About"
 msgstr "Over"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:871 src/dyetool/client.cpp:500 src/gui/windowmenu.cpp:74
+#: src/client.cpp:867 src/dyetool/client.cpp:497 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Help"
@@ -530,45 +529,45 @@ msgstr "Help"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:875 src/client.cpp:1467 src/client.cpp:1486
-#: src/dyetool/client.cpp:504 src/gui/dialogsmanager.cpp:116
+#: src/client.cpp:871 src/client.cpp:1463 src/client.cpp:1482
+#: src/dyetool/client.cpp:501 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:749 src/gui/popups/popupmenu.cpp:826
 #: src/gui/popups/popupmenu.cpp:1080 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:273
 #: src/gui/windows/inventorywindow.cpp:297
-#: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:60
-#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:130
+#: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
+#: src/gui/windows/npcdialog.cpp:87 src/gui/windows/npcdialog.cpp:129
 #: src/gui/windows/questswindow.cpp:77 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Sluiten"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1100 src/gui/windowmanager_unittest.cc:158
+#: src/client.cpp:1096 src/gui/windowmanager_unittest.cc:157
 msgid "Connecting to server"
 msgstr "Verbinden met server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1157 src/gui/windowmanager_unittest.cc:175
+#: src/client.cpp:1153 src/gui/windowmanager_unittest.cc:174
 msgid "Logging in"
 msgstr "Inloggen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1206
+#: src/client.cpp:1202
 msgid "Entering game world"
 msgstr "Spelwereld binnenkomen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1353
+#: src/client.cpp:1349
 msgid "Requesting characters"
 msgstr "Aanvragen personage"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1396
+#: src/client.cpp:1392
 msgid "Connecting to the game server"
 msgstr "Verbinden met de spelserver"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1408
+#: src/client.cpp:1404
 msgid "Changing game servers"
 msgstr "Wijzigen spelservers"
 
@@ -585,7 +584,7 @@ msgstr "Wijzigen spelservers"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1464 src/client.cpp:1483 src/client.cpp:1722
+#: src/client.cpp:1460 src/client.cpp:1479 src/client.cpp:1718
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:468
@@ -593,44 +592,44 @@ msgstr "Wijzigen spelservers"
 #: 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:385
-#: src/net/eathena/charserverrecv.cpp:389
-#: src/net/eathena/charserverrecv.cpp:471 src/net/tmwa/charserverrecv.cpp:292
+#: src/net/eathena/charserverrecv.cpp:378
+#: src/net/eathena/charserverrecv.cpp:382
+#: src/net/eathena/charserverrecv.cpp:464 src/net/tmwa/charserverrecv.cpp:282
 msgid "Error"
 msgstr "Fout"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1502
+#: src/client.cpp:1498
 msgid "Requesting registration details"
 msgstr "Aanvragen registratie details"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1549
+#: src/client.cpp:1545
 msgid "Password Change"
 msgstr "Paswoord Wijziging"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1551
+#: src/client.cpp:1547
 msgid "Password changed successfully!"
 msgstr "Paswoord is gewijzigd!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1584
+#: src/client.cpp:1580
 msgid "Email Change"
 msgstr "Email Wijziging"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1586
+#: src/client.cpp:1582
 msgid "Email changed successfully!"
 msgstr "Email is gewijzigd!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1622
+#: src/client.cpp:1618
 msgid "Unregister Successful"
 msgstr "Registratie ongedaan gemaakt!"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1624
+#: src/client.cpp:1620
 msgid "Farewell, come back any time..."
 msgstr "Tot ziens..."
 
@@ -794,52 +793,52 @@ msgid "%s doesn't exist and can't be created!"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:51
+#: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:53
+#: src/dyetool/dyemain.cpp:50
 msgid "or"
 msgstr "of"
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:55
+#: src/dyetool/dyemain.cpp:52
 msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: chat tab name
-#: src/game.cpp:267 src/gui/windows/chatwindow.cpp:2222
+#: src/game.cpp:266 src/gui/windows/chatwindow.cpp:2222
 msgid "General"
 msgstr "Algemeen"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:274 src/gui/windowmenu.cpp:175
+#: src/game.cpp:273 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:582
+#: src/game.cpp:581
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Schermafdruk opgeslagen als %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:592
+#: src/game.cpp:591
 msgid "Saving screenshot failed!"
 msgstr "Opslaan van screenshot mislukt!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:679
+#: src/game.cpp:678
 msgid "The connection to the server was lost."
 msgstr "De verbinding met de server is verbroken."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:682
+#: src/game.cpp:681
 msgid "Network Error"
 msgstr "Netwerkfout"
 
@@ -1254,10 +1253,9 @@ 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
@@ -1273,7 +1271,8 @@ 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:602
+#: src/gui/windows/equipmentwindow.cpp:671
+#: src/gui/windows/serverdialog.cpp:602
 msgid "default"
 msgstr "standaard"
 
@@ -1791,19 +1790,19 @@ msgid "Cancel"
 msgstr "Annuleren"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:223
+#: src/gui/popups/itempopup.cpp:222
 #, c-format
 msgid "Weight: %s"
 msgstr "Gewicht: %s"
 
 #. TRANSLATORS: named item description
-#: src/gui/popups/itempopup.cpp:290
+#: src/gui/popups/itempopup.cpp:289
 #, c-format
 msgid "Item named: %s"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:317
+#: src/gui/popups/itempopup.cpp:316
 msgid "Cards: "
 msgstr ""
 
@@ -2144,7 +2143,7 @@ msgstr "Wijzig spreuk"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:831 src/gui/windows/npcdialog.cpp:127
+#: src/gui/popups/popupmenu.cpp:831 src/gui/windows/npcdialog.cpp:126
 msgid "Clear"
 msgstr "Wissen"
 
@@ -2486,8 +2485,9 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/popups/popupmenu.cpp:2379 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:68 src/gui/windows/statuswindow.cpp:243
+#: src/gui/windows/statuswindow.cpp:367
 #, c-format
 msgid "Level: %d"
 msgstr "Level: %d"
@@ -2906,8 +2906,8 @@ msgstr ""
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3093 src/gui/popups/popupmenu.cpp:3112
 #: src/gui/popups/popupmenu.cpp:3125 src/gui/windows/charselectdialog.cpp:76
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:408
-#: src/net/eathena/charserverrecv.cpp:444
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:401
+#: src/net/eathena/charserverrecv.cpp:437
 msgid "Info"
 msgstr "Info"
 
@@ -3326,7 +3326,7 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:132
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:131
 #: src/gui/windows/serverdialog.cpp:113 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:85
 msgid "Add"
@@ -3354,7 +3354,7 @@ msgstr "Afsluiten"
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:192
-#: src/gui/windows/itemamountwindow.cpp:228 src/gui/windows/npcdialog.cpp:123
+#: src/gui/windows/itemamountwindow.cpp:228 src/gui/windows/npcdialog.cpp:122
 #: src/gui/windows/statuswindow.cpp:746
 msgid "+"
 msgstr "+"
@@ -3366,7 +3366,7 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:190
-#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:125
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:124
 msgid "-"
 msgstr "-"
 
@@ -3533,13 +3533,15 @@ msgstr "Voorwerpdeling ingeschakeld."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104
+#: src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr "Voorwerpdeling uitgeschakeld."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109
+#: src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr "Voorwerpdeling is niet mogelijk."
 
@@ -3550,19 +3552,22 @@ 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."
 
@@ -3996,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:116
+#: src/gui/widgets/tabs/setup_colors.cpp:86
+#: src/gui/windows/emotewindow.cpp:116
 msgid "Colors"
 msgstr "Kleuren"
 
@@ -4028,11 +4033,9 @@ 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
@@ -4059,11 +4062,9 @@ 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
@@ -4074,9 +4075,7 @@ 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 ""
@@ -4117,8 +4116,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
@@ -4129,11 +4128,9 @@ 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,11 +4141,9 @@ 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,13 +4159,9 @@ 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
@@ -4183,8 +4174,7 @@ 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
@@ -4203,12 +4193,9 @@ 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
@@ -4219,8 +4206,7 @@ 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 ""
@@ -4233,11 +4219,9 @@ 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
@@ -4262,11 +4246,9 @@ 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,8 +4259,7 @@ 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 ""
@@ -4291,9 +4272,7 @@ 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 ""
@@ -4306,9 +4285,7 @@ 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 ""
@@ -4334,10 +4311,7 @@ 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 ""
@@ -4372,8 +4346,7 @@ 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 ""
@@ -4386,8 +4359,7 @@ 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 ""
@@ -4400,12 +4372,9 @@ 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
@@ -4690,8 +4659,8 @@ msgstr "Doorloop monsterdoelwitten"
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
 #: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:114
-#: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:60
-#: src/gui/windows/minimap.cpp:123
+#: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:59
+#: src/gui/windows/minimap.cpp:122
 msgid "Map"
 msgstr "Map"
 
@@ -4882,7 +4851,7 @@ msgstr "shop modus aanzetten"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:292 src/gui/windows/npcdialog.cpp:99
+#: src/gui/widgets/tabs/setup_other.cpp:292 src/gui/windows/npcdialog.cpp:98
 msgid "NPC"
 msgstr "NPC"
 
@@ -5567,17 +5536,13 @@ msgstr "Geen"
 #: src/gui/widgets/tabs/setup_video.cpp:229
 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:236
 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:249
@@ -5618,9 +5583,7 @@ msgstr "Scherm Resolutie is gewijzigd"
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:397
 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
@@ -6155,7 +6118,8 @@ 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"
 
@@ -6274,7 +6238,8 @@ msgstr "^"
 #: src/gui/windows/charcreatedialog.cpp:193
 #: src/gui/windows/charcreatedialog.cpp:206
 #: src/gui/windows/charcreatedialog.cpp:217
-#: src/gui/windows/charcreatedialog.cpp:227 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:227
+#: src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -6292,7 +6257,8 @@ msgstr "Nog %d punten te verdelen"
 #: src/gui/windows/charcreatedialog.cpp:197
 #: src/gui/windows/charcreatedialog.cpp:208
 #: src/gui/windows/charcreatedialog.cpp:219
-#: src/gui/windows/charcreatedialog.cpp:229 src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:229
+#: src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -6318,7 +6284,8 @@ msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:248 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:248
+#: src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr "F"
 
@@ -6520,7 +6487,8 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:111
+#: src/gui/windows/editserverdialog.cpp:57
+#: src/gui/windows/serverdialog.cpp:111
 msgid "Connect"
 msgstr "Verbinden"
 
@@ -6872,26 +6840,28 @@ msgstr "Aan:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:73
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:72
 msgid "Subject:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:104
+#: src/gui/windows/maileditwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:103
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:123
-#: src/gui/windows/mailviewwindow.cpp:132
+#: src/gui/windows/maileditwindow.cpp:63
+#: src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:131
 msgid "Item:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:76
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:75
 msgid "Message:"
 msgstr ""
 
@@ -6901,27 +6871,27 @@ msgid "empty subject"
 msgstr ""
 
 #. TRANSLATORS: mail view window name
-#: src/gui/windows/mailviewwindow.cpp:54
+#: src/gui/windows/mailviewwindow.cpp:53
 msgid "View mail"
 msgstr ""
 
 #. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:64
+#: src/gui/windows/mailviewwindow.cpp:63
 msgid "Reply"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:65
 msgid "Time:"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:70
+#: src/gui/windows/mailviewwindow.cpp:69
 msgid "From:"
 msgstr ""
 
 #. TRANSLATORS: mail view attach button
-#: src/gui/windows/mailviewwindow.cpp:141
+#: src/gui/windows/mailviewwindow.cpp:140
 msgid "Get attach"
 msgstr ""
 
@@ -7011,22 +6981,22 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:84
+#: src/gui/windows/npcdialog.cpp:83
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:86
+#: src/gui/windows/npcdialog.cpp:85
 msgid "Next"
 msgstr "Volgende"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:90
+#: src/gui/windows/npcdialog.cpp:89
 msgid "Submit"
 msgstr "Indienen"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:134
+#: src/gui/windows/npcdialog.cpp:133
 msgid "Reset"
 msgstr "Reset"
 
@@ -7589,10 +7559,9 @@ 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
@@ -8859,9 +8828,7 @@ 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
@@ -9032,9 +8999,7 @@ 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.\n"
-"Neem aub contact op met het GM team via de forums."
+msgstr "Je bent tijdelijk geband van het spel tot %s.\nNeem 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
@@ -9074,33 +9039,33 @@ msgstr "Verbinding met server beëindigd. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:387
-#: src/net/eathena/charserverrecv.cpp:435
+#: src/net/eathena/charserverrecv.cpp:380
+#: src/net/eathena/charserverrecv.cpp:428
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:410
+#: src/net/eathena/charserverrecv.cpp:403
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:419
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:423
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:439
+#: src/net/eathena/charserverrecv.cpp:432
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:473 src/net/tmwa/charserverrecv.cpp:294
+#: src/net/eathena/charserverrecv.cpp:466 src/net/tmwa/charserverrecv.cpp:284
 msgid "Failed to delete character."
 msgstr "Kon personage niet verwijderen."
 
@@ -9432,7 +9397,7 @@ msgid "Map not found"
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/net/eathena/inventoryrecv.cpp:844
+#: src/net/eathena/inventoryrecv.cpp:823
 #, c-format
 msgid "Left %s rental time for item %s."
 msgstr ""
@@ -9440,8 +9405,8 @@ msgstr ""
 #. TRANSLATORS: unknown item
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
-#: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:265
+#: src/net/eathena/inventoryrecv.cpp:1176
+#: src/net/eathena/inventoryrecv.cpp:1309 src/resources/db/itemdb.cpp:265
 msgid "Unknown item"
 msgstr "Onbekend voorwerp"
 
@@ -10244,8 +10209,7 @@ 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
@@ -10892,8 +10856,7 @@ msgstr ""
 #: src/utils/booleanoptions.h:27
 #, 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
diff --git a/po/pl.po b/po/pl.po
index 078b38163..df1f34ce2 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,20 +14,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-05-29 14:56+0300\n"
+"POT-Creation-Date: 2016-05-20 19:25+0300\n"
 "PO-Revision-Date: 2016-05-21 09:33+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Polish (http://www.transifex.com/akaras/manaplus/language/"
-"pl/)\n"
-"Language: pl\n"
+"Language-Team: Polish (http://www.transifex.com/akaras/manaplus/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2);\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"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:167
+#: src/actions/actions.cpp:166
 msgid "File uploaded"
 msgstr "Plik wysłano"
 
@@ -40,7 +38,7 @@ msgstr "Plik wysłano"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:170 src/client.cpp:1553 src/client.cpp:1588
+#: src/actions/actions.cpp:169 src/client.cpp:1549 src/client.cpp:1584
 #: 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,67 +58,67 @@ 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:412
-#: src/net/eathena/charserverrecv.cpp:447
-#: src/net/eathena/charserverrecv.cpp:475 src/net/tmwa/charserverrecv.cpp:296
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:405
+#: src/net/eathena/charserverrecv.cpp:440
+#: src/net/eathena/charserverrecv.cpp:468 src/net/tmwa/charserverrecv.cpp:286
 msgid "OK"
 msgstr "Ok"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1044 src/actions/actions.cpp:1057
+#: src/actions/actions.cpp:1043 src/actions/actions.cpp:1056
 msgid "Cache cleaned"
 msgstr "Cache opróżnione"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1214 src/actions/actions.cpp:1220
+#: src/actions/actions.cpp:1213 src/actions/actions.cpp:1219
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Czas pracy programu: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1286
+#: src/actions/actions.cpp:1276 src/actions/actions.cpp:1285
 msgid "Resource images:"
 msgstr "Obrazy źródłowe:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1280 src/actions/actions.cpp:1290
+#: src/actions/actions.cpp:1279 src/actions/actions.cpp:1289
 msgid "Resource orphaned images:"
 msgstr "Osierocone obrazy źródłowe:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1385
+#: src/actions/actions.cpp:1384
 msgid "Environment variables dumped"
 msgstr "Zmienne środowiskowe zostały zrzucone"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1502
+#: src/actions/actions.cpp:1501
 msgid "Uploaded config into:"
 msgstr "Załaduj ustawienia do:"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1512
+#: src/actions/actions.cpp:1511
 msgid "Uploaded server config into:"
 msgstr "Załaduj ustawienia serwera do:"
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1522
+#: src/actions/actions.cpp:1521
 msgid "Uploaded log into:"
 msgstr "Załaduj log do:"
 
 #. TRANSLATORS: last seen disabled warning
-#: src/actions/actions.cpp:1747
+#: src/actions/actions.cpp:1746
 msgid ""
 "Last seen disabled. Enable in players / collect players id and seen log."
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/actions/actions.cpp:1766 src/actions/actions.cpp:1780
+#: src/actions/actions.cpp:1765 src/actions/actions.cpp:1779
 msgid "You not saw this nick."
 msgstr ""
 
 #. TRANSLATORS: last seen message
-#: src/actions/actions.cpp:1772
+#: src/actions/actions.cpp:1771
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr ""
@@ -480,41 +478,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:856 src/dyetool/client.cpp:485 src/gui/windowmenu.cpp:189
+#: src/client.cpp:852 src/dyetool/client.cpp:482 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:65
 msgid "Setup"
 msgstr "Konfiguracja"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:859 src/dyetool/client.cpp:488
+#: src/client.cpp:855 src/dyetool/client.cpp:485
 #: 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:862 src/dyetool/client.cpp:491
+#: src/client.cpp:858 src/dyetool/client.cpp:488
 #: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Ekran"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:865 src/dyetool/client.cpp:494
+#: src/client.cpp:861 src/dyetool/client.cpp:491
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Skórka"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:868 src/dyetool/client.cpp:497
+#: src/client.cpp:864 src/dyetool/client.cpp:494
 msgid "About"
 msgstr "O..."
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:871 src/dyetool/client.cpp:500 src/gui/windowmenu.cpp:74
+#: src/client.cpp:867 src/dyetool/client.cpp:497 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Pomoc"
@@ -535,45 +533,45 @@ msgstr "Pomoc"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:875 src/client.cpp:1467 src/client.cpp:1486
-#: src/dyetool/client.cpp:504 src/gui/dialogsmanager.cpp:116
+#: src/client.cpp:871 src/client.cpp:1463 src/client.cpp:1482
+#: src/dyetool/client.cpp:501 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:749 src/gui/popups/popupmenu.cpp:826
 #: src/gui/popups/popupmenu.cpp:1080 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:273
 #: src/gui/windows/inventorywindow.cpp:297
-#: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:60
-#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:130
+#: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
+#: src/gui/windows/npcdialog.cpp:87 src/gui/windows/npcdialog.cpp:129
 #: src/gui/windows/questswindow.cpp:77 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Zamknij"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1100 src/gui/windowmanager_unittest.cc:158
+#: src/client.cpp:1096 src/gui/windowmanager_unittest.cc:157
 msgid "Connecting to server"
 msgstr "Łączenie z serwerem"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1157 src/gui/windowmanager_unittest.cc:175
+#: src/client.cpp:1153 src/gui/windowmanager_unittest.cc:174
 msgid "Logging in"
 msgstr "Logowanie"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1206
+#: src/client.cpp:1202
 msgid "Entering game world"
 msgstr "Wchodzenie do świata gry"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1353
+#: src/client.cpp:1349
 msgid "Requesting characters"
 msgstr "Sprawdzanie postaci"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1396
+#: src/client.cpp:1392
 msgid "Connecting to the game server"
 msgstr "Łączenie się z serwerem gry"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1408
+#: src/client.cpp:1404
 msgid "Changing game servers"
 msgstr "Zmiana serwera"
 
@@ -590,7 +588,7 @@ msgstr "Zmiana serwera"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1464 src/client.cpp:1483 src/client.cpp:1722
+#: src/client.cpp:1460 src/client.cpp:1479 src/client.cpp:1718
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:468
@@ -598,44 +596,44 @@ msgstr "Zmiana serwera"
 #: 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:385
-#: src/net/eathena/charserverrecv.cpp:389
-#: src/net/eathena/charserverrecv.cpp:471 src/net/tmwa/charserverrecv.cpp:292
+#: src/net/eathena/charserverrecv.cpp:378
+#: src/net/eathena/charserverrecv.cpp:382
+#: src/net/eathena/charserverrecv.cpp:464 src/net/tmwa/charserverrecv.cpp:282
 msgid "Error"
 msgstr "Błąd"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1502
+#: src/client.cpp:1498
 msgid "Requesting registration details"
 msgstr "Sprawdzanie szczegółów rejestracji"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1549
+#: src/client.cpp:1545
 msgid "Password Change"
 msgstr "Zmiana hasła"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1551
+#: src/client.cpp:1547
 msgid "Password changed successfully!"
 msgstr "Hasło zmienione z powodzeniem!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1584
+#: src/client.cpp:1580
 msgid "Email Change"
 msgstr "Zmiana adresu e-mail"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1586
+#: src/client.cpp:1582
 msgid "Email changed successfully!"
 msgstr "Adres e-mail zmieniony z powodzeniem!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1622
+#: src/client.cpp:1618
 msgid "Unregister Successful"
 msgstr "Wyrejestrowano z powodzeniem"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1624
+#: src/client.cpp:1620
 msgid "Farewell, come back any time..."
 msgstr "Żegnaj, będziemy czekać na Twój powrót..."
 
@@ -799,52 +797,52 @@ msgid "%s doesn't exist and can't be created!"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:51
+#: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr "dyecmd srcfile dyestring dstfile"
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:53
+#: src/dyetool/dyemain.cpp:50
 msgid "or"
 msgstr "lub"
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:55
+#: src/dyetool/dyemain.cpp:52
 msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd srcdyestring dstfile"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: chat tab name
-#: src/game.cpp:267 src/gui/windows/chatwindow.cpp:2222
+#: src/game.cpp:266 src/gui/windows/chatwindow.cpp:2222
 msgid "General"
 msgstr "Ogólny"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:274 src/gui/windowmenu.cpp:175
+#: src/game.cpp:273 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:582
+#: src/game.cpp:581
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Zrzut ekranu zapisany jako %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:592
+#: src/game.cpp:591
 msgid "Saving screenshot failed!"
 msgstr "Zapisywanie zrzutu ekranu nie powiodło się!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:679
+#: src/game.cpp:678
 msgid "The connection to the server was lost."
 msgstr "Połączenie z serwerem zostało zerwane."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:682
+#: src/game.cpp:681
 msgid "Network Error"
 msgstr "Błąd sieci"
 
@@ -1259,16 +1257,14 @@ 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
@@ -1279,7 +1275,8 @@ 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:602
+#: src/gui/windows/equipmentwindow.cpp:671
+#: src/gui/windows/serverdialog.cpp:602
 msgid "default"
 msgstr "domyślnie"
 
@@ -1797,19 +1794,19 @@ msgid "Cancel"
 msgstr "Anuluj"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:223
+#: src/gui/popups/itempopup.cpp:222
 #, c-format
 msgid "Weight: %s"
 msgstr "Waga: %s"
 
 #. TRANSLATORS: named item description
-#: src/gui/popups/itempopup.cpp:290
+#: src/gui/popups/itempopup.cpp:289
 #, c-format
 msgid "Item named: %s"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:317
+#: src/gui/popups/itempopup.cpp:316
 msgid "Cards: "
 msgstr ""
 
@@ -2150,7 +2147,7 @@ msgstr "Edytuj zaklęcie"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:831 src/gui/windows/npcdialog.cpp:127
+#: src/gui/popups/popupmenu.cpp:831 src/gui/windows/npcdialog.cpp:126
 msgid "Clear"
 msgstr "Wyczyść"
 
@@ -2492,8 +2489,9 @@ msgstr "Pokaż okno"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/popups/popupmenu.cpp:2379 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:68 src/gui/windows/statuswindow.cpp:243
+#: src/gui/windows/statuswindow.cpp:367
 #, c-format
 msgid "Level: %d"
 msgstr "Poziom: %d"
@@ -2912,8 +2910,8 @@ msgstr ""
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3093 src/gui/popups/popupmenu.cpp:3112
 #: src/gui/popups/popupmenu.cpp:3125 src/gui/windows/charselectdialog.cpp:76
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:408
-#: src/net/eathena/charserverrecv.cpp:444
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:401
+#: src/net/eathena/charserverrecv.cpp:437
 msgid "Info"
 msgstr "Info"
 
@@ -3332,7 +3330,7 @@ msgstr "Otwórz adres url"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:132
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:131
 #: src/gui/windows/serverdialog.cpp:113 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:85
 msgid "Add"
@@ -3360,7 +3358,7 @@ msgstr "Wyjdź"
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:192
-#: src/gui/windows/itemamountwindow.cpp:228 src/gui/windows/npcdialog.cpp:123
+#: src/gui/windows/itemamountwindow.cpp:228 src/gui/windows/npcdialog.cpp:122
 #: src/gui/windows/statuswindow.cpp:746
 msgid "+"
 msgstr "+"
@@ -3372,7 +3370,7 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:190
-#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:125
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:124
 msgid "-"
 msgstr "-"
 
@@ -3539,13 +3537,15 @@ 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."
 
@@ -3556,23 +3556,24 @@ 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
@@ -4004,15 +4005,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:116
+#: src/gui/widgets/tabs/setup_colors.cpp:86
+#: src/gui/windows/emotewindow.cpp:116
 msgid "Colors"
 msgstr "Kolory"
 
@@ -4036,11 +4037,9 @@ 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
@@ -4067,11 +4066,9 @@ 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
@@ -4082,9 +4079,7 @@ msgstr "Limit wierszy w czacie"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
-"specified number of last lines of text. Oldest lines exceeding this limit "
-"are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
 msgstr ""
@@ -4125,8 +4120,8 @@ msgstr "Pokazuj historię czatu"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on "
-"startup instead of starting with empty chat tabs."
+"If this setting enabled, client will load old chat tabs content from logs on"
+" startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4137,11 +4132,9 @@ 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
@@ -4152,11 +4145,9 @@ 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
@@ -4172,13 +4163,9 @@ 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
@@ -4191,8 +4178,7 @@ 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
@@ -4211,12 +4197,9 @@ 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
@@ -4227,8 +4210,7 @@ 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 ""
@@ -4241,11 +4223,9 @@ 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
@@ -4270,11 +4250,9 @@ 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
@@ -4285,8 +4263,7 @@ 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 ""
@@ -4299,9 +4276,7 @@ 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 ""
@@ -4314,9 +4289,7 @@ 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 ""
@@ -4342,10 +4315,7 @@ 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 ""
@@ -4380,8 +4350,7 @@ 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 ""
@@ -4394,8 +4363,7 @@ 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 ""
@@ -4408,12 +4376,9 @@ 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
@@ -4527,9 +4492,7 @@ 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
@@ -4700,8 +4663,8 @@ msgstr "Przewijaj namierzanie potworów"
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
 #: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:114
-#: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:60
-#: src/gui/windows/minimap.cpp:123
+#: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:59
+#: src/gui/windows/minimap.cpp:122
 msgid "Map"
 msgstr "Mapa"
 
@@ -4892,7 +4855,7 @@ msgstr "Włącz tryb sklepu"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:292 src/gui/windows/npcdialog.cpp:99
+#: src/gui/widgets/tabs/setup_other.cpp:292 src/gui/windows/npcdialog.cpp:98
 msgid "NPC"
 msgstr "NPC"
 
@@ -5298,9 +5261,7 @@ 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
@@ -5579,16 +5540,13 @@ msgstr "Brak"
 #: src/gui/widgets/tabs/setup_video.cpp:229
 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:236
 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:249
@@ -5629,9 +5587,7 @@ msgstr "Rozdzielczość zmieniona"
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:397
 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
@@ -6166,7 +6122,8 @@ 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"
 
@@ -6285,7 +6242,8 @@ msgstr "^"
 #: src/gui/windows/charcreatedialog.cpp:193
 #: src/gui/windows/charcreatedialog.cpp:206
 #: src/gui/windows/charcreatedialog.cpp:217
-#: src/gui/windows/charcreatedialog.cpp:227 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:227
+#: src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -6303,7 +6261,8 @@ msgstr "Proszę wykorzystać %d punktów"
 #: src/gui/windows/charcreatedialog.cpp:197
 #: src/gui/windows/charcreatedialog.cpp:208
 #: src/gui/windows/charcreatedialog.cpp:219
-#: src/gui/windows/charcreatedialog.cpp:229 src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:229
+#: src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -6329,7 +6288,8 @@ 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:248 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:248
+#: src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr "F"
 
@@ -6428,12 +6388,7 @@ msgid ""
 "Level: %u\n"
 "Experience: %u\n"
 "Money: %s"
-msgstr ""
-"PŻ: %u/%u\n"
-"PM: %u/%u\n"
-"Poziom: %u\n"
-"Doświadczenie: %u\n"
-"Pieniądze: %s"
+msgstr "PŻ: %u/%u\nPM: %u/%u\nPoziom: %u\nDoświadczenie: %u\nPieniądze: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/charselectdialog.cpp:308
@@ -6536,7 +6491,8 @@ msgstr "Edytuj serwer"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:111
+#: src/gui/windows/editserverdialog.cpp:57
+#: src/gui/windows/serverdialog.cpp:111
 msgid "Connect"
 msgstr "Połącz"
 
@@ -6890,26 +6846,28 @@ msgstr "Do:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:73
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:72
 msgid "Subject:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:104
+#: src/gui/windows/maileditwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:103
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:123
-#: src/gui/windows/mailviewwindow.cpp:132
+#: src/gui/windows/maileditwindow.cpp:63
+#: src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:131
 msgid "Item:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:76
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:75
 msgid "Message:"
 msgstr ""
 
@@ -6919,27 +6877,27 @@ msgid "empty subject"
 msgstr ""
 
 #. TRANSLATORS: mail view window name
-#: src/gui/windows/mailviewwindow.cpp:54
+#: src/gui/windows/mailviewwindow.cpp:53
 msgid "View mail"
 msgstr ""
 
 #. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:64
+#: src/gui/windows/mailviewwindow.cpp:63
 msgid "Reply"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:65
 msgid "Time:"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:70
+#: src/gui/windows/mailviewwindow.cpp:69
 msgid "From:"
 msgstr ""
 
 #. TRANSLATORS: mail view attach button
-#: src/gui/windows/mailviewwindow.cpp:141
+#: src/gui/windows/mailviewwindow.cpp:140
 msgid "Get attach"
 msgstr ""
 
@@ -7029,22 +6987,22 @@ msgid "Job level: %d"
 msgstr "Poziom Pracy: %d"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:84
+#: src/gui/windows/npcdialog.cpp:83
 msgid "Stop waiting"
 msgstr "Przerwij"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:86
+#: src/gui/windows/npcdialog.cpp:85
 msgid "Next"
 msgstr "Dalej"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:90
+#: src/gui/windows/npcdialog.cpp:89
 msgid "Submit"
 msgstr "Zatwierdź"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:134
+#: src/gui/windows/npcdialog.cpp:133
 msgid "Reset"
 msgstr "Resetuj"
 
@@ -7607,10 +7565,9 @@ 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
@@ -9048,9 +9005,7 @@ 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.\n"
-"Prosimy o kontakt z drużyną GM-ów przez fora."
+msgstr "Dostałeś/aś tymczasowego bana do %s.\nProsimy o kontakt z drużyną GM-ów przez fora."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:151 src/net/eathena/loginrecv.cpp:92
@@ -9090,33 +9045,33 @@ msgstr "Połączenie z serwerem przerwane. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:387
-#: src/net/eathena/charserverrecv.cpp:435
+#: src/net/eathena/charserverrecv.cpp:380
+#: src/net/eathena/charserverrecv.cpp:428
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:410
+#: src/net/eathena/charserverrecv.cpp:403
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:419
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:423
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:439
+#: src/net/eathena/charserverrecv.cpp:432
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:473 src/net/tmwa/charserverrecv.cpp:294
+#: src/net/eathena/charserverrecv.cpp:466 src/net/tmwa/charserverrecv.cpp:284
 msgid "Failed to delete character."
 msgstr "Nie udało się skasować postaci."
 
@@ -9448,7 +9403,7 @@ msgid "Map not found"
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/net/eathena/inventoryrecv.cpp:844
+#: src/net/eathena/inventoryrecv.cpp:823
 #, c-format
 msgid "Left %s rental time for item %s."
 msgstr ""
@@ -9456,8 +9411,8 @@ msgstr ""
 #. TRANSLATORS: unknown item
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
-#: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:265
+#: src/net/eathena/inventoryrecv.cpp:1176
+#: src/net/eathena/inventoryrecv.cpp:1309 src/resources/db/itemdb.cpp:265
 msgid "Unknown item"
 msgstr "Nieznany przedmiot"
 
@@ -10216,9 +10171,7 @@ 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
@@ -10257,9 +10210,7 @@ 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
diff --git a/po/pt.po b/po/pt.po
index fc61195c0..0970646ae 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,19 +13,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-05-29 14:56+0300\n"
+"POT-Creation-Date: 2016-05-20 19:25+0300\n"
 "PO-Revision-Date: 2016-05-21 09:33+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Portuguese (http://www.transifex.com/akaras/manaplus/language/"
-"pt/)\n"
-"Language: pt\n"
+"Language-Team: Portuguese (http://www.transifex.com/akaras/manaplus/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
-#: src/actions/actions.cpp:167
+#: src/actions/actions.cpp:166
 msgid "File uploaded"
 msgstr ""
 
@@ -38,7 +37,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:170 src/client.cpp:1553 src/client.cpp:1588
+#: src/actions/actions.cpp:169 src/client.cpp:1549 src/client.cpp:1584
 #: 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
@@ -58,67 +57,67 @@ 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:412
-#: src/net/eathena/charserverrecv.cpp:447
-#: src/net/eathena/charserverrecv.cpp:475 src/net/tmwa/charserverrecv.cpp:296
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:405
+#: src/net/eathena/charserverrecv.cpp:440
+#: src/net/eathena/charserverrecv.cpp:468 src/net/tmwa/charserverrecv.cpp:286
 msgid "OK"
 msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1044 src/actions/actions.cpp:1057
+#: src/actions/actions.cpp:1043 src/actions/actions.cpp:1056
 msgid "Cache cleaned"
 msgstr "Cache limpo"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1214 src/actions/actions.cpp:1220
+#: src/actions/actions.cpp:1213 src/actions/actions.cpp:1219
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Uptime do cliente: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1286
+#: src/actions/actions.cpp:1276 src/actions/actions.cpp:1285
 msgid "Resource images:"
 msgstr "Recursos de imagens:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1280 src/actions/actions.cpp:1290
+#: src/actions/actions.cpp:1279 src/actions/actions.cpp:1289
 msgid "Resource orphaned images:"
 msgstr "Recursos de imagens orfãos:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1385
+#: src/actions/actions.cpp:1384
 msgid "Environment variables dumped"
 msgstr "Variáveis ​​de ambiente despejadas"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1502
+#: src/actions/actions.cpp:1501
 msgid "Uploaded config into:"
 msgstr ""
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1512
+#: src/actions/actions.cpp:1511
 msgid "Uploaded server config into:"
 msgstr ""
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1522
+#: src/actions/actions.cpp:1521
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: last seen disabled warning
-#: src/actions/actions.cpp:1747
+#: src/actions/actions.cpp:1746
 msgid ""
 "Last seen disabled. Enable in players / collect players id and seen log."
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/actions/actions.cpp:1766 src/actions/actions.cpp:1780
+#: src/actions/actions.cpp:1765 src/actions/actions.cpp:1779
 msgid "You not saw this nick."
 msgstr ""
 
 #. TRANSLATORS: last seen message
-#: src/actions/actions.cpp:1772
+#: src/actions/actions.cpp:1771
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr ""
@@ -477,41 +476,41 @@ msgstr "Bolha Flutuante"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:856 src/dyetool/client.cpp:485 src/gui/windowmenu.cpp:189
+#: src/client.cpp:852 src/dyetool/client.cpp:482 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:65
 msgid "Setup"
 msgstr "Configurar"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:859 src/dyetool/client.cpp:488
+#: src/client.cpp:855 src/dyetool/client.cpp:485
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:862 src/dyetool/client.cpp:491
+#: src/client.cpp:858 src/dyetool/client.cpp:488
 #: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Vídeo"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:865 src/dyetool/client.cpp:494
+#: src/client.cpp:861 src/dyetool/client.cpp:491
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:868 src/dyetool/client.cpp:497
+#: src/client.cpp:864 src/dyetool/client.cpp:494
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:871 src/dyetool/client.cpp:500 src/gui/windowmenu.cpp:74
+#: src/client.cpp:867 src/dyetool/client.cpp:497 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Ajuda"
@@ -532,45 +531,45 @@ msgstr "Ajuda"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:875 src/client.cpp:1467 src/client.cpp:1486
-#: src/dyetool/client.cpp:504 src/gui/dialogsmanager.cpp:116
+#: src/client.cpp:871 src/client.cpp:1463 src/client.cpp:1482
+#: src/dyetool/client.cpp:501 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:749 src/gui/popups/popupmenu.cpp:826
 #: src/gui/popups/popupmenu.cpp:1080 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:273
 #: src/gui/windows/inventorywindow.cpp:297
-#: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:60
-#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:130
+#: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
+#: src/gui/windows/npcdialog.cpp:87 src/gui/windows/npcdialog.cpp:129
 #: src/gui/windows/questswindow.cpp:77 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Fechar"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1100 src/gui/windowmanager_unittest.cc:158
+#: src/client.cpp:1096 src/gui/windowmanager_unittest.cc:157
 msgid "Connecting to server"
 msgstr "Conectando ao servidor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1157 src/gui/windowmanager_unittest.cc:175
+#: src/client.cpp:1153 src/gui/windowmanager_unittest.cc:174
 msgid "Logging in"
 msgstr "Efetuando login"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1206
+#: src/client.cpp:1202
 msgid "Entering game world"
 msgstr "Entrando no domínio do jogo"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1353
+#: src/client.cpp:1349
 msgid "Requesting characters"
 msgstr "Requisitando personagens"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1396
+#: src/client.cpp:1392
 msgid "Connecting to the game server"
 msgstr "Conectando ao servidor do jogo"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1408
+#: src/client.cpp:1404
 msgid "Changing game servers"
 msgstr "Mudando servidores do jogo"
 
@@ -587,7 +586,7 @@ msgstr "Mudando servidores do jogo"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1464 src/client.cpp:1483 src/client.cpp:1722
+#: src/client.cpp:1460 src/client.cpp:1479 src/client.cpp:1718
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:468
@@ -595,44 +594,44 @@ msgstr "Mudando servidores do jogo"
 #: 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:385
-#: src/net/eathena/charserverrecv.cpp:389
-#: src/net/eathena/charserverrecv.cpp:471 src/net/tmwa/charserverrecv.cpp:292
+#: src/net/eathena/charserverrecv.cpp:378
+#: src/net/eathena/charserverrecv.cpp:382
+#: src/net/eathena/charserverrecv.cpp:464 src/net/tmwa/charserverrecv.cpp:282
 msgid "Error"
 msgstr "Erro"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1502
+#: src/client.cpp:1498
 msgid "Requesting registration details"
 msgstr "Requisitando detalhes do registro"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1549
+#: src/client.cpp:1545
 msgid "Password Change"
 msgstr "Mudar senha"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1551
+#: src/client.cpp:1547
 msgid "Password changed successfully!"
 msgstr "Senha modificada com sucesso!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1584
+#: src/client.cpp:1580
 msgid "Email Change"
 msgstr "Mudar email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1586
+#: src/client.cpp:1582
 msgid "Email changed successfully!"
 msgstr "Email modificado com sucesso!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1622
+#: src/client.cpp:1618
 msgid "Unregister Successful"
 msgstr "Registro cancelado com sucesso"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1624
+#: src/client.cpp:1620
 msgid "Farewell, come back any time..."
 msgstr "Tchau, volte sempre..."
 
@@ -724,9 +723,7 @@ 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
@@ -736,14 +733,12 @@ 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
@@ -763,8 +758,7 @@ 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
@@ -801,52 +795,52 @@ msgid "%s doesn't exist and can't be created!"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:51
+#: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:53
+#: src/dyetool/dyemain.cpp:50
 msgid "or"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:55
+#: src/dyetool/dyemain.cpp:52
 msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: chat tab name
-#: src/game.cpp:267 src/gui/windows/chatwindow.cpp:2222
+#: src/game.cpp:266 src/gui/windows/chatwindow.cpp:2222
 msgid "General"
 msgstr "Geral"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:274 src/gui/windowmenu.cpp:175
+#: src/game.cpp:273 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Depurador"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:582
+#: src/game.cpp:581
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Captura de Tela salva em: %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:592
+#: src/game.cpp:591
 msgid "Saving screenshot failed!"
 msgstr "Falha ao salvar screenshot!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:679
+#: src/game.cpp:678
 msgid "The connection to the server was lost."
 msgstr "A conexão com o servidor caiu."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:682
+#: src/game.cpp:681
 msgid "Network Error"
 msgstr "Erro de conexão"
 
@@ -1261,17 +1255,14 @@ 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
@@ -1282,7 +1273,8 @@ 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:602
+#: src/gui/windows/equipmentwindow.cpp:671
+#: src/gui/windows/serverdialog.cpp:602
 msgid "default"
 msgstr "padrão"
 
@@ -1800,19 +1792,19 @@ msgid "Cancel"
 msgstr "Cancelar"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:223
+#: src/gui/popups/itempopup.cpp:222
 #, c-format
 msgid "Weight: %s"
 msgstr "Peso: %s"
 
 #. TRANSLATORS: named item description
-#: src/gui/popups/itempopup.cpp:290
+#: src/gui/popups/itempopup.cpp:289
 #, c-format
 msgid "Item named: %s"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:317
+#: src/gui/popups/itempopup.cpp:316
 msgid "Cards: "
 msgstr ""
 
@@ -2153,7 +2145,7 @@ msgstr "Editar Feitiços"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:831 src/gui/windows/npcdialog.cpp:127
+#: src/gui/popups/popupmenu.cpp:831 src/gui/windows/npcdialog.cpp:126
 msgid "Clear"
 msgstr "Limpar"
 
@@ -2495,8 +2487,9 @@ msgstr "Mostrar janela"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/popups/popupmenu.cpp:2379 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:68 src/gui/windows/statuswindow.cpp:243
+#: src/gui/windows/statuswindow.cpp:367
 #, c-format
 msgid "Level: %d"
 msgstr "Nível: %d"
@@ -2915,8 +2908,8 @@ msgstr ""
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3093 src/gui/popups/popupmenu.cpp:3112
 #: src/gui/popups/popupmenu.cpp:3125 src/gui/windows/charselectdialog.cpp:76
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:408
-#: src/net/eathena/charserverrecv.cpp:444
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:401
+#: src/net/eathena/charserverrecv.cpp:437
 msgid "Info"
 msgstr "Informações"
 
@@ -3335,7 +3328,7 @@ msgstr "Abrir URL"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:132
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:131
 #: src/gui/windows/serverdialog.cpp:113 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:85
 msgid "Add"
@@ -3363,7 +3356,7 @@ msgstr "Sair"
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:192
-#: src/gui/windows/itemamountwindow.cpp:228 src/gui/windows/npcdialog.cpp:123
+#: src/gui/windows/itemamountwindow.cpp:228 src/gui/windows/npcdialog.cpp:122
 #: src/gui/windows/statuswindow.cpp:746
 msgid "+"
 msgstr "+"
@@ -3375,7 +3368,7 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:190
-#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:125
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:124
 msgid "-"
 msgstr "-"
 
@@ -3542,13 +3535,15 @@ 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."
 
@@ -3559,19 +3554,22 @@ 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."
 
@@ -4005,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:116
+#: src/gui/widgets/tabs/setup_colors.cpp:86
+#: src/gui/windows/emotewindow.cpp:116
 msgid "Colors"
 msgstr "Cores"
 
@@ -4037,11 +4035,9 @@ 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
@@ -4068,11 +4064,9 @@ 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,9 +4077,7 @@ 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 ""
@@ -4126,8 +4118,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
@@ -4138,11 +4130,9 @@ 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
@@ -4153,11 +4143,9 @@ 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
@@ -4173,13 +4161,9 @@ 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
@@ -4192,8 +4176,7 @@ 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
@@ -4212,12 +4195,9 @@ 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
@@ -4228,8 +4208,7 @@ 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 ""
@@ -4242,11 +4221,9 @@ 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
@@ -4271,11 +4248,9 @@ 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
@@ -4286,8 +4261,7 @@ 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 ""
@@ -4300,9 +4274,7 @@ 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 ""
@@ -4315,9 +4287,7 @@ 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 ""
@@ -4343,10 +4313,7 @@ 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 ""
@@ -4381,8 +4348,7 @@ 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 ""
@@ -4395,8 +4361,7 @@ 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 ""
@@ -4409,12 +4374,9 @@ 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
@@ -4528,9 +4490,7 @@ 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
@@ -4701,8 +4661,8 @@ msgstr "Alvo de monstros em ciclo"
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
 #: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:114
-#: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:60
-#: src/gui/windows/minimap.cpp:123
+#: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:59
+#: src/gui/windows/minimap.cpp:122
 msgid "Map"
 msgstr "Mapa"
 
@@ -4893,7 +4853,7 @@ msgstr "Habilitar modo loja"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:292 src/gui/windows/npcdialog.cpp:99
+#: src/gui/widgets/tabs/setup_other.cpp:292 src/gui/windows/npcdialog.cpp:98
 msgid "NPC"
 msgstr "NPC"
 
@@ -5578,16 +5538,13 @@ msgstr "Nenhum"
 #: src/gui/widgets/tabs/setup_video.cpp:229
 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:236
 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:249
@@ -5628,8 +5585,7 @@ msgstr "Resolução de tela alterada"
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:397
 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
@@ -6164,7 +6120,8 @@ 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"
 
@@ -6283,7 +6240,8 @@ msgstr "^"
 #: src/gui/windows/charcreatedialog.cpp:193
 #: src/gui/windows/charcreatedialog.cpp:206
 #: src/gui/windows/charcreatedialog.cpp:217
-#: src/gui/windows/charcreatedialog.cpp:227 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:227
+#: src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -6301,7 +6259,8 @@ msgstr "Por favor distribua %d pontos"
 #: src/gui/windows/charcreatedialog.cpp:197
 #: src/gui/windows/charcreatedialog.cpp:208
 #: src/gui/windows/charcreatedialog.cpp:219
-#: src/gui/windows/charcreatedialog.cpp:229 src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:229
+#: src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -6327,7 +6286,8 @@ msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:248 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:248
+#: src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr "A"
 
@@ -6426,12 +6386,7 @@ msgid ""
 "Level: %u\n"
 "Experience: %u\n"
 "Money: %s"
-msgstr ""
-"Hp: %u/%u\n"
-"Mp: %u/%u\n"
-"Nível: %u\n"
-"Experiência: %u\n"
-"Dinheiro: %s"
+msgstr "Hp: %u/%u\nMp: %u/%u\nNível: %u\nExperiência: %u\nDinheiro: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/charselectdialog.cpp:308
@@ -6534,7 +6489,8 @@ msgstr "Editar Servidor"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:111
+#: src/gui/windows/editserverdialog.cpp:57
+#: src/gui/windows/serverdialog.cpp:111
 msgid "Connect"
 msgstr "Conectar"
 
@@ -6886,26 +6842,28 @@ msgstr "Para:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:73
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:72
 msgid "Subject:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:104
+#: src/gui/windows/maileditwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:103
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:123
-#: src/gui/windows/mailviewwindow.cpp:132
+#: src/gui/windows/maileditwindow.cpp:63
+#: src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:131
 msgid "Item:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:76
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:75
 msgid "Message:"
 msgstr ""
 
@@ -6915,27 +6873,27 @@ msgid "empty subject"
 msgstr ""
 
 #. TRANSLATORS: mail view window name
-#: src/gui/windows/mailviewwindow.cpp:54
+#: src/gui/windows/mailviewwindow.cpp:53
 msgid "View mail"
 msgstr ""
 
 #. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:64
+#: src/gui/windows/mailviewwindow.cpp:63
 msgid "Reply"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:65
 msgid "Time:"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:70
+#: src/gui/windows/mailviewwindow.cpp:69
 msgid "From:"
 msgstr ""
 
 #. TRANSLATORS: mail view attach button
-#: src/gui/windows/mailviewwindow.cpp:141
+#: src/gui/windows/mailviewwindow.cpp:140
 msgid "Get attach"
 msgstr ""
 
@@ -7025,22 +6983,22 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:84
+#: src/gui/windows/npcdialog.cpp:83
 msgid "Stop waiting"
 msgstr "Aguarde..."
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:86
+#: src/gui/windows/npcdialog.cpp:85
 msgid "Next"
 msgstr "Próximo"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:90
+#: src/gui/windows/npcdialog.cpp:89
 msgid "Submit"
 msgstr "Enviar"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:134
+#: src/gui/windows/npcdialog.cpp:133
 msgid "Reset"
 msgstr "Resetar"
 
@@ -7603,9 +7561,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
@@ -9030,9 +8988,7 @@ 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
@@ -9045,9 +9001,7 @@ 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.\n"
-"Por favor entre em contato com algum GM através do fórum."
+msgstr "Você banido(a) do jogo até %s.\nPor 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
@@ -9087,33 +9041,33 @@ msgstr "Conexão com o servidor interrompida. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:387
-#: src/net/eathena/charserverrecv.cpp:435
+#: src/net/eathena/charserverrecv.cpp:380
+#: src/net/eathena/charserverrecv.cpp:428
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:410
+#: src/net/eathena/charserverrecv.cpp:403
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:419
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:423
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:439
+#: src/net/eathena/charserverrecv.cpp:432
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:473 src/net/tmwa/charserverrecv.cpp:294
+#: src/net/eathena/charserverrecv.cpp:466 src/net/tmwa/charserverrecv.cpp:284
 msgid "Failed to delete character."
 msgstr "Falha ao deletar personagem."
 
@@ -9445,7 +9399,7 @@ msgid "Map not found"
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/net/eathena/inventoryrecv.cpp:844
+#: src/net/eathena/inventoryrecv.cpp:823
 #, c-format
 msgid "Left %s rental time for item %s."
 msgstr ""
@@ -9453,8 +9407,8 @@ msgstr ""
 #. TRANSLATORS: unknown item
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
-#: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:265
+#: src/net/eathena/inventoryrecv.cpp:1176
+#: src/net/eathena/inventoryrecv.cpp:1309 src/resources/db/itemdb.cpp:265
 msgid "Unknown item"
 msgstr "Item desconhecido"
 
@@ -10213,8 +10167,7 @@ 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
@@ -10905,8 +10858,7 @@ msgstr ""
 #: src/utils/booleanoptions.h:27
 #, 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
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 4af08658d..0221a2d70 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,19 +25,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-05-29 14:56+0300\n"
+"POT-Creation-Date: 2016-05-20 19:25+0300\n"
 "PO-Revision-Date: 2016-05-21 09:33+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: pt_BR\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/akaras/manaplus/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
-#: src/actions/actions.cpp:167
+#: src/actions/actions.cpp:166
 msgid "File uploaded"
 msgstr "Arquivo enviado"
 
@@ -50,7 +49,7 @@ msgstr "Arquivo enviado"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:170 src/client.cpp:1553 src/client.cpp:1588
+#: src/actions/actions.cpp:169 src/client.cpp:1549 src/client.cpp:1584
 #: 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
@@ -70,69 +69,67 @@ 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:412
-#: src/net/eathena/charserverrecv.cpp:447
-#: src/net/eathena/charserverrecv.cpp:475 src/net/tmwa/charserverrecv.cpp:296
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:405
+#: src/net/eathena/charserverrecv.cpp:440
+#: src/net/eathena/charserverrecv.cpp:468 src/net/tmwa/charserverrecv.cpp:286
 msgid "OK"
 msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1044 src/actions/actions.cpp:1057
+#: src/actions/actions.cpp:1043 src/actions/actions.cpp:1056
 msgid "Cache cleaned"
 msgstr "Cache limpo"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1214 src/actions/actions.cpp:1220
+#: src/actions/actions.cpp:1213 src/actions/actions.cpp:1219
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Uptime do cliente: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1286
+#: src/actions/actions.cpp:1276 src/actions/actions.cpp:1285
 msgid "Resource images:"
 msgstr "Recursos de imagem:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1280 src/actions/actions.cpp:1290
+#: src/actions/actions.cpp:1279 src/actions/actions.cpp:1289
 msgid "Resource orphaned images:"
 msgstr "Recurso de imagem orfão:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1385
+#: src/actions/actions.cpp:1384
 msgid "Environment variables dumped"
 msgstr "Variáveis de ambiente despejada"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1502
+#: src/actions/actions.cpp:1501
 msgid "Uploaded config into:"
 msgstr "A|rquivos de configuração enviados para:"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1512
+#: src/actions/actions.cpp:1511
 msgid "Uploaded server config into:"
 msgstr "Configuração de servidor enviada para:"
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1522
+#: src/actions/actions.cpp:1521
 msgid "Uploaded log into:"
 msgstr "Registro enviado em:"
 
 #. TRANSLATORS: last seen disabled warning
-#: src/actions/actions.cpp:1747
+#: src/actions/actions.cpp:1746
 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:1766 src/actions/actions.cpp:1780
+#: src/actions/actions.cpp:1765 src/actions/actions.cpp:1779
 msgid "You not saw this nick."
 msgstr "Você não viu esse apelido."
 
 #. TRANSLATORS: last seen message
-#: src/actions/actions.cpp:1772
+#: src/actions/actions.cpp:1771
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr "Visto pela última vez por %s: %s"
@@ -146,9 +143,7 @@ msgstr "Não é possível enviar mensagens privadas vazias!"
 #: src/actions/chat.cpp:309
 #, 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
@@ -493,41 +488,41 @@ msgstr "Bolha Flutuante"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:856 src/dyetool/client.cpp:485 src/gui/windowmenu.cpp:189
+#: src/client.cpp:852 src/dyetool/client.cpp:482 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:65
 msgid "Setup"
 msgstr "Configurar"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:859 src/dyetool/client.cpp:488
+#: src/client.cpp:855 src/dyetool/client.cpp:485
 #: 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:862 src/dyetool/client.cpp:491
+#: src/client.cpp:858 src/dyetool/client.cpp:488
 #: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Vídeo"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:865 src/dyetool/client.cpp:494
+#: src/client.cpp:861 src/dyetool/client.cpp:491
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:868 src/dyetool/client.cpp:497
+#: src/client.cpp:864 src/dyetool/client.cpp:494
 msgid "About"
 msgstr "Sobre"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:871 src/dyetool/client.cpp:500 src/gui/windowmenu.cpp:74
+#: src/client.cpp:867 src/dyetool/client.cpp:497 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Ajuda"
@@ -548,45 +543,45 @@ msgstr "Ajuda"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:875 src/client.cpp:1467 src/client.cpp:1486
-#: src/dyetool/client.cpp:504 src/gui/dialogsmanager.cpp:116
+#: src/client.cpp:871 src/client.cpp:1463 src/client.cpp:1482
+#: src/dyetool/client.cpp:501 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:749 src/gui/popups/popupmenu.cpp:826
 #: src/gui/popups/popupmenu.cpp:1080 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:273
 #: src/gui/windows/inventorywindow.cpp:297
-#: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:60
-#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:130
+#: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
+#: src/gui/windows/npcdialog.cpp:87 src/gui/windows/npcdialog.cpp:129
 #: src/gui/windows/questswindow.cpp:77 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Fechar"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1100 src/gui/windowmanager_unittest.cc:158
+#: src/client.cpp:1096 src/gui/windowmanager_unittest.cc:157
 msgid "Connecting to server"
 msgstr "Conectando-se ao servidor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1157 src/gui/windowmanager_unittest.cc:175
+#: src/client.cpp:1153 src/gui/windowmanager_unittest.cc:174
 msgid "Logging in"
 msgstr "Fazendo login"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1206
+#: src/client.cpp:1202
 msgid "Entering game world"
 msgstr "Entrando no mundo do jogo"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1353
+#: src/client.cpp:1349
 msgid "Requesting characters"
 msgstr "Requerindo personagens"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1396
+#: src/client.cpp:1392
 msgid "Connecting to the game server"
 msgstr "Conectando ao servidor do jogo"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1408
+#: src/client.cpp:1404
 msgid "Changing game servers"
 msgstr "Mudando de servidor do jogo"
 
@@ -603,7 +598,7 @@ msgstr "Mudando de servidor do jogo"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1464 src/client.cpp:1483 src/client.cpp:1722
+#: src/client.cpp:1460 src/client.cpp:1479 src/client.cpp:1718
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:468
@@ -611,44 +606,44 @@ msgstr "Mudando de servidor do jogo"
 #: 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:385
-#: src/net/eathena/charserverrecv.cpp:389
-#: src/net/eathena/charserverrecv.cpp:471 src/net/tmwa/charserverrecv.cpp:292
+#: src/net/eathena/charserverrecv.cpp:378
+#: src/net/eathena/charserverrecv.cpp:382
+#: src/net/eathena/charserverrecv.cpp:464 src/net/tmwa/charserverrecv.cpp:282
 msgid "Error"
 msgstr "Erro"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1502
+#: src/client.cpp:1498
 msgid "Requesting registration details"
 msgstr "Requisitando detalhes do registro"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1549
+#: src/client.cpp:1545
 msgid "Password Change"
 msgstr "Mudar senha"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1551
+#: src/client.cpp:1547
 msgid "Password changed successfully!"
 msgstr "Senha modificada com sucesso!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1584
+#: src/client.cpp:1580
 msgid "Email Change"
 msgstr "Mudar email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1586
+#: src/client.cpp:1582
 msgid "Email changed successfully!"
 msgstr "Email modificado com sucesso!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1622
+#: src/client.cpp:1618
 msgid "Unregister Successful"
 msgstr "Registro cancelado com sucesso"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1624
+#: src/client.cpp:1620
 msgid "Farewell, come back any time..."
 msgstr "Adeus, volte sempre..."
 
@@ -740,9 +735,7 @@ 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
@@ -752,14 +745,12 @@ 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
@@ -816,52 +807,52 @@ msgid "%s doesn't exist and can't be created!"
 msgstr "%s não existe e não pode ser criado!"
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:51
+#: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr "dyecmd srcfile dyestring dstfile"
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:53
+#: src/dyetool/dyemain.cpp:50
 msgid "or"
 msgstr "ou"
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:55
+#: src/dyetool/dyemain.cpp:52
 msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd srcdyestring dstfile"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: chat tab name
-#: src/game.cpp:267 src/gui/windows/chatwindow.cpp:2222
+#: src/game.cpp:266 src/gui/windows/chatwindow.cpp:2222
 msgid "General"
 msgstr "Geral"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:274 src/gui/windowmenu.cpp:175
+#: src/game.cpp:273 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Depurador"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:582
+#: src/game.cpp:581
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Captura de Tela salva em %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:592
+#: src/game.cpp:591
 msgid "Saving screenshot failed!"
 msgstr "Falha ao salvar screenshot!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:679
+#: src/game.cpp:678
 msgid "The connection to the server was lost."
 msgstr "A conexão com o servidor caiu."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:682
+#: src/game.cpp:681
 msgid "Network Error"
 msgstr "Erro de conexão"
 
@@ -1276,17 +1267,14 @@ 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
@@ -1297,7 +1285,8 @@ 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:602
+#: src/gui/windows/equipmentwindow.cpp:671
+#: src/gui/windows/serverdialog.cpp:602
 msgid "default"
 msgstr "padrão"
 
@@ -1815,19 +1804,19 @@ msgid "Cancel"
 msgstr "Cancelar"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:223
+#: src/gui/popups/itempopup.cpp:222
 #, c-format
 msgid "Weight: %s"
 msgstr "Peso: %s"
 
 #. TRANSLATORS: named item description
-#: src/gui/popups/itempopup.cpp:290
+#: src/gui/popups/itempopup.cpp:289
 #, c-format
 msgid "Item named: %s"
 msgstr "Item nomeado: %s"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:317
+#: src/gui/popups/itempopup.cpp:316
 msgid "Cards: "
 msgstr "Cartões: "
 
@@ -2168,7 +2157,7 @@ msgstr "Editar feitiços"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:831 src/gui/windows/npcdialog.cpp:127
+#: src/gui/popups/popupmenu.cpp:831 src/gui/windows/npcdialog.cpp:126
 msgid "Clear"
 msgstr "Limpar"
 
@@ -2510,8 +2499,9 @@ msgstr "Mostrar Janela"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/popups/popupmenu.cpp:2379 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:68 src/gui/windows/statuswindow.cpp:243
+#: src/gui/windows/statuswindow.cpp:367
 #, c-format
 msgid "Level: %d"
 msgstr "Nível: %d"
@@ -2930,8 +2920,8 @@ msgstr ""
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3093 src/gui/popups/popupmenu.cpp:3112
 #: src/gui/popups/popupmenu.cpp:3125 src/gui/windows/charselectdialog.cpp:76
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:408
-#: src/net/eathena/charserverrecv.cpp:444
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:401
+#: src/net/eathena/charserverrecv.cpp:437
 msgid "Info"
 msgstr "Informações"
 
@@ -3350,7 +3340,7 @@ msgstr "Abrir URL"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:132
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:131
 #: src/gui/windows/serverdialog.cpp:113 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:85
 msgid "Add"
@@ -3378,7 +3368,7 @@ msgstr "Sair"
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:192
-#: src/gui/windows/itemamountwindow.cpp:228 src/gui/windows/npcdialog.cpp:123
+#: src/gui/windows/itemamountwindow.cpp:228 src/gui/windows/npcdialog.cpp:122
 #: src/gui/windows/statuswindow.cpp:746
 msgid "+"
 msgstr "+"
@@ -3390,7 +3380,7 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:190
-#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:125
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:124
 msgid "-"
 msgstr "-"
 
@@ -3557,13 +3547,15 @@ 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."
 
@@ -3574,19 +3566,22 @@ msgstr "Compartilhamento de itens desconhecido."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150
+#: src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr "Compartilhamento de experiência habilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155
+#: src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr "Compartilhamento de experiência desabilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160
+#: src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr "Não é possível compartilhar experiência."
 
@@ -4008,10 +4003,7 @@ 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"
-"\n"
-"Pressione 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\nPressione enter ou passe o cursor para exibir o bate-papo novamente."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:58
@@ -4023,19 +4015,15 @@ 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"
-"\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."
+"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."
 
 #. 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:116
+#: src/gui/widgets/tabs/setup_colors.cpp:86
+#: src/gui/windows/emotewindow.cpp:116
 msgid "Colors"
 msgstr "Cores"
 
@@ -4049,10 +4037,7 @@ 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
@@ -4062,17 +4047,10 @@ msgstr "Mostrar lista de cores do chat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat "
-"window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but "
-"also occupies some space in chat window."
-msgstr ""
-"Ative esta configuração para mostrar a seleção de cor drop-down na janela de "
-"bate-papo. A janela de chat irá exibir a seleção de cor drop-down.\n"
-"\n"
-"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."
+"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."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:90
@@ -4083,9 +4061,7 @@ 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
@@ -4100,16 +4076,10 @@ 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"
-"\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"
+"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
 "\n"
-"Nota: 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\nNota: 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
@@ -4119,17 +4089,10 @@ 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"
-"\n"
-"Nota: 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\nNota: mantendo muitas linhas na rolagem podem deixar o cliente lento."
 
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_chat.cpp:120
@@ -4147,11 +4110,7 @@ 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"
-"\n"
-"Nota: 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\nNota: Com o passar do tempo isto pode consumir muito espaço do disco."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:131
@@ -4171,12 +4130,9 @@ 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
@@ -4186,17 +4142,10 @@ 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"
-"Isso 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 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."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:152
@@ -4206,17 +4155,10 @@ msgstr "Mostrar mensagens de guildas online"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be "
-"shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies "
-"are coming online."
-msgstr ""
-"Caso esta configuração seja habilitada, sempre que um membro da sua guilda "
-"entrar ou sair do jogo uma mensagem será exibida na aba de guilda .\n"
-"\n"
-"Isso 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\nIsso 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
@@ -4231,21 +4173,10 @@ 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.\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."
+"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."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:175
@@ -4257,13 +4188,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."
-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."
+"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."
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: input action group
@@ -4281,20 +4207,10 @@ 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"
-"Nota: Pense duas vezes antes de desabilitar esse recurso. Receber todos os "
-"whispers na aba geral pode ser bastante confuso."
+"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
+msgstr "Caso esta configuração esteja ativa, todos os whispers (mensagens privadas) serão colocados em abas separadas, uma aba para cada jogador. Se essa configuração for desativada, todos os whispers aparecerão na aba geral Geral.\n\nNota: 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
@@ -4304,16 +4220,10 @@ 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"
-"\n"
-"Nota: 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\nNota: 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
@@ -4323,19 +4233,10 @@ 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"
-"\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"
+"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"
-"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."
+"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."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:215
@@ -4349,12 +4250,7 @@ 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
@@ -4364,17 +4260,10 @@ msgstr "Habilitar aba de gm"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM "
-"activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this "
-"tab only appears for GMs."
-msgstr ""
-"Se ativado, a aba GM irá aparecer no chat. Ela exibe o texto relacionado a "
-"GMs.\n"
-"\n"
-"Nota: 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\nNota: 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
@@ -4384,15 +4273,10 @@ 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"
-"\n"
-"Nota: 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\nNota: apenas o servidor Evol tem suporte para isto ate o momento."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:240
@@ -4402,18 +4286,10 @@ 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"
-"\n"
-"Nota: 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\nNota: 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
@@ -4423,17 +4299,10 @@ 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"
-"\n"
-"Nota: É 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\nNota: É necessário reiniciar o cliente para as alterações terem efeito."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:259
@@ -4446,10 +4315,7 @@ 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
@@ -4459,10 +4325,7 @@ 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 ""
@@ -4487,10 +4350,7 @@ 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
@@ -4500,15 +4360,10 @@ 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"
-"\n"
-"Nota: 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\nNota: Isto pode ser irritante - use este recurso com sabedoria."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:305
@@ -4518,17 +4373,10 @@ 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"
-"\n"
-"Nota: 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\nNota: 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
@@ -4538,19 +4386,10 @@ 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"
-"Nota: mesma janela também pode ser aberta pelo atalho durante a digitação, "
-"normalmente F1 por padrão."
+"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."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:324
@@ -4562,10 +4401,7 @@ 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
@@ -4666,9 +4502,7 @@ 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
@@ -4839,8 +4673,8 @@ msgstr "Alvo de monstros em ciclo"
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
 #: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:114
-#: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:60
-#: src/gui/windows/minimap.cpp:123
+#: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:59
+#: src/gui/windows/minimap.cpp:122
 msgid "Map"
 msgstr "Mapa"
 
@@ -5031,7 +4865,7 @@ msgstr "Habilitar modo loja"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:292 src/gui/windows/npcdialog.cpp:99
+#: src/gui/widgets/tabs/setup_other.cpp:292 src/gui/windows/npcdialog.cpp:98
 msgid "NPC"
 msgstr "NPC"
 
@@ -5216,8 +5050,7 @@ 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
@@ -5302,8 +5135,7 @@ 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
@@ -5439,9 +5271,7 @@ 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
@@ -5720,16 +5550,13 @@ msgstr "Nenhum"
 #: src/gui/widgets/tabs/setup_video.cpp:229
 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:236
 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:249
@@ -5770,8 +5597,7 @@ msgstr "Resolução de tela alterada"
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:397
 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
@@ -6306,7 +6132,8 @@ 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"
 
@@ -6425,7 +6252,8 @@ msgstr "^"
 #: src/gui/windows/charcreatedialog.cpp:193
 #: src/gui/windows/charcreatedialog.cpp:206
 #: src/gui/windows/charcreatedialog.cpp:217
-#: src/gui/windows/charcreatedialog.cpp:227 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:227
+#: src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -6443,7 +6271,8 @@ msgstr "Por favor distribua %d pontos"
 #: src/gui/windows/charcreatedialog.cpp:197
 #: src/gui/windows/charcreatedialog.cpp:208
 #: src/gui/windows/charcreatedialog.cpp:219
-#: src/gui/windows/charcreatedialog.cpp:229 src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:229
+#: src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -6469,7 +6298,8 @@ 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:248 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:248
+#: src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr "A"
 
@@ -6568,12 +6398,7 @@ msgid ""
 "Level: %u\n"
 "Experience: %u\n"
 "Money: %s"
-msgstr ""
-"Hp: %u/%u\n"
-"Mp: %u/%u\n"
-"Nível: %u\n"
-"Experiência: %u\n"
-"Dinheiro: %s"
+msgstr "Hp: %u/%u\nMp: %u/%u\nNível: %u\nExperiência: %u\nDinheiro: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/charselectdialog.cpp:308
@@ -6676,7 +6501,8 @@ msgstr "Editar Servidor"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:111
+#: src/gui/windows/editserverdialog.cpp:57
+#: src/gui/windows/serverdialog.cpp:111
 msgid "Connect"
 msgstr "Conectar"
 
@@ -7028,26 +6854,28 @@ msgstr "Para:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:73
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:72
 msgid "Subject:"
 msgstr "Assunto:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:104
+#: src/gui/windows/maileditwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:103
 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:123
-#: src/gui/windows/mailviewwindow.cpp:132
+#: src/gui/windows/maileditwindow.cpp:63
+#: src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:131
 msgid "Item:"
 msgstr "Item:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:76
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:75
 msgid "Message:"
 msgstr "Mensagem:"
 
@@ -7057,27 +6885,27 @@ msgid "empty subject"
 msgstr "assunto vazio"
 
 #. TRANSLATORS: mail view window name
-#: src/gui/windows/mailviewwindow.cpp:54
+#: src/gui/windows/mailviewwindow.cpp:53
 msgid "View mail"
 msgstr "Exibir e-mail"
 
 #. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:64
+#: src/gui/windows/mailviewwindow.cpp:63
 msgid "Reply"
 msgstr "Responder"
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:65
 msgid "Time:"
 msgstr "Hora:"
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:70
+#: src/gui/windows/mailviewwindow.cpp:69
 msgid "From:"
 msgstr "De:"
 
 #. TRANSLATORS: mail view attach button
-#: src/gui/windows/mailviewwindow.cpp:141
+#: src/gui/windows/mailviewwindow.cpp:140
 msgid "Get attach"
 msgstr "Se apegue"
 
@@ -7167,22 +6995,22 @@ msgid "Job level: %d"
 msgstr "Nível de profissão: %d"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:84
+#: src/gui/windows/npcdialog.cpp:83
 msgid "Stop waiting"
 msgstr "Parar de esperar"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:86
+#: src/gui/windows/npcdialog.cpp:85
 msgid "Next"
 msgstr "Próximo"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:90
+#: src/gui/windows/npcdialog.cpp:89
 msgid "Submit"
 msgstr "Enviar"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:134
+#: src/gui/windows/npcdialog.cpp:133
 msgid "Reset"
 msgstr "Resetar"
 
@@ -7745,9 +7573,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
@@ -9082,8 +8910,7 @@ 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
@@ -9173,9 +9000,7 @@ 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
@@ -9188,9 +9013,7 @@ 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.\n"
-"Por favor entre em contato com algum GM através do fórum."
+msgstr "Você banido do jogo até %s.\nPor 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
@@ -9230,33 +9053,33 @@ msgstr "Conexão com o servidor interrompida. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:387
-#: src/net/eathena/charserverrecv.cpp:435
+#: src/net/eathena/charserverrecv.cpp:380
+#: src/net/eathena/charserverrecv.cpp:428
 msgid "Character rename error."
 msgstr "Erro ao renomear personagem."
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:410
+#: src/net/eathena/charserverrecv.cpp:403
 msgid "Character renamed."
 msgstr "Personagem renomeado."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:419
 msgid "Rename not allowed."
 msgstr "Não é permitido renomear."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:423
 msgid "New name is not set."
 msgstr "Novo nome não definido."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:439
+#: src/net/eathena/charserverrecv.cpp:432
 msgid "Character not found."
 msgstr "Personagem não encontrado."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:473 src/net/tmwa/charserverrecv.cpp:294
+#: src/net/eathena/charserverrecv.cpp:466 src/net/tmwa/charserverrecv.cpp:284
 msgid "Failed to delete character."
 msgstr "Falha ao deletar personagem."
 
@@ -9588,7 +9411,7 @@ msgid "Map not found"
 msgstr "Mapa não encontrado."
 
 #. TRANSLATORS: notification message
-#: src/net/eathena/inventoryrecv.cpp:844
+#: src/net/eathena/inventoryrecv.cpp:823
 #, c-format
 msgid "Left %s rental time for item %s."
 msgstr "Faltam %s tempo de aluguel pelo item %s."
@@ -9596,8 +9419,8 @@ msgstr "Faltam %s tempo de aluguel pelo item %s."
 #. TRANSLATORS: unknown item
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
-#: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:265
+#: src/net/eathena/inventoryrecv.cpp:1176
+#: src/net/eathena/inventoryrecv.cpp:1309 src/resources/db/itemdb.cpp:265
 msgid "Unknown item"
 msgstr "Item desconhecido"
 
@@ -10356,8 +10179,7 @@ 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
@@ -10563,18 +10385,14 @@ 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
@@ -10616,9 +10434,7 @@ 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
@@ -11033,9 +10849,7 @@ msgstr "Erro na adoção da criança. Seu level é muito baixo para ter um bebê
 #. 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ê."
+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
@@ -11056,8 +10870,7 @@ msgstr "Erro ao salvar localização. Você não possui a habilidade warp."
 #: src/utils/booleanoptions.h:27
 #, 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
diff --git a/po/ru.po b/po/ru.po
index 62f279ee9..eec0df441 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
@@ -20,21 +20,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-05-29 14:56+0300\n"
+"POT-Creation-Date: 2016-05-20 19:25+0300\n"
 "PO-Revision-Date: 2016-05-21 11:56+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Russian (http://www.transifex.com/akaras/manaplus/language/"
-"ru/)\n"
-"Language: ru\n"
+"Language-Team: Russian (http://www.transifex.com/akaras/manaplus/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\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"
+"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"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:167
+#: src/actions/actions.cpp:166
 msgid "File uploaded"
 msgstr "Файл выгружен"
 
@@ -47,7 +44,7 @@ msgstr "Файл выгружен"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:170 src/client.cpp:1553 src/client.cpp:1588
+#: src/actions/actions.cpp:169 src/client.cpp:1549 src/client.cpp:1584
 #: 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
@@ -67,69 +64,67 @@ 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:412
-#: src/net/eathena/charserverrecv.cpp:447
-#: src/net/eathena/charserverrecv.cpp:475 src/net/tmwa/charserverrecv.cpp:296
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:405
+#: src/net/eathena/charserverrecv.cpp:440
+#: src/net/eathena/charserverrecv.cpp:468 src/net/tmwa/charserverrecv.cpp:286
 msgid "OK"
 msgstr "ОК"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1044 src/actions/actions.cpp:1057
+#: src/actions/actions.cpp:1043 src/actions/actions.cpp:1056
 msgid "Cache cleaned"
 msgstr "Кеш очищен"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1214 src/actions/actions.cpp:1220
+#: src/actions/actions.cpp:1213 src/actions/actions.cpp:1219
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Время работы клиента: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1286
+#: src/actions/actions.cpp:1276 src/actions/actions.cpp:1285
 msgid "Resource images:"
 msgstr "Изображений:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1280 src/actions/actions.cpp:1290
+#: src/actions/actions.cpp:1279 src/actions/actions.cpp:1289
 msgid "Resource orphaned images:"
 msgstr "Удаленных изображений:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1385
+#: src/actions/actions.cpp:1384
 msgid "Environment variables dumped"
 msgstr "Переменные среды сохранены"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1502
+#: src/actions/actions.cpp:1501
 msgid "Uploaded config into:"
 msgstr "Информация о выгруженном конфиге:"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1512
+#: src/actions/actions.cpp:1511
 msgid "Uploaded server config into:"
 msgstr "Информация о выгруженном конфиге сервера:"
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1522
+#: src/actions/actions.cpp:1521
 msgid "Uploaded log into:"
 msgstr "Информация о выгруженном логе:"
 
 #. TRANSLATORS: last seen disabled warning
-#: src/actions/actions.cpp:1747
+#: src/actions/actions.cpp:1746
 msgid ""
 "Last seen disabled. Enable in players / collect players id and seen log."
-msgstr ""
-"Сбор информации о пользователя отключен. Включите его в игроки / собирать ид "
-"игроков и лог встреч."
+msgstr "Сбор информации о пользователя отключен. Включите его в игроки / собирать ид игроков и лог встреч."
 
 #. TRANSLATORS: last seen error
-#: src/actions/actions.cpp:1766 src/actions/actions.cpp:1780
+#: src/actions/actions.cpp:1765 src/actions/actions.cpp:1779
 msgid "You not saw this nick."
 msgstr "Вам не встречался этот ник."
 
 #. TRANSLATORS: last seen message
-#: src/actions/actions.cpp:1772
+#: src/actions/actions.cpp:1771
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr "Последняя встреча с %s: %s"
@@ -490,41 +485,41 @@ msgstr "Плавающий пузырек"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:856 src/dyetool/client.cpp:485 src/gui/windowmenu.cpp:189
+#: src/client.cpp:852 src/dyetool/client.cpp:482 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:65
 msgid "Setup"
 msgstr "Настройка"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:859 src/dyetool/client.cpp:488
+#: src/client.cpp:855 src/dyetool/client.cpp:485
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Производительность"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:862 src/dyetool/client.cpp:491
+#: src/client.cpp:858 src/dyetool/client.cpp:488
 #: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Видео"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:865 src/dyetool/client.cpp:494
+#: src/client.cpp:861 src/dyetool/client.cpp:491
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Тема"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:868 src/dyetool/client.cpp:497
+#: src/client.cpp:864 src/dyetool/client.cpp:494
 msgid "About"
 msgstr "О Программе"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:871 src/dyetool/client.cpp:500 src/gui/windowmenu.cpp:74
+#: src/client.cpp:867 src/dyetool/client.cpp:497 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Помощь"
@@ -545,45 +540,45 @@ msgstr "Помощь"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:875 src/client.cpp:1467 src/client.cpp:1486
-#: src/dyetool/client.cpp:504 src/gui/dialogsmanager.cpp:116
+#: src/client.cpp:871 src/client.cpp:1463 src/client.cpp:1482
+#: src/dyetool/client.cpp:501 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:749 src/gui/popups/popupmenu.cpp:826
 #: src/gui/popups/popupmenu.cpp:1080 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:273
 #: src/gui/windows/inventorywindow.cpp:297
-#: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:60
-#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:130
+#: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
+#: src/gui/windows/npcdialog.cpp:87 src/gui/windows/npcdialog.cpp:129
 #: src/gui/windows/questswindow.cpp:77 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Закрыть"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1100 src/gui/windowmanager_unittest.cc:158
+#: src/client.cpp:1096 src/gui/windowmanager_unittest.cc:157
 msgid "Connecting to server"
 msgstr "Идет подключение к серверу..."
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1157 src/gui/windowmanager_unittest.cc:175
+#: src/client.cpp:1153 src/gui/windowmanager_unittest.cc:174
 msgid "Logging in"
 msgstr "Авторизация"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1206
+#: src/client.cpp:1202
 msgid "Entering game world"
 msgstr "Входим в игровой мир"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1353
+#: src/client.cpp:1349
 msgid "Requesting characters"
 msgstr "Получение списка персонажей"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1396
+#: src/client.cpp:1392
 msgid "Connecting to the game server"
 msgstr "Подключение к игровому серверу"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1408
+#: src/client.cpp:1404
 msgid "Changing game servers"
 msgstr "Смена игрового сервера"
 
@@ -600,7 +595,7 @@ msgstr "Смена игрового сервера"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1464 src/client.cpp:1483 src/client.cpp:1722
+#: src/client.cpp:1460 src/client.cpp:1479 src/client.cpp:1718
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:468
@@ -608,44 +603,44 @@ msgstr "Смена игрового сервера"
 #: 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:385
-#: src/net/eathena/charserverrecv.cpp:389
-#: src/net/eathena/charserverrecv.cpp:471 src/net/tmwa/charserverrecv.cpp:292
+#: src/net/eathena/charserverrecv.cpp:378
+#: src/net/eathena/charserverrecv.cpp:382
+#: src/net/eathena/charserverrecv.cpp:464 src/net/tmwa/charserverrecv.cpp:282
 msgid "Error"
 msgstr "Ошибка"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1502
+#: src/client.cpp:1498
 msgid "Requesting registration details"
 msgstr "Запрос регистрационных данных"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1549
+#: src/client.cpp:1545
 msgid "Password Change"
 msgstr "Изменить Пароль"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1551
+#: src/client.cpp:1547
 msgid "Password changed successfully!"
 msgstr "Пароль изменен!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1584
+#: src/client.cpp:1580
 msgid "Email Change"
 msgstr "Сменить Email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1586
+#: src/client.cpp:1582
 msgid "Email changed successfully!"
 msgstr "Email изменен!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1622
+#: src/client.cpp:1618
 msgid "Unregister Successful"
 msgstr "Регистрация удалена"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1624
+#: src/client.cpp:1620
 msgid "Farewell, come back any time..."
 msgstr "Хорошо, возвращайтесь в любое время..."
 
@@ -737,8 +732,7 @@ 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
@@ -773,8 +767,7 @@ 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
@@ -811,52 +804,52 @@ msgid "%s doesn't exist and can't be created!"
 msgstr "%s не существует и не может быть создана!"
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:51
+#: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr "dyecmd исходный_файл строка_цвета файл_назначения"
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:53
+#: src/dyetool/dyemain.cpp:50
 msgid "or"
 msgstr "или"
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:55
+#: src/dyetool/dyemain.cpp:52
 msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd файл_строка_цвета файл_назначения"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: chat tab name
-#: src/game.cpp:267 src/gui/windows/chatwindow.cpp:2222
+#: src/game.cpp:266 src/gui/windows/chatwindow.cpp:2222
 msgid "General"
 msgstr "Общие"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:274 src/gui/windowmenu.cpp:175
+#: src/game.cpp:273 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Отладка"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:582
+#: src/game.cpp:581
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Снимок экрана сохранен как %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:592
+#: src/game.cpp:591
 msgid "Saving screenshot failed!"
 msgstr "Ошибка при сохранении снимка экрана!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:679
+#: src/game.cpp:678
 msgid "The connection to the server was lost."
 msgstr "Соединение с сервером потеряно."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:682
+#: src/game.cpp:681
 msgid "Network Error"
 msgstr "Ошибка сети"
 
@@ -1271,17 +1264,14 @@ 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
@@ -1292,7 +1282,8 @@ 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:602
+#: src/gui/windows/equipmentwindow.cpp:671
+#: src/gui/windows/serverdialog.cpp:602
 msgid "default"
 msgstr "По умолчанию"
 
@@ -1810,19 +1801,19 @@ msgid "Cancel"
 msgstr "Отмена"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:223
+#: src/gui/popups/itempopup.cpp:222
 #, c-format
 msgid "Weight: %s"
 msgstr "Вес: %s"
 
 #. TRANSLATORS: named item description
-#: src/gui/popups/itempopup.cpp:290
+#: src/gui/popups/itempopup.cpp:289
 #, c-format
 msgid "Item named: %s"
 msgstr "Именной предмет для: %s"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:317
+#: src/gui/popups/itempopup.cpp:316
 msgid "Cards: "
 msgstr "Карты: "
 
@@ -2163,7 +2154,7 @@ msgstr "Изменить заклинание"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:831 src/gui/windows/npcdialog.cpp:127
+#: src/gui/popups/popupmenu.cpp:831 src/gui/windows/npcdialog.cpp:126
 msgid "Clear"
 msgstr "Очистить"
 
@@ -2505,8 +2496,9 @@ msgstr "Показать окно"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/popups/popupmenu.cpp:2379 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:68 src/gui/windows/statuswindow.cpp:243
+#: src/gui/windows/statuswindow.cpp:367
 #, c-format
 msgid "Level: %d"
 msgstr "Уровень: %d"
@@ -2925,8 +2917,8 @@ msgstr "Создать подчиненного"
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3093 src/gui/popups/popupmenu.cpp:3112
 #: src/gui/popups/popupmenu.cpp:3125 src/gui/windows/charselectdialog.cpp:76
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:408
-#: src/net/eathena/charserverrecv.cpp:444
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:401
+#: src/net/eathena/charserverrecv.cpp:437
 msgid "Info"
 msgstr "Сведения"
 
@@ -3345,7 +3337,7 @@ msgstr "Открыть ссылку"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:132
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:131
 #: src/gui/windows/serverdialog.cpp:113 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:85
 msgid "Add"
@@ -3373,7 +3365,7 @@ msgstr "Выход"
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:192
-#: src/gui/windows/itemamountwindow.cpp:228 src/gui/windows/npcdialog.cpp:123
+#: src/gui/windows/itemamountwindow.cpp:228 src/gui/windows/npcdialog.cpp:122
 #: src/gui/windows/statuswindow.cpp:746
 msgid "+"
 msgstr "+"
@@ -3385,7 +3377,7 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:190
-#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:125
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:124
 msgid "-"
 msgstr "-"
 
@@ -3552,13 +3544,15 @@ 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 "Обмен предметами невозможен."
 
@@ -3569,19 +3563,22 @@ msgstr "Статус обмена предметами неизвестен."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150
+#: src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr "Обмен опытом включен."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155
+#: src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr "Обмен опытом выключен."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160
+#: src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr "Обмен опытом невозможен."
 
@@ -4003,10 +4000,7 @@ msgid ""
 "Chat window will be automatically hidden when not in use.\n"
 "\n"
 "Hit Enter or hover mouse to show chat again."
-msgstr ""
-"Окно чата будет автоматически скрыто, когда не используется.\n"
-"\n"
-"Нажмите Enter или наведите курсор, чтобы показать чат снова."
+msgstr "Окно чата будет автоматически скрыто, когда не используется.\n\nНажмите Enter или наведите курсор, чтобы показать чат снова."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:58
@@ -4018,15 +4012,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:116
+#: src/gui/widgets/tabs/setup_colors.cpp:86
+#: src/gui/windows/emotewindow.cpp:116
 msgid "Colors"
 msgstr "Цвета"
 
@@ -4040,9 +4034,7 @@ 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
@@ -4052,11 +4044,9 @@ 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
@@ -4083,11 +4073,9 @@ 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
@@ -4098,9 +4086,7 @@ 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 ""
@@ -4141,8 +4127,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
@@ -4153,11 +4139,9 @@ 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
@@ -4168,11 +4152,9 @@ 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
@@ -4188,13 +4170,9 @@ 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
@@ -4207,8 +4185,7 @@ 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
@@ -4227,12 +4204,9 @@ 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
@@ -4243,8 +4217,7 @@ 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 ""
@@ -4257,11 +4230,9 @@ 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
@@ -4286,11 +4257,9 @@ 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
@@ -4301,8 +4270,7 @@ 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 ""
@@ -4315,9 +4283,7 @@ 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 ""
@@ -4330,9 +4296,7 @@ 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 ""
@@ -4358,10 +4322,7 @@ 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 ""
@@ -4396,8 +4357,7 @@ 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 ""
@@ -4410,8 +4370,7 @@ 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 ""
@@ -4424,12 +4383,9 @@ 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
@@ -4442,9 +4398,7 @@ 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
@@ -4545,9 +4499,7 @@ 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
@@ -4718,8 +4670,8 @@ msgstr "Прокручивать прицел по монстрам"
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
 #: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:114
-#: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:60
-#: src/gui/windows/minimap.cpp:123
+#: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:59
+#: src/gui/windows/minimap.cpp:122
 msgid "Map"
 msgstr "Карта"
 
@@ -4910,7 +4862,7 @@ msgstr "Включить режим магазина"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:292 src/gui/windows/npcdialog.cpp:99
+#: src/gui/widgets/tabs/setup_other.cpp:292 src/gui/windows/npcdialog.cpp:98
 msgid "NPC"
 msgstr "NPC"
 
@@ -5095,9 +5047,7 @@ 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
@@ -5127,9 +5077,7 @@ 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
@@ -5144,8 +5092,7 @@ 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
@@ -5160,8 +5107,7 @@ 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
@@ -5196,8 +5142,7 @@ 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
@@ -5602,17 +5547,13 @@ msgstr "Нет"
 #: src/gui/widgets/tabs/setup_video.cpp:229
 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:236
 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:249
@@ -5653,9 +5594,7 @@ msgstr "Разрешение экрана изменено"
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:397
 msgid "Some windows may be moved to fit the lowered resolution."
-msgstr ""
-"Некоторые окна могут быть сдвинуты, чтобы уместиться на экране при меньшем "
-"разрешении."
+msgstr "Некоторые окна могут быть сдвинуты, чтобы уместиться на экране при меньшем разрешении."
 
 #. TRANSLATORS: speach type
 #: src/gui/widgets/tabs/setup_visual.cpp:43
@@ -6190,7 +6129,8 @@ 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 "Создать"
 
@@ -6309,7 +6249,8 @@ msgstr "^"
 #: src/gui/windows/charcreatedialog.cpp:193
 #: src/gui/windows/charcreatedialog.cpp:206
 #: src/gui/windows/charcreatedialog.cpp:217
-#: src/gui/windows/charcreatedialog.cpp:227 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:227
+#: src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -6327,7 +6268,8 @@ msgstr "Распределите очки (%d)"
 #: src/gui/windows/charcreatedialog.cpp:197
 #: src/gui/windows/charcreatedialog.cpp:208
 #: src/gui/windows/charcreatedialog.cpp:219
-#: src/gui/windows/charcreatedialog.cpp:229 src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:229
+#: src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -6353,7 +6295,8 @@ msgstr "Внешность:"
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:248 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:248
+#: src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr "Д"
 
@@ -6452,12 +6395,7 @@ msgid ""
 "Level: %u\n"
 "Experience: %u\n"
 "Money: %s"
-msgstr ""
-"Hp: %u/%u\n"
-"Mp: %u/%u\n"
-"Уровень: %u\n"
-"Опыт: %u\n"
-"Деньги: %s"
+msgstr "Hp: %u/%u\nMp: %u/%u\nУровень: %u\nОпыт: %u\nДеньги: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/charselectdialog.cpp:308
@@ -6560,7 +6498,8 @@ msgstr "Редактирование сервера"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:111
+#: src/gui/windows/editserverdialog.cpp:57
+#: src/gui/windows/serverdialog.cpp:111
 msgid "Connect"
 msgstr "Соединиться"
 
@@ -6916,26 +6855,28 @@ msgstr "Для:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:73
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:72
 msgid "Subject:"
 msgstr "Заголовок:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:104
+#: src/gui/windows/maileditwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:103
 msgid "Money:"
 msgstr "Деньги:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:123
-#: src/gui/windows/mailviewwindow.cpp:132
+#: src/gui/windows/maileditwindow.cpp:63
+#: src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:131
 msgid "Item:"
 msgstr "Премет:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:76
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:75
 msgid "Message:"
 msgstr "Сообщение:"
 
@@ -6945,27 +6886,27 @@ msgid "empty subject"
 msgstr "пустой заголовок"
 
 #. TRANSLATORS: mail view window name
-#: src/gui/windows/mailviewwindow.cpp:54
+#: src/gui/windows/mailviewwindow.cpp:53
 msgid "View mail"
 msgstr "Просмотр почтового сообщения"
 
 #. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:64
+#: src/gui/windows/mailviewwindow.cpp:63
 msgid "Reply"
 msgstr "Ответить"
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:65
 msgid "Time:"
 msgstr "Время:"
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:70
+#: src/gui/windows/mailviewwindow.cpp:69
 msgid "From:"
 msgstr "От:"
 
 #. TRANSLATORS: mail view attach button
-#: src/gui/windows/mailviewwindow.cpp:141
+#: src/gui/windows/mailviewwindow.cpp:140
 msgid "Get attach"
 msgstr "Получить вложение"
 
@@ -7055,22 +6996,22 @@ msgid "Job level: %d"
 msgstr "Уровень профессии: %d"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:84
+#: src/gui/windows/npcdialog.cpp:83
 msgid "Stop waiting"
 msgstr "Остановить ожидание"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:86
+#: src/gui/windows/npcdialog.cpp:85
 msgid "Next"
 msgstr "Следующий"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:90
+#: src/gui/windows/npcdialog.cpp:89
 msgid "Submit"
 msgstr "Применить"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:134
+#: src/gui/windows/npcdialog.cpp:133
 msgid "Reset"
 msgstr "Сбросить"
 
@@ -7633,10 +7574,9 @@ 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
@@ -8903,8 +8843,7 @@ 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
@@ -8919,8 +8858,7 @@ 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
@@ -9076,8 +9014,7 @@ 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
@@ -9117,33 +9054,33 @@ msgstr "Подключение к серверу прервано. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:387
-#: src/net/eathena/charserverrecv.cpp:435
+#: src/net/eathena/charserverrecv.cpp:380
+#: src/net/eathena/charserverrecv.cpp:428
 msgid "Character rename error."
 msgstr "Ошибка изменения имени персонажа."
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:410
+#: src/net/eathena/charserverrecv.cpp:403
 msgid "Character renamed."
 msgstr "Персонаж переименован."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:419
 msgid "Rename not allowed."
 msgstr "Изменение имени запрещено."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:423
 msgid "New name is not set."
 msgstr "Новое имя не указано."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:439
+#: src/net/eathena/charserverrecv.cpp:432
 msgid "Character not found."
 msgstr "Персонаж не найден."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:473 src/net/tmwa/charserverrecv.cpp:294
+#: src/net/eathena/charserverrecv.cpp:466 src/net/tmwa/charserverrecv.cpp:284
 msgid "Failed to delete character."
 msgstr "Невозможно удалить персонажа."
 
@@ -9475,7 +9412,7 @@ msgid "Map not found"
 msgstr "Карта не найдена"
 
 #. TRANSLATORS: notification message
-#: src/net/eathena/inventoryrecv.cpp:844
+#: src/net/eathena/inventoryrecv.cpp:823
 #, c-format
 msgid "Left %s rental time for item %s."
 msgstr "Осталось %s арендного времени для %s."
@@ -9483,8 +9420,8 @@ msgstr "Осталось %s арендного времени для %s."
 #. TRANSLATORS: unknown item
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
-#: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:265
+#: src/net/eathena/inventoryrecv.cpp:1176
+#: src/net/eathena/inventoryrecv.cpp:1309 src/resources/db/itemdb.cpp:265
 msgid "Unknown item"
 msgstr "Неизвестный предмет"
 
@@ -10456,8 +10393,7 @@ 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
@@ -10499,9 +10435,7 @@ 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
@@ -10824,8 +10758,7 @@ 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
@@ -10917,8 +10850,7 @@ msgstr "Ошибка принятия ребенка: ваш уровень сл
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:816
 msgid "Adoption child error. This player already married and can't be baby."
-msgstr ""
-"Ошибка принятия ребенка: этот игрок уже женат, и не может быть ребенком."
+msgstr "Ошибка принятия ребенка: этот игрок уже женат, и не может быть ребенком."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:821
@@ -10939,9 +10871,7 @@ msgstr "Ошибка сохранения позиции. У вас нет ум�
 #: src/utils/booleanoptions.h:27
 #, 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
diff --git a/po/sr.po b/po/sr.po
index 37a07d2dd..264a5b78c 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,20 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-05-29 14:56+0300\n"
+"POT-Creation-Date: 2016-05-20 19:25+0300\n"
 "PO-Revision-Date: 2016-05-21 09:33+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Serbian (http://www.transifex.com/akaras/manaplus/language/"
-"sr/)\n"
-"Language: sr\n"
+"Language-Team: Serbian (http://www.transifex.com/akaras/manaplus/language/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\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"
+"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"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:167
+#: src/actions/actions.cpp:166
 msgid "File uploaded"
 msgstr ""
 
@@ -35,7 +33,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:170 src/client.cpp:1553 src/client.cpp:1588
+#: src/actions/actions.cpp:169 src/client.cpp:1549 src/client.cpp:1584
 #: 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
@@ -55,67 +53,67 @@ 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:412
-#: src/net/eathena/charserverrecv.cpp:447
-#: src/net/eathena/charserverrecv.cpp:475 src/net/tmwa/charserverrecv.cpp:296
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:405
+#: src/net/eathena/charserverrecv.cpp:440
+#: src/net/eathena/charserverrecv.cpp:468 src/net/tmwa/charserverrecv.cpp:286
 msgid "OK"
 msgstr "U redu"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1044 src/actions/actions.cpp:1057
+#: src/actions/actions.cpp:1043 src/actions/actions.cpp:1056
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1214 src/actions/actions.cpp:1220
+#: src/actions/actions.cpp:1213 src/actions/actions.cpp:1219
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1286
+#: src/actions/actions.cpp:1276 src/actions/actions.cpp:1285
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1280 src/actions/actions.cpp:1290
+#: src/actions/actions.cpp:1279 src/actions/actions.cpp:1289
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1385
+#: src/actions/actions.cpp:1384
 msgid "Environment variables dumped"
 msgstr ""
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1502
+#: src/actions/actions.cpp:1501
 msgid "Uploaded config into:"
 msgstr ""
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1512
+#: src/actions/actions.cpp:1511
 msgid "Uploaded server config into:"
 msgstr ""
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1522
+#: src/actions/actions.cpp:1521
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: last seen disabled warning
-#: src/actions/actions.cpp:1747
+#: src/actions/actions.cpp:1746
 msgid ""
 "Last seen disabled. Enable in players / collect players id and seen log."
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/actions/actions.cpp:1766 src/actions/actions.cpp:1780
+#: src/actions/actions.cpp:1765 src/actions/actions.cpp:1779
 msgid "You not saw this nick."
 msgstr ""
 
 #. TRANSLATORS: last seen message
-#: src/actions/actions.cpp:1772
+#: src/actions/actions.cpp:1771
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr ""
@@ -475,41 +473,41 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:856 src/dyetool/client.cpp:485 src/gui/windowmenu.cpp:189
+#: src/client.cpp:852 src/dyetool/client.cpp:482 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:65
 msgid "Setup"
 msgstr "Podešavanje"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:859 src/dyetool/client.cpp:488
+#: src/client.cpp:855 src/dyetool/client.cpp:485
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:862 src/dyetool/client.cpp:491
+#: src/client.cpp:858 src/dyetool/client.cpp:488
 #: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:865 src/dyetool/client.cpp:494
+#: src/client.cpp:861 src/dyetool/client.cpp:491
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Stil"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:868 src/dyetool/client.cpp:497
+#: src/client.cpp:864 src/dyetool/client.cpp:494
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:871 src/dyetool/client.cpp:500 src/gui/windowmenu.cpp:74
+#: src/client.cpp:867 src/dyetool/client.cpp:497 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Pomoć"
@@ -530,45 +528,45 @@ msgstr "Pomoć"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:875 src/client.cpp:1467 src/client.cpp:1486
-#: src/dyetool/client.cpp:504 src/gui/dialogsmanager.cpp:116
+#: src/client.cpp:871 src/client.cpp:1463 src/client.cpp:1482
+#: src/dyetool/client.cpp:501 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:749 src/gui/popups/popupmenu.cpp:826
 #: src/gui/popups/popupmenu.cpp:1080 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:273
 #: src/gui/windows/inventorywindow.cpp:297
-#: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:60
-#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:130
+#: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
+#: src/gui/windows/npcdialog.cpp:87 src/gui/windows/npcdialog.cpp:129
 #: src/gui/windows/questswindow.cpp:77 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Zatvori"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1100 src/gui/windowmanager_unittest.cc:158
+#: src/client.cpp:1096 src/gui/windowmanager_unittest.cc:157
 msgid "Connecting to server"
 msgstr "Povezivanje sa serverom"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1157 src/gui/windowmanager_unittest.cc:175
+#: src/client.cpp:1153 src/gui/windowmanager_unittest.cc:174
 msgid "Logging in"
 msgstr "Prijavljivanje"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1206
+#: src/client.cpp:1202
 msgid "Entering game world"
 msgstr "Ulaz u svet"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1353
+#: src/client.cpp:1349
 msgid "Requesting characters"
 msgstr "Tražim karaktere"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1396
+#: src/client.cpp:1392
 msgid "Connecting to the game server"
 msgstr "Poverzujem se sa serverom za igru"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1408
+#: src/client.cpp:1404
 msgid "Changing game servers"
 msgstr "Menjam server igre"
 
@@ -585,7 +583,7 @@ msgstr "Menjam server igre"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1464 src/client.cpp:1483 src/client.cpp:1722
+#: src/client.cpp:1460 src/client.cpp:1479 src/client.cpp:1718
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:468
@@ -593,44 +591,44 @@ msgstr "Menjam server igre"
 #: 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:385
-#: src/net/eathena/charserverrecv.cpp:389
-#: src/net/eathena/charserverrecv.cpp:471 src/net/tmwa/charserverrecv.cpp:292
+#: src/net/eathena/charserverrecv.cpp:378
+#: src/net/eathena/charserverrecv.cpp:382
+#: src/net/eathena/charserverrecv.cpp:464 src/net/tmwa/charserverrecv.cpp:282
 msgid "Error"
 msgstr "Greška"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1502
+#: src/client.cpp:1498
 msgid "Requesting registration details"
 msgstr "Zahtevam detalje registracije"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1549
+#: src/client.cpp:1545
 msgid "Password Change"
 msgstr "Promena lozinke"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1551
+#: src/client.cpp:1547
 msgid "Password changed successfully!"
 msgstr "Lozinka je uspešno promenjena!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1584
+#: src/client.cpp:1580
 msgid "Email Change"
 msgstr "Izmena e-mail adrese"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1586
+#: src/client.cpp:1582
 msgid "Email changed successfully!"
 msgstr "E-mail adresa je uspešno promenjena!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1622
+#: src/client.cpp:1618
 msgid "Unregister Successful"
 msgstr "De-registracija je uspela"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1624
+#: src/client.cpp:1620
 msgid "Farewell, come back any time..."
 msgstr "Zbogom, vrati se kad god poželiš..."
 
@@ -794,52 +792,52 @@ msgid "%s doesn't exist and can't be created!"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:51
+#: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:53
+#: src/dyetool/dyemain.cpp:50
 msgid "or"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:55
+#: src/dyetool/dyemain.cpp:52
 msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: chat tab name
-#: src/game.cpp:267 src/gui/windows/chatwindow.cpp:2222
+#: src/game.cpp:266 src/gui/windows/chatwindow.cpp:2222
 msgid "General"
 msgstr "Opšte"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:274 src/gui/windowmenu.cpp:175
+#: src/game.cpp:273 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:582
+#: src/game.cpp:581
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:592
+#: src/game.cpp:591
 msgid "Saving screenshot failed!"
 msgstr ""
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:679
+#: src/game.cpp:678
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:682
+#: src/game.cpp:681
 msgid "Network Error"
 msgstr ""
 
@@ -1254,7 +1252,8 @@ 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
@@ -1271,7 +1270,8 @@ 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:602
+#: src/gui/windows/equipmentwindow.cpp:671
+#: src/gui/windows/serverdialog.cpp:602
 msgid "default"
 msgstr "standardno"
 
@@ -1789,19 +1789,19 @@ msgid "Cancel"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:223
+#: src/gui/popups/itempopup.cpp:222
 #, c-format
 msgid "Weight: %s"
 msgstr ""
 
 #. TRANSLATORS: named item description
-#: src/gui/popups/itempopup.cpp:290
+#: src/gui/popups/itempopup.cpp:289
 #, c-format
 msgid "Item named: %s"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:317
+#: src/gui/popups/itempopup.cpp:316
 msgid "Cards: "
 msgstr ""
 
@@ -2142,7 +2142,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:831 src/gui/windows/npcdialog.cpp:127
+#: src/gui/popups/popupmenu.cpp:831 src/gui/windows/npcdialog.cpp:126
 msgid "Clear"
 msgstr ""
 
@@ -2484,8 +2484,9 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/popups/popupmenu.cpp:2379 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:68 src/gui/windows/statuswindow.cpp:243
+#: src/gui/windows/statuswindow.cpp:367
 #, c-format
 msgid "Level: %d"
 msgstr "Nivo: %d"
@@ -2904,8 +2905,8 @@ msgstr ""
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3093 src/gui/popups/popupmenu.cpp:3112
 #: src/gui/popups/popupmenu.cpp:3125 src/gui/windows/charselectdialog.cpp:76
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:408
-#: src/net/eathena/charserverrecv.cpp:444
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:401
+#: src/net/eathena/charserverrecv.cpp:437
 msgid "Info"
 msgstr ""
 
@@ -3324,7 +3325,7 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:132
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:131
 #: src/gui/windows/serverdialog.cpp:113 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:85
 msgid "Add"
@@ -3352,7 +3353,7 @@ msgstr ""
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:192
-#: src/gui/windows/itemamountwindow.cpp:228 src/gui/windows/npcdialog.cpp:123
+#: src/gui/windows/itemamountwindow.cpp:228 src/gui/windows/npcdialog.cpp:122
 #: src/gui/windows/statuswindow.cpp:746
 msgid "+"
 msgstr ""
@@ -3364,7 +3365,7 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:190
-#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:125
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:124
 msgid "-"
 msgstr ""
 
@@ -3531,13 +3532,15 @@ msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104
+#: src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109
+#: src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr ""
 
@@ -3548,19 +3551,22 @@ 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 ""
 
@@ -3994,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:116
+#: src/gui/widgets/tabs/setup_colors.cpp:86
+#: src/gui/windows/emotewindow.cpp:116
 msgid "Colors"
 msgstr "Boje"
 
@@ -4026,11 +4032,9 @@ 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
@@ -4057,11 +4061,9 @@ 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
@@ -4072,9 +4074,7 @@ 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 ""
@@ -4115,8 +4115,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
@@ -4127,11 +4127,9 @@ 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
@@ -4142,11 +4140,9 @@ 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,13 +4158,9 @@ 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
@@ -4181,8 +4173,7 @@ msgstr ""
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
-"usually makes little difference."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4201,12 +4192,9 @@ 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
@@ -4217,8 +4205,7 @@ 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 ""
@@ -4231,11 +4218,9 @@ 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
@@ -4260,11 +4245,9 @@ 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
@@ -4275,8 +4258,7 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this "
-"feature.\n"
+"If this feature enabled, language tab will appear if server supports this feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
 msgstr ""
@@ -4289,9 +4271,7 @@ 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 ""
@@ -4304,9 +4284,7 @@ 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 ""
@@ -4332,10 +4310,7 @@ 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 ""
@@ -4370,8 +4345,7 @@ 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 ""
@@ -4384,8 +4358,7 @@ 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 ""
@@ -4398,12 +4371,9 @@ 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
@@ -4517,9 +4487,7 @@ 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
@@ -4690,8 +4658,8 @@ msgstr ""
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
 #: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:114
-#: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:60
-#: src/gui/windows/minimap.cpp:123
+#: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:59
+#: src/gui/windows/minimap.cpp:122
 msgid "Map"
 msgstr ""
 
@@ -4882,7 +4850,7 @@ msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:292 src/gui/windows/npcdialog.cpp:99
+#: src/gui/widgets/tabs/setup_other.cpp:292 src/gui/windows/npcdialog.cpp:98
 msgid "NPC"
 msgstr ""
 
@@ -6149,7 +6117,8 @@ 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 ""
 
@@ -6268,7 +6237,8 @@ msgstr ""
 #: src/gui/windows/charcreatedialog.cpp:193
 #: src/gui/windows/charcreatedialog.cpp:206
 #: src/gui/windows/charcreatedialog.cpp:217
-#: src/gui/windows/charcreatedialog.cpp:227 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:227
+#: src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ""
 
@@ -6286,7 +6256,8 @@ msgstr ""
 #: src/gui/windows/charcreatedialog.cpp:197
 #: src/gui/windows/charcreatedialog.cpp:208
 #: src/gui/windows/charcreatedialog.cpp:219
-#: src/gui/windows/charcreatedialog.cpp:229 src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:229
+#: src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr ""
 
@@ -6312,7 +6283,8 @@ msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:248 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:248
+#: src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr ""
 
@@ -6514,7 +6486,8 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:111
+#: src/gui/windows/editserverdialog.cpp:57
+#: src/gui/windows/serverdialog.cpp:111
 msgid "Connect"
 msgstr "Koncija"
 
@@ -6868,26 +6841,28 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:73
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:72
 msgid "Subject:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:104
+#: src/gui/windows/maileditwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:103
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:123
-#: src/gui/windows/mailviewwindow.cpp:132
+#: src/gui/windows/maileditwindow.cpp:63
+#: src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:131
 msgid "Item:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:76
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:75
 msgid "Message:"
 msgstr ""
 
@@ -6897,27 +6872,27 @@ msgid "empty subject"
 msgstr ""
 
 #. TRANSLATORS: mail view window name
-#: src/gui/windows/mailviewwindow.cpp:54
+#: src/gui/windows/mailviewwindow.cpp:53
 msgid "View mail"
 msgstr ""
 
 #. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:64
+#: src/gui/windows/mailviewwindow.cpp:63
 msgid "Reply"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:65
 msgid "Time:"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:70
+#: src/gui/windows/mailviewwindow.cpp:69
 msgid "From:"
 msgstr ""
 
 #. TRANSLATORS: mail view attach button
-#: src/gui/windows/mailviewwindow.cpp:141
+#: src/gui/windows/mailviewwindow.cpp:140
 msgid "Get attach"
 msgstr ""
 
@@ -7007,22 +6982,22 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:84
+#: src/gui/windows/npcdialog.cpp:83
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:86
+#: src/gui/windows/npcdialog.cpp:85
 msgid "Next"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:90
+#: src/gui/windows/npcdialog.cpp:89
 msgid "Submit"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:134
+#: src/gui/windows/npcdialog.cpp:133
 msgid "Reset"
 msgstr ""
 
@@ -7585,7 +7560,8 @@ 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
@@ -9064,33 +9040,33 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:387
-#: src/net/eathena/charserverrecv.cpp:435
+#: src/net/eathena/charserverrecv.cpp:380
+#: src/net/eathena/charserverrecv.cpp:428
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:410
+#: src/net/eathena/charserverrecv.cpp:403
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:419
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:423
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:439
+#: src/net/eathena/charserverrecv.cpp:432
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:473 src/net/tmwa/charserverrecv.cpp:294
+#: src/net/eathena/charserverrecv.cpp:466 src/net/tmwa/charserverrecv.cpp:284
 msgid "Failed to delete character."
 msgstr ""
 
@@ -9422,7 +9398,7 @@ msgid "Map not found"
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/net/eathena/inventoryrecv.cpp:844
+#: src/net/eathena/inventoryrecv.cpp:823
 #, c-format
 msgid "Left %s rental time for item %s."
 msgstr ""
@@ -9430,8 +9406,8 @@ msgstr ""
 #. TRANSLATORS: unknown item
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
-#: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:265
+#: src/net/eathena/inventoryrecv.cpp:1176
+#: src/net/eathena/inventoryrecv.cpp:1309 src/resources/db/itemdb.cpp:265
 msgid "Unknown item"
 msgstr ""
 
diff --git a/po/sv.po b/po/sv.po
index 8cada332d..a3358a4d4 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,26 +1,25 @@
 # 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-05-29 14:56+0300\n"
+"POT-Creation-Date: 2016-05-20 19:25+0300\n"
 "PO-Revision-Date: 2016-05-21 09:33+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: sv_SE\n"
+"Language-Team: Swedish (Sweden) (http://www.transifex.com/akaras/manaplus/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
-#: src/actions/actions.cpp:167
+#: src/actions/actions.cpp:166
 msgid "File uploaded"
 msgstr ""
 
@@ -33,7 +32,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:170 src/client.cpp:1553 src/client.cpp:1588
+#: src/actions/actions.cpp:169 src/client.cpp:1549 src/client.cpp:1584
 #: 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
@@ -53,67 +52,67 @@ 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:412
-#: src/net/eathena/charserverrecv.cpp:447
-#: src/net/eathena/charserverrecv.cpp:475 src/net/tmwa/charserverrecv.cpp:296
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:405
+#: src/net/eathena/charserverrecv.cpp:440
+#: src/net/eathena/charserverrecv.cpp:468 src/net/tmwa/charserverrecv.cpp:286
 msgid "OK"
 msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1044 src/actions/actions.cpp:1057
+#: src/actions/actions.cpp:1043 src/actions/actions.cpp:1056
 msgid "Cache cleaned"
 msgstr "Cache rensad"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1214 src/actions/actions.cpp:1220
+#: src/actions/actions.cpp:1213 src/actions/actions.cpp:1219
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Klientupptid: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1286
+#: src/actions/actions.cpp:1276 src/actions/actions.cpp:1285
 msgid "Resource images:"
 msgstr "Resurs-bilder:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1280 src/actions/actions.cpp:1290
+#: src/actions/actions.cpp:1279 src/actions/actions.cpp:1289
 msgid "Resource orphaned images:"
 msgstr "Föräldralösa resurs-bilder:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1385
+#: src/actions/actions.cpp:1384
 msgid "Environment variables dumped"
 msgstr "Omgivningsvariabler dumpade"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1502
+#: src/actions/actions.cpp:1501
 msgid "Uploaded config into:"
 msgstr ""
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1512
+#: src/actions/actions.cpp:1511
 msgid "Uploaded server config into:"
 msgstr ""
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1522
+#: src/actions/actions.cpp:1521
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: last seen disabled warning
-#: src/actions/actions.cpp:1747
+#: src/actions/actions.cpp:1746
 msgid ""
 "Last seen disabled. Enable in players / collect players id and seen log."
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/actions/actions.cpp:1766 src/actions/actions.cpp:1780
+#: src/actions/actions.cpp:1765 src/actions/actions.cpp:1779
 msgid "You not saw this nick."
 msgstr ""
 
 #. TRANSLATORS: last seen message
-#: src/actions/actions.cpp:1772
+#: src/actions/actions.cpp:1771
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr ""
@@ -472,41 +471,41 @@ msgstr "Floating bubble"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:856 src/dyetool/client.cpp:485 src/gui/windowmenu.cpp:189
+#: src/client.cpp:852 src/dyetool/client.cpp:482 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:65
 msgid "Setup"
 msgstr "Inställningar"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:859 src/dyetool/client.cpp:488
+#: src/client.cpp:855 src/dyetool/client.cpp:485
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:862 src/dyetool/client.cpp:491
+#: src/client.cpp:858 src/dyetool/client.cpp:488
 #: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:865 src/dyetool/client.cpp:494
+#: src/client.cpp:861 src/dyetool/client.cpp:491
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:868 src/dyetool/client.cpp:497
+#: src/client.cpp:864 src/dyetool/client.cpp:494
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:871 src/dyetool/client.cpp:500 src/gui/windowmenu.cpp:74
+#: src/client.cpp:867 src/dyetool/client.cpp:497 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Hjälp"
@@ -527,45 +526,45 @@ msgstr "Hjälp"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:875 src/client.cpp:1467 src/client.cpp:1486
-#: src/dyetool/client.cpp:504 src/gui/dialogsmanager.cpp:116
+#: src/client.cpp:871 src/client.cpp:1463 src/client.cpp:1482
+#: src/dyetool/client.cpp:501 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:749 src/gui/popups/popupmenu.cpp:826
 #: src/gui/popups/popupmenu.cpp:1080 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:273
 #: src/gui/windows/inventorywindow.cpp:297
-#: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:60
-#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:130
+#: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
+#: src/gui/windows/npcdialog.cpp:87 src/gui/windows/npcdialog.cpp:129
 #: src/gui/windows/questswindow.cpp:77 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Stäng"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1100 src/gui/windowmanager_unittest.cc:158
+#: src/client.cpp:1096 src/gui/windowmanager_unittest.cc:157
 msgid "Connecting to server"
 msgstr "Ansluter till server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1157 src/gui/windowmanager_unittest.cc:175
+#: src/client.cpp:1153 src/gui/windowmanager_unittest.cc:174
 msgid "Logging in"
 msgstr "Loggar in"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1206
+#: src/client.cpp:1202
 msgid "Entering game world"
 msgstr "Går in i spelvärld"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1353
+#: src/client.cpp:1349
 msgid "Requesting characters"
 msgstr "Begär karaktärer"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1396
+#: src/client.cpp:1392
 msgid "Connecting to the game server"
 msgstr "Ansluter till spelservern"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1408
+#: src/client.cpp:1404
 msgid "Changing game servers"
 msgstr "Ändrar spelserver"
 
@@ -582,7 +581,7 @@ msgstr "Ändrar spelserver"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1464 src/client.cpp:1483 src/client.cpp:1722
+#: src/client.cpp:1460 src/client.cpp:1479 src/client.cpp:1718
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:468
@@ -590,44 +589,44 @@ msgstr "Ändrar spelserver"
 #: 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:385
-#: src/net/eathena/charserverrecv.cpp:389
-#: src/net/eathena/charserverrecv.cpp:471 src/net/tmwa/charserverrecv.cpp:292
+#: src/net/eathena/charserverrecv.cpp:378
+#: src/net/eathena/charserverrecv.cpp:382
+#: src/net/eathena/charserverrecv.cpp:464 src/net/tmwa/charserverrecv.cpp:282
 msgid "Error"
 msgstr "Error"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1502
+#: src/client.cpp:1498
 msgid "Requesting registration details"
 msgstr "Begär registreringsuppgifter"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1549
+#: src/client.cpp:1545
 msgid "Password Change"
 msgstr "Lösenordsändring"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1551
+#: src/client.cpp:1547
 msgid "Password changed successfully!"
 msgstr "Lösenordsändring har lyckats!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1584
+#: src/client.cpp:1580
 msgid "Email Change"
 msgstr "Byte av E-post"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1586
+#: src/client.cpp:1582
 msgid "Email changed successfully!"
 msgstr "E-posten har ändrats!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1622
+#: src/client.cpp:1618
 msgid "Unregister Successful"
 msgstr "Avregistrering lyckad"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1624
+#: src/client.cpp:1620
 msgid "Farewell, come back any time..."
 msgstr "Farväl, kom gärna tillbaka snart igen..."
 
@@ -679,8 +678,7 @@ 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
@@ -755,9 +753,7 @@ 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
@@ -794,52 +790,52 @@ msgid "%s doesn't exist and can't be created!"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:51
+#: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:53
+#: src/dyetool/dyemain.cpp:50
 msgid "or"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:55
+#: src/dyetool/dyemain.cpp:52
 msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: chat tab name
-#: src/game.cpp:267 src/gui/windows/chatwindow.cpp:2222
+#: src/game.cpp:266 src/gui/windows/chatwindow.cpp:2222
 msgid "General"
 msgstr "General"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:274 src/gui/windowmenu.cpp:175
+#: src/game.cpp:273 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:582
+#: src/game.cpp:581
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Skärmdump sparades som %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:592
+#: src/game.cpp:591
 msgid "Saving screenshot failed!"
 msgstr "Spara skärmdump misslyckades!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:679
+#: src/game.cpp:678
 msgid "The connection to the server was lost."
 msgstr "Anslutningen till servern förlorades."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:682
+#: src/game.cpp:681
 msgid "Network Error"
 msgstr "Nätverksfel"
 
@@ -1254,7 +1250,8 @@ 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
@@ -1271,7 +1268,8 @@ 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:602
+#: src/gui/windows/equipmentwindow.cpp:671
+#: src/gui/windows/serverdialog.cpp:602
 msgid "default"
 msgstr "standard"
 
@@ -1789,19 +1787,19 @@ msgid "Cancel"
 msgstr "Avbryt"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:223
+#: src/gui/popups/itempopup.cpp:222
 #, c-format
 msgid "Weight: %s"
 msgstr "Vikt: %s"
 
 #. TRANSLATORS: named item description
-#: src/gui/popups/itempopup.cpp:290
+#: src/gui/popups/itempopup.cpp:289
 #, c-format
 msgid "Item named: %s"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:317
+#: src/gui/popups/itempopup.cpp:316
 msgid "Cards: "
 msgstr ""
 
@@ -2142,7 +2140,7 @@ msgstr "Ändra spell"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:831 src/gui/windows/npcdialog.cpp:127
+#: src/gui/popups/popupmenu.cpp:831 src/gui/windows/npcdialog.cpp:126
 msgid "Clear"
 msgstr "Clear"
 
@@ -2484,8 +2482,9 @@ msgstr "Visa fönster"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/popups/popupmenu.cpp:2379 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:68 src/gui/windows/statuswindow.cpp:243
+#: src/gui/windows/statuswindow.cpp:367
 #, c-format
 msgid "Level: %d"
 msgstr "Level: %d"
@@ -2904,8 +2903,8 @@ msgstr ""
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3093 src/gui/popups/popupmenu.cpp:3112
 #: src/gui/popups/popupmenu.cpp:3125 src/gui/windows/charselectdialog.cpp:76
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:408
-#: src/net/eathena/charserverrecv.cpp:444
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:401
+#: src/net/eathena/charserverrecv.cpp:437
 msgid "Info"
 msgstr "Info"
 
@@ -3324,7 +3323,7 @@ msgstr "Öppna url"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:132
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:131
 #: src/gui/windows/serverdialog.cpp:113 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:85
 msgid "Add"
@@ -3352,7 +3351,7 @@ msgstr "Avsluta"
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:192
-#: src/gui/windows/itemamountwindow.cpp:228 src/gui/windows/npcdialog.cpp:123
+#: src/gui/windows/itemamountwindow.cpp:228 src/gui/windows/npcdialog.cpp:122
 #: src/gui/windows/statuswindow.cpp:746
 msgid "+"
 msgstr "+"
@@ -3364,7 +3363,7 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:190
-#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:125
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:124
 msgid "-"
 msgstr "-"
 
@@ -3531,13 +3530,15 @@ 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."
 
@@ -3548,19 +3549,22 @@ 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."
 
@@ -3994,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:116
+#: src/gui/widgets/tabs/setup_colors.cpp:86
+#: src/gui/windows/emotewindow.cpp:116
 msgid "Colors"
 msgstr "Färger"
 
@@ -4026,11 +4030,9 @@ 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
@@ -4057,11 +4059,9 @@ 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
@@ -4072,9 +4072,7 @@ 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 ""
@@ -4115,8 +4113,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
@@ -4127,11 +4125,9 @@ 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
@@ -4142,11 +4138,9 @@ 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,13 +4156,9 @@ 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
@@ -4181,8 +4171,7 @@ 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
@@ -4201,12 +4190,9 @@ 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
@@ -4217,8 +4203,7 @@ 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 ""
@@ -4231,11 +4216,9 @@ 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
@@ -4260,11 +4243,9 @@ 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
@@ -4275,8 +4256,7 @@ 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 ""
@@ -4289,9 +4269,7 @@ 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 ""
@@ -4304,9 +4282,7 @@ 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 ""
@@ -4332,10 +4308,7 @@ 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 ""
@@ -4370,8 +4343,7 @@ 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 ""
@@ -4384,8 +4356,7 @@ 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 ""
@@ -4398,12 +4369,9 @@ 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
@@ -4517,9 +4485,7 @@ 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
@@ -4690,8 +4656,8 @@ msgstr "Cycle monsters targets"
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
 #: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:114
-#: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:60
-#: src/gui/windows/minimap.cpp:123
+#: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:59
+#: src/gui/windows/minimap.cpp:122
 msgid "Map"
 msgstr "Karta"
 
@@ -4882,7 +4848,7 @@ msgstr "Aktivera shop mode"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:292 src/gui/windows/npcdialog.cpp:99
+#: src/gui/widgets/tabs/setup_other.cpp:292 src/gui/windows/npcdialog.cpp:98
 msgid "NPC"
 msgstr "NPC"
 
@@ -4904,8 +4870,7 @@ 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
@@ -5568,17 +5533,13 @@ msgstr "Ingen"
 #: src/gui/widgets/tabs/setup_video.cpp:229
 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:236
 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:249
@@ -6154,7 +6115,8 @@ 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"
 
@@ -6273,7 +6235,8 @@ msgstr "^"
 #: src/gui/windows/charcreatedialog.cpp:193
 #: src/gui/windows/charcreatedialog.cpp:206
 #: src/gui/windows/charcreatedialog.cpp:217
-#: src/gui/windows/charcreatedialog.cpp:227 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:227
+#: src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -6291,7 +6254,8 @@ msgstr "Vänligen distribuera %d poäng"
 #: src/gui/windows/charcreatedialog.cpp:197
 #: src/gui/windows/charcreatedialog.cpp:208
 #: src/gui/windows/charcreatedialog.cpp:219
-#: src/gui/windows/charcreatedialog.cpp:229 src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:229
+#: src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -6317,7 +6281,8 @@ 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:248 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:248
+#: src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr "F"
 
@@ -6416,12 +6381,7 @@ msgid ""
 "Level: %u\n"
 "Experience: %u\n"
 "Money: %s"
-msgstr ""
-"Hp: %u/%u⏎\n"
-"Mp: %u/%u⏎\n"
-"Level: %u⏎\n"
-"Experience: %u⏎\n"
-"Money: %s"
+msgstr "Hp: %u/%u⏎\nMp: %u/%u⏎\nLevel: %u⏎\nExperience: %u⏎\nMoney: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/charselectdialog.cpp:308
@@ -6524,7 +6484,8 @@ msgstr "Editera Server"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:111
+#: src/gui/windows/editserverdialog.cpp:57
+#: src/gui/windows/serverdialog.cpp:111
 msgid "Connect"
 msgstr "Anslut"
 
@@ -6566,9 +6527,7 @@ 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
@@ -6878,26 +6837,28 @@ msgstr "Till:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:73
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:72
 msgid "Subject:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:104
+#: src/gui/windows/maileditwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:103
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:123
-#: src/gui/windows/mailviewwindow.cpp:132
+#: src/gui/windows/maileditwindow.cpp:63
+#: src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:131
 msgid "Item:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:76
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:75
 msgid "Message:"
 msgstr ""
 
@@ -6907,27 +6868,27 @@ msgid "empty subject"
 msgstr ""
 
 #. TRANSLATORS: mail view window name
-#: src/gui/windows/mailviewwindow.cpp:54
+#: src/gui/windows/mailviewwindow.cpp:53
 msgid "View mail"
 msgstr ""
 
 #. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:64
+#: src/gui/windows/mailviewwindow.cpp:63
 msgid "Reply"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:65
 msgid "Time:"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:70
+#: src/gui/windows/mailviewwindow.cpp:69
 msgid "From:"
 msgstr ""
 
 #. TRANSLATORS: mail view attach button
-#: src/gui/windows/mailviewwindow.cpp:141
+#: src/gui/windows/mailviewwindow.cpp:140
 msgid "Get attach"
 msgstr ""
 
@@ -7017,22 +6978,22 @@ msgid "Job level: %d"
 msgstr "Jobb level: %d"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:84
+#: src/gui/windows/npcdialog.cpp:83
 msgid "Stop waiting"
 msgstr "Sluta vänta"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:86
+#: src/gui/windows/npcdialog.cpp:85
 msgid "Next"
 msgstr "Nästa"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:90
+#: src/gui/windows/npcdialog.cpp:89
 msgid "Submit"
 msgstr "Submit"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:134
+#: src/gui/windows/npcdialog.cpp:133
 msgid "Reset"
 msgstr "Återställ"
 
@@ -7595,10 +7556,9 @@ 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
@@ -8880,9 +8840,7 @@ 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
@@ -9025,8 +8983,7 @@ 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
@@ -9039,9 +8996,7 @@ 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
@@ -9081,33 +9036,33 @@ msgstr "Anslutningen till servern avslutad. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:387
-#: src/net/eathena/charserverrecv.cpp:435
+#: src/net/eathena/charserverrecv.cpp:380
+#: src/net/eathena/charserverrecv.cpp:428
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:410
+#: src/net/eathena/charserverrecv.cpp:403
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:419
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:423
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:439
+#: src/net/eathena/charserverrecv.cpp:432
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:473 src/net/tmwa/charserverrecv.cpp:294
+#: src/net/eathena/charserverrecv.cpp:466 src/net/tmwa/charserverrecv.cpp:284
 msgid "Failed to delete character."
 msgstr "Misslyckades att radera karaktär."
 
@@ -9439,7 +9394,7 @@ msgid "Map not found"
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/net/eathena/inventoryrecv.cpp:844
+#: src/net/eathena/inventoryrecv.cpp:823
 #, c-format
 msgid "Left %s rental time for item %s."
 msgstr ""
@@ -9447,8 +9402,8 @@ msgstr ""
 #. TRANSLATORS: unknown item
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
-#: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:265
+#: src/net/eathena/inventoryrecv.cpp:1176
+#: src/net/eathena/inventoryrecv.cpp:1309 src/resources/db/itemdb.cpp:265
 msgid "Unknown item"
 msgstr "Okänt item"
 
@@ -10898,9 +10853,7 @@ msgstr ""
 #: src/utils/booleanoptions.h:27
 #, 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
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 8cada332d..a3358a4d4 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -1,26 +1,25 @@
 # 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-05-29 14:56+0300\n"
+"POT-Creation-Date: 2016-05-20 19:25+0300\n"
 "PO-Revision-Date: 2016-05-21 09:33+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: sv_SE\n"
+"Language-Team: Swedish (Sweden) (http://www.transifex.com/akaras/manaplus/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
-#: src/actions/actions.cpp:167
+#: src/actions/actions.cpp:166
 msgid "File uploaded"
 msgstr ""
 
@@ -33,7 +32,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:170 src/client.cpp:1553 src/client.cpp:1588
+#: src/actions/actions.cpp:169 src/client.cpp:1549 src/client.cpp:1584
 #: 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
@@ -53,67 +52,67 @@ 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:412
-#: src/net/eathena/charserverrecv.cpp:447
-#: src/net/eathena/charserverrecv.cpp:475 src/net/tmwa/charserverrecv.cpp:296
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:405
+#: src/net/eathena/charserverrecv.cpp:440
+#: src/net/eathena/charserverrecv.cpp:468 src/net/tmwa/charserverrecv.cpp:286
 msgid "OK"
 msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1044 src/actions/actions.cpp:1057
+#: src/actions/actions.cpp:1043 src/actions/actions.cpp:1056
 msgid "Cache cleaned"
 msgstr "Cache rensad"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1214 src/actions/actions.cpp:1220
+#: src/actions/actions.cpp:1213 src/actions/actions.cpp:1219
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Klientupptid: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1286
+#: src/actions/actions.cpp:1276 src/actions/actions.cpp:1285
 msgid "Resource images:"
 msgstr "Resurs-bilder:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1280 src/actions/actions.cpp:1290
+#: src/actions/actions.cpp:1279 src/actions/actions.cpp:1289
 msgid "Resource orphaned images:"
 msgstr "Föräldralösa resurs-bilder:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1385
+#: src/actions/actions.cpp:1384
 msgid "Environment variables dumped"
 msgstr "Omgivningsvariabler dumpade"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1502
+#: src/actions/actions.cpp:1501
 msgid "Uploaded config into:"
 msgstr ""
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1512
+#: src/actions/actions.cpp:1511
 msgid "Uploaded server config into:"
 msgstr ""
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1522
+#: src/actions/actions.cpp:1521
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: last seen disabled warning
-#: src/actions/actions.cpp:1747
+#: src/actions/actions.cpp:1746
 msgid ""
 "Last seen disabled. Enable in players / collect players id and seen log."
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/actions/actions.cpp:1766 src/actions/actions.cpp:1780
+#: src/actions/actions.cpp:1765 src/actions/actions.cpp:1779
 msgid "You not saw this nick."
 msgstr ""
 
 #. TRANSLATORS: last seen message
-#: src/actions/actions.cpp:1772
+#: src/actions/actions.cpp:1771
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr ""
@@ -472,41 +471,41 @@ msgstr "Floating bubble"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:856 src/dyetool/client.cpp:485 src/gui/windowmenu.cpp:189
+#: src/client.cpp:852 src/dyetool/client.cpp:482 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:65
 msgid "Setup"
 msgstr "Inställningar"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:859 src/dyetool/client.cpp:488
+#: src/client.cpp:855 src/dyetool/client.cpp:485
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:862 src/dyetool/client.cpp:491
+#: src/client.cpp:858 src/dyetool/client.cpp:488
 #: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:865 src/dyetool/client.cpp:494
+#: src/client.cpp:861 src/dyetool/client.cpp:491
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:868 src/dyetool/client.cpp:497
+#: src/client.cpp:864 src/dyetool/client.cpp:494
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:871 src/dyetool/client.cpp:500 src/gui/windowmenu.cpp:74
+#: src/client.cpp:867 src/dyetool/client.cpp:497 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Hjälp"
@@ -527,45 +526,45 @@ msgstr "Hjälp"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:875 src/client.cpp:1467 src/client.cpp:1486
-#: src/dyetool/client.cpp:504 src/gui/dialogsmanager.cpp:116
+#: src/client.cpp:871 src/client.cpp:1463 src/client.cpp:1482
+#: src/dyetool/client.cpp:501 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:749 src/gui/popups/popupmenu.cpp:826
 #: src/gui/popups/popupmenu.cpp:1080 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:273
 #: src/gui/windows/inventorywindow.cpp:297
-#: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:60
-#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:130
+#: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
+#: src/gui/windows/npcdialog.cpp:87 src/gui/windows/npcdialog.cpp:129
 #: src/gui/windows/questswindow.cpp:77 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Stäng"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1100 src/gui/windowmanager_unittest.cc:158
+#: src/client.cpp:1096 src/gui/windowmanager_unittest.cc:157
 msgid "Connecting to server"
 msgstr "Ansluter till server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1157 src/gui/windowmanager_unittest.cc:175
+#: src/client.cpp:1153 src/gui/windowmanager_unittest.cc:174
 msgid "Logging in"
 msgstr "Loggar in"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1206
+#: src/client.cpp:1202
 msgid "Entering game world"
 msgstr "Går in i spelvärld"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1353
+#: src/client.cpp:1349
 msgid "Requesting characters"
 msgstr "Begär karaktärer"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1396
+#: src/client.cpp:1392
 msgid "Connecting to the game server"
 msgstr "Ansluter till spelservern"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1408
+#: src/client.cpp:1404
 msgid "Changing game servers"
 msgstr "Ändrar spelserver"
 
@@ -582,7 +581,7 @@ msgstr "Ändrar spelserver"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1464 src/client.cpp:1483 src/client.cpp:1722
+#: src/client.cpp:1460 src/client.cpp:1479 src/client.cpp:1718
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:468
@@ -590,44 +589,44 @@ msgstr "Ändrar spelserver"
 #: 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:385
-#: src/net/eathena/charserverrecv.cpp:389
-#: src/net/eathena/charserverrecv.cpp:471 src/net/tmwa/charserverrecv.cpp:292
+#: src/net/eathena/charserverrecv.cpp:378
+#: src/net/eathena/charserverrecv.cpp:382
+#: src/net/eathena/charserverrecv.cpp:464 src/net/tmwa/charserverrecv.cpp:282
 msgid "Error"
 msgstr "Error"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1502
+#: src/client.cpp:1498
 msgid "Requesting registration details"
 msgstr "Begär registreringsuppgifter"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1549
+#: src/client.cpp:1545
 msgid "Password Change"
 msgstr "Lösenordsändring"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1551
+#: src/client.cpp:1547
 msgid "Password changed successfully!"
 msgstr "Lösenordsändring har lyckats!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1584
+#: src/client.cpp:1580
 msgid "Email Change"
 msgstr "Byte av E-post"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1586
+#: src/client.cpp:1582
 msgid "Email changed successfully!"
 msgstr "E-posten har ändrats!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1622
+#: src/client.cpp:1618
 msgid "Unregister Successful"
 msgstr "Avregistrering lyckad"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1624
+#: src/client.cpp:1620
 msgid "Farewell, come back any time..."
 msgstr "Farväl, kom gärna tillbaka snart igen..."
 
@@ -679,8 +678,7 @@ 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
@@ -755,9 +753,7 @@ 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
@@ -794,52 +790,52 @@ msgid "%s doesn't exist and can't be created!"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:51
+#: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:53
+#: src/dyetool/dyemain.cpp:50
 msgid "or"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:55
+#: src/dyetool/dyemain.cpp:52
 msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: chat tab name
-#: src/game.cpp:267 src/gui/windows/chatwindow.cpp:2222
+#: src/game.cpp:266 src/gui/windows/chatwindow.cpp:2222
 msgid "General"
 msgstr "General"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:274 src/gui/windowmenu.cpp:175
+#: src/game.cpp:273 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:582
+#: src/game.cpp:581
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Skärmdump sparades som %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:592
+#: src/game.cpp:591
 msgid "Saving screenshot failed!"
 msgstr "Spara skärmdump misslyckades!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:679
+#: src/game.cpp:678
 msgid "The connection to the server was lost."
 msgstr "Anslutningen till servern förlorades."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:682
+#: src/game.cpp:681
 msgid "Network Error"
 msgstr "Nätverksfel"
 
@@ -1254,7 +1250,8 @@ 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
@@ -1271,7 +1268,8 @@ 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:602
+#: src/gui/windows/equipmentwindow.cpp:671
+#: src/gui/windows/serverdialog.cpp:602
 msgid "default"
 msgstr "standard"
 
@@ -1789,19 +1787,19 @@ msgid "Cancel"
 msgstr "Avbryt"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:223
+#: src/gui/popups/itempopup.cpp:222
 #, c-format
 msgid "Weight: %s"
 msgstr "Vikt: %s"
 
 #. TRANSLATORS: named item description
-#: src/gui/popups/itempopup.cpp:290
+#: src/gui/popups/itempopup.cpp:289
 #, c-format
 msgid "Item named: %s"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:317
+#: src/gui/popups/itempopup.cpp:316
 msgid "Cards: "
 msgstr ""
 
@@ -2142,7 +2140,7 @@ msgstr "Ändra spell"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:831 src/gui/windows/npcdialog.cpp:127
+#: src/gui/popups/popupmenu.cpp:831 src/gui/windows/npcdialog.cpp:126
 msgid "Clear"
 msgstr "Clear"
 
@@ -2484,8 +2482,9 @@ msgstr "Visa fönster"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/popups/popupmenu.cpp:2379 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:68 src/gui/windows/statuswindow.cpp:243
+#: src/gui/windows/statuswindow.cpp:367
 #, c-format
 msgid "Level: %d"
 msgstr "Level: %d"
@@ -2904,8 +2903,8 @@ msgstr ""
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3093 src/gui/popups/popupmenu.cpp:3112
 #: src/gui/popups/popupmenu.cpp:3125 src/gui/windows/charselectdialog.cpp:76
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:408
-#: src/net/eathena/charserverrecv.cpp:444
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:401
+#: src/net/eathena/charserverrecv.cpp:437
 msgid "Info"
 msgstr "Info"
 
@@ -3324,7 +3323,7 @@ msgstr "Öppna url"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:132
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:131
 #: src/gui/windows/serverdialog.cpp:113 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:85
 msgid "Add"
@@ -3352,7 +3351,7 @@ msgstr "Avsluta"
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:192
-#: src/gui/windows/itemamountwindow.cpp:228 src/gui/windows/npcdialog.cpp:123
+#: src/gui/windows/itemamountwindow.cpp:228 src/gui/windows/npcdialog.cpp:122
 #: src/gui/windows/statuswindow.cpp:746
 msgid "+"
 msgstr "+"
@@ -3364,7 +3363,7 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:190
-#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:125
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:124
 msgid "-"
 msgstr "-"
 
@@ -3531,13 +3530,15 @@ 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."
 
@@ -3548,19 +3549,22 @@ 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."
 
@@ -3994,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:116
+#: src/gui/widgets/tabs/setup_colors.cpp:86
+#: src/gui/windows/emotewindow.cpp:116
 msgid "Colors"
 msgstr "Färger"
 
@@ -4026,11 +4030,9 @@ 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
@@ -4057,11 +4059,9 @@ 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
@@ -4072,9 +4072,7 @@ 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 ""
@@ -4115,8 +4113,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
@@ -4127,11 +4125,9 @@ 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
@@ -4142,11 +4138,9 @@ 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,13 +4156,9 @@ 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
@@ -4181,8 +4171,7 @@ 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
@@ -4201,12 +4190,9 @@ 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
@@ -4217,8 +4203,7 @@ 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 ""
@@ -4231,11 +4216,9 @@ 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
@@ -4260,11 +4243,9 @@ 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
@@ -4275,8 +4256,7 @@ 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 ""
@@ -4289,9 +4269,7 @@ 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 ""
@@ -4304,9 +4282,7 @@ 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 ""
@@ -4332,10 +4308,7 @@ 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 ""
@@ -4370,8 +4343,7 @@ 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 ""
@@ -4384,8 +4356,7 @@ 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 ""
@@ -4398,12 +4369,9 @@ 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
@@ -4517,9 +4485,7 @@ 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
@@ -4690,8 +4656,8 @@ msgstr "Cycle monsters targets"
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
 #: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:114
-#: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:60
-#: src/gui/windows/minimap.cpp:123
+#: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:59
+#: src/gui/windows/minimap.cpp:122
 msgid "Map"
 msgstr "Karta"
 
@@ -4882,7 +4848,7 @@ msgstr "Aktivera shop mode"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:292 src/gui/windows/npcdialog.cpp:99
+#: src/gui/widgets/tabs/setup_other.cpp:292 src/gui/windows/npcdialog.cpp:98
 msgid "NPC"
 msgstr "NPC"
 
@@ -4904,8 +4870,7 @@ 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
@@ -5568,17 +5533,13 @@ msgstr "Ingen"
 #: src/gui/widgets/tabs/setup_video.cpp:229
 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:236
 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:249
@@ -6154,7 +6115,8 @@ 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"
 
@@ -6273,7 +6235,8 @@ msgstr "^"
 #: src/gui/windows/charcreatedialog.cpp:193
 #: src/gui/windows/charcreatedialog.cpp:206
 #: src/gui/windows/charcreatedialog.cpp:217
-#: src/gui/windows/charcreatedialog.cpp:227 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:227
+#: src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -6291,7 +6254,8 @@ msgstr "Vänligen distribuera %d poäng"
 #: src/gui/windows/charcreatedialog.cpp:197
 #: src/gui/windows/charcreatedialog.cpp:208
 #: src/gui/windows/charcreatedialog.cpp:219
-#: src/gui/windows/charcreatedialog.cpp:229 src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:229
+#: src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -6317,7 +6281,8 @@ 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:248 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:248
+#: src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr "F"
 
@@ -6416,12 +6381,7 @@ msgid ""
 "Level: %u\n"
 "Experience: %u\n"
 "Money: %s"
-msgstr ""
-"Hp: %u/%u⏎\n"
-"Mp: %u/%u⏎\n"
-"Level: %u⏎\n"
-"Experience: %u⏎\n"
-"Money: %s"
+msgstr "Hp: %u/%u⏎\nMp: %u/%u⏎\nLevel: %u⏎\nExperience: %u⏎\nMoney: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/charselectdialog.cpp:308
@@ -6524,7 +6484,8 @@ msgstr "Editera Server"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:111
+#: src/gui/windows/editserverdialog.cpp:57
+#: src/gui/windows/serverdialog.cpp:111
 msgid "Connect"
 msgstr "Anslut"
 
@@ -6566,9 +6527,7 @@ 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
@@ -6878,26 +6837,28 @@ msgstr "Till:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:73
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:72
 msgid "Subject:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:104
+#: src/gui/windows/maileditwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:103
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:123
-#: src/gui/windows/mailviewwindow.cpp:132
+#: src/gui/windows/maileditwindow.cpp:63
+#: src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:131
 msgid "Item:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:76
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:75
 msgid "Message:"
 msgstr ""
 
@@ -6907,27 +6868,27 @@ msgid "empty subject"
 msgstr ""
 
 #. TRANSLATORS: mail view window name
-#: src/gui/windows/mailviewwindow.cpp:54
+#: src/gui/windows/mailviewwindow.cpp:53
 msgid "View mail"
 msgstr ""
 
 #. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:64
+#: src/gui/windows/mailviewwindow.cpp:63
 msgid "Reply"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:65
 msgid "Time:"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:70
+#: src/gui/windows/mailviewwindow.cpp:69
 msgid "From:"
 msgstr ""
 
 #. TRANSLATORS: mail view attach button
-#: src/gui/windows/mailviewwindow.cpp:141
+#: src/gui/windows/mailviewwindow.cpp:140
 msgid "Get attach"
 msgstr ""
 
@@ -7017,22 +6978,22 @@ msgid "Job level: %d"
 msgstr "Jobb level: %d"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:84
+#: src/gui/windows/npcdialog.cpp:83
 msgid "Stop waiting"
 msgstr "Sluta vänta"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:86
+#: src/gui/windows/npcdialog.cpp:85
 msgid "Next"
 msgstr "Nästa"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:90
+#: src/gui/windows/npcdialog.cpp:89
 msgid "Submit"
 msgstr "Submit"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:134
+#: src/gui/windows/npcdialog.cpp:133
 msgid "Reset"
 msgstr "Återställ"
 
@@ -7595,10 +7556,9 @@ 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
@@ -8880,9 +8840,7 @@ 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
@@ -9025,8 +8983,7 @@ 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
@@ -9039,9 +8996,7 @@ 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
@@ -9081,33 +9036,33 @@ msgstr "Anslutningen till servern avslutad. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:387
-#: src/net/eathena/charserverrecv.cpp:435
+#: src/net/eathena/charserverrecv.cpp:380
+#: src/net/eathena/charserverrecv.cpp:428
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:410
+#: src/net/eathena/charserverrecv.cpp:403
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:419
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:423
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:439
+#: src/net/eathena/charserverrecv.cpp:432
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:473 src/net/tmwa/charserverrecv.cpp:294
+#: src/net/eathena/charserverrecv.cpp:466 src/net/tmwa/charserverrecv.cpp:284
 msgid "Failed to delete character."
 msgstr "Misslyckades att radera karaktär."
 
@@ -9439,7 +9394,7 @@ msgid "Map not found"
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/net/eathena/inventoryrecv.cpp:844
+#: src/net/eathena/inventoryrecv.cpp:823
 #, c-format
 msgid "Left %s rental time for item %s."
 msgstr ""
@@ -9447,8 +9402,8 @@ msgstr ""
 #. TRANSLATORS: unknown item
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
-#: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:265
+#: src/net/eathena/inventoryrecv.cpp:1176
+#: src/net/eathena/inventoryrecv.cpp:1309 src/resources/db/itemdb.cpp:265
 msgid "Unknown item"
 msgstr "Okänt item"
 
@@ -10898,9 +10853,7 @@ msgstr ""
 #: src/utils/booleanoptions.h:27
 #, 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
diff --git a/po/tr.po b/po/tr.po
index a37067a88..ca60d383e 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,19 +10,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-05-29 14:56+0300\n"
+"POT-Creation-Date: 2016-05-20 19:25+0300\n"
 "PO-Revision-Date: 2016-05-21 09:33+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Turkish (http://www.transifex.com/akaras/manaplus/language/"
-"tr/)\n"
-"Language: tr\n"
+"Language-Team: Turkish (http://www.transifex.com/akaras/manaplus/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
-#: src/actions/actions.cpp:167
+#: src/actions/actions.cpp:166
 msgid "File uploaded"
 msgstr "Dosya yüklendi"
 
@@ -35,7 +34,7 @@ msgstr "Dosya yüklendi"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:170 src/client.cpp:1553 src/client.cpp:1588
+#: src/actions/actions.cpp:169 src/client.cpp:1549 src/client.cpp:1584
 #: 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
@@ -55,67 +54,67 @@ 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:412
-#: src/net/eathena/charserverrecv.cpp:447
-#: src/net/eathena/charserverrecv.cpp:475 src/net/tmwa/charserverrecv.cpp:296
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:405
+#: src/net/eathena/charserverrecv.cpp:440
+#: src/net/eathena/charserverrecv.cpp:468 src/net/tmwa/charserverrecv.cpp:286
 msgid "OK"
 msgstr "TAMAM"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1044 src/actions/actions.cpp:1057
+#: src/actions/actions.cpp:1043 src/actions/actions.cpp:1056
 msgid "Cache cleaned"
 msgstr "Bellek temizlendi"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1214 src/actions/actions.cpp:1220
+#: src/actions/actions.cpp:1213 src/actions/actions.cpp:1219
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Client çalışma süresi: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1286
+#: src/actions/actions.cpp:1276 src/actions/actions.cpp:1285
 msgid "Resource images:"
 msgstr "Kaynak resimleri:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1280 src/actions/actions.cpp:1290
+#: src/actions/actions.cpp:1279 src/actions/actions.cpp:1289
 msgid "Resource orphaned images:"
 msgstr "Edinilmiş kaynak resimleri:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1385
+#: src/actions/actions.cpp:1384
 msgid "Environment variables dumped"
 msgstr "Çevre değişkenleri yığıldı"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1502
+#: src/actions/actions.cpp:1501
 msgid "Uploaded config into:"
 msgstr "Config bilgisi şuraya yüklendi:"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1512
+#: src/actions/actions.cpp:1511
 msgid "Uploaded server config into:"
 msgstr "Server configi şuraya yüklendi:"
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1522
+#: src/actions/actions.cpp:1521
 msgid "Uploaded log into:"
 msgstr "Log kayıtları şuraya yüklendi:"
 
 #. TRANSLATORS: last seen disabled warning
-#: src/actions/actions.cpp:1747
+#: src/actions/actions.cpp:1746
 msgid ""
 "Last seen disabled. Enable in players / collect players id and seen log."
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/actions/actions.cpp:1766 src/actions/actions.cpp:1780
+#: src/actions/actions.cpp:1765 src/actions/actions.cpp:1779
 msgid "You not saw this nick."
 msgstr ""
 
 #. TRANSLATORS: last seen message
-#: src/actions/actions.cpp:1772
+#: src/actions/actions.cpp:1771
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr ""
@@ -474,41 +473,41 @@ msgstr "Yüzen balon"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:856 src/dyetool/client.cpp:485 src/gui/windowmenu.cpp:189
+#: src/client.cpp:852 src/dyetool/client.cpp:482 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:65
 msgid "Setup"
 msgstr "Ayarlar"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:859 src/dyetool/client.cpp:488
+#: src/client.cpp:855 src/dyetool/client.cpp:485
 #: 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:862 src/dyetool/client.cpp:491
+#: src/client.cpp:858 src/dyetool/client.cpp:488
 #: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:865 src/dyetool/client.cpp:494
+#: src/client.cpp:861 src/dyetool/client.cpp:491
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:868 src/dyetool/client.cpp:497
+#: src/client.cpp:864 src/dyetool/client.cpp:494
 msgid "About"
 msgstr "Hakkında"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:871 src/dyetool/client.cpp:500 src/gui/windowmenu.cpp:74
+#: src/client.cpp:867 src/dyetool/client.cpp:497 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Yardım"
@@ -529,45 +528,45 @@ msgstr "Yardım"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:875 src/client.cpp:1467 src/client.cpp:1486
-#: src/dyetool/client.cpp:504 src/gui/dialogsmanager.cpp:116
+#: src/client.cpp:871 src/client.cpp:1463 src/client.cpp:1482
+#: src/dyetool/client.cpp:501 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:749 src/gui/popups/popupmenu.cpp:826
 #: src/gui/popups/popupmenu.cpp:1080 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:273
 #: src/gui/windows/inventorywindow.cpp:297
-#: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:60
-#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:130
+#: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
+#: src/gui/windows/npcdialog.cpp:87 src/gui/windows/npcdialog.cpp:129
 #: src/gui/windows/questswindow.cpp:77 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Kapat"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1100 src/gui/windowmanager_unittest.cc:158
+#: src/client.cpp:1096 src/gui/windowmanager_unittest.cc:157
 msgid "Connecting to server"
 msgstr "Sunucuya bağlanılıyor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1157 src/gui/windowmanager_unittest.cc:175
+#: src/client.cpp:1153 src/gui/windowmanager_unittest.cc:174
 msgid "Logging in"
 msgstr "Giriş yapılıyor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1206
+#: src/client.cpp:1202
 msgid "Entering game world"
 msgstr "Oyun dünyasına giriliyor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1353
+#: src/client.cpp:1349
 msgid "Requesting characters"
 msgstr "Karakterler isteniliyor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1396
+#: src/client.cpp:1392
 msgid "Connecting to the game server"
 msgstr "Oyun sunucusuna bağlanılıyor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1408
+#: src/client.cpp:1404
 msgid "Changing game servers"
 msgstr "Oyun sunucusu değiştiriliyor"
 
@@ -584,7 +583,7 @@ msgstr "Oyun sunucusu değiştiriliyor"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1464 src/client.cpp:1483 src/client.cpp:1722
+#: src/client.cpp:1460 src/client.cpp:1479 src/client.cpp:1718
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:468
@@ -592,44 +591,44 @@ msgstr "Oyun sunucusu değiştiriliyor"
 #: 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:385
-#: src/net/eathena/charserverrecv.cpp:389
-#: src/net/eathena/charserverrecv.cpp:471 src/net/tmwa/charserverrecv.cpp:292
+#: src/net/eathena/charserverrecv.cpp:378
+#: src/net/eathena/charserverrecv.cpp:382
+#: src/net/eathena/charserverrecv.cpp:464 src/net/tmwa/charserverrecv.cpp:282
 msgid "Error"
 msgstr "Hata"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1502
+#: src/client.cpp:1498
 msgid "Requesting registration details"
 msgstr "Kayıt detayları isteniyor"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1549
+#: src/client.cpp:1545
 msgid "Password Change"
 msgstr "Şifre Değiştir"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1551
+#: src/client.cpp:1547
 msgid "Password changed successfully!"
 msgstr "Şifreniz başarı ile değiştirildi!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1584
+#: src/client.cpp:1580
 msgid "Email Change"
 msgstr "E-posta Değiştir"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1586
+#: src/client.cpp:1582
 msgid "Email changed successfully!"
 msgstr "E-posta başarı ile değiştirildi!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1622
+#: src/client.cpp:1618
 msgid "Unregister Successful"
 msgstr "Kayıt silme başarılı"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1624
+#: src/client.cpp:1620
 msgid "Farewell, come back any time..."
 msgstr "Hoşçakal, tekrar bekleriz..."
 
@@ -793,52 +792,52 @@ msgid "%s doesn't exist and can't be created!"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:51
+#: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr "dyecmd srcfile dyestring dstfile"
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:53
+#: src/dyetool/dyemain.cpp:50
 msgid "or"
 msgstr "ya da"
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:55
+#: src/dyetool/dyemain.cpp:52
 msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd srcdyestring dstfile"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: chat tab name
-#: src/game.cpp:267 src/gui/windows/chatwindow.cpp:2222
+#: src/game.cpp:266 src/gui/windows/chatwindow.cpp:2222
 msgid "General"
 msgstr "Genel"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:274 src/gui/windowmenu.cpp:175
+#: src/game.cpp:273 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Hata ayıklama"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:582
+#: src/game.cpp:581
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Ekran görüntüsü %s olarak kaydedildi"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:592
+#: src/game.cpp:591
 msgid "Saving screenshot failed!"
 msgstr "Ekran görüntüsü kaydı başarısız!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:679
+#: src/game.cpp:678
 msgid "The connection to the server was lost."
 msgstr "Sunucu bağlantısı koptu."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:682
+#: src/game.cpp:681
 msgid "Network Error"
 msgstr "Ağ Hatası"
 
@@ -1253,17 +1252,14 @@ 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
@@ -1274,7 +1270,8 @@ 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:602
+#: src/gui/windows/equipmentwindow.cpp:671
+#: src/gui/windows/serverdialog.cpp:602
 msgid "default"
 msgstr "varsayılan"
 
@@ -1792,19 +1789,19 @@ msgid "Cancel"
 msgstr "İptal"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:223
+#: src/gui/popups/itempopup.cpp:222
 #, c-format
 msgid "Weight: %s"
 msgstr "Ağırlık: %s"
 
 #. TRANSLATORS: named item description
-#: src/gui/popups/itempopup.cpp:290
+#: src/gui/popups/itempopup.cpp:289
 #, c-format
 msgid "Item named: %s"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:317
+#: src/gui/popups/itempopup.cpp:316
 msgid "Cards: "
 msgstr ""
 
@@ -2145,7 +2142,7 @@ msgstr "Büyü düzenle"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:831 src/gui/windows/npcdialog.cpp:127
+#: src/gui/popups/popupmenu.cpp:831 src/gui/windows/npcdialog.cpp:126
 msgid "Clear"
 msgstr "Temizle"
 
@@ -2487,8 +2484,9 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/popups/popupmenu.cpp:2379 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:68 src/gui/windows/statuswindow.cpp:243
+#: src/gui/windows/statuswindow.cpp:367
 #, c-format
 msgid "Level: %d"
 msgstr "Seviye: %d"
@@ -2907,8 +2905,8 @@ msgstr ""
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3093 src/gui/popups/popupmenu.cpp:3112
 #: src/gui/popups/popupmenu.cpp:3125 src/gui/windows/charselectdialog.cpp:76
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:408
-#: src/net/eathena/charserverrecv.cpp:444
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:401
+#: src/net/eathena/charserverrecv.cpp:437
 msgid "Info"
 msgstr "Bilgi"
 
@@ -3327,7 +3325,7 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:132
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:131
 #: src/gui/windows/serverdialog.cpp:113 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:85
 msgid "Add"
@@ -3355,7 +3353,7 @@ msgstr "Çıkış"
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:192
-#: src/gui/windows/itemamountwindow.cpp:228 src/gui/windows/npcdialog.cpp:123
+#: src/gui/windows/itemamountwindow.cpp:228 src/gui/windows/npcdialog.cpp:122
 #: src/gui/windows/statuswindow.cpp:746
 msgid "+"
 msgstr "+"
@@ -3367,7 +3365,7 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:190
-#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:125
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:124
 msgid "-"
 msgstr "-"
 
@@ -3534,13 +3532,15 @@ 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."
 
@@ -3551,19 +3551,22 @@ 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 ""
 
@@ -3997,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:116
+#: src/gui/widgets/tabs/setup_colors.cpp:86
+#: src/gui/windows/emotewindow.cpp:116
 msgid "Colors"
 msgstr "Renkler"
 
@@ -4029,18 +4032,15 @@ 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
@@ -4061,11 +4061,9 @@ 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
@@ -4076,9 +4074,7 @@ 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 ""
@@ -4119,8 +4115,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
@@ -4131,11 +4127,9 @@ 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,11 +4140,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be "
-"shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies "
-"are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4166,13 +4158,9 @@ 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
@@ -4185,8 +4173,7 @@ 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
@@ -4205,12 +4192,9 @@ 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
@@ -4221,8 +4205,7 @@ 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 ""
@@ -4235,11 +4218,9 @@ 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
@@ -4264,11 +4245,9 @@ 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
@@ -4279,8 +4258,7 @@ 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 ""
@@ -4293,9 +4271,7 @@ 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 ""
@@ -4308,9 +4284,7 @@ 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 ""
@@ -4336,10 +4310,7 @@ 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 ""
@@ -4374,8 +4345,7 @@ 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 ""
@@ -4388,8 +4358,7 @@ 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 ""
@@ -4402,12 +4371,9 @@ 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
@@ -4521,9 +4487,7 @@ 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
@@ -4694,8 +4658,8 @@ msgstr "Canavar hedeflerini sırayla değiştir"
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
 #: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:114
-#: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:60
-#: src/gui/windows/minimap.cpp:123
+#: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:59
+#: src/gui/windows/minimap.cpp:122
 msgid "Map"
 msgstr "Harita"
 
@@ -4886,7 +4850,7 @@ msgstr "Mağaza modunu etkinleştir"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:292 src/gui/windows/npcdialog.cpp:99
+#: src/gui/widgets/tabs/setup_other.cpp:292 src/gui/windows/npcdialog.cpp:98
 msgid "NPC"
 msgstr "NPC"
 
@@ -6153,7 +6117,8 @@ 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"
 
@@ -6272,7 +6237,8 @@ msgstr ""
 #: src/gui/windows/charcreatedialog.cpp:193
 #: src/gui/windows/charcreatedialog.cpp:206
 #: src/gui/windows/charcreatedialog.cpp:217
-#: src/gui/windows/charcreatedialog.cpp:227 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:227
+#: src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -6290,7 +6256,8 @@ msgstr "Lütfen %d puanı dağıt"
 #: src/gui/windows/charcreatedialog.cpp:197
 #: src/gui/windows/charcreatedialog.cpp:208
 #: src/gui/windows/charcreatedialog.cpp:219
-#: src/gui/windows/charcreatedialog.cpp:229 src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:229
+#: src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -6316,7 +6283,8 @@ msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:248 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:248
+#: src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr ""
 
@@ -6518,7 +6486,8 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:111
+#: src/gui/windows/editserverdialog.cpp:57
+#: src/gui/windows/serverdialog.cpp:111
 msgid "Connect"
 msgstr "Bağlan"
 
@@ -6870,26 +6839,28 @@ msgstr "Alıcı:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:73
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:72
 msgid "Subject:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:104
+#: src/gui/windows/maileditwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:103
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:123
-#: src/gui/windows/mailviewwindow.cpp:132
+#: src/gui/windows/maileditwindow.cpp:63
+#: src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:131
 msgid "Item:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:76
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:75
 msgid "Message:"
 msgstr ""
 
@@ -6899,27 +6870,27 @@ msgid "empty subject"
 msgstr ""
 
 #. TRANSLATORS: mail view window name
-#: src/gui/windows/mailviewwindow.cpp:54
+#: src/gui/windows/mailviewwindow.cpp:53
 msgid "View mail"
 msgstr ""
 
 #. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:64
+#: src/gui/windows/mailviewwindow.cpp:63
 msgid "Reply"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:65
 msgid "Time:"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:70
+#: src/gui/windows/mailviewwindow.cpp:69
 msgid "From:"
 msgstr ""
 
 #. TRANSLATORS: mail view attach button
-#: src/gui/windows/mailviewwindow.cpp:141
+#: src/gui/windows/mailviewwindow.cpp:140
 msgid "Get attach"
 msgstr ""
 
@@ -7009,22 +6980,22 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:84
+#: src/gui/windows/npcdialog.cpp:83
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:86
+#: src/gui/windows/npcdialog.cpp:85
 msgid "Next"
 msgstr "İleri"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:90
+#: src/gui/windows/npcdialog.cpp:89
 msgid "Submit"
 msgstr "Onayla"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:134
+#: src/gui/windows/npcdialog.cpp:133
 msgid "Reset"
 msgstr "Sıfırla"
 
@@ -7587,10 +7558,9 @@ 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
@@ -9068,33 +9038,33 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:387
-#: src/net/eathena/charserverrecv.cpp:435
+#: src/net/eathena/charserverrecv.cpp:380
+#: src/net/eathena/charserverrecv.cpp:428
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:410
+#: src/net/eathena/charserverrecv.cpp:403
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:419
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:423
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:439
+#: src/net/eathena/charserverrecv.cpp:432
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:473 src/net/tmwa/charserverrecv.cpp:294
+#: src/net/eathena/charserverrecv.cpp:466 src/net/tmwa/charserverrecv.cpp:284
 msgid "Failed to delete character."
 msgstr ""
 
@@ -9426,7 +9396,7 @@ msgid "Map not found"
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/net/eathena/inventoryrecv.cpp:844
+#: src/net/eathena/inventoryrecv.cpp:823
 #, c-format
 msgid "Left %s rental time for item %s."
 msgstr ""
@@ -9434,8 +9404,8 @@ msgstr ""
 #. TRANSLATORS: unknown item
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
-#: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:265
+#: src/net/eathena/inventoryrecv.cpp:1176
+#: src/net/eathena/inventoryrecv.cpp:1309 src/resources/db/itemdb.cpp:265
 msgid "Unknown item"
 msgstr "Bilinmeyen nesne"
 
@@ -10885,8 +10855,7 @@ msgstr ""
 #: src/utils/booleanoptions.h:27
 #, 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 f20e5ead7..2856db542 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,20 +10,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-05-29 14:56+0300\n"
+"POT-Creation-Date: 2016-05-20 19:25+0300\n"
 "PO-Revision-Date: 2016-05-21 09:33+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Ukrainian (http://www.transifex.com/akaras/manaplus/language/"
-"uk/)\n"
-"Language: uk\n"
+"Language-Team: Ukrainian (http://www.transifex.com/akaras/manaplus/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\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"
+"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"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:167
+#: src/actions/actions.cpp:166
 msgid "File uploaded"
 msgstr "Файл завантажено"
 
@@ -36,7 +34,7 @@ msgstr "Файл завантажено"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:170 src/client.cpp:1553 src/client.cpp:1588
+#: src/actions/actions.cpp:169 src/client.cpp:1549 src/client.cpp:1584
 #: 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,67 +54,67 @@ 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:412
-#: src/net/eathena/charserverrecv.cpp:447
-#: src/net/eathena/charserverrecv.cpp:475 src/net/tmwa/charserverrecv.cpp:296
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:405
+#: src/net/eathena/charserverrecv.cpp:440
+#: src/net/eathena/charserverrecv.cpp:468 src/net/tmwa/charserverrecv.cpp:286
 msgid "OK"
 msgstr "ОК"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1044 src/actions/actions.cpp:1057
+#: src/actions/actions.cpp:1043 src/actions/actions.cpp:1056
 msgid "Cache cleaned"
 msgstr "Кеш прибрано"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1214 src/actions/actions.cpp:1220
+#: src/actions/actions.cpp:1213 src/actions/actions.cpp:1219
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Час безперервної роботи клієнта: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1286
+#: src/actions/actions.cpp:1276 src/actions/actions.cpp:1285
 msgid "Resource images:"
 msgstr "Зображень:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1280 src/actions/actions.cpp:1290
+#: src/actions/actions.cpp:1279 src/actions/actions.cpp:1289
 msgid "Resource orphaned images:"
 msgstr "Вилучених зображень:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1385
+#: src/actions/actions.cpp:1384
 msgid "Environment variables dumped"
 msgstr "Змінні середовища збережені"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1502
+#: src/actions/actions.cpp:1501
 msgid "Uploaded config into:"
 msgstr "Завантажений конфіг:"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1512
+#: src/actions/actions.cpp:1511
 msgid "Uploaded server config into:"
 msgstr "Завантажена конфігурація сервера:"
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1522
+#: src/actions/actions.cpp:1521
 msgid "Uploaded log into:"
 msgstr "Завантажений лог:"
 
 #. TRANSLATORS: last seen disabled warning
-#: src/actions/actions.cpp:1747
+#: src/actions/actions.cpp:1746
 msgid ""
 "Last seen disabled. Enable in players / collect players id and seen log."
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/actions/actions.cpp:1766 src/actions/actions.cpp:1780
+#: src/actions/actions.cpp:1765 src/actions/actions.cpp:1779
 msgid "You not saw this nick."
 msgstr ""
 
 #. TRANSLATORS: last seen message
-#: src/actions/actions.cpp:1772
+#: src/actions/actions.cpp:1771
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr ""
@@ -130,9 +128,7 @@ msgstr "Не можна надсилати порожні повідомленн
 #: src/actions/chat.cpp:309
 #, 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
@@ -478,41 +474,41 @@ msgstr "Плаваюча бульбашка"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:856 src/dyetool/client.cpp:485 src/gui/windowmenu.cpp:189
+#: src/client.cpp:852 src/dyetool/client.cpp:482 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:65
 msgid "Setup"
 msgstr "Налаштування"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:859 src/dyetool/client.cpp:488
+#: src/client.cpp:855 src/dyetool/client.cpp:485
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Продуктивність"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:862 src/dyetool/client.cpp:491
+#: src/client.cpp:858 src/dyetool/client.cpp:488
 #: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Відео"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:865 src/dyetool/client.cpp:494
+#: src/client.cpp:861 src/dyetool/client.cpp:491
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Теми"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:868 src/dyetool/client.cpp:497
+#: src/client.cpp:864 src/dyetool/client.cpp:494
 msgid "About"
 msgstr "Про програму"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:871 src/dyetool/client.cpp:500 src/gui/windowmenu.cpp:74
+#: src/client.cpp:867 src/dyetool/client.cpp:497 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Довідка"
@@ -533,45 +529,45 @@ msgstr "Довідка"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:875 src/client.cpp:1467 src/client.cpp:1486
-#: src/dyetool/client.cpp:504 src/gui/dialogsmanager.cpp:116
+#: src/client.cpp:871 src/client.cpp:1463 src/client.cpp:1482
+#: src/dyetool/client.cpp:501 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:749 src/gui/popups/popupmenu.cpp:826
 #: src/gui/popups/popupmenu.cpp:1080 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:273
 #: src/gui/windows/inventorywindow.cpp:297
-#: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:60
-#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:130
+#: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
+#: src/gui/windows/npcdialog.cpp:87 src/gui/windows/npcdialog.cpp:129
 #: src/gui/windows/questswindow.cpp:77 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Закрити"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1100 src/gui/windowmanager_unittest.cc:158
+#: src/client.cpp:1096 src/gui/windowmanager_unittest.cc:157
 msgid "Connecting to server"
 msgstr "Очікування відповіді сервера"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1157 src/gui/windowmanager_unittest.cc:175
+#: src/client.cpp:1153 src/gui/windowmanager_unittest.cc:174
 msgid "Logging in"
 msgstr "Авторизація..."
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1206
+#: src/client.cpp:1202
 msgid "Entering game world"
 msgstr "Поринаємо в ігровий всесвіт..."
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1353
+#: src/client.cpp:1349
 msgid "Requesting characters"
 msgstr "Завантаження списку персонажів..."
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1396
+#: src/client.cpp:1392
 msgid "Connecting to the game server"
 msgstr "Приєднання до серверу..."
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1408
+#: src/client.cpp:1404
 msgid "Changing game servers"
 msgstr "Зміна ігрового серверу..."
 
@@ -588,7 +584,7 @@ msgstr "Зміна ігрового серверу..."
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1464 src/client.cpp:1483 src/client.cpp:1722
+#: src/client.cpp:1460 src/client.cpp:1479 src/client.cpp:1718
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:468
@@ -596,44 +592,44 @@ msgstr "Зміна ігрового серверу..."
 #: 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:385
-#: src/net/eathena/charserverrecv.cpp:389
-#: src/net/eathena/charserverrecv.cpp:471 src/net/tmwa/charserverrecv.cpp:292
+#: src/net/eathena/charserverrecv.cpp:378
+#: src/net/eathena/charserverrecv.cpp:382
+#: src/net/eathena/charserverrecv.cpp:464 src/net/tmwa/charserverrecv.cpp:282
 msgid "Error"
 msgstr "Помилка"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1502
+#: src/client.cpp:1498
 msgid "Requesting registration details"
 msgstr "Запитуємо деталі реєстрації"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1549
+#: src/client.cpp:1545
 msgid "Password Change"
 msgstr "Змінити пароль"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1551
+#: src/client.cpp:1547
 msgid "Password changed successfully!"
 msgstr "Пароль змінено!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1584
+#: src/client.cpp:1580
 msgid "Email Change"
 msgstr "Змінити імейл"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1586
+#: src/client.cpp:1582
 msgid "Email changed successfully!"
 msgstr "Імейл змінено!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1622
+#: src/client.cpp:1618
 msgid "Unregister Successful"
 msgstr "Акаунт видалено"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1624
+#: src/client.cpp:1620
 msgid "Farewell, come back any time..."
 msgstr "До побачення та вертайтесь."
 
@@ -685,8 +681,7 @@ 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
@@ -721,8 +716,7 @@ 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
@@ -799,52 +793,52 @@ msgid "%s doesn't exist and can't be created!"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:51
+#: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr "dyecmd файл_джерела рядок_кольору файл_призначення"
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:53
+#: src/dyetool/dyemain.cpp:50
 msgid "or"
 msgstr "або"
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:55
+#: src/dyetool/dyemain.cpp:52
 msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd файл_рядків_кольору файл_призначення"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: chat tab name
-#: src/game.cpp:267 src/gui/windows/chatwindow.cpp:2222
+#: src/game.cpp:266 src/gui/windows/chatwindow.cpp:2222
 msgid "General"
 msgstr "Загальне"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:274 src/gui/windowmenu.cpp:175
+#: src/game.cpp:273 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Зневадження"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:582
+#: src/game.cpp:581
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Скріншот збережено як %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:592
+#: src/game.cpp:591
 msgid "Saving screenshot failed!"
 msgstr "Збереження скріншоту провалилось!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:679
+#: src/game.cpp:678
 msgid "The connection to the server was lost."
 msgstr "Втрачено з'єднання з сервером."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:682
+#: src/game.cpp:681
 msgid "Network Error"
 msgstr "Мережева помилка"
 
@@ -1259,10 +1253,9 @@ 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
@@ -1278,7 +1271,8 @@ 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:602
+#: src/gui/windows/equipmentwindow.cpp:671
+#: src/gui/windows/serverdialog.cpp:602
 msgid "default"
 msgstr "за замовчуванням"
 
@@ -1796,19 +1790,19 @@ msgid "Cancel"
 msgstr "Скасувати"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:223
+#: src/gui/popups/itempopup.cpp:222
 #, c-format
 msgid "Weight: %s"
 msgstr "Вага: %s"
 
 #. TRANSLATORS: named item description
-#: src/gui/popups/itempopup.cpp:290
+#: src/gui/popups/itempopup.cpp:289
 #, c-format
 msgid "Item named: %s"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:317
+#: src/gui/popups/itempopup.cpp:316
 msgid "Cards: "
 msgstr ""
 
@@ -2149,7 +2143,7 @@ msgstr "Редагувати заклинання"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:831 src/gui/windows/npcdialog.cpp:127
+#: src/gui/popups/popupmenu.cpp:831 src/gui/windows/npcdialog.cpp:126
 msgid "Clear"
 msgstr "Скинути"
 
@@ -2491,8 +2485,9 @@ msgstr "Показати вікно"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/popups/popupmenu.cpp:2379 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:68 src/gui/windows/statuswindow.cpp:243
+#: src/gui/windows/statuswindow.cpp:367
 #, c-format
 msgid "Level: %d"
 msgstr "Рівень: %d"
@@ -2911,8 +2906,8 @@ msgstr ""
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3093 src/gui/popups/popupmenu.cpp:3112
 #: src/gui/popups/popupmenu.cpp:3125 src/gui/windows/charselectdialog.cpp:76
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:408
-#: src/net/eathena/charserverrecv.cpp:444
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:401
+#: src/net/eathena/charserverrecv.cpp:437
 msgid "Info"
 msgstr "Відомості"
 
@@ -3331,7 +3326,7 @@ msgstr "Відвідати посилання"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:132
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:131
 #: src/gui/windows/serverdialog.cpp:113 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:85
 msgid "Add"
@@ -3359,7 +3354,7 @@ msgstr "Вийти"
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:192
-#: src/gui/windows/itemamountwindow.cpp:228 src/gui/windows/npcdialog.cpp:123
+#: src/gui/windows/itemamountwindow.cpp:228 src/gui/windows/npcdialog.cpp:122
 #: src/gui/windows/statuswindow.cpp:746
 msgid "+"
 msgstr "+"
@@ -3371,7 +3366,7 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:190
-#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:125
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:124
 msgid "-"
 msgstr "-"
 
@@ -3538,13 +3533,15 @@ 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,19 +3552,22 @@ 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 "Неможливо ввімкнути розподіл досвіду."
 
@@ -4001,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:116
+#: src/gui/widgets/tabs/setup_colors.cpp:86
+#: src/gui/windows/emotewindow.cpp:116
 msgid "Colors"
 msgstr "Кольори"
 
@@ -4033,11 +4033,9 @@ msgstr "Показувати список кольорів чату"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat "
-"window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but "
-"also occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4064,11 +4062,9 @@ 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
@@ -4079,9 +4075,7 @@ 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 +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
@@ -4134,11 +4128,9 @@ 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,11 +4141,9 @@ 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
@@ -4169,13 +4159,9 @@ 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
@@ -4188,8 +4174,7 @@ 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
@@ -4208,12 +4193,9 @@ 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,8 +4206,7 @@ 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 ""
@@ -4238,11 +4219,9 @@ 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
@@ -4267,11 +4246,9 @@ 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
@@ -4282,8 +4259,7 @@ 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 ""
@@ -4296,9 +4272,7 @@ 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 ""
@@ -4311,9 +4285,7 @@ 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 ""
@@ -4339,10 +4311,7 @@ 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 ""
@@ -4377,8 +4346,7 @@ 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 ""
@@ -4391,8 +4359,7 @@ 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 ""
@@ -4405,12 +4372,9 @@ 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
@@ -4524,9 +4488,7 @@ 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
@@ -4697,8 +4659,8 @@ msgstr "Прокручувати мобів по колу"
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
 #: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:114
-#: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:60
-#: src/gui/windows/minimap.cpp:123
+#: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:59
+#: src/gui/windows/minimap.cpp:122
 msgid "Map"
 msgstr "Локація"
 
@@ -4889,7 +4851,7 @@ msgstr "Ввімкнути режим крамниці"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:292 src/gui/windows/npcdialog.cpp:99
+#: src/gui/widgets/tabs/setup_other.cpp:292 src/gui/windows/npcdialog.cpp:98
 msgid "NPC"
 msgstr "NPC"
 
@@ -5134,9 +5096,7 @@ 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
@@ -5171,8 +5131,7 @@ 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
@@ -5298,9 +5257,7 @@ 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
@@ -6161,7 +6118,8 @@ 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 "Створити"
 
@@ -6280,7 +6238,8 @@ msgstr "^"
 #: src/gui/windows/charcreatedialog.cpp:193
 #: src/gui/windows/charcreatedialog.cpp:206
 #: src/gui/windows/charcreatedialog.cpp:217
-#: src/gui/windows/charcreatedialog.cpp:227 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:227
+#: src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -6298,7 +6257,8 @@ msgstr "Будь ласка, розподіліть %d балів"
 #: src/gui/windows/charcreatedialog.cpp:197
 #: src/gui/windows/charcreatedialog.cpp:208
 #: src/gui/windows/charcreatedialog.cpp:219
-#: src/gui/windows/charcreatedialog.cpp:229 src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:229
+#: src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -6324,7 +6284,8 @@ msgstr "Вигляд:"
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:248 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:248
+#: src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr "П"
 
@@ -6423,12 +6384,7 @@ msgid ""
 "Level: %u\n"
 "Experience: %u\n"
 "Money: %s"
-msgstr ""
-"Hp: %u/%u\n"
-"Mp: %u/%u\n"
-"Рівень: %u\n"
-"Досвід: %u\n"
-"Кошти: %s"
+msgstr "Hp: %u/%u\nMp: %u/%u\nРівень: %u\nДосвід: %u\nКошти: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/charselectdialog.cpp:308
@@ -6531,7 +6487,8 @@ msgstr "Редагувати сервер"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:111
+#: src/gui/windows/editserverdialog.cpp:57
+#: src/gui/windows/serverdialog.cpp:111
 msgid "Connect"
 msgstr "З'єднання"
 
@@ -6885,26 +6842,28 @@ msgstr "Для:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:73
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:72
 msgid "Subject:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:104
+#: src/gui/windows/maileditwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:103
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:123
-#: src/gui/windows/mailviewwindow.cpp:132
+#: src/gui/windows/maileditwindow.cpp:63
+#: src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:131
 msgid "Item:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:76
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:75
 msgid "Message:"
 msgstr ""
 
@@ -6914,27 +6873,27 @@ msgid "empty subject"
 msgstr ""
 
 #. TRANSLATORS: mail view window name
-#: src/gui/windows/mailviewwindow.cpp:54
+#: src/gui/windows/mailviewwindow.cpp:53
 msgid "View mail"
 msgstr ""
 
 #. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:64
+#: src/gui/windows/mailviewwindow.cpp:63
 msgid "Reply"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:65
 msgid "Time:"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:70
+#: src/gui/windows/mailviewwindow.cpp:69
 msgid "From:"
 msgstr ""
 
 #. TRANSLATORS: mail view attach button
-#: src/gui/windows/mailviewwindow.cpp:141
+#: src/gui/windows/mailviewwindow.cpp:140
 msgid "Get attach"
 msgstr ""
 
@@ -7024,22 +6983,22 @@ msgid "Job level: %d"
 msgstr "Рівень роботи: %d"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:84
+#: src/gui/windows/npcdialog.cpp:83
 msgid "Stop waiting"
 msgstr "Зупинити очікування"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:86
+#: src/gui/windows/npcdialog.cpp:85
 msgid "Next"
 msgstr "Далі"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:90
+#: src/gui/windows/npcdialog.cpp:89
 msgid "Submit"
 msgstr "Відправити"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:134
+#: src/gui/windows/npcdialog.cpp:133
 msgid "Reset"
 msgstr "Скинути"
 
@@ -7602,7 +7561,8 @@ 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
@@ -9041,9 +9001,7 @@ 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
@@ -9083,33 +9041,33 @@ msgstr "З'єднання з сервером припинене. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:387
-#: src/net/eathena/charserverrecv.cpp:435
+#: src/net/eathena/charserverrecv.cpp:380
+#: src/net/eathena/charserverrecv.cpp:428
 msgid "Character rename error."
 msgstr "Помилка переіменування персонажу."
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:410
+#: src/net/eathena/charserverrecv.cpp:403
 msgid "Character renamed."
 msgstr "Персонаж переіменовано."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:419
 msgid "Rename not allowed."
 msgstr "Переіменування не дозволене."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:423
 msgid "New name is not set."
 msgstr "Нове ім'я не вжито."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:439
+#: src/net/eathena/charserverrecv.cpp:432
 msgid "Character not found."
 msgstr "Персонаж не знайдено."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:473 src/net/tmwa/charserverrecv.cpp:294
+#: src/net/eathena/charserverrecv.cpp:466 src/net/tmwa/charserverrecv.cpp:284
 msgid "Failed to delete character."
 msgstr "Неможливо видалити персонаж."
 
@@ -9441,7 +9399,7 @@ msgid "Map not found"
 msgstr "Мапу не знайдено."
 
 #. TRANSLATORS: notification message
-#: src/net/eathena/inventoryrecv.cpp:844
+#: src/net/eathena/inventoryrecv.cpp:823
 #, c-format
 msgid "Left %s rental time for item %s."
 msgstr ""
@@ -9449,8 +9407,8 @@ msgstr ""
 #. TRANSLATORS: unknown item
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
-#: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:265
+#: src/net/eathena/inventoryrecv.cpp:1176
+#: src/net/eathena/inventoryrecv.cpp:1309 src/resources/db/itemdb.cpp:265
 msgid "Unknown item"
 msgstr "Невідомий предмет"
 
@@ -10900,9 +10858,7 @@ msgstr ""
 #: src/utils/booleanoptions.h:27
 #, 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
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 731ae4298..74c6e8644 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,19 +15,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-05-29 14:56+0300\n"
+"POT-Creation-Date: 2016-05-20 19:25+0300\n"
 "PO-Revision-Date: 2016-05-21 09:33+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: zh_CN\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/akaras/manaplus/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
-#: src/actions/actions.cpp:167
+#: src/actions/actions.cpp:166
 msgid "File uploaded"
 msgstr ""
 
@@ -40,7 +39,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:170 src/client.cpp:1553 src/client.cpp:1588
+#: src/actions/actions.cpp:169 src/client.cpp:1549 src/client.cpp:1584
 #: 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,67 +59,67 @@ 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:412
-#: src/net/eathena/charserverrecv.cpp:447
-#: src/net/eathena/charserverrecv.cpp:475 src/net/tmwa/charserverrecv.cpp:296
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:405
+#: src/net/eathena/charserverrecv.cpp:440
+#: src/net/eathena/charserverrecv.cpp:468 src/net/tmwa/charserverrecv.cpp:286
 msgid "OK"
 msgstr "确定"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1044 src/actions/actions.cpp:1057
+#: src/actions/actions.cpp:1043 src/actions/actions.cpp:1056
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1214 src/actions/actions.cpp:1220
+#: src/actions/actions.cpp:1213 src/actions/actions.cpp:1219
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1286
+#: src/actions/actions.cpp:1276 src/actions/actions.cpp:1285
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1280 src/actions/actions.cpp:1290
+#: src/actions/actions.cpp:1279 src/actions/actions.cpp:1289
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1385
+#: src/actions/actions.cpp:1384
 msgid "Environment variables dumped"
 msgstr ""
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1502
+#: src/actions/actions.cpp:1501
 msgid "Uploaded config into:"
 msgstr ""
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1512
+#: src/actions/actions.cpp:1511
 msgid "Uploaded server config into:"
 msgstr ""
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1522
+#: src/actions/actions.cpp:1521
 msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: last seen disabled warning
-#: src/actions/actions.cpp:1747
+#: src/actions/actions.cpp:1746
 msgid ""
 "Last seen disabled. Enable in players / collect players id and seen log."
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/actions/actions.cpp:1766 src/actions/actions.cpp:1780
+#: src/actions/actions.cpp:1765 src/actions/actions.cpp:1779
 msgid "You not saw this nick."
 msgstr ""
 
 #. TRANSLATORS: last seen message
-#: src/actions/actions.cpp:1772
+#: src/actions/actions.cpp:1771
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr ""
@@ -478,41 +477,41 @@ msgstr "流动的泡沫"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:856 src/dyetool/client.cpp:485 src/gui/windowmenu.cpp:189
+#: src/client.cpp:852 src/dyetool/client.cpp:482 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:65
 msgid "Setup"
 msgstr "设置"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:859 src/dyetool/client.cpp:488
+#: src/client.cpp:855 src/dyetool/client.cpp:485
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:862 src/dyetool/client.cpp:491
+#: src/client.cpp:858 src/dyetool/client.cpp:488
 #: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "视频"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:865 src/dyetool/client.cpp:494
+#: src/client.cpp:861 src/dyetool/client.cpp:491
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "主题"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:868 src/dyetool/client.cpp:497
+#: src/client.cpp:864 src/dyetool/client.cpp:494
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:871 src/dyetool/client.cpp:500 src/gui/windowmenu.cpp:74
+#: src/client.cpp:867 src/dyetool/client.cpp:497 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "帮助"
@@ -533,45 +532,45 @@ msgstr "帮助"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:875 src/client.cpp:1467 src/client.cpp:1486
-#: src/dyetool/client.cpp:504 src/gui/dialogsmanager.cpp:116
+#: src/client.cpp:871 src/client.cpp:1463 src/client.cpp:1482
+#: src/dyetool/client.cpp:501 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:749 src/gui/popups/popupmenu.cpp:826
 #: src/gui/popups/popupmenu.cpp:1080 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:273
 #: src/gui/windows/inventorywindow.cpp:297
-#: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:60
-#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:130
+#: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
+#: src/gui/windows/npcdialog.cpp:87 src/gui/windows/npcdialog.cpp:129
 #: src/gui/windows/questswindow.cpp:77 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "关闭"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1100 src/gui/windowmanager_unittest.cc:158
+#: src/client.cpp:1096 src/gui/windowmanager_unittest.cc:157
 msgid "Connecting to server"
 msgstr "正在连接服务器"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1157 src/gui/windowmanager_unittest.cc:175
+#: src/client.cpp:1153 src/gui/windowmanager_unittest.cc:174
 msgid "Logging in"
 msgstr "登录中"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1206
+#: src/client.cpp:1202
 msgid "Entering game world"
 msgstr "进入游戏世界"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1353
+#: src/client.cpp:1349
 msgid "Requesting characters"
 msgstr "请求角色"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1396
+#: src/client.cpp:1392
 msgid "Connecting to the game server"
 msgstr "正在连接游戏服务器"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1408
+#: src/client.cpp:1404
 msgid "Changing game servers"
 msgstr "正在更改游戏服务器"
 
@@ -588,7 +587,7 @@ msgstr "正在更改游戏服务器"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1464 src/client.cpp:1483 src/client.cpp:1722
+#: src/client.cpp:1460 src/client.cpp:1479 src/client.cpp:1718
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:468
@@ -596,44 +595,44 @@ msgstr "正在更改游戏服务器"
 #: 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:385
-#: src/net/eathena/charserverrecv.cpp:389
-#: src/net/eathena/charserverrecv.cpp:471 src/net/tmwa/charserverrecv.cpp:292
+#: src/net/eathena/charserverrecv.cpp:378
+#: src/net/eathena/charserverrecv.cpp:382
+#: src/net/eathena/charserverrecv.cpp:464 src/net/tmwa/charserverrecv.cpp:282
 msgid "Error"
 msgstr "错误"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1502
+#: src/client.cpp:1498
 msgid "Requesting registration details"
 msgstr "正在请求详细注册信息"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1549
+#: src/client.cpp:1545
 msgid "Password Change"
 msgstr "更改密码"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1551
+#: src/client.cpp:1547
 msgid "Password changed successfully!"
 msgstr "密码更改成功!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1584
+#: src/client.cpp:1580
 msgid "Email Change"
 msgstr "更改电子邮箱地址"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1586
+#: src/client.cpp:1582
 msgid "Email changed successfully!"
 msgstr "电子邮箱地址更改成功!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1622
+#: src/client.cpp:1618
 msgid "Unregister Successful"
 msgstr "取消注册成功"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1624
+#: src/client.cpp:1620
 msgid "Farewell, come back any time..."
 msgstr "再见，欢迎随时回来..."
 
@@ -797,52 +796,52 @@ msgid "%s doesn't exist and can't be created!"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:51
+#: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:53
+#: src/dyetool/dyemain.cpp:50
 msgid "or"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:55
+#: src/dyetool/dyemain.cpp:52
 msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: chat tab name
-#: src/game.cpp:267 src/gui/windows/chatwindow.cpp:2222
+#: src/game.cpp:266 src/gui/windows/chatwindow.cpp:2222
 msgid "General"
 msgstr "常规"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:274 src/gui/windowmenu.cpp:175
+#: src/game.cpp:273 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "调试"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:582
+#: src/game.cpp:581
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:592
+#: src/game.cpp:591
 msgid "Saving screenshot failed!"
 msgstr "保存屏幕快照失败!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:679
+#: src/game.cpp:678
 msgid "The connection to the server was lost."
 msgstr "服务器的连接丢失."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:682
+#: src/game.cpp:681
 msgid "Network Error"
 msgstr "网络错误"
 
@@ -1257,7 +1256,8 @@ 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,7 +1274,8 @@ 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:602
+#: src/gui/windows/equipmentwindow.cpp:671
+#: src/gui/windows/serverdialog.cpp:602
 msgid "default"
 msgstr "默认"
 
@@ -1792,19 +1793,19 @@ msgid "Cancel"
 msgstr "取消"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:223
+#: src/gui/popups/itempopup.cpp:222
 #, c-format
 msgid "Weight: %s"
 msgstr "重量：%s"
 
 #. TRANSLATORS: named item description
-#: src/gui/popups/itempopup.cpp:290
+#: src/gui/popups/itempopup.cpp:289
 #, c-format
 msgid "Item named: %s"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:317
+#: src/gui/popups/itempopup.cpp:316
 msgid "Cards: "
 msgstr ""
 
@@ -2145,7 +2146,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:831 src/gui/windows/npcdialog.cpp:127
+#: src/gui/popups/popupmenu.cpp:831 src/gui/windows/npcdialog.cpp:126
 msgid "Clear"
 msgstr "清除"
 
@@ -2487,8 +2488,9 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/popups/popupmenu.cpp:2379 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:68 src/gui/windows/statuswindow.cpp:243
+#: src/gui/windows/statuswindow.cpp:367
 #, c-format
 msgid "Level: %d"
 msgstr "等级：%d"
@@ -2907,8 +2909,8 @@ msgstr ""
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3093 src/gui/popups/popupmenu.cpp:3112
 #: src/gui/popups/popupmenu.cpp:3125 src/gui/windows/charselectdialog.cpp:76
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:408
-#: src/net/eathena/charserverrecv.cpp:444
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:401
+#: src/net/eathena/charserverrecv.cpp:437
 msgid "Info"
 msgstr "信息"
 
@@ -3327,7 +3329,7 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:132
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:131
 #: src/gui/windows/serverdialog.cpp:113 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:85
 msgid "Add"
@@ -3355,7 +3357,7 @@ msgstr "退出"
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:192
-#: src/gui/windows/itemamountwindow.cpp:228 src/gui/windows/npcdialog.cpp:123
+#: src/gui/windows/itemamountwindow.cpp:228 src/gui/windows/npcdialog.cpp:122
 #: src/gui/windows/statuswindow.cpp:746
 msgid "+"
 msgstr "+"
@@ -3367,7 +3369,7 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:190
-#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:125
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:124
 msgid "-"
 msgstr "-"
 
@@ -3534,13 +3536,15 @@ 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 "物品共享不可能."
 
@@ -3551,19 +3555,22 @@ 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 "经验共享不可能."
 
@@ -3997,15 +4004,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:116
+#: src/gui/widgets/tabs/setup_colors.cpp:86
+#: src/gui/windows/emotewindow.cpp:116
 msgid "Colors"
 msgstr "颜色"
 
@@ -4029,11 +4036,9 @@ 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
@@ -4060,11 +4065,9 @@ 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
@@ -4075,9 +4078,7 @@ msgstr "限制聊天的最大"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
-"specified number of last lines of text. Oldest lines exceeding this limit "
-"are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
 msgstr ""
@@ -4118,8 +4119,8 @@ msgstr "显示聊天记录"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on "
-"startup instead of starting with empty chat tabs."
+"If this setting enabled, client will load old chat tabs content from logs on"
+" startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4130,11 +4131,9 @@ 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,11 +4144,9 @@ 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,13 +4162,9 @@ 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
@@ -4184,8 +4177,7 @@ 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
@@ -4204,12 +4196,9 @@ 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
@@ -4220,8 +4209,7 @@ 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 ""
@@ -4234,11 +4222,9 @@ msgstr "在调试选项卡中显示服务器的消息"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of "
-"chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some "
-"debug messages from client in Debug tab since these are fake server messages."
+"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4263,11 +4249,9 @@ 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
@@ -4278,8 +4262,7 @@ 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 ""
@@ -4292,9 +4275,7 @@ 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 ""
@@ -4307,9 +4288,7 @@ 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 ""
@@ -4335,10 +4314,7 @@ 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 ""
@@ -4373,8 +4349,7 @@ 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 ""
@@ -4387,8 +4362,7 @@ 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 ""
@@ -4401,12 +4375,9 @@ 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
@@ -4691,8 +4662,8 @@ msgstr ""
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
 #: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:114
-#: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:60
-#: src/gui/windows/minimap.cpp:123
+#: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:59
+#: src/gui/windows/minimap.cpp:122
 msgid "Map"
 msgstr "地图"
 
@@ -4883,7 +4854,7 @@ msgstr "启用商店模式"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:292 src/gui/windows/npcdialog.cpp:99
+#: src/gui/widgets/tabs/setup_other.cpp:292 src/gui/windows/npcdialog.cpp:98
 msgid "NPC"
 msgstr "NPC"
 
@@ -6150,7 +6121,8 @@ 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 "建立"
 
@@ -6269,7 +6241,8 @@ msgstr ""
 #: src/gui/windows/charcreatedialog.cpp:193
 #: src/gui/windows/charcreatedialog.cpp:206
 #: src/gui/windows/charcreatedialog.cpp:217
-#: src/gui/windows/charcreatedialog.cpp:227 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:227
+#: src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -6287,7 +6260,8 @@ msgstr "请分发%d点数"
 #: src/gui/windows/charcreatedialog.cpp:197
 #: src/gui/windows/charcreatedialog.cpp:208
 #: src/gui/windows/charcreatedialog.cpp:219
-#: src/gui/windows/charcreatedialog.cpp:229 src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:229
+#: src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -6313,7 +6287,8 @@ msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:248 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:248
+#: src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr ""
 
@@ -6515,7 +6490,8 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:111
+#: src/gui/windows/editserverdialog.cpp:57
+#: src/gui/windows/serverdialog.cpp:111
 msgid "Connect"
 msgstr "连接"
 
@@ -6865,26 +6841,28 @@ msgstr "至:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:73
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:72
 msgid "Subject:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:104
+#: src/gui/windows/maileditwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:103
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:123
-#: src/gui/windows/mailviewwindow.cpp:132
+#: src/gui/windows/maileditwindow.cpp:63
+#: src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:131
 msgid "Item:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:76
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:75
 msgid "Message:"
 msgstr ""
 
@@ -6894,27 +6872,27 @@ msgid "empty subject"
 msgstr ""
 
 #. TRANSLATORS: mail view window name
-#: src/gui/windows/mailviewwindow.cpp:54
+#: src/gui/windows/mailviewwindow.cpp:53
 msgid "View mail"
 msgstr ""
 
 #. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:64
+#: src/gui/windows/mailviewwindow.cpp:63
 msgid "Reply"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:65
 msgid "Time:"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:70
+#: src/gui/windows/mailviewwindow.cpp:69
 msgid "From:"
 msgstr ""
 
 #. TRANSLATORS: mail view attach button
-#: src/gui/windows/mailviewwindow.cpp:141
+#: src/gui/windows/mailviewwindow.cpp:140
 msgid "Get attach"
 msgstr ""
 
@@ -7004,22 +6982,22 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:84
+#: src/gui/windows/npcdialog.cpp:83
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:86
+#: src/gui/windows/npcdialog.cpp:85
 msgid "Next"
 msgstr "下一个"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:90
+#: src/gui/windows/npcdialog.cpp:89
 msgid "Submit"
 msgstr "提交"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:134
+#: src/gui/windows/npcdialog.cpp:133
 msgid "Reset"
 msgstr "重置"
 
@@ -7582,7 +7560,8 @@ 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
@@ -9021,9 +9000,7 @@ 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
@@ -9063,33 +9040,33 @@ msgstr "连接到服务器终止. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:387
-#: src/net/eathena/charserverrecv.cpp:435
+#: src/net/eathena/charserverrecv.cpp:380
+#: src/net/eathena/charserverrecv.cpp:428
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:410
+#: src/net/eathena/charserverrecv.cpp:403
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:419
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:423
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:439
+#: src/net/eathena/charserverrecv.cpp:432
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:473 src/net/tmwa/charserverrecv.cpp:294
+#: src/net/eathena/charserverrecv.cpp:466 src/net/tmwa/charserverrecv.cpp:284
 msgid "Failed to delete character."
 msgstr "删除角色失败."
 
@@ -9421,7 +9398,7 @@ msgid "Map not found"
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/net/eathena/inventoryrecv.cpp:844
+#: src/net/eathena/inventoryrecv.cpp:823
 #, c-format
 msgid "Left %s rental time for item %s."
 msgstr ""
@@ -9429,8 +9406,8 @@ msgstr ""
 #. TRANSLATORS: unknown item
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
-#: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:265
+#: src/net/eathena/inventoryrecv.cpp:1176
+#: src/net/eathena/inventoryrecv.cpp:1309 src/resources/db/itemdb.cpp:265
 msgid "Unknown item"
 msgstr "未知物品"
 
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 68fb5bca3..c661efef6 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,19 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-05-29 14:56+0300\n"
+"POT-Creation-Date: 2016-05-20 19:25+0300\n"
 "PO-Revision-Date: 2016-05-21 09:33+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: zh_HK\n"
+"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/akaras/manaplus/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
-#: src/actions/actions.cpp:167
+#: src/actions/actions.cpp:166
 msgid "File uploaded"
 msgstr "檔案上載成功"
 
@@ -34,7 +33,7 @@ msgstr "檔案上載成功"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:170 src/client.cpp:1553 src/client.cpp:1588
+#: src/actions/actions.cpp:169 src/client.cpp:1549 src/client.cpp:1584
 #: 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,67 +53,67 @@ 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:412
-#: src/net/eathena/charserverrecv.cpp:447
-#: src/net/eathena/charserverrecv.cpp:475 src/net/tmwa/charserverrecv.cpp:296
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:405
+#: src/net/eathena/charserverrecv.cpp:440
+#: src/net/eathena/charserverrecv.cpp:468 src/net/tmwa/charserverrecv.cpp:286
 msgid "OK"
 msgstr "確定"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1044 src/actions/actions.cpp:1057
+#: src/actions/actions.cpp:1043 src/actions/actions.cpp:1056
 msgid "Cache cleaned"
 msgstr "緩存清理成功"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1214 src/actions/actions.cpp:1220
+#: src/actions/actions.cpp:1213 src/actions/actions.cpp:1219
 #, c-format
 msgid "Client uptime: %s"
 msgstr "客戶端已開啟: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1286
+#: src/actions/actions.cpp:1276 src/actions/actions.cpp:1285
 msgid "Resource images:"
 msgstr "來源影像:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1280 src/actions/actions.cpp:1290
+#: src/actions/actions.cpp:1279 src/actions/actions.cpp:1289
 msgid "Resource orphaned images:"
 msgstr "來源孤立影像:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1385
+#: src/actions/actions.cpp:1384
 msgid "Environment variables dumped"
 msgstr "環境變量轉儲成功"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1502
+#: src/actions/actions.cpp:1501
 msgid "Uploaded config into:"
 msgstr "已把配置上傳至:"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1512
+#: src/actions/actions.cpp:1511
 msgid "Uploaded server config into:"
 msgstr "已把伺服器配置上傳至:"
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1522
+#: src/actions/actions.cpp:1521
 msgid "Uploaded log into:"
 msgstr "已把日誌上傳至:"
 
 #. TRANSLATORS: last seen disabled warning
-#: src/actions/actions.cpp:1747
+#: src/actions/actions.cpp:1746
 msgid ""
 "Last seen disabled. Enable in players / collect players id and seen log."
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/actions/actions.cpp:1766 src/actions/actions.cpp:1780
+#: src/actions/actions.cpp:1765 src/actions/actions.cpp:1779
 msgid "You not saw this nick."
 msgstr ""
 
 #. TRANSLATORS: last seen message
-#: src/actions/actions.cpp:1772
+#: src/actions/actions.cpp:1771
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr ""
@@ -472,41 +471,41 @@ msgstr "浮動的泡泡"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: long button name for setup window.
 #. TRANSLATORS: setup window name
-#: src/client.cpp:856 src/dyetool/client.cpp:485 src/gui/windowmenu.cpp:189
+#: src/client.cpp:852 src/dyetool/client.cpp:482 src/gui/windowmenu.cpp:189
 #: src/gui/windows/setupwindow.cpp:65
 msgid "Setup"
 msgstr "設定"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:859 src/dyetool/client.cpp:488
+#: src/client.cpp:855 src/dyetool/client.cpp:485
 #: src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "性能"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:862 src/dyetool/client.cpp:491
+#: src/client.cpp:858 src/dyetool/client.cpp:488
 #: src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "顯示"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:865 src/dyetool/client.cpp:494
+#: src/client.cpp:861 src/dyetool/client.cpp:491
 #: src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "主題"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:868 src/dyetool/client.cpp:497
+#: src/client.cpp:864 src/dyetool/client.cpp:494
 msgid "About"
 msgstr "關於"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: long button name for help window.
 #. TRANSLATORS: help window name
-#: src/client.cpp:871 src/dyetool/client.cpp:500 src/gui/windowmenu.cpp:74
+#: src/client.cpp:867 src/dyetool/client.cpp:497 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "說明"
@@ -527,45 +526,45 @@ msgstr "說明"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:875 src/client.cpp:1467 src/client.cpp:1486
-#: src/dyetool/client.cpp:504 src/gui/dialogsmanager.cpp:116
+#: src/client.cpp:871 src/client.cpp:1463 src/client.cpp:1482
+#: src/dyetool/client.cpp:501 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:749 src/gui/popups/popupmenu.cpp:826
 #: src/gui/popups/popupmenu.cpp:1080 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:273
 #: src/gui/windows/inventorywindow.cpp:297
-#: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:60
-#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:130
+#: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
+#: src/gui/windows/npcdialog.cpp:87 src/gui/windows/npcdialog.cpp:129
 #: src/gui/windows/questswindow.cpp:77 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "關閉"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1100 src/gui/windowmanager_unittest.cc:158
+#: src/client.cpp:1096 src/gui/windowmanager_unittest.cc:157
 msgid "Connecting to server"
 msgstr "正在連接到伺服器"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1157 src/gui/windowmanager_unittest.cc:175
+#: src/client.cpp:1153 src/gui/windowmanager_unittest.cc:174
 msgid "Logging in"
 msgstr "正在登入"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1206
+#: src/client.cpp:1202
 msgid "Entering game world"
 msgstr "正在進入遊戲"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1353
+#: src/client.cpp:1349
 msgid "Requesting characters"
 msgstr "正在查詢角色"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1396
+#: src/client.cpp:1392
 msgid "Connecting to the game server"
 msgstr "正在連接到遊戲伺服器"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1408
+#: src/client.cpp:1404
 msgid "Changing game servers"
 msgstr "正在轉換遊戲伺服器"
 
@@ -582,7 +581,7 @@ msgstr "正在轉換遊戲伺服器"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1464 src/client.cpp:1483 src/client.cpp:1722
+#: src/client.cpp:1460 src/client.cpp:1479 src/client.cpp:1718
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
 #: src/gui/windows/charcreatedialog.cpp:468
@@ -590,44 +589,44 @@ msgstr "正在轉換遊戲伺服器"
 #: 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:385
-#: src/net/eathena/charserverrecv.cpp:389
-#: src/net/eathena/charserverrecv.cpp:471 src/net/tmwa/charserverrecv.cpp:292
+#: src/net/eathena/charserverrecv.cpp:378
+#: src/net/eathena/charserverrecv.cpp:382
+#: src/net/eathena/charserverrecv.cpp:464 src/net/tmwa/charserverrecv.cpp:282
 msgid "Error"
 msgstr "錯誤"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1502
+#: src/client.cpp:1498
 msgid "Requesting registration details"
 msgstr "正在查詢註冊的詳細信息"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1549
+#: src/client.cpp:1545
 msgid "Password Change"
 msgstr "更改密碼"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1551
+#: src/client.cpp:1547
 msgid "Password changed successfully!"
 msgstr "成功更改密碼!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1584
+#: src/client.cpp:1580
 msgid "Email Change"
 msgstr "更改電郵地址"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1586
+#: src/client.cpp:1582
 msgid "Email changed successfully!"
 msgstr "成功更改電郵地址!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1622
+#: src/client.cpp:1618
 msgid "Unregister Successful"
 msgstr "取消註冊成功"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1624
+#: src/client.cpp:1620
 msgid "Farewell, come back any time..."
 msgstr "再見了，隨時回來吧..."
 
@@ -791,52 +790,52 @@ msgid "%s doesn't exist and can't be created!"
 msgstr ""
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:51
+#: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
 msgstr "dyecmd srcfile dyestring dstfile"
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:53
+#: src/dyetool/dyemain.cpp:50
 msgid "or"
 msgstr "or"
 
 #. TRANSLATORS: command line help
-#: src/dyetool/dyemain.cpp:55
+#: src/dyetool/dyemain.cpp:52
 msgid "dyecmd srcdyestring dstfile"
 msgstr "dyecmd srcdyestring dstfile"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: chat tab name
-#: src/game.cpp:267 src/gui/windows/chatwindow.cpp:2222
+#: src/game.cpp:266 src/gui/windows/chatwindow.cpp:2222
 msgid "General"
 msgstr "一般"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:274 src/gui/windowmenu.cpp:175
+#: src/game.cpp:273 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "調試"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:582
+#: src/game.cpp:581
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "截圖已保存為 %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:592
+#: src/game.cpp:591
 msgid "Saving screenshot failed!"
 msgstr "保存截圖失敗!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:679
+#: src/game.cpp:678
 msgid "The connection to the server was lost."
 msgstr "與服務器的連接中斷."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:682
+#: src/game.cpp:681
 msgid "Network Error"
 msgstr "網絡錯誤"
 
@@ -1251,7 +1250,8 @@ 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,7 +1268,8 @@ 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:602
+#: src/gui/windows/equipmentwindow.cpp:671
+#: src/gui/windows/serverdialog.cpp:602
 msgid "default"
 msgstr "默認"
 
@@ -1786,19 +1787,19 @@ msgid "Cancel"
 msgstr "取消"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:223
+#: src/gui/popups/itempopup.cpp:222
 #, c-format
 msgid "Weight: %s"
 msgstr "重量：%s"
 
 #. TRANSLATORS: named item description
-#: src/gui/popups/itempopup.cpp:290
+#: src/gui/popups/itempopup.cpp:289
 #, c-format
 msgid "Item named: %s"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:317
+#: src/gui/popups/itempopup.cpp:316
 msgid "Cards: "
 msgstr "卡片： "
 
@@ -2139,7 +2140,7 @@ msgstr "編輯咒語"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:831 src/gui/windows/npcdialog.cpp:127
+#: src/gui/popups/popupmenu.cpp:831 src/gui/windows/npcdialog.cpp:126
 msgid "Clear"
 msgstr "清除"
 
@@ -2481,8 +2482,9 @@ msgstr "顯示視窗"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/popups/popupmenu.cpp:2379 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:68 src/gui/windows/statuswindow.cpp:243
+#: src/gui/windows/statuswindow.cpp:367
 #, c-format
 msgid "Level: %d"
 msgstr "等級:%d"
@@ -2901,8 +2903,8 @@ msgstr ""
 #. TRANSLATORS: info message
 #: src/gui/popups/popupmenu.cpp:3093 src/gui/popups/popupmenu.cpp:3112
 #: src/gui/popups/popupmenu.cpp:3125 src/gui/windows/charselectdialog.cpp:76
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:408
-#: src/net/eathena/charserverrecv.cpp:444
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:401
+#: src/net/eathena/charserverrecv.cpp:437
 msgid "Info"
 msgstr ""
 
@@ -3321,7 +3323,7 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:132
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:131
 #: src/gui/windows/serverdialog.cpp:113 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:85
 msgid "Add"
@@ -3349,7 +3351,7 @@ msgstr "離開"
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:192
-#: src/gui/windows/itemamountwindow.cpp:228 src/gui/windows/npcdialog.cpp:123
+#: src/gui/windows/itemamountwindow.cpp:228 src/gui/windows/npcdialog.cpp:122
 #: src/gui/windows/statuswindow.cpp:746
 msgid "+"
 msgstr ""
@@ -3361,7 +3363,7 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:190
-#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:125
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:124
 msgid "-"
 msgstr ""
 
@@ -3528,13 +3530,15 @@ 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 ""
 
@@ -3545,19 +3549,22 @@ 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 ""
 
@@ -3991,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:116
+#: src/gui/widgets/tabs/setup_colors.cpp:86
+#: src/gui/windows/emotewindow.cpp:116
 msgid "Colors"
 msgstr ""
 
@@ -4023,11 +4030,9 @@ 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
@@ -4054,11 +4059,9 @@ 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
@@ -4069,9 +4072,7 @@ 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 ""
@@ -4112,8 +4113,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
@@ -4124,11 +4125,9 @@ 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
@@ -4139,11 +4138,9 @@ 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
@@ -4159,13 +4156,9 @@ 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
@@ -4178,8 +4171,7 @@ 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,12 +4190,9 @@ 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,8 +4203,7 @@ 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,11 +4216,9 @@ 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
@@ -4257,11 +4243,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM "
-"activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this "
-"tab only appears for GMs."
+"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4272,8 +4256,7 @@ 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,9 +4269,7 @@ 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 ""
@@ -4301,9 +4282,7 @@ 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,10 +4308,7 @@ 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 ""
@@ -4367,8 +4343,7 @@ 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 ""
@@ -4381,8 +4356,7 @@ 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 ""
@@ -4395,12 +4369,9 @@ 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
@@ -4685,8 +4656,8 @@ msgstr ""
 #. TRANSLATORS: debug window tab
 #. TRANSLATORS: mini map window name
 #: src/gui/widgets/tabs/setup_other.cpp:137 src/gui/windowmenu.cpp:114
-#: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:60
-#: src/gui/windows/minimap.cpp:123
+#: src/gui/windows/debugwindow.cpp:61 src/gui/windows/minimap.cpp:59
+#: src/gui/windows/minimap.cpp:122
 msgid "Map"
 msgstr ""
 
@@ -4877,7 +4848,7 @@ msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:292 src/gui/windows/npcdialog.cpp:99
+#: src/gui/widgets/tabs/setup_other.cpp:292 src/gui/windows/npcdialog.cpp:98
 msgid "NPC"
 msgstr "NPC"
 
@@ -6144,7 +6115,8 @@ 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 "建立隊伍"
 
@@ -6263,7 +6235,8 @@ msgstr ""
 #: src/gui/windows/charcreatedialog.cpp:193
 #: src/gui/windows/charcreatedialog.cpp:206
 #: src/gui/windows/charcreatedialog.cpp:217
-#: src/gui/windows/charcreatedialog.cpp:227 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:227
+#: src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ""
 
@@ -6281,7 +6254,8 @@ msgstr "請分配%d點數"
 #: src/gui/windows/charcreatedialog.cpp:197
 #: src/gui/windows/charcreatedialog.cpp:208
 #: src/gui/windows/charcreatedialog.cpp:219
-#: src/gui/windows/charcreatedialog.cpp:229 src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:229
+#: src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr ""
 
@@ -6307,7 +6281,8 @@ msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:248 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:248
+#: src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr ""
 
@@ -6509,7 +6484,8 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:111
+#: src/gui/windows/editserverdialog.cpp:57
+#: src/gui/windows/serverdialog.cpp:111
 msgid "Connect"
 msgstr ""
 
@@ -6859,26 +6835,28 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:73
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:72
 msgid "Subject:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:104
+#: src/gui/windows/maileditwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:103
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:123
-#: src/gui/windows/mailviewwindow.cpp:132
+#: src/gui/windows/maileditwindow.cpp:63
+#: src/gui/windows/mailviewwindow.cpp:122
+#: src/gui/windows/mailviewwindow.cpp:131
 msgid "Item:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:76
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:75
 msgid "Message:"
 msgstr ""
 
@@ -6888,27 +6866,27 @@ msgid "empty subject"
 msgstr ""
 
 #. TRANSLATORS: mail view window name
-#: src/gui/windows/mailviewwindow.cpp:54
+#: src/gui/windows/mailviewwindow.cpp:53
 msgid "View mail"
 msgstr ""
 
 #. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:64
+#: src/gui/windows/mailviewwindow.cpp:63
 msgid "Reply"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:65
 msgid "Time:"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:70
+#: src/gui/windows/mailviewwindow.cpp:69
 msgid "From:"
 msgstr ""
 
 #. TRANSLATORS: mail view attach button
-#: src/gui/windows/mailviewwindow.cpp:141
+#: src/gui/windows/mailviewwindow.cpp:140
 msgid "Get attach"
 msgstr ""
 
@@ -6998,22 +6976,22 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:84
+#: src/gui/windows/npcdialog.cpp:83
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:86
+#: src/gui/windows/npcdialog.cpp:85
 msgid "Next"
 msgstr "繼續"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:90
+#: src/gui/windows/npcdialog.cpp:89
 msgid "Submit"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:134
+#: src/gui/windows/npcdialog.cpp:133
 msgid "Reset"
 msgstr ""
 
@@ -7576,7 +7554,8 @@ 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
@@ -9055,33 +9034,33 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:387
-#: src/net/eathena/charserverrecv.cpp:435
+#: src/net/eathena/charserverrecv.cpp:380
+#: src/net/eathena/charserverrecv.cpp:428
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:410
+#: src/net/eathena/charserverrecv.cpp:403
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:419
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:423
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:439
+#: src/net/eathena/charserverrecv.cpp:432
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:473 src/net/tmwa/charserverrecv.cpp:294
+#: src/net/eathena/charserverrecv.cpp:466 src/net/tmwa/charserverrecv.cpp:284
 msgid "Failed to delete character."
 msgstr ""
 
@@ -9413,7 +9392,7 @@ msgid "Map not found"
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/net/eathena/inventoryrecv.cpp:844
+#: src/net/eathena/inventoryrecv.cpp:823
 #, c-format
 msgid "Left %s rental time for item %s."
 msgstr ""
@@ -9421,8 +9400,8 @@ msgstr ""
 #. TRANSLATORS: unknown item
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
-#: src/net/eathena/inventoryrecv.cpp:1197
-#: src/net/eathena/inventoryrecv.cpp:1330 src/resources/db/itemdb.cpp:265
+#: src/net/eathena/inventoryrecv.cpp:1176
+#: src/net/eathena/inventoryrecv.cpp:1309 src/resources/db/itemdb.cpp:265
 msgid "Unknown item"
 msgstr ""