update and rebuild translations.

44 files changed, 8250 insertions, 5936 deletions

diff --git a/data/translations/help/de.po b/data/translations/help/de.po
index 03c62003e..34476bfaa 100644
--- a/data/translations/help/de.po
+++ b/data/translations/help/de.po
@@ -1,14 +1,15 @@
 # en#
 # Translators:
 # Fortunato <fortunato108@googlemail.com>, 2013
+# proll007, 2013
 # Slimor <madjuca@gmx.de>, 2013
 # Marco Jäger <>, 2012
 # tux9th <mr.x@aon.at>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2013-07-14 11:23+0000\n"
-"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"PO-Revision-Date: 2013-08-06 10:53+0000\n"
+"Last-Translator: proll007\n"
 "Language-Team: German (http://www.transifex.com/projects/p/manaplus/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -205,7 +206,7 @@ msgid "/setdrop N - set drop counter to requested value."
 msgstr "/setdrop N - Setzt Anzahl der gleichzeitig weggeworfenen Gegenstände auf N."
 
 msgid "\"Quit\""
-msgstr ""
+msgstr "\"Beenden\""
 
 msgid "/outfit N - wear outfit number N."
 msgstr "/outfit N - Ausrüstung Nummer N anziehen."
@@ -720,7 +721,7 @@ msgid "/dirs - show client dirs in debug chat tab."
 msgstr "/dirs - listet die verwendeten Verzeichnisse des Clienten\nim Debug-Chatfenster auf."
 
 msgid "Website: @@http://manaplus.org/|http://manaplus.org/@@"
-msgstr ""
+msgstr "Internetseite: @@http://manaplus.org/|http://manaplus.org/@@"
 
 msgid "/disconnect - quick disconnect from server."
 msgstr "/disconnect - schnell vom Server trennen."
diff --git a/data/translations/help/pl.po b/data/translations/help/pl.po
index 048d554bb..cbae6772b 100644
--- a/data/translations/help/pl.po
+++ b/data/translations/help/pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2013-07-31 10:06+0000\n"
+"PO-Revision-Date: 2013-08-07 19:50+0000\n"
 "Last-Translator: foobo <lukasz.antoni.komorowski@poczta.fm>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/manaplus/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -79,7 +79,7 @@ msgid "\"Emote shortcut 9\""
 msgstr "\"Skrót Emotki 9\""
 
 msgid "\"Set direction down\""
-msgstr ""
+msgstr "\"Ustaw w dolny kierunek\""
 
 msgid "\"Target NPC\""
 msgstr "\"Namierz NPC\""
@@ -112,7 +112,7 @@ msgid "/priceload - load shop price from disc."
 msgstr "/priceload - wczytaj ceny sklepu z dysku."
 
 msgid "\"Quests window\""
-msgstr ""
+msgstr "\"Okno Misji\""
 
 msgid ""
 " - ##2friend##P:  You consider this player a friend.  The player may chat,\n"
@@ -219,7 +219,7 @@ msgid "/createparty NAME - create party with selected name."
 msgstr "/createparty NAZWA - utwórz grupę o podanej nazwie."
 
 msgid "\"Move down\""
-msgstr ""
+msgstr "\"Idź w dół\""
 
 msgid "/heal NICK - heal nick."
 msgstr "/heal NICK - uzdrów nick."
@@ -234,7 +234,7 @@ msgid "/removeattack NAME - remove monster from attack list."
 msgstr "/removeattack NAZWA - usuń potwora z listy ataku."
 
 msgid "\"Set direction up\""
-msgstr ""
+msgstr "\"Ustaw w górny kierunek\""
 
 msgid "/where - print current player position to chat."
 msgstr "/where - napisz w czacie obecną pozycję gracza."
@@ -290,7 +290,7 @@ msgid "\"Outfit shortcut 10\""
 msgstr "\"Skrót ubioru 10\""
 
 msgid "Look this page for help and downloads:"
-msgstr ""
+msgstr "Sprawdź tę stronę by uzyskać pomoc jak i by uzyskać dostęp do pobierania."
 
 msgid "COMMUNICATION:"
 msgstr "KOMUNIKACJA:"
@@ -299,7 +299,7 @@ msgid "Other skills:"
 msgstr "Inne zdolności:"
 
 msgid "Powered By"
-msgstr ""
+msgstr "Wspierane przez"
 
 msgid ""
 "You can use mumble voice chat for talking with other players.\n"
@@ -307,10 +307,10 @@ msgid ""
 msgstr "Możesz skorzystać z czatu głosowego mumble do rozmów z innymi graczami.\nUruchom mumble przed uruchomieniem klienta gry i aktywuj mumble w ustawieniach."
 
 msgid "\"Move up\""
-msgstr ""
+msgstr "\"Idź w górę\""
 
 msgid "Here contributors from parent projects"
-msgstr ""
+msgstr "Deweloperzy z matczynych projektów"
 
 msgid "\"Item shortcut 4\""
 msgstr "\"Skrót przedmiotu 4\""
@@ -382,7 +382,7 @@ msgid "\"Select OK\""
 msgstr "\"Wybierz OK\""
 
 msgid "MacOSX porting"
-msgstr ""
+msgstr "Portowanie na MaxOSX"
 
 msgid ""
 "About yellow bar you can read here:\n"
@@ -411,7 +411,7 @@ msgid "/ignoreall - add all whispers to ignore list."
 msgstr "/ignoreall - umieść wszystkie szepty na liście ignorowanych."
 
 msgid "\"Copy outfit\""
-msgstr ""
+msgstr "\"Kopiuj strój\""
 
 msgid "/ignore NICK - add nick to ignore list."
 msgstr "/ignore NICK - dodaj nick'a do listy ignorowanych."
@@ -420,7 +420,7 @@ msgid "\"Item shortcuts Key\""
 msgstr "\"Klawisz skrótów do przedmiotów\""
 
 msgid "\"Disable / enable game modifier keys\""
-msgstr ""
+msgstr "\"Włącz/ wyłącz klawisze modyfikatorów gry\""
 
 msgid "Other contributors"
 msgstr "Pozostali kontrybutorzy."
@@ -438,7 +438,7 @@ msgid "/outfit next - wear next outfit."
 msgstr "/outfit next - załóż następny strój."
 
 msgid "\"Move right\""
-msgstr ""
+msgstr "\"Idź w prawo\""
 
 msgid ""
 "You can set away mode,\n"
@@ -461,7 +461,7 @@ msgid "/addignoreattack NAME - add monster to ignore attack list."
 msgstr "/addignoreattack NAME - dodaj potwora do listy ignorowanych celów."
 
 msgid "Android porting"
-msgstr ""
+msgstr "Portowanie na Androida"
 
 msgid "/clear - clear current chat tab."
 msgstr "/clear - wyczyść obecną zakładkę czatu."
@@ -494,7 +494,7 @@ msgid "\"Item shortcut 6\""
 msgstr "\"Skrót przedmiotu 6\""
 
 msgid "Art or images contributors"
-msgstr ""
+msgstr "Deweloperzy zasobów graficznych"
 
 msgid "\"Target player\""
 msgstr "\"Namierz Gracza\""
@@ -560,13 +560,13 @@ msgid ""
 " - ##2neutral##P:  As far as the game is concerned, this is the same as not\n"
 "   having the player listed:  the player may chat with you, but may only trade\n"
 "   or whisper if you have this option allowed for everyone."
-msgstr ""
+msgstr " - ##2neutral##P:  to tak jakby nie mieć gracza na liście: może on rozmawiać z tobą, ale handel lub szept odbywa się, tylko gdy pozwoliłeś na tę opcję dla wszystkich."
 
 msgid "\"Inventory window\""
 msgstr "\"Okno Inwentarza\""
 
 msgid "Contributors to client/server development"
-msgstr ""
+msgstr "Deweloperzy klienta/serwera"
 
 msgid "\"Quick heal target or self\""
 msgstr "\"Szybkie uleczenie celu lub siebie\""
@@ -578,7 +578,7 @@ msgid "\"Use #itenplz spell\""
 msgstr "\"Użyj zaklęcia #itenplz\""
 
 msgid "move key"
-msgstr ""
+msgstr "klawisz automatycznego przemieszczania się"
 
 msgid "\"Item shortcut 13\""
 msgstr "\"Skrót przedmiotu 13\""
@@ -587,7 +587,7 @@ msgid "Skills"
 msgstr "Zdolności"
 
 msgid "##2Party Level1:##P enables a char to join a party."
-msgstr ""
+msgstr "##2Grupa Poziom1:##P pozwala postaci na dołączenie do grupy."
 
 msgid "##2Version:##6%VER%"
 msgstr "##2Wersja:##6%VER%"
@@ -627,7 +627,7 @@ msgstr "\"Przerwij atak\""
 msgid ""
 " The player list lists all of your acquaintances.  They are categorised as one\n"
 " of the following:"
-msgstr ""
+msgstr "Lista graczy zawiera twych znajomych. Skategoryzowani są jako jedni z następujących:"
 
 msgid "\"Change attack weapon type\""
 msgstr "\"Zmień rodzaj broni\""
@@ -657,10 +657,10 @@ msgid "\"Next chat tab line\""
 msgstr "\"Następny wiersz czatu\""
 
 msgid "\"Set direction right\""
-msgstr ""
+msgstr "\"Ustaw w prawy kierunek\""
 
 msgid "\"Move to home location\""
-msgstr ""
+msgstr "\"Podejdź do lokacji domowej\""
 
 msgid "Player relations"
 msgstr "Relacje z graczami"
@@ -671,7 +671,7 @@ msgstr "Błąd wyszukiwania"
 msgid ""
 "You can copy value from any bar,\n"
 "by right click on it and select in context menu \"Copy to chat\"."
-msgstr ""
+msgstr "Możesz skopiować wartość z któregokolwiek paska,\nklikając na nim prawym przyciskiem myszy i wybierając z menu kontekstowego opcję \"Kopiuj do czatu\"."
 
 msgid "/closeall - close all whispers."
 msgstr "/closeall - zamknij wszystkie zakładki z szeptami."
@@ -695,7 +695,7 @@ msgid "\"Toggle chat\""
 msgstr "\"Przełącznik Czatu\""
 
 msgid "##POther skills can be obtain by doing quests and missions in game."
-msgstr ""
+msgstr "##Inne umiejętności mogą być zdobyte wykonując zadania i misje w grze."
 
 msgid "\"Change attack type\""
 msgstr "\"Zmień rodzaj ataku\""
@@ -719,13 +719,13 @@ msgid "/dirs - show client dirs in debug chat tab."
 msgstr "/dirs - pokaż foldery klienta w zakładce czatu debug."
 
 msgid "Website: @@http://manaplus.org/|http://manaplus.org/@@"
-msgstr ""
+msgstr "Strona: @@http://manaplus.org/|http://manaplus.org/@@"
 
 msgid "/disconnect - quick disconnect from server."
 msgstr "/disconnect - szybkie rozłączenie się z serwerem."
 
 msgid "\"Switch quick drop counter\""
-msgstr ""
+msgstr "\"Zmień licznik szybkiego upuszczania\""
 
 msgid "\"Previous chat tab line\""
 msgstr ""
@@ -760,7 +760,7 @@ msgid "\"Outfit shortcut 14\""
 msgstr "\"Skrót ubioru 14\""
 
 msgid "\"Quick drop N items from 0 slot\""
-msgstr ""
+msgstr "\"Szybkie upuszczenie N przedmiotów z pozycji 0\""
 
 msgid "\"Switch pvp attack\""
 msgstr "\"Przełącz atak PvP\""
@@ -793,7 +793,7 @@ msgstr "Komendy szeptu"
 msgid ""
 " There you will find a list of all players you are acquainted with, as well as\n"
 " several configuration options:"
-msgstr ""
+msgstr "Znajdziesz tu listę graczy z którymi jesteś zaznajomiony oraz różne opcje:"
 
 msgid "\"Use magic attack\""
 msgstr "\"Użyj magicznego ataku\""
@@ -807,13 +807,13 @@ msgid "Whispers"
 msgstr "Szepty"
 
 msgid "Search string not found."
-msgstr ""
+msgstr "Nie znaleziono poszukiwanego ciągu."
 
 msgid "\"Wear outfit\""
 msgstr "\"Nałóż strój\""
 
 msgid "emote key"
-msgstr ""
+msgstr "klawisz emotki"
 
 msgid "Search results"
 msgstr "Wyniki wyszukiwania"
@@ -866,13 +866,13 @@ msgid "\"Emulate right click from keyboard\""
 msgstr "\"Emuluj prawe kliknięcie z klawiatury\""
 
 msgid "\"Set home location/set arrow\""
-msgstr ""
+msgstr "\"Ustaw lokację domową/ustaw wskaźnik\""
 
 msgid "\"Set direction left\""
-msgstr ""
+msgstr "\"Ustaw w prawy kierunek\""
 
 msgid "\"Move left\""
-msgstr ""
+msgstr "\"Idź w lewo\""
 
 msgid "\"Item shortcut window\""
 msgstr "\"Okno Skrótów do przedmiotów\""
@@ -916,10 +916,10 @@ msgstr ""
 msgid ""
 "##P This file lists all contributors up to the current release. Check the wiki\n"
 "##P for the currently active development team."
-msgstr ""
+msgstr "##P Lista ta zawiera wszystkich deweloperów obecnego wydania. Sprawdź \n##P wiki by poznać obecnie aktywną ekipę dewelopingu."
 
 msgid "Different patches"
-msgstr ""
+msgstr "Rozmaite łatki"
 
 msgid "\"Switch magic attack\""
 msgstr "\"Zmień magiczny atak\""
@@ -931,7 +931,7 @@ msgid "SKILLS"
 msgstr "ZDOLNOŚCI"
 
 msgid "Actions"
-msgstr ""
+msgstr "Działania"
 
 msgid "\"Item shortcut 12\""
 msgstr "\"Skrót przedmiotu 12\""
diff --git a/data/translations/help/pt_BR.po b/data/translations/help/pt_BR.po
index 4bb71be91..29e7ed411 100644
--- a/data/translations/help/pt_BR.po
+++ b/data/translations/help/pt_BR.po
@@ -2,12 +2,12 @@
 # Translators:
 # alastrim <alasmirt@gmail.com>, 2012
 # freya <freya.df@gmail.com>, 2012
-# luckZago <lcnzg7@gmail.com>, 2013
+# Luciano Zago <lcnzg7@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2013-07-14 11:23+0000\n"
-"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"PO-Revision-Date: 2013-08-09 20:26+0000\n"
+"Last-Translator: Luciano Zago <lcnzg7@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/manaplus/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 msgid "\"Outfit shortcut 12\""
-msgstr ""
+msgstr "\"Atalho de roupa 12\""
 
 msgid ""
 " - ##2allow trading##P: Do you wish to allow trade requests from arbitrary\n"
@@ -27,7 +27,7 @@ msgid "To read about whispering and other chat commands, look here:"
 msgstr "Para ler sobre sussurros e outros comandos de chat, veja aqui: "
 
 msgid "/away, /away MSG - set away mode."
-msgstr ""
+msgstr "/away, /away MSG - definir modo ausente."
 
 msgid ""
 "You can select other themes.\n"
@@ -36,7 +36,7 @@ msgid ""
 msgstr ""
 
 msgid "\"Target & attack\""
-msgstr ""
+msgstr "\"Selecionar & atacar\""
 
 msgid ""
 "Most commands working in whispers.\n"
@@ -45,7 +45,7 @@ msgid ""
 msgstr ""
 
 msgid "\"Emote shortcut 11\""
-msgstr ""
+msgstr "\"Atalho para emoticon 11\""
 
 msgid ""
 " To add an item to the shortcut bar click on the item in the inventory window,\n"
@@ -56,13 +56,13 @@ msgid ""
 msgstr ""
 
 msgid "\"Ignore input 1\""
-msgstr ""
+msgstr "\"Ignorar input 1\""
 
 msgid "/cacheinfo - show text cache info."
 msgstr "/cacheinfo - mostra informações de cache de texto"
 
 msgid "\"Outfits window\""
-msgstr ""
+msgstr "\"Janela de roupas\""
 
 msgid ""
 "You can imitate other players by selecting \"imitation\" in player context menu\n"
@@ -76,13 +76,13 @@ msgid ""
 msgstr ""
 
 msgid "\"Emote shortcut 9\""
-msgstr ""
+msgstr "\"Atalho para emoticon 9\""
 
 msgid "\"Set direction down\""
-msgstr ""
+msgstr "\"Definir direção para baixo\""
 
 msgid "\"Target NPC\""
-msgstr ""
+msgstr "\"Selecionar NPC\""
 
 msgid ""
 "You can walk to warps automatically.\n"
@@ -91,13 +91,13 @@ msgid ""
 msgstr ""
 
 msgid "\"Chat window\""
-msgstr ""
+msgstr "\"Janela de bate-papo\""
 
 msgid "/neutral NICK - add nick to neutral relation list."
 msgstr "/neutral NICK - adiciona um u nick neutro na lista de relações"
 
 msgid "\"Outfit shortcut 7\""
-msgstr ""
+msgstr "\"Atalho de roupa 7\""
 
 msgid "/addpriorityattack NAME - add monster to priority attack list."
 msgstr "/addpriorityattack NAME - adiciona um monstro na lista de prioridades"
@@ -112,7 +112,7 @@ msgid "/priceload - load shop price from disc."
 msgstr "/priceload - Carrega preços de shop do disco."
 
 msgid "\"Quests window\""
-msgstr ""
+msgstr "\"Janela de missões\""
 
 msgid ""
 " - ##2friend##P:  You consider this player a friend.  The player may chat,\n"
@@ -127,22 +127,22 @@ msgstr " - ##2allow whispers##P: Você deseja permiti que os jogadores arbitrár
 msgid ""
 "You can disable yellow bar,\n"
 "by pressing ###keyDisableGameModifiers;."
-msgstr ""
+msgstr "Você pode desabilitar a barra amarela\npressionando ###keyDisableGameModifiers;."
 
 msgid "Support"
 msgstr "Suporte"
 
 msgid "\"Quick drop window\""
-msgstr ""
+msgstr "\"Janela descarte rápido\""
 
 msgid "\"Screenshot\""
-msgstr ""
+msgstr "\"Screenshot\""
 
 msgid "##PMagic skills can be obtain by doing quests and missions in game."
 msgstr "##PHabilidades mágicas podem ser obtidas fazendo quests ou missões no jogo."
 
 msgid "\"Emote shortcut 1\""
-msgstr ""
+msgstr "\"Atalho para emoticon 1\""
 
 msgid "\"Outfit shortcut 13\""
 msgstr ""
@@ -207,7 +207,7 @@ msgid "\"Quit\""
 msgstr ""
 
 msgid "/outfit N - wear outfit number N."
-msgstr ""
+msgstr "/outfit N - vestir roupa número N."
 
 msgid "Visit IRC channel:"
 msgstr "Visite o canal IRC:"
@@ -299,7 +299,7 @@ msgid "Other skills:"
 msgstr "Outras habilidades:"
 
 msgid "Powered By"
-msgstr ""
+msgstr "Mantido por"
 
 msgid ""
 "You can use mumble voice chat for talking with other players.\n"
@@ -599,7 +599,7 @@ msgid "\"Quick drop N items\""
 msgstr ""
 
 msgid "Themes:"
-msgstr ""
+msgstr "\"Temas\""
 
 msgid ""
 "/msg NICK text, /whisper NICK text, /w NICK text - send whisper message to "
@@ -716,13 +716,13 @@ msgid "You can change any key in keyboard settings."
 msgstr "Você pode mudar qualquer tecla nas configurações de teclado."
 
 msgid "/dirs - show client dirs in debug chat tab."
-msgstr ""
+msgstr "/dirs - mostra diretório do cliente na aba \"Depurador\" do bate-papo."
 
 msgid "Website: @@http://manaplus.org/|http://manaplus.org/@@"
 msgstr ""
 
 msgid "/disconnect - quick disconnect from server."
-msgstr ""
+msgstr "/disconnect - desconexão rápida do servidor."
 
 msgid "\"Switch quick drop counter\""
 msgstr ""
@@ -734,7 +734,7 @@ msgid "\"Emote shortcut 13\""
 msgstr ""
 
 msgid "/disregard NICK - add nick to disregarded list."
-msgstr ""
+msgstr "/disregard NICK - adiciona um nick à lista de ignorados."
 
 msgid "\"Change crazy Move mode\""
 msgstr ""
@@ -779,7 +779,7 @@ msgid "\"Item shortcut 15\""
 msgstr ""
 
 msgid "About The Mana World"
-msgstr ""
+msgstr "Sobre o The Mana World"
 
 msgid "\"Emote shortcut 5\""
 msgstr ""
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 63b948536..58e94e9d7 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -72,6 +72,7 @@ src/gui/whoisonline.cpp
 src/gui/widgets/battletab.cpp
 src/gui/widgets/characterdisplay.cpp
 src/gui/widgets/chattab.cpp
+src/gui/widgets/colormodel.cpp
 src/gui/widgets/gmtab.cpp
 src/gui/widgets/guildchattab.cpp
 src/gui/widgets/itemcontainer.cpp
diff --git a/po/ar.po b/po/ar.po
index 66a854ca4..b77d25c1a 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-07-19 22:23+0300\n"
-"PO-Revision-Date: 2013-07-19 19:52+0000\n"
+"POT-Creation-Date: 2013-08-16 20:45+0300\n"
+"PO-Revision-Date: 2013-08-16 17:53+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/manaplus/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -38,21 +38,21 @@ msgstr ""
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1606 src/gui/whoisonline.cpp:835
+#: src/being.cpp:1713 src/gui/whoisonline.cpp:842
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1611 src/gui/whoisonline.cpp:840
+#: src/being.cpp:1718 src/gui/whoisonline.cpp:847
 msgid "I"
 msgstr ""
 
@@ -89,8 +89,8 @@ msgstr ""
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:1176 src/gui/didyouknowwindow.cpp:78
-#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:66
-#: src/gui/npcdialog.cpp:103 src/gui/popupmenu.cpp:562
+#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:70
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:562
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:81
 msgid "Close"
 msgstr ""
@@ -425,36 +425,36 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:465
+#: src/game.cpp:259 src/gui/widgets/chattab.cpp:466
 msgid "General"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: debug window name
 #. TRANSLATORS: full button name
-#: src/game.cpp:272 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:467
+#: src/game.cpp:275 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:468
 #: src/gui/windowmenu.cpp:154
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:536
+#: src/game.cpp:540
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:546
+#: src/game.cpp:550
 msgid "Saving screenshot failed!"
 msgstr ""
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:618
+#: src/game.cpp:622
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:621
+#: src/game.cpp:625
 msgid "Network Error"
 msgstr ""
 
@@ -489,7 +489,7 @@ msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:105
+#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:111
 msgid "Reset"
 msgstr ""
 
@@ -590,7 +590,7 @@ msgstr "شراء"
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
 #: src/gui/buydialog.cpp:251 src/gui/buydialog.cpp:531
-#: src/gui/selldialog.cpp:96 src/gui/selldialog.cpp:356
+#: src/gui/selldialog.cpp:97 src/gui/selldialog.cpp:357
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
@@ -607,8 +607,8 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/buydialog.cpp:265 src/gui/itemamountwindow.cpp:202
-#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:96
-#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:790
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:100
+#: src/gui/selldialog.cpp:101 src/gui/statuswindow.cpp:791
 msgid "+"
 msgstr ""
 
@@ -619,8 +619,8 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
 #: src/gui/buydialog.cpp:268 src/gui/itemamountwindow.cpp:200
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:98
-#: src/gui/selldialog.cpp:102 src/gui/statuswindow.cpp:803
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:102
+#: src/gui/selldialog.cpp:103 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr ""
 
@@ -628,7 +628,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/buydialog.cpp:271 src/gui/charcreatedialog.cpp:122
-#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1160
+#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1282
 msgid "Create"
 msgstr "إنشاء"
 
@@ -640,7 +640,7 @@ msgstr "إنشاء"
 #. TRANSLATORS: input action name
 #: src/gui/buydialog.cpp:273 src/gui/quitdialog.cpp:55
 #: src/gui/quitdialog.cpp:60 src/gui/quitdialog.cpp:62
-#: src/gui/selldialog.cpp:106 src/gui/serverdialog.cpp:262
+#: src/gui/selldialog.cpp:107 src/gui/serverdialog.cpp:262
 #: src/gui/setupactiondata.h:177
 msgid "Quit"
 msgstr "مغادرة"
@@ -650,9 +650,9 @@ msgstr "مغادرة"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:108
-#: src/gui/statuswindow.cpp:531 src/gui/statuswindow.cpp:586
-#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:821
+#: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:109
+#: src/gui/statuswindow.cpp:532 src/gui/statuswindow.cpp:587
+#: src/gui/statuswindow.cpp:788 src/gui/statuswindow.cpp:822
 msgid "Max"
 msgstr ""
 
@@ -672,7 +672,7 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #: src/gui/buyselldialog.cpp:69 src/gui/popupmenu.cpp:223
 #: src/gui/popupmenu.cpp:2455 src/gui/selldialog.cpp:54
-#: src/gui/selldialog.cpp:64 src/gui/selldialog.cpp:104
+#: src/gui/selldialog.cpp:64 src/gui/selldialog.cpp:105
 msgid "Sell"
 msgstr "بيع"
 
@@ -712,7 +712,7 @@ msgstr "بيع"
 #: src/gui/popupmenu.cpp:2309 src/gui/popupmenu.cpp:2543
 #: src/gui/popupmenu.cpp:2660 src/gui/quitdialog.cpp:73
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
-#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1094
+#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1216
 #: src/gui/textcommandeditor.cpp:211 src/gui/textdialog.cpp:53
 #: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:181
 msgid "Cancel"
@@ -996,92 +996,102 @@ msgstr ""
 #. TRANSLATORS: inventory sort mode
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
-#: src/gui/chatwindow.cpp:139 src/gui/inventorywindow.cpp:65
+#: src/gui/chatwindow.cpp:143 src/gui/inventorywindow.cpp:65
 #: src/gui/setup_other.cpp:69 src/gui/setup_visual.cpp:77
 msgid "default"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:141
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:145 src/gui/widgets/colormodel.cpp:76
 msgid "black"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:143
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:147 src/gui/widgets/colormodel.cpp:78
 msgid "red"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:145
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:149 src/gui/widgets/colormodel.cpp:80
 msgid "green"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:147
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:151 src/gui/widgets/colormodel.cpp:82
 msgid "blue"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:149
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:153 src/gui/widgets/colormodel.cpp:84
 msgid "gold"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:151
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:155 src/gui/widgets/colormodel.cpp:86
 msgid "yellow"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:153
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:157 src/gui/widgets/colormodel.cpp:88
 msgid "pink"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:155
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:159 src/gui/widgets/colormodel.cpp:90
 msgid "purple"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:157
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:161 src/gui/widgets/colormodel.cpp:92
 msgid "grey"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:159
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:163 src/gui/widgets/colormodel.cpp:94
 msgid "brown"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:161
+#: src/gui/chatwindow.cpp:165
 msgid "rainbow 1"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:163
+#: src/gui/chatwindow.cpp:167
 msgid "rainbow 2"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:165
+#: src/gui/chatwindow.cpp:169
 msgid "rainbow 3"
 msgstr ""
 
 #. TRANSLATORS: chat window name
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
-#: src/gui/chatwindow.cpp:192 src/gui/setupactiondata.h:1866
+#: src/gui/chatwindow.cpp:196 src/gui/setupactiondata.h:1866
 #: src/gui/setup_chat.cpp:50 src/gui/windowmenu.cpp:88
 msgid "Chat"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:641
+#: src/gui/chatwindow.cpp:684
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1044
+#: src/gui/chatwindow.cpp:1091
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -1390,6 +1400,38 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
+#. TRANSLATORS: font size
+#: src/gui/emotewindow.cpp:49
+msgid "Normal font"
+msgstr ""
+
+#. TRANSLATORS: font size
+#. TRANSLATORS: theme settings label
+#: src/gui/emotewindow.cpp:51 src/gui/setup_theme.cpp:249
+msgid "Bold font"
+msgstr ""
+
+#. TRANSLATORS: emotes window name
+#. TRANSLATORS: emotes tab name
+#. TRANSLATORS: input tab sub tab name
+#: src/gui/emotewindow.cpp:56 src/gui/emotewindow.cpp:107
+#: src/gui/setupactiondata.h:1862
+msgid "Emotes"
+msgstr ""
+
+#. TRANSLATORS: emotes tab name
+#. TRANSLATORS: settings group
+#. TRANSLATORS: settings colors tab name
+#: src/gui/emotewindow.cpp:109 src/gui/setup_chat.cpp:70
+#: src/gui/setup_colors.cpp:83
+msgid "Colors"
+msgstr ""
+
+#. TRANSLATORS: emotes tab name
+#: src/gui/emotewindow.cpp:111
+msgid "Fonts"
+msgstr ""
+
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/equipmentwindow.cpp:56 src/gui/inventorywindow.cpp:204
@@ -1481,7 +1523,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/inventorywindow.cpp:580 src/gui/statuswindow.cpp:143
-#: src/gui/statuswindow.cpp:284 src/gui/statuswindow.cpp:337
+#: src/gui/statuswindow.cpp:285 src/gui/statuswindow.cpp:338
 #: src/gui/widgets/characterdisplay.cpp:126
 #, c-format
 msgid "Money: %s"
@@ -1777,7 +1819,7 @@ msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:295
+#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:296
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
@@ -1785,7 +1827,7 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/ministatuswindow.cpp:317 src/gui/statuswindow.cpp:141
-#: src/gui/statuswindow.cpp:302 src/gui/statuswindow.cpp:373
+#: src/gui/statuswindow.cpp:303 src/gui/statuswindow.cpp:374
 #, c-format
 msgid "Level: %d"
 msgstr "المستوى: %d"
@@ -1802,34 +1844,45 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:62
+#: src/gui/npcdialog.cpp:66
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:64
+#: src/gui/npcdialog.cpp:68
 msgid "Next"
 msgstr "التّالي"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:68
+#: src/gui/npcdialog.cpp:72
 msgid "Submit"
 msgstr ""
 
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
 #. TRANSLATORS: settings group
-#: src/gui/npcdialog.cpp:77 src/gui/npcpostdialog.cpp:43
+#: src/gui/npcdialog.cpp:81 src/gui/npcpostdialog.cpp:43
 #: src/gui/setup_other.cpp:257
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:566
+#: src/gui/npcdialog.cpp:104 src/gui/popupmenu.cpp:566
 msgid "Clear"
 msgstr ""
 
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: trade window button
+#: src/gui/npcdialog.cpp:109 src/gui/serverdialog.cpp:266
+#: src/gui/shopwindow.cpp:95 src/gui/shopwindow.cpp:102
+#: src/gui/tradewindow.cpp:77
+msgid "Add"
+msgstr "إضافة"
+
 #. TRANSLATORS: label in npc post dialog
 #: src/gui/npcpostdialog.cpp:53
 msgid "To:"
@@ -2037,7 +2090,7 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: social window button
-#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1164
+#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1286
 msgid "Leave"
 msgstr ""
 
@@ -2171,7 +2224,7 @@ msgstr ""
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2194
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:985
 msgid "(default)"
 msgstr ""
 
@@ -2403,12 +2456,12 @@ msgid "Passwords do not match."
 msgstr "كلمات السرّ غير متطابقة."
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/selldialog.cpp:242
+#: src/gui/selldialog.cpp:243
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/selldialog.cpp:244
+#: src/gui/selldialog.cpp:245
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
@@ -2419,15 +2472,6 @@ msgid "Choose Your Server"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:266 src/gui/shopwindow.cpp:95
-#: src/gui/shopwindow.cpp:102 src/gui/tradewindow.cpp:77
-msgid "Add"
-msgstr "إضافة"
-
-#. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
 #: src/gui/serverdialog.cpp:268 src/gui/widgets/setupitem.cpp:303
 #: src/gui/widgets/setupitem.cpp:430
@@ -3163,11 +3207,6 @@ msgid "Windows"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1862
-msgid "Emotes"
-msgstr ""
-
-#. TRANSLATORS: input tab sub tab name
 #: src/gui/setupactiondata.h:1870
 msgid "Gui"
 msgstr ""
@@ -3323,18 +3362,12 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:61
-msgid "Auto hide chat window."
+msgid "Auto hide chat window"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:65
-msgid "Protect chat focus."
-msgstr ""
-
-#. TRANSLATORS: settings group
-#. TRANSLATORS: settings colors tab name
-#: src/gui/setup_chat.cpp:70 src/gui/setup_colors.cpp:83
-msgid "Colors"
+msgid "Protect chat focus"
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4429,11 +4462,6 @@ msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:249
-msgid "Bold font"
-msgstr ""
-
-#. TRANSLATORS: theme settings label
 #: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr ""
@@ -4919,258 +4947,289 @@ msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
-#: src/gui/socialwindow.cpp:158 src/gui/socialwindow.cpp:259
+#: src/gui/socialwindow.cpp:176 src/gui/socialwindow.cpp:309
 #: src/gui/widgets/guildchattab.cpp:42 src/net/ea/gui/guildtab.cpp:49
 msgid "Guild"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:213
+#: src/gui/socialwindow.cpp:231
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:245
 msgid "Member Invite to Guild"
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:229
+#: src/gui/socialwindow.cpp:247
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:238
+#: src/gui/socialwindow.cpp:256
 msgid "Leave Guild?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:240
+#: src/gui/socialwindow.cpp:258
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:269
+#, c-format
+msgid "Members: %u/%u"
+msgstr ""
+
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:291 src/gui/socialwindow.cpp:361
+#: src/gui/socialwindow.cpp:483
+#, c-format
+msgid "Players: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/socialwindow.cpp:302 src/net/ea/gui/partytab.cpp:49
+#: src/gui/socialwindow.cpp:376 src/net/ea/gui/partytab.cpp:49
 msgid "Party"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:341
+#: src/gui/socialwindow.cpp:415
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
 #. TRANSLATORS: tab in social window
-#: src/gui/socialwindow.cpp:356
+#: src/gui/socialwindow.cpp:430
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:370
+#: src/gui/socialwindow.cpp:444
 msgid "Member Invite to Party"
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:372
+#: src/gui/socialwindow.cpp:446
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:381
+#: src/gui/socialwindow.cpp:455
 msgid "Leave Party?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:383
+#: src/gui/socialwindow.cpp:457
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:681
+#, c-format
+msgid "Visible players: %d"
+msgstr ""
+
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:605
+#: src/gui/socialwindow.cpp:707
 msgid "Nav"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:809
+#, c-format
+msgid "Portals: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:922
+#: src/gui/socialwindow.cpp:1035
 msgid "Atk"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:941
+#: src/gui/socialwindow.cpp:1054
 msgid "Priority mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:943
+#: src/gui/socialwindow.cpp:1056
 msgid "Attack mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:945
+#: src/gui/socialwindow.cpp:1058
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:968
+#: src/gui/socialwindow.cpp:1081
 msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:987
+#: src/gui/socialwindow.cpp:1100
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:989
+#: src/gui/socialwindow.cpp:1102
 msgid "Ignore items"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:1190
+#, c-format
+msgid "Friends: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1091 src/gui/socialwindow.cpp:1563
+#: src/gui/socialwindow.cpp:1213 src/gui/socialwindow.cpp:1687
 msgid "Create Party"
 msgstr ""
 
 #. TRANSLATORS: social window name
 #. TRANSLATORS: full button name
-#: src/gui/socialwindow.cpp:1138 src/gui/windowmenu.cpp:126
+#: src/gui/socialwindow.cpp:1260 src/gui/windowmenu.cpp:126
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1273
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1156
+#: src/gui/socialwindow.cpp:1278
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/socialwindow.cpp:1162
+#: src/gui/socialwindow.cpp:1284
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1345
+#: src/gui/socialwindow.cpp:1469
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1356
+#: src/gui/socialwindow.cpp:1480
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1497
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1424
+#: src/gui/socialwindow.cpp:1548
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1445
+#: src/gui/socialwindow.cpp:1569
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1460
+#: src/gui/socialwindow.cpp:1584
 msgid "Guild Name"
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1462
+#: src/gui/socialwindow.cpp:1586
 msgid "Choose your guild's name."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1477
+#: src/gui/socialwindow.cpp:1601
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1485
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1616
 msgid "Accept Guild Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1631
 msgid "Received party request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1519
+#: src/gui/socialwindow.cpp:1643
 msgid "You have been invited you to join a party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1524
+#: src/gui/socialwindow.cpp:1648
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1533
+#: src/gui/socialwindow.cpp:1657
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1539
+#: src/gui/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1673
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1688
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1694
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1572
+#: src/gui/socialwindow.cpp:1696
 msgid "Choose your party's name."
 msgstr ""
 
@@ -5190,24 +5249,24 @@ msgid "MP:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:235 src/gui/statuswindow.cpp:423
+#: src/gui/statuswindow.cpp:234 src/gui/statuswindow.cpp:424
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:237
+#: src/gui/statuswindow.cpp:236
 msgid "Job:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:288 src/gui/statuswindow.cpp:345
+#: src/gui/statuswindow.cpp:289 src/gui/statuswindow.cpp:346
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:360
+#: src/gui/statuswindow.cpp:361
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
@@ -5653,13 +5712,13 @@ msgid "%s whispers: %s"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:540
+#: src/gui/widgets/chattab.cpp:541
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:545
+#: src/gui/widgets/chattab.cpp:546
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -5945,24 +6004,24 @@ msgstr ""
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/inputmanager.cpp:328 src/inputmanager.cpp:372 src/keyboardconfig.cpp:90
+#: src/inputmanager.cpp:329 src/inputmanager.cpp:373 src/keyboardconfig.cpp:90
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/inputmanager.cpp:334
+#: src/inputmanager.cpp:335
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/inputmanager.cpp:348
+#: src/inputmanager.cpp:349
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/inputmanager.cpp:378
+#: src/inputmanager.cpp:379
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -5970,7 +6029,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/inputmanager.cpp:392 src/keyboardconfig.cpp:103
+#: src/inputmanager.cpp:393 src/keyboardconfig.cpp:134
 msgid "u key"
 msgstr ""
 
@@ -6650,55 +6709,55 @@ msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:176
+#: src/net/ea/guildhandler.cpp:178
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:179
+#: src/net/ea/guildhandler.cpp:181
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:186
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:187
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:193
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:195
+#: src/net/ea/guildhandler.cpp:197
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:198
+#: src/net/ea/guildhandler.cpp:200
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
@@ -7573,8 +7632,8 @@ msgstr ""
 #. TRANSLATORS: being info default name
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
-#: src/resources/avatardb.cpp:69 src/resources/beinginfo.cpp:40
-#: src/resources/itemdb.cpp:291 src/resources/monsterdb.cpp:100
+#: src/resources/avatardb.cpp:69 src/resources/beinginfo.cpp:41
+#: src/resources/itemdb.cpp:295 src/resources/monsterdb.cpp:100
 msgid "unnamed"
 msgstr ""
 
diff --git a/po/bg.po b/po/bg.po
index 17bafe022..ad881fca7 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-07-19 22:23+0300\n"
-"PO-Revision-Date: 2013-07-19 19:52+0000\n"
+"POT-Creation-Date: 2013-08-16 20:45+0300\n"
+"PO-Revision-Date: 2013-08-16 17:53+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Bulgarian (http://www.transifex.com/projects/p/manaplus/language/bg/)\n"
 "MIME-Version: 1.0\n"
@@ -38,21 +38,21 @@ msgstr ""
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1606 src/gui/whoisonline.cpp:835
+#: src/being.cpp:1713 src/gui/whoisonline.cpp:842
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1611 src/gui/whoisonline.cpp:840
+#: src/being.cpp:1718 src/gui/whoisonline.cpp:847
 msgid "I"
 msgstr ""
 
@@ -89,8 +89,8 @@ msgstr ""
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:1176 src/gui/didyouknowwindow.cpp:78
-#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:66
-#: src/gui/npcdialog.cpp:103 src/gui/popupmenu.cpp:562
+#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:70
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:562
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:81
 msgid "Close"
 msgstr ""
@@ -425,36 +425,36 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:465
+#: src/game.cpp:259 src/gui/widgets/chattab.cpp:466
 msgid "General"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: debug window name
 #. TRANSLATORS: full button name
-#: src/game.cpp:272 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:467
+#: src/game.cpp:275 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:468
 #: src/gui/windowmenu.cpp:154
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:536
+#: src/game.cpp:540
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:546
+#: src/game.cpp:550
 msgid "Saving screenshot failed!"
 msgstr ""
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:618
+#: src/game.cpp:622
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:621
+#: src/game.cpp:625
 msgid "Network Error"
 msgstr ""
 
@@ -489,7 +489,7 @@ msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:105
+#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:111
 msgid "Reset"
 msgstr ""
 
@@ -590,7 +590,7 @@ msgstr ""
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
 #: src/gui/buydialog.cpp:251 src/gui/buydialog.cpp:531
-#: src/gui/selldialog.cpp:96 src/gui/selldialog.cpp:356
+#: src/gui/selldialog.cpp:97 src/gui/selldialog.cpp:357
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
@@ -607,8 +607,8 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/buydialog.cpp:265 src/gui/itemamountwindow.cpp:202
-#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:96
-#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:790
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:100
+#: src/gui/selldialog.cpp:101 src/gui/statuswindow.cpp:791
 msgid "+"
 msgstr ""
 
@@ -619,8 +619,8 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
 #: src/gui/buydialog.cpp:268 src/gui/itemamountwindow.cpp:200
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:98
-#: src/gui/selldialog.cpp:102 src/gui/statuswindow.cpp:803
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:102
+#: src/gui/selldialog.cpp:103 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr ""
 
@@ -628,7 +628,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/buydialog.cpp:271 src/gui/charcreatedialog.cpp:122
-#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1160
+#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1282
 msgid "Create"
 msgstr ""
 
@@ -640,7 +640,7 @@ msgstr ""
 #. TRANSLATORS: input action name
 #: src/gui/buydialog.cpp:273 src/gui/quitdialog.cpp:55
 #: src/gui/quitdialog.cpp:60 src/gui/quitdialog.cpp:62
-#: src/gui/selldialog.cpp:106 src/gui/serverdialog.cpp:262
+#: src/gui/selldialog.cpp:107 src/gui/serverdialog.cpp:262
 #: src/gui/setupactiondata.h:177
 msgid "Quit"
 msgstr ""
@@ -650,9 +650,9 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:108
-#: src/gui/statuswindow.cpp:531 src/gui/statuswindow.cpp:586
-#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:821
+#: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:109
+#: src/gui/statuswindow.cpp:532 src/gui/statuswindow.cpp:587
+#: src/gui/statuswindow.cpp:788 src/gui/statuswindow.cpp:822
 msgid "Max"
 msgstr ""
 
@@ -672,7 +672,7 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #: src/gui/buyselldialog.cpp:69 src/gui/popupmenu.cpp:223
 #: src/gui/popupmenu.cpp:2455 src/gui/selldialog.cpp:54
-#: src/gui/selldialog.cpp:64 src/gui/selldialog.cpp:104
+#: src/gui/selldialog.cpp:64 src/gui/selldialog.cpp:105
 msgid "Sell"
 msgstr ""
 
@@ -712,7 +712,7 @@ msgstr ""
 #: src/gui/popupmenu.cpp:2309 src/gui/popupmenu.cpp:2543
 #: src/gui/popupmenu.cpp:2660 src/gui/quitdialog.cpp:73
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
-#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1094
+#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1216
 #: src/gui/textcommandeditor.cpp:211 src/gui/textdialog.cpp:53
 #: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:181
 msgid "Cancel"
@@ -996,92 +996,102 @@ msgstr ""
 #. TRANSLATORS: inventory sort mode
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
-#: src/gui/chatwindow.cpp:139 src/gui/inventorywindow.cpp:65
+#: src/gui/chatwindow.cpp:143 src/gui/inventorywindow.cpp:65
 #: src/gui/setup_other.cpp:69 src/gui/setup_visual.cpp:77
 msgid "default"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:141
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:145 src/gui/widgets/colormodel.cpp:76
 msgid "black"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:143
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:147 src/gui/widgets/colormodel.cpp:78
 msgid "red"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:145
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:149 src/gui/widgets/colormodel.cpp:80
 msgid "green"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:147
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:151 src/gui/widgets/colormodel.cpp:82
 msgid "blue"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:149
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:153 src/gui/widgets/colormodel.cpp:84
 msgid "gold"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:151
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:155 src/gui/widgets/colormodel.cpp:86
 msgid "yellow"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:153
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:157 src/gui/widgets/colormodel.cpp:88
 msgid "pink"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:155
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:159 src/gui/widgets/colormodel.cpp:90
 msgid "purple"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:157
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:161 src/gui/widgets/colormodel.cpp:92
 msgid "grey"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:159
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:163 src/gui/widgets/colormodel.cpp:94
 msgid "brown"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:161
+#: src/gui/chatwindow.cpp:165
 msgid "rainbow 1"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:163
+#: src/gui/chatwindow.cpp:167
 msgid "rainbow 2"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:165
+#: src/gui/chatwindow.cpp:169
 msgid "rainbow 3"
 msgstr ""
 
 #. TRANSLATORS: chat window name
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
-#: src/gui/chatwindow.cpp:192 src/gui/setupactiondata.h:1866
+#: src/gui/chatwindow.cpp:196 src/gui/setupactiondata.h:1866
 #: src/gui/setup_chat.cpp:50 src/gui/windowmenu.cpp:88
 msgid "Chat"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:641
+#: src/gui/chatwindow.cpp:684
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1044
+#: src/gui/chatwindow.cpp:1091
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -1390,6 +1400,38 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
+#. TRANSLATORS: font size
+#: src/gui/emotewindow.cpp:49
+msgid "Normal font"
+msgstr ""
+
+#. TRANSLATORS: font size
+#. TRANSLATORS: theme settings label
+#: src/gui/emotewindow.cpp:51 src/gui/setup_theme.cpp:249
+msgid "Bold font"
+msgstr ""
+
+#. TRANSLATORS: emotes window name
+#. TRANSLATORS: emotes tab name
+#. TRANSLATORS: input tab sub tab name
+#: src/gui/emotewindow.cpp:56 src/gui/emotewindow.cpp:107
+#: src/gui/setupactiondata.h:1862
+msgid "Emotes"
+msgstr ""
+
+#. TRANSLATORS: emotes tab name
+#. TRANSLATORS: settings group
+#. TRANSLATORS: settings colors tab name
+#: src/gui/emotewindow.cpp:109 src/gui/setup_chat.cpp:70
+#: src/gui/setup_colors.cpp:83
+msgid "Colors"
+msgstr ""
+
+#. TRANSLATORS: emotes tab name
+#: src/gui/emotewindow.cpp:111
+msgid "Fonts"
+msgstr ""
+
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/equipmentwindow.cpp:56 src/gui/inventorywindow.cpp:204
@@ -1481,7 +1523,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/inventorywindow.cpp:580 src/gui/statuswindow.cpp:143
-#: src/gui/statuswindow.cpp:284 src/gui/statuswindow.cpp:337
+#: src/gui/statuswindow.cpp:285 src/gui/statuswindow.cpp:338
 #: src/gui/widgets/characterdisplay.cpp:126
 #, c-format
 msgid "Money: %s"
@@ -1769,7 +1811,7 @@ msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:295
+#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:296
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
@@ -1777,7 +1819,7 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/ministatuswindow.cpp:317 src/gui/statuswindow.cpp:141
-#: src/gui/statuswindow.cpp:302 src/gui/statuswindow.cpp:373
+#: src/gui/statuswindow.cpp:303 src/gui/statuswindow.cpp:374
 #, c-format
 msgid "Level: %d"
 msgstr ""
@@ -1794,34 +1836,45 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:62
+#: src/gui/npcdialog.cpp:66
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:64
+#: src/gui/npcdialog.cpp:68
 msgid "Next"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:68
+#: src/gui/npcdialog.cpp:72
 msgid "Submit"
 msgstr ""
 
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
 #. TRANSLATORS: settings group
-#: src/gui/npcdialog.cpp:77 src/gui/npcpostdialog.cpp:43
+#: src/gui/npcdialog.cpp:81 src/gui/npcpostdialog.cpp:43
 #: src/gui/setup_other.cpp:257
 msgid "NPC"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:566
+#: src/gui/npcdialog.cpp:104 src/gui/popupmenu.cpp:566
 msgid "Clear"
 msgstr ""
 
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: trade window button
+#: src/gui/npcdialog.cpp:109 src/gui/serverdialog.cpp:266
+#: src/gui/shopwindow.cpp:95 src/gui/shopwindow.cpp:102
+#: src/gui/tradewindow.cpp:77
+msgid "Add"
+msgstr ""
+
 #. TRANSLATORS: label in npc post dialog
 #: src/gui/npcpostdialog.cpp:53
 msgid "To:"
@@ -2029,7 +2082,7 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: social window button
-#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1164
+#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1286
 msgid "Leave"
 msgstr ""
 
@@ -2163,7 +2216,7 @@ msgstr ""
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2194
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:985
 msgid "(default)"
 msgstr ""
 
@@ -2395,12 +2448,12 @@ msgid "Passwords do not match."
 msgstr ""
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/selldialog.cpp:242
+#: src/gui/selldialog.cpp:243
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/selldialog.cpp:244
+#: src/gui/selldialog.cpp:245
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
@@ -2411,15 +2464,6 @@ msgid "Choose Your Server"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:266 src/gui/shopwindow.cpp:95
-#: src/gui/shopwindow.cpp:102 src/gui/tradewindow.cpp:77
-msgid "Add"
-msgstr ""
-
-#. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
 #: src/gui/serverdialog.cpp:268 src/gui/widgets/setupitem.cpp:303
 #: src/gui/widgets/setupitem.cpp:430
@@ -3155,11 +3199,6 @@ msgid "Windows"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1862
-msgid "Emotes"
-msgstr ""
-
-#. TRANSLATORS: input tab sub tab name
 #: src/gui/setupactiondata.h:1870
 msgid "Gui"
 msgstr ""
@@ -3315,18 +3354,12 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:61
-msgid "Auto hide chat window."
+msgid "Auto hide chat window"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:65
-msgid "Protect chat focus."
-msgstr ""
-
-#. TRANSLATORS: settings group
-#. TRANSLATORS: settings colors tab name
-#: src/gui/setup_chat.cpp:70 src/gui/setup_colors.cpp:83
-msgid "Colors"
+msgid "Protect chat focus"
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4421,11 +4454,6 @@ msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:249
-msgid "Bold font"
-msgstr ""
-
-#. TRANSLATORS: theme settings label
 #: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr ""
@@ -4911,258 +4939,289 @@ msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
-#: src/gui/socialwindow.cpp:158 src/gui/socialwindow.cpp:259
+#: src/gui/socialwindow.cpp:176 src/gui/socialwindow.cpp:309
 #: src/gui/widgets/guildchattab.cpp:42 src/net/ea/gui/guildtab.cpp:49
 msgid "Guild"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:213
+#: src/gui/socialwindow.cpp:231
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:245
 msgid "Member Invite to Guild"
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:229
+#: src/gui/socialwindow.cpp:247
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:238
+#: src/gui/socialwindow.cpp:256
 msgid "Leave Guild?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:240
+#: src/gui/socialwindow.cpp:258
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:269
+#, c-format
+msgid "Members: %u/%u"
+msgstr ""
+
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:291 src/gui/socialwindow.cpp:361
+#: src/gui/socialwindow.cpp:483
+#, c-format
+msgid "Players: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/socialwindow.cpp:302 src/net/ea/gui/partytab.cpp:49
+#: src/gui/socialwindow.cpp:376 src/net/ea/gui/partytab.cpp:49
 msgid "Party"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:341
+#: src/gui/socialwindow.cpp:415
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
 #. TRANSLATORS: tab in social window
-#: src/gui/socialwindow.cpp:356
+#: src/gui/socialwindow.cpp:430
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:370
+#: src/gui/socialwindow.cpp:444
 msgid "Member Invite to Party"
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:372
+#: src/gui/socialwindow.cpp:446
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:381
+#: src/gui/socialwindow.cpp:455
 msgid "Leave Party?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:383
+#: src/gui/socialwindow.cpp:457
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:681
+#, c-format
+msgid "Visible players: %d"
+msgstr ""
+
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:605
+#: src/gui/socialwindow.cpp:707
 msgid "Nav"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:809
+#, c-format
+msgid "Portals: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:922
+#: src/gui/socialwindow.cpp:1035
 msgid "Atk"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:941
+#: src/gui/socialwindow.cpp:1054
 msgid "Priority mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:943
+#: src/gui/socialwindow.cpp:1056
 msgid "Attack mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:945
+#: src/gui/socialwindow.cpp:1058
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:968
+#: src/gui/socialwindow.cpp:1081
 msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:987
+#: src/gui/socialwindow.cpp:1100
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:989
+#: src/gui/socialwindow.cpp:1102
 msgid "Ignore items"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:1190
+#, c-format
+msgid "Friends: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1091 src/gui/socialwindow.cpp:1563
+#: src/gui/socialwindow.cpp:1213 src/gui/socialwindow.cpp:1687
 msgid "Create Party"
 msgstr ""
 
 #. TRANSLATORS: social window name
 #. TRANSLATORS: full button name
-#: src/gui/socialwindow.cpp:1138 src/gui/windowmenu.cpp:126
+#: src/gui/socialwindow.cpp:1260 src/gui/windowmenu.cpp:126
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1273
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1156
+#: src/gui/socialwindow.cpp:1278
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/socialwindow.cpp:1162
+#: src/gui/socialwindow.cpp:1284
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1345
+#: src/gui/socialwindow.cpp:1469
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1356
+#: src/gui/socialwindow.cpp:1480
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1497
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1424
+#: src/gui/socialwindow.cpp:1548
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1445
+#: src/gui/socialwindow.cpp:1569
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1460
+#: src/gui/socialwindow.cpp:1584
 msgid "Guild Name"
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1462
+#: src/gui/socialwindow.cpp:1586
 msgid "Choose your guild's name."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1477
+#: src/gui/socialwindow.cpp:1601
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1485
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1616
 msgid "Accept Guild Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1631
 msgid "Received party request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1519
+#: src/gui/socialwindow.cpp:1643
 msgid "You have been invited you to join a party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1524
+#: src/gui/socialwindow.cpp:1648
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1533
+#: src/gui/socialwindow.cpp:1657
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1539
+#: src/gui/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1673
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1688
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1694
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1572
+#: src/gui/socialwindow.cpp:1696
 msgid "Choose your party's name."
 msgstr ""
 
@@ -5182,24 +5241,24 @@ msgid "MP:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:235 src/gui/statuswindow.cpp:423
+#: src/gui/statuswindow.cpp:234 src/gui/statuswindow.cpp:424
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:237
+#: src/gui/statuswindow.cpp:236
 msgid "Job:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:288 src/gui/statuswindow.cpp:345
+#: src/gui/statuswindow.cpp:289 src/gui/statuswindow.cpp:346
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:360
+#: src/gui/statuswindow.cpp:361
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
@@ -5645,13 +5704,13 @@ msgid "%s whispers: %s"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:540
+#: src/gui/widgets/chattab.cpp:541
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:545
+#: src/gui/widgets/chattab.cpp:546
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -5937,24 +5996,24 @@ msgstr ""
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/inputmanager.cpp:328 src/inputmanager.cpp:372 src/keyboardconfig.cpp:90
+#: src/inputmanager.cpp:329 src/inputmanager.cpp:373 src/keyboardconfig.cpp:90
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/inputmanager.cpp:334
+#: src/inputmanager.cpp:335
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/inputmanager.cpp:348
+#: src/inputmanager.cpp:349
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/inputmanager.cpp:378
+#: src/inputmanager.cpp:379
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -5962,7 +6021,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/inputmanager.cpp:392 src/keyboardconfig.cpp:103
+#: src/inputmanager.cpp:393 src/keyboardconfig.cpp:134
 msgid "u key"
 msgstr ""
 
@@ -6638,55 +6697,55 @@ msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:176
+#: src/net/ea/guildhandler.cpp:178
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:179
+#: src/net/ea/guildhandler.cpp:181
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:186
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:187
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:193
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:195
+#: src/net/ea/guildhandler.cpp:197
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:198
+#: src/net/ea/guildhandler.cpp:200
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
@@ -7561,8 +7620,8 @@ msgstr ""
 #. TRANSLATORS: being info default name
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
-#: src/resources/avatardb.cpp:69 src/resources/beinginfo.cpp:40
-#: src/resources/itemdb.cpp:291 src/resources/monsterdb.cpp:100
+#: src/resources/avatardb.cpp:69 src/resources/beinginfo.cpp:41
+#: src/resources/itemdb.cpp:295 src/resources/monsterdb.cpp:100
 msgid "unnamed"
 msgstr ""
 
diff --git a/po/ca.po b/po/ca.po
index dda1639ad..166487aac 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-07-19 22:23+0300\n"
-"PO-Revision-Date: 2013-07-19 19:52+0000\n"
+"POT-Creation-Date: 2013-08-16 20:45+0300\n"
+"PO-Revision-Date: 2013-08-16 17:53+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/manaplus/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -38,21 +38,21 @@ msgstr ""
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1606 src/gui/whoisonline.cpp:835
+#: src/being.cpp:1713 src/gui/whoisonline.cpp:842
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1611 src/gui/whoisonline.cpp:840
+#: src/being.cpp:1718 src/gui/whoisonline.cpp:847
 msgid "I"
 msgstr ""
 
@@ -89,8 +89,8 @@ msgstr ""
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:1176 src/gui/didyouknowwindow.cpp:78
-#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:66
-#: src/gui/npcdialog.cpp:103 src/gui/popupmenu.cpp:562
+#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:70
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:562
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:81
 msgid "Close"
 msgstr ""
@@ -425,36 +425,36 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:465
+#: src/game.cpp:259 src/gui/widgets/chattab.cpp:466
 msgid "General"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: debug window name
 #. TRANSLATORS: full button name
-#: src/game.cpp:272 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:467
+#: src/game.cpp:275 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:468
 #: src/gui/windowmenu.cpp:154
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:536
+#: src/game.cpp:540
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:546
+#: src/game.cpp:550
 msgid "Saving screenshot failed!"
 msgstr ""
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:618
+#: src/game.cpp:622
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:621
+#: src/game.cpp:625
 msgid "Network Error"
 msgstr ""
 
@@ -489,7 +489,7 @@ msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:105
+#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:111
 msgid "Reset"
 msgstr ""
 
@@ -590,7 +590,7 @@ msgstr ""
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
 #: src/gui/buydialog.cpp:251 src/gui/buydialog.cpp:531
-#: src/gui/selldialog.cpp:96 src/gui/selldialog.cpp:356
+#: src/gui/selldialog.cpp:97 src/gui/selldialog.cpp:357
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
@@ -607,8 +607,8 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/buydialog.cpp:265 src/gui/itemamountwindow.cpp:202
-#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:96
-#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:790
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:100
+#: src/gui/selldialog.cpp:101 src/gui/statuswindow.cpp:791
 msgid "+"
 msgstr ""
 
@@ -619,8 +619,8 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
 #: src/gui/buydialog.cpp:268 src/gui/itemamountwindow.cpp:200
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:98
-#: src/gui/selldialog.cpp:102 src/gui/statuswindow.cpp:803
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:102
+#: src/gui/selldialog.cpp:103 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr ""
 
@@ -628,7 +628,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/buydialog.cpp:271 src/gui/charcreatedialog.cpp:122
-#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1160
+#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1282
 msgid "Create"
 msgstr ""
 
@@ -640,7 +640,7 @@ msgstr ""
 #. TRANSLATORS: input action name
 #: src/gui/buydialog.cpp:273 src/gui/quitdialog.cpp:55
 #: src/gui/quitdialog.cpp:60 src/gui/quitdialog.cpp:62
-#: src/gui/selldialog.cpp:106 src/gui/serverdialog.cpp:262
+#: src/gui/selldialog.cpp:107 src/gui/serverdialog.cpp:262
 #: src/gui/setupactiondata.h:177
 msgid "Quit"
 msgstr "sortir"
@@ -650,9 +650,9 @@ msgstr "sortir"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:108
-#: src/gui/statuswindow.cpp:531 src/gui/statuswindow.cpp:586
-#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:821
+#: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:109
+#: src/gui/statuswindow.cpp:532 src/gui/statuswindow.cpp:587
+#: src/gui/statuswindow.cpp:788 src/gui/statuswindow.cpp:822
 msgid "Max"
 msgstr ""
 
@@ -672,7 +672,7 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #: src/gui/buyselldialog.cpp:69 src/gui/popupmenu.cpp:223
 #: src/gui/popupmenu.cpp:2455 src/gui/selldialog.cpp:54
-#: src/gui/selldialog.cpp:64 src/gui/selldialog.cpp:104
+#: src/gui/selldialog.cpp:64 src/gui/selldialog.cpp:105
 msgid "Sell"
 msgstr ""
 
@@ -712,7 +712,7 @@ msgstr ""
 #: src/gui/popupmenu.cpp:2309 src/gui/popupmenu.cpp:2543
 #: src/gui/popupmenu.cpp:2660 src/gui/quitdialog.cpp:73
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
-#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1094
+#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1216
 #: src/gui/textcommandeditor.cpp:211 src/gui/textdialog.cpp:53
 #: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:181
 msgid "Cancel"
@@ -996,92 +996,102 @@ msgstr ""
 #. TRANSLATORS: inventory sort mode
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
-#: src/gui/chatwindow.cpp:139 src/gui/inventorywindow.cpp:65
+#: src/gui/chatwindow.cpp:143 src/gui/inventorywindow.cpp:65
 #: src/gui/setup_other.cpp:69 src/gui/setup_visual.cpp:77
 msgid "default"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:141
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:145 src/gui/widgets/colormodel.cpp:76
 msgid "black"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:143
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:147 src/gui/widgets/colormodel.cpp:78
 msgid "red"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:145
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:149 src/gui/widgets/colormodel.cpp:80
 msgid "green"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:147
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:151 src/gui/widgets/colormodel.cpp:82
 msgid "blue"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:149
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:153 src/gui/widgets/colormodel.cpp:84
 msgid "gold"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:151
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:155 src/gui/widgets/colormodel.cpp:86
 msgid "yellow"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:153
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:157 src/gui/widgets/colormodel.cpp:88
 msgid "pink"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:155
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:159 src/gui/widgets/colormodel.cpp:90
 msgid "purple"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:157
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:161 src/gui/widgets/colormodel.cpp:92
 msgid "grey"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:159
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:163 src/gui/widgets/colormodel.cpp:94
 msgid "brown"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:161
+#: src/gui/chatwindow.cpp:165
 msgid "rainbow 1"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:163
+#: src/gui/chatwindow.cpp:167
 msgid "rainbow 2"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:165
+#: src/gui/chatwindow.cpp:169
 msgid "rainbow 3"
 msgstr ""
 
 #. TRANSLATORS: chat window name
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
-#: src/gui/chatwindow.cpp:192 src/gui/setupactiondata.h:1866
+#: src/gui/chatwindow.cpp:196 src/gui/setupactiondata.h:1866
 #: src/gui/setup_chat.cpp:50 src/gui/windowmenu.cpp:88
 msgid "Chat"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:641
+#: src/gui/chatwindow.cpp:684
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1044
+#: src/gui/chatwindow.cpp:1091
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -1390,6 +1400,38 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
+#. TRANSLATORS: font size
+#: src/gui/emotewindow.cpp:49
+msgid "Normal font"
+msgstr ""
+
+#. TRANSLATORS: font size
+#. TRANSLATORS: theme settings label
+#: src/gui/emotewindow.cpp:51 src/gui/setup_theme.cpp:249
+msgid "Bold font"
+msgstr ""
+
+#. TRANSLATORS: emotes window name
+#. TRANSLATORS: emotes tab name
+#. TRANSLATORS: input tab sub tab name
+#: src/gui/emotewindow.cpp:56 src/gui/emotewindow.cpp:107
+#: src/gui/setupactiondata.h:1862
+msgid "Emotes"
+msgstr ""
+
+#. TRANSLATORS: emotes tab name
+#. TRANSLATORS: settings group
+#. TRANSLATORS: settings colors tab name
+#: src/gui/emotewindow.cpp:109 src/gui/setup_chat.cpp:70
+#: src/gui/setup_colors.cpp:83
+msgid "Colors"
+msgstr ""
+
+#. TRANSLATORS: emotes tab name
+#: src/gui/emotewindow.cpp:111
+msgid "Fonts"
+msgstr ""
+
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/equipmentwindow.cpp:56 src/gui/inventorywindow.cpp:204
@@ -1481,7 +1523,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/inventorywindow.cpp:580 src/gui/statuswindow.cpp:143
-#: src/gui/statuswindow.cpp:284 src/gui/statuswindow.cpp:337
+#: src/gui/statuswindow.cpp:285 src/gui/statuswindow.cpp:338
 #: src/gui/widgets/characterdisplay.cpp:126
 #, c-format
 msgid "Money: %s"
@@ -1769,7 +1811,7 @@ msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:295
+#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:296
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
@@ -1777,7 +1819,7 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/ministatuswindow.cpp:317 src/gui/statuswindow.cpp:141
-#: src/gui/statuswindow.cpp:302 src/gui/statuswindow.cpp:373
+#: src/gui/statuswindow.cpp:303 src/gui/statuswindow.cpp:374
 #, c-format
 msgid "Level: %d"
 msgstr ""
@@ -1794,34 +1836,45 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:62
+#: src/gui/npcdialog.cpp:66
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:64
+#: src/gui/npcdialog.cpp:68
 msgid "Next"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:68
+#: src/gui/npcdialog.cpp:72
 msgid "Submit"
 msgstr ""
 
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
 #. TRANSLATORS: settings group
-#: src/gui/npcdialog.cpp:77 src/gui/npcpostdialog.cpp:43
+#: src/gui/npcdialog.cpp:81 src/gui/npcpostdialog.cpp:43
 #: src/gui/setup_other.cpp:257
 msgid "NPC"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:566
+#: src/gui/npcdialog.cpp:104 src/gui/popupmenu.cpp:566
 msgid "Clear"
 msgstr ""
 
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: trade window button
+#: src/gui/npcdialog.cpp:109 src/gui/serverdialog.cpp:266
+#: src/gui/shopwindow.cpp:95 src/gui/shopwindow.cpp:102
+#: src/gui/tradewindow.cpp:77
+msgid "Add"
+msgstr ""
+
 #. TRANSLATORS: label in npc post dialog
 #: src/gui/npcpostdialog.cpp:53
 msgid "To:"
@@ -2029,7 +2082,7 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: social window button
-#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1164
+#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1286
 msgid "Leave"
 msgstr ""
 
@@ -2163,7 +2216,7 @@ msgstr ""
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2194
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:985
 msgid "(default)"
 msgstr ""
 
@@ -2395,12 +2448,12 @@ msgid "Passwords do not match."
 msgstr ""
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/selldialog.cpp:242
+#: src/gui/selldialog.cpp:243
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/selldialog.cpp:244
+#: src/gui/selldialog.cpp:245
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
@@ -2411,15 +2464,6 @@ msgid "Choose Your Server"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:266 src/gui/shopwindow.cpp:95
-#: src/gui/shopwindow.cpp:102 src/gui/tradewindow.cpp:77
-msgid "Add"
-msgstr ""
-
-#. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
 #: src/gui/serverdialog.cpp:268 src/gui/widgets/setupitem.cpp:303
 #: src/gui/widgets/setupitem.cpp:430
@@ -3155,11 +3199,6 @@ msgid "Windows"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1862
-msgid "Emotes"
-msgstr ""
-
-#. TRANSLATORS: input tab sub tab name
 #: src/gui/setupactiondata.h:1870
 msgid "Gui"
 msgstr ""
@@ -3315,18 +3354,12 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:61
-msgid "Auto hide chat window."
+msgid "Auto hide chat window"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:65
-msgid "Protect chat focus."
-msgstr ""
-
-#. TRANSLATORS: settings group
-#. TRANSLATORS: settings colors tab name
-#: src/gui/setup_chat.cpp:70 src/gui/setup_colors.cpp:83
-msgid "Colors"
+msgid "Protect chat focus"
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4421,11 +4454,6 @@ msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:249
-msgid "Bold font"
-msgstr ""
-
-#. TRANSLATORS: theme settings label
 #: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr ""
@@ -4911,258 +4939,289 @@ msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
-#: src/gui/socialwindow.cpp:158 src/gui/socialwindow.cpp:259
+#: src/gui/socialwindow.cpp:176 src/gui/socialwindow.cpp:309
 #: src/gui/widgets/guildchattab.cpp:42 src/net/ea/gui/guildtab.cpp:49
 msgid "Guild"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:213
+#: src/gui/socialwindow.cpp:231
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:245
 msgid "Member Invite to Guild"
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:229
+#: src/gui/socialwindow.cpp:247
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:238
+#: src/gui/socialwindow.cpp:256
 msgid "Leave Guild?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:240
+#: src/gui/socialwindow.cpp:258
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:269
+#, c-format
+msgid "Members: %u/%u"
+msgstr ""
+
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:291 src/gui/socialwindow.cpp:361
+#: src/gui/socialwindow.cpp:483
+#, c-format
+msgid "Players: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/socialwindow.cpp:302 src/net/ea/gui/partytab.cpp:49
+#: src/gui/socialwindow.cpp:376 src/net/ea/gui/partytab.cpp:49
 msgid "Party"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:341
+#: src/gui/socialwindow.cpp:415
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
 #. TRANSLATORS: tab in social window
-#: src/gui/socialwindow.cpp:356
+#: src/gui/socialwindow.cpp:430
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:370
+#: src/gui/socialwindow.cpp:444
 msgid "Member Invite to Party"
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:372
+#: src/gui/socialwindow.cpp:446
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:381
+#: src/gui/socialwindow.cpp:455
 msgid "Leave Party?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:383
+#: src/gui/socialwindow.cpp:457
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:681
+#, c-format
+msgid "Visible players: %d"
+msgstr ""
+
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:605
+#: src/gui/socialwindow.cpp:707
 msgid "Nav"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:809
+#, c-format
+msgid "Portals: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:922
+#: src/gui/socialwindow.cpp:1035
 msgid "Atk"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:941
+#: src/gui/socialwindow.cpp:1054
 msgid "Priority mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:943
+#: src/gui/socialwindow.cpp:1056
 msgid "Attack mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:945
+#: src/gui/socialwindow.cpp:1058
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:968
+#: src/gui/socialwindow.cpp:1081
 msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:987
+#: src/gui/socialwindow.cpp:1100
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:989
+#: src/gui/socialwindow.cpp:1102
 msgid "Ignore items"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:1190
+#, c-format
+msgid "Friends: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1091 src/gui/socialwindow.cpp:1563
+#: src/gui/socialwindow.cpp:1213 src/gui/socialwindow.cpp:1687
 msgid "Create Party"
 msgstr ""
 
 #. TRANSLATORS: social window name
 #. TRANSLATORS: full button name
-#: src/gui/socialwindow.cpp:1138 src/gui/windowmenu.cpp:126
+#: src/gui/socialwindow.cpp:1260 src/gui/windowmenu.cpp:126
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1273
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1156
+#: src/gui/socialwindow.cpp:1278
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/socialwindow.cpp:1162
+#: src/gui/socialwindow.cpp:1284
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1345
+#: src/gui/socialwindow.cpp:1469
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1356
+#: src/gui/socialwindow.cpp:1480
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1497
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1424
+#: src/gui/socialwindow.cpp:1548
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1445
+#: src/gui/socialwindow.cpp:1569
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1460
+#: src/gui/socialwindow.cpp:1584
 msgid "Guild Name"
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1462
+#: src/gui/socialwindow.cpp:1586
 msgid "Choose your guild's name."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1477
+#: src/gui/socialwindow.cpp:1601
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1485
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1616
 msgid "Accept Guild Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1631
 msgid "Received party request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1519
+#: src/gui/socialwindow.cpp:1643
 msgid "You have been invited you to join a party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1524
+#: src/gui/socialwindow.cpp:1648
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1533
+#: src/gui/socialwindow.cpp:1657
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1539
+#: src/gui/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1673
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1688
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1694
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1572
+#: src/gui/socialwindow.cpp:1696
 msgid "Choose your party's name."
 msgstr ""
 
@@ -5182,24 +5241,24 @@ msgid "MP:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:235 src/gui/statuswindow.cpp:423
+#: src/gui/statuswindow.cpp:234 src/gui/statuswindow.cpp:424
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:237
+#: src/gui/statuswindow.cpp:236
 msgid "Job:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:288 src/gui/statuswindow.cpp:345
+#: src/gui/statuswindow.cpp:289 src/gui/statuswindow.cpp:346
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:360
+#: src/gui/statuswindow.cpp:361
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
@@ -5645,13 +5704,13 @@ msgid "%s whispers: %s"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:540
+#: src/gui/widgets/chattab.cpp:541
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:545
+#: src/gui/widgets/chattab.cpp:546
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -5937,24 +5996,24 @@ msgstr ""
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/inputmanager.cpp:328 src/inputmanager.cpp:372 src/keyboardconfig.cpp:90
+#: src/inputmanager.cpp:329 src/inputmanager.cpp:373 src/keyboardconfig.cpp:90
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/inputmanager.cpp:334
+#: src/inputmanager.cpp:335
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/inputmanager.cpp:348
+#: src/inputmanager.cpp:349
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/inputmanager.cpp:378
+#: src/inputmanager.cpp:379
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -5962,7 +6021,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/inputmanager.cpp:392 src/keyboardconfig.cpp:103
+#: src/inputmanager.cpp:393 src/keyboardconfig.cpp:134
 msgid "u key"
 msgstr ""
 
@@ -6638,55 +6697,55 @@ msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:176
+#: src/net/ea/guildhandler.cpp:178
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:179
+#: src/net/ea/guildhandler.cpp:181
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:186
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:187
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:193
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:195
+#: src/net/ea/guildhandler.cpp:197
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:198
+#: src/net/ea/guildhandler.cpp:200
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
@@ -7561,8 +7620,8 @@ msgstr ""
 #. TRANSLATORS: being info default name
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
-#: src/resources/avatardb.cpp:69 src/resources/beinginfo.cpp:40
-#: src/resources/itemdb.cpp:291 src/resources/monsterdb.cpp:100
+#: src/resources/avatardb.cpp:69 src/resources/beinginfo.cpp:41
+#: src/resources/itemdb.cpp:295 src/resources/monsterdb.cpp:100
 msgid "unnamed"
 msgstr ""
 
diff --git a/po/cs.po b/po/cs.po
index bbc115493..54dd4fa82 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-08-03 13:52+0300\n"
-"PO-Revision-Date: 2013-07-19 19:52+0000\n"
+"POT-Creation-Date: 2013-08-17 13:35+0300\n"
+"PO-Revision-Date: 2013-08-16 17:53+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Czech (http://www.transifex.com/projects/p/manaplus/language/"
 "cs/)\n"
@@ -42,21 +42,21 @@ msgstr "Viditelný na mapě"
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "dodge"
 msgstr "uskočil"
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "miss"
 msgstr "minul"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1710 src/gui/whoisonline.cpp:835
+#: src/being.cpp:1713 src/gui/whoisonline.cpp:842
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1715 src/gui/whoisonline.cpp:840
+#: src/being.cpp:1718 src/gui/whoisonline.cpp:847
 msgid "I"
 msgstr ""
 
@@ -93,8 +93,8 @@ msgstr "Téma"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:1176 src/gui/didyouknowwindow.cpp:78
-#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:66
-#: src/gui/npcdialog.cpp:103 src/gui/popupmenu.cpp:562
+#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:70
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:562
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:81
 msgid "Close"
 msgstr "Zavřít"
@@ -431,14 +431,14 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "Volby k %s jsou \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:259 src/gui/widgets/chattab.cpp:465
+#: src/game.cpp:259 src/gui/widgets/chattab.cpp:466
 msgid "General"
 msgstr "Obecná"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: debug window name
 #. TRANSLATORS: full button name
-#: src/game.cpp:275 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:467
+#: src/game.cpp:275 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:468
 #: src/gui/windowmenu.cpp:154
 msgid "Debug"
 msgstr "Debug"
@@ -495,7 +495,7 @@ msgstr "Ověřovač botů"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:105
+#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:111
 msgid "Reset"
 msgstr "Vynulovat"
 
@@ -613,8 +613,8 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/buydialog.cpp:265 src/gui/itemamountwindow.cpp:202
-#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:96
-#: src/gui/selldialog.cpp:101 src/gui/statuswindow.cpp:790
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:100
+#: src/gui/selldialog.cpp:101 src/gui/statuswindow.cpp:791
 msgid "+"
 msgstr "+"
 
@@ -625,8 +625,8 @@ msgstr "+"
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
 #: src/gui/buydialog.cpp:268 src/gui/itemamountwindow.cpp:200
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:98
-#: src/gui/selldialog.cpp:103 src/gui/statuswindow.cpp:803
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:102
+#: src/gui/selldialog.cpp:103 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr "-"
 
@@ -634,7 +634,7 @@ msgstr "-"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/buydialog.cpp:271 src/gui/charcreatedialog.cpp:122
-#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1160
+#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1282
 msgid "Create"
 msgstr "Vytvořit"
 
@@ -657,8 +657,8 @@ msgstr "Ukončit"
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
 #: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:109
-#: src/gui/statuswindow.cpp:531 src/gui/statuswindow.cpp:586
-#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:821
+#: src/gui/statuswindow.cpp:532 src/gui/statuswindow.cpp:587
+#: src/gui/statuswindow.cpp:788 src/gui/statuswindow.cpp:822
 msgid "Max"
 msgstr "Vše"
 
@@ -718,7 +718,7 @@ msgstr "Prodej"
 #: src/gui/popupmenu.cpp:2309 src/gui/popupmenu.cpp:2543
 #: src/gui/popupmenu.cpp:2660 src/gui/quitdialog.cpp:73
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
-#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1094
+#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1216
 #: src/gui/textcommandeditor.cpp:211 src/gui/textdialog.cpp:53
 #: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:181
 msgid "Cancel"
@@ -1002,92 +1002,102 @@ msgstr "Zadej heslo:"
 #. TRANSLATORS: inventory sort mode
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
-#: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:65
+#: src/gui/chatwindow.cpp:143 src/gui/inventorywindow.cpp:65
 #: src/gui/setup_other.cpp:69 src/gui/setup_visual.cpp:77
 msgid "default"
 msgstr "výchozí"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:144
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:145 src/gui/widgets/colormodel.cpp:76
 msgid "black"
 msgstr "černá"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:146
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:147 src/gui/widgets/colormodel.cpp:78
 msgid "red"
 msgstr "červená"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:148
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:149 src/gui/widgets/colormodel.cpp:80
 msgid "green"
 msgstr "zelená"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:150
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:151 src/gui/widgets/colormodel.cpp:82
 msgid "blue"
 msgstr "modrá"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:152
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:153 src/gui/widgets/colormodel.cpp:84
 msgid "gold"
 msgstr "zlatá"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:154
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:155 src/gui/widgets/colormodel.cpp:86
 msgid "yellow"
 msgstr "žlutá"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:156
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:157 src/gui/widgets/colormodel.cpp:88
 msgid "pink"
 msgstr "růžová"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:158
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:159 src/gui/widgets/colormodel.cpp:90
 msgid "purple"
 msgstr "fialová"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:160
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:161 src/gui/widgets/colormodel.cpp:92
 msgid "grey"
 msgstr "šedá"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:162
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:163 src/gui/widgets/colormodel.cpp:94
 msgid "brown"
 msgstr "hnědá"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:164
+#: src/gui/chatwindow.cpp:165
 msgid "rainbow 1"
 msgstr "duhová 1"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:166
+#: src/gui/chatwindow.cpp:167
 msgid "rainbow 2"
 msgstr "duhová 2"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:168
+#: src/gui/chatwindow.cpp:169
 msgid "rainbow 3"
 msgstr "duhová 3"
 
 #. TRANSLATORS: chat window name
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
-#: src/gui/chatwindow.cpp:195 src/gui/setupactiondata.h:1866
+#: src/gui/chatwindow.cpp:196 src/gui/setupactiondata.h:1866
 #: src/gui/setup_chat.cpp:50 src/gui/windowmenu.cpp:88
 msgid "Chat"
 msgstr "Chat"
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:659
+#: src/gui/chatwindow.cpp:684
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Přítomni: %s; %d hráčů je přítomno."
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1066
+#: src/gui/chatwindow.cpp:1091
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Šeptání pro %s: %s"
@@ -1396,14 +1406,38 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
+#. TRANSLATORS: font size
+#: src/gui/emotewindow.cpp:49
+msgid "Normal font"
+msgstr ""
+
+#. TRANSLATORS: font size
+#. TRANSLATORS: theme settings label
+#: src/gui/emotewindow.cpp:51 src/gui/setup_theme.cpp:249
+msgid "Bold font"
+msgstr "Tučný font"
+
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/emotewindow.cpp:41 src/gui/emotewindow.cpp:61
+#: src/gui/emotewindow.cpp:56 src/gui/emotewindow.cpp:107
 #: src/gui/setupactiondata.h:1862
 msgid "Emotes"
 msgstr ""
 
+#. TRANSLATORS: emotes tab name
+#. TRANSLATORS: settings group
+#. TRANSLATORS: settings colors tab name
+#: src/gui/emotewindow.cpp:109 src/gui/setup_chat.cpp:70
+#: src/gui/setup_colors.cpp:83
+msgid "Colors"
+msgstr "Barvy"
+
+#. TRANSLATORS: emotes tab name
+#: src/gui/emotewindow.cpp:111
+msgid "Fonts"
+msgstr ""
+
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/equipmentwindow.cpp:56 src/gui/inventorywindow.cpp:204
@@ -1495,7 +1529,7 @@ msgstr "Vzít"
 
 #. TRANSLATORS: status window label
 #: src/gui/inventorywindow.cpp:580 src/gui/statuswindow.cpp:143
-#: src/gui/statuswindow.cpp:284 src/gui/statuswindow.cpp:337
+#: src/gui/statuswindow.cpp:285 src/gui/statuswindow.cpp:338
 #: src/gui/widgets/characterdisplay.cpp:126
 #, c-format
 msgid "Money: %s"
@@ -1785,7 +1819,7 @@ msgstr "pruh práce"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:295
+#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:296
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Úroveň: %d (GM %d)"
@@ -1793,7 +1827,7 @@ msgstr "Úroveň: %d (GM %d)"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/ministatuswindow.cpp:317 src/gui/statuswindow.cpp:141
-#: src/gui/statuswindow.cpp:302 src/gui/statuswindow.cpp:373
+#: src/gui/statuswindow.cpp:303 src/gui/statuswindow.cpp:374
 #, c-format
 msgid "Level: %d"
 msgstr "Úroveň: %d"
@@ -1810,34 +1844,45 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:62
+#: src/gui/npcdialog.cpp:66
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:64
+#: src/gui/npcdialog.cpp:68
 msgid "Next"
 msgstr "Další"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:68
+#: src/gui/npcdialog.cpp:72
 msgid "Submit"
 msgstr "Odeslat"
 
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
 #. TRANSLATORS: settings group
-#: src/gui/npcdialog.cpp:77 src/gui/npcpostdialog.cpp:43
+#: src/gui/npcdialog.cpp:81 src/gui/npcpostdialog.cpp:43
 #: src/gui/setup_other.cpp:257
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:566
+#: src/gui/npcdialog.cpp:104 src/gui/popupmenu.cpp:566
 msgid "Clear"
 msgstr "Vyprázdnit"
 
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: trade window button
+#: src/gui/npcdialog.cpp:109 src/gui/serverdialog.cpp:266
+#: src/gui/shopwindow.cpp:95 src/gui/shopwindow.cpp:102
+#: src/gui/tradewindow.cpp:77
+msgid "Add"
+msgstr "Přidat"
+
 #. TRANSLATORS: label in npc post dialog
 #: src/gui/npcpostdialog.cpp:53
 msgid "To:"
@@ -2045,7 +2090,7 @@ msgstr "Vypnout \"away\""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: social window button
-#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1164
+#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1286
 msgid "Leave"
 msgstr "Odejít"
 
@@ -2179,7 +2224,7 @@ msgstr "Zkopírovat do chatu"
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2194
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:985
 msgid "(default)"
 msgstr ""
 
@@ -2427,15 +2472,6 @@ msgid "Choose Your Server"
 msgstr "Zvolte server"
 
 #. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:266 src/gui/shopwindow.cpp:95
-#: src/gui/shopwindow.cpp:102 src/gui/tradewindow.cpp:77
-msgid "Add"
-msgstr "Přidat"
-
-#. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
 #: src/gui/serverdialog.cpp:268 src/gui/widgets/setupitem.cpp:303
 #: src/gui/widgets/setupitem.cpp:430
@@ -3326,20 +3362,14 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:61
-msgid "Auto hide chat window."
+msgid "Auto hide chat window"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:65
-msgid "Protect chat focus."
+msgid "Protect chat focus"
 msgstr ""
 
-#. TRANSLATORS: settings group
-#. TRANSLATORS: settings colors tab name
-#: src/gui/setup_chat.cpp:70 src/gui/setup_colors.cpp:83
-msgid "Colors"
-msgstr "Barvy"
-
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:73
 msgid "Remove colors from received chat messages"
@@ -4434,11 +4464,6 @@ msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:249
-msgid "Bold font"
-msgstr "Tučný font"
-
-#. TRANSLATORS: theme settings label
 #: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr "Font částic"
@@ -4927,258 +4952,289 @@ msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
-#: src/gui/socialwindow.cpp:158 src/gui/socialwindow.cpp:259
+#: src/gui/socialwindow.cpp:176 src/gui/socialwindow.cpp:309
 #: src/gui/widgets/guildchattab.cpp:42 src/net/ea/gui/guildtab.cpp:49
 msgid "Guild"
 msgstr "Gilda"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Pozvali jste %s do gildy %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:213
+#: src/gui/socialwindow.cpp:231
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Požadován odchod z gildy %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:245
 msgid "Member Invite to Guild"
 msgstr "Člen pozval do gildy"
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:229
+#: src/gui/socialwindow.cpp:247
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "Koho byste rád pozval do gildy %s?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:238
+#: src/gui/socialwindow.cpp:256
 msgid "Leave Guild?"
 msgstr "Opustit gildu?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:240
+#: src/gui/socialwindow.cpp:258
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Jste si jisti že chcete opustit gildu %s?"
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:269
+#, c-format
+msgid "Members: %u/%u"
+msgstr ""
+
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:291 src/gui/socialwindow.cpp:361
+#: src/gui/socialwindow.cpp:483
+#, c-format
+msgid "Players: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/socialwindow.cpp:302 src/net/ea/gui/partytab.cpp:49
+#: src/gui/socialwindow.cpp:376 src/net/ea/gui/partytab.cpp:49
 msgid "Party"
 msgstr "Parta"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:341
+#: src/gui/socialwindow.cpp:415
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Hráč %s pozván do party."
 
 #. TRANSLATORS: tab in social window
-#: src/gui/socialwindow.cpp:356
+#: src/gui/socialwindow.cpp:430
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Odchod z party %s vyžádán."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:370
+#: src/gui/socialwindow.cpp:444
 msgid "Member Invite to Party"
 msgstr "Přijetí člena do party"
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:372
+#: src/gui/socialwindow.cpp:446
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Koho chceš pozvat do party %s?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:381
+#: src/gui/socialwindow.cpp:455
 msgid "Leave Party?"
 msgstr "Opustit partu?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:383
+#: src/gui/socialwindow.cpp:457
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Opravdu chceš opustit partu %s?"
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:681
+#, c-format
+msgid "Visible players: %d"
+msgstr ""
+
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:605
+#: src/gui/socialwindow.cpp:707
 msgid "Nav"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:809
+#, c-format
+msgid "Portals: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:922
+#: src/gui/socialwindow.cpp:1035
 msgid "Atk"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:941
+#: src/gui/socialwindow.cpp:1054
 msgid "Priority mobs"
 msgstr "Prioritní monstra"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:943
+#: src/gui/socialwindow.cpp:1056
 msgid "Attack mobs"
 msgstr "Útočit na monstra"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:945
+#: src/gui/socialwindow.cpp:1058
 msgid "Ignore mobs"
 msgstr "Ignorovat monstra"
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:968
+#: src/gui/socialwindow.cpp:1081
 msgid "Pik"
 msgstr "Sb"
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:987
+#: src/gui/socialwindow.cpp:1100
 msgid "Pickup items"
 msgstr "Sbírej věci"
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:989
+#: src/gui/socialwindow.cpp:1102
 msgid "Ignore items"
 msgstr "Ignoruj věci"
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:1190
+#, c-format
+msgid "Friends: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1091 src/gui/socialwindow.cpp:1563
+#: src/gui/socialwindow.cpp:1213 src/gui/socialwindow.cpp:1687
 msgid "Create Party"
 msgstr "Vytvořit partu"
 
 #. TRANSLATORS: social window name
 #. TRANSLATORS: full button name
-#: src/gui/socialwindow.cpp:1138 src/gui/windowmenu.cpp:126
+#: src/gui/socialwindow.cpp:1260 src/gui/windowmenu.cpp:126
 msgid "Social"
 msgstr "Společenství"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1273
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1156
+#: src/gui/socialwindow.cpp:1278
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/socialwindow.cpp:1162
+#: src/gui/socialwindow.cpp:1284
 msgid "Invite"
 msgstr "Pozvat"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1345
+#: src/gui/socialwindow.cpp:1469
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Přijato pozvání do party od %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1356
+#: src/gui/socialwindow.cpp:1480
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Odmítnuto přijetí do party od %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1497
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Přijato pozvání do gildy od %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Odmítnuto pozvání do gildy od %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1424
+#: src/gui/socialwindow.cpp:1548
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Vytvářím gildu s názvem %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1445
+#: src/gui/socialwindow.cpp:1569
 #, c-format
 msgid "Creating party called %s."
 msgstr "Vytvářím partu s názvem %s."
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1460
+#: src/gui/socialwindow.cpp:1584
 msgid "Guild Name"
 msgstr "Název gildy"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1462
+#: src/gui/socialwindow.cpp:1586
 msgid "Choose your guild's name."
 msgstr "Zvolte jméno vaší gildy."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1477
+#: src/gui/socialwindow.cpp:1601
 msgid "Received guild request, but one already exists."
 msgstr "Obdržen požadavek na vytvoření gildy, ale tato již existuje."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1485
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s vás zve ke vstupu do gildy %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1616
 msgid "Accept Guild Invite"
 msgstr "Přílmout pozvání do gildy"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1631
 msgid "Received party request, but one already exists."
 msgstr "Obdržen požadavek na vytvoření party, ale tato již existuje."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1519
+#: src/gui/socialwindow.cpp:1643
 msgid "You have been invited you to join a party."
 msgstr "Byli jste pozváni k připojení se do party."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1524
+#: src/gui/socialwindow.cpp:1648
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Byli jste pozváni k připojení se do party %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1533
+#: src/gui/socialwindow.cpp:1657
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s vás pozval ke vstupu do své party."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1539
+#: src/gui/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s vás zve ke vstupu do party: %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1673
 msgid "Accept Party Invite"
 msgstr "Přijmout pozvání do party"
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1688
 msgid "Cannot create party. You are already in a party"
 msgstr "Nemohu vytvořit partu. Již jste členem party."
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1694
 msgid "Party Name"
 msgstr "Jméno party"
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1572
+#: src/gui/socialwindow.cpp:1696
 msgid "Choose your party's name."
 msgstr "Zvolte jméno vaší party."
 
@@ -5198,24 +5254,24 @@ msgid "MP:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:235 src/gui/statuswindow.cpp:423
+#: src/gui/statuswindow.cpp:234 src/gui/statuswindow.cpp:424
 #, c-format
 msgid "Job: %d"
 msgstr "Práce: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:237
+#: src/gui/statuswindow.cpp:236
 msgid "Job:"
 msgstr "Práce:"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:288 src/gui/statuswindow.cpp:345
+#: src/gui/statuswindow.cpp:289 src/gui/statuswindow.cpp:346
 #, c-format
 msgid "Character points: %d"
 msgstr "Bodů postavy: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:360
+#: src/gui/statuswindow.cpp:361
 #, c-format
 msgid "Correction points: %d"
 msgstr "Opravné body: %d"
@@ -5660,13 +5716,13 @@ msgid "%s whispers: %s"
 msgstr "%s šeptá: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:540
+#: src/gui/widgets/chattab.cpp:541
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:545
+#: src/gui/widgets/chattab.cpp:546
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -5953,24 +6009,24 @@ msgstr "vyber svět"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/inputmanager.cpp:328 src/inputmanager.cpp:372 src/keyboardconfig.cpp:90
+#: src/inputmanager.cpp:329 src/inputmanager.cpp:373 src/keyboardconfig.cpp:90
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/inputmanager.cpp:334
+#: src/inputmanager.cpp:335
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/inputmanager.cpp:348
+#: src/inputmanager.cpp:349
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/inputmanager.cpp:378
+#: src/inputmanager.cpp:379
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -5978,7 +6034,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/inputmanager.cpp:392 src/keyboardconfig.cpp:103
+#: src/inputmanager.cpp:393 src/keyboardconfig.cpp:134
 msgid "u key"
 msgstr ""
 
@@ -6657,55 +6713,55 @@ msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:176
+#: src/net/ea/guildhandler.cpp:178
 #, c-format
 msgid "Guild name: %s"
 msgstr "Jméno gildy: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:179
+#: src/net/ea/guildhandler.cpp:181
 #, c-format
 msgid "Guild master: %s"
 msgstr "Vedoucí gildy: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild level: %d"
 msgstr "Úroveň gildy: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:186
 #, c-format
 msgid "Online members: %d"
 msgstr "Připojených členů: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:187
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Average level: %d"
 msgstr "Průměrná úroveň: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:193
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Guild exp: %d"
 msgstr "Zkušenosti gildy: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:195
+#: src/net/ea/guildhandler.cpp:197
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:198
+#: src/net/ea/guildhandler.cpp:200
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
diff --git a/po/da.po b/po/da.po
index 2a31b8148..ffa12c5fa 100644
--- a/po/da.po
+++ b/po/da.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-07-19 22:23+0300\n"
-"PO-Revision-Date: 2013-07-19 19:52+0000\n"
+"POT-Creation-Date: 2013-08-16 20:45+0300\n"
+"PO-Revision-Date: 2013-08-16 17:53+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/manaplus/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -39,21 +39,21 @@ msgstr ""
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1606 src/gui/whoisonline.cpp:835
+#: src/being.cpp:1713 src/gui/whoisonline.cpp:842
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1611 src/gui/whoisonline.cpp:840
+#: src/being.cpp:1718 src/gui/whoisonline.cpp:847
 msgid "I"
 msgstr ""
 
@@ -90,8 +90,8 @@ msgstr ""
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:1176 src/gui/didyouknowwindow.cpp:78
-#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:66
-#: src/gui/npcdialog.cpp:103 src/gui/popupmenu.cpp:562
+#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:70
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:562
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:81
 msgid "Close"
 msgstr "Luk"
@@ -426,36 +426,36 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:465
+#: src/game.cpp:259 src/gui/widgets/chattab.cpp:466
 msgid "General"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: debug window name
 #. TRANSLATORS: full button name
-#: src/game.cpp:272 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:467
+#: src/game.cpp:275 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:468
 #: src/gui/windowmenu.cpp:154
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:536
+#: src/game.cpp:540
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:546
+#: src/game.cpp:550
 msgid "Saving screenshot failed!"
 msgstr "Gemningen af skærmbilledet fejlede!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:618
+#: src/game.cpp:622
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:621
+#: src/game.cpp:625
 msgid "Network Error"
 msgstr "Netværksfejl"
 
@@ -490,7 +490,7 @@ msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:105
+#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:111
 msgid "Reset"
 msgstr "Nulstil"
 
@@ -591,7 +591,7 @@ msgstr "Køb"
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
 #: src/gui/buydialog.cpp:251 src/gui/buydialog.cpp:531
-#: src/gui/selldialog.cpp:96 src/gui/selldialog.cpp:356
+#: src/gui/selldialog.cpp:97 src/gui/selldialog.cpp:357
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Pris: %s / Total: %s"
@@ -608,8 +608,8 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/buydialog.cpp:265 src/gui/itemamountwindow.cpp:202
-#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:96
-#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:790
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:100
+#: src/gui/selldialog.cpp:101 src/gui/statuswindow.cpp:791
 msgid "+"
 msgstr ""
 
@@ -620,8 +620,8 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
 #: src/gui/buydialog.cpp:268 src/gui/itemamountwindow.cpp:200
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:98
-#: src/gui/selldialog.cpp:102 src/gui/statuswindow.cpp:803
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:102
+#: src/gui/selldialog.cpp:103 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr ""
 
@@ -629,7 +629,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/buydialog.cpp:271 src/gui/charcreatedialog.cpp:122
-#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1160
+#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1282
 msgid "Create"
 msgstr "Opret"
 
@@ -641,7 +641,7 @@ msgstr "Opret"
 #. TRANSLATORS: input action name
 #: src/gui/buydialog.cpp:273 src/gui/quitdialog.cpp:55
 #: src/gui/quitdialog.cpp:60 src/gui/quitdialog.cpp:62
-#: src/gui/selldialog.cpp:106 src/gui/serverdialog.cpp:262
+#: src/gui/selldialog.cpp:107 src/gui/serverdialog.cpp:262
 #: src/gui/setupactiondata.h:177
 msgid "Quit"
 msgstr "Afslut"
@@ -651,9 +651,9 @@ msgstr "Afslut"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:108
-#: src/gui/statuswindow.cpp:531 src/gui/statuswindow.cpp:586
-#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:821
+#: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:109
+#: src/gui/statuswindow.cpp:532 src/gui/statuswindow.cpp:587
+#: src/gui/statuswindow.cpp:788 src/gui/statuswindow.cpp:822
 msgid "Max"
 msgstr "Maks"
 
@@ -673,7 +673,7 @@ msgstr "butik"
 #. TRANSLATORS: sell dialog button
 #: src/gui/buyselldialog.cpp:69 src/gui/popupmenu.cpp:223
 #: src/gui/popupmenu.cpp:2455 src/gui/selldialog.cpp:54
-#: src/gui/selldialog.cpp:64 src/gui/selldialog.cpp:104
+#: src/gui/selldialog.cpp:64 src/gui/selldialog.cpp:105
 msgid "Sell"
 msgstr "Sælg"
 
@@ -713,7 +713,7 @@ msgstr "Sælg"
 #: src/gui/popupmenu.cpp:2309 src/gui/popupmenu.cpp:2543
 #: src/gui/popupmenu.cpp:2660 src/gui/quitdialog.cpp:73
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
-#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1094
+#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1216
 #: src/gui/textcommandeditor.cpp:211 src/gui/textdialog.cpp:53
 #: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:181
 msgid "Cancel"
@@ -997,92 +997,102 @@ msgstr ""
 #. TRANSLATORS: inventory sort mode
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
-#: src/gui/chatwindow.cpp:139 src/gui/inventorywindow.cpp:65
+#: src/gui/chatwindow.cpp:143 src/gui/inventorywindow.cpp:65
 #: src/gui/setup_other.cpp:69 src/gui/setup_visual.cpp:77
 msgid "default"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:141
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:145 src/gui/widgets/colormodel.cpp:76
 msgid "black"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:143
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:147 src/gui/widgets/colormodel.cpp:78
 msgid "red"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:145
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:149 src/gui/widgets/colormodel.cpp:80
 msgid "green"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:147
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:151 src/gui/widgets/colormodel.cpp:82
 msgid "blue"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:149
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:153 src/gui/widgets/colormodel.cpp:84
 msgid "gold"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:151
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:155 src/gui/widgets/colormodel.cpp:86
 msgid "yellow"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:153
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:157 src/gui/widgets/colormodel.cpp:88
 msgid "pink"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:155
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:159 src/gui/widgets/colormodel.cpp:90
 msgid "purple"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:157
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:161 src/gui/widgets/colormodel.cpp:92
 msgid "grey"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:159
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:163 src/gui/widgets/colormodel.cpp:94
 msgid "brown"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:161
+#: src/gui/chatwindow.cpp:165
 msgid "rainbow 1"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:163
+#: src/gui/chatwindow.cpp:167
 msgid "rainbow 2"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:165
+#: src/gui/chatwindow.cpp:169
 msgid "rainbow 3"
 msgstr ""
 
 #. TRANSLATORS: chat window name
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
-#: src/gui/chatwindow.cpp:192 src/gui/setupactiondata.h:1866
+#: src/gui/chatwindow.cpp:196 src/gui/setupactiondata.h:1866
 #: src/gui/setup_chat.cpp:50 src/gui/windowmenu.cpp:88
 msgid "Chat"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:641
+#: src/gui/chatwindow.cpp:684
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1044
+#: src/gui/chatwindow.cpp:1091
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Hvisker til %s: %s"
@@ -1391,6 +1401,38 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
+#. TRANSLATORS: font size
+#: src/gui/emotewindow.cpp:49
+msgid "Normal font"
+msgstr ""
+
+#. TRANSLATORS: font size
+#. TRANSLATORS: theme settings label
+#: src/gui/emotewindow.cpp:51 src/gui/setup_theme.cpp:249
+msgid "Bold font"
+msgstr ""
+
+#. TRANSLATORS: emotes window name
+#. TRANSLATORS: emotes tab name
+#. TRANSLATORS: input tab sub tab name
+#: src/gui/emotewindow.cpp:56 src/gui/emotewindow.cpp:107
+#: src/gui/setupactiondata.h:1862
+msgid "Emotes"
+msgstr ""
+
+#. TRANSLATORS: emotes tab name
+#. TRANSLATORS: settings group
+#. TRANSLATORS: settings colors tab name
+#: src/gui/emotewindow.cpp:109 src/gui/setup_chat.cpp:70
+#: src/gui/setup_colors.cpp:83
+msgid "Colors"
+msgstr "Farver"
+
+#. TRANSLATORS: emotes tab name
+#: src/gui/emotewindow.cpp:111
+msgid "Fonts"
+msgstr ""
+
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/equipmentwindow.cpp:56 src/gui/inventorywindow.cpp:204
@@ -1482,7 +1524,7 @@ msgstr "Hent fra lager"
 
 #. TRANSLATORS: status window label
 #: src/gui/inventorywindow.cpp:580 src/gui/statuswindow.cpp:143
-#: src/gui/statuswindow.cpp:284 src/gui/statuswindow.cpp:337
+#: src/gui/statuswindow.cpp:285 src/gui/statuswindow.cpp:338
 #: src/gui/widgets/characterdisplay.cpp:126
 #, c-format
 msgid "Money: %s"
@@ -1770,7 +1812,7 @@ msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:295
+#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:296
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
@@ -1778,7 +1820,7 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/ministatuswindow.cpp:317 src/gui/statuswindow.cpp:141
-#: src/gui/statuswindow.cpp:302 src/gui/statuswindow.cpp:373
+#: src/gui/statuswindow.cpp:303 src/gui/statuswindow.cpp:374
 #, c-format
 msgid "Level: %d"
 msgstr "Niveau: %d"
@@ -1795,34 +1837,45 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:62
+#: src/gui/npcdialog.cpp:66
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:64
+#: src/gui/npcdialog.cpp:68
 msgid "Next"
 msgstr "Næste"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:68
+#: src/gui/npcdialog.cpp:72
 msgid "Submit"
 msgstr "Send forespørgsel"
 
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
 #. TRANSLATORS: settings group
-#: src/gui/npcdialog.cpp:77 src/gui/npcpostdialog.cpp:43
+#: src/gui/npcdialog.cpp:81 src/gui/npcpostdialog.cpp:43
 #: src/gui/setup_other.cpp:257
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:566
+#: src/gui/npcdialog.cpp:104 src/gui/popupmenu.cpp:566
 msgid "Clear"
 msgstr ""
 
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: trade window button
+#: src/gui/npcdialog.cpp:109 src/gui/serverdialog.cpp:266
+#: src/gui/shopwindow.cpp:95 src/gui/shopwindow.cpp:102
+#: src/gui/tradewindow.cpp:77
+msgid "Add"
+msgstr "Tilføj"
+
 #. TRANSLATORS: label in npc post dialog
 #: src/gui/npcpostdialog.cpp:53
 msgid "To:"
@@ -2030,7 +2083,7 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: social window button
-#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1164
+#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1286
 msgid "Leave"
 msgstr ""
 
@@ -2164,7 +2217,7 @@ msgstr ""
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2194
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:985
 msgid "(default)"
 msgstr ""
 
@@ -2396,12 +2449,12 @@ msgid "Passwords do not match."
 msgstr "De indtastede adgangskoder stemmer ikke overens."
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/selldialog.cpp:242
+#: src/gui/selldialog.cpp:243
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/selldialog.cpp:244
+#: src/gui/selldialog.cpp:245
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
@@ -2412,15 +2465,6 @@ msgid "Choose Your Server"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:266 src/gui/shopwindow.cpp:95
-#: src/gui/shopwindow.cpp:102 src/gui/tradewindow.cpp:77
-msgid "Add"
-msgstr "Tilføj"
-
-#. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
 #: src/gui/serverdialog.cpp:268 src/gui/widgets/setupitem.cpp:303
 #: src/gui/widgets/setupitem.cpp:430
@@ -3156,11 +3200,6 @@ msgid "Windows"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1862
-msgid "Emotes"
-msgstr ""
-
-#. TRANSLATORS: input tab sub tab name
 #: src/gui/setupactiondata.h:1870
 msgid "Gui"
 msgstr ""
@@ -3316,20 +3355,14 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:61
-msgid "Auto hide chat window."
+msgid "Auto hide chat window"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:65
-msgid "Protect chat focus."
+msgid "Protect chat focus"
 msgstr ""
 
-#. TRANSLATORS: settings group
-#. TRANSLATORS: settings colors tab name
-#: src/gui/setup_chat.cpp:70 src/gui/setup_colors.cpp:83
-msgid "Colors"
-msgstr "Farver"
-
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:73
 msgid "Remove colors from received chat messages"
@@ -4422,11 +4455,6 @@ msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:249
-msgid "Bold font"
-msgstr ""
-
-#. TRANSLATORS: theme settings label
 #: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr ""
@@ -4912,258 +4940,289 @@ msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
-#: src/gui/socialwindow.cpp:158 src/gui/socialwindow.cpp:259
+#: src/gui/socialwindow.cpp:176 src/gui/socialwindow.cpp:309
 #: src/gui/widgets/guildchattab.cpp:42 src/net/ea/gui/guildtab.cpp:49
 msgid "Guild"
 msgstr "Opret en guild"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:213
+#: src/gui/socialwindow.cpp:231
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:245
 msgid "Member Invite to Guild"
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:229
+#: src/gui/socialwindow.cpp:247
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:238
+#: src/gui/socialwindow.cpp:256
 msgid "Leave Guild?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:240
+#: src/gui/socialwindow.cpp:258
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:269
+#, c-format
+msgid "Members: %u/%u"
+msgstr ""
+
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:291 src/gui/socialwindow.cpp:361
+#: src/gui/socialwindow.cpp:483
+#, c-format
+msgid "Players: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/socialwindow.cpp:302 src/net/ea/gui/partytab.cpp:49
+#: src/gui/socialwindow.cpp:376 src/net/ea/gui/partytab.cpp:49
 msgid "Party"
 msgstr "Gruppe"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:341
+#: src/gui/socialwindow.cpp:415
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
 #. TRANSLATORS: tab in social window
-#: src/gui/socialwindow.cpp:356
+#: src/gui/socialwindow.cpp:430
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:370
+#: src/gui/socialwindow.cpp:444
 msgid "Member Invite to Party"
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:372
+#: src/gui/socialwindow.cpp:446
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:381
+#: src/gui/socialwindow.cpp:455
 msgid "Leave Party?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:383
+#: src/gui/socialwindow.cpp:457
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:681
+#, c-format
+msgid "Visible players: %d"
+msgstr ""
+
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:605
+#: src/gui/socialwindow.cpp:707
 msgid "Nav"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:809
+#, c-format
+msgid "Portals: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:922
+#: src/gui/socialwindow.cpp:1035
 msgid "Atk"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:941
+#: src/gui/socialwindow.cpp:1054
 msgid "Priority mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:943
+#: src/gui/socialwindow.cpp:1056
 msgid "Attack mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:945
+#: src/gui/socialwindow.cpp:1058
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:968
+#: src/gui/socialwindow.cpp:1081
 msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:987
+#: src/gui/socialwindow.cpp:1100
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:989
+#: src/gui/socialwindow.cpp:1102
 msgid "Ignore items"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:1190
+#, c-format
+msgid "Friends: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1091 src/gui/socialwindow.cpp:1563
+#: src/gui/socialwindow.cpp:1213 src/gui/socialwindow.cpp:1687
 msgid "Create Party"
 msgstr ""
 
 #. TRANSLATORS: social window name
 #. TRANSLATORS: full button name
-#: src/gui/socialwindow.cpp:1138 src/gui/windowmenu.cpp:126
+#: src/gui/socialwindow.cpp:1260 src/gui/windowmenu.cpp:126
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1273
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1156
+#: src/gui/socialwindow.cpp:1278
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/socialwindow.cpp:1162
+#: src/gui/socialwindow.cpp:1284
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1345
+#: src/gui/socialwindow.cpp:1469
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1356
+#: src/gui/socialwindow.cpp:1480
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1497
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1424
+#: src/gui/socialwindow.cpp:1548
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1445
+#: src/gui/socialwindow.cpp:1569
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1460
+#: src/gui/socialwindow.cpp:1584
 msgid "Guild Name"
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1462
+#: src/gui/socialwindow.cpp:1586
 msgid "Choose your guild's name."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1477
+#: src/gui/socialwindow.cpp:1601
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1485
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1616
 msgid "Accept Guild Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1631
 msgid "Received party request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1519
+#: src/gui/socialwindow.cpp:1643
 msgid "You have been invited you to join a party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1524
+#: src/gui/socialwindow.cpp:1648
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1533
+#: src/gui/socialwindow.cpp:1657
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s har inviteret med i sin gruppe"
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1539
+#: src/gui/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s har inviteret med i %s's gruppe."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1673
 msgid "Accept Party Invite"
 msgstr "Accepter invitationen"
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1688
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1694
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1572
+#: src/gui/socialwindow.cpp:1696
 msgid "Choose your party's name."
 msgstr ""
 
@@ -5183,24 +5242,24 @@ msgid "MP:"
 msgstr "MP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:235 src/gui/statuswindow.cpp:423
+#: src/gui/statuswindow.cpp:234 src/gui/statuswindow.cpp:424
 #, c-format
 msgid "Job: %d"
 msgstr "Copy text   \t\r\nJob: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:237
+#: src/gui/statuswindow.cpp:236
 msgid "Job:"
 msgstr "Job:"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:288 src/gui/statuswindow.cpp:345
+#: src/gui/statuswindow.cpp:289 src/gui/statuswindow.cpp:346
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:360
+#: src/gui/statuswindow.cpp:361
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
@@ -5646,13 +5705,13 @@ msgid "%s whispers: %s"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:540
+#: src/gui/widgets/chattab.cpp:541
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:545
+#: src/gui/widgets/chattab.cpp:546
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -5938,24 +5997,24 @@ msgstr ""
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/inputmanager.cpp:328 src/inputmanager.cpp:372 src/keyboardconfig.cpp:90
+#: src/inputmanager.cpp:329 src/inputmanager.cpp:373 src/keyboardconfig.cpp:90
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/inputmanager.cpp:334
+#: src/inputmanager.cpp:335
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/inputmanager.cpp:348
+#: src/inputmanager.cpp:349
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/inputmanager.cpp:378
+#: src/inputmanager.cpp:379
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -5963,7 +6022,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/inputmanager.cpp:392 src/keyboardconfig.cpp:103
+#: src/inputmanager.cpp:393 src/keyboardconfig.cpp:134
 msgid "u key"
 msgstr ""
 
@@ -6639,55 +6698,55 @@ msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:176
+#: src/net/ea/guildhandler.cpp:178
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:179
+#: src/net/ea/guildhandler.cpp:181
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:186
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:187
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:193
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:195
+#: src/net/ea/guildhandler.cpp:197
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:198
+#: src/net/ea/guildhandler.cpp:200
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
@@ -7562,8 +7621,8 @@ msgstr ""
 #. TRANSLATORS: being info default name
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
-#: src/resources/avatardb.cpp:69 src/resources/beinginfo.cpp:40
-#: src/resources/itemdb.cpp:291 src/resources/monsterdb.cpp:100
+#: src/resources/avatardb.cpp:69 src/resources/beinginfo.cpp:41
+#: src/resources/itemdb.cpp:295 src/resources/monsterdb.cpp:100
 msgid "unnamed"
 msgstr "unavngivet"
 
diff --git a/po/de.po b/po/de.po
index bc52e2151..7ad9cf261 100644
--- a/po/de.po
+++ b/po/de.po
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-08-03 13:52+0300\n"
-"PO-Revision-Date: 2013-07-19 19:52+0000\n"
+"POT-Creation-Date: 2013-08-17 13:35+0300\n"
+"PO-Revision-Date: 2013-08-16 17:53+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/manaplus/language/"
 "de/)\n"
@@ -52,21 +52,21 @@ msgstr "Sichtbar auf der Karte"
 msgid "Human"
 msgstr "Mensch"
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "dodge"
 msgstr "ausweichen"
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "miss"
 msgstr "verfehlt"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1710 src/gui/whoisonline.cpp:835
+#: src/being.cpp:1713 src/gui/whoisonline.cpp:842
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1715 src/gui/whoisonline.cpp:840
+#: src/being.cpp:1718 src/gui/whoisonline.cpp:847
 msgid "I"
 msgstr "I"
 
@@ -103,8 +103,8 @@ msgstr "Theme"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:1176 src/gui/didyouknowwindow.cpp:78
-#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:66
-#: src/gui/npcdialog.cpp:103 src/gui/popupmenu.cpp:562
+#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:70
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:562
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:81
 msgid "Close"
 msgstr "Schließen"
@@ -443,14 +443,14 @@ msgstr ""
 "Gültige Optionen für /%s sind \"yes\",\"no\",\"true\",\"false\",\"1\",\"0\"."
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:259 src/gui/widgets/chattab.cpp:465
+#: src/game.cpp:259 src/gui/widgets/chattab.cpp:466
 msgid "General"
 msgstr "Allgemein"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: debug window name
 #. TRANSLATORS: full button name
-#: src/game.cpp:275 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:467
+#: src/game.cpp:275 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:468
 #: src/gui/windowmenu.cpp:154
 msgid "Debug"
 msgstr "Debug"
@@ -507,7 +507,7 @@ msgstr "Bot-Prüfer"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:105
+#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:111
 msgid "Reset"
 msgstr "Zurücksetzten"
 
@@ -625,8 +625,8 @@ msgstr "Menge:"
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/buydialog.cpp:265 src/gui/itemamountwindow.cpp:202
-#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:96
-#: src/gui/selldialog.cpp:101 src/gui/statuswindow.cpp:790
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:100
+#: src/gui/selldialog.cpp:101 src/gui/statuswindow.cpp:791
 msgid "+"
 msgstr "+"
 
@@ -637,8 +637,8 @@ msgstr "+"
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
 #: src/gui/buydialog.cpp:268 src/gui/itemamountwindow.cpp:200
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:98
-#: src/gui/selldialog.cpp:103 src/gui/statuswindow.cpp:803
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:102
+#: src/gui/selldialog.cpp:103 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr "-"
 
@@ -646,7 +646,7 @@ msgstr "-"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/buydialog.cpp:271 src/gui/charcreatedialog.cpp:122
-#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1160
+#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1282
 msgid "Create"
 msgstr "Erstellen"
 
@@ -669,8 +669,8 @@ msgstr "Beenden"
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
 #: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:109
-#: src/gui/statuswindow.cpp:531 src/gui/statuswindow.cpp:586
-#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:821
+#: src/gui/statuswindow.cpp:532 src/gui/statuswindow.cpp:587
+#: src/gui/statuswindow.cpp:788 src/gui/statuswindow.cpp:822
 msgid "Max"
 msgstr "Max"
 
@@ -730,7 +730,7 @@ msgstr "Verkaufen"
 #: src/gui/popupmenu.cpp:2309 src/gui/popupmenu.cpp:2543
 #: src/gui/popupmenu.cpp:2660 src/gui/quitdialog.cpp:73
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
-#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1094
+#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1216
 #: src/gui/textcommandeditor.cpp:211 src/gui/textdialog.cpp:53
 #: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:181
 msgid "Cancel"
@@ -1014,92 +1014,102 @@ msgstr "Gib dein Passwort ein:"
 #. TRANSLATORS: inventory sort mode
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
-#: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:65
+#: src/gui/chatwindow.cpp:143 src/gui/inventorywindow.cpp:65
 #: src/gui/setup_other.cpp:69 src/gui/setup_visual.cpp:77
 msgid "default"
 msgstr "Standard"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:144
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:145 src/gui/widgets/colormodel.cpp:76
 msgid "black"
 msgstr "schwarz"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:146
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:147 src/gui/widgets/colormodel.cpp:78
 msgid "red"
 msgstr "rot"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:148
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:149 src/gui/widgets/colormodel.cpp:80
 msgid "green"
 msgstr "grün"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:150
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:151 src/gui/widgets/colormodel.cpp:82
 msgid "blue"
 msgstr "blau"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:152
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:153 src/gui/widgets/colormodel.cpp:84
 msgid "gold"
 msgstr "gold"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:154
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:155 src/gui/widgets/colormodel.cpp:86
 msgid "yellow"
 msgstr "gelb"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:156
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:157 src/gui/widgets/colormodel.cpp:88
 msgid "pink"
 msgstr "rosa"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:158
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:159 src/gui/widgets/colormodel.cpp:90
 msgid "purple"
 msgstr "lila"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:160
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:161 src/gui/widgets/colormodel.cpp:92
 msgid "grey"
 msgstr "grau"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:162
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:163 src/gui/widgets/colormodel.cpp:94
 msgid "brown"
 msgstr "braun"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:164
+#: src/gui/chatwindow.cpp:165
 msgid "rainbow 1"
 msgstr "Regenbogen 1"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:166
+#: src/gui/chatwindow.cpp:167
 msgid "rainbow 2"
 msgstr "Regenbogen 2"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:168
+#: src/gui/chatwindow.cpp:169
 msgid "rainbow 3"
 msgstr "Regenbogen 3"
 
 #. TRANSLATORS: chat window name
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
-#: src/gui/chatwindow.cpp:195 src/gui/setupactiondata.h:1866
+#: src/gui/chatwindow.cpp:196 src/gui/setupactiondata.h:1866
 #: src/gui/setup_chat.cpp:50 src/gui/windowmenu.cpp:88
 msgid "Chat"
 msgstr "Chat"
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:659
+#: src/gui/chatwindow.cpp:684
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Anwesend: %s ; %d Spieler sind anwesend."
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1066
+#: src/gui/chatwindow.cpp:1091
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Flüstern zu %s: %s"
@@ -1408,14 +1418,38 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr "Bitte die Adresse und den Port eines Servers eingeben."
 
+#. TRANSLATORS: font size
+#: src/gui/emotewindow.cpp:49
+msgid "Normal font"
+msgstr ""
+
+#. TRANSLATORS: font size
+#. TRANSLATORS: theme settings label
+#: src/gui/emotewindow.cpp:51 src/gui/setup_theme.cpp:249
+msgid "Bold font"
+msgstr "Dicke Schrift"
+
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/emotewindow.cpp:41 src/gui/emotewindow.cpp:61
+#: src/gui/emotewindow.cpp:56 src/gui/emotewindow.cpp:107
 #: src/gui/setupactiondata.h:1862
 msgid "Emotes"
 msgstr "Gefühle"
 
+#. TRANSLATORS: emotes tab name
+#. TRANSLATORS: settings group
+#. TRANSLATORS: settings colors tab name
+#: src/gui/emotewindow.cpp:109 src/gui/setup_chat.cpp:70
+#: src/gui/setup_colors.cpp:83
+msgid "Colors"
+msgstr "Farben"
+
+#. TRANSLATORS: emotes tab name
+#: src/gui/emotewindow.cpp:111
+msgid "Fonts"
+msgstr ""
+
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/equipmentwindow.cpp:56 src/gui/inventorywindow.cpp:204
@@ -1507,7 +1541,7 @@ msgstr "Abholen"
 
 #. TRANSLATORS: status window label
 #: src/gui/inventorywindow.cpp:580 src/gui/statuswindow.cpp:143
-#: src/gui/statuswindow.cpp:284 src/gui/statuswindow.cpp:337
+#: src/gui/statuswindow.cpp:285 src/gui/statuswindow.cpp:338
 #: src/gui/widgets/characterdisplay.cpp:126
 #, c-format
 msgid "Money: %s"
@@ -1797,7 +1831,7 @@ msgstr "Job Balken"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:295
+#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:296
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Level: %d (GM %d)"
@@ -1805,7 +1839,7 @@ msgstr "Level: %d (GM %d)"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/ministatuswindow.cpp:317 src/gui/statuswindow.cpp:141
-#: src/gui/statuswindow.cpp:302 src/gui/statuswindow.cpp:373
+#: src/gui/statuswindow.cpp:303 src/gui/statuswindow.cpp:374
 #, c-format
 msgid "Level: %d"
 msgstr "Stufe: %d"
@@ -1822,34 +1856,45 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:62
+#: src/gui/npcdialog.cpp:66
 msgid "Stop waiting"
 msgstr "Stoppe Warten"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:64
+#: src/gui/npcdialog.cpp:68
 msgid "Next"
 msgstr "Weiter"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:68
+#: src/gui/npcdialog.cpp:72
 msgid "Submit"
 msgstr "Absenden"
 
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
 #. TRANSLATORS: settings group
-#: src/gui/npcdialog.cpp:77 src/gui/npcpostdialog.cpp:43
+#: src/gui/npcdialog.cpp:81 src/gui/npcpostdialog.cpp:43
 #: src/gui/setup_other.cpp:257
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:566
+#: src/gui/npcdialog.cpp:104 src/gui/popupmenu.cpp:566
 msgid "Clear"
 msgstr "Leeren"
 
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: trade window button
+#: src/gui/npcdialog.cpp:109 src/gui/serverdialog.cpp:266
+#: src/gui/shopwindow.cpp:95 src/gui/shopwindow.cpp:102
+#: src/gui/tradewindow.cpp:77
+msgid "Add"
+msgstr "Hinzufügen"
+
 #. TRANSLATORS: label in npc post dialog
 #: src/gui/npcpostdialog.cpp:53
 msgid "To:"
@@ -2057,7 +2102,7 @@ msgstr "Deaktiviere abwesend"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: social window button
-#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1164
+#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1286
 msgid "Leave"
 msgstr "Verlassen"
 
@@ -2191,7 +2236,7 @@ msgstr "Kopiere zu Chat"
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2194
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:985
 msgid "(default)"
 msgstr "(normal)"
 
@@ -2439,15 +2484,6 @@ msgid "Choose Your Server"
 msgstr "Wähle deinen Server"
 
 #. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:266 src/gui/shopwindow.cpp:95
-#: src/gui/shopwindow.cpp:102 src/gui/tradewindow.cpp:77
-msgid "Add"
-msgstr "Hinzufügen"
-
-#. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
 #: src/gui/serverdialog.cpp:268 src/gui/widgets/setupitem.cpp:303
 #: src/gui/widgets/setupitem.cpp:430
@@ -3338,19 +3374,13 @@ msgstr "Fenster"
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:61
-msgid "Auto hide chat window."
-msgstr "Automatisches Verstecken des Chats"
+msgid "Auto hide chat window"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:65
-msgid "Protect chat focus."
-msgstr "Bewahre Chatfokus"
-
-#. TRANSLATORS: settings group
-#. TRANSLATORS: settings colors tab name
-#: src/gui/setup_chat.cpp:70 src/gui/setup_colors.cpp:83
-msgid "Colors"
-msgstr "Farben"
+msgid "Protect chat focus"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:73
@@ -4449,11 +4479,6 @@ msgid "Language"
 msgstr "Sprache"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:249
-msgid "Bold font"
-msgstr "Dicke Schrift"
-
-#. TRANSLATORS: theme settings label
 #: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr "Schrift von Spieleraktionen"
@@ -4947,259 +4972,290 @@ msgstr "Lvl: %d"
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
-#: src/gui/socialwindow.cpp:158 src/gui/socialwindow.cpp:259
+#: src/gui/socialwindow.cpp:176 src/gui/socialwindow.cpp:309
 #: src/gui/widgets/guildchattab.cpp:42 src/net/ea/gui/guildtab.cpp:49
 msgid "Guild"
 msgstr "Gilde"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "%s in die Gilde %s einladen."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:213
+#: src/gui/socialwindow.cpp:231
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Gilde %s Ausstieg angefragt,"
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:245
 msgid "Member Invite to Guild"
 msgstr "Lade Mitglied in die Gilde ein."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:229
+#: src/gui/socialwindow.cpp:247
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "Wen willst du in die Gilde %s einladen?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:238
+#: src/gui/socialwindow.cpp:256
 msgid "Leave Guild?"
 msgstr "Gilde verlassen?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:240
+#: src/gui/socialwindow.cpp:258
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Bist du sicher, dass du die Gilde %s verlassen willst?"
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:269
+#, c-format
+msgid "Members: %u/%u"
+msgstr ""
+
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:291 src/gui/socialwindow.cpp:361
+#: src/gui/socialwindow.cpp:483
+#, c-format
+msgid "Players: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/socialwindow.cpp:302 src/net/ea/gui/partytab.cpp:49
+#: src/gui/socialwindow.cpp:376 src/net/ea/gui/partytab.cpp:49
 msgid "Party"
 msgstr "Gruppe"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:341
+#: src/gui/socialwindow.cpp:415
 #, c-format
 msgid "Invited user %s to party."
 msgstr "%s zur Gruppe einladen."
 
 #. TRANSLATORS: tab in social window
-#: src/gui/socialwindow.cpp:356
+#: src/gui/socialwindow.cpp:430
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Gruppe %s Auflösung beauftragt."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:370
+#: src/gui/socialwindow.cpp:444
 msgid "Member Invite to Party"
 msgstr "Lade Mitglied in die Gruppe ein."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:372
+#: src/gui/socialwindow.cpp:446
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Wen willst du zur Gruppe %s einladen?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:381
+#: src/gui/socialwindow.cpp:455
 msgid "Leave Party?"
 msgstr "Gruppe verlassen?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:383
+#: src/gui/socialwindow.cpp:457
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Bist du sicher, dass du die Gruppe %s verlassen willst?"
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:681
+#, c-format
+msgid "Visible players: %d"
+msgstr ""
+
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:605
+#: src/gui/socialwindow.cpp:707
 msgid "Nav"
 msgstr "Nav"
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:809
+#, c-format
+msgid "Portals: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:922
+#: src/gui/socialwindow.cpp:1035
 msgid "Atk"
 msgstr "Atk"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:941
+#: src/gui/socialwindow.cpp:1054
 msgid "Priority mobs"
 msgstr "Bevorzugte Monster"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:943
+#: src/gui/socialwindow.cpp:1056
 msgid "Attack mobs"
 msgstr "Greife Monster an"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:945
+#: src/gui/socialwindow.cpp:1058
 msgid "Ignore mobs"
 msgstr "Ignoriere Monster"
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:968
+#: src/gui/socialwindow.cpp:1081
 msgid "Pik"
 msgstr "Pik"
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:987
+#: src/gui/socialwindow.cpp:1100
 msgid "Pickup items"
 msgstr "Gegenstände aufheben"
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:989
+#: src/gui/socialwindow.cpp:1102
 msgid "Ignore items"
 msgstr "Gegenstände ignorieren"
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:1190
+#, c-format
+msgid "Friends: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1091 src/gui/socialwindow.cpp:1563
+#: src/gui/socialwindow.cpp:1213 src/gui/socialwindow.cpp:1687
 msgid "Create Party"
 msgstr "Gruppe erstellen"
 
 #. TRANSLATORS: social window name
 #. TRANSLATORS: full button name
-#: src/gui/socialwindow.cpp:1138 src/gui/windowmenu.cpp:126
+#: src/gui/socialwindow.cpp:1260 src/gui/windowmenu.cpp:126
 msgid "Social"
 msgstr "Sozial"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1273
 msgid "P"
 msgstr "P"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1156
+#: src/gui/socialwindow.cpp:1278
 msgid "F"
 msgstr "F"
 
 #. TRANSLATORS: social window button
-#: src/gui/socialwindow.cpp:1162
+#: src/gui/socialwindow.cpp:1284
 msgid "Invite"
 msgstr "Einladen"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1345
+#: src/gui/socialwindow.cpp:1469
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Gruppeneinladung von %s angenommen."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1356
+#: src/gui/socialwindow.cpp:1480
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Gruppeneinladung von %s abgelehnt."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1497
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Gildeneinladung von %s angenommen."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Gildeneinladung von %s abgelehnt."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1424
+#: src/gui/socialwindow.cpp:1548
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Erstelle der Gilde %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1445
+#: src/gui/socialwindow.cpp:1569
 #, c-format
 msgid "Creating party called %s."
 msgstr "Erstelle die Gruppe \"%s\""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1460
+#: src/gui/socialwindow.cpp:1584
 msgid "Guild Name"
 msgstr "Gildenname"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1462
+#: src/gui/socialwindow.cpp:1586
 msgid "Choose your guild's name."
 msgstr "Wähle den Namen deiner Gilde"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1477
+#: src/gui/socialwindow.cpp:1601
 msgid "Received guild request, but one already exists."
 msgstr "Anfrage für eine Gruppe erhalten, es wurde schon einmal angefragt."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1485
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s hat dich eingeladen, seiner Gilde %s beizutreten."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1616
 msgid "Accept Guild Invite"
 msgstr "Nehme Gildeneinladung an"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1631
 msgid "Received party request, but one already exists."
 msgstr ""
 "Anfrage für eine Gruppe erhalten, aber du bist bereits in einer Gruppe."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1519
+#: src/gui/socialwindow.cpp:1643
 msgid "You have been invited you to join a party."
 msgstr "Du wurdest zu einer Gruppe eingeladen."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1524
+#: src/gui/socialwindow.cpp:1648
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Du wurdest zu der Gruppe %s eingeladen."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1533
+#: src/gui/socialwindow.cpp:1657
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s hat dich in seine Gruppe eingeladen."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1539
+#: src/gui/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s hat dich eingeladen, an der Gruppe %s teilzunehmen."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1673
 msgid "Accept Party Invite"
 msgstr "Nehme Gruppeneinladung an"
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1688
 msgid "Cannot create party. You are already in a party"
 msgstr "Konnte keine Gruppe erstellen. Du bist schon in einer Gruppe."
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1694
 msgid "Party Name"
 msgstr "Gruppenname"
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1572
+#: src/gui/socialwindow.cpp:1696
 msgid "Choose your party's name."
 msgstr "Name deiner Gruppe wählen."
 
@@ -5219,24 +5275,24 @@ msgid "MP:"
 msgstr "MP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:235 src/gui/statuswindow.cpp:423
+#: src/gui/statuswindow.cpp:234 src/gui/statuswindow.cpp:424
 #, c-format
 msgid "Job: %d"
 msgstr "Job: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:237
+#: src/gui/statuswindow.cpp:236
 msgid "Job:"
 msgstr "Job:"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:288 src/gui/statuswindow.cpp:345
+#: src/gui/statuswindow.cpp:289 src/gui/statuswindow.cpp:346
 #, c-format
 msgid "Character points: %d"
 msgstr "Charakterpunkte: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:360
+#: src/gui/statuswindow.cpp:361
 #, c-format
 msgid "Correction points: %d"
 msgstr "Korrekturpunkte: %d"
@@ -5683,13 +5739,13 @@ msgid "%s whispers: %s"
 msgstr "%s flüstert: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:540
+#: src/gui/widgets/chattab.cpp:541
 #, c-format
 msgid "%s is now Online."
 msgstr "%s ist jetzt Online."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:545
+#: src/gui/widgets/chattab.cpp:546
 #, c-format
 msgid "%s is now Offline."
 msgstr "%s ist jetzt Offline."
@@ -5978,24 +6034,24 @@ msgstr "Wähle Welt"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/inputmanager.cpp:328 src/inputmanager.cpp:372 src/keyboardconfig.cpp:90
+#: src/inputmanager.cpp:329 src/inputmanager.cpp:373 src/keyboardconfig.cpp:90
 #, c-format
 msgid "key_%d"
 msgstr "Taste_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/inputmanager.cpp:334
+#: src/inputmanager.cpp:335
 #, c-format
 msgid "JButton%d"
 msgstr "JButton%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/inputmanager.cpp:348
+#: src/inputmanager.cpp:349
 msgid "unknown key"
 msgstr "unbekannte Taste"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/inputmanager.cpp:378
+#: src/inputmanager.cpp:379
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -6003,7 +6059,7 @@ msgstr "JB%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/inputmanager.cpp:392 src/keyboardconfig.cpp:103
+#: src/inputmanager.cpp:393 src/keyboardconfig.cpp:134
 msgid "u key"
 msgstr "U-Taste"
 
@@ -6684,55 +6740,55 @@ msgid "Request to quit denied!"
 msgstr "Verlassen verweigert!"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:176
+#: src/net/ea/guildhandler.cpp:178
 #, c-format
 msgid "Guild name: %s"
 msgstr "Gildenname: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:179
+#: src/net/ea/guildhandler.cpp:181
 #, c-format
 msgid "Guild master: %s"
 msgstr "Gilden Meister: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild level: %d"
 msgstr "Gilden Level: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:186
 #, c-format
 msgid "Online members: %d"
 msgstr "Mitglieder Online: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:187
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Max members: %d"
 msgstr "Max Mitglieder: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Average level: %d"
 msgstr "Durchschn. Level: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:193
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Guild exp: %d"
 msgstr "Gilden-EP: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:195
+#: src/net/ea/guildhandler.cpp:197
 #, c-format
 msgid "Guild next exp: %d"
 msgstr "Verbl. Gilden-EP: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:198
+#: src/net/ea/guildhandler.cpp:200
 #, c-format
 msgid "Guild castle: %s"
 msgstr "Gildenburg: %s"
diff --git a/po/el.po b/po/el.po
index b8936bae9..8f8e202a1 100644
--- a/po/el.po
+++ b/po/el.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-07-19 22:23+0300\n"
-"PO-Revision-Date: 2013-07-19 19:52+0000\n"
+"POT-Creation-Date: 2013-08-16 20:45+0300\n"
+"PO-Revision-Date: 2013-08-16 17:53+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/manaplus/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -38,21 +38,21 @@ msgstr ""
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "dodge"
 msgstr "υπευκφυγή"
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "miss"
 msgstr "αστοχία"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1606 src/gui/whoisonline.cpp:835
+#: src/being.cpp:1713 src/gui/whoisonline.cpp:842
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1611 src/gui/whoisonline.cpp:840
+#: src/being.cpp:1718 src/gui/whoisonline.cpp:847
 msgid "I"
 msgstr ""
 
@@ -89,8 +89,8 @@ msgstr ""
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:1176 src/gui/didyouknowwindow.cpp:78
-#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:66
-#: src/gui/npcdialog.cpp:103 src/gui/popupmenu.cpp:562
+#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:70
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:562
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:81
 msgid "Close"
 msgstr "Κλείσιμο"
@@ -425,36 +425,36 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:465
+#: src/game.cpp:259 src/gui/widgets/chattab.cpp:466
 msgid "General"
 msgstr "Γενικά"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: debug window name
 #. TRANSLATORS: full button name
-#: src/game.cpp:272 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:467
+#: src/game.cpp:275 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:468
 #: src/gui/windowmenu.cpp:154
 msgid "Debug"
 msgstr "Αποσφαλμάτωση"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:536
+#: src/game.cpp:540
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:546
+#: src/game.cpp:550
 msgid "Saving screenshot failed!"
 msgstr "Σώσιμο φωτογραφίας απέτυχε"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:618
+#: src/game.cpp:622
 msgid "The connection to the server was lost."
 msgstr "Η σύνδεση με το διακομιστή χάθηκε."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:621
+#: src/game.cpp:625
 msgid "Network Error"
 msgstr "Σφάλμα δικτύου"
 
@@ -489,7 +489,7 @@ msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:105
+#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:111
 msgid "Reset"
 msgstr "Επαναφορά"
 
@@ -590,7 +590,7 @@ msgstr "Αγορά"
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
 #: src/gui/buydialog.cpp:251 src/gui/buydialog.cpp:531
-#: src/gui/selldialog.cpp:96 src/gui/selldialog.cpp:356
+#: src/gui/selldialog.cpp:97 src/gui/selldialog.cpp:357
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
@@ -607,8 +607,8 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/buydialog.cpp:265 src/gui/itemamountwindow.cpp:202
-#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:96
-#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:790
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:100
+#: src/gui/selldialog.cpp:101 src/gui/statuswindow.cpp:791
 msgid "+"
 msgstr "+"
 
@@ -619,8 +619,8 @@ msgstr "+"
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
 #: src/gui/buydialog.cpp:268 src/gui/itemamountwindow.cpp:200
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:98
-#: src/gui/selldialog.cpp:102 src/gui/statuswindow.cpp:803
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:102
+#: src/gui/selldialog.cpp:103 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr "-"
 
@@ -628,7 +628,7 @@ msgstr "-"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/buydialog.cpp:271 src/gui/charcreatedialog.cpp:122
-#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1160
+#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1282
 msgid "Create"
 msgstr "Δημιουργία"
 
@@ -640,7 +640,7 @@ msgstr "Δημιουργία"
 #. TRANSLATORS: input action name
 #: src/gui/buydialog.cpp:273 src/gui/quitdialog.cpp:55
 #: src/gui/quitdialog.cpp:60 src/gui/quitdialog.cpp:62
-#: src/gui/selldialog.cpp:106 src/gui/serverdialog.cpp:262
+#: src/gui/selldialog.cpp:107 src/gui/serverdialog.cpp:262
 #: src/gui/setupactiondata.h:177
 msgid "Quit"
 msgstr "Έξοδος"
@@ -650,9 +650,9 @@ msgstr "Έξοδος"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:108
-#: src/gui/statuswindow.cpp:531 src/gui/statuswindow.cpp:586
-#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:821
+#: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:109
+#: src/gui/statuswindow.cpp:532 src/gui/statuswindow.cpp:587
+#: src/gui/statuswindow.cpp:788 src/gui/statuswindow.cpp:822
 msgid "Max"
 msgstr "Max"
 
@@ -672,7 +672,7 @@ msgstr "Κατάστημα"
 #. TRANSLATORS: sell dialog button
 #: src/gui/buyselldialog.cpp:69 src/gui/popupmenu.cpp:223
 #: src/gui/popupmenu.cpp:2455 src/gui/selldialog.cpp:54
-#: src/gui/selldialog.cpp:64 src/gui/selldialog.cpp:104
+#: src/gui/selldialog.cpp:64 src/gui/selldialog.cpp:105
 msgid "Sell"
 msgstr "Πουλήστε"
 
@@ -712,7 +712,7 @@ msgstr "Πουλήστε"
 #: src/gui/popupmenu.cpp:2309 src/gui/popupmenu.cpp:2543
 #: src/gui/popupmenu.cpp:2660 src/gui/quitdialog.cpp:73
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
-#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1094
+#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1216
 #: src/gui/textcommandeditor.cpp:211 src/gui/textdialog.cpp:53
 #: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:181
 msgid "Cancel"
@@ -996,92 +996,102 @@ msgstr ""
 #. TRANSLATORS: inventory sort mode
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
-#: src/gui/chatwindow.cpp:139 src/gui/inventorywindow.cpp:65
+#: src/gui/chatwindow.cpp:143 src/gui/inventorywindow.cpp:65
 #: src/gui/setup_other.cpp:69 src/gui/setup_visual.cpp:77
 msgid "default"
 msgstr "προεπιλογή"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:141
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:145 src/gui/widgets/colormodel.cpp:76
 msgid "black"
 msgstr "μαύρο"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:143
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:147 src/gui/widgets/colormodel.cpp:78
 msgid "red"
 msgstr "κόκκινο"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:145
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:149 src/gui/widgets/colormodel.cpp:80
 msgid "green"
 msgstr "πράσινο"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:147
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:151 src/gui/widgets/colormodel.cpp:82
 msgid "blue"
 msgstr "μπλε"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:149
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:153 src/gui/widgets/colormodel.cpp:84
 msgid "gold"
 msgstr "χρυσό"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:151
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:155 src/gui/widgets/colormodel.cpp:86
 msgid "yellow"
 msgstr "κίτρινο"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:153
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:157 src/gui/widgets/colormodel.cpp:88
 msgid "pink"
 msgstr "ροζ"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:155
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:159 src/gui/widgets/colormodel.cpp:90
 msgid "purple"
 msgstr "μωβ"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:157
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:161 src/gui/widgets/colormodel.cpp:92
 msgid "grey"
 msgstr "γκρί"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:159
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:163 src/gui/widgets/colormodel.cpp:94
 msgid "brown"
 msgstr "καφέ"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:161
+#: src/gui/chatwindow.cpp:165
 msgid "rainbow 1"
 msgstr "ουράνιο τόξο 1"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:163
+#: src/gui/chatwindow.cpp:167
 msgid "rainbow 2"
 msgstr "ουράνιο τόξο 2"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:165
+#: src/gui/chatwindow.cpp:169
 msgid "rainbow 3"
 msgstr "ουράνιο τόξο 3"
 
 #. TRANSLATORS: chat window name
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
-#: src/gui/chatwindow.cpp:192 src/gui/setupactiondata.h:1866
+#: src/gui/chatwindow.cpp:196 src/gui/setupactiondata.h:1866
 #: src/gui/setup_chat.cpp:50 src/gui/windowmenu.cpp:88
 msgid "Chat"
 msgstr "Συζήτηση"
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:641
+#: src/gui/chatwindow.cpp:684
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1044
+#: src/gui/chatwindow.cpp:1091
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Ψιθυρίζοντας στο %s: %s"
@@ -1390,6 +1400,38 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
+#. TRANSLATORS: font size
+#: src/gui/emotewindow.cpp:49
+msgid "Normal font"
+msgstr ""
+
+#. TRANSLATORS: font size
+#. TRANSLATORS: theme settings label
+#: src/gui/emotewindow.cpp:51 src/gui/setup_theme.cpp:249
+msgid "Bold font"
+msgstr ""
+
+#. TRANSLATORS: emotes window name
+#. TRANSLATORS: emotes tab name
+#. TRANSLATORS: input tab sub tab name
+#: src/gui/emotewindow.cpp:56 src/gui/emotewindow.cpp:107
+#: src/gui/setupactiondata.h:1862
+msgid "Emotes"
+msgstr ""
+
+#. TRANSLATORS: emotes tab name
+#. TRANSLATORS: settings group
+#. TRANSLATORS: settings colors tab name
+#: src/gui/emotewindow.cpp:109 src/gui/setup_chat.cpp:70
+#: src/gui/setup_colors.cpp:83
+msgid "Colors"
+msgstr ""
+
+#. TRANSLATORS: emotes tab name
+#: src/gui/emotewindow.cpp:111
+msgid "Fonts"
+msgstr ""
+
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/equipmentwindow.cpp:56 src/gui/inventorywindow.cpp:204
@@ -1481,7 +1523,7 @@ msgstr "Ανάκτηση"
 
 #. TRANSLATORS: status window label
 #: src/gui/inventorywindow.cpp:580 src/gui/statuswindow.cpp:143
-#: src/gui/statuswindow.cpp:284 src/gui/statuswindow.cpp:337
+#: src/gui/statuswindow.cpp:285 src/gui/statuswindow.cpp:338
 #: src/gui/widgets/characterdisplay.cpp:126
 #, c-format
 msgid "Money: %s"
@@ -1769,7 +1811,7 @@ msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:295
+#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:296
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
@@ -1777,7 +1819,7 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/ministatuswindow.cpp:317 src/gui/statuswindow.cpp:141
-#: src/gui/statuswindow.cpp:302 src/gui/statuswindow.cpp:373
+#: src/gui/statuswindow.cpp:303 src/gui/statuswindow.cpp:374
 #, c-format
 msgid "Level: %d"
 msgstr ""
@@ -1794,34 +1836,45 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:62
+#: src/gui/npcdialog.cpp:66
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:64
+#: src/gui/npcdialog.cpp:68
 msgid "Next"
 msgstr "Επόμενο"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:68
+#: src/gui/npcdialog.cpp:72
 msgid "Submit"
 msgstr "Υποβολή"
 
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
 #. TRANSLATORS: settings group
-#: src/gui/npcdialog.cpp:77 src/gui/npcpostdialog.cpp:43
+#: src/gui/npcdialog.cpp:81 src/gui/npcpostdialog.cpp:43
 #: src/gui/setup_other.cpp:257
 msgid "NPC"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:566
+#: src/gui/npcdialog.cpp:104 src/gui/popupmenu.cpp:566
 msgid "Clear"
 msgstr "Σαφή"
 
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: trade window button
+#: src/gui/npcdialog.cpp:109 src/gui/serverdialog.cpp:266
+#: src/gui/shopwindow.cpp:95 src/gui/shopwindow.cpp:102
+#: src/gui/tradewindow.cpp:77
+msgid "Add"
+msgstr "Προσθήκη"
+
 #. TRANSLATORS: label in npc post dialog
 #: src/gui/npcpostdialog.cpp:53
 msgid "To:"
@@ -2029,7 +2082,7 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: social window button
-#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1164
+#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1286
 msgid "Leave"
 msgstr ""
 
@@ -2163,7 +2216,7 @@ msgstr ""
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2194
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:985
 msgid "(default)"
 msgstr ""
 
@@ -2395,12 +2448,12 @@ msgid "Passwords do not match."
 msgstr "Οι κωδικοί πρόσβασης δεν ταιριάζουν."
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/selldialog.cpp:242
+#: src/gui/selldialog.cpp:243
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/selldialog.cpp:244
+#: src/gui/selldialog.cpp:245
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
@@ -2411,15 +2464,6 @@ msgid "Choose Your Server"
 msgstr "Επιλέξε τον διακοσμιτή σου"
 
 #. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:266 src/gui/shopwindow.cpp:95
-#: src/gui/shopwindow.cpp:102 src/gui/tradewindow.cpp:77
-msgid "Add"
-msgstr "Προσθήκη"
-
-#. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
 #: src/gui/serverdialog.cpp:268 src/gui/widgets/setupitem.cpp:303
 #: src/gui/widgets/setupitem.cpp:430
@@ -3155,11 +3199,6 @@ msgid "Windows"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1862
-msgid "Emotes"
-msgstr ""
-
-#. TRANSLATORS: input tab sub tab name
 #: src/gui/setupactiondata.h:1870
 msgid "Gui"
 msgstr ""
@@ -3315,18 +3354,12 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:61
-msgid "Auto hide chat window."
+msgid "Auto hide chat window"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:65
-msgid "Protect chat focus."
-msgstr ""
-
-#. TRANSLATORS: settings group
-#. TRANSLATORS: settings colors tab name
-#: src/gui/setup_chat.cpp:70 src/gui/setup_colors.cpp:83
-msgid "Colors"
+msgid "Protect chat focus"
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4421,11 +4454,6 @@ msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:249
-msgid "Bold font"
-msgstr ""
-
-#. TRANSLATORS: theme settings label
 #: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr ""
@@ -4911,258 +4939,289 @@ msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
-#: src/gui/socialwindow.cpp:158 src/gui/socialwindow.cpp:259
+#: src/gui/socialwindow.cpp:176 src/gui/socialwindow.cpp:309
 #: src/gui/widgets/guildchattab.cpp:42 src/net/ea/gui/guildtab.cpp:49
 msgid "Guild"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:213
+#: src/gui/socialwindow.cpp:231
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:245
 msgid "Member Invite to Guild"
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:229
+#: src/gui/socialwindow.cpp:247
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:238
+#: src/gui/socialwindow.cpp:256
 msgid "Leave Guild?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:240
+#: src/gui/socialwindow.cpp:258
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:269
+#, c-format
+msgid "Members: %u/%u"
+msgstr ""
+
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:291 src/gui/socialwindow.cpp:361
+#: src/gui/socialwindow.cpp:483
+#, c-format
+msgid "Players: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/socialwindow.cpp:302 src/net/ea/gui/partytab.cpp:49
+#: src/gui/socialwindow.cpp:376 src/net/ea/gui/partytab.cpp:49
 msgid "Party"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:341
+#: src/gui/socialwindow.cpp:415
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
 #. TRANSLATORS: tab in social window
-#: src/gui/socialwindow.cpp:356
+#: src/gui/socialwindow.cpp:430
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:370
+#: src/gui/socialwindow.cpp:444
 msgid "Member Invite to Party"
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:372
+#: src/gui/socialwindow.cpp:446
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:381
+#: src/gui/socialwindow.cpp:455
 msgid "Leave Party?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:383
+#: src/gui/socialwindow.cpp:457
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:681
+#, c-format
+msgid "Visible players: %d"
+msgstr ""
+
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:605
+#: src/gui/socialwindow.cpp:707
 msgid "Nav"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:809
+#, c-format
+msgid "Portals: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:922
+#: src/gui/socialwindow.cpp:1035
 msgid "Atk"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:941
+#: src/gui/socialwindow.cpp:1054
 msgid "Priority mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:943
+#: src/gui/socialwindow.cpp:1056
 msgid "Attack mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:945
+#: src/gui/socialwindow.cpp:1058
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:968
+#: src/gui/socialwindow.cpp:1081
 msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:987
+#: src/gui/socialwindow.cpp:1100
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:989
+#: src/gui/socialwindow.cpp:1102
 msgid "Ignore items"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:1190
+#, c-format
+msgid "Friends: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1091 src/gui/socialwindow.cpp:1563
+#: src/gui/socialwindow.cpp:1213 src/gui/socialwindow.cpp:1687
 msgid "Create Party"
 msgstr ""
 
 #. TRANSLATORS: social window name
 #. TRANSLATORS: full button name
-#: src/gui/socialwindow.cpp:1138 src/gui/windowmenu.cpp:126
+#: src/gui/socialwindow.cpp:1260 src/gui/windowmenu.cpp:126
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1273
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1156
+#: src/gui/socialwindow.cpp:1278
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/socialwindow.cpp:1162
+#: src/gui/socialwindow.cpp:1284
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1345
+#: src/gui/socialwindow.cpp:1469
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1356
+#: src/gui/socialwindow.cpp:1480
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1497
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1424
+#: src/gui/socialwindow.cpp:1548
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1445
+#: src/gui/socialwindow.cpp:1569
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1460
+#: src/gui/socialwindow.cpp:1584
 msgid "Guild Name"
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1462
+#: src/gui/socialwindow.cpp:1586
 msgid "Choose your guild's name."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1477
+#: src/gui/socialwindow.cpp:1601
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1485
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1616
 msgid "Accept Guild Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1631
 msgid "Received party request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1519
+#: src/gui/socialwindow.cpp:1643
 msgid "You have been invited you to join a party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1524
+#: src/gui/socialwindow.cpp:1648
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1533
+#: src/gui/socialwindow.cpp:1657
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1539
+#: src/gui/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1673
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1688
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1694
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1572
+#: src/gui/socialwindow.cpp:1696
 msgid "Choose your party's name."
 msgstr ""
 
@@ -5182,24 +5241,24 @@ msgid "MP:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:235 src/gui/statuswindow.cpp:423
+#: src/gui/statuswindow.cpp:234 src/gui/statuswindow.cpp:424
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:237
+#: src/gui/statuswindow.cpp:236
 msgid "Job:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:288 src/gui/statuswindow.cpp:345
+#: src/gui/statuswindow.cpp:289 src/gui/statuswindow.cpp:346
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:360
+#: src/gui/statuswindow.cpp:361
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
@@ -5645,13 +5704,13 @@ msgid "%s whispers: %s"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:540
+#: src/gui/widgets/chattab.cpp:541
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:545
+#: src/gui/widgets/chattab.cpp:546
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -5937,24 +5996,24 @@ msgstr ""
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/inputmanager.cpp:328 src/inputmanager.cpp:372 src/keyboardconfig.cpp:90
+#: src/inputmanager.cpp:329 src/inputmanager.cpp:373 src/keyboardconfig.cpp:90
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/inputmanager.cpp:334
+#: src/inputmanager.cpp:335
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/inputmanager.cpp:348
+#: src/inputmanager.cpp:349
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/inputmanager.cpp:378
+#: src/inputmanager.cpp:379
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -5962,7 +6021,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/inputmanager.cpp:392 src/keyboardconfig.cpp:103
+#: src/inputmanager.cpp:393 src/keyboardconfig.cpp:134
 msgid "u key"
 msgstr ""
 
@@ -6638,55 +6697,55 @@ msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:176
+#: src/net/ea/guildhandler.cpp:178
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:179
+#: src/net/ea/guildhandler.cpp:181
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:186
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:187
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:193
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:195
+#: src/net/ea/guildhandler.cpp:197
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:198
+#: src/net/ea/guildhandler.cpp:200
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
@@ -7561,8 +7620,8 @@ msgstr ""
 #. TRANSLATORS: being info default name
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
-#: src/resources/avatardb.cpp:69 src/resources/beinginfo.cpp:40
-#: src/resources/itemdb.cpp:291 src/resources/monsterdb.cpp:100
+#: src/resources/avatardb.cpp:69 src/resources/beinginfo.cpp:41
+#: src/resources/itemdb.cpp:295 src/resources/monsterdb.cpp:100
 msgid "unnamed"
 msgstr ""
 
diff --git a/po/en_GB.po b/po/en_GB.po
index 2accfcd4f..0313d72bd 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-07-19 22:23+0300\n"
-"PO-Revision-Date: 2013-07-19 19:52+0000\n"
+"POT-Creation-Date: 2013-08-16 20:45+0300\n"
+"PO-Revision-Date: 2013-08-16 17:53+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/manaplus/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -39,21 +39,21 @@ msgstr ""
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "dodge"
 msgstr "dodge"
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "miss"
 msgstr "miss"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1606 src/gui/whoisonline.cpp:835
+#: src/being.cpp:1713 src/gui/whoisonline.cpp:842
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1611 src/gui/whoisonline.cpp:840
+#: src/being.cpp:1718 src/gui/whoisonline.cpp:847
 msgid "I"
 msgstr ""
 
@@ -90,8 +90,8 @@ msgstr ""
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:1176 src/gui/didyouknowwindow.cpp:78
-#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:66
-#: src/gui/npcdialog.cpp:103 src/gui/popupmenu.cpp:562
+#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:70
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:562
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:81
 msgid "Close"
 msgstr "Close"
@@ -426,36 +426,36 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:465
+#: src/game.cpp:259 src/gui/widgets/chattab.cpp:466
 msgid "General"
 msgstr "General"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: debug window name
 #. TRANSLATORS: full button name
-#: src/game.cpp:272 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:467
+#: src/game.cpp:275 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:468
 #: src/gui/windowmenu.cpp:154
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:536
+#: src/game.cpp:540
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:546
+#: src/game.cpp:550
 msgid "Saving screenshot failed!"
 msgstr "Saving screenshot failed!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:618
+#: src/game.cpp:622
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:621
+#: src/game.cpp:625
 msgid "Network Error"
 msgstr "Network Error"
 
@@ -490,7 +490,7 @@ msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:105
+#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:111
 msgid "Reset"
 msgstr "Reset"
 
@@ -591,7 +591,7 @@ msgstr "Buy"
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
 #: src/gui/buydialog.cpp:251 src/gui/buydialog.cpp:531
-#: src/gui/selldialog.cpp:96 src/gui/selldialog.cpp:356
+#: src/gui/selldialog.cpp:97 src/gui/selldialog.cpp:357
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Price: %s / Total: %s"
@@ -608,8 +608,8 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/buydialog.cpp:265 src/gui/itemamountwindow.cpp:202
-#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:96
-#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:790
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:100
+#: src/gui/selldialog.cpp:101 src/gui/statuswindow.cpp:791
 msgid "+"
 msgstr ""
 
@@ -620,8 +620,8 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
 #: src/gui/buydialog.cpp:268 src/gui/itemamountwindow.cpp:200
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:98
-#: src/gui/selldialog.cpp:102 src/gui/statuswindow.cpp:803
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:102
+#: src/gui/selldialog.cpp:103 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr ""
 
@@ -629,7 +629,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/buydialog.cpp:271 src/gui/charcreatedialog.cpp:122
-#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1160
+#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1282
 msgid "Create"
 msgstr "Create"
 
@@ -641,7 +641,7 @@ msgstr "Create"
 #. TRANSLATORS: input action name
 #: src/gui/buydialog.cpp:273 src/gui/quitdialog.cpp:55
 #: src/gui/quitdialog.cpp:60 src/gui/quitdialog.cpp:62
-#: src/gui/selldialog.cpp:106 src/gui/serverdialog.cpp:262
+#: src/gui/selldialog.cpp:107 src/gui/serverdialog.cpp:262
 #: src/gui/setupactiondata.h:177
 msgid "Quit"
 msgstr "Exit"
@@ -651,9 +651,9 @@ msgstr "Exit"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:108
-#: src/gui/statuswindow.cpp:531 src/gui/statuswindow.cpp:586
-#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:821
+#: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:109
+#: src/gui/statuswindow.cpp:532 src/gui/statuswindow.cpp:587
+#: src/gui/statuswindow.cpp:788 src/gui/statuswindow.cpp:822
 msgid "Max"
 msgstr "Max"
 
@@ -673,7 +673,7 @@ msgstr "Shop"
 #. TRANSLATORS: sell dialog button
 #: src/gui/buyselldialog.cpp:69 src/gui/popupmenu.cpp:223
 #: src/gui/popupmenu.cpp:2455 src/gui/selldialog.cpp:54
-#: src/gui/selldialog.cpp:64 src/gui/selldialog.cpp:104
+#: src/gui/selldialog.cpp:64 src/gui/selldialog.cpp:105
 msgid "Sell"
 msgstr "Sell"
 
@@ -713,7 +713,7 @@ msgstr "Sell"
 #: src/gui/popupmenu.cpp:2309 src/gui/popupmenu.cpp:2543
 #: src/gui/popupmenu.cpp:2660 src/gui/quitdialog.cpp:73
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
-#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1094
+#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1216
 #: src/gui/textcommandeditor.cpp:211 src/gui/textdialog.cpp:53
 #: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:181
 msgid "Cancel"
@@ -997,92 +997,102 @@ msgstr ""
 #. TRANSLATORS: inventory sort mode
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
-#: src/gui/chatwindow.cpp:139 src/gui/inventorywindow.cpp:65
+#: src/gui/chatwindow.cpp:143 src/gui/inventorywindow.cpp:65
 #: src/gui/setup_other.cpp:69 src/gui/setup_visual.cpp:77
 msgid "default"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:141
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:145 src/gui/widgets/colormodel.cpp:76
 msgid "black"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:143
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:147 src/gui/widgets/colormodel.cpp:78
 msgid "red"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:145
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:149 src/gui/widgets/colormodel.cpp:80
 msgid "green"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:147
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:151 src/gui/widgets/colormodel.cpp:82
 msgid "blue"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:149
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:153 src/gui/widgets/colormodel.cpp:84
 msgid "gold"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:151
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:155 src/gui/widgets/colormodel.cpp:86
 msgid "yellow"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:153
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:157 src/gui/widgets/colormodel.cpp:88
 msgid "pink"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:155
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:159 src/gui/widgets/colormodel.cpp:90
 msgid "purple"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:157
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:161 src/gui/widgets/colormodel.cpp:92
 msgid "grey"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:159
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:163 src/gui/widgets/colormodel.cpp:94
 msgid "brown"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:161
+#: src/gui/chatwindow.cpp:165
 msgid "rainbow 1"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:163
+#: src/gui/chatwindow.cpp:167
 msgid "rainbow 2"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:165
+#: src/gui/chatwindow.cpp:169
 msgid "rainbow 3"
 msgstr ""
 
 #. TRANSLATORS: chat window name
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
-#: src/gui/chatwindow.cpp:192 src/gui/setupactiondata.h:1866
+#: src/gui/chatwindow.cpp:196 src/gui/setupactiondata.h:1866
 #: src/gui/setup_chat.cpp:50 src/gui/windowmenu.cpp:88
 msgid "Chat"
 msgstr "Chat"
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:641
+#: src/gui/chatwindow.cpp:684
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1044
+#: src/gui/chatwindow.cpp:1091
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Whispering to %s: %s"
@@ -1391,6 +1401,38 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
+#. TRANSLATORS: font size
+#: src/gui/emotewindow.cpp:49
+msgid "Normal font"
+msgstr ""
+
+#. TRANSLATORS: font size
+#. TRANSLATORS: theme settings label
+#: src/gui/emotewindow.cpp:51 src/gui/setup_theme.cpp:249
+msgid "Bold font"
+msgstr ""
+
+#. TRANSLATORS: emotes window name
+#. TRANSLATORS: emotes tab name
+#. TRANSLATORS: input tab sub tab name
+#: src/gui/emotewindow.cpp:56 src/gui/emotewindow.cpp:107
+#: src/gui/setupactiondata.h:1862
+msgid "Emotes"
+msgstr ""
+
+#. TRANSLATORS: emotes tab name
+#. TRANSLATORS: settings group
+#. TRANSLATORS: settings colors tab name
+#: src/gui/emotewindow.cpp:109 src/gui/setup_chat.cpp:70
+#: src/gui/setup_colors.cpp:83
+msgid "Colors"
+msgstr "Colours"
+
+#. TRANSLATORS: emotes tab name
+#: src/gui/emotewindow.cpp:111
+msgid "Fonts"
+msgstr ""
+
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/equipmentwindow.cpp:56 src/gui/inventorywindow.cpp:204
@@ -1482,7 +1524,7 @@ msgstr "Retrieve"
 
 #. TRANSLATORS: status window label
 #: src/gui/inventorywindow.cpp:580 src/gui/statuswindow.cpp:143
-#: src/gui/statuswindow.cpp:284 src/gui/statuswindow.cpp:337
+#: src/gui/statuswindow.cpp:285 src/gui/statuswindow.cpp:338
 #: src/gui/widgets/characterdisplay.cpp:126
 #, c-format
 msgid "Money: %s"
@@ -1770,7 +1812,7 @@ msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:295
+#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:296
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
@@ -1778,7 +1820,7 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/ministatuswindow.cpp:317 src/gui/statuswindow.cpp:141
-#: src/gui/statuswindow.cpp:302 src/gui/statuswindow.cpp:373
+#: src/gui/statuswindow.cpp:303 src/gui/statuswindow.cpp:374
 #, c-format
 msgid "Level: %d"
 msgstr "Level: %d"
@@ -1795,34 +1837,45 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:62
+#: src/gui/npcdialog.cpp:66
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:64
+#: src/gui/npcdialog.cpp:68
 msgid "Next"
 msgstr "Next"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:68
+#: src/gui/npcdialog.cpp:72
 msgid "Submit"
 msgstr "Submit"
 
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
 #. TRANSLATORS: settings group
-#: src/gui/npcdialog.cpp:77 src/gui/npcpostdialog.cpp:43
+#: src/gui/npcdialog.cpp:81 src/gui/npcpostdialog.cpp:43
 #: src/gui/setup_other.cpp:257
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:566
+#: src/gui/npcdialog.cpp:104 src/gui/popupmenu.cpp:566
 msgid "Clear"
 msgstr ""
 
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: trade window button
+#: src/gui/npcdialog.cpp:109 src/gui/serverdialog.cpp:266
+#: src/gui/shopwindow.cpp:95 src/gui/shopwindow.cpp:102
+#: src/gui/tradewindow.cpp:77
+msgid "Add"
+msgstr "Add"
+
 #. TRANSLATORS: label in npc post dialog
 #: src/gui/npcpostdialog.cpp:53
 msgid "To:"
@@ -2030,7 +2083,7 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: social window button
-#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1164
+#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1286
 msgid "Leave"
 msgstr ""
 
@@ -2164,7 +2217,7 @@ msgstr ""
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2194
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:985
 msgid "(default)"
 msgstr ""
 
@@ -2396,12 +2449,12 @@ msgid "Passwords do not match."
 msgstr "Passwords do not match."
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/selldialog.cpp:242
+#: src/gui/selldialog.cpp:243
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/selldialog.cpp:244
+#: src/gui/selldialog.cpp:245
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
@@ -2412,15 +2465,6 @@ msgid "Choose Your Server"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:266 src/gui/shopwindow.cpp:95
-#: src/gui/shopwindow.cpp:102 src/gui/tradewindow.cpp:77
-msgid "Add"
-msgstr "Add"
-
-#. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
 #: src/gui/serverdialog.cpp:268 src/gui/widgets/setupitem.cpp:303
 #: src/gui/widgets/setupitem.cpp:430
@@ -3156,11 +3200,6 @@ msgid "Windows"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1862
-msgid "Emotes"
-msgstr ""
-
-#. TRANSLATORS: input tab sub tab name
 #: src/gui/setupactiondata.h:1870
 msgid "Gui"
 msgstr ""
@@ -3316,20 +3355,14 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:61
-msgid "Auto hide chat window."
+msgid "Auto hide chat window"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:65
-msgid "Protect chat focus."
+msgid "Protect chat focus"
 msgstr ""
 
-#. TRANSLATORS: settings group
-#. TRANSLATORS: settings colors tab name
-#: src/gui/setup_chat.cpp:70 src/gui/setup_colors.cpp:83
-msgid "Colors"
-msgstr "Colours"
-
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:73
 msgid "Remove colors from received chat messages"
@@ -4422,11 +4455,6 @@ msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:249
-msgid "Bold font"
-msgstr ""
-
-#. TRANSLATORS: theme settings label
 #: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr ""
@@ -4912,258 +4940,289 @@ msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
-#: src/gui/socialwindow.cpp:158 src/gui/socialwindow.cpp:259
+#: src/gui/socialwindow.cpp:176 src/gui/socialwindow.cpp:309
 #: src/gui/widgets/guildchattab.cpp:42 src/net/ea/gui/guildtab.cpp:49
 msgid "Guild"
 msgstr "Guild"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:213
+#: src/gui/socialwindow.cpp:231
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:245
 msgid "Member Invite to Guild"
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:229
+#: src/gui/socialwindow.cpp:247
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:238
+#: src/gui/socialwindow.cpp:256
 msgid "Leave Guild?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:240
+#: src/gui/socialwindow.cpp:258
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:269
+#, c-format
+msgid "Members: %u/%u"
+msgstr ""
+
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:291 src/gui/socialwindow.cpp:361
+#: src/gui/socialwindow.cpp:483
+#, c-format
+msgid "Players: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/socialwindow.cpp:302 src/net/ea/gui/partytab.cpp:49
+#: src/gui/socialwindow.cpp:376 src/net/ea/gui/partytab.cpp:49
 msgid "Party"
 msgstr "Party"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:341
+#: src/gui/socialwindow.cpp:415
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
 #. TRANSLATORS: tab in social window
-#: src/gui/socialwindow.cpp:356
+#: src/gui/socialwindow.cpp:430
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:370
+#: src/gui/socialwindow.cpp:444
 msgid "Member Invite to Party"
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:372
+#: src/gui/socialwindow.cpp:446
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:381
+#: src/gui/socialwindow.cpp:455
 msgid "Leave Party?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:383
+#: src/gui/socialwindow.cpp:457
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:681
+#, c-format
+msgid "Visible players: %d"
+msgstr ""
+
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:605
+#: src/gui/socialwindow.cpp:707
 msgid "Nav"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:809
+#, c-format
+msgid "Portals: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:922
+#: src/gui/socialwindow.cpp:1035
 msgid "Atk"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:941
+#: src/gui/socialwindow.cpp:1054
 msgid "Priority mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:943
+#: src/gui/socialwindow.cpp:1056
 msgid "Attack mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:945
+#: src/gui/socialwindow.cpp:1058
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:968
+#: src/gui/socialwindow.cpp:1081
 msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:987
+#: src/gui/socialwindow.cpp:1100
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:989
+#: src/gui/socialwindow.cpp:1102
 msgid "Ignore items"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:1190
+#, c-format
+msgid "Friends: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1091 src/gui/socialwindow.cpp:1563
+#: src/gui/socialwindow.cpp:1213 src/gui/socialwindow.cpp:1687
 msgid "Create Party"
 msgstr ""
 
 #. TRANSLATORS: social window name
 #. TRANSLATORS: full button name
-#: src/gui/socialwindow.cpp:1138 src/gui/windowmenu.cpp:126
+#: src/gui/socialwindow.cpp:1260 src/gui/windowmenu.cpp:126
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1273
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1156
+#: src/gui/socialwindow.cpp:1278
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/socialwindow.cpp:1162
+#: src/gui/socialwindow.cpp:1284
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1345
+#: src/gui/socialwindow.cpp:1469
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1356
+#: src/gui/socialwindow.cpp:1480
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1497
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1424
+#: src/gui/socialwindow.cpp:1548
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1445
+#: src/gui/socialwindow.cpp:1569
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1460
+#: src/gui/socialwindow.cpp:1584
 msgid "Guild Name"
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1462
+#: src/gui/socialwindow.cpp:1586
 msgid "Choose your guild's name."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1477
+#: src/gui/socialwindow.cpp:1601
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1485
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1616
 msgid "Accept Guild Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1631
 msgid "Received party request, but one already exists."
 msgstr "Received party request, but one already exists."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1519
+#: src/gui/socialwindow.cpp:1643
 msgid "You have been invited you to join a party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1524
+#: src/gui/socialwindow.cpp:1648
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1533
+#: src/gui/socialwindow.cpp:1657
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s has invited you to join their party."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1539
+#: src/gui/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s has invited you to join the %s party."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1673
 msgid "Accept Party Invite"
 msgstr "Accept Party Invite"
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1688
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1694
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1572
+#: src/gui/socialwindow.cpp:1696
 msgid "Choose your party's name."
 msgstr ""
 
@@ -5183,24 +5242,24 @@ msgid "MP:"
 msgstr "MP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:235 src/gui/statuswindow.cpp:423
+#: src/gui/statuswindow.cpp:234 src/gui/statuswindow.cpp:424
 #, c-format
 msgid "Job: %d"
 msgstr "Job: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:237
+#: src/gui/statuswindow.cpp:236
 msgid "Job:"
 msgstr "Job:"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:288 src/gui/statuswindow.cpp:345
+#: src/gui/statuswindow.cpp:289 src/gui/statuswindow.cpp:346
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:360
+#: src/gui/statuswindow.cpp:361
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
@@ -5646,13 +5705,13 @@ msgid "%s whispers: %s"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:540
+#: src/gui/widgets/chattab.cpp:541
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:545
+#: src/gui/widgets/chattab.cpp:546
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -5938,24 +5997,24 @@ msgstr ""
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/inputmanager.cpp:328 src/inputmanager.cpp:372 src/keyboardconfig.cpp:90
+#: src/inputmanager.cpp:329 src/inputmanager.cpp:373 src/keyboardconfig.cpp:90
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/inputmanager.cpp:334
+#: src/inputmanager.cpp:335
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/inputmanager.cpp:348
+#: src/inputmanager.cpp:349
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/inputmanager.cpp:378
+#: src/inputmanager.cpp:379
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -5963,7 +6022,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/inputmanager.cpp:392 src/keyboardconfig.cpp:103
+#: src/inputmanager.cpp:393 src/keyboardconfig.cpp:134
 msgid "u key"
 msgstr ""
 
@@ -6639,55 +6698,55 @@ msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:176
+#: src/net/ea/guildhandler.cpp:178
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:179
+#: src/net/ea/guildhandler.cpp:181
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:186
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:187
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:193
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:195
+#: src/net/ea/guildhandler.cpp:197
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:198
+#: src/net/ea/guildhandler.cpp:200
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
@@ -7562,8 +7621,8 @@ msgstr ""
 #. TRANSLATORS: being info default name
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
-#: src/resources/avatardb.cpp:69 src/resources/beinginfo.cpp:40
-#: src/resources/itemdb.cpp:291 src/resources/monsterdb.cpp:100
+#: src/resources/avatardb.cpp:69 src/resources/beinginfo.cpp:41
+#: src/resources/itemdb.cpp:295 src/resources/monsterdb.cpp:100
 msgid "unnamed"
 msgstr "unnamed"
 
diff --git a/po/eo.po b/po/eo.po
index 453bd6287..21064d288 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-07-19 22:23+0300\n"
-"PO-Revision-Date: 2013-07-19 19:52+0000\n"
+"POT-Creation-Date: 2013-08-16 20:45+0300\n"
+"PO-Revision-Date: 2013-08-16 17:53+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/manaplus/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -38,21 +38,21 @@ msgstr ""
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1606 src/gui/whoisonline.cpp:835
+#: src/being.cpp:1713 src/gui/whoisonline.cpp:842
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1611 src/gui/whoisonline.cpp:840
+#: src/being.cpp:1718 src/gui/whoisonline.cpp:847
 msgid "I"
 msgstr ""
 
@@ -89,8 +89,8 @@ msgstr ""
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:1176 src/gui/didyouknowwindow.cpp:78
-#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:66
-#: src/gui/npcdialog.cpp:103 src/gui/popupmenu.cpp:562
+#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:70
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:562
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:81
 msgid "Close"
 msgstr ""
@@ -425,36 +425,36 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:465
+#: src/game.cpp:259 src/gui/widgets/chattab.cpp:466
 msgid "General"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: debug window name
 #. TRANSLATORS: full button name
-#: src/game.cpp:272 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:467
+#: src/game.cpp:275 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:468
 #: src/gui/windowmenu.cpp:154
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:536
+#: src/game.cpp:540
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:546
+#: src/game.cpp:550
 msgid "Saving screenshot failed!"
 msgstr ""
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:618
+#: src/game.cpp:622
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:621
+#: src/game.cpp:625
 msgid "Network Error"
 msgstr ""
 
@@ -489,7 +489,7 @@ msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:105
+#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:111
 msgid "Reset"
 msgstr ""
 
@@ -590,7 +590,7 @@ msgstr ""
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
 #: src/gui/buydialog.cpp:251 src/gui/buydialog.cpp:531
-#: src/gui/selldialog.cpp:96 src/gui/selldialog.cpp:356
+#: src/gui/selldialog.cpp:97 src/gui/selldialog.cpp:357
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
@@ -607,8 +607,8 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/buydialog.cpp:265 src/gui/itemamountwindow.cpp:202
-#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:96
-#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:790
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:100
+#: src/gui/selldialog.cpp:101 src/gui/statuswindow.cpp:791
 msgid "+"
 msgstr ""
 
@@ -619,8 +619,8 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
 #: src/gui/buydialog.cpp:268 src/gui/itemamountwindow.cpp:200
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:98
-#: src/gui/selldialog.cpp:102 src/gui/statuswindow.cpp:803
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:102
+#: src/gui/selldialog.cpp:103 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr ""
 
@@ -628,7 +628,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/buydialog.cpp:271 src/gui/charcreatedialog.cpp:122
-#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1160
+#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1282
 msgid "Create"
 msgstr ""
 
@@ -640,7 +640,7 @@ msgstr ""
 #. TRANSLATORS: input action name
 #: src/gui/buydialog.cpp:273 src/gui/quitdialog.cpp:55
 #: src/gui/quitdialog.cpp:60 src/gui/quitdialog.cpp:62
-#: src/gui/selldialog.cpp:106 src/gui/serverdialog.cpp:262
+#: src/gui/selldialog.cpp:107 src/gui/serverdialog.cpp:262
 #: src/gui/setupactiondata.h:177
 msgid "Quit"
 msgstr ""
@@ -650,9 +650,9 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:108
-#: src/gui/statuswindow.cpp:531 src/gui/statuswindow.cpp:586
-#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:821
+#: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:109
+#: src/gui/statuswindow.cpp:532 src/gui/statuswindow.cpp:587
+#: src/gui/statuswindow.cpp:788 src/gui/statuswindow.cpp:822
 msgid "Max"
 msgstr ""
 
@@ -672,7 +672,7 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #: src/gui/buyselldialog.cpp:69 src/gui/popupmenu.cpp:223
 #: src/gui/popupmenu.cpp:2455 src/gui/selldialog.cpp:54
-#: src/gui/selldialog.cpp:64 src/gui/selldialog.cpp:104
+#: src/gui/selldialog.cpp:64 src/gui/selldialog.cpp:105
 msgid "Sell"
 msgstr ""
 
@@ -712,7 +712,7 @@ msgstr ""
 #: src/gui/popupmenu.cpp:2309 src/gui/popupmenu.cpp:2543
 #: src/gui/popupmenu.cpp:2660 src/gui/quitdialog.cpp:73
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
-#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1094
+#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1216
 #: src/gui/textcommandeditor.cpp:211 src/gui/textdialog.cpp:53
 #: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:181
 msgid "Cancel"
@@ -996,92 +996,102 @@ msgstr ""
 #. TRANSLATORS: inventory sort mode
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
-#: src/gui/chatwindow.cpp:139 src/gui/inventorywindow.cpp:65
+#: src/gui/chatwindow.cpp:143 src/gui/inventorywindow.cpp:65
 #: src/gui/setup_other.cpp:69 src/gui/setup_visual.cpp:77
 msgid "default"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:141
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:145 src/gui/widgets/colormodel.cpp:76
 msgid "black"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:143
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:147 src/gui/widgets/colormodel.cpp:78
 msgid "red"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:145
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:149 src/gui/widgets/colormodel.cpp:80
 msgid "green"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:147
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:151 src/gui/widgets/colormodel.cpp:82
 msgid "blue"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:149
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:153 src/gui/widgets/colormodel.cpp:84
 msgid "gold"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:151
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:155 src/gui/widgets/colormodel.cpp:86
 msgid "yellow"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:153
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:157 src/gui/widgets/colormodel.cpp:88
 msgid "pink"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:155
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:159 src/gui/widgets/colormodel.cpp:90
 msgid "purple"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:157
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:161 src/gui/widgets/colormodel.cpp:92
 msgid "grey"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:159
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:163 src/gui/widgets/colormodel.cpp:94
 msgid "brown"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:161
+#: src/gui/chatwindow.cpp:165
 msgid "rainbow 1"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:163
+#: src/gui/chatwindow.cpp:167
 msgid "rainbow 2"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:165
+#: src/gui/chatwindow.cpp:169
 msgid "rainbow 3"
 msgstr ""
 
 #. TRANSLATORS: chat window name
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
-#: src/gui/chatwindow.cpp:192 src/gui/setupactiondata.h:1866
+#: src/gui/chatwindow.cpp:196 src/gui/setupactiondata.h:1866
 #: src/gui/setup_chat.cpp:50 src/gui/windowmenu.cpp:88
 msgid "Chat"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:641
+#: src/gui/chatwindow.cpp:684
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1044
+#: src/gui/chatwindow.cpp:1091
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -1390,6 +1400,38 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
+#. TRANSLATORS: font size
+#: src/gui/emotewindow.cpp:49
+msgid "Normal font"
+msgstr ""
+
+#. TRANSLATORS: font size
+#. TRANSLATORS: theme settings label
+#: src/gui/emotewindow.cpp:51 src/gui/setup_theme.cpp:249
+msgid "Bold font"
+msgstr ""
+
+#. TRANSLATORS: emotes window name
+#. TRANSLATORS: emotes tab name
+#. TRANSLATORS: input tab sub tab name
+#: src/gui/emotewindow.cpp:56 src/gui/emotewindow.cpp:107
+#: src/gui/setupactiondata.h:1862
+msgid "Emotes"
+msgstr ""
+
+#. TRANSLATORS: emotes tab name
+#. TRANSLATORS: settings group
+#. TRANSLATORS: settings colors tab name
+#: src/gui/emotewindow.cpp:109 src/gui/setup_chat.cpp:70
+#: src/gui/setup_colors.cpp:83
+msgid "Colors"
+msgstr ""
+
+#. TRANSLATORS: emotes tab name
+#: src/gui/emotewindow.cpp:111
+msgid "Fonts"
+msgstr ""
+
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/equipmentwindow.cpp:56 src/gui/inventorywindow.cpp:204
@@ -1481,7 +1523,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/inventorywindow.cpp:580 src/gui/statuswindow.cpp:143
-#: src/gui/statuswindow.cpp:284 src/gui/statuswindow.cpp:337
+#: src/gui/statuswindow.cpp:285 src/gui/statuswindow.cpp:338
 #: src/gui/widgets/characterdisplay.cpp:126
 #, c-format
 msgid "Money: %s"
@@ -1769,7 +1811,7 @@ msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:295
+#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:296
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
@@ -1777,7 +1819,7 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/ministatuswindow.cpp:317 src/gui/statuswindow.cpp:141
-#: src/gui/statuswindow.cpp:302 src/gui/statuswindow.cpp:373
+#: src/gui/statuswindow.cpp:303 src/gui/statuswindow.cpp:374
 #, c-format
 msgid "Level: %d"
 msgstr ""
@@ -1794,34 +1836,45 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:62
+#: src/gui/npcdialog.cpp:66
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:64
+#: src/gui/npcdialog.cpp:68
 msgid "Next"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:68
+#: src/gui/npcdialog.cpp:72
 msgid "Submit"
 msgstr ""
 
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
 #. TRANSLATORS: settings group
-#: src/gui/npcdialog.cpp:77 src/gui/npcpostdialog.cpp:43
+#: src/gui/npcdialog.cpp:81 src/gui/npcpostdialog.cpp:43
 #: src/gui/setup_other.cpp:257
 msgid "NPC"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:566
+#: src/gui/npcdialog.cpp:104 src/gui/popupmenu.cpp:566
 msgid "Clear"
 msgstr ""
 
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: trade window button
+#: src/gui/npcdialog.cpp:109 src/gui/serverdialog.cpp:266
+#: src/gui/shopwindow.cpp:95 src/gui/shopwindow.cpp:102
+#: src/gui/tradewindow.cpp:77
+msgid "Add"
+msgstr ""
+
 #. TRANSLATORS: label in npc post dialog
 #: src/gui/npcpostdialog.cpp:53
 msgid "To:"
@@ -2029,7 +2082,7 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: social window button
-#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1164
+#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1286
 msgid "Leave"
 msgstr ""
 
@@ -2163,7 +2216,7 @@ msgstr ""
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2194
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:985
 msgid "(default)"
 msgstr ""
 
@@ -2395,12 +2448,12 @@ msgid "Passwords do not match."
 msgstr ""
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/selldialog.cpp:242
+#: src/gui/selldialog.cpp:243
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/selldialog.cpp:244
+#: src/gui/selldialog.cpp:245
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
@@ -2411,15 +2464,6 @@ msgid "Choose Your Server"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:266 src/gui/shopwindow.cpp:95
-#: src/gui/shopwindow.cpp:102 src/gui/tradewindow.cpp:77
-msgid "Add"
-msgstr ""
-
-#. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
 #: src/gui/serverdialog.cpp:268 src/gui/widgets/setupitem.cpp:303
 #: src/gui/widgets/setupitem.cpp:430
@@ -3155,11 +3199,6 @@ msgid "Windows"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1862
-msgid "Emotes"
-msgstr ""
-
-#. TRANSLATORS: input tab sub tab name
 #: src/gui/setupactiondata.h:1870
 msgid "Gui"
 msgstr ""
@@ -3315,18 +3354,12 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:61
-msgid "Auto hide chat window."
+msgid "Auto hide chat window"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:65
-msgid "Protect chat focus."
-msgstr ""
-
-#. TRANSLATORS: settings group
-#. TRANSLATORS: settings colors tab name
-#: src/gui/setup_chat.cpp:70 src/gui/setup_colors.cpp:83
-msgid "Colors"
+msgid "Protect chat focus"
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4421,11 +4454,6 @@ msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:249
-msgid "Bold font"
-msgstr ""
-
-#. TRANSLATORS: theme settings label
 #: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr ""
@@ -4911,258 +4939,289 @@ msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
-#: src/gui/socialwindow.cpp:158 src/gui/socialwindow.cpp:259
+#: src/gui/socialwindow.cpp:176 src/gui/socialwindow.cpp:309
 #: src/gui/widgets/guildchattab.cpp:42 src/net/ea/gui/guildtab.cpp:49
 msgid "Guild"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:213
+#: src/gui/socialwindow.cpp:231
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:245
 msgid "Member Invite to Guild"
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:229
+#: src/gui/socialwindow.cpp:247
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:238
+#: src/gui/socialwindow.cpp:256
 msgid "Leave Guild?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:240
+#: src/gui/socialwindow.cpp:258
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:269
+#, c-format
+msgid "Members: %u/%u"
+msgstr ""
+
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:291 src/gui/socialwindow.cpp:361
+#: src/gui/socialwindow.cpp:483
+#, c-format
+msgid "Players: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/socialwindow.cpp:302 src/net/ea/gui/partytab.cpp:49
+#: src/gui/socialwindow.cpp:376 src/net/ea/gui/partytab.cpp:49
 msgid "Party"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:341
+#: src/gui/socialwindow.cpp:415
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
 #. TRANSLATORS: tab in social window
-#: src/gui/socialwindow.cpp:356
+#: src/gui/socialwindow.cpp:430
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:370
+#: src/gui/socialwindow.cpp:444
 msgid "Member Invite to Party"
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:372
+#: src/gui/socialwindow.cpp:446
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:381
+#: src/gui/socialwindow.cpp:455
 msgid "Leave Party?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:383
+#: src/gui/socialwindow.cpp:457
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:681
+#, c-format
+msgid "Visible players: %d"
+msgstr ""
+
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:605
+#: src/gui/socialwindow.cpp:707
 msgid "Nav"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:809
+#, c-format
+msgid "Portals: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:922
+#: src/gui/socialwindow.cpp:1035
 msgid "Atk"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:941
+#: src/gui/socialwindow.cpp:1054
 msgid "Priority mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:943
+#: src/gui/socialwindow.cpp:1056
 msgid "Attack mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:945
+#: src/gui/socialwindow.cpp:1058
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:968
+#: src/gui/socialwindow.cpp:1081
 msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:987
+#: src/gui/socialwindow.cpp:1100
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:989
+#: src/gui/socialwindow.cpp:1102
 msgid "Ignore items"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:1190
+#, c-format
+msgid "Friends: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1091 src/gui/socialwindow.cpp:1563
+#: src/gui/socialwindow.cpp:1213 src/gui/socialwindow.cpp:1687
 msgid "Create Party"
 msgstr ""
 
 #. TRANSLATORS: social window name
 #. TRANSLATORS: full button name
-#: src/gui/socialwindow.cpp:1138 src/gui/windowmenu.cpp:126
+#: src/gui/socialwindow.cpp:1260 src/gui/windowmenu.cpp:126
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1273
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1156
+#: src/gui/socialwindow.cpp:1278
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/socialwindow.cpp:1162
+#: src/gui/socialwindow.cpp:1284
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1345
+#: src/gui/socialwindow.cpp:1469
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1356
+#: src/gui/socialwindow.cpp:1480
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1497
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1424
+#: src/gui/socialwindow.cpp:1548
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1445
+#: src/gui/socialwindow.cpp:1569
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1460
+#: src/gui/socialwindow.cpp:1584
 msgid "Guild Name"
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1462
+#: src/gui/socialwindow.cpp:1586
 msgid "Choose your guild's name."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1477
+#: src/gui/socialwindow.cpp:1601
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1485
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1616
 msgid "Accept Guild Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1631
 msgid "Received party request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1519
+#: src/gui/socialwindow.cpp:1643
 msgid "You have been invited you to join a party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1524
+#: src/gui/socialwindow.cpp:1648
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1533
+#: src/gui/socialwindow.cpp:1657
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1539
+#: src/gui/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1673
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1688
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1694
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1572
+#: src/gui/socialwindow.cpp:1696
 msgid "Choose your party's name."
 msgstr ""
 
@@ -5182,24 +5241,24 @@ msgid "MP:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:235 src/gui/statuswindow.cpp:423
+#: src/gui/statuswindow.cpp:234 src/gui/statuswindow.cpp:424
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:237
+#: src/gui/statuswindow.cpp:236
 msgid "Job:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:288 src/gui/statuswindow.cpp:345
+#: src/gui/statuswindow.cpp:289 src/gui/statuswindow.cpp:346
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:360
+#: src/gui/statuswindow.cpp:361
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
@@ -5645,13 +5704,13 @@ msgid "%s whispers: %s"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:540
+#: src/gui/widgets/chattab.cpp:541
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:545
+#: src/gui/widgets/chattab.cpp:546
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -5937,24 +5996,24 @@ msgstr ""
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/inputmanager.cpp:328 src/inputmanager.cpp:372 src/keyboardconfig.cpp:90
+#: src/inputmanager.cpp:329 src/inputmanager.cpp:373 src/keyboardconfig.cpp:90
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/inputmanager.cpp:334
+#: src/inputmanager.cpp:335
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/inputmanager.cpp:348
+#: src/inputmanager.cpp:349
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/inputmanager.cpp:378
+#: src/inputmanager.cpp:379
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -5962,7 +6021,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/inputmanager.cpp:392 src/keyboardconfig.cpp:103
+#: src/inputmanager.cpp:393 src/keyboardconfig.cpp:134
 msgid "u key"
 msgstr ""
 
@@ -6638,55 +6697,55 @@ msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:176
+#: src/net/ea/guildhandler.cpp:178
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:179
+#: src/net/ea/guildhandler.cpp:181
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:186
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:187
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:193
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:195
+#: src/net/ea/guildhandler.cpp:197
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:198
+#: src/net/ea/guildhandler.cpp:200
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
@@ -7561,8 +7620,8 @@ msgstr ""
 #. TRANSLATORS: being info default name
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
-#: src/resources/avatardb.cpp:69 src/resources/beinginfo.cpp:40
-#: src/resources/itemdb.cpp:291 src/resources/monsterdb.cpp:100
+#: src/resources/avatardb.cpp:69 src/resources/beinginfo.cpp:41
+#: src/resources/itemdb.cpp:295 src/resources/monsterdb.cpp:100
 msgid "unnamed"
 msgstr "sennoma"
 
diff --git a/po/es.po b/po/es.po
index 9500a1a00..27b5c50b5 100644
--- a/po/es.po
+++ b/po/es.po
@@ -17,9 +17,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-08-03 13:52+0300\n"
-"PO-Revision-Date: 2013-08-01 20:17+0000\n"
-"Last-Translator: Nelson Martell <nelson6e65-manaplus@yahoo.es>\n"
+"POT-Creation-Date: 2013-08-17 13:35+0300\n"
+"PO-Revision-Date: 2013-08-16 17:53+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/manaplus/"
 "language/es/)\n"
 "Language: es\n"
@@ -48,21 +48,21 @@ msgstr "Visible sobre el mapa"
 msgid "Human"
 msgstr "Humano"
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "dodge"
 msgstr "evade"
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "miss"
 msgstr "falla"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1710 src/gui/whoisonline.cpp:835
+#: src/being.cpp:1713 src/gui/whoisonline.cpp:842
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1715 src/gui/whoisonline.cpp:840
+#: src/being.cpp:1718 src/gui/whoisonline.cpp:847
 msgid "I"
 msgstr "I"
 
@@ -99,8 +99,8 @@ msgstr "Tema"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:1176 src/gui/didyouknowwindow.cpp:78
-#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:66
-#: src/gui/npcdialog.cpp:103 src/gui/popupmenu.cpp:562
+#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:70
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:562
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:81
 msgid "Close"
 msgstr "Cerrar"
@@ -438,14 +438,14 @@ msgstr ""
 "Opciones para /%s son \"yes\" | \"no\", \"true\" | \"false\", \"1\" | \"0\"."
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:259 src/gui/widgets/chattab.cpp:465
+#: src/game.cpp:259 src/gui/widgets/chattab.cpp:466
 msgid "General"
 msgstr "General"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: debug window name
 #. TRANSLATORS: full button name
-#: src/game.cpp:275 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:467
+#: src/game.cpp:275 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:468
 #: src/gui/windowmenu.cpp:154
 msgid "Debug"
 msgstr "Depurador"
@@ -502,7 +502,7 @@ msgstr "Inspector de Bot"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:105
+#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:111
 msgid "Reset"
 msgstr "Restablecer"
 
@@ -620,8 +620,8 @@ msgstr "Cantidad:"
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/buydialog.cpp:265 src/gui/itemamountwindow.cpp:202
-#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:96
-#: src/gui/selldialog.cpp:101 src/gui/statuswindow.cpp:790
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:100
+#: src/gui/selldialog.cpp:101 src/gui/statuswindow.cpp:791
 msgid "+"
 msgstr "+"
 
@@ -632,8 +632,8 @@ msgstr "+"
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
 #: src/gui/buydialog.cpp:268 src/gui/itemamountwindow.cpp:200
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:98
-#: src/gui/selldialog.cpp:103 src/gui/statuswindow.cpp:803
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:102
+#: src/gui/selldialog.cpp:103 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr "-"
 
@@ -641,7 +641,7 @@ msgstr "-"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/buydialog.cpp:271 src/gui/charcreatedialog.cpp:122
-#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1160
+#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1282
 msgid "Create"
 msgstr "Crear"
 
@@ -664,8 +664,8 @@ msgstr "Salir"
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
 #: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:109
-#: src/gui/statuswindow.cpp:531 src/gui/statuswindow.cpp:586
-#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:821
+#: src/gui/statuswindow.cpp:532 src/gui/statuswindow.cpp:587
+#: src/gui/statuswindow.cpp:788 src/gui/statuswindow.cpp:822
 msgid "Max"
 msgstr "Máx"
 
@@ -725,7 +725,7 @@ msgstr "Vender"
 #: src/gui/popupmenu.cpp:2309 src/gui/popupmenu.cpp:2543
 #: src/gui/popupmenu.cpp:2660 src/gui/quitdialog.cpp:73
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
-#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1094
+#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1216
 #: src/gui/textcommandeditor.cpp:211 src/gui/textdialog.cpp:53
 #: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:181
 msgid "Cancel"
@@ -1018,92 +1018,102 @@ msgstr "Ingrese contraseña:"
 #. TRANSLATORS: inventory sort mode
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
-#: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:65
+#: src/gui/chatwindow.cpp:143 src/gui/inventorywindow.cpp:65
 #: src/gui/setup_other.cpp:69 src/gui/setup_visual.cpp:77
 msgid "default"
 msgstr "predeterminado"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:144
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:145 src/gui/widgets/colormodel.cpp:76
 msgid "black"
 msgstr "negro"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:146
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:147 src/gui/widgets/colormodel.cpp:78
 msgid "red"
 msgstr "rojo"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:148
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:149 src/gui/widgets/colormodel.cpp:80
 msgid "green"
 msgstr "verde"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:150
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:151 src/gui/widgets/colormodel.cpp:82
 msgid "blue"
 msgstr "azul"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:152
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:153 src/gui/widgets/colormodel.cpp:84
 msgid "gold"
 msgstr "dorado"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:154
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:155 src/gui/widgets/colormodel.cpp:86
 msgid "yellow"
 msgstr "amarillo"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:156
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:157 src/gui/widgets/colormodel.cpp:88
 msgid "pink"
 msgstr "rosa"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:158
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:159 src/gui/widgets/colormodel.cpp:90
 msgid "purple"
 msgstr "púrpura"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:160
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:161 src/gui/widgets/colormodel.cpp:92
 msgid "grey"
 msgstr "gris"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:162
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:163 src/gui/widgets/colormodel.cpp:94
 msgid "brown"
 msgstr "marrón"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:164
+#: src/gui/chatwindow.cpp:165
 msgid "rainbow 1"
 msgstr "arco iris 1"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:166
+#: src/gui/chatwindow.cpp:167
 msgid "rainbow 2"
 msgstr "arco iris 2"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:168
+#: src/gui/chatwindow.cpp:169
 msgid "rainbow 3"
 msgstr "arco iris 3"
 
 #. TRANSLATORS: chat window name
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
-#: src/gui/chatwindow.cpp:195 src/gui/setupactiondata.h:1866
+#: src/gui/chatwindow.cpp:196 src/gui/setupactiondata.h:1866
 #: src/gui/setup_chat.cpp:50 src/gui/windowmenu.cpp:88
 msgid "Chat"
 msgstr "Chat"
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:659
+#: src/gui/chatwindow.cpp:684
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presentes: %s; %d jugadores están presentes."
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1066
+#: src/gui/chatwindow.cpp:1091
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Susurrando a %s: %s"
@@ -1413,14 +1423,38 @@ msgid "Please at least type both the address and the port of the server."
 msgstr ""
 "Por favor, por lo menos especifique el nombre y el puerto del servidor."
 
+#. TRANSLATORS: font size
+#: src/gui/emotewindow.cpp:49
+msgid "Normal font"
+msgstr ""
+
+#. TRANSLATORS: font size
+#. TRANSLATORS: theme settings label
+#: src/gui/emotewindow.cpp:51 src/gui/setup_theme.cpp:249
+msgid "Bold font"
+msgstr "Fuente negrita"
+
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/emotewindow.cpp:41 src/gui/emotewindow.cpp:61
+#: src/gui/emotewindow.cpp:56 src/gui/emotewindow.cpp:107
 #: src/gui/setupactiondata.h:1862
 msgid "Emotes"
 msgstr "Emotes"
 
+#. TRANSLATORS: emotes tab name
+#. TRANSLATORS: settings group
+#. TRANSLATORS: settings colors tab name
+#: src/gui/emotewindow.cpp:109 src/gui/setup_chat.cpp:70
+#: src/gui/setup_colors.cpp:83
+msgid "Colors"
+msgstr "Colores"
+
+#. TRANSLATORS: emotes tab name
+#: src/gui/emotewindow.cpp:111
+msgid "Fonts"
+msgstr ""
+
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/equipmentwindow.cpp:56 src/gui/inventorywindow.cpp:204
@@ -1512,7 +1546,7 @@ msgstr "Recuperar"
 
 #. TRANSLATORS: status window label
 #: src/gui/inventorywindow.cpp:580 src/gui/statuswindow.cpp:143
-#: src/gui/statuswindow.cpp:284 src/gui/statuswindow.cpp:337
+#: src/gui/statuswindow.cpp:285 src/gui/statuswindow.cpp:338
 #: src/gui/widgets/characterdisplay.cpp:126
 #, c-format
 msgid "Money: %s"
@@ -1800,7 +1834,7 @@ msgstr "barra de trabajo"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:295
+#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:296
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Nivel: %d (GM %d)"
@@ -1808,7 +1842,7 @@ msgstr "Nivel: %d (GM %d)"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/ministatuswindow.cpp:317 src/gui/statuswindow.cpp:141
-#: src/gui/statuswindow.cpp:302 src/gui/statuswindow.cpp:373
+#: src/gui/statuswindow.cpp:303 src/gui/statuswindow.cpp:374
 #, c-format
 msgid "Level: %d"
 msgstr "Nivel: %d"
@@ -1825,34 +1859,45 @@ msgid "Job level: %d"
 msgstr "Nivel de trabajo: %d"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:62
+#: src/gui/npcdialog.cpp:66
 msgid "Stop waiting"
 msgstr "Dejar de esperar"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:64
+#: src/gui/npcdialog.cpp:68
 msgid "Next"
 msgstr "Siguiente"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:68
+#: src/gui/npcdialog.cpp:72
 msgid "Submit"
 msgstr "Enviar"
 
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
 #. TRANSLATORS: settings group
-#: src/gui/npcdialog.cpp:77 src/gui/npcpostdialog.cpp:43
+#: src/gui/npcdialog.cpp:81 src/gui/npcpostdialog.cpp:43
 #: src/gui/setup_other.cpp:257
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:566
+#: src/gui/npcdialog.cpp:104 src/gui/popupmenu.cpp:566
 msgid "Clear"
 msgstr "Limpiar"
 
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: trade window button
+#: src/gui/npcdialog.cpp:109 src/gui/serverdialog.cpp:266
+#: src/gui/shopwindow.cpp:95 src/gui/shopwindow.cpp:102
+#: src/gui/tradewindow.cpp:77
+msgid "Add"
+msgstr "Añadir"
+
 #. TRANSLATORS: label in npc post dialog
 #: src/gui/npcpostdialog.cpp:53
 msgid "To:"
@@ -2060,7 +2105,7 @@ msgstr "Deshabilitar ausencia"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: social window button
-#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1164
+#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1286
 msgid "Leave"
 msgstr "Dejar"
 
@@ -2194,7 +2239,7 @@ msgstr "Copiar al chat"
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2194
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:985
 msgid "(default)"
 msgstr "(predeterminado)"
 
@@ -2444,15 +2489,6 @@ msgid "Choose Your Server"
 msgstr "Escoge tu servidor"
 
 #. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:266 src/gui/shopwindow.cpp:95
-#: src/gui/shopwindow.cpp:102 src/gui/tradewindow.cpp:77
-msgid "Add"
-msgstr "Añadir"
-
-#. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
 #: src/gui/serverdialog.cpp:268 src/gui/widgets/setupitem.cpp:303
 #: src/gui/widgets/setupitem.cpp:430
@@ -3343,19 +3379,13 @@ msgstr "Ventana"
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:61
-msgid "Auto hide chat window."
-msgstr "Ocultar automáticamente la ventana del chat."
+msgid "Auto hide chat window"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:65
-msgid "Protect chat focus."
-msgstr "Proteger foco del chat."
-
-#. TRANSLATORS: settings group
-#. TRANSLATORS: settings colors tab name
-#: src/gui/setup_chat.cpp:70 src/gui/setup_colors.cpp:83
-msgid "Colors"
-msgstr "Colores"
+msgid "Protect chat focus"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:73
@@ -4461,11 +4491,6 @@ msgid "Language"
 msgstr "Idioma"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:249
-msgid "Bold font"
-msgstr "Fuente negrita"
-
-#. TRANSLATORS: theme settings label
 #: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr "Fuente de partícula"
@@ -4954,258 +4979,289 @@ msgstr "Nivel: %d"
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
-#: src/gui/socialwindow.cpp:158 src/gui/socialwindow.cpp:259
+#: src/gui/socialwindow.cpp:176 src/gui/socialwindow.cpp:309
 #: src/gui/widgets/guildchattab.cpp:42 src/net/ea/gui/guildtab.cpp:49
 msgid "Guild"
 msgstr "Clan"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Invita al jugador %s al clan %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:213
+#: src/gui/socialwindow.cpp:231
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Clan %s pidiendo salir."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:245
 msgid "Member Invite to Guild"
 msgstr "Miembro invitado al clan."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:229
+#: src/gui/socialwindow.cpp:247
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "A quién te gustaría invitar al clan %s?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:238
+#: src/gui/socialwindow.cpp:256
 msgid "Leave Guild?"
 msgstr "¿Dejar el clan?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:240
+#: src/gui/socialwindow.cpp:258
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "¿Estás seguro de dejar el clan %s?"
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:269
+#, c-format
+msgid "Members: %u/%u"
+msgstr ""
+
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:291 src/gui/socialwindow.cpp:361
+#: src/gui/socialwindow.cpp:483
+#, c-format
+msgid "Players: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/socialwindow.cpp:302 src/net/ea/gui/partytab.cpp:49
+#: src/gui/socialwindow.cpp:376 src/net/ea/gui/partytab.cpp:49
 msgid "Party"
 msgstr "Grupo"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:341
+#: src/gui/socialwindow.cpp:415
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Jugador %s invitado al grupo."
 
 #. TRANSLATORS: tab in social window
-#: src/gui/socialwindow.cpp:356
+#: src/gui/socialwindow.cpp:430
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Grupo %s requisitado."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:370
+#: src/gui/socialwindow.cpp:444
 msgid "Member Invite to Party"
 msgstr "Invitación de un miembro al grupo"
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:372
+#: src/gui/socialwindow.cpp:446
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "¿A quién te gustaría invitar al grupo %s?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:381
+#: src/gui/socialwindow.cpp:455
 msgid "Leave Party?"
 msgstr "¿Dejar grupo?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:383
+#: src/gui/socialwindow.cpp:457
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "¿Estás seguro de que quieres dejar el grupo %s?"
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:681
+#, c-format
+msgid "Visible players: %d"
+msgstr ""
+
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:605
+#: src/gui/socialwindow.cpp:707
 msgid "Nav"
 msgstr "Navegación"
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:809
+#, c-format
+msgid "Portals: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:922
+#: src/gui/socialwindow.cpp:1035
 msgid "Atk"
 msgstr "Ataque"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:941
+#: src/gui/socialwindow.cpp:1054
 msgid "Priority mobs"
 msgstr "Criaturas prioritarias"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:943
+#: src/gui/socialwindow.cpp:1056
 msgid "Attack mobs"
 msgstr "Criaturas atacadas"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:945
+#: src/gui/socialwindow.cpp:1058
 msgid "Ignore mobs"
 msgstr "Criaturas ignoradas"
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:968
+#: src/gui/socialwindow.cpp:1081
 msgid "Pik"
 msgstr "Pik"
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:987
+#: src/gui/socialwindow.cpp:1100
 msgid "Pickup items"
 msgstr "Recoger Items"
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:989
+#: src/gui/socialwindow.cpp:1102
 msgid "Ignore items"
 msgstr "Ignorar Items"
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:1190
+#, c-format
+msgid "Friends: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1091 src/gui/socialwindow.cpp:1563
+#: src/gui/socialwindow.cpp:1213 src/gui/socialwindow.cpp:1687
 msgid "Create Party"
 msgstr "Crear grupo"
 
 #. TRANSLATORS: social window name
 #. TRANSLATORS: full button name
-#: src/gui/socialwindow.cpp:1138 src/gui/windowmenu.cpp:126
+#: src/gui/socialwindow.cpp:1260 src/gui/windowmenu.cpp:126
 msgid "Social"
 msgstr "Social"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1273
 msgid "P"
 msgstr "J"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1156
+#: src/gui/socialwindow.cpp:1278
 msgid "F"
 msgstr "A"
 
 #. TRANSLATORS: social window button
-#: src/gui/socialwindow.cpp:1162
+#: src/gui/socialwindow.cpp:1284
 msgid "Invite"
 msgstr "Invitar"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1345
+#: src/gui/socialwindow.cpp:1469
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Aceptada la invitación de %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1356
+#: src/gui/socialwindow.cpp:1480
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Cancelada la invitación de %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1497
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Aceptada la invitación al clan de  %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Rechazada la invitación al clan de %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1424
+#: src/gui/socialwindow.cpp:1548
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Creando clan llamado %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1445
+#: src/gui/socialwindow.cpp:1569
 #, c-format
 msgid "Creating party called %s."
 msgstr "Creando grupo llamado %s."
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1460
+#: src/gui/socialwindow.cpp:1584
 msgid "Guild Name"
 msgstr "Nombre del clan"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1462
+#: src/gui/socialwindow.cpp:1586
 msgid "Choose your guild's name."
 msgstr "Escoge el nombre de tu clan."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1477
+#: src/gui/socialwindow.cpp:1601
 msgid "Received guild request, but one already exists."
 msgstr "Recibida petición de creación del clan, pero ya existe."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1485
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s te ha invitado al clan %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1616
 msgid "Accept Guild Invite"
 msgstr "Aceptar invitación al clan"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1631
 msgid "Received party request, but one already exists."
 msgstr "Recibida petición de creación del grupo, pero ya existe."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1519
+#: src/gui/socialwindow.cpp:1643
 msgid "You have been invited you to join a party."
 msgstr "Fuiste invitado a un grupo."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1524
+#: src/gui/socialwindow.cpp:1648
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Has sido invitado para unirte al grupo %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1533
+#: src/gui/socialwindow.cpp:1657
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s te ha invitado a unirte a su grupo."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1539
+#: src/gui/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s te ha invitado para unirte al grupo %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1673
 msgid "Accept Party Invite"
 msgstr "Aceptar invitación al grupo"
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1688
 msgid "Cannot create party. You are already in a party"
 msgstr "No se pudo crear un grupo. Ya estás en uno."
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1694
 msgid "Party Name"
 msgstr "Nombre del grupo"
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1572
+#: src/gui/socialwindow.cpp:1696
 msgid "Choose your party's name."
 msgstr "Escoge el nombre del grupo."
 
@@ -5225,24 +5281,24 @@ msgid "MP:"
 msgstr "MP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:235 src/gui/statuswindow.cpp:423
+#: src/gui/statuswindow.cpp:234 src/gui/statuswindow.cpp:424
 #, c-format
 msgid "Job: %d"
 msgstr "Trabajo: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:237
+#: src/gui/statuswindow.cpp:236
 msgid "Job:"
 msgstr "Trabajo:"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:288 src/gui/statuswindow.cpp:345
+#: src/gui/statuswindow.cpp:289 src/gui/statuswindow.cpp:346
 #, c-format
 msgid "Character points: %d"
 msgstr "Puntos del personaje: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:360
+#: src/gui/statuswindow.cpp:361
 #, c-format
 msgid "Correction points: %d"
 msgstr "Puntos de corrección: %d"
@@ -5689,13 +5745,13 @@ msgid "%s whispers: %s"
 msgstr "%s envía mensaje privado: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:540
+#: src/gui/widgets/chattab.cpp:541
 #, c-format
 msgid "%s is now Online."
 msgstr "%s ahora está Conectado."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:545
+#: src/gui/widgets/chattab.cpp:546
 #, c-format
 msgid "%s is now Offline."
 msgstr "%s ahora está Desconectado."
@@ -5982,24 +6038,24 @@ msgstr "Escojer Mundo"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/inputmanager.cpp:328 src/inputmanager.cpp:372 src/keyboardconfig.cpp:90
+#: src/inputmanager.cpp:329 src/inputmanager.cpp:373 src/keyboardconfig.cpp:90
 #, c-format
 msgid "key_%d"
 msgstr "tecla_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/inputmanager.cpp:334
+#: src/inputmanager.cpp:335
 #, c-format
 msgid "JButton%d"
 msgstr "JButton%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/inputmanager.cpp:348
+#: src/inputmanager.cpp:349
 msgid "unknown key"
 msgstr "tecla desconocida"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/inputmanager.cpp:378
+#: src/inputmanager.cpp:379
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -6007,7 +6063,7 @@ msgstr "JB%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/inputmanager.cpp:392 src/keyboardconfig.cpp:103
+#: src/inputmanager.cpp:393 src/keyboardconfig.cpp:134
 msgid "u key"
 msgstr "tecla u"
 
@@ -6686,55 +6742,55 @@ msgid "Request to quit denied!"
 msgstr "¡Petición de salida denegada!"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:176
+#: src/net/ea/guildhandler.cpp:178
 #, c-format
 msgid "Guild name: %s"
 msgstr "Nombre del clan: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:179
+#: src/net/ea/guildhandler.cpp:181
 #, c-format
 msgid "Guild master: %s"
 msgstr "Maestro del clan: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild level: %d"
 msgstr "Nivel del clan: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:186
 #, c-format
 msgid "Online members: %d"
 msgstr "Miembros conectados: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:187
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Max members: %d"
 msgstr "Máx. Miembros: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Average level: %d"
 msgstr "Nivel promedio: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:193
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Guild exp: %d"
 msgstr "Experiencia del clan: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:195
+#: src/net/ea/guildhandler.cpp:197
 #, c-format
 msgid "Guild next exp: %d"
 msgstr "Experiencia siguiente del clan: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:198
+#: src/net/ea/guildhandler.cpp:200
 #, c-format
 msgid "Guild castle: %s"
 msgstr "Castillo del clan: %s"
diff --git a/po/et.po b/po/et.po
index 92242e506..8e54d3406 100644
--- a/po/et.po
+++ b/po/et.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-07-19 22:23+0300\n"
-"PO-Revision-Date: 2013-07-19 19:52+0000\n"
+"POT-Creation-Date: 2013-08-16 20:45+0300\n"
+"PO-Revision-Date: 2013-08-16 17:53+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Estonian (http://www.transifex.com/projects/p/manaplus/language/et/)\n"
 "MIME-Version: 1.0\n"
@@ -38,21 +38,21 @@ msgstr ""
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1606 src/gui/whoisonline.cpp:835
+#: src/being.cpp:1713 src/gui/whoisonline.cpp:842
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1611 src/gui/whoisonline.cpp:840
+#: src/being.cpp:1718 src/gui/whoisonline.cpp:847
 msgid "I"
 msgstr ""
 
@@ -89,8 +89,8 @@ msgstr ""
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:1176 src/gui/didyouknowwindow.cpp:78
-#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:66
-#: src/gui/npcdialog.cpp:103 src/gui/popupmenu.cpp:562
+#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:70
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:562
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:81
 msgid "Close"
 msgstr "Sulge"
@@ -425,36 +425,36 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:465
+#: src/game.cpp:259 src/gui/widgets/chattab.cpp:466
 msgid "General"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: debug window name
 #. TRANSLATORS: full button name
-#: src/game.cpp:272 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:467
+#: src/game.cpp:275 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:468
 #: src/gui/windowmenu.cpp:154
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:536
+#: src/game.cpp:540
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:546
+#: src/game.cpp:550
 msgid "Saving screenshot failed!"
 msgstr ""
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:618
+#: src/game.cpp:622
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:621
+#: src/game.cpp:625
 msgid "Network Error"
 msgstr ""
 
@@ -489,7 +489,7 @@ msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:105
+#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:111
 msgid "Reset"
 msgstr ""
 
@@ -590,7 +590,7 @@ msgstr ""
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
 #: src/gui/buydialog.cpp:251 src/gui/buydialog.cpp:531
-#: src/gui/selldialog.cpp:96 src/gui/selldialog.cpp:356
+#: src/gui/selldialog.cpp:97 src/gui/selldialog.cpp:357
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
@@ -607,8 +607,8 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/buydialog.cpp:265 src/gui/itemamountwindow.cpp:202
-#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:96
-#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:790
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:100
+#: src/gui/selldialog.cpp:101 src/gui/statuswindow.cpp:791
 msgid "+"
 msgstr ""
 
@@ -619,8 +619,8 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
 #: src/gui/buydialog.cpp:268 src/gui/itemamountwindow.cpp:200
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:98
-#: src/gui/selldialog.cpp:102 src/gui/statuswindow.cpp:803
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:102
+#: src/gui/selldialog.cpp:103 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr ""
 
@@ -628,7 +628,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/buydialog.cpp:271 src/gui/charcreatedialog.cpp:122
-#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1160
+#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1282
 msgid "Create"
 msgstr ""
 
@@ -640,7 +640,7 @@ msgstr ""
 #. TRANSLATORS: input action name
 #: src/gui/buydialog.cpp:273 src/gui/quitdialog.cpp:55
 #: src/gui/quitdialog.cpp:60 src/gui/quitdialog.cpp:62
-#: src/gui/selldialog.cpp:106 src/gui/serverdialog.cpp:262
+#: src/gui/selldialog.cpp:107 src/gui/serverdialog.cpp:262
 #: src/gui/setupactiondata.h:177
 msgid "Quit"
 msgstr ""
@@ -650,9 +650,9 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:108
-#: src/gui/statuswindow.cpp:531 src/gui/statuswindow.cpp:586
-#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:821
+#: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:109
+#: src/gui/statuswindow.cpp:532 src/gui/statuswindow.cpp:587
+#: src/gui/statuswindow.cpp:788 src/gui/statuswindow.cpp:822
 msgid "Max"
 msgstr ""
 
@@ -672,7 +672,7 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #: src/gui/buyselldialog.cpp:69 src/gui/popupmenu.cpp:223
 #: src/gui/popupmenu.cpp:2455 src/gui/selldialog.cpp:54
-#: src/gui/selldialog.cpp:64 src/gui/selldialog.cpp:104
+#: src/gui/selldialog.cpp:64 src/gui/selldialog.cpp:105
 msgid "Sell"
 msgstr ""
 
@@ -712,7 +712,7 @@ msgstr ""
 #: src/gui/popupmenu.cpp:2309 src/gui/popupmenu.cpp:2543
 #: src/gui/popupmenu.cpp:2660 src/gui/quitdialog.cpp:73
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
-#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1094
+#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1216
 #: src/gui/textcommandeditor.cpp:211 src/gui/textdialog.cpp:53
 #: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:181
 msgid "Cancel"
@@ -996,92 +996,102 @@ msgstr ""
 #. TRANSLATORS: inventory sort mode
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
-#: src/gui/chatwindow.cpp:139 src/gui/inventorywindow.cpp:65
+#: src/gui/chatwindow.cpp:143 src/gui/inventorywindow.cpp:65
 #: src/gui/setup_other.cpp:69 src/gui/setup_visual.cpp:77
 msgid "default"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:141
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:145 src/gui/widgets/colormodel.cpp:76
 msgid "black"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:143
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:147 src/gui/widgets/colormodel.cpp:78
 msgid "red"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:145
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:149 src/gui/widgets/colormodel.cpp:80
 msgid "green"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:147
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:151 src/gui/widgets/colormodel.cpp:82
 msgid "blue"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:149
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:153 src/gui/widgets/colormodel.cpp:84
 msgid "gold"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:151
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:155 src/gui/widgets/colormodel.cpp:86
 msgid "yellow"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:153
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:157 src/gui/widgets/colormodel.cpp:88
 msgid "pink"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:155
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:159 src/gui/widgets/colormodel.cpp:90
 msgid "purple"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:157
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:161 src/gui/widgets/colormodel.cpp:92
 msgid "grey"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:159
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:163 src/gui/widgets/colormodel.cpp:94
 msgid "brown"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:161
+#: src/gui/chatwindow.cpp:165
 msgid "rainbow 1"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:163
+#: src/gui/chatwindow.cpp:167
 msgid "rainbow 2"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:165
+#: src/gui/chatwindow.cpp:169
 msgid "rainbow 3"
 msgstr ""
 
 #. TRANSLATORS: chat window name
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
-#: src/gui/chatwindow.cpp:192 src/gui/setupactiondata.h:1866
+#: src/gui/chatwindow.cpp:196 src/gui/setupactiondata.h:1866
 #: src/gui/setup_chat.cpp:50 src/gui/windowmenu.cpp:88
 msgid "Chat"
 msgstr "Vestlus"
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:641
+#: src/gui/chatwindow.cpp:684
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1044
+#: src/gui/chatwindow.cpp:1091
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -1390,6 +1400,38 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
+#. TRANSLATORS: font size
+#: src/gui/emotewindow.cpp:49
+msgid "Normal font"
+msgstr ""
+
+#. TRANSLATORS: font size
+#. TRANSLATORS: theme settings label
+#: src/gui/emotewindow.cpp:51 src/gui/setup_theme.cpp:249
+msgid "Bold font"
+msgstr ""
+
+#. TRANSLATORS: emotes window name
+#. TRANSLATORS: emotes tab name
+#. TRANSLATORS: input tab sub tab name
+#: src/gui/emotewindow.cpp:56 src/gui/emotewindow.cpp:107
+#: src/gui/setupactiondata.h:1862
+msgid "Emotes"
+msgstr ""
+
+#. TRANSLATORS: emotes tab name
+#. TRANSLATORS: settings group
+#. TRANSLATORS: settings colors tab name
+#: src/gui/emotewindow.cpp:109 src/gui/setup_chat.cpp:70
+#: src/gui/setup_colors.cpp:83
+msgid "Colors"
+msgstr ""
+
+#. TRANSLATORS: emotes tab name
+#: src/gui/emotewindow.cpp:111
+msgid "Fonts"
+msgstr ""
+
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/equipmentwindow.cpp:56 src/gui/inventorywindow.cpp:204
@@ -1481,7 +1523,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/inventorywindow.cpp:580 src/gui/statuswindow.cpp:143
-#: src/gui/statuswindow.cpp:284 src/gui/statuswindow.cpp:337
+#: src/gui/statuswindow.cpp:285 src/gui/statuswindow.cpp:338
 #: src/gui/widgets/characterdisplay.cpp:126
 #, c-format
 msgid "Money: %s"
@@ -1769,7 +1811,7 @@ msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:295
+#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:296
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
@@ -1777,7 +1819,7 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/ministatuswindow.cpp:317 src/gui/statuswindow.cpp:141
-#: src/gui/statuswindow.cpp:302 src/gui/statuswindow.cpp:373
+#: src/gui/statuswindow.cpp:303 src/gui/statuswindow.cpp:374
 #, c-format
 msgid "Level: %d"
 msgstr ""
@@ -1794,34 +1836,45 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:62
+#: src/gui/npcdialog.cpp:66
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:64
+#: src/gui/npcdialog.cpp:68
 msgid "Next"
 msgstr "Järgmine"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:68
+#: src/gui/npcdialog.cpp:72
 msgid "Submit"
 msgstr ""
 
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
 #. TRANSLATORS: settings group
-#: src/gui/npcdialog.cpp:77 src/gui/npcpostdialog.cpp:43
+#: src/gui/npcdialog.cpp:81 src/gui/npcpostdialog.cpp:43
 #: src/gui/setup_other.cpp:257
 msgid "NPC"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:566
+#: src/gui/npcdialog.cpp:104 src/gui/popupmenu.cpp:566
 msgid "Clear"
 msgstr ""
 
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: trade window button
+#: src/gui/npcdialog.cpp:109 src/gui/serverdialog.cpp:266
+#: src/gui/shopwindow.cpp:95 src/gui/shopwindow.cpp:102
+#: src/gui/tradewindow.cpp:77
+msgid "Add"
+msgstr ""
+
 #. TRANSLATORS: label in npc post dialog
 #: src/gui/npcpostdialog.cpp:53
 msgid "To:"
@@ -2029,7 +2082,7 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: social window button
-#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1164
+#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1286
 msgid "Leave"
 msgstr ""
 
@@ -2163,7 +2216,7 @@ msgstr ""
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2194
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:985
 msgid "(default)"
 msgstr ""
 
@@ -2395,12 +2448,12 @@ msgid "Passwords do not match."
 msgstr ""
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/selldialog.cpp:242
+#: src/gui/selldialog.cpp:243
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/selldialog.cpp:244
+#: src/gui/selldialog.cpp:245
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
@@ -2411,15 +2464,6 @@ msgid "Choose Your Server"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:266 src/gui/shopwindow.cpp:95
-#: src/gui/shopwindow.cpp:102 src/gui/tradewindow.cpp:77
-msgid "Add"
-msgstr ""
-
-#. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
 #: src/gui/serverdialog.cpp:268 src/gui/widgets/setupitem.cpp:303
 #: src/gui/widgets/setupitem.cpp:430
@@ -3155,11 +3199,6 @@ msgid "Windows"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1862
-msgid "Emotes"
-msgstr ""
-
-#. TRANSLATORS: input tab sub tab name
 #: src/gui/setupactiondata.h:1870
 msgid "Gui"
 msgstr ""
@@ -3315,18 +3354,12 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:61
-msgid "Auto hide chat window."
+msgid "Auto hide chat window"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:65
-msgid "Protect chat focus."
-msgstr ""
-
-#. TRANSLATORS: settings group
-#. TRANSLATORS: settings colors tab name
-#: src/gui/setup_chat.cpp:70 src/gui/setup_colors.cpp:83
-msgid "Colors"
+msgid "Protect chat focus"
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4421,11 +4454,6 @@ msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:249
-msgid "Bold font"
-msgstr ""
-
-#. TRANSLATORS: theme settings label
 #: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr ""
@@ -4911,258 +4939,289 @@ msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
-#: src/gui/socialwindow.cpp:158 src/gui/socialwindow.cpp:259
+#: src/gui/socialwindow.cpp:176 src/gui/socialwindow.cpp:309
 #: src/gui/widgets/guildchattab.cpp:42 src/net/ea/gui/guildtab.cpp:49
 msgid "Guild"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:213
+#: src/gui/socialwindow.cpp:231
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:245
 msgid "Member Invite to Guild"
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:229
+#: src/gui/socialwindow.cpp:247
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:238
+#: src/gui/socialwindow.cpp:256
 msgid "Leave Guild?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:240
+#: src/gui/socialwindow.cpp:258
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:269
+#, c-format
+msgid "Members: %u/%u"
+msgstr ""
+
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:291 src/gui/socialwindow.cpp:361
+#: src/gui/socialwindow.cpp:483
+#, c-format
+msgid "Players: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/socialwindow.cpp:302 src/net/ea/gui/partytab.cpp:49
+#: src/gui/socialwindow.cpp:376 src/net/ea/gui/partytab.cpp:49
 msgid "Party"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:341
+#: src/gui/socialwindow.cpp:415
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
 #. TRANSLATORS: tab in social window
-#: src/gui/socialwindow.cpp:356
+#: src/gui/socialwindow.cpp:430
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:370
+#: src/gui/socialwindow.cpp:444
 msgid "Member Invite to Party"
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:372
+#: src/gui/socialwindow.cpp:446
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:381
+#: src/gui/socialwindow.cpp:455
 msgid "Leave Party?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:383
+#: src/gui/socialwindow.cpp:457
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:681
+#, c-format
+msgid "Visible players: %d"
+msgstr ""
+
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:605
+#: src/gui/socialwindow.cpp:707
 msgid "Nav"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:809
+#, c-format
+msgid "Portals: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:922
+#: src/gui/socialwindow.cpp:1035
 msgid "Atk"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:941
+#: src/gui/socialwindow.cpp:1054
 msgid "Priority mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:943
+#: src/gui/socialwindow.cpp:1056
 msgid "Attack mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:945
+#: src/gui/socialwindow.cpp:1058
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:968
+#: src/gui/socialwindow.cpp:1081
 msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:987
+#: src/gui/socialwindow.cpp:1100
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:989
+#: src/gui/socialwindow.cpp:1102
 msgid "Ignore items"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:1190
+#, c-format
+msgid "Friends: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1091 src/gui/socialwindow.cpp:1563
+#: src/gui/socialwindow.cpp:1213 src/gui/socialwindow.cpp:1687
 msgid "Create Party"
 msgstr ""
 
 #. TRANSLATORS: social window name
 #. TRANSLATORS: full button name
-#: src/gui/socialwindow.cpp:1138 src/gui/windowmenu.cpp:126
+#: src/gui/socialwindow.cpp:1260 src/gui/windowmenu.cpp:126
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1273
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1156
+#: src/gui/socialwindow.cpp:1278
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/socialwindow.cpp:1162
+#: src/gui/socialwindow.cpp:1284
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1345
+#: src/gui/socialwindow.cpp:1469
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1356
+#: src/gui/socialwindow.cpp:1480
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1497
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1424
+#: src/gui/socialwindow.cpp:1548
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1445
+#: src/gui/socialwindow.cpp:1569
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1460
+#: src/gui/socialwindow.cpp:1584
 msgid "Guild Name"
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1462
+#: src/gui/socialwindow.cpp:1586
 msgid "Choose your guild's name."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1477
+#: src/gui/socialwindow.cpp:1601
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1485
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1616
 msgid "Accept Guild Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1631
 msgid "Received party request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1519
+#: src/gui/socialwindow.cpp:1643
 msgid "You have been invited you to join a party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1524
+#: src/gui/socialwindow.cpp:1648
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1533
+#: src/gui/socialwindow.cpp:1657
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1539
+#: src/gui/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1673
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1688
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1694
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1572
+#: src/gui/socialwindow.cpp:1696
 msgid "Choose your party's name."
 msgstr ""
 
@@ -5182,24 +5241,24 @@ msgid "MP:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:235 src/gui/statuswindow.cpp:423
+#: src/gui/statuswindow.cpp:234 src/gui/statuswindow.cpp:424
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:237
+#: src/gui/statuswindow.cpp:236
 msgid "Job:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:288 src/gui/statuswindow.cpp:345
+#: src/gui/statuswindow.cpp:289 src/gui/statuswindow.cpp:346
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:360
+#: src/gui/statuswindow.cpp:361
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
@@ -5645,13 +5704,13 @@ msgid "%s whispers: %s"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:540
+#: src/gui/widgets/chattab.cpp:541
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:545
+#: src/gui/widgets/chattab.cpp:546
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -5937,24 +5996,24 @@ msgstr ""
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/inputmanager.cpp:328 src/inputmanager.cpp:372 src/keyboardconfig.cpp:90
+#: src/inputmanager.cpp:329 src/inputmanager.cpp:373 src/keyboardconfig.cpp:90
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/inputmanager.cpp:334
+#: src/inputmanager.cpp:335
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/inputmanager.cpp:348
+#: src/inputmanager.cpp:349
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/inputmanager.cpp:378
+#: src/inputmanager.cpp:379
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -5962,7 +6021,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/inputmanager.cpp:392 src/keyboardconfig.cpp:103
+#: src/inputmanager.cpp:393 src/keyboardconfig.cpp:134
 msgid "u key"
 msgstr ""
 
@@ -6638,55 +6697,55 @@ msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:176
+#: src/net/ea/guildhandler.cpp:178
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:179
+#: src/net/ea/guildhandler.cpp:181
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:186
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:187
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:193
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:195
+#: src/net/ea/guildhandler.cpp:197
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:198
+#: src/net/ea/guildhandler.cpp:200
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
@@ -7561,8 +7620,8 @@ msgstr ""
 #. TRANSLATORS: being info default name
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
-#: src/resources/avatardb.cpp:69 src/resources/beinginfo.cpp:40
-#: src/resources/itemdb.cpp:291 src/resources/monsterdb.cpp:100
+#: src/resources/avatardb.cpp:69 src/resources/beinginfo.cpp:41
+#: src/resources/itemdb.cpp:295 src/resources/monsterdb.cpp:100
 msgid "unnamed"
 msgstr ""
 
diff --git a/po/fa.po b/po/fa.po
index 685001792..b409a2e52 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-07-19 22:23+0300\n"
-"PO-Revision-Date: 2013-07-19 19:52+0000\n"
+"POT-Creation-Date: 2013-08-16 20:45+0300\n"
+"PO-Revision-Date: 2013-08-16 17:53+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/manaplus/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -38,21 +38,21 @@ msgstr ""
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1606 src/gui/whoisonline.cpp:835
+#: src/being.cpp:1713 src/gui/whoisonline.cpp:842
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1611 src/gui/whoisonline.cpp:840
+#: src/being.cpp:1718 src/gui/whoisonline.cpp:847
 msgid "I"
 msgstr ""
 
@@ -89,8 +89,8 @@ msgstr ""
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:1176 src/gui/didyouknowwindow.cpp:78
-#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:66
-#: src/gui/npcdialog.cpp:103 src/gui/popupmenu.cpp:562
+#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:70
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:562
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:81
 msgid "Close"
 msgstr ""
@@ -425,36 +425,36 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:465
+#: src/game.cpp:259 src/gui/widgets/chattab.cpp:466
 msgid "General"
 msgstr "کلی"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: debug window name
 #. TRANSLATORS: full button name
-#: src/game.cpp:272 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:467
+#: src/game.cpp:275 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:468
 #: src/gui/windowmenu.cpp:154
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:536
+#: src/game.cpp:540
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:546
+#: src/game.cpp:550
 msgid "Saving screenshot failed!"
 msgstr ""
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:618
+#: src/game.cpp:622
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:621
+#: src/game.cpp:625
 msgid "Network Error"
 msgstr "خطای شبکه"
 
@@ -489,7 +489,7 @@ msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:105
+#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:111
 msgid "Reset"
 msgstr ""
 
@@ -590,7 +590,7 @@ msgstr ""
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
 #: src/gui/buydialog.cpp:251 src/gui/buydialog.cpp:531
-#: src/gui/selldialog.cpp:96 src/gui/selldialog.cpp:356
+#: src/gui/selldialog.cpp:97 src/gui/selldialog.cpp:357
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
@@ -607,8 +607,8 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/buydialog.cpp:265 src/gui/itemamountwindow.cpp:202
-#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:96
-#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:790
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:100
+#: src/gui/selldialog.cpp:101 src/gui/statuswindow.cpp:791
 msgid "+"
 msgstr ""
 
@@ -619,8 +619,8 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
 #: src/gui/buydialog.cpp:268 src/gui/itemamountwindow.cpp:200
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:98
-#: src/gui/selldialog.cpp:102 src/gui/statuswindow.cpp:803
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:102
+#: src/gui/selldialog.cpp:103 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr ""
 
@@ -628,7 +628,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/buydialog.cpp:271 src/gui/charcreatedialog.cpp:122
-#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1160
+#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1282
 msgid "Create"
 msgstr "بساز"
 
@@ -640,7 +640,7 @@ msgstr "بساز"
 #. TRANSLATORS: input action name
 #: src/gui/buydialog.cpp:273 src/gui/quitdialog.cpp:55
 #: src/gui/quitdialog.cpp:60 src/gui/quitdialog.cpp:62
-#: src/gui/selldialog.cpp:106 src/gui/serverdialog.cpp:262
+#: src/gui/selldialog.cpp:107 src/gui/serverdialog.cpp:262
 #: src/gui/setupactiondata.h:177
 msgid "Quit"
 msgstr "خروج"
@@ -650,9 +650,9 @@ msgstr "خروج"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:108
-#: src/gui/statuswindow.cpp:531 src/gui/statuswindow.cpp:586
-#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:821
+#: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:109
+#: src/gui/statuswindow.cpp:532 src/gui/statuswindow.cpp:587
+#: src/gui/statuswindow.cpp:788 src/gui/statuswindow.cpp:822
 msgid "Max"
 msgstr "حداکثر"
 
@@ -672,7 +672,7 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #: src/gui/buyselldialog.cpp:69 src/gui/popupmenu.cpp:223
 #: src/gui/popupmenu.cpp:2455 src/gui/selldialog.cpp:54
-#: src/gui/selldialog.cpp:64 src/gui/selldialog.cpp:104
+#: src/gui/selldialog.cpp:64 src/gui/selldialog.cpp:105
 msgid "Sell"
 msgstr ""
 
@@ -712,7 +712,7 @@ msgstr ""
 #: src/gui/popupmenu.cpp:2309 src/gui/popupmenu.cpp:2543
 #: src/gui/popupmenu.cpp:2660 src/gui/quitdialog.cpp:73
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
-#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1094
+#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1216
 #: src/gui/textcommandeditor.cpp:211 src/gui/textdialog.cpp:53
 #: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:181
 msgid "Cancel"
@@ -996,92 +996,102 @@ msgstr ""
 #. TRANSLATORS: inventory sort mode
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
-#: src/gui/chatwindow.cpp:139 src/gui/inventorywindow.cpp:65
+#: src/gui/chatwindow.cpp:143 src/gui/inventorywindow.cpp:65
 #: src/gui/setup_other.cpp:69 src/gui/setup_visual.cpp:77
 msgid "default"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:141
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:145 src/gui/widgets/colormodel.cpp:76
 msgid "black"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:143
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:147 src/gui/widgets/colormodel.cpp:78
 msgid "red"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:145
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:149 src/gui/widgets/colormodel.cpp:80
 msgid "green"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:147
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:151 src/gui/widgets/colormodel.cpp:82
 msgid "blue"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:149
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:153 src/gui/widgets/colormodel.cpp:84
 msgid "gold"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:151
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:155 src/gui/widgets/colormodel.cpp:86
 msgid "yellow"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:153
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:157 src/gui/widgets/colormodel.cpp:88
 msgid "pink"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:155
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:159 src/gui/widgets/colormodel.cpp:90
 msgid "purple"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:157
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:161 src/gui/widgets/colormodel.cpp:92
 msgid "grey"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:159
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:163 src/gui/widgets/colormodel.cpp:94
 msgid "brown"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:161
+#: src/gui/chatwindow.cpp:165
 msgid "rainbow 1"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:163
+#: src/gui/chatwindow.cpp:167
 msgid "rainbow 2"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:165
+#: src/gui/chatwindow.cpp:169
 msgid "rainbow 3"
 msgstr ""
 
 #. TRANSLATORS: chat window name
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
-#: src/gui/chatwindow.cpp:192 src/gui/setupactiondata.h:1866
+#: src/gui/chatwindow.cpp:196 src/gui/setupactiondata.h:1866
 #: src/gui/setup_chat.cpp:50 src/gui/windowmenu.cpp:88
 msgid "Chat"
 msgstr "چت"
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:641
+#: src/gui/chatwindow.cpp:684
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1044
+#: src/gui/chatwindow.cpp:1091
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -1390,6 +1400,38 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
+#. TRANSLATORS: font size
+#: src/gui/emotewindow.cpp:49
+msgid "Normal font"
+msgstr ""
+
+#. TRANSLATORS: font size
+#. TRANSLATORS: theme settings label
+#: src/gui/emotewindow.cpp:51 src/gui/setup_theme.cpp:249
+msgid "Bold font"
+msgstr ""
+
+#. TRANSLATORS: emotes window name
+#. TRANSLATORS: emotes tab name
+#. TRANSLATORS: input tab sub tab name
+#: src/gui/emotewindow.cpp:56 src/gui/emotewindow.cpp:107
+#: src/gui/setupactiondata.h:1862
+msgid "Emotes"
+msgstr ""
+
+#. TRANSLATORS: emotes tab name
+#. TRANSLATORS: settings group
+#. TRANSLATORS: settings colors tab name
+#: src/gui/emotewindow.cpp:109 src/gui/setup_chat.cpp:70
+#: src/gui/setup_colors.cpp:83
+msgid "Colors"
+msgstr ""
+
+#. TRANSLATORS: emotes tab name
+#: src/gui/emotewindow.cpp:111
+msgid "Fonts"
+msgstr ""
+
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/equipmentwindow.cpp:56 src/gui/inventorywindow.cpp:204
@@ -1481,7 +1523,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/inventorywindow.cpp:580 src/gui/statuswindow.cpp:143
-#: src/gui/statuswindow.cpp:284 src/gui/statuswindow.cpp:337
+#: src/gui/statuswindow.cpp:285 src/gui/statuswindow.cpp:338
 #: src/gui/widgets/characterdisplay.cpp:126
 #, c-format
 msgid "Money: %s"
@@ -1767,7 +1809,7 @@ msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:295
+#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:296
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
@@ -1775,7 +1817,7 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/ministatuswindow.cpp:317 src/gui/statuswindow.cpp:141
-#: src/gui/statuswindow.cpp:302 src/gui/statuswindow.cpp:373
+#: src/gui/statuswindow.cpp:303 src/gui/statuswindow.cpp:374
 #, c-format
 msgid "Level: %d"
 msgstr ""
@@ -1792,34 +1834,45 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:62
+#: src/gui/npcdialog.cpp:66
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:64
+#: src/gui/npcdialog.cpp:68
 msgid "Next"
 msgstr "بعدی"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:68
+#: src/gui/npcdialog.cpp:72
 msgid "Submit"
 msgstr ""
 
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
 #. TRANSLATORS: settings group
-#: src/gui/npcdialog.cpp:77 src/gui/npcpostdialog.cpp:43
+#: src/gui/npcdialog.cpp:81 src/gui/npcpostdialog.cpp:43
 #: src/gui/setup_other.cpp:257
 msgid "NPC"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:566
+#: src/gui/npcdialog.cpp:104 src/gui/popupmenu.cpp:566
 msgid "Clear"
 msgstr ""
 
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: trade window button
+#: src/gui/npcdialog.cpp:109 src/gui/serverdialog.cpp:266
+#: src/gui/shopwindow.cpp:95 src/gui/shopwindow.cpp:102
+#: src/gui/tradewindow.cpp:77
+msgid "Add"
+msgstr ""
+
 #. TRANSLATORS: label in npc post dialog
 #: src/gui/npcpostdialog.cpp:53
 msgid "To:"
@@ -2027,7 +2080,7 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: social window button
-#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1164
+#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1286
 msgid "Leave"
 msgstr ""
 
@@ -2161,7 +2214,7 @@ msgstr ""
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2194
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:985
 msgid "(default)"
 msgstr ""
 
@@ -2393,12 +2446,12 @@ msgid "Passwords do not match."
 msgstr ""
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/selldialog.cpp:242
+#: src/gui/selldialog.cpp:243
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/selldialog.cpp:244
+#: src/gui/selldialog.cpp:245
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
@@ -2409,15 +2462,6 @@ msgid "Choose Your Server"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:266 src/gui/shopwindow.cpp:95
-#: src/gui/shopwindow.cpp:102 src/gui/tradewindow.cpp:77
-msgid "Add"
-msgstr ""
-
-#. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
 #: src/gui/serverdialog.cpp:268 src/gui/widgets/setupitem.cpp:303
 #: src/gui/widgets/setupitem.cpp:430
@@ -3153,11 +3197,6 @@ msgid "Windows"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1862
-msgid "Emotes"
-msgstr ""
-
-#. TRANSLATORS: input tab sub tab name
 #: src/gui/setupactiondata.h:1870
 msgid "Gui"
 msgstr ""
@@ -3313,18 +3352,12 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:61
-msgid "Auto hide chat window."
+msgid "Auto hide chat window"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:65
-msgid "Protect chat focus."
-msgstr ""
-
-#. TRANSLATORS: settings group
-#. TRANSLATORS: settings colors tab name
-#: src/gui/setup_chat.cpp:70 src/gui/setup_colors.cpp:83
-msgid "Colors"
+msgid "Protect chat focus"
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4419,11 +4452,6 @@ msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:249
-msgid "Bold font"
-msgstr ""
-
-#. TRANSLATORS: theme settings label
 #: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr ""
@@ -4909,258 +4937,289 @@ msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
-#: src/gui/socialwindow.cpp:158 src/gui/socialwindow.cpp:259
+#: src/gui/socialwindow.cpp:176 src/gui/socialwindow.cpp:309
 #: src/gui/widgets/guildchattab.cpp:42 src/net/ea/gui/guildtab.cpp:49
 msgid "Guild"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:213
+#: src/gui/socialwindow.cpp:231
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:245
 msgid "Member Invite to Guild"
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:229
+#: src/gui/socialwindow.cpp:247
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:238
+#: src/gui/socialwindow.cpp:256
 msgid "Leave Guild?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:240
+#: src/gui/socialwindow.cpp:258
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:269
+#, c-format
+msgid "Members: %u/%u"
+msgstr ""
+
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:291 src/gui/socialwindow.cpp:361
+#: src/gui/socialwindow.cpp:483
+#, c-format
+msgid "Players: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/socialwindow.cpp:302 src/net/ea/gui/partytab.cpp:49
+#: src/gui/socialwindow.cpp:376 src/net/ea/gui/partytab.cpp:49
 msgid "Party"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:341
+#: src/gui/socialwindow.cpp:415
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
 #. TRANSLATORS: tab in social window
-#: src/gui/socialwindow.cpp:356
+#: src/gui/socialwindow.cpp:430
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:370
+#: src/gui/socialwindow.cpp:444
 msgid "Member Invite to Party"
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:372
+#: src/gui/socialwindow.cpp:446
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:381
+#: src/gui/socialwindow.cpp:455
 msgid "Leave Party?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:383
+#: src/gui/socialwindow.cpp:457
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:681
+#, c-format
+msgid "Visible players: %d"
+msgstr ""
+
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:605
+#: src/gui/socialwindow.cpp:707
 msgid "Nav"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:809
+#, c-format
+msgid "Portals: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:922
+#: src/gui/socialwindow.cpp:1035
 msgid "Atk"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:941
+#: src/gui/socialwindow.cpp:1054
 msgid "Priority mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:943
+#: src/gui/socialwindow.cpp:1056
 msgid "Attack mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:945
+#: src/gui/socialwindow.cpp:1058
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:968
+#: src/gui/socialwindow.cpp:1081
 msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:987
+#: src/gui/socialwindow.cpp:1100
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:989
+#: src/gui/socialwindow.cpp:1102
 msgid "Ignore items"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:1190
+#, c-format
+msgid "Friends: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1091 src/gui/socialwindow.cpp:1563
+#: src/gui/socialwindow.cpp:1213 src/gui/socialwindow.cpp:1687
 msgid "Create Party"
 msgstr ""
 
 #. TRANSLATORS: social window name
 #. TRANSLATORS: full button name
-#: src/gui/socialwindow.cpp:1138 src/gui/windowmenu.cpp:126
+#: src/gui/socialwindow.cpp:1260 src/gui/windowmenu.cpp:126
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1273
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1156
+#: src/gui/socialwindow.cpp:1278
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/socialwindow.cpp:1162
+#: src/gui/socialwindow.cpp:1284
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1345
+#: src/gui/socialwindow.cpp:1469
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1356
+#: src/gui/socialwindow.cpp:1480
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1497
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1424
+#: src/gui/socialwindow.cpp:1548
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1445
+#: src/gui/socialwindow.cpp:1569
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1460
+#: src/gui/socialwindow.cpp:1584
 msgid "Guild Name"
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1462
+#: src/gui/socialwindow.cpp:1586
 msgid "Choose your guild's name."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1477
+#: src/gui/socialwindow.cpp:1601
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1485
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1616
 msgid "Accept Guild Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1631
 msgid "Received party request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1519
+#: src/gui/socialwindow.cpp:1643
 msgid "You have been invited you to join a party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1524
+#: src/gui/socialwindow.cpp:1648
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1533
+#: src/gui/socialwindow.cpp:1657
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1539
+#: src/gui/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1673
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1688
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1694
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1572
+#: src/gui/socialwindow.cpp:1696
 msgid "Choose your party's name."
 msgstr ""
 
@@ -5180,24 +5239,24 @@ msgid "MP:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:235 src/gui/statuswindow.cpp:423
+#: src/gui/statuswindow.cpp:234 src/gui/statuswindow.cpp:424
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:237
+#: src/gui/statuswindow.cpp:236
 msgid "Job:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:288 src/gui/statuswindow.cpp:345
+#: src/gui/statuswindow.cpp:289 src/gui/statuswindow.cpp:346
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:360
+#: src/gui/statuswindow.cpp:361
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
@@ -5643,13 +5702,13 @@ msgid "%s whispers: %s"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:540
+#: src/gui/widgets/chattab.cpp:541
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:545
+#: src/gui/widgets/chattab.cpp:546
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -5935,24 +5994,24 @@ msgstr ""
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/inputmanager.cpp:328 src/inputmanager.cpp:372 src/keyboardconfig.cpp:90
+#: src/inputmanager.cpp:329 src/inputmanager.cpp:373 src/keyboardconfig.cpp:90
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/inputmanager.cpp:334
+#: src/inputmanager.cpp:335
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/inputmanager.cpp:348
+#: src/inputmanager.cpp:349
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/inputmanager.cpp:378
+#: src/inputmanager.cpp:379
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -5960,7 +6019,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/inputmanager.cpp:392 src/keyboardconfig.cpp:103
+#: src/inputmanager.cpp:393 src/keyboardconfig.cpp:134
 msgid "u key"
 msgstr ""
 
@@ -6635,55 +6694,55 @@ msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:176
+#: src/net/ea/guildhandler.cpp:178
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:179
+#: src/net/ea/guildhandler.cpp:181
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:186
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:187
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:193
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:195
+#: src/net/ea/guildhandler.cpp:197
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:198
+#: src/net/ea/guildhandler.cpp:200
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
@@ -7558,8 +7617,8 @@ msgstr ""
 #. TRANSLATORS: being info default name
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
-#: src/resources/avatardb.cpp:69 src/resources/beinginfo.cpp:40
-#: src/resources/itemdb.cpp:291 src/resources/monsterdb.cpp:100
+#: src/resources/avatardb.cpp:69 src/resources/beinginfo.cpp:41
+#: src/resources/itemdb.cpp:295 src/resources/monsterdb.cpp:100
 msgid "unnamed"
 msgstr ""
 
diff --git a/po/fi.po b/po/fi.po
index 62c4a7597..b045b522f 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-08-03 13:52+0300\n"
-"PO-Revision-Date: 2013-07-19 19:52+0000\n"
+"POT-Creation-Date: 2013-08-17 13:35+0300\n"
+"PO-Revision-Date: 2013-08-16 17:53+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Finnish (http://www.transifex.com/projects/p/manaplus/"
 "language/fi/)\n"
@@ -40,21 +40,21 @@ msgstr "Näkyvillä kartalla"
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "dodge"
 msgstr "väistö"
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "miss"
 msgstr "huti"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1710 src/gui/whoisonline.cpp:835
+#: src/being.cpp:1713 src/gui/whoisonline.cpp:842
 msgid "A"
 msgstr "P"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1715 src/gui/whoisonline.cpp:840
+#: src/being.cpp:1718 src/gui/whoisonline.cpp:847
 msgid "I"
 msgstr "-"
 
@@ -91,8 +91,8 @@ msgstr "Teema"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:1176 src/gui/didyouknowwindow.cpp:78
-#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:66
-#: src/gui/npcdialog.cpp:103 src/gui/popupmenu.cpp:562
+#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:70
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:562
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:81
 msgid "Close"
 msgstr "Sulje"
@@ -431,14 +431,14 @@ msgstr ""
 "\"true\", \"false\", \"1\" tai \"0\"."
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:259 src/gui/widgets/chattab.cpp:465
+#: src/game.cpp:259 src/gui/widgets/chattab.cpp:466
 msgid "General"
 msgstr "Yleiset"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: debug window name
 #. TRANSLATORS: full button name
-#: src/game.cpp:275 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:467
+#: src/game.cpp:275 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:468
 #: src/gui/windowmenu.cpp:154
 msgid "Debug"
 msgstr "Debug"
@@ -495,7 +495,7 @@ msgstr "Bottitutka"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:105
+#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:111
 msgid "Reset"
 msgstr "Nollaa"
 
@@ -613,8 +613,8 @@ msgstr "Määrä:"
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/buydialog.cpp:265 src/gui/itemamountwindow.cpp:202
-#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:96
-#: src/gui/selldialog.cpp:101 src/gui/statuswindow.cpp:790
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:100
+#: src/gui/selldialog.cpp:101 src/gui/statuswindow.cpp:791
 msgid "+"
 msgstr "+"
 
@@ -625,8 +625,8 @@ msgstr "+"
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
 #: src/gui/buydialog.cpp:268 src/gui/itemamountwindow.cpp:200
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:98
-#: src/gui/selldialog.cpp:103 src/gui/statuswindow.cpp:803
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:102
+#: src/gui/selldialog.cpp:103 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr "-"
 
@@ -634,7 +634,7 @@ msgstr "-"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/buydialog.cpp:271 src/gui/charcreatedialog.cpp:122
-#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1160
+#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1282
 msgid "Create"
 msgstr "Luo"
 
@@ -657,8 +657,8 @@ msgstr "Sulje"
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
 #: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:109
-#: src/gui/statuswindow.cpp:531 src/gui/statuswindow.cpp:586
-#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:821
+#: src/gui/statuswindow.cpp:532 src/gui/statuswindow.cpp:587
+#: src/gui/statuswindow.cpp:788 src/gui/statuswindow.cpp:822
 msgid "Max"
 msgstr "Max"
 
@@ -718,7 +718,7 @@ msgstr "Myy"
 #: src/gui/popupmenu.cpp:2309 src/gui/popupmenu.cpp:2543
 #: src/gui/popupmenu.cpp:2660 src/gui/quitdialog.cpp:73
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
-#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1094
+#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1216
 #: src/gui/textcommandeditor.cpp:211 src/gui/textdialog.cpp:53
 #: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:181
 msgid "Cancel"
@@ -1002,92 +1002,102 @@ msgstr "Salasana:"
 #. TRANSLATORS: inventory sort mode
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
-#: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:65
+#: src/gui/chatwindow.cpp:143 src/gui/inventorywindow.cpp:65
 #: src/gui/setup_other.cpp:69 src/gui/setup_visual.cpp:77
 msgid "default"
 msgstr "oletus"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:144
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:145 src/gui/widgets/colormodel.cpp:76
 msgid "black"
 msgstr "musta"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:146
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:147 src/gui/widgets/colormodel.cpp:78
 msgid "red"
 msgstr "punainen"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:148
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:149 src/gui/widgets/colormodel.cpp:80
 msgid "green"
 msgstr "vihreä"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:150
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:151 src/gui/widgets/colormodel.cpp:82
 msgid "blue"
 msgstr "sininen"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:152
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:153 src/gui/widgets/colormodel.cpp:84
 msgid "gold"
 msgstr "kulta"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:154
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:155 src/gui/widgets/colormodel.cpp:86
 msgid "yellow"
 msgstr "keltainen"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:156
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:157 src/gui/widgets/colormodel.cpp:88
 msgid "pink"
 msgstr "vaaleanpunainen"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:158
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:159 src/gui/widgets/colormodel.cpp:90
 msgid "purple"
 msgstr "violetti"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:160
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:161 src/gui/widgets/colormodel.cpp:92
 msgid "grey"
 msgstr "harmaa"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:162
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:163 src/gui/widgets/colormodel.cpp:94
 msgid "brown"
 msgstr "ruskea"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:164
+#: src/gui/chatwindow.cpp:165
 msgid "rainbow 1"
 msgstr "sateenkaari 1"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:166
+#: src/gui/chatwindow.cpp:167
 msgid "rainbow 2"
 msgstr "sateenkaari 2"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:168
+#: src/gui/chatwindow.cpp:169
 msgid "rainbow 3"
 msgstr "sateenkaari 3"
 
 #. TRANSLATORS: chat window name
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
-#: src/gui/chatwindow.cpp:195 src/gui/setupactiondata.h:1866
+#: src/gui/chatwindow.cpp:196 src/gui/setupactiondata.h:1866
 #: src/gui/setup_chat.cpp:50 src/gui/windowmenu.cpp:88
 msgid "Chat"
 msgstr "Keskustelu"
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:659
+#: src/gui/chatwindow.cpp:684
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Läsnä: %s; %d pelaajaa paikalla."
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1066
+#: src/gui/chatwindow.cpp:1091
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Kuiskaat pelaajalle %s: %s"
@@ -1396,14 +1406,38 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
+#. TRANSLATORS: font size
+#: src/gui/emotewindow.cpp:49
+msgid "Normal font"
+msgstr ""
+
+#. TRANSLATORS: font size
+#. TRANSLATORS: theme settings label
+#: src/gui/emotewindow.cpp:51 src/gui/setup_theme.cpp:249
+msgid "Bold font"
+msgstr "Lihavoitu kirjasin"
+
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/emotewindow.cpp:41 src/gui/emotewindow.cpp:61
+#: src/gui/emotewindow.cpp:56 src/gui/emotewindow.cpp:107
 #: src/gui/setupactiondata.h:1862
 msgid "Emotes"
 msgstr ""
 
+#. TRANSLATORS: emotes tab name
+#. TRANSLATORS: settings group
+#. TRANSLATORS: settings colors tab name
+#: src/gui/emotewindow.cpp:109 src/gui/setup_chat.cpp:70
+#: src/gui/setup_colors.cpp:83
+msgid "Colors"
+msgstr "Värit"
+
+#. TRANSLATORS: emotes tab name
+#: src/gui/emotewindow.cpp:111
+msgid "Fonts"
+msgstr ""
+
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/equipmentwindow.cpp:56 src/gui/inventorywindow.cpp:204
@@ -1495,7 +1529,7 @@ msgstr "Ota"
 
 #. TRANSLATORS: status window label
 #: src/gui/inventorywindow.cpp:580 src/gui/statuswindow.cpp:143
-#: src/gui/statuswindow.cpp:284 src/gui/statuswindow.cpp:337
+#: src/gui/statuswindow.cpp:285 src/gui/statuswindow.cpp:338
 #: src/gui/widgets/characterdisplay.cpp:126
 #, c-format
 msgid "Money: %s"
@@ -1783,7 +1817,7 @@ msgstr "työpalkki"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:295
+#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:296
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Taso: %d (GM %d)"
@@ -1791,7 +1825,7 @@ msgstr "Taso: %d (GM %d)"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/ministatuswindow.cpp:317 src/gui/statuswindow.cpp:141
-#: src/gui/statuswindow.cpp:302 src/gui/statuswindow.cpp:373
+#: src/gui/statuswindow.cpp:303 src/gui/statuswindow.cpp:374
 #, c-format
 msgid "Level: %d"
 msgstr "Taso: %d"
@@ -1808,34 +1842,45 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:62
+#: src/gui/npcdialog.cpp:66
 msgid "Stop waiting"
 msgstr "Lakkaa odottamasta"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:64
+#: src/gui/npcdialog.cpp:68
 msgid "Next"
 msgstr "Seuraava"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:68
+#: src/gui/npcdialog.cpp:72
 msgid "Submit"
 msgstr "Lähetä"
 
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
 #. TRANSLATORS: settings group
-#: src/gui/npcdialog.cpp:77 src/gui/npcpostdialog.cpp:43
+#: src/gui/npcdialog.cpp:81 src/gui/npcpostdialog.cpp:43
 #: src/gui/setup_other.cpp:257
 msgid "NPC"
 msgstr "Ei-pelaajahahmo (NPC)"
 
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:566
+#: src/gui/npcdialog.cpp:104 src/gui/popupmenu.cpp:566
 msgid "Clear"
 msgstr "Tyhjennä"
 
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: trade window button
+#: src/gui/npcdialog.cpp:109 src/gui/serverdialog.cpp:266
+#: src/gui/shopwindow.cpp:95 src/gui/shopwindow.cpp:102
+#: src/gui/tradewindow.cpp:77
+msgid "Add"
+msgstr "Lisää"
+
 #. TRANSLATORS: label in npc post dialog
 #: src/gui/npcpostdialog.cpp:53
 msgid "To:"
@@ -2043,7 +2088,7 @@ msgstr "Poista poissaolo käytöstä"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: social window button
-#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1164
+#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1286
 msgid "Leave"
 msgstr "Eroa"
 
@@ -2177,7 +2222,7 @@ msgstr "Kopioi keskusteluun"
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2194
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:985
 msgid "(default)"
 msgstr "(oletus)"
 
@@ -2425,15 +2470,6 @@ msgid "Choose Your Server"
 msgstr "Valitse palvelimesi"
 
 #. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:266 src/gui/shopwindow.cpp:95
-#: src/gui/shopwindow.cpp:102 src/gui/tradewindow.cpp:77
-msgid "Add"
-msgstr "Lisää"
-
-#. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
 #: src/gui/serverdialog.cpp:268 src/gui/widgets/setupitem.cpp:303
 #: src/gui/widgets/setupitem.cpp:430
@@ -3324,20 +3360,14 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:61
-msgid "Auto hide chat window."
+msgid "Auto hide chat window"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:65
-msgid "Protect chat focus."
+msgid "Protect chat focus"
 msgstr ""
 
-#. TRANSLATORS: settings group
-#. TRANSLATORS: settings colors tab name
-#: src/gui/setup_chat.cpp:70 src/gui/setup_colors.cpp:83
-msgid "Colors"
-msgstr "Värit"
-
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:73
 msgid "Remove colors from received chat messages"
@@ -4433,11 +4463,6 @@ msgid "Language"
 msgstr "Kieli"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:249
-msgid "Bold font"
-msgstr "Lihavoitu kirjasin"
-
-#. TRANSLATORS: theme settings label
 #: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr "Hiukkaskirjasin"
@@ -4924,258 +4949,289 @@ msgstr "Taso: %d"
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
-#: src/gui/socialwindow.cpp:158 src/gui/socialwindow.cpp:259
+#: src/gui/socialwindow.cpp:176 src/gui/socialwindow.cpp:309
 #: src/gui/widgets/guildchattab.cpp:42 src/net/ea/gui/guildtab.cpp:49
 msgid "Guild"
 msgstr "Kilta"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Kutsuit käyttäjän %s kiltaan %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:213
+#: src/gui/socialwindow.cpp:231
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Killasta %s eroa pyydetty."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:245
 msgid "Member Invite to Guild"
 msgstr "Jäsenen kutsuminen kiltaan"
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:229
+#: src/gui/socialwindow.cpp:247
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "Kenet haluaisit kutsua kiltaan %s?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:238
+#: src/gui/socialwindow.cpp:256
 msgid "Leave Guild?"
 msgstr "Eroa killasta?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:240
+#: src/gui/socialwindow.cpp:258
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Haluatko varmasti erota killasta %s?"
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:269
+#, c-format
+msgid "Members: %u/%u"
+msgstr ""
+
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:291 src/gui/socialwindow.cpp:361
+#: src/gui/socialwindow.cpp:483
+#, c-format
+msgid "Players: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/socialwindow.cpp:302 src/net/ea/gui/partytab.cpp:49
+#: src/gui/socialwindow.cpp:376 src/net/ea/gui/partytab.cpp:49
 msgid "Party"
 msgstr "Ryhmä"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:341
+#: src/gui/socialwindow.cpp:415
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Käyttäjä %s kutsuttu ryhmään."
 
 #. TRANSLATORS: tab in social window
-#: src/gui/socialwindow.cpp:356
+#: src/gui/socialwindow.cpp:430
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Ryhmästä %s eroamista pyydetty."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:370
+#: src/gui/socialwindow.cpp:444
 msgid "Member Invite to Party"
 msgstr "Jäsenen kutsuminen ryhmään"
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:372
+#: src/gui/socialwindow.cpp:446
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Kenet haluaisit kutsua ryhmään %s?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:381
+#: src/gui/socialwindow.cpp:455
 msgid "Leave Party?"
 msgstr "Eroa ryhmästä?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:383
+#: src/gui/socialwindow.cpp:457
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Haluatko varmasti erota ryhmästä %s?"
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:681
+#, c-format
+msgid "Visible players: %d"
+msgstr ""
+
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:605
+#: src/gui/socialwindow.cpp:707
 msgid "Nav"
 msgstr "Nav"
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:809
+#, c-format
+msgid "Portals: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:922
+#: src/gui/socialwindow.cpp:1035
 msgid "Atk"
 msgstr "Hyö"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:941
+#: src/gui/socialwindow.cpp:1054
 msgid "Priority mobs"
 msgstr "Priorisoidut kohteet"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:943
+#: src/gui/socialwindow.cpp:1056
 msgid "Attack mobs"
 msgstr "Hyökkäyskohteet"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:945
+#: src/gui/socialwindow.cpp:1058
 msgid "Ignore mobs"
 msgstr "Ohitettavat kohteet"
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:968
+#: src/gui/socialwindow.cpp:1081
 msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:987
+#: src/gui/socialwindow.cpp:1100
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:989
+#: src/gui/socialwindow.cpp:1102
 msgid "Ignore items"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:1190
+#, c-format
+msgid "Friends: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1091 src/gui/socialwindow.cpp:1563
+#: src/gui/socialwindow.cpp:1213 src/gui/socialwindow.cpp:1687
 msgid "Create Party"
 msgstr "Luo ryhmä"
 
 #. TRANSLATORS: social window name
 #. TRANSLATORS: full button name
-#: src/gui/socialwindow.cpp:1138 src/gui/windowmenu.cpp:126
+#: src/gui/socialwindow.cpp:1260 src/gui/windowmenu.cpp:126
 msgid "Social"
 msgstr "Suhteet"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1273
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1156
+#: src/gui/socialwindow.cpp:1278
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/socialwindow.cpp:1162
+#: src/gui/socialwindow.cpp:1284
 msgid "Invite"
 msgstr "Kutsu"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1345
+#: src/gui/socialwindow.cpp:1469
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Otit vastaan ryhmäkutsun pelaajalta %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1356
+#: src/gui/socialwindow.cpp:1480
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Kieltäydyit pelaajan %s ryhmäkutsusta."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1497
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Otit vastaan kiltakutsun pelaajalta %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Kieltäydyit pelaajan %s kiltakutsusta."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1424
+#: src/gui/socialwindow.cpp:1548
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Luon killan %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1445
+#: src/gui/socialwindow.cpp:1569
 #, c-format
 msgid "Creating party called %s."
 msgstr "Luon ryhmän %s."
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1460
+#: src/gui/socialwindow.cpp:1584
 msgid "Guild Name"
 msgstr "Killan nimi"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1462
+#: src/gui/socialwindow.cpp:1586
 msgid "Choose your guild's name."
 msgstr "Valitse killallesi nimi."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1477
+#: src/gui/socialwindow.cpp:1601
 msgid "Received guild request, but one already exists."
 msgstr "Vastaanotin kiltapyynnön, mutta sellainen on jo olemassa."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1485
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s on kutsunut sinut liittymään kiltaan %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1616
 msgid "Accept Guild Invite"
 msgstr "Ota kiltakutsu vastaan"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1631
 msgid "Received party request, but one already exists."
 msgstr "Sain ryhmäpyynnön, mutta sellainen on jo olemassa."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1519
+#: src/gui/socialwindow.cpp:1643
 msgid "You have been invited you to join a party."
 msgstr "Sinut on kutsuttu liittymään ryhmään."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1524
+#: src/gui/socialwindow.cpp:1648
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Sinut on kutsuttu liittymään ryhmään %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1533
+#: src/gui/socialwindow.cpp:1657
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s on kutsunut sinut liittymään ryhmäänsä."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1539
+#: src/gui/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s on kutsunut sinut liittymään ryhmäänsä %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1673
 msgid "Accept Party Invite"
 msgstr "Ota ryhmäkutsu vastaan"
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1688
 msgid "Cannot create party. You are already in a party"
 msgstr "Ryhmän luominen epäonnistui, olet jo ryhmän jäsen."
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1694
 msgid "Party Name"
 msgstr "Ryhmän nimi"
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1572
+#: src/gui/socialwindow.cpp:1696
 msgid "Choose your party's name."
 msgstr "Anna ryhmällesi nimi."
 
@@ -5195,24 +5251,24 @@ msgid "MP:"
 msgstr "MP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:235 src/gui/statuswindow.cpp:423
+#: src/gui/statuswindow.cpp:234 src/gui/statuswindow.cpp:424
 #, c-format
 msgid "Job: %d"
 msgstr "Työ: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:237
+#: src/gui/statuswindow.cpp:236
 msgid "Job:"
 msgstr "Työ:"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:288 src/gui/statuswindow.cpp:345
+#: src/gui/statuswindow.cpp:289 src/gui/statuswindow.cpp:346
 #, c-format
 msgid "Character points: %d"
 msgstr "Hahmopisteitä: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:360
+#: src/gui/statuswindow.cpp:361
 #, c-format
 msgid "Correction points: %d"
 msgstr "Korjauspisteitä: %d"
@@ -5657,13 +5713,13 @@ msgid "%s whispers: %s"
 msgstr "%s kuiskaa: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:540
+#: src/gui/widgets/chattab.cpp:541
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:545
+#: src/gui/widgets/chattab.cpp:546
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -5951,24 +6007,24 @@ msgstr "Valitse pelimaailma"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/inputmanager.cpp:328 src/inputmanager.cpp:372 src/keyboardconfig.cpp:90
+#: src/inputmanager.cpp:329 src/inputmanager.cpp:373 src/keyboardconfig.cpp:90
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/inputmanager.cpp:334
+#: src/inputmanager.cpp:335
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/inputmanager.cpp:348
+#: src/inputmanager.cpp:349
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/inputmanager.cpp:378
+#: src/inputmanager.cpp:379
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -5976,7 +6032,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/inputmanager.cpp:392 src/keyboardconfig.cpp:103
+#: src/inputmanager.cpp:393 src/keyboardconfig.cpp:134
 msgid "u key"
 msgstr ""
 
@@ -6653,55 +6709,55 @@ msgid "Request to quit denied!"
 msgstr "Lopetuspyyntö evätty!"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:176
+#: src/net/ea/guildhandler.cpp:178
 #, c-format
 msgid "Guild name: %s"
 msgstr "Killan nimi: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:179
+#: src/net/ea/guildhandler.cpp:181
 #, c-format
 msgid "Guild master: %s"
 msgstr "Kiltamestari: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild level: %d"
 msgstr "Kiltataso: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:186
 #, c-format
 msgid "Online members: %d"
 msgstr "Jäseniä linjoilla: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:187
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Max members: %d"
 msgstr "Jäsenmaksimi: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Average level: %d"
 msgstr "Keskim. taso: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:193
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Guild exp: %d"
 msgstr "Kiltakokemusta: %d kkp"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:195
+#: src/net/ea/guildhandler.cpp:197
 #, c-format
 msgid "Guild next exp: %d"
 msgstr "Seuraavaan tasoon: %d kkp"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:198
+#: src/net/ea/guildhandler.cpp:200
 #, c-format
 msgid "Guild castle: %s"
 msgstr "Killan linna: %s"
diff --git a/po/fr.po b/po/fr.po
index daa507c19..633e09436 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -16,9 +16,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-08-03 13:52+0300\n"
-"PO-Revision-Date: 2013-07-21 09:30+0000\n"
-"Last-Translator: Alige <aligetmw@hotmail.fr>\n"
+"POT-Creation-Date: 2013-08-17 13:35+0300\n"
+"PO-Revision-Date: 2013-08-16 17:53+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/manaplus/language/"
 "fr/)\n"
 "Language: fr\n"
@@ -47,21 +47,21 @@ msgstr "Visible sur la carte"
 msgid "Human"
 msgstr "Humain"
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "dodge"
 msgstr "esquive"
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "miss"
 msgstr "raté"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1710 src/gui/whoisonline.cpp:835
+#: src/being.cpp:1713 src/gui/whoisonline.cpp:842
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1715 src/gui/whoisonline.cpp:840
+#: src/being.cpp:1718 src/gui/whoisonline.cpp:847
 msgid "I"
 msgstr "I"
 
@@ -98,8 +98,8 @@ msgstr "Thème"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:1176 src/gui/didyouknowwindow.cpp:78
-#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:66
-#: src/gui/npcdialog.cpp:103 src/gui/popupmenu.cpp:562
+#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:70
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:562
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:81
 msgid "Close"
 msgstr "Fermer"
@@ -439,14 +439,14 @@ msgstr ""
 "Les options de /%s sont \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:259 src/gui/widgets/chattab.cpp:465
+#: src/game.cpp:259 src/gui/widgets/chattab.cpp:466
 msgid "General"
 msgstr "Général"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: debug window name
 #. TRANSLATORS: full button name
-#: src/game.cpp:275 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:467
+#: src/game.cpp:275 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:468
 #: src/gui/windowmenu.cpp:154
 msgid "Debug"
 msgstr "Débogage"
@@ -504,7 +504,7 @@ msgstr "Testeur de Robot"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:105
+#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:111
 msgid "Reset"
 msgstr "Réinitialiser"
 
@@ -622,8 +622,8 @@ msgstr "Montant :"
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/buydialog.cpp:265 src/gui/itemamountwindow.cpp:202
-#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:96
-#: src/gui/selldialog.cpp:101 src/gui/statuswindow.cpp:790
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:100
+#: src/gui/selldialog.cpp:101 src/gui/statuswindow.cpp:791
 msgid "+"
 msgstr "+"
 
@@ -634,8 +634,8 @@ msgstr "+"
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
 #: src/gui/buydialog.cpp:268 src/gui/itemamountwindow.cpp:200
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:98
-#: src/gui/selldialog.cpp:103 src/gui/statuswindow.cpp:803
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:102
+#: src/gui/selldialog.cpp:103 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr "-"
 
@@ -643,7 +643,7 @@ msgstr "-"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/buydialog.cpp:271 src/gui/charcreatedialog.cpp:122
-#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1160
+#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1282
 msgid "Create"
 msgstr "Créer"
 
@@ -666,8 +666,8 @@ msgstr "Quitter"
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
 #: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:109
-#: src/gui/statuswindow.cpp:531 src/gui/statuswindow.cpp:586
-#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:821
+#: src/gui/statuswindow.cpp:532 src/gui/statuswindow.cpp:587
+#: src/gui/statuswindow.cpp:788 src/gui/statuswindow.cpp:822
 msgid "Max"
 msgstr "Max."
 
@@ -727,7 +727,7 @@ msgstr "Vendre"
 #: src/gui/popupmenu.cpp:2309 src/gui/popupmenu.cpp:2543
 #: src/gui/popupmenu.cpp:2660 src/gui/quitdialog.cpp:73
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
-#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1094
+#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1216
 #: src/gui/textcommandeditor.cpp:211 src/gui/textdialog.cpp:53
 #: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:181
 msgid "Cancel"
@@ -1016,92 +1016,102 @@ msgstr "Entrer le mot de passe :"
 #. TRANSLATORS: inventory sort mode
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
-#: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:65
+#: src/gui/chatwindow.cpp:143 src/gui/inventorywindow.cpp:65
 #: src/gui/setup_other.cpp:69 src/gui/setup_visual.cpp:77
 msgid "default"
 msgstr "défaut"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:144
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:145 src/gui/widgets/colormodel.cpp:76
 msgid "black"
 msgstr "noir"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:146
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:147 src/gui/widgets/colormodel.cpp:78
 msgid "red"
 msgstr "rouge"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:148
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:149 src/gui/widgets/colormodel.cpp:80
 msgid "green"
 msgstr "vert"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:150
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:151 src/gui/widgets/colormodel.cpp:82
 msgid "blue"
 msgstr "bleu"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:152
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:153 src/gui/widgets/colormodel.cpp:84
 msgid "gold"
 msgstr "or"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:154
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:155 src/gui/widgets/colormodel.cpp:86
 msgid "yellow"
 msgstr "jaune"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:156
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:157 src/gui/widgets/colormodel.cpp:88
 msgid "pink"
 msgstr "rose"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:158
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:159 src/gui/widgets/colormodel.cpp:90
 msgid "purple"
 msgstr "violet"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:160
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:161 src/gui/widgets/colormodel.cpp:92
 msgid "grey"
 msgstr "gris"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:162
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:163 src/gui/widgets/colormodel.cpp:94
 msgid "brown"
 msgstr "marron"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:164
+#: src/gui/chatwindow.cpp:165
 msgid "rainbow 1"
 msgstr "arc en ciel 1"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:166
+#: src/gui/chatwindow.cpp:167
 msgid "rainbow 2"
 msgstr "arc en ciel 2"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:168
+#: src/gui/chatwindow.cpp:169
 msgid "rainbow 3"
 msgstr "arc en ciel 3"
 
 #. TRANSLATORS: chat window name
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
-#: src/gui/chatwindow.cpp:195 src/gui/setupactiondata.h:1866
+#: src/gui/chatwindow.cpp:196 src/gui/setupactiondata.h:1866
 #: src/gui/setup_chat.cpp:50 src/gui/windowmenu.cpp:88
 msgid "Chat"
 msgstr "Conversation"
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:659
+#: src/gui/chatwindow.cpp:684
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Présents : %s ; %d joueurs sont présents."
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1066
+#: src/gui/chatwindow.cpp:1091
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Message envoyé à %s : %s"
@@ -1410,14 +1420,38 @@ msgstr "URL de la liste en ligne"
 msgid "Please at least type both the address and the port of the server."
 msgstr "Entres au moins l'adresse et le port du serveur."
 
+#. TRANSLATORS: font size
+#: src/gui/emotewindow.cpp:49
+msgid "Normal font"
+msgstr ""
+
+#. TRANSLATORS: font size
+#. TRANSLATORS: theme settings label
+#: src/gui/emotewindow.cpp:51 src/gui/setup_theme.cpp:249
+msgid "Bold font"
+msgstr "Police grasse"
+
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/emotewindow.cpp:41 src/gui/emotewindow.cpp:61
+#: src/gui/emotewindow.cpp:56 src/gui/emotewindow.cpp:107
 #: src/gui/setupactiondata.h:1862
 msgid "Emotes"
 msgstr "Emoticônes"
 
+#. TRANSLATORS: emotes tab name
+#. TRANSLATORS: settings group
+#. TRANSLATORS: settings colors tab name
+#: src/gui/emotewindow.cpp:109 src/gui/setup_chat.cpp:70
+#: src/gui/setup_colors.cpp:83
+msgid "Colors"
+msgstr "Couleurs"
+
+#. TRANSLATORS: emotes tab name
+#: src/gui/emotewindow.cpp:111
+msgid "Fonts"
+msgstr ""
+
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/equipmentwindow.cpp:56 src/gui/inventorywindow.cpp:204
@@ -1509,7 +1543,7 @@ msgstr "Récupérer"
 
 #. TRANSLATORS: status window label
 #: src/gui/inventorywindow.cpp:580 src/gui/statuswindow.cpp:143
-#: src/gui/statuswindow.cpp:284 src/gui/statuswindow.cpp:337
+#: src/gui/statuswindow.cpp:285 src/gui/statuswindow.cpp:338
 #: src/gui/widgets/characterdisplay.cpp:126
 #, c-format
 msgid "Money: %s"
@@ -1797,7 +1831,7 @@ msgstr "Barre de compétences"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:295
+#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:296
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Niveau : %d (MJ %d)"
@@ -1805,7 +1839,7 @@ msgstr "Niveau : %d (MJ %d)"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/ministatuswindow.cpp:317 src/gui/statuswindow.cpp:141
-#: src/gui/statuswindow.cpp:302 src/gui/statuswindow.cpp:373
+#: src/gui/statuswindow.cpp:303 src/gui/statuswindow.cpp:374
 #, c-format
 msgid "Level: %d"
 msgstr "Niveau : %d"
@@ -1822,34 +1856,45 @@ msgid "Job level: %d"
 msgstr "Niveau de métier : %d"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:62
+#: src/gui/npcdialog.cpp:66
 msgid "Stop waiting"
 msgstr "Arrêter d'attendre "
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:64
+#: src/gui/npcdialog.cpp:68
 msgid "Next"
 msgstr "Suivant"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:68
+#: src/gui/npcdialog.cpp:72
 msgid "Submit"
 msgstr "Soumettre"
 
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
 #. TRANSLATORS: settings group
-#: src/gui/npcdialog.cpp:77 src/gui/npcpostdialog.cpp:43
+#: src/gui/npcdialog.cpp:81 src/gui/npcpostdialog.cpp:43
 #: src/gui/setup_other.cpp:257
 msgid "NPC"
 msgstr "PNJ"
 
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:566
+#: src/gui/npcdialog.cpp:104 src/gui/popupmenu.cpp:566
 msgid "Clear"
 msgstr "Effacer"
 
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: trade window button
+#: src/gui/npcdialog.cpp:109 src/gui/serverdialog.cpp:266
+#: src/gui/shopwindow.cpp:95 src/gui/shopwindow.cpp:102
+#: src/gui/tradewindow.cpp:77
+msgid "Add"
+msgstr "Ajouter"
+
 #. TRANSLATORS: label in npc post dialog
 #: src/gui/npcpostdialog.cpp:53
 msgid "To:"
@@ -2057,7 +2102,7 @@ msgstr "Désactive la fonction Absence"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: social window button
-#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1164
+#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1286
 msgid "Leave"
 msgstr "Quitter"
 
@@ -2191,7 +2236,7 @@ msgstr "Copier dans la conversation"
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2194
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:985
 msgid "(default)"
 msgstr "(défaut)"
 
@@ -2439,15 +2484,6 @@ msgid "Choose Your Server"
 msgstr "Choisis le serveur"
 
 #. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:266 src/gui/shopwindow.cpp:95
-#: src/gui/shopwindow.cpp:102 src/gui/tradewindow.cpp:77
-msgid "Add"
-msgstr "Ajouter"
-
-#. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
 #: src/gui/serverdialog.cpp:268 src/gui/widgets/setupitem.cpp:303
 #: src/gui/widgets/setupitem.cpp:430
@@ -3338,19 +3374,13 @@ msgstr "Fenêtre"
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:61
-msgid "Auto hide chat window."
-msgstr "Cacher automatiquement la fenêtre de dialogue."
+msgid "Auto hide chat window"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:65
-msgid "Protect chat focus."
-msgstr "Protéger la concentration de conversation."
-
-#. TRANSLATORS: settings group
-#. TRANSLATORS: settings colors tab name
-#: src/gui/setup_chat.cpp:70 src/gui/setup_colors.cpp:83
-msgid "Colors"
-msgstr "Couleurs"
+msgid "Protect chat focus"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:73
@@ -4450,11 +4480,6 @@ msgid "Language"
 msgstr "Langue"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:249
-msgid "Bold font"
-msgstr "Police grasse"
-
-#. TRANSLATORS: theme settings label
 #: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr "Taille des effets de particules"
@@ -4948,262 +4973,293 @@ msgstr "Niveau : %d"
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
-#: src/gui/socialwindow.cpp:158 src/gui/socialwindow.cpp:259
+#: src/gui/socialwindow.cpp:176 src/gui/socialwindow.cpp:309
 #: src/gui/widgets/guildchattab.cpp:42 src/net/ea/gui/guildtab.cpp:49
 msgid "Guild"
 msgstr "Guilde"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Le joueur %s a été invité dans la guilde %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:213
+#: src/gui/socialwindow.cpp:231
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Demande pour quitter la guilde %s effectuée."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:245
 msgid "Member Invite to Guild"
 msgstr "Inviter le membre dans la guilde"
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:229
+#: src/gui/socialwindow.cpp:247
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "Qui voulez-vous inviter dans la guilde %s ?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:238
+#: src/gui/socialwindow.cpp:256
 msgid "Leave Guild?"
 msgstr "Quitter la guilde ?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:240
+#: src/gui/socialwindow.cpp:258
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Êtes-vous certain de vouloir quitter la guilde %s ?"
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:269
+#, c-format
+msgid "Members: %u/%u"
+msgstr ""
+
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:291 src/gui/socialwindow.cpp:361
+#: src/gui/socialwindow.cpp:483
+#, c-format
+msgid "Players: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/socialwindow.cpp:302 src/net/ea/gui/partytab.cpp:49
+#: src/gui/socialwindow.cpp:376 src/net/ea/gui/partytab.cpp:49
 msgid "Party"
 msgstr "Groupe"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:341
+#: src/gui/socialwindow.cpp:415
 #, c-format
 msgid "Invited user %s to party."
 msgstr "/party > Inviter l'utilisateur %s dans le groupe."
 
 #. TRANSLATORS: tab in social window
-#: src/gui/socialwindow.cpp:356
+#: src/gui/socialwindow.cpp:430
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Vous avez demandé à quitter le groupe %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:370
+#: src/gui/socialwindow.cpp:444
 msgid "Member Invite to Party"
 msgstr "Inviter un joueur dans le groupe"
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:372
+#: src/gui/socialwindow.cpp:446
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Qui voudrais-tu inviter dans le groupe %s ?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:381
+#: src/gui/socialwindow.cpp:455
 msgid "Leave Party?"
 msgstr "Quitter le groupe ?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:383
+#: src/gui/socialwindow.cpp:457
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Êtes-vous certain de vouloir quitter le groupe %s ?"
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:681
+#, c-format
+msgid "Visible players: %d"
+msgstr ""
+
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:605
+#: src/gui/socialwindow.cpp:707
 msgid "Nav"
 msgstr "Nav"
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:809
+#, c-format
+msgid "Portals: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:922
+#: src/gui/socialwindow.cpp:1035
 msgid "Atk"
 msgstr "Atq"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:941
+#: src/gui/socialwindow.cpp:1054
 msgid "Priority mobs"
 msgstr "Monstres prioritaires"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:943
+#: src/gui/socialwindow.cpp:1056
 msgid "Attack mobs"
 msgstr "Attaquer les monstres"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:945
+#: src/gui/socialwindow.cpp:1058
 msgid "Ignore mobs"
 msgstr "Ignorer les monstres"
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:968
+#: src/gui/socialwindow.cpp:1081
 msgid "Pik"
 msgstr "Pik"
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:987
+#: src/gui/socialwindow.cpp:1100
 msgid "Pickup items"
 msgstr "Ramasser les objets"
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:989
+#: src/gui/socialwindow.cpp:1102
 msgid "Ignore items"
 msgstr "Ignorer les objets"
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:1190
+#, c-format
+msgid "Friends: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1091 src/gui/socialwindow.cpp:1563
+#: src/gui/socialwindow.cpp:1213 src/gui/socialwindow.cpp:1687
 msgid "Create Party"
 msgstr "Créer un groupe"
 
 #. TRANSLATORS: social window name
 #. TRANSLATORS: full button name
-#: src/gui/socialwindow.cpp:1138 src/gui/windowmenu.cpp:126
+#: src/gui/socialwindow.cpp:1260 src/gui/windowmenu.cpp:126
 msgid "Social"
 msgstr "Social"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1273
 msgid "P"
 msgstr "P"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1156
+#: src/gui/socialwindow.cpp:1278
 msgid "F"
 msgstr "F"
 
 #. TRANSLATORS: social window button
-#: src/gui/socialwindow.cpp:1162
+#: src/gui/socialwindow.cpp:1284
 msgid "Invite"
 msgstr "Inviter"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1345
+#: src/gui/socialwindow.cpp:1469
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Invitation dans le groupe acceptée de la part de %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1356
+#: src/gui/socialwindow.cpp:1480
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Invitation dans le groupe de la part de %s refusée."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1497
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Invitation dans la guilde acceptée de la part de %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Invitation dans la guilde de la part de %s refusée."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1424
+#: src/gui/socialwindow.cpp:1548
 #, c-format
 msgid "Creating guild called %s."
 msgstr "La guilde %s a été créée."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1445
+#: src/gui/socialwindow.cpp:1569
 #, c-format
 msgid "Creating party called %s."
 msgstr "Le groupe %s a été créé."
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1460
+#: src/gui/socialwindow.cpp:1584
 msgid "Guild Name"
 msgstr "Nom de la guilde"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1462
+#: src/gui/socialwindow.cpp:1586
 msgid "Choose your guild's name."
 msgstr "Choisis le nom de la guilde."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1477
+#: src/gui/socialwindow.cpp:1601
 msgid "Received guild request, but one already exists."
 msgstr ""
 "Vous avez reçu une invitation pour rejoindre une guilde, mais vous êtes déjà "
 "membre d'une autre."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1485
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s t'a invité à rejoindre la guilde %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1616
 msgid "Accept Guild Invite"
 msgstr "Accepter l'invitation dans cette guilde"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1631
 msgid "Received party request, but one already exists."
 msgstr ""
 "Vous avez reçu une invitation pour rejoindre un groupe, mais vous êtes déjà "
 "membre d'une autre."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1519
+#: src/gui/socialwindow.cpp:1643
 msgid "You have been invited you to join a party."
 msgstr "Vous avez été invité à rejoindre un groupe."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1524
+#: src/gui/socialwindow.cpp:1648
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Tu as été invité à rejoindre le groupe %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1533
+#: src/gui/socialwindow.cpp:1657
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s t'a invité à rejoindre son groupe."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1539
+#: src/gui/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s t'a invité à rejoindre le groupe %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1673
 msgid "Accept Party Invite"
 msgstr "Accepter l'invitation pour ce groupe"
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1688
 msgid "Cannot create party. You are already in a party"
 msgstr "Impossible de créer le groupe. vous faîtes déjà partie d'un groupe."
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1694
 msgid "Party Name"
 msgstr "Nom du groupe"
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1572
+#: src/gui/socialwindow.cpp:1696
 msgid "Choose your party's name."
 msgstr "Choisis le nom du groupe."
 
@@ -5223,24 +5279,24 @@ msgid "MP:"
 msgstr "PM :"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:235 src/gui/statuswindow.cpp:423
+#: src/gui/statuswindow.cpp:234 src/gui/statuswindow.cpp:424
 #, c-format
 msgid "Job: %d"
 msgstr "Métier : %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:237
+#: src/gui/statuswindow.cpp:236
 msgid "Job:"
 msgstr "Compétence :"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:288 src/gui/statuswindow.cpp:345
+#: src/gui/statuswindow.cpp:289 src/gui/statuswindow.cpp:346
 #, c-format
 msgid "Character points: %d"
 msgstr "Points de caractéristiques du personnage : %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:360
+#: src/gui/statuswindow.cpp:361
 #, c-format
 msgid "Correction points: %d"
 msgstr "Points de correction : %d"
@@ -5687,13 +5743,13 @@ msgid "%s whispers: %s"
 msgstr "Message de %s : %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:540
+#: src/gui/widgets/chattab.cpp:541
 #, c-format
 msgid "%s is now Online."
 msgstr "%s est maintenant En Ligne."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:545
+#: src/gui/widgets/chattab.cpp:546
 #, c-format
 msgid "%s is now Offline."
 msgstr "%s est maintenant Hors Ligne."
@@ -5982,24 +6038,24 @@ msgstr "Choix du monde"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/inputmanager.cpp:328 src/inputmanager.cpp:372 src/keyboardconfig.cpp:90
+#: src/inputmanager.cpp:329 src/inputmanager.cpp:373 src/keyboardconfig.cpp:90
 #, c-format
 msgid "key_%d"
 msgstr "touche_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/inputmanager.cpp:334
+#: src/inputmanager.cpp:335
 #, c-format
 msgid "JButton%d"
 msgstr "JBoutton%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/inputmanager.cpp:348
+#: src/inputmanager.cpp:349
 msgid "unknown key"
 msgstr "touche inconnue"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/inputmanager.cpp:378
+#: src/inputmanager.cpp:379
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -6007,7 +6063,7 @@ msgstr "JB%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/inputmanager.cpp:392 src/keyboardconfig.cpp:103
+#: src/inputmanager.cpp:393 src/keyboardconfig.cpp:134
 msgid "u key"
 msgstr "touche u"
 
@@ -6691,55 +6747,55 @@ msgid "Request to quit denied!"
 msgstr "Requête de départ refusée !"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:176
+#: src/net/ea/guildhandler.cpp:178
 #, c-format
 msgid "Guild name: %s"
 msgstr "Nom de la guilde : %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:179
+#: src/net/ea/guildhandler.cpp:181
 #, c-format
 msgid "Guild master: %s"
 msgstr "Maître de la guilde : %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild level: %d"
 msgstr "Niveau de la guilde : %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:186
 #, c-format
 msgid "Online members: %d"
 msgstr "Membres en ligne : %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:187
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Max members: %d"
 msgstr "Membres maximums : %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Average level: %d"
 msgstr "Niveau moyen : %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:193
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Guild exp: %d"
 msgstr "Expérience Groupe : %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:195
+#: src/net/ea/guildhandler.cpp:197
 #, c-format
 msgid "Guild next exp: %d"
 msgstr "Expérience suivante pour la guilde : %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:198
+#: src/net/ea/guildhandler.cpp:200
 #, c-format
 msgid "Guild castle: %s"
 msgstr "Château de la guilde : %s"
diff --git a/po/he.po b/po/he.po
index 4f8844206..20eaeb134 100644
--- a/po/he.po
+++ b/po/he.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-07-19 22:23+0300\n"
-"PO-Revision-Date: 2013-07-19 19:52+0000\n"
+"POT-Creation-Date: 2013-08-16 20:45+0300\n"
+"PO-Revision-Date: 2013-08-16 17:53+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/manaplus/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -38,21 +38,21 @@ msgstr ""
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1606 src/gui/whoisonline.cpp:835
+#: src/being.cpp:1713 src/gui/whoisonline.cpp:842
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1611 src/gui/whoisonline.cpp:840
+#: src/being.cpp:1718 src/gui/whoisonline.cpp:847
 msgid "I"
 msgstr ""
 
@@ -89,8 +89,8 @@ msgstr ""
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:1176 src/gui/didyouknowwindow.cpp:78
-#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:66
-#: src/gui/npcdialog.cpp:103 src/gui/popupmenu.cpp:562
+#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:70
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:562
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:81
 msgid "Close"
 msgstr "סגור"
@@ -425,36 +425,36 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "האפשרויות עבור /%s הינם \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:465
+#: src/game.cpp:259 src/gui/widgets/chattab.cpp:466
 msgid "General"
 msgstr "כללי"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: debug window name
 #. TRANSLATORS: full button name
-#: src/game.cpp:272 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:467
+#: src/game.cpp:275 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:468
 #: src/gui/windowmenu.cpp:154
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:536
+#: src/game.cpp:540
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:546
+#: src/game.cpp:550
 msgid "Saving screenshot failed!"
 msgstr "שמירת תמונת־מסך נכשלה"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:618
+#: src/game.cpp:622
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:621
+#: src/game.cpp:625
 msgid "Network Error"
 msgstr "שגיאת רשת"
 
@@ -489,7 +489,7 @@ msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:105
+#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:111
 msgid "Reset"
 msgstr "אפס"
 
@@ -590,7 +590,7 @@ msgstr "קנה"
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
 #: src/gui/buydialog.cpp:251 src/gui/buydialog.cpp:531
-#: src/gui/selldialog.cpp:96 src/gui/selldialog.cpp:356
+#: src/gui/selldialog.cpp:97 src/gui/selldialog.cpp:357
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "מחיר: %s / סה\"כ: %s"
@@ -607,8 +607,8 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/buydialog.cpp:265 src/gui/itemamountwindow.cpp:202
-#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:96
-#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:790
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:100
+#: src/gui/selldialog.cpp:101 src/gui/statuswindow.cpp:791
 msgid "+"
 msgstr ""
 
@@ -619,8 +619,8 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
 #: src/gui/buydialog.cpp:268 src/gui/itemamountwindow.cpp:200
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:98
-#: src/gui/selldialog.cpp:102 src/gui/statuswindow.cpp:803
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:102
+#: src/gui/selldialog.cpp:103 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr ""
 
@@ -628,7 +628,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/buydialog.cpp:271 src/gui/charcreatedialog.cpp:122
-#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1160
+#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1282
 msgid "Create"
 msgstr "צור"
 
@@ -640,7 +640,7 @@ msgstr "צור"
 #. TRANSLATORS: input action name
 #: src/gui/buydialog.cpp:273 src/gui/quitdialog.cpp:55
 #: src/gui/quitdialog.cpp:60 src/gui/quitdialog.cpp:62
-#: src/gui/selldialog.cpp:106 src/gui/serverdialog.cpp:262
+#: src/gui/selldialog.cpp:107 src/gui/serverdialog.cpp:262
 #: src/gui/setupactiondata.h:177
 msgid "Quit"
 msgstr "יציאה"
@@ -650,9 +650,9 @@ msgstr "יציאה"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:108
-#: src/gui/statuswindow.cpp:531 src/gui/statuswindow.cpp:586
-#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:821
+#: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:109
+#: src/gui/statuswindow.cpp:532 src/gui/statuswindow.cpp:587
+#: src/gui/statuswindow.cpp:788 src/gui/statuswindow.cpp:822
 msgid "Max"
 msgstr "מקסימום"
 
@@ -672,7 +672,7 @@ msgstr "חנות"
 #. TRANSLATORS: sell dialog button
 #: src/gui/buyselldialog.cpp:69 src/gui/popupmenu.cpp:223
 #: src/gui/popupmenu.cpp:2455 src/gui/selldialog.cpp:54
-#: src/gui/selldialog.cpp:64 src/gui/selldialog.cpp:104
+#: src/gui/selldialog.cpp:64 src/gui/selldialog.cpp:105
 msgid "Sell"
 msgstr "מכר"
 
@@ -712,7 +712,7 @@ msgstr "מכר"
 #: src/gui/popupmenu.cpp:2309 src/gui/popupmenu.cpp:2543
 #: src/gui/popupmenu.cpp:2660 src/gui/quitdialog.cpp:73
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
-#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1094
+#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1216
 #: src/gui/textcommandeditor.cpp:211 src/gui/textdialog.cpp:53
 #: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:181
 msgid "Cancel"
@@ -996,92 +996,102 @@ msgstr ""
 #. TRANSLATORS: inventory sort mode
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
-#: src/gui/chatwindow.cpp:139 src/gui/inventorywindow.cpp:65
+#: src/gui/chatwindow.cpp:143 src/gui/inventorywindow.cpp:65
 #: src/gui/setup_other.cpp:69 src/gui/setup_visual.cpp:77
 msgid "default"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:141
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:145 src/gui/widgets/colormodel.cpp:76
 msgid "black"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:143
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:147 src/gui/widgets/colormodel.cpp:78
 msgid "red"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:145
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:149 src/gui/widgets/colormodel.cpp:80
 msgid "green"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:147
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:151 src/gui/widgets/colormodel.cpp:82
 msgid "blue"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:149
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:153 src/gui/widgets/colormodel.cpp:84
 msgid "gold"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:151
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:155 src/gui/widgets/colormodel.cpp:86
 msgid "yellow"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:153
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:157 src/gui/widgets/colormodel.cpp:88
 msgid "pink"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:155
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:159 src/gui/widgets/colormodel.cpp:90
 msgid "purple"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:157
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:161 src/gui/widgets/colormodel.cpp:92
 msgid "grey"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:159
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:163 src/gui/widgets/colormodel.cpp:94
 msgid "brown"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:161
+#: src/gui/chatwindow.cpp:165
 msgid "rainbow 1"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:163
+#: src/gui/chatwindow.cpp:167
 msgid "rainbow 2"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:165
+#: src/gui/chatwindow.cpp:169
 msgid "rainbow 3"
 msgstr ""
 
 #. TRANSLATORS: chat window name
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
-#: src/gui/chatwindow.cpp:192 src/gui/setupactiondata.h:1866
+#: src/gui/chatwindow.cpp:196 src/gui/setupactiondata.h:1866
 #: src/gui/setup_chat.cpp:50 src/gui/windowmenu.cpp:88
 msgid "Chat"
 msgstr "שיחה"
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:641
+#: src/gui/chatwindow.cpp:684
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1044
+#: src/gui/chatwindow.cpp:1091
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "לוחש אל %s: %s"
@@ -1390,6 +1400,38 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
+#. TRANSLATORS: font size
+#: src/gui/emotewindow.cpp:49
+msgid "Normal font"
+msgstr ""
+
+#. TRANSLATORS: font size
+#. TRANSLATORS: theme settings label
+#: src/gui/emotewindow.cpp:51 src/gui/setup_theme.cpp:249
+msgid "Bold font"
+msgstr ""
+
+#. TRANSLATORS: emotes window name
+#. TRANSLATORS: emotes tab name
+#. TRANSLATORS: input tab sub tab name
+#: src/gui/emotewindow.cpp:56 src/gui/emotewindow.cpp:107
+#: src/gui/setupactiondata.h:1862
+msgid "Emotes"
+msgstr ""
+
+#. TRANSLATORS: emotes tab name
+#. TRANSLATORS: settings group
+#. TRANSLATORS: settings colors tab name
+#: src/gui/emotewindow.cpp:109 src/gui/setup_chat.cpp:70
+#: src/gui/setup_colors.cpp:83
+msgid "Colors"
+msgstr "צבעים"
+
+#. TRANSLATORS: emotes tab name
+#: src/gui/emotewindow.cpp:111
+msgid "Fonts"
+msgstr ""
+
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/equipmentwindow.cpp:56 src/gui/inventorywindow.cpp:204
@@ -1481,7 +1523,7 @@ msgstr "החזר"
 
 #. TRANSLATORS: status window label
 #: src/gui/inventorywindow.cpp:580 src/gui/statuswindow.cpp:143
-#: src/gui/statuswindow.cpp:284 src/gui/statuswindow.cpp:337
+#: src/gui/statuswindow.cpp:285 src/gui/statuswindow.cpp:338
 #: src/gui/widgets/characterdisplay.cpp:126
 #, c-format
 msgid "Money: %s"
@@ -1769,7 +1811,7 @@ msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:295
+#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:296
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
@@ -1777,7 +1819,7 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/ministatuswindow.cpp:317 src/gui/statuswindow.cpp:141
-#: src/gui/statuswindow.cpp:302 src/gui/statuswindow.cpp:373
+#: src/gui/statuswindow.cpp:303 src/gui/statuswindow.cpp:374
 #, c-format
 msgid "Level: %d"
 msgstr "רמה: %d"
@@ -1794,34 +1836,45 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:62
+#: src/gui/npcdialog.cpp:66
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:64
+#: src/gui/npcdialog.cpp:68
 msgid "Next"
 msgstr "הבא"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:68
+#: src/gui/npcdialog.cpp:72
 msgid "Submit"
 msgstr "שלח"
 
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
 #. TRANSLATORS: settings group
-#: src/gui/npcdialog.cpp:77 src/gui/npcpostdialog.cpp:43
+#: src/gui/npcdialog.cpp:81 src/gui/npcpostdialog.cpp:43
 #: src/gui/setup_other.cpp:257
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:566
+#: src/gui/npcdialog.cpp:104 src/gui/popupmenu.cpp:566
 msgid "Clear"
 msgstr ""
 
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: trade window button
+#: src/gui/npcdialog.cpp:109 src/gui/serverdialog.cpp:266
+#: src/gui/shopwindow.cpp:95 src/gui/shopwindow.cpp:102
+#: src/gui/tradewindow.cpp:77
+msgid "Add"
+msgstr "הוסף"
+
 #. TRANSLATORS: label in npc post dialog
 #: src/gui/npcpostdialog.cpp:53
 msgid "To:"
@@ -2029,7 +2082,7 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: social window button
-#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1164
+#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1286
 msgid "Leave"
 msgstr ""
 
@@ -2163,7 +2216,7 @@ msgstr ""
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2194
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:985
 msgid "(default)"
 msgstr ""
 
@@ -2395,12 +2448,12 @@ msgid "Passwords do not match."
 msgstr "הסיסמאות אינן תואמות."
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/selldialog.cpp:242
+#: src/gui/selldialog.cpp:243
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/selldialog.cpp:244
+#: src/gui/selldialog.cpp:245
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
@@ -2411,15 +2464,6 @@ msgid "Choose Your Server"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:266 src/gui/shopwindow.cpp:95
-#: src/gui/shopwindow.cpp:102 src/gui/tradewindow.cpp:77
-msgid "Add"
-msgstr "הוסף"
-
-#. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
 #: src/gui/serverdialog.cpp:268 src/gui/widgets/setupitem.cpp:303
 #: src/gui/widgets/setupitem.cpp:430
@@ -3155,11 +3199,6 @@ msgid "Windows"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1862
-msgid "Emotes"
-msgstr ""
-
-#. TRANSLATORS: input tab sub tab name
 #: src/gui/setupactiondata.h:1870
 msgid "Gui"
 msgstr ""
@@ -3315,20 +3354,14 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:61
-msgid "Auto hide chat window."
+msgid "Auto hide chat window"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:65
-msgid "Protect chat focus."
+msgid "Protect chat focus"
 msgstr ""
 
-#. TRANSLATORS: settings group
-#. TRANSLATORS: settings colors tab name
-#: src/gui/setup_chat.cpp:70 src/gui/setup_colors.cpp:83
-msgid "Colors"
-msgstr "צבעים"
-
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:73
 msgid "Remove colors from received chat messages"
@@ -4421,11 +4454,6 @@ msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:249
-msgid "Bold font"
-msgstr ""
-
-#. TRANSLATORS: theme settings label
 #: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr ""
@@ -4911,258 +4939,289 @@ msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
-#: src/gui/socialwindow.cpp:158 src/gui/socialwindow.cpp:259
+#: src/gui/socialwindow.cpp:176 src/gui/socialwindow.cpp:309
 #: src/gui/widgets/guildchattab.cpp:42 src/net/ea/gui/guildtab.cpp:49
 msgid "Guild"
 msgstr "גילדה"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:213
+#: src/gui/socialwindow.cpp:231
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:245
 msgid "Member Invite to Guild"
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:229
+#: src/gui/socialwindow.cpp:247
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:238
+#: src/gui/socialwindow.cpp:256
 msgid "Leave Guild?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:240
+#: src/gui/socialwindow.cpp:258
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:269
+#, c-format
+msgid "Members: %u/%u"
+msgstr ""
+
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:291 src/gui/socialwindow.cpp:361
+#: src/gui/socialwindow.cpp:483
+#, c-format
+msgid "Players: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/socialwindow.cpp:302 src/net/ea/gui/partytab.cpp:49
+#: src/gui/socialwindow.cpp:376 src/net/ea/gui/partytab.cpp:49
 msgid "Party"
 msgstr "חבורה"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:341
+#: src/gui/socialwindow.cpp:415
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
 #. TRANSLATORS: tab in social window
-#: src/gui/socialwindow.cpp:356
+#: src/gui/socialwindow.cpp:430
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:370
+#: src/gui/socialwindow.cpp:444
 msgid "Member Invite to Party"
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:372
+#: src/gui/socialwindow.cpp:446
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:381
+#: src/gui/socialwindow.cpp:455
 msgid "Leave Party?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:383
+#: src/gui/socialwindow.cpp:457
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:681
+#, c-format
+msgid "Visible players: %d"
+msgstr ""
+
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:605
+#: src/gui/socialwindow.cpp:707
 msgid "Nav"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:809
+#, c-format
+msgid "Portals: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:922
+#: src/gui/socialwindow.cpp:1035
 msgid "Atk"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:941
+#: src/gui/socialwindow.cpp:1054
 msgid "Priority mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:943
+#: src/gui/socialwindow.cpp:1056
 msgid "Attack mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:945
+#: src/gui/socialwindow.cpp:1058
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:968
+#: src/gui/socialwindow.cpp:1081
 msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:987
+#: src/gui/socialwindow.cpp:1100
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:989
+#: src/gui/socialwindow.cpp:1102
 msgid "Ignore items"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:1190
+#, c-format
+msgid "Friends: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1091 src/gui/socialwindow.cpp:1563
+#: src/gui/socialwindow.cpp:1213 src/gui/socialwindow.cpp:1687
 msgid "Create Party"
 msgstr ""
 
 #. TRANSLATORS: social window name
 #. TRANSLATORS: full button name
-#: src/gui/socialwindow.cpp:1138 src/gui/windowmenu.cpp:126
+#: src/gui/socialwindow.cpp:1260 src/gui/windowmenu.cpp:126
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1273
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1156
+#: src/gui/socialwindow.cpp:1278
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/socialwindow.cpp:1162
+#: src/gui/socialwindow.cpp:1284
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1345
+#: src/gui/socialwindow.cpp:1469
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1356
+#: src/gui/socialwindow.cpp:1480
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1497
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1424
+#: src/gui/socialwindow.cpp:1548
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1445
+#: src/gui/socialwindow.cpp:1569
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1460
+#: src/gui/socialwindow.cpp:1584
 msgid "Guild Name"
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1462
+#: src/gui/socialwindow.cpp:1586
 msgid "Choose your guild's name."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1477
+#: src/gui/socialwindow.cpp:1601
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1485
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1616
 msgid "Accept Guild Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1631
 msgid "Received party request, but one already exists."
 msgstr "התקבלה הזמנה לחבורה, אך הזמנה זהה כבר קיימת."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1519
+#: src/gui/socialwindow.cpp:1643
 msgid "You have been invited you to join a party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1524
+#: src/gui/socialwindow.cpp:1648
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1533
+#: src/gui/socialwindow.cpp:1657
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s הזמין אותך לחבורה שלהם."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1539
+#: src/gui/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s הזמין אותך להצטרף לחבורת %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1673
 msgid "Accept Party Invite"
 msgstr "אשר את הזמנת חבורה"
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1688
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1694
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1572
+#: src/gui/socialwindow.cpp:1696
 msgid "Choose your party's name."
 msgstr ""
 
@@ -5182,24 +5241,24 @@ msgid "MP:"
 msgstr "קסם:"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:235 src/gui/statuswindow.cpp:423
+#: src/gui/statuswindow.cpp:234 src/gui/statuswindow.cpp:424
 #, c-format
 msgid "Job: %d"
 msgstr "עבודה: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:237
+#: src/gui/statuswindow.cpp:236
 msgid "Job:"
 msgstr "עבודה:"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:288 src/gui/statuswindow.cpp:345
+#: src/gui/statuswindow.cpp:289 src/gui/statuswindow.cpp:346
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:360
+#: src/gui/statuswindow.cpp:361
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
@@ -5645,13 +5704,13 @@ msgid "%s whispers: %s"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:540
+#: src/gui/widgets/chattab.cpp:541
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:545
+#: src/gui/widgets/chattab.cpp:546
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -5937,24 +5996,24 @@ msgstr ""
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/inputmanager.cpp:328 src/inputmanager.cpp:372 src/keyboardconfig.cpp:90
+#: src/inputmanager.cpp:329 src/inputmanager.cpp:373 src/keyboardconfig.cpp:90
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/inputmanager.cpp:334
+#: src/inputmanager.cpp:335
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/inputmanager.cpp:348
+#: src/inputmanager.cpp:349
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/inputmanager.cpp:378
+#: src/inputmanager.cpp:379
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -5962,7 +6021,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/inputmanager.cpp:392 src/keyboardconfig.cpp:103
+#: src/inputmanager.cpp:393 src/keyboardconfig.cpp:134
 msgid "u key"
 msgstr ""
 
@@ -6638,55 +6697,55 @@ msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:176
+#: src/net/ea/guildhandler.cpp:178
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:179
+#: src/net/ea/guildhandler.cpp:181
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:186
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:187
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:193
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:195
+#: src/net/ea/guildhandler.cpp:197
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:198
+#: src/net/ea/guildhandler.cpp:200
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
@@ -7561,8 +7620,8 @@ msgstr ""
 #. TRANSLATORS: being info default name
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
-#: src/resources/avatardb.cpp:69 src/resources/beinginfo.cpp:40
-#: src/resources/itemdb.cpp:291 src/resources/monsterdb.cpp:100
+#: src/resources/avatardb.cpp:69 src/resources/beinginfo.cpp:41
+#: src/resources/itemdb.cpp:295 src/resources/monsterdb.cpp:100
 msgid "unnamed"
 msgstr "ללא שם"
 
diff --git a/po/hr.po b/po/hr.po
index ae26ded94..39a41ef45 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-07-19 22:23+0300\n"
-"PO-Revision-Date: 2013-07-19 19:52+0000\n"
+"POT-Creation-Date: 2013-08-16 20:45+0300\n"
+"PO-Revision-Date: 2013-08-16 17:53+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/manaplus/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -38,21 +38,21 @@ msgstr ""
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1606 src/gui/whoisonline.cpp:835
+#: src/being.cpp:1713 src/gui/whoisonline.cpp:842
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1611 src/gui/whoisonline.cpp:840
+#: src/being.cpp:1718 src/gui/whoisonline.cpp:847
 msgid "I"
 msgstr ""
 
@@ -89,8 +89,8 @@ msgstr ""
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:1176 src/gui/didyouknowwindow.cpp:78
-#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:66
-#: src/gui/npcdialog.cpp:103 src/gui/popupmenu.cpp:562
+#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:70
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:562
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:81
 msgid "Close"
 msgstr "Zatvori"
@@ -425,36 +425,36 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "Opcije za /%s su \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:465
+#: src/game.cpp:259 src/gui/widgets/chattab.cpp:466
 msgid "General"
 msgstr "Općenito"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: debug window name
 #. TRANSLATORS: full button name
-#: src/game.cpp:272 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:467
+#: src/game.cpp:275 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:468
 #: src/gui/windowmenu.cpp:154
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:536
+#: src/game.cpp:540
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:546
+#: src/game.cpp:550
 msgid "Saving screenshot failed!"
 msgstr "Spremanje screenshot-a nije uspjelo!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:618
+#: src/game.cpp:622
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:621
+#: src/game.cpp:625
 msgid "Network Error"
 msgstr "Mreža Greška"
 
@@ -489,7 +489,7 @@ msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:105
+#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:111
 msgid "Reset"
 msgstr "Poništi"
 
@@ -590,7 +590,7 @@ msgstr "Kupi"
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
 #: src/gui/buydialog.cpp:251 src/gui/buydialog.cpp:531
-#: src/gui/selldialog.cpp:96 src/gui/selldialog.cpp:356
+#: src/gui/selldialog.cpp:97 src/gui/selldialog.cpp:357
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Cijena: %s / Ukupno: %s"
@@ -607,8 +607,8 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/buydialog.cpp:265 src/gui/itemamountwindow.cpp:202
-#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:96
-#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:790
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:100
+#: src/gui/selldialog.cpp:101 src/gui/statuswindow.cpp:791
 msgid "+"
 msgstr ""
 
@@ -619,8 +619,8 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
 #: src/gui/buydialog.cpp:268 src/gui/itemamountwindow.cpp:200
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:98
-#: src/gui/selldialog.cpp:102 src/gui/statuswindow.cpp:803
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:102
+#: src/gui/selldialog.cpp:103 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr ""
 
@@ -628,7 +628,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/buydialog.cpp:271 src/gui/charcreatedialog.cpp:122
-#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1160
+#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1282
 msgid "Create"
 msgstr "Stvori"
 
@@ -640,7 +640,7 @@ msgstr "Stvori"
 #. TRANSLATORS: input action name
 #: src/gui/buydialog.cpp:273 src/gui/quitdialog.cpp:55
 #: src/gui/quitdialog.cpp:60 src/gui/quitdialog.cpp:62
-#: src/gui/selldialog.cpp:106 src/gui/serverdialog.cpp:262
+#: src/gui/selldialog.cpp:107 src/gui/serverdialog.cpp:262
 #: src/gui/setupactiondata.h:177
 msgid "Quit"
 msgstr "Izlaz"
@@ -650,9 +650,9 @@ msgstr "Izlaz"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:108
-#: src/gui/statuswindow.cpp:531 src/gui/statuswindow.cpp:586
-#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:821
+#: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:109
+#: src/gui/statuswindow.cpp:532 src/gui/statuswindow.cpp:587
+#: src/gui/statuswindow.cpp:788 src/gui/statuswindow.cpp:822
 msgid "Max"
 msgstr "Max"
 
@@ -672,7 +672,7 @@ msgstr "Trgovina"
 #. TRANSLATORS: sell dialog button
 #: src/gui/buyselldialog.cpp:69 src/gui/popupmenu.cpp:223
 #: src/gui/popupmenu.cpp:2455 src/gui/selldialog.cpp:54
-#: src/gui/selldialog.cpp:64 src/gui/selldialog.cpp:104
+#: src/gui/selldialog.cpp:64 src/gui/selldialog.cpp:105
 msgid "Sell"
 msgstr "Prodaj"
 
@@ -712,7 +712,7 @@ msgstr "Prodaj"
 #: src/gui/popupmenu.cpp:2309 src/gui/popupmenu.cpp:2543
 #: src/gui/popupmenu.cpp:2660 src/gui/quitdialog.cpp:73
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
-#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1094
+#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1216
 #: src/gui/textcommandeditor.cpp:211 src/gui/textdialog.cpp:53
 #: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:181
 msgid "Cancel"
@@ -996,92 +996,102 @@ msgstr ""
 #. TRANSLATORS: inventory sort mode
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
-#: src/gui/chatwindow.cpp:139 src/gui/inventorywindow.cpp:65
+#: src/gui/chatwindow.cpp:143 src/gui/inventorywindow.cpp:65
 #: src/gui/setup_other.cpp:69 src/gui/setup_visual.cpp:77
 msgid "default"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:141
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:145 src/gui/widgets/colormodel.cpp:76
 msgid "black"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:143
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:147 src/gui/widgets/colormodel.cpp:78
 msgid "red"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:145
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:149 src/gui/widgets/colormodel.cpp:80
 msgid "green"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:147
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:151 src/gui/widgets/colormodel.cpp:82
 msgid "blue"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:149
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:153 src/gui/widgets/colormodel.cpp:84
 msgid "gold"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:151
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:155 src/gui/widgets/colormodel.cpp:86
 msgid "yellow"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:153
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:157 src/gui/widgets/colormodel.cpp:88
 msgid "pink"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:155
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:159 src/gui/widgets/colormodel.cpp:90
 msgid "purple"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:157
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:161 src/gui/widgets/colormodel.cpp:92
 msgid "grey"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:159
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:163 src/gui/widgets/colormodel.cpp:94
 msgid "brown"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:161
+#: src/gui/chatwindow.cpp:165
 msgid "rainbow 1"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:163
+#: src/gui/chatwindow.cpp:167
 msgid "rainbow 2"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:165
+#: src/gui/chatwindow.cpp:169
 msgid "rainbow 3"
 msgstr ""
 
 #. TRANSLATORS: chat window name
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
-#: src/gui/chatwindow.cpp:192 src/gui/setupactiondata.h:1866
+#: src/gui/chatwindow.cpp:196 src/gui/setupactiondata.h:1866
 #: src/gui/setup_chat.cpp:50 src/gui/windowmenu.cpp:88
 msgid "Chat"
 msgstr "Chat"
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:641
+#: src/gui/chatwindow.cpp:684
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1044
+#: src/gui/chatwindow.cpp:1091
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Šaptaj prema %s: %s"
@@ -1390,6 +1400,38 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
+#. TRANSLATORS: font size
+#: src/gui/emotewindow.cpp:49
+msgid "Normal font"
+msgstr ""
+
+#. TRANSLATORS: font size
+#. TRANSLATORS: theme settings label
+#: src/gui/emotewindow.cpp:51 src/gui/setup_theme.cpp:249
+msgid "Bold font"
+msgstr ""
+
+#. TRANSLATORS: emotes window name
+#. TRANSLATORS: emotes tab name
+#. TRANSLATORS: input tab sub tab name
+#: src/gui/emotewindow.cpp:56 src/gui/emotewindow.cpp:107
+#: src/gui/setupactiondata.h:1862
+msgid "Emotes"
+msgstr ""
+
+#. TRANSLATORS: emotes tab name
+#. TRANSLATORS: settings group
+#. TRANSLATORS: settings colors tab name
+#: src/gui/emotewindow.cpp:109 src/gui/setup_chat.cpp:70
+#: src/gui/setup_colors.cpp:83
+msgid "Colors"
+msgstr "Boje"
+
+#. TRANSLATORS: emotes tab name
+#: src/gui/emotewindow.cpp:111
+msgid "Fonts"
+msgstr ""
+
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/equipmentwindow.cpp:56 src/gui/inventorywindow.cpp:204
@@ -1481,7 +1523,7 @@ msgstr "Preuzmi"
 
 #. TRANSLATORS: status window label
 #: src/gui/inventorywindow.cpp:580 src/gui/statuswindow.cpp:143
-#: src/gui/statuswindow.cpp:284 src/gui/statuswindow.cpp:337
+#: src/gui/statuswindow.cpp:285 src/gui/statuswindow.cpp:338
 #: src/gui/widgets/characterdisplay.cpp:126
 #, c-format
 msgid "Money: %s"
@@ -1771,7 +1813,7 @@ msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:295
+#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:296
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
@@ -1779,7 +1821,7 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/ministatuswindow.cpp:317 src/gui/statuswindow.cpp:141
-#: src/gui/statuswindow.cpp:302 src/gui/statuswindow.cpp:373
+#: src/gui/statuswindow.cpp:303 src/gui/statuswindow.cpp:374
 #, c-format
 msgid "Level: %d"
 msgstr "Nivo: %d"
@@ -1796,34 +1838,45 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:62
+#: src/gui/npcdialog.cpp:66
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:64
+#: src/gui/npcdialog.cpp:68
 msgid "Next"
 msgstr "Slijedeći"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:68
+#: src/gui/npcdialog.cpp:72
 msgid "Submit"
 msgstr "Dostavi"
 
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
 #. TRANSLATORS: settings group
-#: src/gui/npcdialog.cpp:77 src/gui/npcpostdialog.cpp:43
+#: src/gui/npcdialog.cpp:81 src/gui/npcpostdialog.cpp:43
 #: src/gui/setup_other.cpp:257
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:566
+#: src/gui/npcdialog.cpp:104 src/gui/popupmenu.cpp:566
 msgid "Clear"
 msgstr ""
 
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: trade window button
+#: src/gui/npcdialog.cpp:109 src/gui/serverdialog.cpp:266
+#: src/gui/shopwindow.cpp:95 src/gui/shopwindow.cpp:102
+#: src/gui/tradewindow.cpp:77
+msgid "Add"
+msgstr "Dodaj"
+
 #. TRANSLATORS: label in npc post dialog
 #: src/gui/npcpostdialog.cpp:53
 msgid "To:"
@@ -2031,7 +2084,7 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: social window button
-#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1164
+#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1286
 msgid "Leave"
 msgstr ""
 
@@ -2165,7 +2218,7 @@ msgstr ""
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2194
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:985
 msgid "(default)"
 msgstr ""
 
@@ -2397,12 +2450,12 @@ msgid "Passwords do not match."
 msgstr "Lozinke se ne podudaraju."
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/selldialog.cpp:242
+#: src/gui/selldialog.cpp:243
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/selldialog.cpp:244
+#: src/gui/selldialog.cpp:245
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
@@ -2413,15 +2466,6 @@ msgid "Choose Your Server"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:266 src/gui/shopwindow.cpp:95
-#: src/gui/shopwindow.cpp:102 src/gui/tradewindow.cpp:77
-msgid "Add"
-msgstr "Dodaj"
-
-#. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
 #: src/gui/serverdialog.cpp:268 src/gui/widgets/setupitem.cpp:303
 #: src/gui/widgets/setupitem.cpp:430
@@ -3157,11 +3201,6 @@ msgid "Windows"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1862
-msgid "Emotes"
-msgstr ""
-
-#. TRANSLATORS: input tab sub tab name
 #: src/gui/setupactiondata.h:1870
 msgid "Gui"
 msgstr ""
@@ -3317,20 +3356,14 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:61
-msgid "Auto hide chat window."
+msgid "Auto hide chat window"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:65
-msgid "Protect chat focus."
+msgid "Protect chat focus"
 msgstr ""
 
-#. TRANSLATORS: settings group
-#. TRANSLATORS: settings colors tab name
-#: src/gui/setup_chat.cpp:70 src/gui/setup_colors.cpp:83
-msgid "Colors"
-msgstr "Boje"
-
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:73
 msgid "Remove colors from received chat messages"
@@ -4423,11 +4456,6 @@ msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:249
-msgid "Bold font"
-msgstr ""
-
-#. TRANSLATORS: theme settings label
 #: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr ""
@@ -4913,258 +4941,289 @@ msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
-#: src/gui/socialwindow.cpp:158 src/gui/socialwindow.cpp:259
+#: src/gui/socialwindow.cpp:176 src/gui/socialwindow.cpp:309
 #: src/gui/widgets/guildchattab.cpp:42 src/net/ea/gui/guildtab.cpp:49
 msgid "Guild"
 msgstr "Ceh"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:213
+#: src/gui/socialwindow.cpp:231
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:245
 msgid "Member Invite to Guild"
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:229
+#: src/gui/socialwindow.cpp:247
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:238
+#: src/gui/socialwindow.cpp:256
 msgid "Leave Guild?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:240
+#: src/gui/socialwindow.cpp:258
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:269
+#, c-format
+msgid "Members: %u/%u"
+msgstr ""
+
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:291 src/gui/socialwindow.cpp:361
+#: src/gui/socialwindow.cpp:483
+#, c-format
+msgid "Players: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/socialwindow.cpp:302 src/net/ea/gui/partytab.cpp:49
+#: src/gui/socialwindow.cpp:376 src/net/ea/gui/partytab.cpp:49
 msgid "Party"
 msgstr "Partija"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:341
+#: src/gui/socialwindow.cpp:415
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
 #. TRANSLATORS: tab in social window
-#: src/gui/socialwindow.cpp:356
+#: src/gui/socialwindow.cpp:430
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:370
+#: src/gui/socialwindow.cpp:444
 msgid "Member Invite to Party"
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:372
+#: src/gui/socialwindow.cpp:446
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:381
+#: src/gui/socialwindow.cpp:455
 msgid "Leave Party?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:383
+#: src/gui/socialwindow.cpp:457
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:681
+#, c-format
+msgid "Visible players: %d"
+msgstr ""
+
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:605
+#: src/gui/socialwindow.cpp:707
 msgid "Nav"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:809
+#, c-format
+msgid "Portals: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:922
+#: src/gui/socialwindow.cpp:1035
 msgid "Atk"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:941
+#: src/gui/socialwindow.cpp:1054
 msgid "Priority mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:943
+#: src/gui/socialwindow.cpp:1056
 msgid "Attack mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:945
+#: src/gui/socialwindow.cpp:1058
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:968
+#: src/gui/socialwindow.cpp:1081
 msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:987
+#: src/gui/socialwindow.cpp:1100
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:989
+#: src/gui/socialwindow.cpp:1102
 msgid "Ignore items"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:1190
+#, c-format
+msgid "Friends: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1091 src/gui/socialwindow.cpp:1563
+#: src/gui/socialwindow.cpp:1213 src/gui/socialwindow.cpp:1687
 msgid "Create Party"
 msgstr ""
 
 #. TRANSLATORS: social window name
 #. TRANSLATORS: full button name
-#: src/gui/socialwindow.cpp:1138 src/gui/windowmenu.cpp:126
+#: src/gui/socialwindow.cpp:1260 src/gui/windowmenu.cpp:126
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1273
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1156
+#: src/gui/socialwindow.cpp:1278
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/socialwindow.cpp:1162
+#: src/gui/socialwindow.cpp:1284
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1345
+#: src/gui/socialwindow.cpp:1469
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1356
+#: src/gui/socialwindow.cpp:1480
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1497
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1424
+#: src/gui/socialwindow.cpp:1548
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1445
+#: src/gui/socialwindow.cpp:1569
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1460
+#: src/gui/socialwindow.cpp:1584
 msgid "Guild Name"
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1462
+#: src/gui/socialwindow.cpp:1586
 msgid "Choose your guild's name."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1477
+#: src/gui/socialwindow.cpp:1601
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1485
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1616
 msgid "Accept Guild Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1631
 msgid "Received party request, but one already exists."
 msgstr "Primljen zahtjev za partiju, ali ona već postoji."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1519
+#: src/gui/socialwindow.cpp:1643
 msgid "You have been invited you to join a party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1524
+#: src/gui/socialwindow.cpp:1648
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1533
+#: src/gui/socialwindow.cpp:1657
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s vas je pozvao/la da se pridružite njihovoj partiji."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1539
+#: src/gui/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s vas je pozvao/la da se pridružite %s partiji."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1673
 msgid "Accept Party Invite"
 msgstr "Prihvati Pozivnicu za Partiju"
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1688
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1694
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1572
+#: src/gui/socialwindow.cpp:1696
 msgid "Choose your party's name."
 msgstr ""
 
@@ -5184,24 +5243,24 @@ msgid "MP:"
 msgstr "MP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:235 src/gui/statuswindow.cpp:423
+#: src/gui/statuswindow.cpp:234 src/gui/statuswindow.cpp:424
 #, c-format
 msgid "Job: %d"
 msgstr "Zadatak: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:237
+#: src/gui/statuswindow.cpp:236
 msgid "Job:"
 msgstr "Zadatak:"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:288 src/gui/statuswindow.cpp:345
+#: src/gui/statuswindow.cpp:289 src/gui/statuswindow.cpp:346
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:360
+#: src/gui/statuswindow.cpp:361
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
@@ -5647,13 +5706,13 @@ msgid "%s whispers: %s"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:540
+#: src/gui/widgets/chattab.cpp:541
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:545
+#: src/gui/widgets/chattab.cpp:546
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -5939,24 +5998,24 @@ msgstr ""
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/inputmanager.cpp:328 src/inputmanager.cpp:372 src/keyboardconfig.cpp:90
+#: src/inputmanager.cpp:329 src/inputmanager.cpp:373 src/keyboardconfig.cpp:90
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/inputmanager.cpp:334
+#: src/inputmanager.cpp:335
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/inputmanager.cpp:348
+#: src/inputmanager.cpp:349
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/inputmanager.cpp:378
+#: src/inputmanager.cpp:379
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -5964,7 +6023,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/inputmanager.cpp:392 src/keyboardconfig.cpp:103
+#: src/inputmanager.cpp:393 src/keyboardconfig.cpp:134
 msgid "u key"
 msgstr ""
 
@@ -6641,55 +6700,55 @@ msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:176
+#: src/net/ea/guildhandler.cpp:178
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:179
+#: src/net/ea/guildhandler.cpp:181
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:186
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:187
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:193
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:195
+#: src/net/ea/guildhandler.cpp:197
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:198
+#: src/net/ea/guildhandler.cpp:200
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
@@ -7564,8 +7623,8 @@ msgstr ""
 #. TRANSLATORS: being info default name
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
-#: src/resources/avatardb.cpp:69 src/resources/beinginfo.cpp:40
-#: src/resources/itemdb.cpp:291 src/resources/monsterdb.cpp:100
+#: src/resources/avatardb.cpp:69 src/resources/beinginfo.cpp:41
+#: src/resources/itemdb.cpp:295 src/resources/monsterdb.cpp:100
 msgid "unnamed"
 msgstr "neimenovano"
 
diff --git a/po/hu.po b/po/hu.po
index 7724995d3..55d56b7c0 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-07-19 22:23+0300\n"
-"PO-Revision-Date: 2013-07-19 19:52+0000\n"
+"POT-Creation-Date: 2013-08-16 20:45+0300\n"
+"PO-Revision-Date: 2013-08-16 17:53+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Hungarian (http://www.transifex.com/projects/p/manaplus/language/hu/)\n"
 "MIME-Version: 1.0\n"
@@ -38,21 +38,21 @@ msgstr ""
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1606 src/gui/whoisonline.cpp:835
+#: src/being.cpp:1713 src/gui/whoisonline.cpp:842
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1611 src/gui/whoisonline.cpp:840
+#: src/being.cpp:1718 src/gui/whoisonline.cpp:847
 msgid "I"
 msgstr ""
 
@@ -89,8 +89,8 @@ msgstr ""
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:1176 src/gui/didyouknowwindow.cpp:78
-#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:66
-#: src/gui/npcdialog.cpp:103 src/gui/popupmenu.cpp:562
+#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:70
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:562
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:81
 msgid "Close"
 msgstr "Bezár"
@@ -425,36 +425,36 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "Lehetőségek a /%s parancshoz: \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:465
+#: src/game.cpp:259 src/gui/widgets/chattab.cpp:466
 msgid "General"
 msgstr "Általános"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: debug window name
 #. TRANSLATORS: full button name
-#: src/game.cpp:272 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:467
+#: src/game.cpp:275 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:468
 #: src/gui/windowmenu.cpp:154
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:536
+#: src/game.cpp:540
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:546
+#: src/game.cpp:550
 msgid "Saving screenshot failed!"
 msgstr "Hiba a képernyő mentése során!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:618
+#: src/game.cpp:622
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:621
+#: src/game.cpp:625
 msgid "Network Error"
 msgstr "Hálózati hiba"
 
@@ -489,7 +489,7 @@ msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:105
+#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:111
 msgid "Reset"
 msgstr "Alaphelyzet"
 
@@ -590,7 +590,7 @@ msgstr "Vétel"
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
 #: src/gui/buydialog.cpp:251 src/gui/buydialog.cpp:531
-#: src/gui/selldialog.cpp:96 src/gui/selldialog.cpp:356
+#: src/gui/selldialog.cpp:97 src/gui/selldialog.cpp:357
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Ár: %s / Teljes: %s"
@@ -607,8 +607,8 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/buydialog.cpp:265 src/gui/itemamountwindow.cpp:202
-#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:96
-#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:790
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:100
+#: src/gui/selldialog.cpp:101 src/gui/statuswindow.cpp:791
 msgid "+"
 msgstr ""
 
@@ -619,8 +619,8 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
 #: src/gui/buydialog.cpp:268 src/gui/itemamountwindow.cpp:200
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:98
-#: src/gui/selldialog.cpp:102 src/gui/statuswindow.cpp:803
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:102
+#: src/gui/selldialog.cpp:103 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr ""
 
@@ -628,7 +628,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/buydialog.cpp:271 src/gui/charcreatedialog.cpp:122
-#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1160
+#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1282
 msgid "Create"
 msgstr "Létrehozás"
 
@@ -640,7 +640,7 @@ msgstr "Létrehozás"
 #. TRANSLATORS: input action name
 #: src/gui/buydialog.cpp:273 src/gui/quitdialog.cpp:55
 #: src/gui/quitdialog.cpp:60 src/gui/quitdialog.cpp:62
-#: src/gui/selldialog.cpp:106 src/gui/serverdialog.cpp:262
+#: src/gui/selldialog.cpp:107 src/gui/serverdialog.cpp:262
 #: src/gui/setupactiondata.h:177
 msgid "Quit"
 msgstr "Kilépés"
@@ -650,9 +650,9 @@ msgstr "Kilépés"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:108
-#: src/gui/statuswindow.cpp:531 src/gui/statuswindow.cpp:586
-#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:821
+#: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:109
+#: src/gui/statuswindow.cpp:532 src/gui/statuswindow.cpp:587
+#: src/gui/statuswindow.cpp:788 src/gui/statuswindow.cpp:822
 msgid "Max"
 msgstr "Max."
 
@@ -672,7 +672,7 @@ msgstr "Üzlet"
 #. TRANSLATORS: sell dialog button
 #: src/gui/buyselldialog.cpp:69 src/gui/popupmenu.cpp:223
 #: src/gui/popupmenu.cpp:2455 src/gui/selldialog.cpp:54
-#: src/gui/selldialog.cpp:64 src/gui/selldialog.cpp:104
+#: src/gui/selldialog.cpp:64 src/gui/selldialog.cpp:105
 msgid "Sell"
 msgstr "Eladás"
 
@@ -712,7 +712,7 @@ msgstr "Eladás"
 #: src/gui/popupmenu.cpp:2309 src/gui/popupmenu.cpp:2543
 #: src/gui/popupmenu.cpp:2660 src/gui/quitdialog.cpp:73
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
-#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1094
+#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1216
 #: src/gui/textcommandeditor.cpp:211 src/gui/textdialog.cpp:53
 #: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:181
 msgid "Cancel"
@@ -996,92 +996,102 @@ msgstr ""
 #. TRANSLATORS: inventory sort mode
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
-#: src/gui/chatwindow.cpp:139 src/gui/inventorywindow.cpp:65
+#: src/gui/chatwindow.cpp:143 src/gui/inventorywindow.cpp:65
 #: src/gui/setup_other.cpp:69 src/gui/setup_visual.cpp:77
 msgid "default"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:141
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:145 src/gui/widgets/colormodel.cpp:76
 msgid "black"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:143
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:147 src/gui/widgets/colormodel.cpp:78
 msgid "red"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:145
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:149 src/gui/widgets/colormodel.cpp:80
 msgid "green"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:147
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:151 src/gui/widgets/colormodel.cpp:82
 msgid "blue"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:149
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:153 src/gui/widgets/colormodel.cpp:84
 msgid "gold"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:151
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:155 src/gui/widgets/colormodel.cpp:86
 msgid "yellow"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:153
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:157 src/gui/widgets/colormodel.cpp:88
 msgid "pink"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:155
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:159 src/gui/widgets/colormodel.cpp:90
 msgid "purple"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:157
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:161 src/gui/widgets/colormodel.cpp:92
 msgid "grey"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:159
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:163 src/gui/widgets/colormodel.cpp:94
 msgid "brown"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:161
+#: src/gui/chatwindow.cpp:165
 msgid "rainbow 1"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:163
+#: src/gui/chatwindow.cpp:167
 msgid "rainbow 2"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:165
+#: src/gui/chatwindow.cpp:169
 msgid "rainbow 3"
 msgstr ""
 
 #. TRANSLATORS: chat window name
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
-#: src/gui/chatwindow.cpp:192 src/gui/setupactiondata.h:1866
+#: src/gui/chatwindow.cpp:196 src/gui/setupactiondata.h:1866
 #: src/gui/setup_chat.cpp:50 src/gui/windowmenu.cpp:88
 msgid "Chat"
 msgstr "Chat"
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:641
+#: src/gui/chatwindow.cpp:684
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1044
+#: src/gui/chatwindow.cpp:1091
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Üzenet %s számára: %s"
@@ -1390,6 +1400,38 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
+#. TRANSLATORS: font size
+#: src/gui/emotewindow.cpp:49
+msgid "Normal font"
+msgstr ""
+
+#. TRANSLATORS: font size
+#. TRANSLATORS: theme settings label
+#: src/gui/emotewindow.cpp:51 src/gui/setup_theme.cpp:249
+msgid "Bold font"
+msgstr ""
+
+#. TRANSLATORS: emotes window name
+#. TRANSLATORS: emotes tab name
+#. TRANSLATORS: input tab sub tab name
+#: src/gui/emotewindow.cpp:56 src/gui/emotewindow.cpp:107
+#: src/gui/setupactiondata.h:1862
+msgid "Emotes"
+msgstr ""
+
+#. TRANSLATORS: emotes tab name
+#. TRANSLATORS: settings group
+#. TRANSLATORS: settings colors tab name
+#: src/gui/emotewindow.cpp:109 src/gui/setup_chat.cpp:70
+#: src/gui/setup_colors.cpp:83
+msgid "Colors"
+msgstr "Színek"
+
+#. TRANSLATORS: emotes tab name
+#: src/gui/emotewindow.cpp:111
+msgid "Fonts"
+msgstr ""
+
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/equipmentwindow.cpp:56 src/gui/inventorywindow.cpp:204
@@ -1481,7 +1523,7 @@ msgstr "Magához vesz"
 
 #. TRANSLATORS: status window label
 #: src/gui/inventorywindow.cpp:580 src/gui/statuswindow.cpp:143
-#: src/gui/statuswindow.cpp:284 src/gui/statuswindow.cpp:337
+#: src/gui/statuswindow.cpp:285 src/gui/statuswindow.cpp:338
 #: src/gui/widgets/characterdisplay.cpp:126
 #, c-format
 msgid "Money: %s"
@@ -1769,7 +1811,7 @@ msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:295
+#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:296
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
@@ -1777,7 +1819,7 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/ministatuswindow.cpp:317 src/gui/statuswindow.cpp:141
-#: src/gui/statuswindow.cpp:302 src/gui/statuswindow.cpp:373
+#: src/gui/statuswindow.cpp:303 src/gui/statuswindow.cpp:374
 #, c-format
 msgid "Level: %d"
 msgstr "Szint: %d"
@@ -1794,34 +1836,45 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:62
+#: src/gui/npcdialog.cpp:66
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:64
+#: src/gui/npcdialog.cpp:68
 msgid "Next"
 msgstr "Következő"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:68
+#: src/gui/npcdialog.cpp:72
 msgid "Submit"
 msgstr "Küldés"
 
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
 #. TRANSLATORS: settings group
-#: src/gui/npcdialog.cpp:77 src/gui/npcpostdialog.cpp:43
+#: src/gui/npcdialog.cpp:81 src/gui/npcpostdialog.cpp:43
 #: src/gui/setup_other.cpp:257
 msgid "NPC"
 msgstr "Gépjátékos"
 
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:566
+#: src/gui/npcdialog.cpp:104 src/gui/popupmenu.cpp:566
 msgid "Clear"
 msgstr ""
 
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: trade window button
+#: src/gui/npcdialog.cpp:109 src/gui/serverdialog.cpp:266
+#: src/gui/shopwindow.cpp:95 src/gui/shopwindow.cpp:102
+#: src/gui/tradewindow.cpp:77
+msgid "Add"
+msgstr "Hozzáad"
+
 #. TRANSLATORS: label in npc post dialog
 #: src/gui/npcpostdialog.cpp:53
 msgid "To:"
@@ -2029,7 +2082,7 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: social window button
-#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1164
+#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1286
 msgid "Leave"
 msgstr ""
 
@@ -2163,7 +2216,7 @@ msgstr ""
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2194
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:985
 msgid "(default)"
 msgstr ""
 
@@ -2395,12 +2448,12 @@ msgid "Passwords do not match."
 msgstr "A jelszavak nem egyeznek."
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/selldialog.cpp:242
+#: src/gui/selldialog.cpp:243
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/selldialog.cpp:244
+#: src/gui/selldialog.cpp:245
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
@@ -2411,15 +2464,6 @@ msgid "Choose Your Server"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:266 src/gui/shopwindow.cpp:95
-#: src/gui/shopwindow.cpp:102 src/gui/tradewindow.cpp:77
-msgid "Add"
-msgstr "Hozzáad"
-
-#. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
 #: src/gui/serverdialog.cpp:268 src/gui/widgets/setupitem.cpp:303
 #: src/gui/widgets/setupitem.cpp:430
@@ -3155,11 +3199,6 @@ msgid "Windows"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1862
-msgid "Emotes"
-msgstr ""
-
-#. TRANSLATORS: input tab sub tab name
 #: src/gui/setupactiondata.h:1870
 msgid "Gui"
 msgstr ""
@@ -3315,20 +3354,14 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:61
-msgid "Auto hide chat window."
+msgid "Auto hide chat window"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:65
-msgid "Protect chat focus."
+msgid "Protect chat focus"
 msgstr ""
 
-#. TRANSLATORS: settings group
-#. TRANSLATORS: settings colors tab name
-#: src/gui/setup_chat.cpp:70 src/gui/setup_colors.cpp:83
-msgid "Colors"
-msgstr "Színek"
-
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:73
 msgid "Remove colors from received chat messages"
@@ -4421,11 +4454,6 @@ msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:249
-msgid "Bold font"
-msgstr ""
-
-#. TRANSLATORS: theme settings label
 #: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr ""
@@ -4911,258 +4939,289 @@ msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
-#: src/gui/socialwindow.cpp:158 src/gui/socialwindow.cpp:259
+#: src/gui/socialwindow.cpp:176 src/gui/socialwindow.cpp:309
 #: src/gui/widgets/guildchattab.cpp:42 src/net/ea/gui/guildtab.cpp:49
 msgid "Guild"
 msgstr "Klán"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:213
+#: src/gui/socialwindow.cpp:231
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:245
 msgid "Member Invite to Guild"
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:229
+#: src/gui/socialwindow.cpp:247
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:238
+#: src/gui/socialwindow.cpp:256
 msgid "Leave Guild?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:240
+#: src/gui/socialwindow.cpp:258
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:269
+#, c-format
+msgid "Members: %u/%u"
+msgstr ""
+
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:291 src/gui/socialwindow.cpp:361
+#: src/gui/socialwindow.cpp:483
+#, c-format
+msgid "Players: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/socialwindow.cpp:302 src/net/ea/gui/partytab.cpp:49
+#: src/gui/socialwindow.cpp:376 src/net/ea/gui/partytab.cpp:49
 msgid "Party"
 msgstr "Csapat"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:341
+#: src/gui/socialwindow.cpp:415
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
 #. TRANSLATORS: tab in social window
-#: src/gui/socialwindow.cpp:356
+#: src/gui/socialwindow.cpp:430
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:370
+#: src/gui/socialwindow.cpp:444
 msgid "Member Invite to Party"
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:372
+#: src/gui/socialwindow.cpp:446
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:381
+#: src/gui/socialwindow.cpp:455
 msgid "Leave Party?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:383
+#: src/gui/socialwindow.cpp:457
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:681
+#, c-format
+msgid "Visible players: %d"
+msgstr ""
+
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:605
+#: src/gui/socialwindow.cpp:707
 msgid "Nav"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:809
+#, c-format
+msgid "Portals: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:922
+#: src/gui/socialwindow.cpp:1035
 msgid "Atk"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:941
+#: src/gui/socialwindow.cpp:1054
 msgid "Priority mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:943
+#: src/gui/socialwindow.cpp:1056
 msgid "Attack mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:945
+#: src/gui/socialwindow.cpp:1058
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:968
+#: src/gui/socialwindow.cpp:1081
 msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:987
+#: src/gui/socialwindow.cpp:1100
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:989
+#: src/gui/socialwindow.cpp:1102
 msgid "Ignore items"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:1190
+#, c-format
+msgid "Friends: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1091 src/gui/socialwindow.cpp:1563
+#: src/gui/socialwindow.cpp:1213 src/gui/socialwindow.cpp:1687
 msgid "Create Party"
 msgstr ""
 
 #. TRANSLATORS: social window name
 #. TRANSLATORS: full button name
-#: src/gui/socialwindow.cpp:1138 src/gui/windowmenu.cpp:126
+#: src/gui/socialwindow.cpp:1260 src/gui/windowmenu.cpp:126
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1273
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1156
+#: src/gui/socialwindow.cpp:1278
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/socialwindow.cpp:1162
+#: src/gui/socialwindow.cpp:1284
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1345
+#: src/gui/socialwindow.cpp:1469
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1356
+#: src/gui/socialwindow.cpp:1480
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1497
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1424
+#: src/gui/socialwindow.cpp:1548
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1445
+#: src/gui/socialwindow.cpp:1569
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1460
+#: src/gui/socialwindow.cpp:1584
 msgid "Guild Name"
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1462
+#: src/gui/socialwindow.cpp:1586
 msgid "Choose your guild's name."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1477
+#: src/gui/socialwindow.cpp:1601
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1485
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1616
 msgid "Accept Guild Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1631
 msgid "Received party request, but one already exists."
 msgstr "Csapatba hívtak, de neked van csapatod."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1519
+#: src/gui/socialwindow.cpp:1643
 msgid "You have been invited you to join a party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1524
+#: src/gui/socialwindow.cpp:1648
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1533
+#: src/gui/socialwindow.cpp:1657
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s a csapatába hívott."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1539
+#: src/gui/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s behívott %s csapatába."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1673
 msgid "Accept Party Invite"
 msgstr "Ajánlat elfogadása"
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1688
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1694
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1572
+#: src/gui/socialwindow.cpp:1696
 msgid "Choose your party's name."
 msgstr ""
 
@@ -5182,24 +5241,24 @@ msgid "MP:"
 msgstr "Varázserő:"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:235 src/gui/statuswindow.cpp:423
+#: src/gui/statuswindow.cpp:234 src/gui/statuswindow.cpp:424
 #, c-format
 msgid "Job: %d"
 msgstr "Munka: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:237
+#: src/gui/statuswindow.cpp:236
 msgid "Job:"
 msgstr "Munka:"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:288 src/gui/statuswindow.cpp:345
+#: src/gui/statuswindow.cpp:289 src/gui/statuswindow.cpp:346
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:360
+#: src/gui/statuswindow.cpp:361
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
@@ -5645,13 +5704,13 @@ msgid "%s whispers: %s"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:540
+#: src/gui/widgets/chattab.cpp:541
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:545
+#: src/gui/widgets/chattab.cpp:546
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -5937,24 +5996,24 @@ msgstr ""
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/inputmanager.cpp:328 src/inputmanager.cpp:372 src/keyboardconfig.cpp:90
+#: src/inputmanager.cpp:329 src/inputmanager.cpp:373 src/keyboardconfig.cpp:90
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/inputmanager.cpp:334
+#: src/inputmanager.cpp:335
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/inputmanager.cpp:348
+#: src/inputmanager.cpp:349
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/inputmanager.cpp:378
+#: src/inputmanager.cpp:379
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -5962,7 +6021,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/inputmanager.cpp:392 src/keyboardconfig.cpp:103
+#: src/inputmanager.cpp:393 src/keyboardconfig.cpp:134
 msgid "u key"
 msgstr ""
 
@@ -6638,55 +6697,55 @@ msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:176
+#: src/net/ea/guildhandler.cpp:178
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:179
+#: src/net/ea/guildhandler.cpp:181
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:186
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:187
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:193
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:195
+#: src/net/ea/guildhandler.cpp:197
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:198
+#: src/net/ea/guildhandler.cpp:200
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
@@ -7561,8 +7620,8 @@ msgstr ""
 #. TRANSLATORS: being info default name
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
-#: src/resources/avatardb.cpp:69 src/resources/beinginfo.cpp:40
-#: src/resources/itemdb.cpp:291 src/resources/monsterdb.cpp:100
+#: src/resources/avatardb.cpp:69 src/resources/beinginfo.cpp:41
+#: src/resources/itemdb.cpp:295 src/resources/monsterdb.cpp:100
 msgid "unnamed"
 msgstr "Névtelen"
 
diff --git a/po/id.po b/po/id.po
index d61872aaf..9932a0b28 100644
--- a/po/id.po
+++ b/po/id.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-08-03 13:52+0300\n"
-"PO-Revision-Date: 2013-07-19 19:52+0000\n"
+"POT-Creation-Date: 2013-08-17 13:35+0300\n"
+"PO-Revision-Date: 2013-08-16 17:53+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/manaplus/"
 "language/id/)\n"
@@ -41,21 +41,21 @@ msgstr "Terlihat di peta"
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "dodge"
 msgstr "Menghindar"
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "miss"
 msgstr "Luput"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1710 src/gui/whoisonline.cpp:835
+#: src/being.cpp:1713 src/gui/whoisonline.cpp:842
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1715 src/gui/whoisonline.cpp:840
+#: src/being.cpp:1718 src/gui/whoisonline.cpp:847
 msgid "I"
 msgstr "l"
 
@@ -92,8 +92,8 @@ msgstr "Tema"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:1176 src/gui/didyouknowwindow.cpp:78
-#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:66
-#: src/gui/npcdialog.cpp:103 src/gui/popupmenu.cpp:562
+#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:70
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:562
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:81
 msgid "Close"
 msgstr "Tutup"
@@ -431,14 +431,14 @@ msgstr ""
 "Pilihan untuk /%s adalah \"ya\", \"tidak\", \"benar\",\"salah\", \"1\",\"0\"."
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:259 src/gui/widgets/chattab.cpp:465
+#: src/game.cpp:259 src/gui/widgets/chattab.cpp:466
 msgid "General"
 msgstr "Umum"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: debug window name
 #. TRANSLATORS: full button name
-#: src/game.cpp:275 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:467
+#: src/game.cpp:275 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:468
 #: src/gui/windowmenu.cpp:154
 msgid "Debug"
 msgstr "Debug"
@@ -495,7 +495,7 @@ msgstr "Pengecek Bot"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:105
+#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:111
 msgid "Reset"
 msgstr "Reset"
 
@@ -613,8 +613,8 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/buydialog.cpp:265 src/gui/itemamountwindow.cpp:202
-#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:96
-#: src/gui/selldialog.cpp:101 src/gui/statuswindow.cpp:790
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:100
+#: src/gui/selldialog.cpp:101 src/gui/statuswindow.cpp:791
 msgid "+"
 msgstr "+"
 
@@ -625,8 +625,8 @@ msgstr "+"
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
 #: src/gui/buydialog.cpp:268 src/gui/itemamountwindow.cpp:200
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:98
-#: src/gui/selldialog.cpp:103 src/gui/statuswindow.cpp:803
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:102
+#: src/gui/selldialog.cpp:103 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr "-"
 
@@ -634,7 +634,7 @@ msgstr "-"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/buydialog.cpp:271 src/gui/charcreatedialog.cpp:122
-#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1160
+#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1282
 msgid "Create"
 msgstr "Buat"
 
@@ -657,8 +657,8 @@ msgstr "Keluar"
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
 #: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:109
-#: src/gui/statuswindow.cpp:531 src/gui/statuswindow.cpp:586
-#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:821
+#: src/gui/statuswindow.cpp:532 src/gui/statuswindow.cpp:587
+#: src/gui/statuswindow.cpp:788 src/gui/statuswindow.cpp:822
 msgid "Max"
 msgstr "Max"
 
@@ -718,7 +718,7 @@ msgstr "Jual"
 #: src/gui/popupmenu.cpp:2309 src/gui/popupmenu.cpp:2543
 #: src/gui/popupmenu.cpp:2660 src/gui/quitdialog.cpp:73
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
-#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1094
+#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1216
 #: src/gui/textcommandeditor.cpp:211 src/gui/textdialog.cpp:53
 #: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:181
 msgid "Cancel"
@@ -1002,92 +1002,102 @@ msgstr "Masukkan sandi"
 #. TRANSLATORS: inventory sort mode
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
-#: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:65
+#: src/gui/chatwindow.cpp:143 src/gui/inventorywindow.cpp:65
 #: src/gui/setup_other.cpp:69 src/gui/setup_visual.cpp:77
 msgid "default"
 msgstr "kembalikan ke semula"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:144
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:145 src/gui/widgets/colormodel.cpp:76
 msgid "black"
 msgstr "hitam"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:146
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:147 src/gui/widgets/colormodel.cpp:78
 msgid "red"
 msgstr "merah"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:148
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:149 src/gui/widgets/colormodel.cpp:80
 msgid "green"
 msgstr "hijau"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:150
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:151 src/gui/widgets/colormodel.cpp:82
 msgid "blue"
 msgstr "biru"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:152
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:153 src/gui/widgets/colormodel.cpp:84
 msgid "gold"
 msgstr "emas"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:154
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:155 src/gui/widgets/colormodel.cpp:86
 msgid "yellow"
 msgstr "kuning"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:156
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:157 src/gui/widgets/colormodel.cpp:88
 msgid "pink"
 msgstr "merah muda"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:158
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:159 src/gui/widgets/colormodel.cpp:90
 msgid "purple"
 msgstr "ungu"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:160
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:161 src/gui/widgets/colormodel.cpp:92
 msgid "grey"
 msgstr "abu-abu"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:162
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:163 src/gui/widgets/colormodel.cpp:94
 msgid "brown"
 msgstr "coklat"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:164
+#: src/gui/chatwindow.cpp:165
 msgid "rainbow 1"
 msgstr "pelangi 1"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:166
+#: src/gui/chatwindow.cpp:167
 msgid "rainbow 2"
 msgstr "pelangi 2"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:168
+#: src/gui/chatwindow.cpp:169
 msgid "rainbow 3"
 msgstr "pelangi 3"
 
 #. TRANSLATORS: chat window name
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
-#: src/gui/chatwindow.cpp:195 src/gui/setupactiondata.h:1866
+#: src/gui/chatwindow.cpp:196 src/gui/setupactiondata.h:1866
 #: src/gui/setup_chat.cpp:50 src/gui/windowmenu.cpp:88
 msgid "Chat"
 msgstr "Obrolan"
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:659
+#: src/gui/chatwindow.cpp:684
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Kehadiran: %s; %d pemain yang hadir."
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1066
+#: src/gui/chatwindow.cpp:1091
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Berbisik ke %s: %s"
@@ -1396,14 +1406,38 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
+#. TRANSLATORS: font size
+#: src/gui/emotewindow.cpp:49
+msgid "Normal font"
+msgstr ""
+
+#. TRANSLATORS: font size
+#. TRANSLATORS: theme settings label
+#: src/gui/emotewindow.cpp:51 src/gui/setup_theme.cpp:249
+msgid "Bold font"
+msgstr "Jenis huruf tebal"
+
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/emotewindow.cpp:41 src/gui/emotewindow.cpp:61
+#: src/gui/emotewindow.cpp:56 src/gui/emotewindow.cpp:107
 #: src/gui/setupactiondata.h:1862
 msgid "Emotes"
 msgstr ""
 
+#. TRANSLATORS: emotes tab name
+#. TRANSLATORS: settings group
+#. TRANSLATORS: settings colors tab name
+#: src/gui/emotewindow.cpp:109 src/gui/setup_chat.cpp:70
+#: src/gui/setup_colors.cpp:83
+msgid "Colors"
+msgstr "Warna"
+
+#. TRANSLATORS: emotes tab name
+#: src/gui/emotewindow.cpp:111
+msgid "Fonts"
+msgstr ""
+
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/equipmentwindow.cpp:56 src/gui/inventorywindow.cpp:204
@@ -1495,7 +1529,7 @@ msgstr "Kembalikan"
 
 #. TRANSLATORS: status window label
 #: src/gui/inventorywindow.cpp:580 src/gui/statuswindow.cpp:143
-#: src/gui/statuswindow.cpp:284 src/gui/statuswindow.cpp:337
+#: src/gui/statuswindow.cpp:285 src/gui/statuswindow.cpp:338
 #: src/gui/widgets/characterdisplay.cpp:126
 #, c-format
 msgid "Money: %s"
@@ -1781,7 +1815,7 @@ msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:295
+#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:296
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
@@ -1789,7 +1823,7 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/ministatuswindow.cpp:317 src/gui/statuswindow.cpp:141
-#: src/gui/statuswindow.cpp:302 src/gui/statuswindow.cpp:373
+#: src/gui/statuswindow.cpp:303 src/gui/statuswindow.cpp:374
 #, c-format
 msgid "Level: %d"
 msgstr "Tingkatan: %d"
@@ -1806,34 +1840,45 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:62
+#: src/gui/npcdialog.cpp:66
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:64
+#: src/gui/npcdialog.cpp:68
 msgid "Next"
 msgstr "Berikutnya"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:68
+#: src/gui/npcdialog.cpp:72
 msgid "Submit"
 msgstr "Masukan"
 
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
 #. TRANSLATORS: settings group
-#: src/gui/npcdialog.cpp:77 src/gui/npcpostdialog.cpp:43
+#: src/gui/npcdialog.cpp:81 src/gui/npcpostdialog.cpp:43
 #: src/gui/setup_other.cpp:257
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:566
+#: src/gui/npcdialog.cpp:104 src/gui/popupmenu.cpp:566
 msgid "Clear"
 msgstr "Hapus"
 
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: trade window button
+#: src/gui/npcdialog.cpp:109 src/gui/serverdialog.cpp:266
+#: src/gui/shopwindow.cpp:95 src/gui/shopwindow.cpp:102
+#: src/gui/tradewindow.cpp:77
+msgid "Add"
+msgstr "Tambah"
+
 #. TRANSLATORS: label in npc post dialog
 #: src/gui/npcpostdialog.cpp:53
 msgid "To:"
@@ -2041,7 +2086,7 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: social window button
-#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1164
+#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1286
 msgid "Leave"
 msgstr ""
 
@@ -2175,7 +2220,7 @@ msgstr "Pindahkan ke chat"
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2194
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:985
 msgid "(default)"
 msgstr "(kembalikan)"
 
@@ -2423,15 +2468,6 @@ msgid "Choose Your Server"
 msgstr "Pilih Server Anda"
 
 #. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:266 src/gui/shopwindow.cpp:95
-#: src/gui/shopwindow.cpp:102 src/gui/tradewindow.cpp:77
-msgid "Add"
-msgstr "Tambah"
-
-#. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
 #: src/gui/serverdialog.cpp:268 src/gui/widgets/setupitem.cpp:303
 #: src/gui/widgets/setupitem.cpp:430
@@ -3322,20 +3358,14 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:61
-msgid "Auto hide chat window."
+msgid "Auto hide chat window"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:65
-msgid "Protect chat focus."
+msgid "Protect chat focus"
 msgstr ""
 
-#. TRANSLATORS: settings group
-#. TRANSLATORS: settings colors tab name
-#: src/gui/setup_chat.cpp:70 src/gui/setup_colors.cpp:83
-msgid "Colors"
-msgstr "Warna"
-
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:73
 msgid "Remove colors from received chat messages"
@@ -4428,11 +4458,6 @@ msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:249
-msgid "Bold font"
-msgstr "Jenis huruf tebal"
-
-#. TRANSLATORS: theme settings label
 #: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr ""
@@ -4918,258 +4943,289 @@ msgstr "Level: %d"
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
-#: src/gui/socialwindow.cpp:158 src/gui/socialwindow.cpp:259
+#: src/gui/socialwindow.cpp:176 src/gui/socialwindow.cpp:309
 #: src/gui/widgets/guildchattab.cpp:42 src/net/ea/gui/guildtab.cpp:49
 msgid "Guild"
 msgstr "Organisasi"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Pengguna yang diajak %s ke organisasi %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:213
+#: src/gui/socialwindow.cpp:231
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Permintaan %s keluar dari Organisasi "
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:245
 msgid "Member Invite to Guild"
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:229
+#: src/gui/socialwindow.cpp:247
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:238
+#: src/gui/socialwindow.cpp:256
 msgid "Leave Guild?"
 msgstr "Tinggalkan organisasi?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:240
+#: src/gui/socialwindow.cpp:258
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Apakah anda yakin ingin meninggalkan organisasi %s?"
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:269
+#, c-format
+msgid "Members: %u/%u"
+msgstr ""
+
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:291 src/gui/socialwindow.cpp:361
+#: src/gui/socialwindow.cpp:483
+#, c-format
+msgid "Players: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/socialwindow.cpp:302 src/net/ea/gui/partytab.cpp:49
+#: src/gui/socialwindow.cpp:376 src/net/ea/gui/partytab.cpp:49
 msgid "Party"
 msgstr "Kelompok"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:341
+#: src/gui/socialwindow.cpp:415
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Pengguna yang diajak %s ke kelompok"
 
 #. TRANSLATORS: tab in social window
-#: src/gui/socialwindow.cpp:356
+#: src/gui/socialwindow.cpp:430
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:370
+#: src/gui/socialwindow.cpp:444
 msgid "Member Invite to Party"
 msgstr "Mengundang pengguna ke kelompok"
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:372
+#: src/gui/socialwindow.cpp:446
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:381
+#: src/gui/socialwindow.cpp:455
 msgid "Leave Party?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:383
+#: src/gui/socialwindow.cpp:457
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:681
+#, c-format
+msgid "Visible players: %d"
+msgstr ""
+
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:605
+#: src/gui/socialwindow.cpp:707
 msgid "Nav"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:809
+#, c-format
+msgid "Portals: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:922
+#: src/gui/socialwindow.cpp:1035
 msgid "Atk"
 msgstr "Sedang meninggalkan keyboard"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:941
+#: src/gui/socialwindow.cpp:1054
 msgid "Priority mobs"
 msgstr "mob prioritas"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:943
+#: src/gui/socialwindow.cpp:1056
 msgid "Attack mobs"
 msgstr "serang mob"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:945
+#: src/gui/socialwindow.cpp:1058
 msgid "Ignore mobs"
 msgstr "Abaikan mobs"
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:968
+#: src/gui/socialwindow.cpp:1081
 msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:987
+#: src/gui/socialwindow.cpp:1100
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:989
+#: src/gui/socialwindow.cpp:1102
 msgid "Ignore items"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:1190
+#, c-format
+msgid "Friends: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1091 src/gui/socialwindow.cpp:1563
+#: src/gui/socialwindow.cpp:1213 src/gui/socialwindow.cpp:1687
 msgid "Create Party"
 msgstr ""
 
 #. TRANSLATORS: social window name
 #. TRANSLATORS: full button name
-#: src/gui/socialwindow.cpp:1138 src/gui/windowmenu.cpp:126
+#: src/gui/socialwindow.cpp:1260 src/gui/windowmenu.cpp:126
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1273
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1156
+#: src/gui/socialwindow.cpp:1278
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/socialwindow.cpp:1162
+#: src/gui/socialwindow.cpp:1284
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1345
+#: src/gui/socialwindow.cpp:1469
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1356
+#: src/gui/socialwindow.cpp:1480
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1497
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1424
+#: src/gui/socialwindow.cpp:1548
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1445
+#: src/gui/socialwindow.cpp:1569
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1460
+#: src/gui/socialwindow.cpp:1584
 msgid "Guild Name"
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1462
+#: src/gui/socialwindow.cpp:1586
 msgid "Choose your guild's name."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1477
+#: src/gui/socialwindow.cpp:1601
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1485
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1616
 msgid "Accept Guild Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1631
 msgid "Received party request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1519
+#: src/gui/socialwindow.cpp:1643
 msgid "You have been invited you to join a party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1524
+#: src/gui/socialwindow.cpp:1648
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1533
+#: src/gui/socialwindow.cpp:1657
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1539
+#: src/gui/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1673
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1688
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1694
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1572
+#: src/gui/socialwindow.cpp:1696
 msgid "Choose your party's name."
 msgstr ""
 
@@ -5189,24 +5245,24 @@ msgid "MP:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:235 src/gui/statuswindow.cpp:423
+#: src/gui/statuswindow.cpp:234 src/gui/statuswindow.cpp:424
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:237
+#: src/gui/statuswindow.cpp:236
 msgid "Job:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:288 src/gui/statuswindow.cpp:345
+#: src/gui/statuswindow.cpp:289 src/gui/statuswindow.cpp:346
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:360
+#: src/gui/statuswindow.cpp:361
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
@@ -5651,13 +5707,13 @@ msgid "%s whispers: %s"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:540
+#: src/gui/widgets/chattab.cpp:541
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:545
+#: src/gui/widgets/chattab.cpp:546
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -5942,24 +5998,24 @@ msgstr ""
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/inputmanager.cpp:328 src/inputmanager.cpp:372 src/keyboardconfig.cpp:90
+#: src/inputmanager.cpp:329 src/inputmanager.cpp:373 src/keyboardconfig.cpp:90
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/inputmanager.cpp:334
+#: src/inputmanager.cpp:335
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/inputmanager.cpp:348
+#: src/inputmanager.cpp:349
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/inputmanager.cpp:378
+#: src/inputmanager.cpp:379
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -5967,7 +6023,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/inputmanager.cpp:392 src/keyboardconfig.cpp:103
+#: src/inputmanager.cpp:393 src/keyboardconfig.cpp:134
 msgid "u key"
 msgstr ""
 
@@ -6642,55 +6698,55 @@ msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:176
+#: src/net/ea/guildhandler.cpp:178
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:179
+#: src/net/ea/guildhandler.cpp:181
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:186
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:187
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:193
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:195
+#: src/net/ea/guildhandler.cpp:197
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:198
+#: src/net/ea/guildhandler.cpp:200
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index ec94b6d64..71c590673 100644
--- a/po/it.po
+++ b/po/it.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-08-03 13:52+0300\n"
-"PO-Revision-Date: 2013-07-19 19:52+0000\n"
+"POT-Creation-Date: 2013-08-17 13:35+0300\n"
+"PO-Revision-Date: 2013-08-16 17:53+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/manaplus/"
 "language/it/)\n"
@@ -45,21 +45,21 @@ msgstr "Visibile nella mappa"
 msgid "Human"
 msgstr "Umano"
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "dodge"
 msgstr "Schivato"
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "miss"
 msgstr "Mancato"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1710 src/gui/whoisonline.cpp:835
+#: src/being.cpp:1713 src/gui/whoisonline.cpp:842
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1715 src/gui/whoisonline.cpp:840
+#: src/being.cpp:1718 src/gui/whoisonline.cpp:847
 msgid "I"
 msgstr "I"
 
@@ -96,8 +96,8 @@ msgstr "Tema"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:1176 src/gui/didyouknowwindow.cpp:78
-#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:66
-#: src/gui/npcdialog.cpp:103 src/gui/popupmenu.cpp:562
+#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:70
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:562
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:81
 msgid "Close"
 msgstr "Chiudi"
@@ -436,14 +436,14 @@ msgstr ""
 "\" (falso), \"1\", \"0\"."
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:259 src/gui/widgets/chattab.cpp:465
+#: src/game.cpp:259 src/gui/widgets/chattab.cpp:466
 msgid "General"
 msgstr "Generale"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: debug window name
 #. TRANSLATORS: full button name
-#: src/game.cpp:275 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:467
+#: src/game.cpp:275 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:468
 #: src/gui/windowmenu.cpp:154
 msgid "Debug"
 msgstr "Debug"
@@ -500,7 +500,7 @@ msgstr "Bot Checker"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:105
+#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:111
 msgid "Reset"
 msgstr "Reimposta"
 
@@ -618,8 +618,8 @@ msgstr "Quantita':"
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/buydialog.cpp:265 src/gui/itemamountwindow.cpp:202
-#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:96
-#: src/gui/selldialog.cpp:101 src/gui/statuswindow.cpp:790
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:100
+#: src/gui/selldialog.cpp:101 src/gui/statuswindow.cpp:791
 msgid "+"
 msgstr "+"
 
@@ -630,8 +630,8 @@ msgstr "+"
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
 #: src/gui/buydialog.cpp:268 src/gui/itemamountwindow.cpp:200
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:98
-#: src/gui/selldialog.cpp:103 src/gui/statuswindow.cpp:803
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:102
+#: src/gui/selldialog.cpp:103 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr "-"
 
@@ -639,7 +639,7 @@ msgstr "-"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/buydialog.cpp:271 src/gui/charcreatedialog.cpp:122
-#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1160
+#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1282
 msgid "Create"
 msgstr "Crea"
 
@@ -662,8 +662,8 @@ msgstr "Esci"
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
 #: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:109
-#: src/gui/statuswindow.cpp:531 src/gui/statuswindow.cpp:586
-#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:821
+#: src/gui/statuswindow.cpp:532 src/gui/statuswindow.cpp:587
+#: src/gui/statuswindow.cpp:788 src/gui/statuswindow.cpp:822
 msgid "Max"
 msgstr "Massimo"
 
@@ -723,7 +723,7 @@ msgstr "Vendi"
 #: src/gui/popupmenu.cpp:2309 src/gui/popupmenu.cpp:2543
 #: src/gui/popupmenu.cpp:2660 src/gui/quitdialog.cpp:73
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
-#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1094
+#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1216
 #: src/gui/textcommandeditor.cpp:211 src/gui/textdialog.cpp:53
 #: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:181
 msgid "Cancel"
@@ -1007,92 +1007,102 @@ msgstr "Digitare password:"
 #. TRANSLATORS: inventory sort mode
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
-#: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:65
+#: src/gui/chatwindow.cpp:143 src/gui/inventorywindow.cpp:65
 #: src/gui/setup_other.cpp:69 src/gui/setup_visual.cpp:77
 msgid "default"
 msgstr "Predefinito"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:144
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:145 src/gui/widgets/colormodel.cpp:76
 msgid "black"
 msgstr "Nero"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:146
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:147 src/gui/widgets/colormodel.cpp:78
 msgid "red"
 msgstr "Rosso"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:148
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:149 src/gui/widgets/colormodel.cpp:80
 msgid "green"
 msgstr "Verde"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:150
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:151 src/gui/widgets/colormodel.cpp:82
 msgid "blue"
 msgstr "Blu"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:152
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:153 src/gui/widgets/colormodel.cpp:84
 msgid "gold"
 msgstr "Oro"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:154
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:155 src/gui/widgets/colormodel.cpp:86
 msgid "yellow"
 msgstr "Giallo"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:156
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:157 src/gui/widgets/colormodel.cpp:88
 msgid "pink"
 msgstr "Rosa"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:158
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:159 src/gui/widgets/colormodel.cpp:90
 msgid "purple"
 msgstr "Viola"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:160
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:161 src/gui/widgets/colormodel.cpp:92
 msgid "grey"
 msgstr "Grigio"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:162
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:163 src/gui/widgets/colormodel.cpp:94
 msgid "brown"
 msgstr "Marrone"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:164
+#: src/gui/chatwindow.cpp:165
 msgid "rainbow 1"
 msgstr "Arcobaleno 1"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:166
+#: src/gui/chatwindow.cpp:167
 msgid "rainbow 2"
 msgstr "Arcobaleno 2"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:168
+#: src/gui/chatwindow.cpp:169
 msgid "rainbow 3"
 msgstr "Arcobaleno 3"
 
 #. TRANSLATORS: chat window name
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
-#: src/gui/chatwindow.cpp:195 src/gui/setupactiondata.h:1866
+#: src/gui/chatwindow.cpp:196 src/gui/setupactiondata.h:1866
 #: src/gui/setup_chat.cpp:50 src/gui/windowmenu.cpp:88
 msgid "Chat"
 msgstr "Chat"
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:659
+#: src/gui/chatwindow.cpp:684
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presente: %s; %d giocatori sono presenti."
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1066
+#: src/gui/chatwindow.cpp:1091
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Sussurra a %s: %s"
@@ -1401,14 +1411,38 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr "Per favore indicare almeno l'indirizzo e la porta del server."
 
+#. TRANSLATORS: font size
+#: src/gui/emotewindow.cpp:49
+msgid "Normal font"
+msgstr ""
+
+#. TRANSLATORS: font size
+#. TRANSLATORS: theme settings label
+#: src/gui/emotewindow.cpp:51 src/gui/setup_theme.cpp:249
+msgid "Bold font"
+msgstr "Font in grassetto"
+
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/emotewindow.cpp:41 src/gui/emotewindow.cpp:61
+#: src/gui/emotewindow.cpp:56 src/gui/emotewindow.cpp:107
 #: src/gui/setupactiondata.h:1862
 msgid "Emotes"
 msgstr "Faccine"
 
+#. TRANSLATORS: emotes tab name
+#. TRANSLATORS: settings group
+#. TRANSLATORS: settings colors tab name
+#: src/gui/emotewindow.cpp:109 src/gui/setup_chat.cpp:70
+#: src/gui/setup_colors.cpp:83
+msgid "Colors"
+msgstr "Colori"
+
+#. TRANSLATORS: emotes tab name
+#: src/gui/emotewindow.cpp:111
+msgid "Fonts"
+msgstr ""
+
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/equipmentwindow.cpp:56 src/gui/inventorywindow.cpp:204
@@ -1500,7 +1534,7 @@ msgstr "Recupera"
 
 #. TRANSLATORS: status window label
 #: src/gui/inventorywindow.cpp:580 src/gui/statuswindow.cpp:143
-#: src/gui/statuswindow.cpp:284 src/gui/statuswindow.cpp:337
+#: src/gui/statuswindow.cpp:285 src/gui/statuswindow.cpp:338
 #: src/gui/widgets/characterdisplay.cpp:126
 #, c-format
 msgid "Money: %s"
@@ -1788,7 +1822,7 @@ msgstr "Barra dei punti lavoro"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:295
+#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:296
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Livello: %d (GM:%d)"
@@ -1796,7 +1830,7 @@ msgstr "Livello: %d (GM:%d)"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/ministatuswindow.cpp:317 src/gui/statuswindow.cpp:141
-#: src/gui/statuswindow.cpp:302 src/gui/statuswindow.cpp:373
+#: src/gui/statuswindow.cpp:303 src/gui/statuswindow.cpp:374
 #, c-format
 msgid "Level: %d"
 msgstr "Livello: %d"
@@ -1813,34 +1847,45 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:62
+#: src/gui/npcdialog.cpp:66
 msgid "Stop waiting"
 msgstr "Ferma attesa"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:64
+#: src/gui/npcdialog.cpp:68
 msgid "Next"
 msgstr "Prossimo"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:68
+#: src/gui/npcdialog.cpp:72
 msgid "Submit"
 msgstr "Invia"
 
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
 #. TRANSLATORS: settings group
-#: src/gui/npcdialog.cpp:77 src/gui/npcpostdialog.cpp:43
+#: src/gui/npcdialog.cpp:81 src/gui/npcpostdialog.cpp:43
 #: src/gui/setup_other.cpp:257
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:566
+#: src/gui/npcdialog.cpp:104 src/gui/popupmenu.cpp:566
 msgid "Clear"
 msgstr "Cancella"
 
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: trade window button
+#: src/gui/npcdialog.cpp:109 src/gui/serverdialog.cpp:266
+#: src/gui/shopwindow.cpp:95 src/gui/shopwindow.cpp:102
+#: src/gui/tradewindow.cpp:77
+msgid "Add"
+msgstr "Aggiungi"
+
 #. TRANSLATORS: label in npc post dialog
 #: src/gui/npcpostdialog.cpp:53
 msgid "To:"
@@ -2048,7 +2093,7 @@ msgstr "Disabilita modalita' Away"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: social window button
-#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1164
+#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1286
 msgid "Leave"
 msgstr "Lascia"
 
@@ -2182,7 +2227,7 @@ msgstr "Copia in Chat"
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2194
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:985
 msgid "(default)"
 msgstr "(default)"
 
@@ -2430,15 +2475,6 @@ msgid "Choose Your Server"
 msgstr "Scegli il tuo server"
 
 #. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:266 src/gui/shopwindow.cpp:95
-#: src/gui/shopwindow.cpp:102 src/gui/tradewindow.cpp:77
-msgid "Add"
-msgstr "Aggiungi"
-
-#. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
 #: src/gui/serverdialog.cpp:268 src/gui/widgets/setupitem.cpp:303
 #: src/gui/widgets/setupitem.cpp:430
@@ -3329,20 +3365,14 @@ msgstr "Finestra"
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:61
-msgid "Auto hide chat window."
-msgstr "Nascondi Chat automaticamente."
+msgid "Auto hide chat window"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:65
-msgid "Protect chat focus."
+msgid "Protect chat focus"
 msgstr ""
 
-#. TRANSLATORS: settings group
-#. TRANSLATORS: settings colors tab name
-#: src/gui/setup_chat.cpp:70 src/gui/setup_colors.cpp:83
-msgid "Colors"
-msgstr "Colori"
-
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:73
 msgid "Remove colors from received chat messages"
@@ -4437,11 +4467,6 @@ msgid "Language"
 msgstr "Lingua"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:249
-msgid "Bold font"
-msgstr "Font in grassetto"
-
-#. TRANSLATORS: theme settings label
 #: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr "Font con particelle"
@@ -4933,258 +4958,289 @@ msgstr "Lvl: %d"
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
-#: src/gui/socialwindow.cpp:158 src/gui/socialwindow.cpp:259
+#: src/gui/socialwindow.cpp:176 src/gui/socialwindow.cpp:309
 #: src/gui/widgets/guildchattab.cpp:42 src/net/ea/gui/guildtab.cpp:49
 msgid "Guild"
 msgstr "Gilda"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Invitato utente %s alla gilda %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:213
+#: src/gui/socialwindow.cpp:231
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Abbandono gilda %s richiesto."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:245
 msgid "Member Invite to Guild"
 msgstr "invita qualcuno nel gruppo"
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:229
+#: src/gui/socialwindow.cpp:247
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "Chi vorresti invitare alla gilda %s?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:238
+#: src/gui/socialwindow.cpp:256
 msgid "Leave Guild?"
 msgstr "Lasciare la gilda?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:240
+#: src/gui/socialwindow.cpp:258
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Sei sicuro di voler lasciare la gilda %s?"
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:269
+#, c-format
+msgid "Members: %u/%u"
+msgstr ""
+
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:291 src/gui/socialwindow.cpp:361
+#: src/gui/socialwindow.cpp:483
+#, c-format
+msgid "Players: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/socialwindow.cpp:302 src/net/ea/gui/partytab.cpp:49
+#: src/gui/socialwindow.cpp:376 src/net/ea/gui/partytab.cpp:49
 msgid "Party"
 msgstr "Party"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:341
+#: src/gui/socialwindow.cpp:415
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Invitato utente al gruppo %s"
 
 #. TRANSLATORS: tab in social window
-#: src/gui/socialwindow.cpp:356
+#: src/gui/socialwindow.cpp:430
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Abbandono gruppo %s richiesto"
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:370
+#: src/gui/socialwindow.cpp:444
 msgid "Member Invite to Party"
 msgstr "Invita qualcuno nel gruppo"
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:372
+#: src/gui/socialwindow.cpp:446
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Chi vorresti invitare al gruppo %s?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:381
+#: src/gui/socialwindow.cpp:455
 msgid "Leave Party?"
 msgstr "Lasciare il gruppo?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:383
+#: src/gui/socialwindow.cpp:457
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Sei sicuro di voler lasciare il gruppo %s?"
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:681
+#, c-format
+msgid "Visible players: %d"
+msgstr ""
+
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:605
+#: src/gui/socialwindow.cpp:707
 msgid "Nav"
 msgstr "Nav"
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:809
+#, c-format
+msgid "Portals: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:922
+#: src/gui/socialwindow.cpp:1035
 msgid "Atk"
 msgstr "Attacco"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:941
+#: src/gui/socialwindow.cpp:1054
 msgid "Priority mobs"
 msgstr "Priorità mobs"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:943
+#: src/gui/socialwindow.cpp:1056
 msgid "Attack mobs"
 msgstr "Attacca mobs"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:945
+#: src/gui/socialwindow.cpp:1058
 msgid "Ignore mobs"
 msgstr "Ignora mobs"
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:968
+#: src/gui/socialwindow.cpp:1081
 msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:987
+#: src/gui/socialwindow.cpp:1100
 msgid "Pickup items"
 msgstr "Raccogli oggetti"
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:989
+#: src/gui/socialwindow.cpp:1102
 msgid "Ignore items"
 msgstr "Ignora oggetti"
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:1190
+#, c-format
+msgid "Friends: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1091 src/gui/socialwindow.cpp:1563
+#: src/gui/socialwindow.cpp:1213 src/gui/socialwindow.cpp:1687
 msgid "Create Party"
 msgstr "Crea gruppo"
 
 #. TRANSLATORS: social window name
 #. TRANSLATORS: full button name
-#: src/gui/socialwindow.cpp:1138 src/gui/windowmenu.cpp:126
+#: src/gui/socialwindow.cpp:1260 src/gui/windowmenu.cpp:126
 msgid "Social"
 msgstr "Sociale"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1273
 msgid "P"
 msgstr "P"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1156
+#: src/gui/socialwindow.cpp:1278
 msgid "F"
 msgstr "F"
 
 #. TRANSLATORS: social window button
-#: src/gui/socialwindow.cpp:1162
+#: src/gui/socialwindow.cpp:1284
 msgid "Invite"
 msgstr "Invita"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1345
+#: src/gui/socialwindow.cpp:1469
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Accettato invito al gruppo da parte di %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1356
+#: src/gui/socialwindow.cpp:1480
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Rifiutato invito al gruppo da parte di %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1497
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Accettato invito alla gilda da parte di %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Rifiutato invito alla gilda da parte di %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1424
+#: src/gui/socialwindow.cpp:1548
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Stai creando una gilda chiamata %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1445
+#: src/gui/socialwindow.cpp:1569
 #, c-format
 msgid "Creating party called %s."
 msgstr "Stai creando un party chiamato %s"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1460
+#: src/gui/socialwindow.cpp:1584
 msgid "Guild Name"
 msgstr "Nome della gilda"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1462
+#: src/gui/socialwindow.cpp:1586
 msgid "Choose your guild's name."
 msgstr "Scegli un nome per la tua gilda"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1477
+#: src/gui/socialwindow.cpp:1601
 msgid "Received guild request, but one already exists."
 msgstr "Ricevuto invito ad una gilda, ma ne hai già una."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1485
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s ti ha invitato ad entrare nella gilda %s"
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1616
 msgid "Accept Guild Invite"
 msgstr "Accetta invito alla gilda"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1631
 msgid "Received party request, but one already exists."
 msgstr "Ricevuta richiesta di party, ma ne esiste già una."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1519
+#: src/gui/socialwindow.cpp:1643
 msgid "You have been invited you to join a party."
 msgstr "Sei stato invitato ad entrare in un party"
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1524
+#: src/gui/socialwindow.cpp:1648
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Sei stato invitato ad entrare nel gruppo %s"
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1533
+#: src/gui/socialwindow.cpp:1657
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s ti ha invitato ad unirti al suo party."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1539
+#: src/gui/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s ti ha invitato ad unirti al party %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1673
 msgid "Accept Party Invite"
 msgstr "Accetta invito nel party"
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1688
 msgid "Cannot create party. You are already in a party"
 msgstr "Impossibile creare un party, sei già in un party"
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1694
 msgid "Party Name"
 msgstr "Nome del gruppo"
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1572
+#: src/gui/socialwindow.cpp:1696
 msgid "Choose your party's name."
 msgstr "Scegli un nome per il tuo party"
 
@@ -5204,24 +5260,24 @@ msgid "MP:"
 msgstr "MP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:235 src/gui/statuswindow.cpp:423
+#: src/gui/statuswindow.cpp:234 src/gui/statuswindow.cpp:424
 #, c-format
 msgid "Job: %d"
 msgstr "Lavoro: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:237
+#: src/gui/statuswindow.cpp:236
 msgid "Job:"
 msgstr "Lavoro:"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:288 src/gui/statuswindow.cpp:345
+#: src/gui/statuswindow.cpp:289 src/gui/statuswindow.cpp:346
 #, c-format
 msgid "Character points: %d"
 msgstr "Punti personaggio: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:360
+#: src/gui/statuswindow.cpp:361
 #, c-format
 msgid "Correction points: %d"
 msgstr "Punti correzione: %d"
@@ -5668,13 +5724,13 @@ msgid "%s whispers: %s"
 msgstr "%s sussurra: %s "
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:540
+#: src/gui/widgets/chattab.cpp:541
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:545
+#: src/gui/widgets/chattab.cpp:546
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -5962,24 +6018,24 @@ msgstr "Scegli parola"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/inputmanager.cpp:328 src/inputmanager.cpp:372 src/keyboardconfig.cpp:90
+#: src/inputmanager.cpp:329 src/inputmanager.cpp:373 src/keyboardconfig.cpp:90
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/inputmanager.cpp:334
+#: src/inputmanager.cpp:335
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/inputmanager.cpp:348
+#: src/inputmanager.cpp:349
 msgid "unknown key"
 msgstr "pulsante sconosciuto"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/inputmanager.cpp:378
+#: src/inputmanager.cpp:379
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -5987,7 +6043,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/inputmanager.cpp:392 src/keyboardconfig.cpp:103
+#: src/inputmanager.cpp:393 src/keyboardconfig.cpp:134
 msgid "u key"
 msgstr ""
 
@@ -6666,55 +6722,55 @@ msgid "Request to quit denied!"
 msgstr "Richiesta di chiusura rifiutata!"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:176
+#: src/net/ea/guildhandler.cpp:178
 #, c-format
 msgid "Guild name: %s"
 msgstr "Nome Gilda: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:179
+#: src/net/ea/guildhandler.cpp:181
 #, c-format
 msgid "Guild master: %s"
 msgstr "Master di Gilda: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild level: %d"
 msgstr "Livello Gilda: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:186
 #, c-format
 msgid "Online members: %d"
 msgstr "Membri Online: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:187
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Max members: %d"
 msgstr "Numero massimo Membri: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Average level: %d"
 msgstr "Livello Medio: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:193
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Guild exp: %d"
 msgstr "Punti Exp Gilda: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:195
+#: src/net/ea/guildhandler.cpp:197
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:198
+#: src/net/ea/guildhandler.cpp:200
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 8a8de0236..48078f238 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-08-03 13:52+0300\n"
-"PO-Revision-Date: 2013-07-19 19:52+0000\n"
+"POT-Creation-Date: 2013-08-17 13:35+0300\n"
+"PO-Revision-Date: 2013-08-16 17:53+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/manaplus/"
 "language/ja/)\n"
@@ -44,21 +44,21 @@ msgstr "マップに表示させる"
 msgid "Human"
 msgstr "人間"
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "dodge"
 msgstr "ドッジ"
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "miss"
 msgstr "ミス"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1710 src/gui/whoisonline.cpp:835
+#: src/being.cpp:1713 src/gui/whoisonline.cpp:842
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1715 src/gui/whoisonline.cpp:840
+#: src/being.cpp:1718 src/gui/whoisonline.cpp:847
 msgid "I"
 msgstr "I"
 
@@ -95,8 +95,8 @@ msgstr "テーマ"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:1176 src/gui/didyouknowwindow.cpp:78
-#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:66
-#: src/gui/npcdialog.cpp:103 src/gui/popupmenu.cpp:562
+#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:70
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:562
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:81
 msgid "Close"
 msgstr "閉じる"
@@ -434,14 +434,14 @@ msgstr ""
 "/%sへの可能なオプションは：\"yes\", \"no\", \"true\", \"false\", \"1\", \"0\""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:259 src/gui/widgets/chattab.cpp:465
+#: src/game.cpp:259 src/gui/widgets/chattab.cpp:466
 msgid "General"
 msgstr "一般"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: debug window name
 #. TRANSLATORS: full button name
-#: src/game.cpp:275 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:467
+#: src/game.cpp:275 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:468
 #: src/gui/windowmenu.cpp:154
 msgid "Debug"
 msgstr "デバッグ"
@@ -498,7 +498,7 @@ msgstr "ボットチェッカー"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:105
+#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:111
 msgid "Reset"
 msgstr "リセット"
 
@@ -616,8 +616,8 @@ msgstr "量:"
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/buydialog.cpp:265 src/gui/itemamountwindow.cpp:202
-#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:96
-#: src/gui/selldialog.cpp:101 src/gui/statuswindow.cpp:790
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:100
+#: src/gui/selldialog.cpp:101 src/gui/statuswindow.cpp:791
 msgid "+"
 msgstr "+"
 
@@ -628,8 +628,8 @@ msgstr "+"
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
 #: src/gui/buydialog.cpp:268 src/gui/itemamountwindow.cpp:200
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:98
-#: src/gui/selldialog.cpp:103 src/gui/statuswindow.cpp:803
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:102
+#: src/gui/selldialog.cpp:103 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr "-"
 
@@ -637,7 +637,7 @@ msgstr "-"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/buydialog.cpp:271 src/gui/charcreatedialog.cpp:122
-#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1160
+#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1282
 msgid "Create"
 msgstr "作成"
 
@@ -660,8 +660,8 @@ msgstr "終了"
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
 #: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:109
-#: src/gui/statuswindow.cpp:531 src/gui/statuswindow.cpp:586
-#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:821
+#: src/gui/statuswindow.cpp:532 src/gui/statuswindow.cpp:587
+#: src/gui/statuswindow.cpp:788 src/gui/statuswindow.cpp:822
 msgid "Max"
 msgstr "最大"
 
@@ -721,7 +721,7 @@ msgstr "売る"
 #: src/gui/popupmenu.cpp:2309 src/gui/popupmenu.cpp:2543
 #: src/gui/popupmenu.cpp:2660 src/gui/quitdialog.cpp:73
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
-#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1094
+#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1216
 #: src/gui/textcommandeditor.cpp:211 src/gui/textdialog.cpp:53
 #: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:181
 msgid "Cancel"
@@ -1005,92 +1005,102 @@ msgstr "パスワードを入力して下さい:"
 #. TRANSLATORS: inventory sort mode
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
-#: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:65
+#: src/gui/chatwindow.cpp:143 src/gui/inventorywindow.cpp:65
 #: src/gui/setup_other.cpp:69 src/gui/setup_visual.cpp:77
 msgid "default"
 msgstr "デフォルト"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:144
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:145 src/gui/widgets/colormodel.cpp:76
 msgid "black"
 msgstr "黒"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:146
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:147 src/gui/widgets/colormodel.cpp:78
 msgid "red"
 msgstr "赤"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:148
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:149 src/gui/widgets/colormodel.cpp:80
 msgid "green"
 msgstr "緑"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:150
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:151 src/gui/widgets/colormodel.cpp:82
 msgid "blue"
 msgstr "青"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:152
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:153 src/gui/widgets/colormodel.cpp:84
 msgid "gold"
 msgstr "金色"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:154
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:155 src/gui/widgets/colormodel.cpp:86
 msgid "yellow"
 msgstr "黄色"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:156
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:157 src/gui/widgets/colormodel.cpp:88
 msgid "pink"
 msgstr "ピンク"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:158
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:159 src/gui/widgets/colormodel.cpp:90
 msgid "purple"
 msgstr "紫"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:160
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:161 src/gui/widgets/colormodel.cpp:92
 msgid "grey"
 msgstr "グレー"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:162
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:163 src/gui/widgets/colormodel.cpp:94
 msgid "brown"
 msgstr "茶色"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:164
+#: src/gui/chatwindow.cpp:165
 msgid "rainbow 1"
 msgstr "カラフル1"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:166
+#: src/gui/chatwindow.cpp:167
 msgid "rainbow 2"
 msgstr "カラフル 2"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:168
+#: src/gui/chatwindow.cpp:169
 msgid "rainbow 3"
 msgstr "カラフル 3"
 
 #. TRANSLATORS: chat window name
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
-#: src/gui/chatwindow.cpp:195 src/gui/setupactiondata.h:1866
+#: src/gui/chatwindow.cpp:196 src/gui/setupactiondata.h:1866
 #: src/gui/setup_chat.cpp:50 src/gui/windowmenu.cpp:88
 msgid "Chat"
 msgstr "チャット"
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:659
+#: src/gui/chatwindow.cpp:684
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "現在: %s; %d プレイヤーがいます"
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1066
+#: src/gui/chatwindow.cpp:1091
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "%sにささやき中:%s"
@@ -1399,14 +1409,38 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr "サーバーアドレスとポートを入力して下さい"
 
+#. TRANSLATORS: font size
+#: src/gui/emotewindow.cpp:49
+msgid "Normal font"
+msgstr ""
+
+#. TRANSLATORS: font size
+#. TRANSLATORS: theme settings label
+#: src/gui/emotewindow.cpp:51 src/gui/setup_theme.cpp:249
+msgid "Bold font"
+msgstr "太字フォント"
+
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/emotewindow.cpp:41 src/gui/emotewindow.cpp:61
+#: src/gui/emotewindow.cpp:56 src/gui/emotewindow.cpp:107
 #: src/gui/setupactiondata.h:1862
 msgid "Emotes"
 msgstr "スマイリー"
 
+#. TRANSLATORS: emotes tab name
+#. TRANSLATORS: settings group
+#. TRANSLATORS: settings colors tab name
+#: src/gui/emotewindow.cpp:109 src/gui/setup_chat.cpp:70
+#: src/gui/setup_colors.cpp:83
+msgid "Colors"
+msgstr "色"
+
+#. TRANSLATORS: emotes tab name
+#: src/gui/emotewindow.cpp:111
+msgid "Fonts"
+msgstr ""
+
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/equipmentwindow.cpp:56 src/gui/inventorywindow.cpp:204
@@ -1498,7 +1532,7 @@ msgstr "取出す"
 
 #. TRANSLATORS: status window label
 #: src/gui/inventorywindow.cpp:580 src/gui/statuswindow.cpp:143
-#: src/gui/statuswindow.cpp:284 src/gui/statuswindow.cpp:337
+#: src/gui/statuswindow.cpp:285 src/gui/statuswindow.cpp:338
 #: src/gui/widgets/characterdisplay.cpp:126
 #, c-format
 msgid "Money: %s"
@@ -1784,7 +1818,7 @@ msgstr "職"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:295
+#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:296
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "レベル: %d (GM %d)"
@@ -1792,7 +1826,7 @@ msgstr "レベル: %d (GM %d)"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/ministatuswindow.cpp:317 src/gui/statuswindow.cpp:141
-#: src/gui/statuswindow.cpp:302 src/gui/statuswindow.cpp:373
+#: src/gui/statuswindow.cpp:303 src/gui/statuswindow.cpp:374
 #, c-format
 msgid "Level: %d"
 msgstr "レベル: %d"
@@ -1809,34 +1843,45 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:62
+#: src/gui/npcdialog.cpp:66
 msgid "Stop waiting"
 msgstr "キャンセル"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:64
+#: src/gui/npcdialog.cpp:68
 msgid "Next"
 msgstr "次"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:68
+#: src/gui/npcdialog.cpp:72
 msgid "Submit"
 msgstr "決定"
 
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
 #. TRANSLATORS: settings group
-#: src/gui/npcdialog.cpp:77 src/gui/npcpostdialog.cpp:43
+#: src/gui/npcdialog.cpp:81 src/gui/npcpostdialog.cpp:43
 #: src/gui/setup_other.cpp:257
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:566
+#: src/gui/npcdialog.cpp:104 src/gui/popupmenu.cpp:566
 msgid "Clear"
 msgstr "クリア"
 
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: trade window button
+#: src/gui/npcdialog.cpp:109 src/gui/serverdialog.cpp:266
+#: src/gui/shopwindow.cpp:95 src/gui/shopwindow.cpp:102
+#: src/gui/tradewindow.cpp:77
+msgid "Add"
+msgstr "追加"
+
 #. TRANSLATORS: label in npc post dialog
 #: src/gui/npcpostdialog.cpp:53
 msgid "To:"
@@ -2044,7 +2089,7 @@ msgstr "AFKを無効にする"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: social window button
-#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1164
+#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1286
 msgid "Leave"
 msgstr "退会"
 
@@ -2178,7 +2223,7 @@ msgstr "チャットへコピーする"
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2194
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:985
 msgid "(default)"
 msgstr "(デフォルト)"
 
@@ -2426,15 +2471,6 @@ msgid "Choose Your Server"
 msgstr "サーバーを選択してください"
 
 #. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:266 src/gui/shopwindow.cpp:95
-#: src/gui/shopwindow.cpp:102 src/gui/tradewindow.cpp:77
-msgid "Add"
-msgstr "追加"
-
-#. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
 #: src/gui/serverdialog.cpp:268 src/gui/widgets/setupitem.cpp:303
 #: src/gui/widgets/setupitem.cpp:430
@@ -3325,20 +3361,14 @@ msgstr "ウィンドウ"
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:61
-msgid "Auto hide chat window."
-msgstr "チャットウィンドウを自動で隠す"
+msgid "Auto hide chat window"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:65
-msgid "Protect chat focus."
+msgid "Protect chat focus"
 msgstr ""
 
-#. TRANSLATORS: settings group
-#. TRANSLATORS: settings colors tab name
-#: src/gui/setup_chat.cpp:70 src/gui/setup_colors.cpp:83
-msgid "Colors"
-msgstr "色"
-
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:73
 msgid "Remove colors from received chat messages"
@@ -4436,11 +4466,6 @@ msgid "Language"
 msgstr "言語"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:249
-msgid "Bold font"
-msgstr "太字フォント"
-
-#. TRANSLATORS: theme settings label
 #: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr "パーティクルフォント"
@@ -4926,258 +4951,289 @@ msgstr "Lvl: %d"
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
-#: src/gui/socialwindow.cpp:158 src/gui/socialwindow.cpp:259
+#: src/gui/socialwindow.cpp:176 src/gui/socialwindow.cpp:309
 #: src/gui/widgets/guildchattab.cpp:42 src/net/ea/gui/guildtab.cpp:49
 msgid "Guild"
 msgstr "ギルド"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "ユーザー %sを、ギルド %sに招待しました"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:213
+#: src/gui/socialwindow.cpp:231
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "ギルド %sへ退会届を出しました"
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:245
 msgid "Member Invite to Guild"
 msgstr "ギルドへメンバーを招待しました"
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:229
+#: src/gui/socialwindow.cpp:247
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "ギルド %sに誰を招待しますか？"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:238
+#: src/gui/socialwindow.cpp:256
 msgid "Leave Guild?"
 msgstr "ギルドから退会しますか？"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:240
+#: src/gui/socialwindow.cpp:258
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "ギルド %sから本当に退会しますか?"
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:269
+#, c-format
+msgid "Members: %u/%u"
+msgstr ""
+
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:291 src/gui/socialwindow.cpp:361
+#: src/gui/socialwindow.cpp:483
+#, c-format
+msgid "Players: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/socialwindow.cpp:302 src/net/ea/gui/partytab.cpp:49
+#: src/gui/socialwindow.cpp:376 src/net/ea/gui/partytab.cpp:49
 msgid "Party"
 msgstr "パーティー"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:341
+#: src/gui/socialwindow.cpp:415
 #, c-format
 msgid "Invited user %s to party."
 msgstr "ユーザー %s をパーティに招待しました"
 
 #. TRANSLATORS: tab in social window
-#: src/gui/socialwindow.cpp:356
+#: src/gui/socialwindow.cpp:430
 #, c-format
 msgid "Party %s quit requested."
 msgstr "パーティ %sへ退会届を出しました"
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:370
+#: src/gui/socialwindow.cpp:444
 msgid "Member Invite to Party"
 msgstr "メンバーをパーティに招待しました"
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:372
+#: src/gui/socialwindow.cpp:446
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "パーティ %sに誰を招待しますか?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:381
+#: src/gui/socialwindow.cpp:455
 msgid "Leave Party?"
 msgstr "パーティーから退会しますか？"
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:383
+#: src/gui/socialwindow.cpp:457
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "パーティ %sから本当に退会しますか?"
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:681
+#, c-format
+msgid "Visible players: %d"
+msgstr ""
+
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:605
+#: src/gui/socialwindow.cpp:707
 msgid "Nav"
 msgstr "ナビ"
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:809
+#, c-format
+msgid "Portals: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:922
+#: src/gui/socialwindow.cpp:1035
 msgid "Atk"
 msgstr "攻撃"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:941
+#: src/gui/socialwindow.cpp:1054
 msgid "Priority mobs"
 msgstr "優先される敵"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:943
+#: src/gui/socialwindow.cpp:1056
 msgid "Attack mobs"
 msgstr "敵を攻撃する"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:945
+#: src/gui/socialwindow.cpp:1058
 msgid "Ignore mobs"
 msgstr "無視している敵"
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:968
+#: src/gui/socialwindow.cpp:1081
 msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:987
+#: src/gui/socialwindow.cpp:1100
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:989
+#: src/gui/socialwindow.cpp:1102
 msgid "Ignore items"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:1190
+#, c-format
+msgid "Friends: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1091 src/gui/socialwindow.cpp:1563
+#: src/gui/socialwindow.cpp:1213 src/gui/socialwindow.cpp:1687
 msgid "Create Party"
 msgstr "パーティを作る"
 
 #. TRANSLATORS: social window name
 #. TRANSLATORS: full button name
-#: src/gui/socialwindow.cpp:1138 src/gui/windowmenu.cpp:126
+#: src/gui/socialwindow.cpp:1260 src/gui/windowmenu.cpp:126
 msgid "Social"
 msgstr "ソーシャル"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1273
 msgid "P"
 msgstr "周囲"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1156
+#: src/gui/socialwindow.cpp:1278
 msgid "F"
 msgstr "友達"
 
 #. TRANSLATORS: social window button
-#: src/gui/socialwindow.cpp:1162
+#: src/gui/socialwindow.cpp:1284
 msgid "Invite"
 msgstr "招待"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1345
+#: src/gui/socialwindow.cpp:1469
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "%sからのパーティ招待を承認しました"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1356
+#: src/gui/socialwindow.cpp:1480
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "%sからのパーティ招待を拒否しました"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1497
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "%sからのギルド招待を承認しました"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "%sからのギルド招待を拒否しました"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1424
+#: src/gui/socialwindow.cpp:1548
 #, c-format
 msgid "Creating guild called %s."
 msgstr "ギルド %sを作成しました"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1445
+#: src/gui/socialwindow.cpp:1569
 #, c-format
 msgid "Creating party called %s."
 msgstr "パーティ %sを作成しました"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1460
+#: src/gui/socialwindow.cpp:1584
 msgid "Guild Name"
 msgstr "ギルド名"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1462
+#: src/gui/socialwindow.cpp:1586
 msgid "Choose your guild's name."
 msgstr "ギルド名を選んでください"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1477
+#: src/gui/socialwindow.cpp:1601
 msgid "Received guild request, but one already exists."
 msgstr "ギルド招待を承認したが既に入会しています"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1485
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%sがギルド %sへ招待しています"
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1616
 msgid "Accept Guild Invite"
 msgstr "ギルド招待を受け入れる"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1631
 msgid "Received party request, but one already exists."
 msgstr "パーティ招待を承認したが既に入会しています"
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1519
+#: src/gui/socialwindow.cpp:1643
 msgid "You have been invited you to join a party."
 msgstr "パーティに招待されました"
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1524
+#: src/gui/socialwindow.cpp:1648
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "パーティ %sに招待されました"
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1533
+#: src/gui/socialwindow.cpp:1657
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%sはあなたをパーティに招待しました"
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1539
+#: src/gui/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%sはあなたを%sというパーティに招待しました"
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1673
 msgid "Accept Party Invite"
 msgstr "パーティ招待を受け入れます"
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1688
 msgid "Cannot create party. You are already in a party"
 msgstr "パーティーを作成することはできません。もうパーティーに入っています"
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1694
 msgid "Party Name"
 msgstr "パーティ名"
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1572
+#: src/gui/socialwindow.cpp:1696
 msgid "Choose your party's name."
 msgstr "パーティ名を選んでください"
 
@@ -5197,24 +5253,24 @@ msgid "MP:"
 msgstr "MP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:235 src/gui/statuswindow.cpp:423
+#: src/gui/statuswindow.cpp:234 src/gui/statuswindow.cpp:424
 #, c-format
 msgid "Job: %d"
 msgstr "ジョブ: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:237
+#: src/gui/statuswindow.cpp:236
 msgid "Job:"
 msgstr "ジョブポイント:"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:288 src/gui/statuswindow.cpp:345
+#: src/gui/statuswindow.cpp:289 src/gui/statuswindow.cpp:346
 #, c-format
 msgid "Character points: %d"
 msgstr "キャラクターポイント: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:360
+#: src/gui/statuswindow.cpp:361
 #, c-format
 msgid "Correction points: %d"
 msgstr "修正点: %d"
@@ -5661,13 +5717,13 @@ msgid "%s whispers: %s"
 msgstr "%s ささやく: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:540
+#: src/gui/widgets/chattab.cpp:541
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:545
+#: src/gui/widgets/chattab.cpp:546
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -5954,24 +6010,24 @@ msgstr "世界の選択"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/inputmanager.cpp:328 src/inputmanager.cpp:372 src/keyboardconfig.cpp:90
+#: src/inputmanager.cpp:329 src/inputmanager.cpp:373 src/keyboardconfig.cpp:90
 #, c-format
 msgid "key_%d"
 msgstr "キー_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/inputmanager.cpp:334
+#: src/inputmanager.cpp:335
 #, c-format
 msgid "JButton%d"
 msgstr "ジョイスティックボタン%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/inputmanager.cpp:348
+#: src/inputmanager.cpp:349
 msgid "unknown key"
 msgstr "不明なキー"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/inputmanager.cpp:378
+#: src/inputmanager.cpp:379
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -5979,7 +6035,7 @@ msgstr "JB%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/inputmanager.cpp:392 src/keyboardconfig.cpp:103
+#: src/inputmanager.cpp:393 src/keyboardconfig.cpp:134
 msgid "u key"
 msgstr "u キー"
 
@@ -6659,55 +6715,55 @@ msgid "Request to quit denied!"
 msgstr "今キャンセルできません"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:176
+#: src/net/ea/guildhandler.cpp:178
 #, c-format
 msgid "Guild name: %s"
 msgstr "ギルド名: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:179
+#: src/net/ea/guildhandler.cpp:181
 #, c-format
 msgid "Guild master: %s"
 msgstr "ギルドマスター: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild level: %d"
 msgstr "ギルドレベル: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:186
 #, c-format
 msgid "Online members: %d"
 msgstr "オンラインユーザー: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:187
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Max members: %d"
 msgstr "最大メンバー数: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Average level: %d"
 msgstr "平均レベル: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:193
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Guild exp: %d"
 msgstr "ギルドExp: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:195
+#: src/net/ea/guildhandler.cpp:197
 #, c-format
 msgid "Guild next exp: %d"
 msgstr "次のギルドExpまで: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:198
+#: src/net/ea/guildhandler.cpp:200
 #, c-format
 msgid "Guild castle: %s"
 msgstr "ギルド城: %s"
diff --git a/po/ka.po b/po/ka.po
index 30945ff70..d21f5d0ea 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-07-19 22:23+0300\n"
-"PO-Revision-Date: 2013-07-19 19:52+0000\n"
+"POT-Creation-Date: 2013-08-16 20:45+0300\n"
+"PO-Revision-Date: 2013-08-16 17:53+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Georgian (http://www.transifex.com/projects/p/manaplus/language/ka/)\n"
 "MIME-Version: 1.0\n"
@@ -38,21 +38,21 @@ msgstr ""
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1606 src/gui/whoisonline.cpp:835
+#: src/being.cpp:1713 src/gui/whoisonline.cpp:842
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1611 src/gui/whoisonline.cpp:840
+#: src/being.cpp:1718 src/gui/whoisonline.cpp:847
 msgid "I"
 msgstr ""
 
@@ -89,8 +89,8 @@ msgstr ""
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:1176 src/gui/didyouknowwindow.cpp:78
-#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:66
-#: src/gui/npcdialog.cpp:103 src/gui/popupmenu.cpp:562
+#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:70
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:562
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:81
 msgid "Close"
 msgstr ""
@@ -425,36 +425,36 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:465
+#: src/game.cpp:259 src/gui/widgets/chattab.cpp:466
 msgid "General"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: debug window name
 #. TRANSLATORS: full button name
-#: src/game.cpp:272 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:467
+#: src/game.cpp:275 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:468
 #: src/gui/windowmenu.cpp:154
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:536
+#: src/game.cpp:540
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:546
+#: src/game.cpp:550
 msgid "Saving screenshot failed!"
 msgstr ""
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:618
+#: src/game.cpp:622
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:621
+#: src/game.cpp:625
 msgid "Network Error"
 msgstr ""
 
@@ -489,7 +489,7 @@ msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:105
+#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:111
 msgid "Reset"
 msgstr ""
 
@@ -590,7 +590,7 @@ msgstr ""
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
 #: src/gui/buydialog.cpp:251 src/gui/buydialog.cpp:531
-#: src/gui/selldialog.cpp:96 src/gui/selldialog.cpp:356
+#: src/gui/selldialog.cpp:97 src/gui/selldialog.cpp:357
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
@@ -607,8 +607,8 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/buydialog.cpp:265 src/gui/itemamountwindow.cpp:202
-#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:96
-#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:790
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:100
+#: src/gui/selldialog.cpp:101 src/gui/statuswindow.cpp:791
 msgid "+"
 msgstr ""
 
@@ -619,8 +619,8 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
 #: src/gui/buydialog.cpp:268 src/gui/itemamountwindow.cpp:200
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:98
-#: src/gui/selldialog.cpp:102 src/gui/statuswindow.cpp:803
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:102
+#: src/gui/selldialog.cpp:103 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr ""
 
@@ -628,7 +628,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/buydialog.cpp:271 src/gui/charcreatedialog.cpp:122
-#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1160
+#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1282
 msgid "Create"
 msgstr ""
 
@@ -640,7 +640,7 @@ msgstr ""
 #. TRANSLATORS: input action name
 #: src/gui/buydialog.cpp:273 src/gui/quitdialog.cpp:55
 #: src/gui/quitdialog.cpp:60 src/gui/quitdialog.cpp:62
-#: src/gui/selldialog.cpp:106 src/gui/serverdialog.cpp:262
+#: src/gui/selldialog.cpp:107 src/gui/serverdialog.cpp:262
 #: src/gui/setupactiondata.h:177
 msgid "Quit"
 msgstr ""
@@ -650,9 +650,9 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:108
-#: src/gui/statuswindow.cpp:531 src/gui/statuswindow.cpp:586
-#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:821
+#: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:109
+#: src/gui/statuswindow.cpp:532 src/gui/statuswindow.cpp:587
+#: src/gui/statuswindow.cpp:788 src/gui/statuswindow.cpp:822
 msgid "Max"
 msgstr ""
 
@@ -672,7 +672,7 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #: src/gui/buyselldialog.cpp:69 src/gui/popupmenu.cpp:223
 #: src/gui/popupmenu.cpp:2455 src/gui/selldialog.cpp:54
-#: src/gui/selldialog.cpp:64 src/gui/selldialog.cpp:104
+#: src/gui/selldialog.cpp:64 src/gui/selldialog.cpp:105
 msgid "Sell"
 msgstr ""
 
@@ -712,7 +712,7 @@ msgstr ""
 #: src/gui/popupmenu.cpp:2309 src/gui/popupmenu.cpp:2543
 #: src/gui/popupmenu.cpp:2660 src/gui/quitdialog.cpp:73
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
-#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1094
+#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1216
 #: src/gui/textcommandeditor.cpp:211 src/gui/textdialog.cpp:53
 #: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:181
 msgid "Cancel"
@@ -996,92 +996,102 @@ msgstr ""
 #. TRANSLATORS: inventory sort mode
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
-#: src/gui/chatwindow.cpp:139 src/gui/inventorywindow.cpp:65
+#: src/gui/chatwindow.cpp:143 src/gui/inventorywindow.cpp:65
 #: src/gui/setup_other.cpp:69 src/gui/setup_visual.cpp:77
 msgid "default"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:141
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:145 src/gui/widgets/colormodel.cpp:76
 msgid "black"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:143
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:147 src/gui/widgets/colormodel.cpp:78
 msgid "red"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:145
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:149 src/gui/widgets/colormodel.cpp:80
 msgid "green"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:147
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:151 src/gui/widgets/colormodel.cpp:82
 msgid "blue"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:149
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:153 src/gui/widgets/colormodel.cpp:84
 msgid "gold"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:151
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:155 src/gui/widgets/colormodel.cpp:86
 msgid "yellow"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:153
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:157 src/gui/widgets/colormodel.cpp:88
 msgid "pink"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:155
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:159 src/gui/widgets/colormodel.cpp:90
 msgid "purple"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:157
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:161 src/gui/widgets/colormodel.cpp:92
 msgid "grey"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:159
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:163 src/gui/widgets/colormodel.cpp:94
 msgid "brown"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:161
+#: src/gui/chatwindow.cpp:165
 msgid "rainbow 1"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:163
+#: src/gui/chatwindow.cpp:167
 msgid "rainbow 2"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:165
+#: src/gui/chatwindow.cpp:169
 msgid "rainbow 3"
 msgstr ""
 
 #. TRANSLATORS: chat window name
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
-#: src/gui/chatwindow.cpp:192 src/gui/setupactiondata.h:1866
+#: src/gui/chatwindow.cpp:196 src/gui/setupactiondata.h:1866
 #: src/gui/setup_chat.cpp:50 src/gui/windowmenu.cpp:88
 msgid "Chat"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:641
+#: src/gui/chatwindow.cpp:684
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1044
+#: src/gui/chatwindow.cpp:1091
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -1390,6 +1400,38 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
+#. TRANSLATORS: font size
+#: src/gui/emotewindow.cpp:49
+msgid "Normal font"
+msgstr ""
+
+#. TRANSLATORS: font size
+#. TRANSLATORS: theme settings label
+#: src/gui/emotewindow.cpp:51 src/gui/setup_theme.cpp:249
+msgid "Bold font"
+msgstr ""
+
+#. TRANSLATORS: emotes window name
+#. TRANSLATORS: emotes tab name
+#. TRANSLATORS: input tab sub tab name
+#: src/gui/emotewindow.cpp:56 src/gui/emotewindow.cpp:107
+#: src/gui/setupactiondata.h:1862
+msgid "Emotes"
+msgstr ""
+
+#. TRANSLATORS: emotes tab name
+#. TRANSLATORS: settings group
+#. TRANSLATORS: settings colors tab name
+#: src/gui/emotewindow.cpp:109 src/gui/setup_chat.cpp:70
+#: src/gui/setup_colors.cpp:83
+msgid "Colors"
+msgstr ""
+
+#. TRANSLATORS: emotes tab name
+#: src/gui/emotewindow.cpp:111
+msgid "Fonts"
+msgstr ""
+
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/equipmentwindow.cpp:56 src/gui/inventorywindow.cpp:204
@@ -1481,7 +1523,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/inventorywindow.cpp:580 src/gui/statuswindow.cpp:143
-#: src/gui/statuswindow.cpp:284 src/gui/statuswindow.cpp:337
+#: src/gui/statuswindow.cpp:285 src/gui/statuswindow.cpp:338
 #: src/gui/widgets/characterdisplay.cpp:126
 #, c-format
 msgid "Money: %s"
@@ -1767,7 +1809,7 @@ msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:295
+#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:296
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
@@ -1775,7 +1817,7 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/ministatuswindow.cpp:317 src/gui/statuswindow.cpp:141
-#: src/gui/statuswindow.cpp:302 src/gui/statuswindow.cpp:373
+#: src/gui/statuswindow.cpp:303 src/gui/statuswindow.cpp:374
 #, c-format
 msgid "Level: %d"
 msgstr ""
@@ -1792,34 +1834,45 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:62
+#: src/gui/npcdialog.cpp:66
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:64
+#: src/gui/npcdialog.cpp:68
 msgid "Next"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:68
+#: src/gui/npcdialog.cpp:72
 msgid "Submit"
 msgstr ""
 
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
 #. TRANSLATORS: settings group
-#: src/gui/npcdialog.cpp:77 src/gui/npcpostdialog.cpp:43
+#: src/gui/npcdialog.cpp:81 src/gui/npcpostdialog.cpp:43
 #: src/gui/setup_other.cpp:257
 msgid "NPC"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:566
+#: src/gui/npcdialog.cpp:104 src/gui/popupmenu.cpp:566
 msgid "Clear"
 msgstr ""
 
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: trade window button
+#: src/gui/npcdialog.cpp:109 src/gui/serverdialog.cpp:266
+#: src/gui/shopwindow.cpp:95 src/gui/shopwindow.cpp:102
+#: src/gui/tradewindow.cpp:77
+msgid "Add"
+msgstr ""
+
 #. TRANSLATORS: label in npc post dialog
 #: src/gui/npcpostdialog.cpp:53
 msgid "To:"
@@ -2027,7 +2080,7 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: social window button
-#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1164
+#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1286
 msgid "Leave"
 msgstr ""
 
@@ -2161,7 +2214,7 @@ msgstr ""
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2194
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:985
 msgid "(default)"
 msgstr ""
 
@@ -2393,12 +2446,12 @@ msgid "Passwords do not match."
 msgstr ""
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/selldialog.cpp:242
+#: src/gui/selldialog.cpp:243
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/selldialog.cpp:244
+#: src/gui/selldialog.cpp:245
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
@@ -2409,15 +2462,6 @@ msgid "Choose Your Server"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:266 src/gui/shopwindow.cpp:95
-#: src/gui/shopwindow.cpp:102 src/gui/tradewindow.cpp:77
-msgid "Add"
-msgstr ""
-
-#. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
 #: src/gui/serverdialog.cpp:268 src/gui/widgets/setupitem.cpp:303
 #: src/gui/widgets/setupitem.cpp:430
@@ -3153,11 +3197,6 @@ msgid "Windows"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1862
-msgid "Emotes"
-msgstr ""
-
-#. TRANSLATORS: input tab sub tab name
 #: src/gui/setupactiondata.h:1870
 msgid "Gui"
 msgstr ""
@@ -3313,18 +3352,12 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:61
-msgid "Auto hide chat window."
+msgid "Auto hide chat window"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:65
-msgid "Protect chat focus."
-msgstr ""
-
-#. TRANSLATORS: settings group
-#. TRANSLATORS: settings colors tab name
-#: src/gui/setup_chat.cpp:70 src/gui/setup_colors.cpp:83
-msgid "Colors"
+msgid "Protect chat focus"
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4419,11 +4452,6 @@ msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:249
-msgid "Bold font"
-msgstr ""
-
-#. TRANSLATORS: theme settings label
 #: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr ""
@@ -4909,258 +4937,289 @@ msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
-#: src/gui/socialwindow.cpp:158 src/gui/socialwindow.cpp:259
+#: src/gui/socialwindow.cpp:176 src/gui/socialwindow.cpp:309
 #: src/gui/widgets/guildchattab.cpp:42 src/net/ea/gui/guildtab.cpp:49
 msgid "Guild"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:213
+#: src/gui/socialwindow.cpp:231
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:245
 msgid "Member Invite to Guild"
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:229
+#: src/gui/socialwindow.cpp:247
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:238
+#: src/gui/socialwindow.cpp:256
 msgid "Leave Guild?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:240
+#: src/gui/socialwindow.cpp:258
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:269
+#, c-format
+msgid "Members: %u/%u"
+msgstr ""
+
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:291 src/gui/socialwindow.cpp:361
+#: src/gui/socialwindow.cpp:483
+#, c-format
+msgid "Players: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/socialwindow.cpp:302 src/net/ea/gui/partytab.cpp:49
+#: src/gui/socialwindow.cpp:376 src/net/ea/gui/partytab.cpp:49
 msgid "Party"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:341
+#: src/gui/socialwindow.cpp:415
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
 #. TRANSLATORS: tab in social window
-#: src/gui/socialwindow.cpp:356
+#: src/gui/socialwindow.cpp:430
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:370
+#: src/gui/socialwindow.cpp:444
 msgid "Member Invite to Party"
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:372
+#: src/gui/socialwindow.cpp:446
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:381
+#: src/gui/socialwindow.cpp:455
 msgid "Leave Party?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:383
+#: src/gui/socialwindow.cpp:457
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:681
+#, c-format
+msgid "Visible players: %d"
+msgstr ""
+
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:605
+#: src/gui/socialwindow.cpp:707
 msgid "Nav"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:809
+#, c-format
+msgid "Portals: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:922
+#: src/gui/socialwindow.cpp:1035
 msgid "Atk"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:941
+#: src/gui/socialwindow.cpp:1054
 msgid "Priority mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:943
+#: src/gui/socialwindow.cpp:1056
 msgid "Attack mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:945
+#: src/gui/socialwindow.cpp:1058
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:968
+#: src/gui/socialwindow.cpp:1081
 msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:987
+#: src/gui/socialwindow.cpp:1100
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:989
+#: src/gui/socialwindow.cpp:1102
 msgid "Ignore items"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:1190
+#, c-format
+msgid "Friends: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1091 src/gui/socialwindow.cpp:1563
+#: src/gui/socialwindow.cpp:1213 src/gui/socialwindow.cpp:1687
 msgid "Create Party"
 msgstr ""
 
 #. TRANSLATORS: social window name
 #. TRANSLATORS: full button name
-#: src/gui/socialwindow.cpp:1138 src/gui/windowmenu.cpp:126
+#: src/gui/socialwindow.cpp:1260 src/gui/windowmenu.cpp:126
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1273
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1156
+#: src/gui/socialwindow.cpp:1278
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/socialwindow.cpp:1162
+#: src/gui/socialwindow.cpp:1284
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1345
+#: src/gui/socialwindow.cpp:1469
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1356
+#: src/gui/socialwindow.cpp:1480
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1497
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1424
+#: src/gui/socialwindow.cpp:1548
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1445
+#: src/gui/socialwindow.cpp:1569
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1460
+#: src/gui/socialwindow.cpp:1584
 msgid "Guild Name"
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1462
+#: src/gui/socialwindow.cpp:1586
 msgid "Choose your guild's name."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1477
+#: src/gui/socialwindow.cpp:1601
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1485
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1616
 msgid "Accept Guild Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1631
 msgid "Received party request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1519
+#: src/gui/socialwindow.cpp:1643
 msgid "You have been invited you to join a party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1524
+#: src/gui/socialwindow.cpp:1648
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1533
+#: src/gui/socialwindow.cpp:1657
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1539
+#: src/gui/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1673
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1688
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1694
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1572
+#: src/gui/socialwindow.cpp:1696
 msgid "Choose your party's name."
 msgstr ""
 
@@ -5180,24 +5239,24 @@ msgid "MP:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:235 src/gui/statuswindow.cpp:423
+#: src/gui/statuswindow.cpp:234 src/gui/statuswindow.cpp:424
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:237
+#: src/gui/statuswindow.cpp:236
 msgid "Job:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:288 src/gui/statuswindow.cpp:345
+#: src/gui/statuswindow.cpp:289 src/gui/statuswindow.cpp:346
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:360
+#: src/gui/statuswindow.cpp:361
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
@@ -5643,13 +5702,13 @@ msgid "%s whispers: %s"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:540
+#: src/gui/widgets/chattab.cpp:541
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:545
+#: src/gui/widgets/chattab.cpp:546
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -5935,24 +5994,24 @@ msgstr ""
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/inputmanager.cpp:328 src/inputmanager.cpp:372 src/keyboardconfig.cpp:90
+#: src/inputmanager.cpp:329 src/inputmanager.cpp:373 src/keyboardconfig.cpp:90
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/inputmanager.cpp:334
+#: src/inputmanager.cpp:335
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/inputmanager.cpp:348
+#: src/inputmanager.cpp:349
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/inputmanager.cpp:378
+#: src/inputmanager.cpp:379
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -5960,7 +6019,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/inputmanager.cpp:392 src/keyboardconfig.cpp:103
+#: src/inputmanager.cpp:393 src/keyboardconfig.cpp:134
 msgid "u key"
 msgstr ""
 
@@ -6635,55 +6694,55 @@ msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:176
+#: src/net/ea/guildhandler.cpp:178
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:179
+#: src/net/ea/guildhandler.cpp:181
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:186
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:187
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:193
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:195
+#: src/net/ea/guildhandler.cpp:197
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:198
+#: src/net/ea/guildhandler.cpp:200
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
@@ -7558,8 +7617,8 @@ msgstr ""
 #. TRANSLATORS: being info default name
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
-#: src/resources/avatardb.cpp:69 src/resources/beinginfo.cpp:40
-#: src/resources/itemdb.cpp:291 src/resources/monsterdb.cpp:100
+#: src/resources/avatardb.cpp:69 src/resources/beinginfo.cpp:41
+#: src/resources/itemdb.cpp:295 src/resources/monsterdb.cpp:100
 msgid "unnamed"
 msgstr ""
 
diff --git a/po/manaplus.pot b/po/manaplus.pot
index 5e51aee12..8bb101534 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-08-03 13:52+0300\n"
+"POT-Creation-Date: 2013-08-17 13:35+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"
@@ -38,21 +38,21 @@ msgstr ""
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1710 src/gui/whoisonline.cpp:835
+#: src/being.cpp:1713 src/gui/whoisonline.cpp:842
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1715 src/gui/whoisonline.cpp:840
+#: src/being.cpp:1718 src/gui/whoisonline.cpp:847
 msgid "I"
 msgstr ""
 
@@ -89,8 +89,8 @@ msgstr ""
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:1176 src/gui/didyouknowwindow.cpp:78
-#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:66
-#: src/gui/npcdialog.cpp:103 src/gui/popupmenu.cpp:562
+#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:70
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:562
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:81
 msgid "Close"
 msgstr ""
@@ -425,14 +425,14 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:259 src/gui/widgets/chattab.cpp:465
+#: src/game.cpp:259 src/gui/widgets/chattab.cpp:466
 msgid "General"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: debug window name
 #. TRANSLATORS: full button name
-#: src/game.cpp:275 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:467
+#: src/game.cpp:275 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:468
 #: src/gui/windowmenu.cpp:154
 msgid "Debug"
 msgstr ""
@@ -489,7 +489,7 @@ msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:105
+#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:111
 msgid "Reset"
 msgstr ""
 
@@ -607,8 +607,8 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/buydialog.cpp:265 src/gui/itemamountwindow.cpp:202
-#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:96
-#: src/gui/selldialog.cpp:101 src/gui/statuswindow.cpp:790
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:100
+#: src/gui/selldialog.cpp:101 src/gui/statuswindow.cpp:791
 msgid "+"
 msgstr ""
 
@@ -619,8 +619,8 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
 #: src/gui/buydialog.cpp:268 src/gui/itemamountwindow.cpp:200
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:98
-#: src/gui/selldialog.cpp:103 src/gui/statuswindow.cpp:803
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:102
+#: src/gui/selldialog.cpp:103 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr ""
 
@@ -628,7 +628,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/buydialog.cpp:271 src/gui/charcreatedialog.cpp:122
-#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1160
+#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1282
 msgid "Create"
 msgstr ""
 
@@ -651,8 +651,8 @@ msgstr ""
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
 #: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:109
-#: src/gui/statuswindow.cpp:531 src/gui/statuswindow.cpp:586
-#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:821
+#: src/gui/statuswindow.cpp:532 src/gui/statuswindow.cpp:587
+#: src/gui/statuswindow.cpp:788 src/gui/statuswindow.cpp:822
 msgid "Max"
 msgstr ""
 
@@ -712,7 +712,7 @@ msgstr ""
 #: src/gui/popupmenu.cpp:2309 src/gui/popupmenu.cpp:2543
 #: src/gui/popupmenu.cpp:2660 src/gui/quitdialog.cpp:73
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
-#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1094
+#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1216
 #: src/gui/textcommandeditor.cpp:211 src/gui/textdialog.cpp:53
 #: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:181
 msgid "Cancel"
@@ -996,92 +996,102 @@ msgstr ""
 #. TRANSLATORS: inventory sort mode
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
-#: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:65
+#: src/gui/chatwindow.cpp:143 src/gui/inventorywindow.cpp:65
 #: src/gui/setup_other.cpp:69 src/gui/setup_visual.cpp:77
 msgid "default"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:144
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:145 src/gui/widgets/colormodel.cpp:76
 msgid "black"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:146
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:147 src/gui/widgets/colormodel.cpp:78
 msgid "red"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:148
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:149 src/gui/widgets/colormodel.cpp:80
 msgid "green"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:150
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:151 src/gui/widgets/colormodel.cpp:82
 msgid "blue"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:152
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:153 src/gui/widgets/colormodel.cpp:84
 msgid "gold"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:154
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:155 src/gui/widgets/colormodel.cpp:86
 msgid "yellow"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:156
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:157 src/gui/widgets/colormodel.cpp:88
 msgid "pink"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:158
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:159 src/gui/widgets/colormodel.cpp:90
 msgid "purple"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:160
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:161 src/gui/widgets/colormodel.cpp:92
 msgid "grey"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:162
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:163 src/gui/widgets/colormodel.cpp:94
 msgid "brown"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:164
+#: src/gui/chatwindow.cpp:165
 msgid "rainbow 1"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:166
+#: src/gui/chatwindow.cpp:167
 msgid "rainbow 2"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:168
+#: src/gui/chatwindow.cpp:169
 msgid "rainbow 3"
 msgstr ""
 
 #. TRANSLATORS: chat window name
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
-#: src/gui/chatwindow.cpp:195 src/gui/setupactiondata.h:1866
+#: src/gui/chatwindow.cpp:196 src/gui/setupactiondata.h:1866
 #: src/gui/setup_chat.cpp:50 src/gui/windowmenu.cpp:88
 msgid "Chat"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:659
+#: src/gui/chatwindow.cpp:684
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1066
+#: src/gui/chatwindow.cpp:1091
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -1390,14 +1400,38 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
+#. TRANSLATORS: font size
+#: src/gui/emotewindow.cpp:49
+msgid "Normal font"
+msgstr ""
+
+#. TRANSLATORS: font size
+#. TRANSLATORS: theme settings label
+#: src/gui/emotewindow.cpp:51 src/gui/setup_theme.cpp:249
+msgid "Bold font"
+msgstr ""
+
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/emotewindow.cpp:41 src/gui/emotewindow.cpp:61
+#: src/gui/emotewindow.cpp:56 src/gui/emotewindow.cpp:107
 #: src/gui/setupactiondata.h:1862
 msgid "Emotes"
 msgstr ""
 
+#. TRANSLATORS: emotes tab name
+#. TRANSLATORS: settings group
+#. TRANSLATORS: settings colors tab name
+#: src/gui/emotewindow.cpp:109 src/gui/setup_chat.cpp:70
+#: src/gui/setup_colors.cpp:83
+msgid "Colors"
+msgstr ""
+
+#. TRANSLATORS: emotes tab name
+#: src/gui/emotewindow.cpp:111
+msgid "Fonts"
+msgstr ""
+
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/equipmentwindow.cpp:56 src/gui/inventorywindow.cpp:204
@@ -1489,7 +1523,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/inventorywindow.cpp:580 src/gui/statuswindow.cpp:143
-#: src/gui/statuswindow.cpp:284 src/gui/statuswindow.cpp:337
+#: src/gui/statuswindow.cpp:285 src/gui/statuswindow.cpp:338
 #: src/gui/widgets/characterdisplay.cpp:126
 #, c-format
 msgid "Money: %s"
@@ -1777,7 +1811,7 @@ msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:295
+#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:296
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
@@ -1785,7 +1819,7 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/ministatuswindow.cpp:317 src/gui/statuswindow.cpp:141
-#: src/gui/statuswindow.cpp:302 src/gui/statuswindow.cpp:373
+#: src/gui/statuswindow.cpp:303 src/gui/statuswindow.cpp:374
 #, c-format
 msgid "Level: %d"
 msgstr ""
@@ -1802,34 +1836,45 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:62
+#: src/gui/npcdialog.cpp:66
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:64
+#: src/gui/npcdialog.cpp:68
 msgid "Next"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:68
+#: src/gui/npcdialog.cpp:72
 msgid "Submit"
 msgstr ""
 
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
 #. TRANSLATORS: settings group
-#: src/gui/npcdialog.cpp:77 src/gui/npcpostdialog.cpp:43
+#: src/gui/npcdialog.cpp:81 src/gui/npcpostdialog.cpp:43
 #: src/gui/setup_other.cpp:257
 msgid "NPC"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:566
+#: src/gui/npcdialog.cpp:104 src/gui/popupmenu.cpp:566
 msgid "Clear"
 msgstr ""
 
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: trade window button
+#: src/gui/npcdialog.cpp:109 src/gui/serverdialog.cpp:266
+#: src/gui/shopwindow.cpp:95 src/gui/shopwindow.cpp:102
+#: src/gui/tradewindow.cpp:77
+msgid "Add"
+msgstr ""
+
 #. TRANSLATORS: label in npc post dialog
 #: src/gui/npcpostdialog.cpp:53
 msgid "To:"
@@ -2037,7 +2082,7 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: social window button
-#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1164
+#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1286
 msgid "Leave"
 msgstr ""
 
@@ -2171,7 +2216,7 @@ msgstr ""
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2194
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:985
 msgid "(default)"
 msgstr ""
 
@@ -2419,15 +2464,6 @@ msgid "Choose Your Server"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:266 src/gui/shopwindow.cpp:95
-#: src/gui/shopwindow.cpp:102 src/gui/tradewindow.cpp:77
-msgid "Add"
-msgstr ""
-
-#. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
 #: src/gui/serverdialog.cpp:268 src/gui/widgets/setupitem.cpp:303
 #: src/gui/widgets/setupitem.cpp:430
@@ -3318,18 +3354,12 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:61
-msgid "Auto hide chat window."
+msgid "Auto hide chat window"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:65
-msgid "Protect chat focus."
-msgstr ""
-
-#. TRANSLATORS: settings group
-#. TRANSLATORS: settings colors tab name
-#: src/gui/setup_chat.cpp:70 src/gui/setup_colors.cpp:83
-msgid "Colors"
+msgid "Protect chat focus"
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4424,11 +4454,6 @@ msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:249
-msgid "Bold font"
-msgstr ""
-
-#. TRANSLATORS: theme settings label
 #: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr ""
@@ -4914,258 +4939,289 @@ msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
-#: src/gui/socialwindow.cpp:158 src/gui/socialwindow.cpp:259
+#: src/gui/socialwindow.cpp:176 src/gui/socialwindow.cpp:309
 #: src/gui/widgets/guildchattab.cpp:42 src/net/ea/gui/guildtab.cpp:49
 msgid "Guild"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:213
+#: src/gui/socialwindow.cpp:231
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:245
 msgid "Member Invite to Guild"
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:229
+#: src/gui/socialwindow.cpp:247
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:238
+#: src/gui/socialwindow.cpp:256
 msgid "Leave Guild?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:240
+#: src/gui/socialwindow.cpp:258
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:269
+#, c-format
+msgid "Members: %u/%u"
+msgstr ""
+
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:291 src/gui/socialwindow.cpp:361
+#: src/gui/socialwindow.cpp:483
+#, c-format
+msgid "Players: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/socialwindow.cpp:302 src/net/ea/gui/partytab.cpp:49
+#: src/gui/socialwindow.cpp:376 src/net/ea/gui/partytab.cpp:49
 msgid "Party"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:341
+#: src/gui/socialwindow.cpp:415
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
 #. TRANSLATORS: tab in social window
-#: src/gui/socialwindow.cpp:356
+#: src/gui/socialwindow.cpp:430
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:370
+#: src/gui/socialwindow.cpp:444
 msgid "Member Invite to Party"
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:372
+#: src/gui/socialwindow.cpp:446
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:381
+#: src/gui/socialwindow.cpp:455
 msgid "Leave Party?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:383
+#: src/gui/socialwindow.cpp:457
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:681
+#, c-format
+msgid "Visible players: %d"
+msgstr ""
+
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:605
+#: src/gui/socialwindow.cpp:707
 msgid "Nav"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:809
+#, c-format
+msgid "Portals: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:922
+#: src/gui/socialwindow.cpp:1035
 msgid "Atk"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:941
+#: src/gui/socialwindow.cpp:1054
 msgid "Priority mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:943
+#: src/gui/socialwindow.cpp:1056
 msgid "Attack mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:945
+#: src/gui/socialwindow.cpp:1058
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:968
+#: src/gui/socialwindow.cpp:1081
 msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:987
+#: src/gui/socialwindow.cpp:1100
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:989
+#: src/gui/socialwindow.cpp:1102
 msgid "Ignore items"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:1190
+#, c-format
+msgid "Friends: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1091 src/gui/socialwindow.cpp:1563
+#: src/gui/socialwindow.cpp:1213 src/gui/socialwindow.cpp:1687
 msgid "Create Party"
 msgstr ""
 
 #. TRANSLATORS: social window name
 #. TRANSLATORS: full button name
-#: src/gui/socialwindow.cpp:1138 src/gui/windowmenu.cpp:126
+#: src/gui/socialwindow.cpp:1260 src/gui/windowmenu.cpp:126
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1273
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1156
+#: src/gui/socialwindow.cpp:1278
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/socialwindow.cpp:1162
+#: src/gui/socialwindow.cpp:1284
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1345
+#: src/gui/socialwindow.cpp:1469
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1356
+#: src/gui/socialwindow.cpp:1480
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1497
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1424
+#: src/gui/socialwindow.cpp:1548
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1445
+#: src/gui/socialwindow.cpp:1569
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1460
+#: src/gui/socialwindow.cpp:1584
 msgid "Guild Name"
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1462
+#: src/gui/socialwindow.cpp:1586
 msgid "Choose your guild's name."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1477
+#: src/gui/socialwindow.cpp:1601
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1485
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1616
 msgid "Accept Guild Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1631
 msgid "Received party request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1519
+#: src/gui/socialwindow.cpp:1643
 msgid "You have been invited you to join a party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1524
+#: src/gui/socialwindow.cpp:1648
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1533
+#: src/gui/socialwindow.cpp:1657
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1539
+#: src/gui/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1673
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1688
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1694
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1572
+#: src/gui/socialwindow.cpp:1696
 msgid "Choose your party's name."
 msgstr ""
 
@@ -5185,24 +5241,24 @@ msgid "MP:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:235 src/gui/statuswindow.cpp:423
+#: src/gui/statuswindow.cpp:234 src/gui/statuswindow.cpp:424
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:237
+#: src/gui/statuswindow.cpp:236
 msgid "Job:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:288 src/gui/statuswindow.cpp:345
+#: src/gui/statuswindow.cpp:289 src/gui/statuswindow.cpp:346
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:360
+#: src/gui/statuswindow.cpp:361
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
@@ -5647,13 +5703,13 @@ msgid "%s whispers: %s"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:540
+#: src/gui/widgets/chattab.cpp:541
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:545
+#: src/gui/widgets/chattab.cpp:546
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -5938,24 +5994,24 @@ msgstr ""
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/inputmanager.cpp:328 src/inputmanager.cpp:372 src/keyboardconfig.cpp:90
+#: src/inputmanager.cpp:329 src/inputmanager.cpp:373 src/keyboardconfig.cpp:90
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/inputmanager.cpp:334
+#: src/inputmanager.cpp:335
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/inputmanager.cpp:348
+#: src/inputmanager.cpp:349
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/inputmanager.cpp:378
+#: src/inputmanager.cpp:379
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -5963,7 +6019,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/inputmanager.cpp:392 src/keyboardconfig.cpp:103
+#: src/inputmanager.cpp:393 src/keyboardconfig.cpp:134
 msgid "u key"
 msgstr ""
 
@@ -6639,55 +6695,55 @@ msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:176
+#: src/net/ea/guildhandler.cpp:178
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:179
+#: src/net/ea/guildhandler.cpp:181
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:186
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:187
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:193
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:195
+#: src/net/ea/guildhandler.cpp:197
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:198
+#: src/net/ea/guildhandler.cpp:200
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
diff --git a/po/nb.po b/po/nb.po
index a312bef2f..c28eae373 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-07-19 22:23+0300\n"
-"PO-Revision-Date: 2013-07-19 19:52+0000\n"
+"POT-Creation-Date: 2013-08-16 20:45+0300\n"
+"PO-Revision-Date: 2013-08-16 17:53+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/manaplus/language/nb/)\n"
 "MIME-Version: 1.0\n"
@@ -38,21 +38,21 @@ msgstr ""
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1606 src/gui/whoisonline.cpp:835
+#: src/being.cpp:1713 src/gui/whoisonline.cpp:842
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1611 src/gui/whoisonline.cpp:840
+#: src/being.cpp:1718 src/gui/whoisonline.cpp:847
 msgid "I"
 msgstr ""
 
@@ -89,8 +89,8 @@ msgstr ""
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:1176 src/gui/didyouknowwindow.cpp:78
-#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:66
-#: src/gui/npcdialog.cpp:103 src/gui/popupmenu.cpp:562
+#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:70
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:562
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:81
 msgid "Close"
 msgstr "Lukk"
@@ -425,36 +425,36 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:465
+#: src/game.cpp:259 src/gui/widgets/chattab.cpp:466
 msgid "General"
 msgstr "Generelt"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: debug window name
 #. TRANSLATORS: full button name
-#: src/game.cpp:272 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:467
+#: src/game.cpp:275 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:468
 #: src/gui/windowmenu.cpp:154
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:536
+#: src/game.cpp:540
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:546
+#: src/game.cpp:550
 msgid "Saving screenshot failed!"
 msgstr "Lagring av skjermbilde feilet!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:618
+#: src/game.cpp:622
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:621
+#: src/game.cpp:625
 msgid "Network Error"
 msgstr "Nettverksfeil"
 
@@ -489,7 +489,7 @@ msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:105
+#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:111
 msgid "Reset"
 msgstr "Tilbakestill"
 
@@ -590,7 +590,7 @@ msgstr "Kjøp"
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
 #: src/gui/buydialog.cpp:251 src/gui/buydialog.cpp:531
-#: src/gui/selldialog.cpp:96 src/gui/selldialog.cpp:356
+#: src/gui/selldialog.cpp:97 src/gui/selldialog.cpp:357
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Pris: %s / Totalt: %s"
@@ -607,8 +607,8 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/buydialog.cpp:265 src/gui/itemamountwindow.cpp:202
-#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:96
-#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:790
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:100
+#: src/gui/selldialog.cpp:101 src/gui/statuswindow.cpp:791
 msgid "+"
 msgstr ""
 
@@ -619,8 +619,8 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
 #: src/gui/buydialog.cpp:268 src/gui/itemamountwindow.cpp:200
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:98
-#: src/gui/selldialog.cpp:102 src/gui/statuswindow.cpp:803
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:102
+#: src/gui/selldialog.cpp:103 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr ""
 
@@ -628,7 +628,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/buydialog.cpp:271 src/gui/charcreatedialog.cpp:122
-#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1160
+#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1282
 msgid "Create"
 msgstr "Lag"
 
@@ -640,7 +640,7 @@ msgstr "Lag"
 #. TRANSLATORS: input action name
 #: src/gui/buydialog.cpp:273 src/gui/quitdialog.cpp:55
 #: src/gui/quitdialog.cpp:60 src/gui/quitdialog.cpp:62
-#: src/gui/selldialog.cpp:106 src/gui/serverdialog.cpp:262
+#: src/gui/selldialog.cpp:107 src/gui/serverdialog.cpp:262
 #: src/gui/setupactiondata.h:177
 msgid "Quit"
 msgstr "Avslutt"
@@ -650,9 +650,9 @@ msgstr "Avslutt"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:108
-#: src/gui/statuswindow.cpp:531 src/gui/statuswindow.cpp:586
-#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:821
+#: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:109
+#: src/gui/statuswindow.cpp:532 src/gui/statuswindow.cpp:587
+#: src/gui/statuswindow.cpp:788 src/gui/statuswindow.cpp:822
 msgid "Max"
 msgstr "Maks"
 
@@ -672,7 +672,7 @@ msgstr "Butikk"
 #. TRANSLATORS: sell dialog button
 #: src/gui/buyselldialog.cpp:69 src/gui/popupmenu.cpp:223
 #: src/gui/popupmenu.cpp:2455 src/gui/selldialog.cpp:54
-#: src/gui/selldialog.cpp:64 src/gui/selldialog.cpp:104
+#: src/gui/selldialog.cpp:64 src/gui/selldialog.cpp:105
 msgid "Sell"
 msgstr "Selg"
 
@@ -712,7 +712,7 @@ msgstr "Selg"
 #: src/gui/popupmenu.cpp:2309 src/gui/popupmenu.cpp:2543
 #: src/gui/popupmenu.cpp:2660 src/gui/quitdialog.cpp:73
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
-#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1094
+#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1216
 #: src/gui/textcommandeditor.cpp:211 src/gui/textdialog.cpp:53
 #: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:181
 msgid "Cancel"
@@ -996,92 +996,102 @@ msgstr ""
 #. TRANSLATORS: inventory sort mode
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
-#: src/gui/chatwindow.cpp:139 src/gui/inventorywindow.cpp:65
+#: src/gui/chatwindow.cpp:143 src/gui/inventorywindow.cpp:65
 #: src/gui/setup_other.cpp:69 src/gui/setup_visual.cpp:77
 msgid "default"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:141
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:145 src/gui/widgets/colormodel.cpp:76
 msgid "black"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:143
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:147 src/gui/widgets/colormodel.cpp:78
 msgid "red"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:145
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:149 src/gui/widgets/colormodel.cpp:80
 msgid "green"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:147
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:151 src/gui/widgets/colormodel.cpp:82
 msgid "blue"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:149
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:153 src/gui/widgets/colormodel.cpp:84
 msgid "gold"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:151
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:155 src/gui/widgets/colormodel.cpp:86
 msgid "yellow"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:153
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:157 src/gui/widgets/colormodel.cpp:88
 msgid "pink"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:155
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:159 src/gui/widgets/colormodel.cpp:90
 msgid "purple"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:157
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:161 src/gui/widgets/colormodel.cpp:92
 msgid "grey"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:159
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:163 src/gui/widgets/colormodel.cpp:94
 msgid "brown"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:161
+#: src/gui/chatwindow.cpp:165
 msgid "rainbow 1"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:163
+#: src/gui/chatwindow.cpp:167
 msgid "rainbow 2"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:165
+#: src/gui/chatwindow.cpp:169
 msgid "rainbow 3"
 msgstr ""
 
 #. TRANSLATORS: chat window name
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
-#: src/gui/chatwindow.cpp:192 src/gui/setupactiondata.h:1866
+#: src/gui/chatwindow.cpp:196 src/gui/setupactiondata.h:1866
 #: src/gui/setup_chat.cpp:50 src/gui/windowmenu.cpp:88
 msgid "Chat"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:641
+#: src/gui/chatwindow.cpp:684
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1044
+#: src/gui/chatwindow.cpp:1091
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -1390,6 +1400,38 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
+#. TRANSLATORS: font size
+#: src/gui/emotewindow.cpp:49
+msgid "Normal font"
+msgstr ""
+
+#. TRANSLATORS: font size
+#. TRANSLATORS: theme settings label
+#: src/gui/emotewindow.cpp:51 src/gui/setup_theme.cpp:249
+msgid "Bold font"
+msgstr ""
+
+#. TRANSLATORS: emotes window name
+#. TRANSLATORS: emotes tab name
+#. TRANSLATORS: input tab sub tab name
+#: src/gui/emotewindow.cpp:56 src/gui/emotewindow.cpp:107
+#: src/gui/setupactiondata.h:1862
+msgid "Emotes"
+msgstr ""
+
+#. TRANSLATORS: emotes tab name
+#. TRANSLATORS: settings group
+#. TRANSLATORS: settings colors tab name
+#: src/gui/emotewindow.cpp:109 src/gui/setup_chat.cpp:70
+#: src/gui/setup_colors.cpp:83
+msgid "Colors"
+msgstr "Farger"
+
+#. TRANSLATORS: emotes tab name
+#: src/gui/emotewindow.cpp:111
+msgid "Fonts"
+msgstr ""
+
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/equipmentwindow.cpp:56 src/gui/inventorywindow.cpp:204
@@ -1481,7 +1523,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/inventorywindow.cpp:580 src/gui/statuswindow.cpp:143
-#: src/gui/statuswindow.cpp:284 src/gui/statuswindow.cpp:337
+#: src/gui/statuswindow.cpp:285 src/gui/statuswindow.cpp:338
 #: src/gui/widgets/characterdisplay.cpp:126
 #, c-format
 msgid "Money: %s"
@@ -1769,7 +1811,7 @@ msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:295
+#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:296
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
@@ -1777,7 +1819,7 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/ministatuswindow.cpp:317 src/gui/statuswindow.cpp:141
-#: src/gui/statuswindow.cpp:302 src/gui/statuswindow.cpp:373
+#: src/gui/statuswindow.cpp:303 src/gui/statuswindow.cpp:374
 #, c-format
 msgid "Level: %d"
 msgstr "Nivå: %d"
@@ -1794,34 +1836,45 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:62
+#: src/gui/npcdialog.cpp:66
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:64
+#: src/gui/npcdialog.cpp:68
 msgid "Next"
 msgstr "Neste"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:68
+#: src/gui/npcdialog.cpp:72
 msgid "Submit"
 msgstr "Bekreft"
 
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
 #. TRANSLATORS: settings group
-#: src/gui/npcdialog.cpp:77 src/gui/npcpostdialog.cpp:43
+#: src/gui/npcdialog.cpp:81 src/gui/npcpostdialog.cpp:43
 #: src/gui/setup_other.cpp:257
 msgid "NPC"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:566
+#: src/gui/npcdialog.cpp:104 src/gui/popupmenu.cpp:566
 msgid "Clear"
 msgstr ""
 
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: trade window button
+#: src/gui/npcdialog.cpp:109 src/gui/serverdialog.cpp:266
+#: src/gui/shopwindow.cpp:95 src/gui/shopwindow.cpp:102
+#: src/gui/tradewindow.cpp:77
+msgid "Add"
+msgstr ""
+
 #. TRANSLATORS: label in npc post dialog
 #: src/gui/npcpostdialog.cpp:53
 msgid "To:"
@@ -2029,7 +2082,7 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: social window button
-#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1164
+#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1286
 msgid "Leave"
 msgstr ""
 
@@ -2163,7 +2216,7 @@ msgstr ""
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2194
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:985
 msgid "(default)"
 msgstr ""
 
@@ -2395,12 +2448,12 @@ msgid "Passwords do not match."
 msgstr "Passordene stemmer ikke."
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/selldialog.cpp:242
+#: src/gui/selldialog.cpp:243
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/selldialog.cpp:244
+#: src/gui/selldialog.cpp:245
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
@@ -2411,15 +2464,6 @@ msgid "Choose Your Server"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:266 src/gui/shopwindow.cpp:95
-#: src/gui/shopwindow.cpp:102 src/gui/tradewindow.cpp:77
-msgid "Add"
-msgstr ""
-
-#. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
 #: src/gui/serverdialog.cpp:268 src/gui/widgets/setupitem.cpp:303
 #: src/gui/widgets/setupitem.cpp:430
@@ -3155,11 +3199,6 @@ msgid "Windows"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1862
-msgid "Emotes"
-msgstr ""
-
-#. TRANSLATORS: input tab sub tab name
 #: src/gui/setupactiondata.h:1870
 msgid "Gui"
 msgstr ""
@@ -3315,20 +3354,14 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:61
-msgid "Auto hide chat window."
+msgid "Auto hide chat window"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:65
-msgid "Protect chat focus."
+msgid "Protect chat focus"
 msgstr ""
 
-#. TRANSLATORS: settings group
-#. TRANSLATORS: settings colors tab name
-#: src/gui/setup_chat.cpp:70 src/gui/setup_colors.cpp:83
-msgid "Colors"
-msgstr "Farger"
-
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:73
 msgid "Remove colors from received chat messages"
@@ -4421,11 +4454,6 @@ msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:249
-msgid "Bold font"
-msgstr ""
-
-#. TRANSLATORS: theme settings label
 #: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr ""
@@ -4911,258 +4939,289 @@ msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
-#: src/gui/socialwindow.cpp:158 src/gui/socialwindow.cpp:259
+#: src/gui/socialwindow.cpp:176 src/gui/socialwindow.cpp:309
 #: src/gui/widgets/guildchattab.cpp:42 src/net/ea/gui/guildtab.cpp:49
 msgid "Guild"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:213
+#: src/gui/socialwindow.cpp:231
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:245
 msgid "Member Invite to Guild"
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:229
+#: src/gui/socialwindow.cpp:247
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:238
+#: src/gui/socialwindow.cpp:256
 msgid "Leave Guild?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:240
+#: src/gui/socialwindow.cpp:258
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:269
+#, c-format
+msgid "Members: %u/%u"
+msgstr ""
+
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:291 src/gui/socialwindow.cpp:361
+#: src/gui/socialwindow.cpp:483
+#, c-format
+msgid "Players: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/socialwindow.cpp:302 src/net/ea/gui/partytab.cpp:49
+#: src/gui/socialwindow.cpp:376 src/net/ea/gui/partytab.cpp:49
 msgid "Party"
 msgstr "Gruppe"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:341
+#: src/gui/socialwindow.cpp:415
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
 #. TRANSLATORS: tab in social window
-#: src/gui/socialwindow.cpp:356
+#: src/gui/socialwindow.cpp:430
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:370
+#: src/gui/socialwindow.cpp:444
 msgid "Member Invite to Party"
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:372
+#: src/gui/socialwindow.cpp:446
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:381
+#: src/gui/socialwindow.cpp:455
 msgid "Leave Party?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:383
+#: src/gui/socialwindow.cpp:457
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:681
+#, c-format
+msgid "Visible players: %d"
+msgstr ""
+
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:605
+#: src/gui/socialwindow.cpp:707
 msgid "Nav"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:809
+#, c-format
+msgid "Portals: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:922
+#: src/gui/socialwindow.cpp:1035
 msgid "Atk"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:941
+#: src/gui/socialwindow.cpp:1054
 msgid "Priority mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:943
+#: src/gui/socialwindow.cpp:1056
 msgid "Attack mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:945
+#: src/gui/socialwindow.cpp:1058
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:968
+#: src/gui/socialwindow.cpp:1081
 msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:987
+#: src/gui/socialwindow.cpp:1100
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:989
+#: src/gui/socialwindow.cpp:1102
 msgid "Ignore items"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:1190
+#, c-format
+msgid "Friends: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1091 src/gui/socialwindow.cpp:1563
+#: src/gui/socialwindow.cpp:1213 src/gui/socialwindow.cpp:1687
 msgid "Create Party"
 msgstr ""
 
 #. TRANSLATORS: social window name
 #. TRANSLATORS: full button name
-#: src/gui/socialwindow.cpp:1138 src/gui/windowmenu.cpp:126
+#: src/gui/socialwindow.cpp:1260 src/gui/windowmenu.cpp:126
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1273
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1156
+#: src/gui/socialwindow.cpp:1278
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/socialwindow.cpp:1162
+#: src/gui/socialwindow.cpp:1284
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1345
+#: src/gui/socialwindow.cpp:1469
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1356
+#: src/gui/socialwindow.cpp:1480
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1497
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1424
+#: src/gui/socialwindow.cpp:1548
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1445
+#: src/gui/socialwindow.cpp:1569
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1460
+#: src/gui/socialwindow.cpp:1584
 msgid "Guild Name"
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1462
+#: src/gui/socialwindow.cpp:1586
 msgid "Choose your guild's name."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1477
+#: src/gui/socialwindow.cpp:1601
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1485
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1616
 msgid "Accept Guild Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1631
 msgid "Received party request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1519
+#: src/gui/socialwindow.cpp:1643
 msgid "You have been invited you to join a party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1524
+#: src/gui/socialwindow.cpp:1648
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1533
+#: src/gui/socialwindow.cpp:1657
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s har invitert deg til sin gruppe."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1539
+#: src/gui/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1673
 msgid "Accept Party Invite"
 msgstr "Godta Gruppeinvitasjon"
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1688
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1694
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1572
+#: src/gui/socialwindow.cpp:1696
 msgid "Choose your party's name."
 msgstr ""
 
@@ -5182,24 +5241,24 @@ msgid "MP:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:235 src/gui/statuswindow.cpp:423
+#: src/gui/statuswindow.cpp:234 src/gui/statuswindow.cpp:424
 #, c-format
 msgid "Job: %d"
 msgstr "Jobb: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:237
+#: src/gui/statuswindow.cpp:236
 msgid "Job:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:288 src/gui/statuswindow.cpp:345
+#: src/gui/statuswindow.cpp:289 src/gui/statuswindow.cpp:346
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:360
+#: src/gui/statuswindow.cpp:361
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
@@ -5645,13 +5704,13 @@ msgid "%s whispers: %s"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:540
+#: src/gui/widgets/chattab.cpp:541
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:545
+#: src/gui/widgets/chattab.cpp:546
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -5937,24 +5996,24 @@ msgstr ""
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/inputmanager.cpp:328 src/inputmanager.cpp:372 src/keyboardconfig.cpp:90
+#: src/inputmanager.cpp:329 src/inputmanager.cpp:373 src/keyboardconfig.cpp:90
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/inputmanager.cpp:334
+#: src/inputmanager.cpp:335
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/inputmanager.cpp:348
+#: src/inputmanager.cpp:349
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/inputmanager.cpp:378
+#: src/inputmanager.cpp:379
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -5962,7 +6021,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/inputmanager.cpp:392 src/keyboardconfig.cpp:103
+#: src/inputmanager.cpp:393 src/keyboardconfig.cpp:134
 msgid "u key"
 msgstr ""
 
@@ -6638,55 +6697,55 @@ msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:176
+#: src/net/ea/guildhandler.cpp:178
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:179
+#: src/net/ea/guildhandler.cpp:181
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:186
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:187
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:193
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:195
+#: src/net/ea/guildhandler.cpp:197
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:198
+#: src/net/ea/guildhandler.cpp:200
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
@@ -7561,8 +7620,8 @@ msgstr ""
 #. TRANSLATORS: being info default name
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
-#: src/resources/avatardb.cpp:69 src/resources/beinginfo.cpp:40
-#: src/resources/itemdb.cpp:291 src/resources/monsterdb.cpp:100
+#: src/resources/avatardb.cpp:69 src/resources/beinginfo.cpp:41
+#: src/resources/itemdb.cpp:295 src/resources/monsterdb.cpp:100
 msgid "unnamed"
 msgstr ""
 
diff --git a/po/nl.po b/po/nl.po
index fdfe47fb1..b0467cf3f 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-07-19 22:23+0300\n"
-"PO-Revision-Date: 2013-07-19 19:52+0000\n"
+"POT-Creation-Date: 2013-08-16 20:45+0300\n"
+"PO-Revision-Date: 2013-08-16 17:53+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/manaplus/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -39,21 +39,21 @@ msgstr ""
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "dodge"
 msgstr "ontwijk"
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "miss"
 msgstr "mis"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1606 src/gui/whoisonline.cpp:835
+#: src/being.cpp:1713 src/gui/whoisonline.cpp:842
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1611 src/gui/whoisonline.cpp:840
+#: src/being.cpp:1718 src/gui/whoisonline.cpp:847
 msgid "I"
 msgstr ""
 
@@ -90,8 +90,8 @@ msgstr ""
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:1176 src/gui/didyouknowwindow.cpp:78
-#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:66
-#: src/gui/npcdialog.cpp:103 src/gui/popupmenu.cpp:562
+#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:70
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:562
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:81
 msgid "Close"
 msgstr "Sluiten"
@@ -426,36 +426,36 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "Opties voor /%s zijn \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:465
+#: src/game.cpp:259 src/gui/widgets/chattab.cpp:466
 msgid "General"
 msgstr "Algemeen"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: debug window name
 #. TRANSLATORS: full button name
-#: src/game.cpp:272 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:467
+#: src/game.cpp:275 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:468
 #: src/gui/windowmenu.cpp:154
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:536
+#: src/game.cpp:540
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:546
+#: src/game.cpp:550
 msgid "Saving screenshot failed!"
 msgstr "Opslaan van screenshot mislukt!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:618
+#: src/game.cpp:622
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:621
+#: src/game.cpp:625
 msgid "Network Error"
 msgstr "Netwerkfout"
 
@@ -490,7 +490,7 @@ msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:105
+#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:111
 msgid "Reset"
 msgstr "Reset"
 
@@ -591,7 +591,7 @@ msgstr "Kopen"
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
 #: src/gui/buydialog.cpp:251 src/gui/buydialog.cpp:531
-#: src/gui/selldialog.cpp:96 src/gui/selldialog.cpp:356
+#: src/gui/selldialog.cpp:97 src/gui/selldialog.cpp:357
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Prijs: %s / Totaal: %s"
@@ -608,8 +608,8 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/buydialog.cpp:265 src/gui/itemamountwindow.cpp:202
-#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:96
-#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:790
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:100
+#: src/gui/selldialog.cpp:101 src/gui/statuswindow.cpp:791
 msgid "+"
 msgstr ""
 
@@ -620,8 +620,8 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
 #: src/gui/buydialog.cpp:268 src/gui/itemamountwindow.cpp:200
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:98
-#: src/gui/selldialog.cpp:102 src/gui/statuswindow.cpp:803
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:102
+#: src/gui/selldialog.cpp:103 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr ""
 
@@ -629,7 +629,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/buydialog.cpp:271 src/gui/charcreatedialog.cpp:122
-#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1160
+#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1282
 msgid "Create"
 msgstr "Aanmaken"
 
@@ -641,7 +641,7 @@ msgstr "Aanmaken"
 #. TRANSLATORS: input action name
 #: src/gui/buydialog.cpp:273 src/gui/quitdialog.cpp:55
 #: src/gui/quitdialog.cpp:60 src/gui/quitdialog.cpp:62
-#: src/gui/selldialog.cpp:106 src/gui/serverdialog.cpp:262
+#: src/gui/selldialog.cpp:107 src/gui/serverdialog.cpp:262
 #: src/gui/setupactiondata.h:177
 msgid "Quit"
 msgstr "Afsluiten"
@@ -651,9 +651,9 @@ msgstr "Afsluiten"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:108
-#: src/gui/statuswindow.cpp:531 src/gui/statuswindow.cpp:586
-#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:821
+#: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:109
+#: src/gui/statuswindow.cpp:532 src/gui/statuswindow.cpp:587
+#: src/gui/statuswindow.cpp:788 src/gui/statuswindow.cpp:822
 msgid "Max"
 msgstr "Maximum"
 
@@ -673,7 +673,7 @@ msgstr "Winkel"
 #. TRANSLATORS: sell dialog button
 #: src/gui/buyselldialog.cpp:69 src/gui/popupmenu.cpp:223
 #: src/gui/popupmenu.cpp:2455 src/gui/selldialog.cpp:54
-#: src/gui/selldialog.cpp:64 src/gui/selldialog.cpp:104
+#: src/gui/selldialog.cpp:64 src/gui/selldialog.cpp:105
 msgid "Sell"
 msgstr "Verkopen"
 
@@ -713,7 +713,7 @@ msgstr "Verkopen"
 #: src/gui/popupmenu.cpp:2309 src/gui/popupmenu.cpp:2543
 #: src/gui/popupmenu.cpp:2660 src/gui/quitdialog.cpp:73
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
-#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1094
+#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1216
 #: src/gui/textcommandeditor.cpp:211 src/gui/textdialog.cpp:53
 #: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:181
 msgid "Cancel"
@@ -997,92 +997,102 @@ msgstr ""
 #. TRANSLATORS: inventory sort mode
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
-#: src/gui/chatwindow.cpp:139 src/gui/inventorywindow.cpp:65
+#: src/gui/chatwindow.cpp:143 src/gui/inventorywindow.cpp:65
 #: src/gui/setup_other.cpp:69 src/gui/setup_visual.cpp:77
 msgid "default"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:141
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:145 src/gui/widgets/colormodel.cpp:76
 msgid "black"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:143
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:147 src/gui/widgets/colormodel.cpp:78
 msgid "red"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:145
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:149 src/gui/widgets/colormodel.cpp:80
 msgid "green"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:147
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:151 src/gui/widgets/colormodel.cpp:82
 msgid "blue"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:149
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:153 src/gui/widgets/colormodel.cpp:84
 msgid "gold"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:151
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:155 src/gui/widgets/colormodel.cpp:86
 msgid "yellow"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:153
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:157 src/gui/widgets/colormodel.cpp:88
 msgid "pink"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:155
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:159 src/gui/widgets/colormodel.cpp:90
 msgid "purple"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:157
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:161 src/gui/widgets/colormodel.cpp:92
 msgid "grey"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:159
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:163 src/gui/widgets/colormodel.cpp:94
 msgid "brown"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:161
+#: src/gui/chatwindow.cpp:165
 msgid "rainbow 1"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:163
+#: src/gui/chatwindow.cpp:167
 msgid "rainbow 2"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:165
+#: src/gui/chatwindow.cpp:169
 msgid "rainbow 3"
 msgstr ""
 
 #. TRANSLATORS: chat window name
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
-#: src/gui/chatwindow.cpp:192 src/gui/setupactiondata.h:1866
+#: src/gui/chatwindow.cpp:196 src/gui/setupactiondata.h:1866
 #: src/gui/setup_chat.cpp:50 src/gui/windowmenu.cpp:88
 msgid "Chat"
 msgstr "Chat"
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:641
+#: src/gui/chatwindow.cpp:684
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1044
+#: src/gui/chatwindow.cpp:1091
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Fluisteren naar %s: %s"
@@ -1391,6 +1401,38 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
+#. TRANSLATORS: font size
+#: src/gui/emotewindow.cpp:49
+msgid "Normal font"
+msgstr ""
+
+#. TRANSLATORS: font size
+#. TRANSLATORS: theme settings label
+#: src/gui/emotewindow.cpp:51 src/gui/setup_theme.cpp:249
+msgid "Bold font"
+msgstr ""
+
+#. TRANSLATORS: emotes window name
+#. TRANSLATORS: emotes tab name
+#. TRANSLATORS: input tab sub tab name
+#: src/gui/emotewindow.cpp:56 src/gui/emotewindow.cpp:107
+#: src/gui/setupactiondata.h:1862
+msgid "Emotes"
+msgstr ""
+
+#. TRANSLATORS: emotes tab name
+#. TRANSLATORS: settings group
+#. TRANSLATORS: settings colors tab name
+#: src/gui/emotewindow.cpp:109 src/gui/setup_chat.cpp:70
+#: src/gui/setup_colors.cpp:83
+msgid "Colors"
+msgstr "Kleuren"
+
+#. TRANSLATORS: emotes tab name
+#: src/gui/emotewindow.cpp:111
+msgid "Fonts"
+msgstr ""
+
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/equipmentwindow.cpp:56 src/gui/inventorywindow.cpp:204
@@ -1482,7 +1524,7 @@ msgstr "Afhalen"
 
 #. TRANSLATORS: status window label
 #: src/gui/inventorywindow.cpp:580 src/gui/statuswindow.cpp:143
-#: src/gui/statuswindow.cpp:284 src/gui/statuswindow.cpp:337
+#: src/gui/statuswindow.cpp:285 src/gui/statuswindow.cpp:338
 #: src/gui/widgets/characterdisplay.cpp:126
 #, c-format
 msgid "Money: %s"
@@ -1770,7 +1812,7 @@ msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:295
+#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:296
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
@@ -1778,7 +1820,7 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/ministatuswindow.cpp:317 src/gui/statuswindow.cpp:141
-#: src/gui/statuswindow.cpp:302 src/gui/statuswindow.cpp:373
+#: src/gui/statuswindow.cpp:303 src/gui/statuswindow.cpp:374
 #, c-format
 msgid "Level: %d"
 msgstr "Level: %d"
@@ -1795,34 +1837,45 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:62
+#: src/gui/npcdialog.cpp:66
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:64
+#: src/gui/npcdialog.cpp:68
 msgid "Next"
 msgstr "Volgende"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:68
+#: src/gui/npcdialog.cpp:72
 msgid "Submit"
 msgstr "Indienen"
 
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
 #. TRANSLATORS: settings group
-#: src/gui/npcdialog.cpp:77 src/gui/npcpostdialog.cpp:43
+#: src/gui/npcdialog.cpp:81 src/gui/npcpostdialog.cpp:43
 #: src/gui/setup_other.cpp:257
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:566
+#: src/gui/npcdialog.cpp:104 src/gui/popupmenu.cpp:566
 msgid "Clear"
 msgstr ""
 
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: trade window button
+#: src/gui/npcdialog.cpp:109 src/gui/serverdialog.cpp:266
+#: src/gui/shopwindow.cpp:95 src/gui/shopwindow.cpp:102
+#: src/gui/tradewindow.cpp:77
+msgid "Add"
+msgstr "Toevoegen"
+
 #. TRANSLATORS: label in npc post dialog
 #: src/gui/npcpostdialog.cpp:53
 msgid "To:"
@@ -2030,7 +2083,7 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: social window button
-#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1164
+#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1286
 msgid "Leave"
 msgstr ""
 
@@ -2164,7 +2217,7 @@ msgstr ""
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2194
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:985
 msgid "(default)"
 msgstr ""
 
@@ -2396,12 +2449,12 @@ msgid "Passwords do not match."
 msgstr "Wachtwoorden komen niet overeen."
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/selldialog.cpp:242
+#: src/gui/selldialog.cpp:243
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/selldialog.cpp:244
+#: src/gui/selldialog.cpp:245
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
@@ -2412,15 +2465,6 @@ msgid "Choose Your Server"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:266 src/gui/shopwindow.cpp:95
-#: src/gui/shopwindow.cpp:102 src/gui/tradewindow.cpp:77
-msgid "Add"
-msgstr "Toevoegen"
-
-#. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
 #: src/gui/serverdialog.cpp:268 src/gui/widgets/setupitem.cpp:303
 #: src/gui/widgets/setupitem.cpp:430
@@ -3156,11 +3200,6 @@ msgid "Windows"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1862
-msgid "Emotes"
-msgstr ""
-
-#. TRANSLATORS: input tab sub tab name
 #: src/gui/setupactiondata.h:1870
 msgid "Gui"
 msgstr ""
@@ -3316,20 +3355,14 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:61
-msgid "Auto hide chat window."
+msgid "Auto hide chat window"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:65
-msgid "Protect chat focus."
+msgid "Protect chat focus"
 msgstr ""
 
-#. TRANSLATORS: settings group
-#. TRANSLATORS: settings colors tab name
-#: src/gui/setup_chat.cpp:70 src/gui/setup_colors.cpp:83
-msgid "Colors"
-msgstr "Kleuren"
-
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:73
 msgid "Remove colors from received chat messages"
@@ -4422,11 +4455,6 @@ msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:249
-msgid "Bold font"
-msgstr ""
-
-#. TRANSLATORS: theme settings label
 #: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr ""
@@ -4912,258 +4940,289 @@ msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
-#: src/gui/socialwindow.cpp:158 src/gui/socialwindow.cpp:259
+#: src/gui/socialwindow.cpp:176 src/gui/socialwindow.cpp:309
 #: src/gui/widgets/guildchattab.cpp:42 src/net/ea/gui/guildtab.cpp:49
 msgid "Guild"
 msgstr "Guild"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:213
+#: src/gui/socialwindow.cpp:231
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:245
 msgid "Member Invite to Guild"
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:229
+#: src/gui/socialwindow.cpp:247
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:238
+#: src/gui/socialwindow.cpp:256
 msgid "Leave Guild?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:240
+#: src/gui/socialwindow.cpp:258
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:269
+#, c-format
+msgid "Members: %u/%u"
+msgstr ""
+
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:291 src/gui/socialwindow.cpp:361
+#: src/gui/socialwindow.cpp:483
+#, c-format
+msgid "Players: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/socialwindow.cpp:302 src/net/ea/gui/partytab.cpp:49
+#: src/gui/socialwindow.cpp:376 src/net/ea/gui/partytab.cpp:49
 msgid "Party"
 msgstr "Groep"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:341
+#: src/gui/socialwindow.cpp:415
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
 #. TRANSLATORS: tab in social window
-#: src/gui/socialwindow.cpp:356
+#: src/gui/socialwindow.cpp:430
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:370
+#: src/gui/socialwindow.cpp:444
 msgid "Member Invite to Party"
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:372
+#: src/gui/socialwindow.cpp:446
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:381
+#: src/gui/socialwindow.cpp:455
 msgid "Leave Party?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:383
+#: src/gui/socialwindow.cpp:457
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:681
+#, c-format
+msgid "Visible players: %d"
+msgstr ""
+
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:605
+#: src/gui/socialwindow.cpp:707
 msgid "Nav"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:809
+#, c-format
+msgid "Portals: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:922
+#: src/gui/socialwindow.cpp:1035
 msgid "Atk"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:941
+#: src/gui/socialwindow.cpp:1054
 msgid "Priority mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:943
+#: src/gui/socialwindow.cpp:1056
 msgid "Attack mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:945
+#: src/gui/socialwindow.cpp:1058
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:968
+#: src/gui/socialwindow.cpp:1081
 msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:987
+#: src/gui/socialwindow.cpp:1100
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:989
+#: src/gui/socialwindow.cpp:1102
 msgid "Ignore items"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:1190
+#, c-format
+msgid "Friends: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1091 src/gui/socialwindow.cpp:1563
+#: src/gui/socialwindow.cpp:1213 src/gui/socialwindow.cpp:1687
 msgid "Create Party"
 msgstr ""
 
 #. TRANSLATORS: social window name
 #. TRANSLATORS: full button name
-#: src/gui/socialwindow.cpp:1138 src/gui/windowmenu.cpp:126
+#: src/gui/socialwindow.cpp:1260 src/gui/windowmenu.cpp:126
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1273
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1156
+#: src/gui/socialwindow.cpp:1278
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/socialwindow.cpp:1162
+#: src/gui/socialwindow.cpp:1284
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1345
+#: src/gui/socialwindow.cpp:1469
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1356
+#: src/gui/socialwindow.cpp:1480
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1497
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1424
+#: src/gui/socialwindow.cpp:1548
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1445
+#: src/gui/socialwindow.cpp:1569
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1460
+#: src/gui/socialwindow.cpp:1584
 msgid "Guild Name"
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1462
+#: src/gui/socialwindow.cpp:1586
 msgid "Choose your guild's name."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1477
+#: src/gui/socialwindow.cpp:1601
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1485
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1616
 msgid "Accept Guild Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1631
 msgid "Received party request, but one already exists."
 msgstr "Uitnodiging tot groep ontvangen, maar er is er al één."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1519
+#: src/gui/socialwindow.cpp:1643
 msgid "You have been invited you to join a party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1524
+#: src/gui/socialwindow.cpp:1648
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1533
+#: src/gui/socialwindow.cpp:1657
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s heeft je uitgenodigd om je bij hun groep te voegen."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1539
+#: src/gui/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s heeft je uitgenodigd om je bij groep %s te voegen."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1673
 msgid "Accept Party Invite"
 msgstr "Groepsuitnodiging aanvaarden"
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1688
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1694
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1572
+#: src/gui/socialwindow.cpp:1696
 msgid "Choose your party's name."
 msgstr ""
 
@@ -5183,24 +5242,24 @@ msgid "MP:"
 msgstr "Magie:"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:235 src/gui/statuswindow.cpp:423
+#: src/gui/statuswindow.cpp:234 src/gui/statuswindow.cpp:424
 #, c-format
 msgid "Job: %d"
 msgstr "Job: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:237
+#: src/gui/statuswindow.cpp:236
 msgid "Job:"
 msgstr "Job:"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:288 src/gui/statuswindow.cpp:345
+#: src/gui/statuswindow.cpp:289 src/gui/statuswindow.cpp:346
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:360
+#: src/gui/statuswindow.cpp:361
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
@@ -5646,13 +5705,13 @@ msgid "%s whispers: %s"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:540
+#: src/gui/widgets/chattab.cpp:541
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:545
+#: src/gui/widgets/chattab.cpp:546
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -5938,24 +5997,24 @@ msgstr ""
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/inputmanager.cpp:328 src/inputmanager.cpp:372 src/keyboardconfig.cpp:90
+#: src/inputmanager.cpp:329 src/inputmanager.cpp:373 src/keyboardconfig.cpp:90
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/inputmanager.cpp:334
+#: src/inputmanager.cpp:335
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/inputmanager.cpp:348
+#: src/inputmanager.cpp:349
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/inputmanager.cpp:378
+#: src/inputmanager.cpp:379
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -5963,7 +6022,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/inputmanager.cpp:392 src/keyboardconfig.cpp:103
+#: src/inputmanager.cpp:393 src/keyboardconfig.cpp:134
 msgid "u key"
 msgstr ""
 
@@ -6639,55 +6698,55 @@ msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:176
+#: src/net/ea/guildhandler.cpp:178
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:179
+#: src/net/ea/guildhandler.cpp:181
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:186
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:187
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:193
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:195
+#: src/net/ea/guildhandler.cpp:197
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:198
+#: src/net/ea/guildhandler.cpp:200
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
@@ -7562,8 +7621,8 @@ msgstr ""
 #. TRANSLATORS: being info default name
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
-#: src/resources/avatardb.cpp:69 src/resources/beinginfo.cpp:40
-#: src/resources/itemdb.cpp:291 src/resources/monsterdb.cpp:100
+#: src/resources/avatardb.cpp:69 src/resources/beinginfo.cpp:41
+#: src/resources/itemdb.cpp:295 src/resources/monsterdb.cpp:100
 msgid "unnamed"
 msgstr "naamloos"
 
diff --git a/po/nl_BE.po b/po/nl_BE.po
index 9c964067d..5f85c1887 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-08-03 13:52+0300\n"
-"PO-Revision-Date: 2013-07-19 19:52+0000\n"
+"POT-Creation-Date: 2013-08-17 13:35+0300\n"
+"PO-Revision-Date: 2013-08-16 17:53+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/projects/p/manaplus/"
 "language/nl_BE/)\n"
@@ -41,21 +41,21 @@ msgstr "Zichtbaar op de map"
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "dodge"
 msgstr "ontwijkt"
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "miss"
 msgstr "mist"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1710 src/gui/whoisonline.cpp:835
+#: src/being.cpp:1713 src/gui/whoisonline.cpp:842
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1715 src/gui/whoisonline.cpp:840
+#: src/being.cpp:1718 src/gui/whoisonline.cpp:847
 msgid "I"
 msgstr "I"
 
@@ -92,8 +92,8 @@ msgstr "Thema"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:1176 src/gui/didyouknowwindow.cpp:78
-#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:66
-#: src/gui/npcdialog.cpp:103 src/gui/popupmenu.cpp:562
+#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:70
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:562
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:81
 msgid "Close"
 msgstr "Sluiten"
@@ -431,14 +431,14 @@ msgstr ""
 "Opties voor /%s zijn \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:259 src/gui/widgets/chattab.cpp:465
+#: src/game.cpp:259 src/gui/widgets/chattab.cpp:466
 msgid "General"
 msgstr "Algemeen"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: debug window name
 #. TRANSLATORS: full button name
-#: src/game.cpp:275 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:467
+#: src/game.cpp:275 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:468
 #: src/gui/windowmenu.cpp:154
 msgid "Debug"
 msgstr "Debug"
@@ -495,7 +495,7 @@ msgstr "Bot Controleerder"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:105
+#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:111
 msgid "Reset"
 msgstr "Reset"
 
@@ -613,8 +613,8 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/buydialog.cpp:265 src/gui/itemamountwindow.cpp:202
-#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:96
-#: src/gui/selldialog.cpp:101 src/gui/statuswindow.cpp:790
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:100
+#: src/gui/selldialog.cpp:101 src/gui/statuswindow.cpp:791
 msgid "+"
 msgstr "+"
 
@@ -625,8 +625,8 @@ msgstr "+"
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
 #: src/gui/buydialog.cpp:268 src/gui/itemamountwindow.cpp:200
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:98
-#: src/gui/selldialog.cpp:103 src/gui/statuswindow.cpp:803
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:102
+#: src/gui/selldialog.cpp:103 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr "-"
 
@@ -634,7 +634,7 @@ msgstr "-"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/buydialog.cpp:271 src/gui/charcreatedialog.cpp:122
-#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1160
+#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1282
 msgid "Create"
 msgstr "Aanmaken"
 
@@ -657,8 +657,8 @@ msgstr "Afsluiten"
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
 #: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:109
-#: src/gui/statuswindow.cpp:531 src/gui/statuswindow.cpp:586
-#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:821
+#: src/gui/statuswindow.cpp:532 src/gui/statuswindow.cpp:587
+#: src/gui/statuswindow.cpp:788 src/gui/statuswindow.cpp:822
 msgid "Max"
 msgstr "Maximum"
 
@@ -718,7 +718,7 @@ msgstr "Verkopen"
 #: src/gui/popupmenu.cpp:2309 src/gui/popupmenu.cpp:2543
 #: src/gui/popupmenu.cpp:2660 src/gui/quitdialog.cpp:73
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
-#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1094
+#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1216
 #: src/gui/textcommandeditor.cpp:211 src/gui/textdialog.cpp:53
 #: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:181
 msgid "Cancel"
@@ -1002,92 +1002,102 @@ msgstr "Geef wachtwoord:"
 #. TRANSLATORS: inventory sort mode
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
-#: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:65
+#: src/gui/chatwindow.cpp:143 src/gui/inventorywindow.cpp:65
 #: src/gui/setup_other.cpp:69 src/gui/setup_visual.cpp:77
 msgid "default"
 msgstr "standaard"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:144
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:145 src/gui/widgets/colormodel.cpp:76
 msgid "black"
 msgstr "zwart"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:146
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:147 src/gui/widgets/colormodel.cpp:78
 msgid "red"
 msgstr "rood"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:148
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:149 src/gui/widgets/colormodel.cpp:80
 msgid "green"
 msgstr "groen"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:150
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:151 src/gui/widgets/colormodel.cpp:82
 msgid "blue"
 msgstr "blauw"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:152
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:153 src/gui/widgets/colormodel.cpp:84
 msgid "gold"
 msgstr "goud"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:154
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:155 src/gui/widgets/colormodel.cpp:86
 msgid "yellow"
 msgstr "geel"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:156
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:157 src/gui/widgets/colormodel.cpp:88
 msgid "pink"
 msgstr "roze"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:158
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:159 src/gui/widgets/colormodel.cpp:90
 msgid "purple"
 msgstr "paars"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:160
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:161 src/gui/widgets/colormodel.cpp:92
 msgid "grey"
 msgstr "grijs"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:162
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:163 src/gui/widgets/colormodel.cpp:94
 msgid "brown"
 msgstr "bruin"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:164
+#: src/gui/chatwindow.cpp:165
 msgid "rainbow 1"
 msgstr "regenboog 1"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:166
+#: src/gui/chatwindow.cpp:167
 msgid "rainbow 2"
 msgstr "regenboog 2"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:168
+#: src/gui/chatwindow.cpp:169
 msgid "rainbow 3"
 msgstr "regenboog 3"
 
 #. TRANSLATORS: chat window name
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
-#: src/gui/chatwindow.cpp:195 src/gui/setupactiondata.h:1866
+#: src/gui/chatwindow.cpp:196 src/gui/setupactiondata.h:1866
 #: src/gui/setup_chat.cpp:50 src/gui/windowmenu.cpp:88
 msgid "Chat"
 msgstr "Chat"
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:659
+#: src/gui/chatwindow.cpp:684
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Aanwezig: %s; %d speler zijn aanwezig."
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1066
+#: src/gui/chatwindow.cpp:1091
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Fluisteren naar %s: %s"
@@ -1396,14 +1406,38 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
+#. TRANSLATORS: font size
+#: src/gui/emotewindow.cpp:49
+msgid "Normal font"
+msgstr ""
+
+#. TRANSLATORS: font size
+#. TRANSLATORS: theme settings label
+#: src/gui/emotewindow.cpp:51 src/gui/setup_theme.cpp:249
+msgid "Bold font"
+msgstr "Vet lettertype"
+
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/emotewindow.cpp:41 src/gui/emotewindow.cpp:61
+#: src/gui/emotewindow.cpp:56 src/gui/emotewindow.cpp:107
 #: src/gui/setupactiondata.h:1862
 msgid "Emotes"
 msgstr ""
 
+#. TRANSLATORS: emotes tab name
+#. TRANSLATORS: settings group
+#. TRANSLATORS: settings colors tab name
+#: src/gui/emotewindow.cpp:109 src/gui/setup_chat.cpp:70
+#: src/gui/setup_colors.cpp:83
+msgid "Colors"
+msgstr "Kleuren"
+
+#. TRANSLATORS: emotes tab name
+#: src/gui/emotewindow.cpp:111
+msgid "Fonts"
+msgstr ""
+
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/equipmentwindow.cpp:56 src/gui/inventorywindow.cpp:204
@@ -1495,7 +1529,7 @@ msgstr "Afhalen"
 
 #. TRANSLATORS: status window label
 #: src/gui/inventorywindow.cpp:580 src/gui/statuswindow.cpp:143
-#: src/gui/statuswindow.cpp:284 src/gui/statuswindow.cpp:337
+#: src/gui/statuswindow.cpp:285 src/gui/statuswindow.cpp:338
 #: src/gui/widgets/characterdisplay.cpp:126
 #, c-format
 msgid "Money: %s"
@@ -1783,7 +1817,7 @@ msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:295
+#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:296
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Niveau: %d (GM %d)"
@@ -1791,7 +1825,7 @@ msgstr "Niveau: %d (GM %d)"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/ministatuswindow.cpp:317 src/gui/statuswindow.cpp:141
-#: src/gui/statuswindow.cpp:302 src/gui/statuswindow.cpp:373
+#: src/gui/statuswindow.cpp:303 src/gui/statuswindow.cpp:374
 #, c-format
 msgid "Level: %d"
 msgstr "Level: %d"
@@ -1808,34 +1842,45 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:62
+#: src/gui/npcdialog.cpp:66
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:64
+#: src/gui/npcdialog.cpp:68
 msgid "Next"
 msgstr "Volgende"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:68
+#: src/gui/npcdialog.cpp:72
 msgid "Submit"
 msgstr "Indienen"
 
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
 #. TRANSLATORS: settings group
-#: src/gui/npcdialog.cpp:77 src/gui/npcpostdialog.cpp:43
+#: src/gui/npcdialog.cpp:81 src/gui/npcpostdialog.cpp:43
 #: src/gui/setup_other.cpp:257
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:566
+#: src/gui/npcdialog.cpp:104 src/gui/popupmenu.cpp:566
 msgid "Clear"
 msgstr "Wissen"
 
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: trade window button
+#: src/gui/npcdialog.cpp:109 src/gui/serverdialog.cpp:266
+#: src/gui/shopwindow.cpp:95 src/gui/shopwindow.cpp:102
+#: src/gui/tradewindow.cpp:77
+msgid "Add"
+msgstr "Toevoegen"
+
 #. TRANSLATORS: label in npc post dialog
 #: src/gui/npcpostdialog.cpp:53
 msgid "To:"
@@ -2043,7 +2088,7 @@ msgstr "away afzetten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: social window button
-#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1164
+#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1286
 msgid "Leave"
 msgstr "Verlaat"
 
@@ -2177,7 +2222,7 @@ msgstr "Kopieer naar chat"
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2194
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:985
 msgid "(default)"
 msgstr "(standaard)"
 
@@ -2425,15 +2470,6 @@ msgid "Choose Your Server"
 msgstr "Kies Uw Server"
 
 #. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:266 src/gui/shopwindow.cpp:95
-#: src/gui/shopwindow.cpp:102 src/gui/tradewindow.cpp:77
-msgid "Add"
-msgstr "Toevoegen"
-
-#. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
 #: src/gui/serverdialog.cpp:268 src/gui/widgets/setupitem.cpp:303
 #: src/gui/widgets/setupitem.cpp:430
@@ -3324,20 +3360,14 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:61
-msgid "Auto hide chat window."
+msgid "Auto hide chat window"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:65
-msgid "Protect chat focus."
+msgid "Protect chat focus"
 msgstr ""
 
-#. TRANSLATORS: settings group
-#. TRANSLATORS: settings colors tab name
-#: src/gui/setup_chat.cpp:70 src/gui/setup_colors.cpp:83
-msgid "Colors"
-msgstr "Kleuren"
-
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:73
 msgid "Remove colors from received chat messages"
@@ -4430,11 +4460,6 @@ msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:249
-msgid "Bold font"
-msgstr "Vet lettertype"
-
-#. TRANSLATORS: theme settings label
 #: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr "Deeltjes lettertype"
@@ -4926,258 +4951,289 @@ msgstr "Niv: %d"
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
-#: src/gui/socialwindow.cpp:158 src/gui/socialwindow.cpp:259
+#: src/gui/socialwindow.cpp:176 src/gui/socialwindow.cpp:309
 #: src/gui/widgets/guildchattab.cpp:42 src/net/ea/gui/guildtab.cpp:49
 msgid "Guild"
 msgstr "Guild"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "gebruiker %s uitgenodigd in guild %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:213
+#: src/gui/socialwindow.cpp:231
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Guild %s verlating aangevraagd."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:245
 msgid "Member Invite to Guild"
 msgstr "Lid uitnodigen bij gilde"
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:229
+#: src/gui/socialwindow.cpp:247
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "Wie zou u willen uitnodigen in guild %s?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:238
+#: src/gui/socialwindow.cpp:256
 msgid "Leave Guild?"
 msgstr "Verlaten Guild?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:240
+#: src/gui/socialwindow.cpp:258
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Bent u zeker dat u guild %s wilt verlaten?"
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:269
+#, c-format
+msgid "Members: %u/%u"
+msgstr ""
+
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:291 src/gui/socialwindow.cpp:361
+#: src/gui/socialwindow.cpp:483
+#, c-format
+msgid "Players: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/socialwindow.cpp:302 src/net/ea/gui/partytab.cpp:49
+#: src/gui/socialwindow.cpp:376 src/net/ea/gui/partytab.cpp:49
 msgid "Party"
 msgstr "Groep"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:341
+#: src/gui/socialwindow.cpp:415
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Gebruiker %s uitgenodigd in groep."
 
 #. TRANSLATORS: tab in social window
-#: src/gui/socialwindow.cpp:356
+#: src/gui/socialwindow.cpp:430
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Groep %s stoppen verzocht."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:370
+#: src/gui/socialwindow.cpp:444
 msgid "Member Invite to Party"
 msgstr "Lid uitnodigen in groep"
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:372
+#: src/gui/socialwindow.cpp:446
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Wie zou u willen uitnodigen in group %s?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:381
+#: src/gui/socialwindow.cpp:455
 msgid "Leave Party?"
 msgstr "Verlaten Groep?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:383
+#: src/gui/socialwindow.cpp:457
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Bent u zeker dat u groep %s wilt verlaten?"
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:681
+#, c-format
+msgid "Visible players: %d"
+msgstr ""
+
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:605
+#: src/gui/socialwindow.cpp:707
 msgid "Nav"
 msgstr "Nav"
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:809
+#, c-format
+msgid "Portals: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:922
+#: src/gui/socialwindow.cpp:1035
 msgid "Atk"
 msgstr "Aanv"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:941
+#: src/gui/socialwindow.cpp:1054
 msgid "Priority mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:943
+#: src/gui/socialwindow.cpp:1056
 msgid "Attack mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:945
+#: src/gui/socialwindow.cpp:1058
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:968
+#: src/gui/socialwindow.cpp:1081
 msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:987
+#: src/gui/socialwindow.cpp:1100
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:989
+#: src/gui/socialwindow.cpp:1102
 msgid "Ignore items"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:1190
+#, c-format
+msgid "Friends: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1091 src/gui/socialwindow.cpp:1563
+#: src/gui/socialwindow.cpp:1213 src/gui/socialwindow.cpp:1687
 msgid "Create Party"
 msgstr "Groep aanmaken"
 
 #. TRANSLATORS: social window name
 #. TRANSLATORS: full button name
-#: src/gui/socialwindow.cpp:1138 src/gui/windowmenu.cpp:126
+#: src/gui/socialwindow.cpp:1260 src/gui/windowmenu.cpp:126
 msgid "Social"
 msgstr "Sociaal"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1273
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1156
+#: src/gui/socialwindow.cpp:1278
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/socialwindow.cpp:1162
+#: src/gui/socialwindow.cpp:1284
 msgid "Invite"
 msgstr "Nodig uit"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1345
+#: src/gui/socialwindow.cpp:1469
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Uitnodiging voor groep %s aanvaard."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1356
+#: src/gui/socialwindow.cpp:1480
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Uitnodiging voor groep %s geweigerd."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1497
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Uitnodiging voor guild %s aanvaard."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Uitnodiging voor guild %s geweigerd."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1424
+#: src/gui/socialwindow.cpp:1548
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Maken van guild %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1445
+#: src/gui/socialwindow.cpp:1569
 #, c-format
 msgid "Creating party called %s."
 msgstr "Maken van groep %s."
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1460
+#: src/gui/socialwindow.cpp:1584
 msgid "Guild Name"
 msgstr "Guild Naam"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1462
+#: src/gui/socialwindow.cpp:1586
 msgid "Choose your guild's name."
 msgstr "Kies uw guild naam"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1477
+#: src/gui/socialwindow.cpp:1601
 msgid "Received guild request, but one already exists."
 msgstr "Uitnodiging tot guild ontvangen, maar er is er al één."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1485
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s heeft je uitgenodigd om guid %s te vervoegen."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1616
 msgid "Accept Guild Invite"
 msgstr "Guild Uitnodiging Aanvaarden"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1631
 msgid "Received party request, but one already exists."
 msgstr "Uitnodiging tot groep ontvangen, maar er is er al één."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1519
+#: src/gui/socialwindow.cpp:1643
 msgid "You have been invited you to join a party."
 msgstr "U bent uitgenodigd om je bij een groep te voegen."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1524
+#: src/gui/socialwindow.cpp:1648
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "U bent uitgenodigd om je bij groep %s te voegen."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1533
+#: src/gui/socialwindow.cpp:1657
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s heeft je uitgenodigd om je bij hun groep te voegen."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1539
+#: src/gui/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s heeft je uitgenodigd om je bij groep %s te voegen."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1673
 msgid "Accept Party Invite"
 msgstr "Groepsuitnodiging aanvaarden"
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1688
 msgid "Cannot create party. You are already in a party"
 msgstr "Kan groep niet aanmaken. Je bent al in een groep."
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1694
 msgid "Party Name"
 msgstr "Groep Naam"
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1572
+#: src/gui/socialwindow.cpp:1696
 msgid "Choose your party's name."
 msgstr "Kies uw groepsnaam."
 
@@ -5197,24 +5253,24 @@ msgid "MP:"
 msgstr "Magie:"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:235 src/gui/statuswindow.cpp:423
+#: src/gui/statuswindow.cpp:234 src/gui/statuswindow.cpp:424
 #, c-format
 msgid "Job: %d"
 msgstr "Job: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:237
+#: src/gui/statuswindow.cpp:236
 msgid "Job:"
 msgstr "Job:"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:288 src/gui/statuswindow.cpp:345
+#: src/gui/statuswindow.cpp:289 src/gui/statuswindow.cpp:346
 #, c-format
 msgid "Character points: %d"
 msgstr "Personagepunten: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:360
+#: src/gui/statuswindow.cpp:361
 #, c-format
 msgid "Correction points: %d"
 msgstr "Correctiepunten: %d"
@@ -5661,13 +5717,13 @@ msgid "%s whispers: %s"
 msgstr "%s fluistert: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:540
+#: src/gui/widgets/chattab.cpp:541
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:545
+#: src/gui/widgets/chattab.cpp:546
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -5957,24 +6013,24 @@ msgstr "Kies Wereld"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/inputmanager.cpp:328 src/inputmanager.cpp:372 src/keyboardconfig.cpp:90
+#: src/inputmanager.cpp:329 src/inputmanager.cpp:373 src/keyboardconfig.cpp:90
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/inputmanager.cpp:334
+#: src/inputmanager.cpp:335
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/inputmanager.cpp:348
+#: src/inputmanager.cpp:349
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/inputmanager.cpp:378
+#: src/inputmanager.cpp:379
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -5982,7 +6038,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/inputmanager.cpp:392 src/keyboardconfig.cpp:103
+#: src/inputmanager.cpp:393 src/keyboardconfig.cpp:134
 msgid "u key"
 msgstr ""
 
@@ -6660,55 +6716,55 @@ msgid "Request to quit denied!"
 msgstr "Aanvraag op de stoppen is geweigerd!"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:176
+#: src/net/ea/guildhandler.cpp:178
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:179
+#: src/net/ea/guildhandler.cpp:181
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:186
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:187
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:193
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:195
+#: src/net/ea/guildhandler.cpp:197
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:198
+#: src/net/ea/guildhandler.cpp:200
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index db25d5249..b7802d978 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-08-03 13:52+0300\n"
-"PO-Revision-Date: 2013-07-31 09:53+0000\n"
-"Last-Translator: foobo <lukasz.antoni.komorowski@poczta.fm>\n"
+"POT-Creation-Date: 2013-08-17 13:35+0300\n"
+"PO-Revision-Date: 2013-08-16 17:53+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/manaplus/language/"
 "pl/)\n"
 "Language: pl\n"
@@ -43,21 +43,21 @@ msgstr "Widoczne na mapie"
 msgid "Human"
 msgstr "Człowiek"
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "dodge"
 msgstr "Unik!"
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "miss"
 msgstr "Pudło!"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1710 src/gui/whoisonline.cpp:835
+#: src/being.cpp:1713 src/gui/whoisonline.cpp:842
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1715 src/gui/whoisonline.cpp:840
+#: src/being.cpp:1718 src/gui/whoisonline.cpp:847
 msgid "I"
 msgstr "I"
 
@@ -94,8 +94,8 @@ msgstr "Skórka"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:1176 src/gui/didyouknowwindow.cpp:78
-#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:66
-#: src/gui/npcdialog.cpp:103 src/gui/popupmenu.cpp:562
+#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:70
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:562
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:81
 msgid "Close"
 msgstr "Zamknij"
@@ -431,14 +431,14 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "Opcjami dla /%s są \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:259 src/gui/widgets/chattab.cpp:465
+#: src/game.cpp:259 src/gui/widgets/chattab.cpp:466
 msgid "General"
 msgstr "Ogólny"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: debug window name
 #. TRANSLATORS: full button name
-#: src/game.cpp:275 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:467
+#: src/game.cpp:275 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:468
 #: src/gui/windowmenu.cpp:154
 msgid "Debug"
 msgstr "Debug"
@@ -495,7 +495,7 @@ msgstr "Wykrywacz botów"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:105
+#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:111
 msgid "Reset"
 msgstr "Resetuj"
 
@@ -613,8 +613,8 @@ msgstr "Ilość:"
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/buydialog.cpp:265 src/gui/itemamountwindow.cpp:202
-#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:96
-#: src/gui/selldialog.cpp:101 src/gui/statuswindow.cpp:790
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:100
+#: src/gui/selldialog.cpp:101 src/gui/statuswindow.cpp:791
 msgid "+"
 msgstr "+"
 
@@ -625,8 +625,8 @@ msgstr "+"
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
 #: src/gui/buydialog.cpp:268 src/gui/itemamountwindow.cpp:200
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:98
-#: src/gui/selldialog.cpp:103 src/gui/statuswindow.cpp:803
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:102
+#: src/gui/selldialog.cpp:103 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr "-"
 
@@ -634,7 +634,7 @@ msgstr "-"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/buydialog.cpp:271 src/gui/charcreatedialog.cpp:122
-#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1160
+#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1282
 msgid "Create"
 msgstr "Utwórz"
 
@@ -657,8 +657,8 @@ msgstr "Wyjdź"
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
 #: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:109
-#: src/gui/statuswindow.cpp:531 src/gui/statuswindow.cpp:586
-#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:821
+#: src/gui/statuswindow.cpp:532 src/gui/statuswindow.cpp:587
+#: src/gui/statuswindow.cpp:788 src/gui/statuswindow.cpp:822
 msgid "Max"
 msgstr "Maks."
 
@@ -718,7 +718,7 @@ msgstr "Sprzedaj"
 #: src/gui/popupmenu.cpp:2309 src/gui/popupmenu.cpp:2543
 #: src/gui/popupmenu.cpp:2660 src/gui/quitdialog.cpp:73
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
-#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1094
+#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1216
 #: src/gui/textcommandeditor.cpp:211 src/gui/textdialog.cpp:53
 #: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:181
 msgid "Cancel"
@@ -1007,92 +1007,102 @@ msgstr "Wprowadź hasło:"
 #. TRANSLATORS: inventory sort mode
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
-#: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:65
+#: src/gui/chatwindow.cpp:143 src/gui/inventorywindow.cpp:65
 #: src/gui/setup_other.cpp:69 src/gui/setup_visual.cpp:77
 msgid "default"
 msgstr "domyślnie"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:144
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:145 src/gui/widgets/colormodel.cpp:76
 msgid "black"
 msgstr "czarny"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:146
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:147 src/gui/widgets/colormodel.cpp:78
 msgid "red"
 msgstr "czerwony"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:148
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:149 src/gui/widgets/colormodel.cpp:80
 msgid "green"
 msgstr "zielony"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:150
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:151 src/gui/widgets/colormodel.cpp:82
 msgid "blue"
 msgstr "niebieski"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:152
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:153 src/gui/widgets/colormodel.cpp:84
 msgid "gold"
 msgstr "złoty"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:154
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:155 src/gui/widgets/colormodel.cpp:86
 msgid "yellow"
 msgstr "żółty"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:156
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:157 src/gui/widgets/colormodel.cpp:88
 msgid "pink"
 msgstr "różowy"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:158
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:159 src/gui/widgets/colormodel.cpp:90
 msgid "purple"
 msgstr "fioletowy"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:160
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:161 src/gui/widgets/colormodel.cpp:92
 msgid "grey"
 msgstr "szary"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:162
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:163 src/gui/widgets/colormodel.cpp:94
 msgid "brown"
 msgstr "brązowy"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:164
+#: src/gui/chatwindow.cpp:165
 msgid "rainbow 1"
 msgstr "tęczowy 1"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:166
+#: src/gui/chatwindow.cpp:167
 msgid "rainbow 2"
 msgstr "tęczowy 2"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:168
+#: src/gui/chatwindow.cpp:169
 msgid "rainbow 3"
 msgstr "tęczowy 3"
 
 #. TRANSLATORS: chat window name
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
-#: src/gui/chatwindow.cpp:195 src/gui/setupactiondata.h:1866
+#: src/gui/chatwindow.cpp:196 src/gui/setupactiondata.h:1866
 #: src/gui/setup_chat.cpp:50 src/gui/windowmenu.cpp:88
 msgid "Chat"
 msgstr "Czat"
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:659
+#: src/gui/chatwindow.cpp:684
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "%s obecny/a. %d graczy online."
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1066
+#: src/gui/chatwindow.cpp:1091
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Szepczesz do %s: %s"
@@ -1401,14 +1411,38 @@ msgstr "Adres strony z graczami online:"
 msgid "Please at least type both the address and the port of the server."
 msgstr "Wymagany zarówno adres jak i port serwera."
 
+#. TRANSLATORS: font size
+#: src/gui/emotewindow.cpp:49
+msgid "Normal font"
+msgstr ""
+
+#. TRANSLATORS: font size
+#. TRANSLATORS: theme settings label
+#: src/gui/emotewindow.cpp:51 src/gui/setup_theme.cpp:249
+msgid "Bold font"
+msgstr "Pogrubiona czcionka"
+
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/emotewindow.cpp:41 src/gui/emotewindow.cpp:61
+#: src/gui/emotewindow.cpp:56 src/gui/emotewindow.cpp:107
 #: src/gui/setupactiondata.h:1862
 msgid "Emotes"
 msgstr "Emotki"
 
+#. TRANSLATORS: emotes tab name
+#. TRANSLATORS: settings group
+#. TRANSLATORS: settings colors tab name
+#: src/gui/emotewindow.cpp:109 src/gui/setup_chat.cpp:70
+#: src/gui/setup_colors.cpp:83
+msgid "Colors"
+msgstr "Kolory"
+
+#. TRANSLATORS: emotes tab name
+#: src/gui/emotewindow.cpp:111
+msgid "Fonts"
+msgstr ""
+
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/equipmentwindow.cpp:56 src/gui/inventorywindow.cpp:204
@@ -1500,7 +1534,7 @@ msgstr "Pobierz"
 
 #. TRANSLATORS: status window label
 #: src/gui/inventorywindow.cpp:580 src/gui/statuswindow.cpp:143
-#: src/gui/statuswindow.cpp:284 src/gui/statuswindow.cpp:337
+#: src/gui/statuswindow.cpp:285 src/gui/statuswindow.cpp:338
 #: src/gui/widgets/characterdisplay.cpp:126
 #, c-format
 msgid "Money: %s"
@@ -1790,7 +1824,7 @@ msgstr "pasek punktów umiejętności"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:295
+#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:296
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Poziom: %d (GM %d)"
@@ -1798,7 +1832,7 @@ msgstr "Poziom: %d (GM %d)"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/ministatuswindow.cpp:317 src/gui/statuswindow.cpp:141
-#: src/gui/statuswindow.cpp:302 src/gui/statuswindow.cpp:373
+#: src/gui/statuswindow.cpp:303 src/gui/statuswindow.cpp:374
 #, c-format
 msgid "Level: %d"
 msgstr "Poziom: %d"
@@ -1815,34 +1849,45 @@ msgid "Job level: %d"
 msgstr "Poziom Pracy: %d"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:62
+#: src/gui/npcdialog.cpp:66
 msgid "Stop waiting"
 msgstr "Przerwij"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:64
+#: src/gui/npcdialog.cpp:68
 msgid "Next"
 msgstr "Dalej"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:68
+#: src/gui/npcdialog.cpp:72
 msgid "Submit"
 msgstr "Zatwierdź"
 
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
 #. TRANSLATORS: settings group
-#: src/gui/npcdialog.cpp:77 src/gui/npcpostdialog.cpp:43
+#: src/gui/npcdialog.cpp:81 src/gui/npcpostdialog.cpp:43
 #: src/gui/setup_other.cpp:257
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:566
+#: src/gui/npcdialog.cpp:104 src/gui/popupmenu.cpp:566
 msgid "Clear"
 msgstr "Wyczyść"
 
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: trade window button
+#: src/gui/npcdialog.cpp:109 src/gui/serverdialog.cpp:266
+#: src/gui/shopwindow.cpp:95 src/gui/shopwindow.cpp:102
+#: src/gui/tradewindow.cpp:77
+msgid "Add"
+msgstr "Dodaj"
+
 #. TRANSLATORS: label in npc post dialog
 #: src/gui/npcpostdialog.cpp:53
 msgid "To:"
@@ -2050,7 +2095,7 @@ msgstr "Wyłącz tryb AFK"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: social window button
-#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1164
+#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1286
 msgid "Leave"
 msgstr "Opuść"
 
@@ -2184,7 +2229,7 @@ msgstr "Skopiuj do czatu"
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2194
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:985
 msgid "(default)"
 msgstr "(domyślne)"
 
@@ -2432,15 +2477,6 @@ msgid "Choose Your Server"
 msgstr "Wybierz serwer"
 
 #. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:266 src/gui/shopwindow.cpp:95
-#: src/gui/shopwindow.cpp:102 src/gui/tradewindow.cpp:77
-msgid "Add"
-msgstr "Dodaj"
-
-#. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
 #: src/gui/serverdialog.cpp:268 src/gui/widgets/setupitem.cpp:303
 #: src/gui/widgets/setupitem.cpp:430
@@ -3331,19 +3367,13 @@ msgstr "Okno"
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:61
-msgid "Auto hide chat window."
-msgstr "Autoukrywanie okna czatu."
+msgid "Auto hide chat window"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:65
-msgid "Protect chat focus."
-msgstr "Podtrzymuj skupienie na pasek czatu."
-
-#. TRANSLATORS: settings group
-#. TRANSLATORS: settings colors tab name
-#: src/gui/setup_chat.cpp:70 src/gui/setup_colors.cpp:83
-msgid "Colors"
-msgstr "Kolory"
+msgid "Protect chat focus"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:73
@@ -4439,11 +4469,6 @@ msgid "Language"
 msgstr "Język"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:249
-msgid "Bold font"
-msgstr "Pogrubiona czcionka"
-
-#. TRANSLATORS: theme settings label
 #: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr "Czcionka efektów"
@@ -4934,258 +4959,289 @@ msgstr "Poziom: %d"
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
-#: src/gui/socialwindow.cpp:158 src/gui/socialwindow.cpp:259
+#: src/gui/socialwindow.cpp:176 src/gui/socialwindow.cpp:309
 #: src/gui/widgets/guildchattab.cpp:42 src/net/ea/gui/guildtab.cpp:49
 msgid "Guild"
 msgstr "Gildia"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Zaproszono gracza %s do gildii %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:213
+#: src/gui/socialwindow.cpp:231
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Poproszono o wyjście z gildii %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:245
 msgid "Member Invite to Guild"
 msgstr "Zaproszenie do gildii"
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:229
+#: src/gui/socialwindow.cpp:247
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "Kogo chcesz zaprosić do gildii %s?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:238
+#: src/gui/socialwindow.cpp:256
 msgid "Leave Guild?"
 msgstr "Opuścić gildię?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:240
+#: src/gui/socialwindow.cpp:258
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Na pewno opuścić gildię %s?"
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:269
+#, c-format
+msgid "Members: %u/%u"
+msgstr ""
+
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:291 src/gui/socialwindow.cpp:361
+#: src/gui/socialwindow.cpp:483
+#, c-format
+msgid "Players: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/socialwindow.cpp:302 src/net/ea/gui/partytab.cpp:49
+#: src/gui/socialwindow.cpp:376 src/net/ea/gui/partytab.cpp:49
 msgid "Party"
 msgstr "Grupa"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:341
+#: src/gui/socialwindow.cpp:415
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Gracz %s zaproszony do grupy."
 
 #. TRANSLATORS: tab in social window
-#: src/gui/socialwindow.cpp:356
+#: src/gui/socialwindow.cpp:430
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Poproszono o wyjście z grupy %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:370
+#: src/gui/socialwindow.cpp:444
 msgid "Member Invite to Party"
 msgstr "Zaproszenie do grupy"
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:372
+#: src/gui/socialwindow.cpp:446
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Kogo chcesz zaprosić do grupy %s?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:381
+#: src/gui/socialwindow.cpp:455
 msgid "Leave Party?"
 msgstr "Opuścić grupę?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:383
+#: src/gui/socialwindow.cpp:457
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Na pewno opuścić grupę %s?"
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:681
+#, c-format
+msgid "Visible players: %d"
+msgstr ""
+
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:605
+#: src/gui/socialwindow.cpp:707
 msgid "Nav"
 msgstr "GPS"
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:809
+#, c-format
+msgid "Portals: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:922
+#: src/gui/socialwindow.cpp:1035
 msgid "Atk"
 msgstr "Atk"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:941
+#: src/gui/socialwindow.cpp:1054
 msgid "Priority mobs"
 msgstr "Priorytetowe moby"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:943
+#: src/gui/socialwindow.cpp:1056
 msgid "Attack mobs"
 msgstr "Atakuj moby"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:945
+#: src/gui/socialwindow.cpp:1058
 msgid "Ignore mobs"
 msgstr "Ignoruj moby"
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:968
+#: src/gui/socialwindow.cpp:1081
 msgid "Pik"
 msgstr "Pod"
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:987
+#: src/gui/socialwindow.cpp:1100
 msgid "Pickup items"
 msgstr "Podnoś przedmioty"
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:989
+#: src/gui/socialwindow.cpp:1102
 msgid "Ignore items"
 msgstr "Ignoruj przedmioty"
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:1190
+#, c-format
+msgid "Friends: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1091 src/gui/socialwindow.cpp:1563
+#: src/gui/socialwindow.cpp:1213 src/gui/socialwindow.cpp:1687
 msgid "Create Party"
 msgstr "Utwórz grupę"
 
 #. TRANSLATORS: social window name
 #. TRANSLATORS: full button name
-#: src/gui/socialwindow.cpp:1138 src/gui/windowmenu.cpp:126
+#: src/gui/socialwindow.cpp:1260 src/gui/windowmenu.cpp:126
 msgid "Social"
 msgstr "Społeczność"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1273
 msgid "P"
 msgstr "V"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1156
+#: src/gui/socialwindow.cpp:1278
 msgid "F"
 msgstr "F"
 
 #. TRANSLATORS: social window button
-#: src/gui/socialwindow.cpp:1162
+#: src/gui/socialwindow.cpp:1284
 msgid "Invite"
 msgstr "Zaproś"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1345
+#: src/gui/socialwindow.cpp:1469
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Zaakceptowano zaproszenie do grupy od %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1356
+#: src/gui/socialwindow.cpp:1480
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Odrzucono zaproszenie do grupy od %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1497
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Akceptowano zaproszenie do gildii od %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Odrzucono zaproszenie do gildii od %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1424
+#: src/gui/socialwindow.cpp:1548
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Tworzenie gildii o nazwie %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1445
+#: src/gui/socialwindow.cpp:1569
 #, c-format
 msgid "Creating party called %s."
 msgstr "Tworzenie grupy o nazwie %s."
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1460
+#: src/gui/socialwindow.cpp:1584
 msgid "Guild Name"
 msgstr "Nazwa gildii"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1462
+#: src/gui/socialwindow.cpp:1586
 msgid "Choose your guild's name."
 msgstr "Wybierz nazwę gildii."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1477
+#: src/gui/socialwindow.cpp:1601
 msgid "Received guild request, but one already exists."
 msgstr "Gildia o tej nazwie już istnieje."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1485
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s zaprosił/a Cię do gildii %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1616
 msgid "Accept Guild Invite"
 msgstr "Akceptuj zaproszenie do gildii"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1631
 msgid "Received party request, but one already exists."
 msgstr "Grupa o takiej nazwie już istnieje."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1519
+#: src/gui/socialwindow.cpp:1643
 msgid "You have been invited you to join a party."
 msgstr "Zostałeś/aś zaproszony/a do grupy."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1524
+#: src/gui/socialwindow.cpp:1648
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Zostałeś/aś zaproszony/a do grupy %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1533
+#: src/gui/socialwindow.cpp:1657
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s zaprosił/a Cię do grupy."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1539
+#: src/gui/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s zaprosił/a Cię do grupy %s ."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1673
 msgid "Accept Party Invite"
 msgstr "Zaakceptuj zaproszenie do grupy"
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1688
 msgid "Cannot create party. You are already in a party"
 msgstr "Nie można utworzyć grupy. Już należysz do grupy."
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1694
 msgid "Party Name"
 msgstr "Nazwa grupy"
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1572
+#: src/gui/socialwindow.cpp:1696
 msgid "Choose your party's name."
 msgstr "Wybierz nazwę grupy."
 
@@ -5205,24 +5261,24 @@ msgid "MP:"
 msgstr "MP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:235 src/gui/statuswindow.cpp:423
+#: src/gui/statuswindow.cpp:234 src/gui/statuswindow.cpp:424
 #, c-format
 msgid "Job: %d"
 msgstr "Praca: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:237
+#: src/gui/statuswindow.cpp:236
 msgid "Job:"
 msgstr "Praca:"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:288 src/gui/statuswindow.cpp:345
+#: src/gui/statuswindow.cpp:289 src/gui/statuswindow.cpp:346
 #, c-format
 msgid "Character points: %d"
 msgstr "Punkty postaci: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:360
+#: src/gui/statuswindow.cpp:361
 #, c-format
 msgid "Correction points: %d"
 msgstr "Punkty korekcyjne: %d"
@@ -5669,13 +5725,13 @@ msgid "%s whispers: %s"
 msgstr "%s szepcze: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:540
+#: src/gui/widgets/chattab.cpp:541
 #, c-format
 msgid "%s is now Online."
 msgstr "%s jest teraz Online."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:545
+#: src/gui/widgets/chattab.cpp:546
 #, c-format
 msgid "%s is now Offline."
 msgstr "%s jest teraz Offline."
@@ -5960,24 +6016,24 @@ msgstr "Wybierz świat"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/inputmanager.cpp:328 src/inputmanager.cpp:372 src/keyboardconfig.cpp:90
+#: src/inputmanager.cpp:329 src/inputmanager.cpp:373 src/keyboardconfig.cpp:90
 #, c-format
 msgid "key_%d"
 msgstr "key_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/inputmanager.cpp:334
+#: src/inputmanager.cpp:335
 #, c-format
 msgid "JButton%d"
 msgstr "JButton%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/inputmanager.cpp:348
+#: src/inputmanager.cpp:349
 msgid "unknown key"
 msgstr "nieznany klawisz"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/inputmanager.cpp:378
+#: src/inputmanager.cpp:379
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -5985,7 +6041,7 @@ msgstr "JB%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/inputmanager.cpp:392 src/keyboardconfig.cpp:103
+#: src/inputmanager.cpp:393 src/keyboardconfig.cpp:134
 msgid "u key"
 msgstr "(nieznany)"
 
@@ -6662,55 +6718,55 @@ msgid "Request to quit denied!"
 msgstr "Żądanie wyjścia odrzucone!"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:176
+#: src/net/ea/guildhandler.cpp:178
 #, c-format
 msgid "Guild name: %s"
 msgstr "Nazwa gildii: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:179
+#: src/net/ea/guildhandler.cpp:181
 #, c-format
 msgid "Guild master: %s"
 msgstr "Przywódca gildii: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild level: %d"
 msgstr "Poziom gildii: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:186
 #, c-format
 msgid "Online members: %d"
 msgstr "Członkowie online: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:187
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Max members: %d"
 msgstr "Maksymalna ilość członków: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Average level: %d"
 msgstr "Przeciętny poziom: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:193
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Guild exp: %d"
 msgstr "Punkty doświadczenie gildii: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:195
+#: src/net/ea/guildhandler.cpp:197
 #, c-format
 msgid "Guild next exp: %d"
 msgstr "Punkty doświadczenia do następnego poziomu gildii: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:198
+#: src/net/ea/guildhandler.cpp:200
 #, c-format
 msgid "Guild castle: %s"
 msgstr "Zamek gildii: %s"
diff --git a/po/pt.po b/po/pt.po
index 609c256d8..4ca1488d1 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-08-03 13:52+0300\n"
-"PO-Revision-Date: 2013-07-19 19:52+0000\n"
+"POT-Creation-Date: 2013-08-17 13:35+0300\n"
+"PO-Revision-Date: 2013-08-16 17:53+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (http://www.transifex.com/projects/p/manaplus/"
 "language/pt/)\n"
@@ -42,21 +42,21 @@ msgstr "Visivel no mapa"
 msgid "Human"
 msgstr "Humano"
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "dodge"
 msgstr "desviou"
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "miss"
 msgstr "errou"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1710 src/gui/whoisonline.cpp:835
+#: src/being.cpp:1713 src/gui/whoisonline.cpp:842
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1715 src/gui/whoisonline.cpp:840
+#: src/being.cpp:1718 src/gui/whoisonline.cpp:847
 msgid "I"
 msgstr "l"
 
@@ -93,8 +93,8 @@ msgstr "Tema"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:1176 src/gui/didyouknowwindow.cpp:78
-#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:66
-#: src/gui/npcdialog.cpp:103 src/gui/popupmenu.cpp:562
+#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:70
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:562
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:81
 msgid "Close"
 msgstr "Fechar"
@@ -432,14 +432,14 @@ msgstr ""
 "Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:259 src/gui/widgets/chattab.cpp:465
+#: src/game.cpp:259 src/gui/widgets/chattab.cpp:466
 msgid "General"
 msgstr "Geral"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: debug window name
 #. TRANSLATORS: full button name
-#: src/game.cpp:275 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:467
+#: src/game.cpp:275 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:468
 #: src/gui/windowmenu.cpp:154
 msgid "Debug"
 msgstr "Depurador"
@@ -496,7 +496,7 @@ msgstr "Analizador de bot"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:105
+#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:111
 msgid "Reset"
 msgstr "Resetar"
 
@@ -614,8 +614,8 @@ msgstr "Quantidade:"
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/buydialog.cpp:265 src/gui/itemamountwindow.cpp:202
-#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:96
-#: src/gui/selldialog.cpp:101 src/gui/statuswindow.cpp:790
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:100
+#: src/gui/selldialog.cpp:101 src/gui/statuswindow.cpp:791
 msgid "+"
 msgstr "+"
 
@@ -626,8 +626,8 @@ msgstr "+"
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
 #: src/gui/buydialog.cpp:268 src/gui/itemamountwindow.cpp:200
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:98
-#: src/gui/selldialog.cpp:103 src/gui/statuswindow.cpp:803
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:102
+#: src/gui/selldialog.cpp:103 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr "-"
 
@@ -635,7 +635,7 @@ msgstr "-"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/buydialog.cpp:271 src/gui/charcreatedialog.cpp:122
-#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1160
+#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1282
 msgid "Create"
 msgstr "Criar"
 
@@ -658,8 +658,8 @@ msgstr "Sair"
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
 #: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:109
-#: src/gui/statuswindow.cpp:531 src/gui/statuswindow.cpp:586
-#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:821
+#: src/gui/statuswindow.cpp:532 src/gui/statuswindow.cpp:587
+#: src/gui/statuswindow.cpp:788 src/gui/statuswindow.cpp:822
 msgid "Max"
 msgstr "Máximo"
 
@@ -719,7 +719,7 @@ msgstr "Vender"
 #: src/gui/popupmenu.cpp:2309 src/gui/popupmenu.cpp:2543
 #: src/gui/popupmenu.cpp:2660 src/gui/quitdialog.cpp:73
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
-#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1094
+#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1216
 #: src/gui/textcommandeditor.cpp:211 src/gui/textdialog.cpp:53
 #: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:181
 msgid "Cancel"
@@ -1008,92 +1008,102 @@ msgstr "Entre com a senha"
 #. TRANSLATORS: inventory sort mode
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
-#: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:65
+#: src/gui/chatwindow.cpp:143 src/gui/inventorywindow.cpp:65
 #: src/gui/setup_other.cpp:69 src/gui/setup_visual.cpp:77
 msgid "default"
 msgstr "padrão"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:144
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:145 src/gui/widgets/colormodel.cpp:76
 msgid "black"
 msgstr "preto"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:146
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:147 src/gui/widgets/colormodel.cpp:78
 msgid "red"
 msgstr "vermelho"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:148
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:149 src/gui/widgets/colormodel.cpp:80
 msgid "green"
 msgstr "verde"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:150
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:151 src/gui/widgets/colormodel.cpp:82
 msgid "blue"
 msgstr "azul"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:152
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:153 src/gui/widgets/colormodel.cpp:84
 msgid "gold"
 msgstr "ouro"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:154
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:155 src/gui/widgets/colormodel.cpp:86
 msgid "yellow"
 msgstr "amarelo"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:156
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:157 src/gui/widgets/colormodel.cpp:88
 msgid "pink"
 msgstr "rosa"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:158
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:159 src/gui/widgets/colormodel.cpp:90
 msgid "purple"
 msgstr "roxo"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:160
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:161 src/gui/widgets/colormodel.cpp:92
 msgid "grey"
 msgstr "cinza"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:162
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:163 src/gui/widgets/colormodel.cpp:94
 msgid "brown"
 msgstr "marrom"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:164
+#: src/gui/chatwindow.cpp:165
 msgid "rainbow 1"
 msgstr "arco-íris 1"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:166
+#: src/gui/chatwindow.cpp:167
 msgid "rainbow 2"
 msgstr "arco-íris 2"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:168
+#: src/gui/chatwindow.cpp:169
 msgid "rainbow 3"
 msgstr "arco-íris 3"
 
 #. TRANSLATORS: chat window name
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
-#: src/gui/chatwindow.cpp:195 src/gui/setupactiondata.h:1866
+#: src/gui/chatwindow.cpp:196 src/gui/setupactiondata.h:1866
 #: src/gui/setup_chat.cpp:50 src/gui/windowmenu.cpp:88
 msgid "Chat"
 msgstr "Chat"
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:659
+#: src/gui/chatwindow.cpp:684
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presentes: %s; %d jogadores estão presentes."
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1066
+#: src/gui/chatwindow.cpp:1091
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Enviando MP para %s: %s"
@@ -1402,14 +1412,38 @@ msgstr "URL de lista onlines:"
 msgid "Please at least type both the address and the port of the server."
 msgstr "Por favor coloque ao menos uma porta de servidor."
 
+#. TRANSLATORS: font size
+#: src/gui/emotewindow.cpp:49
+msgid "Normal font"
+msgstr ""
+
+#. TRANSLATORS: font size
+#. TRANSLATORS: theme settings label
+#: src/gui/emotewindow.cpp:51 src/gui/setup_theme.cpp:249
+msgid "Bold font"
+msgstr "Fonte negrito"
+
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/emotewindow.cpp:41 src/gui/emotewindow.cpp:61
+#: src/gui/emotewindow.cpp:56 src/gui/emotewindow.cpp:107
 #: src/gui/setupactiondata.h:1862
 msgid "Emotes"
 msgstr "Emoções"
 
+#. TRANSLATORS: emotes tab name
+#. TRANSLATORS: settings group
+#. TRANSLATORS: settings colors tab name
+#: src/gui/emotewindow.cpp:109 src/gui/setup_chat.cpp:70
+#: src/gui/setup_colors.cpp:83
+msgid "Colors"
+msgstr "Cores"
+
+#. TRANSLATORS: emotes tab name
+#: src/gui/emotewindow.cpp:111
+msgid "Fonts"
+msgstr ""
+
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/equipmentwindow.cpp:56 src/gui/inventorywindow.cpp:204
@@ -1501,7 +1535,7 @@ msgstr "Retirar"
 
 #. TRANSLATORS: status window label
 #: src/gui/inventorywindow.cpp:580 src/gui/statuswindow.cpp:143
-#: src/gui/statuswindow.cpp:284 src/gui/statuswindow.cpp:337
+#: src/gui/statuswindow.cpp:285 src/gui/statuswindow.cpp:338
 #: src/gui/widgets/characterdisplay.cpp:126
 #, c-format
 msgid "Money: %s"
@@ -1789,7 +1823,7 @@ msgstr "Barra de Job"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:295
+#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:296
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Nível: %d (GM %d)"
@@ -1797,7 +1831,7 @@ msgstr "Nível: %d (GM %d)"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/ministatuswindow.cpp:317 src/gui/statuswindow.cpp:141
-#: src/gui/statuswindow.cpp:302 src/gui/statuswindow.cpp:373
+#: src/gui/statuswindow.cpp:303 src/gui/statuswindow.cpp:374
 #, c-format
 msgid "Level: %d"
 msgstr "Nível: %d"
@@ -1814,34 +1848,45 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:62
+#: src/gui/npcdialog.cpp:66
 msgid "Stop waiting"
 msgstr "Aguarde..."
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:64
+#: src/gui/npcdialog.cpp:68
 msgid "Next"
 msgstr "Próximo"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:68
+#: src/gui/npcdialog.cpp:72
 msgid "Submit"
 msgstr "Enviar"
 
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
 #. TRANSLATORS: settings group
-#: src/gui/npcdialog.cpp:77 src/gui/npcpostdialog.cpp:43
+#: src/gui/npcdialog.cpp:81 src/gui/npcpostdialog.cpp:43
 #: src/gui/setup_other.cpp:257
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:566
+#: src/gui/npcdialog.cpp:104 src/gui/popupmenu.cpp:566
 msgid "Clear"
 msgstr "Limpar"
 
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: trade window button
+#: src/gui/npcdialog.cpp:109 src/gui/serverdialog.cpp:266
+#: src/gui/shopwindow.cpp:95 src/gui/shopwindow.cpp:102
+#: src/gui/tradewindow.cpp:77
+msgid "Add"
+msgstr "Adicionar"
+
 #. TRANSLATORS: label in npc post dialog
 #: src/gui/npcpostdialog.cpp:53
 msgid "To:"
@@ -2049,7 +2094,7 @@ msgstr "Desabilitar longe do teclado"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: social window button
-#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1164
+#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1286
 msgid "Leave"
 msgstr "Sair"
 
@@ -2183,7 +2228,7 @@ msgstr "Copiar para o chat"
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2194
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:985
 msgid "(default)"
 msgstr "(padrão)"
 
@@ -2431,15 +2476,6 @@ msgid "Choose Your Server"
 msgstr "Escolha seu servidor"
 
 #. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:266 src/gui/shopwindow.cpp:95
-#: src/gui/shopwindow.cpp:102 src/gui/tradewindow.cpp:77
-msgid "Add"
-msgstr "Adicionar"
-
-#. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
 #: src/gui/serverdialog.cpp:268 src/gui/widgets/setupitem.cpp:303
 #: src/gui/widgets/setupitem.cpp:430
@@ -3330,19 +3366,13 @@ msgstr "Janela"
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:61
-msgid "Auto hide chat window."
-msgstr "Auto ocultar janela de chat"
+msgid "Auto hide chat window"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:65
-msgid "Protect chat focus."
-msgstr "Proteger foco em chat."
-
-#. TRANSLATORS: settings group
-#. TRANSLATORS: settings colors tab name
-#: src/gui/setup_chat.cpp:70 src/gui/setup_colors.cpp:83
-msgid "Colors"
-msgstr "Cores"
+msgid "Protect chat focus"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:73
@@ -4438,11 +4468,6 @@ msgid "Language"
 msgstr "Linguagem"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:249
-msgid "Bold font"
-msgstr "Fonte negrito"
-
-#. TRANSLATORS: theme settings label
 #: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr "Fonte de particulas"
@@ -4932,258 +4957,289 @@ msgstr "Nível: %d"
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
-#: src/gui/socialwindow.cpp:158 src/gui/socialwindow.cpp:259
+#: src/gui/socialwindow.cpp:176 src/gui/socialwindow.cpp:309
 #: src/gui/widgets/guildchattab.cpp:42 src/net/ea/gui/guildtab.cpp:49
 msgid "Guild"
 msgstr "Guilda"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Convidou o jogador %s para a guilda %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:213
+#: src/gui/socialwindow.cpp:231
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Saída da Guilda %s requisitada."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:245
 msgid "Member Invite to Guild"
 msgstr "Convite de membros para a Guilda."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:229
+#: src/gui/socialwindow.cpp:247
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "Quem você gostaria de convidar para a guilda %s?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:238
+#: src/gui/socialwindow.cpp:256
 msgid "Leave Guild?"
 msgstr "Sair da guilda?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:240
+#: src/gui/socialwindow.cpp:258
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Tem certeza que deseja sair da guilda %s?"
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:269
+#, c-format
+msgid "Members: %u/%u"
+msgstr ""
+
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:291 src/gui/socialwindow.cpp:361
+#: src/gui/socialwindow.cpp:483
+#, c-format
+msgid "Players: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/socialwindow.cpp:302 src/net/ea/gui/partytab.cpp:49
+#: src/gui/socialwindow.cpp:376 src/net/ea/gui/partytab.cpp:49
 msgid "Party"
 msgstr "Grupo"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:341
+#: src/gui/socialwindow.cpp:415
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Convidou usuário %s para o grupo."
 
 #. TRANSLATORS: tab in social window
-#: src/gui/socialwindow.cpp:356
+#: src/gui/socialwindow.cpp:430
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Saída do grupo %s requisitada."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:370
+#: src/gui/socialwindow.cpp:444
 msgid "Member Invite to Party"
 msgstr "Convite de membros para o grupo"
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:372
+#: src/gui/socialwindow.cpp:446
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Quem você gostaria de convidar para o grupo %s?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:381
+#: src/gui/socialwindow.cpp:455
 msgid "Leave Party?"
 msgstr "Sair do grupo?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:383
+#: src/gui/socialwindow.cpp:457
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Tem certeza que deseja sair do grupo %s?"
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:681
+#, c-format
+msgid "Visible players: %d"
+msgstr ""
+
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:605
+#: src/gui/socialwindow.cpp:707
 msgid "Nav"
 msgstr "Nav"
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:809
+#, c-format
+msgid "Portals: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:922
+#: src/gui/socialwindow.cpp:1035
 msgid "Atk"
 msgstr "Atq"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:941
+#: src/gui/socialwindow.cpp:1054
 msgid "Priority mobs"
 msgstr "Mobs Prioritarios"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:943
+#: src/gui/socialwindow.cpp:1056
 msgid "Attack mobs"
 msgstr "Atacar Mobs"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:945
+#: src/gui/socialwindow.cpp:1058
 msgid "Ignore mobs"
 msgstr "Ignorar mobs"
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:968
+#: src/gui/socialwindow.cpp:1081
 msgid "Pik"
 msgstr "Pik"
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:987
+#: src/gui/socialwindow.cpp:1100
 msgid "Pickup items"
 msgstr "Pegar itens"
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:989
+#: src/gui/socialwindow.cpp:1102
 msgid "Ignore items"
 msgstr "Ignorar itens"
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:1190
+#, c-format
+msgid "Friends: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1091 src/gui/socialwindow.cpp:1563
+#: src/gui/socialwindow.cpp:1213 src/gui/socialwindow.cpp:1687
 msgid "Create Party"
 msgstr "Criar grupo"
 
 #. TRANSLATORS: social window name
 #. TRANSLATORS: full button name
-#: src/gui/socialwindow.cpp:1138 src/gui/windowmenu.cpp:126
+#: src/gui/socialwindow.cpp:1260 src/gui/windowmenu.cpp:126
 msgid "Social"
 msgstr "Social"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1273
 msgid "P"
 msgstr "J"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1156
+#: src/gui/socialwindow.cpp:1278
 msgid "F"
 msgstr "A"
 
 #. TRANSLATORS: social window button
-#: src/gui/socialwindow.cpp:1162
+#: src/gui/socialwindow.cpp:1284
 msgid "Invite"
 msgstr "Convidar"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1345
+#: src/gui/socialwindow.cpp:1469
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Aceitou convite para o grupo de  %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1356
+#: src/gui/socialwindow.cpp:1480
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Rejeitou convite para o grupo de  %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1497
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Aceitou convite para a guilda de  %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Rejeitou convite para a guilda de  %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1424
+#: src/gui/socialwindow.cpp:1548
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Criando guilda chamada %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1445
+#: src/gui/socialwindow.cpp:1569
 #, c-format
 msgid "Creating party called %s."
 msgstr "Criando grupo chamado %s."
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1460
+#: src/gui/socialwindow.cpp:1584
 msgid "Guild Name"
 msgstr "Nome da guilda"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1462
+#: src/gui/socialwindow.cpp:1586
 msgid "Choose your guild's name."
 msgstr "Escolha o nome da sua guilda."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1477
+#: src/gui/socialwindow.cpp:1601
 msgid "Received guild request, but one already exists."
 msgstr "Requisição de guilda recebida, mas já existe uma."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1485
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s te convidou para entrar na guilda %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1616
 msgid "Accept Guild Invite"
 msgstr "Aceitar convite para a guilda"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1631
 msgid "Received party request, but one already exists."
 msgstr "Requisição de grupo recebida, mas já existe um."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1519
+#: src/gui/socialwindow.cpp:1643
 msgid "You have been invited you to join a party."
 msgstr "Você foi convidado(a) para entrar em um grupo."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1524
+#: src/gui/socialwindow.cpp:1648
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Você foi convidado(a) para entrar no grupo %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1533
+#: src/gui/socialwindow.cpp:1657
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s te convidou para entrar em seu grupo."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1539
+#: src/gui/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s te convidou para entrar no grupo %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1673
 msgid "Accept Party Invite"
 msgstr "Aceitar convite para o grupo"
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1688
 msgid "Cannot create party. You are already in a party"
 msgstr "Não foi possível criar o grupo. Você já faz parte de um."
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1694
 msgid "Party Name"
 msgstr "Nome do grupo"
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1572
+#: src/gui/socialwindow.cpp:1696
 msgid "Choose your party's name."
 msgstr "Escolha o nome do seu grupo."
 
@@ -5203,24 +5259,24 @@ msgid "MP:"
 msgstr "MP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:235 src/gui/statuswindow.cpp:423
+#: src/gui/statuswindow.cpp:234 src/gui/statuswindow.cpp:424
 #, c-format
 msgid "Job: %d"
 msgstr "Job: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:237
+#: src/gui/statuswindow.cpp:236
 msgid "Job:"
 msgstr "Job:"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:288 src/gui/statuswindow.cpp:345
+#: src/gui/statuswindow.cpp:289 src/gui/statuswindow.cpp:346
 #, c-format
 msgid "Character points: %d"
 msgstr "Pontos do personagem: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:360
+#: src/gui/statuswindow.cpp:361
 #, c-format
 msgid "Correction points: %d"
 msgstr "Pontos de correção: %d"
@@ -5666,13 +5722,13 @@ msgid "%s whispers: %s"
 msgstr "%s envia mensagem privada: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:540
+#: src/gui/widgets/chattab.cpp:541
 #, c-format
 msgid "%s is now Online."
 msgstr "%s está online"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:545
+#: src/gui/widgets/chattab.cpp:546
 #, c-format
 msgid "%s is now Offline."
 msgstr "%s está offline"
@@ -5958,24 +6014,24 @@ msgstr "Escolher Mundo"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/inputmanager.cpp:328 src/inputmanager.cpp:372 src/keyboardconfig.cpp:90
+#: src/inputmanager.cpp:329 src/inputmanager.cpp:373 src/keyboardconfig.cpp:90
 #, c-format
 msgid "key_%d"
 msgstr "tecla_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/inputmanager.cpp:334
+#: src/inputmanager.cpp:335
 #, c-format
 msgid "JButton%d"
 msgstr "JBotão%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/inputmanager.cpp:348
+#: src/inputmanager.cpp:349
 msgid "unknown key"
 msgstr "Tecla desconhecida"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/inputmanager.cpp:378
+#: src/inputmanager.cpp:379
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -5983,7 +6039,7 @@ msgstr "JB%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/inputmanager.cpp:392 src/keyboardconfig.cpp:103
+#: src/inputmanager.cpp:393 src/keyboardconfig.cpp:134
 msgid "u key"
 msgstr "Tecla u"
 
@@ -6664,55 +6720,55 @@ msgid "Request to quit denied!"
 msgstr "Requisição de saída negada!"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:176
+#: src/net/ea/guildhandler.cpp:178
 #, c-format
 msgid "Guild name: %s"
 msgstr "Nome Guilda: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:179
+#: src/net/ea/guildhandler.cpp:181
 #, c-format
 msgid "Guild master: %s"
 msgstr "Mestre da guilda: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild level: %d"
 msgstr "Nível Guilda: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:186
 #, c-format
 msgid "Online members: %d"
 msgstr "Membros Online: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:187
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Max members: %d"
 msgstr "Max Membros: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Average level: %d"
 msgstr "Nível médio: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:193
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Guild exp: %d"
 msgstr "Guilda exp: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:195
+#: src/net/ea/guildhandler.cpp:197
 #, c-format
 msgid "Guild next exp: %d"
 msgstr "Guilda prox. exp: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:198
+#: src/net/ea/guildhandler.cpp:200
 #, c-format
 msgid "Guild castle: %s"
 msgstr "Castelo Guilda : %s"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index fea5ba127..c7392c119 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -11,14 +11,14 @@
 # freya <freya.df@gmail.com>, 2013
 # freya <freya.df@gmail.com>, 2011-2012
 # freya <freya.df@gmail.com>, 2011
-# luckZago <lcnzg7@gmail.com>, 2013
+# Luciano Zago <lcnzg7@gmail.com>, 2013
 # María Rolón <luxlloth@gmail.com>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-08-03 13:52+0300\n"
-"PO-Revision-Date: 2013-07-19 19:52+0000\n"
+"POT-Creation-Date: 2013-08-17 13:35+0300\n"
+"PO-Revision-Date: 2013-08-16 17:53+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
 "manaplus/language/pt_BR/)\n"
@@ -48,21 +48,21 @@ msgstr "Mapa visivel "
 msgid "Human"
 msgstr "Humano"
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "dodge"
 msgstr "desviou"
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "miss"
 msgstr "errou"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1710 src/gui/whoisonline.cpp:835
+#: src/being.cpp:1713 src/gui/whoisonline.cpp:842
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1715 src/gui/whoisonline.cpp:840
+#: src/being.cpp:1718 src/gui/whoisonline.cpp:847
 msgid "I"
 msgstr "I"
 
@@ -99,8 +99,8 @@ msgstr "Tema"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:1176 src/gui/didyouknowwindow.cpp:78
-#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:66
-#: src/gui/npcdialog.cpp:103 src/gui/popupmenu.cpp:562
+#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:70
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:562
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:81
 msgid "Close"
 msgstr "Fechar"
@@ -201,7 +201,7 @@ msgstr "%s não existe e não pode ser criado! Saindo."
 #: src/client.cpp:2189
 #, c-format
 msgid "Invalid update host: %s."
-msgstr ""
+msgstr "Host de atualização inválido: %s."
 
 #. TRANSLATORS: update server initialisation error
 #: src/client.cpp:2230 src/client.cpp:2237
@@ -216,7 +216,7 @@ msgstr "Erro: %s não existe e não pode se criado! Saindo."
 #. TRANSLATORS: error message question
 #: src/client.cpp:3042
 msgid "Do you want to open support page?"
-msgstr ""
+msgstr "Você quer abrir a página de suporte?"
 
 #. TRANSLATORS: chat commands handling message
 #: src/commandhandler.cpp:97
@@ -438,14 +438,14 @@ msgstr ""
 "Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:259 src/gui/widgets/chattab.cpp:465
+#: src/game.cpp:259 src/gui/widgets/chattab.cpp:466
 msgid "General"
 msgstr "Geral"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: debug window name
 #. TRANSLATORS: full button name
-#: src/game.cpp:275 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:467
+#: src/game.cpp:275 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:468
 #: src/gui/windowmenu.cpp:154
 msgid "Debug"
 msgstr "Depurador"
@@ -502,7 +502,7 @@ msgstr "Analizador de bot"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:105
+#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:111
 msgid "Reset"
 msgstr "Resetar"
 
@@ -589,7 +589,7 @@ msgstr "por tipo"
 #. TRANSLATORS: buy dialog name
 #: src/gui/buydialog.cpp:194
 msgid "Create items"
-msgstr ""
+msgstr "Criar itens"
 
 #. TRANSLATORS: buy dialog name
 #. TRANSLATORS: shop window button
@@ -620,8 +620,8 @@ msgstr "Quantidade:"
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/buydialog.cpp:265 src/gui/itemamountwindow.cpp:202
-#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:96
-#: src/gui/selldialog.cpp:101 src/gui/statuswindow.cpp:790
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:100
+#: src/gui/selldialog.cpp:101 src/gui/statuswindow.cpp:791
 msgid "+"
 msgstr "+"
 
@@ -632,8 +632,8 @@ msgstr "+"
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
 #: src/gui/buydialog.cpp:268 src/gui/itemamountwindow.cpp:200
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:98
-#: src/gui/selldialog.cpp:103 src/gui/statuswindow.cpp:803
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:102
+#: src/gui/selldialog.cpp:103 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr "-"
 
@@ -641,7 +641,7 @@ msgstr "-"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/buydialog.cpp:271 src/gui/charcreatedialog.cpp:122
-#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1160
+#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1282
 msgid "Create"
 msgstr "Criar"
 
@@ -664,8 +664,8 @@ msgstr "Sair"
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
 #: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:109
-#: src/gui/statuswindow.cpp:531 src/gui/statuswindow.cpp:586
-#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:821
+#: src/gui/statuswindow.cpp:532 src/gui/statuswindow.cpp:587
+#: src/gui/statuswindow.cpp:788 src/gui/statuswindow.cpp:822
 msgid "Max"
 msgstr "Máximo"
 
@@ -725,7 +725,7 @@ msgstr "Vender"
 #: src/gui/popupmenu.cpp:2309 src/gui/popupmenu.cpp:2543
 #: src/gui/popupmenu.cpp:2660 src/gui/quitdialog.cpp:73
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
-#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1094
+#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1216
 #: src/gui/textcommandeditor.cpp:211 src/gui/textdialog.cpp:53
 #: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:181
 msgid "Cancel"
@@ -897,7 +897,7 @@ msgstr "Corrida:"
 #. TRANSLATORS: char create dialog label
 #: src/gui/charcreatedialog.cpp:190
 msgid "Look:"
-msgstr ""
+msgstr "Aparência:"
 
 #. TRANSLATORS: char creation error
 #: src/gui/charcreatedialog.cpp:365
@@ -1014,92 +1014,102 @@ msgstr "Entre com a senha:"
 #. TRANSLATORS: inventory sort mode
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
-#: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:65
+#: src/gui/chatwindow.cpp:143 src/gui/inventorywindow.cpp:65
 #: src/gui/setup_other.cpp:69 src/gui/setup_visual.cpp:77
 msgid "default"
 msgstr "padrão"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:144
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:145 src/gui/widgets/colormodel.cpp:76
 msgid "black"
 msgstr "preto"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:146
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:147 src/gui/widgets/colormodel.cpp:78
 msgid "red"
 msgstr "vermelho"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:148
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:149 src/gui/widgets/colormodel.cpp:80
 msgid "green"
 msgstr "verde"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:150
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:151 src/gui/widgets/colormodel.cpp:82
 msgid "blue"
 msgstr "azul"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:152
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:153 src/gui/widgets/colormodel.cpp:84
 msgid "gold"
 msgstr "ouro"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:154
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:155 src/gui/widgets/colormodel.cpp:86
 msgid "yellow"
 msgstr "amarelo"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:156
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:157 src/gui/widgets/colormodel.cpp:88
 msgid "pink"
 msgstr "rosa"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:158
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:159 src/gui/widgets/colormodel.cpp:90
 msgid "purple"
 msgstr "roxo"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:160
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:161 src/gui/widgets/colormodel.cpp:92
 msgid "grey"
 msgstr "cinza"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:162
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:163 src/gui/widgets/colormodel.cpp:94
 msgid "brown"
 msgstr "marrom"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:164
+#: src/gui/chatwindow.cpp:165
 msgid "rainbow 1"
 msgstr "arco-íris 1"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:166
+#: src/gui/chatwindow.cpp:167
 msgid "rainbow 2"
 msgstr "arco-íris 2"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:168
+#: src/gui/chatwindow.cpp:169
 msgid "rainbow 3"
 msgstr "arco-íris 3"
 
 #. TRANSLATORS: chat window name
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
-#: src/gui/chatwindow.cpp:195 src/gui/setupactiondata.h:1866
+#: src/gui/chatwindow.cpp:196 src/gui/setupactiondata.h:1866
 #: src/gui/setup_chat.cpp:50 src/gui/windowmenu.cpp:88
 msgid "Chat"
 msgstr "Chat"
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:659
+#: src/gui/chatwindow.cpp:684
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presentes: %s; %d jogadores estão presentes."
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1066
+#: src/gui/chatwindow.cpp:1091
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Enviando MP para %s: %s"
@@ -1408,14 +1418,38 @@ msgstr "URL de lista online:"
 msgid "Please at least type both the address and the port of the server."
 msgstr "Por favor, pelo menos um dos dois tipos de portas de servidor."
 
+#. TRANSLATORS: font size
+#: src/gui/emotewindow.cpp:49
+msgid "Normal font"
+msgstr ""
+
+#. TRANSLATORS: font size
+#. TRANSLATORS: theme settings label
+#: src/gui/emotewindow.cpp:51 src/gui/setup_theme.cpp:249
+msgid "Bold font"
+msgstr "Fonte negrito"
+
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/emotewindow.cpp:41 src/gui/emotewindow.cpp:61
+#: src/gui/emotewindow.cpp:56 src/gui/emotewindow.cpp:107
 #: src/gui/setupactiondata.h:1862
 msgid "Emotes"
 msgstr "Emoções"
 
+#. TRANSLATORS: emotes tab name
+#. TRANSLATORS: settings group
+#. TRANSLATORS: settings colors tab name
+#: src/gui/emotewindow.cpp:109 src/gui/setup_chat.cpp:70
+#: src/gui/setup_colors.cpp:83
+msgid "Colors"
+msgstr "Cores"
+
+#. TRANSLATORS: emotes tab name
+#: src/gui/emotewindow.cpp:111
+msgid "Fonts"
+msgstr ""
+
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/equipmentwindow.cpp:56 src/gui/inventorywindow.cpp:204
@@ -1507,7 +1541,7 @@ msgstr "Retirar"
 
 #. TRANSLATORS: status window label
 #: src/gui/inventorywindow.cpp:580 src/gui/statuswindow.cpp:143
-#: src/gui/statuswindow.cpp:284 src/gui/statuswindow.cpp:337
+#: src/gui/statuswindow.cpp:285 src/gui/statuswindow.cpp:338
 #: src/gui/widgets/characterdisplay.cpp:126
 #, c-format
 msgid "Money: %s"
@@ -1795,7 +1829,7 @@ msgstr "Barra de Job"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:295
+#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:296
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Nível: %d (GM %d)"
@@ -1803,7 +1837,7 @@ msgstr "Nível: %d (GM %d)"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/ministatuswindow.cpp:317 src/gui/statuswindow.cpp:141
-#: src/gui/statuswindow.cpp:302 src/gui/statuswindow.cpp:373
+#: src/gui/statuswindow.cpp:303 src/gui/statuswindow.cpp:374
 #, c-format
 msgid "Level: %d"
 msgstr "Nível: %d"
@@ -1817,37 +1851,48 @@ msgstr "Precisa"
 #: src/gui/ministatuswindow.cpp:357
 #, c-format
 msgid "Job level: %d"
-msgstr ""
+msgstr "Nível Job: %d"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:62
+#: src/gui/npcdialog.cpp:66
 msgid "Stop waiting"
 msgstr "Parar de esperar"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:64
+#: src/gui/npcdialog.cpp:68
 msgid "Next"
 msgstr "Próximo"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:68
+#: src/gui/npcdialog.cpp:72
 msgid "Submit"
 msgstr "Enviar"
 
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
 #. TRANSLATORS: settings group
-#: src/gui/npcdialog.cpp:77 src/gui/npcpostdialog.cpp:43
+#: src/gui/npcdialog.cpp:81 src/gui/npcpostdialog.cpp:43
 #: src/gui/setup_other.cpp:257
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:566
+#: src/gui/npcdialog.cpp:104 src/gui/popupmenu.cpp:566
 msgid "Clear"
 msgstr "Limpar"
 
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: trade window button
+#: src/gui/npcdialog.cpp:109 src/gui/serverdialog.cpp:266
+#: src/gui/shopwindow.cpp:95 src/gui/shopwindow.cpp:102
+#: src/gui/tradewindow.cpp:77
+msgid "Add"
+msgstr "Adicionar"
+
 #. TRANSLATORS: label in npc post dialog
 #: src/gui/npcpostdialog.cpp:53
 msgid "To:"
@@ -2055,7 +2100,7 @@ msgstr "Desabilitar modo indisponível"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: social window button
-#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1164
+#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1286
 msgid "Leave"
 msgstr "Sair"
 
@@ -2189,7 +2234,7 @@ msgstr "Copiar para chat"
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2194
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:985
 msgid "(default)"
 msgstr "(padrão)"
 
@@ -2311,12 +2356,12 @@ msgstr "Adicionar a lista de captura"
 #. TRANSLATORS: popup menu item
 #: src/gui/popupmenu.cpp:2568
 msgid "Unprotect item"
-msgstr ""
+msgstr "Desproteger item"
 
 #. TRANSLATORS: popup menu item
 #: src/gui/popupmenu.cpp:2575
 msgid "Protect item"
-msgstr ""
+msgstr "Proteger item"
 
 #. TRANSLATORS: popup menu item
 #: src/gui/popupmenu.cpp:2611
@@ -2326,32 +2371,32 @@ msgstr "Descartar tudo"
 #. TRANSLATORS: popup menu item
 #: src/gui/popupmenu.cpp:2632
 msgid "GM..."
-msgstr ""
+msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
 #: src/gui/popupmenu.cpp:2640
 msgid "GM commands"
-msgstr ""
+msgstr "Comandos de GM"
 
 #. TRANSLATORS: popup menu item
 #: src/gui/popupmenu.cpp:2644
 msgid "Check ip"
-msgstr ""
+msgstr "Checar ip"
 
 #. TRANSLATORS: popup menu item
 #: src/gui/popupmenu.cpp:2646
 msgid "Goto"
-msgstr ""
+msgstr "Ir à"
 
 #. TRANSLATORS: popup menu item
 #: src/gui/popupmenu.cpp:2648
 msgid "Recall"
-msgstr ""
+msgstr "Trazer jogador"
 
 #. TRANSLATORS: popup menu item
 #: src/gui/popupmenu.cpp:2650
 msgid "Revive"
-msgstr ""
+msgstr "Reviver"
 
 #. TRANSLATORS: popup menu item
 #: src/gui/popupmenu.cpp:2654
@@ -2437,15 +2482,6 @@ msgid "Choose Your Server"
 msgstr "Escolha seu servidor"
 
 #. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:266 src/gui/shopwindow.cpp:95
-#: src/gui/shopwindow.cpp:102 src/gui/tradewindow.cpp:77
-msgid "Add"
-msgstr "Adicionar"
-
-#. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
 #: src/gui/serverdialog.cpp:268 src/gui/widgets/setupitem.cpp:303
 #: src/gui/widgets/setupitem.cpp:430
@@ -3336,19 +3372,13 @@ msgstr "Janela"
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:61
-msgid "Auto hide chat window."
-msgstr "Auto ocultar janela."
+msgid "Auto hide chat window"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:65
-msgid "Protect chat focus."
-msgstr "Proteger foco do chat"
-
-#. TRANSLATORS: settings group
-#. TRANSLATORS: settings colors tab name
-#: src/gui/setup_chat.cpp:70 src/gui/setup_colors.cpp:83
-msgid "Colors"
-msgstr "Cores"
+msgid "Protect chat focus"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:73
@@ -3398,7 +3428,7 @@ msgstr "Salvar conversas"
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:109
 msgid "Enable debug chat Log"
-msgstr ""
+msgstr "Habilitar depurador de bate-papo"
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:113
@@ -3976,7 +4006,7 @@ msgstr "Habilitar ataque do lado do servidor"
 #. TRANSLATORS: settings option
 #: src/gui/setup_other.cpp:326
 msgid "Enable double clicks"
-msgstr ""
+msgstr "Habilitar duplo clique"
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_other.cpp:330
@@ -4447,11 +4477,6 @@ msgid "Language"
 msgstr "Linguagem"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:249
-msgid "Bold font"
-msgstr "Fonte negrito"
-
-#. TRANSLATORS: theme settings label
 #: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr "Fonte de particulas"
@@ -4941,258 +4966,289 @@ msgstr "Nível: %d"
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
-#: src/gui/socialwindow.cpp:158 src/gui/socialwindow.cpp:259
+#: src/gui/socialwindow.cpp:176 src/gui/socialwindow.cpp:309
 #: src/gui/widgets/guildchattab.cpp:42 src/net/ea/gui/guildtab.cpp:49
 msgid "Guild"
 msgstr "Guilda"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Convidou o jogador %s para a guilda %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:213
+#: src/gui/socialwindow.cpp:231
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Saída da Guilda %s requisitada."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:245
 msgid "Member Invite to Guild"
 msgstr "Convite de membros para a Guilda."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:229
+#: src/gui/socialwindow.cpp:247
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "Quem você gostaria de convidar para a guilda %s?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:238
+#: src/gui/socialwindow.cpp:256
 msgid "Leave Guild?"
 msgstr "Sair da guilda?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:240
+#: src/gui/socialwindow.cpp:258
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Tem certeza que deseja sair da guilda %s?"
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:269
+#, c-format
+msgid "Members: %u/%u"
+msgstr ""
+
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:291 src/gui/socialwindow.cpp:361
+#: src/gui/socialwindow.cpp:483
+#, c-format
+msgid "Players: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/socialwindow.cpp:302 src/net/ea/gui/partytab.cpp:49
+#: src/gui/socialwindow.cpp:376 src/net/ea/gui/partytab.cpp:49
 msgid "Party"
 msgstr "Grupo"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:341
+#: src/gui/socialwindow.cpp:415
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Convidou usuário %s para o grupo."
 
 #. TRANSLATORS: tab in social window
-#: src/gui/socialwindow.cpp:356
+#: src/gui/socialwindow.cpp:430
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Saída do grupo %s requisitada."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:370
+#: src/gui/socialwindow.cpp:444
 msgid "Member Invite to Party"
 msgstr "Convite de membros para o grupo"
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:372
+#: src/gui/socialwindow.cpp:446
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Quem você gostaria de convidar para o grupo %s?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:381
+#: src/gui/socialwindow.cpp:455
 msgid "Leave Party?"
 msgstr "Sair do grupo?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:383
+#: src/gui/socialwindow.cpp:457
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Tem certeza que deseja sair do grupo %s?"
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:681
+#, c-format
+msgid "Visible players: %d"
+msgstr ""
+
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:605
+#: src/gui/socialwindow.cpp:707
 msgid "Nav"
 msgstr "Nav"
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:809
+#, c-format
+msgid "Portals: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:922
+#: src/gui/socialwindow.cpp:1035
 msgid "Atk"
 msgstr "Ataque"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:941
+#: src/gui/socialwindow.cpp:1054
 msgid "Priority mobs"
 msgstr "Mobs prioritarios "
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:943
+#: src/gui/socialwindow.cpp:1056
 msgid "Attack mobs"
 msgstr "Atacar mobs"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:945
+#: src/gui/socialwindow.cpp:1058
 msgid "Ignore mobs"
 msgstr "Ignorar mobs"
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:968
+#: src/gui/socialwindow.cpp:1081
 msgid "Pik"
 msgstr "Pik"
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:987
+#: src/gui/socialwindow.cpp:1100
 msgid "Pickup items"
 msgstr "Pegar itens"
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:989
+#: src/gui/socialwindow.cpp:1102
 msgid "Ignore items"
 msgstr "Ignorar itens"
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:1190
+#, c-format
+msgid "Friends: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1091 src/gui/socialwindow.cpp:1563
+#: src/gui/socialwindow.cpp:1213 src/gui/socialwindow.cpp:1687
 msgid "Create Party"
 msgstr "Criar grupo"
 
 #. TRANSLATORS: social window name
 #. TRANSLATORS: full button name
-#: src/gui/socialwindow.cpp:1138 src/gui/windowmenu.cpp:126
+#: src/gui/socialwindow.cpp:1260 src/gui/windowmenu.cpp:126
 msgid "Social"
 msgstr "Social"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1273
 msgid "P"
 msgstr "J"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1156
+#: src/gui/socialwindow.cpp:1278
 msgid "F"
 msgstr "A"
 
 #. TRANSLATORS: social window button
-#: src/gui/socialwindow.cpp:1162
+#: src/gui/socialwindow.cpp:1284
 msgid "Invite"
 msgstr "Convidar"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1345
+#: src/gui/socialwindow.cpp:1469
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Aceitou convite para o grupo de  %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1356
+#: src/gui/socialwindow.cpp:1480
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Rejeitou convite para o grupo de  %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1497
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Aceitou convite para a guilda de  %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Rejeitou convite para a guilda de  %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1424
+#: src/gui/socialwindow.cpp:1548
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Criando guilda chamada %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1445
+#: src/gui/socialwindow.cpp:1569
 #, c-format
 msgid "Creating party called %s."
 msgstr "Criando grupo chamado %s."
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1460
+#: src/gui/socialwindow.cpp:1584
 msgid "Guild Name"
 msgstr "Nome da guilda"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1462
+#: src/gui/socialwindow.cpp:1586
 msgid "Choose your guild's name."
 msgstr "Escolha o nome da sua guilda."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1477
+#: src/gui/socialwindow.cpp:1601
 msgid "Received guild request, but one already exists."
 msgstr "Requisição de guilda recebida, mas já existe uma."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1485
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s te convidou para entrar na guilda %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1616
 msgid "Accept Guild Invite"
 msgstr "Aceitar convite para a guilda"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1631
 msgid "Received party request, but one already exists."
 msgstr "Requisição de grupo recebida, mas já existe um."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1519
+#: src/gui/socialwindow.cpp:1643
 msgid "You have been invited you to join a party."
 msgstr "Você foi convidado(a) para entrar em um grupo."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1524
+#: src/gui/socialwindow.cpp:1648
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Você foi convidado(a) para entrar no grupo %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1533
+#: src/gui/socialwindow.cpp:1657
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s te convidou para entrar em seu grupo."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1539
+#: src/gui/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s te convidou para entrar no grupo %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1673
 msgid "Accept Party Invite"
 msgstr "Aceitar convite para o grupo"
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1688
 msgid "Cannot create party. You are already in a party"
 msgstr "Não foi possível criar o grupo. Você já faz parte de um."
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1694
 msgid "Party Name"
 msgstr "Nome do grupo"
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1572
+#: src/gui/socialwindow.cpp:1696
 msgid "Choose your party's name."
 msgstr "Escolha o nome do seu grupo."
 
@@ -5212,24 +5268,24 @@ msgid "MP:"
 msgstr "MP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:235 src/gui/statuswindow.cpp:423
+#: src/gui/statuswindow.cpp:234 src/gui/statuswindow.cpp:424
 #, c-format
 msgid "Job: %d"
 msgstr "Job: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:237
+#: src/gui/statuswindow.cpp:236
 msgid "Job:"
 msgstr "Job:"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:288 src/gui/statuswindow.cpp:345
+#: src/gui/statuswindow.cpp:289 src/gui/statuswindow.cpp:346
 #, c-format
 msgid "Character points: %d"
 msgstr "Pontos do personagem: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:360
+#: src/gui/statuswindow.cpp:361
 #, c-format
 msgid "Correction points: %d"
 msgstr "Pontos de correção: %d"
@@ -5675,13 +5731,13 @@ msgid "%s whispers: %s"
 msgstr "%s envia mensagem privada: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:540
+#: src/gui/widgets/chattab.cpp:541
 #, c-format
 msgid "%s is now Online."
 msgstr "%s estão online"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:545
+#: src/gui/widgets/chattab.cpp:546
 #, c-format
 msgid "%s is now Offline."
 msgstr "%s estão offline"
@@ -5967,24 +6023,24 @@ msgstr "Escolher Mundo"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/inputmanager.cpp:328 src/inputmanager.cpp:372 src/keyboardconfig.cpp:90
+#: src/inputmanager.cpp:329 src/inputmanager.cpp:373 src/keyboardconfig.cpp:90
 #, c-format
 msgid "key_%d"
 msgstr "tecla_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/inputmanager.cpp:334
+#: src/inputmanager.cpp:335
 #, c-format
 msgid "JButton%d"
 msgstr "BotãoJ%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/inputmanager.cpp:348
+#: src/inputmanager.cpp:349
 msgid "unknown key"
 msgstr "Tecla desconhecida"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/inputmanager.cpp:378
+#: src/inputmanager.cpp:379
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -5992,7 +6048,7 @@ msgstr "JB%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/inputmanager.cpp:392 src/keyboardconfig.cpp:103
+#: src/inputmanager.cpp:393 src/keyboardconfig.cpp:134
 msgid "u key"
 msgstr "tecla u"
 
@@ -6641,7 +6697,7 @@ msgstr "Corrida incorreta."
 #. TRANSLATORS: error message
 #: src/net/ea/charserverhandler.cpp:195
 msgid "Incorrect look."
-msgstr ""
+msgstr "Aparência incorreta."
 
 #: src/net/ea/charserverhandler.cpp:214
 msgid "Character deleted."
@@ -6672,55 +6728,55 @@ msgid "Request to quit denied!"
 msgstr "Requisição de saída negada!"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:176
+#: src/net/ea/guildhandler.cpp:178
 #, c-format
 msgid "Guild name: %s"
 msgstr "Nome Guilda: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:179
+#: src/net/ea/guildhandler.cpp:181
 #, c-format
 msgid "Guild master: %s"
 msgstr "Mestre da guilda: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild level: %d"
 msgstr "Nível Guilda: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:186
 #, c-format
 msgid "Online members: %d"
 msgstr "Membros Online: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:187
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Max members: %d"
 msgstr "Max Membros: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Average level: %d"
 msgstr "Nível médio: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:193
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Guild exp: %d"
 msgstr "Guilda exp: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:195
+#: src/net/ea/guildhandler.cpp:197
 #, c-format
 msgid "Guild next exp: %d"
 msgstr "Guilda prox. exp: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:198
+#: src/net/ea/guildhandler.cpp:200
 #, c-format
 msgid "Guild castle: %s"
 msgstr "Castelo Guilda : %s"
@@ -7089,37 +7145,37 @@ msgstr "Veneno não surtiu efeito..."
 #: src/net/eathena/generalhandler.cpp:102 src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Strength %s"
-msgstr ""
+msgstr "Força %s"
 
 #. TRANSLATORS: player stat
 #: src/net/eathena/generalhandler.cpp:103 src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Agility %s"
-msgstr ""
+msgstr "Agilidade %s"
 
 #. TRANSLATORS: player stat
 #: src/net/eathena/generalhandler.cpp:104 src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Vitality %s"
-msgstr ""
+msgstr "Vitalidade %s"
 
 #. TRANSLATORS: player stat
 #: src/net/eathena/generalhandler.cpp:105 src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Intelligence %s"
-msgstr ""
+msgstr "Inteligência %s"
 
 #. TRANSLATORS: player stat
 #: src/net/eathena/generalhandler.cpp:106 src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Dexterity %s"
-msgstr ""
+msgstr "Destreza %s"
 
 #. TRANSLATORS: player stat
 #: src/net/eathena/generalhandler.cpp:107 src/net/tmwa/generalhandler.cpp:115
 #, c-format
 msgid "Luck %s"
-msgstr ""
+msgstr "Sorte %s"
 
 #. TRANSLATORS: error message
 #: src/net/eathena/generalhandler.cpp:130 src/net/tmwa/generalhandler.cpp:141
@@ -7619,31 +7675,31 @@ msgstr "sem nome"
 #: src/resources/itemdb.cpp:71
 #, c-format
 msgid "Attack %s"
-msgstr ""
+msgstr "Ataque %s"
 
 #. TRANSLATORS: item info label
 #: src/resources/itemdb.cpp:73
 #, c-format
 msgid "Defense %s"
-msgstr ""
+msgstr "Defesa %s"
 
 #. TRANSLATORS: item info label
 #: src/resources/itemdb.cpp:75
 #, c-format
 msgid "HP %s"
-msgstr ""
+msgstr "HP %s"
 
 #. TRANSLATORS: item info label
 #: src/resources/itemdb.cpp:77
 #, c-format
 msgid "MP %s"
-msgstr ""
+msgstr "MP %s"
 
 #. TRANSLATORS: item info label
 #: src/resources/itemdb.cpp:79
 #, c-format
 msgid "Level %s"
-msgstr ""
+msgstr "Nível %s"
 
 #. TRANSLATORS: item name
 #: src/resources/itemdb.cpp:184
diff --git a/po/ru.po b/po/ru.po
index 93bdf23ad..21eece0f1 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-08-03 13:52+0300\n"
-"PO-Revision-Date: 2013-07-19 19:53+0000\n"
+"POT-Creation-Date: 2013-08-17 13:35+0300\n"
+"PO-Revision-Date: 2013-08-16 17:56+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/manaplus/"
 "language/ru/)\n"
@@ -46,21 +46,21 @@ msgstr "Видимые на карте"
 msgid "Human"
 msgstr "Человек"
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "dodge"
 msgstr "уворот"
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "miss"
 msgstr "промах"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1710 src/gui/whoisonline.cpp:835
+#: src/being.cpp:1713 src/gui/whoisonline.cpp:842
 msgid "A"
 msgstr "О"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1715 src/gui/whoisonline.cpp:840
+#: src/being.cpp:1718 src/gui/whoisonline.cpp:847
 msgid "I"
 msgstr "Б"
 
@@ -97,8 +97,8 @@ msgstr "Тема"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:1176 src/gui/didyouknowwindow.cpp:78
-#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:66
-#: src/gui/npcdialog.cpp:103 src/gui/popupmenu.cpp:562
+#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:70
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:562
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:81
 msgid "Close"
 msgstr "Закрыть"
@@ -437,14 +437,14 @@ msgstr ""
 "\"0\"."
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:259 src/gui/widgets/chattab.cpp:465
+#: src/game.cpp:259 src/gui/widgets/chattab.cpp:466
 msgid "General"
 msgstr "Общие"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: debug window name
 #. TRANSLATORS: full button name
-#: src/game.cpp:275 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:467
+#: src/game.cpp:275 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:468
 #: src/gui/windowmenu.cpp:154
 msgid "Debug"
 msgstr "Отладка"
@@ -501,7 +501,7 @@ msgstr "Окно детектора ботов"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:105
+#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:111
 msgid "Reset"
 msgstr "Сбросить"
 
@@ -619,8 +619,8 @@ msgstr "Количество:"
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/buydialog.cpp:265 src/gui/itemamountwindow.cpp:202
-#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:96
-#: src/gui/selldialog.cpp:101 src/gui/statuswindow.cpp:790
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:100
+#: src/gui/selldialog.cpp:101 src/gui/statuswindow.cpp:791
 msgid "+"
 msgstr "+"
 
@@ -631,8 +631,8 @@ msgstr "+"
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
 #: src/gui/buydialog.cpp:268 src/gui/itemamountwindow.cpp:200
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:98
-#: src/gui/selldialog.cpp:103 src/gui/statuswindow.cpp:803
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:102
+#: src/gui/selldialog.cpp:103 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr "-"
 
@@ -640,7 +640,7 @@ msgstr "-"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/buydialog.cpp:271 src/gui/charcreatedialog.cpp:122
-#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1160
+#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1282
 msgid "Create"
 msgstr "Создать"
 
@@ -663,8 +663,8 @@ msgstr "Выход"
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
 #: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:109
-#: src/gui/statuswindow.cpp:531 src/gui/statuswindow.cpp:586
-#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:821
+#: src/gui/statuswindow.cpp:532 src/gui/statuswindow.cpp:587
+#: src/gui/statuswindow.cpp:788 src/gui/statuswindow.cpp:822
 msgid "Max"
 msgstr "Макс"
 
@@ -724,7 +724,7 @@ msgstr "Продать"
 #: src/gui/popupmenu.cpp:2309 src/gui/popupmenu.cpp:2543
 #: src/gui/popupmenu.cpp:2660 src/gui/quitdialog.cpp:73
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
-#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1094
+#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1216
 #: src/gui/textcommandeditor.cpp:211 src/gui/textdialog.cpp:53
 #: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:181
 msgid "Cancel"
@@ -1013,92 +1013,102 @@ msgstr "Введите пароль:"
 #. TRANSLATORS: inventory sort mode
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
-#: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:65
+#: src/gui/chatwindow.cpp:143 src/gui/inventorywindow.cpp:65
 #: src/gui/setup_other.cpp:69 src/gui/setup_visual.cpp:77
 msgid "default"
 msgstr "По умолчанию"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:144
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:145 src/gui/widgets/colormodel.cpp:76
 msgid "black"
 msgstr "черный"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:146
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:147 src/gui/widgets/colormodel.cpp:78
 msgid "red"
 msgstr "красный"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:148
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:149 src/gui/widgets/colormodel.cpp:80
 msgid "green"
 msgstr "зеленый"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:150
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:151 src/gui/widgets/colormodel.cpp:82
 msgid "blue"
 msgstr "синий"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:152
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:153 src/gui/widgets/colormodel.cpp:84
 msgid "gold"
 msgstr "золотой"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:154
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:155 src/gui/widgets/colormodel.cpp:86
 msgid "yellow"
 msgstr "желтый"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:156
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:157 src/gui/widgets/colormodel.cpp:88
 msgid "pink"
 msgstr "розовый"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:158
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:159 src/gui/widgets/colormodel.cpp:90
 msgid "purple"
 msgstr "фиолетовый"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:160
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:161 src/gui/widgets/colormodel.cpp:92
 msgid "grey"
 msgstr "серый"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:162
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:163 src/gui/widgets/colormodel.cpp:94
 msgid "brown"
 msgstr "коричневый"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:164
+#: src/gui/chatwindow.cpp:165
 msgid "rainbow 1"
 msgstr "радуга 1"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:166
+#: src/gui/chatwindow.cpp:167
 msgid "rainbow 2"
 msgstr "радуга 2"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:168
+#: src/gui/chatwindow.cpp:169
 msgid "rainbow 3"
 msgstr "радуга 3"
 
 #. TRANSLATORS: chat window name
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
-#: src/gui/chatwindow.cpp:195 src/gui/setupactiondata.h:1866
+#: src/gui/chatwindow.cpp:196 src/gui/setupactiondata.h:1866
 #: src/gui/setup_chat.cpp:50 src/gui/windowmenu.cpp:88
 msgid "Chat"
 msgstr "Чат"
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:659
+#: src/gui/chatwindow.cpp:684
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Присутствуют: %s; Всего %d игроков."
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1066
+#: src/gui/chatwindow.cpp:1091
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Вы прошептали %s: %s"
@@ -1407,14 +1417,38 @@ msgstr "URL онлайн списка:"
 msgid "Please at least type both the address and the port of the server."
 msgstr "Пожалуйста введите хотя бы адрес и порт сервера"
 
+#. TRANSLATORS: font size
+#: src/gui/emotewindow.cpp:49
+msgid "Normal font"
+msgstr "Нормальный шрифт"
+
+#. TRANSLATORS: font size
+#. TRANSLATORS: theme settings label
+#: src/gui/emotewindow.cpp:51 src/gui/setup_theme.cpp:249
+msgid "Bold font"
+msgstr "Жирный шрифт"
+
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/emotewindow.cpp:41 src/gui/emotewindow.cpp:61
+#: src/gui/emotewindow.cpp:56 src/gui/emotewindow.cpp:107
 #: src/gui/setupactiondata.h:1862
 msgid "Emotes"
 msgstr "Смайлы"
 
+#. TRANSLATORS: emotes tab name
+#. TRANSLATORS: settings group
+#. TRANSLATORS: settings colors tab name
+#: src/gui/emotewindow.cpp:109 src/gui/setup_chat.cpp:70
+#: src/gui/setup_colors.cpp:83
+msgid "Colors"
+msgstr "Цвета"
+
+#. TRANSLATORS: emotes tab name
+#: src/gui/emotewindow.cpp:111
+msgid "Fonts"
+msgstr "Шрифты"
+
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/equipmentwindow.cpp:56 src/gui/inventorywindow.cpp:204
@@ -1506,7 +1540,7 @@ msgstr "Получить"
 
 #. TRANSLATORS: status window label
 #: src/gui/inventorywindow.cpp:580 src/gui/statuswindow.cpp:143
-#: src/gui/statuswindow.cpp:284 src/gui/statuswindow.cpp:337
+#: src/gui/statuswindow.cpp:285 src/gui/statuswindow.cpp:338
 #: src/gui/widgets/characterdisplay.cpp:126
 #, c-format
 msgid "Money: %s"
@@ -1796,7 +1830,7 @@ msgstr "работа"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:295
+#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:296
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Уровень: %d (GM %d)"
@@ -1804,7 +1838,7 @@ msgstr "Уровень: %d (GM %d)"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/ministatuswindow.cpp:317 src/gui/statuswindow.cpp:141
-#: src/gui/statuswindow.cpp:302 src/gui/statuswindow.cpp:373
+#: src/gui/statuswindow.cpp:303 src/gui/statuswindow.cpp:374
 #, c-format
 msgid "Level: %d"
 msgstr "Уровень: %d"
@@ -1821,34 +1855,45 @@ msgid "Job level: %d"
 msgstr "Уровень профессии: %d"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:62
+#: src/gui/npcdialog.cpp:66
 msgid "Stop waiting"
 msgstr "Остановить ожидание"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:64
+#: src/gui/npcdialog.cpp:68
 msgid "Next"
 msgstr "Следующий"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:68
+#: src/gui/npcdialog.cpp:72
 msgid "Submit"
 msgstr "Применить"
 
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
 #. TRANSLATORS: settings group
-#: src/gui/npcdialog.cpp:77 src/gui/npcpostdialog.cpp:43
+#: src/gui/npcdialog.cpp:81 src/gui/npcpostdialog.cpp:43
 #: src/gui/setup_other.cpp:257
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:566
+#: src/gui/npcdialog.cpp:104 src/gui/popupmenu.cpp:566
 msgid "Clear"
 msgstr "Очистить"
 
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: trade window button
+#: src/gui/npcdialog.cpp:109 src/gui/serverdialog.cpp:266
+#: src/gui/shopwindow.cpp:95 src/gui/shopwindow.cpp:102
+#: src/gui/tradewindow.cpp:77
+msgid "Add"
+msgstr "Добавить"
+
 #. TRANSLATORS: label in npc post dialog
 #: src/gui/npcpostdialog.cpp:53
 msgid "To:"
@@ -2056,7 +2101,7 @@ msgstr "Запретить режим \"отошел\""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: social window button
-#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1164
+#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1286
 msgid "Leave"
 msgstr "Покинуть"
 
@@ -2190,7 +2235,7 @@ msgstr "Скопировать в чат"
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2194
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:985
 msgid "(default)"
 msgstr "(по умолчанию)"
 
@@ -2438,15 +2483,6 @@ msgid "Choose Your Server"
 msgstr "Выберите сервер"
 
 #. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:266 src/gui/shopwindow.cpp:95
-#: src/gui/shopwindow.cpp:102 src/gui/tradewindow.cpp:77
-msgid "Add"
-msgstr "Добавить"
-
-#. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
 #: src/gui/serverdialog.cpp:268 src/gui/widgets/setupitem.cpp:303
 #: src/gui/widgets/setupitem.cpp:430
@@ -3337,19 +3373,13 @@ msgstr "Окно"
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:61
-msgid "Auto hide chat window."
-msgstr "Автоматически прятать окно чата."
+msgid "Auto hide chat window"
+msgstr "Автоматически прятать окно чата"
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:65
-msgid "Protect chat focus."
-msgstr "Защитить фокус чата."
-
-#. TRANSLATORS: settings group
-#. TRANSLATORS: settings colors tab name
-#: src/gui/setup_chat.cpp:70 src/gui/setup_colors.cpp:83
-msgid "Colors"
-msgstr "Цвета"
+msgid "Protect chat focus"
+msgstr "Защитить фокус чата"
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:73
@@ -4451,11 +4481,6 @@ msgid "Language"
 msgstr "Язык"
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:249
-msgid "Bold font"
-msgstr "Жирный шрифт"
-
-#. TRANSLATORS: theme settings label
 #: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr "Шрифт частиц"
@@ -4947,258 +4972,289 @@ msgstr "Уровень: %d"
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
-#: src/gui/socialwindow.cpp:158 src/gui/socialwindow.cpp:259
+#: src/gui/socialwindow.cpp:176 src/gui/socialwindow.cpp:309
 #: src/gui/widgets/guildchattab.cpp:42 src/net/ea/gui/guildtab.cpp:49
 msgid "Guild"
 msgstr "Гильдия"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Пользователь %s приглашен в гильдию %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:213
+#: src/gui/socialwindow.cpp:231
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Выход из гильдии %s запрошен."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:245
 msgid "Member Invite to Guild"
 msgstr "Приглашение игрока в Гильдию"
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:229
+#: src/gui/socialwindow.cpp:247
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "Кого вы хотите пригласить в гильдию %s?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:238
+#: src/gui/socialwindow.cpp:256
 msgid "Leave Guild?"
 msgstr "Покинуть Гильдию?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:240
+#: src/gui/socialwindow.cpp:258
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Вы действительно хотите выйти из гильдии %s?"
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:269
+#, c-format
+msgid "Members: %u/%u"
+msgstr "Членов: %u/%u"
+
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:291 src/gui/socialwindow.cpp:361
+#: src/gui/socialwindow.cpp:483
+#, c-format
+msgid "Players: %u/%u"
+msgstr "Игроков: %u/%u"
+
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/socialwindow.cpp:302 src/net/ea/gui/partytab.cpp:49
+#: src/gui/socialwindow.cpp:376 src/net/ea/gui/partytab.cpp:49
 msgid "Party"
 msgstr "Группа"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:341
+#: src/gui/socialwindow.cpp:415
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Пригласить пользователя %s в группу."
 
 #. TRANSLATORS: tab in social window
-#: src/gui/socialwindow.cpp:356
+#: src/gui/socialwindow.cpp:430
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Запрошен выход из группы %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:370
+#: src/gui/socialwindow.cpp:444
 msgid "Member Invite to Party"
 msgstr "Пригласить пользователя в группу"
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:372
+#: src/gui/socialwindow.cpp:446
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Кого вы хотите пригласить в группу %s?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:381
+#: src/gui/socialwindow.cpp:455
 msgid "Leave Party?"
 msgstr "Покинуть группу?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:383
+#: src/gui/socialwindow.cpp:457
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Вы действительно хотите покинуть группу %s?"
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:681
+#, c-format
+msgid "Visible players: %d"
+msgstr "Видимых игроков: %d"
+
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:605
+#: src/gui/socialwindow.cpp:707
 msgid "Nav"
 msgstr "Нав"
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:809
+#, c-format
+msgid "Portals: %u/%u"
+msgstr "Порталов: %u/%u"
+
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:922
+#: src/gui/socialwindow.cpp:1035
 msgid "Atk"
 msgstr "Атк"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:941
+#: src/gui/socialwindow.cpp:1054
 msgid "Priority mobs"
 msgstr "Приоритетные монстры"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:943
+#: src/gui/socialwindow.cpp:1056
 msgid "Attack mobs"
 msgstr "Атакуемые монстры"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:945
+#: src/gui/socialwindow.cpp:1058
 msgid "Ignore mobs"
 msgstr "Игнорируемые монстры"
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:968
+#: src/gui/socialwindow.cpp:1081
 msgid "Pik"
 msgstr "Подб"
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:987
+#: src/gui/socialwindow.cpp:1100
 msgid "Pickup items"
 msgstr "Подбирать предметы"
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:989
+#: src/gui/socialwindow.cpp:1102
 msgid "Ignore items"
 msgstr "Игнорировать предметы"
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:1190
+#, c-format
+msgid "Friends: %u/%u"
+msgstr "Друзей: %u/%u"
+
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1091 src/gui/socialwindow.cpp:1563
+#: src/gui/socialwindow.cpp:1213 src/gui/socialwindow.cpp:1687
 msgid "Create Party"
 msgstr "Создать группу"
 
 #. TRANSLATORS: social window name
 #. TRANSLATORS: full button name
-#: src/gui/socialwindow.cpp:1138 src/gui/windowmenu.cpp:126
+#: src/gui/socialwindow.cpp:1260 src/gui/windowmenu.cpp:126
 msgid "Social"
 msgstr "Общество"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1273
 msgid "P"
 msgstr "И"
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1156
+#: src/gui/socialwindow.cpp:1278
 msgid "F"
 msgstr "Д"
 
 #. TRANSLATORS: social window button
-#: src/gui/socialwindow.cpp:1162
+#: src/gui/socialwindow.cpp:1284
 msgid "Invite"
 msgstr "Пригласить"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1345
+#: src/gui/socialwindow.cpp:1469
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Принято приглашение в группу от %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1356
+#: src/gui/socialwindow.cpp:1480
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Отклонено приглашение в группу от %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1497
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Принято приглашение в гильдию от %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Отклонено приглашение в гильдию от %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1424
+#: src/gui/socialwindow.cpp:1548
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Создание гильдии с именем %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1445
+#: src/gui/socialwindow.cpp:1569
 #, c-format
 msgid "Creating party called %s."
 msgstr "Создание группы с именем %s."
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1460
+#: src/gui/socialwindow.cpp:1584
 msgid "Guild Name"
 msgstr "Имя гильдии"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1462
+#: src/gui/socialwindow.cpp:1586
 msgid "Choose your guild's name."
 msgstr "Выберите имя для гильдии."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1477
+#: src/gui/socialwindow.cpp:1601
 msgid "Received guild request, but one already exists."
 msgstr "Получено приглашение в гильдию, но оно не первое."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1485
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s приглашает присоединиться к гильдии %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1616
 msgid "Accept Guild Invite"
 msgstr "Принять приглашение в гильдию"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1631
 msgid "Received party request, but one already exists."
 msgstr "Получено приглашение в группу, но оно не первое."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1519
+#: src/gui/socialwindow.cpp:1643
 msgid "You have been invited you to join a party."
 msgstr "Вас приглашают в группу."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1524
+#: src/gui/socialwindow.cpp:1648
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Вас приглашают присоединиться к группе %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1533
+#: src/gui/socialwindow.cpp:1657
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s приглашает Вас к себе в группу."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1539
+#: src/gui/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s приглашает присоединиться к %s группе."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1673
 msgid "Accept Party Invite"
 msgstr "Принять приглашение в группу"
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1688
 msgid "Cannot create party. You are already in a party"
 msgstr "Не удалось создать группу. Вы уже состоите в другой."
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1694
 msgid "Party Name"
 msgstr "Имя группы"
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1572
+#: src/gui/socialwindow.cpp:1696
 msgid "Choose your party's name."
 msgstr "Выберите имя будущей группы."
 
@@ -5218,24 +5274,24 @@ msgid "MP:"
 msgstr "Мана:"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:235 src/gui/statuswindow.cpp:423
+#: src/gui/statuswindow.cpp:234 src/gui/statuswindow.cpp:424
 #, c-format
 msgid "Job: %d"
 msgstr "Профессия: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:237
+#: src/gui/statuswindow.cpp:236
 msgid "Job:"
 msgstr "Профессия:"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:288 src/gui/statuswindow.cpp:345
+#: src/gui/statuswindow.cpp:289 src/gui/statuswindow.cpp:346
 #, c-format
 msgid "Character points: %d"
 msgstr "Очки персонажа: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:360
+#: src/gui/statuswindow.cpp:361
 #, c-format
 msgid "Correction points: %d"
 msgstr "Очков навыков: %d"
@@ -5682,13 +5738,13 @@ msgid "%s whispers: %s"
 msgstr "%s шепчет: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:540
+#: src/gui/widgets/chattab.cpp:541
 #, c-format
 msgid "%s is now Online."
 msgstr "%s вошел(а)."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:545
+#: src/gui/widgets/chattab.cpp:546
 #, c-format
 msgid "%s is now Offline."
 msgstr "%s вышел(а)."
@@ -5975,24 +6031,24 @@ msgstr "Выберите сервер"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/inputmanager.cpp:328 src/inputmanager.cpp:372 src/keyboardconfig.cpp:90
+#: src/inputmanager.cpp:329 src/inputmanager.cpp:373 src/keyboardconfig.cpp:90
 #, c-format
 msgid "key_%d"
 msgstr "кнопка_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/inputmanager.cpp:334
+#: src/inputmanager.cpp:335
 #, c-format
 msgid "JButton%d"
 msgstr "КнопДж%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/inputmanager.cpp:348
+#: src/inputmanager.cpp:349
 msgid "unknown key"
 msgstr "неизвестная кнопка"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/inputmanager.cpp:378
+#: src/inputmanager.cpp:379
 #, c-format
 msgid "JB%d"
 msgstr "ДЖ%d"
@@ -6000,7 +6056,7 @@ msgstr "ДЖ%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/inputmanager.cpp:392 src/keyboardconfig.cpp:103
+#: src/inputmanager.cpp:393 src/keyboardconfig.cpp:134
 msgid "u key"
 msgstr "неиз."
 
@@ -6681,55 +6737,55 @@ msgid "Request to quit denied!"
 msgstr "Запрос на выход отклонен!"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:176
+#: src/net/ea/guildhandler.cpp:178
 #, c-format
 msgid "Guild name: %s"
 msgstr "Имя гильдии: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:179
+#: src/net/ea/guildhandler.cpp:181
 #, c-format
 msgid "Guild master: %s"
 msgstr "Мастер гильдии: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild level: %d"
 msgstr "Уровень гильдии: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:186
 #, c-format
 msgid "Online members: %d"
 msgstr "Пользователей онлайн: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:187
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Max members: %d"
 msgstr "Макс. членов: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Average level: %d"
 msgstr "Средний уровень: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:193
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Guild exp: %d"
 msgstr "Опыт гильдии: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:195
+#: src/net/ea/guildhandler.cpp:197
 #, c-format
 msgid "Guild next exp: %d"
 msgstr "Нужно опыта до следующего уровня: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:198
+#: src/net/ea/guildhandler.cpp:200
 #, c-format
 msgid "Guild castle: %s"
 msgstr "Замки: %s"
diff --git a/po/sk.po b/po/sk.po
index 031910dc3..b728a53ca 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-07-19 22:23+0300\n"
-"PO-Revision-Date: 2013-07-19 19:52+0000\n"
+"POT-Creation-Date: 2013-08-16 20:45+0300\n"
+"PO-Revision-Date: 2013-08-16 17:53+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/manaplus/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -38,21 +38,21 @@ msgstr ""
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1606 src/gui/whoisonline.cpp:835
+#: src/being.cpp:1713 src/gui/whoisonline.cpp:842
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1611 src/gui/whoisonline.cpp:840
+#: src/being.cpp:1718 src/gui/whoisonline.cpp:847
 msgid "I"
 msgstr ""
 
@@ -89,8 +89,8 @@ msgstr ""
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:1176 src/gui/didyouknowwindow.cpp:78
-#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:66
-#: src/gui/npcdialog.cpp:103 src/gui/popupmenu.cpp:562
+#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:70
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:562
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:81
 msgid "Close"
 msgstr "Zatvoriť"
@@ -425,36 +425,36 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:465
+#: src/game.cpp:259 src/gui/widgets/chattab.cpp:466
 msgid "General"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: debug window name
 #. TRANSLATORS: full button name
-#: src/game.cpp:272 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:467
+#: src/game.cpp:275 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:468
 #: src/gui/windowmenu.cpp:154
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:536
+#: src/game.cpp:540
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:546
+#: src/game.cpp:550
 msgid "Saving screenshot failed!"
 msgstr ""
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:618
+#: src/game.cpp:622
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:621
+#: src/game.cpp:625
 msgid "Network Error"
 msgstr ""
 
@@ -489,7 +489,7 @@ msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:105
+#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:111
 msgid "Reset"
 msgstr ""
 
@@ -590,7 +590,7 @@ msgstr "Kúpiť"
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
 #: src/gui/buydialog.cpp:251 src/gui/buydialog.cpp:531
-#: src/gui/selldialog.cpp:96 src/gui/selldialog.cpp:356
+#: src/gui/selldialog.cpp:97 src/gui/selldialog.cpp:357
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
@@ -607,8 +607,8 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/buydialog.cpp:265 src/gui/itemamountwindow.cpp:202
-#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:96
-#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:790
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:100
+#: src/gui/selldialog.cpp:101 src/gui/statuswindow.cpp:791
 msgid "+"
 msgstr ""
 
@@ -619,8 +619,8 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
 #: src/gui/buydialog.cpp:268 src/gui/itemamountwindow.cpp:200
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:98
-#: src/gui/selldialog.cpp:102 src/gui/statuswindow.cpp:803
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:102
+#: src/gui/selldialog.cpp:103 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr ""
 
@@ -628,7 +628,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/buydialog.cpp:271 src/gui/charcreatedialog.cpp:122
-#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1160
+#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1282
 msgid "Create"
 msgstr "Vytvoriť"
 
@@ -640,7 +640,7 @@ msgstr "Vytvoriť"
 #. TRANSLATORS: input action name
 #: src/gui/buydialog.cpp:273 src/gui/quitdialog.cpp:55
 #: src/gui/quitdialog.cpp:60 src/gui/quitdialog.cpp:62
-#: src/gui/selldialog.cpp:106 src/gui/serverdialog.cpp:262
+#: src/gui/selldialog.cpp:107 src/gui/serverdialog.cpp:262
 #: src/gui/setupactiondata.h:177
 msgid "Quit"
 msgstr "Ukončiť"
@@ -650,9 +650,9 @@ msgstr "Ukončiť"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:108
-#: src/gui/statuswindow.cpp:531 src/gui/statuswindow.cpp:586
-#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:821
+#: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:109
+#: src/gui/statuswindow.cpp:532 src/gui/statuswindow.cpp:587
+#: src/gui/statuswindow.cpp:788 src/gui/statuswindow.cpp:822
 msgid "Max"
 msgstr ""
 
@@ -672,7 +672,7 @@ msgstr "Obchod"
 #. TRANSLATORS: sell dialog button
 #: src/gui/buyselldialog.cpp:69 src/gui/popupmenu.cpp:223
 #: src/gui/popupmenu.cpp:2455 src/gui/selldialog.cpp:54
-#: src/gui/selldialog.cpp:64 src/gui/selldialog.cpp:104
+#: src/gui/selldialog.cpp:64 src/gui/selldialog.cpp:105
 msgid "Sell"
 msgstr "Predaj"
 
@@ -712,7 +712,7 @@ msgstr "Predaj"
 #: src/gui/popupmenu.cpp:2309 src/gui/popupmenu.cpp:2543
 #: src/gui/popupmenu.cpp:2660 src/gui/quitdialog.cpp:73
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
-#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1094
+#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1216
 #: src/gui/textcommandeditor.cpp:211 src/gui/textdialog.cpp:53
 #: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:181
 msgid "Cancel"
@@ -996,92 +996,102 @@ msgstr ""
 #. TRANSLATORS: inventory sort mode
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
-#: src/gui/chatwindow.cpp:139 src/gui/inventorywindow.cpp:65
+#: src/gui/chatwindow.cpp:143 src/gui/inventorywindow.cpp:65
 #: src/gui/setup_other.cpp:69 src/gui/setup_visual.cpp:77
 msgid "default"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:141
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:145 src/gui/widgets/colormodel.cpp:76
 msgid "black"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:143
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:147 src/gui/widgets/colormodel.cpp:78
 msgid "red"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:145
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:149 src/gui/widgets/colormodel.cpp:80
 msgid "green"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:147
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:151 src/gui/widgets/colormodel.cpp:82
 msgid "blue"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:149
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:153 src/gui/widgets/colormodel.cpp:84
 msgid "gold"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:151
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:155 src/gui/widgets/colormodel.cpp:86
 msgid "yellow"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:153
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:157 src/gui/widgets/colormodel.cpp:88
 msgid "pink"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:155
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:159 src/gui/widgets/colormodel.cpp:90
 msgid "purple"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:157
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:161 src/gui/widgets/colormodel.cpp:92
 msgid "grey"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:159
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:163 src/gui/widgets/colormodel.cpp:94
 msgid "brown"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:161
+#: src/gui/chatwindow.cpp:165
 msgid "rainbow 1"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:163
+#: src/gui/chatwindow.cpp:167
 msgid "rainbow 2"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:165
+#: src/gui/chatwindow.cpp:169
 msgid "rainbow 3"
 msgstr ""
 
 #. TRANSLATORS: chat window name
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
-#: src/gui/chatwindow.cpp:192 src/gui/setupactiondata.h:1866
+#: src/gui/chatwindow.cpp:196 src/gui/setupactiondata.h:1866
 #: src/gui/setup_chat.cpp:50 src/gui/windowmenu.cpp:88
 msgid "Chat"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:641
+#: src/gui/chatwindow.cpp:684
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1044
+#: src/gui/chatwindow.cpp:1091
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Nápoveda pre %s: %s"
@@ -1390,6 +1400,38 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
+#. TRANSLATORS: font size
+#: src/gui/emotewindow.cpp:49
+msgid "Normal font"
+msgstr ""
+
+#. TRANSLATORS: font size
+#. TRANSLATORS: theme settings label
+#: src/gui/emotewindow.cpp:51 src/gui/setup_theme.cpp:249
+msgid "Bold font"
+msgstr ""
+
+#. TRANSLATORS: emotes window name
+#. TRANSLATORS: emotes tab name
+#. TRANSLATORS: input tab sub tab name
+#: src/gui/emotewindow.cpp:56 src/gui/emotewindow.cpp:107
+#: src/gui/setupactiondata.h:1862
+msgid "Emotes"
+msgstr ""
+
+#. TRANSLATORS: emotes tab name
+#. TRANSLATORS: settings group
+#. TRANSLATORS: settings colors tab name
+#: src/gui/emotewindow.cpp:109 src/gui/setup_chat.cpp:70
+#: src/gui/setup_colors.cpp:83
+msgid "Colors"
+msgstr ""
+
+#. TRANSLATORS: emotes tab name
+#: src/gui/emotewindow.cpp:111
+msgid "Fonts"
+msgstr ""
+
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/equipmentwindow.cpp:56 src/gui/inventorywindow.cpp:204
@@ -1481,7 +1523,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/inventorywindow.cpp:580 src/gui/statuswindow.cpp:143
-#: src/gui/statuswindow.cpp:284 src/gui/statuswindow.cpp:337
+#: src/gui/statuswindow.cpp:285 src/gui/statuswindow.cpp:338
 #: src/gui/widgets/characterdisplay.cpp:126
 #, c-format
 msgid "Money: %s"
@@ -1771,7 +1813,7 @@ msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:295
+#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:296
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
@@ -1779,7 +1821,7 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/ministatuswindow.cpp:317 src/gui/statuswindow.cpp:141
-#: src/gui/statuswindow.cpp:302 src/gui/statuswindow.cpp:373
+#: src/gui/statuswindow.cpp:303 src/gui/statuswindow.cpp:374
 #, c-format
 msgid "Level: %d"
 msgstr "Level: %d"
@@ -1796,34 +1838,45 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:62
+#: src/gui/npcdialog.cpp:66
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:64
+#: src/gui/npcdialog.cpp:68
 msgid "Next"
 msgstr "Nasledujúci"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:68
+#: src/gui/npcdialog.cpp:72
 msgid "Submit"
 msgstr ""
 
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
 #. TRANSLATORS: settings group
-#: src/gui/npcdialog.cpp:77 src/gui/npcpostdialog.cpp:43
+#: src/gui/npcdialog.cpp:81 src/gui/npcpostdialog.cpp:43
 #: src/gui/setup_other.cpp:257
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:566
+#: src/gui/npcdialog.cpp:104 src/gui/popupmenu.cpp:566
 msgid "Clear"
 msgstr ""
 
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: trade window button
+#: src/gui/npcdialog.cpp:109 src/gui/serverdialog.cpp:266
+#: src/gui/shopwindow.cpp:95 src/gui/shopwindow.cpp:102
+#: src/gui/tradewindow.cpp:77
+msgid "Add"
+msgstr ""
+
 #. TRANSLATORS: label in npc post dialog
 #: src/gui/npcpostdialog.cpp:53
 msgid "To:"
@@ -2031,7 +2084,7 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: social window button
-#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1164
+#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1286
 msgid "Leave"
 msgstr ""
 
@@ -2165,7 +2218,7 @@ msgstr ""
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2194
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:985
 msgid "(default)"
 msgstr ""
 
@@ -2397,12 +2450,12 @@ msgid "Passwords do not match."
 msgstr "Heslá sa nezhodujú."
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/selldialog.cpp:242
+#: src/gui/selldialog.cpp:243
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/selldialog.cpp:244
+#: src/gui/selldialog.cpp:245
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
@@ -2413,15 +2466,6 @@ msgid "Choose Your Server"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:266 src/gui/shopwindow.cpp:95
-#: src/gui/shopwindow.cpp:102 src/gui/tradewindow.cpp:77
-msgid "Add"
-msgstr ""
-
-#. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
 #: src/gui/serverdialog.cpp:268 src/gui/widgets/setupitem.cpp:303
 #: src/gui/widgets/setupitem.cpp:430
@@ -3157,11 +3201,6 @@ msgid "Windows"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1862
-msgid "Emotes"
-msgstr ""
-
-#. TRANSLATORS: input tab sub tab name
 #: src/gui/setupactiondata.h:1870
 msgid "Gui"
 msgstr ""
@@ -3317,18 +3356,12 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:61
-msgid "Auto hide chat window."
+msgid "Auto hide chat window"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:65
-msgid "Protect chat focus."
-msgstr ""
-
-#. TRANSLATORS: settings group
-#. TRANSLATORS: settings colors tab name
-#: src/gui/setup_chat.cpp:70 src/gui/setup_colors.cpp:83
-msgid "Colors"
+msgid "Protect chat focus"
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4423,11 +4456,6 @@ msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:249
-msgid "Bold font"
-msgstr ""
-
-#. TRANSLATORS: theme settings label
 #: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr ""
@@ -4913,258 +4941,289 @@ msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
-#: src/gui/socialwindow.cpp:158 src/gui/socialwindow.cpp:259
+#: src/gui/socialwindow.cpp:176 src/gui/socialwindow.cpp:309
 #: src/gui/widgets/guildchattab.cpp:42 src/net/ea/gui/guildtab.cpp:49
 msgid "Guild"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:213
+#: src/gui/socialwindow.cpp:231
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:245
 msgid "Member Invite to Guild"
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:229
+#: src/gui/socialwindow.cpp:247
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:238
+#: src/gui/socialwindow.cpp:256
 msgid "Leave Guild?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:240
+#: src/gui/socialwindow.cpp:258
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:269
+#, c-format
+msgid "Members: %u/%u"
+msgstr ""
+
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:291 src/gui/socialwindow.cpp:361
+#: src/gui/socialwindow.cpp:483
+#, c-format
+msgid "Players: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/socialwindow.cpp:302 src/net/ea/gui/partytab.cpp:49
+#: src/gui/socialwindow.cpp:376 src/net/ea/gui/partytab.cpp:49
 msgid "Party"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:341
+#: src/gui/socialwindow.cpp:415
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
 #. TRANSLATORS: tab in social window
-#: src/gui/socialwindow.cpp:356
+#: src/gui/socialwindow.cpp:430
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:370
+#: src/gui/socialwindow.cpp:444
 msgid "Member Invite to Party"
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:372
+#: src/gui/socialwindow.cpp:446
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:381
+#: src/gui/socialwindow.cpp:455
 msgid "Leave Party?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:383
+#: src/gui/socialwindow.cpp:457
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:681
+#, c-format
+msgid "Visible players: %d"
+msgstr ""
+
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:605
+#: src/gui/socialwindow.cpp:707
 msgid "Nav"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:809
+#, c-format
+msgid "Portals: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:922
+#: src/gui/socialwindow.cpp:1035
 msgid "Atk"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:941
+#: src/gui/socialwindow.cpp:1054
 msgid "Priority mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:943
+#: src/gui/socialwindow.cpp:1056
 msgid "Attack mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:945
+#: src/gui/socialwindow.cpp:1058
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:968
+#: src/gui/socialwindow.cpp:1081
 msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:987
+#: src/gui/socialwindow.cpp:1100
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:989
+#: src/gui/socialwindow.cpp:1102
 msgid "Ignore items"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:1190
+#, c-format
+msgid "Friends: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1091 src/gui/socialwindow.cpp:1563
+#: src/gui/socialwindow.cpp:1213 src/gui/socialwindow.cpp:1687
 msgid "Create Party"
 msgstr ""
 
 #. TRANSLATORS: social window name
 #. TRANSLATORS: full button name
-#: src/gui/socialwindow.cpp:1138 src/gui/windowmenu.cpp:126
+#: src/gui/socialwindow.cpp:1260 src/gui/windowmenu.cpp:126
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1273
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1156
+#: src/gui/socialwindow.cpp:1278
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/socialwindow.cpp:1162
+#: src/gui/socialwindow.cpp:1284
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1345
+#: src/gui/socialwindow.cpp:1469
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1356
+#: src/gui/socialwindow.cpp:1480
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1497
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1424
+#: src/gui/socialwindow.cpp:1548
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1445
+#: src/gui/socialwindow.cpp:1569
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1460
+#: src/gui/socialwindow.cpp:1584
 msgid "Guild Name"
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1462
+#: src/gui/socialwindow.cpp:1586
 msgid "Choose your guild's name."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1477
+#: src/gui/socialwindow.cpp:1601
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1485
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1616
 msgid "Accept Guild Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1631
 msgid "Received party request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1519
+#: src/gui/socialwindow.cpp:1643
 msgid "You have been invited you to join a party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1524
+#: src/gui/socialwindow.cpp:1648
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1533
+#: src/gui/socialwindow.cpp:1657
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1539
+#: src/gui/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1673
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1688
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1694
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1572
+#: src/gui/socialwindow.cpp:1696
 msgid "Choose your party's name."
 msgstr ""
 
@@ -5184,24 +5243,24 @@ msgid "MP:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:235 src/gui/statuswindow.cpp:423
+#: src/gui/statuswindow.cpp:234 src/gui/statuswindow.cpp:424
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:237
+#: src/gui/statuswindow.cpp:236
 msgid "Job:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:288 src/gui/statuswindow.cpp:345
+#: src/gui/statuswindow.cpp:289 src/gui/statuswindow.cpp:346
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:360
+#: src/gui/statuswindow.cpp:361
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
@@ -5647,13 +5706,13 @@ msgid "%s whispers: %s"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:540
+#: src/gui/widgets/chattab.cpp:541
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:545
+#: src/gui/widgets/chattab.cpp:546
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -5939,24 +5998,24 @@ msgstr ""
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/inputmanager.cpp:328 src/inputmanager.cpp:372 src/keyboardconfig.cpp:90
+#: src/inputmanager.cpp:329 src/inputmanager.cpp:373 src/keyboardconfig.cpp:90
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/inputmanager.cpp:334
+#: src/inputmanager.cpp:335
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/inputmanager.cpp:348
+#: src/inputmanager.cpp:349
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/inputmanager.cpp:378
+#: src/inputmanager.cpp:379
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -5964,7 +6023,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/inputmanager.cpp:392 src/keyboardconfig.cpp:103
+#: src/inputmanager.cpp:393 src/keyboardconfig.cpp:134
 msgid "u key"
 msgstr ""
 
@@ -6641,55 +6700,55 @@ msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:176
+#: src/net/ea/guildhandler.cpp:178
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:179
+#: src/net/ea/guildhandler.cpp:181
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:186
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:187
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:193
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:195
+#: src/net/ea/guildhandler.cpp:197
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:198
+#: src/net/ea/guildhandler.cpp:200
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
@@ -7564,8 +7623,8 @@ msgstr ""
 #. TRANSLATORS: being info default name
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
-#: src/resources/avatardb.cpp:69 src/resources/beinginfo.cpp:40
-#: src/resources/itemdb.cpp:291 src/resources/monsterdb.cpp:100
+#: src/resources/avatardb.cpp:69 src/resources/beinginfo.cpp:41
+#: src/resources/itemdb.cpp:295 src/resources/monsterdb.cpp:100
 msgid "unnamed"
 msgstr ""
 
diff --git a/po/sq.po b/po/sq.po
index 50dc1a8fb..527b08d35 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-07-19 22:23+0300\n"
-"PO-Revision-Date: 2013-07-19 19:52+0000\n"
+"POT-Creation-Date: 2013-08-16 20:45+0300\n"
+"PO-Revision-Date: 2013-08-16 17:53+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/manaplus/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -38,21 +38,21 @@ msgstr ""
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1606 src/gui/whoisonline.cpp:835
+#: src/being.cpp:1713 src/gui/whoisonline.cpp:842
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1611 src/gui/whoisonline.cpp:840
+#: src/being.cpp:1718 src/gui/whoisonline.cpp:847
 msgid "I"
 msgstr ""
 
@@ -89,8 +89,8 @@ msgstr ""
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:1176 src/gui/didyouknowwindow.cpp:78
-#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:66
-#: src/gui/npcdialog.cpp:103 src/gui/popupmenu.cpp:562
+#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:70
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:562
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:81
 msgid "Close"
 msgstr ""
@@ -425,36 +425,36 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:465
+#: src/game.cpp:259 src/gui/widgets/chattab.cpp:466
 msgid "General"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: debug window name
 #. TRANSLATORS: full button name
-#: src/game.cpp:272 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:467
+#: src/game.cpp:275 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:468
 #: src/gui/windowmenu.cpp:154
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:536
+#: src/game.cpp:540
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:546
+#: src/game.cpp:550
 msgid "Saving screenshot failed!"
 msgstr ""
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:618
+#: src/game.cpp:622
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:621
+#: src/game.cpp:625
 msgid "Network Error"
 msgstr ""
 
@@ -489,7 +489,7 @@ msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:105
+#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:111
 msgid "Reset"
 msgstr ""
 
@@ -590,7 +590,7 @@ msgstr ""
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
 #: src/gui/buydialog.cpp:251 src/gui/buydialog.cpp:531
-#: src/gui/selldialog.cpp:96 src/gui/selldialog.cpp:356
+#: src/gui/selldialog.cpp:97 src/gui/selldialog.cpp:357
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
@@ -607,8 +607,8 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/buydialog.cpp:265 src/gui/itemamountwindow.cpp:202
-#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:96
-#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:790
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:100
+#: src/gui/selldialog.cpp:101 src/gui/statuswindow.cpp:791
 msgid "+"
 msgstr ""
 
@@ -619,8 +619,8 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
 #: src/gui/buydialog.cpp:268 src/gui/itemamountwindow.cpp:200
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:98
-#: src/gui/selldialog.cpp:102 src/gui/statuswindow.cpp:803
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:102
+#: src/gui/selldialog.cpp:103 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr ""
 
@@ -628,7 +628,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/buydialog.cpp:271 src/gui/charcreatedialog.cpp:122
-#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1160
+#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1282
 msgid "Create"
 msgstr ""
 
@@ -640,7 +640,7 @@ msgstr ""
 #. TRANSLATORS: input action name
 #: src/gui/buydialog.cpp:273 src/gui/quitdialog.cpp:55
 #: src/gui/quitdialog.cpp:60 src/gui/quitdialog.cpp:62
-#: src/gui/selldialog.cpp:106 src/gui/serverdialog.cpp:262
+#: src/gui/selldialog.cpp:107 src/gui/serverdialog.cpp:262
 #: src/gui/setupactiondata.h:177
 msgid "Quit"
 msgstr ""
@@ -650,9 +650,9 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:108
-#: src/gui/statuswindow.cpp:531 src/gui/statuswindow.cpp:586
-#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:821
+#: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:109
+#: src/gui/statuswindow.cpp:532 src/gui/statuswindow.cpp:587
+#: src/gui/statuswindow.cpp:788 src/gui/statuswindow.cpp:822
 msgid "Max"
 msgstr ""
 
@@ -672,7 +672,7 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #: src/gui/buyselldialog.cpp:69 src/gui/popupmenu.cpp:223
 #: src/gui/popupmenu.cpp:2455 src/gui/selldialog.cpp:54
-#: src/gui/selldialog.cpp:64 src/gui/selldialog.cpp:104
+#: src/gui/selldialog.cpp:64 src/gui/selldialog.cpp:105
 msgid "Sell"
 msgstr ""
 
@@ -712,7 +712,7 @@ msgstr ""
 #: src/gui/popupmenu.cpp:2309 src/gui/popupmenu.cpp:2543
 #: src/gui/popupmenu.cpp:2660 src/gui/quitdialog.cpp:73
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
-#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1094
+#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1216
 #: src/gui/textcommandeditor.cpp:211 src/gui/textdialog.cpp:53
 #: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:181
 msgid "Cancel"
@@ -996,92 +996,102 @@ msgstr ""
 #. TRANSLATORS: inventory sort mode
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
-#: src/gui/chatwindow.cpp:139 src/gui/inventorywindow.cpp:65
+#: src/gui/chatwindow.cpp:143 src/gui/inventorywindow.cpp:65
 #: src/gui/setup_other.cpp:69 src/gui/setup_visual.cpp:77
 msgid "default"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:141
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:145 src/gui/widgets/colormodel.cpp:76
 msgid "black"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:143
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:147 src/gui/widgets/colormodel.cpp:78
 msgid "red"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:145
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:149 src/gui/widgets/colormodel.cpp:80
 msgid "green"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:147
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:151 src/gui/widgets/colormodel.cpp:82
 msgid "blue"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:149
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:153 src/gui/widgets/colormodel.cpp:84
 msgid "gold"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:151
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:155 src/gui/widgets/colormodel.cpp:86
 msgid "yellow"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:153
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:157 src/gui/widgets/colormodel.cpp:88
 msgid "pink"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:155
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:159 src/gui/widgets/colormodel.cpp:90
 msgid "purple"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:157
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:161 src/gui/widgets/colormodel.cpp:92
 msgid "grey"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:159
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:163 src/gui/widgets/colormodel.cpp:94
 msgid "brown"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:161
+#: src/gui/chatwindow.cpp:165
 msgid "rainbow 1"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:163
+#: src/gui/chatwindow.cpp:167
 msgid "rainbow 2"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:165
+#: src/gui/chatwindow.cpp:169
 msgid "rainbow 3"
 msgstr ""
 
 #. TRANSLATORS: chat window name
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
-#: src/gui/chatwindow.cpp:192 src/gui/setupactiondata.h:1866
+#: src/gui/chatwindow.cpp:196 src/gui/setupactiondata.h:1866
 #: src/gui/setup_chat.cpp:50 src/gui/windowmenu.cpp:88
 msgid "Chat"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:641
+#: src/gui/chatwindow.cpp:684
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1044
+#: src/gui/chatwindow.cpp:1091
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -1390,6 +1400,38 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
+#. TRANSLATORS: font size
+#: src/gui/emotewindow.cpp:49
+msgid "Normal font"
+msgstr ""
+
+#. TRANSLATORS: font size
+#. TRANSLATORS: theme settings label
+#: src/gui/emotewindow.cpp:51 src/gui/setup_theme.cpp:249
+msgid "Bold font"
+msgstr ""
+
+#. TRANSLATORS: emotes window name
+#. TRANSLATORS: emotes tab name
+#. TRANSLATORS: input tab sub tab name
+#: src/gui/emotewindow.cpp:56 src/gui/emotewindow.cpp:107
+#: src/gui/setupactiondata.h:1862
+msgid "Emotes"
+msgstr ""
+
+#. TRANSLATORS: emotes tab name
+#. TRANSLATORS: settings group
+#. TRANSLATORS: settings colors tab name
+#: src/gui/emotewindow.cpp:109 src/gui/setup_chat.cpp:70
+#: src/gui/setup_colors.cpp:83
+msgid "Colors"
+msgstr ""
+
+#. TRANSLATORS: emotes tab name
+#: src/gui/emotewindow.cpp:111
+msgid "Fonts"
+msgstr ""
+
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/equipmentwindow.cpp:56 src/gui/inventorywindow.cpp:204
@@ -1481,7 +1523,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/inventorywindow.cpp:580 src/gui/statuswindow.cpp:143
-#: src/gui/statuswindow.cpp:284 src/gui/statuswindow.cpp:337
+#: src/gui/statuswindow.cpp:285 src/gui/statuswindow.cpp:338
 #: src/gui/widgets/characterdisplay.cpp:126
 #, c-format
 msgid "Money: %s"
@@ -1769,7 +1811,7 @@ msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:295
+#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:296
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
@@ -1777,7 +1819,7 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/ministatuswindow.cpp:317 src/gui/statuswindow.cpp:141
-#: src/gui/statuswindow.cpp:302 src/gui/statuswindow.cpp:373
+#: src/gui/statuswindow.cpp:303 src/gui/statuswindow.cpp:374
 #, c-format
 msgid "Level: %d"
 msgstr ""
@@ -1794,34 +1836,45 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:62
+#: src/gui/npcdialog.cpp:66
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:64
+#: src/gui/npcdialog.cpp:68
 msgid "Next"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:68
+#: src/gui/npcdialog.cpp:72
 msgid "Submit"
 msgstr ""
 
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
 #. TRANSLATORS: settings group
-#: src/gui/npcdialog.cpp:77 src/gui/npcpostdialog.cpp:43
+#: src/gui/npcdialog.cpp:81 src/gui/npcpostdialog.cpp:43
 #: src/gui/setup_other.cpp:257
 msgid "NPC"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:566
+#: src/gui/npcdialog.cpp:104 src/gui/popupmenu.cpp:566
 msgid "Clear"
 msgstr ""
 
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: trade window button
+#: src/gui/npcdialog.cpp:109 src/gui/serverdialog.cpp:266
+#: src/gui/shopwindow.cpp:95 src/gui/shopwindow.cpp:102
+#: src/gui/tradewindow.cpp:77
+msgid "Add"
+msgstr ""
+
 #. TRANSLATORS: label in npc post dialog
 #: src/gui/npcpostdialog.cpp:53
 msgid "To:"
@@ -2029,7 +2082,7 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: social window button
-#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1164
+#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1286
 msgid "Leave"
 msgstr ""
 
@@ -2163,7 +2216,7 @@ msgstr ""
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2194
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:985
 msgid "(default)"
 msgstr ""
 
@@ -2395,12 +2448,12 @@ msgid "Passwords do not match."
 msgstr ""
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/selldialog.cpp:242
+#: src/gui/selldialog.cpp:243
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/selldialog.cpp:244
+#: src/gui/selldialog.cpp:245
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
@@ -2411,15 +2464,6 @@ msgid "Choose Your Server"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:266 src/gui/shopwindow.cpp:95
-#: src/gui/shopwindow.cpp:102 src/gui/tradewindow.cpp:77
-msgid "Add"
-msgstr ""
-
-#. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
 #: src/gui/serverdialog.cpp:268 src/gui/widgets/setupitem.cpp:303
 #: src/gui/widgets/setupitem.cpp:430
@@ -3155,11 +3199,6 @@ msgid "Windows"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1862
-msgid "Emotes"
-msgstr ""
-
-#. TRANSLATORS: input tab sub tab name
 #: src/gui/setupactiondata.h:1870
 msgid "Gui"
 msgstr ""
@@ -3315,18 +3354,12 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:61
-msgid "Auto hide chat window."
+msgid "Auto hide chat window"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:65
-msgid "Protect chat focus."
-msgstr ""
-
-#. TRANSLATORS: settings group
-#. TRANSLATORS: settings colors tab name
-#: src/gui/setup_chat.cpp:70 src/gui/setup_colors.cpp:83
-msgid "Colors"
+msgid "Protect chat focus"
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4421,11 +4454,6 @@ msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:249
-msgid "Bold font"
-msgstr ""
-
-#. TRANSLATORS: theme settings label
 #: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr ""
@@ -4911,258 +4939,289 @@ msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
-#: src/gui/socialwindow.cpp:158 src/gui/socialwindow.cpp:259
+#: src/gui/socialwindow.cpp:176 src/gui/socialwindow.cpp:309
 #: src/gui/widgets/guildchattab.cpp:42 src/net/ea/gui/guildtab.cpp:49
 msgid "Guild"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:213
+#: src/gui/socialwindow.cpp:231
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:245
 msgid "Member Invite to Guild"
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:229
+#: src/gui/socialwindow.cpp:247
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:238
+#: src/gui/socialwindow.cpp:256
 msgid "Leave Guild?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:240
+#: src/gui/socialwindow.cpp:258
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:269
+#, c-format
+msgid "Members: %u/%u"
+msgstr ""
+
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:291 src/gui/socialwindow.cpp:361
+#: src/gui/socialwindow.cpp:483
+#, c-format
+msgid "Players: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/socialwindow.cpp:302 src/net/ea/gui/partytab.cpp:49
+#: src/gui/socialwindow.cpp:376 src/net/ea/gui/partytab.cpp:49
 msgid "Party"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:341
+#: src/gui/socialwindow.cpp:415
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
 #. TRANSLATORS: tab in social window
-#: src/gui/socialwindow.cpp:356
+#: src/gui/socialwindow.cpp:430
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:370
+#: src/gui/socialwindow.cpp:444
 msgid "Member Invite to Party"
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:372
+#: src/gui/socialwindow.cpp:446
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:381
+#: src/gui/socialwindow.cpp:455
 msgid "Leave Party?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:383
+#: src/gui/socialwindow.cpp:457
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:681
+#, c-format
+msgid "Visible players: %d"
+msgstr ""
+
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:605
+#: src/gui/socialwindow.cpp:707
 msgid "Nav"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:809
+#, c-format
+msgid "Portals: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:922
+#: src/gui/socialwindow.cpp:1035
 msgid "Atk"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:941
+#: src/gui/socialwindow.cpp:1054
 msgid "Priority mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:943
+#: src/gui/socialwindow.cpp:1056
 msgid "Attack mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:945
+#: src/gui/socialwindow.cpp:1058
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:968
+#: src/gui/socialwindow.cpp:1081
 msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:987
+#: src/gui/socialwindow.cpp:1100
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:989
+#: src/gui/socialwindow.cpp:1102
 msgid "Ignore items"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:1190
+#, c-format
+msgid "Friends: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1091 src/gui/socialwindow.cpp:1563
+#: src/gui/socialwindow.cpp:1213 src/gui/socialwindow.cpp:1687
 msgid "Create Party"
 msgstr ""
 
 #. TRANSLATORS: social window name
 #. TRANSLATORS: full button name
-#: src/gui/socialwindow.cpp:1138 src/gui/windowmenu.cpp:126
+#: src/gui/socialwindow.cpp:1260 src/gui/windowmenu.cpp:126
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1273
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1156
+#: src/gui/socialwindow.cpp:1278
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/socialwindow.cpp:1162
+#: src/gui/socialwindow.cpp:1284
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1345
+#: src/gui/socialwindow.cpp:1469
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1356
+#: src/gui/socialwindow.cpp:1480
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1497
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1424
+#: src/gui/socialwindow.cpp:1548
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1445
+#: src/gui/socialwindow.cpp:1569
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1460
+#: src/gui/socialwindow.cpp:1584
 msgid "Guild Name"
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1462
+#: src/gui/socialwindow.cpp:1586
 msgid "Choose your guild's name."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1477
+#: src/gui/socialwindow.cpp:1601
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1485
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1616
 msgid "Accept Guild Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1631
 msgid "Received party request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1519
+#: src/gui/socialwindow.cpp:1643
 msgid "You have been invited you to join a party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1524
+#: src/gui/socialwindow.cpp:1648
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1533
+#: src/gui/socialwindow.cpp:1657
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1539
+#: src/gui/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1673
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1688
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1694
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1572
+#: src/gui/socialwindow.cpp:1696
 msgid "Choose your party's name."
 msgstr ""
 
@@ -5182,24 +5241,24 @@ msgid "MP:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:235 src/gui/statuswindow.cpp:423
+#: src/gui/statuswindow.cpp:234 src/gui/statuswindow.cpp:424
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:237
+#: src/gui/statuswindow.cpp:236
 msgid "Job:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:288 src/gui/statuswindow.cpp:345
+#: src/gui/statuswindow.cpp:289 src/gui/statuswindow.cpp:346
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:360
+#: src/gui/statuswindow.cpp:361
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
@@ -5645,13 +5704,13 @@ msgid "%s whispers: %s"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:540
+#: src/gui/widgets/chattab.cpp:541
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:545
+#: src/gui/widgets/chattab.cpp:546
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -5937,24 +5996,24 @@ msgstr ""
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/inputmanager.cpp:328 src/inputmanager.cpp:372 src/keyboardconfig.cpp:90
+#: src/inputmanager.cpp:329 src/inputmanager.cpp:373 src/keyboardconfig.cpp:90
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/inputmanager.cpp:334
+#: src/inputmanager.cpp:335
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/inputmanager.cpp:348
+#: src/inputmanager.cpp:349
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/inputmanager.cpp:378
+#: src/inputmanager.cpp:379
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -5962,7 +6021,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/inputmanager.cpp:392 src/keyboardconfig.cpp:103
+#: src/inputmanager.cpp:393 src/keyboardconfig.cpp:134
 msgid "u key"
 msgstr ""
 
@@ -6638,55 +6697,55 @@ msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:176
+#: src/net/ea/guildhandler.cpp:178
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:179
+#: src/net/ea/guildhandler.cpp:181
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:186
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:187
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:193
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:195
+#: src/net/ea/guildhandler.cpp:197
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:198
+#: src/net/ea/guildhandler.cpp:200
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
@@ -7561,8 +7620,8 @@ msgstr ""
 #. TRANSLATORS: being info default name
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
-#: src/resources/avatardb.cpp:69 src/resources/beinginfo.cpp:40
-#: src/resources/itemdb.cpp:291 src/resources/monsterdb.cpp:100
+#: src/resources/avatardb.cpp:69 src/resources/beinginfo.cpp:41
+#: src/resources/itemdb.cpp:295 src/resources/monsterdb.cpp:100
 msgid "unnamed"
 msgstr ""
 
diff --git a/po/sv.po b/po/sv.po
index f51cf55eb..297f6f6f3 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-07-19 22:23+0300\n"
-"PO-Revision-Date: 2013-07-19 19:52+0000\n"
+"POT-Creation-Date: 2013-08-16 20:45+0300\n"
+"PO-Revision-Date: 2013-08-16 17:53+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/manaplus/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -38,21 +38,21 @@ msgstr ""
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1606 src/gui/whoisonline.cpp:835
+#: src/being.cpp:1713 src/gui/whoisonline.cpp:842
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1611 src/gui/whoisonline.cpp:840
+#: src/being.cpp:1718 src/gui/whoisonline.cpp:847
 msgid "I"
 msgstr ""
 
@@ -89,8 +89,8 @@ msgstr ""
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:1176 src/gui/didyouknowwindow.cpp:78
-#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:66
-#: src/gui/npcdialog.cpp:103 src/gui/popupmenu.cpp:562
+#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:70
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:562
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:81
 msgid "Close"
 msgstr "Stäng"
@@ -425,36 +425,36 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "Alternativ till /%s är ”yes”, ”no”, ”true”, ”false”, ”1”, ”0”."
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:465
+#: src/game.cpp:259 src/gui/widgets/chattab.cpp:466
 msgid "General"
 msgstr "Allmänt"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: debug window name
 #. TRANSLATORS: full button name
-#: src/game.cpp:272 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:467
+#: src/game.cpp:275 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:468
 #: src/gui/windowmenu.cpp:154
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:536
+#: src/game.cpp:540
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:546
+#: src/game.cpp:550
 msgid "Saving screenshot failed!"
 msgstr "Kunde inte spara skärmbild!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:618
+#: src/game.cpp:622
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:621
+#: src/game.cpp:625
 msgid "Network Error"
 msgstr "Nätverksfel"
 
@@ -489,7 +489,7 @@ msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:105
+#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:111
 msgid "Reset"
 msgstr "Återställ"
 
@@ -590,7 +590,7 @@ msgstr "Köp"
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
 #: src/gui/buydialog.cpp:251 src/gui/buydialog.cpp:531
-#: src/gui/selldialog.cpp:96 src/gui/selldialog.cpp:356
+#: src/gui/selldialog.cpp:97 src/gui/selldialog.cpp:357
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Pris: %s / Totalt: %s"
@@ -607,8 +607,8 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/buydialog.cpp:265 src/gui/itemamountwindow.cpp:202
-#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:96
-#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:790
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:100
+#: src/gui/selldialog.cpp:101 src/gui/statuswindow.cpp:791
 msgid "+"
 msgstr ""
 
@@ -619,8 +619,8 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
 #: src/gui/buydialog.cpp:268 src/gui/itemamountwindow.cpp:200
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:98
-#: src/gui/selldialog.cpp:102 src/gui/statuswindow.cpp:803
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:102
+#: src/gui/selldialog.cpp:103 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr ""
 
@@ -628,7 +628,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/buydialog.cpp:271 src/gui/charcreatedialog.cpp:122
-#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1160
+#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1282
 msgid "Create"
 msgstr "Skapa"
 
@@ -640,7 +640,7 @@ msgstr "Skapa"
 #. TRANSLATORS: input action name
 #: src/gui/buydialog.cpp:273 src/gui/quitdialog.cpp:55
 #: src/gui/quitdialog.cpp:60 src/gui/quitdialog.cpp:62
-#: src/gui/selldialog.cpp:106 src/gui/serverdialog.cpp:262
+#: src/gui/selldialog.cpp:107 src/gui/serverdialog.cpp:262
 #: src/gui/setupactiondata.h:177
 msgid "Quit"
 msgstr "Avsluta"
@@ -650,9 +650,9 @@ msgstr "Avsluta"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:108
-#: src/gui/statuswindow.cpp:531 src/gui/statuswindow.cpp:586
-#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:821
+#: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:109
+#: src/gui/statuswindow.cpp:532 src/gui/statuswindow.cpp:587
+#: src/gui/statuswindow.cpp:788 src/gui/statuswindow.cpp:822
 msgid "Max"
 msgstr "Max"
 
@@ -672,7 +672,7 @@ msgstr "Affär"
 #. TRANSLATORS: sell dialog button
 #: src/gui/buyselldialog.cpp:69 src/gui/popupmenu.cpp:223
 #: src/gui/popupmenu.cpp:2455 src/gui/selldialog.cpp:54
-#: src/gui/selldialog.cpp:64 src/gui/selldialog.cpp:104
+#: src/gui/selldialog.cpp:64 src/gui/selldialog.cpp:105
 msgid "Sell"
 msgstr "Sälj"
 
@@ -712,7 +712,7 @@ msgstr "Sälj"
 #: src/gui/popupmenu.cpp:2309 src/gui/popupmenu.cpp:2543
 #: src/gui/popupmenu.cpp:2660 src/gui/quitdialog.cpp:73
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
-#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1094
+#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1216
 #: src/gui/textcommandeditor.cpp:211 src/gui/textdialog.cpp:53
 #: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:181
 msgid "Cancel"
@@ -996,92 +996,102 @@ msgstr ""
 #. TRANSLATORS: inventory sort mode
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
-#: src/gui/chatwindow.cpp:139 src/gui/inventorywindow.cpp:65
+#: src/gui/chatwindow.cpp:143 src/gui/inventorywindow.cpp:65
 #: src/gui/setup_other.cpp:69 src/gui/setup_visual.cpp:77
 msgid "default"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:141
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:145 src/gui/widgets/colormodel.cpp:76
 msgid "black"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:143
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:147 src/gui/widgets/colormodel.cpp:78
 msgid "red"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:145
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:149 src/gui/widgets/colormodel.cpp:80
 msgid "green"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:147
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:151 src/gui/widgets/colormodel.cpp:82
 msgid "blue"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:149
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:153 src/gui/widgets/colormodel.cpp:84
 msgid "gold"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:151
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:155 src/gui/widgets/colormodel.cpp:86
 msgid "yellow"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:153
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:157 src/gui/widgets/colormodel.cpp:88
 msgid "pink"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:155
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:159 src/gui/widgets/colormodel.cpp:90
 msgid "purple"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:157
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:161 src/gui/widgets/colormodel.cpp:92
 msgid "grey"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:159
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:163 src/gui/widgets/colormodel.cpp:94
 msgid "brown"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:161
+#: src/gui/chatwindow.cpp:165
 msgid "rainbow 1"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:163
+#: src/gui/chatwindow.cpp:167
 msgid "rainbow 2"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:165
+#: src/gui/chatwindow.cpp:169
 msgid "rainbow 3"
 msgstr ""
 
 #. TRANSLATORS: chat window name
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
-#: src/gui/chatwindow.cpp:192 src/gui/setupactiondata.h:1866
+#: src/gui/chatwindow.cpp:196 src/gui/setupactiondata.h:1866
 #: src/gui/setup_chat.cpp:50 src/gui/windowmenu.cpp:88
 msgid "Chat"
 msgstr "Chatt"
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:641
+#: src/gui/chatwindow.cpp:684
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1044
+#: src/gui/chatwindow.cpp:1091
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Viskar till %s: %s"
@@ -1390,6 +1400,38 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
+#. TRANSLATORS: font size
+#: src/gui/emotewindow.cpp:49
+msgid "Normal font"
+msgstr ""
+
+#. TRANSLATORS: font size
+#. TRANSLATORS: theme settings label
+#: src/gui/emotewindow.cpp:51 src/gui/setup_theme.cpp:249
+msgid "Bold font"
+msgstr ""
+
+#. TRANSLATORS: emotes window name
+#. TRANSLATORS: emotes tab name
+#. TRANSLATORS: input tab sub tab name
+#: src/gui/emotewindow.cpp:56 src/gui/emotewindow.cpp:107
+#: src/gui/setupactiondata.h:1862
+msgid "Emotes"
+msgstr ""
+
+#. TRANSLATORS: emotes tab name
+#. TRANSLATORS: settings group
+#. TRANSLATORS: settings colors tab name
+#: src/gui/emotewindow.cpp:109 src/gui/setup_chat.cpp:70
+#: src/gui/setup_colors.cpp:83
+msgid "Colors"
+msgstr "Färger"
+
+#. TRANSLATORS: emotes tab name
+#: src/gui/emotewindow.cpp:111
+msgid "Fonts"
+msgstr ""
+
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/equipmentwindow.cpp:56 src/gui/inventorywindow.cpp:204
@@ -1481,7 +1523,7 @@ msgstr "Hämta"
 
 #. TRANSLATORS: status window label
 #: src/gui/inventorywindow.cpp:580 src/gui/statuswindow.cpp:143
-#: src/gui/statuswindow.cpp:284 src/gui/statuswindow.cpp:337
+#: src/gui/statuswindow.cpp:285 src/gui/statuswindow.cpp:338
 #: src/gui/widgets/characterdisplay.cpp:126
 #, c-format
 msgid "Money: %s"
@@ -1769,7 +1811,7 @@ msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:295
+#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:296
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
@@ -1777,7 +1819,7 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/ministatuswindow.cpp:317 src/gui/statuswindow.cpp:141
-#: src/gui/statuswindow.cpp:302 src/gui/statuswindow.cpp:373
+#: src/gui/statuswindow.cpp:303 src/gui/statuswindow.cpp:374
 #, c-format
 msgid "Level: %d"
 msgstr "Nivå: %d"
@@ -1794,34 +1836,45 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:62
+#: src/gui/npcdialog.cpp:66
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:64
+#: src/gui/npcdialog.cpp:68
 msgid "Next"
 msgstr "Nästa"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:68
+#: src/gui/npcdialog.cpp:72
 msgid "Submit"
 msgstr "Vidare"
 
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
 #. TRANSLATORS: settings group
-#: src/gui/npcdialog.cpp:77 src/gui/npcpostdialog.cpp:43
+#: src/gui/npcdialog.cpp:81 src/gui/npcpostdialog.cpp:43
 #: src/gui/setup_other.cpp:257
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:566
+#: src/gui/npcdialog.cpp:104 src/gui/popupmenu.cpp:566
 msgid "Clear"
 msgstr ""
 
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: trade window button
+#: src/gui/npcdialog.cpp:109 src/gui/serverdialog.cpp:266
+#: src/gui/shopwindow.cpp:95 src/gui/shopwindow.cpp:102
+#: src/gui/tradewindow.cpp:77
+msgid "Add"
+msgstr "Lägg till"
+
 #. TRANSLATORS: label in npc post dialog
 #: src/gui/npcpostdialog.cpp:53
 msgid "To:"
@@ -2029,7 +2082,7 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: social window button
-#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1164
+#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1286
 msgid "Leave"
 msgstr ""
 
@@ -2163,7 +2216,7 @@ msgstr ""
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2194
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:985
 msgid "(default)"
 msgstr ""
 
@@ -2395,12 +2448,12 @@ msgid "Passwords do not match."
 msgstr "Lösenorden stämmer inte överens."
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/selldialog.cpp:242
+#: src/gui/selldialog.cpp:243
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/selldialog.cpp:244
+#: src/gui/selldialog.cpp:245
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
@@ -2411,15 +2464,6 @@ msgid "Choose Your Server"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:266 src/gui/shopwindow.cpp:95
-#: src/gui/shopwindow.cpp:102 src/gui/tradewindow.cpp:77
-msgid "Add"
-msgstr "Lägg till"
-
-#. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
 #: src/gui/serverdialog.cpp:268 src/gui/widgets/setupitem.cpp:303
 #: src/gui/widgets/setupitem.cpp:430
@@ -3155,11 +3199,6 @@ msgid "Windows"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1862
-msgid "Emotes"
-msgstr ""
-
-#. TRANSLATORS: input tab sub tab name
 #: src/gui/setupactiondata.h:1870
 msgid "Gui"
 msgstr ""
@@ -3315,20 +3354,14 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:61
-msgid "Auto hide chat window."
+msgid "Auto hide chat window"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:65
-msgid "Protect chat focus."
+msgid "Protect chat focus"
 msgstr ""
 
-#. TRANSLATORS: settings group
-#. TRANSLATORS: settings colors tab name
-#: src/gui/setup_chat.cpp:70 src/gui/setup_colors.cpp:83
-msgid "Colors"
-msgstr "Färger"
-
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:73
 msgid "Remove colors from received chat messages"
@@ -4421,11 +4454,6 @@ msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:249
-msgid "Bold font"
-msgstr ""
-
-#. TRANSLATORS: theme settings label
 #: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr ""
@@ -4911,258 +4939,289 @@ msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
-#: src/gui/socialwindow.cpp:158 src/gui/socialwindow.cpp:259
+#: src/gui/socialwindow.cpp:176 src/gui/socialwindow.cpp:309
 #: src/gui/widgets/guildchattab.cpp:42 src/net/ea/gui/guildtab.cpp:49
 msgid "Guild"
 msgstr "Gille"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:213
+#: src/gui/socialwindow.cpp:231
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:245
 msgid "Member Invite to Guild"
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:229
+#: src/gui/socialwindow.cpp:247
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:238
+#: src/gui/socialwindow.cpp:256
 msgid "Leave Guild?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:240
+#: src/gui/socialwindow.cpp:258
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:269
+#, c-format
+msgid "Members: %u/%u"
+msgstr ""
+
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:291 src/gui/socialwindow.cpp:361
+#: src/gui/socialwindow.cpp:483
+#, c-format
+msgid "Players: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/socialwindow.cpp:302 src/net/ea/gui/partytab.cpp:49
+#: src/gui/socialwindow.cpp:376 src/net/ea/gui/partytab.cpp:49
 msgid "Party"
 msgstr "Grupp"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:341
+#: src/gui/socialwindow.cpp:415
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
 #. TRANSLATORS: tab in social window
-#: src/gui/socialwindow.cpp:356
+#: src/gui/socialwindow.cpp:430
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:370
+#: src/gui/socialwindow.cpp:444
 msgid "Member Invite to Party"
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:372
+#: src/gui/socialwindow.cpp:446
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:381
+#: src/gui/socialwindow.cpp:455
 msgid "Leave Party?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:383
+#: src/gui/socialwindow.cpp:457
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:681
+#, c-format
+msgid "Visible players: %d"
+msgstr ""
+
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:605
+#: src/gui/socialwindow.cpp:707
 msgid "Nav"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:809
+#, c-format
+msgid "Portals: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:922
+#: src/gui/socialwindow.cpp:1035
 msgid "Atk"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:941
+#: src/gui/socialwindow.cpp:1054
 msgid "Priority mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:943
+#: src/gui/socialwindow.cpp:1056
 msgid "Attack mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:945
+#: src/gui/socialwindow.cpp:1058
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:968
+#: src/gui/socialwindow.cpp:1081
 msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:987
+#: src/gui/socialwindow.cpp:1100
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:989
+#: src/gui/socialwindow.cpp:1102
 msgid "Ignore items"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:1190
+#, c-format
+msgid "Friends: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1091 src/gui/socialwindow.cpp:1563
+#: src/gui/socialwindow.cpp:1213 src/gui/socialwindow.cpp:1687
 msgid "Create Party"
 msgstr ""
 
 #. TRANSLATORS: social window name
 #. TRANSLATORS: full button name
-#: src/gui/socialwindow.cpp:1138 src/gui/windowmenu.cpp:126
+#: src/gui/socialwindow.cpp:1260 src/gui/windowmenu.cpp:126
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1273
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1156
+#: src/gui/socialwindow.cpp:1278
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/socialwindow.cpp:1162
+#: src/gui/socialwindow.cpp:1284
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1345
+#: src/gui/socialwindow.cpp:1469
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1356
+#: src/gui/socialwindow.cpp:1480
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1497
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1424
+#: src/gui/socialwindow.cpp:1548
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1445
+#: src/gui/socialwindow.cpp:1569
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1460
+#: src/gui/socialwindow.cpp:1584
 msgid "Guild Name"
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1462
+#: src/gui/socialwindow.cpp:1586
 msgid "Choose your guild's name."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1477
+#: src/gui/socialwindow.cpp:1601
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1485
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1616
 msgid "Accept Guild Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1631
 msgid "Received party request, but one already exists."
 msgstr "Mottog en gruppinbjudan, men du har redan en annan inbjudan."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1519
+#: src/gui/socialwindow.cpp:1643
 msgid "You have been invited you to join a party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1524
+#: src/gui/socialwindow.cpp:1648
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1533
+#: src/gui/socialwindow.cpp:1657
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s har bjudit in dig till sin grupp."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1539
+#: src/gui/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s har bjudit in dig till %ss grupp."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1673
 msgid "Accept Party Invite"
 msgstr "Acceptera gruppinbjudan"
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1688
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1694
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1572
+#: src/gui/socialwindow.cpp:1696
 msgid "Choose your party's name."
 msgstr ""
 
@@ -5182,24 +5241,24 @@ msgid "MP:"
 msgstr "MP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:235 src/gui/statuswindow.cpp:423
+#: src/gui/statuswindow.cpp:234 src/gui/statuswindow.cpp:424
 #, c-format
 msgid "Job: %d"
 msgstr "Jobb: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:237
+#: src/gui/statuswindow.cpp:236
 msgid "Job:"
 msgstr "Jobb:"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:288 src/gui/statuswindow.cpp:345
+#: src/gui/statuswindow.cpp:289 src/gui/statuswindow.cpp:346
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:360
+#: src/gui/statuswindow.cpp:361
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
@@ -5645,13 +5704,13 @@ msgid "%s whispers: %s"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:540
+#: src/gui/widgets/chattab.cpp:541
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:545
+#: src/gui/widgets/chattab.cpp:546
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -5937,24 +5996,24 @@ msgstr ""
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/inputmanager.cpp:328 src/inputmanager.cpp:372 src/keyboardconfig.cpp:90
+#: src/inputmanager.cpp:329 src/inputmanager.cpp:373 src/keyboardconfig.cpp:90
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/inputmanager.cpp:334
+#: src/inputmanager.cpp:335
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/inputmanager.cpp:348
+#: src/inputmanager.cpp:349
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/inputmanager.cpp:378
+#: src/inputmanager.cpp:379
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -5962,7 +6021,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/inputmanager.cpp:392 src/keyboardconfig.cpp:103
+#: src/inputmanager.cpp:393 src/keyboardconfig.cpp:134
 msgid "u key"
 msgstr ""
 
@@ -6638,55 +6697,55 @@ msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:176
+#: src/net/ea/guildhandler.cpp:178
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:179
+#: src/net/ea/guildhandler.cpp:181
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:186
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:187
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:193
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:195
+#: src/net/ea/guildhandler.cpp:197
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:198
+#: src/net/ea/guildhandler.cpp:200
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
@@ -7561,8 +7620,8 @@ msgstr ""
 #. TRANSLATORS: being info default name
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
-#: src/resources/avatardb.cpp:69 src/resources/beinginfo.cpp:40
-#: src/resources/itemdb.cpp:291 src/resources/monsterdb.cpp:100
+#: src/resources/avatardb.cpp:69 src/resources/beinginfo.cpp:41
+#: src/resources/itemdb.cpp:295 src/resources/monsterdb.cpp:100
 msgid "unnamed"
 msgstr "namnlös"
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 830cb4e14..58e15eb61 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-07-19 22:23+0300\n"
-"PO-Revision-Date: 2013-07-19 19:52+0000\n"
+"POT-Creation-Date: 2013-08-16 20:45+0300\n"
+"PO-Revision-Date: 2013-08-16 17:53+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Swedish (Sweden) (http://www.transifex.com/projects/p/manaplus/language/sv_SE/)\n"
 "MIME-Version: 1.0\n"
@@ -37,21 +37,21 @@ msgstr ""
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1606 src/gui/whoisonline.cpp:835
+#: src/being.cpp:1713 src/gui/whoisonline.cpp:842
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1611 src/gui/whoisonline.cpp:840
+#: src/being.cpp:1718 src/gui/whoisonline.cpp:847
 msgid "I"
 msgstr ""
 
@@ -88,8 +88,8 @@ msgstr ""
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:1176 src/gui/didyouknowwindow.cpp:78
-#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:66
-#: src/gui/npcdialog.cpp:103 src/gui/popupmenu.cpp:562
+#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:70
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:562
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:81
 msgid "Close"
 msgstr ""
@@ -424,36 +424,36 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:465
+#: src/game.cpp:259 src/gui/widgets/chattab.cpp:466
 msgid "General"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: debug window name
 #. TRANSLATORS: full button name
-#: src/game.cpp:272 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:467
+#: src/game.cpp:275 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:468
 #: src/gui/windowmenu.cpp:154
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:536
+#: src/game.cpp:540
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:546
+#: src/game.cpp:550
 msgid "Saving screenshot failed!"
 msgstr ""
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:618
+#: src/game.cpp:622
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:621
+#: src/game.cpp:625
 msgid "Network Error"
 msgstr ""
 
@@ -488,7 +488,7 @@ msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:105
+#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:111
 msgid "Reset"
 msgstr ""
 
@@ -589,7 +589,7 @@ msgstr ""
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
 #: src/gui/buydialog.cpp:251 src/gui/buydialog.cpp:531
-#: src/gui/selldialog.cpp:96 src/gui/selldialog.cpp:356
+#: src/gui/selldialog.cpp:97 src/gui/selldialog.cpp:357
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
@@ -606,8 +606,8 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/buydialog.cpp:265 src/gui/itemamountwindow.cpp:202
-#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:96
-#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:790
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:100
+#: src/gui/selldialog.cpp:101 src/gui/statuswindow.cpp:791
 msgid "+"
 msgstr ""
 
@@ -618,8 +618,8 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
 #: src/gui/buydialog.cpp:268 src/gui/itemamountwindow.cpp:200
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:98
-#: src/gui/selldialog.cpp:102 src/gui/statuswindow.cpp:803
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:102
+#: src/gui/selldialog.cpp:103 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr ""
 
@@ -627,7 +627,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/buydialog.cpp:271 src/gui/charcreatedialog.cpp:122
-#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1160
+#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1282
 msgid "Create"
 msgstr ""
 
@@ -639,7 +639,7 @@ msgstr ""
 #. TRANSLATORS: input action name
 #: src/gui/buydialog.cpp:273 src/gui/quitdialog.cpp:55
 #: src/gui/quitdialog.cpp:60 src/gui/quitdialog.cpp:62
-#: src/gui/selldialog.cpp:106 src/gui/serverdialog.cpp:262
+#: src/gui/selldialog.cpp:107 src/gui/serverdialog.cpp:262
 #: src/gui/setupactiondata.h:177
 msgid "Quit"
 msgstr ""
@@ -649,9 +649,9 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:108
-#: src/gui/statuswindow.cpp:531 src/gui/statuswindow.cpp:586
-#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:821
+#: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:109
+#: src/gui/statuswindow.cpp:532 src/gui/statuswindow.cpp:587
+#: src/gui/statuswindow.cpp:788 src/gui/statuswindow.cpp:822
 msgid "Max"
 msgstr ""
 
@@ -671,7 +671,7 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #: src/gui/buyselldialog.cpp:69 src/gui/popupmenu.cpp:223
 #: src/gui/popupmenu.cpp:2455 src/gui/selldialog.cpp:54
-#: src/gui/selldialog.cpp:64 src/gui/selldialog.cpp:104
+#: src/gui/selldialog.cpp:64 src/gui/selldialog.cpp:105
 msgid "Sell"
 msgstr ""
 
@@ -711,7 +711,7 @@ msgstr ""
 #: src/gui/popupmenu.cpp:2309 src/gui/popupmenu.cpp:2543
 #: src/gui/popupmenu.cpp:2660 src/gui/quitdialog.cpp:73
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
-#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1094
+#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1216
 #: src/gui/textcommandeditor.cpp:211 src/gui/textdialog.cpp:53
 #: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:181
 msgid "Cancel"
@@ -995,92 +995,102 @@ msgstr ""
 #. TRANSLATORS: inventory sort mode
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
-#: src/gui/chatwindow.cpp:139 src/gui/inventorywindow.cpp:65
+#: src/gui/chatwindow.cpp:143 src/gui/inventorywindow.cpp:65
 #: src/gui/setup_other.cpp:69 src/gui/setup_visual.cpp:77
 msgid "default"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:141
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:145 src/gui/widgets/colormodel.cpp:76
 msgid "black"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:143
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:147 src/gui/widgets/colormodel.cpp:78
 msgid "red"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:145
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:149 src/gui/widgets/colormodel.cpp:80
 msgid "green"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:147
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:151 src/gui/widgets/colormodel.cpp:82
 msgid "blue"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:149
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:153 src/gui/widgets/colormodel.cpp:84
 msgid "gold"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:151
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:155 src/gui/widgets/colormodel.cpp:86
 msgid "yellow"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:153
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:157 src/gui/widgets/colormodel.cpp:88
 msgid "pink"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:155
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:159 src/gui/widgets/colormodel.cpp:90
 msgid "purple"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:157
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:161 src/gui/widgets/colormodel.cpp:92
 msgid "grey"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:159
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:163 src/gui/widgets/colormodel.cpp:94
 msgid "brown"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:161
+#: src/gui/chatwindow.cpp:165
 msgid "rainbow 1"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:163
+#: src/gui/chatwindow.cpp:167
 msgid "rainbow 2"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:165
+#: src/gui/chatwindow.cpp:169
 msgid "rainbow 3"
 msgstr ""
 
 #. TRANSLATORS: chat window name
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
-#: src/gui/chatwindow.cpp:192 src/gui/setupactiondata.h:1866
+#: src/gui/chatwindow.cpp:196 src/gui/setupactiondata.h:1866
 #: src/gui/setup_chat.cpp:50 src/gui/windowmenu.cpp:88
 msgid "Chat"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:641
+#: src/gui/chatwindow.cpp:684
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1044
+#: src/gui/chatwindow.cpp:1091
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -1389,6 +1399,38 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
+#. TRANSLATORS: font size
+#: src/gui/emotewindow.cpp:49
+msgid "Normal font"
+msgstr ""
+
+#. TRANSLATORS: font size
+#. TRANSLATORS: theme settings label
+#: src/gui/emotewindow.cpp:51 src/gui/setup_theme.cpp:249
+msgid "Bold font"
+msgstr ""
+
+#. TRANSLATORS: emotes window name
+#. TRANSLATORS: emotes tab name
+#. TRANSLATORS: input tab sub tab name
+#: src/gui/emotewindow.cpp:56 src/gui/emotewindow.cpp:107
+#: src/gui/setupactiondata.h:1862
+msgid "Emotes"
+msgstr ""
+
+#. TRANSLATORS: emotes tab name
+#. TRANSLATORS: settings group
+#. TRANSLATORS: settings colors tab name
+#: src/gui/emotewindow.cpp:109 src/gui/setup_chat.cpp:70
+#: src/gui/setup_colors.cpp:83
+msgid "Colors"
+msgstr ""
+
+#. TRANSLATORS: emotes tab name
+#: src/gui/emotewindow.cpp:111
+msgid "Fonts"
+msgstr ""
+
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/equipmentwindow.cpp:56 src/gui/inventorywindow.cpp:204
@@ -1480,7 +1522,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/inventorywindow.cpp:580 src/gui/statuswindow.cpp:143
-#: src/gui/statuswindow.cpp:284 src/gui/statuswindow.cpp:337
+#: src/gui/statuswindow.cpp:285 src/gui/statuswindow.cpp:338
 #: src/gui/widgets/characterdisplay.cpp:126
 #, c-format
 msgid "Money: %s"
@@ -1768,7 +1810,7 @@ msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:295
+#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:296
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
@@ -1776,7 +1818,7 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/ministatuswindow.cpp:317 src/gui/statuswindow.cpp:141
-#: src/gui/statuswindow.cpp:302 src/gui/statuswindow.cpp:373
+#: src/gui/statuswindow.cpp:303 src/gui/statuswindow.cpp:374
 #, c-format
 msgid "Level: %d"
 msgstr ""
@@ -1793,34 +1835,45 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:62
+#: src/gui/npcdialog.cpp:66
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:64
+#: src/gui/npcdialog.cpp:68
 msgid "Next"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:68
+#: src/gui/npcdialog.cpp:72
 msgid "Submit"
 msgstr ""
 
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
 #. TRANSLATORS: settings group
-#: src/gui/npcdialog.cpp:77 src/gui/npcpostdialog.cpp:43
+#: src/gui/npcdialog.cpp:81 src/gui/npcpostdialog.cpp:43
 #: src/gui/setup_other.cpp:257
 msgid "NPC"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:566
+#: src/gui/npcdialog.cpp:104 src/gui/popupmenu.cpp:566
 msgid "Clear"
 msgstr ""
 
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: trade window button
+#: src/gui/npcdialog.cpp:109 src/gui/serverdialog.cpp:266
+#: src/gui/shopwindow.cpp:95 src/gui/shopwindow.cpp:102
+#: src/gui/tradewindow.cpp:77
+msgid "Add"
+msgstr ""
+
 #. TRANSLATORS: label in npc post dialog
 #: src/gui/npcpostdialog.cpp:53
 msgid "To:"
@@ -2028,7 +2081,7 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: social window button
-#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1164
+#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1286
 msgid "Leave"
 msgstr ""
 
@@ -2162,7 +2215,7 @@ msgstr ""
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2194
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:985
 msgid "(default)"
 msgstr ""
 
@@ -2394,12 +2447,12 @@ msgid "Passwords do not match."
 msgstr ""
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/selldialog.cpp:242
+#: src/gui/selldialog.cpp:243
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/selldialog.cpp:244
+#: src/gui/selldialog.cpp:245
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
@@ -2410,15 +2463,6 @@ msgid "Choose Your Server"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:266 src/gui/shopwindow.cpp:95
-#: src/gui/shopwindow.cpp:102 src/gui/tradewindow.cpp:77
-msgid "Add"
-msgstr ""
-
-#. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
 #: src/gui/serverdialog.cpp:268 src/gui/widgets/setupitem.cpp:303
 #: src/gui/widgets/setupitem.cpp:430
@@ -3154,11 +3198,6 @@ msgid "Windows"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1862
-msgid "Emotes"
-msgstr ""
-
-#. TRANSLATORS: input tab sub tab name
 #: src/gui/setupactiondata.h:1870
 msgid "Gui"
 msgstr ""
@@ -3314,18 +3353,12 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:61
-msgid "Auto hide chat window."
+msgid "Auto hide chat window"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:65
-msgid "Protect chat focus."
-msgstr ""
-
-#. TRANSLATORS: settings group
-#. TRANSLATORS: settings colors tab name
-#: src/gui/setup_chat.cpp:70 src/gui/setup_colors.cpp:83
-msgid "Colors"
+msgid "Protect chat focus"
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4420,11 +4453,6 @@ msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:249
-msgid "Bold font"
-msgstr ""
-
-#. TRANSLATORS: theme settings label
 #: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr ""
@@ -4910,258 +4938,289 @@ msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
-#: src/gui/socialwindow.cpp:158 src/gui/socialwindow.cpp:259
+#: src/gui/socialwindow.cpp:176 src/gui/socialwindow.cpp:309
 #: src/gui/widgets/guildchattab.cpp:42 src/net/ea/gui/guildtab.cpp:49
 msgid "Guild"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:213
+#: src/gui/socialwindow.cpp:231
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:245
 msgid "Member Invite to Guild"
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:229
+#: src/gui/socialwindow.cpp:247
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:238
+#: src/gui/socialwindow.cpp:256
 msgid "Leave Guild?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:240
+#: src/gui/socialwindow.cpp:258
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:269
+#, c-format
+msgid "Members: %u/%u"
+msgstr ""
+
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:291 src/gui/socialwindow.cpp:361
+#: src/gui/socialwindow.cpp:483
+#, c-format
+msgid "Players: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/socialwindow.cpp:302 src/net/ea/gui/partytab.cpp:49
+#: src/gui/socialwindow.cpp:376 src/net/ea/gui/partytab.cpp:49
 msgid "Party"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:341
+#: src/gui/socialwindow.cpp:415
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
 #. TRANSLATORS: tab in social window
-#: src/gui/socialwindow.cpp:356
+#: src/gui/socialwindow.cpp:430
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:370
+#: src/gui/socialwindow.cpp:444
 msgid "Member Invite to Party"
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:372
+#: src/gui/socialwindow.cpp:446
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:381
+#: src/gui/socialwindow.cpp:455
 msgid "Leave Party?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:383
+#: src/gui/socialwindow.cpp:457
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:681
+#, c-format
+msgid "Visible players: %d"
+msgstr ""
+
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:605
+#: src/gui/socialwindow.cpp:707
 msgid "Nav"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:809
+#, c-format
+msgid "Portals: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:922
+#: src/gui/socialwindow.cpp:1035
 msgid "Atk"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:941
+#: src/gui/socialwindow.cpp:1054
 msgid "Priority mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:943
+#: src/gui/socialwindow.cpp:1056
 msgid "Attack mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:945
+#: src/gui/socialwindow.cpp:1058
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:968
+#: src/gui/socialwindow.cpp:1081
 msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:987
+#: src/gui/socialwindow.cpp:1100
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:989
+#: src/gui/socialwindow.cpp:1102
 msgid "Ignore items"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:1190
+#, c-format
+msgid "Friends: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1091 src/gui/socialwindow.cpp:1563
+#: src/gui/socialwindow.cpp:1213 src/gui/socialwindow.cpp:1687
 msgid "Create Party"
 msgstr ""
 
 #. TRANSLATORS: social window name
 #. TRANSLATORS: full button name
-#: src/gui/socialwindow.cpp:1138 src/gui/windowmenu.cpp:126
+#: src/gui/socialwindow.cpp:1260 src/gui/windowmenu.cpp:126
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1273
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1156
+#: src/gui/socialwindow.cpp:1278
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/socialwindow.cpp:1162
+#: src/gui/socialwindow.cpp:1284
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1345
+#: src/gui/socialwindow.cpp:1469
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1356
+#: src/gui/socialwindow.cpp:1480
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1497
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1424
+#: src/gui/socialwindow.cpp:1548
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1445
+#: src/gui/socialwindow.cpp:1569
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1460
+#: src/gui/socialwindow.cpp:1584
 msgid "Guild Name"
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1462
+#: src/gui/socialwindow.cpp:1586
 msgid "Choose your guild's name."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1477
+#: src/gui/socialwindow.cpp:1601
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1485
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1616
 msgid "Accept Guild Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1631
 msgid "Received party request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1519
+#: src/gui/socialwindow.cpp:1643
 msgid "You have been invited you to join a party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1524
+#: src/gui/socialwindow.cpp:1648
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1533
+#: src/gui/socialwindow.cpp:1657
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1539
+#: src/gui/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1673
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1688
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1694
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1572
+#: src/gui/socialwindow.cpp:1696
 msgid "Choose your party's name."
 msgstr ""
 
@@ -5181,24 +5240,24 @@ msgid "MP:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:235 src/gui/statuswindow.cpp:423
+#: src/gui/statuswindow.cpp:234 src/gui/statuswindow.cpp:424
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:237
+#: src/gui/statuswindow.cpp:236
 msgid "Job:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:288 src/gui/statuswindow.cpp:345
+#: src/gui/statuswindow.cpp:289 src/gui/statuswindow.cpp:346
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:360
+#: src/gui/statuswindow.cpp:361
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
@@ -5644,13 +5703,13 @@ msgid "%s whispers: %s"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:540
+#: src/gui/widgets/chattab.cpp:541
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:545
+#: src/gui/widgets/chattab.cpp:546
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -5936,24 +5995,24 @@ msgstr ""
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/inputmanager.cpp:328 src/inputmanager.cpp:372 src/keyboardconfig.cpp:90
+#: src/inputmanager.cpp:329 src/inputmanager.cpp:373 src/keyboardconfig.cpp:90
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/inputmanager.cpp:334
+#: src/inputmanager.cpp:335
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/inputmanager.cpp:348
+#: src/inputmanager.cpp:349
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/inputmanager.cpp:378
+#: src/inputmanager.cpp:379
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -5961,7 +6020,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/inputmanager.cpp:392 src/keyboardconfig.cpp:103
+#: src/inputmanager.cpp:393 src/keyboardconfig.cpp:134
 msgid "u key"
 msgstr ""
 
@@ -6637,55 +6696,55 @@ msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:176
+#: src/net/ea/guildhandler.cpp:178
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:179
+#: src/net/ea/guildhandler.cpp:181
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:186
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:187
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:193
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:195
+#: src/net/ea/guildhandler.cpp:197
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:198
+#: src/net/ea/guildhandler.cpp:200
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
@@ -7560,8 +7619,8 @@ msgstr ""
 #. TRANSLATORS: being info default name
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
-#: src/resources/avatardb.cpp:69 src/resources/beinginfo.cpp:40
-#: src/resources/itemdb.cpp:291 src/resources/monsterdb.cpp:100
+#: src/resources/avatardb.cpp:69 src/resources/beinginfo.cpp:41
+#: src/resources/itemdb.cpp:295 src/resources/monsterdb.cpp:100
 msgid "unnamed"
 msgstr ""
 
diff --git a/po/te.po b/po/te.po
index f0a57eeac..7d80ce9e1 100644
--- a/po/te.po
+++ b/po/te.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-07-19 22:23+0300\n"
-"PO-Revision-Date: 2013-07-19 19:52+0000\n"
+"POT-Creation-Date: 2013-08-16 20:45+0300\n"
+"PO-Revision-Date: 2013-08-16 17:53+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/manaplus/language/te/)\n"
 "MIME-Version: 1.0\n"
@@ -38,21 +38,21 @@ msgstr ""
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1606 src/gui/whoisonline.cpp:835
+#: src/being.cpp:1713 src/gui/whoisonline.cpp:842
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1611 src/gui/whoisonline.cpp:840
+#: src/being.cpp:1718 src/gui/whoisonline.cpp:847
 msgid "I"
 msgstr ""
 
@@ -89,8 +89,8 @@ msgstr ""
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:1176 src/gui/didyouknowwindow.cpp:78
-#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:66
-#: src/gui/npcdialog.cpp:103 src/gui/popupmenu.cpp:562
+#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:70
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:562
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:81
 msgid "Close"
 msgstr ""
@@ -425,36 +425,36 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:465
+#: src/game.cpp:259 src/gui/widgets/chattab.cpp:466
 msgid "General"
 msgstr "సాధారణ"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: debug window name
 #. TRANSLATORS: full button name
-#: src/game.cpp:272 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:467
+#: src/game.cpp:275 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:468
 #: src/gui/windowmenu.cpp:154
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:536
+#: src/game.cpp:540
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:546
+#: src/game.cpp:550
 msgid "Saving screenshot failed!"
 msgstr ""
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:618
+#: src/game.cpp:622
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:621
+#: src/game.cpp:625
 msgid "Network Error"
 msgstr ""
 
@@ -489,7 +489,7 @@ msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:105
+#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:111
 msgid "Reset"
 msgstr ""
 
@@ -590,7 +590,7 @@ msgstr ""
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
 #: src/gui/buydialog.cpp:251 src/gui/buydialog.cpp:531
-#: src/gui/selldialog.cpp:96 src/gui/selldialog.cpp:356
+#: src/gui/selldialog.cpp:97 src/gui/selldialog.cpp:357
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "వెల: %s / మొత్తం: %s"
@@ -607,8 +607,8 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/buydialog.cpp:265 src/gui/itemamountwindow.cpp:202
-#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:96
-#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:790
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:100
+#: src/gui/selldialog.cpp:101 src/gui/statuswindow.cpp:791
 msgid "+"
 msgstr ""
 
@@ -619,8 +619,8 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
 #: src/gui/buydialog.cpp:268 src/gui/itemamountwindow.cpp:200
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:98
-#: src/gui/selldialog.cpp:102 src/gui/statuswindow.cpp:803
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:102
+#: src/gui/selldialog.cpp:103 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr ""
 
@@ -628,7 +628,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/buydialog.cpp:271 src/gui/charcreatedialog.cpp:122
-#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1160
+#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1282
 msgid "Create"
 msgstr "సృష్టించు"
 
@@ -640,7 +640,7 @@ msgstr "సృష్టించు"
 #. TRANSLATORS: input action name
 #: src/gui/buydialog.cpp:273 src/gui/quitdialog.cpp:55
 #: src/gui/quitdialog.cpp:60 src/gui/quitdialog.cpp:62
-#: src/gui/selldialog.cpp:106 src/gui/serverdialog.cpp:262
+#: src/gui/selldialog.cpp:107 src/gui/serverdialog.cpp:262
 #: src/gui/setupactiondata.h:177
 msgid "Quit"
 msgstr "నిష్క్రమించు"
@@ -650,9 +650,9 @@ msgstr "నిష్క్రమించు"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:108
-#: src/gui/statuswindow.cpp:531 src/gui/statuswindow.cpp:586
-#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:821
+#: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:109
+#: src/gui/statuswindow.cpp:532 src/gui/statuswindow.cpp:587
+#: src/gui/statuswindow.cpp:788 src/gui/statuswindow.cpp:822
 msgid "Max"
 msgstr "గరిష్ఠ"
 
@@ -672,7 +672,7 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #: src/gui/buyselldialog.cpp:69 src/gui/popupmenu.cpp:223
 #: src/gui/popupmenu.cpp:2455 src/gui/selldialog.cpp:54
-#: src/gui/selldialog.cpp:64 src/gui/selldialog.cpp:104
+#: src/gui/selldialog.cpp:64 src/gui/selldialog.cpp:105
 msgid "Sell"
 msgstr ""
 
@@ -712,7 +712,7 @@ msgstr ""
 #: src/gui/popupmenu.cpp:2309 src/gui/popupmenu.cpp:2543
 #: src/gui/popupmenu.cpp:2660 src/gui/quitdialog.cpp:73
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
-#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1094
+#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1216
 #: src/gui/textcommandeditor.cpp:211 src/gui/textdialog.cpp:53
 #: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:181
 msgid "Cancel"
@@ -996,92 +996,102 @@ msgstr ""
 #. TRANSLATORS: inventory sort mode
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
-#: src/gui/chatwindow.cpp:139 src/gui/inventorywindow.cpp:65
+#: src/gui/chatwindow.cpp:143 src/gui/inventorywindow.cpp:65
 #: src/gui/setup_other.cpp:69 src/gui/setup_visual.cpp:77
 msgid "default"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:141
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:145 src/gui/widgets/colormodel.cpp:76
 msgid "black"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:143
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:147 src/gui/widgets/colormodel.cpp:78
 msgid "red"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:145
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:149 src/gui/widgets/colormodel.cpp:80
 msgid "green"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:147
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:151 src/gui/widgets/colormodel.cpp:82
 msgid "blue"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:149
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:153 src/gui/widgets/colormodel.cpp:84
 msgid "gold"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:151
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:155 src/gui/widgets/colormodel.cpp:86
 msgid "yellow"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:153
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:157 src/gui/widgets/colormodel.cpp:88
 msgid "pink"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:155
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:159 src/gui/widgets/colormodel.cpp:90
 msgid "purple"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:157
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:161 src/gui/widgets/colormodel.cpp:92
 msgid "grey"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:159
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:163 src/gui/widgets/colormodel.cpp:94
 msgid "brown"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:161
+#: src/gui/chatwindow.cpp:165
 msgid "rainbow 1"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:163
+#: src/gui/chatwindow.cpp:167
 msgid "rainbow 2"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:165
+#: src/gui/chatwindow.cpp:169
 msgid "rainbow 3"
 msgstr ""
 
 #. TRANSLATORS: chat window name
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
-#: src/gui/chatwindow.cpp:192 src/gui/setupactiondata.h:1866
+#: src/gui/chatwindow.cpp:196 src/gui/setupactiondata.h:1866
 #: src/gui/setup_chat.cpp:50 src/gui/windowmenu.cpp:88
 msgid "Chat"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:641
+#: src/gui/chatwindow.cpp:684
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1044
+#: src/gui/chatwindow.cpp:1091
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -1390,6 +1400,38 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
+#. TRANSLATORS: font size
+#: src/gui/emotewindow.cpp:49
+msgid "Normal font"
+msgstr ""
+
+#. TRANSLATORS: font size
+#. TRANSLATORS: theme settings label
+#: src/gui/emotewindow.cpp:51 src/gui/setup_theme.cpp:249
+msgid "Bold font"
+msgstr ""
+
+#. TRANSLATORS: emotes window name
+#. TRANSLATORS: emotes tab name
+#. TRANSLATORS: input tab sub tab name
+#: src/gui/emotewindow.cpp:56 src/gui/emotewindow.cpp:107
+#: src/gui/setupactiondata.h:1862
+msgid "Emotes"
+msgstr ""
+
+#. TRANSLATORS: emotes tab name
+#. TRANSLATORS: settings group
+#. TRANSLATORS: settings colors tab name
+#: src/gui/emotewindow.cpp:109 src/gui/setup_chat.cpp:70
+#: src/gui/setup_colors.cpp:83
+msgid "Colors"
+msgstr "రంగులు"
+
+#. TRANSLATORS: emotes tab name
+#: src/gui/emotewindow.cpp:111
+msgid "Fonts"
+msgstr ""
+
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/equipmentwindow.cpp:56 src/gui/inventorywindow.cpp:204
@@ -1481,7 +1523,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/inventorywindow.cpp:580 src/gui/statuswindow.cpp:143
-#: src/gui/statuswindow.cpp:284 src/gui/statuswindow.cpp:337
+#: src/gui/statuswindow.cpp:285 src/gui/statuswindow.cpp:338
 #: src/gui/widgets/characterdisplay.cpp:126
 #, c-format
 msgid "Money: %s"
@@ -1769,7 +1811,7 @@ msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:295
+#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:296
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
@@ -1777,7 +1819,7 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/ministatuswindow.cpp:317 src/gui/statuswindow.cpp:141
-#: src/gui/statuswindow.cpp:302 src/gui/statuswindow.cpp:373
+#: src/gui/statuswindow.cpp:303 src/gui/statuswindow.cpp:374
 #, c-format
 msgid "Level: %d"
 msgstr "స్థాయి: %d"
@@ -1794,34 +1836,45 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:62
+#: src/gui/npcdialog.cpp:66
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:64
+#: src/gui/npcdialog.cpp:68
 msgid "Next"
 msgstr "తదుపరి"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:68
+#: src/gui/npcdialog.cpp:72
 msgid "Submit"
 msgstr ""
 
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
 #. TRANSLATORS: settings group
-#: src/gui/npcdialog.cpp:77 src/gui/npcpostdialog.cpp:43
+#: src/gui/npcdialog.cpp:81 src/gui/npcpostdialog.cpp:43
 #: src/gui/setup_other.cpp:257
 msgid "NPC"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:566
+#: src/gui/npcdialog.cpp:104 src/gui/popupmenu.cpp:566
 msgid "Clear"
 msgstr ""
 
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: trade window button
+#: src/gui/npcdialog.cpp:109 src/gui/serverdialog.cpp:266
+#: src/gui/shopwindow.cpp:95 src/gui/shopwindow.cpp:102
+#: src/gui/tradewindow.cpp:77
+msgid "Add"
+msgstr ""
+
 #. TRANSLATORS: label in npc post dialog
 #: src/gui/npcpostdialog.cpp:53
 msgid "To:"
@@ -2029,7 +2082,7 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: social window button
-#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1164
+#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1286
 msgid "Leave"
 msgstr ""
 
@@ -2163,7 +2216,7 @@ msgstr ""
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2194
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:985
 msgid "(default)"
 msgstr ""
 
@@ -2395,12 +2448,12 @@ msgid "Passwords do not match."
 msgstr ""
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/selldialog.cpp:242
+#: src/gui/selldialog.cpp:243
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/selldialog.cpp:244
+#: src/gui/selldialog.cpp:245
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
@@ -2411,15 +2464,6 @@ msgid "Choose Your Server"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:266 src/gui/shopwindow.cpp:95
-#: src/gui/shopwindow.cpp:102 src/gui/tradewindow.cpp:77
-msgid "Add"
-msgstr ""
-
-#. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
 #: src/gui/serverdialog.cpp:268 src/gui/widgets/setupitem.cpp:303
 #: src/gui/widgets/setupitem.cpp:430
@@ -3155,11 +3199,6 @@ msgid "Windows"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1862
-msgid "Emotes"
-msgstr ""
-
-#. TRANSLATORS: input tab sub tab name
 #: src/gui/setupactiondata.h:1870
 msgid "Gui"
 msgstr ""
@@ -3315,20 +3354,14 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:61
-msgid "Auto hide chat window."
+msgid "Auto hide chat window"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:65
-msgid "Protect chat focus."
+msgid "Protect chat focus"
 msgstr ""
 
-#. TRANSLATORS: settings group
-#. TRANSLATORS: settings colors tab name
-#: src/gui/setup_chat.cpp:70 src/gui/setup_colors.cpp:83
-msgid "Colors"
-msgstr "రంగులు"
-
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:73
 msgid "Remove colors from received chat messages"
@@ -4421,11 +4454,6 @@ msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:249
-msgid "Bold font"
-msgstr ""
-
-#. TRANSLATORS: theme settings label
 #: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr ""
@@ -4911,258 +4939,289 @@ msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
-#: src/gui/socialwindow.cpp:158 src/gui/socialwindow.cpp:259
+#: src/gui/socialwindow.cpp:176 src/gui/socialwindow.cpp:309
 #: src/gui/widgets/guildchattab.cpp:42 src/net/ea/gui/guildtab.cpp:49
 msgid "Guild"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:213
+#: src/gui/socialwindow.cpp:231
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:245
 msgid "Member Invite to Guild"
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:229
+#: src/gui/socialwindow.cpp:247
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:238
+#: src/gui/socialwindow.cpp:256
 msgid "Leave Guild?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:240
+#: src/gui/socialwindow.cpp:258
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:269
+#, c-format
+msgid "Members: %u/%u"
+msgstr ""
+
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:291 src/gui/socialwindow.cpp:361
+#: src/gui/socialwindow.cpp:483
+#, c-format
+msgid "Players: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/socialwindow.cpp:302 src/net/ea/gui/partytab.cpp:49
+#: src/gui/socialwindow.cpp:376 src/net/ea/gui/partytab.cpp:49
 msgid "Party"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:341
+#: src/gui/socialwindow.cpp:415
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
 #. TRANSLATORS: tab in social window
-#: src/gui/socialwindow.cpp:356
+#: src/gui/socialwindow.cpp:430
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:370
+#: src/gui/socialwindow.cpp:444
 msgid "Member Invite to Party"
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:372
+#: src/gui/socialwindow.cpp:446
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:381
+#: src/gui/socialwindow.cpp:455
 msgid "Leave Party?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:383
+#: src/gui/socialwindow.cpp:457
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:681
+#, c-format
+msgid "Visible players: %d"
+msgstr ""
+
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:605
+#: src/gui/socialwindow.cpp:707
 msgid "Nav"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:809
+#, c-format
+msgid "Portals: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:922
+#: src/gui/socialwindow.cpp:1035
 msgid "Atk"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:941
+#: src/gui/socialwindow.cpp:1054
 msgid "Priority mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:943
+#: src/gui/socialwindow.cpp:1056
 msgid "Attack mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:945
+#: src/gui/socialwindow.cpp:1058
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:968
+#: src/gui/socialwindow.cpp:1081
 msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:987
+#: src/gui/socialwindow.cpp:1100
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:989
+#: src/gui/socialwindow.cpp:1102
 msgid "Ignore items"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:1190
+#, c-format
+msgid "Friends: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1091 src/gui/socialwindow.cpp:1563
+#: src/gui/socialwindow.cpp:1213 src/gui/socialwindow.cpp:1687
 msgid "Create Party"
 msgstr ""
 
 #. TRANSLATORS: social window name
 #. TRANSLATORS: full button name
-#: src/gui/socialwindow.cpp:1138 src/gui/windowmenu.cpp:126
+#: src/gui/socialwindow.cpp:1260 src/gui/windowmenu.cpp:126
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1273
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1156
+#: src/gui/socialwindow.cpp:1278
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/socialwindow.cpp:1162
+#: src/gui/socialwindow.cpp:1284
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1345
+#: src/gui/socialwindow.cpp:1469
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1356
+#: src/gui/socialwindow.cpp:1480
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1497
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1424
+#: src/gui/socialwindow.cpp:1548
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1445
+#: src/gui/socialwindow.cpp:1569
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1460
+#: src/gui/socialwindow.cpp:1584
 msgid "Guild Name"
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1462
+#: src/gui/socialwindow.cpp:1586
 msgid "Choose your guild's name."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1477
+#: src/gui/socialwindow.cpp:1601
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1485
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1616
 msgid "Accept Guild Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1631
 msgid "Received party request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1519
+#: src/gui/socialwindow.cpp:1643
 msgid "You have been invited you to join a party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1524
+#: src/gui/socialwindow.cpp:1648
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1533
+#: src/gui/socialwindow.cpp:1657
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1539
+#: src/gui/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1673
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1688
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1694
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1572
+#: src/gui/socialwindow.cpp:1696
 msgid "Choose your party's name."
 msgstr ""
 
@@ -5182,24 +5241,24 @@ msgid "MP:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:235 src/gui/statuswindow.cpp:423
+#: src/gui/statuswindow.cpp:234 src/gui/statuswindow.cpp:424
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:237
+#: src/gui/statuswindow.cpp:236
 msgid "Job:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:288 src/gui/statuswindow.cpp:345
+#: src/gui/statuswindow.cpp:289 src/gui/statuswindow.cpp:346
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:360
+#: src/gui/statuswindow.cpp:361
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
@@ -5645,13 +5704,13 @@ msgid "%s whispers: %s"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:540
+#: src/gui/widgets/chattab.cpp:541
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:545
+#: src/gui/widgets/chattab.cpp:546
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -5937,24 +5996,24 @@ msgstr ""
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/inputmanager.cpp:328 src/inputmanager.cpp:372 src/keyboardconfig.cpp:90
+#: src/inputmanager.cpp:329 src/inputmanager.cpp:373 src/keyboardconfig.cpp:90
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/inputmanager.cpp:334
+#: src/inputmanager.cpp:335
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/inputmanager.cpp:348
+#: src/inputmanager.cpp:349
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/inputmanager.cpp:378
+#: src/inputmanager.cpp:379
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -5962,7 +6021,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/inputmanager.cpp:392 src/keyboardconfig.cpp:103
+#: src/inputmanager.cpp:393 src/keyboardconfig.cpp:134
 msgid "u key"
 msgstr ""
 
@@ -6638,55 +6697,55 @@ msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:176
+#: src/net/ea/guildhandler.cpp:178
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:179
+#: src/net/ea/guildhandler.cpp:181
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:186
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:187
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:193
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:195
+#: src/net/ea/guildhandler.cpp:197
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:198
+#: src/net/ea/guildhandler.cpp:200
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
@@ -7561,8 +7620,8 @@ msgstr ""
 #. TRANSLATORS: being info default name
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
-#: src/resources/avatardb.cpp:69 src/resources/beinginfo.cpp:40
-#: src/resources/itemdb.cpp:291 src/resources/monsterdb.cpp:100
+#: src/resources/avatardb.cpp:69 src/resources/beinginfo.cpp:41
+#: src/resources/itemdb.cpp:295 src/resources/monsterdb.cpp:100
 msgid "unnamed"
 msgstr ""
 
diff --git a/po/th.po b/po/th.po
index bcaad2127..24d5e6664 100644
--- a/po/th.po
+++ b/po/th.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-07-19 22:23+0300\n"
-"PO-Revision-Date: 2013-07-19 19:52+0000\n"
+"POT-Creation-Date: 2013-08-16 20:45+0300\n"
+"PO-Revision-Date: 2013-08-16 17:53+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Thai (http://www.transifex.com/projects/p/manaplus/language/th/)\n"
 "MIME-Version: 1.0\n"
@@ -38,21 +38,21 @@ msgstr ""
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1606 src/gui/whoisonline.cpp:835
+#: src/being.cpp:1713 src/gui/whoisonline.cpp:842
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1611 src/gui/whoisonline.cpp:840
+#: src/being.cpp:1718 src/gui/whoisonline.cpp:847
 msgid "I"
 msgstr ""
 
@@ -89,8 +89,8 @@ msgstr ""
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:1176 src/gui/didyouknowwindow.cpp:78
-#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:66
-#: src/gui/npcdialog.cpp:103 src/gui/popupmenu.cpp:562
+#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:70
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:562
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:81
 msgid "Close"
 msgstr ""
@@ -425,36 +425,36 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:465
+#: src/game.cpp:259 src/gui/widgets/chattab.cpp:466
 msgid "General"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: debug window name
 #. TRANSLATORS: full button name
-#: src/game.cpp:272 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:467
+#: src/game.cpp:275 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:468
 #: src/gui/windowmenu.cpp:154
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:536
+#: src/game.cpp:540
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:546
+#: src/game.cpp:550
 msgid "Saving screenshot failed!"
 msgstr ""
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:618
+#: src/game.cpp:622
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:621
+#: src/game.cpp:625
 msgid "Network Error"
 msgstr ""
 
@@ -489,7 +489,7 @@ msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:105
+#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:111
 msgid "Reset"
 msgstr ""
 
@@ -590,7 +590,7 @@ msgstr "ซื้อ"
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
 #: src/gui/buydialog.cpp:251 src/gui/buydialog.cpp:531
-#: src/gui/selldialog.cpp:96 src/gui/selldialog.cpp:356
+#: src/gui/selldialog.cpp:97 src/gui/selldialog.cpp:357
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
@@ -607,8 +607,8 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/buydialog.cpp:265 src/gui/itemamountwindow.cpp:202
-#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:96
-#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:790
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:100
+#: src/gui/selldialog.cpp:101 src/gui/statuswindow.cpp:791
 msgid "+"
 msgstr ""
 
@@ -619,8 +619,8 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
 #: src/gui/buydialog.cpp:268 src/gui/itemamountwindow.cpp:200
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:98
-#: src/gui/selldialog.cpp:102 src/gui/statuswindow.cpp:803
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:102
+#: src/gui/selldialog.cpp:103 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr ""
 
@@ -628,7 +628,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/buydialog.cpp:271 src/gui/charcreatedialog.cpp:122
-#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1160
+#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1282
 msgid "Create"
 msgstr "สร้าง"
 
@@ -640,7 +640,7 @@ msgstr "สร้าง"
 #. TRANSLATORS: input action name
 #: src/gui/buydialog.cpp:273 src/gui/quitdialog.cpp:55
 #: src/gui/quitdialog.cpp:60 src/gui/quitdialog.cpp:62
-#: src/gui/selldialog.cpp:106 src/gui/serverdialog.cpp:262
+#: src/gui/selldialog.cpp:107 src/gui/serverdialog.cpp:262
 #: src/gui/setupactiondata.h:177
 msgid "Quit"
 msgstr "ออก"
@@ -650,9 +650,9 @@ msgstr "ออก"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:108
-#: src/gui/statuswindow.cpp:531 src/gui/statuswindow.cpp:586
-#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:821
+#: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:109
+#: src/gui/statuswindow.cpp:532 src/gui/statuswindow.cpp:587
+#: src/gui/statuswindow.cpp:788 src/gui/statuswindow.cpp:822
 msgid "Max"
 msgstr ""
 
@@ -672,7 +672,7 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #: src/gui/buyselldialog.cpp:69 src/gui/popupmenu.cpp:223
 #: src/gui/popupmenu.cpp:2455 src/gui/selldialog.cpp:54
-#: src/gui/selldialog.cpp:64 src/gui/selldialog.cpp:104
+#: src/gui/selldialog.cpp:64 src/gui/selldialog.cpp:105
 msgid "Sell"
 msgstr ""
 
@@ -712,7 +712,7 @@ msgstr ""
 #: src/gui/popupmenu.cpp:2309 src/gui/popupmenu.cpp:2543
 #: src/gui/popupmenu.cpp:2660 src/gui/quitdialog.cpp:73
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
-#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1094
+#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1216
 #: src/gui/textcommandeditor.cpp:211 src/gui/textdialog.cpp:53
 #: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:181
 msgid "Cancel"
@@ -996,92 +996,102 @@ msgstr ""
 #. TRANSLATORS: inventory sort mode
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
-#: src/gui/chatwindow.cpp:139 src/gui/inventorywindow.cpp:65
+#: src/gui/chatwindow.cpp:143 src/gui/inventorywindow.cpp:65
 #: src/gui/setup_other.cpp:69 src/gui/setup_visual.cpp:77
 msgid "default"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:141
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:145 src/gui/widgets/colormodel.cpp:76
 msgid "black"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:143
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:147 src/gui/widgets/colormodel.cpp:78
 msgid "red"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:145
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:149 src/gui/widgets/colormodel.cpp:80
 msgid "green"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:147
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:151 src/gui/widgets/colormodel.cpp:82
 msgid "blue"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:149
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:153 src/gui/widgets/colormodel.cpp:84
 msgid "gold"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:151
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:155 src/gui/widgets/colormodel.cpp:86
 msgid "yellow"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:153
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:157 src/gui/widgets/colormodel.cpp:88
 msgid "pink"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:155
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:159 src/gui/widgets/colormodel.cpp:90
 msgid "purple"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:157
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:161 src/gui/widgets/colormodel.cpp:92
 msgid "grey"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:159
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:163 src/gui/widgets/colormodel.cpp:94
 msgid "brown"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:161
+#: src/gui/chatwindow.cpp:165
 msgid "rainbow 1"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:163
+#: src/gui/chatwindow.cpp:167
 msgid "rainbow 2"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:165
+#: src/gui/chatwindow.cpp:169
 msgid "rainbow 3"
 msgstr ""
 
 #. TRANSLATORS: chat window name
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
-#: src/gui/chatwindow.cpp:192 src/gui/setupactiondata.h:1866
+#: src/gui/chatwindow.cpp:196 src/gui/setupactiondata.h:1866
 #: src/gui/setup_chat.cpp:50 src/gui/windowmenu.cpp:88
 msgid "Chat"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:641
+#: src/gui/chatwindow.cpp:684
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1044
+#: src/gui/chatwindow.cpp:1091
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -1390,6 +1400,38 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
+#. TRANSLATORS: font size
+#: src/gui/emotewindow.cpp:49
+msgid "Normal font"
+msgstr ""
+
+#. TRANSLATORS: font size
+#. TRANSLATORS: theme settings label
+#: src/gui/emotewindow.cpp:51 src/gui/setup_theme.cpp:249
+msgid "Bold font"
+msgstr ""
+
+#. TRANSLATORS: emotes window name
+#. TRANSLATORS: emotes tab name
+#. TRANSLATORS: input tab sub tab name
+#: src/gui/emotewindow.cpp:56 src/gui/emotewindow.cpp:107
+#: src/gui/setupactiondata.h:1862
+msgid "Emotes"
+msgstr ""
+
+#. TRANSLATORS: emotes tab name
+#. TRANSLATORS: settings group
+#. TRANSLATORS: settings colors tab name
+#: src/gui/emotewindow.cpp:109 src/gui/setup_chat.cpp:70
+#: src/gui/setup_colors.cpp:83
+msgid "Colors"
+msgstr ""
+
+#. TRANSLATORS: emotes tab name
+#: src/gui/emotewindow.cpp:111
+msgid "Fonts"
+msgstr ""
+
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/equipmentwindow.cpp:56 src/gui/inventorywindow.cpp:204
@@ -1481,7 +1523,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/inventorywindow.cpp:580 src/gui/statuswindow.cpp:143
-#: src/gui/statuswindow.cpp:284 src/gui/statuswindow.cpp:337
+#: src/gui/statuswindow.cpp:285 src/gui/statuswindow.cpp:338
 #: src/gui/widgets/characterdisplay.cpp:126
 #, c-format
 msgid "Money: %s"
@@ -1767,7 +1809,7 @@ msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:295
+#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:296
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
@@ -1775,7 +1817,7 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/ministatuswindow.cpp:317 src/gui/statuswindow.cpp:141
-#: src/gui/statuswindow.cpp:302 src/gui/statuswindow.cpp:373
+#: src/gui/statuswindow.cpp:303 src/gui/statuswindow.cpp:374
 #, c-format
 msgid "Level: %d"
 msgstr "เลเวล: %d"
@@ -1792,34 +1834,45 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:62
+#: src/gui/npcdialog.cpp:66
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:64
+#: src/gui/npcdialog.cpp:68
 msgid "Next"
 msgstr "ถัดไป"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:68
+#: src/gui/npcdialog.cpp:72
 msgid "Submit"
 msgstr ""
 
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
 #. TRANSLATORS: settings group
-#: src/gui/npcdialog.cpp:77 src/gui/npcpostdialog.cpp:43
+#: src/gui/npcdialog.cpp:81 src/gui/npcpostdialog.cpp:43
 #: src/gui/setup_other.cpp:257
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:566
+#: src/gui/npcdialog.cpp:104 src/gui/popupmenu.cpp:566
 msgid "Clear"
 msgstr ""
 
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: trade window button
+#: src/gui/npcdialog.cpp:109 src/gui/serverdialog.cpp:266
+#: src/gui/shopwindow.cpp:95 src/gui/shopwindow.cpp:102
+#: src/gui/tradewindow.cpp:77
+msgid "Add"
+msgstr ""
+
 #. TRANSLATORS: label in npc post dialog
 #: src/gui/npcpostdialog.cpp:53
 msgid "To:"
@@ -2027,7 +2080,7 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: social window button
-#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1164
+#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1286
 msgid "Leave"
 msgstr ""
 
@@ -2161,7 +2214,7 @@ msgstr ""
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2194
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:985
 msgid "(default)"
 msgstr ""
 
@@ -2393,12 +2446,12 @@ msgid "Passwords do not match."
 msgstr ""
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/selldialog.cpp:242
+#: src/gui/selldialog.cpp:243
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/selldialog.cpp:244
+#: src/gui/selldialog.cpp:245
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
@@ -2409,15 +2462,6 @@ msgid "Choose Your Server"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:266 src/gui/shopwindow.cpp:95
-#: src/gui/shopwindow.cpp:102 src/gui/tradewindow.cpp:77
-msgid "Add"
-msgstr ""
-
-#. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
 #: src/gui/serverdialog.cpp:268 src/gui/widgets/setupitem.cpp:303
 #: src/gui/widgets/setupitem.cpp:430
@@ -3153,11 +3197,6 @@ msgid "Windows"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1862
-msgid "Emotes"
-msgstr ""
-
-#. TRANSLATORS: input tab sub tab name
 #: src/gui/setupactiondata.h:1870
 msgid "Gui"
 msgstr ""
@@ -3313,18 +3352,12 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:61
-msgid "Auto hide chat window."
+msgid "Auto hide chat window"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:65
-msgid "Protect chat focus."
-msgstr ""
-
-#. TRANSLATORS: settings group
-#. TRANSLATORS: settings colors tab name
-#: src/gui/setup_chat.cpp:70 src/gui/setup_colors.cpp:83
-msgid "Colors"
+msgid "Protect chat focus"
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4419,11 +4452,6 @@ msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:249
-msgid "Bold font"
-msgstr ""
-
-#. TRANSLATORS: theme settings label
 #: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr ""
@@ -4909,258 +4937,289 @@ msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
-#: src/gui/socialwindow.cpp:158 src/gui/socialwindow.cpp:259
+#: src/gui/socialwindow.cpp:176 src/gui/socialwindow.cpp:309
 #: src/gui/widgets/guildchattab.cpp:42 src/net/ea/gui/guildtab.cpp:49
 msgid "Guild"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:213
+#: src/gui/socialwindow.cpp:231
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:245
 msgid "Member Invite to Guild"
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:229
+#: src/gui/socialwindow.cpp:247
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:238
+#: src/gui/socialwindow.cpp:256
 msgid "Leave Guild?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:240
+#: src/gui/socialwindow.cpp:258
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:269
+#, c-format
+msgid "Members: %u/%u"
+msgstr ""
+
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:291 src/gui/socialwindow.cpp:361
+#: src/gui/socialwindow.cpp:483
+#, c-format
+msgid "Players: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/socialwindow.cpp:302 src/net/ea/gui/partytab.cpp:49
+#: src/gui/socialwindow.cpp:376 src/net/ea/gui/partytab.cpp:49
 msgid "Party"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:341
+#: src/gui/socialwindow.cpp:415
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
 #. TRANSLATORS: tab in social window
-#: src/gui/socialwindow.cpp:356
+#: src/gui/socialwindow.cpp:430
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:370
+#: src/gui/socialwindow.cpp:444
 msgid "Member Invite to Party"
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:372
+#: src/gui/socialwindow.cpp:446
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:381
+#: src/gui/socialwindow.cpp:455
 msgid "Leave Party?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:383
+#: src/gui/socialwindow.cpp:457
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:681
+#, c-format
+msgid "Visible players: %d"
+msgstr ""
+
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:605
+#: src/gui/socialwindow.cpp:707
 msgid "Nav"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:809
+#, c-format
+msgid "Portals: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:922
+#: src/gui/socialwindow.cpp:1035
 msgid "Atk"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:941
+#: src/gui/socialwindow.cpp:1054
 msgid "Priority mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:943
+#: src/gui/socialwindow.cpp:1056
 msgid "Attack mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:945
+#: src/gui/socialwindow.cpp:1058
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:968
+#: src/gui/socialwindow.cpp:1081
 msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:987
+#: src/gui/socialwindow.cpp:1100
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:989
+#: src/gui/socialwindow.cpp:1102
 msgid "Ignore items"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:1190
+#, c-format
+msgid "Friends: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1091 src/gui/socialwindow.cpp:1563
+#: src/gui/socialwindow.cpp:1213 src/gui/socialwindow.cpp:1687
 msgid "Create Party"
 msgstr ""
 
 #. TRANSLATORS: social window name
 #. TRANSLATORS: full button name
-#: src/gui/socialwindow.cpp:1138 src/gui/windowmenu.cpp:126
+#: src/gui/socialwindow.cpp:1260 src/gui/windowmenu.cpp:126
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1273
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1156
+#: src/gui/socialwindow.cpp:1278
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/socialwindow.cpp:1162
+#: src/gui/socialwindow.cpp:1284
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1345
+#: src/gui/socialwindow.cpp:1469
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1356
+#: src/gui/socialwindow.cpp:1480
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1497
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1424
+#: src/gui/socialwindow.cpp:1548
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1445
+#: src/gui/socialwindow.cpp:1569
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1460
+#: src/gui/socialwindow.cpp:1584
 msgid "Guild Name"
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1462
+#: src/gui/socialwindow.cpp:1586
 msgid "Choose your guild's name."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1477
+#: src/gui/socialwindow.cpp:1601
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1485
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1616
 msgid "Accept Guild Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1631
 msgid "Received party request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1519
+#: src/gui/socialwindow.cpp:1643
 msgid "You have been invited you to join a party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1524
+#: src/gui/socialwindow.cpp:1648
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1533
+#: src/gui/socialwindow.cpp:1657
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1539
+#: src/gui/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1673
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1688
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1694
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1572
+#: src/gui/socialwindow.cpp:1696
 msgid "Choose your party's name."
 msgstr ""
 
@@ -5180,24 +5239,24 @@ msgid "MP:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:235 src/gui/statuswindow.cpp:423
+#: src/gui/statuswindow.cpp:234 src/gui/statuswindow.cpp:424
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:237
+#: src/gui/statuswindow.cpp:236
 msgid "Job:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:288 src/gui/statuswindow.cpp:345
+#: src/gui/statuswindow.cpp:289 src/gui/statuswindow.cpp:346
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:360
+#: src/gui/statuswindow.cpp:361
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
@@ -5643,13 +5702,13 @@ msgid "%s whispers: %s"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:540
+#: src/gui/widgets/chattab.cpp:541
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:545
+#: src/gui/widgets/chattab.cpp:546
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -5935,24 +5994,24 @@ msgstr ""
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/inputmanager.cpp:328 src/inputmanager.cpp:372 src/keyboardconfig.cpp:90
+#: src/inputmanager.cpp:329 src/inputmanager.cpp:373 src/keyboardconfig.cpp:90
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/inputmanager.cpp:334
+#: src/inputmanager.cpp:335
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/inputmanager.cpp:348
+#: src/inputmanager.cpp:349
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/inputmanager.cpp:378
+#: src/inputmanager.cpp:379
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -5960,7 +6019,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/inputmanager.cpp:392 src/keyboardconfig.cpp:103
+#: src/inputmanager.cpp:393 src/keyboardconfig.cpp:134
 msgid "u key"
 msgstr ""
 
@@ -6635,55 +6694,55 @@ msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:176
+#: src/net/ea/guildhandler.cpp:178
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:179
+#: src/net/ea/guildhandler.cpp:181
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:186
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:187
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:193
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:195
+#: src/net/ea/guildhandler.cpp:197
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:198
+#: src/net/ea/guildhandler.cpp:200
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
@@ -7558,8 +7617,8 @@ msgstr ""
 #. TRANSLATORS: being info default name
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
-#: src/resources/avatardb.cpp:69 src/resources/beinginfo.cpp:40
-#: src/resources/itemdb.cpp:291 src/resources/monsterdb.cpp:100
+#: src/resources/avatardb.cpp:69 src/resources/beinginfo.cpp:41
+#: src/resources/itemdb.cpp:295 src/resources/monsterdb.cpp:100
 msgid "unnamed"
 msgstr ""
 
diff --git a/po/tr.po b/po/tr.po
index 0c2b99311..52f08fa08 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-08-03 13:52+0300\n"
-"PO-Revision-Date: 2013-07-19 19:52+0000\n"
+"POT-Creation-Date: 2013-08-17 13:35+0300\n"
+"PO-Revision-Date: 2013-08-16 17:53+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/manaplus/"
 "language/tr/)\n"
@@ -41,21 +41,21 @@ msgstr ""
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "dodge"
 msgstr "kaçınıldı"
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "miss"
 msgstr "ıskalandı"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1710 src/gui/whoisonline.cpp:835
+#: src/being.cpp:1713 src/gui/whoisonline.cpp:842
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1715 src/gui/whoisonline.cpp:840
+#: src/being.cpp:1718 src/gui/whoisonline.cpp:847
 msgid "I"
 msgstr ""
 
@@ -92,8 +92,8 @@ msgstr "Tema"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:1176 src/gui/didyouknowwindow.cpp:78
-#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:66
-#: src/gui/npcdialog.cpp:103 src/gui/popupmenu.cpp:562
+#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:70
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:562
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:81
 msgid "Close"
 msgstr "Kapat"
@@ -431,14 +431,14 @@ msgstr ""
 "/%s ayar seçenekleri \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\" 'dir."
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:259 src/gui/widgets/chattab.cpp:465
+#: src/game.cpp:259 src/gui/widgets/chattab.cpp:466
 msgid "General"
 msgstr "Genel"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: debug window name
 #. TRANSLATORS: full button name
-#: src/game.cpp:275 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:467
+#: src/game.cpp:275 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:468
 #: src/gui/windowmenu.cpp:154
 msgid "Debug"
 msgstr "Hata ayıklama"
@@ -495,7 +495,7 @@ msgstr "Bot Kontrolörü"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:105
+#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:111
 msgid "Reset"
 msgstr "Sıfırla"
 
@@ -613,8 +613,8 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/buydialog.cpp:265 src/gui/itemamountwindow.cpp:202
-#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:96
-#: src/gui/selldialog.cpp:101 src/gui/statuswindow.cpp:790
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:100
+#: src/gui/selldialog.cpp:101 src/gui/statuswindow.cpp:791
 msgid "+"
 msgstr "+"
 
@@ -625,8 +625,8 @@ msgstr "+"
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
 #: src/gui/buydialog.cpp:268 src/gui/itemamountwindow.cpp:200
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:98
-#: src/gui/selldialog.cpp:103 src/gui/statuswindow.cpp:803
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:102
+#: src/gui/selldialog.cpp:103 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr "-"
 
@@ -634,7 +634,7 @@ msgstr "-"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/buydialog.cpp:271 src/gui/charcreatedialog.cpp:122
-#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1160
+#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1282
 msgid "Create"
 msgstr "Oluştur"
 
@@ -657,8 +657,8 @@ msgstr "Çıkış"
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
 #: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:109
-#: src/gui/statuswindow.cpp:531 src/gui/statuswindow.cpp:586
-#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:821
+#: src/gui/statuswindow.cpp:532 src/gui/statuswindow.cpp:587
+#: src/gui/statuswindow.cpp:788 src/gui/statuswindow.cpp:822
 msgid "Max"
 msgstr "En Fazla"
 
@@ -718,7 +718,7 @@ msgstr "Sat"
 #: src/gui/popupmenu.cpp:2309 src/gui/popupmenu.cpp:2543
 #: src/gui/popupmenu.cpp:2660 src/gui/quitdialog.cpp:73
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
-#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1094
+#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1216
 #: src/gui/textcommandeditor.cpp:211 src/gui/textdialog.cpp:53
 #: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:181
 msgid "Cancel"
@@ -1002,92 +1002,102 @@ msgstr ""
 #. TRANSLATORS: inventory sort mode
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
-#: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:65
+#: src/gui/chatwindow.cpp:143 src/gui/inventorywindow.cpp:65
 #: src/gui/setup_other.cpp:69 src/gui/setup_visual.cpp:77
 msgid "default"
 msgstr "varsayılan"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:144
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:145 src/gui/widgets/colormodel.cpp:76
 msgid "black"
 msgstr "siyah"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:146
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:147 src/gui/widgets/colormodel.cpp:78
 msgid "red"
 msgstr "kırmızı"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:148
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:149 src/gui/widgets/colormodel.cpp:80
 msgid "green"
 msgstr "yeşil"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:150
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:151 src/gui/widgets/colormodel.cpp:82
 msgid "blue"
 msgstr "mavi"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:152
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:153 src/gui/widgets/colormodel.cpp:84
 msgid "gold"
 msgstr "altın rengi"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:154
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:155 src/gui/widgets/colormodel.cpp:86
 msgid "yellow"
 msgstr "sarı"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:156
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:157 src/gui/widgets/colormodel.cpp:88
 msgid "pink"
 msgstr "pembe"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:158
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:159 src/gui/widgets/colormodel.cpp:90
 msgid "purple"
 msgstr "mor"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:160
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:161 src/gui/widgets/colormodel.cpp:92
 msgid "grey"
 msgstr "gri"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:162
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:163 src/gui/widgets/colormodel.cpp:94
 msgid "brown"
 msgstr "kahverengi"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:164
+#: src/gui/chatwindow.cpp:165
 msgid "rainbow 1"
 msgstr "gökkuşağı 1"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:166
+#: src/gui/chatwindow.cpp:167
 msgid "rainbow 2"
 msgstr "gökkuşağı 2"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:168
+#: src/gui/chatwindow.cpp:169
 msgid "rainbow 3"
 msgstr "gökkuşağı 3"
 
 #. TRANSLATORS: chat window name
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
-#: src/gui/chatwindow.cpp:195 src/gui/setupactiondata.h:1866
+#: src/gui/chatwindow.cpp:196 src/gui/setupactiondata.h:1866
 #: src/gui/setup_chat.cpp:50 src/gui/windowmenu.cpp:88
 msgid "Chat"
 msgstr "Sohbet"
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:659
+#: src/gui/chatwindow.cpp:684
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Mevcut: %s; %d oyuncu mevcut."
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1066
+#: src/gui/chatwindow.cpp:1091
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "%s 'e fısıldanıyor: %s"
@@ -1396,14 +1406,38 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
+#. TRANSLATORS: font size
+#: src/gui/emotewindow.cpp:49
+msgid "Normal font"
+msgstr ""
+
+#. TRANSLATORS: font size
+#. TRANSLATORS: theme settings label
+#: src/gui/emotewindow.cpp:51 src/gui/setup_theme.cpp:249
+msgid "Bold font"
+msgstr "Kalın Yazı Tipi"
+
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/emotewindow.cpp:41 src/gui/emotewindow.cpp:61
+#: src/gui/emotewindow.cpp:56 src/gui/emotewindow.cpp:107
 #: src/gui/setupactiondata.h:1862
 msgid "Emotes"
 msgstr ""
 
+#. TRANSLATORS: emotes tab name
+#. TRANSLATORS: settings group
+#. TRANSLATORS: settings colors tab name
+#: src/gui/emotewindow.cpp:109 src/gui/setup_chat.cpp:70
+#: src/gui/setup_colors.cpp:83
+msgid "Colors"
+msgstr "Renkler"
+
+#. TRANSLATORS: emotes tab name
+#: src/gui/emotewindow.cpp:111
+msgid "Fonts"
+msgstr ""
+
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/equipmentwindow.cpp:56 src/gui/inventorywindow.cpp:204
@@ -1495,7 +1529,7 @@ msgstr "Almak"
 
 #. TRANSLATORS: status window label
 #: src/gui/inventorywindow.cpp:580 src/gui/statuswindow.cpp:143
-#: src/gui/statuswindow.cpp:284 src/gui/statuswindow.cpp:337
+#: src/gui/statuswindow.cpp:285 src/gui/statuswindow.cpp:338
 #: src/gui/widgets/characterdisplay.cpp:126
 #, c-format
 msgid "Money: %s"
@@ -1783,7 +1817,7 @@ msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:295
+#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:296
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Level: %d (GM %d)"
@@ -1791,7 +1825,7 @@ msgstr "Level: %d (GM %d)"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/ministatuswindow.cpp:317 src/gui/statuswindow.cpp:141
-#: src/gui/statuswindow.cpp:302 src/gui/statuswindow.cpp:373
+#: src/gui/statuswindow.cpp:303 src/gui/statuswindow.cpp:374
 #, c-format
 msgid "Level: %d"
 msgstr "Seviye: %d"
@@ -1808,34 +1842,45 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:62
+#: src/gui/npcdialog.cpp:66
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:64
+#: src/gui/npcdialog.cpp:68
 msgid "Next"
 msgstr "İleri"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:68
+#: src/gui/npcdialog.cpp:72
 msgid "Submit"
 msgstr "Onayla"
 
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
 #. TRANSLATORS: settings group
-#: src/gui/npcdialog.cpp:77 src/gui/npcpostdialog.cpp:43
+#: src/gui/npcdialog.cpp:81 src/gui/npcpostdialog.cpp:43
 #: src/gui/setup_other.cpp:257
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:566
+#: src/gui/npcdialog.cpp:104 src/gui/popupmenu.cpp:566
 msgid "Clear"
 msgstr "Temizle"
 
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: trade window button
+#: src/gui/npcdialog.cpp:109 src/gui/serverdialog.cpp:266
+#: src/gui/shopwindow.cpp:95 src/gui/shopwindow.cpp:102
+#: src/gui/tradewindow.cpp:77
+msgid "Add"
+msgstr "Ekle"
+
 #. TRANSLATORS: label in npc post dialog
 #: src/gui/npcpostdialog.cpp:53
 msgid "To:"
@@ -2043,7 +2088,7 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: social window button
-#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1164
+#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1286
 msgid "Leave"
 msgstr "Ayrıl"
 
@@ -2177,7 +2222,7 @@ msgstr ""
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2194
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:985
 msgid "(default)"
 msgstr ""
 
@@ -2425,15 +2470,6 @@ msgid "Choose Your Server"
 msgstr "Sunucunu Seç"
 
 #. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:266 src/gui/shopwindow.cpp:95
-#: src/gui/shopwindow.cpp:102 src/gui/tradewindow.cpp:77
-msgid "Add"
-msgstr "Ekle"
-
-#. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
 #: src/gui/serverdialog.cpp:268 src/gui/widgets/setupitem.cpp:303
 #: src/gui/widgets/setupitem.cpp:430
@@ -3324,20 +3360,14 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:61
-msgid "Auto hide chat window."
+msgid "Auto hide chat window"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:65
-msgid "Protect chat focus."
+msgid "Protect chat focus"
 msgstr ""
 
-#. TRANSLATORS: settings group
-#. TRANSLATORS: settings colors tab name
-#: src/gui/setup_chat.cpp:70 src/gui/setup_colors.cpp:83
-msgid "Colors"
-msgstr "Renkler"
-
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:73
 msgid "Remove colors from received chat messages"
@@ -4433,11 +4463,6 @@ msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:249
-msgid "Bold font"
-msgstr "Kalın Yazı Tipi"
-
-#. TRANSLATORS: theme settings label
 #: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr "Partikül yazı tipi"
@@ -4923,258 +4948,289 @@ msgstr "Level: %d"
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
-#: src/gui/socialwindow.cpp:158 src/gui/socialwindow.cpp:259
+#: src/gui/socialwindow.cpp:176 src/gui/socialwindow.cpp:309
 #: src/gui/widgets/guildchattab.cpp:42 src/net/ea/gui/guildtab.cpp:49
 msgid "Guild"
 msgstr "Lonca"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "%s kullanıcısı %s loncasına davet edildi."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:213
+#: src/gui/socialwindow.cpp:231
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "%s loncasından çıkış istendi."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:245
 msgid "Member Invite to Guild"
 msgstr "Loncaya üye davet et"
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:229
+#: src/gui/socialwindow.cpp:247
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "%s loncasına kimi davet etmek istersin?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:238
+#: src/gui/socialwindow.cpp:256
 msgid "Leave Guild?"
 msgstr "Loncadan ayrıl?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:240
+#: src/gui/socialwindow.cpp:258
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "%s loncasından ayrılmak istediğine emin misin?"
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:269
+#, c-format
+msgid "Members: %u/%u"
+msgstr ""
+
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:291 src/gui/socialwindow.cpp:361
+#: src/gui/socialwindow.cpp:483
+#, c-format
+msgid "Players: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/socialwindow.cpp:302 src/net/ea/gui/partytab.cpp:49
+#: src/gui/socialwindow.cpp:376 src/net/ea/gui/partytab.cpp:49
 msgid "Party"
 msgstr "Grup"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:341
+#: src/gui/socialwindow.cpp:415
 #, c-format
 msgid "Invited user %s to party."
 msgstr "%s adlı oyuncu gruba davet edildi."
 
 #. TRANSLATORS: tab in social window
-#: src/gui/socialwindow.cpp:356
+#: src/gui/socialwindow.cpp:430
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Grup %s 'ten çıkış istendi."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:370
+#: src/gui/socialwindow.cpp:444
 msgid "Member Invite to Party"
 msgstr "Üye Gruba Daveti"
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:372
+#: src/gui/socialwindow.cpp:446
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Grup %s 'e kimi davet etmek istersin?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:381
+#: src/gui/socialwindow.cpp:455
 msgid "Leave Party?"
 msgstr "Gruptan ayrıl?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:383
+#: src/gui/socialwindow.cpp:457
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "%s grubundan ayrılmak istediğinize emin misin?"
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:681
+#, c-format
+msgid "Visible players: %d"
+msgstr ""
+
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:605
+#: src/gui/socialwindow.cpp:707
 msgid "Nav"
 msgstr "Navigasyon"
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:809
+#, c-format
+msgid "Portals: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:922
+#: src/gui/socialwindow.cpp:1035
 msgid "Atk"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:941
+#: src/gui/socialwindow.cpp:1054
 msgid "Priority mobs"
 msgstr "Öncelikli canavarlar"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:943
+#: src/gui/socialwindow.cpp:1056
 msgid "Attack mobs"
 msgstr "Saldırılacak canavarlar"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:945
+#: src/gui/socialwindow.cpp:1058
 msgid "Ignore mobs"
 msgstr "Canavarları görmezden gel"
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:968
+#: src/gui/socialwindow.cpp:1081
 msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:987
+#: src/gui/socialwindow.cpp:1100
 msgid "Pickup items"
 msgstr "Nesneleri Topla"
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:989
+#: src/gui/socialwindow.cpp:1102
 msgid "Ignore items"
 msgstr "Nesneleri görmezden gel"
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:1190
+#, c-format
+msgid "Friends: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1091 src/gui/socialwindow.cpp:1563
+#: src/gui/socialwindow.cpp:1213 src/gui/socialwindow.cpp:1687
 msgid "Create Party"
 msgstr "Grup kur"
 
 #. TRANSLATORS: social window name
 #. TRANSLATORS: full button name
-#: src/gui/socialwindow.cpp:1138 src/gui/windowmenu.cpp:126
+#: src/gui/socialwindow.cpp:1260 src/gui/windowmenu.cpp:126
 msgid "Social"
 msgstr "Sosyal"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1273
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1156
+#: src/gui/socialwindow.cpp:1278
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/socialwindow.cpp:1162
+#: src/gui/socialwindow.cpp:1284
 msgid "Invite"
 msgstr "Davet et"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1345
+#: src/gui/socialwindow.cpp:1469
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "%s 'ten gelen grup daveti kabul edildi."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1356
+#: src/gui/socialwindow.cpp:1480
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "%s 'ten gelen grup daveti reddedildi."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1497
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "%s ten gelen lonca davetiyesi kabul edildi."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "%s ten gelen lonca davetiyesi reddedildi."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1424
+#: src/gui/socialwindow.cpp:1548
 #, c-format
 msgid "Creating guild called %s."
 msgstr "%s isimli lonca oluşturuluyor."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1445
+#: src/gui/socialwindow.cpp:1569
 #, c-format
 msgid "Creating party called %s."
 msgstr "%s adlı grup kuruluyor."
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1460
+#: src/gui/socialwindow.cpp:1584
 msgid "Guild Name"
 msgstr "Lonca Adı"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1462
+#: src/gui/socialwindow.cpp:1586
 msgid "Choose your guild's name."
 msgstr "Loncanızın adını seçiniz."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1477
+#: src/gui/socialwindow.cpp:1601
 msgid "Received guild request, but one already exists."
 msgstr "Lonca isteği alındı, ancak halihazırda bir tane var."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1485
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s seni %s loncasına katılmaya davet etti."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1616
 msgid "Accept Guild Invite"
 msgstr "Lonca davetini kabul et"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1631
 msgid "Received party request, but one already exists."
 msgstr "Bir grup daveti aldın, ancak zaten bir gruba dahilsin."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1519
+#: src/gui/socialwindow.cpp:1643
 msgid "You have been invited you to join a party."
 msgstr "Bir gruba katılma daveti aldın."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1524
+#: src/gui/socialwindow.cpp:1648
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "%s grubuna katılmaya davet edildin."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1533
+#: src/gui/socialwindow.cpp:1657
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s seni gruplarına davet etti."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1539
+#: src/gui/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s seni %s grubuna davet etti."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1673
 msgid "Accept Party Invite"
 msgstr "Grup Davetini Kabul et"
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1688
 msgid "Cannot create party. You are already in a party"
 msgstr "Grup kuramazsın. Zaten bir gruba dahilsin"
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1694
 msgid "Party Name"
 msgstr "Grup Adı"
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1572
+#: src/gui/socialwindow.cpp:1696
 msgid "Choose your party's name."
 msgstr "Grubunun adını seç."
 
@@ -5194,24 +5250,24 @@ msgid "MP:"
 msgstr "MP:"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:235 src/gui/statuswindow.cpp:423
+#: src/gui/statuswindow.cpp:234 src/gui/statuswindow.cpp:424
 #, c-format
 msgid "Job: %d"
 msgstr "İş: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:237
+#: src/gui/statuswindow.cpp:236
 msgid "Job:"
 msgstr "İş:"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:288 src/gui/statuswindow.cpp:345
+#: src/gui/statuswindow.cpp:289 src/gui/statuswindow.cpp:346
 #, c-format
 msgid "Character points: %d"
 msgstr "Karakter Puanları: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:360
+#: src/gui/statuswindow.cpp:361
 #, c-format
 msgid "Correction points: %d"
 msgstr "Düzeltme puanları: %d"
@@ -5658,13 +5714,13 @@ msgid "%s whispers: %s"
 msgstr "%s %s'e fısıldıyor:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:540
+#: src/gui/widgets/chattab.cpp:541
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:545
+#: src/gui/widgets/chattab.cpp:546
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -5953,24 +6009,24 @@ msgstr "Dünya Seç"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/inputmanager.cpp:328 src/inputmanager.cpp:372 src/keyboardconfig.cpp:90
+#: src/inputmanager.cpp:329 src/inputmanager.cpp:373 src/keyboardconfig.cpp:90
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/inputmanager.cpp:334
+#: src/inputmanager.cpp:335
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/inputmanager.cpp:348
+#: src/inputmanager.cpp:349
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/inputmanager.cpp:378
+#: src/inputmanager.cpp:379
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -5978,7 +6034,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/inputmanager.cpp:392 src/keyboardconfig.cpp:103
+#: src/inputmanager.cpp:393 src/keyboardconfig.cpp:134
 msgid "u key"
 msgstr ""
 
@@ -6654,55 +6710,55 @@ msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:176
+#: src/net/ea/guildhandler.cpp:178
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:179
+#: src/net/ea/guildhandler.cpp:181
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:186
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:187
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:193
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:195
+#: src/net/ea/guildhandler.cpp:197
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:198
+#: src/net/ea/guildhandler.cpp:200
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
diff --git a/po/vls.po b/po/vls.po
index 0e60b3a59..f005566b8 100644
--- a/po/vls.po
+++ b/po/vls.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-07-19 22:23+0300\n"
-"PO-Revision-Date: 2013-07-19 19:52+0000\n"
+"POT-Creation-Date: 2013-08-16 20:45+0300\n"
+"PO-Revision-Date: 2013-08-16 17:53+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Vlaams (http://www.transifex.com/projects/p/manaplus/language/vls/)\n"
 "MIME-Version: 1.0\n"
@@ -37,21 +37,21 @@ msgstr ""
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1606 src/gui/whoisonline.cpp:835
+#: src/being.cpp:1713 src/gui/whoisonline.cpp:842
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1611 src/gui/whoisonline.cpp:840
+#: src/being.cpp:1718 src/gui/whoisonline.cpp:847
 msgid "I"
 msgstr ""
 
@@ -88,8 +88,8 @@ msgstr ""
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:1176 src/gui/didyouknowwindow.cpp:78
-#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:66
-#: src/gui/npcdialog.cpp:103 src/gui/popupmenu.cpp:562
+#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:70
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:562
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:81
 msgid "Close"
 msgstr ""
@@ -424,36 +424,36 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:465
+#: src/game.cpp:259 src/gui/widgets/chattab.cpp:466
 msgid "General"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: debug window name
 #. TRANSLATORS: full button name
-#: src/game.cpp:272 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:467
+#: src/game.cpp:275 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:468
 #: src/gui/windowmenu.cpp:154
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:536
+#: src/game.cpp:540
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:546
+#: src/game.cpp:550
 msgid "Saving screenshot failed!"
 msgstr ""
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:618
+#: src/game.cpp:622
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:621
+#: src/game.cpp:625
 msgid "Network Error"
 msgstr ""
 
@@ -488,7 +488,7 @@ msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:105
+#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:111
 msgid "Reset"
 msgstr ""
 
@@ -589,7 +589,7 @@ msgstr ""
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
 #: src/gui/buydialog.cpp:251 src/gui/buydialog.cpp:531
-#: src/gui/selldialog.cpp:96 src/gui/selldialog.cpp:356
+#: src/gui/selldialog.cpp:97 src/gui/selldialog.cpp:357
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
@@ -606,8 +606,8 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/buydialog.cpp:265 src/gui/itemamountwindow.cpp:202
-#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:96
-#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:790
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:100
+#: src/gui/selldialog.cpp:101 src/gui/statuswindow.cpp:791
 msgid "+"
 msgstr ""
 
@@ -618,8 +618,8 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
 #: src/gui/buydialog.cpp:268 src/gui/itemamountwindow.cpp:200
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:98
-#: src/gui/selldialog.cpp:102 src/gui/statuswindow.cpp:803
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:102
+#: src/gui/selldialog.cpp:103 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr ""
 
@@ -627,7 +627,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/buydialog.cpp:271 src/gui/charcreatedialog.cpp:122
-#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1160
+#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1282
 msgid "Create"
 msgstr ""
 
@@ -639,7 +639,7 @@ msgstr ""
 #. TRANSLATORS: input action name
 #: src/gui/buydialog.cpp:273 src/gui/quitdialog.cpp:55
 #: src/gui/quitdialog.cpp:60 src/gui/quitdialog.cpp:62
-#: src/gui/selldialog.cpp:106 src/gui/serverdialog.cpp:262
+#: src/gui/selldialog.cpp:107 src/gui/serverdialog.cpp:262
 #: src/gui/setupactiondata.h:177
 msgid "Quit"
 msgstr ""
@@ -649,9 +649,9 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:108
-#: src/gui/statuswindow.cpp:531 src/gui/statuswindow.cpp:586
-#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:821
+#: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:109
+#: src/gui/statuswindow.cpp:532 src/gui/statuswindow.cpp:587
+#: src/gui/statuswindow.cpp:788 src/gui/statuswindow.cpp:822
 msgid "Max"
 msgstr ""
 
@@ -671,7 +671,7 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #: src/gui/buyselldialog.cpp:69 src/gui/popupmenu.cpp:223
 #: src/gui/popupmenu.cpp:2455 src/gui/selldialog.cpp:54
-#: src/gui/selldialog.cpp:64 src/gui/selldialog.cpp:104
+#: src/gui/selldialog.cpp:64 src/gui/selldialog.cpp:105
 msgid "Sell"
 msgstr ""
 
@@ -711,7 +711,7 @@ msgstr ""
 #: src/gui/popupmenu.cpp:2309 src/gui/popupmenu.cpp:2543
 #: src/gui/popupmenu.cpp:2660 src/gui/quitdialog.cpp:73
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
-#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1094
+#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1216
 #: src/gui/textcommandeditor.cpp:211 src/gui/textdialog.cpp:53
 #: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:181
 msgid "Cancel"
@@ -995,92 +995,102 @@ msgstr ""
 #. TRANSLATORS: inventory sort mode
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
-#: src/gui/chatwindow.cpp:139 src/gui/inventorywindow.cpp:65
+#: src/gui/chatwindow.cpp:143 src/gui/inventorywindow.cpp:65
 #: src/gui/setup_other.cpp:69 src/gui/setup_visual.cpp:77
 msgid "default"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:141
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:145 src/gui/widgets/colormodel.cpp:76
 msgid "black"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:143
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:147 src/gui/widgets/colormodel.cpp:78
 msgid "red"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:145
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:149 src/gui/widgets/colormodel.cpp:80
 msgid "green"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:147
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:151 src/gui/widgets/colormodel.cpp:82
 msgid "blue"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:149
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:153 src/gui/widgets/colormodel.cpp:84
 msgid "gold"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:151
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:155 src/gui/widgets/colormodel.cpp:86
 msgid "yellow"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:153
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:157 src/gui/widgets/colormodel.cpp:88
 msgid "pink"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:155
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:159 src/gui/widgets/colormodel.cpp:90
 msgid "purple"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:157
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:161 src/gui/widgets/colormodel.cpp:92
 msgid "grey"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:159
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:163 src/gui/widgets/colormodel.cpp:94
 msgid "brown"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:161
+#: src/gui/chatwindow.cpp:165
 msgid "rainbow 1"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:163
+#: src/gui/chatwindow.cpp:167
 msgid "rainbow 2"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:165
+#: src/gui/chatwindow.cpp:169
 msgid "rainbow 3"
 msgstr ""
 
 #. TRANSLATORS: chat window name
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
-#: src/gui/chatwindow.cpp:192 src/gui/setupactiondata.h:1866
+#: src/gui/chatwindow.cpp:196 src/gui/setupactiondata.h:1866
 #: src/gui/setup_chat.cpp:50 src/gui/windowmenu.cpp:88
 msgid "Chat"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:641
+#: src/gui/chatwindow.cpp:684
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1044
+#: src/gui/chatwindow.cpp:1091
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -1389,6 +1399,38 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
+#. TRANSLATORS: font size
+#: src/gui/emotewindow.cpp:49
+msgid "Normal font"
+msgstr ""
+
+#. TRANSLATORS: font size
+#. TRANSLATORS: theme settings label
+#: src/gui/emotewindow.cpp:51 src/gui/setup_theme.cpp:249
+msgid "Bold font"
+msgstr ""
+
+#. TRANSLATORS: emotes window name
+#. TRANSLATORS: emotes tab name
+#. TRANSLATORS: input tab sub tab name
+#: src/gui/emotewindow.cpp:56 src/gui/emotewindow.cpp:107
+#: src/gui/setupactiondata.h:1862
+msgid "Emotes"
+msgstr ""
+
+#. TRANSLATORS: emotes tab name
+#. TRANSLATORS: settings group
+#. TRANSLATORS: settings colors tab name
+#: src/gui/emotewindow.cpp:109 src/gui/setup_chat.cpp:70
+#: src/gui/setup_colors.cpp:83
+msgid "Colors"
+msgstr ""
+
+#. TRANSLATORS: emotes tab name
+#: src/gui/emotewindow.cpp:111
+msgid "Fonts"
+msgstr ""
+
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/equipmentwindow.cpp:56 src/gui/inventorywindow.cpp:204
@@ -1480,7 +1522,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/inventorywindow.cpp:580 src/gui/statuswindow.cpp:143
-#: src/gui/statuswindow.cpp:284 src/gui/statuswindow.cpp:337
+#: src/gui/statuswindow.cpp:285 src/gui/statuswindow.cpp:338
 #: src/gui/widgets/characterdisplay.cpp:126
 #, c-format
 msgid "Money: %s"
@@ -1768,7 +1810,7 @@ msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:295
+#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:296
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
@@ -1776,7 +1818,7 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/ministatuswindow.cpp:317 src/gui/statuswindow.cpp:141
-#: src/gui/statuswindow.cpp:302 src/gui/statuswindow.cpp:373
+#: src/gui/statuswindow.cpp:303 src/gui/statuswindow.cpp:374
 #, c-format
 msgid "Level: %d"
 msgstr ""
@@ -1793,34 +1835,45 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:62
+#: src/gui/npcdialog.cpp:66
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:64
+#: src/gui/npcdialog.cpp:68
 msgid "Next"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:68
+#: src/gui/npcdialog.cpp:72
 msgid "Submit"
 msgstr ""
 
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
 #. TRANSLATORS: settings group
-#: src/gui/npcdialog.cpp:77 src/gui/npcpostdialog.cpp:43
+#: src/gui/npcdialog.cpp:81 src/gui/npcpostdialog.cpp:43
 #: src/gui/setup_other.cpp:257
 msgid "NPC"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:566
+#: src/gui/npcdialog.cpp:104 src/gui/popupmenu.cpp:566
 msgid "Clear"
 msgstr ""
 
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: trade window button
+#: src/gui/npcdialog.cpp:109 src/gui/serverdialog.cpp:266
+#: src/gui/shopwindow.cpp:95 src/gui/shopwindow.cpp:102
+#: src/gui/tradewindow.cpp:77
+msgid "Add"
+msgstr ""
+
 #. TRANSLATORS: label in npc post dialog
 #: src/gui/npcpostdialog.cpp:53
 msgid "To:"
@@ -2028,7 +2081,7 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: social window button
-#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1164
+#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1286
 msgid "Leave"
 msgstr ""
 
@@ -2162,7 +2215,7 @@ msgstr ""
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2194
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:985
 msgid "(default)"
 msgstr ""
 
@@ -2394,12 +2447,12 @@ msgid "Passwords do not match."
 msgstr ""
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/selldialog.cpp:242
+#: src/gui/selldialog.cpp:243
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/selldialog.cpp:244
+#: src/gui/selldialog.cpp:245
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
@@ -2410,15 +2463,6 @@ msgid "Choose Your Server"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:266 src/gui/shopwindow.cpp:95
-#: src/gui/shopwindow.cpp:102 src/gui/tradewindow.cpp:77
-msgid "Add"
-msgstr ""
-
-#. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
 #: src/gui/serverdialog.cpp:268 src/gui/widgets/setupitem.cpp:303
 #: src/gui/widgets/setupitem.cpp:430
@@ -3154,11 +3198,6 @@ msgid "Windows"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1862
-msgid "Emotes"
-msgstr ""
-
-#. TRANSLATORS: input tab sub tab name
 #: src/gui/setupactiondata.h:1870
 msgid "Gui"
 msgstr ""
@@ -3314,18 +3353,12 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:61
-msgid "Auto hide chat window."
+msgid "Auto hide chat window"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:65
-msgid "Protect chat focus."
-msgstr ""
-
-#. TRANSLATORS: settings group
-#. TRANSLATORS: settings colors tab name
-#: src/gui/setup_chat.cpp:70 src/gui/setup_colors.cpp:83
-msgid "Colors"
+msgid "Protect chat focus"
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4420,11 +4453,6 @@ msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:249
-msgid "Bold font"
-msgstr ""
-
-#. TRANSLATORS: theme settings label
 #: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr ""
@@ -4910,258 +4938,289 @@ msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
-#: src/gui/socialwindow.cpp:158 src/gui/socialwindow.cpp:259
+#: src/gui/socialwindow.cpp:176 src/gui/socialwindow.cpp:309
 #: src/gui/widgets/guildchattab.cpp:42 src/net/ea/gui/guildtab.cpp:49
 msgid "Guild"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:213
+#: src/gui/socialwindow.cpp:231
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:245
 msgid "Member Invite to Guild"
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:229
+#: src/gui/socialwindow.cpp:247
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:238
+#: src/gui/socialwindow.cpp:256
 msgid "Leave Guild?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:240
+#: src/gui/socialwindow.cpp:258
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:269
+#, c-format
+msgid "Members: %u/%u"
+msgstr ""
+
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:291 src/gui/socialwindow.cpp:361
+#: src/gui/socialwindow.cpp:483
+#, c-format
+msgid "Players: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/socialwindow.cpp:302 src/net/ea/gui/partytab.cpp:49
+#: src/gui/socialwindow.cpp:376 src/net/ea/gui/partytab.cpp:49
 msgid "Party"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:341
+#: src/gui/socialwindow.cpp:415
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
 #. TRANSLATORS: tab in social window
-#: src/gui/socialwindow.cpp:356
+#: src/gui/socialwindow.cpp:430
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:370
+#: src/gui/socialwindow.cpp:444
 msgid "Member Invite to Party"
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:372
+#: src/gui/socialwindow.cpp:446
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:381
+#: src/gui/socialwindow.cpp:455
 msgid "Leave Party?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:383
+#: src/gui/socialwindow.cpp:457
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:681
+#, c-format
+msgid "Visible players: %d"
+msgstr ""
+
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:605
+#: src/gui/socialwindow.cpp:707
 msgid "Nav"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:809
+#, c-format
+msgid "Portals: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:922
+#: src/gui/socialwindow.cpp:1035
 msgid "Atk"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:941
+#: src/gui/socialwindow.cpp:1054
 msgid "Priority mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:943
+#: src/gui/socialwindow.cpp:1056
 msgid "Attack mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:945
+#: src/gui/socialwindow.cpp:1058
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:968
+#: src/gui/socialwindow.cpp:1081
 msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:987
+#: src/gui/socialwindow.cpp:1100
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:989
+#: src/gui/socialwindow.cpp:1102
 msgid "Ignore items"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:1190
+#, c-format
+msgid "Friends: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1091 src/gui/socialwindow.cpp:1563
+#: src/gui/socialwindow.cpp:1213 src/gui/socialwindow.cpp:1687
 msgid "Create Party"
 msgstr ""
 
 #. TRANSLATORS: social window name
 #. TRANSLATORS: full button name
-#: src/gui/socialwindow.cpp:1138 src/gui/windowmenu.cpp:126
+#: src/gui/socialwindow.cpp:1260 src/gui/windowmenu.cpp:126
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1273
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1156
+#: src/gui/socialwindow.cpp:1278
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/socialwindow.cpp:1162
+#: src/gui/socialwindow.cpp:1284
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1345
+#: src/gui/socialwindow.cpp:1469
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1356
+#: src/gui/socialwindow.cpp:1480
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1497
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1424
+#: src/gui/socialwindow.cpp:1548
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1445
+#: src/gui/socialwindow.cpp:1569
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1460
+#: src/gui/socialwindow.cpp:1584
 msgid "Guild Name"
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1462
+#: src/gui/socialwindow.cpp:1586
 msgid "Choose your guild's name."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1477
+#: src/gui/socialwindow.cpp:1601
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1485
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1616
 msgid "Accept Guild Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1631
 msgid "Received party request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1519
+#: src/gui/socialwindow.cpp:1643
 msgid "You have been invited you to join a party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1524
+#: src/gui/socialwindow.cpp:1648
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1533
+#: src/gui/socialwindow.cpp:1657
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1539
+#: src/gui/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1673
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1688
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1694
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1572
+#: src/gui/socialwindow.cpp:1696
 msgid "Choose your party's name."
 msgstr ""
 
@@ -5181,24 +5240,24 @@ msgid "MP:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:235 src/gui/statuswindow.cpp:423
+#: src/gui/statuswindow.cpp:234 src/gui/statuswindow.cpp:424
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:237
+#: src/gui/statuswindow.cpp:236
 msgid "Job:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:288 src/gui/statuswindow.cpp:345
+#: src/gui/statuswindow.cpp:289 src/gui/statuswindow.cpp:346
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:360
+#: src/gui/statuswindow.cpp:361
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
@@ -5644,13 +5703,13 @@ msgid "%s whispers: %s"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:540
+#: src/gui/widgets/chattab.cpp:541
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:545
+#: src/gui/widgets/chattab.cpp:546
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -5936,24 +5995,24 @@ msgstr ""
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/inputmanager.cpp:328 src/inputmanager.cpp:372 src/keyboardconfig.cpp:90
+#: src/inputmanager.cpp:329 src/inputmanager.cpp:373 src/keyboardconfig.cpp:90
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/inputmanager.cpp:334
+#: src/inputmanager.cpp:335
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/inputmanager.cpp:348
+#: src/inputmanager.cpp:349
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/inputmanager.cpp:378
+#: src/inputmanager.cpp:379
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -5961,7 +6020,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/inputmanager.cpp:392 src/keyboardconfig.cpp:103
+#: src/inputmanager.cpp:393 src/keyboardconfig.cpp:134
 msgid "u key"
 msgstr ""
 
@@ -6637,55 +6696,55 @@ msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:176
+#: src/net/ea/guildhandler.cpp:178
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:179
+#: src/net/ea/guildhandler.cpp:181
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:186
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:187
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:193
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:195
+#: src/net/ea/guildhandler.cpp:197
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:198
+#: src/net/ea/guildhandler.cpp:200
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
@@ -7560,8 +7619,8 @@ msgstr ""
 #. TRANSLATORS: being info default name
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
-#: src/resources/avatardb.cpp:69 src/resources/beinginfo.cpp:40
-#: src/resources/itemdb.cpp:291 src/resources/monsterdb.cpp:100
+#: src/resources/avatardb.cpp:69 src/resources/beinginfo.cpp:41
+#: src/resources/itemdb.cpp:295 src/resources/monsterdb.cpp:100
 msgid "unnamed"
 msgstr ""
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 12c7f503d..00b89cdf5 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-08-03 13:52+0300\n"
-"PO-Revision-Date: 2013-07-19 19:52+0000\n"
+"POT-Creation-Date: 2013-08-17 13:35+0300\n"
+"PO-Revision-Date: 2013-08-16 17:53+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/manaplus/"
 "language/zh_CN/)\n"
@@ -42,21 +42,21 @@ msgstr "在地图上可见"
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "dodge"
 msgstr "躲闪"
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "miss"
 msgstr "失误"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1710 src/gui/whoisonline.cpp:835
+#: src/being.cpp:1713 src/gui/whoisonline.cpp:842
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1715 src/gui/whoisonline.cpp:840
+#: src/being.cpp:1718 src/gui/whoisonline.cpp:847
 msgid "I"
 msgstr "I"
 
@@ -93,8 +93,8 @@ msgstr "主题"
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:1176 src/gui/didyouknowwindow.cpp:78
-#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:66
-#: src/gui/npcdialog.cpp:103 src/gui/popupmenu.cpp:562
+#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:70
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:562
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:81
 msgid "Close"
 msgstr "关闭"
@@ -429,14 +429,14 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "/%s的选项是\"yes\"，\"no\"，\"true\"，\"false\"，\"1\"，\"0\"。"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:259 src/gui/widgets/chattab.cpp:465
+#: src/game.cpp:259 src/gui/widgets/chattab.cpp:466
 msgid "General"
 msgstr "常规"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: debug window name
 #. TRANSLATORS: full button name
-#: src/game.cpp:275 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:467
+#: src/game.cpp:275 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:468
 #: src/gui/windowmenu.cpp:154
 msgid "Debug"
 msgstr "调试 "
@@ -493,7 +493,7 @@ msgstr "挂机检查"
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:105
+#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:111
 msgid "Reset"
 msgstr "重置"
 
@@ -611,8 +611,8 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/buydialog.cpp:265 src/gui/itemamountwindow.cpp:202
-#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:96
-#: src/gui/selldialog.cpp:101 src/gui/statuswindow.cpp:790
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:100
+#: src/gui/selldialog.cpp:101 src/gui/statuswindow.cpp:791
 msgid "+"
 msgstr "+"
 
@@ -623,8 +623,8 @@ msgstr "+"
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
 #: src/gui/buydialog.cpp:268 src/gui/itemamountwindow.cpp:200
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:98
-#: src/gui/selldialog.cpp:103 src/gui/statuswindow.cpp:803
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:102
+#: src/gui/selldialog.cpp:103 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr "-"
 
@@ -632,7 +632,7 @@ msgstr "-"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/buydialog.cpp:271 src/gui/charcreatedialog.cpp:122
-#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1160
+#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1282
 msgid "Create"
 msgstr "建立"
 
@@ -655,8 +655,8 @@ msgstr "退出"
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
 #: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:109
-#: src/gui/statuswindow.cpp:531 src/gui/statuswindow.cpp:586
-#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:821
+#: src/gui/statuswindow.cpp:532 src/gui/statuswindow.cpp:587
+#: src/gui/statuswindow.cpp:788 src/gui/statuswindow.cpp:822
 msgid "Max"
 msgstr "最大"
 
@@ -716,7 +716,7 @@ msgstr "出售"
 #: src/gui/popupmenu.cpp:2309 src/gui/popupmenu.cpp:2543
 #: src/gui/popupmenu.cpp:2660 src/gui/quitdialog.cpp:73
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
-#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1094
+#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1216
 #: src/gui/textcommandeditor.cpp:211 src/gui/textdialog.cpp:53
 #: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:181
 msgid "Cancel"
@@ -1000,92 +1000,102 @@ msgstr "输入密码："
 #. TRANSLATORS: inventory sort mode
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
-#: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:65
+#: src/gui/chatwindow.cpp:143 src/gui/inventorywindow.cpp:65
 #: src/gui/setup_other.cpp:69 src/gui/setup_visual.cpp:77
 msgid "default"
 msgstr "默认"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:144
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:145 src/gui/widgets/colormodel.cpp:76
 msgid "black"
 msgstr "黑色"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:146
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:147 src/gui/widgets/colormodel.cpp:78
 msgid "red"
 msgstr "红色"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:148
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:149 src/gui/widgets/colormodel.cpp:80
 msgid "green"
 msgstr "绿色"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:150
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:151 src/gui/widgets/colormodel.cpp:82
 msgid "blue"
 msgstr "蓝色"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:152
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:153 src/gui/widgets/colormodel.cpp:84
 msgid "gold"
 msgstr "金"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:154
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:155 src/gui/widgets/colormodel.cpp:86
 msgid "yellow"
 msgstr "黄色"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:156
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:157 src/gui/widgets/colormodel.cpp:88
 msgid "pink"
 msgstr "粉红色"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:158
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:159 src/gui/widgets/colormodel.cpp:90
 msgid "purple"
 msgstr "紫"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:160
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:161 src/gui/widgets/colormodel.cpp:92
 msgid "grey"
 msgstr "灰色"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:162
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:163 src/gui/widgets/colormodel.cpp:94
 msgid "brown"
 msgstr "棕色"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:164
+#: src/gui/chatwindow.cpp:165
 msgid "rainbow 1"
 msgstr "彩虹1"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:166
+#: src/gui/chatwindow.cpp:167
 msgid "rainbow 2"
 msgstr "彩虹2"
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:168
+#: src/gui/chatwindow.cpp:169
 msgid "rainbow 3"
 msgstr "彩虹3"
 
 #. TRANSLATORS: chat window name
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
-#: src/gui/chatwindow.cpp:195 src/gui/setupactiondata.h:1866
+#: src/gui/chatwindow.cpp:196 src/gui/setupactiondata.h:1866
 #: src/gui/setup_chat.cpp:50 src/gui/windowmenu.cpp:88
 msgid "Chat"
 msgstr "聊天"
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:659
+#: src/gui/chatwindow.cpp:684
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1066
+#: src/gui/chatwindow.cpp:1091
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "对%s密语到：%s"
@@ -1394,14 +1404,38 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
+#. TRANSLATORS: font size
+#: src/gui/emotewindow.cpp:49
+msgid "Normal font"
+msgstr ""
+
+#. TRANSLATORS: font size
+#. TRANSLATORS: theme settings label
+#: src/gui/emotewindow.cpp:51 src/gui/setup_theme.cpp:249
+msgid "Bold font"
+msgstr "加粗字体"
+
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/emotewindow.cpp:41 src/gui/emotewindow.cpp:61
+#: src/gui/emotewindow.cpp:56 src/gui/emotewindow.cpp:107
 #: src/gui/setupactiondata.h:1862
 msgid "Emotes"
 msgstr ""
 
+#. TRANSLATORS: emotes tab name
+#. TRANSLATORS: settings group
+#. TRANSLATORS: settings colors tab name
+#: src/gui/emotewindow.cpp:109 src/gui/setup_chat.cpp:70
+#: src/gui/setup_colors.cpp:83
+msgid "Colors"
+msgstr "颜色"
+
+#. TRANSLATORS: emotes tab name
+#: src/gui/emotewindow.cpp:111
+msgid "Fonts"
+msgstr ""
+
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/equipmentwindow.cpp:56 src/gui/inventorywindow.cpp:204
@@ -1493,7 +1527,7 @@ msgstr "取回"
 
 #. TRANSLATORS: status window label
 #: src/gui/inventorywindow.cpp:580 src/gui/statuswindow.cpp:143
-#: src/gui/statuswindow.cpp:284 src/gui/statuswindow.cpp:337
+#: src/gui/statuswindow.cpp:285 src/gui/statuswindow.cpp:338
 #: src/gui/widgets/characterdisplay.cpp:126
 #, c-format
 msgid "Money: %s"
@@ -1779,7 +1813,7 @@ msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:295
+#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:296
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "级别:%d (GM %d)"
@@ -1787,7 +1821,7 @@ msgstr "级别:%d (GM %d)"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/ministatuswindow.cpp:317 src/gui/statuswindow.cpp:141
-#: src/gui/statuswindow.cpp:302 src/gui/statuswindow.cpp:373
+#: src/gui/statuswindow.cpp:303 src/gui/statuswindow.cpp:374
 #, c-format
 msgid "Level: %d"
 msgstr "等级：%d"
@@ -1804,34 +1838,45 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:62
+#: src/gui/npcdialog.cpp:66
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:64
+#: src/gui/npcdialog.cpp:68
 msgid "Next"
 msgstr "下一个"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:68
+#: src/gui/npcdialog.cpp:72
 msgid "Submit"
 msgstr "提交"
 
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
 #. TRANSLATORS: settings group
-#: src/gui/npcdialog.cpp:77 src/gui/npcpostdialog.cpp:43
+#: src/gui/npcdialog.cpp:81 src/gui/npcpostdialog.cpp:43
 #: src/gui/setup_other.cpp:257
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:566
+#: src/gui/npcdialog.cpp:104 src/gui/popupmenu.cpp:566
 msgid "Clear"
 msgstr "清除"
 
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: trade window button
+#: src/gui/npcdialog.cpp:109 src/gui/serverdialog.cpp:266
+#: src/gui/shopwindow.cpp:95 src/gui/shopwindow.cpp:102
+#: src/gui/tradewindow.cpp:77
+msgid "Add"
+msgstr "添加"
+
 #. TRANSLATORS: label in npc post dialog
 #: src/gui/npcpostdialog.cpp:53
 msgid "To:"
@@ -2039,7 +2084,7 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: social window button
-#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1164
+#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1286
 msgid "Leave"
 msgstr "留下"
 
@@ -2173,7 +2218,7 @@ msgstr ""
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2194
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:985
 msgid "(default)"
 msgstr "(默认)"
 
@@ -2421,15 +2466,6 @@ msgid "Choose Your Server"
 msgstr "选择您的服务器"
 
 #. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:266 src/gui/shopwindow.cpp:95
-#: src/gui/shopwindow.cpp:102 src/gui/tradewindow.cpp:77
-msgid "Add"
-msgstr "添加"
-
-#. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
 #: src/gui/serverdialog.cpp:268 src/gui/widgets/setupitem.cpp:303
 #: src/gui/widgets/setupitem.cpp:430
@@ -3320,20 +3356,14 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:61
-msgid "Auto hide chat window."
+msgid "Auto hide chat window"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:65
-msgid "Protect chat focus."
+msgid "Protect chat focus"
 msgstr ""
 
-#. TRANSLATORS: settings group
-#. TRANSLATORS: settings colors tab name
-#: src/gui/setup_chat.cpp:70 src/gui/setup_colors.cpp:83
-msgid "Colors"
-msgstr "颜色"
-
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:73
 msgid "Remove colors from received chat messages"
@@ -4426,11 +4456,6 @@ msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:249
-msgid "Bold font"
-msgstr "加粗字体"
-
-#. TRANSLATORS: theme settings label
 #: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr "粒子字体"
@@ -4916,258 +4941,289 @@ msgstr "等级: %d"
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
-#: src/gui/socialwindow.cpp:158 src/gui/socialwindow.cpp:259
+#: src/gui/socialwindow.cpp:176 src/gui/socialwindow.cpp:309
 #: src/gui/widgets/guildchattab.cpp:42 src/net/ea/gui/guildtab.cpp:49
 msgid "Guild"
 msgstr "帮会"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "邀请用户%s加入公会%s"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:213
+#: src/gui/socialwindow.cpp:231
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "退出公会%s的请求。"
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:245
 msgid "Member Invite to Guild"
 msgstr "会员邀请到公会"
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:229
+#: src/gui/socialwindow.cpp:247
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "你要邀请谁加入工会%s?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:238
+#: src/gui/socialwindow.cpp:256
 msgid "Leave Guild?"
 msgstr "离开公会？"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:240
+#: src/gui/socialwindow.cpp:258
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "你确定要离开工会%s吗？"
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:269
+#, c-format
+msgid "Members: %u/%u"
+msgstr ""
+
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:291 src/gui/socialwindow.cpp:361
+#: src/gui/socialwindow.cpp:483
+#, c-format
+msgid "Players: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/socialwindow.cpp:302 src/net/ea/gui/partytab.cpp:49
+#: src/gui/socialwindow.cpp:376 src/net/ea/gui/partytab.cpp:49
 msgid "Party"
 msgstr "t"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:341
+#: src/gui/socialwindow.cpp:415
 #, c-format
 msgid "Invited user %s to party."
 msgstr "邀请用户%s加入团队."
 
 #. TRANSLATORS: tab in social window
-#: src/gui/socialwindow.cpp:356
+#: src/gui/socialwindow.cpp:430
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:370
+#: src/gui/socialwindow.cpp:444
 msgid "Member Invite to Party"
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:372
+#: src/gui/socialwindow.cpp:446
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:381
+#: src/gui/socialwindow.cpp:455
 msgid "Leave Party?"
 msgstr "离开团队?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:383
+#: src/gui/socialwindow.cpp:457
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:681
+#, c-format
+msgid "Visible players: %d"
+msgstr ""
+
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:605
+#: src/gui/socialwindow.cpp:707
 msgid "Nav"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:809
+#, c-format
+msgid "Portals: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:922
+#: src/gui/socialwindow.cpp:1035
 msgid "Atk"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:941
+#: src/gui/socialwindow.cpp:1054
 msgid "Priority mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:943
+#: src/gui/socialwindow.cpp:1056
 msgid "Attack mobs"
 msgstr "攻击暴徒"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:945
+#: src/gui/socialwindow.cpp:1058
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:968
+#: src/gui/socialwindow.cpp:1081
 msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:987
+#: src/gui/socialwindow.cpp:1100
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:989
+#: src/gui/socialwindow.cpp:1102
 msgid "Ignore items"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:1190
+#, c-format
+msgid "Friends: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1091 src/gui/socialwindow.cpp:1563
+#: src/gui/socialwindow.cpp:1213 src/gui/socialwindow.cpp:1687
 msgid "Create Party"
 msgstr "建立"
 
 #. TRANSLATORS: social window name
 #. TRANSLATORS: full button name
-#: src/gui/socialwindow.cpp:1138 src/gui/windowmenu.cpp:126
+#: src/gui/socialwindow.cpp:1260 src/gui/windowmenu.cpp:126
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1273
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1156
+#: src/gui/socialwindow.cpp:1278
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/socialwindow.cpp:1162
+#: src/gui/socialwindow.cpp:1284
 msgid "Invite"
 msgstr "邀请"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1345
+#: src/gui/socialwindow.cpp:1469
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "接受%s团队的邀请."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1356
+#: src/gui/socialwindow.cpp:1480
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "拒绝%s的团队邀请."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1497
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "已接受公会邀请来自%s."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "拒绝%s的公会邀请."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1424
+#: src/gui/socialwindow.cpp:1548
 #, c-format
 msgid "Creating guild called %s."
 msgstr "创建公会的名为%s"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1445
+#: src/gui/socialwindow.cpp:1569
 #, c-format
 msgid "Creating party called %s."
 msgstr "创建团队名字为%s的"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1460
+#: src/gui/socialwindow.cpp:1584
 msgid "Guild Name"
 msgstr "公会名称"
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1462
+#: src/gui/socialwindow.cpp:1586
 msgid "Choose your guild's name."
 msgstr "选择你的公会的名字."
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1477
+#: src/gui/socialwindow.cpp:1601
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1485
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s邀请你加入公会%s"
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1616
 msgid "Accept Guild Invite"
 msgstr "接受邀请"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1631
 msgid "Received party request, but one already exists."
 msgstr "接受到一个已经存在的帮会邀请。"
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1519
+#: src/gui/socialwindow.cpp:1643
 msgid "You have been invited you to join a party."
 msgstr "您已被邀请您加入党。"
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1524
+#: src/gui/socialwindow.cpp:1648
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "您已被邀请加入%s的团队。"
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1533
+#: src/gui/socialwindow.cpp:1657
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s已经邀请你加入他们的帮会。"
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1539
+#: src/gui/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s已经邀请你加入帮会%s。"
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1673
 msgid "Accept Party Invite"
 msgstr "接受帮会邀请"
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1688
 msgid "Cannot create party. You are already in a party"
 msgstr "无法建立团队.您已经在一个队伍中了"
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1694
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1572
+#: src/gui/socialwindow.cpp:1696
 msgid "Choose your party's name."
 msgstr "选择n的名称。"
 
@@ -5187,24 +5243,24 @@ msgid "MP:"
 msgstr "MP："
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:235 src/gui/statuswindow.cpp:423
+#: src/gui/statuswindow.cpp:234 src/gui/statuswindow.cpp:424
 #, c-format
 msgid "Job: %d"
 msgstr "职业：%d"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:237
+#: src/gui/statuswindow.cpp:236
 msgid "Job:"
 msgstr "职业："
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:288 src/gui/statuswindow.cpp:345
+#: src/gui/statuswindow.cpp:289 src/gui/statuswindow.cpp:346
 #, c-format
 msgid "Character points: %d"
 msgstr "角色可用点: %d"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:360
+#: src/gui/statuswindow.cpp:361
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
@@ -5649,13 +5705,13 @@ msgid "%s whispers: %s"
 msgstr "%s私语:%s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:540
+#: src/gui/widgets/chattab.cpp:541
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:545
+#: src/gui/widgets/chattab.cpp:546
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -5940,24 +5996,24 @@ msgstr "选择世界"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/inputmanager.cpp:328 src/inputmanager.cpp:372 src/keyboardconfig.cpp:90
+#: src/inputmanager.cpp:329 src/inputmanager.cpp:373 src/keyboardconfig.cpp:90
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/inputmanager.cpp:334
+#: src/inputmanager.cpp:335
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/inputmanager.cpp:348
+#: src/inputmanager.cpp:349
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/inputmanager.cpp:378
+#: src/inputmanager.cpp:379
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -5965,7 +6021,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/inputmanager.cpp:392 src/keyboardconfig.cpp:103
+#: src/inputmanager.cpp:393 src/keyboardconfig.cpp:134
 msgid "u key"
 msgstr ""
 
@@ -6640,55 +6696,55 @@ msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:176
+#: src/net/ea/guildhandler.cpp:178
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:179
+#: src/net/ea/guildhandler.cpp:181
 #, c-format
 msgid "Guild master: %s"
 msgstr "工会会长: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild level: %d"
 msgstr "工会等级: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:186
 #, c-format
 msgid "Online members: %d"
 msgstr "在线玩家: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:187
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Max members: %d"
 msgstr "最大成员: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Average level: %d"
 msgstr "平均等级: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:193
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Guild exp: %d"
 msgstr "工会经验值: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:195
+#: src/net/ea/guildhandler.cpp:197
 #, c-format
 msgid "Guild next exp: %d"
 msgstr "工会下一级所需经验: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:198
+#: src/net/ea/guildhandler.cpp:200
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 97447c010..42081d6b4 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-07-19 22:23+0300\n"
-"PO-Revision-Date: 2013-07-19 19:52+0000\n"
+"POT-Creation-Date: 2013-08-16 20:45+0300\n"
+"PO-Revision-Date: 2013-08-16 17:53+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/manaplus/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -38,21 +38,21 @@ msgstr ""
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1606 src/gui/whoisonline.cpp:835
+#: src/being.cpp:1713 src/gui/whoisonline.cpp:842
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1611 src/gui/whoisonline.cpp:840
+#: src/being.cpp:1718 src/gui/whoisonline.cpp:847
 msgid "I"
 msgstr ""
 
@@ -89,8 +89,8 @@ msgstr ""
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:1176 src/gui/didyouknowwindow.cpp:78
-#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:66
-#: src/gui/npcdialog.cpp:103 src/gui/popupmenu.cpp:562
+#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:70
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:562
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:81
 msgid "Close"
 msgstr "關閉"
@@ -425,36 +425,36 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:465
+#: src/game.cpp:259 src/gui/widgets/chattab.cpp:466
 msgid "General"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: debug window name
 #. TRANSLATORS: full button name
-#: src/game.cpp:272 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:467
+#: src/game.cpp:275 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:468
 #: src/gui/windowmenu.cpp:154
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:536
+#: src/game.cpp:540
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:546
+#: src/game.cpp:550
 msgid "Saving screenshot failed!"
 msgstr ""
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:618
+#: src/game.cpp:622
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:621
+#: src/game.cpp:625
 msgid "Network Error"
 msgstr ""
 
@@ -489,7 +489,7 @@ msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:105
+#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:111
 msgid "Reset"
 msgstr ""
 
@@ -590,7 +590,7 @@ msgstr "購買"
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
 #: src/gui/buydialog.cpp:251 src/gui/buydialog.cpp:531
-#: src/gui/selldialog.cpp:96 src/gui/selldialog.cpp:356
+#: src/gui/selldialog.cpp:97 src/gui/selldialog.cpp:357
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
@@ -607,8 +607,8 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/buydialog.cpp:265 src/gui/itemamountwindow.cpp:202
-#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:96
-#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:790
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:100
+#: src/gui/selldialog.cpp:101 src/gui/statuswindow.cpp:791
 msgid "+"
 msgstr ""
 
@@ -619,8 +619,8 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
 #: src/gui/buydialog.cpp:268 src/gui/itemamountwindow.cpp:200
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:98
-#: src/gui/selldialog.cpp:102 src/gui/statuswindow.cpp:803
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:102
+#: src/gui/selldialog.cpp:103 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr ""
 
@@ -628,7 +628,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/buydialog.cpp:271 src/gui/charcreatedialog.cpp:122
-#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1160
+#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1282
 msgid "Create"
 msgstr "創造"
 
@@ -640,7 +640,7 @@ msgstr "創造"
 #. TRANSLATORS: input action name
 #: src/gui/buydialog.cpp:273 src/gui/quitdialog.cpp:55
 #: src/gui/quitdialog.cpp:60 src/gui/quitdialog.cpp:62
-#: src/gui/selldialog.cpp:106 src/gui/serverdialog.cpp:262
+#: src/gui/selldialog.cpp:107 src/gui/serverdialog.cpp:262
 #: src/gui/setupactiondata.h:177
 msgid "Quit"
 msgstr "離開"
@@ -650,9 +650,9 @@ msgstr "離開"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:108
-#: src/gui/statuswindow.cpp:531 src/gui/statuswindow.cpp:586
-#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:821
+#: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:109
+#: src/gui/statuswindow.cpp:532 src/gui/statuswindow.cpp:587
+#: src/gui/statuswindow.cpp:788 src/gui/statuswindow.cpp:822
 msgid "Max"
 msgstr ""
 
@@ -672,7 +672,7 @@ msgstr "商店"
 #. TRANSLATORS: sell dialog button
 #: src/gui/buyselldialog.cpp:69 src/gui/popupmenu.cpp:223
 #: src/gui/popupmenu.cpp:2455 src/gui/selldialog.cpp:54
-#: src/gui/selldialog.cpp:64 src/gui/selldialog.cpp:104
+#: src/gui/selldialog.cpp:64 src/gui/selldialog.cpp:105
 msgid "Sell"
 msgstr "出售"
 
@@ -712,7 +712,7 @@ msgstr "出售"
 #: src/gui/popupmenu.cpp:2309 src/gui/popupmenu.cpp:2543
 #: src/gui/popupmenu.cpp:2660 src/gui/quitdialog.cpp:73
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
-#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1094
+#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1216
 #: src/gui/textcommandeditor.cpp:211 src/gui/textdialog.cpp:53
 #: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:181
 msgid "Cancel"
@@ -996,92 +996,102 @@ msgstr ""
 #. TRANSLATORS: inventory sort mode
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
-#: src/gui/chatwindow.cpp:139 src/gui/inventorywindow.cpp:65
+#: src/gui/chatwindow.cpp:143 src/gui/inventorywindow.cpp:65
 #: src/gui/setup_other.cpp:69 src/gui/setup_visual.cpp:77
 msgid "default"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:141
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:145 src/gui/widgets/colormodel.cpp:76
 msgid "black"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:143
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:147 src/gui/widgets/colormodel.cpp:78
 msgid "red"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:145
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:149 src/gui/widgets/colormodel.cpp:80
 msgid "green"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:147
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:151 src/gui/widgets/colormodel.cpp:82
 msgid "blue"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:149
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:153 src/gui/widgets/colormodel.cpp:84
 msgid "gold"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:151
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:155 src/gui/widgets/colormodel.cpp:86
 msgid "yellow"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:153
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:157 src/gui/widgets/colormodel.cpp:88
 msgid "pink"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:155
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:159 src/gui/widgets/colormodel.cpp:90
 msgid "purple"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:157
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:161 src/gui/widgets/colormodel.cpp:92
 msgid "grey"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:159
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:163 src/gui/widgets/colormodel.cpp:94
 msgid "brown"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:161
+#: src/gui/chatwindow.cpp:165
 msgid "rainbow 1"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:163
+#: src/gui/chatwindow.cpp:167
 msgid "rainbow 2"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:165
+#: src/gui/chatwindow.cpp:169
 msgid "rainbow 3"
 msgstr ""
 
 #. TRANSLATORS: chat window name
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
-#: src/gui/chatwindow.cpp:192 src/gui/setupactiondata.h:1866
+#: src/gui/chatwindow.cpp:196 src/gui/setupactiondata.h:1866
 #: src/gui/setup_chat.cpp:50 src/gui/windowmenu.cpp:88
 msgid "Chat"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:641
+#: src/gui/chatwindow.cpp:684
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1044
+#: src/gui/chatwindow.cpp:1091
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "對%s竊竊私語：%s"
@@ -1390,6 +1400,38 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
+#. TRANSLATORS: font size
+#: src/gui/emotewindow.cpp:49
+msgid "Normal font"
+msgstr ""
+
+#. TRANSLATORS: font size
+#. TRANSLATORS: theme settings label
+#: src/gui/emotewindow.cpp:51 src/gui/setup_theme.cpp:249
+msgid "Bold font"
+msgstr ""
+
+#. TRANSLATORS: emotes window name
+#. TRANSLATORS: emotes tab name
+#. TRANSLATORS: input tab sub tab name
+#: src/gui/emotewindow.cpp:56 src/gui/emotewindow.cpp:107
+#: src/gui/setupactiondata.h:1862
+msgid "Emotes"
+msgstr ""
+
+#. TRANSLATORS: emotes tab name
+#. TRANSLATORS: settings group
+#. TRANSLATORS: settings colors tab name
+#: src/gui/emotewindow.cpp:109 src/gui/setup_chat.cpp:70
+#: src/gui/setup_colors.cpp:83
+msgid "Colors"
+msgstr ""
+
+#. TRANSLATORS: emotes tab name
+#: src/gui/emotewindow.cpp:111
+msgid "Fonts"
+msgstr ""
+
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/equipmentwindow.cpp:56 src/gui/inventorywindow.cpp:204
@@ -1481,7 +1523,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/inventorywindow.cpp:580 src/gui/statuswindow.cpp:143
-#: src/gui/statuswindow.cpp:284 src/gui/statuswindow.cpp:337
+#: src/gui/statuswindow.cpp:285 src/gui/statuswindow.cpp:338
 #: src/gui/widgets/characterdisplay.cpp:126
 #, c-format
 msgid "Money: %s"
@@ -1767,7 +1809,7 @@ msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:295
+#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:296
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
@@ -1775,7 +1817,7 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/ministatuswindow.cpp:317 src/gui/statuswindow.cpp:141
-#: src/gui/statuswindow.cpp:302 src/gui/statuswindow.cpp:373
+#: src/gui/statuswindow.cpp:303 src/gui/statuswindow.cpp:374
 #, c-format
 msgid "Level: %d"
 msgstr "等級：%d"
@@ -1792,34 +1834,45 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:62
+#: src/gui/npcdialog.cpp:66
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:64
+#: src/gui/npcdialog.cpp:68
 msgid "Next"
 msgstr "下一個"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:68
+#: src/gui/npcdialog.cpp:72
 msgid "Submit"
 msgstr ""
 
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
 #. TRANSLATORS: settings group
-#: src/gui/npcdialog.cpp:77 src/gui/npcpostdialog.cpp:43
+#: src/gui/npcdialog.cpp:81 src/gui/npcpostdialog.cpp:43
 #: src/gui/setup_other.cpp:257
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:566
+#: src/gui/npcdialog.cpp:104 src/gui/popupmenu.cpp:566
 msgid "Clear"
 msgstr ""
 
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: trade window button
+#: src/gui/npcdialog.cpp:109 src/gui/serverdialog.cpp:266
+#: src/gui/shopwindow.cpp:95 src/gui/shopwindow.cpp:102
+#: src/gui/tradewindow.cpp:77
+msgid "Add"
+msgstr "增加"
+
 #. TRANSLATORS: label in npc post dialog
 #: src/gui/npcpostdialog.cpp:53
 msgid "To:"
@@ -2027,7 +2080,7 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: social window button
-#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1164
+#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1286
 msgid "Leave"
 msgstr ""
 
@@ -2161,7 +2214,7 @@ msgstr ""
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2194
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:985
 msgid "(default)"
 msgstr ""
 
@@ -2393,12 +2446,12 @@ msgid "Passwords do not match."
 msgstr "密碼不一樣."
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/selldialog.cpp:242
+#: src/gui/selldialog.cpp:243
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/selldialog.cpp:244
+#: src/gui/selldialog.cpp:245
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
@@ -2409,15 +2462,6 @@ msgid "Choose Your Server"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:266 src/gui/shopwindow.cpp:95
-#: src/gui/shopwindow.cpp:102 src/gui/tradewindow.cpp:77
-msgid "Add"
-msgstr "增加"
-
-#. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
 #: src/gui/serverdialog.cpp:268 src/gui/widgets/setupitem.cpp:303
 #: src/gui/widgets/setupitem.cpp:430
@@ -3153,11 +3197,6 @@ msgid "Windows"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1862
-msgid "Emotes"
-msgstr ""
-
-#. TRANSLATORS: input tab sub tab name
 #: src/gui/setupactiondata.h:1870
 msgid "Gui"
 msgstr ""
@@ -3313,18 +3352,12 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:61
-msgid "Auto hide chat window."
+msgid "Auto hide chat window"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:65
-msgid "Protect chat focus."
-msgstr ""
-
-#. TRANSLATORS: settings group
-#. TRANSLATORS: settings colors tab name
-#: src/gui/setup_chat.cpp:70 src/gui/setup_colors.cpp:83
-msgid "Colors"
+msgid "Protect chat focus"
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4419,11 +4452,6 @@ msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:249
-msgid "Bold font"
-msgstr ""
-
-#. TRANSLATORS: theme settings label
 #: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr ""
@@ -4909,258 +4937,289 @@ msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
-#: src/gui/socialwindow.cpp:158 src/gui/socialwindow.cpp:259
+#: src/gui/socialwindow.cpp:176 src/gui/socialwindow.cpp:309
 #: src/gui/widgets/guildchattab.cpp:42 src/net/ea/gui/guildtab.cpp:49
 msgid "Guild"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:213
+#: src/gui/socialwindow.cpp:231
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:245
 msgid "Member Invite to Guild"
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:229
+#: src/gui/socialwindow.cpp:247
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:238
+#: src/gui/socialwindow.cpp:256
 msgid "Leave Guild?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:240
+#: src/gui/socialwindow.cpp:258
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:269
+#, c-format
+msgid "Members: %u/%u"
+msgstr ""
+
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:291 src/gui/socialwindow.cpp:361
+#: src/gui/socialwindow.cpp:483
+#, c-format
+msgid "Players: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/socialwindow.cpp:302 src/net/ea/gui/partytab.cpp:49
+#: src/gui/socialwindow.cpp:376 src/net/ea/gui/partytab.cpp:49
 msgid "Party"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:341
+#: src/gui/socialwindow.cpp:415
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
 #. TRANSLATORS: tab in social window
-#: src/gui/socialwindow.cpp:356
+#: src/gui/socialwindow.cpp:430
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:370
+#: src/gui/socialwindow.cpp:444
 msgid "Member Invite to Party"
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:372
+#: src/gui/socialwindow.cpp:446
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:381
+#: src/gui/socialwindow.cpp:455
 msgid "Leave Party?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:383
+#: src/gui/socialwindow.cpp:457
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:681
+#, c-format
+msgid "Visible players: %d"
+msgstr ""
+
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:605
+#: src/gui/socialwindow.cpp:707
 msgid "Nav"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:809
+#, c-format
+msgid "Portals: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:922
+#: src/gui/socialwindow.cpp:1035
 msgid "Atk"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:941
+#: src/gui/socialwindow.cpp:1054
 msgid "Priority mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:943
+#: src/gui/socialwindow.cpp:1056
 msgid "Attack mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:945
+#: src/gui/socialwindow.cpp:1058
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:968
+#: src/gui/socialwindow.cpp:1081
 msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:987
+#: src/gui/socialwindow.cpp:1100
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:989
+#: src/gui/socialwindow.cpp:1102
 msgid "Ignore items"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:1190
+#, c-format
+msgid "Friends: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1091 src/gui/socialwindow.cpp:1563
+#: src/gui/socialwindow.cpp:1213 src/gui/socialwindow.cpp:1687
 msgid "Create Party"
 msgstr ""
 
 #. TRANSLATORS: social window name
 #. TRANSLATORS: full button name
-#: src/gui/socialwindow.cpp:1138 src/gui/windowmenu.cpp:126
+#: src/gui/socialwindow.cpp:1260 src/gui/windowmenu.cpp:126
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1273
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1156
+#: src/gui/socialwindow.cpp:1278
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/socialwindow.cpp:1162
+#: src/gui/socialwindow.cpp:1284
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1345
+#: src/gui/socialwindow.cpp:1469
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1356
+#: src/gui/socialwindow.cpp:1480
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1497
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1424
+#: src/gui/socialwindow.cpp:1548
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1445
+#: src/gui/socialwindow.cpp:1569
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1460
+#: src/gui/socialwindow.cpp:1584
 msgid "Guild Name"
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1462
+#: src/gui/socialwindow.cpp:1586
 msgid "Choose your guild's name."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1477
+#: src/gui/socialwindow.cpp:1601
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1485
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1616
 msgid "Accept Guild Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1631
 msgid "Received party request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1519
+#: src/gui/socialwindow.cpp:1643
 msgid "You have been invited you to join a party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1524
+#: src/gui/socialwindow.cpp:1648
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1533
+#: src/gui/socialwindow.cpp:1657
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1539
+#: src/gui/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1673
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1688
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1694
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1572
+#: src/gui/socialwindow.cpp:1696
 msgid "Choose your party's name."
 msgstr ""
 
@@ -5180,24 +5239,24 @@ msgid "MP:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:235 src/gui/statuswindow.cpp:423
+#: src/gui/statuswindow.cpp:234 src/gui/statuswindow.cpp:424
 #, c-format
 msgid "Job: %d"
 msgstr "職業：%d"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:237
+#: src/gui/statuswindow.cpp:236
 msgid "Job:"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:288 src/gui/statuswindow.cpp:345
+#: src/gui/statuswindow.cpp:289 src/gui/statuswindow.cpp:346
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:360
+#: src/gui/statuswindow.cpp:361
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
@@ -5643,13 +5702,13 @@ msgid "%s whispers: %s"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:540
+#: src/gui/widgets/chattab.cpp:541
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:545
+#: src/gui/widgets/chattab.cpp:546
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -5935,24 +5994,24 @@ msgstr ""
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/inputmanager.cpp:328 src/inputmanager.cpp:372 src/keyboardconfig.cpp:90
+#: src/inputmanager.cpp:329 src/inputmanager.cpp:373 src/keyboardconfig.cpp:90
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/inputmanager.cpp:334
+#: src/inputmanager.cpp:335
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/inputmanager.cpp:348
+#: src/inputmanager.cpp:349
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/inputmanager.cpp:378
+#: src/inputmanager.cpp:379
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -5960,7 +6019,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/inputmanager.cpp:392 src/keyboardconfig.cpp:103
+#: src/inputmanager.cpp:393 src/keyboardconfig.cpp:134
 msgid "u key"
 msgstr ""
 
@@ -6635,55 +6694,55 @@ msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:176
+#: src/net/ea/guildhandler.cpp:178
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:179
+#: src/net/ea/guildhandler.cpp:181
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:186
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:187
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:193
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:195
+#: src/net/ea/guildhandler.cpp:197
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:198
+#: src/net/ea/guildhandler.cpp:200
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
@@ -7558,8 +7617,8 @@ msgstr ""
 #. TRANSLATORS: being info default name
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
-#: src/resources/avatardb.cpp:69 src/resources/beinginfo.cpp:40
-#: src/resources/itemdb.cpp:291 src/resources/monsterdb.cpp:100
+#: src/resources/avatardb.cpp:69 src/resources/beinginfo.cpp:41
+#: src/resources/itemdb.cpp:295 src/resources/monsterdb.cpp:100
 msgid "unnamed"
 msgstr ""
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index c38cf31de..fb4d3604a 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2013-07-19 22:23+0300\n"
-"PO-Revision-Date: 2013-07-19 19:52+0000\n"
+"POT-Creation-Date: 2013-08-16 20:45+0300\n"
+"PO-Revision-Date: 2013-08-16 17:53+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/manaplus/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -38,21 +38,21 @@ msgstr ""
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:489
+#: src/being.cpp:492
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1606 src/gui/whoisonline.cpp:835
+#: src/being.cpp:1713 src/gui/whoisonline.cpp:842
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1611 src/gui/whoisonline.cpp:840
+#: src/being.cpp:1718 src/gui/whoisonline.cpp:847
 msgid "I"
 msgstr ""
 
@@ -89,8 +89,8 @@ msgstr ""
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
 #: src/client.cpp:1176 src/gui/didyouknowwindow.cpp:78
-#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:66
-#: src/gui/npcdialog.cpp:103 src/gui/popupmenu.cpp:562
+#: src/gui/inventorywindow.cpp:231 src/gui/npcdialog.cpp:70
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:562
 #: src/gui/questswindow.cpp:138 src/gui/shopwindow.cpp:81
 msgid "Close"
 msgstr "關閉"
@@ -425,36 +425,36 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "/%s 的選項可以是 \"yes\"、\"no\"、\"true\"、\"false\"、\"1\"、\"0\"。"
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:465
+#: src/game.cpp:259 src/gui/widgets/chattab.cpp:466
 msgid "General"
 msgstr "一般"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: debug window name
 #. TRANSLATORS: full button name
-#: src/game.cpp:272 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:467
+#: src/game.cpp:275 src/gui/debugwindow.cpp:51 src/gui/widgets/chattab.cpp:468
 #: src/gui/windowmenu.cpp:154
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:536
+#: src/game.cpp:540
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:546
+#: src/game.cpp:550
 msgid "Saving screenshot failed!"
 msgstr "儲存抓圖失敗!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:618
+#: src/game.cpp:622
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:621
+#: src/game.cpp:625
 msgid "Network Error"
 msgstr "網路錯誤"
 
@@ -489,7 +489,7 @@ msgstr ""
 
 #. TRANSLATORS: bot checker window button
 #. TRANSLATORS: npc dialog button
-#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:105
+#: src/gui/botcheckerwindow.cpp:278 src/gui/npcdialog.cpp:111
 msgid "Reset"
 msgstr "重設"
 
@@ -590,7 +590,7 @@ msgstr "購買"
 #. TRANSLATORS: buy dialog label
 #. TRANSLATORS: sell dialog label
 #: src/gui/buydialog.cpp:251 src/gui/buydialog.cpp:531
-#: src/gui/selldialog.cpp:96 src/gui/selldialog.cpp:356
+#: src/gui/selldialog.cpp:97 src/gui/selldialog.cpp:357
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "價格: %s / 總共: %s"
@@ -607,8 +607,8 @@ msgstr ""
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/buydialog.cpp:265 src/gui/itemamountwindow.cpp:202
-#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:96
-#: src/gui/selldialog.cpp:100 src/gui/statuswindow.cpp:790
+#: src/gui/itemamountwindow.cpp:237 src/gui/npcdialog.cpp:100
+#: src/gui/selldialog.cpp:101 src/gui/statuswindow.cpp:791
 msgid "+"
 msgstr "增加"
 
@@ -619,8 +619,8 @@ msgstr "增加"
 #. TRANSLATORS: sell dialog button
 #. TRANSLATORS: status window label (minus sign)
 #: src/gui/buydialog.cpp:268 src/gui/itemamountwindow.cpp:200
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:98
-#: src/gui/selldialog.cpp:102 src/gui/statuswindow.cpp:803
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:102
+#: src/gui/selldialog.cpp:103 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr "減少"
 
@@ -628,7 +628,7 @@ msgstr "減少"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/buydialog.cpp:271 src/gui/charcreatedialog.cpp:122
-#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1160
+#: src/gui/charselectdialog.cpp:584 src/gui/socialwindow.cpp:1282
 msgid "Create"
 msgstr "創造"
 
@@ -640,7 +640,7 @@ msgstr "創造"
 #. TRANSLATORS: input action name
 #: src/gui/buydialog.cpp:273 src/gui/quitdialog.cpp:55
 #: src/gui/quitdialog.cpp:60 src/gui/quitdialog.cpp:62
-#: src/gui/selldialog.cpp:106 src/gui/serverdialog.cpp:262
+#: src/gui/selldialog.cpp:107 src/gui/serverdialog.cpp:262
 #: src/gui/setupactiondata.h:177
 msgid "Quit"
 msgstr "離開"
@@ -650,9 +650,9 @@ msgstr "離開"
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #. TRANSLATORS: status bar label
-#: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:108
-#: src/gui/statuswindow.cpp:531 src/gui/statuswindow.cpp:586
-#: src/gui/statuswindow.cpp:787 src/gui/statuswindow.cpp:821
+#: src/gui/buydialog.cpp:275 src/gui/selldialog.cpp:109
+#: src/gui/statuswindow.cpp:532 src/gui/statuswindow.cpp:587
+#: src/gui/statuswindow.cpp:788 src/gui/statuswindow.cpp:822
 msgid "Max"
 msgstr "最大"
 
@@ -672,7 +672,7 @@ msgstr "商店"
 #. TRANSLATORS: sell dialog button
 #: src/gui/buyselldialog.cpp:69 src/gui/popupmenu.cpp:223
 #: src/gui/popupmenu.cpp:2455 src/gui/selldialog.cpp:54
-#: src/gui/selldialog.cpp:64 src/gui/selldialog.cpp:104
+#: src/gui/selldialog.cpp:64 src/gui/selldialog.cpp:105
 msgid "Sell"
 msgstr "出售"
 
@@ -712,7 +712,7 @@ msgstr "出售"
 #: src/gui/popupmenu.cpp:2309 src/gui/popupmenu.cpp:2543
 #: src/gui/popupmenu.cpp:2660 src/gui/quitdialog.cpp:73
 #: src/gui/registerdialog.cpp:78 src/gui/setupactiondata.h:1797
-#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1094
+#: src/gui/setup.cpp:85 src/gui/socialwindow.cpp:1216
 #: src/gui/textcommandeditor.cpp:211 src/gui/textdialog.cpp:53
 #: src/gui/unregisterdialog.cpp:55 src/gui/updaterwindow.cpp:181
 msgid "Cancel"
@@ -996,92 +996,102 @@ msgstr ""
 #. TRANSLATORS: inventory sort mode
 #. TRANSLATORS: screen density type
 #. TRANSLATORS: vsync type
-#: src/gui/chatwindow.cpp:139 src/gui/inventorywindow.cpp:65
+#: src/gui/chatwindow.cpp:143 src/gui/inventorywindow.cpp:65
 #: src/gui/setup_other.cpp:69 src/gui/setup_visual.cpp:77
 msgid "default"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:141
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:145 src/gui/widgets/colormodel.cpp:76
 msgid "black"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:143
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:147 src/gui/widgets/colormodel.cpp:78
 msgid "red"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:145
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:149 src/gui/widgets/colormodel.cpp:80
 msgid "green"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:147
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:151 src/gui/widgets/colormodel.cpp:82
 msgid "blue"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:149
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:153 src/gui/widgets/colormodel.cpp:84
 msgid "gold"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:151
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:155 src/gui/widgets/colormodel.cpp:86
 msgid "yellow"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:153
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:157 src/gui/widgets/colormodel.cpp:88
 msgid "pink"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:155
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:159 src/gui/widgets/colormodel.cpp:90
 msgid "purple"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:157
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:161 src/gui/widgets/colormodel.cpp:92
 msgid "grey"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:159
+#. TRANSLATORS: color name
+#: src/gui/chatwindow.cpp:163 src/gui/widgets/colormodel.cpp:94
 msgid "brown"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:161
+#: src/gui/chatwindow.cpp:165
 msgid "rainbow 1"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:163
+#: src/gui/chatwindow.cpp:167
 msgid "rainbow 2"
 msgstr ""
 
 #. TRANSLATORS: chat color
-#: src/gui/chatwindow.cpp:165
+#: src/gui/chatwindow.cpp:169
 msgid "rainbow 3"
 msgstr ""
 
 #. TRANSLATORS: chat window name
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings tab name
-#: src/gui/chatwindow.cpp:192 src/gui/setupactiondata.h:1866
+#: src/gui/chatwindow.cpp:196 src/gui/setupactiondata.h:1866
 #: src/gui/setup_chat.cpp:50 src/gui/windowmenu.cpp:88
 msgid "Chat"
 msgstr "聊天"
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:641
+#: src/gui/chatwindow.cpp:684
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/chatwindow.cpp:1044
+#: src/gui/chatwindow.cpp:1091
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "對%s竊竊私語：%s"
@@ -1390,6 +1400,38 @@ msgstr ""
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
+#. TRANSLATORS: font size
+#: src/gui/emotewindow.cpp:49
+msgid "Normal font"
+msgstr ""
+
+#. TRANSLATORS: font size
+#. TRANSLATORS: theme settings label
+#: src/gui/emotewindow.cpp:51 src/gui/setup_theme.cpp:249
+msgid "Bold font"
+msgstr ""
+
+#. TRANSLATORS: emotes window name
+#. TRANSLATORS: emotes tab name
+#. TRANSLATORS: input tab sub tab name
+#: src/gui/emotewindow.cpp:56 src/gui/emotewindow.cpp:107
+#: src/gui/setupactiondata.h:1862
+msgid "Emotes"
+msgstr ""
+
+#. TRANSLATORS: emotes tab name
+#. TRANSLATORS: settings group
+#. TRANSLATORS: settings colors tab name
+#: src/gui/emotewindow.cpp:109 src/gui/setup_chat.cpp:70
+#: src/gui/setup_colors.cpp:83
+msgid "Colors"
+msgstr "顏色"
+
+#. TRANSLATORS: emotes tab name
+#: src/gui/emotewindow.cpp:111
+msgid "Fonts"
+msgstr ""
+
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/equipmentwindow.cpp:56 src/gui/inventorywindow.cpp:204
@@ -1481,7 +1523,7 @@ msgstr "取回"
 
 #. TRANSLATORS: status window label
 #: src/gui/inventorywindow.cpp:580 src/gui/statuswindow.cpp:143
-#: src/gui/statuswindow.cpp:284 src/gui/statuswindow.cpp:337
+#: src/gui/statuswindow.cpp:285 src/gui/statuswindow.cpp:338
 #: src/gui/widgets/characterdisplay.cpp:126
 #, c-format
 msgid "Money: %s"
@@ -1767,7 +1809,7 @@ msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:295
+#: src/gui/ministatuswindow.cpp:310 src/gui/statuswindow.cpp:296
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
@@ -1775,7 +1817,7 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
 #: src/gui/ministatuswindow.cpp:317 src/gui/statuswindow.cpp:141
-#: src/gui/statuswindow.cpp:302 src/gui/statuswindow.cpp:373
+#: src/gui/statuswindow.cpp:303 src/gui/statuswindow.cpp:374
 #, c-format
 msgid "Level: %d"
 msgstr "等級：%d"
@@ -1792,34 +1834,45 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:62
+#: src/gui/npcdialog.cpp:66
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:64
+#: src/gui/npcdialog.cpp:68
 msgid "Next"
 msgstr "下一個"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/npcdialog.cpp:68
+#: src/gui/npcdialog.cpp:72
 msgid "Submit"
 msgstr "確認"
 
 #. TRANSLATORS: npc dialog name
 #. TRANSLATORS: npc post dialog caption
 #. TRANSLATORS: settings group
-#: src/gui/npcdialog.cpp:77 src/gui/npcpostdialog.cpp:43
+#: src/gui/npcdialog.cpp:81 src/gui/npcpostdialog.cpp:43
 #: src/gui/setup_other.cpp:257
 msgid "NPC"
 msgstr "NPC"
 
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: popup menu item
-#: src/gui/npcdialog.cpp:100 src/gui/popupmenu.cpp:566
+#: src/gui/npcdialog.cpp:104 src/gui/popupmenu.cpp:566
 msgid "Clear"
 msgstr ""
 
+#. TRANSLATORS: npc dialog button
+#. TRANSLATORS: servers dialog button
+#. TRANSLATORS: shop window label
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: trade window button
+#: src/gui/npcdialog.cpp:109 src/gui/serverdialog.cpp:266
+#: src/gui/shopwindow.cpp:95 src/gui/shopwindow.cpp:102
+#: src/gui/tradewindow.cpp:77
+msgid "Add"
+msgstr "增加"
+
 #. TRANSLATORS: label in npc post dialog
 #: src/gui/npcpostdialog.cpp:53
 msgid "To:"
@@ -2027,7 +2080,7 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: social window button
-#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1164
+#: src/gui/popupmenu.cpp:603 src/gui/socialwindow.cpp:1286
 msgid "Leave"
 msgstr ""
 
@@ -2161,7 +2214,7 @@ msgstr ""
 #. TRANSLATORS: language
 #: src/gui/popupmenu.cpp:2123 src/gui/popupmenu.cpp:2194
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:149
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:985
 msgid "(default)"
 msgstr ""
 
@@ -2393,12 +2446,12 @@ msgid "Passwords do not match."
 msgstr "密碼不一樣."
 
 #. TRANSLATORS: sell confirmation header
-#: src/gui/selldialog.cpp:242
+#: src/gui/selldialog.cpp:243
 msgid "sell item"
 msgstr ""
 
 #. TRANSLATORS: sell confirmation message
-#: src/gui/selldialog.cpp:244
+#: src/gui/selldialog.cpp:245
 #, c-format
 msgid "Do you really want to sell %s?"
 msgstr ""
@@ -2409,15 +2462,6 @@ msgid "Choose Your Server"
 msgstr ""
 
 #. TRANSLATORS: servers dialog button
-#. TRANSLATORS: shop window label
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: trade window button
-#: src/gui/serverdialog.cpp:266 src/gui/shopwindow.cpp:95
-#: src/gui/shopwindow.cpp:102 src/gui/tradewindow.cpp:77
-msgid "Add"
-msgstr "增加"
-
-#. TRANSLATORS: servers dialog button
 #. TRANSLATORS: setup item button
 #: src/gui/serverdialog.cpp:268 src/gui/widgets/setupitem.cpp:303
 #: src/gui/widgets/setupitem.cpp:430
@@ -3153,11 +3197,6 @@ msgid "Windows"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1862
-msgid "Emotes"
-msgstr ""
-
-#. TRANSLATORS: input tab sub tab name
 #: src/gui/setupactiondata.h:1870
 msgid "Gui"
 msgstr ""
@@ -3313,20 +3352,14 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:61
-msgid "Auto hide chat window."
+msgid "Auto hide chat window"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:65
-msgid "Protect chat focus."
+msgid "Protect chat focus"
 msgstr ""
 
-#. TRANSLATORS: settings group
-#. TRANSLATORS: settings colors tab name
-#: src/gui/setup_chat.cpp:70 src/gui/setup_colors.cpp:83
-msgid "Colors"
-msgstr "顏色"
-
 #. TRANSLATORS: settings option
 #: src/gui/setup_chat.cpp:73
 msgid "Remove colors from received chat messages"
@@ -4419,11 +4452,6 @@ msgid "Language"
 msgstr ""
 
 #. TRANSLATORS: theme settings label
-#: src/gui/setup_theme.cpp:249
-msgid "Bold font"
-msgstr ""
-
-#. TRANSLATORS: theme settings label
 #: src/gui/setup_theme.cpp:253
 msgid "Particle font"
 msgstr ""
@@ -4909,258 +4937,289 @@ msgstr ""
 
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: guild chat tab name
-#: src/gui/socialwindow.cpp:158 src/gui/socialwindow.cpp:259
+#: src/gui/socialwindow.cpp:176 src/gui/socialwindow.cpp:309
 #: src/gui/widgets/guildchattab.cpp:42 src/net/ea/gui/guildtab.cpp:49
 msgid "Guild"
 msgstr "公會"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:213
+#: src/gui/socialwindow.cpp:231
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:245
 msgid "Member Invite to Guild"
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:229
+#: src/gui/socialwindow.cpp:247
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:238
+#: src/gui/socialwindow.cpp:256
 msgid "Leave Guild?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/socialwindow.cpp:240
+#: src/gui/socialwindow.cpp:258
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:269
+#, c-format
+msgid "Members: %u/%u"
+msgstr ""
+
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:291 src/gui/socialwindow.cpp:361
+#: src/gui/socialwindow.cpp:483
+#, c-format
+msgid "Players: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: tab in social window
 #. TRANSLATORS: party chat tab name
-#: src/gui/socialwindow.cpp:302 src/net/ea/gui/partytab.cpp:49
+#: src/gui/socialwindow.cpp:376 src/net/ea/gui/partytab.cpp:49
 msgid "Party"
 msgstr "隊伍"
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:341
+#: src/gui/socialwindow.cpp:415
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
 #. TRANSLATORS: tab in social window
-#: src/gui/socialwindow.cpp:356
+#: src/gui/socialwindow.cpp:430
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:370
+#: src/gui/socialwindow.cpp:444
 msgid "Member Invite to Party"
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:372
+#: src/gui/socialwindow.cpp:446
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:381
+#: src/gui/socialwindow.cpp:455
 msgid "Leave Party?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/socialwindow.cpp:383
+#: src/gui/socialwindow.cpp:457
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:681
+#, c-format
+msgid "Visible players: %d"
+msgstr ""
+
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:605
+#: src/gui/socialwindow.cpp:707
 msgid "Nav"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:809
+#, c-format
+msgid "Portals: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:922
+#: src/gui/socialwindow.cpp:1035
 msgid "Atk"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:941
+#: src/gui/socialwindow.cpp:1054
 msgid "Priority mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:943
+#: src/gui/socialwindow.cpp:1056
 msgid "Attack mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/socialwindow.cpp:945
+#: src/gui/socialwindow.cpp:1058
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:968
+#: src/gui/socialwindow.cpp:1081
 msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:987
+#: src/gui/socialwindow.cpp:1100
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/socialwindow.cpp:989
+#: src/gui/socialwindow.cpp:1102
 msgid "Ignore items"
 msgstr ""
 
+#. TRANSLATORS: social window label
+#: src/gui/socialwindow.cpp:1190
+#, c-format
+msgid "Friends: %u/%u"
+msgstr ""
+
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1091 src/gui/socialwindow.cpp:1563
+#: src/gui/socialwindow.cpp:1213 src/gui/socialwindow.cpp:1687
 msgid "Create Party"
 msgstr ""
 
 #. TRANSLATORS: social window name
 #. TRANSLATORS: full button name
-#: src/gui/socialwindow.cpp:1138 src/gui/windowmenu.cpp:126
+#: src/gui/socialwindow.cpp:1260 src/gui/windowmenu.cpp:126
 msgid "Social"
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1151
+#: src/gui/socialwindow.cpp:1273
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1156
+#: src/gui/socialwindow.cpp:1278
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/socialwindow.cpp:1162
+#: src/gui/socialwindow.cpp:1284
 msgid "Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1345
+#: src/gui/socialwindow.cpp:1469
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1356
+#: src/gui/socialwindow.cpp:1480
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1497
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1511
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1424
+#: src/gui/socialwindow.cpp:1548
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1445
+#: src/gui/socialwindow.cpp:1569
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1460
+#: src/gui/socialwindow.cpp:1584
 msgid "Guild Name"
 msgstr ""
 
 #. TRANSLATORS: guild creation message
-#: src/gui/socialwindow.cpp:1462
+#: src/gui/socialwindow.cpp:1586
 msgid "Choose your guild's name."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1477
+#: src/gui/socialwindow.cpp:1601
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1485
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1616
 msgid "Accept Guild Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1631
 msgid "Received party request, but one already exists."
 msgstr "收到派對邀請,但而有另一個存在."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1519
+#: src/gui/socialwindow.cpp:1643
 msgid "You have been invited you to join a party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1524
+#: src/gui/socialwindow.cpp:1648
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1533
+#: src/gui/socialwindow.cpp:1657
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s 邀請你參加他們的派對."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1539
+#: src/gui/socialwindow.cpp:1663
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s 邀請你參加 %s 派對."
 
 #. TRANSLATORS: party invite message
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1673
 msgid "Accept Party Invite"
 msgstr "接受派對邀請"
 
-#: src/gui/socialwindow.cpp:1564
+#: src/gui/socialwindow.cpp:1688
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1570
+#: src/gui/socialwindow.cpp:1694
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/socialwindow.cpp:1572
+#: src/gui/socialwindow.cpp:1696
 msgid "Choose your party's name."
 msgstr ""
 
@@ -5180,24 +5239,24 @@ msgid "MP:"
 msgstr "魔力:"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:235 src/gui/statuswindow.cpp:423
+#: src/gui/statuswindow.cpp:234 src/gui/statuswindow.cpp:424
 #, c-format
 msgid "Job: %d"
 msgstr "職業：%d"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:237
+#: src/gui/statuswindow.cpp:236
 msgid "Job:"
 msgstr "職業:"
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:288 src/gui/statuswindow.cpp:345
+#: src/gui/statuswindow.cpp:289 src/gui/statuswindow.cpp:346
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
 #. TRANSLATORS: status window label
-#: src/gui/statuswindow.cpp:360
+#: src/gui/statuswindow.cpp:361
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
@@ -5643,13 +5702,13 @@ msgid "%s whispers: %s"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:540
+#: src/gui/widgets/chattab.cpp:541
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/chattab.cpp:545
+#: src/gui/widgets/chattab.cpp:546
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -5935,24 +5994,24 @@ msgstr ""
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/inputmanager.cpp:328 src/inputmanager.cpp:372 src/keyboardconfig.cpp:90
+#: src/inputmanager.cpp:329 src/inputmanager.cpp:373 src/keyboardconfig.cpp:90
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/inputmanager.cpp:334
+#: src/inputmanager.cpp:335
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/inputmanager.cpp:348
+#: src/inputmanager.cpp:349
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/inputmanager.cpp:378
+#: src/inputmanager.cpp:379
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -5960,7 +6019,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/inputmanager.cpp:392 src/keyboardconfig.cpp:103
+#: src/inputmanager.cpp:393 src/keyboardconfig.cpp:134
 msgid "u key"
 msgstr ""
 
@@ -6635,55 +6694,55 @@ msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:176
+#: src/net/ea/guildhandler.cpp:178
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:179
+#: src/net/ea/guildhandler.cpp:181
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:184
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:186
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:187
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:193
+#: src/net/ea/guildhandler.cpp:195
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:195
+#: src/net/ea/guildhandler.cpp:197
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:198
+#: src/net/ea/guildhandler.cpp:200
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
@@ -7558,8 +7617,8 @@ msgstr ""
 #. TRANSLATORS: being info default name
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
-#: src/resources/avatardb.cpp:69 src/resources/beinginfo.cpp:40
-#: src/resources/itemdb.cpp:291 src/resources/monsterdb.cpp:100
+#: src/resources/avatardb.cpp:69 src/resources/beinginfo.cpp:41
+#: src/resources/itemdb.cpp:295 src/resources/monsterdb.cpp:100
 msgid "unnamed"
 msgstr "未知物品"