update translations.

16 files changed, 1604 insertions, 1419 deletions

diff --git a/po/cs.po b/po/cs.po
index 0cdd67446..ff3ad115a 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-10-19 16:54+0300\n"
+"POT-Creation-Date: 2013-10-25 16:34+0300\n"
 "PO-Revision-Date: 2013-09-20 08:56+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Czech (http://www.transifex.com/projects/p/manaplus/language/"
@@ -38,25 +38,25 @@ msgid "Visible on map"
 msgstr "Viditelný na mapě"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:296
+#: src/being/being.cpp:294
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:504
+#: src/being/being.cpp:502
 msgid "dodge"
 msgstr "uskočil"
 
-#: src/being/being.cpp:504
+#: src/being/being.cpp:502
 msgid "miss"
 msgstr "minul"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1748 src/gui/windows/whoisonline.cpp:861
+#: src/being/being.cpp:1746 src/gui/windows/whoisonline.cpp:861
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1753 src/gui/windows/whoisonline.cpp:866
+#: src/being/being.cpp:1751 src/gui/windows/whoisonline.cpp:866
 msgid "I"
 msgstr ""
 
@@ -530,31 +530,31 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:1106 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:58
+#: src/client.cpp:1109 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:58
 msgid "Setup"
 msgstr "Nastavení"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1110 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1113 src/gui/widgets/tabs/setup_perfomance.cpp:50
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:1113 src/gui/widgets/tabs/setup_video.cpp:221
+#: src/client.cpp:1116 src/gui/widgets/tabs/setup_video.cpp:221
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1116 src/gui/widgets/tabs/setup_theme.cpp:279
+#: src/client.cpp:1119 src/gui/widgets/tabs/setup_theme.cpp:279
 msgid "Theme"
 msgstr "Téma"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:1119 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1122 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:50
 msgid "Help"
 msgstr "Nápověda"
@@ -567,7 +567,7 @@ msgstr "Nápověda"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1123 src/gui/popups/popupmenu.cpp:618
+#: src/client.cpp:1126 src/gui/popups/popupmenu.cpp:618
 #: src/gui/windows/didyouknowwindow.cpp:78
 #: src/gui/windows/inventorywindow.cpp:252 src/gui/windows/npcdialog.cpp:71
 #: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:134
@@ -576,32 +576,32 @@ msgid "Close"
 msgstr "Zavřít"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1242
+#: src/client.cpp:1245
 msgid "Connecting to server"
 msgstr "Připojuji se k serveru"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1287
+#: src/client.cpp:1290
 msgid "Logging in"
 msgstr "Přihlašuji se"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1328
+#: src/client.cpp:1331
 msgid "Entering game world"
 msgstr "Vstupuji do herního světa"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1451
+#: src/client.cpp:1454
 msgid "Requesting characters"
 msgstr "Požaduji postavy"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1492
+#: src/client.cpp:1495
 msgid "Connecting to the game server"
 msgstr "Připojuji se k hernímu serveru"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1506
+#: src/client.cpp:1509
 msgid "Changing game servers"
 msgstr "Zaměňuji herní servery"
 
@@ -616,10 +616,10 @@ msgstr "Zaměňuji herní servery"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1566 src/client.cpp:1577 src/client.cpp:1758
+#: src/client.cpp:1569 src/client.cpp:1580 src/client.cpp:1761
 #: src/gui/windows/changeemaildialog.cpp:167
 #: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:358
+#: src/gui/windows/charcreatedialog.cpp:357
 #: src/gui/windows/charselectdialog.cpp:297
 #: src/gui/windows/editserverdialog.cpp:217
 #: src/gui/windows/registerdialog.cpp:259
@@ -629,65 +629,65 @@ msgid "Error"
 msgstr "Chyba"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1590
+#: src/client.cpp:1593
 msgid "Requesting registration details"
 msgstr "Požaduji registrační detaily"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1630
+#: src/client.cpp:1633
 msgid "Password Change"
 msgstr "Změna hesla"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1632
+#: src/client.cpp:1635
 msgid "Password changed successfully!"
 msgstr "Heslo úspěšně změněno!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1654
+#: src/client.cpp:1657
 msgid "Email Change"
 msgstr "Změna emailu"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1656
+#: src/client.cpp:1659
 msgid "Email changed successfully!"
 msgstr "Email úspěšně změněn!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1679
+#: src/client.cpp:1682
 msgid "Unregister Successful"
 msgstr "Zrušení registrace úspěšné"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1681
+#: src/client.cpp:1684
 msgid "Farewell, come back any time..."
 msgstr "Nashledanou, vraťte se kdykoli..."
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1953 src/client.cpp:1968 src/client.cpp:2011
-#: src/client.cpp:2027 src/client.cpp:2467 src/client.cpp:2475
+#: src/client.cpp:1956 src/client.cpp:1971 src/client.cpp:2014
+#: src/client.cpp:2030 src/client.cpp:2456 src/client.cpp:2464
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s neexistuje a vytvoření selhalo. Končím."
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2167
+#: src/client.cpp:2170
 #, c-format
 msgid "Invalid update host: %s."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2208 src/client.cpp:2215
+#: src/client.cpp:2211 src/client.cpp:2218
 msgid "Error creating updates directory!"
 msgstr "Chyba při vytváření adresáře s updaty!"
 
-#: src/client.cpp:2237 src/client.cpp:2250
+#: src/client.cpp:2240 src/client.cpp:2253
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Chyba: %s neexistuje a nelze ho vytvořit. Ukončuji."
 
 #. TRANSLATORS: error message question
-#: src/client.cpp:2915
+#: src/client.cpp:2904
 msgid "Do you want to open support page?"
 msgstr ""
 
@@ -945,25 +945,25 @@ msgid "Network Error"
 msgstr "Chyba sítě"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:132
 #, c-format
 msgid "Party: %s"
 msgstr "Parta: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:147
 #, c-format
 msgid "Guild: %s"
 msgstr "Guilda: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:161
 #, c-format
 msgid "Pvp rank: %u"
 msgstr "PVP hodnost: %u"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:173
 #, c-format
 msgid "Comment: %s"
 msgstr "Komentář: %s"
@@ -1174,7 +1174,7 @@ msgstr "Vložit jméno do chatu"
 #: src/gui/windows/connectiondialog.cpp:48
 #: src/gui/windows/editserverdialog.cpp:78
 #: src/gui/windows/itemamountwindow.cpp:209
-#: src/gui/windows/npcpostdialog.cpp:69 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:69
 #: src/gui/windows/registerdialog.cpp:76 src/gui/windows/setup.cpp:90
 #: src/gui/windows/socialwindow.cpp:1231
 #: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:53
@@ -2394,7 +2394,7 @@ msgstr ""
 #. TRANSLATORS: register dialog. button.
 #: src/gui/setupactiondata.h:1779 src/gui/setupactiondata.h:1868
 #: src/gui/widgets/tabs/setup_audio.cpp:159
-#: src/gui/widgets/tabs/setup_chat.cpp:176
+#: src/gui/widgets/tabs/setup_chat.cpp:180
 #: src/gui/widgets/tabs/setup_other.cpp:321
 #: src/gui/widgets/tabs/setup_visual.cpp:175
 #: src/gui/windows/charcreatedialog.cpp:107
@@ -2477,7 +2477,7 @@ msgstr ""
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupactiondata.h:1866 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:197
+#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
 msgid "Chat"
 msgstr "Chat"
 
@@ -2704,61 +2704,61 @@ msgstr "Peníze: %s"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:146
+#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
 msgid "black"
 msgstr "černá"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:148
+#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
 msgid "red"
 msgstr "červená"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:150
+#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
 msgid "green"
 msgstr "zelená"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:152
+#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
 msgid "blue"
 msgstr "modrá"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:154
+#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
 msgid "gold"
 msgstr "zlatá"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:156
+#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
 msgid "yellow"
 msgstr "žlutá"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:158
+#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
 msgid "pink"
 msgstr "růžová"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:160
+#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
 msgid "purple"
 msgstr "fialová"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:162
+#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
 msgid "grey"
 msgstr "šedá"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:164
+#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
 msgid "brown"
 msgstr "hnědá"
 
@@ -3143,86 +3143,97 @@ msgstr "Zprávy"
 msgid "Hide shop messages"
 msgstr "Skrýt obchodní zprávy"
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:124
+msgid "Show MVP messages"
+msgstr ""
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:125
+#: src/gui/widgets/tabs/setup_chat.cpp:129
 msgid "Tabs"
 msgstr "Záložky"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:128
+#: src/gui/widgets/tabs/setup_chat.cpp:132
 msgid "Put all whispers in tabs"
 msgstr "Všechy šeptání jako záložky"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:132
+#: src/gui/widgets/tabs/setup_chat.cpp:136
 msgid "Log magic messages in debug tab"
 msgstr "Zaznamenávat zprávy o magii v debug záložce"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:136
+#: src/gui/widgets/tabs/setup_chat.cpp:140
 msgid "Show server messages in debug tab"
 msgstr "Zobrazovat serverové zprávy v debug záložce"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:140
+#: src/gui/widgets/tabs/setup_chat.cpp:144
 msgid "Enable trade tab"
 msgstr "Zapnout obchodní záložku"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:144
+#: src/gui/widgets/tabs/setup_chat.cpp:148
 msgid "Enable gm tab"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:148
+#: src/gui/widgets/tabs/setup_chat.cpp:152
 msgid "Enable language tab"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:152
+#: src/gui/widgets/tabs/setup_chat.cpp:156
 msgid "Show all languages messages"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:156
+#: src/gui/widgets/tabs/setup_chat.cpp:160
 msgid "Enable battle tab"
 msgstr "Zapnout bitevní záložku"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:160
+#: src/gui/widgets/tabs/setup_chat.cpp:164
 msgid "Show battle events"
 msgstr "Zobrazovat bitevní události"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:164
+#: src/gui/widgets/tabs/setup_chat.cpp:168
 msgid "Resize chat tabs if need"
 msgstr "Změnit velikost záložek pokud nutno"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:169
+#: src/gui/widgets/tabs/setup_chat.cpp:173
 msgid "Time"
 msgstr "Čas"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:172
+#: src/gui/widgets/tabs/setup_chat.cpp:176
 msgid "Use local time"
 msgstr "Použít místní čas"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:179
+#: src/gui/widgets/tabs/setup_chat.cpp:183
 msgid "Highlight words (separated by comma)"
 msgstr "Zvýrazňovaná slova (oddělená čárkou)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:183
+#: src/gui/widgets/tabs/setup_chat.cpp:187
 msgid "Globals ignore names (separated by comma)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:187
-msgid "Show MVP messages"
+#: src/gui/widgets/tabs/setup_chat.cpp:191
+msgid "Show emotes button in chat"
 msgstr ""
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:195
+#, fuzzy
+msgid "Show motd server message on start"
+msgstr "Zobrazovat serverové zprávy v debug záložce"
+
 #: src/gui/widgets/tabs/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr "Takhle to bude vypadat"
@@ -3409,7 +3420,7 @@ msgstr ""
 #. TRANSLATORS: chat color
 #. TRANSLATORS: inventory sort mode
 #: src/gui/widgets/tabs/setup_other.cpp:71
-#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:150
 #: src/gui/windows/inventorywindow.cpp:69
 msgid "default"
 msgstr "výchozí"
@@ -5075,8 +5086,8 @@ msgstr "Jméno:"
 #: src/gui/windows/charcreatedialog.cpp:75
 #: src/gui/windows/charcreatedialog.cpp:84
 #: src/gui/windows/charcreatedialog.cpp:101
-#: src/gui/windows/charcreatedialog.cpp:171
-#: src/gui/windows/charcreatedialog.cpp:181
+#: src/gui/windows/charcreatedialog.cpp:170
+#: src/gui/windows/charcreatedialog.cpp:180
 #: src/gui/windows/outfitwindow.cpp:58
 msgid ">"
 msgstr ">"
@@ -5087,8 +5098,8 @@ msgstr ">"
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:79
 #: src/gui/windows/charcreatedialog.cpp:86
-#: src/gui/windows/charcreatedialog.cpp:173
-#: src/gui/windows/charcreatedialog.cpp:183
+#: src/gui/windows/charcreatedialog.cpp:172
+#: src/gui/windows/charcreatedialog.cpp:182
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "<"
 msgstr "<"
@@ -5124,33 +5135,33 @@ msgstr "Žena"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:466
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Rozdělte prosím %d bodů"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:174
 msgid "Race:"
 msgstr "Rasa:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:185
+#: src/gui/windows/charcreatedialog.cpp:184
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:359
 msgid "Your name needs to be at least 4 characters."
 msgstr "Vaše jméno musí mít nejméně 4 znaky."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:456
 msgid "Character stats OK"
 msgstr "Stav postavy je OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:472
 #, c-format
 msgid "Please remove %d points"
 msgstr "Odstraňte prosím %d bodů"
@@ -5236,28 +5247,28 @@ msgid "Enter password:"
 msgstr "Zadej heslo:"
 
 #. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:166
+#: src/gui/windows/chatwindow.cpp:172
 msgid "rainbow 1"
 msgstr "duhová 1"
 
 #. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:168
+#: src/gui/windows/chatwindow.cpp:174
 msgid "rainbow 2"
 msgstr "duhová 2"
 
 #. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:170
+#: src/gui/windows/chatwindow.cpp:176
 msgid "rainbow 3"
 msgstr "duhová 3"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:694
+#: src/gui/windows/chatwindow.cpp:740
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Přítomni: %s; %d hráčů je přítomno."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1103
+#: src/gui/windows/chatwindow.cpp:1154
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Šeptání pro %s: %s"
@@ -5880,17 +5891,17 @@ msgid "Add"
 msgstr "Přidat"
 
 #. TRANSLATORS: label in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:58
+#: src/gui/windows/npcpostdialog.cpp:57
 msgid "To:"
 msgstr "Komu:"
 
 #. TRANSLATORS: button in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:65
+#: src/gui/windows/npcpostdialog.cpp:64
 msgid "Send"
 msgstr "Odeslat"
 
 #. TRANSLATORS: npc post message error
-#: src/gui/windows/npcpostdialog.cpp:112
+#: src/gui/windows/npcpostdialog.cpp:111
 msgid "Failed to send as sender or letter invalid."
 msgstr "Odeslání se nezdařilo. Odesílatel nebo dopis není platný."
 
@@ -6915,13 +6926,13 @@ msgid "Failed to delete character."
 msgstr "Nepodařilo se odstranit postavu."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:87
+#: src/net/ea/chathandler.cpp:88
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr "Nelze odeslat šeptání, %s není připojen."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:96
+#: src/net/ea/chathandler.cpp:97
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr "Nelze odeslat šeptání, %s vás ignoruje."
diff --git a/po/de.po b/po/de.po
index fdd7b5a38..739063af4 100644
--- a/po/de.po
+++ b/po/de.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-10-19 16:54+0300\n"
+"POT-Creation-Date: 2013-10-25 16:34+0300\n"
 "PO-Revision-Date: 2013-09-20 08:56+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/manaplus/language/"
@@ -48,25 +48,25 @@ msgid "Visible on map"
 msgstr "Sichtbar auf der Karte"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:296
+#: src/being/being.cpp:294
 msgid "Human"
 msgstr "Mensch"
 
-#: src/being/being.cpp:504
+#: src/being/being.cpp:502
 msgid "dodge"
 msgstr "ausweichen"
 
-#: src/being/being.cpp:504
+#: src/being/being.cpp:502
 msgid "miss"
 msgstr "verfehlt"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1748 src/gui/windows/whoisonline.cpp:861
+#: src/being/being.cpp:1746 src/gui/windows/whoisonline.cpp:861
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1753 src/gui/windows/whoisonline.cpp:866
+#: src/being/being.cpp:1751 src/gui/windows/whoisonline.cpp:866
 msgid "I"
 msgstr "I"
 
@@ -539,31 +539,31 @@ msgstr "Schwebende Blase"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:1106 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:58
+#: src/client.cpp:1109 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:58
 msgid "Setup"
 msgstr "Einstellungen"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1110 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1113 src/gui/widgets/tabs/setup_perfomance.cpp:50
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:1113 src/gui/widgets/tabs/setup_video.cpp:221
+#: src/client.cpp:1116 src/gui/widgets/tabs/setup_video.cpp:221
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1116 src/gui/widgets/tabs/setup_theme.cpp:279
+#: src/client.cpp:1119 src/gui/widgets/tabs/setup_theme.cpp:279
 msgid "Theme"
 msgstr "Theme"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:1119 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1122 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:50
 msgid "Help"
 msgstr "Hilfe"
@@ -576,7 +576,7 @@ msgstr "Hilfe"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1123 src/gui/popups/popupmenu.cpp:618
+#: src/client.cpp:1126 src/gui/popups/popupmenu.cpp:618
 #: src/gui/windows/didyouknowwindow.cpp:78
 #: src/gui/windows/inventorywindow.cpp:252 src/gui/windows/npcdialog.cpp:71
 #: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:134
@@ -585,32 +585,32 @@ msgid "Close"
 msgstr "Schließen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1242
+#: src/client.cpp:1245
 msgid "Connecting to server"
 msgstr "Verbinde zum Server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1287
+#: src/client.cpp:1290
 msgid "Logging in"
 msgstr "Anmelden"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1328
+#: src/client.cpp:1331
 msgid "Entering game world"
 msgstr "Betrete die Spielwelt"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1451
+#: src/client.cpp:1454
 msgid "Requesting characters"
 msgstr "Spielfiguren werden abgefragt"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1492
+#: src/client.cpp:1495
 msgid "Connecting to the game server"
 msgstr "Verbinde zum Charakterserver"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1506
+#: src/client.cpp:1509
 msgid "Changing game servers"
 msgstr "Charakterserver wechseln"
 
@@ -625,10 +625,10 @@ msgstr "Charakterserver wechseln"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1566 src/client.cpp:1577 src/client.cpp:1758
+#: src/client.cpp:1569 src/client.cpp:1580 src/client.cpp:1761
 #: src/gui/windows/changeemaildialog.cpp:167
 #: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:358
+#: src/gui/windows/charcreatedialog.cpp:357
 #: src/gui/windows/charselectdialog.cpp:297
 #: src/gui/windows/editserverdialog.cpp:217
 #: src/gui/windows/registerdialog.cpp:259
@@ -638,66 +638,66 @@ msgid "Error"
 msgstr "Fehler"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1590
+#: src/client.cpp:1593
 msgid "Requesting registration details"
 msgstr "Anfrage der Registrierungsdetails"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1630
+#: src/client.cpp:1633
 msgid "Password Change"
 msgstr "Passwort ändern"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1632
+#: src/client.cpp:1635
 msgid "Password changed successfully!"
 msgstr "Passwort erfolgreich geändert!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1654
+#: src/client.cpp:1657
 msgid "Email Change"
 msgstr "E-Mail ändern"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1656
+#: src/client.cpp:1659
 msgid "Email changed successfully!"
 msgstr "E-Mail erfolgreich geändert!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1679
+#: src/client.cpp:1682
 msgid "Unregister Successful"
 msgstr "Erfolgreich abgemeldet."
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1681
+#: src/client.cpp:1684
 msgid "Farewell, come back any time..."
 msgstr "Leb wohl und komm jeder Zeit wieder..."
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1953 src/client.cpp:1968 src/client.cpp:2011
-#: src/client.cpp:2027 src/client.cpp:2467 src/client.cpp:2475
+#: src/client.cpp:1956 src/client.cpp:1971 src/client.cpp:2014
+#: src/client.cpp:2030 src/client.cpp:2456 src/client.cpp:2464
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s existiert nicht und kann nicht erstellt werden! Beende."
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2167
+#: src/client.cpp:2170
 #, c-format
 msgid "Invalid update host: %s."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2208 src/client.cpp:2215
+#: src/client.cpp:2211 src/client.cpp:2218
 msgid "Error creating updates directory!"
 msgstr "Fehler beim Erstellen des Verzeichnisses für Updates!"
 
-#: src/client.cpp:2237 src/client.cpp:2250
+#: src/client.cpp:2240 src/client.cpp:2253
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 "Fehler: %s existiert nicht und kann nicht erstellt werden! Verlassend..."
 
 #. TRANSLATORS: error message question
-#: src/client.cpp:2915
+#: src/client.cpp:2904
 msgid "Do you want to open support page?"
 msgstr ""
 
@@ -956,25 +956,25 @@ msgid "Network Error"
 msgstr "Netzwerkfehler"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:132
 #, c-format
 msgid "Party: %s"
 msgstr "Gruppe: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:147
 #, c-format
 msgid "Guild: %s"
 msgstr "Gilde: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:161
 #, c-format
 msgid "Pvp rank: %u"
 msgstr "PvP-Rang: %u"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:173
 #, c-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
@@ -1185,7 +1185,7 @@ msgstr "Füge Name dem Chat hinzu"
 #: src/gui/windows/connectiondialog.cpp:48
 #: src/gui/windows/editserverdialog.cpp:78
 #: src/gui/windows/itemamountwindow.cpp:209
-#: src/gui/windows/npcpostdialog.cpp:69 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:69
 #: src/gui/windows/registerdialog.cpp:76 src/gui/windows/setup.cpp:90
 #: src/gui/windows/socialwindow.cpp:1231
 #: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:53
@@ -2405,7 +2405,7 @@ msgstr "Seite runter"
 #. TRANSLATORS: register dialog. button.
 #: src/gui/setupactiondata.h:1779 src/gui/setupactiondata.h:1868
 #: src/gui/widgets/tabs/setup_audio.cpp:159
-#: src/gui/widgets/tabs/setup_chat.cpp:176
+#: src/gui/widgets/tabs/setup_chat.cpp:180
 #: src/gui/widgets/tabs/setup_other.cpp:321
 #: src/gui/widgets/tabs/setup_visual.cpp:175
 #: src/gui/windows/charcreatedialog.cpp:107
@@ -2488,7 +2488,7 @@ msgstr "Gefühle"
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupactiondata.h:1866 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:197
+#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
 msgid "Chat"
 msgstr "Chat"
 
@@ -2715,61 +2715,61 @@ msgstr "Geld: %s"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:146
+#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
 msgid "black"
 msgstr "schwarz"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:148
+#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
 msgid "red"
 msgstr "rot"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:150
+#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
 msgid "green"
 msgstr "grün"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:152
+#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
 msgid "blue"
 msgstr "blau"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:154
+#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
 msgid "gold"
 msgstr "gold"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:156
+#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
 msgid "yellow"
 msgstr "gelb"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:158
+#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
 msgid "pink"
 msgstr "rosa"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:160
+#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
 msgid "purple"
 msgstr "lila"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:162
+#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
 msgid "grey"
 msgstr "grau"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:164
+#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
 msgid "brown"
 msgstr "braun"
 
@@ -3156,85 +3156,97 @@ msgstr "Nachrichten"
 msgid "Hide shop messages"
 msgstr "Verstecke Laden-Mitteilungen"
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:124
+msgid "Show MVP messages"
+msgstr "Zeige MVP-Mitteilungen"
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:125
+#: src/gui/widgets/tabs/setup_chat.cpp:129
 msgid "Tabs"
 msgstr "Tabs"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:128
+#: src/gui/widgets/tabs/setup_chat.cpp:132
 msgid "Put all whispers in tabs"
 msgstr "Alle privaten Nachrichten in Unterfenster öffnen"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:132
+#: src/gui/widgets/tabs/setup_chat.cpp:136
 msgid "Log magic messages in debug tab"
 msgstr "Aufzeichnen der magischen Nachrichten im \"Debug Tab\""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:136
+#: src/gui/widgets/tabs/setup_chat.cpp:140
 msgid "Show server messages in debug tab"
 msgstr "Zeige Servermitteilungen im \"Debug Tab\""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:140
+#: src/gui/widgets/tabs/setup_chat.cpp:144
 msgid "Enable trade tab"
 msgstr "Handels-Tab einschalten"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:144
+#: src/gui/widgets/tabs/setup_chat.cpp:148
 msgid "Enable gm tab"
 msgstr "GM-Tab einschalten"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:148
+#: src/gui/widgets/tabs/setup_chat.cpp:152
 msgid "Enable language tab"
 msgstr "\"eigene Sprache\"-Tab einschalten"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:152
+#: src/gui/widgets/tabs/setup_chat.cpp:156
 msgid "Show all languages messages"
 msgstr "Zeige alle \"eigene Sprache\"-Nachrichten"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:156
+#: src/gui/widgets/tabs/setup_chat.cpp:160
 msgid "Enable battle tab"
 msgstr "Kampf-Tab einschalten"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:160
+#: src/gui/widgets/tabs/setup_chat.cpp:164
 msgid "Show battle events"
 msgstr "Zeige Kampf-Ereignisse"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:164
+#: src/gui/widgets/tabs/setup_chat.cpp:168
 msgid "Resize chat tabs if need"
 msgstr "Größe der Chatunterfenster anpassen"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:169
+#: src/gui/widgets/tabs/setup_chat.cpp:173
 msgid "Time"
 msgstr "Zeit"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:172
+#: src/gui/widgets/tabs/setup_chat.cpp:176
 msgid "Use local time"
 msgstr "Benutze lokale Zeit"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:179
+#: src/gui/widgets/tabs/setup_chat.cpp:183
 msgid "Highlight words (separated by comma)"
 msgstr "Diese Wörter hervorheben (mit Komma trennen)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:183
+#: src/gui/widgets/tabs/setup_chat.cpp:187
 msgid "Globals ignore names (separated by comma)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:187
-msgid "Show MVP messages"
-msgstr "Zeige MVP-Mitteilungen"
+#: src/gui/widgets/tabs/setup_chat.cpp:191
+#, fuzzy
+msgid "Show emotes button in chat"
+msgstr "Zeige Aufhebenachrichten im Chat"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:195
+#, fuzzy
+msgid "Show motd server message on start"
+msgstr "Zeige Servermitteilungen im \"Debug Tab\""
 
 #: src/gui/widgets/tabs/setup_colors.cpp:46
 msgid "This is what the color looks like"
@@ -3422,7 +3434,7 @@ msgstr "SOCKS5 hostname"
 #. TRANSLATORS: chat color
 #. TRANSLATORS: inventory sort mode
 #: src/gui/widgets/tabs/setup_other.cpp:71
-#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:150
 #: src/gui/windows/inventorywindow.cpp:69
 msgid "default"
 msgstr "Standard"
@@ -5093,8 +5105,8 @@ msgstr "Name :"
 #: src/gui/windows/charcreatedialog.cpp:75
 #: src/gui/windows/charcreatedialog.cpp:84
 #: src/gui/windows/charcreatedialog.cpp:101
-#: src/gui/windows/charcreatedialog.cpp:171
-#: src/gui/windows/charcreatedialog.cpp:181
+#: src/gui/windows/charcreatedialog.cpp:170
+#: src/gui/windows/charcreatedialog.cpp:180
 #: src/gui/windows/outfitwindow.cpp:58
 msgid ">"
 msgstr ">"
@@ -5105,8 +5117,8 @@ msgstr ">"
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:79
 #: src/gui/windows/charcreatedialog.cpp:86
-#: src/gui/windows/charcreatedialog.cpp:173
-#: src/gui/windows/charcreatedialog.cpp:183
+#: src/gui/windows/charcreatedialog.cpp:172
+#: src/gui/windows/charcreatedialog.cpp:182
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "<"
 msgstr "<"
@@ -5142,33 +5154,33 @@ msgstr "Weiblich"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:466
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Bitte verteile %d Punkte"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:174
 msgid "Race:"
 msgstr "Rasse:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:185
+#: src/gui/windows/charcreatedialog.cpp:184
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:359
 msgid "Your name needs to be at least 4 characters."
 msgstr "Dein Name muss aus mindestens 4 Zeichen bestehen."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:456
 msgid "Character stats OK"
 msgstr "Spielfigurattribute OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:472
 #, c-format
 msgid "Please remove %d points"
 msgstr "Bitte entferne %d Punkte"
@@ -5254,28 +5266,28 @@ msgid "Enter password:"
 msgstr "Gib dein Passwort ein:"
 
 #. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:166
+#: src/gui/windows/chatwindow.cpp:172
 msgid "rainbow 1"
 msgstr "Regenbogen 1"
 
 #. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:168
+#: src/gui/windows/chatwindow.cpp:174
 msgid "rainbow 2"
 msgstr "Regenbogen 2"
 
 #. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:170
+#: src/gui/windows/chatwindow.cpp:176
 msgid "rainbow 3"
 msgstr "Regenbogen 3"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:694
+#: src/gui/windows/chatwindow.cpp:740
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Anwesend: %s ; %d Spieler sind anwesend."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1103
+#: src/gui/windows/chatwindow.cpp:1154
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Flüstern zu %s: %s"
@@ -5898,17 +5910,17 @@ msgid "Add"
 msgstr "Hinzufügen"
 
 #. TRANSLATORS: label in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:58
+#: src/gui/windows/npcpostdialog.cpp:57
 msgid "To:"
 msgstr "Nach:"
 
 #. TRANSLATORS: button in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:65
+#: src/gui/windows/npcpostdialog.cpp:64
 msgid "Send"
 msgstr "Senden"
 
 #. TRANSLATORS: npc post message error
-#: src/gui/windows/npcpostdialog.cpp:112
+#: src/gui/windows/npcpostdialog.cpp:111
 msgid "Failed to send as sender or letter invalid."
 msgstr "Es misslang, den Brief zu senden oder er war ungültig."
 
@@ -6939,13 +6951,13 @@ msgid "Failed to delete character."
 msgstr "Konnte Charakter nicht löschen."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:87
+#: src/net/ea/chathandler.cpp:88
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr "Flüstern konnte nicht gesendet werden, %s ist nicht online."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:96
+#: src/net/ea/chathandler.cpp:97
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr "Konnte nicht flüstern. Ignoriert von %s."
diff --git a/po/es.po b/po/es.po
index 5ea32f7e3..71bb78f65 100644
--- a/po/es.po
+++ b/po/es.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-10-19 16:54+0300\n"
+"POT-Creation-Date: 2013-10-25 16:34+0300\n"
 "PO-Revision-Date: 2013-09-23 20:25+0000\n"
 "Last-Translator: Nelson Martell <nelson6e65-manaplus@yahoo.es>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/manaplus/"
@@ -44,25 +44,25 @@ msgid "Visible on map"
 msgstr "Visible sobre el mapa"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:296
+#: src/being/being.cpp:294
 msgid "Human"
 msgstr "Humano"
 
-#: src/being/being.cpp:504
+#: src/being/being.cpp:502
 msgid "dodge"
 msgstr "evade"
 
-#: src/being/being.cpp:504
+#: src/being/being.cpp:502
 msgid "miss"
 msgstr "falla"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1748 src/gui/windows/whoisonline.cpp:861
+#: src/being/being.cpp:1746 src/gui/windows/whoisonline.cpp:861
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1753 src/gui/windows/whoisonline.cpp:866
+#: src/being/being.cpp:1751 src/gui/windows/whoisonline.cpp:866
 msgid "I"
 msgstr "I"
 
@@ -535,31 +535,31 @@ msgstr "Burbuja Flotante"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:1106 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:58
+#: src/client.cpp:1109 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:58
 msgid "Setup"
 msgstr "Configuración"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1110 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1113 src/gui/widgets/tabs/setup_perfomance.cpp:50
 msgid "Performance"
 msgstr "Desempeño"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:1113 src/gui/widgets/tabs/setup_video.cpp:221
+#: src/client.cpp:1116 src/gui/widgets/tabs/setup_video.cpp:221
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1116 src/gui/widgets/tabs/setup_theme.cpp:279
+#: src/client.cpp:1119 src/gui/widgets/tabs/setup_theme.cpp:279
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:1119 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1122 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:50
 msgid "Help"
 msgstr "Ayuda"
@@ -572,7 +572,7 @@ msgstr "Ayuda"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1123 src/gui/popups/popupmenu.cpp:618
+#: src/client.cpp:1126 src/gui/popups/popupmenu.cpp:618
 #: src/gui/windows/didyouknowwindow.cpp:78
 #: src/gui/windows/inventorywindow.cpp:252 src/gui/windows/npcdialog.cpp:71
 #: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:134
@@ -581,32 +581,32 @@ msgid "Close"
 msgstr "Cerrar"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1242
+#: src/client.cpp:1245
 msgid "Connecting to server"
 msgstr "Conectando al servidor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1287
+#: src/client.cpp:1290
 msgid "Logging in"
 msgstr "Accediendo a la cuenta"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1328
+#: src/client.cpp:1331
 msgid "Entering game world"
 msgstr "Entrando al mundo del juego"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1451
+#: src/client.cpp:1454
 msgid "Requesting characters"
 msgstr "Cargando personajes"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1492
+#: src/client.cpp:1495
 msgid "Connecting to the game server"
 msgstr "Conectando al servidor del juego"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1506
+#: src/client.cpp:1509
 msgid "Changing game servers"
 msgstr "Cambiando servidores del juego"
 
@@ -621,10 +621,10 @@ msgstr "Cambiando servidores del juego"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1566 src/client.cpp:1577 src/client.cpp:1758
+#: src/client.cpp:1569 src/client.cpp:1580 src/client.cpp:1761
 #: src/gui/windows/changeemaildialog.cpp:167
 #: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:358
+#: src/gui/windows/charcreatedialog.cpp:357
 #: src/gui/windows/charselectdialog.cpp:297
 #: src/gui/windows/editserverdialog.cpp:217
 #: src/gui/windows/registerdialog.cpp:259
@@ -634,65 +634,65 @@ msgid "Error"
 msgstr "Error"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1590
+#: src/client.cpp:1593
 msgid "Requesting registration details"
 msgstr "Solicitando detalles de registro"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1630
+#: src/client.cpp:1633
 msgid "Password Change"
 msgstr "Cambio de contraseña"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1632
+#: src/client.cpp:1635
 msgid "Password changed successfully!"
 msgstr "¡Contraseña cambiada exitosamente!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1654
+#: src/client.cpp:1657
 msgid "Email Change"
 msgstr "Cambio de Email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1656
+#: src/client.cpp:1659
 msgid "Email changed successfully!"
 msgstr "¡Email modificado exitosamente!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1679
+#: src/client.cpp:1682
 msgid "Unregister Successful"
 msgstr "Registro cancelado"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1681
+#: src/client.cpp:1684
 msgid "Farewell, come back any time..."
 msgstr "Adiós, vuelve cuando quieras..."
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1953 src/client.cpp:1968 src/client.cpp:2011
-#: src/client.cpp:2027 src/client.cpp:2467 src/client.cpp:2475
+#: src/client.cpp:1956 src/client.cpp:1971 src/client.cpp:2014
+#: src/client.cpp:2030 src/client.cpp:2456 src/client.cpp:2464
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "¡%s no existe y no puede ser creado! Saliendo."
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2167
+#: src/client.cpp:2170
 #, c-format
 msgid "Invalid update host: %s."
 msgstr "Servidor de actualización inválido: %s."
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2208 src/client.cpp:2215
+#: src/client.cpp:2211 src/client.cpp:2218
 msgid "Error creating updates directory!"
 msgstr "¡Error al crear la carpeta de actualizaciones!"
 
-#: src/client.cpp:2237 src/client.cpp:2250
+#: src/client.cpp:2240 src/client.cpp:2253
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Error: ¡%s no existe y no puede ser creado! Saliendo."
 
 #. TRANSLATORS: error message question
-#: src/client.cpp:2915
+#: src/client.cpp:2904
 msgid "Do you want to open support page?"
 msgstr "¿Quieres abrir la página de soporte?"
 
@@ -951,25 +951,25 @@ msgid "Network Error"
 msgstr "Error de Red"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:132
 #, c-format
 msgid "Party: %s"
 msgstr "Grupo: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:147
 #, c-format
 msgid "Guild: %s"
 msgstr "Clan: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:161
 #, c-format
 msgid "Pvp rank: %u"
 msgstr "Rango PVP: %u"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:173
 #, c-format
 msgid "Comment: %s"
 msgstr "Comentario: %s"
@@ -1180,7 +1180,7 @@ msgstr "Agregar nombre al chat"
 #: src/gui/windows/connectiondialog.cpp:48
 #: src/gui/windows/editserverdialog.cpp:78
 #: src/gui/windows/itemamountwindow.cpp:209
-#: src/gui/windows/npcpostdialog.cpp:69 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:69
 #: src/gui/windows/registerdialog.cpp:76 src/gui/windows/setup.cpp:90
 #: src/gui/windows/socialwindow.cpp:1231
 #: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:53
@@ -2400,7 +2400,7 @@ msgstr "Page down"
 #. TRANSLATORS: register dialog. button.
 #: src/gui/setupactiondata.h:1779 src/gui/setupactiondata.h:1868
 #: src/gui/widgets/tabs/setup_audio.cpp:159
-#: src/gui/widgets/tabs/setup_chat.cpp:176
+#: src/gui/widgets/tabs/setup_chat.cpp:180
 #: src/gui/widgets/tabs/setup_other.cpp:321
 #: src/gui/widgets/tabs/setup_visual.cpp:175
 #: src/gui/windows/charcreatedialog.cpp:107
@@ -2483,7 +2483,7 @@ msgstr "Emotes"
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupactiondata.h:1866 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:197
+#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
 msgid "Chat"
 msgstr "Chat"
 
@@ -2710,61 +2710,61 @@ msgstr "Dinero: %s"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:146
+#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
 msgid "black"
 msgstr "negro"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:148
+#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
 msgid "red"
 msgstr "rojo"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:150
+#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
 msgid "green"
 msgstr "verde"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:152
+#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
 msgid "blue"
 msgstr "azul"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:154
+#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
 msgid "gold"
 msgstr "dorado"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:156
+#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
 msgid "yellow"
 msgstr "amarillo"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:158
+#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
 msgid "pink"
 msgstr "rosa"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:160
+#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
 msgid "purple"
 msgstr "púrpura"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:162
+#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
 msgid "grey"
 msgstr "gris"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:164
+#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
 msgid "brown"
 msgstr "marrón"
 
@@ -3151,85 +3151,97 @@ msgstr "Mensajes"
 msgid "Hide shop messages"
 msgstr "Ocultar mensajes de la tienda"
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:124
+msgid "Show MVP messages"
+msgstr "Mostrar mensajes MVP"
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:125
+#: src/gui/widgets/tabs/setup_chat.cpp:129
 msgid "Tabs"
 msgstr "Pestañas"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:128
+#: src/gui/widgets/tabs/setup_chat.cpp:132
 msgid "Put all whispers in tabs"
 msgstr "Mostrar nuevos susurros en pestañas"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:132
+#: src/gui/widgets/tabs/setup_chat.cpp:136
 msgid "Log magic messages in debug tab"
 msgstr "Registrar mensajes de magia en la pestaña del depurador"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:136
+#: src/gui/widgets/tabs/setup_chat.cpp:140
 msgid "Show server messages in debug tab"
 msgstr "Mostrar los mensajes del servidor en la pestaña del depurador"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:140
+#: src/gui/widgets/tabs/setup_chat.cpp:144
 msgid "Enable trade tab"
 msgstr "Habilitar pestaña de intercambio"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:144
+#: src/gui/widgets/tabs/setup_chat.cpp:148
 msgid "Enable gm tab"
 msgstr "Habilitar pestaña para GM"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:148
+#: src/gui/widgets/tabs/setup_chat.cpp:152
 msgid "Enable language tab"
 msgstr "Habilitar pestaña de lenguaje"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:152
+#: src/gui/widgets/tabs/setup_chat.cpp:156
 msgid "Show all languages messages"
 msgstr "Mostrar los mensajes de todos los lenguajes"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:156
+#: src/gui/widgets/tabs/setup_chat.cpp:160
 msgid "Enable battle tab"
 msgstr "Habilitar pestaña de batalla"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:160
+#: src/gui/widgets/tabs/setup_chat.cpp:164
 msgid "Show battle events"
 msgstr "Mostrar eventos de batalla"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:164
+#: src/gui/widgets/tabs/setup_chat.cpp:168
 msgid "Resize chat tabs if need"
 msgstr "Si hace falta, cambia el tamaño de pestañas del chat"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:169
+#: src/gui/widgets/tabs/setup_chat.cpp:173
 msgid "Time"
 msgstr "Tiempo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:172
+#: src/gui/widgets/tabs/setup_chat.cpp:176
 msgid "Use local time"
 msgstr "Usar hora local"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:179
+#: src/gui/widgets/tabs/setup_chat.cpp:183
 msgid "Highlight words (separated by comma)"
 msgstr "Resaltar palabras (separadas por coma)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:183
+#: src/gui/widgets/tabs/setup_chat.cpp:187
 msgid "Globals ignore names (separated by comma)"
 msgstr "Ignorar nombres globalmente (separados por coma)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:187
-msgid "Show MVP messages"
-msgstr "Mostrar mensajes MVP"
+#: src/gui/widgets/tabs/setup_chat.cpp:191
+#, fuzzy
+msgid "Show emotes button in chat"
+msgstr "Mostrar notificaciones en el chat al recoger"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:195
+#, fuzzy
+msgid "Show motd server message on start"
+msgstr "Mostrar los mensajes del servidor en la pestaña del depurador"
 
 #: src/gui/widgets/tabs/setup_colors.cpp:46
 msgid "This is what the color looks like"
@@ -3417,7 +3429,7 @@ msgstr "SOCKS5 hostname"
 #. TRANSLATORS: chat color
 #. TRANSLATORS: inventory sort mode
 #: src/gui/widgets/tabs/setup_other.cpp:71
-#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:150
 #: src/gui/windows/inventorywindow.cpp:69
 msgid "default"
 msgstr "predeterminado"
@@ -5095,8 +5107,8 @@ msgstr "Nombre:"
 #: src/gui/windows/charcreatedialog.cpp:75
 #: src/gui/windows/charcreatedialog.cpp:84
 #: src/gui/windows/charcreatedialog.cpp:101
-#: src/gui/windows/charcreatedialog.cpp:171
-#: src/gui/windows/charcreatedialog.cpp:181
+#: src/gui/windows/charcreatedialog.cpp:170
+#: src/gui/windows/charcreatedialog.cpp:180
 #: src/gui/windows/outfitwindow.cpp:58
 msgid ">"
 msgstr ">"
@@ -5107,8 +5119,8 @@ msgstr ">"
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:79
 #: src/gui/windows/charcreatedialog.cpp:86
-#: src/gui/windows/charcreatedialog.cpp:173
-#: src/gui/windows/charcreatedialog.cpp:183
+#: src/gui/windows/charcreatedialog.cpp:172
+#: src/gui/windows/charcreatedialog.cpp:182
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "<"
 msgstr "<"
@@ -5144,33 +5156,33 @@ msgstr "Femenino"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:466
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Por favor, distribuye %d puntos"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:174
 msgid "Race:"
 msgstr "Race:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:185
+#: src/gui/windows/charcreatedialog.cpp:184
 msgid "Look:"
 msgstr "Apariencia:"
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:359
 msgid "Your name needs to be at least 4 characters."
 msgstr "Tu nombre debe tener como mínimo 4 caracteres."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:456
 msgid "Character stats OK"
 msgstr "Atributos del personaje OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:472
 #, c-format
 msgid "Please remove %d points"
 msgstr "Por favor, borra %d puntos"
@@ -5261,28 +5273,28 @@ msgid "Enter password:"
 msgstr "Ingrese contraseña:"
 
 #. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:166
+#: src/gui/windows/chatwindow.cpp:172
 msgid "rainbow 1"
 msgstr "arco iris 1"
 
 #. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:168
+#: src/gui/windows/chatwindow.cpp:174
 msgid "rainbow 2"
 msgstr "arco iris 2"
 
 #. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:170
+#: src/gui/windows/chatwindow.cpp:176
 msgid "rainbow 3"
 msgstr "arco iris 3"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:694
+#: src/gui/windows/chatwindow.cpp:740
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presentes: %s; %d jugadores están presentes."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1103
+#: src/gui/windows/chatwindow.cpp:1154
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Susurrando a %s: %s"
@@ -5904,17 +5916,17 @@ msgid "Add"
 msgstr "Añadir"
 
 #. TRANSLATORS: label in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:58
+#: src/gui/windows/npcpostdialog.cpp:57
 msgid "To:"
 msgstr "Para:"
 
 #. TRANSLATORS: button in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:65
+#: src/gui/windows/npcpostdialog.cpp:64
 msgid "Send"
 msgstr "Enviar"
 
 #. TRANSLATORS: npc post message error
-#: src/gui/windows/npcpostdialog.cpp:112
+#: src/gui/windows/npcpostdialog.cpp:111
 msgid "Failed to send as sender or letter invalid."
 msgstr "Fallo al enviar o mensaje inválido."
 
@@ -6944,13 +6956,13 @@ msgid "Failed to delete character."
 msgstr "Fallo al borrar el personaje."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:87
+#: src/net/ea/chathandler.cpp:88
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr "No pudo ser enviado el Susurro, ya que %s está desconectado."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:96
+#: src/net/ea/chathandler.cpp:97
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr "No pudo ser enviado el Susurro, ya que es ignorado por %s."
diff --git a/po/fi.po b/po/fi.po
index dc477af07..1271a554a 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-10-19 16:54+0300\n"
+"POT-Creation-Date: 2013-10-25 16:34+0300\n"
 "PO-Revision-Date: 2013-09-20 08:56+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Finnish (http://www.transifex.com/projects/p/manaplus/"
@@ -36,25 +36,25 @@ msgid "Visible on map"
 msgstr "Näkyvillä kartalla"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:296
+#: src/being/being.cpp:294
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:504
+#: src/being/being.cpp:502
 msgid "dodge"
 msgstr "väistö"
 
-#: src/being/being.cpp:504
+#: src/being/being.cpp:502
 msgid "miss"
 msgstr "huti"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1748 src/gui/windows/whoisonline.cpp:861
+#: src/being/being.cpp:1746 src/gui/windows/whoisonline.cpp:861
 msgid "A"
 msgstr "P"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1753 src/gui/windows/whoisonline.cpp:866
+#: src/being/being.cpp:1751 src/gui/windows/whoisonline.cpp:866
 msgid "I"
 msgstr "-"
 
@@ -527,31 +527,31 @@ msgstr "Leijuva puhekupla"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:1106 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:58
+#: src/client.cpp:1109 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:58
 msgid "Setup"
 msgstr "Asetukset"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1110 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1113 src/gui/widgets/tabs/setup_perfomance.cpp:50
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:1113 src/gui/widgets/tabs/setup_video.cpp:221
+#: src/client.cpp:1116 src/gui/widgets/tabs/setup_video.cpp:221
 msgid "Video"
 msgstr "Kuva"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1116 src/gui/widgets/tabs/setup_theme.cpp:279
+#: src/client.cpp:1119 src/gui/widgets/tabs/setup_theme.cpp:279
 msgid "Theme"
 msgstr "Teema"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:1119 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1122 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:50
 msgid "Help"
 msgstr "Apua"
@@ -564,7 +564,7 @@ msgstr "Apua"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1123 src/gui/popups/popupmenu.cpp:618
+#: src/client.cpp:1126 src/gui/popups/popupmenu.cpp:618
 #: src/gui/windows/didyouknowwindow.cpp:78
 #: src/gui/windows/inventorywindow.cpp:252 src/gui/windows/npcdialog.cpp:71
 #: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:134
@@ -573,32 +573,32 @@ msgid "Close"
 msgstr "Sulje"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1242
+#: src/client.cpp:1245
 msgid "Connecting to server"
 msgstr "Yhdistän palvelimeen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1287
+#: src/client.cpp:1290
 msgid "Logging in"
 msgstr "Kirjaudun sisään"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1328
+#: src/client.cpp:1331
 msgid "Entering game world"
 msgstr "Siirryn pelimaailmaan"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1451
+#: src/client.cpp:1454
 msgid "Requesting characters"
 msgstr "Pyydän hahmoja"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1492
+#: src/client.cpp:1495
 msgid "Connecting to the game server"
 msgstr "Yhdistän pelipalvelimeen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1506
+#: src/client.cpp:1509
 msgid "Changing game servers"
 msgstr "Vaihdan pelipalvelinta"
 
@@ -613,10 +613,10 @@ msgstr "Vaihdan pelipalvelinta"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1566 src/client.cpp:1577 src/client.cpp:1758
+#: src/client.cpp:1569 src/client.cpp:1580 src/client.cpp:1761
 #: src/gui/windows/changeemaildialog.cpp:167
 #: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:358
+#: src/gui/windows/charcreatedialog.cpp:357
 #: src/gui/windows/charselectdialog.cpp:297
 #: src/gui/windows/editserverdialog.cpp:217
 #: src/gui/windows/registerdialog.cpp:259
@@ -626,65 +626,65 @@ msgid "Error"
 msgstr "Virhe"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1590
+#: src/client.cpp:1593
 msgid "Requesting registration details"
 msgstr "Pyydän rekisteröitymisen yksityiskohtia"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1630
+#: src/client.cpp:1633
 msgid "Password Change"
 msgstr "Salasanan vaihto"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1632
+#: src/client.cpp:1635
 msgid "Password changed successfully!"
 msgstr "Salasana vaihdettu onnistuneesti!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1654
+#: src/client.cpp:1657
 msgid "Email Change"
 msgstr "Sähköpostin vaihto"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1656
+#: src/client.cpp:1659
 msgid "Email changed successfully!"
 msgstr "Sähköpostiosoite vaihdettu onnistuneesti!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1679
+#: src/client.cpp:1682
 msgid "Unregister Successful"
 msgstr "Tietojen poisto onnistui"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1681
+#: src/client.cpp:1684
 msgid "Farewell, come back any time..."
 msgstr "Näkemisiin, tule pian takaisin..."
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1953 src/client.cpp:1968 src/client.cpp:2011
-#: src/client.cpp:2027 src/client.cpp:2467 src/client.cpp:2475
+#: src/client.cpp:1956 src/client.cpp:1971 src/client.cpp:2014
+#: src/client.cpp:2030 src/client.cpp:2456 src/client.cpp:2464
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s ei ole olemassa eikä sitä voi luoda! Poistun."
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2167
+#: src/client.cpp:2170
 #, c-format
 msgid "Invalid update host: %s."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2208 src/client.cpp:2215
+#: src/client.cpp:2211 src/client.cpp:2218
 msgid "Error creating updates directory!"
 msgstr "Päivityshakemistoa luodessa tapahtui virhe!"
 
-#: src/client.cpp:2237 src/client.cpp:2250
+#: src/client.cpp:2240 src/client.cpp:2253
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Virhe: %s ei ole olemassa eikä sitä voi luoda! Poistun."
 
 #. TRANSLATORS: error message question
-#: src/client.cpp:2915
+#: src/client.cpp:2904
 msgid "Do you want to open support page?"
 msgstr ""
 
@@ -944,25 +944,25 @@ msgid "Network Error"
 msgstr "Verkkovirhe"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:132
 #, c-format
 msgid "Party: %s"
 msgstr "Ryhmä: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:147
 #, c-format
 msgid "Guild: %s"
 msgstr "Kilta: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:161
 #, c-format
 msgid "Pvp rank: %u"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:173
 #, c-format
 msgid "Comment: %s"
 msgstr "Kommentti: %s"
@@ -1173,7 +1173,7 @@ msgstr "Lisää nimi keskusteluun"
 #: src/gui/windows/connectiondialog.cpp:48
 #: src/gui/windows/editserverdialog.cpp:78
 #: src/gui/windows/itemamountwindow.cpp:209
-#: src/gui/windows/npcpostdialog.cpp:69 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:69
 #: src/gui/windows/registerdialog.cpp:76 src/gui/windows/setup.cpp:90
 #: src/gui/windows/socialwindow.cpp:1231
 #: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:53
@@ -2393,7 +2393,7 @@ msgstr ""
 #. TRANSLATORS: register dialog. button.
 #: src/gui/setupactiondata.h:1779 src/gui/setupactiondata.h:1868
 #: src/gui/widgets/tabs/setup_audio.cpp:159
-#: src/gui/widgets/tabs/setup_chat.cpp:176
+#: src/gui/widgets/tabs/setup_chat.cpp:180
 #: src/gui/widgets/tabs/setup_other.cpp:321
 #: src/gui/widgets/tabs/setup_visual.cpp:175
 #: src/gui/windows/charcreatedialog.cpp:107
@@ -2476,7 +2476,7 @@ msgstr ""
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupactiondata.h:1866 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:197
+#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
 msgid "Chat"
 msgstr "Keskustelu"
 
@@ -2703,61 +2703,61 @@ msgstr "Rahat: %s"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:146
+#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
 msgid "black"
 msgstr "musta"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:148
+#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
 msgid "red"
 msgstr "punainen"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:150
+#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
 msgid "green"
 msgstr "vihreä"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:152
+#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
 msgid "blue"
 msgstr "sininen"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:154
+#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
 msgid "gold"
 msgstr "kulta"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:156
+#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
 msgid "yellow"
 msgstr "keltainen"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:158
+#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
 msgid "pink"
 msgstr "vaaleanpunainen"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:160
+#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
 msgid "purple"
 msgstr "violetti"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:162
+#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
 msgid "grey"
 msgstr "harmaa"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:164
+#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
 msgid "brown"
 msgstr "ruskea"
 
@@ -3142,85 +3142,96 @@ msgstr "Viestit"
 msgid "Hide shop messages"
 msgstr "Piilota kauppaviestit"
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:124
+msgid "Show MVP messages"
+msgstr "Näytä MVP-viestit"
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:125
+#: src/gui/widgets/tabs/setup_chat.cpp:129
 msgid "Tabs"
 msgstr "Välilehdet"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:128
+#: src/gui/widgets/tabs/setup_chat.cpp:132
 msgid "Put all whispers in tabs"
 msgstr "Laita kaikki kuiskaukset välilehtiin"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:132
+#: src/gui/widgets/tabs/setup_chat.cpp:136
 msgid "Log magic messages in debug tab"
 msgstr "Kirjaa magiaviestit debug-välilehdelle"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:136
+#: src/gui/widgets/tabs/setup_chat.cpp:140
 msgid "Show server messages in debug tab"
 msgstr "Näytä palvelinviestit debug-välilehdellä"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:140
+#: src/gui/widgets/tabs/setup_chat.cpp:144
 msgid "Enable trade tab"
 msgstr "Ota kaupankäyntivälilehti käyttöön"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:144
+#: src/gui/widgets/tabs/setup_chat.cpp:148
 msgid "Enable gm tab"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:148
+#: src/gui/widgets/tabs/setup_chat.cpp:152
 msgid "Enable language tab"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:152
+#: src/gui/widgets/tabs/setup_chat.cpp:156
 msgid "Show all languages messages"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:156
+#: src/gui/widgets/tabs/setup_chat.cpp:160
 msgid "Enable battle tab"
 msgstr "Ota taisteluvälilehti käyttöön"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:160
+#: src/gui/widgets/tabs/setup_chat.cpp:164
 msgid "Show battle events"
 msgstr "Näytä taistelutapahtumat"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:164
+#: src/gui/widgets/tabs/setup_chat.cpp:168
 msgid "Resize chat tabs if need"
 msgstr "Muuta välilehden kokoa tarpeen mukaan"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:169
+#: src/gui/widgets/tabs/setup_chat.cpp:173
 msgid "Time"
 msgstr "Aika"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:172
+#: src/gui/widgets/tabs/setup_chat.cpp:176
 msgid "Use local time"
 msgstr "Käytä paikallista aikaa"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:179
+#: src/gui/widgets/tabs/setup_chat.cpp:183
 msgid "Highlight words (separated by comma)"
 msgstr "Korosta sanat (pilkuin erotettu)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:183
+#: src/gui/widgets/tabs/setup_chat.cpp:187
 msgid "Globals ignore names (separated by comma)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:187
-msgid "Show MVP messages"
-msgstr "Näytä MVP-viestit"
+#: src/gui/widgets/tabs/setup_chat.cpp:191
+msgid "Show emotes button in chat"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:195
+#, fuzzy
+msgid "Show motd server message on start"
+msgstr "Näytä palvelinviestit debug-välilehdellä"
 
 #: src/gui/widgets/tabs/setup_colors.cpp:46
 msgid "This is what the color looks like"
@@ -3408,7 +3419,7 @@ msgstr ""
 #. TRANSLATORS: chat color
 #. TRANSLATORS: inventory sort mode
 #: src/gui/widgets/tabs/setup_other.cpp:71
-#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:150
 #: src/gui/windows/inventorywindow.cpp:69
 msgid "default"
 msgstr "oletus"
@@ -5073,8 +5084,8 @@ msgstr "Nimi:"
 #: src/gui/windows/charcreatedialog.cpp:75
 #: src/gui/windows/charcreatedialog.cpp:84
 #: src/gui/windows/charcreatedialog.cpp:101
-#: src/gui/windows/charcreatedialog.cpp:171
-#: src/gui/windows/charcreatedialog.cpp:181
+#: src/gui/windows/charcreatedialog.cpp:170
+#: src/gui/windows/charcreatedialog.cpp:180
 #: src/gui/windows/outfitwindow.cpp:58
 msgid ">"
 msgstr ">"
@@ -5085,8 +5096,8 @@ msgstr ">"
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:79
 #: src/gui/windows/charcreatedialog.cpp:86
-#: src/gui/windows/charcreatedialog.cpp:173
-#: src/gui/windows/charcreatedialog.cpp:183
+#: src/gui/windows/charcreatedialog.cpp:172
+#: src/gui/windows/charcreatedialog.cpp:182
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "<"
 msgstr "<"
@@ -5122,33 +5133,33 @@ msgstr "Naispuolinen"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:466
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Jaa %d pistettä"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:174
 msgid "Race:"
 msgstr "Rotu: "
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:185
+#: src/gui/windows/charcreatedialog.cpp:184
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:359
 msgid "Your name needs to be at least 4 characters."
 msgstr "Nimessäsi täytyy olla ainakin 4 merkkiä."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:456
 msgid "Character stats OK"
 msgstr "Hahmon pistejako OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:472
 #, c-format
 msgid "Please remove %d points"
 msgstr "%d pistettä liikaa, ole hyvä ja poista ylimäärä"
@@ -5234,28 +5245,28 @@ msgid "Enter password:"
 msgstr "Salasana:"
 
 #. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:166
+#: src/gui/windows/chatwindow.cpp:172
 msgid "rainbow 1"
 msgstr "sateenkaari 1"
 
 #. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:168
+#: src/gui/windows/chatwindow.cpp:174
 msgid "rainbow 2"
 msgstr "sateenkaari 2"
 
 #. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:170
+#: src/gui/windows/chatwindow.cpp:176
 msgid "rainbow 3"
 msgstr "sateenkaari 3"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:694
+#: src/gui/windows/chatwindow.cpp:740
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Läsnä: %s; %d pelaajaa paikalla."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1103
+#: src/gui/windows/chatwindow.cpp:1154
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Kuiskaat pelaajalle %s: %s"
@@ -5876,17 +5887,17 @@ msgid "Add"
 msgstr "Lisää"
 
 #. TRANSLATORS: label in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:58
+#: src/gui/windows/npcpostdialog.cpp:57
 msgid "To:"
 msgstr "Vastaanottaja:"
 
 #. TRANSLATORS: button in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:65
+#: src/gui/windows/npcpostdialog.cpp:64
 msgid "Send"
 msgstr "Lähetä"
 
 #. TRANSLATORS: npc post message error
-#: src/gui/windows/npcpostdialog.cpp:112
+#: src/gui/windows/npcpostdialog.cpp:111
 msgid "Failed to send as sender or letter invalid."
 msgstr "Lähettäminen epäonnistui: vastaanottaja tai kirje ei kelpaa."
 
@@ -6910,13 +6921,13 @@ msgid "Failed to delete character."
 msgstr "Hahmon poisto epäonnistui."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:87
+#: src/net/ea/chathandler.cpp:88
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr "Kuiskausta ei voitu lähettää, %s ei ole kirjautuneena sisään."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:96
+#: src/net/ea/chathandler.cpp:97
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr "Kuiskausta ei voitu lähettää, %s ei huomioinut sitä."
diff --git a/po/fr.po b/po/fr.po
index 3120029ae..615fb0eff 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-10-19 16:54+0300\n"
+"POT-Creation-Date: 2013-10-25 16:34+0300\n"
 "PO-Revision-Date: 2013-09-23 03:33+0000\n"
 "Last-Translator: Alige <aligetmw@hotmail.fr>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/manaplus/language/"
@@ -43,25 +43,25 @@ msgid "Visible on map"
 msgstr "Visible sur la carte"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:296
+#: src/being/being.cpp:294
 msgid "Human"
 msgstr "Humain"
 
-#: src/being/being.cpp:504
+#: src/being/being.cpp:502
 msgid "dodge"
 msgstr "esquive"
 
-#: src/being/being.cpp:504
+#: src/being/being.cpp:502
 msgid "miss"
 msgstr "raté"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1748 src/gui/windows/whoisonline.cpp:861
+#: src/being/being.cpp:1746 src/gui/windows/whoisonline.cpp:861
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1753 src/gui/windows/whoisonline.cpp:866
+#: src/being/being.cpp:1751 src/gui/windows/whoisonline.cpp:866
 msgid "I"
 msgstr "I"
 
@@ -534,31 +534,31 @@ msgstr "Bulle flottante"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:1106 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:58
+#: src/client.cpp:1109 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:58
 msgid "Setup"
 msgstr "Configuration"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1110 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1113 src/gui/widgets/tabs/setup_perfomance.cpp:50
 msgid "Performance"
 msgstr "Performance"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:1113 src/gui/widgets/tabs/setup_video.cpp:221
+#: src/client.cpp:1116 src/gui/widgets/tabs/setup_video.cpp:221
 msgid "Video"
 msgstr "Vidéo"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1116 src/gui/widgets/tabs/setup_theme.cpp:279
+#: src/client.cpp:1119 src/gui/widgets/tabs/setup_theme.cpp:279
 msgid "Theme"
 msgstr "Thème"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:1119 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1122 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:50
 msgid "Help"
 msgstr "Aide"
@@ -571,7 +571,7 @@ msgstr "Aide"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1123 src/gui/popups/popupmenu.cpp:618
+#: src/client.cpp:1126 src/gui/popups/popupmenu.cpp:618
 #: src/gui/windows/didyouknowwindow.cpp:78
 #: src/gui/windows/inventorywindow.cpp:252 src/gui/windows/npcdialog.cpp:71
 #: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:134
@@ -580,32 +580,32 @@ msgid "Close"
 msgstr "Fermer"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1242
+#: src/client.cpp:1245
 msgid "Connecting to server"
 msgstr "Connexion au serveur"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1287
+#: src/client.cpp:1290
 msgid "Logging in"
 msgstr "Connexion"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1328
+#: src/client.cpp:1331
 msgid "Entering game world"
 msgstr "Entrée dans le monde de jeu"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1451
+#: src/client.cpp:1454
 msgid "Requesting characters"
 msgstr "Téléchargement des personnages"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1492
+#: src/client.cpp:1495
 msgid "Connecting to the game server"
 msgstr "Connexion au serveur de jeu"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1506
+#: src/client.cpp:1509
 msgid "Changing game servers"
 msgstr "Changement de serveur de jeu"
 
@@ -620,10 +620,10 @@ msgstr "Changement de serveur de jeu"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1566 src/client.cpp:1577 src/client.cpp:1758
+#: src/client.cpp:1569 src/client.cpp:1580 src/client.cpp:1761
 #: src/gui/windows/changeemaildialog.cpp:167
 #: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:358
+#: src/gui/windows/charcreatedialog.cpp:357
 #: src/gui/windows/charselectdialog.cpp:297
 #: src/gui/windows/editserverdialog.cpp:217
 #: src/gui/windows/registerdialog.cpp:259
@@ -633,66 +633,66 @@ msgid "Error"
 msgstr "Erreur"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1590
+#: src/client.cpp:1593
 msgid "Requesting registration details"
 msgstr "Demande des paramètres d'inscription"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1630
+#: src/client.cpp:1633
 msgid "Password Change"
 msgstr "Changement de mot de passe"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1632
+#: src/client.cpp:1635
 msgid "Password changed successfully!"
 msgstr "Le mot de passe a été changé avec succès !"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1654
+#: src/client.cpp:1657
 msgid "Email Change"
 msgstr "Changer d'e-mail"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1656
+#: src/client.cpp:1659
 msgid "Email changed successfully!"
 msgstr "L'adresse e-mail a été changée avec succès !"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1679
+#: src/client.cpp:1682
 msgid "Unregister Successful"
 msgstr "Désinscription réussie"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1681
+#: src/client.cpp:1684
 msgid "Farewell, come back any time..."
 msgstr "À bientôt, Revenez quand vous voulez..."
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1953 src/client.cpp:1968 src/client.cpp:2011
-#: src/client.cpp:2027 src/client.cpp:2467 src/client.cpp:2475
+#: src/client.cpp:1956 src/client.cpp:1971 src/client.cpp:2014
+#: src/client.cpp:2030 src/client.cpp:2456 src/client.cpp:2464
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s n'existe pas et ne peut pas être créé ! Fermeture du programme."
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2167
+#: src/client.cpp:2170
 #, c-format
 msgid "Invalid update host: %s."
 msgstr "Hôte de mise à jour invalide : %s"
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2208 src/client.cpp:2215
+#: src/client.cpp:2211 src/client.cpp:2218
 msgid "Error creating updates directory!"
 msgstr "Impossible de créer le dossier de mise à jour !"
 
-#: src/client.cpp:2237 src/client.cpp:2250
+#: src/client.cpp:2240 src/client.cpp:2253
 #, 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."
 
 #. TRANSLATORS: error message question
-#: src/client.cpp:2915
+#: src/client.cpp:2904
 msgid "Do you want to open support page?"
 msgstr "Veux-tu ouvrir la page d'aide ?"
 
@@ -953,25 +953,25 @@ msgid "Network Error"
 msgstr "Erreur Réseau"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:132
 #, c-format
 msgid "Party: %s"
 msgstr "Groupe : %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:147
 #, c-format
 msgid "Guild: %s"
 msgstr "Guilde : %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:161
 #, c-format
 msgid "Pvp rank: %u"
 msgstr "Rang Pvp : %u"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:173
 #, c-format
 msgid "Comment: %s"
 msgstr "Commentaire : %s"
@@ -1182,7 +1182,7 @@ msgstr "Ajouter le nom dans la boite de dialogue"
 #: src/gui/windows/connectiondialog.cpp:48
 #: src/gui/windows/editserverdialog.cpp:78
 #: src/gui/windows/itemamountwindow.cpp:209
-#: src/gui/windows/npcpostdialog.cpp:69 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:69
 #: src/gui/windows/registerdialog.cpp:76 src/gui/windows/setup.cpp:90
 #: src/gui/windows/socialwindow.cpp:1231
 #: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:53
@@ -2402,7 +2402,7 @@ msgstr "Page suivante"
 #. TRANSLATORS: register dialog. button.
 #: src/gui/setupactiondata.h:1779 src/gui/setupactiondata.h:1868
 #: src/gui/widgets/tabs/setup_audio.cpp:159
-#: src/gui/widgets/tabs/setup_chat.cpp:176
+#: src/gui/widgets/tabs/setup_chat.cpp:180
 #: src/gui/widgets/tabs/setup_other.cpp:321
 #: src/gui/widgets/tabs/setup_visual.cpp:175
 #: src/gui/windows/charcreatedialog.cpp:107
@@ -2485,7 +2485,7 @@ msgstr "Emoticônes"
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupactiondata.h:1866 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:197
+#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
 msgid "Chat"
 msgstr "Conversation"
 
@@ -2712,61 +2712,61 @@ msgstr "Argent : %s"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:146
+#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
 msgid "black"
 msgstr "noir"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:148
+#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
 msgid "red"
 msgstr "rouge"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:150
+#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
 msgid "green"
 msgstr "vert"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:152
+#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
 msgid "blue"
 msgstr "bleu"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:154
+#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
 msgid "gold"
 msgstr "or"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:156
+#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
 msgid "yellow"
 msgstr "jaune"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:158
+#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
 msgid "pink"
 msgstr "rose"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:160
+#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
 msgid "purple"
 msgstr "violet"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:162
+#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
 msgid "grey"
 msgstr "gris"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:164
+#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
 msgid "brown"
 msgstr "marron"
 
@@ -3153,85 +3153,97 @@ msgstr "Messages"
 msgid "Hide shop messages"
 msgstr "Masquer les messages liés à la boutique"
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:124
+msgid "Show MVP messages"
+msgstr "Montrer les messages MVP"
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:125
+#: src/gui/widgets/tabs/setup_chat.cpp:129
 msgid "Tabs"
 msgstr "Fenêtre"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:128
+#: src/gui/widgets/tabs/setup_chat.cpp:132
 msgid "Put all whispers in tabs"
 msgstr "Placer tous les messages privés dans des onglets"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:132
+#: src/gui/widgets/tabs/setup_chat.cpp:136
 msgid "Log magic messages in debug tab"
 msgstr "Messages de magie dans l'onglet de débogage"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:136
+#: src/gui/widgets/tabs/setup_chat.cpp:140
 msgid "Show server messages in debug tab"
 msgstr "Afficher les messages du serveur dans l'onglet de débogage"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:140
+#: src/gui/widgets/tabs/setup_chat.cpp:144
 msgid "Enable trade tab"
 msgstr "Activer l'onglet d'échanges"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:144
+#: src/gui/widgets/tabs/setup_chat.cpp:148
 msgid "Enable gm tab"
 msgstr "Activer le tab des MJ"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:148
+#: src/gui/widgets/tabs/setup_chat.cpp:152
 msgid "Enable language tab"
 msgstr "Activer la tabulation des langues"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:152
+#: src/gui/widgets/tabs/setup_chat.cpp:156
 msgid "Show all languages messages"
 msgstr "Afficher tous les messages de langue"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:156
+#: src/gui/widgets/tabs/setup_chat.cpp:160
 msgid "Enable battle tab"
 msgstr "Activer l'onglet de combat"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:160
+#: src/gui/widgets/tabs/setup_chat.cpp:164
 msgid "Show battle events"
 msgstr "Afficher les événements de combat"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:164
+#: src/gui/widgets/tabs/setup_chat.cpp:168
 msgid "Resize chat tabs if need"
 msgstr "Si besoin est, changer la taille des fenêtre de dialogue"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:169
+#: src/gui/widgets/tabs/setup_chat.cpp:173
 msgid "Time"
 msgstr "Temps"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:172
+#: src/gui/widgets/tabs/setup_chat.cpp:176
 msgid "Use local time"
 msgstr "Utiliser l’horaire local"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:179
+#: src/gui/widgets/tabs/setup_chat.cpp:183
 msgid "Highlight words (separated by comma)"
 msgstr "Mots en surbrillance (séparés par une virgule)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:183
+#: src/gui/widgets/tabs/setup_chat.cpp:187
 msgid "Globals ignore names (separated by comma)"
 msgstr "Ignorer de multiples noms (séparés par une virgule)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:187
-msgid "Show MVP messages"
-msgstr "Montrer les messages MVP"
+#: src/gui/widgets/tabs/setup_chat.cpp:191
+#, fuzzy
+msgid "Show emotes button in chat"
+msgstr "Montrer les notifications de ramassage dans la conversation"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:195
+#, fuzzy
+msgid "Show motd server message on start"
+msgstr "Afficher les messages du serveur dans l'onglet de débogage"
 
 #: src/gui/widgets/tabs/setup_colors.cpp:46
 msgid "This is what the color looks like"
@@ -3419,7 +3431,7 @@ msgstr "Nom d'hôte SOCKS5"
 #. TRANSLATORS: chat color
 #. TRANSLATORS: inventory sort mode
 #: src/gui/widgets/tabs/setup_other.cpp:71
-#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:150
 #: src/gui/windows/inventorywindow.cpp:69
 msgid "default"
 msgstr "défaut"
@@ -5097,8 +5109,8 @@ msgstr "Nom :"
 #: src/gui/windows/charcreatedialog.cpp:75
 #: src/gui/windows/charcreatedialog.cpp:84
 #: src/gui/windows/charcreatedialog.cpp:101
-#: src/gui/windows/charcreatedialog.cpp:171
-#: src/gui/windows/charcreatedialog.cpp:181
+#: src/gui/windows/charcreatedialog.cpp:170
+#: src/gui/windows/charcreatedialog.cpp:180
 #: src/gui/windows/outfitwindow.cpp:58
 msgid ">"
 msgstr ">"
@@ -5109,8 +5121,8 @@ msgstr ">"
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:79
 #: src/gui/windows/charcreatedialog.cpp:86
-#: src/gui/windows/charcreatedialog.cpp:173
-#: src/gui/windows/charcreatedialog.cpp:183
+#: src/gui/windows/charcreatedialog.cpp:172
+#: src/gui/windows/charcreatedialog.cpp:182
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "<"
 msgstr "<"
@@ -5146,33 +5158,33 @@ msgstr "Féminin"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:466
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Distribues %d points"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:174
 msgid "Race:"
 msgstr "Race :"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:185
+#: src/gui/windows/charcreatedialog.cpp:184
 msgid "Look:"
 msgstr "Apparence :"
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:359
 msgid "Your name needs to be at least 4 characters."
 msgstr "Ton nom doit comporter un minimum de 4 caractères."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:456
 msgid "Character stats OK"
 msgstr "Caractéristiques du personnage Ok"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:472
 #, c-format
 msgid "Please remove %d points"
 msgstr "Retires %d points"
@@ -5263,28 +5275,28 @@ msgid "Enter password:"
 msgstr "Entrer le mot de passe :"
 
 #. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:166
+#: src/gui/windows/chatwindow.cpp:172
 msgid "rainbow 1"
 msgstr "arc en ciel 1"
 
 #. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:168
+#: src/gui/windows/chatwindow.cpp:174
 msgid "rainbow 2"
 msgstr "arc en ciel 2"
 
 #. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:170
+#: src/gui/windows/chatwindow.cpp:176
 msgid "rainbow 3"
 msgstr "arc en ciel 3"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:694
+#: src/gui/windows/chatwindow.cpp:740
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Présents : %s ; %d joueurs sont présents."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1103
+#: src/gui/windows/chatwindow.cpp:1154
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Message envoyé à %s : %s"
@@ -5905,17 +5917,17 @@ msgid "Add"
 msgstr "Ajouter"
 
 #. TRANSLATORS: label in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:58
+#: src/gui/windows/npcpostdialog.cpp:57
 msgid "To:"
 msgstr "Vers :"
 
 #. TRANSLATORS: button in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:65
+#: src/gui/windows/npcpostdialog.cpp:64
 msgid "Send"
 msgstr "Envoyer"
 
 #. TRANSLATORS: npc post message error
-#: src/gui/windows/npcpostdialog.cpp:112
+#: src/gui/windows/npcpostdialog.cpp:111
 msgid "Failed to send as sender or letter invalid."
 msgstr "Échec de l'envoi comme émetteur ou caractère invalide."
 
@@ -6952,13 +6964,13 @@ msgid "Failed to delete character."
 msgstr "La suppression du personnage n'a pu s'effectuer."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:87
+#: src/net/ea/chathandler.cpp:88
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr "Le message n'a pu être envoyé, %s n'est pas en ligne."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:96
+#: src/net/ea/chathandler.cpp:97
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr "Le message privé n'a pu être envoyé, tu es ignoré par %s."
diff --git a/po/id.po b/po/id.po
index 551f44079..7691e1d52 100644
--- a/po/id.po
+++ b/po/id.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-10-19 16:54+0300\n"
+"POT-Creation-Date: 2013-10-25 16:34+0300\n"
 "PO-Revision-Date: 2013-09-20 08:56+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/manaplus/"
@@ -37,25 +37,25 @@ msgid "Visible on map"
 msgstr "Terlihat di peta"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:296
+#: src/being/being.cpp:294
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:504
+#: src/being/being.cpp:502
 msgid "dodge"
 msgstr "Menghindar"
 
-#: src/being/being.cpp:504
+#: src/being/being.cpp:502
 msgid "miss"
 msgstr "Luput"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1748 src/gui/windows/whoisonline.cpp:861
+#: src/being/being.cpp:1746 src/gui/windows/whoisonline.cpp:861
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1753 src/gui/windows/whoisonline.cpp:866
+#: src/being/being.cpp:1751 src/gui/windows/whoisonline.cpp:866
 msgid "I"
 msgstr "l"
 
@@ -527,31 +527,31 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:1106 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:58
+#: src/client.cpp:1109 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:58
 msgid "Setup"
 msgstr "Pengaturan"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1110 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1113 src/gui/widgets/tabs/setup_perfomance.cpp:50
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:1113 src/gui/widgets/tabs/setup_video.cpp:221
+#: src/client.cpp:1116 src/gui/widgets/tabs/setup_video.cpp:221
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1116 src/gui/widgets/tabs/setup_theme.cpp:279
+#: src/client.cpp:1119 src/gui/widgets/tabs/setup_theme.cpp:279
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:1119 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1122 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:50
 msgid "Help"
 msgstr "Bantuan"
@@ -564,7 +564,7 @@ msgstr "Bantuan"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1123 src/gui/popups/popupmenu.cpp:618
+#: src/client.cpp:1126 src/gui/popups/popupmenu.cpp:618
 #: src/gui/windows/didyouknowwindow.cpp:78
 #: src/gui/windows/inventorywindow.cpp:252 src/gui/windows/npcdialog.cpp:71
 #: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:134
@@ -573,32 +573,32 @@ msgid "Close"
 msgstr "Tutup"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1242
+#: src/client.cpp:1245
 msgid "Connecting to server"
 msgstr "Terhubung dengan server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1287
+#: src/client.cpp:1290
 msgid "Logging in"
 msgstr "Masuk"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1328
+#: src/client.cpp:1331
 msgid "Entering game world"
 msgstr "Memasuki arena permainan"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1451
+#: src/client.cpp:1454
 msgid "Requesting characters"
 msgstr "Pemilihan karakter"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1492
+#: src/client.cpp:1495
 msgid "Connecting to the game server"
 msgstr "terhubung dengan server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1506
+#: src/client.cpp:1509
 msgid "Changing game servers"
 msgstr "Pergantian server"
 
@@ -613,10 +613,10 @@ msgstr "Pergantian server"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1566 src/client.cpp:1577 src/client.cpp:1758
+#: src/client.cpp:1569 src/client.cpp:1580 src/client.cpp:1761
 #: src/gui/windows/changeemaildialog.cpp:167
 #: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:358
+#: src/gui/windows/charcreatedialog.cpp:357
 #: src/gui/windows/charselectdialog.cpp:297
 #: src/gui/windows/editserverdialog.cpp:217
 #: src/gui/windows/registerdialog.cpp:259
@@ -626,65 +626,65 @@ msgid "Error"
 msgstr "Kesalahan"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1590
+#: src/client.cpp:1593
 msgid "Requesting registration details"
 msgstr "Meminta detail registrasi"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1630
+#: src/client.cpp:1633
 msgid "Password Change"
 msgstr "Ubah sandi"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1632
+#: src/client.cpp:1635
 msgid "Password changed successfully!"
 msgstr "Perubahan sandi berhasil"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1654
+#: src/client.cpp:1657
 msgid "Email Change"
 msgstr "Perubahan email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1656
+#: src/client.cpp:1659
 msgid "Email changed successfully!"
 msgstr "Perubahan email berhasil"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1679
+#: src/client.cpp:1682
 msgid "Unregister Successful"
 msgstr "Telah tidak terdaftar"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1681
+#: src/client.cpp:1684
 msgid "Farewell, come back any time..."
 msgstr "Selamat tinggal, datang kembali setiap saat"
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1953 src/client.cpp:1968 src/client.cpp:2011
-#: src/client.cpp:2027 src/client.cpp:2467 src/client.cpp:2475
+#: src/client.cpp:1956 src/client.cpp:1971 src/client.cpp:2014
+#: src/client.cpp:2030 src/client.cpp:2456 src/client.cpp:2464
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s tidak ada dan tidak dapat dibuat!keluar."
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2167
+#: src/client.cpp:2170
 #, c-format
 msgid "Invalid update host: %s."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2208 src/client.cpp:2215
+#: src/client.cpp:2211 src/client.cpp:2218
 msgid "Error creating updates directory!"
 msgstr "Gagal membuat direktori update!"
 
-#: src/client.cpp:2237 src/client.cpp:2250
+#: src/client.cpp:2240 src/client.cpp:2253
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "kesalahan %s tidak ada dan tidak dapat dibuat!keluar."
 
 #. TRANSLATORS: error message question
-#: src/client.cpp:2915
+#: src/client.cpp:2904
 msgid "Do you want to open support page?"
 msgstr ""
 
@@ -943,25 +943,25 @@ msgid "Network Error"
 msgstr "Kesalahan jaringan"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:132
 #, c-format
 msgid "Party: %s"
 msgstr "Kelompok: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:147
 #, c-format
 msgid "Guild: %s"
 msgstr "Organisasi: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:161
 #, c-format
 msgid "Pvp rank: %u"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:173
 #, c-format
 msgid "Comment: %s"
 msgstr "Komentar: %s"
@@ -1172,7 +1172,7 @@ msgstr "Tambahkan nama ke Obrolan"
 #: src/gui/windows/connectiondialog.cpp:48
 #: src/gui/windows/editserverdialog.cpp:78
 #: src/gui/windows/itemamountwindow.cpp:209
-#: src/gui/windows/npcpostdialog.cpp:69 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:69
 #: src/gui/windows/registerdialog.cpp:76 src/gui/windows/setup.cpp:90
 #: src/gui/windows/socialwindow.cpp:1231
 #: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:53
@@ -2392,7 +2392,7 @@ msgstr ""
 #. TRANSLATORS: register dialog. button.
 #: src/gui/setupactiondata.h:1779 src/gui/setupactiondata.h:1868
 #: src/gui/widgets/tabs/setup_audio.cpp:159
-#: src/gui/widgets/tabs/setup_chat.cpp:176
+#: src/gui/widgets/tabs/setup_chat.cpp:180
 #: src/gui/widgets/tabs/setup_other.cpp:321
 #: src/gui/widgets/tabs/setup_visual.cpp:175
 #: src/gui/windows/charcreatedialog.cpp:107
@@ -2475,7 +2475,7 @@ msgstr ""
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupactiondata.h:1866 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:197
+#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
 msgid "Chat"
 msgstr "Obrolan"
 
@@ -2702,61 +2702,61 @@ msgstr ""
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:146
+#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
 msgid "black"
 msgstr "hitam"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:148
+#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
 msgid "red"
 msgstr "merah"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:150
+#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
 msgid "green"
 msgstr "hijau"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:152
+#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
 msgid "blue"
 msgstr "biru"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:154
+#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
 msgid "gold"
 msgstr "emas"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:156
+#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
 msgid "yellow"
 msgstr "kuning"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:158
+#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
 msgid "pink"
 msgstr "merah muda"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:160
+#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
 msgid "purple"
 msgstr "ungu"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:162
+#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
 msgid "grey"
 msgstr "abu-abu"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:164
+#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
 msgid "brown"
 msgstr "coklat"
 
@@ -3141,86 +3141,97 @@ msgstr "Pesan"
 msgid "Hide shop messages"
 msgstr "Sembunyikan pesan Jual"
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:124
+msgid "Show MVP messages"
+msgstr ""
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:125
+#: src/gui/widgets/tabs/setup_chat.cpp:129
 msgid "Tabs"
 msgstr "Tab"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:128
+#: src/gui/widgets/tabs/setup_chat.cpp:132
 msgid "Put all whispers in tabs"
 msgstr "Masukkan semua bisikan kedalam tab"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:132
+#: src/gui/widgets/tabs/setup_chat.cpp:136
 msgid "Log magic messages in debug tab"
 msgstr "Riwayat pesan sihir di jendela debug"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:136
+#: src/gui/widgets/tabs/setup_chat.cpp:140
 msgid "Show server messages in debug tab"
 msgstr "Tujukkan pesan server di jendela debug"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:140
+#: src/gui/widgets/tabs/setup_chat.cpp:144
 msgid "Enable trade tab"
 msgstr "Perbolehkan jendela transkaksi/trade"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:144
+#: src/gui/widgets/tabs/setup_chat.cpp:148
 msgid "Enable gm tab"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:148
+#: src/gui/widgets/tabs/setup_chat.cpp:152
 msgid "Enable language tab"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:152
+#: src/gui/widgets/tabs/setup_chat.cpp:156
 msgid "Show all languages messages"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:156
+#: src/gui/widgets/tabs/setup_chat.cpp:160
 msgid "Enable battle tab"
 msgstr "Perbolehkan jendela pertarungan"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:160
+#: src/gui/widgets/tabs/setup_chat.cpp:164
 msgid "Show battle events"
 msgstr "Tunjukkan event pertarungan"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:164
+#: src/gui/widgets/tabs/setup_chat.cpp:168
 msgid "Resize chat tabs if need"
 msgstr "Atur besar jendela obrolan apabila dibutuhkan"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:169
+#: src/gui/widgets/tabs/setup_chat.cpp:173
 msgid "Time"
 msgstr "Waktu"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:172
+#: src/gui/widgets/tabs/setup_chat.cpp:176
 msgid "Use local time"
 msgstr "Pengunaan waktu lokal"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:179
+#: src/gui/widgets/tabs/setup_chat.cpp:183
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:183
+#: src/gui/widgets/tabs/setup_chat.cpp:187
 msgid "Globals ignore names (separated by comma)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:187
-msgid "Show MVP messages"
+#: src/gui/widgets/tabs/setup_chat.cpp:191
+msgid "Show emotes button in chat"
 msgstr ""
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:195
+#, fuzzy
+msgid "Show motd server message on start"
+msgstr "Tujukkan pesan server di jendela debug"
+
 #: src/gui/widgets/tabs/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr "Warnanya terlihat seperti ini"
@@ -3405,7 +3416,7 @@ msgstr ""
 #. TRANSLATORS: chat color
 #. TRANSLATORS: inventory sort mode
 #: src/gui/widgets/tabs/setup_other.cpp:71
-#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:150
 #: src/gui/windows/inventorywindow.cpp:69
 msgid "default"
 msgstr "kembalikan ke semula"
@@ -5066,8 +5077,8 @@ msgstr "Nama:"
 #: src/gui/windows/charcreatedialog.cpp:75
 #: src/gui/windows/charcreatedialog.cpp:84
 #: src/gui/windows/charcreatedialog.cpp:101
-#: src/gui/windows/charcreatedialog.cpp:171
-#: src/gui/windows/charcreatedialog.cpp:181
+#: src/gui/windows/charcreatedialog.cpp:170
+#: src/gui/windows/charcreatedialog.cpp:180
 #: src/gui/windows/outfitwindow.cpp:58
 msgid ">"
 msgstr ">"
@@ -5078,8 +5089,8 @@ msgstr ">"
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:79
 #: src/gui/windows/charcreatedialog.cpp:86
-#: src/gui/windows/charcreatedialog.cpp:173
-#: src/gui/windows/charcreatedialog.cpp:183
+#: src/gui/windows/charcreatedialog.cpp:172
+#: src/gui/windows/charcreatedialog.cpp:182
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "<"
 msgstr "<"
@@ -5115,33 +5126,33 @@ msgstr "Perempuan"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:466
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Tolong distribusikan %d point"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:174
 msgid "Race:"
 msgstr "Ras:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:185
+#: src/gui/windows/charcreatedialog.cpp:184
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:359
 msgid "Your name needs to be at least 4 characters."
 msgstr "Nama anda paling sedikit harus mengandung 4 karakter"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:456
 msgid "Character stats OK"
 msgstr "Stats Karakter OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:472
 #, c-format
 msgid "Please remove %d points"
 msgstr "Tolong hilangkan %d poin"
@@ -5227,28 +5238,28 @@ msgid "Enter password:"
 msgstr "Masukkan sandi"
 
 #. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:166
+#: src/gui/windows/chatwindow.cpp:172
 msgid "rainbow 1"
 msgstr "pelangi 1"
 
 #. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:168
+#: src/gui/windows/chatwindow.cpp:174
 msgid "rainbow 2"
 msgstr "pelangi 2"
 
 #. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:170
+#: src/gui/windows/chatwindow.cpp:176
 msgid "rainbow 3"
 msgstr "pelangi 3"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:694
+#: src/gui/windows/chatwindow.cpp:740
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Kehadiran: %s; %d pemain yang hadir."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1103
+#: src/gui/windows/chatwindow.cpp:1154
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Berbisik ke %s: %s"
@@ -5867,17 +5878,17 @@ msgid "Add"
 msgstr "Tambah"
 
 #. TRANSLATORS: label in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:58
+#: src/gui/windows/npcpostdialog.cpp:57
 msgid "To:"
 msgstr "Kepada:"
 
 #. TRANSLATORS: button in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:65
+#: src/gui/windows/npcpostdialog.cpp:64
 msgid "Send"
 msgstr "Kirim"
 
 #. TRANSLATORS: npc post message error
-#: src/gui/windows/npcpostdialog.cpp:112
+#: src/gui/windows/npcpostdialog.cpp:111
 msgid "Failed to send as sender or letter invalid."
 msgstr "Gagal untuk mengirim sebagai pengirim atau surat tidak valid."
 
@@ -6900,13 +6911,13 @@ msgid "Failed to delete character."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:87
+#: src/net/ea/chathandler.cpp:88
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:96
+#: src/net/ea/chathandler.cpp:97
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
diff --git a/po/it.po b/po/it.po
index d40358de6..cff1ffed6 100644
--- a/po/it.po
+++ b/po/it.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-10-19 16:54+0300\n"
+"POT-Creation-Date: 2013-10-25 16:34+0300\n"
 "PO-Revision-Date: 2013-09-20 08:56+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/manaplus/"
@@ -41,25 +41,25 @@ msgid "Visible on map"
 msgstr "Visibile nella mappa"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:296
+#: src/being/being.cpp:294
 msgid "Human"
 msgstr "Umano"
 
-#: src/being/being.cpp:504
+#: src/being/being.cpp:502
 msgid "dodge"
 msgstr "Schivato"
 
-#: src/being/being.cpp:504
+#: src/being/being.cpp:502
 msgid "miss"
 msgstr "Mancato"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1748 src/gui/windows/whoisonline.cpp:861
+#: src/being/being.cpp:1746 src/gui/windows/whoisonline.cpp:861
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1753 src/gui/windows/whoisonline.cpp:866
+#: src/being/being.cpp:1751 src/gui/windows/whoisonline.cpp:866
 msgid "I"
 msgstr "I"
 
@@ -532,31 +532,31 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:1106 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:58
+#: src/client.cpp:1109 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:58
 msgid "Setup"
 msgstr "Impostazioni"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1110 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1113 src/gui/widgets/tabs/setup_perfomance.cpp:50
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:1113 src/gui/widgets/tabs/setup_video.cpp:221
+#: src/client.cpp:1116 src/gui/widgets/tabs/setup_video.cpp:221
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1116 src/gui/widgets/tabs/setup_theme.cpp:279
+#: src/client.cpp:1119 src/gui/widgets/tabs/setup_theme.cpp:279
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:1119 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1122 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:50
 msgid "Help"
 msgstr "Aiuto"
@@ -569,7 +569,7 @@ msgstr "Aiuto"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1123 src/gui/popups/popupmenu.cpp:618
+#: src/client.cpp:1126 src/gui/popups/popupmenu.cpp:618
 #: src/gui/windows/didyouknowwindow.cpp:78
 #: src/gui/windows/inventorywindow.cpp:252 src/gui/windows/npcdialog.cpp:71
 #: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:134
@@ -578,32 +578,32 @@ msgid "Close"
 msgstr "Chiudi"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1242
+#: src/client.cpp:1245
 msgid "Connecting to server"
 msgstr "Connessione al server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1287
+#: src/client.cpp:1290
 msgid "Logging in"
 msgstr "Accesso all'account"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1328
+#: src/client.cpp:1331
 msgid "Entering game world"
 msgstr "Accesso al gioco"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1451
+#: src/client.cpp:1454
 msgid "Requesting characters"
 msgstr "Caricamento personaggi"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1492
+#: src/client.cpp:1495
 msgid "Connecting to the game server"
 msgstr "Connessione al server del gioco"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1506
+#: src/client.cpp:1509
 msgid "Changing game servers"
 msgstr "Cambiamento server del gioco"
 
@@ -618,10 +618,10 @@ msgstr "Cambiamento server del gioco"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1566 src/client.cpp:1577 src/client.cpp:1758
+#: src/client.cpp:1569 src/client.cpp:1580 src/client.cpp:1761
 #: src/gui/windows/changeemaildialog.cpp:167
 #: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:358
+#: src/gui/windows/charcreatedialog.cpp:357
 #: src/gui/windows/charselectdialog.cpp:297
 #: src/gui/windows/editserverdialog.cpp:217
 #: src/gui/windows/registerdialog.cpp:259
@@ -631,65 +631,65 @@ msgid "Error"
 msgstr "Errore"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1590
+#: src/client.cpp:1593
 msgid "Requesting registration details"
 msgstr "Richiesta dettagli di registrazione"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1630
+#: src/client.cpp:1633
 msgid "Password Change"
 msgstr "Cambia password"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1632
+#: src/client.cpp:1635
 msgid "Password changed successfully!"
 msgstr "Password modificata con successo!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1654
+#: src/client.cpp:1657
 msgid "Email Change"
 msgstr "Cambia Email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1656
+#: src/client.cpp:1659
 msgid "Email changed successfully!"
 msgstr "Email cambiata con successo!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1679
+#: src/client.cpp:1682
 msgid "Unregister Successful"
 msgstr "Annullamento registrazione effettuato con successo"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1681
+#: src/client.cpp:1684
 msgid "Farewell, come back any time..."
 msgstr "Addio, torna quando vuoi..."
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1953 src/client.cpp:1968 src/client.cpp:2011
-#: src/client.cpp:2027 src/client.cpp:2467 src/client.cpp:2475
+#: src/client.cpp:1956 src/client.cpp:1971 src/client.cpp:2014
+#: src/client.cpp:2030 src/client.cpp:2456 src/client.cpp:2464
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s non esiste e non può essere creato! Uscita in corso."
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2167
+#: src/client.cpp:2170
 #, c-format
 msgid "Invalid update host: %s."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2208 src/client.cpp:2215
+#: src/client.cpp:2211 src/client.cpp:2218
 msgid "Error creating updates directory!"
 msgstr "Errore durante la creazione della directory degli aggiornamenti"
 
-#: src/client.cpp:2237 src/client.cpp:2250
+#: src/client.cpp:2240 src/client.cpp:2253
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Errore: %s non esiste e non può essere creato! Ucita in corso."
 
 #. TRANSLATORS: error message question
-#: src/client.cpp:2915
+#: src/client.cpp:2904
 msgid "Do you want to open support page?"
 msgstr ""
 
@@ -949,25 +949,25 @@ msgid "Network Error"
 msgstr "Errore di rete"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:132
 #, c-format
 msgid "Party: %s"
 msgstr "Party: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:147
 #, c-format
 msgid "Guild: %s"
 msgstr "Gilda: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:161
 #, c-format
 msgid "Pvp rank: %u"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:173
 #, c-format
 msgid "Comment: %s"
 msgstr "Commento: %s"
@@ -1178,7 +1178,7 @@ msgstr "Aggiungi nome alla chat"
 #: src/gui/windows/connectiondialog.cpp:48
 #: src/gui/windows/editserverdialog.cpp:78
 #: src/gui/windows/itemamountwindow.cpp:209
-#: src/gui/windows/npcpostdialog.cpp:69 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:69
 #: src/gui/windows/registerdialog.cpp:76 src/gui/windows/setup.cpp:90
 #: src/gui/windows/socialwindow.cpp:1231
 #: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:53
@@ -2398,7 +2398,7 @@ msgstr "Page down"
 #. TRANSLATORS: register dialog. button.
 #: src/gui/setupactiondata.h:1779 src/gui/setupactiondata.h:1868
 #: src/gui/widgets/tabs/setup_audio.cpp:159
-#: src/gui/widgets/tabs/setup_chat.cpp:176
+#: src/gui/widgets/tabs/setup_chat.cpp:180
 #: src/gui/widgets/tabs/setup_other.cpp:321
 #: src/gui/widgets/tabs/setup_visual.cpp:175
 #: src/gui/windows/charcreatedialog.cpp:107
@@ -2481,7 +2481,7 @@ msgstr "Faccine"
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupactiondata.h:1866 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:197
+#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
 msgid "Chat"
 msgstr "Chat"
 
@@ -2708,61 +2708,61 @@ msgstr "Soldi: %s"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:146
+#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
 msgid "black"
 msgstr "Nero"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:148
+#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
 msgid "red"
 msgstr "Rosso"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:150
+#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
 msgid "green"
 msgstr "Verde"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:152
+#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
 msgid "blue"
 msgstr "Blu"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:154
+#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
 msgid "gold"
 msgstr "Oro"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:156
+#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
 msgid "yellow"
 msgstr "Giallo"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:158
+#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
 msgid "pink"
 msgstr "Rosa"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:160
+#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
 msgid "purple"
 msgstr "Viola"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:162
+#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
 msgid "grey"
 msgstr "Grigio"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:164
+#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
 msgid "brown"
 msgstr "Marrone"
 
@@ -3147,85 +3147,97 @@ msgstr "Messaggi"
 msgid "Hide shop messages"
 msgstr "Nascondi i messaggi del negozio"
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:124
+msgid "Show MVP messages"
+msgstr ""
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:125
+#: src/gui/widgets/tabs/setup_chat.cpp:129
 msgid "Tabs"
 msgstr "Tabs"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:128
+#: src/gui/widgets/tabs/setup_chat.cpp:132
 msgid "Put all whispers in tabs"
 msgstr "Sposta tutti i sussurri in schede"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:132
+#: src/gui/widgets/tabs/setup_chat.cpp:136
 msgid "Log magic messages in debug tab"
 msgstr "Salva i messaggi delle magie nella debug tab"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:136
+#: src/gui/widgets/tabs/setup_chat.cpp:140
 msgid "Show server messages in debug tab"
 msgstr "Mostra i messaggi del server nella chat di debug"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:140
+#: src/gui/widgets/tabs/setup_chat.cpp:144
 msgid "Enable trade tab"
 msgstr "Abilita la chat di commercio"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:144
+#: src/gui/widgets/tabs/setup_chat.cpp:148
 msgid "Enable gm tab"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:148
+#: src/gui/widgets/tabs/setup_chat.cpp:152
 msgid "Enable language tab"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:152
+#: src/gui/widgets/tabs/setup_chat.cpp:156
 msgid "Show all languages messages"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:156
+#: src/gui/widgets/tabs/setup_chat.cpp:160
 msgid "Enable battle tab"
 msgstr "Abilita la chat di battaglia"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:160
+#: src/gui/widgets/tabs/setup_chat.cpp:164
 msgid "Show battle events"
 msgstr "Mostra gli eventi della battaglia"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:164
+#: src/gui/widgets/tabs/setup_chat.cpp:168
 msgid "Resize chat tabs if need"
 msgstr "Dimensione finestra dialogo dinamica"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:169
+#: src/gui/widgets/tabs/setup_chat.cpp:173
 msgid "Time"
 msgstr "Tempo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:172
+#: src/gui/widgets/tabs/setup_chat.cpp:176
 msgid "Use local time"
 msgstr "Usa ora locale"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:179
+#: src/gui/widgets/tabs/setup_chat.cpp:183
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:183
+#: src/gui/widgets/tabs/setup_chat.cpp:187
 msgid "Globals ignore names (separated by comma)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:187
-msgid "Show MVP messages"
-msgstr ""
+#: src/gui/widgets/tabs/setup_chat.cpp:191
+#, fuzzy
+msgid "Show emotes button in chat"
+msgstr "Notifica oggetti raccolti nella chat."
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:195
+#, fuzzy
+msgid "Show motd server message on start"
+msgstr "Mostra i messaggi del server nella chat di debug"
 
 #: src/gui/widgets/tabs/setup_colors.cpp:46
 msgid "This is what the color looks like"
@@ -3413,7 +3425,7 @@ msgstr ""
 #. TRANSLATORS: chat color
 #. TRANSLATORS: inventory sort mode
 #: src/gui/widgets/tabs/setup_other.cpp:71
-#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:150
 #: src/gui/windows/inventorywindow.cpp:69
 msgid "default"
 msgstr "Predefinito"
@@ -5083,8 +5095,8 @@ msgstr "Nome:"
 #: src/gui/windows/charcreatedialog.cpp:75
 #: src/gui/windows/charcreatedialog.cpp:84
 #: src/gui/windows/charcreatedialog.cpp:101
-#: src/gui/windows/charcreatedialog.cpp:171
-#: src/gui/windows/charcreatedialog.cpp:181
+#: src/gui/windows/charcreatedialog.cpp:170
+#: src/gui/windows/charcreatedialog.cpp:180
 #: src/gui/windows/outfitwindow.cpp:58
 msgid ">"
 msgstr ">"
@@ -5095,8 +5107,8 @@ msgstr ">"
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:79
 #: src/gui/windows/charcreatedialog.cpp:86
-#: src/gui/windows/charcreatedialog.cpp:173
-#: src/gui/windows/charcreatedialog.cpp:183
+#: src/gui/windows/charcreatedialog.cpp:172
+#: src/gui/windows/charcreatedialog.cpp:182
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "<"
 msgstr "<"
@@ -5132,33 +5144,33 @@ msgstr "Femmina"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:466
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Distribuire %d punti"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:174
 msgid "Race:"
 msgstr "Razza:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:185
+#: src/gui/windows/charcreatedialog.cpp:184
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:359
 msgid "Your name needs to be at least 4 characters."
 msgstr "Il tuo nome deve contenere almeno 4 caratteri."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:456
 msgid "Character stats OK"
 msgstr "Statistiche personaggio OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:472
 #, c-format
 msgid "Please remove %d points"
 msgstr "Rimuovere %d punti"
@@ -5244,28 +5256,28 @@ msgid "Enter password:"
 msgstr "Digitare password:"
 
 #. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:166
+#: src/gui/windows/chatwindow.cpp:172
 msgid "rainbow 1"
 msgstr "Arcobaleno 1"
 
 #. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:168
+#: src/gui/windows/chatwindow.cpp:174
 msgid "rainbow 2"
 msgstr "Arcobaleno 2"
 
 #. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:170
+#: src/gui/windows/chatwindow.cpp:176
 msgid "rainbow 3"
 msgstr "Arcobaleno 3"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:694
+#: src/gui/windows/chatwindow.cpp:740
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presente: %s; %d giocatori sono presenti."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1103
+#: src/gui/windows/chatwindow.cpp:1154
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Sussurra a %s: %s"
@@ -5886,17 +5898,17 @@ msgid "Add"
 msgstr "Aggiungi"
 
 #. TRANSLATORS: label in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:58
+#: src/gui/windows/npcpostdialog.cpp:57
 msgid "To:"
 msgstr "A:"
 
 #. TRANSLATORS: button in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:65
+#: src/gui/windows/npcpostdialog.cpp:64
 msgid "Send"
 msgstr "Invia"
 
 #. TRANSLATORS: npc post message error
-#: src/gui/windows/npcpostdialog.cpp:112
+#: src/gui/windows/npcpostdialog.cpp:111
 msgid "Failed to send as sender or letter invalid."
 msgstr "La lettera non è valida oppure non è stato possibile inviarla."
 
@@ -6924,13 +6936,13 @@ msgid "Failed to delete character."
 msgstr "Eliminazione personaggio fallita."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:87
+#: src/net/ea/chathandler.cpp:88
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr "Il messaggio privato non puo' essere inviato, %s e' offline."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:96
+#: src/net/ea/chathandler.cpp:97
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr "Il messaggio privato e' stato ignorato da %s."
diff --git a/po/ja.po b/po/ja.po
index b6bd4f7ec..51d0331d3 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-10-19 16:54+0300\n"
+"POT-Creation-Date: 2013-10-25 16:34+0300\n"
 "PO-Revision-Date: 2013-09-20 08:56+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/manaplus/"
@@ -40,25 +40,25 @@ msgid "Visible on map"
 msgstr "マップに表示させる"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:296
+#: src/being/being.cpp:294
 msgid "Human"
 msgstr "人間"
 
-#: src/being/being.cpp:504
+#: src/being/being.cpp:502
 msgid "dodge"
 msgstr "ドッジ"
 
-#: src/being/being.cpp:504
+#: src/being/being.cpp:502
 msgid "miss"
 msgstr "ミス"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1748 src/gui/windows/whoisonline.cpp:861
+#: src/being/being.cpp:1746 src/gui/windows/whoisonline.cpp:861
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1753 src/gui/windows/whoisonline.cpp:866
+#: src/being/being.cpp:1751 src/gui/windows/whoisonline.cpp:866
 msgid "I"
 msgstr "I"
 
@@ -530,31 +530,31 @@ msgstr "吹出し"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:1106 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:58
+#: src/client.cpp:1109 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:58
 msgid "Setup"
 msgstr "設定"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1110 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1113 src/gui/widgets/tabs/setup_perfomance.cpp:50
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:1113 src/gui/widgets/tabs/setup_video.cpp:221
+#: src/client.cpp:1116 src/gui/widgets/tabs/setup_video.cpp:221
 msgid "Video"
 msgstr "ビデオ"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1116 src/gui/widgets/tabs/setup_theme.cpp:279
+#: src/client.cpp:1119 src/gui/widgets/tabs/setup_theme.cpp:279
 msgid "Theme"
 msgstr "テーマ"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:1119 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1122 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:50
 msgid "Help"
 msgstr "ヘルプ"
@@ -567,7 +567,7 @@ msgstr "ヘルプ"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1123 src/gui/popups/popupmenu.cpp:618
+#: src/client.cpp:1126 src/gui/popups/popupmenu.cpp:618
 #: src/gui/windows/didyouknowwindow.cpp:78
 #: src/gui/windows/inventorywindow.cpp:252 src/gui/windows/npcdialog.cpp:71
 #: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:134
@@ -576,32 +576,32 @@ msgid "Close"
 msgstr "閉じる"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1242
+#: src/client.cpp:1245
 msgid "Connecting to server"
 msgstr "サーバーに接続しています"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1287
+#: src/client.cpp:1290
 msgid "Logging in"
 msgstr "ログインしています"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1328
+#: src/client.cpp:1331
 msgid "Entering game world"
 msgstr "ゲームの世界に移動しています"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1451
+#: src/client.cpp:1454
 msgid "Requesting characters"
 msgstr "キャラクターを呼び出しています"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1492
+#: src/client.cpp:1495
 msgid "Connecting to the game server"
 msgstr "ゲームサーバーに接続しています"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1506
+#: src/client.cpp:1509
 msgid "Changing game servers"
 msgstr "ゲームサーバーを変更しています"
 
@@ -616,10 +616,10 @@ msgstr "ゲームサーバーを変更しています"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1566 src/client.cpp:1577 src/client.cpp:1758
+#: src/client.cpp:1569 src/client.cpp:1580 src/client.cpp:1761
 #: src/gui/windows/changeemaildialog.cpp:167
 #: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:358
+#: src/gui/windows/charcreatedialog.cpp:357
 #: src/gui/windows/charselectdialog.cpp:297
 #: src/gui/windows/editserverdialog.cpp:217
 #: src/gui/windows/registerdialog.cpp:259
@@ -629,65 +629,65 @@ msgid "Error"
 msgstr "エラー"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1590
+#: src/client.cpp:1593
 msgid "Requesting registration details"
 msgstr "登録内容を呼び出しています"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1630
+#: src/client.cpp:1633
 msgid "Password Change"
 msgstr "パスワード変更"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1632
+#: src/client.cpp:1635
 msgid "Password changed successfully!"
 msgstr "パスワードを変更しました"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1654
+#: src/client.cpp:1657
 msgid "Email Change"
 msgstr "メールアドレス変更"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1656
+#: src/client.cpp:1659
 msgid "Email changed successfully!"
 msgstr "メールアドレスを変更しました"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1679
+#: src/client.cpp:1682
 msgid "Unregister Successful"
 msgstr "登録を解除しました"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1681
+#: src/client.cpp:1684
 msgid "Farewell, come back any time..."
 msgstr "さようなら　また会いましょう"
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1953 src/client.cpp:1968 src/client.cpp:2011
-#: src/client.cpp:2027 src/client.cpp:2467 src/client.cpp:2475
+#: src/client.cpp:1956 src/client.cpp:1971 src/client.cpp:2014
+#: src/client.cpp:2030 src/client.cpp:2456 src/client.cpp:2464
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%sは存在しない為、作成できません"
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2167
+#: src/client.cpp:2170
 #, c-format
 msgid "Invalid update host: %s."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2208 src/client.cpp:2215
+#: src/client.cpp:2211 src/client.cpp:2218
 msgid "Error creating updates directory!"
 msgstr "更新フォルダの作成エラー"
 
-#: src/client.cpp:2237 src/client.cpp:2250
+#: src/client.cpp:2240 src/client.cpp:2253
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "エラー: %s は存在しない為、作成できません"
 
 #. TRANSLATORS: error message question
-#: src/client.cpp:2915
+#: src/client.cpp:2904
 msgid "Do you want to open support page?"
 msgstr ""
 
@@ -946,25 +946,25 @@ msgid "Network Error"
 msgstr "ネットワークエラー"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:132
 #, c-format
 msgid "Party: %s"
 msgstr "パーティ: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:147
 #, c-format
 msgid "Guild: %s"
 msgstr "ギルド: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:161
 #, c-format
 msgid "Pvp rank: %u"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:173
 #, c-format
 msgid "Comment: %s"
 msgstr "コメント: %s"
@@ -1175,7 +1175,7 @@ msgstr "名前をチャットへ追加する"
 #: src/gui/windows/connectiondialog.cpp:48
 #: src/gui/windows/editserverdialog.cpp:78
 #: src/gui/windows/itemamountwindow.cpp:209
-#: src/gui/windows/npcpostdialog.cpp:69 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:69
 #: src/gui/windows/registerdialog.cpp:76 src/gui/windows/setup.cpp:90
 #: src/gui/windows/socialwindow.cpp:1231
 #: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:53
@@ -2395,7 +2395,7 @@ msgstr "ページ下へ"
 #. TRANSLATORS: register dialog. button.
 #: src/gui/setupactiondata.h:1779 src/gui/setupactiondata.h:1868
 #: src/gui/widgets/tabs/setup_audio.cpp:159
-#: src/gui/widgets/tabs/setup_chat.cpp:176
+#: src/gui/widgets/tabs/setup_chat.cpp:180
 #: src/gui/widgets/tabs/setup_other.cpp:321
 #: src/gui/widgets/tabs/setup_visual.cpp:175
 #: src/gui/windows/charcreatedialog.cpp:107
@@ -2478,7 +2478,7 @@ msgstr "スマイリー"
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupactiondata.h:1866 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:197
+#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
 msgid "Chat"
 msgstr "チャット"
 
@@ -2705,61 +2705,61 @@ msgstr "GP: %s"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:146
+#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
 msgid "black"
 msgstr "黒"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:148
+#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
 msgid "red"
 msgstr "赤"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:150
+#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
 msgid "green"
 msgstr "緑"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:152
+#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
 msgid "blue"
 msgstr "青"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:154
+#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
 msgid "gold"
 msgstr "金色"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:156
+#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
 msgid "yellow"
 msgstr "黄色"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:158
+#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
 msgid "pink"
 msgstr "ピンク"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:160
+#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
 msgid "purple"
 msgstr "紫"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:162
+#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
 msgid "grey"
 msgstr "グレー"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:164
+#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
 msgid "brown"
 msgstr "茶色"
 
@@ -3146,85 +3146,97 @@ msgstr "メッセージ"
 msgid "Hide shop messages"
 msgstr "売買メッセージを隠す"
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:124
+msgid "Show MVP messages"
+msgstr "MVPメッセージを表示する"
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:125
+#: src/gui/widgets/tabs/setup_chat.cpp:129
 msgid "Tabs"
 msgstr "タブ"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:128
+#: src/gui/widgets/tabs/setup_chat.cpp:132
 msgid "Put all whispers in tabs"
 msgstr "ささやきををタブで表示する"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:132
+#: src/gui/widgets/tabs/setup_chat.cpp:136
 msgid "Log magic messages in debug tab"
 msgstr "デバッグタブに呪文をログする"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:136
+#: src/gui/widgets/tabs/setup_chat.cpp:140
 msgid "Show server messages in debug tab"
 msgstr "デバッグタブにサーバーメッセージをログする"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:140
+#: src/gui/widgets/tabs/setup_chat.cpp:144
 msgid "Enable trade tab"
 msgstr "トレードタブを有効"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:144
+#: src/gui/widgets/tabs/setup_chat.cpp:148
 msgid "Enable gm tab"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:148
+#: src/gui/widgets/tabs/setup_chat.cpp:152
 msgid "Enable language tab"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:152
+#: src/gui/widgets/tabs/setup_chat.cpp:156
 msgid "Show all languages messages"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:156
+#: src/gui/widgets/tabs/setup_chat.cpp:160
 msgid "Enable battle tab"
 msgstr "バトルタブを有効"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:160
+#: src/gui/widgets/tabs/setup_chat.cpp:164
 msgid "Show battle events"
 msgstr "バトルイベントを表示"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:164
+#: src/gui/widgets/tabs/setup_chat.cpp:168
 msgid "Resize chat tabs if need"
 msgstr "チャットタブをリサイズする"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:169
+#: src/gui/widgets/tabs/setup_chat.cpp:173
 msgid "Time"
 msgstr "時間"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:172
+#: src/gui/widgets/tabs/setup_chat.cpp:176
 msgid "Use local time"
 msgstr "ローカルタイムを使う"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:179
+#: src/gui/widgets/tabs/setup_chat.cpp:183
 msgid "Highlight words (separated by comma)"
 msgstr "文字をハイライト (コンマで区切る)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:183
+#: src/gui/widgets/tabs/setup_chat.cpp:187
 msgid "Globals ignore names (separated by comma)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:187
-msgid "Show MVP messages"
-msgstr "MVPメッセージを表示する"
+#: src/gui/widgets/tabs/setup_chat.cpp:191
+#, fuzzy
+msgid "Show emotes button in chat"
+msgstr "入手通知をチャットに表示"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:195
+#, fuzzy
+msgid "Show motd server message on start"
+msgstr "デバッグタブにサーバーメッセージをログする"
 
 #: src/gui/widgets/tabs/setup_colors.cpp:46
 msgid "This is what the color looks like"
@@ -3412,7 +3424,7 @@ msgstr "SOCKS5 ホスト名"
 #. TRANSLATORS: chat color
 #. TRANSLATORS: inventory sort mode
 #: src/gui/widgets/tabs/setup_other.cpp:71
-#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:150
 #: src/gui/windows/inventorywindow.cpp:69
 msgid "default"
 msgstr "デフォルト"
@@ -5073,8 +5085,8 @@ msgstr "名前:"
 #: src/gui/windows/charcreatedialog.cpp:75
 #: src/gui/windows/charcreatedialog.cpp:84
 #: src/gui/windows/charcreatedialog.cpp:101
-#: src/gui/windows/charcreatedialog.cpp:171
-#: src/gui/windows/charcreatedialog.cpp:181
+#: src/gui/windows/charcreatedialog.cpp:170
+#: src/gui/windows/charcreatedialog.cpp:180
 #: src/gui/windows/outfitwindow.cpp:58
 msgid ">"
 msgstr ">"
@@ -5085,8 +5097,8 @@ msgstr ">"
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:79
 #: src/gui/windows/charcreatedialog.cpp:86
-#: src/gui/windows/charcreatedialog.cpp:173
-#: src/gui/windows/charcreatedialog.cpp:183
+#: src/gui/windows/charcreatedialog.cpp:172
+#: src/gui/windows/charcreatedialog.cpp:182
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "<"
 msgstr "<"
@@ -5122,33 +5134,33 @@ msgstr "女性"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:466
 #, c-format
 msgid "Please distribute %d points"
 msgstr "%d ポイントを振り分けてください"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:174
 msgid "Race:"
 msgstr "人種:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:185
+#: src/gui/windows/charcreatedialog.cpp:184
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:359
 msgid "Your name needs to be at least 4 characters."
 msgstr "名前は４文字以上必要です"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:456
 msgid "Character stats OK"
 msgstr "能力ポイント配分量は問題ありません"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:472
 #, c-format
 msgid "Please remove %d points"
 msgstr "%dポイントを取り除いてください"
@@ -5234,28 +5246,28 @@ msgid "Enter password:"
 msgstr "パスワードを入力して下さい:"
 
 #. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:166
+#: src/gui/windows/chatwindow.cpp:172
 msgid "rainbow 1"
 msgstr "カラフル1"
 
 #. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:168
+#: src/gui/windows/chatwindow.cpp:174
 msgid "rainbow 2"
 msgstr "カラフル 2"
 
 #. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:170
+#: src/gui/windows/chatwindow.cpp:176
 msgid "rainbow 3"
 msgstr "カラフル 3"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:694
+#: src/gui/windows/chatwindow.cpp:740
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "現在: %s; %d プレイヤーがいます"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1103
+#: src/gui/windows/chatwindow.cpp:1154
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "%sにささやき中:%s"
@@ -5874,17 +5886,17 @@ msgid "Add"
 msgstr "追加"
 
 #. TRANSLATORS: label in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:58
+#: src/gui/windows/npcpostdialog.cpp:57
 msgid "To:"
 msgstr "宛先:"
 
 #. TRANSLATORS: button in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:65
+#: src/gui/windows/npcpostdialog.cpp:64
 msgid "Send"
 msgstr "送信する"
 
 #. TRANSLATORS: npc post message error
-#: src/gui/windows/npcpostdialog.cpp:112
+#: src/gui/windows/npcpostdialog.cpp:111
 msgid "Failed to send as sender or letter invalid."
 msgstr "文字か差出人が無効の為送信に失敗しました"
 
@@ -6914,13 +6926,13 @@ msgid "Failed to delete character."
 msgstr "キャラクター削除に失敗しました"
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:87
+#: src/net/ea/chathandler.cpp:88
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr "%sがオフラインの為ささやきは送れませんでした"
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:96
+#: src/net/ea/chathandler.cpp:97
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr "%sが完全無視設定をしている為ささやきは送れませんでした"
diff --git a/po/manaplus.pot b/po/manaplus.pot
index a79f93a83..13747fdd5 100644
--- a/po/manaplus.pot
+++ b/po/manaplus.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-10-19 16:54+0300\n"
+"POT-Creation-Date: 2013-10-25 16:34+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -34,25 +34,25 @@ msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:296
+#: src/being/being.cpp:294
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:504
+#: src/being/being.cpp:502
 msgid "dodge"
 msgstr ""
 
-#: src/being/being.cpp:504
+#: src/being/being.cpp:502
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1748 src/gui/windows/whoisonline.cpp:861
+#: src/being/being.cpp:1746 src/gui/windows/whoisonline.cpp:861
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1753 src/gui/windows/whoisonline.cpp:866
+#: src/being/being.cpp:1751 src/gui/windows/whoisonline.cpp:866
 msgid "I"
 msgstr ""
 
@@ -525,31 +525,31 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:1106 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:58
+#: src/client.cpp:1109 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:58
 msgid "Setup"
 msgstr ""
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1110 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1113 src/gui/widgets/tabs/setup_perfomance.cpp:50
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:1113 src/gui/widgets/tabs/setup_video.cpp:221
+#: src/client.cpp:1116 src/gui/widgets/tabs/setup_video.cpp:221
 msgid "Video"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1116 src/gui/widgets/tabs/setup_theme.cpp:279
+#: src/client.cpp:1119 src/gui/widgets/tabs/setup_theme.cpp:279
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:1119 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1122 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:50
 msgid "Help"
 msgstr ""
@@ -562,7 +562,7 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1123 src/gui/popups/popupmenu.cpp:618
+#: src/client.cpp:1126 src/gui/popups/popupmenu.cpp:618
 #: src/gui/windows/didyouknowwindow.cpp:78
 #: src/gui/windows/inventorywindow.cpp:252 src/gui/windows/npcdialog.cpp:71
 #: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:134
@@ -571,32 +571,32 @@ msgid "Close"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1242
+#: src/client.cpp:1245
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1287
+#: src/client.cpp:1290
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1328
+#: src/client.cpp:1331
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1451
+#: src/client.cpp:1454
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1492
+#: src/client.cpp:1495
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1506
+#: src/client.cpp:1509
 msgid "Changing game servers"
 msgstr ""
 
@@ -611,10 +611,10 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1566 src/client.cpp:1577 src/client.cpp:1758
+#: src/client.cpp:1569 src/client.cpp:1580 src/client.cpp:1761
 #: src/gui/windows/changeemaildialog.cpp:167
 #: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:358
+#: src/gui/windows/charcreatedialog.cpp:357
 #: src/gui/windows/charselectdialog.cpp:297
 #: src/gui/windows/editserverdialog.cpp:217
 #: src/gui/windows/registerdialog.cpp:259
@@ -624,65 +624,65 @@ msgid "Error"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1590
+#: src/client.cpp:1593
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1630
+#: src/client.cpp:1633
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1632
+#: src/client.cpp:1635
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1654
+#: src/client.cpp:1657
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1656
+#: src/client.cpp:1659
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1679
+#: src/client.cpp:1682
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1681
+#: src/client.cpp:1684
 msgid "Farewell, come back any time..."
 msgstr ""
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1953 src/client.cpp:1968 src/client.cpp:2011
-#: src/client.cpp:2027 src/client.cpp:2467 src/client.cpp:2475
+#: src/client.cpp:1956 src/client.cpp:1971 src/client.cpp:2014
+#: src/client.cpp:2030 src/client.cpp:2456 src/client.cpp:2464
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2167
+#: src/client.cpp:2170
 #, c-format
 msgid "Invalid update host: %s."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2208 src/client.cpp:2215
+#: src/client.cpp:2211 src/client.cpp:2218
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:2237 src/client.cpp:2250
+#: src/client.cpp:2240 src/client.cpp:2253
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
 #. TRANSLATORS: error message question
-#: src/client.cpp:2915
+#: src/client.cpp:2904
 msgid "Do you want to open support page?"
 msgstr ""
 
@@ -938,25 +938,25 @@ msgid "Network Error"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:132
 #, c-format
 msgid "Party: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:147
 #, c-format
 msgid "Guild: %s"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:161
 #, c-format
 msgid "Pvp rank: %u"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:173
 #, c-format
 msgid "Comment: %s"
 msgstr ""
@@ -1167,7 +1167,7 @@ msgstr ""
 #: src/gui/windows/connectiondialog.cpp:48
 #: src/gui/windows/editserverdialog.cpp:78
 #: src/gui/windows/itemamountwindow.cpp:209
-#: src/gui/windows/npcpostdialog.cpp:69 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:69
 #: src/gui/windows/registerdialog.cpp:76 src/gui/windows/setup.cpp:90
 #: src/gui/windows/socialwindow.cpp:1231
 #: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:53
@@ -2387,7 +2387,7 @@ msgstr ""
 #. TRANSLATORS: register dialog. button.
 #: src/gui/setupactiondata.h:1779 src/gui/setupactiondata.h:1868
 #: src/gui/widgets/tabs/setup_audio.cpp:159
-#: src/gui/widgets/tabs/setup_chat.cpp:176
+#: src/gui/widgets/tabs/setup_chat.cpp:180
 #: src/gui/widgets/tabs/setup_other.cpp:321
 #: src/gui/widgets/tabs/setup_visual.cpp:175
 #: src/gui/windows/charcreatedialog.cpp:107
@@ -2470,7 +2470,7 @@ msgstr ""
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupactiondata.h:1866 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:197
+#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
 msgid "Chat"
 msgstr ""
 
@@ -2697,61 +2697,61 @@ msgstr ""
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:146
+#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
 msgid "black"
 msgstr ""
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:148
+#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
 msgid "red"
 msgstr ""
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:150
+#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
 msgid "green"
 msgstr ""
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:152
+#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
 msgid "blue"
 msgstr ""
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:154
+#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
 msgid "gold"
 msgstr ""
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:156
+#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
 msgid "yellow"
 msgstr ""
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:158
+#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
 msgid "pink"
 msgstr ""
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:160
+#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
 msgid "purple"
 msgstr ""
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:162
+#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
 msgid "grey"
 msgstr ""
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:164
+#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
 msgid "brown"
 msgstr ""
 
@@ -3136,84 +3136,94 @@ msgstr ""
 msgid "Hide shop messages"
 msgstr ""
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:124
+msgid "Show MVP messages"
+msgstr ""
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:125
+#: src/gui/widgets/tabs/setup_chat.cpp:129
 msgid "Tabs"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:128
+#: src/gui/widgets/tabs/setup_chat.cpp:132
 msgid "Put all whispers in tabs"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:132
+#: src/gui/widgets/tabs/setup_chat.cpp:136
 msgid "Log magic messages in debug tab"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:136
+#: src/gui/widgets/tabs/setup_chat.cpp:140
 msgid "Show server messages in debug tab"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:140
+#: src/gui/widgets/tabs/setup_chat.cpp:144
 msgid "Enable trade tab"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:144
+#: src/gui/widgets/tabs/setup_chat.cpp:148
 msgid "Enable gm tab"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:148
+#: src/gui/widgets/tabs/setup_chat.cpp:152
 msgid "Enable language tab"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:152
+#: src/gui/widgets/tabs/setup_chat.cpp:156
 msgid "Show all languages messages"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:156
+#: src/gui/widgets/tabs/setup_chat.cpp:160
 msgid "Enable battle tab"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:160
+#: src/gui/widgets/tabs/setup_chat.cpp:164
 msgid "Show battle events"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:164
+#: src/gui/widgets/tabs/setup_chat.cpp:168
 msgid "Resize chat tabs if need"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:169
+#: src/gui/widgets/tabs/setup_chat.cpp:173
 msgid "Time"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:172
+#: src/gui/widgets/tabs/setup_chat.cpp:176
 msgid "Use local time"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:179
+#: src/gui/widgets/tabs/setup_chat.cpp:183
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:183
+#: src/gui/widgets/tabs/setup_chat.cpp:187
 msgid "Globals ignore names (separated by comma)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:187
-msgid "Show MVP messages"
+#: src/gui/widgets/tabs/setup_chat.cpp:191
+msgid "Show emotes button in chat"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:195
+msgid "Show motd server message on start"
 msgstr ""
 
 #: src/gui/widgets/tabs/setup_colors.cpp:46
@@ -3400,7 +3410,7 @@ msgstr ""
 #. TRANSLATORS: chat color
 #. TRANSLATORS: inventory sort mode
 #: src/gui/widgets/tabs/setup_other.cpp:71
-#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:150
 #: src/gui/windows/inventorywindow.cpp:69
 msgid "default"
 msgstr ""
@@ -5061,8 +5071,8 @@ msgstr ""
 #: src/gui/windows/charcreatedialog.cpp:75
 #: src/gui/windows/charcreatedialog.cpp:84
 #: src/gui/windows/charcreatedialog.cpp:101
-#: src/gui/windows/charcreatedialog.cpp:171
-#: src/gui/windows/charcreatedialog.cpp:181
+#: src/gui/windows/charcreatedialog.cpp:170
+#: src/gui/windows/charcreatedialog.cpp:180
 #: src/gui/windows/outfitwindow.cpp:58
 msgid ">"
 msgstr ""
@@ -5073,8 +5083,8 @@ msgstr ""
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:79
 #: src/gui/windows/charcreatedialog.cpp:86
-#: src/gui/windows/charcreatedialog.cpp:173
-#: src/gui/windows/charcreatedialog.cpp:183
+#: src/gui/windows/charcreatedialog.cpp:172
+#: src/gui/windows/charcreatedialog.cpp:182
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "<"
 msgstr ""
@@ -5110,33 +5120,33 @@ msgstr ""
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:466
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:174
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:185
+#: src/gui/windows/charcreatedialog.cpp:184
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:359
 msgid "Your name needs to be at least 4 characters."
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:456
 msgid "Character stats OK"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:472
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
@@ -5222,28 +5232,28 @@ msgid "Enter password:"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:166
+#: src/gui/windows/chatwindow.cpp:172
 msgid "rainbow 1"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:168
+#: src/gui/windows/chatwindow.cpp:174
 msgid "rainbow 2"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:170
+#: src/gui/windows/chatwindow.cpp:176
 msgid "rainbow 3"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:694
+#: src/gui/windows/chatwindow.cpp:740
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1103
+#: src/gui/windows/chatwindow.cpp:1154
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -5864,17 +5874,17 @@ msgid "Add"
 msgstr ""
 
 #. TRANSLATORS: label in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:58
+#: src/gui/windows/npcpostdialog.cpp:57
 msgid "To:"
 msgstr ""
 
 #. TRANSLATORS: button in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:65
+#: src/gui/windows/npcpostdialog.cpp:64
 msgid "Send"
 msgstr ""
 
 #. TRANSLATORS: npc post message error
-#: src/gui/windows/npcpostdialog.cpp:112
+#: src/gui/windows/npcpostdialog.cpp:111
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
@@ -6897,13 +6907,13 @@ msgid "Failed to delete character."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:87
+#: src/net/ea/chathandler.cpp:88
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:96
+#: src/net/ea/chathandler.cpp:97
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
diff --git a/po/nl_BE.po b/po/nl_BE.po
index ae4492494..6725ebeda 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-10-19 16:54+0300\n"
+"POT-Creation-Date: 2013-10-25 16:34+0300\n"
 "PO-Revision-Date: 2013-09-20 08:56+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/projects/p/manaplus/"
@@ -37,25 +37,25 @@ msgid "Visible on map"
 msgstr "Zichtbaar op de map"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:296
+#: src/being/being.cpp:294
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:504
+#: src/being/being.cpp:502
 msgid "dodge"
 msgstr "ontwijkt"
 
-#: src/being/being.cpp:504
+#: src/being/being.cpp:502
 msgid "miss"
 msgstr "mist"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1748 src/gui/windows/whoisonline.cpp:861
+#: src/being/being.cpp:1746 src/gui/windows/whoisonline.cpp:861
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1753 src/gui/windows/whoisonline.cpp:866
+#: src/being/being.cpp:1751 src/gui/windows/whoisonline.cpp:866
 msgid "I"
 msgstr "I"
 
@@ -528,31 +528,31 @@ msgstr "Zwevende bel"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:1106 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:58
+#: src/client.cpp:1109 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:58
 msgid "Setup"
 msgstr "Configureren"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1110 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1113 src/gui/widgets/tabs/setup_perfomance.cpp:50
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:1113 src/gui/widgets/tabs/setup_video.cpp:221
+#: src/client.cpp:1116 src/gui/widgets/tabs/setup_video.cpp:221
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1116 src/gui/widgets/tabs/setup_theme.cpp:279
+#: src/client.cpp:1119 src/gui/widgets/tabs/setup_theme.cpp:279
 msgid "Theme"
 msgstr "Thema"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:1119 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1122 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:50
 msgid "Help"
 msgstr "Help"
@@ -565,7 +565,7 @@ msgstr "Help"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1123 src/gui/popups/popupmenu.cpp:618
+#: src/client.cpp:1126 src/gui/popups/popupmenu.cpp:618
 #: src/gui/windows/didyouknowwindow.cpp:78
 #: src/gui/windows/inventorywindow.cpp:252 src/gui/windows/npcdialog.cpp:71
 #: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:134
@@ -574,32 +574,32 @@ msgid "Close"
 msgstr "Sluiten"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1242
+#: src/client.cpp:1245
 msgid "Connecting to server"
 msgstr "Verbinden met server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1287
+#: src/client.cpp:1290
 msgid "Logging in"
 msgstr "Inloggen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1328
+#: src/client.cpp:1331
 msgid "Entering game world"
 msgstr "Spelwereld binnenkomen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1451
+#: src/client.cpp:1454
 msgid "Requesting characters"
 msgstr "Aanvragen personage"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1492
+#: src/client.cpp:1495
 msgid "Connecting to the game server"
 msgstr "Verbinden met de spelserver"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1506
+#: src/client.cpp:1509
 msgid "Changing game servers"
 msgstr "Wijzigen spelservers"
 
@@ -614,10 +614,10 @@ msgstr "Wijzigen spelservers"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1566 src/client.cpp:1577 src/client.cpp:1758
+#: src/client.cpp:1569 src/client.cpp:1580 src/client.cpp:1761
 #: src/gui/windows/changeemaildialog.cpp:167
 #: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:358
+#: src/gui/windows/charcreatedialog.cpp:357
 #: src/gui/windows/charselectdialog.cpp:297
 #: src/gui/windows/editserverdialog.cpp:217
 #: src/gui/windows/registerdialog.cpp:259
@@ -627,65 +627,65 @@ msgid "Error"
 msgstr "Fout"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1590
+#: src/client.cpp:1593
 msgid "Requesting registration details"
 msgstr "Aanvragen registratie details"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1630
+#: src/client.cpp:1633
 msgid "Password Change"
 msgstr "Paswoord Wijziging"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1632
+#: src/client.cpp:1635
 msgid "Password changed successfully!"
 msgstr "Paswoord is gewijzigd!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1654
+#: src/client.cpp:1657
 msgid "Email Change"
 msgstr "Email Wijziging"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1656
+#: src/client.cpp:1659
 msgid "Email changed successfully!"
 msgstr "Email is gewijzigd!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1679
+#: src/client.cpp:1682
 msgid "Unregister Successful"
 msgstr "Registratie ongedaan gemaakt!"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1681
+#: src/client.cpp:1684
 msgid "Farewell, come back any time..."
 msgstr "Tot ziens..."
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1953 src/client.cpp:1968 src/client.cpp:2011
-#: src/client.cpp:2027 src/client.cpp:2467 src/client.cpp:2475
+#: src/client.cpp:1956 src/client.cpp:1971 src/client.cpp:2014
+#: src/client.cpp:2030 src/client.cpp:2456 src/client.cpp:2464
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s bestaat niet en kan niet gecreëerd worden! Stoppen."
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2167
+#: src/client.cpp:2170
 #, c-format
 msgid "Invalid update host: %s."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2208 src/client.cpp:2215
+#: src/client.cpp:2211 src/client.cpp:2218
 msgid "Error creating updates directory!"
 msgstr "Fout bij het creëren van de update map!"
 
-#: src/client.cpp:2237 src/client.cpp:2250
+#: src/client.cpp:2240 src/client.cpp:2253
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Fout: %s bestaat niet en kan niet gecreëerd worden! Stoppen."
 
 #. TRANSLATORS: error message question
-#: src/client.cpp:2915
+#: src/client.cpp:2904
 msgid "Do you want to open support page?"
 msgstr ""
 
@@ -944,25 +944,25 @@ msgid "Network Error"
 msgstr "Netwerkfout"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:132
 #, c-format
 msgid "Party: %s"
 msgstr "Groep: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:147
 #, c-format
 msgid "Guild: %s"
 msgstr "Gilde: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:161
 #, c-format
 msgid "Pvp rank: %u"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:173
 #, c-format
 msgid "Comment: %s"
 msgstr ""
@@ -1173,7 +1173,7 @@ msgstr "Naam aan het gesprek toevoegen"
 #: src/gui/windows/connectiondialog.cpp:48
 #: src/gui/windows/editserverdialog.cpp:78
 #: src/gui/windows/itemamountwindow.cpp:209
-#: src/gui/windows/npcpostdialog.cpp:69 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:69
 #: src/gui/windows/registerdialog.cpp:76 src/gui/windows/setup.cpp:90
 #: src/gui/windows/socialwindow.cpp:1231
 #: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:53
@@ -2393,7 +2393,7 @@ msgstr ""
 #. TRANSLATORS: register dialog. button.
 #: src/gui/setupactiondata.h:1779 src/gui/setupactiondata.h:1868
 #: src/gui/widgets/tabs/setup_audio.cpp:159
-#: src/gui/widgets/tabs/setup_chat.cpp:176
+#: src/gui/widgets/tabs/setup_chat.cpp:180
 #: src/gui/widgets/tabs/setup_other.cpp:321
 #: src/gui/widgets/tabs/setup_visual.cpp:175
 #: src/gui/windows/charcreatedialog.cpp:107
@@ -2476,7 +2476,7 @@ msgstr ""
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupactiondata.h:1866 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:197
+#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
 msgid "Chat"
 msgstr "Chat"
 
@@ -2703,61 +2703,61 @@ msgstr "Geld: %s"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:146
+#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
 msgid "black"
 msgstr "zwart"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:148
+#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
 msgid "red"
 msgstr "rood"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:150
+#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
 msgid "green"
 msgstr "groen"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:152
+#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
 msgid "blue"
 msgstr "blauw"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:154
+#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
 msgid "gold"
 msgstr "goud"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:156
+#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
 msgid "yellow"
 msgstr "geel"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:158
+#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
 msgid "pink"
 msgstr "roze"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:160
+#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
 msgid "purple"
 msgstr "paars"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:162
+#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
 msgid "grey"
 msgstr "grijs"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:164
+#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
 msgid "brown"
 msgstr "bruin"
 
@@ -3144,86 +3144,97 @@ msgstr "Berichten"
 msgid "Hide shop messages"
 msgstr "Verberg verkoop boodschappen"
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:124
+msgid "Show MVP messages"
+msgstr ""
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:125
+#: src/gui/widgets/tabs/setup_chat.cpp:129
 msgid "Tabs"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:128
+#: src/gui/widgets/tabs/setup_chat.cpp:132
 msgid "Put all whispers in tabs"
 msgstr "Plaats alle persoonlijke berichten in tabs"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:132
+#: src/gui/widgets/tabs/setup_chat.cpp:136
 msgid "Log magic messages in debug tab"
 msgstr "Hou magie berichten bij in de 'Debug' tab"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:136
+#: src/gui/widgets/tabs/setup_chat.cpp:140
 msgid "Show server messages in debug tab"
 msgstr "Toon server berichten in de debug tab"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:140
+#: src/gui/widgets/tabs/setup_chat.cpp:144
 msgid "Enable trade tab"
 msgstr "Zet handle tab aan"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:144
+#: src/gui/widgets/tabs/setup_chat.cpp:148
 msgid "Enable gm tab"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:148
+#: src/gui/widgets/tabs/setup_chat.cpp:152
 msgid "Enable language tab"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:152
+#: src/gui/widgets/tabs/setup_chat.cpp:156
 msgid "Show all languages messages"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:156
+#: src/gui/widgets/tabs/setup_chat.cpp:160
 msgid "Enable battle tab"
 msgstr "Schakel de gevechtstab in"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:160
+#: src/gui/widgets/tabs/setup_chat.cpp:164
 msgid "Show battle events"
 msgstr "geef de gevechtsevenementen weer"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:164
+#: src/gui/widgets/tabs/setup_chat.cpp:168
 msgid "Resize chat tabs if need"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:169
+#: src/gui/widgets/tabs/setup_chat.cpp:173
 msgid "Time"
 msgstr "Tijd"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:172
+#: src/gui/widgets/tabs/setup_chat.cpp:176
 msgid "Use local time"
 msgstr "Gebruik lokale tijd"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:179
+#: src/gui/widgets/tabs/setup_chat.cpp:183
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:183
+#: src/gui/widgets/tabs/setup_chat.cpp:187
 msgid "Globals ignore names (separated by comma)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:187
-msgid "Show MVP messages"
+#: src/gui/widgets/tabs/setup_chat.cpp:191
+msgid "Show emotes button in chat"
 msgstr ""
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:195
+#, fuzzy
+msgid "Show motd server message on start"
+msgstr "Toon server berichten in de debug tab"
+
 #: src/gui/widgets/tabs/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr "Dit is hoe de kleur eruit ziet"
@@ -3408,7 +3419,7 @@ msgstr ""
 #. TRANSLATORS: chat color
 #. TRANSLATORS: inventory sort mode
 #: src/gui/widgets/tabs/setup_other.cpp:71
-#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:150
 #: src/gui/windows/inventorywindow.cpp:69
 msgid "default"
 msgstr "standaard"
@@ -5078,8 +5089,8 @@ msgstr "Naam:"
 #: src/gui/windows/charcreatedialog.cpp:75
 #: src/gui/windows/charcreatedialog.cpp:84
 #: src/gui/windows/charcreatedialog.cpp:101
-#: src/gui/windows/charcreatedialog.cpp:171
-#: src/gui/windows/charcreatedialog.cpp:181
+#: src/gui/windows/charcreatedialog.cpp:170
+#: src/gui/windows/charcreatedialog.cpp:180
 #: src/gui/windows/outfitwindow.cpp:58
 msgid ">"
 msgstr ">"
@@ -5090,8 +5101,8 @@ msgstr ">"
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:79
 #: src/gui/windows/charcreatedialog.cpp:86
-#: src/gui/windows/charcreatedialog.cpp:173
-#: src/gui/windows/charcreatedialog.cpp:183
+#: src/gui/windows/charcreatedialog.cpp:172
+#: src/gui/windows/charcreatedialog.cpp:182
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "<"
 msgstr "<"
@@ -5127,33 +5138,33 @@ msgstr "Vrouwelijk"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:466
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Nog %d punten te verdelen"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:174
 msgid "Race:"
 msgstr "Ras:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:185
+#: src/gui/windows/charcreatedialog.cpp:184
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:359
 msgid "Your name needs to be at least 4 characters."
 msgstr "Je naam moet uit tenminste 4 tekens bestaan"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:456
 msgid "Character stats OK"
 msgstr "Attributen van personage OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:472
 #, c-format
 msgid "Please remove %d points"
 msgstr "Verwijder alstublieft %d punten"
@@ -5239,28 +5250,28 @@ msgid "Enter password:"
 msgstr "Geef wachtwoord:"
 
 #. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:166
+#: src/gui/windows/chatwindow.cpp:172
 msgid "rainbow 1"
 msgstr "regenboog 1"
 
 #. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:168
+#: src/gui/windows/chatwindow.cpp:174
 msgid "rainbow 2"
 msgstr "regenboog 2"
 
 #. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:170
+#: src/gui/windows/chatwindow.cpp:176
 msgid "rainbow 3"
 msgstr "regenboog 3"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:694
+#: src/gui/windows/chatwindow.cpp:740
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Aanwezig: %s; %d speler zijn aanwezig."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1103
+#: src/gui/windows/chatwindow.cpp:1154
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Fluisteren naar %s: %s"
@@ -5881,17 +5892,17 @@ msgid "Add"
 msgstr "Toevoegen"
 
 #. TRANSLATORS: label in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:58
+#: src/gui/windows/npcpostdialog.cpp:57
 msgid "To:"
 msgstr "Aan:"
 
 #. TRANSLATORS: button in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:65
+#: src/gui/windows/npcpostdialog.cpp:64
 msgid "Send"
 msgstr "Verzenden"
 
 #. TRANSLATORS: npc post message error
-#: src/gui/windows/npcpostdialog.cpp:112
+#: src/gui/windows/npcpostdialog.cpp:111
 msgid "Failed to send as sender or letter invalid."
 msgstr "Kon niet zenden als zender, of de brief is ongeldig."
 
@@ -6918,13 +6929,13 @@ msgid "Failed to delete character."
 msgstr "Kon personage niet verwijderen."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:87
+#: src/net/ea/chathandler.cpp:88
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:96
+#: src/net/ea/chathandler.cpp:97
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index d9cffd3fe..7f63674fa 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-10-19 16:54+0300\n"
+"POT-Creation-Date: 2013-10-25 16:34+0300\n"
 "PO-Revision-Date: 2013-09-20 08:56+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/manaplus/language/"
@@ -40,25 +40,25 @@ msgid "Visible on map"
 msgstr "Widoczne na mapie"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:296
+#: src/being/being.cpp:294
 msgid "Human"
 msgstr "Człowiek"
 
-#: src/being/being.cpp:504
+#: src/being/being.cpp:502
 msgid "dodge"
 msgstr "Unik!"
 
-#: src/being/being.cpp:504
+#: src/being/being.cpp:502
 msgid "miss"
 msgstr "Pudło!"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1748 src/gui/windows/whoisonline.cpp:861
+#: src/being/being.cpp:1746 src/gui/windows/whoisonline.cpp:861
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1753 src/gui/windows/whoisonline.cpp:866
+#: src/being/being.cpp:1751 src/gui/windows/whoisonline.cpp:866
 msgid "I"
 msgstr "I"
 
@@ -532,31 +532,31 @@ msgstr "Bąbelek nad głową"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:1106 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:58
+#: src/client.cpp:1109 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:58
 msgid "Setup"
 msgstr "Konfiguracja"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1110 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1113 src/gui/widgets/tabs/setup_perfomance.cpp:50
 msgid "Performance"
 msgstr "Wydajność"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:1113 src/gui/widgets/tabs/setup_video.cpp:221
+#: src/client.cpp:1116 src/gui/widgets/tabs/setup_video.cpp:221
 msgid "Video"
 msgstr "Ekran"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1116 src/gui/widgets/tabs/setup_theme.cpp:279
+#: src/client.cpp:1119 src/gui/widgets/tabs/setup_theme.cpp:279
 msgid "Theme"
 msgstr "Skórka"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:1119 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1122 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:50
 msgid "Help"
 msgstr "Pomoc"
@@ -569,7 +569,7 @@ msgstr "Pomoc"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1123 src/gui/popups/popupmenu.cpp:618
+#: src/client.cpp:1126 src/gui/popups/popupmenu.cpp:618
 #: src/gui/windows/didyouknowwindow.cpp:78
 #: src/gui/windows/inventorywindow.cpp:252 src/gui/windows/npcdialog.cpp:71
 #: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:134
@@ -578,32 +578,32 @@ msgid "Close"
 msgstr "Zamknij"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1242
+#: src/client.cpp:1245
 msgid "Connecting to server"
 msgstr "Łączenie z serwerem"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1287
+#: src/client.cpp:1290
 msgid "Logging in"
 msgstr "Logowanie"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1328
+#: src/client.cpp:1331
 msgid "Entering game world"
 msgstr "Wchodzenie do świata gry"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1451
+#: src/client.cpp:1454
 msgid "Requesting characters"
 msgstr "Sprawdzanie postaci"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1492
+#: src/client.cpp:1495
 msgid "Connecting to the game server"
 msgstr "Łączenie się z serwerem gry"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1506
+#: src/client.cpp:1509
 msgid "Changing game servers"
 msgstr "Zmiana serwera"
 
@@ -618,10 +618,10 @@ msgstr "Zmiana serwera"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1566 src/client.cpp:1577 src/client.cpp:1758
+#: src/client.cpp:1569 src/client.cpp:1580 src/client.cpp:1761
 #: src/gui/windows/changeemaildialog.cpp:167
 #: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:358
+#: src/gui/windows/charcreatedialog.cpp:357
 #: src/gui/windows/charselectdialog.cpp:297
 #: src/gui/windows/editserverdialog.cpp:217
 #: src/gui/windows/registerdialog.cpp:259
@@ -631,65 +631,65 @@ msgid "Error"
 msgstr "Błąd"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1590
+#: src/client.cpp:1593
 msgid "Requesting registration details"
 msgstr "Sprawdzanie szczegółów rejestracji"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1630
+#: src/client.cpp:1633
 msgid "Password Change"
 msgstr "Zmiana hasła"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1632
+#: src/client.cpp:1635
 msgid "Password changed successfully!"
 msgstr "Hasło zmienione z powodzeniem!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1654
+#: src/client.cpp:1657
 msgid "Email Change"
 msgstr "Zmiana adresu e-mail"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1656
+#: src/client.cpp:1659
 msgid "Email changed successfully!"
 msgstr "Adres e-mail zmieniony z powodzeniem!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1679
+#: src/client.cpp:1682
 msgid "Unregister Successful"
 msgstr "Wyrejestrowano z powodzeniem"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1681
+#: src/client.cpp:1684
 msgid "Farewell, come back any time..."
 msgstr "Żegnaj, będziemy czekać na Twój powrót..."
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1953 src/client.cpp:1968 src/client.cpp:2011
-#: src/client.cpp:2027 src/client.cpp:2467 src/client.cpp:2475
+#: src/client.cpp:1956 src/client.cpp:1971 src/client.cpp:2014
+#: src/client.cpp:2030 src/client.cpp:2456 src/client.cpp:2464
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s nie istnieje i nie może byś utworzone! Wyjście."
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2167
+#: src/client.cpp:2170
 #, c-format
 msgid "Invalid update host: %s."
 msgstr "Nieprawidłowy host aktualizacyjny: %s"
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2208 src/client.cpp:2215
+#: src/client.cpp:2211 src/client.cpp:2218
 msgid "Error creating updates directory!"
 msgstr "Błąd podczas tworzenia katalogu aktualizacji!"
 
-#: src/client.cpp:2237 src/client.cpp:2250
+#: src/client.cpp:2240 src/client.cpp:2253
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Błąd: %s nie istnieje i nie może być utworzone! Wyjście."
 
 #. TRANSLATORS: error message question
-#: src/client.cpp:2915
+#: src/client.cpp:2904
 msgid "Do you want to open support page?"
 msgstr "Czy chcesz otworzyć stronę ze wsparciem/pomocą?"
 
@@ -946,25 +946,25 @@ msgid "Network Error"
 msgstr "Błąd sieci"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:132
 #, c-format
 msgid "Party: %s"
 msgstr "Grupa: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:147
 #, c-format
 msgid "Guild: %s"
 msgstr "Gildia: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:161
 #, c-format
 msgid "Pvp rank: %u"
 msgstr "Miejsce w PvP: %u"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:173
 #, c-format
 msgid "Comment: %s"
 msgstr "Komentarz: %s"
@@ -1175,7 +1175,7 @@ msgstr "Wpisz do czatu"
 #: src/gui/windows/connectiondialog.cpp:48
 #: src/gui/windows/editserverdialog.cpp:78
 #: src/gui/windows/itemamountwindow.cpp:209
-#: src/gui/windows/npcpostdialog.cpp:69 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:69
 #: src/gui/windows/registerdialog.cpp:76 src/gui/windows/setup.cpp:90
 #: src/gui/windows/socialwindow.cpp:1231
 #: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:53
@@ -2395,7 +2395,7 @@ msgstr "Page down"
 #. TRANSLATORS: register dialog. button.
 #: src/gui/setupactiondata.h:1779 src/gui/setupactiondata.h:1868
 #: src/gui/widgets/tabs/setup_audio.cpp:159
-#: src/gui/widgets/tabs/setup_chat.cpp:176
+#: src/gui/widgets/tabs/setup_chat.cpp:180
 #: src/gui/widgets/tabs/setup_other.cpp:321
 #: src/gui/widgets/tabs/setup_visual.cpp:175
 #: src/gui/windows/charcreatedialog.cpp:107
@@ -2478,7 +2478,7 @@ msgstr "Emotki"
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupactiondata.h:1866 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:197
+#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
 msgid "Chat"
 msgstr "Czat"
 
@@ -2705,61 +2705,61 @@ msgstr "Pieniądze: %s"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:146
+#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
 msgid "black"
 msgstr "czarny"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:148
+#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
 msgid "red"
 msgstr "czerwony"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:150
+#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
 msgid "green"
 msgstr "zielony"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:152
+#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
 msgid "blue"
 msgstr "niebieski"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:154
+#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
 msgid "gold"
 msgstr "złoty"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:156
+#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
 msgid "yellow"
 msgstr "żółty"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:158
+#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
 msgid "pink"
 msgstr "różowy"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:160
+#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
 msgid "purple"
 msgstr "fioletowy"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:162
+#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
 msgid "grey"
 msgstr "szary"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:164
+#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
 msgid "brown"
 msgstr "brązowy"
 
@@ -3144,85 +3144,97 @@ msgstr "Wiadomości"
 msgid "Hide shop messages"
 msgstr "Ukryj wiadomości od sklepów"
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:124
+msgid "Show MVP messages"
+msgstr "Pokazuj wiadomości MVP"
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:125
+#: src/gui/widgets/tabs/setup_chat.cpp:129
 msgid "Tabs"
 msgstr "Zakładki"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:128
+#: src/gui/widgets/tabs/setup_chat.cpp:132
 msgid "Put all whispers in tabs"
 msgstr "Umieść wszystkie szepty w zakładkach"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:132
+#: src/gui/widgets/tabs/setup_chat.cpp:136
 msgid "Log magic messages in debug tab"
 msgstr "Loguj powiadomienia o magii w zakładce Debug"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:136
+#: src/gui/widgets/tabs/setup_chat.cpp:140
 msgid "Show server messages in debug tab"
 msgstr "Pokazuj wiadomości serwera w zakładce Debug"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:140
+#: src/gui/widgets/tabs/setup_chat.cpp:144
 msgid "Enable trade tab"
 msgstr "Włącz tab handlowy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:144
+#: src/gui/widgets/tabs/setup_chat.cpp:148
 msgid "Enable gm tab"
 msgstr "Aktywuj zakładkę GM"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:148
+#: src/gui/widgets/tabs/setup_chat.cpp:152
 msgid "Enable language tab"
 msgstr "Aktywuj zakładkę \"języki\""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:152
+#: src/gui/widgets/tabs/setup_chat.cpp:156
 msgid "Show all languages messages"
 msgstr "Pokaż wiadomości ze wszystkich języków"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:156
+#: src/gui/widgets/tabs/setup_chat.cpp:160
 msgid "Enable battle tab"
 msgstr "Włącz zakładkę bitewną"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:160
+#: src/gui/widgets/tabs/setup_chat.cpp:164
 msgid "Show battle events"
 msgstr "Pokazuj wydarzenia bitewne"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:164
+#: src/gui/widgets/tabs/setup_chat.cpp:168
 msgid "Resize chat tabs if need"
 msgstr "Jeśli potrzeba, zmień rozmiar zakładek czatu"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:169
+#: src/gui/widgets/tabs/setup_chat.cpp:173
 msgid "Time"
 msgstr "Czas"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:172
+#: src/gui/widgets/tabs/setup_chat.cpp:176
 msgid "Use local time"
 msgstr "Użyj lokalnego czasu"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:179
+#: src/gui/widgets/tabs/setup_chat.cpp:183
 msgid "Highlight words (separated by comma)"
 msgstr "Podświetlaj słowa (oddzielaj przecinkiem)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:183
+#: src/gui/widgets/tabs/setup_chat.cpp:187
 msgid "Globals ignore names (separated by comma)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:187
-msgid "Show MVP messages"
-msgstr "Pokazuj wiadomości MVP"
+#: src/gui/widgets/tabs/setup_chat.cpp:191
+#, fuzzy
+msgid "Show emotes button in chat"
+msgstr "Pokazuj wiadomości o podnoszeniu w czacie"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:195
+#, fuzzy
+msgid "Show motd server message on start"
+msgstr "Pokazuj wiadomości serwera w zakładce Debug"
 
 #: src/gui/widgets/tabs/setup_colors.cpp:46
 msgid "This is what the color looks like"
@@ -3410,7 +3422,7 @@ msgstr "Nazwa hosta SOCKS5"
 #. TRANSLATORS: chat color
 #. TRANSLATORS: inventory sort mode
 #: src/gui/widgets/tabs/setup_other.cpp:71
-#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:150
 #: src/gui/windows/inventorywindow.cpp:69
 msgid "default"
 msgstr "domyślnie"
@@ -5076,8 +5088,8 @@ msgstr "Nazwa:"
 #: src/gui/windows/charcreatedialog.cpp:75
 #: src/gui/windows/charcreatedialog.cpp:84
 #: src/gui/windows/charcreatedialog.cpp:101
-#: src/gui/windows/charcreatedialog.cpp:171
-#: src/gui/windows/charcreatedialog.cpp:181
+#: src/gui/windows/charcreatedialog.cpp:170
+#: src/gui/windows/charcreatedialog.cpp:180
 #: src/gui/windows/outfitwindow.cpp:58
 msgid ">"
 msgstr ">"
@@ -5088,8 +5100,8 @@ msgstr ">"
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:79
 #: src/gui/windows/charcreatedialog.cpp:86
-#: src/gui/windows/charcreatedialog.cpp:173
-#: src/gui/windows/charcreatedialog.cpp:183
+#: src/gui/windows/charcreatedialog.cpp:172
+#: src/gui/windows/charcreatedialog.cpp:182
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "<"
 msgstr "<"
@@ -5125,33 +5137,33 @@ msgstr "Kobieta"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:466
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Proszę wykorzystać %d punktów"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:174
 msgid "Race:"
 msgstr "Rasa:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:185
+#: src/gui/windows/charcreatedialog.cpp:184
 msgid "Look:"
 msgstr "Wygląd:"
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:359
 msgid "Your name needs to be at least 4 characters."
 msgstr "Twoje imię musi mieć co najmniej 4 znaki."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:456
 msgid "Character stats OK"
 msgstr "Statystyki postaci w porządku."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:472
 #, c-format
 msgid "Please remove %d points"
 msgstr "Proszę usunąć %d punktów"
@@ -5242,28 +5254,28 @@ msgid "Enter password:"
 msgstr "Wprowadź hasło:"
 
 #. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:166
+#: src/gui/windows/chatwindow.cpp:172
 msgid "rainbow 1"
 msgstr "tęczowy 1"
 
 #. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:168
+#: src/gui/windows/chatwindow.cpp:174
 msgid "rainbow 2"
 msgstr "tęczowy 2"
 
 #. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:170
+#: src/gui/windows/chatwindow.cpp:176
 msgid "rainbow 3"
 msgstr "tęczowy 3"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:694
+#: src/gui/windows/chatwindow.cpp:740
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "%s obecny/a. %d graczy online."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1103
+#: src/gui/windows/chatwindow.cpp:1154
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Szepczesz do %s: %s"
@@ -5886,17 +5898,17 @@ msgid "Add"
 msgstr "Dodaj"
 
 #. TRANSLATORS: label in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:58
+#: src/gui/windows/npcpostdialog.cpp:57
 msgid "To:"
 msgstr "Do:"
 
 #. TRANSLATORS: button in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:65
+#: src/gui/windows/npcpostdialog.cpp:64
 msgid "Send"
 msgstr "Wyślij"
 
 #. TRANSLATORS: npc post message error
-#: src/gui/windows/npcpostdialog.cpp:112
+#: src/gui/windows/npcpostdialog.cpp:111
 msgid "Failed to send as sender or letter invalid."
 msgstr "Nie powiodła się wysyłka jako nadawca, albo list jest nieprawidłowy."
 
@@ -6921,13 +6933,13 @@ msgid "Failed to delete character."
 msgstr "Nie udało się skasować postaci."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:87
+#: src/net/ea/chathandler.cpp:88
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr "Szept nie mógł zostać wysłany, %s jest offline."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:96
+#: src/net/ea/chathandler.cpp:97
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr "Szept nie mógł zostać wysłany, jesteś ignorowany/a przez %s."
diff --git a/po/pt.po b/po/pt.po
index c1c22b563..daed325e7 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-10-19 16:54+0300\n"
+"POT-Creation-Date: 2013-10-25 16:34+0300\n"
 "PO-Revision-Date: 2013-09-20 08:56+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (http://www.transifex.com/projects/p/manaplus/"
@@ -38,25 +38,25 @@ msgid "Visible on map"
 msgstr "Visivel no mapa"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:296
+#: src/being/being.cpp:294
 msgid "Human"
 msgstr "Humano"
 
-#: src/being/being.cpp:504
+#: src/being/being.cpp:502
 msgid "dodge"
 msgstr "desviou"
 
-#: src/being/being.cpp:504
+#: src/being/being.cpp:502
 msgid "miss"
 msgstr "errou"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1748 src/gui/windows/whoisonline.cpp:861
+#: src/being/being.cpp:1746 src/gui/windows/whoisonline.cpp:861
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1753 src/gui/windows/whoisonline.cpp:866
+#: src/being/being.cpp:1751 src/gui/windows/whoisonline.cpp:866
 msgid "I"
 msgstr "l"
 
@@ -529,31 +529,31 @@ msgstr "Bolha Flutuante"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:1106 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:58
+#: src/client.cpp:1109 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:58
 msgid "Setup"
 msgstr "Configurar"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1110 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1113 src/gui/widgets/tabs/setup_perfomance.cpp:50
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:1113 src/gui/widgets/tabs/setup_video.cpp:221
+#: src/client.cpp:1116 src/gui/widgets/tabs/setup_video.cpp:221
 msgid "Video"
 msgstr "Vídeo"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1116 src/gui/widgets/tabs/setup_theme.cpp:279
+#: src/client.cpp:1119 src/gui/widgets/tabs/setup_theme.cpp:279
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:1119 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1122 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:50
 msgid "Help"
 msgstr "Ajuda"
@@ -566,7 +566,7 @@ msgstr "Ajuda"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1123 src/gui/popups/popupmenu.cpp:618
+#: src/client.cpp:1126 src/gui/popups/popupmenu.cpp:618
 #: src/gui/windows/didyouknowwindow.cpp:78
 #: src/gui/windows/inventorywindow.cpp:252 src/gui/windows/npcdialog.cpp:71
 #: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:134
@@ -575,32 +575,32 @@ msgid "Close"
 msgstr "Fechar"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1242
+#: src/client.cpp:1245
 msgid "Connecting to server"
 msgstr "Conectando ao servidor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1287
+#: src/client.cpp:1290
 msgid "Logging in"
 msgstr "Efetuando login"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1328
+#: src/client.cpp:1331
 msgid "Entering game world"
 msgstr "Entrando no domínio do jogo"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1451
+#: src/client.cpp:1454
 msgid "Requesting characters"
 msgstr "Requisitando personagens"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1492
+#: src/client.cpp:1495
 msgid "Connecting to the game server"
 msgstr "Conectando ao servidor do jogo"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1506
+#: src/client.cpp:1509
 msgid "Changing game servers"
 msgstr "Mudando servidores do jogo"
 
@@ -615,10 +615,10 @@ msgstr "Mudando servidores do jogo"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1566 src/client.cpp:1577 src/client.cpp:1758
+#: src/client.cpp:1569 src/client.cpp:1580 src/client.cpp:1761
 #: src/gui/windows/changeemaildialog.cpp:167
 #: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:358
+#: src/gui/windows/charcreatedialog.cpp:357
 #: src/gui/windows/charselectdialog.cpp:297
 #: src/gui/windows/editserverdialog.cpp:217
 #: src/gui/windows/registerdialog.cpp:259
@@ -628,65 +628,65 @@ msgid "Error"
 msgstr "Erro"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1590
+#: src/client.cpp:1593
 msgid "Requesting registration details"
 msgstr "Requisitando detalhes do registro"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1630
+#: src/client.cpp:1633
 msgid "Password Change"
 msgstr "Mudar senha"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1632
+#: src/client.cpp:1635
 msgid "Password changed successfully!"
 msgstr "Senha modificada com sucesso!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1654
+#: src/client.cpp:1657
 msgid "Email Change"
 msgstr "Mudar email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1656
+#: src/client.cpp:1659
 msgid "Email changed successfully!"
 msgstr "Email modificado com sucesso!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1679
+#: src/client.cpp:1682
 msgid "Unregister Successful"
 msgstr "Registro cancelado com sucesso"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1681
+#: src/client.cpp:1684
 msgid "Farewell, come back any time..."
 msgstr "Tchau, volte sempre..."
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1953 src/client.cpp:1968 src/client.cpp:2011
-#: src/client.cpp:2027 src/client.cpp:2467 src/client.cpp:2475
+#: src/client.cpp:1956 src/client.cpp:1971 src/client.cpp:2014
+#: src/client.cpp:2030 src/client.cpp:2456 src/client.cpp:2464
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s não existe e não pode ser criado! Saindo."
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2167
+#: src/client.cpp:2170
 #, c-format
 msgid "Invalid update host: %s."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2208 src/client.cpp:2215
+#: src/client.cpp:2211 src/client.cpp:2218
 msgid "Error creating updates directory!"
 msgstr "Erro ao criar pasta de atualizações!"
 
-#: src/client.cpp:2237 src/client.cpp:2250
+#: src/client.cpp:2240 src/client.cpp:2253
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Erro: %s não existe e não pode se criado! Saindo."
 
 #. TRANSLATORS: error message question
-#: src/client.cpp:2915
+#: src/client.cpp:2904
 msgid "Do you want to open support page?"
 msgstr ""
 
@@ -945,25 +945,25 @@ msgid "Network Error"
 msgstr "Erro de conexão"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:132
 #, c-format
 msgid "Party: %s"
 msgstr "Grupo: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:147
 #, c-format
 msgid "Guild: %s"
 msgstr "Guilda: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:161
 #, c-format
 msgid "Pvp rank: %u"
 msgstr "Posição no PVP: %u"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:173
 #, c-format
 msgid "Comment: %s"
 msgstr "Comentário: %s"
@@ -1174,7 +1174,7 @@ msgstr "Adicionar nome ao chat"
 #: src/gui/windows/connectiondialog.cpp:48
 #: src/gui/windows/editserverdialog.cpp:78
 #: src/gui/windows/itemamountwindow.cpp:209
-#: src/gui/windows/npcpostdialog.cpp:69 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:69
 #: src/gui/windows/registerdialog.cpp:76 src/gui/windows/setup.cpp:90
 #: src/gui/windows/socialwindow.cpp:1231
 #: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:53
@@ -2394,7 +2394,7 @@ msgstr "Page down"
 #. TRANSLATORS: register dialog. button.
 #: src/gui/setupactiondata.h:1779 src/gui/setupactiondata.h:1868
 #: src/gui/widgets/tabs/setup_audio.cpp:159
-#: src/gui/widgets/tabs/setup_chat.cpp:176
+#: src/gui/widgets/tabs/setup_chat.cpp:180
 #: src/gui/widgets/tabs/setup_other.cpp:321
 #: src/gui/widgets/tabs/setup_visual.cpp:175
 #: src/gui/windows/charcreatedialog.cpp:107
@@ -2477,7 +2477,7 @@ msgstr "Emoções"
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupactiondata.h:1866 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:197
+#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
 msgid "Chat"
 msgstr "Chat"
 
@@ -2704,61 +2704,61 @@ msgstr "Dinheiro: %s"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:146
+#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
 msgid "black"
 msgstr "preto"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:148
+#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
 msgid "red"
 msgstr "vermelho"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:150
+#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
 msgid "green"
 msgstr "verde"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:152
+#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
 msgid "blue"
 msgstr "azul"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:154
+#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
 msgid "gold"
 msgstr "ouro"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:156
+#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
 msgid "yellow"
 msgstr "amarelo"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:158
+#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
 msgid "pink"
 msgstr "rosa"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:160
+#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
 msgid "purple"
 msgstr "roxo"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:162
+#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
 msgid "grey"
 msgstr "cinza"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:164
+#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
 msgid "brown"
 msgstr "marrom"
 
@@ -3143,85 +3143,97 @@ msgstr "Mensagens"
 msgid "Hide shop messages"
 msgstr "Esconder mensagens de loja"
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:124
+msgid "Show MVP messages"
+msgstr "Ver mensagens MVP"
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:125
+#: src/gui/widgets/tabs/setup_chat.cpp:129
 msgid "Tabs"
 msgstr "Abas"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:128
+#: src/gui/widgets/tabs/setup_chat.cpp:132
 msgid "Put all whispers in tabs"
 msgstr "Deixar as mensagens privadas em abas"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:132
+#: src/gui/widgets/tabs/setup_chat.cpp:136
 msgid "Log magic messages in debug tab"
 msgstr "Salvar comandos de feitiços na aba do Depurador"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:136
+#: src/gui/widgets/tabs/setup_chat.cpp:140
 msgid "Show server messages in debug tab"
 msgstr "Mostrar as mensagens do servidor na aba do Depurador"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:140
+#: src/gui/widgets/tabs/setup_chat.cpp:144
 msgid "Enable trade tab"
 msgstr "Habilitar aba de negociação"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:144
+#: src/gui/widgets/tabs/setup_chat.cpp:148
 msgid "Enable gm tab"
 msgstr "Habilitar aba de gm"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:148
+#: src/gui/widgets/tabs/setup_chat.cpp:152
 msgid "Enable language tab"
 msgstr "Habilitar aba de linguagem"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:152
+#: src/gui/widgets/tabs/setup_chat.cpp:156
 msgid "Show all languages messages"
 msgstr "Mostrar todas mensagens de linguagem"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:156
+#: src/gui/widgets/tabs/setup_chat.cpp:160
 msgid "Enable battle tab"
 msgstr "Habilitar aba de batalha"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:160
+#: src/gui/widgets/tabs/setup_chat.cpp:164
 msgid "Show battle events"
 msgstr "Mostrar eventos de batalha"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:164
+#: src/gui/widgets/tabs/setup_chat.cpp:168
 msgid "Resize chat tabs if need"
 msgstr "Redimensionar as abas de chat caso precisar"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:169
+#: src/gui/widgets/tabs/setup_chat.cpp:173
 msgid "Time"
 msgstr "Tempo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:172
+#: src/gui/widgets/tabs/setup_chat.cpp:176
 msgid "Use local time"
 msgstr "Usar hora local"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:179
+#: src/gui/widgets/tabs/setup_chat.cpp:183
 msgid "Highlight words (separated by comma)"
 msgstr "Palavras Destacadas (separadas por vírgulas)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:183
+#: src/gui/widgets/tabs/setup_chat.cpp:187
 msgid "Globals ignore names (separated by comma)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:187
-msgid "Show MVP messages"
-msgstr "Ver mensagens MVP"
+#: src/gui/widgets/tabs/setup_chat.cpp:191
+#, fuzzy
+msgid "Show emotes button in chat"
+msgstr "Mostar notificações de coleta no chat"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:195
+#, fuzzy
+msgid "Show motd server message on start"
+msgstr "Mostrar as mensagens do servidor na aba do Depurador"
 
 #: src/gui/widgets/tabs/setup_colors.cpp:46
 msgid "This is what the color looks like"
@@ -3409,7 +3421,7 @@ msgstr "SOCK5 hostname"
 #. TRANSLATORS: chat color
 #. TRANSLATORS: inventory sort mode
 #: src/gui/widgets/tabs/setup_other.cpp:71
-#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:150
 #: src/gui/windows/inventorywindow.cpp:69
 msgid "default"
 msgstr "padrão"
@@ -5075,8 +5087,8 @@ msgstr "Nome:"
 #: src/gui/windows/charcreatedialog.cpp:75
 #: src/gui/windows/charcreatedialog.cpp:84
 #: src/gui/windows/charcreatedialog.cpp:101
-#: src/gui/windows/charcreatedialog.cpp:171
-#: src/gui/windows/charcreatedialog.cpp:181
+#: src/gui/windows/charcreatedialog.cpp:170
+#: src/gui/windows/charcreatedialog.cpp:180
 #: src/gui/windows/outfitwindow.cpp:58
 msgid ">"
 msgstr ">"
@@ -5087,8 +5099,8 @@ msgstr ">"
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:79
 #: src/gui/windows/charcreatedialog.cpp:86
-#: src/gui/windows/charcreatedialog.cpp:173
-#: src/gui/windows/charcreatedialog.cpp:183
+#: src/gui/windows/charcreatedialog.cpp:172
+#: src/gui/windows/charcreatedialog.cpp:182
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "<"
 msgstr "<"
@@ -5124,33 +5136,33 @@ msgstr "Mulher"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:466
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Por favor distribua %d pontos"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:174
 msgid "Race:"
 msgstr "Corrida:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:185
+#: src/gui/windows/charcreatedialog.cpp:184
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:359
 msgid "Your name needs to be at least 4 characters."
 msgstr "Seu nome deve ter pelo menos 4 caracteres."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:456
 msgid "Character stats OK"
 msgstr "Atributos do personagem OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:472
 #, c-format
 msgid "Please remove %d points"
 msgstr "Por favor remova %d pontos"
@@ -5241,28 +5253,28 @@ msgid "Enter password:"
 msgstr "Entre com a senha"
 
 #. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:166
+#: src/gui/windows/chatwindow.cpp:172
 msgid "rainbow 1"
 msgstr "arco-íris 1"
 
 #. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:168
+#: src/gui/windows/chatwindow.cpp:174
 msgid "rainbow 2"
 msgstr "arco-íris 2"
 
 #. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:170
+#: src/gui/windows/chatwindow.cpp:176
 msgid "rainbow 3"
 msgstr "arco-íris 3"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:694
+#: src/gui/windows/chatwindow.cpp:740
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presentes: %s; %d jogadores estão presentes."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1103
+#: src/gui/windows/chatwindow.cpp:1154
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Enviando MP para %s: %s"
@@ -5883,17 +5895,17 @@ msgid "Add"
 msgstr "Adicionar"
 
 #. TRANSLATORS: label in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:58
+#: src/gui/windows/npcpostdialog.cpp:57
 msgid "To:"
 msgstr "Para:"
 
 #. TRANSLATORS: button in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:65
+#: src/gui/windows/npcpostdialog.cpp:64
 msgid "Send"
 msgstr "Enviar"
 
 #. TRANSLATORS: npc post message error
-#: src/gui/windows/npcpostdialog.cpp:112
+#: src/gui/windows/npcpostdialog.cpp:111
 msgid "Failed to send as sender or letter invalid."
 msgstr "Falha ao enviar como remetente ou a carta é inválida."
 
@@ -6922,13 +6934,13 @@ msgid "Failed to delete character."
 msgstr "Falha ao deletar personagem."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:87
+#: src/net/ea/chathandler.cpp:88
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr "Mensagem privada não pode ser enviada, %s está offline."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:96
+#: src/net/ea/chathandler.cpp:97
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr "Mensagem privada não pode ser enviada, ignorado por %s."
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 0b34af7ca..eda4ee13f 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-10-19 16:54+0300\n"
+"POT-Creation-Date: 2013-10-25 16:34+0300\n"
 "PO-Revision-Date: 2013-09-20 08:56+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
@@ -44,25 +44,25 @@ msgid "Visible on map"
 msgstr "Mapa visivel "
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:296
+#: src/being/being.cpp:294
 msgid "Human"
 msgstr "Humano"
 
-#: src/being/being.cpp:504
+#: src/being/being.cpp:502
 msgid "dodge"
 msgstr "desviou"
 
-#: src/being/being.cpp:504
+#: src/being/being.cpp:502
 msgid "miss"
 msgstr "errou"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1748 src/gui/windows/whoisonline.cpp:861
+#: src/being/being.cpp:1746 src/gui/windows/whoisonline.cpp:861
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1753 src/gui/windows/whoisonline.cpp:866
+#: src/being/being.cpp:1751 src/gui/windows/whoisonline.cpp:866
 msgid "I"
 msgstr "I"
 
@@ -535,31 +535,31 @@ msgstr "Bolha Flutuante"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:1106 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:58
+#: src/client.cpp:1109 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:58
 msgid "Setup"
 msgstr "Configurar"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1110 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1113 src/gui/widgets/tabs/setup_perfomance.cpp:50
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:1113 src/gui/widgets/tabs/setup_video.cpp:221
+#: src/client.cpp:1116 src/gui/widgets/tabs/setup_video.cpp:221
 msgid "Video"
 msgstr "Vídeo"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1116 src/gui/widgets/tabs/setup_theme.cpp:279
+#: src/client.cpp:1119 src/gui/widgets/tabs/setup_theme.cpp:279
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:1119 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1122 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:50
 msgid "Help"
 msgstr "Ajuda"
@@ -572,7 +572,7 @@ msgstr "Ajuda"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1123 src/gui/popups/popupmenu.cpp:618
+#: src/client.cpp:1126 src/gui/popups/popupmenu.cpp:618
 #: src/gui/windows/didyouknowwindow.cpp:78
 #: src/gui/windows/inventorywindow.cpp:252 src/gui/windows/npcdialog.cpp:71
 #: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:134
@@ -581,32 +581,32 @@ msgid "Close"
 msgstr "Fechar"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1242
+#: src/client.cpp:1245
 msgid "Connecting to server"
 msgstr "Conectando-se ao servidor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1287
+#: src/client.cpp:1290
 msgid "Logging in"
 msgstr "Fazendo login"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1328
+#: src/client.cpp:1331
 msgid "Entering game world"
 msgstr "Entrando no mundo do jogo"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1451
+#: src/client.cpp:1454
 msgid "Requesting characters"
 msgstr "Requerindo personagens"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1492
+#: src/client.cpp:1495
 msgid "Connecting to the game server"
 msgstr "Conectando ao servidor do jogo"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1506
+#: src/client.cpp:1509
 msgid "Changing game servers"
 msgstr "Mudando de servidor do jogo"
 
@@ -621,10 +621,10 @@ msgstr "Mudando de servidor do jogo"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1566 src/client.cpp:1577 src/client.cpp:1758
+#: src/client.cpp:1569 src/client.cpp:1580 src/client.cpp:1761
 #: src/gui/windows/changeemaildialog.cpp:167
 #: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:358
+#: src/gui/windows/charcreatedialog.cpp:357
 #: src/gui/windows/charselectdialog.cpp:297
 #: src/gui/windows/editserverdialog.cpp:217
 #: src/gui/windows/registerdialog.cpp:259
@@ -634,65 +634,65 @@ msgid "Error"
 msgstr "Erro"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1590
+#: src/client.cpp:1593
 msgid "Requesting registration details"
 msgstr "Requisitando detalhes do registro"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1630
+#: src/client.cpp:1633
 msgid "Password Change"
 msgstr "Mudar senha"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1632
+#: src/client.cpp:1635
 msgid "Password changed successfully!"
 msgstr "Senha modificada com sucesso!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1654
+#: src/client.cpp:1657
 msgid "Email Change"
 msgstr "Mudar email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1656
+#: src/client.cpp:1659
 msgid "Email changed successfully!"
 msgstr "Email modificado com sucesso!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1679
+#: src/client.cpp:1682
 msgid "Unregister Successful"
 msgstr "Registro cancelado com sucesso"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1681
+#: src/client.cpp:1684
 msgid "Farewell, come back any time..."
 msgstr "Adeus, volte sempre..."
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1953 src/client.cpp:1968 src/client.cpp:2011
-#: src/client.cpp:2027 src/client.cpp:2467 src/client.cpp:2475
+#: src/client.cpp:1956 src/client.cpp:1971 src/client.cpp:2014
+#: src/client.cpp:2030 src/client.cpp:2456 src/client.cpp:2464
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s não existe e não pode ser criado! Saindo."
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2167
+#: src/client.cpp:2170
 #, c-format
 msgid "Invalid update host: %s."
 msgstr "Host de atualização inválido: %s."
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2208 src/client.cpp:2215
+#: src/client.cpp:2211 src/client.cpp:2218
 msgid "Error creating updates directory!"
 msgstr "Erro ao criar pasta de atualizações!"
 
-#: src/client.cpp:2237 src/client.cpp:2250
+#: src/client.cpp:2240 src/client.cpp:2253
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Erro: %s não existe e não pode se criado! Saindo."
 
 #. TRANSLATORS: error message question
-#: src/client.cpp:2915
+#: src/client.cpp:2904
 msgid "Do you want to open support page?"
 msgstr "Você quer abrir a página de suporte?"
 
@@ -951,25 +951,25 @@ msgid "Network Error"
 msgstr "Erro de conexão"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:132
 #, c-format
 msgid "Party: %s"
 msgstr "Grupo: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:147
 #, c-format
 msgid "Guild: %s"
 msgstr "Guilda: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:161
 #, c-format
 msgid "Pvp rank: %u"
 msgstr "Posição no PVP: %u"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:173
 #, c-format
 msgid "Comment: %s"
 msgstr "Comentário: %s"
@@ -1180,7 +1180,7 @@ msgstr "Adicionar nome ao chat"
 #: src/gui/windows/connectiondialog.cpp:48
 #: src/gui/windows/editserverdialog.cpp:78
 #: src/gui/windows/itemamountwindow.cpp:209
-#: src/gui/windows/npcpostdialog.cpp:69 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:69
 #: src/gui/windows/registerdialog.cpp:76 src/gui/windows/setup.cpp:90
 #: src/gui/windows/socialwindow.cpp:1231
 #: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:53
@@ -2400,7 +2400,7 @@ msgstr "Page down"
 #. TRANSLATORS: register dialog. button.
 #: src/gui/setupactiondata.h:1779 src/gui/setupactiondata.h:1868
 #: src/gui/widgets/tabs/setup_audio.cpp:159
-#: src/gui/widgets/tabs/setup_chat.cpp:176
+#: src/gui/widgets/tabs/setup_chat.cpp:180
 #: src/gui/widgets/tabs/setup_other.cpp:321
 #: src/gui/widgets/tabs/setup_visual.cpp:175
 #: src/gui/windows/charcreatedialog.cpp:107
@@ -2483,7 +2483,7 @@ msgstr "Emoções"
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupactiondata.h:1866 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:197
+#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
 msgid "Chat"
 msgstr "Chat"
 
@@ -2710,61 +2710,61 @@ msgstr "Dinheiro: %s"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:146
+#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
 msgid "black"
 msgstr "preto"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:148
+#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
 msgid "red"
 msgstr "vermelho"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:150
+#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
 msgid "green"
 msgstr "verde"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:152
+#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
 msgid "blue"
 msgstr "azul"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:154
+#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
 msgid "gold"
 msgstr "ouro"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:156
+#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
 msgid "yellow"
 msgstr "amarelo"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:158
+#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
 msgid "pink"
 msgstr "rosa"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:160
+#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
 msgid "purple"
 msgstr "roxo"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:162
+#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
 msgid "grey"
 msgstr "cinza"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:164
+#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
 msgid "brown"
 msgstr "marrom"
 
@@ -3149,85 +3149,97 @@ msgstr "Mensagens"
 msgid "Hide shop messages"
 msgstr "Esconder mensagens de loja"
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:124
+msgid "Show MVP messages"
+msgstr "Ver Mensagens MVP"
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:125
+#: src/gui/widgets/tabs/setup_chat.cpp:129
 msgid "Tabs"
 msgstr "Abas"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:128
+#: src/gui/widgets/tabs/setup_chat.cpp:132
 msgid "Put all whispers in tabs"
 msgstr "Deixar as mensagens privadas em abas"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:132
+#: src/gui/widgets/tabs/setup_chat.cpp:136
 msgid "Log magic messages in debug tab"
 msgstr "Salvar comandos de feitiços na aba do Depurador"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:136
+#: src/gui/widgets/tabs/setup_chat.cpp:140
 msgid "Show server messages in debug tab"
 msgstr "Mostrar as mensagens do servidor na aba do Depurador"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:140
+#: src/gui/widgets/tabs/setup_chat.cpp:144
 msgid "Enable trade tab"
 msgstr "Habilitar aba de negociação"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:144
+#: src/gui/widgets/tabs/setup_chat.cpp:148
 msgid "Enable gm tab"
 msgstr "Habilitar aba de gm"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:148
+#: src/gui/widgets/tabs/setup_chat.cpp:152
 msgid "Enable language tab"
 msgstr "Habilitar aba de idiomas"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:152
+#: src/gui/widgets/tabs/setup_chat.cpp:156
 msgid "Show all languages messages"
 msgstr "Mostrar mensagens de todos idiomas"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:156
+#: src/gui/widgets/tabs/setup_chat.cpp:160
 msgid "Enable battle tab"
 msgstr "Habilitar aba de batalha"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:160
+#: src/gui/widgets/tabs/setup_chat.cpp:164
 msgid "Show battle events"
 msgstr "Mostrar eventos de batalha"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:164
+#: src/gui/widgets/tabs/setup_chat.cpp:168
 msgid "Resize chat tabs if need"
 msgstr "Redimensionar aba de chat caso precisar"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:169
+#: src/gui/widgets/tabs/setup_chat.cpp:173
 msgid "Time"
 msgstr "Tempo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:172
+#: src/gui/widgets/tabs/setup_chat.cpp:176
 msgid "Use local time"
 msgstr "Usar tempo local"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:179
+#: src/gui/widgets/tabs/setup_chat.cpp:183
 msgid "Highlight words (separated by comma)"
 msgstr "Palavras destacadas (separadas em vírgulas)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:183
+#: src/gui/widgets/tabs/setup_chat.cpp:187
 msgid "Globals ignore names (separated by comma)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:187
-msgid "Show MVP messages"
-msgstr "Ver Mensagens MVP"
+#: src/gui/widgets/tabs/setup_chat.cpp:191
+#, fuzzy
+msgid "Show emotes button in chat"
+msgstr "Mostrar notificações de coleta no bate-papo"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:195
+#, fuzzy
+msgid "Show motd server message on start"
+msgstr "Mostrar as mensagens do servidor na aba do Depurador"
 
 #: src/gui/widgets/tabs/setup_colors.cpp:46
 msgid "This is what the color looks like"
@@ -3415,7 +3427,7 @@ msgstr "SOCK5 hostname"
 #. TRANSLATORS: chat color
 #. TRANSLATORS: inventory sort mode
 #: src/gui/widgets/tabs/setup_other.cpp:71
-#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:150
 #: src/gui/windows/inventorywindow.cpp:69
 msgid "default"
 msgstr "padrão"
@@ -5082,8 +5094,8 @@ msgstr "Nome:"
 #: src/gui/windows/charcreatedialog.cpp:75
 #: src/gui/windows/charcreatedialog.cpp:84
 #: src/gui/windows/charcreatedialog.cpp:101
-#: src/gui/windows/charcreatedialog.cpp:171
-#: src/gui/windows/charcreatedialog.cpp:181
+#: src/gui/windows/charcreatedialog.cpp:170
+#: src/gui/windows/charcreatedialog.cpp:180
 #: src/gui/windows/outfitwindow.cpp:58
 msgid ">"
 msgstr ">"
@@ -5094,8 +5106,8 @@ msgstr ">"
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:79
 #: src/gui/windows/charcreatedialog.cpp:86
-#: src/gui/windows/charcreatedialog.cpp:173
-#: src/gui/windows/charcreatedialog.cpp:183
+#: src/gui/windows/charcreatedialog.cpp:172
+#: src/gui/windows/charcreatedialog.cpp:182
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "<"
 msgstr "<"
@@ -5131,33 +5143,33 @@ msgstr "Mulher"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:466
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Por favor distribua %d pontos"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:174
 msgid "Race:"
 msgstr "Corrida:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:185
+#: src/gui/windows/charcreatedialog.cpp:184
 msgid "Look:"
 msgstr "Aparência:"
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:359
 msgid "Your name needs to be at least 4 characters."
 msgstr "Seu nome deve ter pelo menos 4 caracteres."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:456
 msgid "Character stats OK"
 msgstr "Atributos do personagem OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:472
 #, c-format
 msgid "Please remove %d points"
 msgstr "Por favor remova %d pontos"
@@ -5248,28 +5260,28 @@ msgid "Enter password:"
 msgstr "Entre com a senha:"
 
 #. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:166
+#: src/gui/windows/chatwindow.cpp:172
 msgid "rainbow 1"
 msgstr "arco-íris 1"
 
 #. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:168
+#: src/gui/windows/chatwindow.cpp:174
 msgid "rainbow 2"
 msgstr "arco-íris 2"
 
 #. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:170
+#: src/gui/windows/chatwindow.cpp:176
 msgid "rainbow 3"
 msgstr "arco-íris 3"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:694
+#: src/gui/windows/chatwindow.cpp:740
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presentes: %s; %d jogadores estão presentes."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1103
+#: src/gui/windows/chatwindow.cpp:1154
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Enviando MP para %s: %s"
@@ -5890,17 +5902,17 @@ msgid "Add"
 msgstr "Adicionar"
 
 #. TRANSLATORS: label in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:58
+#: src/gui/windows/npcpostdialog.cpp:57
 msgid "To:"
 msgstr "Para:"
 
 #. TRANSLATORS: button in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:65
+#: src/gui/windows/npcpostdialog.cpp:64
 msgid "Send"
 msgstr "Enviar"
 
 #. TRANSLATORS: npc post message error
-#: src/gui/windows/npcpostdialog.cpp:112
+#: src/gui/windows/npcpostdialog.cpp:111
 msgid "Failed to send as sender or letter invalid."
 msgstr "Falha ao enviar como remetente ou a carta é inválida."
 
@@ -6928,13 +6940,13 @@ msgid "Failed to delete character."
 msgstr "Falha ao deletar personagem."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:87
+#: src/net/ea/chathandler.cpp:88
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr "Mensagem privada não pode ser enviada, %s está offline."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:96
+#: src/net/ea/chathandler.cpp:97
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr "Mensagem privada não pode ser enviada, ignorado por %s."
diff --git a/po/ru.po b/po/ru.po
index 8df996fbf..904eb5fae 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-10-19 16:54+0300\n"
+"POT-Creation-Date: 2013-10-25 16:34+0300\n"
 "PO-Revision-Date: 2013-09-20 11:00+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/manaplus/"
@@ -42,25 +42,25 @@ msgid "Visible on map"
 msgstr "Видимые на карте"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:296
+#: src/being/being.cpp:294
 msgid "Human"
 msgstr "Человек"
 
-#: src/being/being.cpp:504
+#: src/being/being.cpp:502
 msgid "dodge"
 msgstr "уворот"
 
-#: src/being/being.cpp:504
+#: src/being/being.cpp:502
 msgid "miss"
 msgstr "промах"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1748 src/gui/windows/whoisonline.cpp:861
+#: src/being/being.cpp:1746 src/gui/windows/whoisonline.cpp:861
 msgid "A"
 msgstr "О"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1753 src/gui/windows/whoisonline.cpp:866
+#: src/being/being.cpp:1751 src/gui/windows/whoisonline.cpp:866
 msgid "I"
 msgstr "Б"
 
@@ -534,31 +534,31 @@ msgstr "Плавающий пузырек"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:1106 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:58
+#: src/client.cpp:1109 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:58
 msgid "Setup"
 msgstr "Настройка"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1110 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1113 src/gui/widgets/tabs/setup_perfomance.cpp:50
 msgid "Performance"
 msgstr "Производительность"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:1113 src/gui/widgets/tabs/setup_video.cpp:221
+#: src/client.cpp:1116 src/gui/widgets/tabs/setup_video.cpp:221
 msgid "Video"
 msgstr "Видео"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1116 src/gui/widgets/tabs/setup_theme.cpp:279
+#: src/client.cpp:1119 src/gui/widgets/tabs/setup_theme.cpp:279
 msgid "Theme"
 msgstr "Тема"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:1119 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1122 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:50
 msgid "Help"
 msgstr "Помощь"
@@ -571,7 +571,7 @@ msgstr "Помощь"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1123 src/gui/popups/popupmenu.cpp:618
+#: src/client.cpp:1126 src/gui/popups/popupmenu.cpp:618
 #: src/gui/windows/didyouknowwindow.cpp:78
 #: src/gui/windows/inventorywindow.cpp:252 src/gui/windows/npcdialog.cpp:71
 #: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:134
@@ -580,32 +580,32 @@ msgid "Close"
 msgstr "Закрыть"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1242
+#: src/client.cpp:1245
 msgid "Connecting to server"
 msgstr "Идет подключение к серверу..."
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1287
+#: src/client.cpp:1290
 msgid "Logging in"
 msgstr "Авторизация"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1328
+#: src/client.cpp:1331
 msgid "Entering game world"
 msgstr "Входим в игровой мир"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1451
+#: src/client.cpp:1454
 msgid "Requesting characters"
 msgstr "Получение списка персонажей"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1492
+#: src/client.cpp:1495
 msgid "Connecting to the game server"
 msgstr "Подключение к игровому серверу"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1506
+#: src/client.cpp:1509
 msgid "Changing game servers"
 msgstr "Смена игрового сервера"
 
@@ -620,10 +620,10 @@ msgstr "Смена игрового сервера"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1566 src/client.cpp:1577 src/client.cpp:1758
+#: src/client.cpp:1569 src/client.cpp:1580 src/client.cpp:1761
 #: src/gui/windows/changeemaildialog.cpp:167
 #: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:358
+#: src/gui/windows/charcreatedialog.cpp:357
 #: src/gui/windows/charselectdialog.cpp:297
 #: src/gui/windows/editserverdialog.cpp:217
 #: src/gui/windows/registerdialog.cpp:259
@@ -633,65 +633,65 @@ msgid "Error"
 msgstr "Ошибка"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1590
+#: src/client.cpp:1593
 msgid "Requesting registration details"
 msgstr "Запрос регистрационных данных"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1630
+#: src/client.cpp:1633
 msgid "Password Change"
 msgstr "Изменить Пароль"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1632
+#: src/client.cpp:1635
 msgid "Password changed successfully!"
 msgstr "Пароль изменен!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1654
+#: src/client.cpp:1657
 msgid "Email Change"
 msgstr "Сменить Email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1656
+#: src/client.cpp:1659
 msgid "Email changed successfully!"
 msgstr "Email изменен!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1679
+#: src/client.cpp:1682
 msgid "Unregister Successful"
 msgstr "Регистрация удалена"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1681
+#: src/client.cpp:1684
 msgid "Farewell, come back any time..."
 msgstr "Хорошо, возвращайтесь в любое время..."
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1953 src/client.cpp:1968 src/client.cpp:2011
-#: src/client.cpp:2027 src/client.cpp:2467 src/client.cpp:2475
+#: src/client.cpp:1956 src/client.cpp:1971 src/client.cpp:2014
+#: src/client.cpp:2030 src/client.cpp:2456 src/client.cpp:2464
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s не существует, и не может быть создано! Выход."
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2167
+#: src/client.cpp:2170
 #, c-format
 msgid "Invalid update host: %s."
 msgstr "Некорректный сервер обновленмй: %s."
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2208 src/client.cpp:2215
+#: src/client.cpp:2211 src/client.cpp:2218
 msgid "Error creating updates directory!"
 msgstr "Ошибка создания директории для обновлений!"
 
-#: src/client.cpp:2237 src/client.cpp:2250
+#: src/client.cpp:2240 src/client.cpp:2253
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Ошибка: %s не существует, и не может быть создан! Выход."
 
 #. TRANSLATORS: error message question
-#: src/client.cpp:2915
+#: src/client.cpp:2904
 msgid "Do you want to open support page?"
 msgstr "Открыть страницу поддержки?"
 
@@ -951,25 +951,25 @@ msgid "Network Error"
 msgstr "Ошибка сети"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:132
 #, c-format
 msgid "Party: %s"
 msgstr "Группа: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:147
 #, c-format
 msgid "Guild: %s"
 msgstr "Гильдия: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:161
 #, c-format
 msgid "Pvp rank: %u"
 msgstr "PvP ранг: %u"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:173
 #, c-format
 msgid "Comment: %s"
 msgstr "Комментарий: %s"
@@ -1180,7 +1180,7 @@ msgstr "Добавить имя в чат"
 #: src/gui/windows/connectiondialog.cpp:48
 #: src/gui/windows/editserverdialog.cpp:78
 #: src/gui/windows/itemamountwindow.cpp:209
-#: src/gui/windows/npcpostdialog.cpp:69 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:69
 #: src/gui/windows/registerdialog.cpp:76 src/gui/windows/setup.cpp:90
 #: src/gui/windows/socialwindow.cpp:1231
 #: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:53
@@ -2400,7 +2400,7 @@ msgstr "Страница вниз"
 #. TRANSLATORS: register dialog. button.
 #: src/gui/setupactiondata.h:1779 src/gui/setupactiondata.h:1868
 #: src/gui/widgets/tabs/setup_audio.cpp:159
-#: src/gui/widgets/tabs/setup_chat.cpp:176
+#: src/gui/widgets/tabs/setup_chat.cpp:180
 #: src/gui/widgets/tabs/setup_other.cpp:321
 #: src/gui/widgets/tabs/setup_visual.cpp:175
 #: src/gui/windows/charcreatedialog.cpp:107
@@ -2483,7 +2483,7 @@ msgstr "Смайлы"
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupactiondata.h:1866 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:197
+#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
 msgid "Chat"
 msgstr "Чат"
 
@@ -2710,61 +2710,61 @@ msgstr "Деньги: %s"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:146
+#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
 msgid "black"
 msgstr "черный"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:148
+#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
 msgid "red"
 msgstr "красный"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:150
+#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
 msgid "green"
 msgstr "зеленый"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:152
+#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
 msgid "blue"
 msgstr "синий"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:154
+#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
 msgid "gold"
 msgstr "золотой"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:156
+#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
 msgid "yellow"
 msgstr "желтый"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:158
+#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
 msgid "pink"
 msgstr "розовый"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:160
+#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
 msgid "purple"
 msgstr "фиолетовый"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:162
+#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
 msgid "grey"
 msgstr "серый"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:164
+#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
 msgid "brown"
 msgstr "коричневый"
 
@@ -3149,85 +3149,97 @@ msgstr "Сообщения"
 msgid "Hide shop messages"
 msgstr "Скрыть сообщения магазина"
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:124
+msgid "Show MVP messages"
+msgstr "Показывать MVP сообщения"
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:125
+#: src/gui/widgets/tabs/setup_chat.cpp:129
 msgid "Tabs"
 msgstr "Страницы"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:128
+#: src/gui/widgets/tabs/setup_chat.cpp:132
 msgid "Put all whispers in tabs"
 msgstr "Личные сообщения во вкладках"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:132
+#: src/gui/widgets/tabs/setup_chat.cpp:136
 msgid "Log magic messages in debug tab"
 msgstr "Оставлять сообщения магии на вкладке отладки"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:136
+#: src/gui/widgets/tabs/setup_chat.cpp:140
 msgid "Show server messages in debug tab"
 msgstr "Показывать сообщения сервера на вкладке отладки"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:140
+#: src/gui/widgets/tabs/setup_chat.cpp:144
 msgid "Enable trade tab"
 msgstr "Включить вкладки торговли"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:144
+#: src/gui/widgets/tabs/setup_chat.cpp:148
 msgid "Enable gm tab"
 msgstr "Включить страницу чата для гм"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:148
+#: src/gui/widgets/tabs/setup_chat.cpp:152
 msgid "Enable language tab"
 msgstr "Включить в чате закладку для языка"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:152
+#: src/gui/widgets/tabs/setup_chat.cpp:156
 msgid "Show all languages messages"
 msgstr "Показывать сообщения на всех языках"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:156
+#: src/gui/widgets/tabs/setup_chat.cpp:160
 msgid "Enable battle tab"
 msgstr "Включить вкладку боя"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:160
+#: src/gui/widgets/tabs/setup_chat.cpp:164
 msgid "Show battle events"
 msgstr "Показать сообщения боя"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:164
+#: src/gui/widgets/tabs/setup_chat.cpp:168
 msgid "Resize chat tabs if need"
 msgstr "Подгонять размер чата"
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:169
+#: src/gui/widgets/tabs/setup_chat.cpp:173
 msgid "Time"
 msgstr "Время"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:172
+#: src/gui/widgets/tabs/setup_chat.cpp:176
 msgid "Use local time"
 msgstr "Использовать местное время"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:179
+#: src/gui/widgets/tabs/setup_chat.cpp:183
 msgid "Highlight words (separated by comma)"
 msgstr "Подсвечиваемые слова (разделенные запятыми)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:183
+#: src/gui/widgets/tabs/setup_chat.cpp:187
 msgid "Globals ignore names (separated by comma)"
 msgstr "Игнорировать глобальные сообщения с именами (разделенные запятой)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:187
-msgid "Show MVP messages"
-msgstr "Показывать MVP сообщения"
+#: src/gui/widgets/tabs/setup_chat.cpp:191
+#, fuzzy
+msgid "Show emotes button in chat"
+msgstr "Показывать в чате сообщения о поднятых предметах"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:195
+#, fuzzy
+msgid "Show motd server message on start"
+msgstr "Показывать сообщения сервера на вкладке отладки"
 
 #: src/gui/widgets/tabs/setup_colors.cpp:46
 msgid "This is what the color looks like"
@@ -3415,7 +3427,7 @@ msgstr "SOCKS5 хост"
 #. TRANSLATORS: chat color
 #. TRANSLATORS: inventory sort mode
 #: src/gui/widgets/tabs/setup_other.cpp:71
-#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:150
 #: src/gui/windows/inventorywindow.cpp:69
 msgid "default"
 msgstr "По умолчанию"
@@ -5090,8 +5102,8 @@ msgstr "Имя:"
 #: src/gui/windows/charcreatedialog.cpp:75
 #: src/gui/windows/charcreatedialog.cpp:84
 #: src/gui/windows/charcreatedialog.cpp:101
-#: src/gui/windows/charcreatedialog.cpp:171
-#: src/gui/windows/charcreatedialog.cpp:181
+#: src/gui/windows/charcreatedialog.cpp:170
+#: src/gui/windows/charcreatedialog.cpp:180
 #: src/gui/windows/outfitwindow.cpp:58
 msgid ">"
 msgstr ">"
@@ -5102,8 +5114,8 @@ msgstr ">"
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:79
 #: src/gui/windows/charcreatedialog.cpp:86
-#: src/gui/windows/charcreatedialog.cpp:173
-#: src/gui/windows/charcreatedialog.cpp:183
+#: src/gui/windows/charcreatedialog.cpp:172
+#: src/gui/windows/charcreatedialog.cpp:182
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "<"
 msgstr "<"
@@ -5139,33 +5151,33 @@ msgstr "Женщина"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:466
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Распределите очки (%d)"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:174
 msgid "Race:"
 msgstr "Раса:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:185
+#: src/gui/windows/charcreatedialog.cpp:184
 msgid "Look:"
 msgstr "Внешность:"
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:359
 msgid "Your name needs to be at least 4 characters."
 msgstr "Имя должно содержать не менее четырех символов."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:456
 msgid "Character stats OK"
 msgstr "Данные персонажа в порядке"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:472
 #, c-format
 msgid "Please remove %d points"
 msgstr "Снимите очки (%d)"
@@ -5256,28 +5268,28 @@ msgid "Enter password:"
 msgstr "Введите пароль:"
 
 #. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:166
+#: src/gui/windows/chatwindow.cpp:172
 msgid "rainbow 1"
 msgstr "радуга 1"
 
 #. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:168
+#: src/gui/windows/chatwindow.cpp:174
 msgid "rainbow 2"
 msgstr "радуга 2"
 
 #. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:170
+#: src/gui/windows/chatwindow.cpp:176
 msgid "rainbow 3"
 msgstr "радуга 3"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:694
+#: src/gui/windows/chatwindow.cpp:740
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Присутствуют: %s; Всего %d игроков."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1103
+#: src/gui/windows/chatwindow.cpp:1154
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Вы прошептали %s: %s"
@@ -5900,17 +5912,17 @@ msgid "Add"
 msgstr "Добавить"
 
 #. TRANSLATORS: label in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:58
+#: src/gui/windows/npcpostdialog.cpp:57
 msgid "To:"
 msgstr "Для:"
 
 #. TRANSLATORS: button in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:65
+#: src/gui/windows/npcpostdialog.cpp:64
 msgid "Send"
 msgstr "Отправить"
 
 #. TRANSLATORS: npc post message error
-#: src/gui/windows/npcpostdialog.cpp:112
+#: src/gui/windows/npcpostdialog.cpp:111
 msgid "Failed to send as sender or letter invalid."
 msgstr "Невозможно послать ибо отправитель либо сообщение неверны."
 
@@ -6939,13 +6951,13 @@ msgid "Failed to delete character."
 msgstr "Невозможно удалить персонажа."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:87
+#: src/net/ea/chathandler.cpp:88
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr "Сообщение не может быть отправлено, %s оффлайн."
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:96
+#: src/net/ea/chathandler.cpp:97
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr "Приватное сообщение не может быть послано: %s игнорирует его."
diff --git a/po/tr.po b/po/tr.po
index 20c0eb7af..5df9f2498 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-10-19 16:54+0300\n"
+"POT-Creation-Date: 2013-10-25 16:34+0300\n"
 "PO-Revision-Date: 2013-09-20 08:56+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/manaplus/"
@@ -37,25 +37,25 @@ msgid "Visible on map"
 msgstr ""
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:296
+#: src/being/being.cpp:294
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:504
+#: src/being/being.cpp:502
 msgid "dodge"
 msgstr "kaçınıldı"
 
-#: src/being/being.cpp:504
+#: src/being/being.cpp:502
 msgid "miss"
 msgstr "ıskalandı"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1748 src/gui/windows/whoisonline.cpp:861
+#: src/being/being.cpp:1746 src/gui/windows/whoisonline.cpp:861
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1753 src/gui/windows/whoisonline.cpp:866
+#: src/being/being.cpp:1751 src/gui/windows/whoisonline.cpp:866
 msgid "I"
 msgstr ""
 
@@ -528,31 +528,31 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:1106 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:58
+#: src/client.cpp:1109 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:58
 msgid "Setup"
 msgstr "Ayarlar"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1110 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1113 src/gui/widgets/tabs/setup_perfomance.cpp:50
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:1113 src/gui/widgets/tabs/setup_video.cpp:221
+#: src/client.cpp:1116 src/gui/widgets/tabs/setup_video.cpp:221
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1116 src/gui/widgets/tabs/setup_theme.cpp:279
+#: src/client.cpp:1119 src/gui/widgets/tabs/setup_theme.cpp:279
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:1119 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1122 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:50
 msgid "Help"
 msgstr "Yardım"
@@ -565,7 +565,7 @@ msgstr "Yardım"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1123 src/gui/popups/popupmenu.cpp:618
+#: src/client.cpp:1126 src/gui/popups/popupmenu.cpp:618
 #: src/gui/windows/didyouknowwindow.cpp:78
 #: src/gui/windows/inventorywindow.cpp:252 src/gui/windows/npcdialog.cpp:71
 #: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:134
@@ -574,32 +574,32 @@ msgid "Close"
 msgstr "Kapat"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1242
+#: src/client.cpp:1245
 msgid "Connecting to server"
 msgstr "Bağlanılıyor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1287
+#: src/client.cpp:1290
 msgid "Logging in"
 msgstr "Bağlanılıyor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1328
+#: src/client.cpp:1331
 msgid "Entering game world"
 msgstr "Oyun dünyasına giriliyor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1451
+#: src/client.cpp:1454
 msgid "Requesting characters"
 msgstr "Karakterler isteniliyor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1492
+#: src/client.cpp:1495
 msgid "Connecting to the game server"
 msgstr "Oyun sunucusuna bağlanılıyor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1506
+#: src/client.cpp:1509
 msgid "Changing game servers"
 msgstr "Oyun sunucusu değiştiriliyor"
 
@@ -614,10 +614,10 @@ msgstr "Oyun sunucusu değiştiriliyor"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1566 src/client.cpp:1577 src/client.cpp:1758
+#: src/client.cpp:1569 src/client.cpp:1580 src/client.cpp:1761
 #: src/gui/windows/changeemaildialog.cpp:167
 #: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:358
+#: src/gui/windows/charcreatedialog.cpp:357
 #: src/gui/windows/charselectdialog.cpp:297
 #: src/gui/windows/editserverdialog.cpp:217
 #: src/gui/windows/registerdialog.cpp:259
@@ -627,65 +627,65 @@ msgid "Error"
 msgstr "Hata"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1590
+#: src/client.cpp:1593
 msgid "Requesting registration details"
 msgstr "Kayıt detayları isteniyor"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1630
+#: src/client.cpp:1633
 msgid "Password Change"
 msgstr "Şifre Değiştir"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1632
+#: src/client.cpp:1635
 msgid "Password changed successfully!"
 msgstr "Şifreniz başarı ile değiştirildi!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1654
+#: src/client.cpp:1657
 msgid "Email Change"
 msgstr "E-posta Değiştir"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1656
+#: src/client.cpp:1659
 msgid "Email changed successfully!"
 msgstr "E-posta başarı ile değiştirildi!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1679
+#: src/client.cpp:1682
 msgid "Unregister Successful"
 msgstr "Hesap kapatma başarılı"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1681
+#: src/client.cpp:1684
 msgid "Farewell, come back any time..."
 msgstr "Hoşçakal, tekrar bekleriz..."
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1953 src/client.cpp:1968 src/client.cpp:2011
-#: src/client.cpp:2027 src/client.cpp:2467 src/client.cpp:2475
+#: src/client.cpp:1956 src/client.cpp:1971 src/client.cpp:2014
+#: src/client.cpp:2030 src/client.cpp:2456 src/client.cpp:2464
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s yok ve yaratılamıyor! Çıkış yapılıyor."
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2167
+#: src/client.cpp:2170
 #, c-format
 msgid "Invalid update host: %s."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2208 src/client.cpp:2215
+#: src/client.cpp:2211 src/client.cpp:2218
 msgid "Error creating updates directory!"
 msgstr "Hata! Güncelleme klasörü oluşturulamadı!"
 
-#: src/client.cpp:2237 src/client.cpp:2250
+#: src/client.cpp:2240 src/client.cpp:2253
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Hata: %s bulunamadı ve yaratılamıyor! Çıkış yapılıyor."
 
 #. TRANSLATORS: error message question
-#: src/client.cpp:2915
+#: src/client.cpp:2904
 msgid "Do you want to open support page?"
 msgstr ""
 
@@ -944,25 +944,25 @@ msgid "Network Error"
 msgstr "Ağ Hatası"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:132
 #, c-format
 msgid "Party: %s"
 msgstr "Grup: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:147
 #, c-format
 msgid "Guild: %s"
 msgstr "Lonca: %s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:161
 #, c-format
 msgid "Pvp rank: %u"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:173
 #, c-format
 msgid "Comment: %s"
 msgstr ""
@@ -1173,7 +1173,7 @@ msgstr ""
 #: src/gui/windows/connectiondialog.cpp:48
 #: src/gui/windows/editserverdialog.cpp:78
 #: src/gui/windows/itemamountwindow.cpp:209
-#: src/gui/windows/npcpostdialog.cpp:69 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:69
 #: src/gui/windows/registerdialog.cpp:76 src/gui/windows/setup.cpp:90
 #: src/gui/windows/socialwindow.cpp:1231
 #: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:53
@@ -2393,7 +2393,7 @@ msgstr ""
 #. TRANSLATORS: register dialog. button.
 #: src/gui/setupactiondata.h:1779 src/gui/setupactiondata.h:1868
 #: src/gui/widgets/tabs/setup_audio.cpp:159
-#: src/gui/widgets/tabs/setup_chat.cpp:176
+#: src/gui/widgets/tabs/setup_chat.cpp:180
 #: src/gui/widgets/tabs/setup_other.cpp:321
 #: src/gui/widgets/tabs/setup_visual.cpp:175
 #: src/gui/windows/charcreatedialog.cpp:107
@@ -2476,7 +2476,7 @@ msgstr ""
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupactiondata.h:1866 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:197
+#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
 msgid "Chat"
 msgstr "Sohbet"
 
@@ -2703,61 +2703,61 @@ msgstr "Para: %s"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:146
+#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
 msgid "black"
 msgstr "siyah"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:148
+#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
 msgid "red"
 msgstr "kırmızı"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:150
+#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
 msgid "green"
 msgstr "yeşil"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:152
+#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
 msgid "blue"
 msgstr "mavi"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:154
+#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
 msgid "gold"
 msgstr "altın rengi"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:156
+#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
 msgid "yellow"
 msgstr "sarı"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:158
+#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
 msgid "pink"
 msgstr "pembe"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:160
+#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
 msgid "purple"
 msgstr "mor"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:162
+#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
 msgid "grey"
 msgstr "gri"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:164
+#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
 msgid "brown"
 msgstr "kahverengi"
 
@@ -3145,85 +3145,97 @@ msgstr ""
 msgid "Hide shop messages"
 msgstr "Alışveriş mesajlarını gizle"
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:124
+msgid "Show MVP messages"
+msgstr ""
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:125
+#: src/gui/widgets/tabs/setup_chat.cpp:129
 msgid "Tabs"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:128
+#: src/gui/widgets/tabs/setup_chat.cpp:132
 msgid "Put all whispers in tabs"
 msgstr "Bütün fısıltıları sekmelere koy"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:132
+#: src/gui/widgets/tabs/setup_chat.cpp:136
 msgid "Log magic messages in debug tab"
 msgstr "Büyü mesajlarını hata ayıklama sekmesinde kayıt altına al"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:136
+#: src/gui/widgets/tabs/setup_chat.cpp:140
 msgid "Show server messages in debug tab"
 msgstr "Sunucu mesajlarını hata ayıklama sekmesinde göster"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:140
+#: src/gui/widgets/tabs/setup_chat.cpp:144
 msgid "Enable trade tab"
 msgstr "Takas penceresini etkinleştir"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:144
+#: src/gui/widgets/tabs/setup_chat.cpp:148
 msgid "Enable gm tab"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:148
+#: src/gui/widgets/tabs/setup_chat.cpp:152
 msgid "Enable language tab"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:152
+#: src/gui/widgets/tabs/setup_chat.cpp:156
 msgid "Show all languages messages"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:156
+#: src/gui/widgets/tabs/setup_chat.cpp:160
 msgid "Enable battle tab"
 msgstr "Savaş sekmesini etkinleştir"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:160
+#: src/gui/widgets/tabs/setup_chat.cpp:164
 msgid "Show battle events"
 msgstr "Savaş etkinliklerini göster"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:164
+#: src/gui/widgets/tabs/setup_chat.cpp:168
 msgid "Resize chat tabs if need"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:169
+#: src/gui/widgets/tabs/setup_chat.cpp:173
 msgid "Time"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:172
+#: src/gui/widgets/tabs/setup_chat.cpp:176
 msgid "Use local time"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:179
+#: src/gui/widgets/tabs/setup_chat.cpp:183
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:183
+#: src/gui/widgets/tabs/setup_chat.cpp:187
 msgid "Globals ignore names (separated by comma)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:187
-msgid "Show MVP messages"
-msgstr ""
+#: src/gui/widgets/tabs/setup_chat.cpp:191
+#, fuzzy
+msgid "Show emotes button in chat"
+msgstr "Toplama bildirimlerini sohbette göster"
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:195
+#, fuzzy
+msgid "Show motd server message on start"
+msgstr "Sunucu mesajlarını hata ayıklama sekmesinde göster"
 
 #: src/gui/widgets/tabs/setup_colors.cpp:46
 msgid "This is what the color looks like"
@@ -3411,7 +3423,7 @@ msgstr ""
 #. TRANSLATORS: chat color
 #. TRANSLATORS: inventory sort mode
 #: src/gui/widgets/tabs/setup_other.cpp:71
-#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:150
 #: src/gui/windows/inventorywindow.cpp:69
 msgid "default"
 msgstr "varsayılan"
@@ -5074,8 +5086,8 @@ msgstr "İsim:"
 #: src/gui/windows/charcreatedialog.cpp:75
 #: src/gui/windows/charcreatedialog.cpp:84
 #: src/gui/windows/charcreatedialog.cpp:101
-#: src/gui/windows/charcreatedialog.cpp:171
-#: src/gui/windows/charcreatedialog.cpp:181
+#: src/gui/windows/charcreatedialog.cpp:170
+#: src/gui/windows/charcreatedialog.cpp:180
 #: src/gui/windows/outfitwindow.cpp:58
 msgid ">"
 msgstr ">"
@@ -5086,8 +5098,8 @@ msgstr ">"
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:79
 #: src/gui/windows/charcreatedialog.cpp:86
-#: src/gui/windows/charcreatedialog.cpp:173
-#: src/gui/windows/charcreatedialog.cpp:183
+#: src/gui/windows/charcreatedialog.cpp:172
+#: src/gui/windows/charcreatedialog.cpp:182
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "<"
 msgstr "<"
@@ -5123,33 +5135,33 @@ msgstr "Kadın"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:466
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Lütfen %d puanı dağıt"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:174
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:185
+#: src/gui/windows/charcreatedialog.cpp:184
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:359
 msgid "Your name needs to be at least 4 characters."
 msgstr "Adınızda en az 4 karakter olması gerekir."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:456
 msgid "Character stats OK"
 msgstr "Karakter istatistikleri TAMAM"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:472
 #, c-format
 msgid "Please remove %d points"
 msgstr "Lütfen %d puanı eksilt"
@@ -5235,28 +5247,28 @@ msgid "Enter password:"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:166
+#: src/gui/windows/chatwindow.cpp:172
 msgid "rainbow 1"
 msgstr "gökkuşağı 1"
 
 #. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:168
+#: src/gui/windows/chatwindow.cpp:174
 msgid "rainbow 2"
 msgstr "gökkuşağı 2"
 
 #. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:170
+#: src/gui/windows/chatwindow.cpp:176
 msgid "rainbow 3"
 msgstr "gökkuşağı 3"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:694
+#: src/gui/windows/chatwindow.cpp:740
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Mevcut: %s; %d oyuncu mevcut."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1103
+#: src/gui/windows/chatwindow.cpp:1154
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "%s 'e fısıldanıyor: %s"
@@ -5877,17 +5889,17 @@ msgid "Add"
 msgstr "Ekle"
 
 #. TRANSLATORS: label in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:58
+#: src/gui/windows/npcpostdialog.cpp:57
 msgid "To:"
 msgstr "Alıcı:"
 
 #. TRANSLATORS: button in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:65
+#: src/gui/windows/npcpostdialog.cpp:64
 msgid "Send"
 msgstr "Gönder"
 
 #. TRANSLATORS: npc post message error
-#: src/gui/windows/npcpostdialog.cpp:112
+#: src/gui/windows/npcpostdialog.cpp:111
 msgid "Failed to send as sender or letter invalid."
 msgstr "Gönderen olarak gönderme yapılamadı ya da hatalı karakter"
 
@@ -6912,13 +6924,13 @@ msgid "Failed to delete character."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:87
+#: src/net/ea/chathandler.cpp:88
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:96
+#: src/net/ea/chathandler.cpp:97
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr "Fısıltı gönderilemedi, %s tarafından görmezden gelindi."
diff --git a/po/zh_CN.po b/po/zh_CN.po
index a48473599..0fa59d018 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-10-19 16:54+0300\n"
+"POT-Creation-Date: 2013-10-25 16:34+0300\n"
 "PO-Revision-Date: 2013-09-20 08:56+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/manaplus/"
@@ -38,25 +38,25 @@ msgid "Visible on map"
 msgstr "在地图上可见"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:296
+#: src/being/being.cpp:294
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:504
+#: src/being/being.cpp:502
 msgid "dodge"
 msgstr "躲闪"
 
-#: src/being/being.cpp:504
+#: src/being/being.cpp:502
 msgid "miss"
 msgstr "失误"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1748 src/gui/windows/whoisonline.cpp:861
+#: src/being/being.cpp:1746 src/gui/windows/whoisonline.cpp:861
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1753 src/gui/windows/whoisonline.cpp:866
+#: src/being/being.cpp:1751 src/gui/windows/whoisonline.cpp:866
 msgid "I"
 msgstr "I"
 
@@ -528,31 +528,31 @@ msgstr "流动的泡沫"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:1106 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:58
+#: src/client.cpp:1109 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:58
 msgid "Setup"
 msgstr "设置"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:1110 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1113 src/gui/widgets/tabs/setup_perfomance.cpp:50
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:1113 src/gui/widgets/tabs/setup_video.cpp:221
+#: src/client.cpp:1116 src/gui/widgets/tabs/setup_video.cpp:221
 msgid "Video"
 msgstr "视频"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1116 src/gui/widgets/tabs/setup_theme.cpp:279
+#: src/client.cpp:1119 src/gui/widgets/tabs/setup_theme.cpp:279
 msgid "Theme"
 msgstr "主题"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:1119 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1122 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:50
 msgid "Help"
 msgstr "帮助"
@@ -565,7 +565,7 @@ msgstr "帮助"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:1123 src/gui/popups/popupmenu.cpp:618
+#: src/client.cpp:1126 src/gui/popups/popupmenu.cpp:618
 #: src/gui/windows/didyouknowwindow.cpp:78
 #: src/gui/windows/inventorywindow.cpp:252 src/gui/windows/npcdialog.cpp:71
 #: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:134
@@ -574,32 +574,32 @@ msgid "Close"
 msgstr "关闭"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1242
+#: src/client.cpp:1245
 msgid "Connecting to server"
 msgstr "正在连接服务器"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1287
+#: src/client.cpp:1290
 msgid "Logging in"
 msgstr "登录中"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1328
+#: src/client.cpp:1331
 msgid "Entering game world"
 msgstr "进入游戏世界"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1451
+#: src/client.cpp:1454
 msgid "Requesting characters"
 msgstr "请求角色"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1492
+#: src/client.cpp:1495
 msgid "Connecting to the game server"
 msgstr "正在连接游戏服务器"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1506
+#: src/client.cpp:1509
 msgid "Changing game servers"
 msgstr "正在更改游戏服务器"
 
@@ -614,10 +614,10 @@ msgstr "正在更改游戏服务器"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1566 src/client.cpp:1577 src/client.cpp:1758
+#: src/client.cpp:1569 src/client.cpp:1580 src/client.cpp:1761
 #: src/gui/windows/changeemaildialog.cpp:167
 #: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:358
+#: src/gui/windows/charcreatedialog.cpp:357
 #: src/gui/windows/charselectdialog.cpp:297
 #: src/gui/windows/editserverdialog.cpp:217
 #: src/gui/windows/registerdialog.cpp:259
@@ -627,65 +627,65 @@ msgid "Error"
 msgstr "错误"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1590
+#: src/client.cpp:1593
 msgid "Requesting registration details"
 msgstr "正在请求详细注册信息"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1630
+#: src/client.cpp:1633
 msgid "Password Change"
 msgstr "更改密码"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1632
+#: src/client.cpp:1635
 msgid "Password changed successfully!"
 msgstr "密码更改成功！"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1654
+#: src/client.cpp:1657
 msgid "Email Change"
 msgstr "更改电子邮箱地址"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1656
+#: src/client.cpp:1659
 msgid "Email changed successfully!"
 msgstr "电子邮箱地址更改成功！"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1679
+#: src/client.cpp:1682
 msgid "Unregister Successful"
 msgstr "取消注册成功"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1681
+#: src/client.cpp:1684
 msgid "Farewell, come back any time..."
 msgstr "再见，欢迎随时回来... ..."
 
 #. TRANSLATORS: directory creation error
-#: src/client.cpp:1953 src/client.cpp:1968 src/client.cpp:2011
-#: src/client.cpp:2027 src/client.cpp:2467 src/client.cpp:2475
+#: src/client.cpp:1956 src/client.cpp:1971 src/client.cpp:2014
+#: src/client.cpp:2030 src/client.cpp:2456 src/client.cpp:2464
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s 不存在，且无法创建！正在退出。"
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2167
+#: src/client.cpp:2170
 #, c-format
 msgid "Invalid update host: %s."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2208 src/client.cpp:2215
+#: src/client.cpp:2211 src/client.cpp:2218
 msgid "Error creating updates directory!"
 msgstr "创建更新目录错误！"
 
-#: src/client.cpp:2237 src/client.cpp:2250
+#: src/client.cpp:2240 src/client.cpp:2253
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "错误：%s 不存在且无法创建！正在退出。"
 
 #. TRANSLATORS: error message question
-#: src/client.cpp:2915
+#: src/client.cpp:2904
 msgid "Do you want to open support page?"
 msgstr ""
 
@@ -941,25 +941,25 @@ msgid "Network Error"
 msgstr "网络错误"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:133
+#: src/gui/popups/beingpopup.cpp:132
 #, c-format
 msgid "Party: %s"
 msgstr "团队:%s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:148
+#: src/gui/popups/beingpopup.cpp:147
 #, c-format
 msgid "Guild: %s"
 msgstr "工会:%s"
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:162
+#: src/gui/popups/beingpopup.cpp:161
 #, c-format
 msgid "Pvp rank: %u"
 msgstr ""
 
 #. TRANSLATORS: being popup label
-#: src/gui/popups/beingpopup.cpp:174
+#: src/gui/popups/beingpopup.cpp:173
 #, c-format
 msgid "Comment: %s"
 msgstr "评论: %s"
@@ -1170,7 +1170,7 @@ msgstr ""
 #: src/gui/windows/connectiondialog.cpp:48
 #: src/gui/windows/editserverdialog.cpp:78
 #: src/gui/windows/itemamountwindow.cpp:209
-#: src/gui/windows/npcpostdialog.cpp:69 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:69
 #: src/gui/windows/registerdialog.cpp:76 src/gui/windows/setup.cpp:90
 #: src/gui/windows/socialwindow.cpp:1231
 #: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:53
@@ -2390,7 +2390,7 @@ msgstr ""
 #. TRANSLATORS: register dialog. button.
 #: src/gui/setupactiondata.h:1779 src/gui/setupactiondata.h:1868
 #: src/gui/widgets/tabs/setup_audio.cpp:159
-#: src/gui/widgets/tabs/setup_chat.cpp:176
+#: src/gui/widgets/tabs/setup_chat.cpp:180
 #: src/gui/widgets/tabs/setup_other.cpp:321
 #: src/gui/widgets/tabs/setup_visual.cpp:175
 #: src/gui/windows/charcreatedialog.cpp:107
@@ -2473,7 +2473,7 @@ msgstr ""
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: chat window name
 #: src/gui/setupactiondata.h:1866 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:197
+#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
 msgid "Chat"
 msgstr "聊天"
 
@@ -2700,61 +2700,61 @@ msgstr "金币: %s"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:146
+#: src/gui/widgets/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
 msgid "black"
 msgstr "黑色"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:148
+#: src/gui/widgets/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
 msgid "red"
 msgstr "红色"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:150
+#: src/gui/widgets/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
 msgid "green"
 msgstr "绿色"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:152
+#: src/gui/widgets/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
 msgid "blue"
 msgstr "蓝色"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:154
+#: src/gui/widgets/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
 msgid "gold"
 msgstr "金"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:156
+#: src/gui/widgets/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
 msgid "yellow"
 msgstr "黄色"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:158
+#: src/gui/widgets/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
 msgid "pink"
 msgstr "粉红色"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:160
+#: src/gui/widgets/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
 msgid "purple"
 msgstr "紫"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:162
+#: src/gui/widgets/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
 msgid "grey"
 msgstr "灰色"
 
 #. TRANSLATORS: color name
 #. TRANSLATORS: chat color
-#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:164
+#: src/gui/widgets/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
 msgid "brown"
 msgstr "棕色"
 
@@ -3139,86 +3139,97 @@ msgstr "消息"
 msgid "Hide shop messages"
 msgstr "隐藏商店消息"
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:124
+msgid "Show MVP messages"
+msgstr ""
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:125
+#: src/gui/widgets/tabs/setup_chat.cpp:129
 msgid "Tabs"
 msgstr "标签"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:128
+#: src/gui/widgets/tabs/setup_chat.cpp:132
 msgid "Put all whispers in tabs"
 msgstr "将所有密语放于标签夜"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:132
+#: src/gui/widgets/tabs/setup_chat.cpp:136
 msgid "Log magic messages in debug tab"
 msgstr "在调试页记录魔法信息"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:136
+#: src/gui/widgets/tabs/setup_chat.cpp:140
 msgid "Show server messages in debug tab"
 msgstr "在调试选项卡中显示服务器的消息"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:140
+#: src/gui/widgets/tabs/setup_chat.cpp:144
 msgid "Enable trade tab"
 msgstr "标签"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:144
+#: src/gui/widgets/tabs/setup_chat.cpp:148
 msgid "Enable gm tab"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:148
+#: src/gui/widgets/tabs/setup_chat.cpp:152
 msgid "Enable language tab"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:152
+#: src/gui/widgets/tabs/setup_chat.cpp:156
 msgid "Show all languages messages"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:156
+#: src/gui/widgets/tabs/setup_chat.cpp:160
 msgid "Enable battle tab"
 msgstr "启用战斗“选项卡"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:160
+#: src/gui/widgets/tabs/setup_chat.cpp:164
 msgid "Show battle events"
 msgstr "显示的战斗事件"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:164
+#: src/gui/widgets/tabs/setup_chat.cpp:168
 msgid "Resize chat tabs if need"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:169
+#: src/gui/widgets/tabs/setup_chat.cpp:173
 msgid "Time"
 msgstr "时间"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:172
+#: src/gui/widgets/tabs/setup_chat.cpp:176
 msgid "Use local time"
 msgstr "使用本地时间"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:179
+#: src/gui/widgets/tabs/setup_chat.cpp:183
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:183
+#: src/gui/widgets/tabs/setup_chat.cpp:187
 msgid "Globals ignore names (separated by comma)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:187
-msgid "Show MVP messages"
+#: src/gui/widgets/tabs/setup_chat.cpp:191
+msgid "Show emotes button in chat"
 msgstr ""
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:195
+#, fuzzy
+msgid "Show motd server message on start"
+msgstr "在调试选项卡中显示服务器的消息"
+
 #: src/gui/widgets/tabs/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr "这就是该色彩看起来的样子"
@@ -3403,7 +3414,7 @@ msgstr ""
 #. TRANSLATORS: chat color
 #. TRANSLATORS: inventory sort mode
 #: src/gui/widgets/tabs/setup_other.cpp:71
-#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:77 src/gui/windows/chatwindow.cpp:150
 #: src/gui/windows/inventorywindow.cpp:69
 msgid "default"
 msgstr "默认"
@@ -5064,8 +5075,8 @@ msgstr "姓名"
 #: src/gui/windows/charcreatedialog.cpp:75
 #: src/gui/windows/charcreatedialog.cpp:84
 #: src/gui/windows/charcreatedialog.cpp:101
-#: src/gui/windows/charcreatedialog.cpp:171
-#: src/gui/windows/charcreatedialog.cpp:181
+#: src/gui/windows/charcreatedialog.cpp:170
+#: src/gui/windows/charcreatedialog.cpp:180
 #: src/gui/windows/outfitwindow.cpp:58
 msgid ">"
 msgstr ">"
@@ -5076,8 +5087,8 @@ msgstr ">"
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:79
 #: src/gui/windows/charcreatedialog.cpp:86
-#: src/gui/windows/charcreatedialog.cpp:173
-#: src/gui/windows/charcreatedialog.cpp:183
+#: src/gui/windows/charcreatedialog.cpp:172
+#: src/gui/windows/charcreatedialog.cpp:182
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "<"
 msgstr "<"
@@ -5113,33 +5124,33 @@ msgstr "美女"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:466
 #, c-format
 msgid "Please distribute %d points"
 msgstr "请分发%d点数"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:175
+#: src/gui/windows/charcreatedialog.cpp:174
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:185
+#: src/gui/windows/charcreatedialog.cpp:184
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:359
 msgid "Your name needs to be at least 4 characters."
 msgstr "你的名字需要至少4个字符"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:456
 msgid "Character stats OK"
 msgstr "角色状态可以"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:472
 #, c-format
 msgid "Please remove %d points"
 msgstr "请删除%d点数"
@@ -5225,28 +5236,28 @@ msgid "Enter password:"
 msgstr "输入密码："
 
 #. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:166
+#: src/gui/windows/chatwindow.cpp:172
 msgid "rainbow 1"
 msgstr "彩虹1"
 
 #. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:168
+#: src/gui/windows/chatwindow.cpp:174
 msgid "rainbow 2"
 msgstr "彩虹2"
 
 #. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:170
+#: src/gui/windows/chatwindow.cpp:176
 msgid "rainbow 3"
 msgstr "彩虹3"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:694
+#: src/gui/windows/chatwindow.cpp:740
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1103
+#: src/gui/windows/chatwindow.cpp:1154
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "对%s密语到：%s"
@@ -5865,17 +5876,17 @@ msgid "Add"
 msgstr "添加"
 
 #. TRANSLATORS: label in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:58
+#: src/gui/windows/npcpostdialog.cpp:57
 msgid "To:"
 msgstr "至："
 
 #. TRANSLATORS: button in npc post dialog
-#: src/gui/windows/npcpostdialog.cpp:65
+#: src/gui/windows/npcpostdialog.cpp:64
 msgid "Send"
 msgstr "发送"
 
 #. TRANSLATORS: npc post message error
-#: src/gui/windows/npcpostdialog.cpp:112
+#: src/gui/windows/npcpostdialog.cpp:111
 msgid "Failed to send as sender or letter invalid."
 msgstr "发送信件失败或者信件无效。"
 
@@ -6898,13 +6909,13 @@ msgid "Failed to delete character."
 msgstr "删除角色失败。"
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:87
+#: src/net/ea/chathandler.cpp:88
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr "密语无法发送，%s离线。"
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:96
+#: src/net/ea/chathandler.cpp:97
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""