summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-03-01 12:15:41 +0300
committerAndrei Karas <akaras@inbox.ru>2014-03-01 12:15:41 +0300
commit65b18659f88367a9bcb707d1a323ce9c21d75495 (patch)
tree848c13abd8694b33cfcb6bd59d41f7fe539c5e8a
parent88d24a5a466287c4a93f4f5167db14aa06489de7 (diff)
downloadplus-65b18659f88367a9bcb707d1a323ce9c21d75495.tar.gz
plus-65b18659f88367a9bcb707d1a323ce9c21d75495.tar.bz2
plus-65b18659f88367a9bcb707d1a323ce9c21d75495.tar.xz
plus-65b18659f88367a9bcb707d1a323ce9c21d75495.zip
update translations.
Diffstat
-rw-r--r--data/translations/help/cs.po66
-rw-r--r--data/translations/help/fr.po8
-rw-r--r--data/translations/help/ru.po14
-rw-r--r--po/ar.po1070
-rw-r--r--po/bg.po1070
-rw-r--r--po/ca.po1072
-rw-r--r--po/cs.po10
-rw-r--r--po/da.po1070
-rw-r--r--po/de.po8
-rw-r--r--po/el.po1072
-rw-r--r--po/en_GB.po1070
-rw-r--r--po/eo.po1070
-rw-r--r--po/es.po10
-rw-r--r--po/et.po1070
-rw-r--r--po/fa.po1070
-rw-r--r--po/fi.po8
-rw-r--r--po/fr.po8
-rw-r--r--po/he.po1070
-rw-r--r--po/hr.po1070
-rw-r--r--po/hu.po1070
-rw-r--r--po/id.po2
-rw-r--r--po/it.po8
-rw-r--r--po/ja.po8
-rw-r--r--po/ka.po1070
-rw-r--r--po/nb.po1070
-rw-r--r--po/nl.po1070
-rw-r--r--po/nl_BE.po5
-rw-r--r--po/pl.po8
-rw-r--r--po/pt.po8
-rw-r--r--po/pt_BR.po8
-rw-r--r--po/ru.po8
-rw-r--r--po/sk.po1070
-rw-r--r--po/sq.po1070
-rw-r--r--po/sv.po1070
-rw-r--r--po/sv_SE.po1072
-rw-r--r--po/te.po1070
-rw-r--r--po/th.po1070
-rw-r--r--po/tr.po8
-rw-r--r--po/vls.po1070
-rw-r--r--po/zh_CN.po5
-rw-r--r--po/zh_HK.po1070
-rw-r--r--po/zh_TW.po1070
42 files changed, 12784 insertions, 13102 deletions
diff --git a/data/translations/help/cs.po b/data/translations/help/cs.po
index 9bc7ec094..4ba371436 100644
--- a/data/translations/help/cs.po
+++ b/data/translations/help/cs.po
@@ -4,7 +4,7 @@
msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2014-02-28 18:21+0000\n"
+"PO-Revision-Date: 2014-02-28 18:34+0000\n"
"Last-Translator: samuraiii <samurai.no.dojo@gmail.com>\n"
"Language-Team: Czech (http://www.transifex.com/projects/p/manaplus/language/cs/)\n"
"MIME-Version: 1.0\n"
@@ -221,7 +221,7 @@ msgid "Debug"
msgstr "Debug"
msgid "/present - print visible players number to chat."
-msgstr ""
+msgstr "/present - vypíše počet viditelných hráčů do chatu."
msgid "Website: @@http://manaplus.org/|http://manaplus.org/@@"
msgstr "Webová stránka: @@http://manaplus.org/|http://manaplus.org/@@"
@@ -252,7 +252,7 @@ msgid "/setdrop N - set drop counter to requested value."
msgstr "/setdrop N - nastavit počítadlo upuštění na danou hodnotu."
msgid "/dumpogl - dump all OpenGL variables into log file."
-msgstr ""
+msgstr "/dumpogl - vypíše všecky OpenGL proměnné do souboru se záznamy."
msgid "/outfit N - wear outfit number N."
msgstr "/outfit N - obleče výbavu číslo N."
@@ -273,7 +273,7 @@ msgid "/heal NICK - heal nick."
msgstr "/heal PŘEZDÍVKA - uzdrav hráče s uvedenou přezdívkou."
msgid "/emotepet N - use emotion number N from your pet."
-msgstr ""
+msgstr "/emotepet N - použije smajlíka N pro vašeho mazlíčka."
msgid "\"Setup window\""
msgstr "\"Okno nastavení\""
@@ -285,7 +285,7 @@ msgid "\"Set direction up\""
msgstr "\"Nastavit směr dolů\""
msgid "/dumpe - dump environment variables into chat."
-msgstr ""
+msgstr "/dumpe - vypíše proměnné prostředí do chatu."
msgid "Instructions"
msgstr "Instrukce"
@@ -307,7 +307,7 @@ msgid "\"Change move to target type\""
msgstr "\"Změnit typ pohybu k cíly\""
msgid "/dumpmods - dump all enabled mod names into chat."
-msgstr ""
+msgstr "/dumpmods - vypíše všecky povolené mody do chatu."
msgid "\"Enable/disable trading\""
msgstr "\"Zakázet/Povolit obchodování\""
@@ -328,7 +328,7 @@ msgid "IGNORING COMMUNICATION"
msgstr "IGNOROVANÍ KOMUNIKACE"
msgid "/wait NAME - wait for nick or moster with name."
-msgstr ""
+msgstr "/wait JMÉNO - zapne čekání na monstrum nebo hráče s daným jménem."
msgid "SUPPORT"
msgstr "PODPORA"
@@ -374,13 +374,13 @@ msgid "/who - print online players number to chat."
msgstr "/who - vypíše počet hráčů co jsou připojeni do chatu."
msgid "/createitems - open dialog for creating items."
-msgstr ""
+msgstr "/createitems - otevře dialog pro vytváření předmětů."
msgid "/pseudoaway, /pseudoaway MSG - set/unset pseudo away mode."
msgstr "/pseudoaway, /pseudoaway ZPRÁVA - nastavit/zrušit pseudo away režim."
msgid "Sources:"
-msgstr ""
+msgstr "Zdrojový kód:"
msgid "/uptime - show client uptime."
msgstr "/uptime - zobrazí jak dlouho byl klient spuštěn."
@@ -457,7 +457,7 @@ msgid "/item 0 - disable party item sharing options."
msgstr "/item 0 - zakázat sdílení předmětů v partě."
msgid "/drop - drop N items from 0 slot."
-msgstr ""
+msgstr "/drop - upustí N předmětů z místa 0."
msgid "\"Enable / disable away mode\""
msgstr "\"Zapnout/Vypnout Away mód\""
@@ -505,7 +505,7 @@ msgid "/outfit next - wear next outfit."
msgstr "/outfit next - obleče další výbavu."
msgid "/magicattack - attack target with magic."
-msgstr ""
+msgstr "/magicattack - zaútočí na cíl magií."
msgid ""
"You can set away mode,\n"
@@ -534,7 +534,7 @@ msgid "Android porting"
msgstr "Portování na Android"
msgid "Tabs"
-msgstr ""
+msgstr "Záložky"
msgid "\"Social window\""
msgstr "\"Okno společenství\""
@@ -576,7 +576,7 @@ msgid "Download"
msgstr "Stáhnout"
msgid "Other linux:"
-msgstr ""
+msgstr "Jiný linux:"
msgid ""
" - ##2friend##9: You consider this player a friend. The player may chat,\n"
@@ -590,16 +590,16 @@ msgid "\"Target player\""
msgstr "\"Zaměřit hráče\""
msgid "/dropn - drop N items from any slot."
-msgstr ""
+msgstr "/dropn - Upustí N předmětů z jakéhokoli slotu."
msgid "/enableaway - enable away messages in current tab."
-msgstr ""
+msgstr "/enableaway - Povolí away zprávy v aktuální záložce."
msgid "##2ManaPlus version: ##6%VER%"
msgstr "##2ManaPlus verze: ##6%VER%"
msgid "/enemy NICK - add nick to enemyes list."
-msgstr ""
+msgstr "/enemy PŘEZDÍVKA - přidá přezdívku do seznamu nepřátel."
msgid ""
" - ##2disregarded##9: You wish to disregard this player, meaning that his or\n"
@@ -611,7 +611,7 @@ msgid "\"Debug window\""
msgstr "\"Debugovací okno\""
msgid "/uploadlog - upload log into pastebin service."
-msgstr ""
+msgstr "/uploadlog - nahraje záznamy na pastebin."
msgid "ManaPlus Contributors"
msgstr "Přispěvatelé ManaPlus"
@@ -660,7 +660,7 @@ msgstr "##2 SDL, SDL_image, SDL_mixer (Rámec pro média)\n##2
msgid ""
"/cleangraphics - remove all cached graphics. Usefull for content developers."
-msgstr ""
+msgstr "/cleangraphics - odstarní veškerou grafiku z vyrovnávací paměti. Užitečné pro vývojaře obsahu."
msgid "/friend NICK, /befriend NICK - add nick to friends list."
msgstr "/friend PŘEZDÍVKA, /befriend PŘEZDÍVKA - přidá přezdívku do seznamu přátel."
@@ -718,13 +718,13 @@ msgid ""
msgstr "/msg PŘEZDÍVKA text, /whisper PŘEZDÍVKA text, /w PŘEZDÍVKA text - pošle šeptaný vzkaz dané přezdívce."
msgid "/movetotarget - move to target position."
-msgstr ""
+msgstr "/movetotarget - přesune postavu na cílovou pozici."
msgid "\"Emote shortcut 14\""
msgstr "\"Zkratka smajlíka 14\""
msgid "/open URL - open url in browser."
-msgstr ""
+msgstr "/open URL - otevře URL v prohlížeči."
msgid "Commands"
msgstr "Příkazy"
@@ -747,10 +747,10 @@ msgid ""
msgstr "Seznam hráčů vede všecky vaše známosti.\n Jsou řazeny podle jednoho možných kritérií:"
msgid "/cleanfonts - remove all cached render strings."
-msgstr ""
+msgstr "/cleanfonts - odstraní všecky vykreslené řetězce z vyrovnávací paměti."
msgid "/dumpgl - dump OpenGL version into chat."
-msgstr ""
+msgstr "/dumpgl - zobrazí verzi OpenGL v chatu."
msgid "/outfit prev - wear previous outfit."
msgstr "/outfit prev - obleče předchozí výbavu."
@@ -783,7 +783,7 @@ msgid "\"Set direction right\""
msgstr "\"Nastavit směr vpravo\""
msgid "/announce MESSAGE - show global message."
-msgstr ""
+msgstr "/announce ZPRÁVA - zobrazí globální oznámení."
msgid "Player relations"
msgstr "Vztahy hráče"
@@ -824,7 +824,7 @@ msgid "\"Toggle chat\""
msgstr "\"Přepnout chat\""
msgid "/talkpet TEXT - talk from your pet."
-msgstr ""
+msgstr "/talkpet TEXT - mluvte skrze svého mazlíčka."
msgid "\"Change attack type\""
msgstr "\"Změnit typ útoku\""
@@ -848,7 +848,7 @@ msgid "/dirs - show client dirs in debug chat tab."
msgstr "/dirs - zobrazí klintské složky v debugové záložce chatu."
msgid "/movetohome - move to home position."
-msgstr ""
+msgstr "/movetohome - přesune na domácí pozici."
msgid "/disconnect - quick disconnect from server."
msgstr "/disconnect - rychle odpojí od serveru."
@@ -895,7 +895,7 @@ msgid "/undress NICK - remove all clothes from nick. Local effect only."
msgstr "/undress PŘEZDÍVKA - odstraní veškeré obleční daného hráče. Pouze lokální efekt."
msgid "Other"
-msgstr ""
+msgstr "Jiné"
msgid ""
" Otherwise see the @@team|Development Team@@ section to have a list of\n"
@@ -906,13 +906,13 @@ msgid "\"Outfit shortcut 14\""
msgstr "\"Zkratka výbavy 14\""
msgid "/uploadconfig - upload main config into pastebin service."
-msgstr ""
+msgstr "/uploadconfig - nahraje hlavní nastavení na pastebin."
msgid "\"Quick drop N items from 0 slot\""
msgstr "\"Rychle zahoď N předmětů ze slotu 0\""
msgid "/enablehighlight - enable highlight in current tab."
-msgstr ""
+msgstr "/enablehighlight - povolit zvýraznění v aktuální záložce."
msgid "\"Emote shortcut window\""
msgstr "\"Okno zkratek smajlíků\""
@@ -921,7 +921,7 @@ msgid "\"Bot checker window\""
msgstr "\"Okno kontroly botů\""
msgid "/disableaway - disable away messages in current tab."
-msgstr ""
+msgstr "/disableaway - zakáže zobrazování away zprávy v aktuální záložce."
msgid ""
"/mail NICK MSG - send offline message to NICK. Working only in tmw server."
@@ -931,7 +931,7 @@ msgid "DOWNLOADS"
msgstr "STAŽENÉ SOUBORY"
msgid "/disablehighlight - disable highlight in current tab."
-msgstr ""
+msgstr "/disablehighlight - zakáže zvýrazňování v aktuální záložce."
msgid "\"Item shortcut 15\""
msgstr "\"Zkratka předmětu 15\""
@@ -940,7 +940,7 @@ msgid "About The Mana World"
msgstr "O The Mana World"
msgid "/testparticle FILENAME - set test particle on player."
-msgstr ""
+msgstr "/testparticle NÁZEV_SOUBORU - otestuje částicový efekt na hráči."
msgid "\"Smilie\""
msgstr "\"Smajlík\""
@@ -965,7 +965,7 @@ msgid "Whispers"
msgstr "Šeptání"
msgid "/url URL - insert url into chat."
-msgstr ""
+msgstr "/url URL - vloží url do chatu."
msgid "\"Wear outfit\""
msgstr "\"Obléct výstroj\""
@@ -1071,7 +1071,7 @@ msgid ""
msgstr "Přesto se ale můžete proti těmto hráčům bránit tím že je budete ignorovat.\nKlikněte pravým tlačítkem myši a v kontextovém menu vyberte 'Ignorovat' nebo\n'Přehlížet' (viz níže). Podrobně můžete upravovat vaše vztahy s ostatními hráči\nv menu 'Nastavení', kde můžete vidět vškeré vztahy s hráči které jste vytvořili.\nPro přístup k tomuto klikněte na tlačítko nastavení v pravém horním rohu a vyberte 'Vztahy'."
msgid "/dumpt - dump tests info into chat."
-msgstr ""
+msgstr "/dumpt - vypíše testy do chatu."
msgid "Different patches"
msgstr "Různé opravy"
diff --git a/data/translations/help/fr.po b/data/translations/help/fr.po
index be3715719..f5183df7a 100644
--- a/data/translations/help/fr.po
+++ b/data/translations/help/fr.po
@@ -1,6 +1,6 @@
# en#
# Translators:
-# Alige <aligetmw@hotmail.fr>, 2013
+# Alige <aligetmw@hotmail.fr>, 2013-2014
# Alige <aligetmw@hotmail.fr>, 2012
# Choupom <andycootlapin@hotmail.fr>, 2012
# Bernard <nard@bh28.net>, 2014
@@ -8,8 +8,8 @@
msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2014-02-28 18:14+0000\n"
-"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"PO-Revision-Date: 2014-03-01 06:16+0000\n"
+"Last-Translator: Alige <aligetmw@hotmail.fr>\n"
"Language-Team: French (http://www.transifex.com/projects/p/manaplus/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -85,7 +85,7 @@ msgid "\"Set direction down\""
msgstr "\"Définir la direction vers le bas\""
msgid "GM"
-msgstr ""
+msgstr "MJ"
msgid "\"Target NPC\""
msgstr "\"Cibler PNJ\""
diff --git a/data/translations/help/ru.po b/data/translations/help/ru.po
index c552c63cb..5e1fbc72e 100644
--- a/data/translations/help/ru.po
+++ b/data/translations/help/ru.po
@@ -1,7 +1,7 @@
# en#
# Translators:
# Alexandr Uspensky <AlexandrUSP@yandex.com>, 2012
-# Andrei Karas <akaras@inbox.ru>, 2012-2013
+# Andrei Karas <akaras@inbox.ru>, 2012-2014
# BoBaH <BoBaH4spam@ukr.net>, 2012
# Dan Sagunov <danilka.pro@gmail.com>, 2012-2013
# RatreX <ratrex@mail.ru>, 2013
@@ -10,7 +10,7 @@
msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2014-02-28 18:14+0000\n"
+"PO-Revision-Date: 2014-02-28 19:53+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/manaplus/language/ru/)\n"
"MIME-Version: 1.0\n"
@@ -87,7 +87,7 @@ msgid "\"Set direction down\""
msgstr "\"Установить направление вниз\""
msgid "GM"
-msgstr ""
+msgstr "ГМ"
msgid "\"Target NPC\""
msgstr "\"Выбрать NPC\""
@@ -204,7 +204,7 @@ msgid "Mana Contributors"
msgstr "В разработке Mana принимали участие"
msgid "Content devs"
-msgstr ""
+msgstr "Разработчики контента"
msgid "/query NICK, /q NICK - open new whisper tab for nick."
msgstr "/query ИГРОК, /q ИГРОК - открыть новую вкладку для шепота с игроком."
@@ -386,7 +386,7 @@ msgid "/pseudoaway, /pseudoaway MSG - set/unset pseudo away mode."
msgstr "/pseudoaway, /pseudoaway ТЕКСТ - включить/выключить режим псевдо-\"Отошел\"."
msgid "Sources:"
-msgstr ""
+msgstr "Исходники:"
msgid "/uptime - show client uptime."
msgstr "/uptime - показать время работы клиента."
@@ -582,7 +582,7 @@ msgid "Download"
msgstr "Скачать"
msgid "Other linux:"
-msgstr ""
+msgstr "Другие linux'ы:"
msgid ""
" - ##2friend##9: You consider this player a friend. The player may chat,\n"
@@ -901,7 +901,7 @@ msgid "/undress NICK - remove all clothes from nick. Local effect only."
msgstr "/undress NICK - снять всю одежду с NICK. Только местное действие."
msgid "Other"
-msgstr ""
+msgstr "Другое"
msgid ""
" Otherwise see the @@team|Development Team@@ section to have a list of\n"
diff --git a/po/ar.po b/po/ar.po
index 9523e10a5..69e7b8425 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: 2014-02-23 00:42+0300\n"
-"PO-Revision-Date: 2014-02-23 08:14+0000\n"
+"POT-Creation-Date: 2014-02-28 21:21+0300\n"
+"PO-Revision-Date: 2014-03-01 08:14+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"
@@ -29,7 +29,7 @@ msgid "Accepting incoming trade requests"
msgstr ""
#. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
msgid "Visible on map"
msgstr ""
@@ -38,68 +38,68 @@ msgstr ""
msgid "Human"
msgstr ""
-#: src/being/being.cpp:544
+#: src/being/being.cpp:496
msgid "dodge"
msgstr ""
-#: src/being/being.cpp:544
+#: src/being/being.cpp:496
msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1965 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1970 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr ""
#. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:392
+#: src/being/localplayer.cpp:376
#, c-format
msgid "You were killed by %s"
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1377
+#: src/being/localplayer.cpp:816
msgid "Tried to pick up nonexistent item."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1381
+#: src/being/localplayer.cpp:820
msgid "Item is too heavy."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1385
+#: src/being/localplayer.cpp:824
msgid "Item is too far away."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1389
+#: src/being/localplayer.cpp:828
msgid "Inventory is full."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1393
+#: src/being/localplayer.cpp:832
msgid "Stack is too big."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1397
+#: src/being/localplayer.cpp:836
msgid "Item belongs to someone else."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1401
+#: src/being/localplayer.cpp:840
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:1425
+#: src/being/localplayer.cpp:864
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -111,387 +111,387 @@ msgstr[4] ""
msgstr[5] ""
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1630 src/being/localplayer.cpp:1665
-#: src/being/localplayer.cpp:1666
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
msgid "xp"
msgstr ""
-#: src/being/localplayer.cpp:1671 src/being/localplayer.cpp:1678
-#: src/being/localplayer.cpp:1685
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
msgid "job"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1871
+#: src/being/localplayer.cpp:1285
msgid "(D) default moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1873
+#: src/being/localplayer.cpp:1287
msgid "(I) invert moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1875
+#: src/being/localplayer.cpp:1289
msgid "(c) moves with some crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1877
+#: src/being/localplayer.cpp:1291
msgid "(C) moves with crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1879
+#: src/being/localplayer.cpp:1293
msgid "(d) double normal + crazy"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1881
+#: src/being/localplayer.cpp:1295
msgid "(?) unknown move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1904
+#: src/being/localplayer.cpp:1318
#, c-format
msgid "(%u) crazy move number %u"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1910
+#: src/being/localplayer.cpp:1324
msgid "(a) custom crazy move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1915
+#: src/being/localplayer.cpp:1329
msgid "(?) crazy move"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1930
+#: src/being/localplayer.cpp:1344
msgid "(0) default moves to target"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1932
+#: src/being/localplayer.cpp:1346
msgid "(1) moves to target in distance 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1934
+#: src/being/localplayer.cpp:1348
msgid "(2) moves to target in distance 2"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1936
+#: src/being/localplayer.cpp:1350
msgid "(3) moves to target in distance 3"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1938
+#: src/being/localplayer.cpp:1352
msgid "(5) moves to target in distance 5"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1940
+#: src/being/localplayer.cpp:1354
msgid "(7) moves to target in distance 7"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1942
+#: src/being/localplayer.cpp:1356
msgid "(A) moves to target in attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1944
+#: src/being/localplayer.cpp:1358
msgid "(a) archer attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1946
+#: src/being/localplayer.cpp:1360
msgid "(B) moves to target in attack range - 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1948
+#: src/being/localplayer.cpp:1362
msgid "(?) move to target"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1968
+#: src/being/localplayer.cpp:1382
msgid "(D) default follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1970
+#: src/being/localplayer.cpp:1384
msgid "(R) relative follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1972
+#: src/being/localplayer.cpp:1386
msgid "(M) mirror follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1974
+#: src/being/localplayer.cpp:1388
msgid "(P) pet follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1976
+#: src/being/localplayer.cpp:1390
msgid "(?) unknown follow"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1996 src/being/localplayer.cpp:2004
-#: src/being/localplayer.cpp:2032
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
msgid "(?) attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1998 src/being/localplayer.cpp:2024
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
msgid "(D) default attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2000
+#: src/being/localplayer.cpp:1414
msgid "(s) switch attack without shield"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2002
+#: src/being/localplayer.cpp:1416
msgid "(S) switch attack with shield"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2026
+#: src/being/localplayer.cpp:1440
msgid "(G) go and attack"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2028
+#: src/being/localplayer.cpp:1442
msgid "(A) go, attack, pickup"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2030
+#: src/being/localplayer.cpp:1444
msgid "(d) without auto attack"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2084
+#: src/being/localplayer.cpp:1498
msgid "(S) small pick up 1x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2086
+#: src/being/localplayer.cpp:1500
msgid "(D) default pick up 2x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2088
+#: src/being/localplayer.cpp:1502
msgid "(F) forward pick up 2x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2090
+#: src/being/localplayer.cpp:1504
msgid "(3) pick up 3x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2092
+#: src/being/localplayer.cpp:1506
msgid "(g) go and pick up in distance 4"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2094
+#: src/being/localplayer.cpp:1508
msgid "(G) go and pick up in distance 8"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2096
+#: src/being/localplayer.cpp:1510
msgid "(A) go and pick up in max distance"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2098
+#: src/being/localplayer.cpp:1512
msgid "(?) pick up"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2112
+#: src/being/localplayer.cpp:1526
msgid "(N) normal map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2114
+#: src/being/localplayer.cpp:1528
msgid "(D) debug map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2116
+#: src/being/localplayer.cpp:1530
msgid "(u) ultra map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2118
+#: src/being/localplayer.cpp:1532
msgid "(U) ultra map view 2"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2120
+#: src/being/localplayer.cpp:1534
msgid "(e) empty map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2122
+#: src/being/localplayer.cpp:1536
msgid "(b) black & white map view"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2142
+#: src/being/localplayer.cpp:1556
msgid "(f) use #flar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2144
+#: src/being/localplayer.cpp:1558
msgid "(c) use #chiza for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2146
+#: src/being/localplayer.cpp:1560
msgid "(I) use #ingrav for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2148
+#: src/being/localplayer.cpp:1562
msgid "(F) use #frillyar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2150
+#: src/being/localplayer.cpp:1564
msgid "(U) use #upmarmu for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2152
+#: src/being/localplayer.cpp:1566
msgid "(?) magic attack"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2172
+#: src/being/localplayer.cpp:1586
msgid "(a) attack all players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2174
+#: src/being/localplayer.cpp:1588
msgid "(f) attack all except friends"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2176
+#: src/being/localplayer.cpp:1590
msgid "(b) attack bad relations"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2178
+#: src/being/localplayer.cpp:1592
msgid "(d) don't attack players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2180
+#: src/being/localplayer.cpp:1594
msgid "(?) pvp attack"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2200
+#: src/being/localplayer.cpp:1614
msgid "(D) default imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2202
+#: src/being/localplayer.cpp:1616
msgid "(O) outfits imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2204
+#: src/being/localplayer.cpp:1618
msgid "(?) imitation"
msgstr ""
#. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2233
+#: src/being/localplayer.cpp:1647
msgid "Away"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2256
+#: src/being/localplayer.cpp:1670
msgid "(O) on keyboard"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2258
+#: src/being/localplayer.cpp:1672
msgid "(A) away"
msgstr ""
#. TRANSLATORS: away type in status bar
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2260 src/being/localplayer.cpp:2278
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
msgid "(?) away"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2274
+#: src/being/localplayer.cpp:1688
msgid "(G) game camera mode"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2276
+#: src/being/localplayer.cpp:1690
msgid "(F) free camera mode"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2303
+#: src/being/localplayer.cpp:1717
msgid "Game modifiers are enabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2305
+#: src/being/localplayer.cpp:1719
msgid "Game modifiers are disabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2307
+#: src/being/localplayer.cpp:1721
msgid "Game modifiers are unknown"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3887
+#: src/being/localplayer.cpp:3287
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3893 src/being/localplayer.cpp:3918
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3903
+#: src/being/localplayer.cpp:3303
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3909 src/being/localplayer.cpp:3923
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4266
+#: src/being/localplayer.cpp:3666
#, c-format
msgid "You see %s"
msgstr ""
@@ -529,32 +529,32 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1139 src/gui/windowmenu.cpp:167
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
#: src/gui/windows/setupwindow.cpp:61
msgid "Setup"
msgstr "تثبيت"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1143 src/gui/widgets/tabs/setup_perfomance.cpp:51
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1146 src/gui/widgets/tabs/setup_video.cpp:225
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:225
msgid "Video"
msgstr "مرئية"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1149 src/gui/widgets/tabs/setup_theme.cpp:269
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1152 src/gui/windowmenu.cpp:74
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr ""
@@ -567,41 +567,41 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1156 src/gui/popups/popupmenu.cpp:619
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
#: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:69
-#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:138
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
#: src/gui/windows/shopwindow.cpp:78
msgid "Close"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1324
msgid "Logging in"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1367
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1492
+#: src/client.cpp:1489
msgid "Requesting characters"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1532
+#: src/client.cpp:1529
msgid "Connecting to the game server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1545
+#: src/client.cpp:1541
msgid "Changing game servers"
msgstr ""
@@ -616,12 +616,12 @@ msgstr ""
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1606 src/client.cpp:1617 src/client.cpp:1801
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:349
#: src/gui/windows/charselectdialog.cpp:299
-#: src/gui/windows/editserverdialog.cpp:218
+#: src/gui/windows/editserverdialog.cpp:186
#: src/gui/windows/registerdialog.cpp:260
#: src/gui/windows/unregisterdialog.cpp:146
#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
@@ -629,65 +629,65 @@ msgid "Error"
msgstr "خطأ"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1629
+#: src/client.cpp:1625
msgid "Requesting registration details"
msgstr ""
#. TRANSLATORS: password change message header
-#: src/client.cpp:1670
+#: src/client.cpp:1666
msgid "Password Change"
msgstr ""
#. TRANSLATORS: password change message text
-#: src/client.cpp:1672
+#: src/client.cpp:1668
msgid "Password changed successfully!"
msgstr ""
#. TRANSLATORS: email change message header
-#: src/client.cpp:1694
+#: src/client.cpp:1690
msgid "Email Change"
msgstr ""
#. TRANSLATORS: email change message text
-#: src/client.cpp:1696
+#: src/client.cpp:1692
msgid "Email changed successfully!"
msgstr ""
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1719
+#: src/client.cpp:1715
msgid "Unregister Successful"
msgstr ""
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1721
+#: src/client.cpp:1717
msgid "Farewell, come back any time..."
msgstr ""
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1998 src/client.cpp:2013 src/client.cpp:2058
-#: src/client.cpp:2074 src/client.cpp:2525 src/client.cpp:2533
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2230
+#: src/client.cpp:2232
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2271 src/client.cpp:2278
+#: src/client.cpp:2273 src/client.cpp:2280
msgid "Error creating updates directory!"
msgstr ""
-#: src/client.cpp:2300 src/client.cpp:2317
+#: src/client.cpp:2302 src/client.cpp:2319
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: error message question
-#: src/client.cpp:3001
+#: src/client.cpp:3003
msgid "Do you want to open support page?"
msgstr ""
@@ -933,99 +933,154 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:277 src/gui/widgets/tabs/chattab.cpp:464
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
msgid "General"
msgstr ""
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:293 src/gui/widgets/tabs/chattab.cpp:466
-#: src/gui/windowmenu.cpp:154 src/gui/windows/debugwindow.cpp:53
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:575
+#: src/game.cpp:563
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:585
+#: src/game.cpp:573
msgid "Saving screenshot failed!"
msgstr ""
#. TRANSLATORS: error message text
-#: src/game.cpp:656
+#: src/game.cpp:644
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:659
+#: src/game.cpp:647
msgid "Network Error"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
-msgid "black"
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
msgstr ""
+#. TRANSLATORS: chat color
#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
+msgid "black"
+msgstr ""
+
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
msgid "red"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
msgid "green"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
msgid "blue"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
msgid "gold"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
msgid "yellow"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
msgid "pink"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
msgid "purple"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
msgid "grey"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
msgid "brown"
msgstr ""
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr ""
+
#. TRANSLATORS: relation type
#: src/gui/models/playerrelationlistmodel.h:33
msgid "Neutral"
@@ -1061,46 +1116,61 @@ msgstr ""
msgid "Enemy"
msgstr ""
-#. TRANSLATORS: inventory sort mode
-#. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#: src/gui/models/sortlistmodelinv.h:34
-#: src/gui/widgets/tabs/setup_other.cpp:72
-#: src/gui/widgets/tabs/setup_visual.cpp:78 src/gui/windows/chatwindow.cpp:150
-msgid "default"
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:36 src/gui/windows/buydialog.cpp:62
-msgid "by name"
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
msgstr ""
+#. TRANSLATORS: buy dialog sort type.
#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
+msgid "by name"
+msgstr ""
+
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:38 src/gui/windows/buydialog.cpp:64
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
msgid "by id"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:40 src/gui/windows/buydialog.cpp:66
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
msgid "by weight"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:42 src/gui/windows/buydialog.cpp:68
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
msgid "by amount"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:44 src/gui/windows/buydialog.cpp:70
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
msgid "by type"
msgstr ""
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr ""
+
#. TRANSLATORS: update type
#. TRANSLATORS: onscreen button size
#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
@@ -1247,8 +1317,8 @@ msgstr ""
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
-#: src/gui/windows/buydialog.cpp:208 src/gui/windows/buydialog.cpp:220
-#: src/gui/windows/buydialog.cpp:274 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
msgid "Buy"
msgstr "شراء"
@@ -1345,12 +1415,12 @@ msgstr ""
#: src/gui/windows/changepassworddialog.cpp:57
#: src/gui/windows/charcreatedialog.cpp:121
#: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:79
-#: src/gui/windows/itemamountwindow.cpp:163
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
-#: src/gui/windows/socialwindow.cpp:1238
-#: src/gui/windows/textcommandeditor.cpp:203 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:54
#: src/gui/windows/updaterwindow.cpp:186
msgid "Cancel"
@@ -1422,7 +1492,7 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:150 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
msgstr ""
@@ -1435,7 +1505,7 @@ msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:134
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
msgid "Spells"
msgstr ""
@@ -1491,7 +1561,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
#. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1311
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
msgid "Leave"
msgstr ""
@@ -1572,8 +1642,8 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
-#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:223
-#: src/gui/windows/inventorywindow.cpp:745 src/gui/windows/setupwindow.cpp:96
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
msgid "Store"
msgstr ""
@@ -1604,7 +1674,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
msgid "Retrieve"
msgstr ""
@@ -1637,8 +1707,8 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
-#: src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:656 src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr "استخدام"
@@ -1672,8 +1742,8 @@ msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: language
#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/widgets/tabs/setup_theme.cpp:127
-#: src/gui/windows/socialwindow.cpp:1003
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
msgid "(default)"
msgstr ""
@@ -1829,8 +1899,8 @@ msgstr ""
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:645
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
msgid "Unequip"
msgstr "تجريد من العتاد"
@@ -1838,16 +1908,16 @@ msgstr "تجريد من العتاد"
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:172
-#: src/gui/windows/inventorywindow.cpp:650 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr "استعمال العتاد"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:189
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
msgid "Drop..."
msgstr ""
@@ -1861,15 +1931,15 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:138
-#: src/gui/windows/inventorywindow.cpp:758
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
msgid "Drop"
msgstr "إسقاط"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
msgid "Split"
msgstr "قسم"
@@ -2025,10 +2095,10 @@ msgstr ""
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:276
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/windows/serverdialog.cpp:198
msgid "Quit"
msgstr "مغادرة"
@@ -2590,7 +2660,7 @@ msgstr ""
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: register dialog. button.
#: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:146
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:330
#: src/gui/widgets/tabs/setup_visual.cpp:189
@@ -2617,9 +2687,8 @@ msgstr ""
#. TRANSLATORS: command editor button
#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
#: src/gui/windows/charselectdialog.cpp:108
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:94
-#: src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/textcommandeditor.cpp:207
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
msgid "Delete"
msgstr "حذف"
@@ -2655,7 +2724,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:130
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
msgid "Shortcuts"
msgstr ""
@@ -2663,7 +2732,7 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:151
msgid "Windows"
msgstr ""
@@ -2679,7 +2748,7 @@ msgstr ""
#. TRANSLATORS: settings tab name
#. TRANSLATORS: chat window name
#: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:88 src/gui/windows/chatwindow.cpp:203
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
msgid "Chat"
msgstr ""
@@ -2902,7 +2971,7 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:137
-#: src/gui/windows/inventorywindow.cpp:569
+#: src/gui/windows/inventorywindow.cpp:568
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
#, c-format
@@ -2922,7 +2991,7 @@ msgstr ""
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/windows/serverdialog.cpp:204
msgid "Edit"
msgstr ""
@@ -2975,7 +3044,7 @@ msgstr ""
#. TRANSLATORS: tab in social window
#. TRANSLATORS: guild chat tab name
#: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:184 src/gui/windows/socialwindow.cpp:320
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
#: src/net/ea/gui/guildtab.cpp:44
msgid "Guild"
msgstr ""
@@ -2986,142 +3055,142 @@ msgid "Lang"
msgstr ""
#. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:49
+#: src/gui/widgets/tabs/setup_audio.cpp:48
msgid "Audio"
msgstr "سمعيّ"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:57
+#: src/gui/widgets/tabs/setup_audio.cpp:56
msgid "Basic settings"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:60
+#: src/gui/widgets/tabs/setup_audio.cpp:59
msgid "Enable Audio"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:63
+#: src/gui/widgets/tabs/setup_audio.cpp:62
msgid "Enable music"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:67
+#: src/gui/widgets/tabs/setup_audio.cpp:66
msgid "Enable game sfx"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:71
+#: src/gui/widgets/tabs/setup_audio.cpp:70
msgid "Enable gui sfx"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:74
msgid "Sfx volume"
msgstr "حجم صوت المؤثرّات"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:78
msgid "Music volume"
msgstr "حجم صوت الموسيقا"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:82
msgid "Enable music fade out"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:86
msgid "Audio frequency"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:90
msgid "mono"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:93
+#: src/gui/widgets/tabs/setup_audio.cpp:92
msgid "stereo"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:94
msgid "surround"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:97
+#: src/gui/widgets/tabs/setup_audio.cpp:96
msgid "surround+center+lfe"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:98
msgid "Audio channels"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:104
+#: src/gui/widgets/tabs/setup_audio.cpp:103
msgid "Sound effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:106
msgid "Information dialog sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:110
msgid "Request dialog sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:115
+#: src/gui/widgets/tabs/setup_audio.cpp:114
msgid "Whisper message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:118
msgid "Guild / Party message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:122
msgid "Highlight message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:126
msgid "Global message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:130
msgid "Error message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:134
msgid "Trade request sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:138
msgid "Show window sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:142
msgid "Hide window sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:150
msgid "Enable mumble voice chat"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:156
+#: src/gui/widgets/tabs/setup_audio.cpp:155
msgid "Download music"
msgstr ""
@@ -3417,7 +3486,7 @@ msgstr ""
#. TRANSLATORS: unknown key name
#. TRANSLATORS: quests window quest name
#: src/gui/widgets/tabs/setup_input.cpp:364
-#: src/gui/windows/questswindow.cpp:263
+#: src/gui/windows/questswindow.cpp:249
msgid "unknown"
msgstr ""
@@ -3576,7 +3645,7 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: debug window tab
#. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:105
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
#: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
#: src/gui/windows/minimap.cpp:114
msgid "Map"
@@ -3744,9 +3813,9 @@ msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: shop window name
#. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:146
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
#: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windows/inventorywindow.cpp:194
msgid "Shop"
msgstr ""
@@ -4128,252 +4197,252 @@ msgid "When ignoring:"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:64
+#: src/gui/widgets/tabs/setup_theme.cpp:63
msgid "Very small (8)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:66
+#: src/gui/widgets/tabs/setup_theme.cpp:65
msgid "Very small (9)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:68
+#: src/gui/widgets/tabs/setup_theme.cpp:67
msgid "Tiny (10)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:70
+#: src/gui/widgets/tabs/setup_theme.cpp:69
msgid "Small (11)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:72
+#: src/gui/widgets/tabs/setup_theme.cpp:71
msgid "Medium (12)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:74
+#: src/gui/widgets/tabs/setup_theme.cpp:73
msgid "Normal (13)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:76
+#: src/gui/widgets/tabs/setup_theme.cpp:75
msgid "Large (14)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:78
+#: src/gui/widgets/tabs/setup_theme.cpp:77
msgid "Large (15)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:80
+#: src/gui/widgets/tabs/setup_theme.cpp:79
msgid "Large (16)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:82
+#: src/gui/widgets/tabs/setup_theme.cpp:81
msgid "Big (17)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:83
msgid "Big (18)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:85
msgid "Big (19)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:87
msgid "Very big (20)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:89
msgid "Very big (21)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:91
msgid "Very big (22)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:93
msgid "Huge (23)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:129
+#: src/gui/widgets/tabs/setup_theme.cpp:128
msgid "Chinese (China)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:131
+#: src/gui/widgets/tabs/setup_theme.cpp:130
msgid "Czech"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:133
+#: src/gui/widgets/tabs/setup_theme.cpp:132
msgid "English"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:135
+#: src/gui/widgets/tabs/setup_theme.cpp:134
msgid "Finnish"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:137
+#: src/gui/widgets/tabs/setup_theme.cpp:136
msgid "French"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:139
+#: src/gui/widgets/tabs/setup_theme.cpp:138
msgid "German"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:141
+#: src/gui/widgets/tabs/setup_theme.cpp:140
msgid "Indonesian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:143
+#: src/gui/widgets/tabs/setup_theme.cpp:142
msgid "Italian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:145
+#: src/gui/widgets/tabs/setup_theme.cpp:144
msgid "Polish"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:147
+#: src/gui/widgets/tabs/setup_theme.cpp:146
msgid "Japanese"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:148
msgid "Dutch (Belgium/Flemish)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:150
msgid "Portuguese"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:152
msgid "Portuguese (Brazilian)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:154
msgid "Russian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:156
msgid "Spanish (Castilian)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:158
msgid "Turkish"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:211
+#: src/gui/widgets/tabs/setup_theme.cpp:210
msgid "Gui theme"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:218
+#: src/gui/widgets/tabs/setup_theme.cpp:217
msgid "Main Font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:223
+#: src/gui/widgets/tabs/setup_theme.cpp:222
msgid "Language"
msgstr ""
#. TRANSLATORS: theme settings label
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:227 src/gui/windows/emotewindow.cpp:45
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
msgid "Bold font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:230
msgid "Particle font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:235
+#: src/gui/widgets/tabs/setup_theme.cpp:234
msgid "Help font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:239
+#: src/gui/widgets/tabs/setup_theme.cpp:238
msgid "Secure font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:242
msgid "Npc font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:247
+#: src/gui/widgets/tabs/setup_theme.cpp:246
msgid "Japanese font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:250
msgid "Chinese font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:256
+#: src/gui/widgets/tabs/setup_theme.cpp:255
msgid "Font size"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:261
+#: src/gui/widgets/tabs/setup_theme.cpp:260
msgid "Npc font size"
msgstr ""
#. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:265
+#: src/gui/widgets/tabs/setup_theme.cpp:264
msgid "i"
msgstr ""
#. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:404
+#: src/gui/widgets/tabs/setup_theme.cpp:403
msgid "Name: "
msgstr ""
-#: src/gui/widgets/tabs/setup_theme.cpp:405
+#: src/gui/widgets/tabs/setup_theme.cpp:404
msgid "Copyright:"
msgstr ""
#. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:470
+#: src/gui/widgets/tabs/setup_theme.cpp:469
msgid "Theme info"
msgstr ""
#. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:497
+#: src/gui/widgets/tabs/setup_theme.cpp:496
msgid "Theme Changed"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:497
+#: src/gui/widgets/tabs/setup_theme.cpp:496
#: src/gui/widgets/tabs/setup_video.cpp:499
#: src/gui/widgets/tabs/setup_video.cpp:508
msgid "Restart your client for the change to take effect."
@@ -4704,178 +4773,169 @@ msgid "Allow screensaver to run"
msgstr ""
#. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:67
msgid "ONL"
msgstr ""
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:68
msgid "Who is online"
msgstr ""
#. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:70
msgid "HLP"
msgstr ""
#. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:73
msgid "QE"
msgstr ""
#. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:77 src/gui/windows/questswindow.cpp:126
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
msgid "Quests"
msgstr ""
#. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:76
msgid "BC"
msgstr ""
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:77
msgid "Bot checker"
msgstr ""
#. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:82
+#: src/gui/windowmenu.cpp:79
msgid "KS"
msgstr ""
#. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:83 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
msgid "Kill stats"
msgstr ""
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:82
msgid "Smilies"
msgstr ""
#. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:87
+#: src/gui/windowmenu.cpp:84
msgid "CH"
msgstr ""
#. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:95
+#: src/gui/windowmenu.cpp:92
msgid "STA"
msgstr ""
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:93
msgid "Status"
msgstr "الحالة"
#. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:95
msgid "EQU"
msgstr ""
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:58
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
msgid "Equipment"
msgstr "العتاد"
#. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:98
msgid "INV"
msgstr ""
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:130
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
#: src/inventory.cpp:257
msgid "Inventory"
msgstr "الجردة"
#. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:104
+#: src/gui/windowmenu.cpp:101
msgid "MAP"
msgstr ""
#. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:110
+#: src/gui/windowmenu.cpp:107
msgid "SKI"
msgstr ""
#. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
msgid "Skills"
msgstr "مهارات"
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:118
-msgid "SPE"
-msgstr ""
-
-#: src/gui/windowmenu.cpp:119
-msgid "Specials"
-msgstr ""
-
#. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:124
+#: src/gui/windowmenu.cpp:112
msgid "SOC"
msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:126 src/gui/windows/socialwindow.cpp:1284
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
msgid "Social"
msgstr ""
#. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:128
+#: src/gui/windowmenu.cpp:116
msgid "SH"
msgstr ""
#. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:132
+#: src/gui/windowmenu.cpp:120
msgid "SP"
msgstr ""
#. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:124
msgid "DR"
msgstr ""
#. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:128
msgid "YK"
msgstr ""
#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:130
msgid "Did you know"
msgstr ""
#. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:144
+#: src/gui/windowmenu.cpp:132
msgid "SHP"
msgstr ""
#. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:148
+#: src/gui/windowmenu.cpp:136
msgid "OU"
msgstr ""
#. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:152
+#: src/gui/windowmenu.cpp:140
msgid "DBG"
msgstr ""
#. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:149
msgid "WIN"
msgstr ""
#. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:153
msgid "SET"
msgstr ""
#. TRANSLATORS: short key name
#. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:301 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
#: src/gui/windows/outfitwindow.cpp:561
#, c-format
msgid "Key: %s"
@@ -4897,31 +4957,21 @@ msgstr ""
msgid "Result"
msgstr ""
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:58
-msgid "unsorted"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:60
-msgid "by price"
-msgstr ""
-
#. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:196
+#: src/gui/windows/buydialog.cpp:162
msgid "Create items"
msgstr ""
#. TRANSLATORS: buy dialog label
#. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:254 src/gui/windows/buydialog.cpp:541
-#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:366
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
#, c-format
msgid "Price: %s / Total: %s"
msgstr ""
#. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:263
+#: src/gui/windows/buydialog.cpp:229
msgid "Amount:"
msgstr ""
@@ -4931,8 +4981,8 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/itemamountwindow.cpp:159
-#: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
msgid "+"
msgstr ""
@@ -4943,8 +4993,8 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:271 src/gui/windows/itemamountwindow.cpp:157
-#: src/gui/windows/itemamountwindow.cpp:191 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
msgid "-"
msgstr ""
@@ -4952,9 +5002,9 @@ msgstr ""
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:274 src/gui/windows/charcreatedialog.cpp:119
-#: src/gui/windows/charselectdialog.cpp:593
-#: src/gui/windows/socialwindow.cpp:1307
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
msgid "Create"
msgstr "إنشاء"
@@ -4963,7 +5013,7 @@ msgstr "إنشاء"
#. TRANSLATORS: status bar label
#. TRANSLATORS: status window label
#. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:278 src/gui/windows/selldialog.cpp:112
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
#: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
#: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
msgid "Max"
@@ -5062,7 +5112,7 @@ msgstr ""
#. TRANSLATORS: login dialog label
#. TRANSLATORS: register dialog. label.
#: src/gui/windows/charcreatedialog.cpp:73
-#: src/gui/windows/editserverdialog.cpp:89 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
#: src/gui/windows/registerdialog.cpp:89
msgid "Name:"
msgstr "الاسم:"
@@ -5123,7 +5173,7 @@ msgstr ""
#. TRANSLATORS: char create dialog label
#: src/gui/windows/charcreatedialog.cpp:115
-#: src/gui/windows/charcreatedialog.cpp:469
+#: src/gui/windows/charcreatedialog.cpp:458
#, c-format
msgid "Please distribute %d points"
msgstr "رجاء أن توزّع %d نقطة"
@@ -5139,17 +5189,17 @@ msgid "Look:"
msgstr ""
#. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:362
+#: src/gui/windows/charcreatedialog.cpp:351
msgid "Your name needs to be at least 4 characters."
msgstr "يجب أن يكون طول اسمك على الأقل 4 محارف."
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:459
+#: src/gui/windows/charcreatedialog.cpp:448
msgid "Character stats OK"
msgstr "إحصائيات الشخصيّة جيّدة"
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:475
+#: src/gui/windows/charcreatedialog.cpp:464
#, c-format
msgid "Please remove %d points"
msgstr "رجاء حذف %d نقطة"
@@ -5178,7 +5228,7 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:104
-#: src/gui/windows/charselectdialog.cpp:588
+#: src/gui/windows/charselectdialog.cpp:580
#: src/gui/windows/updaterwindow.cpp:188
msgid "Play"
msgstr ""
@@ -5234,35 +5284,20 @@ msgstr ""
msgid "Enter password:"
msgstr ""
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:172
-msgid "rainbow 1"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:174
-msgid "rainbow 2"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:176
-msgid "rainbow 3"
-msgstr ""
-
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:755
+#: src/gui/windows/chatwindow.cpp:705
#, c-format
msgid "Present: %s; %d players are present."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1169
+#: src/gui/windows/chatwindow.cpp:1119
#, c-format
msgid "Whispering to %s: %s"
msgstr ""
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1613
+#: src/gui/windows/chatwindow.cpp:1563
#, c-format
msgid "%s's pet"
msgstr ""
@@ -5508,51 +5543,51 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:77
-#: src/gui/windows/itemamountwindow.cpp:161 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
msgid "OK"
msgstr ""
#. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:66
+#: src/gui/windows/editserverdialog.cpp:45
msgid "Edit Server"
msgstr ""
#. TRANSLATORS: edit server dialog button
#. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:75
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
msgid "Connect"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:91
+#: src/gui/windows/editserverdialog.cpp:70
msgid "Address:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:93
+#: src/gui/windows/editserverdialog.cpp:72
msgid "Port:"
msgstr "المنفذ:"
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:95
+#: src/gui/windows/editserverdialog.cpp:74
msgid "Server type:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:97
+#: src/gui/windows/editserverdialog.cpp:76
msgid "Description:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:99
+#: src/gui/windows/editserverdialog.cpp:78
msgid "Online list url:"
msgstr ""
#. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:220
+#: src/gui/windows/editserverdialog.cpp:188
msgid "Please at least type both the address and the port of the server."
msgstr ""
@@ -5572,47 +5607,47 @@ msgid "Did you know..."
msgstr ""
#. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:165
+#: src/gui/windows/itemamountwindow.cpp:164
msgid "All"
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:221
+#: src/gui/windows/itemamountwindow.cpp:220
msgid "Select amount of items to trade."
msgstr "انتقاء كمّيّة من المواد للمتاجرة بها."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:225
+#: src/gui/windows/itemamountwindow.cpp:224
msgid "Select amount of items to drop."
msgstr "انتقاء كمّيّة من المواد لإسقاطها."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:229
+#: src/gui/windows/itemamountwindow.cpp:228
msgid "Select amount of items to store."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:233
+#: src/gui/windows/itemamountwindow.cpp:232
msgid "Select amount of items to retrieve."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:237
+#: src/gui/windows/itemamountwindow.cpp:236
msgid "Select amount of items to split."
msgstr "انتقاء كمّيّة من المواد لقسمها."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:241
+#: src/gui/windows/itemamountwindow.cpp:240
msgid "Add to buy shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:245
+#: src/gui/windows/itemamountwindow.cpp:244
msgid "Add to sell shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:249
+#: src/gui/windows/itemamountwindow.cpp:248
msgid "Unknown."
msgstr ""
@@ -5872,7 +5907,7 @@ msgstr ""
#. TRANSLATORS: shop window label
#. TRANSLATORS: shop window button
#. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:258
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
#: src/gui/windows/tradewindow.cpp:78
msgid "Add"
@@ -5974,53 +6009,53 @@ msgid "Do you really want to sell %s?"
msgstr ""
#. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
msgid "Choose Your Server"
msgstr ""
#. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
msgid "Load"
msgstr ""
#. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
msgid "Choose Your Server *** SAFE MODE ***"
msgstr ""
#. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
msgid "Use same ip for game sub servers"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
msgid "Waiting for server..."
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
msgid "Preparing download"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
msgid "Error retreiving server list!"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
msgid "requires a newer version"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
#, c-format
msgid "requires v%s"
msgstr ""
@@ -6101,277 +6136,277 @@ msgid "Skill %d"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:225
+#: src/gui/windows/socialwindow.cpp:227
#, c-format
msgid "Invited user %s to guild %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:240
+#: src/gui/windows/socialwindow.cpp:242
#, c-format
msgid "Guild %s quit requested."
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:254
+#: src/gui/windows/socialwindow.cpp:256
msgid "Member Invite to Guild"
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:256
+#: src/gui/windows/socialwindow.cpp:258
#, c-format
msgid "Who would you like to invite to guild %s?"
msgstr ""
#. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:266
+#: src/gui/windows/socialwindow.cpp:268
msgid "Leave Guild?"
msgstr ""
#. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:268
+#: src/gui/windows/socialwindow.cpp:270
#, c-format
msgid "Are you sure you want to leave guild %s?"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:279
+#: src/gui/windows/socialwindow.cpp:281
#, c-format
msgid "Members: %u/%u"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:301 src/gui/windows/socialwindow.cpp:373
-#: src/gui/windows/socialwindow.cpp:498
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
#, c-format
msgid "Players: %u/%u"
msgstr ""
#. TRANSLATORS: tab in social window
#. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:389 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
msgid "Party"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:429
+#: src/gui/windows/socialwindow.cpp:431
#, c-format
msgid "Invited user %s to party."
msgstr ""
#. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:444
+#: src/gui/windows/socialwindow.cpp:446
#, c-format
msgid "Party %s quit requested."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:458
+#: src/gui/windows/socialwindow.cpp:460
msgid "Member Invite to Party"
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:460
+#: src/gui/windows/socialwindow.cpp:462
#, c-format
msgid "Who would you like to invite to party %s?"
msgstr ""
#. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:470
+#: src/gui/windows/socialwindow.cpp:472
msgid "Leave Party?"
msgstr ""
#. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:472
+#: src/gui/windows/socialwindow.cpp:474
#, c-format
msgid "Are you sure you want to leave party %s?"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:698
+#: src/gui/windows/socialwindow.cpp:665
#, c-format
msgid "Visible players: %d"
msgstr ""
#. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:725
+#: src/gui/windows/socialwindow.cpp:692
msgid "Nav"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:827
+#: src/gui/windows/socialwindow.cpp:794
#, c-format
msgid "Portals: %u/%u"
msgstr ""
#. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1054
+#: src/gui/windows/socialwindow.cpp:1021
msgid "Atk"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1073
+#: src/gui/windows/socialwindow.cpp:1040
msgid "Priority mobs"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1075
+#: src/gui/windows/socialwindow.cpp:1042
msgid "Attack mobs"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1077
+#: src/gui/windows/socialwindow.cpp:1044
msgid "Ignore mobs"
msgstr ""
#. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1101
+#: src/gui/windows/socialwindow.cpp:1068
msgid "Pik"
msgstr ""
#. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1120
+#: src/gui/windows/socialwindow.cpp:1087
msgid "Pickup items"
msgstr ""
#. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1122
+#: src/gui/windows/socialwindow.cpp:1089
msgid "Ignore items"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1212
+#: src/gui/windows/socialwindow.cpp:1179
#, c-format
msgid "Friends: %u/%u"
msgstr ""
#. TRANSLATORS: party popup item
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1235 src/gui/windows/socialwindow.cpp:1727
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
msgid "Create Party"
msgstr ""
#. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1298
+#: src/gui/windows/socialwindow.cpp:1265
msgid "P"
msgstr ""
#. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1303
+#: src/gui/windows/socialwindow.cpp:1270
msgid "F"
msgstr ""
#. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1309
+#: src/gui/windows/socialwindow.cpp:1276
msgid "Invite"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1503
+#: src/gui/windows/socialwindow.cpp:1470
#, c-format
msgid "Accepted party invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1514
+#: src/gui/windows/socialwindow.cpp:1481
#, c-format
msgid "Rejected party invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1531
+#: src/gui/windows/socialwindow.cpp:1498
#, c-format
msgid "Accepted guild invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1545
+#: src/gui/windows/socialwindow.cpp:1512
#, c-format
msgid "Rejected guild invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1585
+#: src/gui/windows/socialwindow.cpp:1552
#, c-format
msgid "Creating guild called %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1606
+#: src/gui/windows/socialwindow.cpp:1573
#, c-format
msgid "Creating party called %s."
msgstr ""
#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1621
+#: src/gui/windows/socialwindow.cpp:1588
msgid "Guild Name"
msgstr ""
#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1623
+#: src/gui/windows/socialwindow.cpp:1590
msgid "Choose your guild's name."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1639
+#: src/gui/windows/socialwindow.cpp:1606
msgid "Received guild request, but one already exists."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1647
+#: src/gui/windows/socialwindow.cpp:1614
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1654
+#: src/gui/windows/socialwindow.cpp:1621
msgid "Accept Guild Invite"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1670
+#: src/gui/windows/socialwindow.cpp:1637
msgid "Received party request, but one already exists."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1682
+#: src/gui/windows/socialwindow.cpp:1649
msgid "You have been invited you to join a party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1687
+#: src/gui/windows/socialwindow.cpp:1654
#, c-format
msgid "You have been invited to join the %s party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1696
+#: src/gui/windows/socialwindow.cpp:1663
#, c-format
msgid "%s has invited you to join their party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1702
+#: src/gui/windows/socialwindow.cpp:1669
#, c-format
msgid "%s has invited you to join the %s party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1712
+#: src/gui/windows/socialwindow.cpp:1679
msgid "Accept Party Invite"
msgstr ""
-#: src/gui/windows/socialwindow.cpp:1728
+#: src/gui/windows/socialwindow.cpp:1695
msgid "Cannot create party. You are already in a party"
msgstr ""
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1734
+#: src/gui/windows/socialwindow.cpp:1701
msgid "Party Name"
msgstr ""
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1736
+#: src/gui/windows/socialwindow.cpp:1703
msgid "Choose your party's name."
msgstr ""
@@ -6413,113 +6448,68 @@ msgstr ""
msgid "Correction points: %d"
msgstr ""
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "No Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Allow Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:105
-msgid "Need Target"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "General Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "Life Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "War Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Transmute Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Nature Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:121
-msgid "Astral Magic"
-msgstr ""
-
#. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:164
+#: src/gui/windows/textcommandeditor.cpp:47
msgid "Command Editor"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:52
msgid "magic"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:54
msgid "other"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:173
+#: src/gui/windows/textcommandeditor.cpp:56
msgid "Symbol:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:176
+#: src/gui/windows/textcommandeditor.cpp:59
msgid "Command:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:179
+#: src/gui/windows/textcommandeditor.cpp:62
msgid "Comment:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:183
+#: src/gui/windows/textcommandeditor.cpp:66
msgid "Target Type:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:187
+#: src/gui/windows/textcommandeditor.cpp:70
msgid "Icon:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:190
+#: src/gui/windows/textcommandeditor.cpp:73
msgid "Mana:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:193
+#: src/gui/windows/textcommandeditor.cpp:76
msgid "Magic level:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:197
+#: src/gui/windows/textcommandeditor.cpp:80
msgid "Magic School:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:200
+#: src/gui/windows/textcommandeditor.cpp:83
msgid "School level:"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/windows/textcommandeditor.cpp:88
msgid "Save"
msgstr ""
@@ -6549,7 +6539,7 @@ msgid "Trade: You"
msgstr ""
#. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
#, c-format
msgid "You get %s"
msgstr ""
@@ -6565,12 +6555,12 @@ msgid "You give:"
msgstr "أنت تقدّم:"
#. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
msgid "You don't have enough money."
msgstr ""
#. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
msgid ""
"Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
@@ -6641,17 +6631,17 @@ msgid "Who Is Online - Update"
msgstr ""
#. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:87
+#: src/gui/windows/worldselectdialog.cpp:49
msgid "Select World"
msgstr ""
#. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:93
+#: src/gui/windows/worldselectdialog.cpp:55
msgid "Change Login"
msgstr ""
#. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:95
+#: src/gui/windows/worldselectdialog.cpp:57
msgid "Choose World"
msgstr ""
@@ -6869,7 +6859,7 @@ msgid "Failed to create character. Most likely the name is already taken."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:281
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
msgid "Wrong name."
msgstr ""
@@ -7027,58 +7017,58 @@ msgid "Experience sharing unknown."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:154
+#: src/net/ea/loginhandler.cpp:149
msgid "Account was not found. Please re-login."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/ea/loginhandler.cpp:153
msgid "Old password incorrect."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:162
+#: src/net/ea/loginhandler.cpp:157
msgid "New password too short."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:166 src/net/ea/loginhandler.cpp:293
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
msgid "Unknown error."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:239
+#: src/net/ea/loginhandler.cpp:234
msgid "Unregistered ID."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:238
msgid "Wrong password."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:248
+#: src/net/ea/loginhandler.cpp:243
msgid "Account expired."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:252
+#: src/net/ea/loginhandler.cpp:247
msgid "Rejected from server."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:256
+#: src/net/ea/loginhandler.cpp:251
msgid ""
"You have been permanently banned from the game. Please contact the GM team."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:261
+#: src/net/ea/loginhandler.cpp:256
msgid "Client too old."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:265
+#: src/net/ea/loginhandler.cpp:260
#, c-format
msgid ""
"You have been temporarily banned from the game until %s.\n"
@@ -7086,22 +7076,22 @@ msgid ""
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:273
+#: src/net/ea/loginhandler.cpp:268
msgid "Server overpopulated."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:277
+#: src/net/ea/loginhandler.cpp:272
msgid "This user name is already taken."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:285
+#: src/net/ea/loginhandler.cpp:280
msgid "Incorrect email."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:289
+#: src/net/ea/loginhandler.cpp:284
msgid "Username permanently erased."
msgstr ""
@@ -7774,7 +7764,7 @@ msgstr ""
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
#: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr ""
diff --git a/po/bg.po b/po/bg.po
index 7d5338c89..b71db8a11 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: 2014-02-23 00:42+0300\n"
-"PO-Revision-Date: 2014-02-23 08:14+0000\n"
+"POT-Creation-Date: 2014-02-28 21:21+0300\n"
+"PO-Revision-Date: 2014-03-01 08:14+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"
@@ -29,7 +29,7 @@ msgid "Accepting incoming trade requests"
msgstr ""
#. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
msgid "Visible on map"
msgstr ""
@@ -38,68 +38,68 @@ msgstr ""
msgid "Human"
msgstr ""
-#: src/being/being.cpp:544
+#: src/being/being.cpp:496
msgid "dodge"
msgstr ""
-#: src/being/being.cpp:544
+#: src/being/being.cpp:496
msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1965 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1970 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr ""
#. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:392
+#: src/being/localplayer.cpp:376
#, c-format
msgid "You were killed by %s"
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1377
+#: src/being/localplayer.cpp:816
msgid "Tried to pick up nonexistent item."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1381
+#: src/being/localplayer.cpp:820
msgid "Item is too heavy."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1385
+#: src/being/localplayer.cpp:824
msgid "Item is too far away."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1389
+#: src/being/localplayer.cpp:828
msgid "Inventory is full."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1393
+#: src/being/localplayer.cpp:832
msgid "Stack is too big."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1397
+#: src/being/localplayer.cpp:836
msgid "Item belongs to someone else."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1401
+#: src/being/localplayer.cpp:840
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:1425
+#: src/being/localplayer.cpp:864
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -107,387 +107,387 @@ msgstr[0] ""
msgstr[1] ""
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1630 src/being/localplayer.cpp:1665
-#: src/being/localplayer.cpp:1666
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
msgid "xp"
msgstr ""
-#: src/being/localplayer.cpp:1671 src/being/localplayer.cpp:1678
-#: src/being/localplayer.cpp:1685
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
msgid "job"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1871
+#: src/being/localplayer.cpp:1285
msgid "(D) default moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1873
+#: src/being/localplayer.cpp:1287
msgid "(I) invert moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1875
+#: src/being/localplayer.cpp:1289
msgid "(c) moves with some crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1877
+#: src/being/localplayer.cpp:1291
msgid "(C) moves with crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1879
+#: src/being/localplayer.cpp:1293
msgid "(d) double normal + crazy"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1881
+#: src/being/localplayer.cpp:1295
msgid "(?) unknown move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1904
+#: src/being/localplayer.cpp:1318
#, c-format
msgid "(%u) crazy move number %u"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1910
+#: src/being/localplayer.cpp:1324
msgid "(a) custom crazy move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1915
+#: src/being/localplayer.cpp:1329
msgid "(?) crazy move"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1930
+#: src/being/localplayer.cpp:1344
msgid "(0) default moves to target"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1932
+#: src/being/localplayer.cpp:1346
msgid "(1) moves to target in distance 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1934
+#: src/being/localplayer.cpp:1348
msgid "(2) moves to target in distance 2"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1936
+#: src/being/localplayer.cpp:1350
msgid "(3) moves to target in distance 3"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1938
+#: src/being/localplayer.cpp:1352
msgid "(5) moves to target in distance 5"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1940
+#: src/being/localplayer.cpp:1354
msgid "(7) moves to target in distance 7"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1942
+#: src/being/localplayer.cpp:1356
msgid "(A) moves to target in attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1944
+#: src/being/localplayer.cpp:1358
msgid "(a) archer attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1946
+#: src/being/localplayer.cpp:1360
msgid "(B) moves to target in attack range - 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1948
+#: src/being/localplayer.cpp:1362
msgid "(?) move to target"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1968
+#: src/being/localplayer.cpp:1382
msgid "(D) default follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1970
+#: src/being/localplayer.cpp:1384
msgid "(R) relative follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1972
+#: src/being/localplayer.cpp:1386
msgid "(M) mirror follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1974
+#: src/being/localplayer.cpp:1388
msgid "(P) pet follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1976
+#: src/being/localplayer.cpp:1390
msgid "(?) unknown follow"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1996 src/being/localplayer.cpp:2004
-#: src/being/localplayer.cpp:2032
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
msgid "(?) attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1998 src/being/localplayer.cpp:2024
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
msgid "(D) default attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2000
+#: src/being/localplayer.cpp:1414
msgid "(s) switch attack without shield"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2002
+#: src/being/localplayer.cpp:1416
msgid "(S) switch attack with shield"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2026
+#: src/being/localplayer.cpp:1440
msgid "(G) go and attack"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2028
+#: src/being/localplayer.cpp:1442
msgid "(A) go, attack, pickup"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2030
+#: src/being/localplayer.cpp:1444
msgid "(d) without auto attack"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2084
+#: src/being/localplayer.cpp:1498
msgid "(S) small pick up 1x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2086
+#: src/being/localplayer.cpp:1500
msgid "(D) default pick up 2x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2088
+#: src/being/localplayer.cpp:1502
msgid "(F) forward pick up 2x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2090
+#: src/being/localplayer.cpp:1504
msgid "(3) pick up 3x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2092
+#: src/being/localplayer.cpp:1506
msgid "(g) go and pick up in distance 4"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2094
+#: src/being/localplayer.cpp:1508
msgid "(G) go and pick up in distance 8"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2096
+#: src/being/localplayer.cpp:1510
msgid "(A) go and pick up in max distance"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2098
+#: src/being/localplayer.cpp:1512
msgid "(?) pick up"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2112
+#: src/being/localplayer.cpp:1526
msgid "(N) normal map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2114
+#: src/being/localplayer.cpp:1528
msgid "(D) debug map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2116
+#: src/being/localplayer.cpp:1530
msgid "(u) ultra map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2118
+#: src/being/localplayer.cpp:1532
msgid "(U) ultra map view 2"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2120
+#: src/being/localplayer.cpp:1534
msgid "(e) empty map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2122
+#: src/being/localplayer.cpp:1536
msgid "(b) black & white map view"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2142
+#: src/being/localplayer.cpp:1556
msgid "(f) use #flar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2144
+#: src/being/localplayer.cpp:1558
msgid "(c) use #chiza for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2146
+#: src/being/localplayer.cpp:1560
msgid "(I) use #ingrav for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2148
+#: src/being/localplayer.cpp:1562
msgid "(F) use #frillyar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2150
+#: src/being/localplayer.cpp:1564
msgid "(U) use #upmarmu for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2152
+#: src/being/localplayer.cpp:1566
msgid "(?) magic attack"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2172
+#: src/being/localplayer.cpp:1586
msgid "(a) attack all players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2174
+#: src/being/localplayer.cpp:1588
msgid "(f) attack all except friends"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2176
+#: src/being/localplayer.cpp:1590
msgid "(b) attack bad relations"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2178
+#: src/being/localplayer.cpp:1592
msgid "(d) don't attack players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2180
+#: src/being/localplayer.cpp:1594
msgid "(?) pvp attack"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2200
+#: src/being/localplayer.cpp:1614
msgid "(D) default imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2202
+#: src/being/localplayer.cpp:1616
msgid "(O) outfits imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2204
+#: src/being/localplayer.cpp:1618
msgid "(?) imitation"
msgstr ""
#. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2233
+#: src/being/localplayer.cpp:1647
msgid "Away"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2256
+#: src/being/localplayer.cpp:1670
msgid "(O) on keyboard"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2258
+#: src/being/localplayer.cpp:1672
msgid "(A) away"
msgstr ""
#. TRANSLATORS: away type in status bar
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2260 src/being/localplayer.cpp:2278
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
msgid "(?) away"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2274
+#: src/being/localplayer.cpp:1688
msgid "(G) game camera mode"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2276
+#: src/being/localplayer.cpp:1690
msgid "(F) free camera mode"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2303
+#: src/being/localplayer.cpp:1717
msgid "Game modifiers are enabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2305
+#: src/being/localplayer.cpp:1719
msgid "Game modifiers are disabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2307
+#: src/being/localplayer.cpp:1721
msgid "Game modifiers are unknown"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3887
+#: src/being/localplayer.cpp:3287
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3893 src/being/localplayer.cpp:3918
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3903
+#: src/being/localplayer.cpp:3303
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3909 src/being/localplayer.cpp:3923
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4266
+#: src/being/localplayer.cpp:3666
#, c-format
msgid "You see %s"
msgstr ""
@@ -525,32 +525,32 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1139 src/gui/windowmenu.cpp:167
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
#: src/gui/windows/setupwindow.cpp:61
msgid "Setup"
msgstr ""
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1143 src/gui/widgets/tabs/setup_perfomance.cpp:51
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1146 src/gui/widgets/tabs/setup_video.cpp:225
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:225
msgid "Video"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1149 src/gui/widgets/tabs/setup_theme.cpp:269
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1152 src/gui/windowmenu.cpp:74
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr ""
@@ -563,41 +563,41 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1156 src/gui/popups/popupmenu.cpp:619
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
#: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:69
-#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:138
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
#: src/gui/windows/shopwindow.cpp:78
msgid "Close"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1324
msgid "Logging in"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1367
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1492
+#: src/client.cpp:1489
msgid "Requesting characters"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1532
+#: src/client.cpp:1529
msgid "Connecting to the game server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1545
+#: src/client.cpp:1541
msgid "Changing game servers"
msgstr ""
@@ -612,12 +612,12 @@ msgstr ""
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1606 src/client.cpp:1617 src/client.cpp:1801
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:349
#: src/gui/windows/charselectdialog.cpp:299
-#: src/gui/windows/editserverdialog.cpp:218
+#: src/gui/windows/editserverdialog.cpp:186
#: src/gui/windows/registerdialog.cpp:260
#: src/gui/windows/unregisterdialog.cpp:146
#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
@@ -625,65 +625,65 @@ msgid "Error"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1629
+#: src/client.cpp:1625
msgid "Requesting registration details"
msgstr ""
#. TRANSLATORS: password change message header
-#: src/client.cpp:1670
+#: src/client.cpp:1666
msgid "Password Change"
msgstr ""
#. TRANSLATORS: password change message text
-#: src/client.cpp:1672
+#: src/client.cpp:1668
msgid "Password changed successfully!"
msgstr ""
#. TRANSLATORS: email change message header
-#: src/client.cpp:1694
+#: src/client.cpp:1690
msgid "Email Change"
msgstr ""
#. TRANSLATORS: email change message text
-#: src/client.cpp:1696
+#: src/client.cpp:1692
msgid "Email changed successfully!"
msgstr ""
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1719
+#: src/client.cpp:1715
msgid "Unregister Successful"
msgstr ""
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1721
+#: src/client.cpp:1717
msgid "Farewell, come back any time..."
msgstr ""
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1998 src/client.cpp:2013 src/client.cpp:2058
-#: src/client.cpp:2074 src/client.cpp:2525 src/client.cpp:2533
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2230
+#: src/client.cpp:2232
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2271 src/client.cpp:2278
+#: src/client.cpp:2273 src/client.cpp:2280
msgid "Error creating updates directory!"
msgstr ""
-#: src/client.cpp:2300 src/client.cpp:2317
+#: src/client.cpp:2302 src/client.cpp:2319
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: error message question
-#: src/client.cpp:3001
+#: src/client.cpp:3003
msgid "Do you want to open support page?"
msgstr ""
@@ -929,99 +929,154 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:277 src/gui/widgets/tabs/chattab.cpp:464
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
msgid "General"
msgstr ""
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:293 src/gui/widgets/tabs/chattab.cpp:466
-#: src/gui/windowmenu.cpp:154 src/gui/windows/debugwindow.cpp:53
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:575
+#: src/game.cpp:563
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:585
+#: src/game.cpp:573
msgid "Saving screenshot failed!"
msgstr ""
#. TRANSLATORS: error message text
-#: src/game.cpp:656
+#: src/game.cpp:644
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:659
+#: src/game.cpp:647
msgid "Network Error"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
-msgid "black"
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
msgstr ""
+#. TRANSLATORS: chat color
#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
+msgid "black"
+msgstr ""
+
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
msgid "red"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
msgid "green"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
msgid "blue"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
msgid "gold"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
msgid "yellow"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
msgid "pink"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
msgid "purple"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
msgid "grey"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
msgid "brown"
msgstr ""
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr ""
+
#. TRANSLATORS: relation type
#: src/gui/models/playerrelationlistmodel.h:33
msgid "Neutral"
@@ -1057,46 +1112,61 @@ msgstr ""
msgid "Enemy"
msgstr ""
-#. TRANSLATORS: inventory sort mode
-#. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#: src/gui/models/sortlistmodelinv.h:34
-#: src/gui/widgets/tabs/setup_other.cpp:72
-#: src/gui/widgets/tabs/setup_visual.cpp:78 src/gui/windows/chatwindow.cpp:150
-msgid "default"
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:36 src/gui/windows/buydialog.cpp:62
-msgid "by name"
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
msgstr ""
+#. TRANSLATORS: buy dialog sort type.
#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
+msgid "by name"
+msgstr ""
+
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:38 src/gui/windows/buydialog.cpp:64
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
msgid "by id"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:40 src/gui/windows/buydialog.cpp:66
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
msgid "by weight"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:42 src/gui/windows/buydialog.cpp:68
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
msgid "by amount"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:44 src/gui/windows/buydialog.cpp:70
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
msgid "by type"
msgstr ""
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr ""
+
#. TRANSLATORS: update type
#. TRANSLATORS: onscreen button size
#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
@@ -1243,8 +1313,8 @@ msgstr ""
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
-#: src/gui/windows/buydialog.cpp:208 src/gui/windows/buydialog.cpp:220
-#: src/gui/windows/buydialog.cpp:274 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
msgid "Buy"
msgstr ""
@@ -1341,12 +1411,12 @@ msgstr ""
#: src/gui/windows/changepassworddialog.cpp:57
#: src/gui/windows/charcreatedialog.cpp:121
#: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:79
-#: src/gui/windows/itemamountwindow.cpp:163
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
-#: src/gui/windows/socialwindow.cpp:1238
-#: src/gui/windows/textcommandeditor.cpp:203 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:54
#: src/gui/windows/updaterwindow.cpp:186
msgid "Cancel"
@@ -1418,7 +1488,7 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:150 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
msgstr ""
@@ -1431,7 +1501,7 @@ msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:134
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
msgid "Spells"
msgstr ""
@@ -1487,7 +1557,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
#. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1311
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
msgid "Leave"
msgstr ""
@@ -1568,8 +1638,8 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
-#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:223
-#: src/gui/windows/inventorywindow.cpp:745 src/gui/windows/setupwindow.cpp:96
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
msgid "Store"
msgstr ""
@@ -1600,7 +1670,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
msgid "Retrieve"
msgstr ""
@@ -1633,8 +1703,8 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
-#: src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:656 src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr ""
@@ -1668,8 +1738,8 @@ msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: language
#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/widgets/tabs/setup_theme.cpp:127
-#: src/gui/windows/socialwindow.cpp:1003
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
msgid "(default)"
msgstr ""
@@ -1825,8 +1895,8 @@ msgstr ""
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:645
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
msgid "Unequip"
msgstr ""
@@ -1834,16 +1904,16 @@ msgstr ""
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:172
-#: src/gui/windows/inventorywindow.cpp:650 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:189
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
msgid "Drop..."
msgstr ""
@@ -1857,15 +1927,15 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:138
-#: src/gui/windows/inventorywindow.cpp:758
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
msgid "Drop"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
msgid "Split"
msgstr ""
@@ -2021,10 +2091,10 @@ msgstr ""
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:276
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/windows/serverdialog.cpp:198
msgid "Quit"
msgstr ""
@@ -2586,7 +2656,7 @@ msgstr ""
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: register dialog. button.
#: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:146
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:330
#: src/gui/widgets/tabs/setup_visual.cpp:189
@@ -2613,9 +2683,8 @@ msgstr ""
#. TRANSLATORS: command editor button
#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
#: src/gui/windows/charselectdialog.cpp:108
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:94
-#: src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/textcommandeditor.cpp:207
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
msgid "Delete"
msgstr ""
@@ -2651,7 +2720,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:130
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
msgid "Shortcuts"
msgstr ""
@@ -2659,7 +2728,7 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:151
msgid "Windows"
msgstr ""
@@ -2675,7 +2744,7 @@ msgstr ""
#. TRANSLATORS: settings tab name
#. TRANSLATORS: chat window name
#: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:88 src/gui/windows/chatwindow.cpp:203
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
msgid "Chat"
msgstr ""
@@ -2898,7 +2967,7 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:137
-#: src/gui/windows/inventorywindow.cpp:569
+#: src/gui/windows/inventorywindow.cpp:568
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
#, c-format
@@ -2918,7 +2987,7 @@ msgstr ""
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/windows/serverdialog.cpp:204
msgid "Edit"
msgstr ""
@@ -2971,7 +3040,7 @@ msgstr ""
#. TRANSLATORS: tab in social window
#. TRANSLATORS: guild chat tab name
#: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:184 src/gui/windows/socialwindow.cpp:320
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
#: src/net/ea/gui/guildtab.cpp:44
msgid "Guild"
msgstr ""
@@ -2982,142 +3051,142 @@ msgid "Lang"
msgstr ""
#. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:49
+#: src/gui/widgets/tabs/setup_audio.cpp:48
msgid "Audio"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:57
+#: src/gui/widgets/tabs/setup_audio.cpp:56
msgid "Basic settings"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:60
+#: src/gui/widgets/tabs/setup_audio.cpp:59
msgid "Enable Audio"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:63
+#: src/gui/widgets/tabs/setup_audio.cpp:62
msgid "Enable music"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:67
+#: src/gui/widgets/tabs/setup_audio.cpp:66
msgid "Enable game sfx"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:71
+#: src/gui/widgets/tabs/setup_audio.cpp:70
msgid "Enable gui sfx"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:74
msgid "Sfx volume"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:78
msgid "Music volume"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:82
msgid "Enable music fade out"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:86
msgid "Audio frequency"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:90
msgid "mono"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:93
+#: src/gui/widgets/tabs/setup_audio.cpp:92
msgid "stereo"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:94
msgid "surround"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:97
+#: src/gui/widgets/tabs/setup_audio.cpp:96
msgid "surround+center+lfe"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:98
msgid "Audio channels"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:104
+#: src/gui/widgets/tabs/setup_audio.cpp:103
msgid "Sound effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:106
msgid "Information dialog sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:110
msgid "Request dialog sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:115
+#: src/gui/widgets/tabs/setup_audio.cpp:114
msgid "Whisper message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:118
msgid "Guild / Party message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:122
msgid "Highlight message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:126
msgid "Global message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:130
msgid "Error message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:134
msgid "Trade request sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:138
msgid "Show window sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:142
msgid "Hide window sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:150
msgid "Enable mumble voice chat"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:156
+#: src/gui/widgets/tabs/setup_audio.cpp:155
msgid "Download music"
msgstr ""
@@ -3413,7 +3482,7 @@ msgstr ""
#. TRANSLATORS: unknown key name
#. TRANSLATORS: quests window quest name
#: src/gui/widgets/tabs/setup_input.cpp:364
-#: src/gui/windows/questswindow.cpp:263
+#: src/gui/windows/questswindow.cpp:249
msgid "unknown"
msgstr ""
@@ -3572,7 +3641,7 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: debug window tab
#. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:105
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
#: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
#: src/gui/windows/minimap.cpp:114
msgid "Map"
@@ -3740,9 +3809,9 @@ msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: shop window name
#. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:146
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
#: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windows/inventorywindow.cpp:194
msgid "Shop"
msgstr ""
@@ -4124,252 +4193,252 @@ msgid "When ignoring:"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:64
+#: src/gui/widgets/tabs/setup_theme.cpp:63
msgid "Very small (8)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:66
+#: src/gui/widgets/tabs/setup_theme.cpp:65
msgid "Very small (9)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:68
+#: src/gui/widgets/tabs/setup_theme.cpp:67
msgid "Tiny (10)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:70
+#: src/gui/widgets/tabs/setup_theme.cpp:69
msgid "Small (11)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:72
+#: src/gui/widgets/tabs/setup_theme.cpp:71
msgid "Medium (12)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:74
+#: src/gui/widgets/tabs/setup_theme.cpp:73
msgid "Normal (13)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:76
+#: src/gui/widgets/tabs/setup_theme.cpp:75
msgid "Large (14)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:78
+#: src/gui/widgets/tabs/setup_theme.cpp:77
msgid "Large (15)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:80
+#: src/gui/widgets/tabs/setup_theme.cpp:79
msgid "Large (16)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:82
+#: src/gui/widgets/tabs/setup_theme.cpp:81
msgid "Big (17)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:83
msgid "Big (18)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:85
msgid "Big (19)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:87
msgid "Very big (20)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:89
msgid "Very big (21)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:91
msgid "Very big (22)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:93
msgid "Huge (23)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:129
+#: src/gui/widgets/tabs/setup_theme.cpp:128
msgid "Chinese (China)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:131
+#: src/gui/widgets/tabs/setup_theme.cpp:130
msgid "Czech"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:133
+#: src/gui/widgets/tabs/setup_theme.cpp:132
msgid "English"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:135
+#: src/gui/widgets/tabs/setup_theme.cpp:134
msgid "Finnish"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:137
+#: src/gui/widgets/tabs/setup_theme.cpp:136
msgid "French"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:139
+#: src/gui/widgets/tabs/setup_theme.cpp:138
msgid "German"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:141
+#: src/gui/widgets/tabs/setup_theme.cpp:140
msgid "Indonesian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:143
+#: src/gui/widgets/tabs/setup_theme.cpp:142
msgid "Italian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:145
+#: src/gui/widgets/tabs/setup_theme.cpp:144
msgid "Polish"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:147
+#: src/gui/widgets/tabs/setup_theme.cpp:146
msgid "Japanese"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:148
msgid "Dutch (Belgium/Flemish)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:150
msgid "Portuguese"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:152
msgid "Portuguese (Brazilian)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:154
msgid "Russian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:156
msgid "Spanish (Castilian)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:158
msgid "Turkish"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:211
+#: src/gui/widgets/tabs/setup_theme.cpp:210
msgid "Gui theme"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:218
+#: src/gui/widgets/tabs/setup_theme.cpp:217
msgid "Main Font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:223
+#: src/gui/widgets/tabs/setup_theme.cpp:222
msgid "Language"
msgstr ""
#. TRANSLATORS: theme settings label
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:227 src/gui/windows/emotewindow.cpp:45
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
msgid "Bold font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:230
msgid "Particle font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:235
+#: src/gui/widgets/tabs/setup_theme.cpp:234
msgid "Help font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:239
+#: src/gui/widgets/tabs/setup_theme.cpp:238
msgid "Secure font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:242
msgid "Npc font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:247
+#: src/gui/widgets/tabs/setup_theme.cpp:246
msgid "Japanese font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:250
msgid "Chinese font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:256
+#: src/gui/widgets/tabs/setup_theme.cpp:255
msgid "Font size"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:261
+#: src/gui/widgets/tabs/setup_theme.cpp:260
msgid "Npc font size"
msgstr ""
#. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:265
+#: src/gui/widgets/tabs/setup_theme.cpp:264
msgid "i"
msgstr ""
#. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:404
+#: src/gui/widgets/tabs/setup_theme.cpp:403
msgid "Name: "
msgstr ""
-#: src/gui/widgets/tabs/setup_theme.cpp:405
+#: src/gui/widgets/tabs/setup_theme.cpp:404
msgid "Copyright:"
msgstr ""
#. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:470
+#: src/gui/widgets/tabs/setup_theme.cpp:469
msgid "Theme info"
msgstr ""
#. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:497
+#: src/gui/widgets/tabs/setup_theme.cpp:496
msgid "Theme Changed"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:497
+#: src/gui/widgets/tabs/setup_theme.cpp:496
#: src/gui/widgets/tabs/setup_video.cpp:499
#: src/gui/widgets/tabs/setup_video.cpp:508
msgid "Restart your client for the change to take effect."
@@ -4700,178 +4769,169 @@ msgid "Allow screensaver to run"
msgstr ""
#. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:67
msgid "ONL"
msgstr ""
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:68
msgid "Who is online"
msgstr ""
#. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:70
msgid "HLP"
msgstr ""
#. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:73
msgid "QE"
msgstr ""
#. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:77 src/gui/windows/questswindow.cpp:126
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
msgid "Quests"
msgstr ""
#. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:76
msgid "BC"
msgstr ""
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:77
msgid "Bot checker"
msgstr ""
#. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:82
+#: src/gui/windowmenu.cpp:79
msgid "KS"
msgstr ""
#. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:83 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
msgid "Kill stats"
msgstr ""
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:82
msgid "Smilies"
msgstr ""
#. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:87
+#: src/gui/windowmenu.cpp:84
msgid "CH"
msgstr ""
#. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:95
+#: src/gui/windowmenu.cpp:92
msgid "STA"
msgstr ""
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:93
msgid "Status"
msgstr ""
#. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:95
msgid "EQU"
msgstr ""
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:58
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
msgid "Equipment"
msgstr ""
#. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:98
msgid "INV"
msgstr ""
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:130
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
#: src/inventory.cpp:257
msgid "Inventory"
msgstr ""
#. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:104
+#: src/gui/windowmenu.cpp:101
msgid "MAP"
msgstr ""
#. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:110
+#: src/gui/windowmenu.cpp:107
msgid "SKI"
msgstr ""
#. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
msgid "Skills"
msgstr ""
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:118
-msgid "SPE"
-msgstr ""
-
-#: src/gui/windowmenu.cpp:119
-msgid "Specials"
-msgstr ""
-
#. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:124
+#: src/gui/windowmenu.cpp:112
msgid "SOC"
msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:126 src/gui/windows/socialwindow.cpp:1284
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
msgid "Social"
msgstr ""
#. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:128
+#: src/gui/windowmenu.cpp:116
msgid "SH"
msgstr ""
#. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:132
+#: src/gui/windowmenu.cpp:120
msgid "SP"
msgstr ""
#. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:124
msgid "DR"
msgstr ""
#. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:128
msgid "YK"
msgstr ""
#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:130
msgid "Did you know"
msgstr ""
#. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:144
+#: src/gui/windowmenu.cpp:132
msgid "SHP"
msgstr ""
#. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:148
+#: src/gui/windowmenu.cpp:136
msgid "OU"
msgstr ""
#. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:152
+#: src/gui/windowmenu.cpp:140
msgid "DBG"
msgstr ""
#. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:149
msgid "WIN"
msgstr ""
#. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:153
msgid "SET"
msgstr ""
#. TRANSLATORS: short key name
#. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:301 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
#: src/gui/windows/outfitwindow.cpp:561
#, c-format
msgid "Key: %s"
@@ -4893,31 +4953,21 @@ msgstr ""
msgid "Result"
msgstr ""
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:58
-msgid "unsorted"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:60
-msgid "by price"
-msgstr ""
-
#. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:196
+#: src/gui/windows/buydialog.cpp:162
msgid "Create items"
msgstr ""
#. TRANSLATORS: buy dialog label
#. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:254 src/gui/windows/buydialog.cpp:541
-#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:366
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
#, c-format
msgid "Price: %s / Total: %s"
msgstr ""
#. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:263
+#: src/gui/windows/buydialog.cpp:229
msgid "Amount:"
msgstr ""
@@ -4927,8 +4977,8 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/itemamountwindow.cpp:159
-#: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
msgid "+"
msgstr ""
@@ -4939,8 +4989,8 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:271 src/gui/windows/itemamountwindow.cpp:157
-#: src/gui/windows/itemamountwindow.cpp:191 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
msgid "-"
msgstr ""
@@ -4948,9 +4998,9 @@ msgstr ""
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:274 src/gui/windows/charcreatedialog.cpp:119
-#: src/gui/windows/charselectdialog.cpp:593
-#: src/gui/windows/socialwindow.cpp:1307
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
msgid "Create"
msgstr ""
@@ -4959,7 +5009,7 @@ msgstr ""
#. TRANSLATORS: status bar label
#. TRANSLATORS: status window label
#. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:278 src/gui/windows/selldialog.cpp:112
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
#: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
#: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
msgid "Max"
@@ -5058,7 +5108,7 @@ msgstr ""
#. TRANSLATORS: login dialog label
#. TRANSLATORS: register dialog. label.
#: src/gui/windows/charcreatedialog.cpp:73
-#: src/gui/windows/editserverdialog.cpp:89 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
#: src/gui/windows/registerdialog.cpp:89
msgid "Name:"
msgstr ""
@@ -5119,7 +5169,7 @@ msgstr ""
#. TRANSLATORS: char create dialog label
#: src/gui/windows/charcreatedialog.cpp:115
-#: src/gui/windows/charcreatedialog.cpp:469
+#: src/gui/windows/charcreatedialog.cpp:458
#, c-format
msgid "Please distribute %d points"
msgstr ""
@@ -5135,17 +5185,17 @@ msgid "Look:"
msgstr ""
#. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:362
+#: src/gui/windows/charcreatedialog.cpp:351
msgid "Your name needs to be at least 4 characters."
msgstr ""
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:459
+#: src/gui/windows/charcreatedialog.cpp:448
msgid "Character stats OK"
msgstr ""
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:475
+#: src/gui/windows/charcreatedialog.cpp:464
#, c-format
msgid "Please remove %d points"
msgstr ""
@@ -5174,7 +5224,7 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:104
-#: src/gui/windows/charselectdialog.cpp:588
+#: src/gui/windows/charselectdialog.cpp:580
#: src/gui/windows/updaterwindow.cpp:188
msgid "Play"
msgstr ""
@@ -5230,35 +5280,20 @@ msgstr ""
msgid "Enter password:"
msgstr ""
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:172
-msgid "rainbow 1"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:174
-msgid "rainbow 2"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:176
-msgid "rainbow 3"
-msgstr ""
-
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:755
+#: src/gui/windows/chatwindow.cpp:705
#, c-format
msgid "Present: %s; %d players are present."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1169
+#: src/gui/windows/chatwindow.cpp:1119
#, c-format
msgid "Whispering to %s: %s"
msgstr ""
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1613
+#: src/gui/windows/chatwindow.cpp:1563
#, c-format
msgid "%s's pet"
msgstr ""
@@ -5504,51 +5539,51 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:77
-#: src/gui/windows/itemamountwindow.cpp:161 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
msgid "OK"
msgstr ""
#. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:66
+#: src/gui/windows/editserverdialog.cpp:45
msgid "Edit Server"
msgstr ""
#. TRANSLATORS: edit server dialog button
#. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:75
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
msgid "Connect"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:91
+#: src/gui/windows/editserverdialog.cpp:70
msgid "Address:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:93
+#: src/gui/windows/editserverdialog.cpp:72
msgid "Port:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:95
+#: src/gui/windows/editserverdialog.cpp:74
msgid "Server type:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:97
+#: src/gui/windows/editserverdialog.cpp:76
msgid "Description:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:99
+#: src/gui/windows/editserverdialog.cpp:78
msgid "Online list url:"
msgstr ""
#. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:220
+#: src/gui/windows/editserverdialog.cpp:188
msgid "Please at least type both the address and the port of the server."
msgstr ""
@@ -5568,47 +5603,47 @@ msgid "Did you know..."
msgstr ""
#. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:165
+#: src/gui/windows/itemamountwindow.cpp:164
msgid "All"
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:221
+#: src/gui/windows/itemamountwindow.cpp:220
msgid "Select amount of items to trade."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:225
+#: src/gui/windows/itemamountwindow.cpp:224
msgid "Select amount of items to drop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:229
+#: src/gui/windows/itemamountwindow.cpp:228
msgid "Select amount of items to store."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:233
+#: src/gui/windows/itemamountwindow.cpp:232
msgid "Select amount of items to retrieve."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:237
+#: src/gui/windows/itemamountwindow.cpp:236
msgid "Select amount of items to split."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:241
+#: src/gui/windows/itemamountwindow.cpp:240
msgid "Add to buy shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:245
+#: src/gui/windows/itemamountwindow.cpp:244
msgid "Add to sell shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:249
+#: src/gui/windows/itemamountwindow.cpp:248
msgid "Unknown."
msgstr ""
@@ -5860,7 +5895,7 @@ msgstr ""
#. TRANSLATORS: shop window label
#. TRANSLATORS: shop window button
#. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:258
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
#: src/gui/windows/tradewindow.cpp:78
msgid "Add"
@@ -5962,53 +5997,53 @@ msgid "Do you really want to sell %s?"
msgstr ""
#. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
msgid "Choose Your Server"
msgstr ""
#. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
msgid "Load"
msgstr ""
#. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
msgid "Choose Your Server *** SAFE MODE ***"
msgstr ""
#. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
msgid "Use same ip for game sub servers"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
msgid "Waiting for server..."
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
msgid "Preparing download"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
msgid "Error retreiving server list!"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
msgid "requires a newer version"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
#, c-format
msgid "requires v%s"
msgstr ""
@@ -6089,277 +6124,277 @@ msgid "Skill %d"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:225
+#: src/gui/windows/socialwindow.cpp:227
#, c-format
msgid "Invited user %s to guild %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:240
+#: src/gui/windows/socialwindow.cpp:242
#, c-format
msgid "Guild %s quit requested."
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:254
+#: src/gui/windows/socialwindow.cpp:256
msgid "Member Invite to Guild"
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:256
+#: src/gui/windows/socialwindow.cpp:258
#, c-format
msgid "Who would you like to invite to guild %s?"
msgstr ""
#. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:266
+#: src/gui/windows/socialwindow.cpp:268
msgid "Leave Guild?"
msgstr ""
#. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:268
+#: src/gui/windows/socialwindow.cpp:270
#, c-format
msgid "Are you sure you want to leave guild %s?"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:279
+#: src/gui/windows/socialwindow.cpp:281
#, c-format
msgid "Members: %u/%u"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:301 src/gui/windows/socialwindow.cpp:373
-#: src/gui/windows/socialwindow.cpp:498
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
#, c-format
msgid "Players: %u/%u"
msgstr ""
#. TRANSLATORS: tab in social window
#. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:389 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
msgid "Party"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:429
+#: src/gui/windows/socialwindow.cpp:431
#, c-format
msgid "Invited user %s to party."
msgstr ""
#. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:444
+#: src/gui/windows/socialwindow.cpp:446
#, c-format
msgid "Party %s quit requested."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:458
+#: src/gui/windows/socialwindow.cpp:460
msgid "Member Invite to Party"
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:460
+#: src/gui/windows/socialwindow.cpp:462
#, c-format
msgid "Who would you like to invite to party %s?"
msgstr ""
#. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:470
+#: src/gui/windows/socialwindow.cpp:472
msgid "Leave Party?"
msgstr ""
#. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:472
+#: src/gui/windows/socialwindow.cpp:474
#, c-format
msgid "Are you sure you want to leave party %s?"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:698
+#: src/gui/windows/socialwindow.cpp:665
#, c-format
msgid "Visible players: %d"
msgstr ""
#. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:725
+#: src/gui/windows/socialwindow.cpp:692
msgid "Nav"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:827
+#: src/gui/windows/socialwindow.cpp:794
#, c-format
msgid "Portals: %u/%u"
msgstr ""
#. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1054
+#: src/gui/windows/socialwindow.cpp:1021
msgid "Atk"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1073
+#: src/gui/windows/socialwindow.cpp:1040
msgid "Priority mobs"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1075
+#: src/gui/windows/socialwindow.cpp:1042
msgid "Attack mobs"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1077
+#: src/gui/windows/socialwindow.cpp:1044
msgid "Ignore mobs"
msgstr ""
#. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1101
+#: src/gui/windows/socialwindow.cpp:1068
msgid "Pik"
msgstr ""
#. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1120
+#: src/gui/windows/socialwindow.cpp:1087
msgid "Pickup items"
msgstr ""
#. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1122
+#: src/gui/windows/socialwindow.cpp:1089
msgid "Ignore items"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1212
+#: src/gui/windows/socialwindow.cpp:1179
#, c-format
msgid "Friends: %u/%u"
msgstr ""
#. TRANSLATORS: party popup item
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1235 src/gui/windows/socialwindow.cpp:1727
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
msgid "Create Party"
msgstr ""
#. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1298
+#: src/gui/windows/socialwindow.cpp:1265
msgid "P"
msgstr ""
#. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1303
+#: src/gui/windows/socialwindow.cpp:1270
msgid "F"
msgstr ""
#. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1309
+#: src/gui/windows/socialwindow.cpp:1276
msgid "Invite"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1503
+#: src/gui/windows/socialwindow.cpp:1470
#, c-format
msgid "Accepted party invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1514
+#: src/gui/windows/socialwindow.cpp:1481
#, c-format
msgid "Rejected party invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1531
+#: src/gui/windows/socialwindow.cpp:1498
#, c-format
msgid "Accepted guild invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1545
+#: src/gui/windows/socialwindow.cpp:1512
#, c-format
msgid "Rejected guild invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1585
+#: src/gui/windows/socialwindow.cpp:1552
#, c-format
msgid "Creating guild called %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1606
+#: src/gui/windows/socialwindow.cpp:1573
#, c-format
msgid "Creating party called %s."
msgstr ""
#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1621
+#: src/gui/windows/socialwindow.cpp:1588
msgid "Guild Name"
msgstr ""
#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1623
+#: src/gui/windows/socialwindow.cpp:1590
msgid "Choose your guild's name."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1639
+#: src/gui/windows/socialwindow.cpp:1606
msgid "Received guild request, but one already exists."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1647
+#: src/gui/windows/socialwindow.cpp:1614
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1654
+#: src/gui/windows/socialwindow.cpp:1621
msgid "Accept Guild Invite"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1670
+#: src/gui/windows/socialwindow.cpp:1637
msgid "Received party request, but one already exists."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1682
+#: src/gui/windows/socialwindow.cpp:1649
msgid "You have been invited you to join a party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1687
+#: src/gui/windows/socialwindow.cpp:1654
#, c-format
msgid "You have been invited to join the %s party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1696
+#: src/gui/windows/socialwindow.cpp:1663
#, c-format
msgid "%s has invited you to join their party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1702
+#: src/gui/windows/socialwindow.cpp:1669
#, c-format
msgid "%s has invited you to join the %s party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1712
+#: src/gui/windows/socialwindow.cpp:1679
msgid "Accept Party Invite"
msgstr ""
-#: src/gui/windows/socialwindow.cpp:1728
+#: src/gui/windows/socialwindow.cpp:1695
msgid "Cannot create party. You are already in a party"
msgstr ""
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1734
+#: src/gui/windows/socialwindow.cpp:1701
msgid "Party Name"
msgstr ""
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1736
+#: src/gui/windows/socialwindow.cpp:1703
msgid "Choose your party's name."
msgstr ""
@@ -6401,113 +6436,68 @@ msgstr ""
msgid "Correction points: %d"
msgstr ""
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "No Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Allow Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:105
-msgid "Need Target"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "General Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "Life Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "War Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Transmute Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Nature Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:121
-msgid "Astral Magic"
-msgstr ""
-
#. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:164
+#: src/gui/windows/textcommandeditor.cpp:47
msgid "Command Editor"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:52
msgid "magic"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:54
msgid "other"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:173
+#: src/gui/windows/textcommandeditor.cpp:56
msgid "Symbol:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:176
+#: src/gui/windows/textcommandeditor.cpp:59
msgid "Command:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:179
+#: src/gui/windows/textcommandeditor.cpp:62
msgid "Comment:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:183
+#: src/gui/windows/textcommandeditor.cpp:66
msgid "Target Type:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:187
+#: src/gui/windows/textcommandeditor.cpp:70
msgid "Icon:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:190
+#: src/gui/windows/textcommandeditor.cpp:73
msgid "Mana:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:193
+#: src/gui/windows/textcommandeditor.cpp:76
msgid "Magic level:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:197
+#: src/gui/windows/textcommandeditor.cpp:80
msgid "Magic School:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:200
+#: src/gui/windows/textcommandeditor.cpp:83
msgid "School level:"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/windows/textcommandeditor.cpp:88
msgid "Save"
msgstr ""
@@ -6537,7 +6527,7 @@ msgid "Trade: You"
msgstr ""
#. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
#, c-format
msgid "You get %s"
msgstr ""
@@ -6553,12 +6543,12 @@ msgid "You give:"
msgstr ""
#. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
msgid "You don't have enough money."
msgstr ""
#. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
msgid ""
"Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
@@ -6629,17 +6619,17 @@ msgid "Who Is Online - Update"
msgstr ""
#. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:87
+#: src/gui/windows/worldselectdialog.cpp:49
msgid "Select World"
msgstr ""
#. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:93
+#: src/gui/windows/worldselectdialog.cpp:55
msgid "Change Login"
msgstr ""
#. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:95
+#: src/gui/windows/worldselectdialog.cpp:57
msgid "Choose World"
msgstr ""
@@ -6857,7 +6847,7 @@ msgid "Failed to create character. Most likely the name is already taken."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:281
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
msgid "Wrong name."
msgstr ""
@@ -7015,58 +7005,58 @@ msgid "Experience sharing unknown."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:154
+#: src/net/ea/loginhandler.cpp:149
msgid "Account was not found. Please re-login."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/ea/loginhandler.cpp:153
msgid "Old password incorrect."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:162
+#: src/net/ea/loginhandler.cpp:157
msgid "New password too short."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:166 src/net/ea/loginhandler.cpp:293
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
msgid "Unknown error."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:239
+#: src/net/ea/loginhandler.cpp:234
msgid "Unregistered ID."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:238
msgid "Wrong password."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:248
+#: src/net/ea/loginhandler.cpp:243
msgid "Account expired."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:252
+#: src/net/ea/loginhandler.cpp:247
msgid "Rejected from server."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:256
+#: src/net/ea/loginhandler.cpp:251
msgid ""
"You have been permanently banned from the game. Please contact the GM team."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:261
+#: src/net/ea/loginhandler.cpp:256
msgid "Client too old."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:265
+#: src/net/ea/loginhandler.cpp:260
#, c-format
msgid ""
"You have been temporarily banned from the game until %s.\n"
@@ -7074,22 +7064,22 @@ msgid ""
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:273
+#: src/net/ea/loginhandler.cpp:268
msgid "Server overpopulated."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:277
+#: src/net/ea/loginhandler.cpp:272
msgid "This user name is already taken."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:285
+#: src/net/ea/loginhandler.cpp:280
msgid "Incorrect email."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:289
+#: src/net/ea/loginhandler.cpp:284
msgid "Username permanently erased."
msgstr ""
@@ -7762,7 +7752,7 @@ msgstr ""
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
#: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr ""
diff --git a/po/ca.po b/po/ca.po
index 036dd00bd..f9c94fb88 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-23 00:42+0300\n"
-"PO-Revision-Date: 2014-02-23 08:14+0000\n"
+"POT-Creation-Date: 2014-02-28 21:21+0300\n"
+"PO-Revision-Date: 2014-03-01 08:14+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"
@@ -30,7 +30,7 @@ msgid "Accepting incoming trade requests"
msgstr "Acceptant sol·licituds d'intercanvi"
#. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
msgid "Visible on map"
msgstr ""
@@ -39,68 +39,68 @@ msgstr ""
msgid "Human"
msgstr ""
-#: src/being/being.cpp:544
+#: src/being/being.cpp:496
msgid "dodge"
msgstr "esquiva "
-#: src/being/being.cpp:544
+#: src/being/being.cpp:496
msgid "miss"
msgstr "falla"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1965 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1970 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr ""
#. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:392
+#: src/being/localplayer.cpp:376
#, c-format
msgid "You were killed by %s"
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1377
+#: src/being/localplayer.cpp:816
msgid "Tried to pick up nonexistent item."
msgstr "Has intentat agafar un objecte inexistent. "
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1381
+#: src/being/localplayer.cpp:820
msgid "Item is too heavy."
msgstr "L'objecte es massa pesant. "
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1385
+#: src/being/localplayer.cpp:824
msgid "Item is too far away."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1389
+#: src/being/localplayer.cpp:828
msgid "Inventory is full."
msgstr "L'inventari està complet. "
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1393
+#: src/being/localplayer.cpp:832
msgid "Stack is too big."
msgstr "La pila d'objectes es massa gran. "
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1397
+#: src/being/localplayer.cpp:836
msgid "Item belongs to someone else."
msgstr "L'objecte pertany a una altra persona. "
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1401
+#: src/being/localplayer.cpp:840
msgid "Unknown problem picking up item."
msgstr "Problema desconegut al agafar l'objecte. "
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:1425
+#: src/being/localplayer.cpp:864
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -108,387 +108,387 @@ msgstr[0] "Has recollit %d [@@%d|%s@@]. "
msgstr[1] "Has recollit %d [@@%d|%s@@]. "
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1630 src/being/localplayer.cpp:1665
-#: src/being/localplayer.cpp:1666
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
msgid "xp"
msgstr ""
-#: src/being/localplayer.cpp:1671 src/being/localplayer.cpp:1678
-#: src/being/localplayer.cpp:1685
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
msgid "job"
msgstr "treball "
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1871
+#: src/being/localplayer.cpp:1285
msgid "(D) default moves"
msgstr "(D) Moviments per defecte"
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1873
+#: src/being/localplayer.cpp:1287
msgid "(I) invert moves"
msgstr "(I) Invertir moviments "
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1875
+#: src/being/localplayer.cpp:1289
msgid "(c) moves with some crazy moves"
msgstr "(c) moure's amb alguns moviments boigs "
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1877
+#: src/being/localplayer.cpp:1291
msgid "(C) moves with crazy moves"
msgstr "(c) Mou-te amb moviments boigs "
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1879
+#: src/being/localplayer.cpp:1293
msgid "(d) double normal + crazy"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1881
+#: src/being/localplayer.cpp:1295
msgid "(?) unknown move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1904
+#: src/being/localplayer.cpp:1318
#, c-format
msgid "(%u) crazy move number %u"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1910
+#: src/being/localplayer.cpp:1324
msgid "(a) custom crazy move"
msgstr "(a) moviment boig personalitzat"
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1915
+#: src/being/localplayer.cpp:1329
msgid "(?) crazy move"
msgstr "(?) moviment boig "
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1930
+#: src/being/localplayer.cpp:1344
msgid "(0) default moves to target"
msgstr "(0) moviment a objectiu per defecte "
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1932
+#: src/being/localplayer.cpp:1346
msgid "(1) moves to target in distance 1"
msgstr "(1) mou-te al objectiu a la distància 1 "
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1934
+#: src/being/localplayer.cpp:1348
msgid "(2) moves to target in distance 2"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1936
+#: src/being/localplayer.cpp:1350
msgid "(3) moves to target in distance 3"
msgstr "(3) mou-te al objectiu a la distància 3 "
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1938
+#: src/being/localplayer.cpp:1352
msgid "(5) moves to target in distance 5"
msgstr "(5) mou-te al objectiu a la distància 5 "
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1940
+#: src/being/localplayer.cpp:1354
msgid "(7) moves to target in distance 7"
msgstr "(7) mou-te al objectiu a la distància 7"
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1942
+#: src/being/localplayer.cpp:1356
msgid "(A) moves to target in attack range"
msgstr "(A) mou-te al objectiu a la distància d'atac "
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1944
+#: src/being/localplayer.cpp:1358
msgid "(a) archer attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1946
+#: src/being/localplayer.cpp:1360
msgid "(B) moves to target in attack range - 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1948
+#: src/being/localplayer.cpp:1362
msgid "(?) move to target"
msgstr "(?) mou-te al objectiu "
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1968
+#: src/being/localplayer.cpp:1382
msgid "(D) default follow"
msgstr "(D) seguiment per defecte "
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1970
+#: src/being/localplayer.cpp:1384
msgid "(R) relative follow"
msgstr "(R) seguiment relatiu "
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1972
+#: src/being/localplayer.cpp:1386
msgid "(M) mirror follow"
msgstr "(M) seguiment tipus mirall "
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1974
+#: src/being/localplayer.cpp:1388
msgid "(P) pet follow"
msgstr "(P) seguiment de mascota "
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1976
+#: src/being/localplayer.cpp:1390
msgid "(?) unknown follow"
msgstr "(?) seguiment desconegut"
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1996 src/being/localplayer.cpp:2004
-#: src/being/localplayer.cpp:2032
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
msgid "(?) attack"
msgstr "(?) atac "
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1998 src/being/localplayer.cpp:2024
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
msgid "(D) default attack"
msgstr "(D) atac per defecte "
#. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2000
+#: src/being/localplayer.cpp:1414
msgid "(s) switch attack without shield"
msgstr "(s) selecciona atac sense escut "
#. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2002
+#: src/being/localplayer.cpp:1416
msgid "(S) switch attack with shield"
msgstr "(S) selecciona atac amb escut "
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2026
+#: src/being/localplayer.cpp:1440
msgid "(G) go and attack"
msgstr "(G) ves i ataca "
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2028
+#: src/being/localplayer.cpp:1442
msgid "(A) go, attack, pickup"
msgstr "(A) ves, ataca i agafa"
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2030
+#: src/being/localplayer.cpp:1444
msgid "(d) without auto attack"
msgstr "(d) sense auto atac "
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2084
+#: src/being/localplayer.cpp:1498
msgid "(S) small pick up 1x1 cells"
msgstr "(S) àrea de recollida petita 1x1"
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2086
+#: src/being/localplayer.cpp:1500
msgid "(D) default pick up 2x1 cells"
msgstr "(D) àrea de recollida per defecte 2x1 "
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2088
+#: src/being/localplayer.cpp:1502
msgid "(F) forward pick up 2x3 cells"
msgstr "(F) àrea àmplia de recollida 2x3 "
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2090
+#: src/being/localplayer.cpp:1504
msgid "(3) pick up 3x3 cells"
msgstr "(3) àrea de recollida 3x3 "
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2092
+#: src/being/localplayer.cpp:1506
msgid "(g) go and pick up in distance 4"
msgstr "(g) agafa a una distància de 4 "
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2094
+#: src/being/localplayer.cpp:1508
msgid "(G) go and pick up in distance 8"
msgstr "(G) agafa a una distància de 8 "
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2096
+#: src/being/localplayer.cpp:1510
msgid "(A) go and pick up in max distance"
msgstr "(A) agafa a distància màxima "
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2098
+#: src/being/localplayer.cpp:1512
msgid "(?) pick up"
msgstr "(?) agafa "
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2112
+#: src/being/localplayer.cpp:1526
msgid "(N) normal map view"
msgstr "(N) Visualització de mapa normal "
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2114
+#: src/being/localplayer.cpp:1528
msgid "(D) debug map view"
msgstr "(D) visualització de mapa \"depurador\" "
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2116
+#: src/being/localplayer.cpp:1530
msgid "(u) ultra map view"
msgstr "(u) visualització de mapa ultra "
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2118
+#: src/being/localplayer.cpp:1532
msgid "(U) ultra map view 2"
msgstr "(U) visualització de mapa ultra 2 "
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2120
+#: src/being/localplayer.cpp:1534
msgid "(e) empty map view"
msgstr "(e) visualització de mapa buida "
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2122
+#: src/being/localplayer.cpp:1536
msgid "(b) black & white map view"
msgstr "(b) visualització de mapa blanc i negre "
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2142
+#: src/being/localplayer.cpp:1556
msgid "(f) use #flar for magic attack"
msgstr "(f) Utilitza #flar per a atac màgic "
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2144
+#: src/being/localplayer.cpp:1558
msgid "(c) use #chiza for magic attack"
msgstr "(c) utilitza #chiza per a atac màgic "
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2146
+#: src/being/localplayer.cpp:1560
msgid "(I) use #ingrav for magic attack"
msgstr "(I) utilitza #igrav per a atac màgic "
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2148
+#: src/being/localplayer.cpp:1562
msgid "(F) use #frillyar for magic attack"
msgstr "(F) utilitza #chiza per a atac màgic "
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2150
+#: src/being/localplayer.cpp:1564
msgid "(U) use #upmarmu for magic attack"
msgstr "(U) utilitza #upmarmu per a atac màgic "
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2152
+#: src/being/localplayer.cpp:1566
msgid "(?) magic attack"
msgstr "(?) atac màgic "
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2172
+#: src/being/localplayer.cpp:1586
msgid "(a) attack all players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2174
+#: src/being/localplayer.cpp:1588
msgid "(f) attack all except friends"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2176
+#: src/being/localplayer.cpp:1590
msgid "(b) attack bad relations"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2178
+#: src/being/localplayer.cpp:1592
msgid "(d) don't attack players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2180
+#: src/being/localplayer.cpp:1594
msgid "(?) pvp attack"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2200
+#: src/being/localplayer.cpp:1614
msgid "(D) default imitation"
msgstr "(D) imitació per defecte "
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2202
+#: src/being/localplayer.cpp:1616
msgid "(O) outfits imitation"
msgstr "(O) imitació de vestimenta "
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2204
+#: src/being/localplayer.cpp:1618
msgid "(?) imitation"
msgstr "(?) imitació "
#. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2233
+#: src/being/localplayer.cpp:1647
msgid "Away"
msgstr "Lluny del teclat "
#. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2256
+#: src/being/localplayer.cpp:1670
msgid "(O) on keyboard"
msgstr "(O) al teclat "
#. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2258
+#: src/being/localplayer.cpp:1672
msgid "(A) away"
msgstr "(A) absent "
#. TRANSLATORS: away type in status bar
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2260 src/being/localplayer.cpp:2278
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
msgid "(?) away"
msgstr "(?) absent "
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2274
+#: src/being/localplayer.cpp:1688
msgid "(G) game camera mode"
msgstr "(G) mode càmera de joc "
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2276
+#: src/being/localplayer.cpp:1690
msgid "(F) free camera mode"
msgstr "(F) mode de càmera lliure "
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2303
+#: src/being/localplayer.cpp:1717
msgid "Game modifiers are enabled"
msgstr "Els modificadors de joc estan activats "
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2305
+#: src/being/localplayer.cpp:1719
msgid "Game modifiers are disabled"
msgstr "Els modificadors de joc estan desactivats "
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2307
+#: src/being/localplayer.cpp:1721
msgid "Game modifiers are unknown"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3887
+#: src/being/localplayer.cpp:3287
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3893 src/being/localplayer.cpp:3918
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3903
+#: src/being/localplayer.cpp:3303
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3909 src/being/localplayer.cpp:3923
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4266
+#: src/being/localplayer.cpp:3666
#, c-format
msgid "You see %s"
msgstr ""
@@ -526,32 +526,32 @@ msgstr "Bombolla flotant "
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1139 src/gui/windowmenu.cpp:167
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
#: src/gui/windows/setupwindow.cpp:61
msgid "Setup"
msgstr "Configuració "
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1143 src/gui/widgets/tabs/setup_perfomance.cpp:51
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1146 src/gui/widgets/tabs/setup_video.cpp:225
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:225
msgid "Video"
msgstr "Vídeo "
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1149 src/gui/widgets/tabs/setup_theme.cpp:269
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
msgid "Theme"
msgstr "Tema "
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1152 src/gui/windowmenu.cpp:74
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr "Ajuda "
@@ -564,41 +564,41 @@ msgstr "Ajuda "
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1156 src/gui/popups/popupmenu.cpp:619
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
#: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:69
-#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:138
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
#: src/gui/windows/shopwindow.cpp:78
msgid "Close"
msgstr "Tancar"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr "Connectant al servidor"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1324
msgid "Logging in"
msgstr "Iniciant sessió "
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1367
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr "Entrant al mon de joc "
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1492
+#: src/client.cpp:1489
msgid "Requesting characters"
msgstr "Sol·licitant personatges "
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1532
+#: src/client.cpp:1529
msgid "Connecting to the game server"
msgstr "Connectant al servidor de joc "
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1545
+#: src/client.cpp:1541
msgid "Changing game servers"
msgstr "Canviant servidors de joc"
@@ -613,12 +613,12 @@ msgstr "Canviant servidors de joc"
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1606 src/client.cpp:1617 src/client.cpp:1801
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:349
#: src/gui/windows/charselectdialog.cpp:299
-#: src/gui/windows/editserverdialog.cpp:218
+#: src/gui/windows/editserverdialog.cpp:186
#: src/gui/windows/registerdialog.cpp:260
#: src/gui/windows/unregisterdialog.cpp:146
#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
@@ -626,65 +626,65 @@ msgid "Error"
msgstr "Error "
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1629
+#: src/client.cpp:1625
msgid "Requesting registration details"
msgstr "Sol·licitant detalls de registre"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1670
+#: src/client.cpp:1666
msgid "Password Change"
msgstr "Canvi de contrasenya "
#. TRANSLATORS: password change message text
-#: src/client.cpp:1672
+#: src/client.cpp:1668
msgid "Password changed successfully!"
msgstr "Contrasenya canviada amb èxit! "
#. TRANSLATORS: email change message header
-#: src/client.cpp:1694
+#: src/client.cpp:1690
msgid "Email Change"
msgstr "Canvi de correu "
#. TRANSLATORS: email change message text
-#: src/client.cpp:1696
+#: src/client.cpp:1692
msgid "Email changed successfully!"
msgstr "Correu canviat amb èxit! "
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1719
+#: src/client.cpp:1715
msgid "Unregister Successful"
msgstr "Registre anul·lat amb èxit "
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1721
+#: src/client.cpp:1717
msgid "Farewell, come back any time..."
msgstr "Adéu, torna quan vulguis... "
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1998 src/client.cpp:2013 src/client.cpp:2058
-#: src/client.cpp:2074 src/client.cpp:2525 src/client.cpp:2533
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s no existeix i no pot ser creat! Sortint."
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2230
+#: src/client.cpp:2232
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2271 src/client.cpp:2278
+#: src/client.cpp:2273 src/client.cpp:2280
msgid "Error creating updates directory!"
msgstr "Error creant el directori d'actualitzacions! "
-#: src/client.cpp:2300 src/client.cpp:2317
+#: src/client.cpp:2302 src/client.cpp:2319
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Error: %s no existeix i no pot ser creat! Sortint."
#. TRANSLATORS: error message question
-#: src/client.cpp:3001
+#: src/client.cpp:3003
msgid "Do you want to open support page?"
msgstr ""
@@ -930,99 +930,154 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:277 src/gui/widgets/tabs/chattab.cpp:464
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
msgid "General"
msgstr "General"
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:293 src/gui/widgets/tabs/chattab.cpp:466
-#: src/gui/windowmenu.cpp:154 src/gui/windows/debugwindow.cpp:53
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
msgid "Debug"
msgstr "Depurador "
#. TRANSLATORS: save file message
-#: src/game.cpp:575
+#: src/game.cpp:563
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:585
+#: src/game.cpp:573
msgid "Saving screenshot failed!"
msgstr "Error al guardar la captura de pantalla! "
#. TRANSLATORS: error message text
-#: src/game.cpp:656
+#: src/game.cpp:644
msgid "The connection to the server was lost."
msgstr "S'ha perdut la connexió amb el servidor."
#. TRANSLATORS: error message header
-#: src/game.cpp:659
+#: src/game.cpp:647
msgid "Network Error"
msgstr "Error de xarxa "
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
+msgstr "Per defecte "
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
msgid "black"
msgstr "negre"
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
msgid "red"
msgstr "roig"
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
msgid "green"
msgstr "verd"
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
msgid "blue"
msgstr "blau "
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
msgid "gold"
msgstr "daurat"
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
msgid "yellow"
msgstr "groc"
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
msgid "pink"
msgstr "rosa"
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
msgid "purple"
msgstr "lila"
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
msgid "grey"
msgstr "gris"
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
msgid "brown"
msgstr "marró "
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr "arc de sant martí 1"
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr "arc de sant martí 2"
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr "arc de sant martí 3"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr "Màgia General "
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr "Màgia de Vida "
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr "Màgia de Guerra "
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr "Màgia de Transmutació "
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr "Màgia de la Natura "
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr "Màgia Astral "
+
#. TRANSLATORS: relation type
#: src/gui/models/playerrelationlistmodel.h:33
msgid "Neutral"
@@ -1058,46 +1113,61 @@ msgstr ""
msgid "Enemy"
msgstr ""
-#. TRANSLATORS: inventory sort mode
-#. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#: src/gui/models/sortlistmodelinv.h:34
-#: src/gui/widgets/tabs/setup_other.cpp:72
-#: src/gui/widgets/tabs/setup_visual.cpp:78 src/gui/windows/chatwindow.cpp:150
-msgid "default"
-msgstr "Per defecte "
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
+msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:36 src/gui/windows/buydialog.cpp:62
-msgid "by name"
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
msgstr ""
+#. TRANSLATORS: buy dialog sort type.
#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
+msgid "by name"
+msgstr ""
+
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:38 src/gui/windows/buydialog.cpp:64
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
msgid "by id"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:40 src/gui/windows/buydialog.cpp:66
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
msgid "by weight"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:42 src/gui/windows/buydialog.cpp:68
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
msgid "by amount"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:44 src/gui/windows/buydialog.cpp:70
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
msgid "by type"
msgstr ""
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr "Cap objectiu "
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr "Habilita objectiu "
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr "Es necessita objectiu"
+
#. TRANSLATORS: update type
#. TRANSLATORS: onscreen button size
#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
@@ -1244,8 +1314,8 @@ msgstr "Parlar "
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
-#: src/gui/windows/buydialog.cpp:208 src/gui/windows/buydialog.cpp:220
-#: src/gui/windows/buydialog.cpp:274 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
msgid "Buy"
msgstr "Comprar"
@@ -1342,12 +1412,12 @@ msgstr ""
#: src/gui/windows/changepassworddialog.cpp:57
#: src/gui/windows/charcreatedialog.cpp:121
#: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:79
-#: src/gui/windows/itemamountwindow.cpp:163
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
-#: src/gui/windows/socialwindow.cpp:1238
-#: src/gui/windows/textcommandeditor.cpp:203 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:54
#: src/gui/windows/updaterwindow.cpp:186
msgid "Cancel"
@@ -1419,7 +1489,7 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:150 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
msgstr "Conjunt "
@@ -1432,7 +1502,7 @@ msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:134
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
msgid "Spells"
msgstr "Conjurs "
@@ -1488,7 +1558,7 @@ msgstr "Des-habilita absència "
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
#. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1311
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
msgid "Leave"
msgstr "Deixa"
@@ -1569,8 +1639,8 @@ msgstr "Agregar-los tots al intercanvi "
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
-#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:223
-#: src/gui/windows/inventorywindow.cpp:745 src/gui/windows/setupwindow.cpp:96
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
msgid "Store"
msgstr "Botiga "
@@ -1601,7 +1671,7 @@ msgstr "Emmagatzema-ho tot"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
msgid "Retrieve"
msgstr "Recuperar "
@@ -1634,8 +1704,8 @@ msgstr "Recupera-ho tot"
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
-#: src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:656 src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr "Utilitzar "
@@ -1669,8 +1739,8 @@ msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: language
#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/widgets/tabs/setup_theme.cpp:127
-#: src/gui/windows/socialwindow.cpp:1003
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
msgid "(default)"
msgstr ""
@@ -1826,8 +1896,8 @@ msgstr ""
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:645
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
msgid "Unequip"
msgstr "Des-equipar "
@@ -1835,16 +1905,16 @@ msgstr "Des-equipar "
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:172
-#: src/gui/windows/inventorywindow.cpp:650 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr "Equipar "
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:189
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
msgid "Drop..."
msgstr "Deixar caure... "
@@ -1858,15 +1928,15 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:138
-#: src/gui/windows/inventorywindow.cpp:758
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
msgid "Drop"
msgstr "Deixar caure "
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
msgid "Split"
msgstr "Dividir "
@@ -2022,10 +2092,10 @@ msgstr "Selecciona OK "
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:276
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/windows/serverdialog.cpp:198
msgid "Quit"
msgstr "Sortir"
@@ -2587,7 +2657,7 @@ msgstr ""
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: register dialog. button.
#: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:146
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:330
#: src/gui/widgets/tabs/setup_visual.cpp:189
@@ -2614,9 +2684,8 @@ msgstr ""
#. TRANSLATORS: command editor button
#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
#: src/gui/windows/charselectdialog.cpp:108
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:94
-#: src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/textcommandeditor.cpp:207
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
msgid "Delete"
msgstr "Esborra "
@@ -2652,7 +2721,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:130
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
msgid "Shortcuts"
msgstr "Dreceres "
@@ -2660,7 +2729,7 @@ msgstr "Dreceres "
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:151
msgid "Windows"
msgstr ""
@@ -2676,7 +2745,7 @@ msgstr ""
#. TRANSLATORS: settings tab name
#. TRANSLATORS: chat window name
#: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:88 src/gui/windows/chatwindow.cpp:203
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
msgid "Chat"
msgstr "Xat "
@@ -2899,7 +2968,7 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:137
-#: src/gui/windows/inventorywindow.cpp:569
+#: src/gui/windows/inventorywindow.cpp:568
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
#, c-format
@@ -2919,7 +2988,7 @@ msgstr ""
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/windows/serverdialog.cpp:204
msgid "Edit"
msgstr "Editar"
@@ -2972,7 +3041,7 @@ msgstr ""
#. TRANSLATORS: tab in social window
#. TRANSLATORS: guild chat tab name
#: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:184 src/gui/windows/socialwindow.cpp:320
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
#: src/net/ea/gui/guildtab.cpp:44
msgid "Guild"
msgstr "Gremi "
@@ -2983,142 +3052,142 @@ msgid "Lang"
msgstr ""
#. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:49
+#: src/gui/widgets/tabs/setup_audio.cpp:48
msgid "Audio"
msgstr "Àudio "
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:57
+#: src/gui/widgets/tabs/setup_audio.cpp:56
msgid "Basic settings"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:60
+#: src/gui/widgets/tabs/setup_audio.cpp:59
msgid "Enable Audio"
msgstr "Permet Àudio "
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:63
+#: src/gui/widgets/tabs/setup_audio.cpp:62
msgid "Enable music"
msgstr "Permet música "
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:67
+#: src/gui/widgets/tabs/setup_audio.cpp:66
msgid "Enable game sfx"
msgstr "Permet sfx del joc"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:71
+#: src/gui/widgets/tabs/setup_audio.cpp:70
msgid "Enable gui sfx"
msgstr "Permet sfx del gremi "
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:74
msgid "Sfx volume"
msgstr "Volum de sfx "
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:78
msgid "Music volume"
msgstr "Volum de la música "
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:82
msgid "Enable music fade out"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:86
msgid "Audio frequency"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:90
msgid "mono"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:93
+#: src/gui/widgets/tabs/setup_audio.cpp:92
msgid "stereo"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:94
msgid "surround"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:97
+#: src/gui/widgets/tabs/setup_audio.cpp:96
msgid "surround+center+lfe"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:98
msgid "Audio channels"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:104
+#: src/gui/widgets/tabs/setup_audio.cpp:103
msgid "Sound effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:106
msgid "Information dialog sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:110
msgid "Request dialog sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:115
+#: src/gui/widgets/tabs/setup_audio.cpp:114
msgid "Whisper message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:118
msgid "Guild / Party message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:122
msgid "Highlight message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:126
msgid "Global message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:130
msgid "Error message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:134
msgid "Trade request sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:138
msgid "Show window sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:142
msgid "Hide window sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:150
msgid "Enable mumble voice chat"
msgstr "Permet xat de veu de mumble "
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:156
+#: src/gui/widgets/tabs/setup_audio.cpp:155
msgid "Download music"
msgstr "Descarregar música "
@@ -3414,7 +3483,7 @@ msgstr "Conflicte entre les tecles \"%s\" i \"%s\". Resol-lo, o la jugabilitat p
#. TRANSLATORS: unknown key name
#. TRANSLATORS: quests window quest name
#: src/gui/widgets/tabs/setup_input.cpp:364
-#: src/gui/windows/questswindow.cpp:263
+#: src/gui/windows/questswindow.cpp:249
msgid "unknown"
msgstr ""
@@ -3573,7 +3642,7 @@ msgstr "Encercla objectiu del monstre "
#. TRANSLATORS: settings group
#. TRANSLATORS: debug window tab
#. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:105
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
#: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
#: src/gui/windows/minimap.cpp:114
msgid "Map"
@@ -3741,9 +3810,9 @@ msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: shop window name
#. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:146
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
#: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windows/inventorywindow.cpp:194
msgid "Shop"
msgstr "Botiga "
@@ -4125,252 +4194,252 @@ msgid "When ignoring:"
msgstr "Quan ignoris: "
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:64
+#: src/gui/widgets/tabs/setup_theme.cpp:63
msgid "Very small (8)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:66
+#: src/gui/widgets/tabs/setup_theme.cpp:65
msgid "Very small (9)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:68
+#: src/gui/widgets/tabs/setup_theme.cpp:67
msgid "Tiny (10)"
msgstr "Diminut (10)"
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:70
+#: src/gui/widgets/tabs/setup_theme.cpp:69
msgid "Small (11)"
msgstr "Petit (11)"
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:72
+#: src/gui/widgets/tabs/setup_theme.cpp:71
msgid "Medium (12)"
msgstr "Mitjà (12) "
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:74
+#: src/gui/widgets/tabs/setup_theme.cpp:73
msgid "Normal (13)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:76
+#: src/gui/widgets/tabs/setup_theme.cpp:75
msgid "Large (14)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:78
+#: src/gui/widgets/tabs/setup_theme.cpp:77
msgid "Large (15)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:80
+#: src/gui/widgets/tabs/setup_theme.cpp:79
msgid "Large (16)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:82
+#: src/gui/widgets/tabs/setup_theme.cpp:81
msgid "Big (17)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:83
msgid "Big (18)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:85
msgid "Big (19)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:87
msgid "Very big (20)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:89
msgid "Very big (21)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:91
msgid "Very big (22)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:93
msgid "Huge (23)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:129
+#: src/gui/widgets/tabs/setup_theme.cpp:128
msgid "Chinese (China)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:131
+#: src/gui/widgets/tabs/setup_theme.cpp:130
msgid "Czech"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:133
+#: src/gui/widgets/tabs/setup_theme.cpp:132
msgid "English"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:135
+#: src/gui/widgets/tabs/setup_theme.cpp:134
msgid "Finnish"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:137
+#: src/gui/widgets/tabs/setup_theme.cpp:136
msgid "French"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:139
+#: src/gui/widgets/tabs/setup_theme.cpp:138
msgid "German"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:141
+#: src/gui/widgets/tabs/setup_theme.cpp:140
msgid "Indonesian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:143
+#: src/gui/widgets/tabs/setup_theme.cpp:142
msgid "Italian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:145
+#: src/gui/widgets/tabs/setup_theme.cpp:144
msgid "Polish"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:147
+#: src/gui/widgets/tabs/setup_theme.cpp:146
msgid "Japanese"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:148
msgid "Dutch (Belgium/Flemish)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:150
msgid "Portuguese"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:152
msgid "Portuguese (Brazilian)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:154
msgid "Russian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:156
msgid "Spanish (Castilian)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:158
msgid "Turkish"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:211
+#: src/gui/widgets/tabs/setup_theme.cpp:210
msgid "Gui theme"
msgstr "Tema de la interfície "
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:218
+#: src/gui/widgets/tabs/setup_theme.cpp:217
msgid "Main Font"
msgstr "Font principal "
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:223
+#: src/gui/widgets/tabs/setup_theme.cpp:222
msgid "Language"
msgstr ""
#. TRANSLATORS: theme settings label
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:227 src/gui/windows/emotewindow.cpp:45
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
msgid "Bold font"
msgstr "Font en negreta "
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:230
msgid "Particle font"
msgstr "Font de partícula "
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:235
+#: src/gui/widgets/tabs/setup_theme.cpp:234
msgid "Help font"
msgstr "Font d'ajuda"
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:239
+#: src/gui/widgets/tabs/setup_theme.cpp:238
msgid "Secure font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:242
msgid "Npc font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:247
+#: src/gui/widgets/tabs/setup_theme.cpp:246
msgid "Japanese font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:250
msgid "Chinese font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:256
+#: src/gui/widgets/tabs/setup_theme.cpp:255
msgid "Font size"
msgstr "Mida de la font "
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:261
+#: src/gui/widgets/tabs/setup_theme.cpp:260
msgid "Npc font size"
msgstr ""
#. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:265
+#: src/gui/widgets/tabs/setup_theme.cpp:264
msgid "i"
msgstr ""
#. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:404
+#: src/gui/widgets/tabs/setup_theme.cpp:403
msgid "Name: "
msgstr ""
-#: src/gui/widgets/tabs/setup_theme.cpp:405
+#: src/gui/widgets/tabs/setup_theme.cpp:404
msgid "Copyright:"
msgstr ""
#. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:470
+#: src/gui/widgets/tabs/setup_theme.cpp:469
msgid "Theme info"
msgstr ""
#. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:497
+#: src/gui/widgets/tabs/setup_theme.cpp:496
msgid "Theme Changed"
msgstr "Tema canviat "
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:497
+#: src/gui/widgets/tabs/setup_theme.cpp:496
#: src/gui/widgets/tabs/setup_video.cpp:499
#: src/gui/widgets/tabs/setup_video.cpp:508
msgid "Restart your client for the change to take effect."
@@ -4701,178 +4770,169 @@ msgid "Allow screensaver to run"
msgstr ""
#. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:67
msgid "ONL"
msgstr "ONL"
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:68
msgid "Who is online"
msgstr "Qui està en línia "
#. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:70
msgid "HLP"
msgstr ""
#. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:73
msgid "QE"
msgstr ""
#. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:77 src/gui/windows/questswindow.cpp:126
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
msgid "Quests"
msgstr ""
#. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:76
msgid "BC"
msgstr "BC"
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:77
msgid "Bot checker"
msgstr "Comprovador de Bot "
#. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:82
+#: src/gui/windowmenu.cpp:79
msgid "KS"
msgstr "KS"
#. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:83 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
msgid "Kill stats"
msgstr "Estadística de morts "
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:82
msgid "Smilies"
msgstr ""
#. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:87
+#: src/gui/windowmenu.cpp:84
msgid "CH"
msgstr ""
#. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:95
+#: src/gui/windowmenu.cpp:92
msgid "STA"
msgstr "EST"
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:93
msgid "Status"
msgstr "Estat "
#. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:95
msgid "EQU"
msgstr "EQU"
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:58
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
msgid "Equipment"
msgstr "Equipament "
#. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:98
msgid "INV"
msgstr "INV "
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:130
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
#: src/inventory.cpp:257
msgid "Inventory"
msgstr "Inventari "
#. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:104
+#: src/gui/windowmenu.cpp:101
msgid "MAP"
msgstr ""
#. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:110
+#: src/gui/windowmenu.cpp:107
msgid "SKI"
msgstr "HAB"
#. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
msgid "Skills"
msgstr "Habilitats "
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:118
-msgid "SPE"
-msgstr "SPE"
-
-#: src/gui/windowmenu.cpp:119
-msgid "Specials"
-msgstr "Especials "
-
#. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:124
+#: src/gui/windowmenu.cpp:112
msgid "SOC"
msgstr "SOC"
#. TRANSLATORS: full button name
#. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:126 src/gui/windows/socialwindow.cpp:1284
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
msgid "Social"
msgstr "Social "
#. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:128
+#: src/gui/windowmenu.cpp:116
msgid "SH"
msgstr "DR"
#. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:132
+#: src/gui/windowmenu.cpp:120
msgid "SP"
msgstr "CON"
#. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:124
msgid "DR"
msgstr "DR"
#. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:128
msgid "YK"
msgstr ""
#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:130
msgid "Did you know"
msgstr ""
#. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:144
+#: src/gui/windowmenu.cpp:132
msgid "SHP"
msgstr ""
#. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:148
+#: src/gui/windowmenu.cpp:136
msgid "OU"
msgstr ""
#. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:152
+#: src/gui/windowmenu.cpp:140
msgid "DBG"
msgstr ""
#. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:149
msgid "WIN"
msgstr ""
#. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:153
msgid "SET"
msgstr "CON"
#. TRANSLATORS: short key name
#. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:301 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
#: src/gui/windows/outfitwindow.cpp:561
#, c-format
msgid "Key: %s"
@@ -4894,31 +4954,21 @@ msgstr "Reajustar "
msgid "Result"
msgstr "Resultat"
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:58
-msgid "unsorted"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:60
-msgid "by price"
-msgstr ""
-
#. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:196
+#: src/gui/windows/buydialog.cpp:162
msgid "Create items"
msgstr ""
#. TRANSLATORS: buy dialog label
#. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:254 src/gui/windows/buydialog.cpp:541
-#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:366
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Preu: %s / Total: %s"
#. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:263
+#: src/gui/windows/buydialog.cpp:229
msgid "Amount:"
msgstr ""
@@ -4928,8 +4978,8 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/itemamountwindow.cpp:159
-#: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
msgid "+"
msgstr "+"
@@ -4940,8 +4990,8 @@ msgstr "+"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:271 src/gui/windows/itemamountwindow.cpp:157
-#: src/gui/windows/itemamountwindow.cpp:191 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
msgid "-"
msgstr "-"
@@ -4949,9 +4999,9 @@ msgstr "-"
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:274 src/gui/windows/charcreatedialog.cpp:119
-#: src/gui/windows/charselectdialog.cpp:593
-#: src/gui/windows/socialwindow.cpp:1307
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
msgid "Create"
msgstr "Crear"
@@ -4960,7 +5010,7 @@ msgstr "Crear"
#. TRANSLATORS: status bar label
#. TRANSLATORS: status window label
#. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:278 src/gui/windows/selldialog.cpp:112
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
#: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
#: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
msgid "Max"
@@ -5059,7 +5109,7 @@ msgstr ""
#. TRANSLATORS: login dialog label
#. TRANSLATORS: register dialog. label.
#: src/gui/windows/charcreatedialog.cpp:73
-#: src/gui/windows/editserverdialog.cpp:89 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
#: src/gui/windows/registerdialog.cpp:89
msgid "Name:"
msgstr "nom"
@@ -5120,7 +5170,7 @@ msgstr "Dona"
#. TRANSLATORS: char create dialog label
#: src/gui/windows/charcreatedialog.cpp:115
-#: src/gui/windows/charcreatedialog.cpp:469
+#: src/gui/windows/charcreatedialog.cpp:458
#, c-format
msgid "Please distribute %d points"
msgstr "Distribueix %d punts"
@@ -5136,17 +5186,17 @@ msgid "Look:"
msgstr ""
#. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:362
+#: src/gui/windows/charcreatedialog.cpp:351
msgid "Your name needs to be at least 4 characters."
msgstr "El nom ha de tenir com a mínim 4 caràcters. "
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:459
+#: src/gui/windows/charcreatedialog.cpp:448
msgid "Character stats OK"
msgstr "Estadístiques de personatge correctes"
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:475
+#: src/gui/windows/charcreatedialog.cpp:464
#, c-format
msgid "Please remove %d points"
msgstr "Has de treure %d punts"
@@ -5175,7 +5225,7 @@ msgstr "Canvia compta d'accés "
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:104
-#: src/gui/windows/charselectdialog.cpp:588
+#: src/gui/windows/charselectdialog.cpp:580
#: src/gui/windows/updaterwindow.cpp:188
msgid "Play"
msgstr "Juga"
@@ -5231,35 +5281,20 @@ msgstr ""
msgid "Enter password:"
msgstr ""
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:172
-msgid "rainbow 1"
-msgstr "arc de sant martí 1"
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:174
-msgid "rainbow 2"
-msgstr "arc de sant martí 2"
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:176
-msgid "rainbow 3"
-msgstr "arc de sant martí 3"
-
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:755
+#: src/gui/windows/chatwindow.cpp:705
#, c-format
msgid "Present: %s; %d players are present."
msgstr "Present: %s; %d jugadors estan presents. "
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1169
+#: src/gui/windows/chatwindow.cpp:1119
#, c-format
msgid "Whispering to %s: %s"
msgstr "Xiuxiuejant a %s: %s"
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1613
+#: src/gui/windows/chatwindow.cpp:1563
#, c-format
msgid "%s's pet"
msgstr ""
@@ -5505,51 +5540,51 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:77
-#: src/gui/windows/itemamountwindow.cpp:161 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
msgid "OK"
msgstr "OK"
#. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:66
+#: src/gui/windows/editserverdialog.cpp:45
msgid "Edit Server"
msgstr ""
#. TRANSLATORS: edit server dialog button
#. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:75
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
msgid "Connect"
msgstr "Connectar "
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:91
+#: src/gui/windows/editserverdialog.cpp:70
msgid "Address:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:93
+#: src/gui/windows/editserverdialog.cpp:72
msgid "Port:"
msgstr "Port:"
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:95
+#: src/gui/windows/editserverdialog.cpp:74
msgid "Server type:"
msgstr "Tipus de servidor: "
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:97
+#: src/gui/windows/editserverdialog.cpp:76
msgid "Description:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:99
+#: src/gui/windows/editserverdialog.cpp:78
msgid "Online list url:"
msgstr ""
#. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:220
+#: src/gui/windows/editserverdialog.cpp:188
msgid "Please at least type both the address and the port of the server."
msgstr ""
@@ -5569,47 +5604,47 @@ msgid "Did you know..."
msgstr ""
#. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:165
+#: src/gui/windows/itemamountwindow.cpp:164
msgid "All"
msgstr "Tot"
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:221
+#: src/gui/windows/itemamountwindow.cpp:220
msgid "Select amount of items to trade."
msgstr "Selecciona la quantitat d'objectes per intercanviar. "
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:225
+#: src/gui/windows/itemamountwindow.cpp:224
msgid "Select amount of items to drop."
msgstr "Selecciona la quantitat d'objectes per deixar caure. "
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:229
+#: src/gui/windows/itemamountwindow.cpp:228
msgid "Select amount of items to store."
msgstr "Selecciona la quantitat d'objectes per guardar emmagatzemar. "
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:233
+#: src/gui/windows/itemamountwindow.cpp:232
msgid "Select amount of items to retrieve."
msgstr "Selecciona la quantitat d'objectes per recuperar. "
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:237
+#: src/gui/windows/itemamountwindow.cpp:236
msgid "Select amount of items to split."
msgstr "Selecciona la quantitat d'objectes per dividir."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:241
+#: src/gui/windows/itemamountwindow.cpp:240
msgid "Add to buy shop."
msgstr "Afegir a la botiga \"comprar\". "
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:245
+#: src/gui/windows/itemamountwindow.cpp:244
msgid "Add to sell shop."
msgstr "Afegir a la botiga \"vendre\". "
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:249
+#: src/gui/windows/itemamountwindow.cpp:248
msgid "Unknown."
msgstr "Desconegut."
@@ -5861,7 +5896,7 @@ msgstr "Envia"
#. TRANSLATORS: shop window label
#. TRANSLATORS: shop window button
#. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:258
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
#: src/gui/windows/tradewindow.cpp:78
msgid "Add"
@@ -5963,53 +5998,53 @@ msgid "Do you really want to sell %s?"
msgstr ""
#. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
msgid "Choose Your Server"
msgstr "Escolleix el teu servidor"
#. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
msgid "Load"
msgstr "Carregar "
#. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
msgid "Choose Your Server *** SAFE MODE ***"
msgstr ""
#. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
msgid "Use same ip for game sub servers"
msgstr "Utilitza la mateixa ip per a sub-servidors del joc "
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr "Descarregant llista de servidors...%2.2f%% "
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
msgid "Waiting for server..."
msgstr "Esperant el servidor... "
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
msgid "Preparing download"
msgstr "Preparant descàrrega "
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
msgid "Error retreiving server list!"
msgstr "Error recuperant llista de servidors! "
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
msgid "requires a newer version"
msgstr "requereix una nova versió "
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
#, c-format
msgid "requires v%s"
msgstr "requereix v%s"
@@ -6090,277 +6125,277 @@ msgid "Skill %d"
msgstr "Habilitat %d"
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:225
+#: src/gui/windows/socialwindow.cpp:227
#, c-format
msgid "Invited user %s to guild %s."
msgstr "Ha invitat a l'usuari %s al gremi %s"
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:240
+#: src/gui/windows/socialwindow.cpp:242
#, c-format
msgid "Guild %s quit requested."
msgstr "El gremi %s demana la sortida. "
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:254
+#: src/gui/windows/socialwindow.cpp:256
msgid "Member Invite to Guild"
msgstr "Membre invitat al gremi "
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:256
+#: src/gui/windows/socialwindow.cpp:258
#, c-format
msgid "Who would you like to invite to guild %s?"
msgstr "Qui voldries invitar al gremi %s?"
#. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:266
+#: src/gui/windows/socialwindow.cpp:268
msgid "Leave Guild?"
msgstr "Deixar gremi "
#. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:268
+#: src/gui/windows/socialwindow.cpp:270
#, c-format
msgid "Are you sure you want to leave guild %s?"
msgstr "Estàs segur que vols deixar el gremi %s?"
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:279
+#: src/gui/windows/socialwindow.cpp:281
#, c-format
msgid "Members: %u/%u"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:301 src/gui/windows/socialwindow.cpp:373
-#: src/gui/windows/socialwindow.cpp:498
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
#, c-format
msgid "Players: %u/%u"
msgstr ""
#. TRANSLATORS: tab in social window
#. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:389 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
msgid "Party"
msgstr "Grup"
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:429
+#: src/gui/windows/socialwindow.cpp:431
#, c-format
msgid "Invited user %s to party."
msgstr "Ha invitat al usuari %s al grup. "
#. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:444
+#: src/gui/windows/socialwindow.cpp:446
#, c-format
msgid "Party %s quit requested."
msgstr "Renuncia al grup %s sol·licitada. "
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:458
+#: src/gui/windows/socialwindow.cpp:460
msgid "Member Invite to Party"
msgstr "Invitació d'un membre al grup"
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:460
+#: src/gui/windows/socialwindow.cpp:462
#, c-format
msgid "Who would you like to invite to party %s?"
msgstr "Qui voldries invitar al grup %s? "
#. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:470
+#: src/gui/windows/socialwindow.cpp:472
msgid "Leave Party?"
msgstr "Deixar Grup? "
#. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:472
+#: src/gui/windows/socialwindow.cpp:474
#, c-format
msgid "Are you sure you want to leave party %s?"
msgstr "Estàs segur que vols deixar el grup %s? "
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:698
+#: src/gui/windows/socialwindow.cpp:665
#, c-format
msgid "Visible players: %d"
msgstr ""
#. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:725
+#: src/gui/windows/socialwindow.cpp:692
msgid "Nav"
msgstr "Nav"
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:827
+#: src/gui/windows/socialwindow.cpp:794
#, c-format
msgid "Portals: %u/%u"
msgstr ""
#. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1054
+#: src/gui/windows/socialwindow.cpp:1021
msgid "Atk"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1073
+#: src/gui/windows/socialwindow.cpp:1040
msgid "Priority mobs"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1075
+#: src/gui/windows/socialwindow.cpp:1042
msgid "Attack mobs"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1077
+#: src/gui/windows/socialwindow.cpp:1044
msgid "Ignore mobs"
msgstr ""
#. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1101
+#: src/gui/windows/socialwindow.cpp:1068
msgid "Pik"
msgstr ""
#. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1120
+#: src/gui/windows/socialwindow.cpp:1087
msgid "Pickup items"
msgstr ""
#. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1122
+#: src/gui/windows/socialwindow.cpp:1089
msgid "Ignore items"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1212
+#: src/gui/windows/socialwindow.cpp:1179
#, c-format
msgid "Friends: %u/%u"
msgstr ""
#. TRANSLATORS: party popup item
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1235 src/gui/windows/socialwindow.cpp:1727
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
msgid "Create Party"
msgstr "Crear grup "
#. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1298
+#: src/gui/windows/socialwindow.cpp:1265
msgid "P"
msgstr ""
#. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1303
+#: src/gui/windows/socialwindow.cpp:1270
msgid "F"
msgstr ""
#. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1309
+#: src/gui/windows/socialwindow.cpp:1276
msgid "Invite"
msgstr "Invita "
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1503
+#: src/gui/windows/socialwindow.cpp:1470
#, c-format
msgid "Accepted party invite from %s."
msgstr "Acceptada invitació a grup de %s. "
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1514
+#: src/gui/windows/socialwindow.cpp:1481
#, c-format
msgid "Rejected party invite from %s."
msgstr "Refusada invitació al grup de %s."
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1531
+#: src/gui/windows/socialwindow.cpp:1498
#, c-format
msgid "Accepted guild invite from %s."
msgstr "Acceptada invitació a gremi de %s. "
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1545
+#: src/gui/windows/socialwindow.cpp:1512
#, c-format
msgid "Rejected guild invite from %s."
msgstr "Refusada invitació al gremi de %s."
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1585
+#: src/gui/windows/socialwindow.cpp:1552
#, c-format
msgid "Creating guild called %s."
msgstr "Creant gremi anomenat %s."
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1606
+#: src/gui/windows/socialwindow.cpp:1573
#, c-format
msgid "Creating party called %s."
msgstr "Creant grup anomenat %s. "
#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1621
+#: src/gui/windows/socialwindow.cpp:1588
msgid "Guild Name"
msgstr "Nom de gremi "
#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1623
+#: src/gui/windows/socialwindow.cpp:1590
msgid "Choose your guild's name."
msgstr "Selecciona nom del gremi. "
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1639
+#: src/gui/windows/socialwindow.cpp:1606
msgid "Received guild request, but one already exists."
msgstr "Invitació al grup rebuda, però ja n'hi ha una existent. "
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1647
+#: src/gui/windows/socialwindow.cpp:1614
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr "%s t'ha invitat al gremi %s."
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1654
+#: src/gui/windows/socialwindow.cpp:1621
msgid "Accept Guild Invite"
msgstr "Acceptar invitació a gremi "
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1670
+#: src/gui/windows/socialwindow.cpp:1637
msgid "Received party request, but one already exists."
msgstr "Rebuda invitació a grup, però ja n'hi ha una d'existent. "
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1682
+#: src/gui/windows/socialwindow.cpp:1649
msgid "You have been invited you to join a party."
msgstr "Has estat invitat a unir-te a un grup. "
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1687
+#: src/gui/windows/socialwindow.cpp:1654
#, c-format
msgid "You have been invited to join the %s party."
msgstr "Has estat invitat a unir-te al grup %s. "
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1696
+#: src/gui/windows/socialwindow.cpp:1663
#, c-format
msgid "%s has invited you to join their party."
msgstr "%s t'ha invitat a unir-te al seu grup. "
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1702
+#: src/gui/windows/socialwindow.cpp:1669
#, c-format
msgid "%s has invited you to join the %s party."
msgstr "%s t'ha invitat a unir-te al grup %s. "
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1712
+#: src/gui/windows/socialwindow.cpp:1679
msgid "Accept Party Invite"
msgstr "Acceptar invitació a grup "
-#: src/gui/windows/socialwindow.cpp:1728
+#: src/gui/windows/socialwindow.cpp:1695
msgid "Cannot create party. You are already in a party"
msgstr "No es pot crear grup. Ja en pertanys a un. "
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1734
+#: src/gui/windows/socialwindow.cpp:1701
msgid "Party Name"
msgstr "Nom del grup"
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1736
+#: src/gui/windows/socialwindow.cpp:1703
msgid "Choose your party's name."
msgstr "Tria el nom del teu grup."
@@ -6402,113 +6437,68 @@ msgstr "Punts de personatge: %d "
msgid "Correction points: %d"
msgstr "Punts de correcció: %d"
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "No Target"
-msgstr "Cap objectiu "
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Allow Target"
-msgstr "Habilita objectiu "
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:105
-msgid "Need Target"
-msgstr "Es necessita objectiu"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "General Magic"
-msgstr "Màgia General "
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "Life Magic"
-msgstr "Màgia de Vida "
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "War Magic"
-msgstr "Màgia de Guerra "
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Transmute Magic"
-msgstr "Màgia de Transmutació "
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Nature Magic"
-msgstr "Màgia de la Natura "
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:121
-msgid "Astral Magic"
-msgstr "Màgia Astral "
-
#. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:164
+#: src/gui/windows/textcommandeditor.cpp:47
msgid "Command Editor"
msgstr "Editor d'ordres "
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:52
msgid "magic"
msgstr "màgia "
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:54
msgid "other"
msgstr "altres "
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:173
+#: src/gui/windows/textcommandeditor.cpp:56
msgid "Symbol:"
msgstr "Símbol: "
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:176
+#: src/gui/windows/textcommandeditor.cpp:59
msgid "Command:"
msgstr "Ordre: "
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:179
+#: src/gui/windows/textcommandeditor.cpp:62
msgid "Comment:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:183
+#: src/gui/windows/textcommandeditor.cpp:66
msgid "Target Type:"
msgstr "Tipus d'objectiu: "
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:187
+#: src/gui/windows/textcommandeditor.cpp:70
msgid "Icon:"
msgstr "Icona: "
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:190
+#: src/gui/windows/textcommandeditor.cpp:73
msgid "Mana:"
msgstr "Mana: "
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:193
+#: src/gui/windows/textcommandeditor.cpp:76
msgid "Magic level:"
msgstr "Nivell Màgic: "
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:197
+#: src/gui/windows/textcommandeditor.cpp:80
msgid "Magic School:"
msgstr "Escola de màgia: "
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:200
+#: src/gui/windows/textcommandeditor.cpp:83
msgid "School level:"
msgstr "Nivell d'escola: "
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/windows/textcommandeditor.cpp:88
msgid "Save"
msgstr "Guardar "
@@ -6538,7 +6528,7 @@ msgid "Trade: You"
msgstr "Intercanvi: Tu "
#. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
#, c-format
msgid "You get %s"
msgstr "Aconsegueixes %s "
@@ -6554,12 +6544,12 @@ msgid "You give:"
msgstr "Ofereixes: "
#. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
msgid "You don't have enough money."
msgstr "No tens diners suficients. "
#. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
msgid ""
"Failed adding item. You can not overlap one kind of item on the window."
msgstr "No s'ha pogut afegir objecte. No es pot afegir més d'un mateix tipus d'objecte a la finestra."
@@ -6630,17 +6620,17 @@ msgid "Who Is Online - Update"
msgstr "Qui Està En Línia - Actualitza "
#. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:87
+#: src/gui/windows/worldselectdialog.cpp:49
msgid "Select World"
msgstr "Escolleix Món "
#. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:93
+#: src/gui/windows/worldselectdialog.cpp:55
msgid "Change Login"
msgstr "Canvia de sessió "
#. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:95
+#: src/gui/windows/worldselectdialog.cpp:57
msgid "Choose World"
msgstr "Tria Món "
@@ -6858,7 +6848,7 @@ msgid "Failed to create character. Most likely the name is already taken."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:281
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
msgid "Wrong name."
msgstr ""
@@ -7016,58 +7006,58 @@ msgid "Experience sharing unknown."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:154
+#: src/net/ea/loginhandler.cpp:149
msgid "Account was not found. Please re-login."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/ea/loginhandler.cpp:153
msgid "Old password incorrect."
msgstr "Antiga contrasenya incorrecta "
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:162
+#: src/net/ea/loginhandler.cpp:157
msgid "New password too short."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:166 src/net/ea/loginhandler.cpp:293
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
msgid "Unknown error."
msgstr "Error desconegut. "
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:239
+#: src/net/ea/loginhandler.cpp:234
msgid "Unregistered ID."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:238
msgid "Wrong password."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:248
+#: src/net/ea/loginhandler.cpp:243
msgid "Account expired."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:252
+#: src/net/ea/loginhandler.cpp:247
msgid "Rejected from server."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:256
+#: src/net/ea/loginhandler.cpp:251
msgid ""
"You have been permanently banned from the game. Please contact the GM team."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:261
+#: src/net/ea/loginhandler.cpp:256
msgid "Client too old."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:265
+#: src/net/ea/loginhandler.cpp:260
#, c-format
msgid ""
"You have been temporarily banned from the game until %s.\n"
@@ -7075,22 +7065,22 @@ msgid ""
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:273
+#: src/net/ea/loginhandler.cpp:268
msgid "Server overpopulated."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:277
+#: src/net/ea/loginhandler.cpp:272
msgid "This user name is already taken."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:285
+#: src/net/ea/loginhandler.cpp:280
msgid "Incorrect email."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:289
+#: src/net/ea/loginhandler.cpp:284
msgid "Username permanently erased."
msgstr ""
@@ -7763,7 +7753,7 @@ msgstr "OpenGL segur"
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
#: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "sense nom "
diff --git a/po/cs.po b/po/cs.po
index bd180eb62..19405792a 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -13,8 +13,8 @@ msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
"POT-Creation-Date: 2014-02-28 21:21+0300\n"
-"PO-Revision-Date: 2014-02-23 12:22+0000\n"
-"Last-Translator: samuraiii <samurai.no.dojo@gmail.com>\n"
+"PO-Revision-Date: 2014-03-01 08:14+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Czech (http://www.transifex.com/projects/p/manaplus/language/"
"cs/)\n"
"Language: cs\n"
@@ -7823,9 +7823,3 @@ msgstr "Neznámý předmět"
#: src/resources/db/petdb.cpp:99
msgid "pet"
msgstr "mazlíček"
-
-#~ msgid "SPE"
-#~ msgstr "SPE"
-
-#~ msgid "Specials"
-#~ msgstr "Speciální"
diff --git a/po/da.po b/po/da.po
index 087cee95a..0dc016a24 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: 2014-02-23 00:42+0300\n"
-"PO-Revision-Date: 2014-02-23 08:14+0000\n"
+"POT-Creation-Date: 2014-02-28 21:21+0300\n"
+"PO-Revision-Date: 2014-03-01 08:14+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"
@@ -30,7 +30,7 @@ msgid "Accepting incoming trade requests"
msgstr "Accepterer indkomne handels anmodninger"
#. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
msgid "Visible on map"
msgstr ""
@@ -39,68 +39,68 @@ msgstr ""
msgid "Human"
msgstr ""
-#: src/being/being.cpp:544
+#: src/being/being.cpp:496
msgid "dodge"
msgstr ""
-#: src/being/being.cpp:544
+#: src/being/being.cpp:496
msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1965 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1970 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr ""
#. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:392
+#: src/being/localplayer.cpp:376
#, c-format
msgid "You were killed by %s"
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1377
+#: src/being/localplayer.cpp:816
msgid "Tried to pick up nonexistent item."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1381
+#: src/being/localplayer.cpp:820
msgid "Item is too heavy."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1385
+#: src/being/localplayer.cpp:824
msgid "Item is too far away."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1389
+#: src/being/localplayer.cpp:828
msgid "Inventory is full."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1393
+#: src/being/localplayer.cpp:832
msgid "Stack is too big."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1397
+#: src/being/localplayer.cpp:836
msgid "Item belongs to someone else."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1401
+#: src/being/localplayer.cpp:840
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:1425
+#: src/being/localplayer.cpp:864
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -108,387 +108,387 @@ msgstr[0] ""
msgstr[1] ""
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1630 src/being/localplayer.cpp:1665
-#: src/being/localplayer.cpp:1666
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
msgid "xp"
msgstr ""
-#: src/being/localplayer.cpp:1671 src/being/localplayer.cpp:1678
-#: src/being/localplayer.cpp:1685
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
msgid "job"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1871
+#: src/being/localplayer.cpp:1285
msgid "(D) default moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1873
+#: src/being/localplayer.cpp:1287
msgid "(I) invert moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1875
+#: src/being/localplayer.cpp:1289
msgid "(c) moves with some crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1877
+#: src/being/localplayer.cpp:1291
msgid "(C) moves with crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1879
+#: src/being/localplayer.cpp:1293
msgid "(d) double normal + crazy"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1881
+#: src/being/localplayer.cpp:1295
msgid "(?) unknown move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1904
+#: src/being/localplayer.cpp:1318
#, c-format
msgid "(%u) crazy move number %u"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1910
+#: src/being/localplayer.cpp:1324
msgid "(a) custom crazy move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1915
+#: src/being/localplayer.cpp:1329
msgid "(?) crazy move"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1930
+#: src/being/localplayer.cpp:1344
msgid "(0) default moves to target"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1932
+#: src/being/localplayer.cpp:1346
msgid "(1) moves to target in distance 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1934
+#: src/being/localplayer.cpp:1348
msgid "(2) moves to target in distance 2"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1936
+#: src/being/localplayer.cpp:1350
msgid "(3) moves to target in distance 3"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1938
+#: src/being/localplayer.cpp:1352
msgid "(5) moves to target in distance 5"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1940
+#: src/being/localplayer.cpp:1354
msgid "(7) moves to target in distance 7"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1942
+#: src/being/localplayer.cpp:1356
msgid "(A) moves to target in attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1944
+#: src/being/localplayer.cpp:1358
msgid "(a) archer attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1946
+#: src/being/localplayer.cpp:1360
msgid "(B) moves to target in attack range - 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1948
+#: src/being/localplayer.cpp:1362
msgid "(?) move to target"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1968
+#: src/being/localplayer.cpp:1382
msgid "(D) default follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1970
+#: src/being/localplayer.cpp:1384
msgid "(R) relative follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1972
+#: src/being/localplayer.cpp:1386
msgid "(M) mirror follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1974
+#: src/being/localplayer.cpp:1388
msgid "(P) pet follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1976
+#: src/being/localplayer.cpp:1390
msgid "(?) unknown follow"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1996 src/being/localplayer.cpp:2004
-#: src/being/localplayer.cpp:2032
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
msgid "(?) attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1998 src/being/localplayer.cpp:2024
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
msgid "(D) default attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2000
+#: src/being/localplayer.cpp:1414
msgid "(s) switch attack without shield"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2002
+#: src/being/localplayer.cpp:1416
msgid "(S) switch attack with shield"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2026
+#: src/being/localplayer.cpp:1440
msgid "(G) go and attack"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2028
+#: src/being/localplayer.cpp:1442
msgid "(A) go, attack, pickup"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2030
+#: src/being/localplayer.cpp:1444
msgid "(d) without auto attack"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2084
+#: src/being/localplayer.cpp:1498
msgid "(S) small pick up 1x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2086
+#: src/being/localplayer.cpp:1500
msgid "(D) default pick up 2x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2088
+#: src/being/localplayer.cpp:1502
msgid "(F) forward pick up 2x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2090
+#: src/being/localplayer.cpp:1504
msgid "(3) pick up 3x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2092
+#: src/being/localplayer.cpp:1506
msgid "(g) go and pick up in distance 4"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2094
+#: src/being/localplayer.cpp:1508
msgid "(G) go and pick up in distance 8"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2096
+#: src/being/localplayer.cpp:1510
msgid "(A) go and pick up in max distance"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2098
+#: src/being/localplayer.cpp:1512
msgid "(?) pick up"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2112
+#: src/being/localplayer.cpp:1526
msgid "(N) normal map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2114
+#: src/being/localplayer.cpp:1528
msgid "(D) debug map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2116
+#: src/being/localplayer.cpp:1530
msgid "(u) ultra map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2118
+#: src/being/localplayer.cpp:1532
msgid "(U) ultra map view 2"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2120
+#: src/being/localplayer.cpp:1534
msgid "(e) empty map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2122
+#: src/being/localplayer.cpp:1536
msgid "(b) black & white map view"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2142
+#: src/being/localplayer.cpp:1556
msgid "(f) use #flar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2144
+#: src/being/localplayer.cpp:1558
msgid "(c) use #chiza for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2146
+#: src/being/localplayer.cpp:1560
msgid "(I) use #ingrav for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2148
+#: src/being/localplayer.cpp:1562
msgid "(F) use #frillyar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2150
+#: src/being/localplayer.cpp:1564
msgid "(U) use #upmarmu for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2152
+#: src/being/localplayer.cpp:1566
msgid "(?) magic attack"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2172
+#: src/being/localplayer.cpp:1586
msgid "(a) attack all players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2174
+#: src/being/localplayer.cpp:1588
msgid "(f) attack all except friends"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2176
+#: src/being/localplayer.cpp:1590
msgid "(b) attack bad relations"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2178
+#: src/being/localplayer.cpp:1592
msgid "(d) don't attack players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2180
+#: src/being/localplayer.cpp:1594
msgid "(?) pvp attack"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2200
+#: src/being/localplayer.cpp:1614
msgid "(D) default imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2202
+#: src/being/localplayer.cpp:1616
msgid "(O) outfits imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2204
+#: src/being/localplayer.cpp:1618
msgid "(?) imitation"
msgstr ""
#. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2233
+#: src/being/localplayer.cpp:1647
msgid "Away"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2256
+#: src/being/localplayer.cpp:1670
msgid "(O) on keyboard"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2258
+#: src/being/localplayer.cpp:1672
msgid "(A) away"
msgstr ""
#. TRANSLATORS: away type in status bar
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2260 src/being/localplayer.cpp:2278
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
msgid "(?) away"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2274
+#: src/being/localplayer.cpp:1688
msgid "(G) game camera mode"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2276
+#: src/being/localplayer.cpp:1690
msgid "(F) free camera mode"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2303
+#: src/being/localplayer.cpp:1717
msgid "Game modifiers are enabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2305
+#: src/being/localplayer.cpp:1719
msgid "Game modifiers are disabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2307
+#: src/being/localplayer.cpp:1721
msgid "Game modifiers are unknown"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3887
+#: src/being/localplayer.cpp:3287
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3893 src/being/localplayer.cpp:3918
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3903
+#: src/being/localplayer.cpp:3303
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3909 src/being/localplayer.cpp:3923
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4266
+#: src/being/localplayer.cpp:3666
#, c-format
msgid "You see %s"
msgstr ""
@@ -526,32 +526,32 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1139 src/gui/windowmenu.cpp:167
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
#: src/gui/windows/setupwindow.cpp:61
msgid "Setup"
msgstr "Opsætning"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1143 src/gui/widgets/tabs/setup_perfomance.cpp:51
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1146 src/gui/widgets/tabs/setup_video.cpp:225
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:225
msgid "Video"
msgstr "Video"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1149 src/gui/widgets/tabs/setup_theme.cpp:269
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1152 src/gui/windowmenu.cpp:74
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr "Hjælp"
@@ -564,41 +564,41 @@ msgstr "Hjælp"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1156 src/gui/popups/popupmenu.cpp:619
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
#: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:69
-#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:138
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
#: src/gui/windows/shopwindow.cpp:78
msgid "Close"
msgstr "Luk"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr "Forbinder til server"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1324
msgid "Logging in"
msgstr "Logger ind"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1367
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1492
+#: src/client.cpp:1489
msgid "Requesting characters"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1532
+#: src/client.cpp:1529
msgid "Connecting to the game server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1545
+#: src/client.cpp:1541
msgid "Changing game servers"
msgstr ""
@@ -613,12 +613,12 @@ msgstr ""
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1606 src/client.cpp:1617 src/client.cpp:1801
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:349
#: src/gui/windows/charselectdialog.cpp:299
-#: src/gui/windows/editserverdialog.cpp:218
+#: src/gui/windows/editserverdialog.cpp:186
#: src/gui/windows/registerdialog.cpp:260
#: src/gui/windows/unregisterdialog.cpp:146
#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
@@ -626,65 +626,65 @@ msgid "Error"
msgstr "Fejl"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1629
+#: src/client.cpp:1625
msgid "Requesting registration details"
msgstr ""
#. TRANSLATORS: password change message header
-#: src/client.cpp:1670
+#: src/client.cpp:1666
msgid "Password Change"
msgstr ""
#. TRANSLATORS: password change message text
-#: src/client.cpp:1672
+#: src/client.cpp:1668
msgid "Password changed successfully!"
msgstr ""
#. TRANSLATORS: email change message header
-#: src/client.cpp:1694
+#: src/client.cpp:1690
msgid "Email Change"
msgstr ""
#. TRANSLATORS: email change message text
-#: src/client.cpp:1696
+#: src/client.cpp:1692
msgid "Email changed successfully!"
msgstr ""
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1719
+#: src/client.cpp:1715
msgid "Unregister Successful"
msgstr ""
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1721
+#: src/client.cpp:1717
msgid "Farewell, come back any time..."
msgstr ""
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1998 src/client.cpp:2013 src/client.cpp:2058
-#: src/client.cpp:2074 src/client.cpp:2525 src/client.cpp:2533
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2230
+#: src/client.cpp:2232
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2271 src/client.cpp:2278
+#: src/client.cpp:2273 src/client.cpp:2280
msgid "Error creating updates directory!"
msgstr "Fejl under oprettelsen af opdateringen mappen!"
-#: src/client.cpp:2300 src/client.cpp:2317
+#: src/client.cpp:2302 src/client.cpp:2319
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: error message question
-#: src/client.cpp:3001
+#: src/client.cpp:3003
msgid "Do you want to open support page?"
msgstr ""
@@ -930,99 +930,154 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:277 src/gui/widgets/tabs/chattab.cpp:464
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
msgid "General"
msgstr ""
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:293 src/gui/widgets/tabs/chattab.cpp:466
-#: src/gui/windowmenu.cpp:154 src/gui/windows/debugwindow.cpp:53
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:575
+#: src/game.cpp:563
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:585
+#: src/game.cpp:573
msgid "Saving screenshot failed!"
msgstr "Gemningen af skærmbilledet fejlede!"
#. TRANSLATORS: error message text
-#: src/game.cpp:656
+#: src/game.cpp:644
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:659
+#: src/game.cpp:647
msgid "Network Error"
msgstr "Netværksfejl"
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
-msgid "black"
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
msgstr ""
+#. TRANSLATORS: chat color
#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
+msgid "black"
+msgstr ""
+
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
msgid "red"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
msgid "green"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
msgid "blue"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
msgid "gold"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
msgid "yellow"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
msgid "pink"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
msgid "purple"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
msgid "grey"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
msgid "brown"
msgstr ""
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr ""
+
#. TRANSLATORS: relation type
#: src/gui/models/playerrelationlistmodel.h:33
msgid "Neutral"
@@ -1058,46 +1113,61 @@ msgstr ""
msgid "Enemy"
msgstr ""
-#. TRANSLATORS: inventory sort mode
-#. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#: src/gui/models/sortlistmodelinv.h:34
-#: src/gui/widgets/tabs/setup_other.cpp:72
-#: src/gui/widgets/tabs/setup_visual.cpp:78 src/gui/windows/chatwindow.cpp:150
-msgid "default"
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:36 src/gui/windows/buydialog.cpp:62
-msgid "by name"
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
msgstr ""
+#. TRANSLATORS: buy dialog sort type.
#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
+msgid "by name"
+msgstr ""
+
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:38 src/gui/windows/buydialog.cpp:64
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
msgid "by id"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:40 src/gui/windows/buydialog.cpp:66
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
msgid "by weight"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:42 src/gui/windows/buydialog.cpp:68
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
msgid "by amount"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:44 src/gui/windows/buydialog.cpp:70
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
msgid "by type"
msgstr ""
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr ""
+
#. TRANSLATORS: update type
#. TRANSLATORS: onscreen button size
#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
@@ -1244,8 +1314,8 @@ msgstr "Snak"
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
-#: src/gui/windows/buydialog.cpp:208 src/gui/windows/buydialog.cpp:220
-#: src/gui/windows/buydialog.cpp:274 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
msgid "Buy"
msgstr "Køb"
@@ -1342,12 +1412,12 @@ msgstr ""
#: src/gui/windows/changepassworddialog.cpp:57
#: src/gui/windows/charcreatedialog.cpp:121
#: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:79
-#: src/gui/windows/itemamountwindow.cpp:163
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
-#: src/gui/windows/socialwindow.cpp:1238
-#: src/gui/windows/textcommandeditor.cpp:203 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:54
#: src/gui/windows/updaterwindow.cpp:186
msgid "Cancel"
@@ -1419,7 +1489,7 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:150 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
msgstr ""
@@ -1432,7 +1502,7 @@ msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:134
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
msgid "Spells"
msgstr ""
@@ -1488,7 +1558,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
#. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1311
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
msgid "Leave"
msgstr ""
@@ -1569,8 +1639,8 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
-#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:223
-#: src/gui/windows/inventorywindow.cpp:745 src/gui/windows/setupwindow.cpp:96
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
msgid "Store"
msgstr "Gem på lager"
@@ -1601,7 +1671,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
msgid "Retrieve"
msgstr "Hent fra lager"
@@ -1634,8 +1704,8 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
-#: src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:656 src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr "Brug"
@@ -1669,8 +1739,8 @@ msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: language
#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/widgets/tabs/setup_theme.cpp:127
-#: src/gui/windows/socialwindow.cpp:1003
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
msgid "(default)"
msgstr ""
@@ -1826,8 +1896,8 @@ msgstr ""
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:645
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
msgid "Unequip"
msgstr "Tag af"
@@ -1835,16 +1905,16 @@ msgstr "Tag af"
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:172
-#: src/gui/windows/inventorywindow.cpp:650 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr "Tag på"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:189
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
msgid "Drop..."
msgstr ""
@@ -1858,15 +1928,15 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:138
-#: src/gui/windows/inventorywindow.cpp:758
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
msgid "Drop"
msgstr "Smid"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
msgid "Split"
msgstr "Opdel"
@@ -2022,10 +2092,10 @@ msgstr "Vælg OK"
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:276
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/windows/serverdialog.cpp:198
msgid "Quit"
msgstr "Afslut"
@@ -2587,7 +2657,7 @@ msgstr ""
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: register dialog. button.
#: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:146
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:330
#: src/gui/widgets/tabs/setup_visual.cpp:189
@@ -2614,9 +2684,8 @@ msgstr ""
#. TRANSLATORS: command editor button
#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
#: src/gui/windows/charselectdialog.cpp:108
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:94
-#: src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/textcommandeditor.cpp:207
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
msgid "Delete"
msgstr "Slet"
@@ -2652,7 +2721,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:130
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
msgid "Shortcuts"
msgstr ""
@@ -2660,7 +2729,7 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:151
msgid "Windows"
msgstr ""
@@ -2676,7 +2745,7 @@ msgstr ""
#. TRANSLATORS: settings tab name
#. TRANSLATORS: chat window name
#: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:88 src/gui/windows/chatwindow.cpp:203
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
msgid "Chat"
msgstr ""
@@ -2899,7 +2968,7 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:137
-#: src/gui/windows/inventorywindow.cpp:569
+#: src/gui/windows/inventorywindow.cpp:568
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
#, c-format
@@ -2919,7 +2988,7 @@ msgstr ""
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/windows/serverdialog.cpp:204
msgid "Edit"
msgstr ""
@@ -2972,7 +3041,7 @@ msgstr ""
#. TRANSLATORS: tab in social window
#. TRANSLATORS: guild chat tab name
#: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:184 src/gui/windows/socialwindow.cpp:320
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
#: src/net/ea/gui/guildtab.cpp:44
msgid "Guild"
msgstr "Opret en guild"
@@ -2983,142 +3052,142 @@ msgid "Lang"
msgstr ""
#. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:49
+#: src/gui/widgets/tabs/setup_audio.cpp:48
msgid "Audio"
msgstr "Lyd"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:57
+#: src/gui/widgets/tabs/setup_audio.cpp:56
msgid "Basic settings"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:60
+#: src/gui/widgets/tabs/setup_audio.cpp:59
msgid "Enable Audio"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:63
+#: src/gui/widgets/tabs/setup_audio.cpp:62
msgid "Enable music"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:67
+#: src/gui/widgets/tabs/setup_audio.cpp:66
msgid "Enable game sfx"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:71
+#: src/gui/widgets/tabs/setup_audio.cpp:70
msgid "Enable gui sfx"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:74
msgid "Sfx volume"
msgstr "Lydstyrke på effekter"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:78
msgid "Music volume"
msgstr "Lydstyrke på musik"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:82
msgid "Enable music fade out"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:86
msgid "Audio frequency"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:90
msgid "mono"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:93
+#: src/gui/widgets/tabs/setup_audio.cpp:92
msgid "stereo"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:94
msgid "surround"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:97
+#: src/gui/widgets/tabs/setup_audio.cpp:96
msgid "surround+center+lfe"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:98
msgid "Audio channels"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:104
+#: src/gui/widgets/tabs/setup_audio.cpp:103
msgid "Sound effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:106
msgid "Information dialog sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:110
msgid "Request dialog sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:115
+#: src/gui/widgets/tabs/setup_audio.cpp:114
msgid "Whisper message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:118
msgid "Guild / Party message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:122
msgid "Highlight message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:126
msgid "Global message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:130
msgid "Error message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:134
msgid "Trade request sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:138
msgid "Show window sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:142
msgid "Hide window sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:150
msgid "Enable mumble voice chat"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:156
+#: src/gui/widgets/tabs/setup_audio.cpp:155
msgid "Download music"
msgstr ""
@@ -3414,7 +3483,7 @@ msgstr ""
#. TRANSLATORS: unknown key name
#. TRANSLATORS: quests window quest name
#: src/gui/widgets/tabs/setup_input.cpp:364
-#: src/gui/windows/questswindow.cpp:263
+#: src/gui/windows/questswindow.cpp:249
msgid "unknown"
msgstr ""
@@ -3573,7 +3642,7 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: debug window tab
#. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:105
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
#: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
#: src/gui/windows/minimap.cpp:114
msgid "Map"
@@ -3741,9 +3810,9 @@ msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: shop window name
#. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:146
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
#: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windows/inventorywindow.cpp:194
msgid "Shop"
msgstr "butik"
@@ -4125,252 +4194,252 @@ msgid "When ignoring:"
msgstr "Når ignorer:"
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:64
+#: src/gui/widgets/tabs/setup_theme.cpp:63
msgid "Very small (8)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:66
+#: src/gui/widgets/tabs/setup_theme.cpp:65
msgid "Very small (9)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:68
+#: src/gui/widgets/tabs/setup_theme.cpp:67
msgid "Tiny (10)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:70
+#: src/gui/widgets/tabs/setup_theme.cpp:69
msgid "Small (11)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:72
+#: src/gui/widgets/tabs/setup_theme.cpp:71
msgid "Medium (12)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:74
+#: src/gui/widgets/tabs/setup_theme.cpp:73
msgid "Normal (13)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:76
+#: src/gui/widgets/tabs/setup_theme.cpp:75
msgid "Large (14)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:78
+#: src/gui/widgets/tabs/setup_theme.cpp:77
msgid "Large (15)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:80
+#: src/gui/widgets/tabs/setup_theme.cpp:79
msgid "Large (16)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:82
+#: src/gui/widgets/tabs/setup_theme.cpp:81
msgid "Big (17)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:83
msgid "Big (18)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:85
msgid "Big (19)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:87
msgid "Very big (20)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:89
msgid "Very big (21)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:91
msgid "Very big (22)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:93
msgid "Huge (23)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:129
+#: src/gui/widgets/tabs/setup_theme.cpp:128
msgid "Chinese (China)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:131
+#: src/gui/widgets/tabs/setup_theme.cpp:130
msgid "Czech"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:133
+#: src/gui/widgets/tabs/setup_theme.cpp:132
msgid "English"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:135
+#: src/gui/widgets/tabs/setup_theme.cpp:134
msgid "Finnish"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:137
+#: src/gui/widgets/tabs/setup_theme.cpp:136
msgid "French"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:139
+#: src/gui/widgets/tabs/setup_theme.cpp:138
msgid "German"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:141
+#: src/gui/widgets/tabs/setup_theme.cpp:140
msgid "Indonesian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:143
+#: src/gui/widgets/tabs/setup_theme.cpp:142
msgid "Italian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:145
+#: src/gui/widgets/tabs/setup_theme.cpp:144
msgid "Polish"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:147
+#: src/gui/widgets/tabs/setup_theme.cpp:146
msgid "Japanese"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:148
msgid "Dutch (Belgium/Flemish)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:150
msgid "Portuguese"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:152
msgid "Portuguese (Brazilian)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:154
msgid "Russian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:156
msgid "Spanish (Castilian)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:158
msgid "Turkish"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:211
+#: src/gui/widgets/tabs/setup_theme.cpp:210
msgid "Gui theme"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:218
+#: src/gui/widgets/tabs/setup_theme.cpp:217
msgid "Main Font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:223
+#: src/gui/widgets/tabs/setup_theme.cpp:222
msgid "Language"
msgstr ""
#. TRANSLATORS: theme settings label
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:227 src/gui/windows/emotewindow.cpp:45
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
msgid "Bold font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:230
msgid "Particle font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:235
+#: src/gui/widgets/tabs/setup_theme.cpp:234
msgid "Help font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:239
+#: src/gui/widgets/tabs/setup_theme.cpp:238
msgid "Secure font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:242
msgid "Npc font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:247
+#: src/gui/widgets/tabs/setup_theme.cpp:246
msgid "Japanese font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:250
msgid "Chinese font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:256
+#: src/gui/widgets/tabs/setup_theme.cpp:255
msgid "Font size"
msgstr "Skriftstørrelse"
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:261
+#: src/gui/widgets/tabs/setup_theme.cpp:260
msgid "Npc font size"
msgstr ""
#. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:265
+#: src/gui/widgets/tabs/setup_theme.cpp:264
msgid "i"
msgstr ""
#. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:404
+#: src/gui/widgets/tabs/setup_theme.cpp:403
msgid "Name: "
msgstr ""
-#: src/gui/widgets/tabs/setup_theme.cpp:405
+#: src/gui/widgets/tabs/setup_theme.cpp:404
msgid "Copyright:"
msgstr ""
#. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:470
+#: src/gui/widgets/tabs/setup_theme.cpp:469
msgid "Theme info"
msgstr ""
#. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:497
+#: src/gui/widgets/tabs/setup_theme.cpp:496
msgid "Theme Changed"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:497
+#: src/gui/widgets/tabs/setup_theme.cpp:496
#: src/gui/widgets/tabs/setup_video.cpp:499
#: src/gui/widgets/tabs/setup_video.cpp:508
msgid "Restart your client for the change to take effect."
@@ -4701,178 +4770,169 @@ msgid "Allow screensaver to run"
msgstr ""
#. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:67
msgid "ONL"
msgstr ""
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:68
msgid "Who is online"
msgstr ""
#. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:70
msgid "HLP"
msgstr ""
#. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:73
msgid "QE"
msgstr ""
#. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:77 src/gui/windows/questswindow.cpp:126
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
msgid "Quests"
msgstr ""
#. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:76
msgid "BC"
msgstr ""
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:77
msgid "Bot checker"
msgstr ""
#. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:82
+#: src/gui/windowmenu.cpp:79
msgid "KS"
msgstr ""
#. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:83 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
msgid "Kill stats"
msgstr ""
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:82
msgid "Smilies"
msgstr ""
#. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:87
+#: src/gui/windowmenu.cpp:84
msgid "CH"
msgstr ""
#. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:95
+#: src/gui/windowmenu.cpp:92
msgid "STA"
msgstr ""
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:93
msgid "Status"
msgstr "Status"
#. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:95
msgid "EQU"
msgstr ""
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:58
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
msgid "Equipment"
msgstr "Udstyr"
#. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:98
msgid "INV"
msgstr ""
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:130
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
#: src/inventory.cpp:257
msgid "Inventory"
msgstr "Inventarliste"
#. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:104
+#: src/gui/windowmenu.cpp:101
msgid "MAP"
msgstr ""
#. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:110
+#: src/gui/windowmenu.cpp:107
msgid "SKI"
msgstr ""
#. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
msgid "Skills"
msgstr "Færdigheder"
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:118
-msgid "SPE"
-msgstr ""
-
-#: src/gui/windowmenu.cpp:119
-msgid "Specials"
-msgstr ""
-
#. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:124
+#: src/gui/windowmenu.cpp:112
msgid "SOC"
msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:126 src/gui/windows/socialwindow.cpp:1284
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
msgid "Social"
msgstr ""
#. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:128
+#: src/gui/windowmenu.cpp:116
msgid "SH"
msgstr ""
#. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:132
+#: src/gui/windowmenu.cpp:120
msgid "SP"
msgstr ""
#. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:124
msgid "DR"
msgstr ""
#. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:128
msgid "YK"
msgstr ""
#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:130
msgid "Did you know"
msgstr ""
#. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:144
+#: src/gui/windowmenu.cpp:132
msgid "SHP"
msgstr ""
#. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:148
+#: src/gui/windowmenu.cpp:136
msgid "OU"
msgstr ""
#. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:152
+#: src/gui/windowmenu.cpp:140
msgid "DBG"
msgstr ""
#. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:149
msgid "WIN"
msgstr ""
#. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:153
msgid "SET"
msgstr ""
#. TRANSLATORS: short key name
#. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:301 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
#: src/gui/windows/outfitwindow.cpp:561
#, c-format
msgid "Key: %s"
@@ -4894,31 +4954,21 @@ msgstr "Nulstil"
msgid "Result"
msgstr ""
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:58
-msgid "unsorted"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:60
-msgid "by price"
-msgstr ""
-
#. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:196
+#: src/gui/windows/buydialog.cpp:162
msgid "Create items"
msgstr ""
#. TRANSLATORS: buy dialog label
#. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:254 src/gui/windows/buydialog.cpp:541
-#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:366
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Pris: %s / Total: %s"
#. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:263
+#: src/gui/windows/buydialog.cpp:229
msgid "Amount:"
msgstr ""
@@ -4928,8 +4978,8 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/itemamountwindow.cpp:159
-#: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
msgid "+"
msgstr ""
@@ -4940,8 +4990,8 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:271 src/gui/windows/itemamountwindow.cpp:157
-#: src/gui/windows/itemamountwindow.cpp:191 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
msgid "-"
msgstr ""
@@ -4949,9 +4999,9 @@ msgstr ""
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:274 src/gui/windows/charcreatedialog.cpp:119
-#: src/gui/windows/charselectdialog.cpp:593
-#: src/gui/windows/socialwindow.cpp:1307
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
msgid "Create"
msgstr "Opret"
@@ -4960,7 +5010,7 @@ msgstr "Opret"
#. TRANSLATORS: status bar label
#. TRANSLATORS: status window label
#. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:278 src/gui/windows/selldialog.cpp:112
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
#: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
#: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
msgid "Max"
@@ -5059,7 +5109,7 @@ msgstr ""
#. TRANSLATORS: login dialog label
#. TRANSLATORS: register dialog. label.
#: src/gui/windows/charcreatedialog.cpp:73
-#: src/gui/windows/editserverdialog.cpp:89 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
#: src/gui/windows/registerdialog.cpp:89
msgid "Name:"
msgstr "Navn:"
@@ -5120,7 +5170,7 @@ msgstr "Kvinde"
#. TRANSLATORS: char create dialog label
#: src/gui/windows/charcreatedialog.cpp:115
-#: src/gui/windows/charcreatedialog.cpp:469
+#: src/gui/windows/charcreatedialog.cpp:458
#, c-format
msgid "Please distribute %d points"
msgstr "Du mangler at fordele %d points"
@@ -5136,17 +5186,17 @@ msgid "Look:"
msgstr ""
#. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:362
+#: src/gui/windows/charcreatedialog.cpp:351
msgid "Your name needs to be at least 4 characters."
msgstr "Dit navn skal være mindst 4 bogstaver langt."
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:459
+#: src/gui/windows/charcreatedialog.cpp:448
msgid "Character stats OK"
msgstr "Du har brugt alle dine points"
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:475
+#: src/gui/windows/charcreatedialog.cpp:464
#, c-format
msgid "Please remove %d points"
msgstr "Du skal fjerne %d points"
@@ -5175,7 +5225,7 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:104
-#: src/gui/windows/charselectdialog.cpp:588
+#: src/gui/windows/charselectdialog.cpp:580
#: src/gui/windows/updaterwindow.cpp:188
msgid "Play"
msgstr "Spil"
@@ -5231,35 +5281,20 @@ msgstr ""
msgid "Enter password:"
msgstr ""
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:172
-msgid "rainbow 1"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:174
-msgid "rainbow 2"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:176
-msgid "rainbow 3"
-msgstr ""
-
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:755
+#: src/gui/windows/chatwindow.cpp:705
#, c-format
msgid "Present: %s; %d players are present."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1169
+#: src/gui/windows/chatwindow.cpp:1119
#, c-format
msgid "Whispering to %s: %s"
msgstr "Hvisker til %s: %s"
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1613
+#: src/gui/windows/chatwindow.cpp:1563
#, c-format
msgid "%s's pet"
msgstr ""
@@ -5505,51 +5540,51 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:77
-#: src/gui/windows/itemamountwindow.cpp:161 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
msgid "OK"
msgstr "OK"
#. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:66
+#: src/gui/windows/editserverdialog.cpp:45
msgid "Edit Server"
msgstr ""
#. TRANSLATORS: edit server dialog button
#. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:75
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
msgid "Connect"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:91
+#: src/gui/windows/editserverdialog.cpp:70
msgid "Address:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:93
+#: src/gui/windows/editserverdialog.cpp:72
msgid "Port:"
msgstr "Port:"
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:95
+#: src/gui/windows/editserverdialog.cpp:74
msgid "Server type:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:97
+#: src/gui/windows/editserverdialog.cpp:76
msgid "Description:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:99
+#: src/gui/windows/editserverdialog.cpp:78
msgid "Online list url:"
msgstr ""
#. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:220
+#: src/gui/windows/editserverdialog.cpp:188
msgid "Please at least type both the address and the port of the server."
msgstr ""
@@ -5569,47 +5604,47 @@ msgid "Did you know..."
msgstr ""
#. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:165
+#: src/gui/windows/itemamountwindow.cpp:164
msgid "All"
msgstr "Alle"
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:221
+#: src/gui/windows/itemamountwindow.cpp:220
msgid "Select amount of items to trade."
msgstr "Vælg hvor mange genstande du vil bytte."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:225
+#: src/gui/windows/itemamountwindow.cpp:224
msgid "Select amount of items to drop."
msgstr "Vælg hvor mange genstande du vil smide."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:229
+#: src/gui/windows/itemamountwindow.cpp:228
msgid "Select amount of items to store."
msgstr "Vælg hvor mange genstande du vil lagre"
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:233
+#: src/gui/windows/itemamountwindow.cpp:232
msgid "Select amount of items to retrieve."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:237
+#: src/gui/windows/itemamountwindow.cpp:236
msgid "Select amount of items to split."
msgstr "Vælg hvor mange genstande du vil opdele."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:241
+#: src/gui/windows/itemamountwindow.cpp:240
msgid "Add to buy shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:245
+#: src/gui/windows/itemamountwindow.cpp:244
msgid "Add to sell shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:249
+#: src/gui/windows/itemamountwindow.cpp:248
msgid "Unknown."
msgstr ""
@@ -5861,7 +5896,7 @@ msgstr "Send forespørgsel"
#. TRANSLATORS: shop window label
#. TRANSLATORS: shop window button
#. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:258
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
#: src/gui/windows/tradewindow.cpp:78
msgid "Add"
@@ -5963,53 +5998,53 @@ msgid "Do you really want to sell %s?"
msgstr ""
#. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
msgid "Choose Your Server"
msgstr ""
#. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
msgid "Load"
msgstr ""
#. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
msgid "Choose Your Server *** SAFE MODE ***"
msgstr ""
#. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
msgid "Use same ip for game sub servers"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
msgid "Waiting for server..."
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
msgid "Preparing download"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
msgid "Error retreiving server list!"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
msgid "requires a newer version"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
#, c-format
msgid "requires v%s"
msgstr ""
@@ -6090,277 +6125,277 @@ msgid "Skill %d"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:225
+#: src/gui/windows/socialwindow.cpp:227
#, c-format
msgid "Invited user %s to guild %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:240
+#: src/gui/windows/socialwindow.cpp:242
#, c-format
msgid "Guild %s quit requested."
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:254
+#: src/gui/windows/socialwindow.cpp:256
msgid "Member Invite to Guild"
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:256
+#: src/gui/windows/socialwindow.cpp:258
#, c-format
msgid "Who would you like to invite to guild %s?"
msgstr ""
#. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:266
+#: src/gui/windows/socialwindow.cpp:268
msgid "Leave Guild?"
msgstr ""
#. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:268
+#: src/gui/windows/socialwindow.cpp:270
#, c-format
msgid "Are you sure you want to leave guild %s?"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:279
+#: src/gui/windows/socialwindow.cpp:281
#, c-format
msgid "Members: %u/%u"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:301 src/gui/windows/socialwindow.cpp:373
-#: src/gui/windows/socialwindow.cpp:498
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
#, c-format
msgid "Players: %u/%u"
msgstr ""
#. TRANSLATORS: tab in social window
#. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:389 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
msgid "Party"
msgstr "Gruppe"
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:429
+#: src/gui/windows/socialwindow.cpp:431
#, c-format
msgid "Invited user %s to party."
msgstr ""
#. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:444
+#: src/gui/windows/socialwindow.cpp:446
#, c-format
msgid "Party %s quit requested."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:458
+#: src/gui/windows/socialwindow.cpp:460
msgid "Member Invite to Party"
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:460
+#: src/gui/windows/socialwindow.cpp:462
#, c-format
msgid "Who would you like to invite to party %s?"
msgstr ""
#. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:470
+#: src/gui/windows/socialwindow.cpp:472
msgid "Leave Party?"
msgstr ""
#. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:472
+#: src/gui/windows/socialwindow.cpp:474
#, c-format
msgid "Are you sure you want to leave party %s?"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:698
+#: src/gui/windows/socialwindow.cpp:665
#, c-format
msgid "Visible players: %d"
msgstr ""
#. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:725
+#: src/gui/windows/socialwindow.cpp:692
msgid "Nav"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:827
+#: src/gui/windows/socialwindow.cpp:794
#, c-format
msgid "Portals: %u/%u"
msgstr ""
#. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1054
+#: src/gui/windows/socialwindow.cpp:1021
msgid "Atk"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1073
+#: src/gui/windows/socialwindow.cpp:1040
msgid "Priority mobs"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1075
+#: src/gui/windows/socialwindow.cpp:1042
msgid "Attack mobs"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1077
+#: src/gui/windows/socialwindow.cpp:1044
msgid "Ignore mobs"
msgstr ""
#. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1101
+#: src/gui/windows/socialwindow.cpp:1068
msgid "Pik"
msgstr ""
#. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1120
+#: src/gui/windows/socialwindow.cpp:1087
msgid "Pickup items"
msgstr ""
#. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1122
+#: src/gui/windows/socialwindow.cpp:1089
msgid "Ignore items"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1212
+#: src/gui/windows/socialwindow.cpp:1179
#, c-format
msgid "Friends: %u/%u"
msgstr ""
#. TRANSLATORS: party popup item
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1235 src/gui/windows/socialwindow.cpp:1727
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
msgid "Create Party"
msgstr ""
#. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1298
+#: src/gui/windows/socialwindow.cpp:1265
msgid "P"
msgstr ""
#. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1303
+#: src/gui/windows/socialwindow.cpp:1270
msgid "F"
msgstr ""
#. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1309
+#: src/gui/windows/socialwindow.cpp:1276
msgid "Invite"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1503
+#: src/gui/windows/socialwindow.cpp:1470
#, c-format
msgid "Accepted party invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1514
+#: src/gui/windows/socialwindow.cpp:1481
#, c-format
msgid "Rejected party invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1531
+#: src/gui/windows/socialwindow.cpp:1498
#, c-format
msgid "Accepted guild invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1545
+#: src/gui/windows/socialwindow.cpp:1512
#, c-format
msgid "Rejected guild invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1585
+#: src/gui/windows/socialwindow.cpp:1552
#, c-format
msgid "Creating guild called %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1606
+#: src/gui/windows/socialwindow.cpp:1573
#, c-format
msgid "Creating party called %s."
msgstr ""
#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1621
+#: src/gui/windows/socialwindow.cpp:1588
msgid "Guild Name"
msgstr ""
#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1623
+#: src/gui/windows/socialwindow.cpp:1590
msgid "Choose your guild's name."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1639
+#: src/gui/windows/socialwindow.cpp:1606
msgid "Received guild request, but one already exists."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1647
+#: src/gui/windows/socialwindow.cpp:1614
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1654
+#: src/gui/windows/socialwindow.cpp:1621
msgid "Accept Guild Invite"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1670
+#: src/gui/windows/socialwindow.cpp:1637
msgid "Received party request, but one already exists."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1682
+#: src/gui/windows/socialwindow.cpp:1649
msgid "You have been invited you to join a party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1687
+#: src/gui/windows/socialwindow.cpp:1654
#, c-format
msgid "You have been invited to join the %s party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1696
+#: src/gui/windows/socialwindow.cpp:1663
#, 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/windows/socialwindow.cpp:1702
+#: src/gui/windows/socialwindow.cpp:1669
#, 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/windows/socialwindow.cpp:1712
+#: src/gui/windows/socialwindow.cpp:1679
msgid "Accept Party Invite"
msgstr "Accepter invitationen"
-#: src/gui/windows/socialwindow.cpp:1728
+#: src/gui/windows/socialwindow.cpp:1695
msgid "Cannot create party. You are already in a party"
msgstr ""
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1734
+#: src/gui/windows/socialwindow.cpp:1701
msgid "Party Name"
msgstr ""
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1736
+#: src/gui/windows/socialwindow.cpp:1703
msgid "Choose your party's name."
msgstr ""
@@ -6402,113 +6437,68 @@ msgstr ""
msgid "Correction points: %d"
msgstr ""
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "No Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Allow Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:105
-msgid "Need Target"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "General Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "Life Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "War Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Transmute Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Nature Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:121
-msgid "Astral Magic"
-msgstr ""
-
#. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:164
+#: src/gui/windows/textcommandeditor.cpp:47
msgid "Command Editor"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:52
msgid "magic"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:54
msgid "other"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:173
+#: src/gui/windows/textcommandeditor.cpp:56
msgid "Symbol:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:176
+#: src/gui/windows/textcommandeditor.cpp:59
msgid "Command:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:179
+#: src/gui/windows/textcommandeditor.cpp:62
msgid "Comment:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:183
+#: src/gui/windows/textcommandeditor.cpp:66
msgid "Target Type:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:187
+#: src/gui/windows/textcommandeditor.cpp:70
msgid "Icon:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:190
+#: src/gui/windows/textcommandeditor.cpp:73
msgid "Mana:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:193
+#: src/gui/windows/textcommandeditor.cpp:76
msgid "Magic level:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:197
+#: src/gui/windows/textcommandeditor.cpp:80
msgid "Magic School:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:200
+#: src/gui/windows/textcommandeditor.cpp:83
msgid "School level:"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/windows/textcommandeditor.cpp:88
msgid "Save"
msgstr ""
@@ -6538,7 +6528,7 @@ msgid "Trade: You"
msgstr "Handel: Dig"
#. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
#, c-format
msgid "You get %s"
msgstr ""
@@ -6554,12 +6544,12 @@ msgid "You give:"
msgstr "Du giver:"
#. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
msgid "You don't have enough money."
msgstr "Du har ikke penge nok."
#. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
msgid ""
"Failed adding item. You can not overlap one kind of item on the window."
msgstr "Fejlede i at tilføje genstand. Du kan ikke overlappe en slags genstand på vinduet."
@@ -6630,17 +6620,17 @@ msgid "Who Is Online - Update"
msgstr ""
#. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:87
+#: src/gui/windows/worldselectdialog.cpp:49
msgid "Select World"
msgstr ""
#. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:93
+#: src/gui/windows/worldselectdialog.cpp:55
msgid "Change Login"
msgstr ""
#. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:95
+#: src/gui/windows/worldselectdialog.cpp:57
msgid "Choose World"
msgstr ""
@@ -6858,7 +6848,7 @@ msgid "Failed to create character. Most likely the name is already taken."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:281
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
msgid "Wrong name."
msgstr ""
@@ -7016,58 +7006,58 @@ msgid "Experience sharing unknown."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:154
+#: src/net/ea/loginhandler.cpp:149
msgid "Account was not found. Please re-login."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/ea/loginhandler.cpp:153
msgid "Old password incorrect."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:162
+#: src/net/ea/loginhandler.cpp:157
msgid "New password too short."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:166 src/net/ea/loginhandler.cpp:293
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
msgid "Unknown error."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:239
+#: src/net/ea/loginhandler.cpp:234
msgid "Unregistered ID."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:238
msgid "Wrong password."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:248
+#: src/net/ea/loginhandler.cpp:243
msgid "Account expired."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:252
+#: src/net/ea/loginhandler.cpp:247
msgid "Rejected from server."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:256
+#: src/net/ea/loginhandler.cpp:251
msgid ""
"You have been permanently banned from the game. Please contact the GM team."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:261
+#: src/net/ea/loginhandler.cpp:256
msgid "Client too old."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:265
+#: src/net/ea/loginhandler.cpp:260
#, c-format
msgid ""
"You have been temporarily banned from the game until %s.\n"
@@ -7075,22 +7065,22 @@ msgid ""
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:273
+#: src/net/ea/loginhandler.cpp:268
msgid "Server overpopulated."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:277
+#: src/net/ea/loginhandler.cpp:272
msgid "This user name is already taken."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:285
+#: src/net/ea/loginhandler.cpp:280
msgid "Incorrect email."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:289
+#: src/net/ea/loginhandler.cpp:284
msgid "Username permanently erased."
msgstr ""
@@ -7763,7 +7753,7 @@ msgstr ""
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
#: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "unavngivet"
diff --git a/po/de.po b/po/de.po
index 217a9bece..53a371d3c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -22,7 +22,7 @@ msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
"POT-Creation-Date: 2014-02-28 21:21+0300\n"
-"PO-Revision-Date: 2014-02-23 08:14+0000\n"
+"PO-Revision-Date: 2014-03-01 08:14+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: German (http://www.transifex.com/projects/p/manaplus/language/"
"de/)\n"
@@ -7840,9 +7840,3 @@ msgstr "Unbekannter Gegenstand"
#: src/resources/db/petdb.cpp:99
msgid "pet"
msgstr ""
-
-#~ msgid "SPE"
-#~ msgstr "SPE"
-
-#~ msgid "Specials"
-#~ msgstr "Special"
diff --git a/po/el.po b/po/el.po
index 4dbf212d2..f0a1ea0ba 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: 2014-02-23 00:42+0300\n"
-"PO-Revision-Date: 2014-02-23 08:14+0000\n"
+"POT-Creation-Date: 2014-02-28 21:21+0300\n"
+"PO-Revision-Date: 2014-03-01 08:14+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"
@@ -29,7 +29,7 @@ msgid "Accepting incoming trade requests"
msgstr "Αποδεχόμενος τα εισερχόμενα αιτήματα του εμπορίου"
#. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
msgid "Visible on map"
msgstr ""
@@ -38,68 +38,68 @@ msgstr ""
msgid "Human"
msgstr ""
-#: src/being/being.cpp:544
+#: src/being/being.cpp:496
msgid "dodge"
msgstr "υπευκφυγή"
-#: src/being/being.cpp:544
+#: src/being/being.cpp:496
msgid "miss"
msgstr "αστοχία"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1965 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1970 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr ""
#. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:392
+#: src/being/localplayer.cpp:376
#, c-format
msgid "You were killed by %s"
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1377
+#: src/being/localplayer.cpp:816
msgid "Tried to pick up nonexistent item."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1381
+#: src/being/localplayer.cpp:820
msgid "Item is too heavy."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1385
+#: src/being/localplayer.cpp:824
msgid "Item is too far away."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1389
+#: src/being/localplayer.cpp:828
msgid "Inventory is full."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1393
+#: src/being/localplayer.cpp:832
msgid "Stack is too big."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1397
+#: src/being/localplayer.cpp:836
msgid "Item belongs to someone else."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1401
+#: src/being/localplayer.cpp:840
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:1425
+#: src/being/localplayer.cpp:864
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -107,387 +107,387 @@ msgstr[0] ""
msgstr[1] ""
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1630 src/being/localplayer.cpp:1665
-#: src/being/localplayer.cpp:1666
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
msgid "xp"
msgstr ""
-#: src/being/localplayer.cpp:1671 src/being/localplayer.cpp:1678
-#: src/being/localplayer.cpp:1685
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
msgid "job"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1871
+#: src/being/localplayer.cpp:1285
msgid "(D) default moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1873
+#: src/being/localplayer.cpp:1287
msgid "(I) invert moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1875
+#: src/being/localplayer.cpp:1289
msgid "(c) moves with some crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1877
+#: src/being/localplayer.cpp:1291
msgid "(C) moves with crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1879
+#: src/being/localplayer.cpp:1293
msgid "(d) double normal + crazy"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1881
+#: src/being/localplayer.cpp:1295
msgid "(?) unknown move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1904
+#: src/being/localplayer.cpp:1318
#, c-format
msgid "(%u) crazy move number %u"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1910
+#: src/being/localplayer.cpp:1324
msgid "(a) custom crazy move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1915
+#: src/being/localplayer.cpp:1329
msgid "(?) crazy move"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1930
+#: src/being/localplayer.cpp:1344
msgid "(0) default moves to target"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1932
+#: src/being/localplayer.cpp:1346
msgid "(1) moves to target in distance 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1934
+#: src/being/localplayer.cpp:1348
msgid "(2) moves to target in distance 2"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1936
+#: src/being/localplayer.cpp:1350
msgid "(3) moves to target in distance 3"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1938
+#: src/being/localplayer.cpp:1352
msgid "(5) moves to target in distance 5"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1940
+#: src/being/localplayer.cpp:1354
msgid "(7) moves to target in distance 7"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1942
+#: src/being/localplayer.cpp:1356
msgid "(A) moves to target in attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1944
+#: src/being/localplayer.cpp:1358
msgid "(a) archer attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1946
+#: src/being/localplayer.cpp:1360
msgid "(B) moves to target in attack range - 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1948
+#: src/being/localplayer.cpp:1362
msgid "(?) move to target"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1968
+#: src/being/localplayer.cpp:1382
msgid "(D) default follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1970
+#: src/being/localplayer.cpp:1384
msgid "(R) relative follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1972
+#: src/being/localplayer.cpp:1386
msgid "(M) mirror follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1974
+#: src/being/localplayer.cpp:1388
msgid "(P) pet follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1976
+#: src/being/localplayer.cpp:1390
msgid "(?) unknown follow"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1996 src/being/localplayer.cpp:2004
-#: src/being/localplayer.cpp:2032
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
msgid "(?) attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1998 src/being/localplayer.cpp:2024
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
msgid "(D) default attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2000
+#: src/being/localplayer.cpp:1414
msgid "(s) switch attack without shield"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2002
+#: src/being/localplayer.cpp:1416
msgid "(S) switch attack with shield"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2026
+#: src/being/localplayer.cpp:1440
msgid "(G) go and attack"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2028
+#: src/being/localplayer.cpp:1442
msgid "(A) go, attack, pickup"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2030
+#: src/being/localplayer.cpp:1444
msgid "(d) without auto attack"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2084
+#: src/being/localplayer.cpp:1498
msgid "(S) small pick up 1x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2086
+#: src/being/localplayer.cpp:1500
msgid "(D) default pick up 2x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2088
+#: src/being/localplayer.cpp:1502
msgid "(F) forward pick up 2x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2090
+#: src/being/localplayer.cpp:1504
msgid "(3) pick up 3x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2092
+#: src/being/localplayer.cpp:1506
msgid "(g) go and pick up in distance 4"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2094
+#: src/being/localplayer.cpp:1508
msgid "(G) go and pick up in distance 8"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2096
+#: src/being/localplayer.cpp:1510
msgid "(A) go and pick up in max distance"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2098
+#: src/being/localplayer.cpp:1512
msgid "(?) pick up"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2112
+#: src/being/localplayer.cpp:1526
msgid "(N) normal map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2114
+#: src/being/localplayer.cpp:1528
msgid "(D) debug map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2116
+#: src/being/localplayer.cpp:1530
msgid "(u) ultra map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2118
+#: src/being/localplayer.cpp:1532
msgid "(U) ultra map view 2"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2120
+#: src/being/localplayer.cpp:1534
msgid "(e) empty map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2122
+#: src/being/localplayer.cpp:1536
msgid "(b) black & white map view"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2142
+#: src/being/localplayer.cpp:1556
msgid "(f) use #flar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2144
+#: src/being/localplayer.cpp:1558
msgid "(c) use #chiza for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2146
+#: src/being/localplayer.cpp:1560
msgid "(I) use #ingrav for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2148
+#: src/being/localplayer.cpp:1562
msgid "(F) use #frillyar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2150
+#: src/being/localplayer.cpp:1564
msgid "(U) use #upmarmu for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2152
+#: src/being/localplayer.cpp:1566
msgid "(?) magic attack"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2172
+#: src/being/localplayer.cpp:1586
msgid "(a) attack all players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2174
+#: src/being/localplayer.cpp:1588
msgid "(f) attack all except friends"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2176
+#: src/being/localplayer.cpp:1590
msgid "(b) attack bad relations"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2178
+#: src/being/localplayer.cpp:1592
msgid "(d) don't attack players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2180
+#: src/being/localplayer.cpp:1594
msgid "(?) pvp attack"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2200
+#: src/being/localplayer.cpp:1614
msgid "(D) default imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2202
+#: src/being/localplayer.cpp:1616
msgid "(O) outfits imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2204
+#: src/being/localplayer.cpp:1618
msgid "(?) imitation"
msgstr ""
#. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2233
+#: src/being/localplayer.cpp:1647
msgid "Away"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2256
+#: src/being/localplayer.cpp:1670
msgid "(O) on keyboard"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2258
+#: src/being/localplayer.cpp:1672
msgid "(A) away"
msgstr ""
#. TRANSLATORS: away type in status bar
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2260 src/being/localplayer.cpp:2278
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
msgid "(?) away"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2274
+#: src/being/localplayer.cpp:1688
msgid "(G) game camera mode"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2276
+#: src/being/localplayer.cpp:1690
msgid "(F) free camera mode"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2303
+#: src/being/localplayer.cpp:1717
msgid "Game modifiers are enabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2305
+#: src/being/localplayer.cpp:1719
msgid "Game modifiers are disabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2307
+#: src/being/localplayer.cpp:1721
msgid "Game modifiers are unknown"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3887
+#: src/being/localplayer.cpp:3287
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3893 src/being/localplayer.cpp:3918
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3903
+#: src/being/localplayer.cpp:3303
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3909 src/being/localplayer.cpp:3923
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4266
+#: src/being/localplayer.cpp:3666
#, c-format
msgid "You see %s"
msgstr ""
@@ -525,32 +525,32 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1139 src/gui/windowmenu.cpp:167
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
#: src/gui/windows/setupwindow.cpp:61
msgid "Setup"
msgstr "Ρύθμισεις"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1143 src/gui/widgets/tabs/setup_perfomance.cpp:51
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1146 src/gui/widgets/tabs/setup_video.cpp:225
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:225
msgid "Video"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1149 src/gui/widgets/tabs/setup_theme.cpp:269
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1152 src/gui/windowmenu.cpp:74
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr "Βοήθεια"
@@ -563,41 +563,41 @@ msgstr "Βοήθεια"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1156 src/gui/popups/popupmenu.cpp:619
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
#: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:69
-#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:138
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
#: src/gui/windows/shopwindow.cpp:78
msgid "Close"
msgstr "Κλείσιμο"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr "Σύνδεση σε τονδιακομιστή"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1324
msgid "Logging in"
msgstr "Σύνδεση"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1367
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr "Μπαίνοντας στον κόσμο του παιχνιδιού "
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1492
+#: src/client.cpp:1489
msgid "Requesting characters"
msgstr "Αναζητώντας χαρακτήρες"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1532
+#: src/client.cpp:1529
msgid "Connecting to the game server"
msgstr "Σύνδεση με τον διακομιστή του παιχνιδιού"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1545
+#: src/client.cpp:1541
msgid "Changing game servers"
msgstr "Αλλαγή διακοσμητών στο παιχνίδι"
@@ -612,12 +612,12 @@ msgstr "Αλλαγή διακοσμητών στο παιχνίδι"
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1606 src/client.cpp:1617 src/client.cpp:1801
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:349
#: src/gui/windows/charselectdialog.cpp:299
-#: src/gui/windows/editserverdialog.cpp:218
+#: src/gui/windows/editserverdialog.cpp:186
#: src/gui/windows/registerdialog.cpp:260
#: src/gui/windows/unregisterdialog.cpp:146
#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
@@ -625,65 +625,65 @@ msgid "Error"
msgstr "Σφάλμα"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1629
+#: src/client.cpp:1625
msgid "Requesting registration details"
msgstr "Αναζητούνται τα στοιχεία της εγγραφής"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1670
+#: src/client.cpp:1666
msgid "Password Change"
msgstr "Αλλαγή κωδικού πρόσβασης"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1672
+#: src/client.cpp:1668
msgid "Password changed successfully!"
msgstr "Ο κωδικός σας άλλαξε με επιτυχία!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1694
+#: src/client.cpp:1690
msgid "Email Change"
msgstr "Αλλαγή ηλεκτρονικού ταχυδρομείου"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1696
+#: src/client.cpp:1692
msgid "Email changed successfully!"
msgstr "Ηλεκτρονικό ταχυδρομείο άλλαξε με επιτυχία!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1719
+#: src/client.cpp:1715
msgid "Unregister Successful"
msgstr "Διαγραφή Επιτυχής"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1721
+#: src/client.cpp:1717
msgid "Farewell, come back any time..."
msgstr "Αντίο, να επιστρέψεις κάθε στιγμή ..."
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1998 src/client.cpp:2013 src/client.cpp:2058
-#: src/client.cpp:2074 src/client.cpp:2525 src/client.cpp:2533
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr " %s δεν υπάρχει και δεν μπορεί να δημιουργηθεί!Έξοδος."
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2230
+#: src/client.cpp:2232
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2271 src/client.cpp:2278
+#: src/client.cpp:2273 src/client.cpp:2280
msgid "Error creating updates directory!"
msgstr "Σφάλμα κατά τη δημιουργία του καταλόγου ενημερώσεων!"
-#: src/client.cpp:2300 src/client.cpp:2317
+#: src/client.cpp:2302 src/client.cpp:2319
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Σφάλμα: %s δεν υπάρχει και δεν μπορεί να δημιουργηθεί! Εγκατάλειψη."
#. TRANSLATORS: error message question
-#: src/client.cpp:3001
+#: src/client.cpp:3003
msgid "Do you want to open support page?"
msgstr ""
@@ -929,99 +929,154 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:277 src/gui/widgets/tabs/chattab.cpp:464
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
msgid "General"
msgstr "Γενικά"
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:293 src/gui/widgets/tabs/chattab.cpp:466
-#: src/gui/windowmenu.cpp:154 src/gui/windows/debugwindow.cpp:53
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
msgid "Debug"
msgstr "Αποσφαλμάτωση"
#. TRANSLATORS: save file message
-#: src/game.cpp:575
+#: src/game.cpp:563
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:585
+#: src/game.cpp:573
msgid "Saving screenshot failed!"
msgstr "Σώσιμο φωτογραφίας απέτυχε"
#. TRANSLATORS: error message text
-#: src/game.cpp:656
+#: src/game.cpp:644
msgid "The connection to the server was lost."
msgstr "Η σύνδεση με το διακομιστή χάθηκε."
#. TRANSLATORS: error message header
-#: src/game.cpp:659
+#: src/game.cpp:647
msgid "Network Error"
msgstr "Σφάλμα δικτύου"
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
+msgstr "προεπιλογή"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
msgid "black"
msgstr "μαύρο"
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
msgid "red"
msgstr "κόκκινο"
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
msgid "green"
msgstr "πράσινο"
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
msgid "blue"
msgstr "μπλε"
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
msgid "gold"
msgstr "χρυσό"
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
msgid "yellow"
msgstr "κίτρινο"
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
msgid "pink"
msgstr "ροζ"
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
msgid "purple"
msgstr "μωβ"
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
msgid "grey"
msgstr "γκρί"
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
msgid "brown"
msgstr "καφέ"
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr "ουράνιο τόξο 1"
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr "ουράνιο τόξο 2"
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr "ουράνιο τόξο 3"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr ""
+
#. TRANSLATORS: relation type
#: src/gui/models/playerrelationlistmodel.h:33
msgid "Neutral"
@@ -1057,46 +1112,61 @@ msgstr ""
msgid "Enemy"
msgstr ""
-#. TRANSLATORS: inventory sort mode
-#. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#: src/gui/models/sortlistmodelinv.h:34
-#: src/gui/widgets/tabs/setup_other.cpp:72
-#: src/gui/widgets/tabs/setup_visual.cpp:78 src/gui/windows/chatwindow.cpp:150
-msgid "default"
-msgstr "προεπιλογή"
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
+msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:36 src/gui/windows/buydialog.cpp:62
-msgid "by name"
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
msgstr ""
+#. TRANSLATORS: buy dialog sort type.
#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
+msgid "by name"
+msgstr ""
+
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:38 src/gui/windows/buydialog.cpp:64
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
msgid "by id"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:40 src/gui/windows/buydialog.cpp:66
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
msgid "by weight"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:42 src/gui/windows/buydialog.cpp:68
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
msgid "by amount"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:44 src/gui/windows/buydialog.cpp:70
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
msgid "by type"
msgstr ""
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr ""
+
#. TRANSLATORS: update type
#. TRANSLATORS: onscreen button size
#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
@@ -1243,8 +1313,8 @@ msgstr "Συζήτηση"
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
-#: src/gui/windows/buydialog.cpp:208 src/gui/windows/buydialog.cpp:220
-#: src/gui/windows/buydialog.cpp:274 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
msgid "Buy"
msgstr "Αγορά"
@@ -1341,12 +1411,12 @@ msgstr ""
#: src/gui/windows/changepassworddialog.cpp:57
#: src/gui/windows/charcreatedialog.cpp:121
#: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:79
-#: src/gui/windows/itemamountwindow.cpp:163
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
-#: src/gui/windows/socialwindow.cpp:1238
-#: src/gui/windows/textcommandeditor.cpp:203 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:54
#: src/gui/windows/updaterwindow.cpp:186
msgid "Cancel"
@@ -1418,7 +1488,7 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:150 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
msgstr "Ρούχα"
@@ -1431,7 +1501,7 @@ msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:134
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
msgid "Spells"
msgstr "Ξόρκια"
@@ -1487,7 +1557,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
#. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1311
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
msgid "Leave"
msgstr ""
@@ -1568,8 +1638,8 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
-#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:223
-#: src/gui/windows/inventorywindow.cpp:745 src/gui/windows/setupwindow.cpp:96
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
msgid "Store"
msgstr "Κατάστημα"
@@ -1600,7 +1670,7 @@ msgstr "Αποθηκεύστε όλα τα"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
msgid "Retrieve"
msgstr "Ανάκτηση"
@@ -1633,8 +1703,8 @@ msgstr "Ανέκτησε όλα"
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
-#: src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:656 src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr "Χρήση"
@@ -1668,8 +1738,8 @@ msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: language
#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/widgets/tabs/setup_theme.cpp:127
-#: src/gui/windows/socialwindow.cpp:1003
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
msgid "(default)"
msgstr ""
@@ -1825,8 +1895,8 @@ msgstr ""
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:645
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
msgid "Unequip"
msgstr ""
@@ -1834,16 +1904,16 @@ msgstr ""
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:172
-#: src/gui/windows/inventorywindow.cpp:650 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr "Equip"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:189
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
msgid "Drop..."
msgstr "Πέτα ..."
@@ -1857,15 +1927,15 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:138
-#: src/gui/windows/inventorywindow.cpp:758
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
msgid "Drop"
msgstr "Πέτα"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
msgid "Split"
msgstr "Διαίρεση"
@@ -2021,10 +2091,10 @@ msgstr ""
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:276
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/windows/serverdialog.cpp:198
msgid "Quit"
msgstr "Έξοδος"
@@ -2586,7 +2656,7 @@ msgstr ""
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: register dialog. button.
#: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:146
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:330
#: src/gui/widgets/tabs/setup_visual.cpp:189
@@ -2613,9 +2683,8 @@ msgstr ""
#. TRANSLATORS: command editor button
#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
#: src/gui/windows/charselectdialog.cpp:108
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:94
-#: src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/textcommandeditor.cpp:207
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
msgid "Delete"
msgstr "Διαγραφή"
@@ -2651,7 +2720,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:130
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
msgid "Shortcuts"
msgstr ""
@@ -2659,7 +2728,7 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:151
msgid "Windows"
msgstr ""
@@ -2675,7 +2744,7 @@ msgstr ""
#. TRANSLATORS: settings tab name
#. TRANSLATORS: chat window name
#: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:88 src/gui/windows/chatwindow.cpp:203
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
msgid "Chat"
msgstr "Συζήτηση"
@@ -2898,7 +2967,7 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:137
-#: src/gui/windows/inventorywindow.cpp:569
+#: src/gui/windows/inventorywindow.cpp:568
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
#, c-format
@@ -2918,7 +2987,7 @@ msgstr ""
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/windows/serverdialog.cpp:204
msgid "Edit"
msgstr ""
@@ -2971,7 +3040,7 @@ msgstr ""
#. TRANSLATORS: tab in social window
#. TRANSLATORS: guild chat tab name
#: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:184 src/gui/windows/socialwindow.cpp:320
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
#: src/net/ea/gui/guildtab.cpp:44
msgid "Guild"
msgstr ""
@@ -2982,142 +3051,142 @@ msgid "Lang"
msgstr ""
#. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:49
+#: src/gui/widgets/tabs/setup_audio.cpp:48
msgid "Audio"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:57
+#: src/gui/widgets/tabs/setup_audio.cpp:56
msgid "Basic settings"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:60
+#: src/gui/widgets/tabs/setup_audio.cpp:59
msgid "Enable Audio"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:63
+#: src/gui/widgets/tabs/setup_audio.cpp:62
msgid "Enable music"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:67
+#: src/gui/widgets/tabs/setup_audio.cpp:66
msgid "Enable game sfx"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:71
+#: src/gui/widgets/tabs/setup_audio.cpp:70
msgid "Enable gui sfx"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:74
msgid "Sfx volume"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:78
msgid "Music volume"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:82
msgid "Enable music fade out"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:86
msgid "Audio frequency"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:90
msgid "mono"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:93
+#: src/gui/widgets/tabs/setup_audio.cpp:92
msgid "stereo"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:94
msgid "surround"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:97
+#: src/gui/widgets/tabs/setup_audio.cpp:96
msgid "surround+center+lfe"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:98
msgid "Audio channels"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:104
+#: src/gui/widgets/tabs/setup_audio.cpp:103
msgid "Sound effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:106
msgid "Information dialog sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:110
msgid "Request dialog sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:115
+#: src/gui/widgets/tabs/setup_audio.cpp:114
msgid "Whisper message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:118
msgid "Guild / Party message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:122
msgid "Highlight message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:126
msgid "Global message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:130
msgid "Error message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:134
msgid "Trade request sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:138
msgid "Show window sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:142
msgid "Hide window sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:150
msgid "Enable mumble voice chat"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:156
+#: src/gui/widgets/tabs/setup_audio.cpp:155
msgid "Download music"
msgstr ""
@@ -3413,7 +3482,7 @@ msgstr ""
#. TRANSLATORS: unknown key name
#. TRANSLATORS: quests window quest name
#: src/gui/widgets/tabs/setup_input.cpp:364
-#: src/gui/windows/questswindow.cpp:263
+#: src/gui/windows/questswindow.cpp:249
msgid "unknown"
msgstr ""
@@ -3572,7 +3641,7 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: debug window tab
#. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:105
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
#: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
#: src/gui/windows/minimap.cpp:114
msgid "Map"
@@ -3740,9 +3809,9 @@ msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: shop window name
#. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:146
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
#: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windows/inventorywindow.cpp:194
msgid "Shop"
msgstr "Κατάστημα"
@@ -4124,252 +4193,252 @@ msgid "When ignoring:"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:64
+#: src/gui/widgets/tabs/setup_theme.cpp:63
msgid "Very small (8)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:66
+#: src/gui/widgets/tabs/setup_theme.cpp:65
msgid "Very small (9)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:68
+#: src/gui/widgets/tabs/setup_theme.cpp:67
msgid "Tiny (10)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:70
+#: src/gui/widgets/tabs/setup_theme.cpp:69
msgid "Small (11)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:72
+#: src/gui/widgets/tabs/setup_theme.cpp:71
msgid "Medium (12)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:74
+#: src/gui/widgets/tabs/setup_theme.cpp:73
msgid "Normal (13)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:76
+#: src/gui/widgets/tabs/setup_theme.cpp:75
msgid "Large (14)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:78
+#: src/gui/widgets/tabs/setup_theme.cpp:77
msgid "Large (15)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:80
+#: src/gui/widgets/tabs/setup_theme.cpp:79
msgid "Large (16)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:82
+#: src/gui/widgets/tabs/setup_theme.cpp:81
msgid "Big (17)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:83
msgid "Big (18)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:85
msgid "Big (19)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:87
msgid "Very big (20)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:89
msgid "Very big (21)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:91
msgid "Very big (22)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:93
msgid "Huge (23)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:129
+#: src/gui/widgets/tabs/setup_theme.cpp:128
msgid "Chinese (China)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:131
+#: src/gui/widgets/tabs/setup_theme.cpp:130
msgid "Czech"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:133
+#: src/gui/widgets/tabs/setup_theme.cpp:132
msgid "English"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:135
+#: src/gui/widgets/tabs/setup_theme.cpp:134
msgid "Finnish"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:137
+#: src/gui/widgets/tabs/setup_theme.cpp:136
msgid "French"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:139
+#: src/gui/widgets/tabs/setup_theme.cpp:138
msgid "German"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:141
+#: src/gui/widgets/tabs/setup_theme.cpp:140
msgid "Indonesian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:143
+#: src/gui/widgets/tabs/setup_theme.cpp:142
msgid "Italian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:145
+#: src/gui/widgets/tabs/setup_theme.cpp:144
msgid "Polish"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:147
+#: src/gui/widgets/tabs/setup_theme.cpp:146
msgid "Japanese"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:148
msgid "Dutch (Belgium/Flemish)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:150
msgid "Portuguese"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:152
msgid "Portuguese (Brazilian)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:154
msgid "Russian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:156
msgid "Spanish (Castilian)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:158
msgid "Turkish"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:211
+#: src/gui/widgets/tabs/setup_theme.cpp:210
msgid "Gui theme"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:218
+#: src/gui/widgets/tabs/setup_theme.cpp:217
msgid "Main Font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:223
+#: src/gui/widgets/tabs/setup_theme.cpp:222
msgid "Language"
msgstr ""
#. TRANSLATORS: theme settings label
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:227 src/gui/windows/emotewindow.cpp:45
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
msgid "Bold font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:230
msgid "Particle font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:235
+#: src/gui/widgets/tabs/setup_theme.cpp:234
msgid "Help font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:239
+#: src/gui/widgets/tabs/setup_theme.cpp:238
msgid "Secure font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:242
msgid "Npc font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:247
+#: src/gui/widgets/tabs/setup_theme.cpp:246
msgid "Japanese font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:250
msgid "Chinese font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:256
+#: src/gui/widgets/tabs/setup_theme.cpp:255
msgid "Font size"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:261
+#: src/gui/widgets/tabs/setup_theme.cpp:260
msgid "Npc font size"
msgstr ""
#. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:265
+#: src/gui/widgets/tabs/setup_theme.cpp:264
msgid "i"
msgstr ""
#. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:404
+#: src/gui/widgets/tabs/setup_theme.cpp:403
msgid "Name: "
msgstr ""
-#: src/gui/widgets/tabs/setup_theme.cpp:405
+#: src/gui/widgets/tabs/setup_theme.cpp:404
msgid "Copyright:"
msgstr ""
#. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:470
+#: src/gui/widgets/tabs/setup_theme.cpp:469
msgid "Theme info"
msgstr ""
#. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:497
+#: src/gui/widgets/tabs/setup_theme.cpp:496
msgid "Theme Changed"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:497
+#: src/gui/widgets/tabs/setup_theme.cpp:496
#: src/gui/widgets/tabs/setup_video.cpp:499
#: src/gui/widgets/tabs/setup_video.cpp:508
msgid "Restart your client for the change to take effect."
@@ -4700,178 +4769,169 @@ msgid "Allow screensaver to run"
msgstr ""
#. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:67
msgid "ONL"
msgstr ""
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:68
msgid "Who is online"
msgstr ""
#. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:70
msgid "HLP"
msgstr ""
#. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:73
msgid "QE"
msgstr ""
#. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:77 src/gui/windows/questswindow.cpp:126
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
msgid "Quests"
msgstr ""
#. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:76
msgid "BC"
msgstr ""
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:77
msgid "Bot checker"
msgstr ""
#. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:82
+#: src/gui/windowmenu.cpp:79
msgid "KS"
msgstr ""
#. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:83 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
msgid "Kill stats"
msgstr ""
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:82
msgid "Smilies"
msgstr ""
#. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:87
+#: src/gui/windowmenu.cpp:84
msgid "CH"
msgstr ""
#. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:95
+#: src/gui/windowmenu.cpp:92
msgid "STA"
msgstr ""
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:93
msgid "Status"
msgstr ""
#. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:95
msgid "EQU"
msgstr ""
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:58
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
msgid "Equipment"
msgstr "Εξοπλισμός"
#. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:98
msgid "INV"
msgstr ""
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:130
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
#: src/inventory.cpp:257
msgid "Inventory"
msgstr ""
#. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:104
+#: src/gui/windowmenu.cpp:101
msgid "MAP"
msgstr ""
#. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:110
+#: src/gui/windowmenu.cpp:107
msgid "SKI"
msgstr ""
#. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
msgid "Skills"
msgstr ""
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:118
-msgid "SPE"
-msgstr ""
-
-#: src/gui/windowmenu.cpp:119
-msgid "Specials"
-msgstr ""
-
#. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:124
+#: src/gui/windowmenu.cpp:112
msgid "SOC"
msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:126 src/gui/windows/socialwindow.cpp:1284
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
msgid "Social"
msgstr ""
#. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:128
+#: src/gui/windowmenu.cpp:116
msgid "SH"
msgstr ""
#. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:132
+#: src/gui/windowmenu.cpp:120
msgid "SP"
msgstr ""
#. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:124
msgid "DR"
msgstr ""
#. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:128
msgid "YK"
msgstr ""
#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:130
msgid "Did you know"
msgstr ""
#. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:144
+#: src/gui/windowmenu.cpp:132
msgid "SHP"
msgstr ""
#. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:148
+#: src/gui/windowmenu.cpp:136
msgid "OU"
msgstr ""
#. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:152
+#: src/gui/windowmenu.cpp:140
msgid "DBG"
msgstr ""
#. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:149
msgid "WIN"
msgstr ""
#. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:153
msgid "SET"
msgstr ""
#. TRANSLATORS: short key name
#. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:301 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
#: src/gui/windows/outfitwindow.cpp:561
#, c-format
msgid "Key: %s"
@@ -4893,31 +4953,21 @@ msgstr "Επαναφορά"
msgid "Result"
msgstr "Αποτέλεσμα"
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:58
-msgid "unsorted"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:60
-msgid "by price"
-msgstr ""
-
#. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:196
+#: src/gui/windows/buydialog.cpp:162
msgid "Create items"
msgstr ""
#. TRANSLATORS: buy dialog label
#. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:254 src/gui/windows/buydialog.cpp:541
-#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:366
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
#, c-format
msgid "Price: %s / Total: %s"
msgstr ""
#. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:263
+#: src/gui/windows/buydialog.cpp:229
msgid "Amount:"
msgstr ""
@@ -4927,8 +4977,8 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/itemamountwindow.cpp:159
-#: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
msgid "+"
msgstr "+"
@@ -4939,8 +4989,8 @@ msgstr "+"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:271 src/gui/windows/itemamountwindow.cpp:157
-#: src/gui/windows/itemamountwindow.cpp:191 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
msgid "-"
msgstr "-"
@@ -4948,9 +4998,9 @@ msgstr "-"
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:274 src/gui/windows/charcreatedialog.cpp:119
-#: src/gui/windows/charselectdialog.cpp:593
-#: src/gui/windows/socialwindow.cpp:1307
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
msgid "Create"
msgstr "Δημιουργία"
@@ -4959,7 +5009,7 @@ msgstr "Δημιουργία"
#. TRANSLATORS: status bar label
#. TRANSLATORS: status window label
#. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:278 src/gui/windows/selldialog.cpp:112
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
#: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
#: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
msgid "Max"
@@ -5058,7 +5108,7 @@ msgstr ""
#. TRANSLATORS: login dialog label
#. TRANSLATORS: register dialog. label.
#: src/gui/windows/charcreatedialog.cpp:73
-#: src/gui/windows/editserverdialog.cpp:89 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
#: src/gui/windows/registerdialog.cpp:89
msgid "Name:"
msgstr "Όνομα:"
@@ -5119,7 +5169,7 @@ msgstr "Γυναίκα"
#. TRANSLATORS: char create dialog label
#: src/gui/windows/charcreatedialog.cpp:115
-#: src/gui/windows/charcreatedialog.cpp:469
+#: src/gui/windows/charcreatedialog.cpp:458
#, c-format
msgid "Please distribute %d points"
msgstr "Παρακαλούμε να διανείμετε %d πόντους"
@@ -5135,17 +5185,17 @@ msgid "Look:"
msgstr ""
#. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:362
+#: src/gui/windows/charcreatedialog.cpp:351
msgid "Your name needs to be at least 4 characters."
msgstr "Το όνομά σας πρέπει να είναι τουλάχιστον 4 χαρακτήρες."
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:459
+#: src/gui/windows/charcreatedialog.cpp:448
msgid "Character stats OK"
msgstr "Στατιστικά χαρακτηρα:εντάξει"
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:475
+#: src/gui/windows/charcreatedialog.cpp:464
#, c-format
msgid "Please remove %d points"
msgstr "Παρακαλώ αφαιρέστε %d πόντους"
@@ -5174,7 +5224,7 @@ msgstr "Διακόπτης Σύνδεση"
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:104
-#: src/gui/windows/charselectdialog.cpp:588
+#: src/gui/windows/charselectdialog.cpp:580
#: src/gui/windows/updaterwindow.cpp:188
msgid "Play"
msgstr ""
@@ -5230,35 +5280,20 @@ msgstr ""
msgid "Enter password:"
msgstr ""
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:172
-msgid "rainbow 1"
-msgstr "ουράνιο τόξο 1"
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:174
-msgid "rainbow 2"
-msgstr "ουράνιο τόξο 2"
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:176
-msgid "rainbow 3"
-msgstr "ουράνιο τόξο 3"
-
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:755
+#: src/gui/windows/chatwindow.cpp:705
#, c-format
msgid "Present: %s; %d players are present."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1169
+#: src/gui/windows/chatwindow.cpp:1119
#, c-format
msgid "Whispering to %s: %s"
msgstr "Ψιθυρίζοντας στο %s: %s"
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1613
+#: src/gui/windows/chatwindow.cpp:1563
#, c-format
msgid "%s's pet"
msgstr ""
@@ -5504,51 +5539,51 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:77
-#: src/gui/windows/itemamountwindow.cpp:161 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
msgid "OK"
msgstr "ΟΚ"
#. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:66
+#: src/gui/windows/editserverdialog.cpp:45
msgid "Edit Server"
msgstr ""
#. TRANSLATORS: edit server dialog button
#. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:75
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
msgid "Connect"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:91
+#: src/gui/windows/editserverdialog.cpp:70
msgid "Address:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:93
+#: src/gui/windows/editserverdialog.cpp:72
msgid "Port:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:95
+#: src/gui/windows/editserverdialog.cpp:74
msgid "Server type:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:97
+#: src/gui/windows/editserverdialog.cpp:76
msgid "Description:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:99
+#: src/gui/windows/editserverdialog.cpp:78
msgid "Online list url:"
msgstr ""
#. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:220
+#: src/gui/windows/editserverdialog.cpp:188
msgid "Please at least type both the address and the port of the server."
msgstr ""
@@ -5568,47 +5603,47 @@ msgid "Did you know..."
msgstr ""
#. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:165
+#: src/gui/windows/itemamountwindow.cpp:164
msgid "All"
msgstr "Όλες"
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:221
+#: src/gui/windows/itemamountwindow.cpp:220
msgid "Select amount of items to trade."
msgstr "Επιλέξτε το ποσό των στοιχείων για ανταλαγή."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:225
+#: src/gui/windows/itemamountwindow.cpp:224
msgid "Select amount of items to drop."
msgstr "Επιλέξτε το ποσό των στοιχείων για πτώση."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:229
+#: src/gui/windows/itemamountwindow.cpp:228
msgid "Select amount of items to store."
msgstr "Επιλέξτε το ποσό των στοιχείων για αποθήκευση."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:233
+#: src/gui/windows/itemamountwindow.cpp:232
msgid "Select amount of items to retrieve."
msgstr "Επιλέξτε το ποσό των στοιχείων για ανάκτηση."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:237
+#: src/gui/windows/itemamountwindow.cpp:236
msgid "Select amount of items to split."
msgstr "Επιλέξτε το ποσό των στοιχείων για διαιρεση."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:241
+#: src/gui/windows/itemamountwindow.cpp:240
msgid "Add to buy shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:245
+#: src/gui/windows/itemamountwindow.cpp:244
msgid "Add to sell shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:249
+#: src/gui/windows/itemamountwindow.cpp:248
msgid "Unknown."
msgstr "Άγνωστο."
@@ -5860,7 +5895,7 @@ msgstr "Υποβολή"
#. TRANSLATORS: shop window label
#. TRANSLATORS: shop window button
#. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:258
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
#: src/gui/windows/tradewindow.cpp:78
msgid "Add"
@@ -5962,53 +5997,53 @@ msgid "Do you really want to sell %s?"
msgstr ""
#. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
msgid "Choose Your Server"
msgstr "Επιλέξε τον διακοσμιτή σου"
#. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
msgid "Load"
msgstr ""
#. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
msgid "Choose Your Server *** SAFE MODE ***"
msgstr ""
#. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
msgid "Use same ip for game sub servers"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
msgid "Waiting for server..."
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
msgid "Preparing download"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
msgid "Error retreiving server list!"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
msgid "requires a newer version"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
#, c-format
msgid "requires v%s"
msgstr ""
@@ -6089,277 +6124,277 @@ msgid "Skill %d"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:225
+#: src/gui/windows/socialwindow.cpp:227
#, c-format
msgid "Invited user %s to guild %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:240
+#: src/gui/windows/socialwindow.cpp:242
#, c-format
msgid "Guild %s quit requested."
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:254
+#: src/gui/windows/socialwindow.cpp:256
msgid "Member Invite to Guild"
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:256
+#: src/gui/windows/socialwindow.cpp:258
#, c-format
msgid "Who would you like to invite to guild %s?"
msgstr ""
#. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:266
+#: src/gui/windows/socialwindow.cpp:268
msgid "Leave Guild?"
msgstr ""
#. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:268
+#: src/gui/windows/socialwindow.cpp:270
#, c-format
msgid "Are you sure you want to leave guild %s?"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:279
+#: src/gui/windows/socialwindow.cpp:281
#, c-format
msgid "Members: %u/%u"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:301 src/gui/windows/socialwindow.cpp:373
-#: src/gui/windows/socialwindow.cpp:498
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
#, c-format
msgid "Players: %u/%u"
msgstr ""
#. TRANSLATORS: tab in social window
#. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:389 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
msgid "Party"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:429
+#: src/gui/windows/socialwindow.cpp:431
#, c-format
msgid "Invited user %s to party."
msgstr ""
#. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:444
+#: src/gui/windows/socialwindow.cpp:446
#, c-format
msgid "Party %s quit requested."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:458
+#: src/gui/windows/socialwindow.cpp:460
msgid "Member Invite to Party"
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:460
+#: src/gui/windows/socialwindow.cpp:462
#, c-format
msgid "Who would you like to invite to party %s?"
msgstr ""
#. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:470
+#: src/gui/windows/socialwindow.cpp:472
msgid "Leave Party?"
msgstr ""
#. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:472
+#: src/gui/windows/socialwindow.cpp:474
#, c-format
msgid "Are you sure you want to leave party %s?"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:698
+#: src/gui/windows/socialwindow.cpp:665
#, c-format
msgid "Visible players: %d"
msgstr ""
#. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:725
+#: src/gui/windows/socialwindow.cpp:692
msgid "Nav"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:827
+#: src/gui/windows/socialwindow.cpp:794
#, c-format
msgid "Portals: %u/%u"
msgstr ""
#. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1054
+#: src/gui/windows/socialwindow.cpp:1021
msgid "Atk"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1073
+#: src/gui/windows/socialwindow.cpp:1040
msgid "Priority mobs"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1075
+#: src/gui/windows/socialwindow.cpp:1042
msgid "Attack mobs"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1077
+#: src/gui/windows/socialwindow.cpp:1044
msgid "Ignore mobs"
msgstr ""
#. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1101
+#: src/gui/windows/socialwindow.cpp:1068
msgid "Pik"
msgstr ""
#. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1120
+#: src/gui/windows/socialwindow.cpp:1087
msgid "Pickup items"
msgstr ""
#. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1122
+#: src/gui/windows/socialwindow.cpp:1089
msgid "Ignore items"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1212
+#: src/gui/windows/socialwindow.cpp:1179
#, c-format
msgid "Friends: %u/%u"
msgstr ""
#. TRANSLATORS: party popup item
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1235 src/gui/windows/socialwindow.cpp:1727
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
msgid "Create Party"
msgstr ""
#. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1298
+#: src/gui/windows/socialwindow.cpp:1265
msgid "P"
msgstr ""
#. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1303
+#: src/gui/windows/socialwindow.cpp:1270
msgid "F"
msgstr ""
#. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1309
+#: src/gui/windows/socialwindow.cpp:1276
msgid "Invite"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1503
+#: src/gui/windows/socialwindow.cpp:1470
#, c-format
msgid "Accepted party invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1514
+#: src/gui/windows/socialwindow.cpp:1481
#, c-format
msgid "Rejected party invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1531
+#: src/gui/windows/socialwindow.cpp:1498
#, c-format
msgid "Accepted guild invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1545
+#: src/gui/windows/socialwindow.cpp:1512
#, c-format
msgid "Rejected guild invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1585
+#: src/gui/windows/socialwindow.cpp:1552
#, c-format
msgid "Creating guild called %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1606
+#: src/gui/windows/socialwindow.cpp:1573
#, c-format
msgid "Creating party called %s."
msgstr ""
#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1621
+#: src/gui/windows/socialwindow.cpp:1588
msgid "Guild Name"
msgstr ""
#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1623
+#: src/gui/windows/socialwindow.cpp:1590
msgid "Choose your guild's name."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1639
+#: src/gui/windows/socialwindow.cpp:1606
msgid "Received guild request, but one already exists."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1647
+#: src/gui/windows/socialwindow.cpp:1614
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1654
+#: src/gui/windows/socialwindow.cpp:1621
msgid "Accept Guild Invite"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1670
+#: src/gui/windows/socialwindow.cpp:1637
msgid "Received party request, but one already exists."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1682
+#: src/gui/windows/socialwindow.cpp:1649
msgid "You have been invited you to join a party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1687
+#: src/gui/windows/socialwindow.cpp:1654
#, c-format
msgid "You have been invited to join the %s party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1696
+#: src/gui/windows/socialwindow.cpp:1663
#, c-format
msgid "%s has invited you to join their party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1702
+#: src/gui/windows/socialwindow.cpp:1669
#, c-format
msgid "%s has invited you to join the %s party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1712
+#: src/gui/windows/socialwindow.cpp:1679
msgid "Accept Party Invite"
msgstr ""
-#: src/gui/windows/socialwindow.cpp:1728
+#: src/gui/windows/socialwindow.cpp:1695
msgid "Cannot create party. You are already in a party"
msgstr ""
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1734
+#: src/gui/windows/socialwindow.cpp:1701
msgid "Party Name"
msgstr ""
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1736
+#: src/gui/windows/socialwindow.cpp:1703
msgid "Choose your party's name."
msgstr ""
@@ -6401,113 +6436,68 @@ msgstr ""
msgid "Correction points: %d"
msgstr ""
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "No Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Allow Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:105
-msgid "Need Target"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "General Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "Life Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "War Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Transmute Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Nature Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:121
-msgid "Astral Magic"
-msgstr ""
-
#. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:164
+#: src/gui/windows/textcommandeditor.cpp:47
msgid "Command Editor"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:52
msgid "magic"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:54
msgid "other"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:173
+#: src/gui/windows/textcommandeditor.cpp:56
msgid "Symbol:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:176
+#: src/gui/windows/textcommandeditor.cpp:59
msgid "Command:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:179
+#: src/gui/windows/textcommandeditor.cpp:62
msgid "Comment:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:183
+#: src/gui/windows/textcommandeditor.cpp:66
msgid "Target Type:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:187
+#: src/gui/windows/textcommandeditor.cpp:70
msgid "Icon:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:190
+#: src/gui/windows/textcommandeditor.cpp:73
msgid "Mana:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:193
+#: src/gui/windows/textcommandeditor.cpp:76
msgid "Magic level:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:197
+#: src/gui/windows/textcommandeditor.cpp:80
msgid "Magic School:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:200
+#: src/gui/windows/textcommandeditor.cpp:83
msgid "School level:"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/windows/textcommandeditor.cpp:88
msgid "Save"
msgstr ""
@@ -6537,7 +6527,7 @@ msgid "Trade: You"
msgstr ""
#. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
#, c-format
msgid "You get %s"
msgstr ""
@@ -6553,12 +6543,12 @@ msgid "You give:"
msgstr ""
#. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
msgid "You don't have enough money."
msgstr ""
#. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
msgid ""
"Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
@@ -6629,17 +6619,17 @@ msgid "Who Is Online - Update"
msgstr ""
#. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:87
+#: src/gui/windows/worldselectdialog.cpp:49
msgid "Select World"
msgstr ""
#. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:93
+#: src/gui/windows/worldselectdialog.cpp:55
msgid "Change Login"
msgstr ""
#. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:95
+#: src/gui/windows/worldselectdialog.cpp:57
msgid "Choose World"
msgstr ""
@@ -6857,7 +6847,7 @@ msgid "Failed to create character. Most likely the name is already taken."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:281
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
msgid "Wrong name."
msgstr ""
@@ -7015,58 +7005,58 @@ msgid "Experience sharing unknown."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:154
+#: src/net/ea/loginhandler.cpp:149
msgid "Account was not found. Please re-login."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/ea/loginhandler.cpp:153
msgid "Old password incorrect."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:162
+#: src/net/ea/loginhandler.cpp:157
msgid "New password too short."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:166 src/net/ea/loginhandler.cpp:293
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
msgid "Unknown error."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:239
+#: src/net/ea/loginhandler.cpp:234
msgid "Unregistered ID."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:238
msgid "Wrong password."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:248
+#: src/net/ea/loginhandler.cpp:243
msgid "Account expired."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:252
+#: src/net/ea/loginhandler.cpp:247
msgid "Rejected from server."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:256
+#: src/net/ea/loginhandler.cpp:251
msgid ""
"You have been permanently banned from the game. Please contact the GM team."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:261
+#: src/net/ea/loginhandler.cpp:256
msgid "Client too old."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:265
+#: src/net/ea/loginhandler.cpp:260
#, c-format
msgid ""
"You have been temporarily banned from the game until %s.\n"
@@ -7074,22 +7064,22 @@ msgid ""
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:273
+#: src/net/ea/loginhandler.cpp:268
msgid "Server overpopulated."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:277
+#: src/net/ea/loginhandler.cpp:272
msgid "This user name is already taken."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:285
+#: src/net/ea/loginhandler.cpp:280
msgid "Incorrect email."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:289
+#: src/net/ea/loginhandler.cpp:284
msgid "Username permanently erased."
msgstr ""
@@ -7762,7 +7752,7 @@ msgstr ""
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
#: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr ""
diff --git a/po/en_GB.po b/po/en_GB.po
index ef8d6d662..392593917 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: 2014-02-23 00:42+0300\n"
-"PO-Revision-Date: 2014-02-23 08:14+0000\n"
+"POT-Creation-Date: 2014-02-28 21:21+0300\n"
+"PO-Revision-Date: 2014-03-01 08:14+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"
@@ -30,7 +30,7 @@ msgid "Accepting incoming trade requests"
msgstr "Accepting incoming trade requests"
#. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
msgid "Visible on map"
msgstr ""
@@ -39,68 +39,68 @@ msgstr ""
msgid "Human"
msgstr ""
-#: src/being/being.cpp:544
+#: src/being/being.cpp:496
msgid "dodge"
msgstr "dodge"
-#: src/being/being.cpp:544
+#: src/being/being.cpp:496
msgid "miss"
msgstr "miss"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1965 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1970 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr ""
#. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:392
+#: src/being/localplayer.cpp:376
#, c-format
msgid "You were killed by %s"
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1377
+#: src/being/localplayer.cpp:816
msgid "Tried to pick up nonexistent item."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1381
+#: src/being/localplayer.cpp:820
msgid "Item is too heavy."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1385
+#: src/being/localplayer.cpp:824
msgid "Item is too far away."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1389
+#: src/being/localplayer.cpp:828
msgid "Inventory is full."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1393
+#: src/being/localplayer.cpp:832
msgid "Stack is too big."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1397
+#: src/being/localplayer.cpp:836
msgid "Item belongs to someone else."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1401
+#: src/being/localplayer.cpp:840
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:1425
+#: src/being/localplayer.cpp:864
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -108,387 +108,387 @@ msgstr[0] ""
msgstr[1] ""
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1630 src/being/localplayer.cpp:1665
-#: src/being/localplayer.cpp:1666
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
msgid "xp"
msgstr ""
-#: src/being/localplayer.cpp:1671 src/being/localplayer.cpp:1678
-#: src/being/localplayer.cpp:1685
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
msgid "job"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1871
+#: src/being/localplayer.cpp:1285
msgid "(D) default moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1873
+#: src/being/localplayer.cpp:1287
msgid "(I) invert moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1875
+#: src/being/localplayer.cpp:1289
msgid "(c) moves with some crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1877
+#: src/being/localplayer.cpp:1291
msgid "(C) moves with crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1879
+#: src/being/localplayer.cpp:1293
msgid "(d) double normal + crazy"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1881
+#: src/being/localplayer.cpp:1295
msgid "(?) unknown move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1904
+#: src/being/localplayer.cpp:1318
#, c-format
msgid "(%u) crazy move number %u"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1910
+#: src/being/localplayer.cpp:1324
msgid "(a) custom crazy move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1915
+#: src/being/localplayer.cpp:1329
msgid "(?) crazy move"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1930
+#: src/being/localplayer.cpp:1344
msgid "(0) default moves to target"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1932
+#: src/being/localplayer.cpp:1346
msgid "(1) moves to target in distance 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1934
+#: src/being/localplayer.cpp:1348
msgid "(2) moves to target in distance 2"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1936
+#: src/being/localplayer.cpp:1350
msgid "(3) moves to target in distance 3"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1938
+#: src/being/localplayer.cpp:1352
msgid "(5) moves to target in distance 5"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1940
+#: src/being/localplayer.cpp:1354
msgid "(7) moves to target in distance 7"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1942
+#: src/being/localplayer.cpp:1356
msgid "(A) moves to target in attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1944
+#: src/being/localplayer.cpp:1358
msgid "(a) archer attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1946
+#: src/being/localplayer.cpp:1360
msgid "(B) moves to target in attack range - 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1948
+#: src/being/localplayer.cpp:1362
msgid "(?) move to target"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1968
+#: src/being/localplayer.cpp:1382
msgid "(D) default follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1970
+#: src/being/localplayer.cpp:1384
msgid "(R) relative follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1972
+#: src/being/localplayer.cpp:1386
msgid "(M) mirror follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1974
+#: src/being/localplayer.cpp:1388
msgid "(P) pet follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1976
+#: src/being/localplayer.cpp:1390
msgid "(?) unknown follow"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1996 src/being/localplayer.cpp:2004
-#: src/being/localplayer.cpp:2032
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
msgid "(?) attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1998 src/being/localplayer.cpp:2024
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
msgid "(D) default attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2000
+#: src/being/localplayer.cpp:1414
msgid "(s) switch attack without shield"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2002
+#: src/being/localplayer.cpp:1416
msgid "(S) switch attack with shield"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2026
+#: src/being/localplayer.cpp:1440
msgid "(G) go and attack"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2028
+#: src/being/localplayer.cpp:1442
msgid "(A) go, attack, pickup"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2030
+#: src/being/localplayer.cpp:1444
msgid "(d) without auto attack"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2084
+#: src/being/localplayer.cpp:1498
msgid "(S) small pick up 1x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2086
+#: src/being/localplayer.cpp:1500
msgid "(D) default pick up 2x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2088
+#: src/being/localplayer.cpp:1502
msgid "(F) forward pick up 2x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2090
+#: src/being/localplayer.cpp:1504
msgid "(3) pick up 3x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2092
+#: src/being/localplayer.cpp:1506
msgid "(g) go and pick up in distance 4"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2094
+#: src/being/localplayer.cpp:1508
msgid "(G) go and pick up in distance 8"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2096
+#: src/being/localplayer.cpp:1510
msgid "(A) go and pick up in max distance"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2098
+#: src/being/localplayer.cpp:1512
msgid "(?) pick up"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2112
+#: src/being/localplayer.cpp:1526
msgid "(N) normal map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2114
+#: src/being/localplayer.cpp:1528
msgid "(D) debug map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2116
+#: src/being/localplayer.cpp:1530
msgid "(u) ultra map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2118
+#: src/being/localplayer.cpp:1532
msgid "(U) ultra map view 2"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2120
+#: src/being/localplayer.cpp:1534
msgid "(e) empty map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2122
+#: src/being/localplayer.cpp:1536
msgid "(b) black & white map view"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2142
+#: src/being/localplayer.cpp:1556
msgid "(f) use #flar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2144
+#: src/being/localplayer.cpp:1558
msgid "(c) use #chiza for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2146
+#: src/being/localplayer.cpp:1560
msgid "(I) use #ingrav for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2148
+#: src/being/localplayer.cpp:1562
msgid "(F) use #frillyar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2150
+#: src/being/localplayer.cpp:1564
msgid "(U) use #upmarmu for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2152
+#: src/being/localplayer.cpp:1566
msgid "(?) magic attack"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2172
+#: src/being/localplayer.cpp:1586
msgid "(a) attack all players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2174
+#: src/being/localplayer.cpp:1588
msgid "(f) attack all except friends"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2176
+#: src/being/localplayer.cpp:1590
msgid "(b) attack bad relations"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2178
+#: src/being/localplayer.cpp:1592
msgid "(d) don't attack players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2180
+#: src/being/localplayer.cpp:1594
msgid "(?) pvp attack"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2200
+#: src/being/localplayer.cpp:1614
msgid "(D) default imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2202
+#: src/being/localplayer.cpp:1616
msgid "(O) outfits imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2204
+#: src/being/localplayer.cpp:1618
msgid "(?) imitation"
msgstr ""
#. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2233
+#: src/being/localplayer.cpp:1647
msgid "Away"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2256
+#: src/being/localplayer.cpp:1670
msgid "(O) on keyboard"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2258
+#: src/being/localplayer.cpp:1672
msgid "(A) away"
msgstr ""
#. TRANSLATORS: away type in status bar
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2260 src/being/localplayer.cpp:2278
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
msgid "(?) away"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2274
+#: src/being/localplayer.cpp:1688
msgid "(G) game camera mode"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2276
+#: src/being/localplayer.cpp:1690
msgid "(F) free camera mode"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2303
+#: src/being/localplayer.cpp:1717
msgid "Game modifiers are enabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2305
+#: src/being/localplayer.cpp:1719
msgid "Game modifiers are disabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2307
+#: src/being/localplayer.cpp:1721
msgid "Game modifiers are unknown"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3887
+#: src/being/localplayer.cpp:3287
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3893 src/being/localplayer.cpp:3918
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3903
+#: src/being/localplayer.cpp:3303
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3909 src/being/localplayer.cpp:3923
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4266
+#: src/being/localplayer.cpp:3666
#, c-format
msgid "You see %s"
msgstr ""
@@ -526,32 +526,32 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1139 src/gui/windowmenu.cpp:167
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
#: src/gui/windows/setupwindow.cpp:61
msgid "Setup"
msgstr "Setup"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1143 src/gui/widgets/tabs/setup_perfomance.cpp:51
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1146 src/gui/widgets/tabs/setup_video.cpp:225
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:225
msgid "Video"
msgstr "Video"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1149 src/gui/widgets/tabs/setup_theme.cpp:269
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1152 src/gui/windowmenu.cpp:74
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr "Help"
@@ -564,41 +564,41 @@ msgstr "Help"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1156 src/gui/popups/popupmenu.cpp:619
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
#: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:69
-#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:138
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
#: src/gui/windows/shopwindow.cpp:78
msgid "Close"
msgstr "Close"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr "Connecting to server"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1324
msgid "Logging in"
msgstr "Logging in"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1367
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr "Entering game world"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1492
+#: src/client.cpp:1489
msgid "Requesting characters"
msgstr "Requesting characters"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1532
+#: src/client.cpp:1529
msgid "Connecting to the game server"
msgstr "Connecting to the game server"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1545
+#: src/client.cpp:1541
msgid "Changing game servers"
msgstr "Changing game servers"
@@ -613,12 +613,12 @@ msgstr "Changing game servers"
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1606 src/client.cpp:1617 src/client.cpp:1801
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:349
#: src/gui/windows/charselectdialog.cpp:299
-#: src/gui/windows/editserverdialog.cpp:218
+#: src/gui/windows/editserverdialog.cpp:186
#: src/gui/windows/registerdialog.cpp:260
#: src/gui/windows/unregisterdialog.cpp:146
#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
@@ -626,65 +626,65 @@ msgid "Error"
msgstr "Error"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1629
+#: src/client.cpp:1625
msgid "Requesting registration details"
msgstr "Requesting registration details"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1670
+#: src/client.cpp:1666
msgid "Password Change"
msgstr "Password Change"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1672
+#: src/client.cpp:1668
msgid "Password changed successfully!"
msgstr ""
#. TRANSLATORS: email change message header
-#: src/client.cpp:1694
+#: src/client.cpp:1690
msgid "Email Change"
msgstr ""
#. TRANSLATORS: email change message text
-#: src/client.cpp:1696
+#: src/client.cpp:1692
msgid "Email changed successfully!"
msgstr ""
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1719
+#: src/client.cpp:1715
msgid "Unregister Successful"
msgstr ""
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1721
+#: src/client.cpp:1717
msgid "Farewell, come back any time..."
msgstr ""
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1998 src/client.cpp:2013 src/client.cpp:2058
-#: src/client.cpp:2074 src/client.cpp:2525 src/client.cpp:2533
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2230
+#: src/client.cpp:2232
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2271 src/client.cpp:2278
+#: src/client.cpp:2273 src/client.cpp:2280
msgid "Error creating updates directory!"
msgstr "Error creating updates directory!"
-#: src/client.cpp:2300 src/client.cpp:2317
+#: src/client.cpp:2302 src/client.cpp:2319
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: error message question
-#: src/client.cpp:3001
+#: src/client.cpp:3003
msgid "Do you want to open support page?"
msgstr ""
@@ -930,99 +930,154 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:277 src/gui/widgets/tabs/chattab.cpp:464
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
msgid "General"
msgstr "General"
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:293 src/gui/widgets/tabs/chattab.cpp:466
-#: src/gui/windowmenu.cpp:154 src/gui/windows/debugwindow.cpp:53
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:575
+#: src/game.cpp:563
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:585
+#: src/game.cpp:573
msgid "Saving screenshot failed!"
msgstr "Saving screenshot failed!"
#. TRANSLATORS: error message text
-#: src/game.cpp:656
+#: src/game.cpp:644
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:659
+#: src/game.cpp:647
msgid "Network Error"
msgstr "Network Error"
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
-msgid "black"
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
msgstr ""
+#. TRANSLATORS: chat color
#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
+msgid "black"
+msgstr ""
+
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
msgid "red"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
msgid "green"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
msgid "blue"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
msgid "gold"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
msgid "yellow"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
msgid "pink"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
msgid "purple"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
msgid "grey"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
msgid "brown"
msgstr ""
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr ""
+
#. TRANSLATORS: relation type
#: src/gui/models/playerrelationlistmodel.h:33
msgid "Neutral"
@@ -1058,46 +1113,61 @@ msgstr ""
msgid "Enemy"
msgstr ""
-#. TRANSLATORS: inventory sort mode
-#. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#: src/gui/models/sortlistmodelinv.h:34
-#: src/gui/widgets/tabs/setup_other.cpp:72
-#: src/gui/widgets/tabs/setup_visual.cpp:78 src/gui/windows/chatwindow.cpp:150
-msgid "default"
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:36 src/gui/windows/buydialog.cpp:62
-msgid "by name"
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
msgstr ""
+#. TRANSLATORS: buy dialog sort type.
#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
+msgid "by name"
+msgstr ""
+
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:38 src/gui/windows/buydialog.cpp:64
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
msgid "by id"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:40 src/gui/windows/buydialog.cpp:66
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
msgid "by weight"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:42 src/gui/windows/buydialog.cpp:68
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
msgid "by amount"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:44 src/gui/windows/buydialog.cpp:70
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
msgid "by type"
msgstr ""
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr ""
+
#. TRANSLATORS: update type
#. TRANSLATORS: onscreen button size
#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
@@ -1244,8 +1314,8 @@ msgstr "Talk"
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
-#: src/gui/windows/buydialog.cpp:208 src/gui/windows/buydialog.cpp:220
-#: src/gui/windows/buydialog.cpp:274 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
msgid "Buy"
msgstr "Buy"
@@ -1342,12 +1412,12 @@ msgstr ""
#: src/gui/windows/changepassworddialog.cpp:57
#: src/gui/windows/charcreatedialog.cpp:121
#: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:79
-#: src/gui/windows/itemamountwindow.cpp:163
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
-#: src/gui/windows/socialwindow.cpp:1238
-#: src/gui/windows/textcommandeditor.cpp:203 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:54
#: src/gui/windows/updaterwindow.cpp:186
msgid "Cancel"
@@ -1419,7 +1489,7 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:150 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
msgstr ""
@@ -1432,7 +1502,7 @@ msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:134
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
msgid "Spells"
msgstr ""
@@ -1488,7 +1558,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
#. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1311
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
msgid "Leave"
msgstr ""
@@ -1569,8 +1639,8 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
-#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:223
-#: src/gui/windows/inventorywindow.cpp:745 src/gui/windows/setupwindow.cpp:96
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
msgid "Store"
msgstr "Store"
@@ -1601,7 +1671,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
msgid "Retrieve"
msgstr "Retrieve"
@@ -1634,8 +1704,8 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
-#: src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:656 src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr "Use"
@@ -1669,8 +1739,8 @@ msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: language
#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/widgets/tabs/setup_theme.cpp:127
-#: src/gui/windows/socialwindow.cpp:1003
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
msgid "(default)"
msgstr ""
@@ -1826,8 +1896,8 @@ msgstr ""
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:645
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
msgid "Unequip"
msgstr "Unequip"
@@ -1835,16 +1905,16 @@ msgstr "Unequip"
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:172
-#: src/gui/windows/inventorywindow.cpp:650 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr "Equip"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:189
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
msgid "Drop..."
msgstr ""
@@ -1858,15 +1928,15 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:138
-#: src/gui/windows/inventorywindow.cpp:758
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
msgid "Drop"
msgstr "Drop"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
msgid "Split"
msgstr "Split"
@@ -2022,10 +2092,10 @@ msgstr "Select OK"
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:276
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/windows/serverdialog.cpp:198
msgid "Quit"
msgstr "Exit"
@@ -2587,7 +2657,7 @@ msgstr ""
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: register dialog. button.
#: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:146
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:330
#: src/gui/widgets/tabs/setup_visual.cpp:189
@@ -2614,9 +2684,8 @@ msgstr ""
#. TRANSLATORS: command editor button
#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
#: src/gui/windows/charselectdialog.cpp:108
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:94
-#: src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/textcommandeditor.cpp:207
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
msgid "Delete"
msgstr "Delete"
@@ -2652,7 +2721,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:130
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
msgid "Shortcuts"
msgstr ""
@@ -2660,7 +2729,7 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:151
msgid "Windows"
msgstr ""
@@ -2676,7 +2745,7 @@ msgstr ""
#. TRANSLATORS: settings tab name
#. TRANSLATORS: chat window name
#: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:88 src/gui/windows/chatwindow.cpp:203
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
msgid "Chat"
msgstr "Chat"
@@ -2899,7 +2968,7 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:137
-#: src/gui/windows/inventorywindow.cpp:569
+#: src/gui/windows/inventorywindow.cpp:568
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
#, c-format
@@ -2919,7 +2988,7 @@ msgstr ""
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/windows/serverdialog.cpp:204
msgid "Edit"
msgstr ""
@@ -2972,7 +3041,7 @@ msgstr ""
#. TRANSLATORS: tab in social window
#. TRANSLATORS: guild chat tab name
#: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:184 src/gui/windows/socialwindow.cpp:320
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
#: src/net/ea/gui/guildtab.cpp:44
msgid "Guild"
msgstr "Guild"
@@ -2983,142 +3052,142 @@ msgid "Lang"
msgstr ""
#. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:49
+#: src/gui/widgets/tabs/setup_audio.cpp:48
msgid "Audio"
msgstr "Audio"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:57
+#: src/gui/widgets/tabs/setup_audio.cpp:56
msgid "Basic settings"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:60
+#: src/gui/widgets/tabs/setup_audio.cpp:59
msgid "Enable Audio"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:63
+#: src/gui/widgets/tabs/setup_audio.cpp:62
msgid "Enable music"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:67
+#: src/gui/widgets/tabs/setup_audio.cpp:66
msgid "Enable game sfx"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:71
+#: src/gui/widgets/tabs/setup_audio.cpp:70
msgid "Enable gui sfx"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:74
msgid "Sfx volume"
msgstr "Sfx volume"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:78
msgid "Music volume"
msgstr "Music volume"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:82
msgid "Enable music fade out"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:86
msgid "Audio frequency"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:90
msgid "mono"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:93
+#: src/gui/widgets/tabs/setup_audio.cpp:92
msgid "stereo"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:94
msgid "surround"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:97
+#: src/gui/widgets/tabs/setup_audio.cpp:96
msgid "surround+center+lfe"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:98
msgid "Audio channels"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:104
+#: src/gui/widgets/tabs/setup_audio.cpp:103
msgid "Sound effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:106
msgid "Information dialog sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:110
msgid "Request dialog sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:115
+#: src/gui/widgets/tabs/setup_audio.cpp:114
msgid "Whisper message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:118
msgid "Guild / Party message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:122
msgid "Highlight message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:126
msgid "Global message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:130
msgid "Error message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:134
msgid "Trade request sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:138
msgid "Show window sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:142
msgid "Hide window sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:150
msgid "Enable mumble voice chat"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:156
+#: src/gui/widgets/tabs/setup_audio.cpp:155
msgid "Download music"
msgstr ""
@@ -3414,7 +3483,7 @@ msgstr ""
#. TRANSLATORS: unknown key name
#. TRANSLATORS: quests window quest name
#: src/gui/widgets/tabs/setup_input.cpp:364
-#: src/gui/windows/questswindow.cpp:263
+#: src/gui/windows/questswindow.cpp:249
msgid "unknown"
msgstr ""
@@ -3573,7 +3642,7 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: debug window tab
#. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:105
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
#: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
#: src/gui/windows/minimap.cpp:114
msgid "Map"
@@ -3741,9 +3810,9 @@ msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: shop window name
#. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:146
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
#: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windows/inventorywindow.cpp:194
msgid "Shop"
msgstr "Shop"
@@ -4125,252 +4194,252 @@ msgid "When ignoring:"
msgstr "When ignoring:"
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:64
+#: src/gui/widgets/tabs/setup_theme.cpp:63
msgid "Very small (8)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:66
+#: src/gui/widgets/tabs/setup_theme.cpp:65
msgid "Very small (9)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:68
+#: src/gui/widgets/tabs/setup_theme.cpp:67
msgid "Tiny (10)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:70
+#: src/gui/widgets/tabs/setup_theme.cpp:69
msgid "Small (11)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:72
+#: src/gui/widgets/tabs/setup_theme.cpp:71
msgid "Medium (12)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:74
+#: src/gui/widgets/tabs/setup_theme.cpp:73
msgid "Normal (13)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:76
+#: src/gui/widgets/tabs/setup_theme.cpp:75
msgid "Large (14)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:78
+#: src/gui/widgets/tabs/setup_theme.cpp:77
msgid "Large (15)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:80
+#: src/gui/widgets/tabs/setup_theme.cpp:79
msgid "Large (16)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:82
+#: src/gui/widgets/tabs/setup_theme.cpp:81
msgid "Big (17)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:83
msgid "Big (18)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:85
msgid "Big (19)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:87
msgid "Very big (20)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:89
msgid "Very big (21)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:91
msgid "Very big (22)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:93
msgid "Huge (23)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:129
+#: src/gui/widgets/tabs/setup_theme.cpp:128
msgid "Chinese (China)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:131
+#: src/gui/widgets/tabs/setup_theme.cpp:130
msgid "Czech"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:133
+#: src/gui/widgets/tabs/setup_theme.cpp:132
msgid "English"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:135
+#: src/gui/widgets/tabs/setup_theme.cpp:134
msgid "Finnish"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:137
+#: src/gui/widgets/tabs/setup_theme.cpp:136
msgid "French"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:139
+#: src/gui/widgets/tabs/setup_theme.cpp:138
msgid "German"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:141
+#: src/gui/widgets/tabs/setup_theme.cpp:140
msgid "Indonesian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:143
+#: src/gui/widgets/tabs/setup_theme.cpp:142
msgid "Italian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:145
+#: src/gui/widgets/tabs/setup_theme.cpp:144
msgid "Polish"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:147
+#: src/gui/widgets/tabs/setup_theme.cpp:146
msgid "Japanese"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:148
msgid "Dutch (Belgium/Flemish)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:150
msgid "Portuguese"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:152
msgid "Portuguese (Brazilian)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:154
msgid "Russian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:156
msgid "Spanish (Castilian)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:158
msgid "Turkish"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:211
+#: src/gui/widgets/tabs/setup_theme.cpp:210
msgid "Gui theme"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:218
+#: src/gui/widgets/tabs/setup_theme.cpp:217
msgid "Main Font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:223
+#: src/gui/widgets/tabs/setup_theme.cpp:222
msgid "Language"
msgstr ""
#. TRANSLATORS: theme settings label
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:227 src/gui/windows/emotewindow.cpp:45
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
msgid "Bold font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:230
msgid "Particle font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:235
+#: src/gui/widgets/tabs/setup_theme.cpp:234
msgid "Help font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:239
+#: src/gui/widgets/tabs/setup_theme.cpp:238
msgid "Secure font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:242
msgid "Npc font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:247
+#: src/gui/widgets/tabs/setup_theme.cpp:246
msgid "Japanese font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:250
msgid "Chinese font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:256
+#: src/gui/widgets/tabs/setup_theme.cpp:255
msgid "Font size"
msgstr "Font size"
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:261
+#: src/gui/widgets/tabs/setup_theme.cpp:260
msgid "Npc font size"
msgstr ""
#. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:265
+#: src/gui/widgets/tabs/setup_theme.cpp:264
msgid "i"
msgstr ""
#. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:404
+#: src/gui/widgets/tabs/setup_theme.cpp:403
msgid "Name: "
msgstr ""
-#: src/gui/widgets/tabs/setup_theme.cpp:405
+#: src/gui/widgets/tabs/setup_theme.cpp:404
msgid "Copyright:"
msgstr ""
#. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:470
+#: src/gui/widgets/tabs/setup_theme.cpp:469
msgid "Theme info"
msgstr ""
#. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:497
+#: src/gui/widgets/tabs/setup_theme.cpp:496
msgid "Theme Changed"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:497
+#: src/gui/widgets/tabs/setup_theme.cpp:496
#: src/gui/widgets/tabs/setup_video.cpp:499
#: src/gui/widgets/tabs/setup_video.cpp:508
msgid "Restart your client for the change to take effect."
@@ -4701,178 +4770,169 @@ msgid "Allow screensaver to run"
msgstr ""
#. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:67
msgid "ONL"
msgstr ""
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:68
msgid "Who is online"
msgstr ""
#. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:70
msgid "HLP"
msgstr ""
#. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:73
msgid "QE"
msgstr ""
#. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:77 src/gui/windows/questswindow.cpp:126
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
msgid "Quests"
msgstr ""
#. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:76
msgid "BC"
msgstr ""
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:77
msgid "Bot checker"
msgstr ""
#. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:82
+#: src/gui/windowmenu.cpp:79
msgid "KS"
msgstr ""
#. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:83 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
msgid "Kill stats"
msgstr ""
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:82
msgid "Smilies"
msgstr ""
#. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:87
+#: src/gui/windowmenu.cpp:84
msgid "CH"
msgstr ""
#. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:95
+#: src/gui/windowmenu.cpp:92
msgid "STA"
msgstr ""
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:93
msgid "Status"
msgstr "Status"
#. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:95
msgid "EQU"
msgstr ""
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:58
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
msgid "Equipment"
msgstr "Equipment"
#. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:98
msgid "INV"
msgstr ""
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:130
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
#: src/inventory.cpp:257
msgid "Inventory"
msgstr "Inventory"
#. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:104
+#: src/gui/windowmenu.cpp:101
msgid "MAP"
msgstr ""
#. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:110
+#: src/gui/windowmenu.cpp:107
msgid "SKI"
msgstr ""
#. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
msgid "Skills"
msgstr "Skills"
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:118
-msgid "SPE"
-msgstr ""
-
-#: src/gui/windowmenu.cpp:119
-msgid "Specials"
-msgstr ""
-
#. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:124
+#: src/gui/windowmenu.cpp:112
msgid "SOC"
msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:126 src/gui/windows/socialwindow.cpp:1284
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
msgid "Social"
msgstr ""
#. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:128
+#: src/gui/windowmenu.cpp:116
msgid "SH"
msgstr ""
#. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:132
+#: src/gui/windowmenu.cpp:120
msgid "SP"
msgstr ""
#. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:124
msgid "DR"
msgstr ""
#. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:128
msgid "YK"
msgstr ""
#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:130
msgid "Did you know"
msgstr ""
#. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:144
+#: src/gui/windowmenu.cpp:132
msgid "SHP"
msgstr ""
#. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:148
+#: src/gui/windowmenu.cpp:136
msgid "OU"
msgstr ""
#. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:152
+#: src/gui/windowmenu.cpp:140
msgid "DBG"
msgstr ""
#. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:149
msgid "WIN"
msgstr ""
#. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:153
msgid "SET"
msgstr ""
#. TRANSLATORS: short key name
#. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:301 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
#: src/gui/windows/outfitwindow.cpp:561
#, c-format
msgid "Key: %s"
@@ -4894,31 +4954,21 @@ msgstr "Reset"
msgid "Result"
msgstr ""
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:58
-msgid "unsorted"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:60
-msgid "by price"
-msgstr ""
-
#. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:196
+#: src/gui/windows/buydialog.cpp:162
msgid "Create items"
msgstr ""
#. TRANSLATORS: buy dialog label
#. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:254 src/gui/windows/buydialog.cpp:541
-#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:366
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Price: %s / Total: %s"
#. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:263
+#: src/gui/windows/buydialog.cpp:229
msgid "Amount:"
msgstr ""
@@ -4928,8 +4978,8 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/itemamountwindow.cpp:159
-#: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
msgid "+"
msgstr ""
@@ -4940,8 +4990,8 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:271 src/gui/windows/itemamountwindow.cpp:157
-#: src/gui/windows/itemamountwindow.cpp:191 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
msgid "-"
msgstr ""
@@ -4949,9 +4999,9 @@ msgstr ""
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:274 src/gui/windows/charcreatedialog.cpp:119
-#: src/gui/windows/charselectdialog.cpp:593
-#: src/gui/windows/socialwindow.cpp:1307
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
msgid "Create"
msgstr "Create"
@@ -4960,7 +5010,7 @@ msgstr "Create"
#. TRANSLATORS: status bar label
#. TRANSLATORS: status window label
#. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:278 src/gui/windows/selldialog.cpp:112
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
#: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
#: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
msgid "Max"
@@ -5059,7 +5109,7 @@ msgstr ""
#. TRANSLATORS: login dialog label
#. TRANSLATORS: register dialog. label.
#: src/gui/windows/charcreatedialog.cpp:73
-#: src/gui/windows/editserverdialog.cpp:89 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
#: src/gui/windows/registerdialog.cpp:89
msgid "Name:"
msgstr "Name:"
@@ -5120,7 +5170,7 @@ msgstr "Female"
#. TRANSLATORS: char create dialog label
#: src/gui/windows/charcreatedialog.cpp:115
-#: src/gui/windows/charcreatedialog.cpp:469
+#: src/gui/windows/charcreatedialog.cpp:458
#, c-format
msgid "Please distribute %d points"
msgstr "Please distribute %d points"
@@ -5136,17 +5186,17 @@ msgid "Look:"
msgstr ""
#. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:362
+#: src/gui/windows/charcreatedialog.cpp:351
msgid "Your name needs to be at least 4 characters."
msgstr "Your name needs to be at least 4 characters."
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:459
+#: src/gui/windows/charcreatedialog.cpp:448
msgid "Character stats OK"
msgstr "Character stats OK"
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:475
+#: src/gui/windows/charcreatedialog.cpp:464
#, c-format
msgid "Please remove %d points"
msgstr "Please remove %d points"
@@ -5175,7 +5225,7 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:104
-#: src/gui/windows/charselectdialog.cpp:588
+#: src/gui/windows/charselectdialog.cpp:580
#: src/gui/windows/updaterwindow.cpp:188
msgid "Play"
msgstr "Play"
@@ -5231,35 +5281,20 @@ msgstr ""
msgid "Enter password:"
msgstr ""
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:172
-msgid "rainbow 1"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:174
-msgid "rainbow 2"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:176
-msgid "rainbow 3"
-msgstr ""
-
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:755
+#: src/gui/windows/chatwindow.cpp:705
#, c-format
msgid "Present: %s; %d players are present."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1169
+#: src/gui/windows/chatwindow.cpp:1119
#, c-format
msgid "Whispering to %s: %s"
msgstr "Whispering to %s: %s"
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1613
+#: src/gui/windows/chatwindow.cpp:1563
#, c-format
msgid "%s's pet"
msgstr ""
@@ -5505,51 +5540,51 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:77
-#: src/gui/windows/itemamountwindow.cpp:161 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
msgid "OK"
msgstr "OK"
#. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:66
+#: src/gui/windows/editserverdialog.cpp:45
msgid "Edit Server"
msgstr ""
#. TRANSLATORS: edit server dialog button
#. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:75
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
msgid "Connect"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:91
+#: src/gui/windows/editserverdialog.cpp:70
msgid "Address:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:93
+#: src/gui/windows/editserverdialog.cpp:72
msgid "Port:"
msgstr "Port:"
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:95
+#: src/gui/windows/editserverdialog.cpp:74
msgid "Server type:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:97
+#: src/gui/windows/editserverdialog.cpp:76
msgid "Description:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:99
+#: src/gui/windows/editserverdialog.cpp:78
msgid "Online list url:"
msgstr ""
#. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:220
+#: src/gui/windows/editserverdialog.cpp:188
msgid "Please at least type both the address and the port of the server."
msgstr ""
@@ -5569,47 +5604,47 @@ msgid "Did you know..."
msgstr ""
#. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:165
+#: src/gui/windows/itemamountwindow.cpp:164
msgid "All"
msgstr "All"
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:221
+#: src/gui/windows/itemamountwindow.cpp:220
msgid "Select amount of items to trade."
msgstr "Select amount of items to trade."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:225
+#: src/gui/windows/itemamountwindow.cpp:224
msgid "Select amount of items to drop."
msgstr "Select amount of items to drop."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:229
+#: src/gui/windows/itemamountwindow.cpp:228
msgid "Select amount of items to store."
msgstr "Select amount of items to store."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:233
+#: src/gui/windows/itemamountwindow.cpp:232
msgid "Select amount of items to retrieve."
msgstr "Select amount of items to retrieve."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:237
+#: src/gui/windows/itemamountwindow.cpp:236
msgid "Select amount of items to split."
msgstr "Select amount of items to split."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:241
+#: src/gui/windows/itemamountwindow.cpp:240
msgid "Add to buy shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:245
+#: src/gui/windows/itemamountwindow.cpp:244
msgid "Add to sell shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:249
+#: src/gui/windows/itemamountwindow.cpp:248
msgid "Unknown."
msgstr ""
@@ -5861,7 +5896,7 @@ msgstr "Submit"
#. TRANSLATORS: shop window label
#. TRANSLATORS: shop window button
#. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:258
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
#: src/gui/windows/tradewindow.cpp:78
msgid "Add"
@@ -5963,53 +5998,53 @@ msgid "Do you really want to sell %s?"
msgstr ""
#. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
msgid "Choose Your Server"
msgstr ""
#. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
msgid "Load"
msgstr ""
#. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
msgid "Choose Your Server *** SAFE MODE ***"
msgstr ""
#. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
msgid "Use same ip for game sub servers"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
msgid "Waiting for server..."
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
msgid "Preparing download"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
msgid "Error retreiving server list!"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
msgid "requires a newer version"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
#, c-format
msgid "requires v%s"
msgstr ""
@@ -6090,277 +6125,277 @@ msgid "Skill %d"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:225
+#: src/gui/windows/socialwindow.cpp:227
#, c-format
msgid "Invited user %s to guild %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:240
+#: src/gui/windows/socialwindow.cpp:242
#, c-format
msgid "Guild %s quit requested."
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:254
+#: src/gui/windows/socialwindow.cpp:256
msgid "Member Invite to Guild"
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:256
+#: src/gui/windows/socialwindow.cpp:258
#, c-format
msgid "Who would you like to invite to guild %s?"
msgstr ""
#. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:266
+#: src/gui/windows/socialwindow.cpp:268
msgid "Leave Guild?"
msgstr ""
#. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:268
+#: src/gui/windows/socialwindow.cpp:270
#, c-format
msgid "Are you sure you want to leave guild %s?"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:279
+#: src/gui/windows/socialwindow.cpp:281
#, c-format
msgid "Members: %u/%u"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:301 src/gui/windows/socialwindow.cpp:373
-#: src/gui/windows/socialwindow.cpp:498
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
#, c-format
msgid "Players: %u/%u"
msgstr ""
#. TRANSLATORS: tab in social window
#. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:389 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
msgid "Party"
msgstr "Party"
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:429
+#: src/gui/windows/socialwindow.cpp:431
#, c-format
msgid "Invited user %s to party."
msgstr ""
#. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:444
+#: src/gui/windows/socialwindow.cpp:446
#, c-format
msgid "Party %s quit requested."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:458
+#: src/gui/windows/socialwindow.cpp:460
msgid "Member Invite to Party"
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:460
+#: src/gui/windows/socialwindow.cpp:462
#, c-format
msgid "Who would you like to invite to party %s?"
msgstr ""
#. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:470
+#: src/gui/windows/socialwindow.cpp:472
msgid "Leave Party?"
msgstr ""
#. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:472
+#: src/gui/windows/socialwindow.cpp:474
#, c-format
msgid "Are you sure you want to leave party %s?"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:698
+#: src/gui/windows/socialwindow.cpp:665
#, c-format
msgid "Visible players: %d"
msgstr ""
#. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:725
+#: src/gui/windows/socialwindow.cpp:692
msgid "Nav"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:827
+#: src/gui/windows/socialwindow.cpp:794
#, c-format
msgid "Portals: %u/%u"
msgstr ""
#. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1054
+#: src/gui/windows/socialwindow.cpp:1021
msgid "Atk"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1073
+#: src/gui/windows/socialwindow.cpp:1040
msgid "Priority mobs"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1075
+#: src/gui/windows/socialwindow.cpp:1042
msgid "Attack mobs"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1077
+#: src/gui/windows/socialwindow.cpp:1044
msgid "Ignore mobs"
msgstr ""
#. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1101
+#: src/gui/windows/socialwindow.cpp:1068
msgid "Pik"
msgstr ""
#. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1120
+#: src/gui/windows/socialwindow.cpp:1087
msgid "Pickup items"
msgstr ""
#. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1122
+#: src/gui/windows/socialwindow.cpp:1089
msgid "Ignore items"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1212
+#: src/gui/windows/socialwindow.cpp:1179
#, c-format
msgid "Friends: %u/%u"
msgstr ""
#. TRANSLATORS: party popup item
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1235 src/gui/windows/socialwindow.cpp:1727
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
msgid "Create Party"
msgstr ""
#. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1298
+#: src/gui/windows/socialwindow.cpp:1265
msgid "P"
msgstr ""
#. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1303
+#: src/gui/windows/socialwindow.cpp:1270
msgid "F"
msgstr ""
#. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1309
+#: src/gui/windows/socialwindow.cpp:1276
msgid "Invite"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1503
+#: src/gui/windows/socialwindow.cpp:1470
#, c-format
msgid "Accepted party invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1514
+#: src/gui/windows/socialwindow.cpp:1481
#, c-format
msgid "Rejected party invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1531
+#: src/gui/windows/socialwindow.cpp:1498
#, c-format
msgid "Accepted guild invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1545
+#: src/gui/windows/socialwindow.cpp:1512
#, c-format
msgid "Rejected guild invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1585
+#: src/gui/windows/socialwindow.cpp:1552
#, c-format
msgid "Creating guild called %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1606
+#: src/gui/windows/socialwindow.cpp:1573
#, c-format
msgid "Creating party called %s."
msgstr ""
#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1621
+#: src/gui/windows/socialwindow.cpp:1588
msgid "Guild Name"
msgstr ""
#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1623
+#: src/gui/windows/socialwindow.cpp:1590
msgid "Choose your guild's name."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1639
+#: src/gui/windows/socialwindow.cpp:1606
msgid "Received guild request, but one already exists."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1647
+#: src/gui/windows/socialwindow.cpp:1614
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1654
+#: src/gui/windows/socialwindow.cpp:1621
msgid "Accept Guild Invite"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1670
+#: src/gui/windows/socialwindow.cpp:1637
msgid "Received party request, but one already exists."
msgstr "Received party request, but one already exists."
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1682
+#: src/gui/windows/socialwindow.cpp:1649
msgid "You have been invited you to join a party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1687
+#: src/gui/windows/socialwindow.cpp:1654
#, c-format
msgid "You have been invited to join the %s party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1696
+#: src/gui/windows/socialwindow.cpp:1663
#, 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/windows/socialwindow.cpp:1702
+#: src/gui/windows/socialwindow.cpp:1669
#, 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/windows/socialwindow.cpp:1712
+#: src/gui/windows/socialwindow.cpp:1679
msgid "Accept Party Invite"
msgstr "Accept Party Invite"
-#: src/gui/windows/socialwindow.cpp:1728
+#: src/gui/windows/socialwindow.cpp:1695
msgid "Cannot create party. You are already in a party"
msgstr ""
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1734
+#: src/gui/windows/socialwindow.cpp:1701
msgid "Party Name"
msgstr ""
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1736
+#: src/gui/windows/socialwindow.cpp:1703
msgid "Choose your party's name."
msgstr ""
@@ -6402,113 +6437,68 @@ msgstr ""
msgid "Correction points: %d"
msgstr ""
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "No Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Allow Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:105
-msgid "Need Target"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "General Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "Life Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "War Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Transmute Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Nature Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:121
-msgid "Astral Magic"
-msgstr ""
-
#. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:164
+#: src/gui/windows/textcommandeditor.cpp:47
msgid "Command Editor"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:52
msgid "magic"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:54
msgid "other"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:173
+#: src/gui/windows/textcommandeditor.cpp:56
msgid "Symbol:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:176
+#: src/gui/windows/textcommandeditor.cpp:59
msgid "Command:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:179
+#: src/gui/windows/textcommandeditor.cpp:62
msgid "Comment:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:183
+#: src/gui/windows/textcommandeditor.cpp:66
msgid "Target Type:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:187
+#: src/gui/windows/textcommandeditor.cpp:70
msgid "Icon:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:190
+#: src/gui/windows/textcommandeditor.cpp:73
msgid "Mana:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:193
+#: src/gui/windows/textcommandeditor.cpp:76
msgid "Magic level:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:197
+#: src/gui/windows/textcommandeditor.cpp:80
msgid "Magic School:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:200
+#: src/gui/windows/textcommandeditor.cpp:83
msgid "School level:"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/windows/textcommandeditor.cpp:88
msgid "Save"
msgstr ""
@@ -6538,7 +6528,7 @@ msgid "Trade: You"
msgstr "Trade: You"
#. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
#, c-format
msgid "You get %s"
msgstr ""
@@ -6554,12 +6544,12 @@ msgid "You give:"
msgstr "You give:"
#. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
msgid "You don't have enough money."
msgstr "You don't have enough money."
#. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
msgid ""
"Failed adding item. You can not overlap one kind of item on the window."
msgstr "Failed adding item. You can not overlap one kind of item on the window."
@@ -6630,17 +6620,17 @@ msgid "Who Is Online - Update"
msgstr ""
#. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:87
+#: src/gui/windows/worldselectdialog.cpp:49
msgid "Select World"
msgstr ""
#. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:93
+#: src/gui/windows/worldselectdialog.cpp:55
msgid "Change Login"
msgstr ""
#. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:95
+#: src/gui/windows/worldselectdialog.cpp:57
msgid "Choose World"
msgstr ""
@@ -6858,7 +6848,7 @@ msgid "Failed to create character. Most likely the name is already taken."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:281
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
msgid "Wrong name."
msgstr ""
@@ -7016,58 +7006,58 @@ msgid "Experience sharing unknown."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:154
+#: src/net/ea/loginhandler.cpp:149
msgid "Account was not found. Please re-login."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/ea/loginhandler.cpp:153
msgid "Old password incorrect."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:162
+#: src/net/ea/loginhandler.cpp:157
msgid "New password too short."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:166 src/net/ea/loginhandler.cpp:293
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
msgid "Unknown error."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:239
+#: src/net/ea/loginhandler.cpp:234
msgid "Unregistered ID."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:238
msgid "Wrong password."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:248
+#: src/net/ea/loginhandler.cpp:243
msgid "Account expired."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:252
+#: src/net/ea/loginhandler.cpp:247
msgid "Rejected from server."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:256
+#: src/net/ea/loginhandler.cpp:251
msgid ""
"You have been permanently banned from the game. Please contact the GM team."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:261
+#: src/net/ea/loginhandler.cpp:256
msgid "Client too old."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:265
+#: src/net/ea/loginhandler.cpp:260
#, c-format
msgid ""
"You have been temporarily banned from the game until %s.\n"
@@ -7075,22 +7065,22 @@ msgid ""
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:273
+#: src/net/ea/loginhandler.cpp:268
msgid "Server overpopulated."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:277
+#: src/net/ea/loginhandler.cpp:272
msgid "This user name is already taken."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:285
+#: src/net/ea/loginhandler.cpp:280
msgid "Incorrect email."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:289
+#: src/net/ea/loginhandler.cpp:284
msgid "Username permanently erased."
msgstr ""
@@ -7763,7 +7753,7 @@ msgstr ""
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
#: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "unnamed"
diff --git a/po/eo.po b/po/eo.po
index 6956f9677..f9c9c98ba 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-23 00:42+0300\n"
-"PO-Revision-Date: 2014-02-23 08:14+0000\n"
+"POT-Creation-Date: 2014-02-28 21:21+0300\n"
+"PO-Revision-Date: 2014-03-01 08:14+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"
@@ -30,7 +30,7 @@ msgid "Accepting incoming trade requests"
msgstr ""
#. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
msgid "Visible on map"
msgstr ""
@@ -39,68 +39,68 @@ msgstr ""
msgid "Human"
msgstr ""
-#: src/being/being.cpp:544
+#: src/being/being.cpp:496
msgid "dodge"
msgstr ""
-#: src/being/being.cpp:544
+#: src/being/being.cpp:496
msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1965 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1970 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr "I"
#. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:392
+#: src/being/localplayer.cpp:376
#, c-format
msgid "You were killed by %s"
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1377
+#: src/being/localplayer.cpp:816
msgid "Tried to pick up nonexistent item."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1381
+#: src/being/localplayer.cpp:820
msgid "Item is too heavy."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1385
+#: src/being/localplayer.cpp:824
msgid "Item is too far away."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1389
+#: src/being/localplayer.cpp:828
msgid "Inventory is full."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1393
+#: src/being/localplayer.cpp:832
msgid "Stack is too big."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1397
+#: src/being/localplayer.cpp:836
msgid "Item belongs to someone else."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1401
+#: src/being/localplayer.cpp:840
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:1425
+#: src/being/localplayer.cpp:864
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -108,387 +108,387 @@ msgstr[0] ""
msgstr[1] ""
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1630 src/being/localplayer.cpp:1665
-#: src/being/localplayer.cpp:1666
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
msgid "xp"
msgstr ""
-#: src/being/localplayer.cpp:1671 src/being/localplayer.cpp:1678
-#: src/being/localplayer.cpp:1685
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
msgid "job"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1871
+#: src/being/localplayer.cpp:1285
msgid "(D) default moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1873
+#: src/being/localplayer.cpp:1287
msgid "(I) invert moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1875
+#: src/being/localplayer.cpp:1289
msgid "(c) moves with some crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1877
+#: src/being/localplayer.cpp:1291
msgid "(C) moves with crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1879
+#: src/being/localplayer.cpp:1293
msgid "(d) double normal + crazy"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1881
+#: src/being/localplayer.cpp:1295
msgid "(?) unknown move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1904
+#: src/being/localplayer.cpp:1318
#, c-format
msgid "(%u) crazy move number %u"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1910
+#: src/being/localplayer.cpp:1324
msgid "(a) custom crazy move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1915
+#: src/being/localplayer.cpp:1329
msgid "(?) crazy move"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1930
+#: src/being/localplayer.cpp:1344
msgid "(0) default moves to target"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1932
+#: src/being/localplayer.cpp:1346
msgid "(1) moves to target in distance 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1934
+#: src/being/localplayer.cpp:1348
msgid "(2) moves to target in distance 2"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1936
+#: src/being/localplayer.cpp:1350
msgid "(3) moves to target in distance 3"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1938
+#: src/being/localplayer.cpp:1352
msgid "(5) moves to target in distance 5"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1940
+#: src/being/localplayer.cpp:1354
msgid "(7) moves to target in distance 7"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1942
+#: src/being/localplayer.cpp:1356
msgid "(A) moves to target in attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1944
+#: src/being/localplayer.cpp:1358
msgid "(a) archer attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1946
+#: src/being/localplayer.cpp:1360
msgid "(B) moves to target in attack range - 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1948
+#: src/being/localplayer.cpp:1362
msgid "(?) move to target"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1968
+#: src/being/localplayer.cpp:1382
msgid "(D) default follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1970
+#: src/being/localplayer.cpp:1384
msgid "(R) relative follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1972
+#: src/being/localplayer.cpp:1386
msgid "(M) mirror follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1974
+#: src/being/localplayer.cpp:1388
msgid "(P) pet follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1976
+#: src/being/localplayer.cpp:1390
msgid "(?) unknown follow"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1996 src/being/localplayer.cpp:2004
-#: src/being/localplayer.cpp:2032
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
msgid "(?) attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1998 src/being/localplayer.cpp:2024
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
msgid "(D) default attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2000
+#: src/being/localplayer.cpp:1414
msgid "(s) switch attack without shield"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2002
+#: src/being/localplayer.cpp:1416
msgid "(S) switch attack with shield"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2026
+#: src/being/localplayer.cpp:1440
msgid "(G) go and attack"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2028
+#: src/being/localplayer.cpp:1442
msgid "(A) go, attack, pickup"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2030
+#: src/being/localplayer.cpp:1444
msgid "(d) without auto attack"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2084
+#: src/being/localplayer.cpp:1498
msgid "(S) small pick up 1x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2086
+#: src/being/localplayer.cpp:1500
msgid "(D) default pick up 2x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2088
+#: src/being/localplayer.cpp:1502
msgid "(F) forward pick up 2x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2090
+#: src/being/localplayer.cpp:1504
msgid "(3) pick up 3x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2092
+#: src/being/localplayer.cpp:1506
msgid "(g) go and pick up in distance 4"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2094
+#: src/being/localplayer.cpp:1508
msgid "(G) go and pick up in distance 8"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2096
+#: src/being/localplayer.cpp:1510
msgid "(A) go and pick up in max distance"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2098
+#: src/being/localplayer.cpp:1512
msgid "(?) pick up"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2112
+#: src/being/localplayer.cpp:1526
msgid "(N) normal map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2114
+#: src/being/localplayer.cpp:1528
msgid "(D) debug map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2116
+#: src/being/localplayer.cpp:1530
msgid "(u) ultra map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2118
+#: src/being/localplayer.cpp:1532
msgid "(U) ultra map view 2"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2120
+#: src/being/localplayer.cpp:1534
msgid "(e) empty map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2122
+#: src/being/localplayer.cpp:1536
msgid "(b) black & white map view"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2142
+#: src/being/localplayer.cpp:1556
msgid "(f) use #flar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2144
+#: src/being/localplayer.cpp:1558
msgid "(c) use #chiza for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2146
+#: src/being/localplayer.cpp:1560
msgid "(I) use #ingrav for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2148
+#: src/being/localplayer.cpp:1562
msgid "(F) use #frillyar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2150
+#: src/being/localplayer.cpp:1564
msgid "(U) use #upmarmu for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2152
+#: src/being/localplayer.cpp:1566
msgid "(?) magic attack"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2172
+#: src/being/localplayer.cpp:1586
msgid "(a) attack all players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2174
+#: src/being/localplayer.cpp:1588
msgid "(f) attack all except friends"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2176
+#: src/being/localplayer.cpp:1590
msgid "(b) attack bad relations"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2178
+#: src/being/localplayer.cpp:1592
msgid "(d) don't attack players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2180
+#: src/being/localplayer.cpp:1594
msgid "(?) pvp attack"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2200
+#: src/being/localplayer.cpp:1614
msgid "(D) default imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2202
+#: src/being/localplayer.cpp:1616
msgid "(O) outfits imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2204
+#: src/being/localplayer.cpp:1618
msgid "(?) imitation"
msgstr ""
#. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2233
+#: src/being/localplayer.cpp:1647
msgid "Away"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2256
+#: src/being/localplayer.cpp:1670
msgid "(O) on keyboard"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2258
+#: src/being/localplayer.cpp:1672
msgid "(A) away"
msgstr ""
#. TRANSLATORS: away type in status bar
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2260 src/being/localplayer.cpp:2278
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
msgid "(?) away"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2274
+#: src/being/localplayer.cpp:1688
msgid "(G) game camera mode"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2276
+#: src/being/localplayer.cpp:1690
msgid "(F) free camera mode"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2303
+#: src/being/localplayer.cpp:1717
msgid "Game modifiers are enabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2305
+#: src/being/localplayer.cpp:1719
msgid "Game modifiers are disabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2307
+#: src/being/localplayer.cpp:1721
msgid "Game modifiers are unknown"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3887
+#: src/being/localplayer.cpp:3287
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3893 src/being/localplayer.cpp:3918
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3903
+#: src/being/localplayer.cpp:3303
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3909 src/being/localplayer.cpp:3923
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4266
+#: src/being/localplayer.cpp:3666
#, c-format
msgid "You see %s"
msgstr ""
@@ -526,32 +526,32 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1139 src/gui/windowmenu.cpp:167
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
#: src/gui/windows/setupwindow.cpp:61
msgid "Setup"
msgstr ""
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1143 src/gui/widgets/tabs/setup_perfomance.cpp:51
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1146 src/gui/widgets/tabs/setup_video.cpp:225
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:225
msgid "Video"
msgstr "Video"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1149 src/gui/widgets/tabs/setup_theme.cpp:269
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1152 src/gui/windowmenu.cpp:74
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr "Helpo"
@@ -564,41 +564,41 @@ msgstr "Helpo"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1156 src/gui/popups/popupmenu.cpp:619
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
#: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:69
-#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:138
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
#: src/gui/windows/shopwindow.cpp:78
msgid "Close"
msgstr "Fermi"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1324
msgid "Logging in"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1367
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1492
+#: src/client.cpp:1489
msgid "Requesting characters"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1532
+#: src/client.cpp:1529
msgid "Connecting to the game server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1545
+#: src/client.cpp:1541
msgid "Changing game servers"
msgstr ""
@@ -613,12 +613,12 @@ msgstr ""
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1606 src/client.cpp:1617 src/client.cpp:1801
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:349
#: src/gui/windows/charselectdialog.cpp:299
-#: src/gui/windows/editserverdialog.cpp:218
+#: src/gui/windows/editserverdialog.cpp:186
#: src/gui/windows/registerdialog.cpp:260
#: src/gui/windows/unregisterdialog.cpp:146
#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
@@ -626,65 +626,65 @@ msgid "Error"
msgstr "Eraro"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1629
+#: src/client.cpp:1625
msgid "Requesting registration details"
msgstr ""
#. TRANSLATORS: password change message header
-#: src/client.cpp:1670
+#: src/client.cpp:1666
msgid "Password Change"
msgstr ""
#. TRANSLATORS: password change message text
-#: src/client.cpp:1672
+#: src/client.cpp:1668
msgid "Password changed successfully!"
msgstr ""
#. TRANSLATORS: email change message header
-#: src/client.cpp:1694
+#: src/client.cpp:1690
msgid "Email Change"
msgstr ""
#. TRANSLATORS: email change message text
-#: src/client.cpp:1696
+#: src/client.cpp:1692
msgid "Email changed successfully!"
msgstr ""
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1719
+#: src/client.cpp:1715
msgid "Unregister Successful"
msgstr ""
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1721
+#: src/client.cpp:1717
msgid "Farewell, come back any time..."
msgstr ""
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1998 src/client.cpp:2013 src/client.cpp:2058
-#: src/client.cpp:2074 src/client.cpp:2525 src/client.cpp:2533
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2230
+#: src/client.cpp:2232
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2271 src/client.cpp:2278
+#: src/client.cpp:2273 src/client.cpp:2280
msgid "Error creating updates directory!"
msgstr ""
-#: src/client.cpp:2300 src/client.cpp:2317
+#: src/client.cpp:2302 src/client.cpp:2319
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: error message question
-#: src/client.cpp:3001
+#: src/client.cpp:3003
msgid "Do you want to open support page?"
msgstr ""
@@ -930,99 +930,154 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:277 src/gui/widgets/tabs/chattab.cpp:464
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
msgid "General"
msgstr ""
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:293 src/gui/widgets/tabs/chattab.cpp:466
-#: src/gui/windowmenu.cpp:154 src/gui/windows/debugwindow.cpp:53
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:575
+#: src/game.cpp:563
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:585
+#: src/game.cpp:573
msgid "Saving screenshot failed!"
msgstr ""
#. TRANSLATORS: error message text
-#: src/game.cpp:656
+#: src/game.cpp:644
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:659
+#: src/game.cpp:647
msgid "Network Error"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
msgid "black"
msgstr "nigra"
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
msgid "red"
msgstr "ruĝa"
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
msgid "green"
msgstr "verda"
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
msgid "blue"
msgstr "blua"
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
msgid "gold"
msgstr "ora"
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
msgid "yellow"
msgstr "flava"
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
msgid "pink"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
msgid "purple"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
msgid "grey"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
msgid "brown"
msgstr ""
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr ""
+
#. TRANSLATORS: relation type
#: src/gui/models/playerrelationlistmodel.h:33
msgid "Neutral"
@@ -1058,46 +1113,61 @@ msgstr ""
msgid "Enemy"
msgstr "Malamiko"
-#. TRANSLATORS: inventory sort mode
-#. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#: src/gui/models/sortlistmodelinv.h:34
-#: src/gui/widgets/tabs/setup_other.cpp:72
-#: src/gui/widgets/tabs/setup_visual.cpp:78 src/gui/windows/chatwindow.cpp:150
-msgid "default"
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:36 src/gui/windows/buydialog.cpp:62
-msgid "by name"
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
msgstr ""
+#. TRANSLATORS: buy dialog sort type.
#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
+msgid "by name"
+msgstr ""
+
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:38 src/gui/windows/buydialog.cpp:64
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
msgid "by id"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:40 src/gui/windows/buydialog.cpp:66
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
msgid "by weight"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:42 src/gui/windows/buydialog.cpp:68
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
msgid "by amount"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:44 src/gui/windows/buydialog.cpp:70
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
msgid "by type"
msgstr ""
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr ""
+
#. TRANSLATORS: update type
#. TRANSLATORS: onscreen button size
#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
@@ -1244,8 +1314,8 @@ msgstr "Paroli"
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
-#: src/gui/windows/buydialog.cpp:208 src/gui/windows/buydialog.cpp:220
-#: src/gui/windows/buydialog.cpp:274 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
msgid "Buy"
msgstr ""
@@ -1342,12 +1412,12 @@ msgstr ""
#: src/gui/windows/changepassworddialog.cpp:57
#: src/gui/windows/charcreatedialog.cpp:121
#: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:79
-#: src/gui/windows/itemamountwindow.cpp:163
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
-#: src/gui/windows/socialwindow.cpp:1238
-#: src/gui/windows/textcommandeditor.cpp:203 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:54
#: src/gui/windows/updaterwindow.cpp:186
msgid "Cancel"
@@ -1419,7 +1489,7 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:150 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
msgstr ""
@@ -1432,7 +1502,7 @@ msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:134
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
msgid "Spells"
msgstr ""
@@ -1488,7 +1558,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
#. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1311
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
msgid "Leave"
msgstr "Forlasi"
@@ -1569,8 +1639,8 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
-#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:223
-#: src/gui/windows/inventorywindow.cpp:745 src/gui/windows/setupwindow.cpp:96
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
msgid "Store"
msgstr ""
@@ -1601,7 +1671,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
msgid "Retrieve"
msgstr ""
@@ -1634,8 +1704,8 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
-#: src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:656 src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr "Uzi"
@@ -1669,8 +1739,8 @@ msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: language
#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/widgets/tabs/setup_theme.cpp:127
-#: src/gui/windows/socialwindow.cpp:1003
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
msgid "(default)"
msgstr ""
@@ -1826,8 +1896,8 @@ msgstr ""
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:645
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
msgid "Unequip"
msgstr ""
@@ -1835,16 +1905,16 @@ msgstr ""
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:172
-#: src/gui/windows/inventorywindow.cpp:650 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:189
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
msgid "Drop..."
msgstr ""
@@ -1858,15 +1928,15 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:138
-#: src/gui/windows/inventorywindow.cpp:758
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
msgid "Drop"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
msgid "Split"
msgstr ""
@@ -2022,10 +2092,10 @@ msgstr ""
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:276
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/windows/serverdialog.cpp:198
msgid "Quit"
msgstr "Eliri"
@@ -2587,7 +2657,7 @@ msgstr ""
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: register dialog. button.
#: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:146
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:330
#: src/gui/widgets/tabs/setup_visual.cpp:189
@@ -2614,9 +2684,8 @@ msgstr ""
#. TRANSLATORS: command editor button
#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
#: src/gui/windows/charselectdialog.cpp:108
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:94
-#: src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/textcommandeditor.cpp:207
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
msgid "Delete"
msgstr "Forigi"
@@ -2652,7 +2721,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:130
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
msgid "Shortcuts"
msgstr ""
@@ -2660,7 +2729,7 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:151
msgid "Windows"
msgstr "Fenestroj"
@@ -2676,7 +2745,7 @@ msgstr ""
#. TRANSLATORS: settings tab name
#. TRANSLATORS: chat window name
#: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:88 src/gui/windows/chatwindow.cpp:203
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
msgid "Chat"
msgstr "Babilado"
@@ -2899,7 +2968,7 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:137
-#: src/gui/windows/inventorywindow.cpp:569
+#: src/gui/windows/inventorywindow.cpp:568
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
#, c-format
@@ -2919,7 +2988,7 @@ msgstr ""
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/windows/serverdialog.cpp:204
msgid "Edit"
msgstr ""
@@ -2972,7 +3041,7 @@ msgstr ""
#. TRANSLATORS: tab in social window
#. TRANSLATORS: guild chat tab name
#: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:184 src/gui/windows/socialwindow.cpp:320
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
#: src/net/ea/gui/guildtab.cpp:44
msgid "Guild"
msgstr ""
@@ -2983,142 +3052,142 @@ msgid "Lang"
msgstr ""
#. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:49
+#: src/gui/widgets/tabs/setup_audio.cpp:48
msgid "Audio"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:57
+#: src/gui/widgets/tabs/setup_audio.cpp:56
msgid "Basic settings"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:60
+#: src/gui/widgets/tabs/setup_audio.cpp:59
msgid "Enable Audio"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:63
+#: src/gui/widgets/tabs/setup_audio.cpp:62
msgid "Enable music"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:67
+#: src/gui/widgets/tabs/setup_audio.cpp:66
msgid "Enable game sfx"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:71
+#: src/gui/widgets/tabs/setup_audio.cpp:70
msgid "Enable gui sfx"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:74
msgid "Sfx volume"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:78
msgid "Music volume"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:82
msgid "Enable music fade out"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:86
msgid "Audio frequency"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:90
msgid "mono"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:93
+#: src/gui/widgets/tabs/setup_audio.cpp:92
msgid "stereo"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:94
msgid "surround"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:97
+#: src/gui/widgets/tabs/setup_audio.cpp:96
msgid "surround+center+lfe"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:98
msgid "Audio channels"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:104
+#: src/gui/widgets/tabs/setup_audio.cpp:103
msgid "Sound effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:106
msgid "Information dialog sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:110
msgid "Request dialog sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:115
+#: src/gui/widgets/tabs/setup_audio.cpp:114
msgid "Whisper message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:118
msgid "Guild / Party message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:122
msgid "Highlight message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:126
msgid "Global message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:130
msgid "Error message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:134
msgid "Trade request sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:138
msgid "Show window sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:142
msgid "Hide window sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:150
msgid "Enable mumble voice chat"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:156
+#: src/gui/widgets/tabs/setup_audio.cpp:155
msgid "Download music"
msgstr ""
@@ -3414,7 +3483,7 @@ msgstr ""
#. TRANSLATORS: unknown key name
#. TRANSLATORS: quests window quest name
#: src/gui/widgets/tabs/setup_input.cpp:364
-#: src/gui/windows/questswindow.cpp:263
+#: src/gui/windows/questswindow.cpp:249
msgid "unknown"
msgstr ""
@@ -3573,7 +3642,7 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: debug window tab
#. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:105
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
#: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
#: src/gui/windows/minimap.cpp:114
msgid "Map"
@@ -3741,9 +3810,9 @@ msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: shop window name
#. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:146
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
#: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windows/inventorywindow.cpp:194
msgid "Shop"
msgstr ""
@@ -4125,252 +4194,252 @@ msgid "When ignoring:"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:64
+#: src/gui/widgets/tabs/setup_theme.cpp:63
msgid "Very small (8)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:66
+#: src/gui/widgets/tabs/setup_theme.cpp:65
msgid "Very small (9)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:68
+#: src/gui/widgets/tabs/setup_theme.cpp:67
msgid "Tiny (10)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:70
+#: src/gui/widgets/tabs/setup_theme.cpp:69
msgid "Small (11)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:72
+#: src/gui/widgets/tabs/setup_theme.cpp:71
msgid "Medium (12)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:74
+#: src/gui/widgets/tabs/setup_theme.cpp:73
msgid "Normal (13)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:76
+#: src/gui/widgets/tabs/setup_theme.cpp:75
msgid "Large (14)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:78
+#: src/gui/widgets/tabs/setup_theme.cpp:77
msgid "Large (15)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:80
+#: src/gui/widgets/tabs/setup_theme.cpp:79
msgid "Large (16)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:82
+#: src/gui/widgets/tabs/setup_theme.cpp:81
msgid "Big (17)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:83
msgid "Big (18)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:85
msgid "Big (19)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:87
msgid "Very big (20)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:89
msgid "Very big (21)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:91
msgid "Very big (22)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:93
msgid "Huge (23)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:129
+#: src/gui/widgets/tabs/setup_theme.cpp:128
msgid "Chinese (China)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:131
+#: src/gui/widgets/tabs/setup_theme.cpp:130
msgid "Czech"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:133
+#: src/gui/widgets/tabs/setup_theme.cpp:132
msgid "English"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:135
+#: src/gui/widgets/tabs/setup_theme.cpp:134
msgid "Finnish"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:137
+#: src/gui/widgets/tabs/setup_theme.cpp:136
msgid "French"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:139
+#: src/gui/widgets/tabs/setup_theme.cpp:138
msgid "German"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:141
+#: src/gui/widgets/tabs/setup_theme.cpp:140
msgid "Indonesian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:143
+#: src/gui/widgets/tabs/setup_theme.cpp:142
msgid "Italian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:145
+#: src/gui/widgets/tabs/setup_theme.cpp:144
msgid "Polish"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:147
+#: src/gui/widgets/tabs/setup_theme.cpp:146
msgid "Japanese"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:148
msgid "Dutch (Belgium/Flemish)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:150
msgid "Portuguese"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:152
msgid "Portuguese (Brazilian)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:154
msgid "Russian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:156
msgid "Spanish (Castilian)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:158
msgid "Turkish"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:211
+#: src/gui/widgets/tabs/setup_theme.cpp:210
msgid "Gui theme"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:218
+#: src/gui/widgets/tabs/setup_theme.cpp:217
msgid "Main Font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:223
+#: src/gui/widgets/tabs/setup_theme.cpp:222
msgid "Language"
msgstr "Lingvo"
#. TRANSLATORS: theme settings label
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:227 src/gui/windows/emotewindow.cpp:45
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
msgid "Bold font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:230
msgid "Particle font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:235
+#: src/gui/widgets/tabs/setup_theme.cpp:234
msgid "Help font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:239
+#: src/gui/widgets/tabs/setup_theme.cpp:238
msgid "Secure font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:242
msgid "Npc font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:247
+#: src/gui/widgets/tabs/setup_theme.cpp:246
msgid "Japanese font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:250
msgid "Chinese font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:256
+#: src/gui/widgets/tabs/setup_theme.cpp:255
msgid "Font size"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:261
+#: src/gui/widgets/tabs/setup_theme.cpp:260
msgid "Npc font size"
msgstr ""
#. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:265
+#: src/gui/widgets/tabs/setup_theme.cpp:264
msgid "i"
msgstr ""
#. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:404
+#: src/gui/widgets/tabs/setup_theme.cpp:403
msgid "Name: "
msgstr ""
-#: src/gui/widgets/tabs/setup_theme.cpp:405
+#: src/gui/widgets/tabs/setup_theme.cpp:404
msgid "Copyright:"
msgstr ""
#. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:470
+#: src/gui/widgets/tabs/setup_theme.cpp:469
msgid "Theme info"
msgstr ""
#. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:497
+#: src/gui/widgets/tabs/setup_theme.cpp:496
msgid "Theme Changed"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:497
+#: src/gui/widgets/tabs/setup_theme.cpp:496
#: src/gui/widgets/tabs/setup_video.cpp:499
#: src/gui/widgets/tabs/setup_video.cpp:508
msgid "Restart your client for the change to take effect."
@@ -4701,178 +4770,169 @@ msgid "Allow screensaver to run"
msgstr ""
#. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:67
msgid "ONL"
msgstr ""
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:68
msgid "Who is online"
msgstr ""
#. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:70
msgid "HLP"
msgstr ""
#. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:73
msgid "QE"
msgstr ""
#. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:77 src/gui/windows/questswindow.cpp:126
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
msgid "Quests"
msgstr ""
#. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:76
msgid "BC"
msgstr ""
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:77
msgid "Bot checker"
msgstr ""
#. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:82
+#: src/gui/windowmenu.cpp:79
msgid "KS"
msgstr ""
#. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:83 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
msgid "Kill stats"
msgstr ""
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:82
msgid "Smilies"
msgstr ""
#. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:87
+#: src/gui/windowmenu.cpp:84
msgid "CH"
msgstr ""
#. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:95
+#: src/gui/windowmenu.cpp:92
msgid "STA"
msgstr ""
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:93
msgid "Status"
msgstr ""
#. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:95
msgid "EQU"
msgstr ""
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:58
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
msgid "Equipment"
msgstr ""
#. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:98
msgid "INV"
msgstr ""
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:130
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
#: src/inventory.cpp:257
msgid "Inventory"
msgstr ""
#. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:104
+#: src/gui/windowmenu.cpp:101
msgid "MAP"
msgstr ""
#. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:110
+#: src/gui/windowmenu.cpp:107
msgid "SKI"
msgstr ""
#. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
msgid "Skills"
msgstr ""
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:118
-msgid "SPE"
-msgstr ""
-
-#: src/gui/windowmenu.cpp:119
-msgid "Specials"
-msgstr ""
-
#. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:124
+#: src/gui/windowmenu.cpp:112
msgid "SOC"
msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:126 src/gui/windows/socialwindow.cpp:1284
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
msgid "Social"
msgstr ""
#. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:128
+#: src/gui/windowmenu.cpp:116
msgid "SH"
msgstr ""
#. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:132
+#: src/gui/windowmenu.cpp:120
msgid "SP"
msgstr ""
#. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:124
msgid "DR"
msgstr ""
#. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:128
msgid "YK"
msgstr ""
#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:130
msgid "Did you know"
msgstr ""
#. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:144
+#: src/gui/windowmenu.cpp:132
msgid "SHP"
msgstr ""
#. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:148
+#: src/gui/windowmenu.cpp:136
msgid "OU"
msgstr ""
#. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:152
+#: src/gui/windowmenu.cpp:140
msgid "DBG"
msgstr ""
#. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:149
msgid "WIN"
msgstr ""
#. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:153
msgid "SET"
msgstr ""
#. TRANSLATORS: short key name
#. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:301 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
#: src/gui/windows/outfitwindow.cpp:561
#, c-format
msgid "Key: %s"
@@ -4894,31 +4954,21 @@ msgstr ""
msgid "Result"
msgstr ""
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:58
-msgid "unsorted"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:60
-msgid "by price"
-msgstr ""
-
#. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:196
+#: src/gui/windows/buydialog.cpp:162
msgid "Create items"
msgstr ""
#. TRANSLATORS: buy dialog label
#. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:254 src/gui/windows/buydialog.cpp:541
-#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:366
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
#, c-format
msgid "Price: %s / Total: %s"
msgstr ""
#. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:263
+#: src/gui/windows/buydialog.cpp:229
msgid "Amount:"
msgstr "Kvanto:"
@@ -4928,8 +4978,8 @@ msgstr "Kvanto:"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/itemamountwindow.cpp:159
-#: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
msgid "+"
msgstr "+"
@@ -4940,8 +4990,8 @@ msgstr "+"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:271 src/gui/windows/itemamountwindow.cpp:157
-#: src/gui/windows/itemamountwindow.cpp:191 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
msgid "-"
msgstr "-"
@@ -4949,9 +4999,9 @@ msgstr "-"
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:274 src/gui/windows/charcreatedialog.cpp:119
-#: src/gui/windows/charselectdialog.cpp:593
-#: src/gui/windows/socialwindow.cpp:1307
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
msgid "Create"
msgstr "Krei"
@@ -4960,7 +5010,7 @@ msgstr "Krei"
#. TRANSLATORS: status bar label
#. TRANSLATORS: status window label
#. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:278 src/gui/windows/selldialog.cpp:112
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
#: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
#: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
msgid "Max"
@@ -5059,7 +5109,7 @@ msgstr ""
#. TRANSLATORS: login dialog label
#. TRANSLATORS: register dialog. label.
#: src/gui/windows/charcreatedialog.cpp:73
-#: src/gui/windows/editserverdialog.cpp:89 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
#: src/gui/windows/registerdialog.cpp:89
msgid "Name:"
msgstr "Nomo:"
@@ -5120,7 +5170,7 @@ msgstr "Ina"
#. TRANSLATORS: char create dialog label
#: src/gui/windows/charcreatedialog.cpp:115
-#: src/gui/windows/charcreatedialog.cpp:469
+#: src/gui/windows/charcreatedialog.cpp:458
#, c-format
msgid "Please distribute %d points"
msgstr ""
@@ -5136,17 +5186,17 @@ msgid "Look:"
msgstr ""
#. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:362
+#: src/gui/windows/charcreatedialog.cpp:351
msgid "Your name needs to be at least 4 characters."
msgstr ""
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:459
+#: src/gui/windows/charcreatedialog.cpp:448
msgid "Character stats OK"
msgstr ""
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:475
+#: src/gui/windows/charcreatedialog.cpp:464
#, c-format
msgid "Please remove %d points"
msgstr ""
@@ -5175,7 +5225,7 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:104
-#: src/gui/windows/charselectdialog.cpp:588
+#: src/gui/windows/charselectdialog.cpp:580
#: src/gui/windows/updaterwindow.cpp:188
msgid "Play"
msgstr "Ludi"
@@ -5231,35 +5281,20 @@ msgstr ""
msgid "Enter password:"
msgstr ""
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:172
-msgid "rainbow 1"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:174
-msgid "rainbow 2"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:176
-msgid "rainbow 3"
-msgstr ""
-
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:755
+#: src/gui/windows/chatwindow.cpp:705
#, c-format
msgid "Present: %s; %d players are present."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1169
+#: src/gui/windows/chatwindow.cpp:1119
#, c-format
msgid "Whispering to %s: %s"
msgstr ""
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1613
+#: src/gui/windows/chatwindow.cpp:1563
#, c-format
msgid "%s's pet"
msgstr ""
@@ -5505,51 +5540,51 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:77
-#: src/gui/windows/itemamountwindow.cpp:161 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
msgid "OK"
msgstr ""
#. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:66
+#: src/gui/windows/editserverdialog.cpp:45
msgid "Edit Server"
msgstr ""
#. TRANSLATORS: edit server dialog button
#. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:75
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
msgid "Connect"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:91
+#: src/gui/windows/editserverdialog.cpp:70
msgid "Address:"
msgstr "Adreso:"
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:93
+#: src/gui/windows/editserverdialog.cpp:72
msgid "Port:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:95
+#: src/gui/windows/editserverdialog.cpp:74
msgid "Server type:"
msgstr "Servilo-speco:"
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:97
+#: src/gui/windows/editserverdialog.cpp:76
msgid "Description:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:99
+#: src/gui/windows/editserverdialog.cpp:78
msgid "Online list url:"
msgstr ""
#. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:220
+#: src/gui/windows/editserverdialog.cpp:188
msgid "Please at least type both the address and the port of the server."
msgstr ""
@@ -5569,47 +5604,47 @@ msgid "Did you know..."
msgstr ""
#. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:165
+#: src/gui/windows/itemamountwindow.cpp:164
msgid "All"
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:221
+#: src/gui/windows/itemamountwindow.cpp:220
msgid "Select amount of items to trade."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:225
+#: src/gui/windows/itemamountwindow.cpp:224
msgid "Select amount of items to drop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:229
+#: src/gui/windows/itemamountwindow.cpp:228
msgid "Select amount of items to store."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:233
+#: src/gui/windows/itemamountwindow.cpp:232
msgid "Select amount of items to retrieve."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:237
+#: src/gui/windows/itemamountwindow.cpp:236
msgid "Select amount of items to split."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:241
+#: src/gui/windows/itemamountwindow.cpp:240
msgid "Add to buy shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:245
+#: src/gui/windows/itemamountwindow.cpp:244
msgid "Add to sell shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:249
+#: src/gui/windows/itemamountwindow.cpp:248
msgid "Unknown."
msgstr "Nekonata."
@@ -5861,7 +5896,7 @@ msgstr ""
#. TRANSLATORS: shop window label
#. TRANSLATORS: shop window button
#. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:258
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
#: src/gui/windows/tradewindow.cpp:78
msgid "Add"
@@ -5963,53 +5998,53 @@ msgid "Do you really want to sell %s?"
msgstr ""
#. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
msgid "Choose Your Server"
msgstr ""
#. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
msgid "Load"
msgstr ""
#. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
msgid "Choose Your Server *** SAFE MODE ***"
msgstr ""
#. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
msgid "Use same ip for game sub servers"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
msgid "Waiting for server..."
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
msgid "Preparing download"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
msgid "Error retreiving server list!"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
msgid "requires a newer version"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
#, c-format
msgid "requires v%s"
msgstr ""
@@ -6090,277 +6125,277 @@ msgid "Skill %d"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:225
+#: src/gui/windows/socialwindow.cpp:227
#, c-format
msgid "Invited user %s to guild %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:240
+#: src/gui/windows/socialwindow.cpp:242
#, c-format
msgid "Guild %s quit requested."
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:254
+#: src/gui/windows/socialwindow.cpp:256
msgid "Member Invite to Guild"
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:256
+#: src/gui/windows/socialwindow.cpp:258
#, c-format
msgid "Who would you like to invite to guild %s?"
msgstr ""
#. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:266
+#: src/gui/windows/socialwindow.cpp:268
msgid "Leave Guild?"
msgstr ""
#. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:268
+#: src/gui/windows/socialwindow.cpp:270
#, c-format
msgid "Are you sure you want to leave guild %s?"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:279
+#: src/gui/windows/socialwindow.cpp:281
#, c-format
msgid "Members: %u/%u"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:301 src/gui/windows/socialwindow.cpp:373
-#: src/gui/windows/socialwindow.cpp:498
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
#, c-format
msgid "Players: %u/%u"
msgstr ""
#. TRANSLATORS: tab in social window
#. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:389 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
msgid "Party"
msgstr "Partio"
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:429
+#: src/gui/windows/socialwindow.cpp:431
#, c-format
msgid "Invited user %s to party."
msgstr ""
#. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:444
+#: src/gui/windows/socialwindow.cpp:446
#, c-format
msgid "Party %s quit requested."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:458
+#: src/gui/windows/socialwindow.cpp:460
msgid "Member Invite to Party"
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:460
+#: src/gui/windows/socialwindow.cpp:462
#, c-format
msgid "Who would you like to invite to party %s?"
msgstr ""
#. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:470
+#: src/gui/windows/socialwindow.cpp:472
msgid "Leave Party?"
msgstr ""
#. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:472
+#: src/gui/windows/socialwindow.cpp:474
#, c-format
msgid "Are you sure you want to leave party %s?"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:698
+#: src/gui/windows/socialwindow.cpp:665
#, c-format
msgid "Visible players: %d"
msgstr ""
#. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:725
+#: src/gui/windows/socialwindow.cpp:692
msgid "Nav"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:827
+#: src/gui/windows/socialwindow.cpp:794
#, c-format
msgid "Portals: %u/%u"
msgstr ""
#. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1054
+#: src/gui/windows/socialwindow.cpp:1021
msgid "Atk"
msgstr "Atk"
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1073
+#: src/gui/windows/socialwindow.cpp:1040
msgid "Priority mobs"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1075
+#: src/gui/windows/socialwindow.cpp:1042
msgid "Attack mobs"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1077
+#: src/gui/windows/socialwindow.cpp:1044
msgid "Ignore mobs"
msgstr ""
#. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1101
+#: src/gui/windows/socialwindow.cpp:1068
msgid "Pik"
msgstr ""
#. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1120
+#: src/gui/windows/socialwindow.cpp:1087
msgid "Pickup items"
msgstr ""
#. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1122
+#: src/gui/windows/socialwindow.cpp:1089
msgid "Ignore items"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1212
+#: src/gui/windows/socialwindow.cpp:1179
#, c-format
msgid "Friends: %u/%u"
msgstr ""
#. TRANSLATORS: party popup item
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1235 src/gui/windows/socialwindow.cpp:1727
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
msgid "Create Party"
msgstr "Krei partion"
#. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1298
+#: src/gui/windows/socialwindow.cpp:1265
msgid "P"
msgstr ""
#. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1303
+#: src/gui/windows/socialwindow.cpp:1270
msgid "F"
msgstr ""
#. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1309
+#: src/gui/windows/socialwindow.cpp:1276
msgid "Invite"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1503
+#: src/gui/windows/socialwindow.cpp:1470
#, c-format
msgid "Accepted party invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1514
+#: src/gui/windows/socialwindow.cpp:1481
#, c-format
msgid "Rejected party invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1531
+#: src/gui/windows/socialwindow.cpp:1498
#, c-format
msgid "Accepted guild invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1545
+#: src/gui/windows/socialwindow.cpp:1512
#, c-format
msgid "Rejected guild invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1585
+#: src/gui/windows/socialwindow.cpp:1552
#, c-format
msgid "Creating guild called %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1606
+#: src/gui/windows/socialwindow.cpp:1573
#, c-format
msgid "Creating party called %s."
msgstr ""
#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1621
+#: src/gui/windows/socialwindow.cpp:1588
msgid "Guild Name"
msgstr ""
#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1623
+#: src/gui/windows/socialwindow.cpp:1590
msgid "Choose your guild's name."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1639
+#: src/gui/windows/socialwindow.cpp:1606
msgid "Received guild request, but one already exists."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1647
+#: src/gui/windows/socialwindow.cpp:1614
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1654
+#: src/gui/windows/socialwindow.cpp:1621
msgid "Accept Guild Invite"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1670
+#: src/gui/windows/socialwindow.cpp:1637
msgid "Received party request, but one already exists."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1682
+#: src/gui/windows/socialwindow.cpp:1649
msgid "You have been invited you to join a party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1687
+#: src/gui/windows/socialwindow.cpp:1654
#, c-format
msgid "You have been invited to join the %s party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1696
+#: src/gui/windows/socialwindow.cpp:1663
#, c-format
msgid "%s has invited you to join their party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1702
+#: src/gui/windows/socialwindow.cpp:1669
#, c-format
msgid "%s has invited you to join the %s party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1712
+#: src/gui/windows/socialwindow.cpp:1679
msgid "Accept Party Invite"
msgstr ""
-#: src/gui/windows/socialwindow.cpp:1728
+#: src/gui/windows/socialwindow.cpp:1695
msgid "Cannot create party. You are already in a party"
msgstr ""
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1734
+#: src/gui/windows/socialwindow.cpp:1701
msgid "Party Name"
msgstr "Partio-nomo"
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1736
+#: src/gui/windows/socialwindow.cpp:1703
msgid "Choose your party's name."
msgstr ""
@@ -6402,113 +6437,68 @@ msgstr ""
msgid "Correction points: %d"
msgstr ""
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "No Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Allow Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:105
-msgid "Need Target"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "General Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "Life Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "War Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Transmute Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Nature Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:121
-msgid "Astral Magic"
-msgstr ""
-
#. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:164
+#: src/gui/windows/textcommandeditor.cpp:47
msgid "Command Editor"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:52
msgid "magic"
msgstr "magio"
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:54
msgid "other"
msgstr "alia"
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:173
+#: src/gui/windows/textcommandeditor.cpp:56
msgid "Symbol:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:176
+#: src/gui/windows/textcommandeditor.cpp:59
msgid "Command:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:179
+#: src/gui/windows/textcommandeditor.cpp:62
msgid "Comment:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:183
+#: src/gui/windows/textcommandeditor.cpp:66
msgid "Target Type:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:187
+#: src/gui/windows/textcommandeditor.cpp:70
msgid "Icon:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:190
+#: src/gui/windows/textcommandeditor.cpp:73
msgid "Mana:"
msgstr "Manao:"
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:193
+#: src/gui/windows/textcommandeditor.cpp:76
msgid "Magic level:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:197
+#: src/gui/windows/textcommandeditor.cpp:80
msgid "Magic School:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:200
+#: src/gui/windows/textcommandeditor.cpp:83
msgid "School level:"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/windows/textcommandeditor.cpp:88
msgid "Save"
msgstr ""
@@ -6538,7 +6528,7 @@ msgid "Trade: You"
msgstr ""
#. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
#, c-format
msgid "You get %s"
msgstr "Vi ricevas %s"
@@ -6554,12 +6544,12 @@ msgid "You give:"
msgstr "Vi donas:"
#. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
msgid "You don't have enough money."
msgstr ""
#. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
msgid ""
"Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
@@ -6630,17 +6620,17 @@ msgid "Who Is Online - Update"
msgstr ""
#. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:87
+#: src/gui/windows/worldselectdialog.cpp:49
msgid "Select World"
msgstr "Elekti mondon"
#. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:93
+#: src/gui/windows/worldselectdialog.cpp:55
msgid "Change Login"
msgstr ""
#. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:95
+#: src/gui/windows/worldselectdialog.cpp:57
msgid "Choose World"
msgstr ""
@@ -6858,7 +6848,7 @@ msgid "Failed to create character. Most likely the name is already taken."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:281
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
msgid "Wrong name."
msgstr "Nekorekta nomo."
@@ -7016,58 +7006,58 @@ msgid "Experience sharing unknown."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:154
+#: src/net/ea/loginhandler.cpp:149
msgid "Account was not found. Please re-login."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/ea/loginhandler.cpp:153
msgid "Old password incorrect."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:162
+#: src/net/ea/loginhandler.cpp:157
msgid "New password too short."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:166 src/net/ea/loginhandler.cpp:293
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
msgid "Unknown error."
msgstr "Nekonata eraro."
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:239
+#: src/net/ea/loginhandler.cpp:234
msgid "Unregistered ID."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:238
msgid "Wrong password."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:248
+#: src/net/ea/loginhandler.cpp:243
msgid "Account expired."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:252
+#: src/net/ea/loginhandler.cpp:247
msgid "Rejected from server."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:256
+#: src/net/ea/loginhandler.cpp:251
msgid ""
"You have been permanently banned from the game. Please contact the GM team."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:261
+#: src/net/ea/loginhandler.cpp:256
msgid "Client too old."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:265
+#: src/net/ea/loginhandler.cpp:260
#, c-format
msgid ""
"You have been temporarily banned from the game until %s.\n"
@@ -7075,22 +7065,22 @@ msgid ""
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:273
+#: src/net/ea/loginhandler.cpp:268
msgid "Server overpopulated."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:277
+#: src/net/ea/loginhandler.cpp:272
msgid "This user name is already taken."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:285
+#: src/net/ea/loginhandler.cpp:280
msgid "Incorrect email."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:289
+#: src/net/ea/loginhandler.cpp:284
msgid "Username permanently erased."
msgstr ""
@@ -7763,7 +7753,7 @@ msgstr ""
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
#: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "sennoma"
diff --git a/po/es.po b/po/es.po
index c521afcc8..1105d284d 100644
--- a/po/es.po
+++ b/po/es.po
@@ -18,8 +18,8 @@ msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
"POT-Creation-Date: 2014-02-28 21:21+0300\n"
-"PO-Revision-Date: 2014-02-23 20:21+0000\n"
-"Last-Translator: Nelson Martell <nelson6e65-manaplus@yahoo.es>\n"
+"PO-Revision-Date: 2014-03-01 08:14+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"
@@ -7843,9 +7843,3 @@ msgstr "Elemento desconocido"
#: src/resources/db/petdb.cpp:99
msgid "pet"
msgstr "mascota"
-
-#~ msgid "SPE"
-#~ msgstr "SPE"
-
-#~ msgid "Specials"
-#~ msgstr "Especiales"
diff --git a/po/et.po b/po/et.po
index cae58012d..7306089cc 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: 2014-02-23 00:42+0300\n"
-"PO-Revision-Date: 2014-02-23 08:14+0000\n"
+"POT-Creation-Date: 2014-02-28 21:21+0300\n"
+"PO-Revision-Date: 2014-03-01 08:14+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"
@@ -29,7 +29,7 @@ msgid "Accepting incoming trade requests"
msgstr ""
#. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
msgid "Visible on map"
msgstr ""
@@ -38,68 +38,68 @@ msgstr ""
msgid "Human"
msgstr ""
-#: src/being/being.cpp:544
+#: src/being/being.cpp:496
msgid "dodge"
msgstr ""
-#: src/being/being.cpp:544
+#: src/being/being.cpp:496
msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1965 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1970 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr ""
#. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:392
+#: src/being/localplayer.cpp:376
#, c-format
msgid "You were killed by %s"
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1377
+#: src/being/localplayer.cpp:816
msgid "Tried to pick up nonexistent item."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1381
+#: src/being/localplayer.cpp:820
msgid "Item is too heavy."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1385
+#: src/being/localplayer.cpp:824
msgid "Item is too far away."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1389
+#: src/being/localplayer.cpp:828
msgid "Inventory is full."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1393
+#: src/being/localplayer.cpp:832
msgid "Stack is too big."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1397
+#: src/being/localplayer.cpp:836
msgid "Item belongs to someone else."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1401
+#: src/being/localplayer.cpp:840
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:1425
+#: src/being/localplayer.cpp:864
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -107,387 +107,387 @@ msgstr[0] ""
msgstr[1] ""
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1630 src/being/localplayer.cpp:1665
-#: src/being/localplayer.cpp:1666
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
msgid "xp"
msgstr ""
-#: src/being/localplayer.cpp:1671 src/being/localplayer.cpp:1678
-#: src/being/localplayer.cpp:1685
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
msgid "job"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1871
+#: src/being/localplayer.cpp:1285
msgid "(D) default moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1873
+#: src/being/localplayer.cpp:1287
msgid "(I) invert moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1875
+#: src/being/localplayer.cpp:1289
msgid "(c) moves with some crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1877
+#: src/being/localplayer.cpp:1291
msgid "(C) moves with crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1879
+#: src/being/localplayer.cpp:1293
msgid "(d) double normal + crazy"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1881
+#: src/being/localplayer.cpp:1295
msgid "(?) unknown move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1904
+#: src/being/localplayer.cpp:1318
#, c-format
msgid "(%u) crazy move number %u"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1910
+#: src/being/localplayer.cpp:1324
msgid "(a) custom crazy move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1915
+#: src/being/localplayer.cpp:1329
msgid "(?) crazy move"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1930
+#: src/being/localplayer.cpp:1344
msgid "(0) default moves to target"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1932
+#: src/being/localplayer.cpp:1346
msgid "(1) moves to target in distance 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1934
+#: src/being/localplayer.cpp:1348
msgid "(2) moves to target in distance 2"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1936
+#: src/being/localplayer.cpp:1350
msgid "(3) moves to target in distance 3"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1938
+#: src/being/localplayer.cpp:1352
msgid "(5) moves to target in distance 5"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1940
+#: src/being/localplayer.cpp:1354
msgid "(7) moves to target in distance 7"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1942
+#: src/being/localplayer.cpp:1356
msgid "(A) moves to target in attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1944
+#: src/being/localplayer.cpp:1358
msgid "(a) archer attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1946
+#: src/being/localplayer.cpp:1360
msgid "(B) moves to target in attack range - 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1948
+#: src/being/localplayer.cpp:1362
msgid "(?) move to target"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1968
+#: src/being/localplayer.cpp:1382
msgid "(D) default follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1970
+#: src/being/localplayer.cpp:1384
msgid "(R) relative follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1972
+#: src/being/localplayer.cpp:1386
msgid "(M) mirror follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1974
+#: src/being/localplayer.cpp:1388
msgid "(P) pet follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1976
+#: src/being/localplayer.cpp:1390
msgid "(?) unknown follow"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1996 src/being/localplayer.cpp:2004
-#: src/being/localplayer.cpp:2032
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
msgid "(?) attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1998 src/being/localplayer.cpp:2024
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
msgid "(D) default attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2000
+#: src/being/localplayer.cpp:1414
msgid "(s) switch attack without shield"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2002
+#: src/being/localplayer.cpp:1416
msgid "(S) switch attack with shield"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2026
+#: src/being/localplayer.cpp:1440
msgid "(G) go and attack"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2028
+#: src/being/localplayer.cpp:1442
msgid "(A) go, attack, pickup"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2030
+#: src/being/localplayer.cpp:1444
msgid "(d) without auto attack"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2084
+#: src/being/localplayer.cpp:1498
msgid "(S) small pick up 1x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2086
+#: src/being/localplayer.cpp:1500
msgid "(D) default pick up 2x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2088
+#: src/being/localplayer.cpp:1502
msgid "(F) forward pick up 2x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2090
+#: src/being/localplayer.cpp:1504
msgid "(3) pick up 3x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2092
+#: src/being/localplayer.cpp:1506
msgid "(g) go and pick up in distance 4"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2094
+#: src/being/localplayer.cpp:1508
msgid "(G) go and pick up in distance 8"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2096
+#: src/being/localplayer.cpp:1510
msgid "(A) go and pick up in max distance"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2098
+#: src/being/localplayer.cpp:1512
msgid "(?) pick up"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2112
+#: src/being/localplayer.cpp:1526
msgid "(N) normal map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2114
+#: src/being/localplayer.cpp:1528
msgid "(D) debug map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2116
+#: src/being/localplayer.cpp:1530
msgid "(u) ultra map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2118
+#: src/being/localplayer.cpp:1532
msgid "(U) ultra map view 2"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2120
+#: src/being/localplayer.cpp:1534
msgid "(e) empty map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2122
+#: src/being/localplayer.cpp:1536
msgid "(b) black & white map view"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2142
+#: src/being/localplayer.cpp:1556
msgid "(f) use #flar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2144
+#: src/being/localplayer.cpp:1558
msgid "(c) use #chiza for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2146
+#: src/being/localplayer.cpp:1560
msgid "(I) use #ingrav for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2148
+#: src/being/localplayer.cpp:1562
msgid "(F) use #frillyar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2150
+#: src/being/localplayer.cpp:1564
msgid "(U) use #upmarmu for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2152
+#: src/being/localplayer.cpp:1566
msgid "(?) magic attack"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2172
+#: src/being/localplayer.cpp:1586
msgid "(a) attack all players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2174
+#: src/being/localplayer.cpp:1588
msgid "(f) attack all except friends"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2176
+#: src/being/localplayer.cpp:1590
msgid "(b) attack bad relations"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2178
+#: src/being/localplayer.cpp:1592
msgid "(d) don't attack players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2180
+#: src/being/localplayer.cpp:1594
msgid "(?) pvp attack"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2200
+#: src/being/localplayer.cpp:1614
msgid "(D) default imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2202
+#: src/being/localplayer.cpp:1616
msgid "(O) outfits imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2204
+#: src/being/localplayer.cpp:1618
msgid "(?) imitation"
msgstr ""
#. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2233
+#: src/being/localplayer.cpp:1647
msgid "Away"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2256
+#: src/being/localplayer.cpp:1670
msgid "(O) on keyboard"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2258
+#: src/being/localplayer.cpp:1672
msgid "(A) away"
msgstr ""
#. TRANSLATORS: away type in status bar
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2260 src/being/localplayer.cpp:2278
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
msgid "(?) away"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2274
+#: src/being/localplayer.cpp:1688
msgid "(G) game camera mode"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2276
+#: src/being/localplayer.cpp:1690
msgid "(F) free camera mode"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2303
+#: src/being/localplayer.cpp:1717
msgid "Game modifiers are enabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2305
+#: src/being/localplayer.cpp:1719
msgid "Game modifiers are disabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2307
+#: src/being/localplayer.cpp:1721
msgid "Game modifiers are unknown"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3887
+#: src/being/localplayer.cpp:3287
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3893 src/being/localplayer.cpp:3918
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3903
+#: src/being/localplayer.cpp:3303
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3909 src/being/localplayer.cpp:3923
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4266
+#: src/being/localplayer.cpp:3666
#, c-format
msgid "You see %s"
msgstr ""
@@ -525,32 +525,32 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1139 src/gui/windowmenu.cpp:167
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
#: src/gui/windows/setupwindow.cpp:61
msgid "Setup"
msgstr ""
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1143 src/gui/widgets/tabs/setup_perfomance.cpp:51
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1146 src/gui/widgets/tabs/setup_video.cpp:225
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:225
msgid "Video"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1149 src/gui/widgets/tabs/setup_theme.cpp:269
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1152 src/gui/windowmenu.cpp:74
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr "Abi"
@@ -563,41 +563,41 @@ msgstr "Abi"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1156 src/gui/popups/popupmenu.cpp:619
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
#: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:69
-#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:138
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
#: src/gui/windows/shopwindow.cpp:78
msgid "Close"
msgstr "Sulge"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1324
msgid "Logging in"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1367
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1492
+#: src/client.cpp:1489
msgid "Requesting characters"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1532
+#: src/client.cpp:1529
msgid "Connecting to the game server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1545
+#: src/client.cpp:1541
msgid "Changing game servers"
msgstr ""
@@ -612,12 +612,12 @@ msgstr ""
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1606 src/client.cpp:1617 src/client.cpp:1801
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:349
#: src/gui/windows/charselectdialog.cpp:299
-#: src/gui/windows/editserverdialog.cpp:218
+#: src/gui/windows/editserverdialog.cpp:186
#: src/gui/windows/registerdialog.cpp:260
#: src/gui/windows/unregisterdialog.cpp:146
#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
@@ -625,65 +625,65 @@ msgid "Error"
msgstr "Viga"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1629
+#: src/client.cpp:1625
msgid "Requesting registration details"
msgstr ""
#. TRANSLATORS: password change message header
-#: src/client.cpp:1670
+#: src/client.cpp:1666
msgid "Password Change"
msgstr ""
#. TRANSLATORS: password change message text
-#: src/client.cpp:1672
+#: src/client.cpp:1668
msgid "Password changed successfully!"
msgstr ""
#. TRANSLATORS: email change message header
-#: src/client.cpp:1694
+#: src/client.cpp:1690
msgid "Email Change"
msgstr ""
#. TRANSLATORS: email change message text
-#: src/client.cpp:1696
+#: src/client.cpp:1692
msgid "Email changed successfully!"
msgstr ""
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1719
+#: src/client.cpp:1715
msgid "Unregister Successful"
msgstr ""
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1721
+#: src/client.cpp:1717
msgid "Farewell, come back any time..."
msgstr ""
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1998 src/client.cpp:2013 src/client.cpp:2058
-#: src/client.cpp:2074 src/client.cpp:2525 src/client.cpp:2533
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2230
+#: src/client.cpp:2232
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2271 src/client.cpp:2278
+#: src/client.cpp:2273 src/client.cpp:2280
msgid "Error creating updates directory!"
msgstr ""
-#: src/client.cpp:2300 src/client.cpp:2317
+#: src/client.cpp:2302 src/client.cpp:2319
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: error message question
-#: src/client.cpp:3001
+#: src/client.cpp:3003
msgid "Do you want to open support page?"
msgstr ""
@@ -929,99 +929,154 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:277 src/gui/widgets/tabs/chattab.cpp:464
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
msgid "General"
msgstr ""
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:293 src/gui/widgets/tabs/chattab.cpp:466
-#: src/gui/windowmenu.cpp:154 src/gui/windows/debugwindow.cpp:53
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:575
+#: src/game.cpp:563
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:585
+#: src/game.cpp:573
msgid "Saving screenshot failed!"
msgstr ""
#. TRANSLATORS: error message text
-#: src/game.cpp:656
+#: src/game.cpp:644
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:659
+#: src/game.cpp:647
msgid "Network Error"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
-msgid "black"
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
msgstr ""
+#. TRANSLATORS: chat color
#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
+msgid "black"
+msgstr ""
+
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
msgid "red"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
msgid "green"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
msgid "blue"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
msgid "gold"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
msgid "yellow"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
msgid "pink"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
msgid "purple"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
msgid "grey"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
msgid "brown"
msgstr ""
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr ""
+
#. TRANSLATORS: relation type
#: src/gui/models/playerrelationlistmodel.h:33
msgid "Neutral"
@@ -1057,46 +1112,61 @@ msgstr ""
msgid "Enemy"
msgstr ""
-#. TRANSLATORS: inventory sort mode
-#. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#: src/gui/models/sortlistmodelinv.h:34
-#: src/gui/widgets/tabs/setup_other.cpp:72
-#: src/gui/widgets/tabs/setup_visual.cpp:78 src/gui/windows/chatwindow.cpp:150
-msgid "default"
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:36 src/gui/windows/buydialog.cpp:62
-msgid "by name"
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
msgstr ""
+#. TRANSLATORS: buy dialog sort type.
#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
+msgid "by name"
+msgstr ""
+
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:38 src/gui/windows/buydialog.cpp:64
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
msgid "by id"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:40 src/gui/windows/buydialog.cpp:66
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
msgid "by weight"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:42 src/gui/windows/buydialog.cpp:68
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
msgid "by amount"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:44 src/gui/windows/buydialog.cpp:70
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
msgid "by type"
msgstr ""
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr ""
+
#. TRANSLATORS: update type
#. TRANSLATORS: onscreen button size
#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
@@ -1243,8 +1313,8 @@ msgstr ""
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
-#: src/gui/windows/buydialog.cpp:208 src/gui/windows/buydialog.cpp:220
-#: src/gui/windows/buydialog.cpp:274 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
msgid "Buy"
msgstr ""
@@ -1341,12 +1411,12 @@ msgstr ""
#: src/gui/windows/changepassworddialog.cpp:57
#: src/gui/windows/charcreatedialog.cpp:121
#: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:79
-#: src/gui/windows/itemamountwindow.cpp:163
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
-#: src/gui/windows/socialwindow.cpp:1238
-#: src/gui/windows/textcommandeditor.cpp:203 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:54
#: src/gui/windows/updaterwindow.cpp:186
msgid "Cancel"
@@ -1418,7 +1488,7 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:150 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
msgstr ""
@@ -1431,7 +1501,7 @@ msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:134
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
msgid "Spells"
msgstr ""
@@ -1487,7 +1557,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
#. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1311
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
msgid "Leave"
msgstr ""
@@ -1568,8 +1638,8 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
-#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:223
-#: src/gui/windows/inventorywindow.cpp:745 src/gui/windows/setupwindow.cpp:96
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
msgid "Store"
msgstr ""
@@ -1600,7 +1670,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
msgid "Retrieve"
msgstr ""
@@ -1633,8 +1703,8 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
-#: src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:656 src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr ""
@@ -1668,8 +1738,8 @@ msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: language
#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/widgets/tabs/setup_theme.cpp:127
-#: src/gui/windows/socialwindow.cpp:1003
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
msgid "(default)"
msgstr ""
@@ -1825,8 +1895,8 @@ msgstr ""
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:645
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
msgid "Unequip"
msgstr ""
@@ -1834,16 +1904,16 @@ msgstr ""
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:172
-#: src/gui/windows/inventorywindow.cpp:650 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:189
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
msgid "Drop..."
msgstr ""
@@ -1857,15 +1927,15 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:138
-#: src/gui/windows/inventorywindow.cpp:758
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
msgid "Drop"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
msgid "Split"
msgstr ""
@@ -2021,10 +2091,10 @@ msgstr ""
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:276
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/windows/serverdialog.cpp:198
msgid "Quit"
msgstr ""
@@ -2586,7 +2656,7 @@ msgstr ""
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: register dialog. button.
#: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:146
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:330
#: src/gui/widgets/tabs/setup_visual.cpp:189
@@ -2613,9 +2683,8 @@ msgstr ""
#. TRANSLATORS: command editor button
#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
#: src/gui/windows/charselectdialog.cpp:108
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:94
-#: src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/textcommandeditor.cpp:207
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
msgid "Delete"
msgstr "Kustuta"
@@ -2651,7 +2720,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:130
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
msgid "Shortcuts"
msgstr ""
@@ -2659,7 +2728,7 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:151
msgid "Windows"
msgstr ""
@@ -2675,7 +2744,7 @@ msgstr ""
#. TRANSLATORS: settings tab name
#. TRANSLATORS: chat window name
#: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:88 src/gui/windows/chatwindow.cpp:203
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
msgid "Chat"
msgstr "Vestlus"
@@ -2898,7 +2967,7 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:137
-#: src/gui/windows/inventorywindow.cpp:569
+#: src/gui/windows/inventorywindow.cpp:568
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
#, c-format
@@ -2918,7 +2987,7 @@ msgstr ""
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/windows/serverdialog.cpp:204
msgid "Edit"
msgstr ""
@@ -2971,7 +3040,7 @@ msgstr ""
#. TRANSLATORS: tab in social window
#. TRANSLATORS: guild chat tab name
#: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:184 src/gui/windows/socialwindow.cpp:320
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
#: src/net/ea/gui/guildtab.cpp:44
msgid "Guild"
msgstr ""
@@ -2982,142 +3051,142 @@ msgid "Lang"
msgstr ""
#. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:49
+#: src/gui/widgets/tabs/setup_audio.cpp:48
msgid "Audio"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:57
+#: src/gui/widgets/tabs/setup_audio.cpp:56
msgid "Basic settings"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:60
+#: src/gui/widgets/tabs/setup_audio.cpp:59
msgid "Enable Audio"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:63
+#: src/gui/widgets/tabs/setup_audio.cpp:62
msgid "Enable music"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:67
+#: src/gui/widgets/tabs/setup_audio.cpp:66
msgid "Enable game sfx"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:71
+#: src/gui/widgets/tabs/setup_audio.cpp:70
msgid "Enable gui sfx"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:74
msgid "Sfx volume"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:78
msgid "Music volume"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:82
msgid "Enable music fade out"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:86
msgid "Audio frequency"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:90
msgid "mono"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:93
+#: src/gui/widgets/tabs/setup_audio.cpp:92
msgid "stereo"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:94
msgid "surround"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:97
+#: src/gui/widgets/tabs/setup_audio.cpp:96
msgid "surround+center+lfe"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:98
msgid "Audio channels"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:104
+#: src/gui/widgets/tabs/setup_audio.cpp:103
msgid "Sound effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:106
msgid "Information dialog sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:110
msgid "Request dialog sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:115
+#: src/gui/widgets/tabs/setup_audio.cpp:114
msgid "Whisper message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:118
msgid "Guild / Party message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:122
msgid "Highlight message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:126
msgid "Global message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:130
msgid "Error message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:134
msgid "Trade request sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:138
msgid "Show window sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:142
msgid "Hide window sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:150
msgid "Enable mumble voice chat"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:156
+#: src/gui/widgets/tabs/setup_audio.cpp:155
msgid "Download music"
msgstr ""
@@ -3413,7 +3482,7 @@ msgstr ""
#. TRANSLATORS: unknown key name
#. TRANSLATORS: quests window quest name
#: src/gui/widgets/tabs/setup_input.cpp:364
-#: src/gui/windows/questswindow.cpp:263
+#: src/gui/windows/questswindow.cpp:249
msgid "unknown"
msgstr ""
@@ -3572,7 +3641,7 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: debug window tab
#. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:105
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
#: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
#: src/gui/windows/minimap.cpp:114
msgid "Map"
@@ -3740,9 +3809,9 @@ msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: shop window name
#. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:146
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
#: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windows/inventorywindow.cpp:194
msgid "Shop"
msgstr ""
@@ -4124,252 +4193,252 @@ msgid "When ignoring:"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:64
+#: src/gui/widgets/tabs/setup_theme.cpp:63
msgid "Very small (8)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:66
+#: src/gui/widgets/tabs/setup_theme.cpp:65
msgid "Very small (9)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:68
+#: src/gui/widgets/tabs/setup_theme.cpp:67
msgid "Tiny (10)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:70
+#: src/gui/widgets/tabs/setup_theme.cpp:69
msgid "Small (11)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:72
+#: src/gui/widgets/tabs/setup_theme.cpp:71
msgid "Medium (12)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:74
+#: src/gui/widgets/tabs/setup_theme.cpp:73
msgid "Normal (13)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:76
+#: src/gui/widgets/tabs/setup_theme.cpp:75
msgid "Large (14)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:78
+#: src/gui/widgets/tabs/setup_theme.cpp:77
msgid "Large (15)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:80
+#: src/gui/widgets/tabs/setup_theme.cpp:79
msgid "Large (16)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:82
+#: src/gui/widgets/tabs/setup_theme.cpp:81
msgid "Big (17)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:83
msgid "Big (18)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:85
msgid "Big (19)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:87
msgid "Very big (20)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:89
msgid "Very big (21)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:91
msgid "Very big (22)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:93
msgid "Huge (23)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:129
+#: src/gui/widgets/tabs/setup_theme.cpp:128
msgid "Chinese (China)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:131
+#: src/gui/widgets/tabs/setup_theme.cpp:130
msgid "Czech"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:133
+#: src/gui/widgets/tabs/setup_theme.cpp:132
msgid "English"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:135
+#: src/gui/widgets/tabs/setup_theme.cpp:134
msgid "Finnish"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:137
+#: src/gui/widgets/tabs/setup_theme.cpp:136
msgid "French"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:139
+#: src/gui/widgets/tabs/setup_theme.cpp:138
msgid "German"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:141
+#: src/gui/widgets/tabs/setup_theme.cpp:140
msgid "Indonesian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:143
+#: src/gui/widgets/tabs/setup_theme.cpp:142
msgid "Italian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:145
+#: src/gui/widgets/tabs/setup_theme.cpp:144
msgid "Polish"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:147
+#: src/gui/widgets/tabs/setup_theme.cpp:146
msgid "Japanese"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:148
msgid "Dutch (Belgium/Flemish)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:150
msgid "Portuguese"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:152
msgid "Portuguese (Brazilian)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:154
msgid "Russian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:156
msgid "Spanish (Castilian)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:158
msgid "Turkish"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:211
+#: src/gui/widgets/tabs/setup_theme.cpp:210
msgid "Gui theme"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:218
+#: src/gui/widgets/tabs/setup_theme.cpp:217
msgid "Main Font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:223
+#: src/gui/widgets/tabs/setup_theme.cpp:222
msgid "Language"
msgstr ""
#. TRANSLATORS: theme settings label
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:227 src/gui/windows/emotewindow.cpp:45
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
msgid "Bold font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:230
msgid "Particle font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:235
+#: src/gui/widgets/tabs/setup_theme.cpp:234
msgid "Help font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:239
+#: src/gui/widgets/tabs/setup_theme.cpp:238
msgid "Secure font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:242
msgid "Npc font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:247
+#: src/gui/widgets/tabs/setup_theme.cpp:246
msgid "Japanese font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:250
msgid "Chinese font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:256
+#: src/gui/widgets/tabs/setup_theme.cpp:255
msgid "Font size"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:261
+#: src/gui/widgets/tabs/setup_theme.cpp:260
msgid "Npc font size"
msgstr ""
#. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:265
+#: src/gui/widgets/tabs/setup_theme.cpp:264
msgid "i"
msgstr ""
#. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:404
+#: src/gui/widgets/tabs/setup_theme.cpp:403
msgid "Name: "
msgstr ""
-#: src/gui/widgets/tabs/setup_theme.cpp:405
+#: src/gui/widgets/tabs/setup_theme.cpp:404
msgid "Copyright:"
msgstr ""
#. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:470
+#: src/gui/widgets/tabs/setup_theme.cpp:469
msgid "Theme info"
msgstr ""
#. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:497
+#: src/gui/widgets/tabs/setup_theme.cpp:496
msgid "Theme Changed"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:497
+#: src/gui/widgets/tabs/setup_theme.cpp:496
#: src/gui/widgets/tabs/setup_video.cpp:499
#: src/gui/widgets/tabs/setup_video.cpp:508
msgid "Restart your client for the change to take effect."
@@ -4700,178 +4769,169 @@ msgid "Allow screensaver to run"
msgstr ""
#. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:67
msgid "ONL"
msgstr ""
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:68
msgid "Who is online"
msgstr ""
#. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:70
msgid "HLP"
msgstr ""
#. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:73
msgid "QE"
msgstr ""
#. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:77 src/gui/windows/questswindow.cpp:126
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
msgid "Quests"
msgstr ""
#. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:76
msgid "BC"
msgstr ""
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:77
msgid "Bot checker"
msgstr ""
#. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:82
+#: src/gui/windowmenu.cpp:79
msgid "KS"
msgstr ""
#. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:83 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
msgid "Kill stats"
msgstr ""
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:82
msgid "Smilies"
msgstr ""
#. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:87
+#: src/gui/windowmenu.cpp:84
msgid "CH"
msgstr ""
#. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:95
+#: src/gui/windowmenu.cpp:92
msgid "STA"
msgstr ""
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:93
msgid "Status"
msgstr ""
#. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:95
msgid "EQU"
msgstr ""
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:58
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
msgid "Equipment"
msgstr ""
#. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:98
msgid "INV"
msgstr ""
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:130
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
#: src/inventory.cpp:257
msgid "Inventory"
msgstr ""
#. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:104
+#: src/gui/windowmenu.cpp:101
msgid "MAP"
msgstr ""
#. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:110
+#: src/gui/windowmenu.cpp:107
msgid "SKI"
msgstr ""
#. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
msgid "Skills"
msgstr ""
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:118
-msgid "SPE"
-msgstr ""
-
-#: src/gui/windowmenu.cpp:119
-msgid "Specials"
-msgstr ""
-
#. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:124
+#: src/gui/windowmenu.cpp:112
msgid "SOC"
msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:126 src/gui/windows/socialwindow.cpp:1284
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
msgid "Social"
msgstr ""
#. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:128
+#: src/gui/windowmenu.cpp:116
msgid "SH"
msgstr ""
#. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:132
+#: src/gui/windowmenu.cpp:120
msgid "SP"
msgstr ""
#. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:124
msgid "DR"
msgstr ""
#. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:128
msgid "YK"
msgstr ""
#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:130
msgid "Did you know"
msgstr ""
#. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:144
+#: src/gui/windowmenu.cpp:132
msgid "SHP"
msgstr ""
#. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:148
+#: src/gui/windowmenu.cpp:136
msgid "OU"
msgstr ""
#. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:152
+#: src/gui/windowmenu.cpp:140
msgid "DBG"
msgstr ""
#. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:149
msgid "WIN"
msgstr ""
#. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:153
msgid "SET"
msgstr ""
#. TRANSLATORS: short key name
#. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:301 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
#: src/gui/windows/outfitwindow.cpp:561
#, c-format
msgid "Key: %s"
@@ -4893,31 +4953,21 @@ msgstr ""
msgid "Result"
msgstr ""
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:58
-msgid "unsorted"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:60
-msgid "by price"
-msgstr ""
-
#. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:196
+#: src/gui/windows/buydialog.cpp:162
msgid "Create items"
msgstr ""
#. TRANSLATORS: buy dialog label
#. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:254 src/gui/windows/buydialog.cpp:541
-#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:366
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
#, c-format
msgid "Price: %s / Total: %s"
msgstr ""
#. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:263
+#: src/gui/windows/buydialog.cpp:229
msgid "Amount:"
msgstr ""
@@ -4927,8 +4977,8 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/itemamountwindow.cpp:159
-#: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
msgid "+"
msgstr ""
@@ -4939,8 +4989,8 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:271 src/gui/windows/itemamountwindow.cpp:157
-#: src/gui/windows/itemamountwindow.cpp:191 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
msgid "-"
msgstr ""
@@ -4948,9 +4998,9 @@ msgstr ""
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:274 src/gui/windows/charcreatedialog.cpp:119
-#: src/gui/windows/charselectdialog.cpp:593
-#: src/gui/windows/socialwindow.cpp:1307
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
msgid "Create"
msgstr ""
@@ -4959,7 +5009,7 @@ msgstr ""
#. TRANSLATORS: status bar label
#. TRANSLATORS: status window label
#. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:278 src/gui/windows/selldialog.cpp:112
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
#: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
#: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
msgid "Max"
@@ -5058,7 +5108,7 @@ msgstr ""
#. TRANSLATORS: login dialog label
#. TRANSLATORS: register dialog. label.
#: src/gui/windows/charcreatedialog.cpp:73
-#: src/gui/windows/editserverdialog.cpp:89 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
#: src/gui/windows/registerdialog.cpp:89
msgid "Name:"
msgstr ""
@@ -5119,7 +5169,7 @@ msgstr "Naine"
#. TRANSLATORS: char create dialog label
#: src/gui/windows/charcreatedialog.cpp:115
-#: src/gui/windows/charcreatedialog.cpp:469
+#: src/gui/windows/charcreatedialog.cpp:458
#, c-format
msgid "Please distribute %d points"
msgstr ""
@@ -5135,17 +5185,17 @@ msgid "Look:"
msgstr ""
#. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:362
+#: src/gui/windows/charcreatedialog.cpp:351
msgid "Your name needs to be at least 4 characters."
msgstr ""
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:459
+#: src/gui/windows/charcreatedialog.cpp:448
msgid "Character stats OK"
msgstr ""
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:475
+#: src/gui/windows/charcreatedialog.cpp:464
#, c-format
msgid "Please remove %d points"
msgstr ""
@@ -5174,7 +5224,7 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:104
-#: src/gui/windows/charselectdialog.cpp:588
+#: src/gui/windows/charselectdialog.cpp:580
#: src/gui/windows/updaterwindow.cpp:188
msgid "Play"
msgstr ""
@@ -5230,35 +5280,20 @@ msgstr ""
msgid "Enter password:"
msgstr ""
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:172
-msgid "rainbow 1"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:174
-msgid "rainbow 2"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:176
-msgid "rainbow 3"
-msgstr ""
-
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:755
+#: src/gui/windows/chatwindow.cpp:705
#, c-format
msgid "Present: %s; %d players are present."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1169
+#: src/gui/windows/chatwindow.cpp:1119
#, c-format
msgid "Whispering to %s: %s"
msgstr ""
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1613
+#: src/gui/windows/chatwindow.cpp:1563
#, c-format
msgid "%s's pet"
msgstr ""
@@ -5504,51 +5539,51 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:77
-#: src/gui/windows/itemamountwindow.cpp:161 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
msgid "OK"
msgstr ""
#. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:66
+#: src/gui/windows/editserverdialog.cpp:45
msgid "Edit Server"
msgstr ""
#. TRANSLATORS: edit server dialog button
#. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:75
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
msgid "Connect"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:91
+#: src/gui/windows/editserverdialog.cpp:70
msgid "Address:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:93
+#: src/gui/windows/editserverdialog.cpp:72
msgid "Port:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:95
+#: src/gui/windows/editserverdialog.cpp:74
msgid "Server type:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:97
+#: src/gui/windows/editserverdialog.cpp:76
msgid "Description:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:99
+#: src/gui/windows/editserverdialog.cpp:78
msgid "Online list url:"
msgstr ""
#. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:220
+#: src/gui/windows/editserverdialog.cpp:188
msgid "Please at least type both the address and the port of the server."
msgstr ""
@@ -5568,47 +5603,47 @@ msgid "Did you know..."
msgstr ""
#. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:165
+#: src/gui/windows/itemamountwindow.cpp:164
msgid "All"
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:221
+#: src/gui/windows/itemamountwindow.cpp:220
msgid "Select amount of items to trade."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:225
+#: src/gui/windows/itemamountwindow.cpp:224
msgid "Select amount of items to drop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:229
+#: src/gui/windows/itemamountwindow.cpp:228
msgid "Select amount of items to store."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:233
+#: src/gui/windows/itemamountwindow.cpp:232
msgid "Select amount of items to retrieve."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:237
+#: src/gui/windows/itemamountwindow.cpp:236
msgid "Select amount of items to split."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:241
+#: src/gui/windows/itemamountwindow.cpp:240
msgid "Add to buy shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:245
+#: src/gui/windows/itemamountwindow.cpp:244
msgid "Add to sell shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:249
+#: src/gui/windows/itemamountwindow.cpp:248
msgid "Unknown."
msgstr ""
@@ -5860,7 +5895,7 @@ msgstr ""
#. TRANSLATORS: shop window label
#. TRANSLATORS: shop window button
#. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:258
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
#: src/gui/windows/tradewindow.cpp:78
msgid "Add"
@@ -5962,53 +5997,53 @@ msgid "Do you really want to sell %s?"
msgstr ""
#. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
msgid "Choose Your Server"
msgstr ""
#. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
msgid "Load"
msgstr ""
#. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
msgid "Choose Your Server *** SAFE MODE ***"
msgstr ""
#. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
msgid "Use same ip for game sub servers"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
msgid "Waiting for server..."
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
msgid "Preparing download"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
msgid "Error retreiving server list!"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
msgid "requires a newer version"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
#, c-format
msgid "requires v%s"
msgstr ""
@@ -6089,277 +6124,277 @@ msgid "Skill %d"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:225
+#: src/gui/windows/socialwindow.cpp:227
#, c-format
msgid "Invited user %s to guild %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:240
+#: src/gui/windows/socialwindow.cpp:242
#, c-format
msgid "Guild %s quit requested."
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:254
+#: src/gui/windows/socialwindow.cpp:256
msgid "Member Invite to Guild"
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:256
+#: src/gui/windows/socialwindow.cpp:258
#, c-format
msgid "Who would you like to invite to guild %s?"
msgstr ""
#. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:266
+#: src/gui/windows/socialwindow.cpp:268
msgid "Leave Guild?"
msgstr ""
#. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:268
+#: src/gui/windows/socialwindow.cpp:270
#, c-format
msgid "Are you sure you want to leave guild %s?"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:279
+#: src/gui/windows/socialwindow.cpp:281
#, c-format
msgid "Members: %u/%u"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:301 src/gui/windows/socialwindow.cpp:373
-#: src/gui/windows/socialwindow.cpp:498
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
#, c-format
msgid "Players: %u/%u"
msgstr ""
#. TRANSLATORS: tab in social window
#. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:389 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
msgid "Party"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:429
+#: src/gui/windows/socialwindow.cpp:431
#, c-format
msgid "Invited user %s to party."
msgstr ""
#. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:444
+#: src/gui/windows/socialwindow.cpp:446
#, c-format
msgid "Party %s quit requested."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:458
+#: src/gui/windows/socialwindow.cpp:460
msgid "Member Invite to Party"
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:460
+#: src/gui/windows/socialwindow.cpp:462
#, c-format
msgid "Who would you like to invite to party %s?"
msgstr ""
#. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:470
+#: src/gui/windows/socialwindow.cpp:472
msgid "Leave Party?"
msgstr ""
#. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:472
+#: src/gui/windows/socialwindow.cpp:474
#, c-format
msgid "Are you sure you want to leave party %s?"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:698
+#: src/gui/windows/socialwindow.cpp:665
#, c-format
msgid "Visible players: %d"
msgstr ""
#. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:725
+#: src/gui/windows/socialwindow.cpp:692
msgid "Nav"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:827
+#: src/gui/windows/socialwindow.cpp:794
#, c-format
msgid "Portals: %u/%u"
msgstr ""
#. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1054
+#: src/gui/windows/socialwindow.cpp:1021
msgid "Atk"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1073
+#: src/gui/windows/socialwindow.cpp:1040
msgid "Priority mobs"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1075
+#: src/gui/windows/socialwindow.cpp:1042
msgid "Attack mobs"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1077
+#: src/gui/windows/socialwindow.cpp:1044
msgid "Ignore mobs"
msgstr ""
#. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1101
+#: src/gui/windows/socialwindow.cpp:1068
msgid "Pik"
msgstr ""
#. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1120
+#: src/gui/windows/socialwindow.cpp:1087
msgid "Pickup items"
msgstr ""
#. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1122
+#: src/gui/windows/socialwindow.cpp:1089
msgid "Ignore items"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1212
+#: src/gui/windows/socialwindow.cpp:1179
#, c-format
msgid "Friends: %u/%u"
msgstr ""
#. TRANSLATORS: party popup item
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1235 src/gui/windows/socialwindow.cpp:1727
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
msgid "Create Party"
msgstr ""
#. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1298
+#: src/gui/windows/socialwindow.cpp:1265
msgid "P"
msgstr ""
#. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1303
+#: src/gui/windows/socialwindow.cpp:1270
msgid "F"
msgstr ""
#. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1309
+#: src/gui/windows/socialwindow.cpp:1276
msgid "Invite"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1503
+#: src/gui/windows/socialwindow.cpp:1470
#, c-format
msgid "Accepted party invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1514
+#: src/gui/windows/socialwindow.cpp:1481
#, c-format
msgid "Rejected party invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1531
+#: src/gui/windows/socialwindow.cpp:1498
#, c-format
msgid "Accepted guild invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1545
+#: src/gui/windows/socialwindow.cpp:1512
#, c-format
msgid "Rejected guild invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1585
+#: src/gui/windows/socialwindow.cpp:1552
#, c-format
msgid "Creating guild called %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1606
+#: src/gui/windows/socialwindow.cpp:1573
#, c-format
msgid "Creating party called %s."
msgstr ""
#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1621
+#: src/gui/windows/socialwindow.cpp:1588
msgid "Guild Name"
msgstr ""
#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1623
+#: src/gui/windows/socialwindow.cpp:1590
msgid "Choose your guild's name."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1639
+#: src/gui/windows/socialwindow.cpp:1606
msgid "Received guild request, but one already exists."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1647
+#: src/gui/windows/socialwindow.cpp:1614
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1654
+#: src/gui/windows/socialwindow.cpp:1621
msgid "Accept Guild Invite"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1670
+#: src/gui/windows/socialwindow.cpp:1637
msgid "Received party request, but one already exists."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1682
+#: src/gui/windows/socialwindow.cpp:1649
msgid "You have been invited you to join a party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1687
+#: src/gui/windows/socialwindow.cpp:1654
#, c-format
msgid "You have been invited to join the %s party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1696
+#: src/gui/windows/socialwindow.cpp:1663
#, c-format
msgid "%s has invited you to join their party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1702
+#: src/gui/windows/socialwindow.cpp:1669
#, c-format
msgid "%s has invited you to join the %s party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1712
+#: src/gui/windows/socialwindow.cpp:1679
msgid "Accept Party Invite"
msgstr ""
-#: src/gui/windows/socialwindow.cpp:1728
+#: src/gui/windows/socialwindow.cpp:1695
msgid "Cannot create party. You are already in a party"
msgstr ""
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1734
+#: src/gui/windows/socialwindow.cpp:1701
msgid "Party Name"
msgstr ""
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1736
+#: src/gui/windows/socialwindow.cpp:1703
msgid "Choose your party's name."
msgstr ""
@@ -6401,113 +6436,68 @@ msgstr ""
msgid "Correction points: %d"
msgstr ""
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "No Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Allow Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:105
-msgid "Need Target"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "General Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "Life Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "War Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Transmute Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Nature Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:121
-msgid "Astral Magic"
-msgstr ""
-
#. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:164
+#: src/gui/windows/textcommandeditor.cpp:47
msgid "Command Editor"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:52
msgid "magic"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:54
msgid "other"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:173
+#: src/gui/windows/textcommandeditor.cpp:56
msgid "Symbol:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:176
+#: src/gui/windows/textcommandeditor.cpp:59
msgid "Command:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:179
+#: src/gui/windows/textcommandeditor.cpp:62
msgid "Comment:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:183
+#: src/gui/windows/textcommandeditor.cpp:66
msgid "Target Type:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:187
+#: src/gui/windows/textcommandeditor.cpp:70
msgid "Icon:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:190
+#: src/gui/windows/textcommandeditor.cpp:73
msgid "Mana:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:193
+#: src/gui/windows/textcommandeditor.cpp:76
msgid "Magic level:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:197
+#: src/gui/windows/textcommandeditor.cpp:80
msgid "Magic School:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:200
+#: src/gui/windows/textcommandeditor.cpp:83
msgid "School level:"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/windows/textcommandeditor.cpp:88
msgid "Save"
msgstr ""
@@ -6537,7 +6527,7 @@ msgid "Trade: You"
msgstr ""
#. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
#, c-format
msgid "You get %s"
msgstr ""
@@ -6553,12 +6543,12 @@ msgid "You give:"
msgstr ""
#. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
msgid "You don't have enough money."
msgstr ""
#. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
msgid ""
"Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
@@ -6629,17 +6619,17 @@ msgid "Who Is Online - Update"
msgstr ""
#. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:87
+#: src/gui/windows/worldselectdialog.cpp:49
msgid "Select World"
msgstr ""
#. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:93
+#: src/gui/windows/worldselectdialog.cpp:55
msgid "Change Login"
msgstr ""
#. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:95
+#: src/gui/windows/worldselectdialog.cpp:57
msgid "Choose World"
msgstr ""
@@ -6857,7 +6847,7 @@ msgid "Failed to create character. Most likely the name is already taken."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:281
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
msgid "Wrong name."
msgstr ""
@@ -7015,58 +7005,58 @@ msgid "Experience sharing unknown."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:154
+#: src/net/ea/loginhandler.cpp:149
msgid "Account was not found. Please re-login."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/ea/loginhandler.cpp:153
msgid "Old password incorrect."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:162
+#: src/net/ea/loginhandler.cpp:157
msgid "New password too short."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:166 src/net/ea/loginhandler.cpp:293
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
msgid "Unknown error."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:239
+#: src/net/ea/loginhandler.cpp:234
msgid "Unregistered ID."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:238
msgid "Wrong password."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:248
+#: src/net/ea/loginhandler.cpp:243
msgid "Account expired."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:252
+#: src/net/ea/loginhandler.cpp:247
msgid "Rejected from server."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:256
+#: src/net/ea/loginhandler.cpp:251
msgid ""
"You have been permanently banned from the game. Please contact the GM team."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:261
+#: src/net/ea/loginhandler.cpp:256
msgid "Client too old."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:265
+#: src/net/ea/loginhandler.cpp:260
#, c-format
msgid ""
"You have been temporarily banned from the game until %s.\n"
@@ -7074,22 +7064,22 @@ msgid ""
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:273
+#: src/net/ea/loginhandler.cpp:268
msgid "Server overpopulated."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:277
+#: src/net/ea/loginhandler.cpp:272
msgid "This user name is already taken."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:285
+#: src/net/ea/loginhandler.cpp:280
msgid "Incorrect email."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:289
+#: src/net/ea/loginhandler.cpp:284
msgid "Username permanently erased."
msgstr ""
@@ -7762,7 +7752,7 @@ msgstr ""
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
#: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr ""
diff --git a/po/fa.po b/po/fa.po
index 160dc6d71..d374e3230 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: 2014-02-23 00:42+0300\n"
-"PO-Revision-Date: 2014-02-23 08:14+0000\n"
+"POT-Creation-Date: 2014-02-28 21:21+0300\n"
+"PO-Revision-Date: 2014-03-01 08:14+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"
@@ -29,7 +29,7 @@ msgid "Accepting incoming trade requests"
msgstr ""
#. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
msgid "Visible on map"
msgstr ""
@@ -38,455 +38,455 @@ msgstr ""
msgid "Human"
msgstr ""
-#: src/being/being.cpp:544
+#: src/being/being.cpp:496
msgid "dodge"
msgstr ""
-#: src/being/being.cpp:544
+#: src/being/being.cpp:496
msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1965 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1970 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr ""
#. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:392
+#: src/being/localplayer.cpp:376
#, c-format
msgid "You were killed by %s"
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1377
+#: src/being/localplayer.cpp:816
msgid "Tried to pick up nonexistent item."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1381
+#: src/being/localplayer.cpp:820
msgid "Item is too heavy."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1385
+#: src/being/localplayer.cpp:824
msgid "Item is too far away."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1389
+#: src/being/localplayer.cpp:828
msgid "Inventory is full."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1393
+#: src/being/localplayer.cpp:832
msgid "Stack is too big."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1397
+#: src/being/localplayer.cpp:836
msgid "Item belongs to someone else."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1401
+#: src/being/localplayer.cpp:840
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:1425
+#: src/being/localplayer.cpp:864
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
msgstr[0] ""
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1630 src/being/localplayer.cpp:1665
-#: src/being/localplayer.cpp:1666
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
msgid "xp"
msgstr ""
-#: src/being/localplayer.cpp:1671 src/being/localplayer.cpp:1678
-#: src/being/localplayer.cpp:1685
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
msgid "job"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1871
+#: src/being/localplayer.cpp:1285
msgid "(D) default moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1873
+#: src/being/localplayer.cpp:1287
msgid "(I) invert moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1875
+#: src/being/localplayer.cpp:1289
msgid "(c) moves with some crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1877
+#: src/being/localplayer.cpp:1291
msgid "(C) moves with crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1879
+#: src/being/localplayer.cpp:1293
msgid "(d) double normal + crazy"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1881
+#: src/being/localplayer.cpp:1295
msgid "(?) unknown move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1904
+#: src/being/localplayer.cpp:1318
#, c-format
msgid "(%u) crazy move number %u"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1910
+#: src/being/localplayer.cpp:1324
msgid "(a) custom crazy move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1915
+#: src/being/localplayer.cpp:1329
msgid "(?) crazy move"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1930
+#: src/being/localplayer.cpp:1344
msgid "(0) default moves to target"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1932
+#: src/being/localplayer.cpp:1346
msgid "(1) moves to target in distance 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1934
+#: src/being/localplayer.cpp:1348
msgid "(2) moves to target in distance 2"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1936
+#: src/being/localplayer.cpp:1350
msgid "(3) moves to target in distance 3"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1938
+#: src/being/localplayer.cpp:1352
msgid "(5) moves to target in distance 5"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1940
+#: src/being/localplayer.cpp:1354
msgid "(7) moves to target in distance 7"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1942
+#: src/being/localplayer.cpp:1356
msgid "(A) moves to target in attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1944
+#: src/being/localplayer.cpp:1358
msgid "(a) archer attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1946
+#: src/being/localplayer.cpp:1360
msgid "(B) moves to target in attack range - 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1948
+#: src/being/localplayer.cpp:1362
msgid "(?) move to target"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1968
+#: src/being/localplayer.cpp:1382
msgid "(D) default follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1970
+#: src/being/localplayer.cpp:1384
msgid "(R) relative follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1972
+#: src/being/localplayer.cpp:1386
msgid "(M) mirror follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1974
+#: src/being/localplayer.cpp:1388
msgid "(P) pet follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1976
+#: src/being/localplayer.cpp:1390
msgid "(?) unknown follow"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1996 src/being/localplayer.cpp:2004
-#: src/being/localplayer.cpp:2032
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
msgid "(?) attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1998 src/being/localplayer.cpp:2024
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
msgid "(D) default attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2000
+#: src/being/localplayer.cpp:1414
msgid "(s) switch attack without shield"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2002
+#: src/being/localplayer.cpp:1416
msgid "(S) switch attack with shield"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2026
+#: src/being/localplayer.cpp:1440
msgid "(G) go and attack"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2028
+#: src/being/localplayer.cpp:1442
msgid "(A) go, attack, pickup"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2030
+#: src/being/localplayer.cpp:1444
msgid "(d) without auto attack"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2084
+#: src/being/localplayer.cpp:1498
msgid "(S) small pick up 1x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2086
+#: src/being/localplayer.cpp:1500
msgid "(D) default pick up 2x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2088
+#: src/being/localplayer.cpp:1502
msgid "(F) forward pick up 2x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2090
+#: src/being/localplayer.cpp:1504
msgid "(3) pick up 3x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2092
+#: src/being/localplayer.cpp:1506
msgid "(g) go and pick up in distance 4"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2094
+#: src/being/localplayer.cpp:1508
msgid "(G) go and pick up in distance 8"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2096
+#: src/being/localplayer.cpp:1510
msgid "(A) go and pick up in max distance"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2098
+#: src/being/localplayer.cpp:1512
msgid "(?) pick up"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2112
+#: src/being/localplayer.cpp:1526
msgid "(N) normal map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2114
+#: src/being/localplayer.cpp:1528
msgid "(D) debug map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2116
+#: src/being/localplayer.cpp:1530
msgid "(u) ultra map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2118
+#: src/being/localplayer.cpp:1532
msgid "(U) ultra map view 2"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2120
+#: src/being/localplayer.cpp:1534
msgid "(e) empty map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2122
+#: src/being/localplayer.cpp:1536
msgid "(b) black & white map view"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2142
+#: src/being/localplayer.cpp:1556
msgid "(f) use #flar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2144
+#: src/being/localplayer.cpp:1558
msgid "(c) use #chiza for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2146
+#: src/being/localplayer.cpp:1560
msgid "(I) use #ingrav for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2148
+#: src/being/localplayer.cpp:1562
msgid "(F) use #frillyar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2150
+#: src/being/localplayer.cpp:1564
msgid "(U) use #upmarmu for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2152
+#: src/being/localplayer.cpp:1566
msgid "(?) magic attack"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2172
+#: src/being/localplayer.cpp:1586
msgid "(a) attack all players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2174
+#: src/being/localplayer.cpp:1588
msgid "(f) attack all except friends"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2176
+#: src/being/localplayer.cpp:1590
msgid "(b) attack bad relations"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2178
+#: src/being/localplayer.cpp:1592
msgid "(d) don't attack players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2180
+#: src/being/localplayer.cpp:1594
msgid "(?) pvp attack"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2200
+#: src/being/localplayer.cpp:1614
msgid "(D) default imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2202
+#: src/being/localplayer.cpp:1616
msgid "(O) outfits imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2204
+#: src/being/localplayer.cpp:1618
msgid "(?) imitation"
msgstr ""
#. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2233
+#: src/being/localplayer.cpp:1647
msgid "Away"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2256
+#: src/being/localplayer.cpp:1670
msgid "(O) on keyboard"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2258
+#: src/being/localplayer.cpp:1672
msgid "(A) away"
msgstr ""
#. TRANSLATORS: away type in status bar
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2260 src/being/localplayer.cpp:2278
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
msgid "(?) away"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2274
+#: src/being/localplayer.cpp:1688
msgid "(G) game camera mode"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2276
+#: src/being/localplayer.cpp:1690
msgid "(F) free camera mode"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2303
+#: src/being/localplayer.cpp:1717
msgid "Game modifiers are enabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2305
+#: src/being/localplayer.cpp:1719
msgid "Game modifiers are disabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2307
+#: src/being/localplayer.cpp:1721
msgid "Game modifiers are unknown"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3887
+#: src/being/localplayer.cpp:3287
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3893 src/being/localplayer.cpp:3918
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3903
+#: src/being/localplayer.cpp:3303
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3909 src/being/localplayer.cpp:3923
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4266
+#: src/being/localplayer.cpp:3666
#, c-format
msgid "You see %s"
msgstr ""
@@ -524,32 +524,32 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1139 src/gui/windowmenu.cpp:167
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
#: src/gui/windows/setupwindow.cpp:61
msgid "Setup"
msgstr ""
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1143 src/gui/widgets/tabs/setup_perfomance.cpp:51
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1146 src/gui/widgets/tabs/setup_video.cpp:225
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:225
msgid "Video"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1149 src/gui/widgets/tabs/setup_theme.cpp:269
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1152 src/gui/windowmenu.cpp:74
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr ""
@@ -562,41 +562,41 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1156 src/gui/popups/popupmenu.cpp:619
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
#: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:69
-#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:138
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
#: src/gui/windows/shopwindow.cpp:78
msgid "Close"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1324
msgid "Logging in"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1367
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1492
+#: src/client.cpp:1489
msgid "Requesting characters"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1532
+#: src/client.cpp:1529
msgid "Connecting to the game server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1545
+#: src/client.cpp:1541
msgid "Changing game servers"
msgstr ""
@@ -611,12 +611,12 @@ msgstr ""
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1606 src/client.cpp:1617 src/client.cpp:1801
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:349
#: src/gui/windows/charselectdialog.cpp:299
-#: src/gui/windows/editserverdialog.cpp:218
+#: src/gui/windows/editserverdialog.cpp:186
#: src/gui/windows/registerdialog.cpp:260
#: src/gui/windows/unregisterdialog.cpp:146
#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
@@ -624,65 +624,65 @@ msgid "Error"
msgstr "خطا"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1629
+#: src/client.cpp:1625
msgid "Requesting registration details"
msgstr ""
#. TRANSLATORS: password change message header
-#: src/client.cpp:1670
+#: src/client.cpp:1666
msgid "Password Change"
msgstr ""
#. TRANSLATORS: password change message text
-#: src/client.cpp:1672
+#: src/client.cpp:1668
msgid "Password changed successfully!"
msgstr ""
#. TRANSLATORS: email change message header
-#: src/client.cpp:1694
+#: src/client.cpp:1690
msgid "Email Change"
msgstr ""
#. TRANSLATORS: email change message text
-#: src/client.cpp:1696
+#: src/client.cpp:1692
msgid "Email changed successfully!"
msgstr ""
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1719
+#: src/client.cpp:1715
msgid "Unregister Successful"
msgstr ""
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1721
+#: src/client.cpp:1717
msgid "Farewell, come back any time..."
msgstr ""
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1998 src/client.cpp:2013 src/client.cpp:2058
-#: src/client.cpp:2074 src/client.cpp:2525 src/client.cpp:2533
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2230
+#: src/client.cpp:2232
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2271 src/client.cpp:2278
+#: src/client.cpp:2273 src/client.cpp:2280
msgid "Error creating updates directory!"
msgstr ""
-#: src/client.cpp:2300 src/client.cpp:2317
+#: src/client.cpp:2302 src/client.cpp:2319
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: error message question
-#: src/client.cpp:3001
+#: src/client.cpp:3003
msgid "Do you want to open support page?"
msgstr ""
@@ -928,99 +928,154 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:277 src/gui/widgets/tabs/chattab.cpp:464
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
msgid "General"
msgstr "کلی"
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:293 src/gui/widgets/tabs/chattab.cpp:466
-#: src/gui/windowmenu.cpp:154 src/gui/windows/debugwindow.cpp:53
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:575
+#: src/game.cpp:563
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:585
+#: src/game.cpp:573
msgid "Saving screenshot failed!"
msgstr ""
#. TRANSLATORS: error message text
-#: src/game.cpp:656
+#: src/game.cpp:644
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:659
+#: src/game.cpp:647
msgid "Network Error"
msgstr "خطای شبکه"
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
-msgid "black"
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
msgstr ""
+#. TRANSLATORS: chat color
#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
+msgid "black"
+msgstr ""
+
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
msgid "red"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
msgid "green"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
msgid "blue"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
msgid "gold"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
msgid "yellow"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
msgid "pink"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
msgid "purple"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
msgid "grey"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
msgid "brown"
msgstr ""
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr ""
+
#. TRANSLATORS: relation type
#: src/gui/models/playerrelationlistmodel.h:33
msgid "Neutral"
@@ -1056,46 +1111,61 @@ msgstr ""
msgid "Enemy"
msgstr ""
-#. TRANSLATORS: inventory sort mode
-#. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#: src/gui/models/sortlistmodelinv.h:34
-#: src/gui/widgets/tabs/setup_other.cpp:72
-#: src/gui/widgets/tabs/setup_visual.cpp:78 src/gui/windows/chatwindow.cpp:150
-msgid "default"
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:36 src/gui/windows/buydialog.cpp:62
-msgid "by name"
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
msgstr ""
+#. TRANSLATORS: buy dialog sort type.
#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
+msgid "by name"
+msgstr ""
+
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:38 src/gui/windows/buydialog.cpp:64
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
msgid "by id"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:40 src/gui/windows/buydialog.cpp:66
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
msgid "by weight"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:42 src/gui/windows/buydialog.cpp:68
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
msgid "by amount"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:44 src/gui/windows/buydialog.cpp:70
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
msgid "by type"
msgstr ""
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr ""
+
#. TRANSLATORS: update type
#. TRANSLATORS: onscreen button size
#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
@@ -1242,8 +1312,8 @@ msgstr ""
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
-#: src/gui/windows/buydialog.cpp:208 src/gui/windows/buydialog.cpp:220
-#: src/gui/windows/buydialog.cpp:274 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
msgid "Buy"
msgstr ""
@@ -1340,12 +1410,12 @@ msgstr ""
#: src/gui/windows/changepassworddialog.cpp:57
#: src/gui/windows/charcreatedialog.cpp:121
#: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:79
-#: src/gui/windows/itemamountwindow.cpp:163
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
-#: src/gui/windows/socialwindow.cpp:1238
-#: src/gui/windows/textcommandeditor.cpp:203 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:54
#: src/gui/windows/updaterwindow.cpp:186
msgid "Cancel"
@@ -1417,7 +1487,7 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:150 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
msgstr ""
@@ -1430,7 +1500,7 @@ msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:134
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
msgid "Spells"
msgstr ""
@@ -1486,7 +1556,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
#. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1311
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
msgid "Leave"
msgstr ""
@@ -1567,8 +1637,8 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
-#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:223
-#: src/gui/windows/inventorywindow.cpp:745 src/gui/windows/setupwindow.cpp:96
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
msgid "Store"
msgstr ""
@@ -1599,7 +1669,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
msgid "Retrieve"
msgstr ""
@@ -1632,8 +1702,8 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
-#: src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:656 src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr ""
@@ -1667,8 +1737,8 @@ msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: language
#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/widgets/tabs/setup_theme.cpp:127
-#: src/gui/windows/socialwindow.cpp:1003
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
msgid "(default)"
msgstr ""
@@ -1824,8 +1894,8 @@ msgstr ""
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:645
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
msgid "Unequip"
msgstr ""
@@ -1833,16 +1903,16 @@ msgstr ""
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:172
-#: src/gui/windows/inventorywindow.cpp:650 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:189
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
msgid "Drop..."
msgstr ""
@@ -1856,15 +1926,15 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:138
-#: src/gui/windows/inventorywindow.cpp:758
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
msgid "Drop"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
msgid "Split"
msgstr ""
@@ -2020,10 +2090,10 @@ msgstr ""
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:276
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/windows/serverdialog.cpp:198
msgid "Quit"
msgstr "خروج"
@@ -2585,7 +2655,7 @@ msgstr ""
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: register dialog. button.
#: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:146
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:330
#: src/gui/widgets/tabs/setup_visual.cpp:189
@@ -2612,9 +2682,8 @@ msgstr ""
#. TRANSLATORS: command editor button
#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
#: src/gui/windows/charselectdialog.cpp:108
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:94
-#: src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/textcommandeditor.cpp:207
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
msgid "Delete"
msgstr "حذف"
@@ -2650,7 +2719,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:130
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
msgid "Shortcuts"
msgstr ""
@@ -2658,7 +2727,7 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:151
msgid "Windows"
msgstr ""
@@ -2674,7 +2743,7 @@ msgstr ""
#. TRANSLATORS: settings tab name
#. TRANSLATORS: chat window name
#: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:88 src/gui/windows/chatwindow.cpp:203
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
msgid "Chat"
msgstr "چت"
@@ -2897,7 +2966,7 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:137
-#: src/gui/windows/inventorywindow.cpp:569
+#: src/gui/windows/inventorywindow.cpp:568
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
#, c-format
@@ -2917,7 +2986,7 @@ msgstr ""
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/windows/serverdialog.cpp:204
msgid "Edit"
msgstr ""
@@ -2970,7 +3039,7 @@ msgstr ""
#. TRANSLATORS: tab in social window
#. TRANSLATORS: guild chat tab name
#: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:184 src/gui/windows/socialwindow.cpp:320
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
#: src/net/ea/gui/guildtab.cpp:44
msgid "Guild"
msgstr ""
@@ -2981,142 +3050,142 @@ msgid "Lang"
msgstr ""
#. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:49
+#: src/gui/widgets/tabs/setup_audio.cpp:48
msgid "Audio"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:57
+#: src/gui/widgets/tabs/setup_audio.cpp:56
msgid "Basic settings"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:60
+#: src/gui/widgets/tabs/setup_audio.cpp:59
msgid "Enable Audio"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:63
+#: src/gui/widgets/tabs/setup_audio.cpp:62
msgid "Enable music"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:67
+#: src/gui/widgets/tabs/setup_audio.cpp:66
msgid "Enable game sfx"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:71
+#: src/gui/widgets/tabs/setup_audio.cpp:70
msgid "Enable gui sfx"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:74
msgid "Sfx volume"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:78
msgid "Music volume"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:82
msgid "Enable music fade out"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:86
msgid "Audio frequency"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:90
msgid "mono"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:93
+#: src/gui/widgets/tabs/setup_audio.cpp:92
msgid "stereo"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:94
msgid "surround"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:97
+#: src/gui/widgets/tabs/setup_audio.cpp:96
msgid "surround+center+lfe"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:98
msgid "Audio channels"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:104
+#: src/gui/widgets/tabs/setup_audio.cpp:103
msgid "Sound effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:106
msgid "Information dialog sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:110
msgid "Request dialog sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:115
+#: src/gui/widgets/tabs/setup_audio.cpp:114
msgid "Whisper message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:118
msgid "Guild / Party message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:122
msgid "Highlight message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:126
msgid "Global message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:130
msgid "Error message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:134
msgid "Trade request sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:138
msgid "Show window sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:142
msgid "Hide window sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:150
msgid "Enable mumble voice chat"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:156
+#: src/gui/widgets/tabs/setup_audio.cpp:155
msgid "Download music"
msgstr ""
@@ -3412,7 +3481,7 @@ msgstr ""
#. TRANSLATORS: unknown key name
#. TRANSLATORS: quests window quest name
#: src/gui/widgets/tabs/setup_input.cpp:364
-#: src/gui/windows/questswindow.cpp:263
+#: src/gui/windows/questswindow.cpp:249
msgid "unknown"
msgstr ""
@@ -3571,7 +3640,7 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: debug window tab
#. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:105
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
#: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
#: src/gui/windows/minimap.cpp:114
msgid "Map"
@@ -3739,9 +3808,9 @@ msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: shop window name
#. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:146
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
#: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windows/inventorywindow.cpp:194
msgid "Shop"
msgstr ""
@@ -4123,252 +4192,252 @@ msgid "When ignoring:"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:64
+#: src/gui/widgets/tabs/setup_theme.cpp:63
msgid "Very small (8)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:66
+#: src/gui/widgets/tabs/setup_theme.cpp:65
msgid "Very small (9)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:68
+#: src/gui/widgets/tabs/setup_theme.cpp:67
msgid "Tiny (10)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:70
+#: src/gui/widgets/tabs/setup_theme.cpp:69
msgid "Small (11)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:72
+#: src/gui/widgets/tabs/setup_theme.cpp:71
msgid "Medium (12)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:74
+#: src/gui/widgets/tabs/setup_theme.cpp:73
msgid "Normal (13)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:76
+#: src/gui/widgets/tabs/setup_theme.cpp:75
msgid "Large (14)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:78
+#: src/gui/widgets/tabs/setup_theme.cpp:77
msgid "Large (15)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:80
+#: src/gui/widgets/tabs/setup_theme.cpp:79
msgid "Large (16)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:82
+#: src/gui/widgets/tabs/setup_theme.cpp:81
msgid "Big (17)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:83
msgid "Big (18)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:85
msgid "Big (19)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:87
msgid "Very big (20)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:89
msgid "Very big (21)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:91
msgid "Very big (22)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:93
msgid "Huge (23)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:129
+#: src/gui/widgets/tabs/setup_theme.cpp:128
msgid "Chinese (China)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:131
+#: src/gui/widgets/tabs/setup_theme.cpp:130
msgid "Czech"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:133
+#: src/gui/widgets/tabs/setup_theme.cpp:132
msgid "English"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:135
+#: src/gui/widgets/tabs/setup_theme.cpp:134
msgid "Finnish"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:137
+#: src/gui/widgets/tabs/setup_theme.cpp:136
msgid "French"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:139
+#: src/gui/widgets/tabs/setup_theme.cpp:138
msgid "German"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:141
+#: src/gui/widgets/tabs/setup_theme.cpp:140
msgid "Indonesian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:143
+#: src/gui/widgets/tabs/setup_theme.cpp:142
msgid "Italian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:145
+#: src/gui/widgets/tabs/setup_theme.cpp:144
msgid "Polish"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:147
+#: src/gui/widgets/tabs/setup_theme.cpp:146
msgid "Japanese"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:148
msgid "Dutch (Belgium/Flemish)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:150
msgid "Portuguese"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:152
msgid "Portuguese (Brazilian)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:154
msgid "Russian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:156
msgid "Spanish (Castilian)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:158
msgid "Turkish"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:211
+#: src/gui/widgets/tabs/setup_theme.cpp:210
msgid "Gui theme"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:218
+#: src/gui/widgets/tabs/setup_theme.cpp:217
msgid "Main Font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:223
+#: src/gui/widgets/tabs/setup_theme.cpp:222
msgid "Language"
msgstr ""
#. TRANSLATORS: theme settings label
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:227 src/gui/windows/emotewindow.cpp:45
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
msgid "Bold font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:230
msgid "Particle font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:235
+#: src/gui/widgets/tabs/setup_theme.cpp:234
msgid "Help font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:239
+#: src/gui/widgets/tabs/setup_theme.cpp:238
msgid "Secure font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:242
msgid "Npc font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:247
+#: src/gui/widgets/tabs/setup_theme.cpp:246
msgid "Japanese font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:250
msgid "Chinese font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:256
+#: src/gui/widgets/tabs/setup_theme.cpp:255
msgid "Font size"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:261
+#: src/gui/widgets/tabs/setup_theme.cpp:260
msgid "Npc font size"
msgstr ""
#. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:265
+#: src/gui/widgets/tabs/setup_theme.cpp:264
msgid "i"
msgstr ""
#. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:404
+#: src/gui/widgets/tabs/setup_theme.cpp:403
msgid "Name: "
msgstr ""
-#: src/gui/widgets/tabs/setup_theme.cpp:405
+#: src/gui/widgets/tabs/setup_theme.cpp:404
msgid "Copyright:"
msgstr ""
#. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:470
+#: src/gui/widgets/tabs/setup_theme.cpp:469
msgid "Theme info"
msgstr ""
#. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:497
+#: src/gui/widgets/tabs/setup_theme.cpp:496
msgid "Theme Changed"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:497
+#: src/gui/widgets/tabs/setup_theme.cpp:496
#: src/gui/widgets/tabs/setup_video.cpp:499
#: src/gui/widgets/tabs/setup_video.cpp:508
msgid "Restart your client for the change to take effect."
@@ -4699,178 +4768,169 @@ msgid "Allow screensaver to run"
msgstr ""
#. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:67
msgid "ONL"
msgstr ""
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:68
msgid "Who is online"
msgstr ""
#. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:70
msgid "HLP"
msgstr ""
#. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:73
msgid "QE"
msgstr ""
#. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:77 src/gui/windows/questswindow.cpp:126
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
msgid "Quests"
msgstr ""
#. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:76
msgid "BC"
msgstr ""
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:77
msgid "Bot checker"
msgstr ""
#. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:82
+#: src/gui/windowmenu.cpp:79
msgid "KS"
msgstr ""
#. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:83 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
msgid "Kill stats"
msgstr ""
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:82
msgid "Smilies"
msgstr ""
#. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:87
+#: src/gui/windowmenu.cpp:84
msgid "CH"
msgstr ""
#. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:95
+#: src/gui/windowmenu.cpp:92
msgid "STA"
msgstr ""
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:93
msgid "Status"
msgstr ""
#. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:95
msgid "EQU"
msgstr ""
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:58
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
msgid "Equipment"
msgstr "تجهیزات"
#. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:98
msgid "INV"
msgstr ""
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:130
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
#: src/inventory.cpp:257
msgid "Inventory"
msgstr ""
#. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:104
+#: src/gui/windowmenu.cpp:101
msgid "MAP"
msgstr ""
#. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:110
+#: src/gui/windowmenu.cpp:107
msgid "SKI"
msgstr ""
#. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
msgid "Skills"
msgstr ""
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:118
-msgid "SPE"
-msgstr ""
-
-#: src/gui/windowmenu.cpp:119
-msgid "Specials"
-msgstr ""
-
#. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:124
+#: src/gui/windowmenu.cpp:112
msgid "SOC"
msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:126 src/gui/windows/socialwindow.cpp:1284
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
msgid "Social"
msgstr ""
#. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:128
+#: src/gui/windowmenu.cpp:116
msgid "SH"
msgstr ""
#. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:132
+#: src/gui/windowmenu.cpp:120
msgid "SP"
msgstr ""
#. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:124
msgid "DR"
msgstr ""
#. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:128
msgid "YK"
msgstr ""
#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:130
msgid "Did you know"
msgstr ""
#. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:144
+#: src/gui/windowmenu.cpp:132
msgid "SHP"
msgstr ""
#. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:148
+#: src/gui/windowmenu.cpp:136
msgid "OU"
msgstr ""
#. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:152
+#: src/gui/windowmenu.cpp:140
msgid "DBG"
msgstr ""
#. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:149
msgid "WIN"
msgstr ""
#. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:153
msgid "SET"
msgstr ""
#. TRANSLATORS: short key name
#. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:301 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
#: src/gui/windows/outfitwindow.cpp:561
#, c-format
msgid "Key: %s"
@@ -4892,31 +4952,21 @@ msgstr ""
msgid "Result"
msgstr ""
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:58
-msgid "unsorted"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:60
-msgid "by price"
-msgstr ""
-
#. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:196
+#: src/gui/windows/buydialog.cpp:162
msgid "Create items"
msgstr ""
#. TRANSLATORS: buy dialog label
#. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:254 src/gui/windows/buydialog.cpp:541
-#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:366
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
#, c-format
msgid "Price: %s / Total: %s"
msgstr ""
#. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:263
+#: src/gui/windows/buydialog.cpp:229
msgid "Amount:"
msgstr ""
@@ -4926,8 +4976,8 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/itemamountwindow.cpp:159
-#: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
msgid "+"
msgstr ""
@@ -4938,8 +4988,8 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:271 src/gui/windows/itemamountwindow.cpp:157
-#: src/gui/windows/itemamountwindow.cpp:191 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
msgid "-"
msgstr ""
@@ -4947,9 +4997,9 @@ msgstr ""
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:274 src/gui/windows/charcreatedialog.cpp:119
-#: src/gui/windows/charselectdialog.cpp:593
-#: src/gui/windows/socialwindow.cpp:1307
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
msgid "Create"
msgstr "بساز"
@@ -4958,7 +5008,7 @@ msgstr "بساز"
#. TRANSLATORS: status bar label
#. TRANSLATORS: status window label
#. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:278 src/gui/windows/selldialog.cpp:112
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
#: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
#: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
msgid "Max"
@@ -5057,7 +5107,7 @@ msgstr ""
#. TRANSLATORS: login dialog label
#. TRANSLATORS: register dialog. label.
#: src/gui/windows/charcreatedialog.cpp:73
-#: src/gui/windows/editserverdialog.cpp:89 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
#: src/gui/windows/registerdialog.cpp:89
msgid "Name:"
msgstr "نام"
@@ -5118,7 +5168,7 @@ msgstr "زن"
#. TRANSLATORS: char create dialog label
#: src/gui/windows/charcreatedialog.cpp:115
-#: src/gui/windows/charcreatedialog.cpp:469
+#: src/gui/windows/charcreatedialog.cpp:458
#, c-format
msgid "Please distribute %d points"
msgstr ""
@@ -5134,17 +5184,17 @@ msgid "Look:"
msgstr ""
#. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:362
+#: src/gui/windows/charcreatedialog.cpp:351
msgid "Your name needs to be at least 4 characters."
msgstr "نام شما حداقل باید 4 کاراکتر داشته باشد"
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:459
+#: src/gui/windows/charcreatedialog.cpp:448
msgid "Character stats OK"
msgstr ""
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:475
+#: src/gui/windows/charcreatedialog.cpp:464
#, c-format
msgid "Please remove %d points"
msgstr ""
@@ -5173,7 +5223,7 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:104
-#: src/gui/windows/charselectdialog.cpp:588
+#: src/gui/windows/charselectdialog.cpp:580
#: src/gui/windows/updaterwindow.cpp:188
msgid "Play"
msgstr ""
@@ -5229,35 +5279,20 @@ msgstr ""
msgid "Enter password:"
msgstr ""
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:172
-msgid "rainbow 1"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:174
-msgid "rainbow 2"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:176
-msgid "rainbow 3"
-msgstr ""
-
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:755
+#: src/gui/windows/chatwindow.cpp:705
#, c-format
msgid "Present: %s; %d players are present."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1169
+#: src/gui/windows/chatwindow.cpp:1119
#, c-format
msgid "Whispering to %s: %s"
msgstr ""
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1613
+#: src/gui/windows/chatwindow.cpp:1563
#, c-format
msgid "%s's pet"
msgstr ""
@@ -5503,51 +5538,51 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:77
-#: src/gui/windows/itemamountwindow.cpp:161 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
msgid "OK"
msgstr "تایید"
#. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:66
+#: src/gui/windows/editserverdialog.cpp:45
msgid "Edit Server"
msgstr ""
#. TRANSLATORS: edit server dialog button
#. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:75
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
msgid "Connect"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:91
+#: src/gui/windows/editserverdialog.cpp:70
msgid "Address:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:93
+#: src/gui/windows/editserverdialog.cpp:72
msgid "Port:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:95
+#: src/gui/windows/editserverdialog.cpp:74
msgid "Server type:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:97
+#: src/gui/windows/editserverdialog.cpp:76
msgid "Description:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:99
+#: src/gui/windows/editserverdialog.cpp:78
msgid "Online list url:"
msgstr ""
#. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:220
+#: src/gui/windows/editserverdialog.cpp:188
msgid "Please at least type both the address and the port of the server."
msgstr ""
@@ -5567,47 +5602,47 @@ msgid "Did you know..."
msgstr ""
#. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:165
+#: src/gui/windows/itemamountwindow.cpp:164
msgid "All"
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:221
+#: src/gui/windows/itemamountwindow.cpp:220
msgid "Select amount of items to trade."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:225
+#: src/gui/windows/itemamountwindow.cpp:224
msgid "Select amount of items to drop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:229
+#: src/gui/windows/itemamountwindow.cpp:228
msgid "Select amount of items to store."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:233
+#: src/gui/windows/itemamountwindow.cpp:232
msgid "Select amount of items to retrieve."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:237
+#: src/gui/windows/itemamountwindow.cpp:236
msgid "Select amount of items to split."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:241
+#: src/gui/windows/itemamountwindow.cpp:240
msgid "Add to buy shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:245
+#: src/gui/windows/itemamountwindow.cpp:244
msgid "Add to sell shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:249
+#: src/gui/windows/itemamountwindow.cpp:248
msgid "Unknown."
msgstr ""
@@ -5857,7 +5892,7 @@ msgstr ""
#. TRANSLATORS: shop window label
#. TRANSLATORS: shop window button
#. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:258
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
#: src/gui/windows/tradewindow.cpp:78
msgid "Add"
@@ -5959,53 +5994,53 @@ msgid "Do you really want to sell %s?"
msgstr ""
#. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
msgid "Choose Your Server"
msgstr ""
#. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
msgid "Load"
msgstr ""
#. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
msgid "Choose Your Server *** SAFE MODE ***"
msgstr ""
#. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
msgid "Use same ip for game sub servers"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
msgid "Waiting for server..."
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
msgid "Preparing download"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
msgid "Error retreiving server list!"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
msgid "requires a newer version"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
#, c-format
msgid "requires v%s"
msgstr ""
@@ -6086,277 +6121,277 @@ msgid "Skill %d"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:225
+#: src/gui/windows/socialwindow.cpp:227
#, c-format
msgid "Invited user %s to guild %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:240
+#: src/gui/windows/socialwindow.cpp:242
#, c-format
msgid "Guild %s quit requested."
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:254
+#: src/gui/windows/socialwindow.cpp:256
msgid "Member Invite to Guild"
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:256
+#: src/gui/windows/socialwindow.cpp:258
#, c-format
msgid "Who would you like to invite to guild %s?"
msgstr ""
#. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:266
+#: src/gui/windows/socialwindow.cpp:268
msgid "Leave Guild?"
msgstr ""
#. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:268
+#: src/gui/windows/socialwindow.cpp:270
#, c-format
msgid "Are you sure you want to leave guild %s?"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:279
+#: src/gui/windows/socialwindow.cpp:281
#, c-format
msgid "Members: %u/%u"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:301 src/gui/windows/socialwindow.cpp:373
-#: src/gui/windows/socialwindow.cpp:498
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
#, c-format
msgid "Players: %u/%u"
msgstr ""
#. TRANSLATORS: tab in social window
#. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:389 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
msgid "Party"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:429
+#: src/gui/windows/socialwindow.cpp:431
#, c-format
msgid "Invited user %s to party."
msgstr ""
#. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:444
+#: src/gui/windows/socialwindow.cpp:446
#, c-format
msgid "Party %s quit requested."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:458
+#: src/gui/windows/socialwindow.cpp:460
msgid "Member Invite to Party"
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:460
+#: src/gui/windows/socialwindow.cpp:462
#, c-format
msgid "Who would you like to invite to party %s?"
msgstr ""
#. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:470
+#: src/gui/windows/socialwindow.cpp:472
msgid "Leave Party?"
msgstr ""
#. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:472
+#: src/gui/windows/socialwindow.cpp:474
#, c-format
msgid "Are you sure you want to leave party %s?"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:698
+#: src/gui/windows/socialwindow.cpp:665
#, c-format
msgid "Visible players: %d"
msgstr ""
#. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:725
+#: src/gui/windows/socialwindow.cpp:692
msgid "Nav"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:827
+#: src/gui/windows/socialwindow.cpp:794
#, c-format
msgid "Portals: %u/%u"
msgstr ""
#. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1054
+#: src/gui/windows/socialwindow.cpp:1021
msgid "Atk"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1073
+#: src/gui/windows/socialwindow.cpp:1040
msgid "Priority mobs"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1075
+#: src/gui/windows/socialwindow.cpp:1042
msgid "Attack mobs"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1077
+#: src/gui/windows/socialwindow.cpp:1044
msgid "Ignore mobs"
msgstr ""
#. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1101
+#: src/gui/windows/socialwindow.cpp:1068
msgid "Pik"
msgstr ""
#. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1120
+#: src/gui/windows/socialwindow.cpp:1087
msgid "Pickup items"
msgstr ""
#. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1122
+#: src/gui/windows/socialwindow.cpp:1089
msgid "Ignore items"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1212
+#: src/gui/windows/socialwindow.cpp:1179
#, c-format
msgid "Friends: %u/%u"
msgstr ""
#. TRANSLATORS: party popup item
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1235 src/gui/windows/socialwindow.cpp:1727
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
msgid "Create Party"
msgstr ""
#. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1298
+#: src/gui/windows/socialwindow.cpp:1265
msgid "P"
msgstr ""
#. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1303
+#: src/gui/windows/socialwindow.cpp:1270
msgid "F"
msgstr ""
#. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1309
+#: src/gui/windows/socialwindow.cpp:1276
msgid "Invite"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1503
+#: src/gui/windows/socialwindow.cpp:1470
#, c-format
msgid "Accepted party invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1514
+#: src/gui/windows/socialwindow.cpp:1481
#, c-format
msgid "Rejected party invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1531
+#: src/gui/windows/socialwindow.cpp:1498
#, c-format
msgid "Accepted guild invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1545
+#: src/gui/windows/socialwindow.cpp:1512
#, c-format
msgid "Rejected guild invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1585
+#: src/gui/windows/socialwindow.cpp:1552
#, c-format
msgid "Creating guild called %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1606
+#: src/gui/windows/socialwindow.cpp:1573
#, c-format
msgid "Creating party called %s."
msgstr ""
#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1621
+#: src/gui/windows/socialwindow.cpp:1588
msgid "Guild Name"
msgstr ""
#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1623
+#: src/gui/windows/socialwindow.cpp:1590
msgid "Choose your guild's name."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1639
+#: src/gui/windows/socialwindow.cpp:1606
msgid "Received guild request, but one already exists."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1647
+#: src/gui/windows/socialwindow.cpp:1614
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1654
+#: src/gui/windows/socialwindow.cpp:1621
msgid "Accept Guild Invite"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1670
+#: src/gui/windows/socialwindow.cpp:1637
msgid "Received party request, but one already exists."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1682
+#: src/gui/windows/socialwindow.cpp:1649
msgid "You have been invited you to join a party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1687
+#: src/gui/windows/socialwindow.cpp:1654
#, c-format
msgid "You have been invited to join the %s party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1696
+#: src/gui/windows/socialwindow.cpp:1663
#, c-format
msgid "%s has invited you to join their party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1702
+#: src/gui/windows/socialwindow.cpp:1669
#, c-format
msgid "%s has invited you to join the %s party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1712
+#: src/gui/windows/socialwindow.cpp:1679
msgid "Accept Party Invite"
msgstr ""
-#: src/gui/windows/socialwindow.cpp:1728
+#: src/gui/windows/socialwindow.cpp:1695
msgid "Cannot create party. You are already in a party"
msgstr ""
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1734
+#: src/gui/windows/socialwindow.cpp:1701
msgid "Party Name"
msgstr ""
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1736
+#: src/gui/windows/socialwindow.cpp:1703
msgid "Choose your party's name."
msgstr ""
@@ -6398,113 +6433,68 @@ msgstr ""
msgid "Correction points: %d"
msgstr ""
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "No Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Allow Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:105
-msgid "Need Target"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "General Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "Life Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "War Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Transmute Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Nature Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:121
-msgid "Astral Magic"
-msgstr ""
-
#. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:164
+#: src/gui/windows/textcommandeditor.cpp:47
msgid "Command Editor"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:52
msgid "magic"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:54
msgid "other"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:173
+#: src/gui/windows/textcommandeditor.cpp:56
msgid "Symbol:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:176
+#: src/gui/windows/textcommandeditor.cpp:59
msgid "Command:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:179
+#: src/gui/windows/textcommandeditor.cpp:62
msgid "Comment:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:183
+#: src/gui/windows/textcommandeditor.cpp:66
msgid "Target Type:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:187
+#: src/gui/windows/textcommandeditor.cpp:70
msgid "Icon:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:190
+#: src/gui/windows/textcommandeditor.cpp:73
msgid "Mana:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:193
+#: src/gui/windows/textcommandeditor.cpp:76
msgid "Magic level:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:197
+#: src/gui/windows/textcommandeditor.cpp:80
msgid "Magic School:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:200
+#: src/gui/windows/textcommandeditor.cpp:83
msgid "School level:"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/windows/textcommandeditor.cpp:88
msgid "Save"
msgstr ""
@@ -6534,7 +6524,7 @@ msgid "Trade: You"
msgstr ""
#. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
#, c-format
msgid "You get %s"
msgstr ""
@@ -6550,12 +6540,12 @@ msgid "You give:"
msgstr ""
#. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
msgid "You don't have enough money."
msgstr ""
#. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
msgid ""
"Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
@@ -6626,17 +6616,17 @@ msgid "Who Is Online - Update"
msgstr ""
#. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:87
+#: src/gui/windows/worldselectdialog.cpp:49
msgid "Select World"
msgstr ""
#. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:93
+#: src/gui/windows/worldselectdialog.cpp:55
msgid "Change Login"
msgstr ""
#. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:95
+#: src/gui/windows/worldselectdialog.cpp:57
msgid "Choose World"
msgstr ""
@@ -6854,7 +6844,7 @@ msgid "Failed to create character. Most likely the name is already taken."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:281
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
msgid "Wrong name."
msgstr ""
@@ -7012,58 +7002,58 @@ msgid "Experience sharing unknown."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:154
+#: src/net/ea/loginhandler.cpp:149
msgid "Account was not found. Please re-login."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/ea/loginhandler.cpp:153
msgid "Old password incorrect."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:162
+#: src/net/ea/loginhandler.cpp:157
msgid "New password too short."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:166 src/net/ea/loginhandler.cpp:293
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
msgid "Unknown error."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:239
+#: src/net/ea/loginhandler.cpp:234
msgid "Unregistered ID."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:238
msgid "Wrong password."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:248
+#: src/net/ea/loginhandler.cpp:243
msgid "Account expired."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:252
+#: src/net/ea/loginhandler.cpp:247
msgid "Rejected from server."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:256
+#: src/net/ea/loginhandler.cpp:251
msgid ""
"You have been permanently banned from the game. Please contact the GM team."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:261
+#: src/net/ea/loginhandler.cpp:256
msgid "Client too old."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:265
+#: src/net/ea/loginhandler.cpp:260
#, c-format
msgid ""
"You have been temporarily banned from the game until %s.\n"
@@ -7071,22 +7061,22 @@ msgid ""
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:273
+#: src/net/ea/loginhandler.cpp:268
msgid "Server overpopulated."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:277
+#: src/net/ea/loginhandler.cpp:272
msgid "This user name is already taken."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:285
+#: src/net/ea/loginhandler.cpp:280
msgid "Incorrect email."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:289
+#: src/net/ea/loginhandler.cpp:284
msgid "Username permanently erased."
msgstr ""
@@ -7759,7 +7749,7 @@ msgstr ""
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
#: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 6a3d9e71c..ccc2b7aaa 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
"POT-Creation-Date: 2014-02-28 21:21+0300\n"
-"PO-Revision-Date: 2014-02-23 08:14+0000\n"
+"PO-Revision-Date: 2014-03-01 08:14+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Finnish (http://www.transifex.com/projects/p/manaplus/"
"language/fi/)\n"
@@ -7807,9 +7807,3 @@ msgstr "Tuntematon tavara"
#: src/resources/db/petdb.cpp:99
msgid "pet"
msgstr ""
-
-#~ msgid "SPE"
-#~ msgstr "Eri"
-
-#~ msgid "Specials"
-#~ msgstr "Erikoisuudet"
diff --git a/po/fr.po b/po/fr.po
index 72060cef9..400a2c4a4 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -18,7 +18,7 @@ msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
"POT-Creation-Date: 2014-02-28 21:21+0300\n"
-"PO-Revision-Date: 2014-02-23 08:14+0000\n"
+"PO-Revision-Date: 2014-03-01 08:14+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: French (http://www.transifex.com/projects/p/manaplus/language/"
"fr/)\n"
@@ -7853,9 +7853,3 @@ msgstr "Objet inconnu"
#: src/resources/db/petdb.cpp:99
msgid "pet"
msgstr "familier"
-
-#~ msgid "SPE"
-#~ msgstr "Spe"
-
-#~ msgid "Specials"
-#~ msgstr "Cpt. spéciales"
diff --git a/po/he.po b/po/he.po
index b0db90f22..1ad4be16f 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: 2014-02-23 00:42+0300\n"
-"PO-Revision-Date: 2014-02-23 08:14+0000\n"
+"POT-Creation-Date: 2014-02-28 21:21+0300\n"
+"PO-Revision-Date: 2014-03-01 08:14+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"
@@ -29,7 +29,7 @@ msgid "Accepting incoming trade requests"
msgstr "מאשר הצעות סחר נכנסות"
#. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
msgid "Visible on map"
msgstr ""
@@ -38,68 +38,68 @@ msgstr ""
msgid "Human"
msgstr ""
-#: src/being/being.cpp:544
+#: src/being/being.cpp:496
msgid "dodge"
msgstr ""
-#: src/being/being.cpp:544
+#: src/being/being.cpp:496
msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1965 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1970 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr ""
#. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:392
+#: src/being/localplayer.cpp:376
#, c-format
msgid "You were killed by %s"
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1377
+#: src/being/localplayer.cpp:816
msgid "Tried to pick up nonexistent item."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1381
+#: src/being/localplayer.cpp:820
msgid "Item is too heavy."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1385
+#: src/being/localplayer.cpp:824
msgid "Item is too far away."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1389
+#: src/being/localplayer.cpp:828
msgid "Inventory is full."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1393
+#: src/being/localplayer.cpp:832
msgid "Stack is too big."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1397
+#: src/being/localplayer.cpp:836
msgid "Item belongs to someone else."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1401
+#: src/being/localplayer.cpp:840
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:1425
+#: src/being/localplayer.cpp:864
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -107,387 +107,387 @@ msgstr[0] ""
msgstr[1] ""
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1630 src/being/localplayer.cpp:1665
-#: src/being/localplayer.cpp:1666
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
msgid "xp"
msgstr ""
-#: src/being/localplayer.cpp:1671 src/being/localplayer.cpp:1678
-#: src/being/localplayer.cpp:1685
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
msgid "job"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1871
+#: src/being/localplayer.cpp:1285
msgid "(D) default moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1873
+#: src/being/localplayer.cpp:1287
msgid "(I) invert moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1875
+#: src/being/localplayer.cpp:1289
msgid "(c) moves with some crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1877
+#: src/being/localplayer.cpp:1291
msgid "(C) moves with crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1879
+#: src/being/localplayer.cpp:1293
msgid "(d) double normal + crazy"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1881
+#: src/being/localplayer.cpp:1295
msgid "(?) unknown move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1904
+#: src/being/localplayer.cpp:1318
#, c-format
msgid "(%u) crazy move number %u"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1910
+#: src/being/localplayer.cpp:1324
msgid "(a) custom crazy move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1915
+#: src/being/localplayer.cpp:1329
msgid "(?) crazy move"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1930
+#: src/being/localplayer.cpp:1344
msgid "(0) default moves to target"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1932
+#: src/being/localplayer.cpp:1346
msgid "(1) moves to target in distance 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1934
+#: src/being/localplayer.cpp:1348
msgid "(2) moves to target in distance 2"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1936
+#: src/being/localplayer.cpp:1350
msgid "(3) moves to target in distance 3"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1938
+#: src/being/localplayer.cpp:1352
msgid "(5) moves to target in distance 5"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1940
+#: src/being/localplayer.cpp:1354
msgid "(7) moves to target in distance 7"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1942
+#: src/being/localplayer.cpp:1356
msgid "(A) moves to target in attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1944
+#: src/being/localplayer.cpp:1358
msgid "(a) archer attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1946
+#: src/being/localplayer.cpp:1360
msgid "(B) moves to target in attack range - 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1948
+#: src/being/localplayer.cpp:1362
msgid "(?) move to target"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1968
+#: src/being/localplayer.cpp:1382
msgid "(D) default follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1970
+#: src/being/localplayer.cpp:1384
msgid "(R) relative follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1972
+#: src/being/localplayer.cpp:1386
msgid "(M) mirror follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1974
+#: src/being/localplayer.cpp:1388
msgid "(P) pet follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1976
+#: src/being/localplayer.cpp:1390
msgid "(?) unknown follow"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1996 src/being/localplayer.cpp:2004
-#: src/being/localplayer.cpp:2032
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
msgid "(?) attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1998 src/being/localplayer.cpp:2024
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
msgid "(D) default attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2000
+#: src/being/localplayer.cpp:1414
msgid "(s) switch attack without shield"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2002
+#: src/being/localplayer.cpp:1416
msgid "(S) switch attack with shield"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2026
+#: src/being/localplayer.cpp:1440
msgid "(G) go and attack"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2028
+#: src/being/localplayer.cpp:1442
msgid "(A) go, attack, pickup"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2030
+#: src/being/localplayer.cpp:1444
msgid "(d) without auto attack"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2084
+#: src/being/localplayer.cpp:1498
msgid "(S) small pick up 1x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2086
+#: src/being/localplayer.cpp:1500
msgid "(D) default pick up 2x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2088
+#: src/being/localplayer.cpp:1502
msgid "(F) forward pick up 2x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2090
+#: src/being/localplayer.cpp:1504
msgid "(3) pick up 3x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2092
+#: src/being/localplayer.cpp:1506
msgid "(g) go and pick up in distance 4"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2094
+#: src/being/localplayer.cpp:1508
msgid "(G) go and pick up in distance 8"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2096
+#: src/being/localplayer.cpp:1510
msgid "(A) go and pick up in max distance"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2098
+#: src/being/localplayer.cpp:1512
msgid "(?) pick up"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2112
+#: src/being/localplayer.cpp:1526
msgid "(N) normal map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2114
+#: src/being/localplayer.cpp:1528
msgid "(D) debug map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2116
+#: src/being/localplayer.cpp:1530
msgid "(u) ultra map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2118
+#: src/being/localplayer.cpp:1532
msgid "(U) ultra map view 2"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2120
+#: src/being/localplayer.cpp:1534
msgid "(e) empty map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2122
+#: src/being/localplayer.cpp:1536
msgid "(b) black & white map view"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2142
+#: src/being/localplayer.cpp:1556
msgid "(f) use #flar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2144
+#: src/being/localplayer.cpp:1558
msgid "(c) use #chiza for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2146
+#: src/being/localplayer.cpp:1560
msgid "(I) use #ingrav for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2148
+#: src/being/localplayer.cpp:1562
msgid "(F) use #frillyar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2150
+#: src/being/localplayer.cpp:1564
msgid "(U) use #upmarmu for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2152
+#: src/being/localplayer.cpp:1566
msgid "(?) magic attack"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2172
+#: src/being/localplayer.cpp:1586
msgid "(a) attack all players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2174
+#: src/being/localplayer.cpp:1588
msgid "(f) attack all except friends"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2176
+#: src/being/localplayer.cpp:1590
msgid "(b) attack bad relations"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2178
+#: src/being/localplayer.cpp:1592
msgid "(d) don't attack players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2180
+#: src/being/localplayer.cpp:1594
msgid "(?) pvp attack"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2200
+#: src/being/localplayer.cpp:1614
msgid "(D) default imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2202
+#: src/being/localplayer.cpp:1616
msgid "(O) outfits imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2204
+#: src/being/localplayer.cpp:1618
msgid "(?) imitation"
msgstr ""
#. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2233
+#: src/being/localplayer.cpp:1647
msgid "Away"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2256
+#: src/being/localplayer.cpp:1670
msgid "(O) on keyboard"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2258
+#: src/being/localplayer.cpp:1672
msgid "(A) away"
msgstr ""
#. TRANSLATORS: away type in status bar
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2260 src/being/localplayer.cpp:2278
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
msgid "(?) away"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2274
+#: src/being/localplayer.cpp:1688
msgid "(G) game camera mode"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2276
+#: src/being/localplayer.cpp:1690
msgid "(F) free camera mode"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2303
+#: src/being/localplayer.cpp:1717
msgid "Game modifiers are enabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2305
+#: src/being/localplayer.cpp:1719
msgid "Game modifiers are disabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2307
+#: src/being/localplayer.cpp:1721
msgid "Game modifiers are unknown"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3887
+#: src/being/localplayer.cpp:3287
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3893 src/being/localplayer.cpp:3918
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3903
+#: src/being/localplayer.cpp:3303
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3909 src/being/localplayer.cpp:3923
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4266
+#: src/being/localplayer.cpp:3666
#, c-format
msgid "You see %s"
msgstr ""
@@ -525,32 +525,32 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1139 src/gui/windowmenu.cpp:167
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
#: src/gui/windows/setupwindow.cpp:61
msgid "Setup"
msgstr "הגדרות"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1143 src/gui/widgets/tabs/setup_perfomance.cpp:51
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1146 src/gui/widgets/tabs/setup_video.cpp:225
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:225
msgid "Video"
msgstr "וידאו"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1149 src/gui/widgets/tabs/setup_theme.cpp:269
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1152 src/gui/windowmenu.cpp:74
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr "עזרה"
@@ -563,41 +563,41 @@ msgstr "עזרה"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1156 src/gui/popups/popupmenu.cpp:619
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
#: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:69
-#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:138
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
#: src/gui/windows/shopwindow.cpp:78
msgid "Close"
msgstr "סגור"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1324
msgid "Logging in"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1367
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1492
+#: src/client.cpp:1489
msgid "Requesting characters"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1532
+#: src/client.cpp:1529
msgid "Connecting to the game server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1545
+#: src/client.cpp:1541
msgid "Changing game servers"
msgstr ""
@@ -612,12 +612,12 @@ msgstr ""
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1606 src/client.cpp:1617 src/client.cpp:1801
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:349
#: src/gui/windows/charselectdialog.cpp:299
-#: src/gui/windows/editserverdialog.cpp:218
+#: src/gui/windows/editserverdialog.cpp:186
#: src/gui/windows/registerdialog.cpp:260
#: src/gui/windows/unregisterdialog.cpp:146
#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
@@ -625,65 +625,65 @@ msgid "Error"
msgstr "שגיאה"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1629
+#: src/client.cpp:1625
msgid "Requesting registration details"
msgstr ""
#. TRANSLATORS: password change message header
-#: src/client.cpp:1670
+#: src/client.cpp:1666
msgid "Password Change"
msgstr ""
#. TRANSLATORS: password change message text
-#: src/client.cpp:1672
+#: src/client.cpp:1668
msgid "Password changed successfully!"
msgstr ""
#. TRANSLATORS: email change message header
-#: src/client.cpp:1694
+#: src/client.cpp:1690
msgid "Email Change"
msgstr ""
#. TRANSLATORS: email change message text
-#: src/client.cpp:1696
+#: src/client.cpp:1692
msgid "Email changed successfully!"
msgstr ""
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1719
+#: src/client.cpp:1715
msgid "Unregister Successful"
msgstr ""
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1721
+#: src/client.cpp:1717
msgid "Farewell, come back any time..."
msgstr ""
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1998 src/client.cpp:2013 src/client.cpp:2058
-#: src/client.cpp:2074 src/client.cpp:2525 src/client.cpp:2533
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2230
+#: src/client.cpp:2232
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2271 src/client.cpp:2278
+#: src/client.cpp:2273 src/client.cpp:2280
msgid "Error creating updates directory!"
msgstr "שגיאה ביצירת ספריית העדכונים!"
-#: src/client.cpp:2300 src/client.cpp:2317
+#: src/client.cpp:2302 src/client.cpp:2319
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: error message question
-#: src/client.cpp:3001
+#: src/client.cpp:3003
msgid "Do you want to open support page?"
msgstr ""
@@ -929,99 +929,154 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:277 src/gui/widgets/tabs/chattab.cpp:464
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
msgid "General"
msgstr "כללי"
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:293 src/gui/widgets/tabs/chattab.cpp:466
-#: src/gui/windowmenu.cpp:154 src/gui/windows/debugwindow.cpp:53
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:575
+#: src/game.cpp:563
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:585
+#: src/game.cpp:573
msgid "Saving screenshot failed!"
msgstr "שמירת תמונת־מסך נכשלה"
#. TRANSLATORS: error message text
-#: src/game.cpp:656
+#: src/game.cpp:644
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:659
+#: src/game.cpp:647
msgid "Network Error"
msgstr "שגיאת רשת"
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
-msgid "black"
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
msgstr ""
+#. TRANSLATORS: chat color
#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
+msgid "black"
+msgstr ""
+
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
msgid "red"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
msgid "green"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
msgid "blue"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
msgid "gold"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
msgid "yellow"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
msgid "pink"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
msgid "purple"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
msgid "grey"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
msgid "brown"
msgstr ""
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr ""
+
#. TRANSLATORS: relation type
#: src/gui/models/playerrelationlistmodel.h:33
msgid "Neutral"
@@ -1057,46 +1112,61 @@ msgstr ""
msgid "Enemy"
msgstr ""
-#. TRANSLATORS: inventory sort mode
-#. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#: src/gui/models/sortlistmodelinv.h:34
-#: src/gui/widgets/tabs/setup_other.cpp:72
-#: src/gui/widgets/tabs/setup_visual.cpp:78 src/gui/windows/chatwindow.cpp:150
-msgid "default"
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:36 src/gui/windows/buydialog.cpp:62
-msgid "by name"
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
msgstr ""
+#. TRANSLATORS: buy dialog sort type.
#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
+msgid "by name"
+msgstr ""
+
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:38 src/gui/windows/buydialog.cpp:64
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
msgid "by id"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:40 src/gui/windows/buydialog.cpp:66
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
msgid "by weight"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:42 src/gui/windows/buydialog.cpp:68
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
msgid "by amount"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:44 src/gui/windows/buydialog.cpp:70
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
msgid "by type"
msgstr ""
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr ""
+
#. TRANSLATORS: update type
#. TRANSLATORS: onscreen button size
#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
@@ -1243,8 +1313,8 @@ msgstr "דבר"
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
-#: src/gui/windows/buydialog.cpp:208 src/gui/windows/buydialog.cpp:220
-#: src/gui/windows/buydialog.cpp:274 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
msgid "Buy"
msgstr "קנה"
@@ -1341,12 +1411,12 @@ msgstr ""
#: src/gui/windows/changepassworddialog.cpp:57
#: src/gui/windows/charcreatedialog.cpp:121
#: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:79
-#: src/gui/windows/itemamountwindow.cpp:163
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
-#: src/gui/windows/socialwindow.cpp:1238
-#: src/gui/windows/textcommandeditor.cpp:203 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:54
#: src/gui/windows/updaterwindow.cpp:186
msgid "Cancel"
@@ -1418,7 +1488,7 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:150 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
msgstr ""
@@ -1431,7 +1501,7 @@ msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:134
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
msgid "Spells"
msgstr ""
@@ -1487,7 +1557,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
#. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1311
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
msgid "Leave"
msgstr ""
@@ -1568,8 +1638,8 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
-#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:223
-#: src/gui/windows/inventorywindow.cpp:745 src/gui/windows/setupwindow.cpp:96
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
msgid "Store"
msgstr "אחסן"
@@ -1600,7 +1670,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
msgid "Retrieve"
msgstr "החזר"
@@ -1633,8 +1703,8 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
-#: src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:656 src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr "השתמש"
@@ -1668,8 +1738,8 @@ msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: language
#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/widgets/tabs/setup_theme.cpp:127
-#: src/gui/windows/socialwindow.cpp:1003
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
msgid "(default)"
msgstr ""
@@ -1825,8 +1895,8 @@ msgstr ""
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:645
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
msgid "Unequip"
msgstr "הורד"
@@ -1834,16 +1904,16 @@ msgstr "הורד"
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:172
-#: src/gui/windows/inventorywindow.cpp:650 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr "השתמש"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:189
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
msgid "Drop..."
msgstr ""
@@ -1857,15 +1927,15 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:138
-#: src/gui/windows/inventorywindow.cpp:758
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
msgid "Drop"
msgstr "השלך"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
msgid "Split"
msgstr "פצל"
@@ -2021,10 +2091,10 @@ msgstr "בחר אישור"
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:276
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/windows/serverdialog.cpp:198
msgid "Quit"
msgstr "יציאה"
@@ -2586,7 +2656,7 @@ msgstr ""
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: register dialog. button.
#: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:146
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:330
#: src/gui/widgets/tabs/setup_visual.cpp:189
@@ -2613,9 +2683,8 @@ msgstr ""
#. TRANSLATORS: command editor button
#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
#: src/gui/windows/charselectdialog.cpp:108
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:94
-#: src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/textcommandeditor.cpp:207
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
msgid "Delete"
msgstr "מחק"
@@ -2651,7 +2720,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:130
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
msgid "Shortcuts"
msgstr ""
@@ -2659,7 +2728,7 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:151
msgid "Windows"
msgstr ""
@@ -2675,7 +2744,7 @@ msgstr ""
#. TRANSLATORS: settings tab name
#. TRANSLATORS: chat window name
#: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:88 src/gui/windows/chatwindow.cpp:203
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
msgid "Chat"
msgstr "שיחה"
@@ -2898,7 +2967,7 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:137
-#: src/gui/windows/inventorywindow.cpp:569
+#: src/gui/windows/inventorywindow.cpp:568
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
#, c-format
@@ -2918,7 +2987,7 @@ msgstr ""
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/windows/serverdialog.cpp:204
msgid "Edit"
msgstr ""
@@ -2971,7 +3040,7 @@ msgstr ""
#. TRANSLATORS: tab in social window
#. TRANSLATORS: guild chat tab name
#: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:184 src/gui/windows/socialwindow.cpp:320
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
#: src/net/ea/gui/guildtab.cpp:44
msgid "Guild"
msgstr "גילדה"
@@ -2982,142 +3051,142 @@ msgid "Lang"
msgstr ""
#. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:49
+#: src/gui/widgets/tabs/setup_audio.cpp:48
msgid "Audio"
msgstr "שמע"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:57
+#: src/gui/widgets/tabs/setup_audio.cpp:56
msgid "Basic settings"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:60
+#: src/gui/widgets/tabs/setup_audio.cpp:59
msgid "Enable Audio"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:63
+#: src/gui/widgets/tabs/setup_audio.cpp:62
msgid "Enable music"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:67
+#: src/gui/widgets/tabs/setup_audio.cpp:66
msgid "Enable game sfx"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:71
+#: src/gui/widgets/tabs/setup_audio.cpp:70
msgid "Enable gui sfx"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:74
msgid "Sfx volume"
msgstr "עוצמת SFX"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:78
msgid "Music volume"
msgstr "עוצמת מוזיקה"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:82
msgid "Enable music fade out"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:86
msgid "Audio frequency"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:90
msgid "mono"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:93
+#: src/gui/widgets/tabs/setup_audio.cpp:92
msgid "stereo"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:94
msgid "surround"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:97
+#: src/gui/widgets/tabs/setup_audio.cpp:96
msgid "surround+center+lfe"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:98
msgid "Audio channels"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:104
+#: src/gui/widgets/tabs/setup_audio.cpp:103
msgid "Sound effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:106
msgid "Information dialog sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:110
msgid "Request dialog sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:115
+#: src/gui/widgets/tabs/setup_audio.cpp:114
msgid "Whisper message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:118
msgid "Guild / Party message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:122
msgid "Highlight message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:126
msgid "Global message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:130
msgid "Error message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:134
msgid "Trade request sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:138
msgid "Show window sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:142
msgid "Hide window sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:150
msgid "Enable mumble voice chat"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:156
+#: src/gui/widgets/tabs/setup_audio.cpp:155
msgid "Download music"
msgstr ""
@@ -3413,7 +3482,7 @@ msgstr ""
#. TRANSLATORS: unknown key name
#. TRANSLATORS: quests window quest name
#: src/gui/widgets/tabs/setup_input.cpp:364
-#: src/gui/windows/questswindow.cpp:263
+#: src/gui/windows/questswindow.cpp:249
msgid "unknown"
msgstr ""
@@ -3572,7 +3641,7 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: debug window tab
#. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:105
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
#: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
#: src/gui/windows/minimap.cpp:114
msgid "Map"
@@ -3740,9 +3809,9 @@ msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: shop window name
#. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:146
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
#: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windows/inventorywindow.cpp:194
msgid "Shop"
msgstr "חנות"
@@ -4124,252 +4193,252 @@ msgid "When ignoring:"
msgstr "כאשר מתעלם:"
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:64
+#: src/gui/widgets/tabs/setup_theme.cpp:63
msgid "Very small (8)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:66
+#: src/gui/widgets/tabs/setup_theme.cpp:65
msgid "Very small (9)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:68
+#: src/gui/widgets/tabs/setup_theme.cpp:67
msgid "Tiny (10)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:70
+#: src/gui/widgets/tabs/setup_theme.cpp:69
msgid "Small (11)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:72
+#: src/gui/widgets/tabs/setup_theme.cpp:71
msgid "Medium (12)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:74
+#: src/gui/widgets/tabs/setup_theme.cpp:73
msgid "Normal (13)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:76
+#: src/gui/widgets/tabs/setup_theme.cpp:75
msgid "Large (14)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:78
+#: src/gui/widgets/tabs/setup_theme.cpp:77
msgid "Large (15)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:80
+#: src/gui/widgets/tabs/setup_theme.cpp:79
msgid "Large (16)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:82
+#: src/gui/widgets/tabs/setup_theme.cpp:81
msgid "Big (17)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:83
msgid "Big (18)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:85
msgid "Big (19)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:87
msgid "Very big (20)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:89
msgid "Very big (21)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:91
msgid "Very big (22)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:93
msgid "Huge (23)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:129
+#: src/gui/widgets/tabs/setup_theme.cpp:128
msgid "Chinese (China)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:131
+#: src/gui/widgets/tabs/setup_theme.cpp:130
msgid "Czech"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:133
+#: src/gui/widgets/tabs/setup_theme.cpp:132
msgid "English"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:135
+#: src/gui/widgets/tabs/setup_theme.cpp:134
msgid "Finnish"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:137
+#: src/gui/widgets/tabs/setup_theme.cpp:136
msgid "French"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:139
+#: src/gui/widgets/tabs/setup_theme.cpp:138
msgid "German"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:141
+#: src/gui/widgets/tabs/setup_theme.cpp:140
msgid "Indonesian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:143
+#: src/gui/widgets/tabs/setup_theme.cpp:142
msgid "Italian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:145
+#: src/gui/widgets/tabs/setup_theme.cpp:144
msgid "Polish"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:147
+#: src/gui/widgets/tabs/setup_theme.cpp:146
msgid "Japanese"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:148
msgid "Dutch (Belgium/Flemish)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:150
msgid "Portuguese"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:152
msgid "Portuguese (Brazilian)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:154
msgid "Russian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:156
msgid "Spanish (Castilian)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:158
msgid "Turkish"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:211
+#: src/gui/widgets/tabs/setup_theme.cpp:210
msgid "Gui theme"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:218
+#: src/gui/widgets/tabs/setup_theme.cpp:217
msgid "Main Font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:223
+#: src/gui/widgets/tabs/setup_theme.cpp:222
msgid "Language"
msgstr ""
#. TRANSLATORS: theme settings label
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:227 src/gui/windows/emotewindow.cpp:45
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
msgid "Bold font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:230
msgid "Particle font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:235
+#: src/gui/widgets/tabs/setup_theme.cpp:234
msgid "Help font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:239
+#: src/gui/widgets/tabs/setup_theme.cpp:238
msgid "Secure font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:242
msgid "Npc font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:247
+#: src/gui/widgets/tabs/setup_theme.cpp:246
msgid "Japanese font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:250
msgid "Chinese font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:256
+#: src/gui/widgets/tabs/setup_theme.cpp:255
msgid "Font size"
msgstr "גודל הגופן"
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:261
+#: src/gui/widgets/tabs/setup_theme.cpp:260
msgid "Npc font size"
msgstr ""
#. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:265
+#: src/gui/widgets/tabs/setup_theme.cpp:264
msgid "i"
msgstr ""
#. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:404
+#: src/gui/widgets/tabs/setup_theme.cpp:403
msgid "Name: "
msgstr ""
-#: src/gui/widgets/tabs/setup_theme.cpp:405
+#: src/gui/widgets/tabs/setup_theme.cpp:404
msgid "Copyright:"
msgstr ""
#. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:470
+#: src/gui/widgets/tabs/setup_theme.cpp:469
msgid "Theme info"
msgstr ""
#. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:497
+#: src/gui/widgets/tabs/setup_theme.cpp:496
msgid "Theme Changed"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:497
+#: src/gui/widgets/tabs/setup_theme.cpp:496
#: src/gui/widgets/tabs/setup_video.cpp:499
#: src/gui/widgets/tabs/setup_video.cpp:508
msgid "Restart your client for the change to take effect."
@@ -4700,178 +4769,169 @@ msgid "Allow screensaver to run"
msgstr ""
#. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:67
msgid "ONL"
msgstr ""
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:68
msgid "Who is online"
msgstr ""
#. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:70
msgid "HLP"
msgstr ""
#. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:73
msgid "QE"
msgstr ""
#. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:77 src/gui/windows/questswindow.cpp:126
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
msgid "Quests"
msgstr ""
#. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:76
msgid "BC"
msgstr ""
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:77
msgid "Bot checker"
msgstr ""
#. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:82
+#: src/gui/windowmenu.cpp:79
msgid "KS"
msgstr ""
#. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:83 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
msgid "Kill stats"
msgstr ""
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:82
msgid "Smilies"
msgstr ""
#. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:87
+#: src/gui/windowmenu.cpp:84
msgid "CH"
msgstr ""
#. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:95
+#: src/gui/windowmenu.cpp:92
msgid "STA"
msgstr ""
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:93
msgid "Status"
msgstr "מצב"
#. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:95
msgid "EQU"
msgstr ""
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:58
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
msgid "Equipment"
msgstr "לבוש"
#. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:98
msgid "INV"
msgstr ""
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:130
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
#: src/inventory.cpp:257
msgid "Inventory"
msgstr "ציוד"
#. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:104
+#: src/gui/windowmenu.cpp:101
msgid "MAP"
msgstr ""
#. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:110
+#: src/gui/windowmenu.cpp:107
msgid "SKI"
msgstr ""
#. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
msgid "Skills"
msgstr "כישורים"
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:118
-msgid "SPE"
-msgstr ""
-
-#: src/gui/windowmenu.cpp:119
-msgid "Specials"
-msgstr ""
-
#. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:124
+#: src/gui/windowmenu.cpp:112
msgid "SOC"
msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:126 src/gui/windows/socialwindow.cpp:1284
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
msgid "Social"
msgstr ""
#. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:128
+#: src/gui/windowmenu.cpp:116
msgid "SH"
msgstr ""
#. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:132
+#: src/gui/windowmenu.cpp:120
msgid "SP"
msgstr ""
#. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:124
msgid "DR"
msgstr ""
#. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:128
msgid "YK"
msgstr ""
#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:130
msgid "Did you know"
msgstr ""
#. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:144
+#: src/gui/windowmenu.cpp:132
msgid "SHP"
msgstr ""
#. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:148
+#: src/gui/windowmenu.cpp:136
msgid "OU"
msgstr ""
#. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:152
+#: src/gui/windowmenu.cpp:140
msgid "DBG"
msgstr ""
#. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:149
msgid "WIN"
msgstr ""
#. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:153
msgid "SET"
msgstr ""
#. TRANSLATORS: short key name
#. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:301 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
#: src/gui/windows/outfitwindow.cpp:561
#, c-format
msgid "Key: %s"
@@ -4893,31 +4953,21 @@ msgstr "אפס"
msgid "Result"
msgstr ""
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:58
-msgid "unsorted"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:60
-msgid "by price"
-msgstr ""
-
#. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:196
+#: src/gui/windows/buydialog.cpp:162
msgid "Create items"
msgstr ""
#. TRANSLATORS: buy dialog label
#. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:254 src/gui/windows/buydialog.cpp:541
-#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:366
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
#, c-format
msgid "Price: %s / Total: %s"
msgstr "מחיר: %s / סה\"כ: %s"
#. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:263
+#: src/gui/windows/buydialog.cpp:229
msgid "Amount:"
msgstr ""
@@ -4927,8 +4977,8 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/itemamountwindow.cpp:159
-#: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
msgid "+"
msgstr ""
@@ -4939,8 +4989,8 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:271 src/gui/windows/itemamountwindow.cpp:157
-#: src/gui/windows/itemamountwindow.cpp:191 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
msgid "-"
msgstr ""
@@ -4948,9 +4998,9 @@ msgstr ""
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:274 src/gui/windows/charcreatedialog.cpp:119
-#: src/gui/windows/charselectdialog.cpp:593
-#: src/gui/windows/socialwindow.cpp:1307
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
msgid "Create"
msgstr "צור"
@@ -4959,7 +5009,7 @@ msgstr "צור"
#. TRANSLATORS: status bar label
#. TRANSLATORS: status window label
#. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:278 src/gui/windows/selldialog.cpp:112
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
#: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
#: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
msgid "Max"
@@ -5058,7 +5108,7 @@ msgstr ""
#. TRANSLATORS: login dialog label
#. TRANSLATORS: register dialog. label.
#: src/gui/windows/charcreatedialog.cpp:73
-#: src/gui/windows/editserverdialog.cpp:89 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
#: src/gui/windows/registerdialog.cpp:89
msgid "Name:"
msgstr "שם:"
@@ -5119,7 +5169,7 @@ msgstr "נקבה"
#. TRANSLATORS: char create dialog label
#: src/gui/windows/charcreatedialog.cpp:115
-#: src/gui/windows/charcreatedialog.cpp:469
+#: src/gui/windows/charcreatedialog.cpp:458
#, c-format
msgid "Please distribute %d points"
msgstr "אנא חלק %d נקודות"
@@ -5135,17 +5185,17 @@ msgid "Look:"
msgstr ""
#. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:362
+#: src/gui/windows/charcreatedialog.cpp:351
msgid "Your name needs to be at least 4 characters."
msgstr "יש להכניס לפחות 4 תוים בשם."
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:459
+#: src/gui/windows/charcreatedialog.cpp:448
msgid "Character stats OK"
msgstr "נתוני שחקן - אישור"
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:475
+#: src/gui/windows/charcreatedialog.cpp:464
#, c-format
msgid "Please remove %d points"
msgstr "אנא הסר %d נקודות"
@@ -5174,7 +5224,7 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:104
-#: src/gui/windows/charselectdialog.cpp:588
+#: src/gui/windows/charselectdialog.cpp:580
#: src/gui/windows/updaterwindow.cpp:188
msgid "Play"
msgstr "שחק"
@@ -5230,35 +5280,20 @@ msgstr ""
msgid "Enter password:"
msgstr ""
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:172
-msgid "rainbow 1"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:174
-msgid "rainbow 2"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:176
-msgid "rainbow 3"
-msgstr ""
-
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:755
+#: src/gui/windows/chatwindow.cpp:705
#, c-format
msgid "Present: %s; %d players are present."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1169
+#: src/gui/windows/chatwindow.cpp:1119
#, c-format
msgid "Whispering to %s: %s"
msgstr "לוחש אל %s: %s"
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1613
+#: src/gui/windows/chatwindow.cpp:1563
#, c-format
msgid "%s's pet"
msgstr ""
@@ -5504,51 +5539,51 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:77
-#: src/gui/windows/itemamountwindow.cpp:161 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
msgid "OK"
msgstr "אישור"
#. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:66
+#: src/gui/windows/editserverdialog.cpp:45
msgid "Edit Server"
msgstr ""
#. TRANSLATORS: edit server dialog button
#. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:75
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
msgid "Connect"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:91
+#: src/gui/windows/editserverdialog.cpp:70
msgid "Address:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:93
+#: src/gui/windows/editserverdialog.cpp:72
msgid "Port:"
msgstr "פורט:"
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:95
+#: src/gui/windows/editserverdialog.cpp:74
msgid "Server type:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:97
+#: src/gui/windows/editserverdialog.cpp:76
msgid "Description:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:99
+#: src/gui/windows/editserverdialog.cpp:78
msgid "Online list url:"
msgstr ""
#. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:220
+#: src/gui/windows/editserverdialog.cpp:188
msgid "Please at least type both the address and the port of the server."
msgstr ""
@@ -5568,47 +5603,47 @@ msgid "Did you know..."
msgstr ""
#. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:165
+#: src/gui/windows/itemamountwindow.cpp:164
msgid "All"
msgstr "הכל"
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:221
+#: src/gui/windows/itemamountwindow.cpp:220
msgid "Select amount of items to trade."
msgstr "בחר כמות חפצים לסחור."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:225
+#: src/gui/windows/itemamountwindow.cpp:224
msgid "Select amount of items to drop."
msgstr "בחר כמות חפצים להשליך."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:229
+#: src/gui/windows/itemamountwindow.cpp:228
msgid "Select amount of items to store."
msgstr "בחר כמות חפצים לאחסן."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:233
+#: src/gui/windows/itemamountwindow.cpp:232
msgid "Select amount of items to retrieve."
msgstr "בחר כמות חפצים להחזיר."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:237
+#: src/gui/windows/itemamountwindow.cpp:236
msgid "Select amount of items to split."
msgstr "בחר כמות חפצים לפצל."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:241
+#: src/gui/windows/itemamountwindow.cpp:240
msgid "Add to buy shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:245
+#: src/gui/windows/itemamountwindow.cpp:244
msgid "Add to sell shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:249
+#: src/gui/windows/itemamountwindow.cpp:248
msgid "Unknown."
msgstr ""
@@ -5860,7 +5895,7 @@ msgstr "שלח"
#. TRANSLATORS: shop window label
#. TRANSLATORS: shop window button
#. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:258
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
#: src/gui/windows/tradewindow.cpp:78
msgid "Add"
@@ -5962,53 +5997,53 @@ msgid "Do you really want to sell %s?"
msgstr ""
#. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
msgid "Choose Your Server"
msgstr ""
#. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
msgid "Load"
msgstr ""
#. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
msgid "Choose Your Server *** SAFE MODE ***"
msgstr ""
#. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
msgid "Use same ip for game sub servers"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
msgid "Waiting for server..."
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
msgid "Preparing download"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
msgid "Error retreiving server list!"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
msgid "requires a newer version"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
#, c-format
msgid "requires v%s"
msgstr ""
@@ -6089,277 +6124,277 @@ msgid "Skill %d"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:225
+#: src/gui/windows/socialwindow.cpp:227
#, c-format
msgid "Invited user %s to guild %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:240
+#: src/gui/windows/socialwindow.cpp:242
#, c-format
msgid "Guild %s quit requested."
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:254
+#: src/gui/windows/socialwindow.cpp:256
msgid "Member Invite to Guild"
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:256
+#: src/gui/windows/socialwindow.cpp:258
#, c-format
msgid "Who would you like to invite to guild %s?"
msgstr ""
#. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:266
+#: src/gui/windows/socialwindow.cpp:268
msgid "Leave Guild?"
msgstr ""
#. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:268
+#: src/gui/windows/socialwindow.cpp:270
#, c-format
msgid "Are you sure you want to leave guild %s?"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:279
+#: src/gui/windows/socialwindow.cpp:281
#, c-format
msgid "Members: %u/%u"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:301 src/gui/windows/socialwindow.cpp:373
-#: src/gui/windows/socialwindow.cpp:498
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
#, c-format
msgid "Players: %u/%u"
msgstr ""
#. TRANSLATORS: tab in social window
#. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:389 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
msgid "Party"
msgstr "חבורה"
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:429
+#: src/gui/windows/socialwindow.cpp:431
#, c-format
msgid "Invited user %s to party."
msgstr ""
#. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:444
+#: src/gui/windows/socialwindow.cpp:446
#, c-format
msgid "Party %s quit requested."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:458
+#: src/gui/windows/socialwindow.cpp:460
msgid "Member Invite to Party"
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:460
+#: src/gui/windows/socialwindow.cpp:462
#, c-format
msgid "Who would you like to invite to party %s?"
msgstr ""
#. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:470
+#: src/gui/windows/socialwindow.cpp:472
msgid "Leave Party?"
msgstr ""
#. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:472
+#: src/gui/windows/socialwindow.cpp:474
#, c-format
msgid "Are you sure you want to leave party %s?"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:698
+#: src/gui/windows/socialwindow.cpp:665
#, c-format
msgid "Visible players: %d"
msgstr ""
#. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:725
+#: src/gui/windows/socialwindow.cpp:692
msgid "Nav"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:827
+#: src/gui/windows/socialwindow.cpp:794
#, c-format
msgid "Portals: %u/%u"
msgstr ""
#. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1054
+#: src/gui/windows/socialwindow.cpp:1021
msgid "Atk"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1073
+#: src/gui/windows/socialwindow.cpp:1040
msgid "Priority mobs"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1075
+#: src/gui/windows/socialwindow.cpp:1042
msgid "Attack mobs"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1077
+#: src/gui/windows/socialwindow.cpp:1044
msgid "Ignore mobs"
msgstr ""
#. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1101
+#: src/gui/windows/socialwindow.cpp:1068
msgid "Pik"
msgstr ""
#. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1120
+#: src/gui/windows/socialwindow.cpp:1087
msgid "Pickup items"
msgstr ""
#. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1122
+#: src/gui/windows/socialwindow.cpp:1089
msgid "Ignore items"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1212
+#: src/gui/windows/socialwindow.cpp:1179
#, c-format
msgid "Friends: %u/%u"
msgstr ""
#. TRANSLATORS: party popup item
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1235 src/gui/windows/socialwindow.cpp:1727
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
msgid "Create Party"
msgstr ""
#. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1298
+#: src/gui/windows/socialwindow.cpp:1265
msgid "P"
msgstr ""
#. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1303
+#: src/gui/windows/socialwindow.cpp:1270
msgid "F"
msgstr ""
#. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1309
+#: src/gui/windows/socialwindow.cpp:1276
msgid "Invite"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1503
+#: src/gui/windows/socialwindow.cpp:1470
#, c-format
msgid "Accepted party invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1514
+#: src/gui/windows/socialwindow.cpp:1481
#, c-format
msgid "Rejected party invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1531
+#: src/gui/windows/socialwindow.cpp:1498
#, c-format
msgid "Accepted guild invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1545
+#: src/gui/windows/socialwindow.cpp:1512
#, c-format
msgid "Rejected guild invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1585
+#: src/gui/windows/socialwindow.cpp:1552
#, c-format
msgid "Creating guild called %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1606
+#: src/gui/windows/socialwindow.cpp:1573
#, c-format
msgid "Creating party called %s."
msgstr ""
#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1621
+#: src/gui/windows/socialwindow.cpp:1588
msgid "Guild Name"
msgstr ""
#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1623
+#: src/gui/windows/socialwindow.cpp:1590
msgid "Choose your guild's name."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1639
+#: src/gui/windows/socialwindow.cpp:1606
msgid "Received guild request, but one already exists."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1647
+#: src/gui/windows/socialwindow.cpp:1614
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1654
+#: src/gui/windows/socialwindow.cpp:1621
msgid "Accept Guild Invite"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1670
+#: src/gui/windows/socialwindow.cpp:1637
msgid "Received party request, but one already exists."
msgstr "התקבלה הזמנה לחבורה, אך הזמנה זהה כבר קיימת."
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1682
+#: src/gui/windows/socialwindow.cpp:1649
msgid "You have been invited you to join a party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1687
+#: src/gui/windows/socialwindow.cpp:1654
#, c-format
msgid "You have been invited to join the %s party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1696
+#: src/gui/windows/socialwindow.cpp:1663
#, c-format
msgid "%s has invited you to join their party."
msgstr "%s הזמין אותך לחבורה שלהם."
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1702
+#: src/gui/windows/socialwindow.cpp:1669
#, c-format
msgid "%s has invited you to join the %s party."
msgstr "%s הזמין אותך להצטרף לחבורת %s."
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1712
+#: src/gui/windows/socialwindow.cpp:1679
msgid "Accept Party Invite"
msgstr "אשר את הזמנת חבורה"
-#: src/gui/windows/socialwindow.cpp:1728
+#: src/gui/windows/socialwindow.cpp:1695
msgid "Cannot create party. You are already in a party"
msgstr ""
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1734
+#: src/gui/windows/socialwindow.cpp:1701
msgid "Party Name"
msgstr ""
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1736
+#: src/gui/windows/socialwindow.cpp:1703
msgid "Choose your party's name."
msgstr ""
@@ -6401,113 +6436,68 @@ msgstr ""
msgid "Correction points: %d"
msgstr ""
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "No Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Allow Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:105
-msgid "Need Target"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "General Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "Life Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "War Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Transmute Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Nature Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:121
-msgid "Astral Magic"
-msgstr ""
-
#. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:164
+#: src/gui/windows/textcommandeditor.cpp:47
msgid "Command Editor"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:52
msgid "magic"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:54
msgid "other"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:173
+#: src/gui/windows/textcommandeditor.cpp:56
msgid "Symbol:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:176
+#: src/gui/windows/textcommandeditor.cpp:59
msgid "Command:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:179
+#: src/gui/windows/textcommandeditor.cpp:62
msgid "Comment:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:183
+#: src/gui/windows/textcommandeditor.cpp:66
msgid "Target Type:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:187
+#: src/gui/windows/textcommandeditor.cpp:70
msgid "Icon:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:190
+#: src/gui/windows/textcommandeditor.cpp:73
msgid "Mana:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:193
+#: src/gui/windows/textcommandeditor.cpp:76
msgid "Magic level:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:197
+#: src/gui/windows/textcommandeditor.cpp:80
msgid "Magic School:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:200
+#: src/gui/windows/textcommandeditor.cpp:83
msgid "School level:"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/windows/textcommandeditor.cpp:88
msgid "Save"
msgstr ""
@@ -6537,7 +6527,7 @@ msgid "Trade: You"
msgstr "סחור: אתה"
#. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
#, c-format
msgid "You get %s"
msgstr ""
@@ -6553,12 +6543,12 @@ msgid "You give:"
msgstr "אתה נותן:"
#. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
msgid "You don't have enough money."
msgstr "אין לך מספיק כסף."
#. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
msgid ""
"Failed adding item. You can not overlap one kind of item on the window."
msgstr "הוספת הפריט נכשלה. לא ניתן להכניס מעל חפץ אחד לחלון."
@@ -6629,17 +6619,17 @@ msgid "Who Is Online - Update"
msgstr ""
#. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:87
+#: src/gui/windows/worldselectdialog.cpp:49
msgid "Select World"
msgstr ""
#. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:93
+#: src/gui/windows/worldselectdialog.cpp:55
msgid "Change Login"
msgstr ""
#. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:95
+#: src/gui/windows/worldselectdialog.cpp:57
msgid "Choose World"
msgstr ""
@@ -6857,7 +6847,7 @@ msgid "Failed to create character. Most likely the name is already taken."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:281
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
msgid "Wrong name."
msgstr ""
@@ -7015,58 +7005,58 @@ msgid "Experience sharing unknown."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:154
+#: src/net/ea/loginhandler.cpp:149
msgid "Account was not found. Please re-login."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/ea/loginhandler.cpp:153
msgid "Old password incorrect."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:162
+#: src/net/ea/loginhandler.cpp:157
msgid "New password too short."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:166 src/net/ea/loginhandler.cpp:293
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
msgid "Unknown error."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:239
+#: src/net/ea/loginhandler.cpp:234
msgid "Unregistered ID."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:238
msgid "Wrong password."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:248
+#: src/net/ea/loginhandler.cpp:243
msgid "Account expired."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:252
+#: src/net/ea/loginhandler.cpp:247
msgid "Rejected from server."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:256
+#: src/net/ea/loginhandler.cpp:251
msgid ""
"You have been permanently banned from the game. Please contact the GM team."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:261
+#: src/net/ea/loginhandler.cpp:256
msgid "Client too old."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:265
+#: src/net/ea/loginhandler.cpp:260
#, c-format
msgid ""
"You have been temporarily banned from the game until %s.\n"
@@ -7074,22 +7064,22 @@ msgid ""
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:273
+#: src/net/ea/loginhandler.cpp:268
msgid "Server overpopulated."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:277
+#: src/net/ea/loginhandler.cpp:272
msgid "This user name is already taken."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:285
+#: src/net/ea/loginhandler.cpp:280
msgid "Incorrect email."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:289
+#: src/net/ea/loginhandler.cpp:284
msgid "Username permanently erased."
msgstr ""
@@ -7762,7 +7752,7 @@ msgstr ""
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
#: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "ללא שם"
diff --git a/po/hr.po b/po/hr.po
index a3e383563..5ffe25bc2 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: 2014-02-23 00:42+0300\n"
-"PO-Revision-Date: 2014-02-23 08:14+0000\n"
+"POT-Creation-Date: 2014-02-28 21:21+0300\n"
+"PO-Revision-Date: 2014-03-01 08:14+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"
@@ -29,7 +29,7 @@ msgid "Accepting incoming trade requests"
msgstr "Prihvaćanje dolaznih zahtjeva za trgovanje"
#. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
msgid "Visible on map"
msgstr ""
@@ -38,68 +38,68 @@ msgstr ""
msgid "Human"
msgstr ""
-#: src/being/being.cpp:544
+#: src/being/being.cpp:496
msgid "dodge"
msgstr ""
-#: src/being/being.cpp:544
+#: src/being/being.cpp:496
msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1965 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1970 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr ""
#. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:392
+#: src/being/localplayer.cpp:376
#, c-format
msgid "You were killed by %s"
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1377
+#: src/being/localplayer.cpp:816
msgid "Tried to pick up nonexistent item."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1381
+#: src/being/localplayer.cpp:820
msgid "Item is too heavy."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1385
+#: src/being/localplayer.cpp:824
msgid "Item is too far away."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1389
+#: src/being/localplayer.cpp:828
msgid "Inventory is full."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1393
+#: src/being/localplayer.cpp:832
msgid "Stack is too big."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1397
+#: src/being/localplayer.cpp:836
msgid "Item belongs to someone else."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1401
+#: src/being/localplayer.cpp:840
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:1425
+#: src/being/localplayer.cpp:864
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -108,387 +108,387 @@ msgstr[1] ""
msgstr[2] ""
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1630 src/being/localplayer.cpp:1665
-#: src/being/localplayer.cpp:1666
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
msgid "xp"
msgstr ""
-#: src/being/localplayer.cpp:1671 src/being/localplayer.cpp:1678
-#: src/being/localplayer.cpp:1685
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
msgid "job"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1871
+#: src/being/localplayer.cpp:1285
msgid "(D) default moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1873
+#: src/being/localplayer.cpp:1287
msgid "(I) invert moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1875
+#: src/being/localplayer.cpp:1289
msgid "(c) moves with some crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1877
+#: src/being/localplayer.cpp:1291
msgid "(C) moves with crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1879
+#: src/being/localplayer.cpp:1293
msgid "(d) double normal + crazy"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1881
+#: src/being/localplayer.cpp:1295
msgid "(?) unknown move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1904
+#: src/being/localplayer.cpp:1318
#, c-format
msgid "(%u) crazy move number %u"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1910
+#: src/being/localplayer.cpp:1324
msgid "(a) custom crazy move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1915
+#: src/being/localplayer.cpp:1329
msgid "(?) crazy move"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1930
+#: src/being/localplayer.cpp:1344
msgid "(0) default moves to target"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1932
+#: src/being/localplayer.cpp:1346
msgid "(1) moves to target in distance 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1934
+#: src/being/localplayer.cpp:1348
msgid "(2) moves to target in distance 2"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1936
+#: src/being/localplayer.cpp:1350
msgid "(3) moves to target in distance 3"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1938
+#: src/being/localplayer.cpp:1352
msgid "(5) moves to target in distance 5"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1940
+#: src/being/localplayer.cpp:1354
msgid "(7) moves to target in distance 7"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1942
+#: src/being/localplayer.cpp:1356
msgid "(A) moves to target in attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1944
+#: src/being/localplayer.cpp:1358
msgid "(a) archer attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1946
+#: src/being/localplayer.cpp:1360
msgid "(B) moves to target in attack range - 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1948
+#: src/being/localplayer.cpp:1362
msgid "(?) move to target"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1968
+#: src/being/localplayer.cpp:1382
msgid "(D) default follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1970
+#: src/being/localplayer.cpp:1384
msgid "(R) relative follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1972
+#: src/being/localplayer.cpp:1386
msgid "(M) mirror follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1974
+#: src/being/localplayer.cpp:1388
msgid "(P) pet follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1976
+#: src/being/localplayer.cpp:1390
msgid "(?) unknown follow"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1996 src/being/localplayer.cpp:2004
-#: src/being/localplayer.cpp:2032
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
msgid "(?) attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1998 src/being/localplayer.cpp:2024
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
msgid "(D) default attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2000
+#: src/being/localplayer.cpp:1414
msgid "(s) switch attack without shield"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2002
+#: src/being/localplayer.cpp:1416
msgid "(S) switch attack with shield"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2026
+#: src/being/localplayer.cpp:1440
msgid "(G) go and attack"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2028
+#: src/being/localplayer.cpp:1442
msgid "(A) go, attack, pickup"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2030
+#: src/being/localplayer.cpp:1444
msgid "(d) without auto attack"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2084
+#: src/being/localplayer.cpp:1498
msgid "(S) small pick up 1x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2086
+#: src/being/localplayer.cpp:1500
msgid "(D) default pick up 2x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2088
+#: src/being/localplayer.cpp:1502
msgid "(F) forward pick up 2x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2090
+#: src/being/localplayer.cpp:1504
msgid "(3) pick up 3x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2092
+#: src/being/localplayer.cpp:1506
msgid "(g) go and pick up in distance 4"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2094
+#: src/being/localplayer.cpp:1508
msgid "(G) go and pick up in distance 8"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2096
+#: src/being/localplayer.cpp:1510
msgid "(A) go and pick up in max distance"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2098
+#: src/being/localplayer.cpp:1512
msgid "(?) pick up"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2112
+#: src/being/localplayer.cpp:1526
msgid "(N) normal map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2114
+#: src/being/localplayer.cpp:1528
msgid "(D) debug map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2116
+#: src/being/localplayer.cpp:1530
msgid "(u) ultra map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2118
+#: src/being/localplayer.cpp:1532
msgid "(U) ultra map view 2"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2120
+#: src/being/localplayer.cpp:1534
msgid "(e) empty map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2122
+#: src/being/localplayer.cpp:1536
msgid "(b) black & white map view"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2142
+#: src/being/localplayer.cpp:1556
msgid "(f) use #flar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2144
+#: src/being/localplayer.cpp:1558
msgid "(c) use #chiza for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2146
+#: src/being/localplayer.cpp:1560
msgid "(I) use #ingrav for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2148
+#: src/being/localplayer.cpp:1562
msgid "(F) use #frillyar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2150
+#: src/being/localplayer.cpp:1564
msgid "(U) use #upmarmu for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2152
+#: src/being/localplayer.cpp:1566
msgid "(?) magic attack"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2172
+#: src/being/localplayer.cpp:1586
msgid "(a) attack all players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2174
+#: src/being/localplayer.cpp:1588
msgid "(f) attack all except friends"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2176
+#: src/being/localplayer.cpp:1590
msgid "(b) attack bad relations"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2178
+#: src/being/localplayer.cpp:1592
msgid "(d) don't attack players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2180
+#: src/being/localplayer.cpp:1594
msgid "(?) pvp attack"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2200
+#: src/being/localplayer.cpp:1614
msgid "(D) default imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2202
+#: src/being/localplayer.cpp:1616
msgid "(O) outfits imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2204
+#: src/being/localplayer.cpp:1618
msgid "(?) imitation"
msgstr ""
#. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2233
+#: src/being/localplayer.cpp:1647
msgid "Away"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2256
+#: src/being/localplayer.cpp:1670
msgid "(O) on keyboard"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2258
+#: src/being/localplayer.cpp:1672
msgid "(A) away"
msgstr ""
#. TRANSLATORS: away type in status bar
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2260 src/being/localplayer.cpp:2278
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
msgid "(?) away"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2274
+#: src/being/localplayer.cpp:1688
msgid "(G) game camera mode"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2276
+#: src/being/localplayer.cpp:1690
msgid "(F) free camera mode"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2303
+#: src/being/localplayer.cpp:1717
msgid "Game modifiers are enabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2305
+#: src/being/localplayer.cpp:1719
msgid "Game modifiers are disabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2307
+#: src/being/localplayer.cpp:1721
msgid "Game modifiers are unknown"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3887
+#: src/being/localplayer.cpp:3287
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3893 src/being/localplayer.cpp:3918
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3903
+#: src/being/localplayer.cpp:3303
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3909 src/being/localplayer.cpp:3923
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4266
+#: src/being/localplayer.cpp:3666
#, c-format
msgid "You see %s"
msgstr ""
@@ -526,32 +526,32 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1139 src/gui/windowmenu.cpp:167
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
#: src/gui/windows/setupwindow.cpp:61
msgid "Setup"
msgstr "Podešavanje"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1143 src/gui/widgets/tabs/setup_perfomance.cpp:51
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1146 src/gui/widgets/tabs/setup_video.cpp:225
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:225
msgid "Video"
msgstr "Slika"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1149 src/gui/widgets/tabs/setup_theme.cpp:269
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1152 src/gui/windowmenu.cpp:74
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr "Pomoć"
@@ -564,41 +564,41 @@ msgstr "Pomoć"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1156 src/gui/popups/popupmenu.cpp:619
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
#: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:69
-#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:138
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
#: src/gui/windows/shopwindow.cpp:78
msgid "Close"
msgstr "Zatvori"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1324
msgid "Logging in"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1367
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1492
+#: src/client.cpp:1489
msgid "Requesting characters"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1532
+#: src/client.cpp:1529
msgid "Connecting to the game server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1545
+#: src/client.cpp:1541
msgid "Changing game servers"
msgstr ""
@@ -613,12 +613,12 @@ msgstr ""
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1606 src/client.cpp:1617 src/client.cpp:1801
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:349
#: src/gui/windows/charselectdialog.cpp:299
-#: src/gui/windows/editserverdialog.cpp:218
+#: src/gui/windows/editserverdialog.cpp:186
#: src/gui/windows/registerdialog.cpp:260
#: src/gui/windows/unregisterdialog.cpp:146
#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
@@ -626,65 +626,65 @@ msgid "Error"
msgstr "Greška"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1629
+#: src/client.cpp:1625
msgid "Requesting registration details"
msgstr ""
#. TRANSLATORS: password change message header
-#: src/client.cpp:1670
+#: src/client.cpp:1666
msgid "Password Change"
msgstr ""
#. TRANSLATORS: password change message text
-#: src/client.cpp:1672
+#: src/client.cpp:1668
msgid "Password changed successfully!"
msgstr ""
#. TRANSLATORS: email change message header
-#: src/client.cpp:1694
+#: src/client.cpp:1690
msgid "Email Change"
msgstr ""
#. TRANSLATORS: email change message text
-#: src/client.cpp:1696
+#: src/client.cpp:1692
msgid "Email changed successfully!"
msgstr ""
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1719
+#: src/client.cpp:1715
msgid "Unregister Successful"
msgstr ""
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1721
+#: src/client.cpp:1717
msgid "Farewell, come back any time..."
msgstr ""
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1998 src/client.cpp:2013 src/client.cpp:2058
-#: src/client.cpp:2074 src/client.cpp:2525 src/client.cpp:2533
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2230
+#: src/client.cpp:2232
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2271 src/client.cpp:2278
+#: src/client.cpp:2273 src/client.cpp:2280
msgid "Error creating updates directory!"
msgstr ""
-#: src/client.cpp:2300 src/client.cpp:2317
+#: src/client.cpp:2302 src/client.cpp:2319
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: error message question
-#: src/client.cpp:3001
+#: src/client.cpp:3003
msgid "Do you want to open support page?"
msgstr ""
@@ -930,99 +930,154 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:277 src/gui/widgets/tabs/chattab.cpp:464
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
msgid "General"
msgstr "Općenito"
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:293 src/gui/widgets/tabs/chattab.cpp:466
-#: src/gui/windowmenu.cpp:154 src/gui/windows/debugwindow.cpp:53
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:575
+#: src/game.cpp:563
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:585
+#: src/game.cpp:573
msgid "Saving screenshot failed!"
msgstr "Spremanje screenshot-a nije uspjelo!"
#. TRANSLATORS: error message text
-#: src/game.cpp:656
+#: src/game.cpp:644
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:659
+#: src/game.cpp:647
msgid "Network Error"
msgstr "Mreža Greška"
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
-msgid "black"
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
msgstr ""
+#. TRANSLATORS: chat color
#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
+msgid "black"
+msgstr ""
+
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
msgid "red"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
msgid "green"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
msgid "blue"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
msgid "gold"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
msgid "yellow"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
msgid "pink"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
msgid "purple"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
msgid "grey"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
msgid "brown"
msgstr ""
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr ""
+
#. TRANSLATORS: relation type
#: src/gui/models/playerrelationlistmodel.h:33
msgid "Neutral"
@@ -1058,46 +1113,61 @@ msgstr ""
msgid "Enemy"
msgstr ""
-#. TRANSLATORS: inventory sort mode
-#. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#: src/gui/models/sortlistmodelinv.h:34
-#: src/gui/widgets/tabs/setup_other.cpp:72
-#: src/gui/widgets/tabs/setup_visual.cpp:78 src/gui/windows/chatwindow.cpp:150
-msgid "default"
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:36 src/gui/windows/buydialog.cpp:62
-msgid "by name"
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
msgstr ""
+#. TRANSLATORS: buy dialog sort type.
#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
+msgid "by name"
+msgstr ""
+
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:38 src/gui/windows/buydialog.cpp:64
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
msgid "by id"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:40 src/gui/windows/buydialog.cpp:66
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
msgid "by weight"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:42 src/gui/windows/buydialog.cpp:68
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
msgid "by amount"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:44 src/gui/windows/buydialog.cpp:70
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
msgid "by type"
msgstr ""
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr ""
+
#. TRANSLATORS: update type
#. TRANSLATORS: onscreen button size
#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
@@ -1244,8 +1314,8 @@ msgstr "Govori"
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
-#: src/gui/windows/buydialog.cpp:208 src/gui/windows/buydialog.cpp:220
-#: src/gui/windows/buydialog.cpp:274 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
msgid "Buy"
msgstr "Kupi"
@@ -1342,12 +1412,12 @@ msgstr ""
#: src/gui/windows/changepassworddialog.cpp:57
#: src/gui/windows/charcreatedialog.cpp:121
#: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:79
-#: src/gui/windows/itemamountwindow.cpp:163
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
-#: src/gui/windows/socialwindow.cpp:1238
-#: src/gui/windows/textcommandeditor.cpp:203 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:54
#: src/gui/windows/updaterwindow.cpp:186
msgid "Cancel"
@@ -1419,7 +1489,7 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:150 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
msgstr ""
@@ -1432,7 +1502,7 @@ msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:134
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
msgid "Spells"
msgstr ""
@@ -1488,7 +1558,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
#. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1311
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
msgid "Leave"
msgstr ""
@@ -1569,8 +1639,8 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
-#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:223
-#: src/gui/windows/inventorywindow.cpp:745 src/gui/windows/setupwindow.cpp:96
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
msgid "Store"
msgstr "Pohrani"
@@ -1601,7 +1671,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
msgid "Retrieve"
msgstr "Preuzmi"
@@ -1634,8 +1704,8 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
-#: src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:656 src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr "Upotrijebi"
@@ -1669,8 +1739,8 @@ msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: language
#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/widgets/tabs/setup_theme.cpp:127
-#: src/gui/windows/socialwindow.cpp:1003
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
msgid "(default)"
msgstr ""
@@ -1826,8 +1896,8 @@ msgstr ""
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:645
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
msgid "Unequip"
msgstr "Skini opremu"
@@ -1835,16 +1905,16 @@ msgstr "Skini opremu"
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:172
-#: src/gui/windows/inventorywindow.cpp:650 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr "Opremi"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:189
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
msgid "Drop..."
msgstr ""
@@ -1858,15 +1928,15 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:138
-#: src/gui/windows/inventorywindow.cpp:758
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
msgid "Drop"
msgstr "Ispusti"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
msgid "Split"
msgstr "Razdvoji"
@@ -2022,10 +2092,10 @@ msgstr "Odaberite OK"
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:276
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/windows/serverdialog.cpp:198
msgid "Quit"
msgstr "Izlaz"
@@ -2587,7 +2657,7 @@ msgstr ""
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: register dialog. button.
#: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:146
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:330
#: src/gui/widgets/tabs/setup_visual.cpp:189
@@ -2614,9 +2684,8 @@ msgstr ""
#. TRANSLATORS: command editor button
#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
#: src/gui/windows/charselectdialog.cpp:108
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:94
-#: src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/textcommandeditor.cpp:207
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
msgid "Delete"
msgstr "Obriši"
@@ -2652,7 +2721,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:130
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
msgid "Shortcuts"
msgstr ""
@@ -2660,7 +2729,7 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:151
msgid "Windows"
msgstr ""
@@ -2676,7 +2745,7 @@ msgstr ""
#. TRANSLATORS: settings tab name
#. TRANSLATORS: chat window name
#: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:88 src/gui/windows/chatwindow.cpp:203
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
msgid "Chat"
msgstr "Chat"
@@ -2899,7 +2968,7 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:137
-#: src/gui/windows/inventorywindow.cpp:569
+#: src/gui/windows/inventorywindow.cpp:568
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
#, c-format
@@ -2919,7 +2988,7 @@ msgstr ""
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/windows/serverdialog.cpp:204
msgid "Edit"
msgstr ""
@@ -2972,7 +3041,7 @@ msgstr ""
#. TRANSLATORS: tab in social window
#. TRANSLATORS: guild chat tab name
#: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:184 src/gui/windows/socialwindow.cpp:320
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
#: src/net/ea/gui/guildtab.cpp:44
msgid "Guild"
msgstr "Ceh"
@@ -2983,142 +3052,142 @@ msgid "Lang"
msgstr ""
#. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:49
+#: src/gui/widgets/tabs/setup_audio.cpp:48
msgid "Audio"
msgstr "Zvuk"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:57
+#: src/gui/widgets/tabs/setup_audio.cpp:56
msgid "Basic settings"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:60
+#: src/gui/widgets/tabs/setup_audio.cpp:59
msgid "Enable Audio"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:63
+#: src/gui/widgets/tabs/setup_audio.cpp:62
msgid "Enable music"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:67
+#: src/gui/widgets/tabs/setup_audio.cpp:66
msgid "Enable game sfx"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:71
+#: src/gui/widgets/tabs/setup_audio.cpp:70
msgid "Enable gui sfx"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:74
msgid "Sfx volume"
msgstr "Glasnoća zvučnih efekata"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:78
msgid "Music volume"
msgstr "Glasnoća glazbe"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:82
msgid "Enable music fade out"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:86
msgid "Audio frequency"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:90
msgid "mono"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:93
+#: src/gui/widgets/tabs/setup_audio.cpp:92
msgid "stereo"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:94
msgid "surround"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:97
+#: src/gui/widgets/tabs/setup_audio.cpp:96
msgid "surround+center+lfe"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:98
msgid "Audio channels"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:104
+#: src/gui/widgets/tabs/setup_audio.cpp:103
msgid "Sound effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:106
msgid "Information dialog sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:110
msgid "Request dialog sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:115
+#: src/gui/widgets/tabs/setup_audio.cpp:114
msgid "Whisper message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:118
msgid "Guild / Party message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:122
msgid "Highlight message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:126
msgid "Global message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:130
msgid "Error message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:134
msgid "Trade request sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:138
msgid "Show window sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:142
msgid "Hide window sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:150
msgid "Enable mumble voice chat"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:156
+#: src/gui/widgets/tabs/setup_audio.cpp:155
msgid "Download music"
msgstr ""
@@ -3414,7 +3483,7 @@ msgstr ""
#. TRANSLATORS: unknown key name
#. TRANSLATORS: quests window quest name
#: src/gui/widgets/tabs/setup_input.cpp:364
-#: src/gui/windows/questswindow.cpp:263
+#: src/gui/windows/questswindow.cpp:249
msgid "unknown"
msgstr ""
@@ -3573,7 +3642,7 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: debug window tab
#. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:105
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
#: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
#: src/gui/windows/minimap.cpp:114
msgid "Map"
@@ -3741,9 +3810,9 @@ msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: shop window name
#. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:146
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
#: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windows/inventorywindow.cpp:194
msgid "Shop"
msgstr "Trgovina"
@@ -4125,252 +4194,252 @@ msgid "When ignoring:"
msgstr "Kad ignorira:"
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:64
+#: src/gui/widgets/tabs/setup_theme.cpp:63
msgid "Very small (8)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:66
+#: src/gui/widgets/tabs/setup_theme.cpp:65
msgid "Very small (9)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:68
+#: src/gui/widgets/tabs/setup_theme.cpp:67
msgid "Tiny (10)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:70
+#: src/gui/widgets/tabs/setup_theme.cpp:69
msgid "Small (11)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:72
+#: src/gui/widgets/tabs/setup_theme.cpp:71
msgid "Medium (12)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:74
+#: src/gui/widgets/tabs/setup_theme.cpp:73
msgid "Normal (13)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:76
+#: src/gui/widgets/tabs/setup_theme.cpp:75
msgid "Large (14)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:78
+#: src/gui/widgets/tabs/setup_theme.cpp:77
msgid "Large (15)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:80
+#: src/gui/widgets/tabs/setup_theme.cpp:79
msgid "Large (16)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:82
+#: src/gui/widgets/tabs/setup_theme.cpp:81
msgid "Big (17)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:83
msgid "Big (18)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:85
msgid "Big (19)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:87
msgid "Very big (20)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:89
msgid "Very big (21)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:91
msgid "Very big (22)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:93
msgid "Huge (23)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:129
+#: src/gui/widgets/tabs/setup_theme.cpp:128
msgid "Chinese (China)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:131
+#: src/gui/widgets/tabs/setup_theme.cpp:130
msgid "Czech"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:133
+#: src/gui/widgets/tabs/setup_theme.cpp:132
msgid "English"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:135
+#: src/gui/widgets/tabs/setup_theme.cpp:134
msgid "Finnish"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:137
+#: src/gui/widgets/tabs/setup_theme.cpp:136
msgid "French"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:139
+#: src/gui/widgets/tabs/setup_theme.cpp:138
msgid "German"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:141
+#: src/gui/widgets/tabs/setup_theme.cpp:140
msgid "Indonesian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:143
+#: src/gui/widgets/tabs/setup_theme.cpp:142
msgid "Italian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:145
+#: src/gui/widgets/tabs/setup_theme.cpp:144
msgid "Polish"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:147
+#: src/gui/widgets/tabs/setup_theme.cpp:146
msgid "Japanese"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:148
msgid "Dutch (Belgium/Flemish)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:150
msgid "Portuguese"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:152
msgid "Portuguese (Brazilian)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:154
msgid "Russian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:156
msgid "Spanish (Castilian)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:158
msgid "Turkish"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:211
+#: src/gui/widgets/tabs/setup_theme.cpp:210
msgid "Gui theme"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:218
+#: src/gui/widgets/tabs/setup_theme.cpp:217
msgid "Main Font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:223
+#: src/gui/widgets/tabs/setup_theme.cpp:222
msgid "Language"
msgstr ""
#. TRANSLATORS: theme settings label
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:227 src/gui/windows/emotewindow.cpp:45
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
msgid "Bold font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:230
msgid "Particle font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:235
+#: src/gui/widgets/tabs/setup_theme.cpp:234
msgid "Help font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:239
+#: src/gui/widgets/tabs/setup_theme.cpp:238
msgid "Secure font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:242
msgid "Npc font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:247
+#: src/gui/widgets/tabs/setup_theme.cpp:246
msgid "Japanese font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:250
msgid "Chinese font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:256
+#: src/gui/widgets/tabs/setup_theme.cpp:255
msgid "Font size"
msgstr "Veličina fonta"
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:261
+#: src/gui/widgets/tabs/setup_theme.cpp:260
msgid "Npc font size"
msgstr ""
#. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:265
+#: src/gui/widgets/tabs/setup_theme.cpp:264
msgid "i"
msgstr ""
#. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:404
+#: src/gui/widgets/tabs/setup_theme.cpp:403
msgid "Name: "
msgstr ""
-#: src/gui/widgets/tabs/setup_theme.cpp:405
+#: src/gui/widgets/tabs/setup_theme.cpp:404
msgid "Copyright:"
msgstr ""
#. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:470
+#: src/gui/widgets/tabs/setup_theme.cpp:469
msgid "Theme info"
msgstr ""
#. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:497
+#: src/gui/widgets/tabs/setup_theme.cpp:496
msgid "Theme Changed"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:497
+#: src/gui/widgets/tabs/setup_theme.cpp:496
#: src/gui/widgets/tabs/setup_video.cpp:499
#: src/gui/widgets/tabs/setup_video.cpp:508
msgid "Restart your client for the change to take effect."
@@ -4701,178 +4770,169 @@ msgid "Allow screensaver to run"
msgstr ""
#. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:67
msgid "ONL"
msgstr ""
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:68
msgid "Who is online"
msgstr ""
#. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:70
msgid "HLP"
msgstr ""
#. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:73
msgid "QE"
msgstr ""
#. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:77 src/gui/windows/questswindow.cpp:126
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
msgid "Quests"
msgstr ""
#. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:76
msgid "BC"
msgstr ""
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:77
msgid "Bot checker"
msgstr ""
#. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:82
+#: src/gui/windowmenu.cpp:79
msgid "KS"
msgstr ""
#. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:83 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
msgid "Kill stats"
msgstr ""
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:82
msgid "Smilies"
msgstr ""
#. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:87
+#: src/gui/windowmenu.cpp:84
msgid "CH"
msgstr ""
#. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:95
+#: src/gui/windowmenu.cpp:92
msgid "STA"
msgstr ""
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:93
msgid "Status"
msgstr "Stanje"
#. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:95
msgid "EQU"
msgstr ""
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:58
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
msgid "Equipment"
msgstr "Oprema"
#. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:98
msgid "INV"
msgstr ""
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:130
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
#: src/inventory.cpp:257
msgid "Inventory"
msgstr "Zalihe"
#. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:104
+#: src/gui/windowmenu.cpp:101
msgid "MAP"
msgstr ""
#. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:110
+#: src/gui/windowmenu.cpp:107
msgid "SKI"
msgstr ""
#. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
msgid "Skills"
msgstr "Vještine"
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:118
-msgid "SPE"
-msgstr ""
-
-#: src/gui/windowmenu.cpp:119
-msgid "Specials"
-msgstr ""
-
#. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:124
+#: src/gui/windowmenu.cpp:112
msgid "SOC"
msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:126 src/gui/windows/socialwindow.cpp:1284
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
msgid "Social"
msgstr ""
#. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:128
+#: src/gui/windowmenu.cpp:116
msgid "SH"
msgstr ""
#. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:132
+#: src/gui/windowmenu.cpp:120
msgid "SP"
msgstr ""
#. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:124
msgid "DR"
msgstr ""
#. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:128
msgid "YK"
msgstr ""
#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:130
msgid "Did you know"
msgstr ""
#. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:144
+#: src/gui/windowmenu.cpp:132
msgid "SHP"
msgstr ""
#. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:148
+#: src/gui/windowmenu.cpp:136
msgid "OU"
msgstr ""
#. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:152
+#: src/gui/windowmenu.cpp:140
msgid "DBG"
msgstr ""
#. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:149
msgid "WIN"
msgstr ""
#. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:153
msgid "SET"
msgstr ""
#. TRANSLATORS: short key name
#. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:301 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
#: src/gui/windows/outfitwindow.cpp:561
#, c-format
msgid "Key: %s"
@@ -4894,31 +4954,21 @@ msgstr "Poništi"
msgid "Result"
msgstr ""
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:58
-msgid "unsorted"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:60
-msgid "by price"
-msgstr ""
-
#. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:196
+#: src/gui/windows/buydialog.cpp:162
msgid "Create items"
msgstr ""
#. TRANSLATORS: buy dialog label
#. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:254 src/gui/windows/buydialog.cpp:541
-#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:366
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Cijena: %s / Ukupno: %s"
#. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:263
+#: src/gui/windows/buydialog.cpp:229
msgid "Amount:"
msgstr ""
@@ -4928,8 +4978,8 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/itemamountwindow.cpp:159
-#: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
msgid "+"
msgstr ""
@@ -4940,8 +4990,8 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:271 src/gui/windows/itemamountwindow.cpp:157
-#: src/gui/windows/itemamountwindow.cpp:191 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
msgid "-"
msgstr ""
@@ -4949,9 +4999,9 @@ msgstr ""
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:274 src/gui/windows/charcreatedialog.cpp:119
-#: src/gui/windows/charselectdialog.cpp:593
-#: src/gui/windows/socialwindow.cpp:1307
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
msgid "Create"
msgstr "Stvori"
@@ -4960,7 +5010,7 @@ msgstr "Stvori"
#. TRANSLATORS: status bar label
#. TRANSLATORS: status window label
#. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:278 src/gui/windows/selldialog.cpp:112
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
#: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
#: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
msgid "Max"
@@ -5059,7 +5109,7 @@ msgstr ""
#. TRANSLATORS: login dialog label
#. TRANSLATORS: register dialog. label.
#: src/gui/windows/charcreatedialog.cpp:73
-#: src/gui/windows/editserverdialog.cpp:89 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
#: src/gui/windows/registerdialog.cpp:89
msgid "Name:"
msgstr "Ime:"
@@ -5120,7 +5170,7 @@ msgstr "Žensko"
#. TRANSLATORS: char create dialog label
#: src/gui/windows/charcreatedialog.cpp:115
-#: src/gui/windows/charcreatedialog.cpp:469
+#: src/gui/windows/charcreatedialog.cpp:458
#, c-format
msgid "Please distribute %d points"
msgstr "Molimo, rasporedi %d bodova"
@@ -5136,17 +5186,17 @@ msgid "Look:"
msgstr ""
#. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:362
+#: src/gui/windows/charcreatedialog.cpp:351
msgid "Your name needs to be at least 4 characters."
msgstr "Ime mora imati barem 4 znaka."
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:459
+#: src/gui/windows/charcreatedialog.cpp:448
msgid "Character stats OK"
msgstr "Podaci lika su u redu"
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:475
+#: src/gui/windows/charcreatedialog.cpp:464
#, c-format
msgid "Please remove %d points"
msgstr "Molimo, oduzmi %d bodova"
@@ -5175,7 +5225,7 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:104
-#: src/gui/windows/charselectdialog.cpp:588
+#: src/gui/windows/charselectdialog.cpp:580
#: src/gui/windows/updaterwindow.cpp:188
msgid "Play"
msgstr "Igraj"
@@ -5231,35 +5281,20 @@ msgstr ""
msgid "Enter password:"
msgstr ""
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:172
-msgid "rainbow 1"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:174
-msgid "rainbow 2"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:176
-msgid "rainbow 3"
-msgstr ""
-
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:755
+#: src/gui/windows/chatwindow.cpp:705
#, c-format
msgid "Present: %s; %d players are present."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1169
+#: src/gui/windows/chatwindow.cpp:1119
#, c-format
msgid "Whispering to %s: %s"
msgstr "Šaptaj prema %s: %s"
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1613
+#: src/gui/windows/chatwindow.cpp:1563
#, c-format
msgid "%s's pet"
msgstr ""
@@ -5505,51 +5540,51 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:77
-#: src/gui/windows/itemamountwindow.cpp:161 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
msgid "OK"
msgstr "U redu"
#. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:66
+#: src/gui/windows/editserverdialog.cpp:45
msgid "Edit Server"
msgstr ""
#. TRANSLATORS: edit server dialog button
#. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:75
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
msgid "Connect"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:91
+#: src/gui/windows/editserverdialog.cpp:70
msgid "Address:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:93
+#: src/gui/windows/editserverdialog.cpp:72
msgid "Port:"
msgstr "Port:"
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:95
+#: src/gui/windows/editserverdialog.cpp:74
msgid "Server type:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:97
+#: src/gui/windows/editserverdialog.cpp:76
msgid "Description:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:99
+#: src/gui/windows/editserverdialog.cpp:78
msgid "Online list url:"
msgstr ""
#. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:220
+#: src/gui/windows/editserverdialog.cpp:188
msgid "Please at least type both the address and the port of the server."
msgstr ""
@@ -5569,47 +5604,47 @@ msgid "Did you know..."
msgstr ""
#. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:165
+#: src/gui/windows/itemamountwindow.cpp:164
msgid "All"
msgstr "Sve"
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:221
+#: src/gui/windows/itemamountwindow.cpp:220
msgid "Select amount of items to trade."
msgstr "Odaberi količinu predmeta za razmjenu."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:225
+#: src/gui/windows/itemamountwindow.cpp:224
msgid "Select amount of items to drop."
msgstr "Odaberi količinu predmeta za ispuštanje."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:229
+#: src/gui/windows/itemamountwindow.cpp:228
msgid "Select amount of items to store."
msgstr "Odaberite količinu predmeta za spremanje."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:233
+#: src/gui/windows/itemamountwindow.cpp:232
msgid "Select amount of items to retrieve."
msgstr "Odaberite iznos predmeta za preuzimanje."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:237
+#: src/gui/windows/itemamountwindow.cpp:236
msgid "Select amount of items to split."
msgstr "Odaberi količinu predmeta za razdvajanje."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:241
+#: src/gui/windows/itemamountwindow.cpp:240
msgid "Add to buy shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:245
+#: src/gui/windows/itemamountwindow.cpp:244
msgid "Add to sell shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:249
+#: src/gui/windows/itemamountwindow.cpp:248
msgid "Unknown."
msgstr ""
@@ -5863,7 +5898,7 @@ msgstr "Dostavi"
#. TRANSLATORS: shop window label
#. TRANSLATORS: shop window button
#. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:258
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
#: src/gui/windows/tradewindow.cpp:78
msgid "Add"
@@ -5965,53 +6000,53 @@ msgid "Do you really want to sell %s?"
msgstr ""
#. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
msgid "Choose Your Server"
msgstr ""
#. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
msgid "Load"
msgstr ""
#. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
msgid "Choose Your Server *** SAFE MODE ***"
msgstr ""
#. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
msgid "Use same ip for game sub servers"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
msgid "Waiting for server..."
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
msgid "Preparing download"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
msgid "Error retreiving server list!"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
msgid "requires a newer version"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
#, c-format
msgid "requires v%s"
msgstr ""
@@ -6092,277 +6127,277 @@ msgid "Skill %d"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:225
+#: src/gui/windows/socialwindow.cpp:227
#, c-format
msgid "Invited user %s to guild %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:240
+#: src/gui/windows/socialwindow.cpp:242
#, c-format
msgid "Guild %s quit requested."
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:254
+#: src/gui/windows/socialwindow.cpp:256
msgid "Member Invite to Guild"
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:256
+#: src/gui/windows/socialwindow.cpp:258
#, c-format
msgid "Who would you like to invite to guild %s?"
msgstr ""
#. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:266
+#: src/gui/windows/socialwindow.cpp:268
msgid "Leave Guild?"
msgstr ""
#. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:268
+#: src/gui/windows/socialwindow.cpp:270
#, c-format
msgid "Are you sure you want to leave guild %s?"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:279
+#: src/gui/windows/socialwindow.cpp:281
#, c-format
msgid "Members: %u/%u"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:301 src/gui/windows/socialwindow.cpp:373
-#: src/gui/windows/socialwindow.cpp:498
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
#, c-format
msgid "Players: %u/%u"
msgstr ""
#. TRANSLATORS: tab in social window
#. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:389 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
msgid "Party"
msgstr "Partija"
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:429
+#: src/gui/windows/socialwindow.cpp:431
#, c-format
msgid "Invited user %s to party."
msgstr ""
#. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:444
+#: src/gui/windows/socialwindow.cpp:446
#, c-format
msgid "Party %s quit requested."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:458
+#: src/gui/windows/socialwindow.cpp:460
msgid "Member Invite to Party"
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:460
+#: src/gui/windows/socialwindow.cpp:462
#, c-format
msgid "Who would you like to invite to party %s?"
msgstr ""
#. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:470
+#: src/gui/windows/socialwindow.cpp:472
msgid "Leave Party?"
msgstr ""
#. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:472
+#: src/gui/windows/socialwindow.cpp:474
#, c-format
msgid "Are you sure you want to leave party %s?"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:698
+#: src/gui/windows/socialwindow.cpp:665
#, c-format
msgid "Visible players: %d"
msgstr ""
#. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:725
+#: src/gui/windows/socialwindow.cpp:692
msgid "Nav"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:827
+#: src/gui/windows/socialwindow.cpp:794
#, c-format
msgid "Portals: %u/%u"
msgstr ""
#. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1054
+#: src/gui/windows/socialwindow.cpp:1021
msgid "Atk"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1073
+#: src/gui/windows/socialwindow.cpp:1040
msgid "Priority mobs"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1075
+#: src/gui/windows/socialwindow.cpp:1042
msgid "Attack mobs"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1077
+#: src/gui/windows/socialwindow.cpp:1044
msgid "Ignore mobs"
msgstr ""
#. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1101
+#: src/gui/windows/socialwindow.cpp:1068
msgid "Pik"
msgstr ""
#. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1120
+#: src/gui/windows/socialwindow.cpp:1087
msgid "Pickup items"
msgstr ""
#. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1122
+#: src/gui/windows/socialwindow.cpp:1089
msgid "Ignore items"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1212
+#: src/gui/windows/socialwindow.cpp:1179
#, c-format
msgid "Friends: %u/%u"
msgstr ""
#. TRANSLATORS: party popup item
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1235 src/gui/windows/socialwindow.cpp:1727
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
msgid "Create Party"
msgstr ""
#. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1298
+#: src/gui/windows/socialwindow.cpp:1265
msgid "P"
msgstr ""
#. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1303
+#: src/gui/windows/socialwindow.cpp:1270
msgid "F"
msgstr ""
#. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1309
+#: src/gui/windows/socialwindow.cpp:1276
msgid "Invite"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1503
+#: src/gui/windows/socialwindow.cpp:1470
#, c-format
msgid "Accepted party invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1514
+#: src/gui/windows/socialwindow.cpp:1481
#, c-format
msgid "Rejected party invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1531
+#: src/gui/windows/socialwindow.cpp:1498
#, c-format
msgid "Accepted guild invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1545
+#: src/gui/windows/socialwindow.cpp:1512
#, c-format
msgid "Rejected guild invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1585
+#: src/gui/windows/socialwindow.cpp:1552
#, c-format
msgid "Creating guild called %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1606
+#: src/gui/windows/socialwindow.cpp:1573
#, c-format
msgid "Creating party called %s."
msgstr ""
#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1621
+#: src/gui/windows/socialwindow.cpp:1588
msgid "Guild Name"
msgstr ""
#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1623
+#: src/gui/windows/socialwindow.cpp:1590
msgid "Choose your guild's name."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1639
+#: src/gui/windows/socialwindow.cpp:1606
msgid "Received guild request, but one already exists."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1647
+#: src/gui/windows/socialwindow.cpp:1614
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1654
+#: src/gui/windows/socialwindow.cpp:1621
msgid "Accept Guild Invite"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1670
+#: src/gui/windows/socialwindow.cpp:1637
msgid "Received party request, but one already exists."
msgstr "Primljen zahtjev za partiju, ali ona već postoji."
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1682
+#: src/gui/windows/socialwindow.cpp:1649
msgid "You have been invited you to join a party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1687
+#: src/gui/windows/socialwindow.cpp:1654
#, c-format
msgid "You have been invited to join the %s party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1696
+#: src/gui/windows/socialwindow.cpp:1663
#, 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/windows/socialwindow.cpp:1702
+#: src/gui/windows/socialwindow.cpp:1669
#, 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/windows/socialwindow.cpp:1712
+#: src/gui/windows/socialwindow.cpp:1679
msgid "Accept Party Invite"
msgstr "Prihvati Pozivnicu za Partiju"
-#: src/gui/windows/socialwindow.cpp:1728
+#: src/gui/windows/socialwindow.cpp:1695
msgid "Cannot create party. You are already in a party"
msgstr ""
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1734
+#: src/gui/windows/socialwindow.cpp:1701
msgid "Party Name"
msgstr ""
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1736
+#: src/gui/windows/socialwindow.cpp:1703
msgid "Choose your party's name."
msgstr ""
@@ -6404,113 +6439,68 @@ msgstr ""
msgid "Correction points: %d"
msgstr ""
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "No Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Allow Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:105
-msgid "Need Target"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "General Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "Life Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "War Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Transmute Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Nature Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:121
-msgid "Astral Magic"
-msgstr ""
-
#. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:164
+#: src/gui/windows/textcommandeditor.cpp:47
msgid "Command Editor"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:52
msgid "magic"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:54
msgid "other"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:173
+#: src/gui/windows/textcommandeditor.cpp:56
msgid "Symbol:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:176
+#: src/gui/windows/textcommandeditor.cpp:59
msgid "Command:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:179
+#: src/gui/windows/textcommandeditor.cpp:62
msgid "Comment:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:183
+#: src/gui/windows/textcommandeditor.cpp:66
msgid "Target Type:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:187
+#: src/gui/windows/textcommandeditor.cpp:70
msgid "Icon:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:190
+#: src/gui/windows/textcommandeditor.cpp:73
msgid "Mana:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:193
+#: src/gui/windows/textcommandeditor.cpp:76
msgid "Magic level:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:197
+#: src/gui/windows/textcommandeditor.cpp:80
msgid "Magic School:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:200
+#: src/gui/windows/textcommandeditor.cpp:83
msgid "School level:"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/windows/textcommandeditor.cpp:88
msgid "Save"
msgstr ""
@@ -6540,7 +6530,7 @@ msgid "Trade: You"
msgstr "Trgovanje: Vi"
#. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
#, c-format
msgid "You get %s"
msgstr ""
@@ -6556,12 +6546,12 @@ msgid "You give:"
msgstr "Daješ:"
#. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
msgid "You don't have enough money."
msgstr "Nemate dovoljno novca."
#. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
msgid ""
"Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
@@ -6632,17 +6622,17 @@ msgid "Who Is Online - Update"
msgstr ""
#. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:87
+#: src/gui/windows/worldselectdialog.cpp:49
msgid "Select World"
msgstr ""
#. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:93
+#: src/gui/windows/worldselectdialog.cpp:55
msgid "Change Login"
msgstr ""
#. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:95
+#: src/gui/windows/worldselectdialog.cpp:57
msgid "Choose World"
msgstr ""
@@ -6860,7 +6850,7 @@ msgid "Failed to create character. Most likely the name is already taken."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:281
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
msgid "Wrong name."
msgstr ""
@@ -7018,58 +7008,58 @@ msgid "Experience sharing unknown."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:154
+#: src/net/ea/loginhandler.cpp:149
msgid "Account was not found. Please re-login."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/ea/loginhandler.cpp:153
msgid "Old password incorrect."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:162
+#: src/net/ea/loginhandler.cpp:157
msgid "New password too short."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:166 src/net/ea/loginhandler.cpp:293
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
msgid "Unknown error."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:239
+#: src/net/ea/loginhandler.cpp:234
msgid "Unregistered ID."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:238
msgid "Wrong password."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:248
+#: src/net/ea/loginhandler.cpp:243
msgid "Account expired."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:252
+#: src/net/ea/loginhandler.cpp:247
msgid "Rejected from server."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:256
+#: src/net/ea/loginhandler.cpp:251
msgid ""
"You have been permanently banned from the game. Please contact the GM team."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:261
+#: src/net/ea/loginhandler.cpp:256
msgid "Client too old."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:265
+#: src/net/ea/loginhandler.cpp:260
#, c-format
msgid ""
"You have been temporarily banned from the game until %s.\n"
@@ -7077,22 +7067,22 @@ msgid ""
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:273
+#: src/net/ea/loginhandler.cpp:268
msgid "Server overpopulated."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:277
+#: src/net/ea/loginhandler.cpp:272
msgid "This user name is already taken."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:285
+#: src/net/ea/loginhandler.cpp:280
msgid "Incorrect email."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:289
+#: src/net/ea/loginhandler.cpp:284
msgid "Username permanently erased."
msgstr ""
@@ -7765,7 +7755,7 @@ msgstr ""
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
#: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "neimenovano"
diff --git a/po/hu.po b/po/hu.po
index 03c5c4efd..64ec7115d 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: 2014-02-23 00:42+0300\n"
-"PO-Revision-Date: 2014-02-23 08:14+0000\n"
+"POT-Creation-Date: 2014-02-28 21:21+0300\n"
+"PO-Revision-Date: 2014-03-01 08:14+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"
@@ -29,7 +29,7 @@ msgid "Accepting incoming trade requests"
msgstr "Kereskedési kérelmek elfogadása"
#. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
msgid "Visible on map"
msgstr ""
@@ -38,68 +38,68 @@ msgstr ""
msgid "Human"
msgstr ""
-#: src/being/being.cpp:544
+#: src/being/being.cpp:496
msgid "dodge"
msgstr ""
-#: src/being/being.cpp:544
+#: src/being/being.cpp:496
msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1965 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1970 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr ""
#. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:392
+#: src/being/localplayer.cpp:376
#, c-format
msgid "You were killed by %s"
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1377
+#: src/being/localplayer.cpp:816
msgid "Tried to pick up nonexistent item."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1381
+#: src/being/localplayer.cpp:820
msgid "Item is too heavy."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1385
+#: src/being/localplayer.cpp:824
msgid "Item is too far away."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1389
+#: src/being/localplayer.cpp:828
msgid "Inventory is full."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1393
+#: src/being/localplayer.cpp:832
msgid "Stack is too big."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1397
+#: src/being/localplayer.cpp:836
msgid "Item belongs to someone else."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1401
+#: src/being/localplayer.cpp:840
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:1425
+#: src/being/localplayer.cpp:864
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -107,387 +107,387 @@ msgstr[0] ""
msgstr[1] ""
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1630 src/being/localplayer.cpp:1665
-#: src/being/localplayer.cpp:1666
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
msgid "xp"
msgstr ""
-#: src/being/localplayer.cpp:1671 src/being/localplayer.cpp:1678
-#: src/being/localplayer.cpp:1685
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
msgid "job"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1871
+#: src/being/localplayer.cpp:1285
msgid "(D) default moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1873
+#: src/being/localplayer.cpp:1287
msgid "(I) invert moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1875
+#: src/being/localplayer.cpp:1289
msgid "(c) moves with some crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1877
+#: src/being/localplayer.cpp:1291
msgid "(C) moves with crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1879
+#: src/being/localplayer.cpp:1293
msgid "(d) double normal + crazy"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1881
+#: src/being/localplayer.cpp:1295
msgid "(?) unknown move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1904
+#: src/being/localplayer.cpp:1318
#, c-format
msgid "(%u) crazy move number %u"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1910
+#: src/being/localplayer.cpp:1324
msgid "(a) custom crazy move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1915
+#: src/being/localplayer.cpp:1329
msgid "(?) crazy move"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1930
+#: src/being/localplayer.cpp:1344
msgid "(0) default moves to target"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1932
+#: src/being/localplayer.cpp:1346
msgid "(1) moves to target in distance 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1934
+#: src/being/localplayer.cpp:1348
msgid "(2) moves to target in distance 2"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1936
+#: src/being/localplayer.cpp:1350
msgid "(3) moves to target in distance 3"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1938
+#: src/being/localplayer.cpp:1352
msgid "(5) moves to target in distance 5"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1940
+#: src/being/localplayer.cpp:1354
msgid "(7) moves to target in distance 7"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1942
+#: src/being/localplayer.cpp:1356
msgid "(A) moves to target in attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1944
+#: src/being/localplayer.cpp:1358
msgid "(a) archer attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1946
+#: src/being/localplayer.cpp:1360
msgid "(B) moves to target in attack range - 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1948
+#: src/being/localplayer.cpp:1362
msgid "(?) move to target"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1968
+#: src/being/localplayer.cpp:1382
msgid "(D) default follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1970
+#: src/being/localplayer.cpp:1384
msgid "(R) relative follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1972
+#: src/being/localplayer.cpp:1386
msgid "(M) mirror follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1974
+#: src/being/localplayer.cpp:1388
msgid "(P) pet follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1976
+#: src/being/localplayer.cpp:1390
msgid "(?) unknown follow"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1996 src/being/localplayer.cpp:2004
-#: src/being/localplayer.cpp:2032
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
msgid "(?) attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1998 src/being/localplayer.cpp:2024
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
msgid "(D) default attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2000
+#: src/being/localplayer.cpp:1414
msgid "(s) switch attack without shield"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2002
+#: src/being/localplayer.cpp:1416
msgid "(S) switch attack with shield"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2026
+#: src/being/localplayer.cpp:1440
msgid "(G) go and attack"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2028
+#: src/being/localplayer.cpp:1442
msgid "(A) go, attack, pickup"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2030
+#: src/being/localplayer.cpp:1444
msgid "(d) without auto attack"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2084
+#: src/being/localplayer.cpp:1498
msgid "(S) small pick up 1x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2086
+#: src/being/localplayer.cpp:1500
msgid "(D) default pick up 2x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2088
+#: src/being/localplayer.cpp:1502
msgid "(F) forward pick up 2x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2090
+#: src/being/localplayer.cpp:1504
msgid "(3) pick up 3x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2092
+#: src/being/localplayer.cpp:1506
msgid "(g) go and pick up in distance 4"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2094
+#: src/being/localplayer.cpp:1508
msgid "(G) go and pick up in distance 8"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2096
+#: src/being/localplayer.cpp:1510
msgid "(A) go and pick up in max distance"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2098
+#: src/being/localplayer.cpp:1512
msgid "(?) pick up"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2112
+#: src/being/localplayer.cpp:1526
msgid "(N) normal map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2114
+#: src/being/localplayer.cpp:1528
msgid "(D) debug map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2116
+#: src/being/localplayer.cpp:1530
msgid "(u) ultra map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2118
+#: src/being/localplayer.cpp:1532
msgid "(U) ultra map view 2"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2120
+#: src/being/localplayer.cpp:1534
msgid "(e) empty map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2122
+#: src/being/localplayer.cpp:1536
msgid "(b) black & white map view"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2142
+#: src/being/localplayer.cpp:1556
msgid "(f) use #flar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2144
+#: src/being/localplayer.cpp:1558
msgid "(c) use #chiza for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2146
+#: src/being/localplayer.cpp:1560
msgid "(I) use #ingrav for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2148
+#: src/being/localplayer.cpp:1562
msgid "(F) use #frillyar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2150
+#: src/being/localplayer.cpp:1564
msgid "(U) use #upmarmu for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2152
+#: src/being/localplayer.cpp:1566
msgid "(?) magic attack"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2172
+#: src/being/localplayer.cpp:1586
msgid "(a) attack all players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2174
+#: src/being/localplayer.cpp:1588
msgid "(f) attack all except friends"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2176
+#: src/being/localplayer.cpp:1590
msgid "(b) attack bad relations"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2178
+#: src/being/localplayer.cpp:1592
msgid "(d) don't attack players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2180
+#: src/being/localplayer.cpp:1594
msgid "(?) pvp attack"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2200
+#: src/being/localplayer.cpp:1614
msgid "(D) default imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2202
+#: src/being/localplayer.cpp:1616
msgid "(O) outfits imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2204
+#: src/being/localplayer.cpp:1618
msgid "(?) imitation"
msgstr ""
#. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2233
+#: src/being/localplayer.cpp:1647
msgid "Away"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2256
+#: src/being/localplayer.cpp:1670
msgid "(O) on keyboard"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2258
+#: src/being/localplayer.cpp:1672
msgid "(A) away"
msgstr ""
#. TRANSLATORS: away type in status bar
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2260 src/being/localplayer.cpp:2278
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
msgid "(?) away"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2274
+#: src/being/localplayer.cpp:1688
msgid "(G) game camera mode"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2276
+#: src/being/localplayer.cpp:1690
msgid "(F) free camera mode"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2303
+#: src/being/localplayer.cpp:1717
msgid "Game modifiers are enabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2305
+#: src/being/localplayer.cpp:1719
msgid "Game modifiers are disabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2307
+#: src/being/localplayer.cpp:1721
msgid "Game modifiers are unknown"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3887
+#: src/being/localplayer.cpp:3287
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3893 src/being/localplayer.cpp:3918
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3903
+#: src/being/localplayer.cpp:3303
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3909 src/being/localplayer.cpp:3923
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4266
+#: src/being/localplayer.cpp:3666
#, c-format
msgid "You see %s"
msgstr ""
@@ -525,32 +525,32 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1139 src/gui/windowmenu.cpp:167
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
#: src/gui/windows/setupwindow.cpp:61
msgid "Setup"
msgstr "Beállítások"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1143 src/gui/widgets/tabs/setup_perfomance.cpp:51
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1146 src/gui/widgets/tabs/setup_video.cpp:225
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:225
msgid "Video"
msgstr "Videó"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1149 src/gui/widgets/tabs/setup_theme.cpp:269
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1152 src/gui/windowmenu.cpp:74
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr "Súgó"
@@ -563,41 +563,41 @@ msgstr "Súgó"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1156 src/gui/popups/popupmenu.cpp:619
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
#: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:69
-#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:138
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
#: src/gui/windows/shopwindow.cpp:78
msgid "Close"
msgstr "Bezár"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1324
msgid "Logging in"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1367
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1492
+#: src/client.cpp:1489
msgid "Requesting characters"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1532
+#: src/client.cpp:1529
msgid "Connecting to the game server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1545
+#: src/client.cpp:1541
msgid "Changing game servers"
msgstr ""
@@ -612,12 +612,12 @@ msgstr ""
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1606 src/client.cpp:1617 src/client.cpp:1801
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:349
#: src/gui/windows/charselectdialog.cpp:299
-#: src/gui/windows/editserverdialog.cpp:218
+#: src/gui/windows/editserverdialog.cpp:186
#: src/gui/windows/registerdialog.cpp:260
#: src/gui/windows/unregisterdialog.cpp:146
#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
@@ -625,65 +625,65 @@ msgid "Error"
msgstr "Hiba"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1629
+#: src/client.cpp:1625
msgid "Requesting registration details"
msgstr ""
#. TRANSLATORS: password change message header
-#: src/client.cpp:1670
+#: src/client.cpp:1666
msgid "Password Change"
msgstr ""
#. TRANSLATORS: password change message text
-#: src/client.cpp:1672
+#: src/client.cpp:1668
msgid "Password changed successfully!"
msgstr ""
#. TRANSLATORS: email change message header
-#: src/client.cpp:1694
+#: src/client.cpp:1690
msgid "Email Change"
msgstr ""
#. TRANSLATORS: email change message text
-#: src/client.cpp:1696
+#: src/client.cpp:1692
msgid "Email changed successfully!"
msgstr ""
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1719
+#: src/client.cpp:1715
msgid "Unregister Successful"
msgstr ""
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1721
+#: src/client.cpp:1717
msgid "Farewell, come back any time..."
msgstr ""
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1998 src/client.cpp:2013 src/client.cpp:2058
-#: src/client.cpp:2074 src/client.cpp:2525 src/client.cpp:2533
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2230
+#: src/client.cpp:2232
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2271 src/client.cpp:2278
+#: src/client.cpp:2273 src/client.cpp:2280
msgid "Error creating updates directory!"
msgstr "Hiba a frissítési könyvtár létrehozása közben!"
-#: src/client.cpp:2300 src/client.cpp:2317
+#: src/client.cpp:2302 src/client.cpp:2319
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: error message question
-#: src/client.cpp:3001
+#: src/client.cpp:3003
msgid "Do you want to open support page?"
msgstr ""
@@ -929,99 +929,154 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:277 src/gui/widgets/tabs/chattab.cpp:464
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
msgid "General"
msgstr "Általános"
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:293 src/gui/widgets/tabs/chattab.cpp:466
-#: src/gui/windowmenu.cpp:154 src/gui/windows/debugwindow.cpp:53
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:575
+#: src/game.cpp:563
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:585
+#: src/game.cpp:573
msgid "Saving screenshot failed!"
msgstr "Hiba a képernyő mentése során!"
#. TRANSLATORS: error message text
-#: src/game.cpp:656
+#: src/game.cpp:644
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:659
+#: src/game.cpp:647
msgid "Network Error"
msgstr "Hálózati hiba"
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
-msgid "black"
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
msgstr ""
+#. TRANSLATORS: chat color
#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
+msgid "black"
+msgstr ""
+
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
msgid "red"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
msgid "green"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
msgid "blue"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
msgid "gold"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
msgid "yellow"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
msgid "pink"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
msgid "purple"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
msgid "grey"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
msgid "brown"
msgstr ""
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr ""
+
#. TRANSLATORS: relation type
#: src/gui/models/playerrelationlistmodel.h:33
msgid "Neutral"
@@ -1057,46 +1112,61 @@ msgstr ""
msgid "Enemy"
msgstr ""
-#. TRANSLATORS: inventory sort mode
-#. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#: src/gui/models/sortlistmodelinv.h:34
-#: src/gui/widgets/tabs/setup_other.cpp:72
-#: src/gui/widgets/tabs/setup_visual.cpp:78 src/gui/windows/chatwindow.cpp:150
-msgid "default"
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:36 src/gui/windows/buydialog.cpp:62
-msgid "by name"
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
msgstr ""
+#. TRANSLATORS: buy dialog sort type.
#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
+msgid "by name"
+msgstr ""
+
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:38 src/gui/windows/buydialog.cpp:64
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
msgid "by id"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:40 src/gui/windows/buydialog.cpp:66
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
msgid "by weight"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:42 src/gui/windows/buydialog.cpp:68
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
msgid "by amount"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:44 src/gui/windows/buydialog.cpp:70
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
msgid "by type"
msgstr ""
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr ""
+
#. TRANSLATORS: update type
#. TRANSLATORS: onscreen button size
#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
@@ -1243,8 +1313,8 @@ msgstr "Csevegés"
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
-#: src/gui/windows/buydialog.cpp:208 src/gui/windows/buydialog.cpp:220
-#: src/gui/windows/buydialog.cpp:274 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
msgid "Buy"
msgstr "Vétel"
@@ -1341,12 +1411,12 @@ msgstr ""
#: src/gui/windows/changepassworddialog.cpp:57
#: src/gui/windows/charcreatedialog.cpp:121
#: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:79
-#: src/gui/windows/itemamountwindow.cpp:163
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
-#: src/gui/windows/socialwindow.cpp:1238
-#: src/gui/windows/textcommandeditor.cpp:203 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:54
#: src/gui/windows/updaterwindow.cpp:186
msgid "Cancel"
@@ -1418,7 +1488,7 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:150 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
msgstr ""
@@ -1431,7 +1501,7 @@ msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:134
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
msgid "Spells"
msgstr ""
@@ -1487,7 +1557,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
#. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1311
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
msgid "Leave"
msgstr ""
@@ -1568,8 +1638,8 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
-#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:223
-#: src/gui/windows/inventorywindow.cpp:745 src/gui/windows/setupwindow.cpp:96
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
msgid "Store"
msgstr "Raktároz"
@@ -1600,7 +1670,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
msgid "Retrieve"
msgstr "Magához vesz"
@@ -1633,8 +1703,8 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
-#: src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:656 src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr "Bevet"
@@ -1668,8 +1738,8 @@ msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: language
#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/widgets/tabs/setup_theme.cpp:127
-#: src/gui/windows/socialwindow.cpp:1003
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
msgid "(default)"
msgstr ""
@@ -1825,8 +1895,8 @@ msgstr ""
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:645
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
msgid "Unequip"
msgstr "Nem használ"
@@ -1834,16 +1904,16 @@ msgstr "Nem használ"
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:172
-#: src/gui/windows/inventorywindow.cpp:650 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr "Használ"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:189
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
msgid "Drop..."
msgstr ""
@@ -1857,15 +1927,15 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:138
-#: src/gui/windows/inventorywindow.cpp:758
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
msgid "Drop"
msgstr "Eldob"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
msgid "Split"
msgstr "Felosztás"
@@ -2021,10 +2091,10 @@ msgstr "Ok Kiválasztása"
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:276
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/windows/serverdialog.cpp:198
msgid "Quit"
msgstr "Kilépés"
@@ -2586,7 +2656,7 @@ msgstr ""
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: register dialog. button.
#: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:146
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:330
#: src/gui/widgets/tabs/setup_visual.cpp:189
@@ -2613,9 +2683,8 @@ msgstr ""
#. TRANSLATORS: command editor button
#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
#: src/gui/windows/charselectdialog.cpp:108
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:94
-#: src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/textcommandeditor.cpp:207
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
msgid "Delete"
msgstr "Törlés"
@@ -2651,7 +2720,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:130
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
msgid "Shortcuts"
msgstr ""
@@ -2659,7 +2728,7 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:151
msgid "Windows"
msgstr ""
@@ -2675,7 +2744,7 @@ msgstr ""
#. TRANSLATORS: settings tab name
#. TRANSLATORS: chat window name
#: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:88 src/gui/windows/chatwindow.cpp:203
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
msgid "Chat"
msgstr "Chat"
@@ -2898,7 +2967,7 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:137
-#: src/gui/windows/inventorywindow.cpp:569
+#: src/gui/windows/inventorywindow.cpp:568
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
#, c-format
@@ -2918,7 +2987,7 @@ msgstr ""
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/windows/serverdialog.cpp:204
msgid "Edit"
msgstr ""
@@ -2971,7 +3040,7 @@ msgstr ""
#. TRANSLATORS: tab in social window
#. TRANSLATORS: guild chat tab name
#: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:184 src/gui/windows/socialwindow.cpp:320
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
#: src/net/ea/gui/guildtab.cpp:44
msgid "Guild"
msgstr "Klán"
@@ -2982,142 +3051,142 @@ msgid "Lang"
msgstr ""
#. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:49
+#: src/gui/widgets/tabs/setup_audio.cpp:48
msgid "Audio"
msgstr "Audió"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:57
+#: src/gui/widgets/tabs/setup_audio.cpp:56
msgid "Basic settings"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:60
+#: src/gui/widgets/tabs/setup_audio.cpp:59
msgid "Enable Audio"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:63
+#: src/gui/widgets/tabs/setup_audio.cpp:62
msgid "Enable music"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:67
+#: src/gui/widgets/tabs/setup_audio.cpp:66
msgid "Enable game sfx"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:71
+#: src/gui/widgets/tabs/setup_audio.cpp:70
msgid "Enable gui sfx"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:74
msgid "Sfx volume"
msgstr "Effektek hangereje"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:78
msgid "Music volume"
msgstr "Zene hangereje"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:82
msgid "Enable music fade out"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:86
msgid "Audio frequency"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:90
msgid "mono"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:93
+#: src/gui/widgets/tabs/setup_audio.cpp:92
msgid "stereo"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:94
msgid "surround"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:97
+#: src/gui/widgets/tabs/setup_audio.cpp:96
msgid "surround+center+lfe"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:98
msgid "Audio channels"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:104
+#: src/gui/widgets/tabs/setup_audio.cpp:103
msgid "Sound effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:106
msgid "Information dialog sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:110
msgid "Request dialog sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:115
+#: src/gui/widgets/tabs/setup_audio.cpp:114
msgid "Whisper message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:118
msgid "Guild / Party message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:122
msgid "Highlight message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:126
msgid "Global message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:130
msgid "Error message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:134
msgid "Trade request sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:138
msgid "Show window sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:142
msgid "Hide window sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:150
msgid "Enable mumble voice chat"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:156
+#: src/gui/widgets/tabs/setup_audio.cpp:155
msgid "Download music"
msgstr ""
@@ -3413,7 +3482,7 @@ msgstr ""
#. TRANSLATORS: unknown key name
#. TRANSLATORS: quests window quest name
#: src/gui/widgets/tabs/setup_input.cpp:364
-#: src/gui/windows/questswindow.cpp:263
+#: src/gui/windows/questswindow.cpp:249
msgid "unknown"
msgstr ""
@@ -3572,7 +3641,7 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: debug window tab
#. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:105
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
#: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
#: src/gui/windows/minimap.cpp:114
msgid "Map"
@@ -3740,9 +3809,9 @@ msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: shop window name
#. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:146
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
#: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windows/inventorywindow.cpp:194
msgid "Shop"
msgstr "Üzlet"
@@ -4124,252 +4193,252 @@ msgid "When ignoring:"
msgstr "Ha ignorolva van:"
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:64
+#: src/gui/widgets/tabs/setup_theme.cpp:63
msgid "Very small (8)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:66
+#: src/gui/widgets/tabs/setup_theme.cpp:65
msgid "Very small (9)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:68
+#: src/gui/widgets/tabs/setup_theme.cpp:67
msgid "Tiny (10)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:70
+#: src/gui/widgets/tabs/setup_theme.cpp:69
msgid "Small (11)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:72
+#: src/gui/widgets/tabs/setup_theme.cpp:71
msgid "Medium (12)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:74
+#: src/gui/widgets/tabs/setup_theme.cpp:73
msgid "Normal (13)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:76
+#: src/gui/widgets/tabs/setup_theme.cpp:75
msgid "Large (14)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:78
+#: src/gui/widgets/tabs/setup_theme.cpp:77
msgid "Large (15)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:80
+#: src/gui/widgets/tabs/setup_theme.cpp:79
msgid "Large (16)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:82
+#: src/gui/widgets/tabs/setup_theme.cpp:81
msgid "Big (17)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:83
msgid "Big (18)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:85
msgid "Big (19)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:87
msgid "Very big (20)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:89
msgid "Very big (21)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:91
msgid "Very big (22)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:93
msgid "Huge (23)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:129
+#: src/gui/widgets/tabs/setup_theme.cpp:128
msgid "Chinese (China)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:131
+#: src/gui/widgets/tabs/setup_theme.cpp:130
msgid "Czech"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:133
+#: src/gui/widgets/tabs/setup_theme.cpp:132
msgid "English"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:135
+#: src/gui/widgets/tabs/setup_theme.cpp:134
msgid "Finnish"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:137
+#: src/gui/widgets/tabs/setup_theme.cpp:136
msgid "French"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:139
+#: src/gui/widgets/tabs/setup_theme.cpp:138
msgid "German"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:141
+#: src/gui/widgets/tabs/setup_theme.cpp:140
msgid "Indonesian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:143
+#: src/gui/widgets/tabs/setup_theme.cpp:142
msgid "Italian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:145
+#: src/gui/widgets/tabs/setup_theme.cpp:144
msgid "Polish"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:147
+#: src/gui/widgets/tabs/setup_theme.cpp:146
msgid "Japanese"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:148
msgid "Dutch (Belgium/Flemish)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:150
msgid "Portuguese"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:152
msgid "Portuguese (Brazilian)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:154
msgid "Russian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:156
msgid "Spanish (Castilian)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:158
msgid "Turkish"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:211
+#: src/gui/widgets/tabs/setup_theme.cpp:210
msgid "Gui theme"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:218
+#: src/gui/widgets/tabs/setup_theme.cpp:217
msgid "Main Font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:223
+#: src/gui/widgets/tabs/setup_theme.cpp:222
msgid "Language"
msgstr ""
#. TRANSLATORS: theme settings label
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:227 src/gui/windows/emotewindow.cpp:45
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
msgid "Bold font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:230
msgid "Particle font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:235
+#: src/gui/widgets/tabs/setup_theme.cpp:234
msgid "Help font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:239
+#: src/gui/widgets/tabs/setup_theme.cpp:238
msgid "Secure font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:242
msgid "Npc font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:247
+#: src/gui/widgets/tabs/setup_theme.cpp:246
msgid "Japanese font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:250
msgid "Chinese font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:256
+#: src/gui/widgets/tabs/setup_theme.cpp:255
msgid "Font size"
msgstr "Betűméret"
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:261
+#: src/gui/widgets/tabs/setup_theme.cpp:260
msgid "Npc font size"
msgstr ""
#. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:265
+#: src/gui/widgets/tabs/setup_theme.cpp:264
msgid "i"
msgstr ""
#. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:404
+#: src/gui/widgets/tabs/setup_theme.cpp:403
msgid "Name: "
msgstr ""
-#: src/gui/widgets/tabs/setup_theme.cpp:405
+#: src/gui/widgets/tabs/setup_theme.cpp:404
msgid "Copyright:"
msgstr ""
#. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:470
+#: src/gui/widgets/tabs/setup_theme.cpp:469
msgid "Theme info"
msgstr ""
#. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:497
+#: src/gui/widgets/tabs/setup_theme.cpp:496
msgid "Theme Changed"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:497
+#: src/gui/widgets/tabs/setup_theme.cpp:496
#: src/gui/widgets/tabs/setup_video.cpp:499
#: src/gui/widgets/tabs/setup_video.cpp:508
msgid "Restart your client for the change to take effect."
@@ -4700,178 +4769,169 @@ msgid "Allow screensaver to run"
msgstr ""
#. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:67
msgid "ONL"
msgstr ""
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:68
msgid "Who is online"
msgstr ""
#. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:70
msgid "HLP"
msgstr ""
#. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:73
msgid "QE"
msgstr ""
#. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:77 src/gui/windows/questswindow.cpp:126
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
msgid "Quests"
msgstr ""
#. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:76
msgid "BC"
msgstr ""
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:77
msgid "Bot checker"
msgstr ""
#. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:82
+#: src/gui/windowmenu.cpp:79
msgid "KS"
msgstr ""
#. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:83 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
msgid "Kill stats"
msgstr ""
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:82
msgid "Smilies"
msgstr ""
#. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:87
+#: src/gui/windowmenu.cpp:84
msgid "CH"
msgstr ""
#. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:95
+#: src/gui/windowmenu.cpp:92
msgid "STA"
msgstr ""
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:93
msgid "Status"
msgstr "Státusz"
#. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:95
msgid "EQU"
msgstr ""
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:58
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
msgid "Equipment"
msgstr "Felszerelés"
#. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:98
msgid "INV"
msgstr ""
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:130
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
#: src/inventory.cpp:257
msgid "Inventory"
msgstr "Táska"
#. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:104
+#: src/gui/windowmenu.cpp:101
msgid "MAP"
msgstr ""
#. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:110
+#: src/gui/windowmenu.cpp:107
msgid "SKI"
msgstr ""
#. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
msgid "Skills"
msgstr "Képességek"
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:118
-msgid "SPE"
-msgstr ""
-
-#: src/gui/windowmenu.cpp:119
-msgid "Specials"
-msgstr ""
-
#. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:124
+#: src/gui/windowmenu.cpp:112
msgid "SOC"
msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:126 src/gui/windows/socialwindow.cpp:1284
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
msgid "Social"
msgstr ""
#. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:128
+#: src/gui/windowmenu.cpp:116
msgid "SH"
msgstr ""
#. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:132
+#: src/gui/windowmenu.cpp:120
msgid "SP"
msgstr ""
#. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:124
msgid "DR"
msgstr ""
#. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:128
msgid "YK"
msgstr ""
#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:130
msgid "Did you know"
msgstr ""
#. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:144
+#: src/gui/windowmenu.cpp:132
msgid "SHP"
msgstr ""
#. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:148
+#: src/gui/windowmenu.cpp:136
msgid "OU"
msgstr ""
#. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:152
+#: src/gui/windowmenu.cpp:140
msgid "DBG"
msgstr ""
#. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:149
msgid "WIN"
msgstr ""
#. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:153
msgid "SET"
msgstr ""
#. TRANSLATORS: short key name
#. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:301 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
#: src/gui/windows/outfitwindow.cpp:561
#, c-format
msgid "Key: %s"
@@ -4893,31 +4953,21 @@ msgstr "Alaphelyzet"
msgid "Result"
msgstr ""
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:58
-msgid "unsorted"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:60
-msgid "by price"
-msgstr ""
-
#. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:196
+#: src/gui/windows/buydialog.cpp:162
msgid "Create items"
msgstr ""
#. TRANSLATORS: buy dialog label
#. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:254 src/gui/windows/buydialog.cpp:541
-#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:366
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Ár: %s / Teljes: %s"
#. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:263
+#: src/gui/windows/buydialog.cpp:229
msgid "Amount:"
msgstr ""
@@ -4927,8 +4977,8 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/itemamountwindow.cpp:159
-#: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
msgid "+"
msgstr ""
@@ -4939,8 +4989,8 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:271 src/gui/windows/itemamountwindow.cpp:157
-#: src/gui/windows/itemamountwindow.cpp:191 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
msgid "-"
msgstr ""
@@ -4948,9 +4998,9 @@ msgstr ""
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:274 src/gui/windows/charcreatedialog.cpp:119
-#: src/gui/windows/charselectdialog.cpp:593
-#: src/gui/windows/socialwindow.cpp:1307
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
msgid "Create"
msgstr "Létrehozás"
@@ -4959,7 +5009,7 @@ msgstr "Létrehozás"
#. TRANSLATORS: status bar label
#. TRANSLATORS: status window label
#. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:278 src/gui/windows/selldialog.cpp:112
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
#: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
#: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
msgid "Max"
@@ -5058,7 +5108,7 @@ msgstr ""
#. TRANSLATORS: login dialog label
#. TRANSLATORS: register dialog. label.
#: src/gui/windows/charcreatedialog.cpp:73
-#: src/gui/windows/editserverdialog.cpp:89 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
#: src/gui/windows/registerdialog.cpp:89
msgid "Name:"
msgstr "Név:"
@@ -5119,7 +5169,7 @@ msgstr "Nő"
#. TRANSLATORS: char create dialog label
#: src/gui/windows/charcreatedialog.cpp:115
-#: src/gui/windows/charcreatedialog.cpp:469
+#: src/gui/windows/charcreatedialog.cpp:458
#, c-format
msgid "Please distribute %d points"
msgstr "Kérlek oszd el a pontjaidat (%d van még)"
@@ -5135,17 +5185,17 @@ msgid "Look:"
msgstr ""
#. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:362
+#: src/gui/windows/charcreatedialog.cpp:351
msgid "Your name needs to be at least 4 characters."
msgstr "A nevednek minimum 4 karakternek kell lennie."
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:459
+#: src/gui/windows/charcreatedialog.cpp:448
msgid "Character stats OK"
msgstr "Karakter statok rendben"
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:475
+#: src/gui/windows/charcreatedialog.cpp:464
#, c-format
msgid "Please remove %d points"
msgstr "Kérlek távolíts el %d pontot"
@@ -5174,7 +5224,7 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:104
-#: src/gui/windows/charselectdialog.cpp:588
+#: src/gui/windows/charselectdialog.cpp:580
#: src/gui/windows/updaterwindow.cpp:188
msgid "Play"
msgstr "Játék"
@@ -5230,35 +5280,20 @@ msgstr ""
msgid "Enter password:"
msgstr ""
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:172
-msgid "rainbow 1"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:174
-msgid "rainbow 2"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:176
-msgid "rainbow 3"
-msgstr ""
-
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:755
+#: src/gui/windows/chatwindow.cpp:705
#, c-format
msgid "Present: %s; %d players are present."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1169
+#: src/gui/windows/chatwindow.cpp:1119
#, c-format
msgid "Whispering to %s: %s"
msgstr "Üzenet %s számára: %s"
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1613
+#: src/gui/windows/chatwindow.cpp:1563
#, c-format
msgid "%s's pet"
msgstr ""
@@ -5504,51 +5539,51 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:77
-#: src/gui/windows/itemamountwindow.cpp:161 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
msgid "OK"
msgstr "Ok"
#. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:66
+#: src/gui/windows/editserverdialog.cpp:45
msgid "Edit Server"
msgstr ""
#. TRANSLATORS: edit server dialog button
#. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:75
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
msgid "Connect"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:91
+#: src/gui/windows/editserverdialog.cpp:70
msgid "Address:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:93
+#: src/gui/windows/editserverdialog.cpp:72
msgid "Port:"
msgstr "Port:"
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:95
+#: src/gui/windows/editserverdialog.cpp:74
msgid "Server type:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:97
+#: src/gui/windows/editserverdialog.cpp:76
msgid "Description:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:99
+#: src/gui/windows/editserverdialog.cpp:78
msgid "Online list url:"
msgstr ""
#. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:220
+#: src/gui/windows/editserverdialog.cpp:188
msgid "Please at least type both the address and the port of the server."
msgstr ""
@@ -5568,47 +5603,47 @@ msgid "Did you know..."
msgstr ""
#. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:165
+#: src/gui/windows/itemamountwindow.cpp:164
msgid "All"
msgstr "Mind"
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:221
+#: src/gui/windows/itemamountwindow.cpp:220
msgid "Select amount of items to trade."
msgstr "Válaszd ki mennyi tárggyal akarsz üzletelni."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:225
+#: src/gui/windows/itemamountwindow.cpp:224
msgid "Select amount of items to drop."
msgstr "Válaszd ki mennyit akarsz eldobni."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:229
+#: src/gui/windows/itemamountwindow.cpp:228
msgid "Select amount of items to store."
msgstr "Válaszd ki a raktározandó mennyiséget."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:233
+#: src/gui/windows/itemamountwindow.cpp:232
msgid "Select amount of items to retrieve."
msgstr "Válaszd ki mennyit veszel magadhoz."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:237
+#: src/gui/windows/itemamountwindow.cpp:236
msgid "Select amount of items to split."
msgstr "Válaszd ki az elosztandó mennyiséget."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:241
+#: src/gui/windows/itemamountwindow.cpp:240
msgid "Add to buy shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:245
+#: src/gui/windows/itemamountwindow.cpp:244
msgid "Add to sell shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:249
+#: src/gui/windows/itemamountwindow.cpp:248
msgid "Unknown."
msgstr ""
@@ -5860,7 +5895,7 @@ msgstr "Küldés"
#. TRANSLATORS: shop window label
#. TRANSLATORS: shop window button
#. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:258
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
#: src/gui/windows/tradewindow.cpp:78
msgid "Add"
@@ -5962,53 +5997,53 @@ msgid "Do you really want to sell %s?"
msgstr ""
#. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
msgid "Choose Your Server"
msgstr ""
#. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
msgid "Load"
msgstr ""
#. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
msgid "Choose Your Server *** SAFE MODE ***"
msgstr ""
#. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
msgid "Use same ip for game sub servers"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
msgid "Waiting for server..."
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
msgid "Preparing download"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
msgid "Error retreiving server list!"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
msgid "requires a newer version"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
#, c-format
msgid "requires v%s"
msgstr ""
@@ -6089,277 +6124,277 @@ msgid "Skill %d"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:225
+#: src/gui/windows/socialwindow.cpp:227
#, c-format
msgid "Invited user %s to guild %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:240
+#: src/gui/windows/socialwindow.cpp:242
#, c-format
msgid "Guild %s quit requested."
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:254
+#: src/gui/windows/socialwindow.cpp:256
msgid "Member Invite to Guild"
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:256
+#: src/gui/windows/socialwindow.cpp:258
#, c-format
msgid "Who would you like to invite to guild %s?"
msgstr ""
#. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:266
+#: src/gui/windows/socialwindow.cpp:268
msgid "Leave Guild?"
msgstr ""
#. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:268
+#: src/gui/windows/socialwindow.cpp:270
#, c-format
msgid "Are you sure you want to leave guild %s?"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:279
+#: src/gui/windows/socialwindow.cpp:281
#, c-format
msgid "Members: %u/%u"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:301 src/gui/windows/socialwindow.cpp:373
-#: src/gui/windows/socialwindow.cpp:498
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
#, c-format
msgid "Players: %u/%u"
msgstr ""
#. TRANSLATORS: tab in social window
#. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:389 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
msgid "Party"
msgstr "Csapat"
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:429
+#: src/gui/windows/socialwindow.cpp:431
#, c-format
msgid "Invited user %s to party."
msgstr ""
#. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:444
+#: src/gui/windows/socialwindow.cpp:446
#, c-format
msgid "Party %s quit requested."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:458
+#: src/gui/windows/socialwindow.cpp:460
msgid "Member Invite to Party"
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:460
+#: src/gui/windows/socialwindow.cpp:462
#, c-format
msgid "Who would you like to invite to party %s?"
msgstr ""
#. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:470
+#: src/gui/windows/socialwindow.cpp:472
msgid "Leave Party?"
msgstr ""
#. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:472
+#: src/gui/windows/socialwindow.cpp:474
#, c-format
msgid "Are you sure you want to leave party %s?"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:698
+#: src/gui/windows/socialwindow.cpp:665
#, c-format
msgid "Visible players: %d"
msgstr ""
#. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:725
+#: src/gui/windows/socialwindow.cpp:692
msgid "Nav"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:827
+#: src/gui/windows/socialwindow.cpp:794
#, c-format
msgid "Portals: %u/%u"
msgstr ""
#. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1054
+#: src/gui/windows/socialwindow.cpp:1021
msgid "Atk"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1073
+#: src/gui/windows/socialwindow.cpp:1040
msgid "Priority mobs"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1075
+#: src/gui/windows/socialwindow.cpp:1042
msgid "Attack mobs"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1077
+#: src/gui/windows/socialwindow.cpp:1044
msgid "Ignore mobs"
msgstr ""
#. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1101
+#: src/gui/windows/socialwindow.cpp:1068
msgid "Pik"
msgstr ""
#. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1120
+#: src/gui/windows/socialwindow.cpp:1087
msgid "Pickup items"
msgstr ""
#. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1122
+#: src/gui/windows/socialwindow.cpp:1089
msgid "Ignore items"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1212
+#: src/gui/windows/socialwindow.cpp:1179
#, c-format
msgid "Friends: %u/%u"
msgstr ""
#. TRANSLATORS: party popup item
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1235 src/gui/windows/socialwindow.cpp:1727
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
msgid "Create Party"
msgstr ""
#. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1298
+#: src/gui/windows/socialwindow.cpp:1265
msgid "P"
msgstr ""
#. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1303
+#: src/gui/windows/socialwindow.cpp:1270
msgid "F"
msgstr ""
#. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1309
+#: src/gui/windows/socialwindow.cpp:1276
msgid "Invite"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1503
+#: src/gui/windows/socialwindow.cpp:1470
#, c-format
msgid "Accepted party invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1514
+#: src/gui/windows/socialwindow.cpp:1481
#, c-format
msgid "Rejected party invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1531
+#: src/gui/windows/socialwindow.cpp:1498
#, c-format
msgid "Accepted guild invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1545
+#: src/gui/windows/socialwindow.cpp:1512
#, c-format
msgid "Rejected guild invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1585
+#: src/gui/windows/socialwindow.cpp:1552
#, c-format
msgid "Creating guild called %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1606
+#: src/gui/windows/socialwindow.cpp:1573
#, c-format
msgid "Creating party called %s."
msgstr ""
#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1621
+#: src/gui/windows/socialwindow.cpp:1588
msgid "Guild Name"
msgstr ""
#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1623
+#: src/gui/windows/socialwindow.cpp:1590
msgid "Choose your guild's name."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1639
+#: src/gui/windows/socialwindow.cpp:1606
msgid "Received guild request, but one already exists."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1647
+#: src/gui/windows/socialwindow.cpp:1614
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1654
+#: src/gui/windows/socialwindow.cpp:1621
msgid "Accept Guild Invite"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1670
+#: src/gui/windows/socialwindow.cpp:1637
msgid "Received party request, but one already exists."
msgstr "Csapatba hívtak, de neked van csapatod."
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1682
+#: src/gui/windows/socialwindow.cpp:1649
msgid "You have been invited you to join a party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1687
+#: src/gui/windows/socialwindow.cpp:1654
#, c-format
msgid "You have been invited to join the %s party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1696
+#: src/gui/windows/socialwindow.cpp:1663
#, c-format
msgid "%s has invited you to join their party."
msgstr "%s a csapatába hívott."
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1702
+#: src/gui/windows/socialwindow.cpp:1669
#, 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/windows/socialwindow.cpp:1712
+#: src/gui/windows/socialwindow.cpp:1679
msgid "Accept Party Invite"
msgstr "Ajánlat elfogadása"
-#: src/gui/windows/socialwindow.cpp:1728
+#: src/gui/windows/socialwindow.cpp:1695
msgid "Cannot create party. You are already in a party"
msgstr ""
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1734
+#: src/gui/windows/socialwindow.cpp:1701
msgid "Party Name"
msgstr ""
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1736
+#: src/gui/windows/socialwindow.cpp:1703
msgid "Choose your party's name."
msgstr ""
@@ -6401,113 +6436,68 @@ msgstr ""
msgid "Correction points: %d"
msgstr ""
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "No Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Allow Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:105
-msgid "Need Target"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "General Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "Life Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "War Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Transmute Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Nature Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:121
-msgid "Astral Magic"
-msgstr ""
-
#. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:164
+#: src/gui/windows/textcommandeditor.cpp:47
msgid "Command Editor"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:52
msgid "magic"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:54
msgid "other"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:173
+#: src/gui/windows/textcommandeditor.cpp:56
msgid "Symbol:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:176
+#: src/gui/windows/textcommandeditor.cpp:59
msgid "Command:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:179
+#: src/gui/windows/textcommandeditor.cpp:62
msgid "Comment:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:183
+#: src/gui/windows/textcommandeditor.cpp:66
msgid "Target Type:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:187
+#: src/gui/windows/textcommandeditor.cpp:70
msgid "Icon:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:190
+#: src/gui/windows/textcommandeditor.cpp:73
msgid "Mana:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:193
+#: src/gui/windows/textcommandeditor.cpp:76
msgid "Magic level:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:197
+#: src/gui/windows/textcommandeditor.cpp:80
msgid "Magic School:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:200
+#: src/gui/windows/textcommandeditor.cpp:83
msgid "School level:"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/windows/textcommandeditor.cpp:88
msgid "Save"
msgstr ""
@@ -6537,7 +6527,7 @@ msgid "Trade: You"
msgstr "Üzlet: Te"
#. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
#, c-format
msgid "You get %s"
msgstr ""
@@ -6553,12 +6543,12 @@ msgid "You give:"
msgstr "Adott tárgyak:"
#. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
msgid "You don't have enough money."
msgstr "Nincs elég pénzed."
#. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
msgid ""
"Failed adding item. You can not overlap one kind of item on the window."
msgstr "Hiba a tárgy hozzáadásakor. Nem tudod rárakni az egyik tárgyat a másikra."
@@ -6629,17 +6619,17 @@ msgid "Who Is Online - Update"
msgstr ""
#. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:87
+#: src/gui/windows/worldselectdialog.cpp:49
msgid "Select World"
msgstr ""
#. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:93
+#: src/gui/windows/worldselectdialog.cpp:55
msgid "Change Login"
msgstr ""
#. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:95
+#: src/gui/windows/worldselectdialog.cpp:57
msgid "Choose World"
msgstr ""
@@ -6857,7 +6847,7 @@ msgid "Failed to create character. Most likely the name is already taken."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:281
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
msgid "Wrong name."
msgstr ""
@@ -7015,58 +7005,58 @@ msgid "Experience sharing unknown."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:154
+#: src/net/ea/loginhandler.cpp:149
msgid "Account was not found. Please re-login."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/ea/loginhandler.cpp:153
msgid "Old password incorrect."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:162
+#: src/net/ea/loginhandler.cpp:157
msgid "New password too short."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:166 src/net/ea/loginhandler.cpp:293
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
msgid "Unknown error."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:239
+#: src/net/ea/loginhandler.cpp:234
msgid "Unregistered ID."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:238
msgid "Wrong password."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:248
+#: src/net/ea/loginhandler.cpp:243
msgid "Account expired."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:252
+#: src/net/ea/loginhandler.cpp:247
msgid "Rejected from server."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:256
+#: src/net/ea/loginhandler.cpp:251
msgid ""
"You have been permanently banned from the game. Please contact the GM team."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:261
+#: src/net/ea/loginhandler.cpp:256
msgid "Client too old."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:265
+#: src/net/ea/loginhandler.cpp:260
#, c-format
msgid ""
"You have been temporarily banned from the game until %s.\n"
@@ -7074,22 +7064,22 @@ msgid ""
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:273
+#: src/net/ea/loginhandler.cpp:268
msgid "Server overpopulated."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:277
+#: src/net/ea/loginhandler.cpp:272
msgid "This user name is already taken."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:285
+#: src/net/ea/loginhandler.cpp:280
msgid "Incorrect email."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:289
+#: src/net/ea/loginhandler.cpp:284
msgid "Username permanently erased."
msgstr ""
@@ -7762,7 +7752,7 @@ msgstr ""
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
#: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "Névtelen"
diff --git a/po/id.po b/po/id.po
index 44225cdfc..3a0bb35ee 100644
--- a/po/id.po
+++ b/po/id.po
@@ -11,7 +11,7 @@ msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
"POT-Creation-Date: 2014-02-28 21:21+0300\n"
-"PO-Revision-Date: 2014-02-23 08:14+0000\n"
+"PO-Revision-Date: 2014-03-01 08:14+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/manaplus/"
"language/id/)\n"
diff --git a/po/it.po b/po/it.po
index e289dc0d9..ba4db394c 100644
--- a/po/it.po
+++ b/po/it.po
@@ -15,7 +15,7 @@ msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
"POT-Creation-Date: 2014-02-28 21:21+0300\n"
-"PO-Revision-Date: 2014-02-23 08:14+0000\n"
+"PO-Revision-Date: 2014-03-01 08:14+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/manaplus/"
"language/it/)\n"
@@ -7824,9 +7824,3 @@ msgstr "Oggetto sconosciuto"
#: src/resources/db/petdb.cpp:99
msgid "pet"
msgstr ""
-
-#~ msgid "SPE"
-#~ msgstr "SPE"
-
-#~ msgid "Specials"
-#~ msgstr "Speciali"
diff --git a/po/ja.po b/po/ja.po
index 525b49be5..58bbfe75a 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -14,7 +14,7 @@ msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
"POT-Creation-Date: 2014-02-28 21:21+0300\n"
-"PO-Revision-Date: 2014-02-23 08:14+0000\n"
+"PO-Revision-Date: 2014-03-01 08:14+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Japanese (http://www.transifex.com/projects/p/manaplus/"
"language/ja/)\n"
@@ -7810,9 +7810,3 @@ msgstr "不明なアイテム"
#: src/resources/db/petdb.cpp:99
msgid "pet"
msgstr ""
-
-#~ msgid "SPE"
-#~ msgstr "SPE"
-
-#~ msgid "Specials"
-#~ msgstr "スペシャル"
diff --git a/po/ka.po b/po/ka.po
index 49d78f05c..9f4f64d71 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: 2014-02-23 00:42+0300\n"
-"PO-Revision-Date: 2014-02-23 08:14+0000\n"
+"POT-Creation-Date: 2014-02-28 21:21+0300\n"
+"PO-Revision-Date: 2014-03-01 08:14+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"
@@ -29,7 +29,7 @@ msgid "Accepting incoming trade requests"
msgstr ""
#. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
msgid "Visible on map"
msgstr ""
@@ -38,455 +38,455 @@ msgstr ""
msgid "Human"
msgstr ""
-#: src/being/being.cpp:544
+#: src/being/being.cpp:496
msgid "dodge"
msgstr ""
-#: src/being/being.cpp:544
+#: src/being/being.cpp:496
msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1965 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1970 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr ""
#. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:392
+#: src/being/localplayer.cpp:376
#, c-format
msgid "You were killed by %s"
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1377
+#: src/being/localplayer.cpp:816
msgid "Tried to pick up nonexistent item."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1381
+#: src/being/localplayer.cpp:820
msgid "Item is too heavy."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1385
+#: src/being/localplayer.cpp:824
msgid "Item is too far away."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1389
+#: src/being/localplayer.cpp:828
msgid "Inventory is full."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1393
+#: src/being/localplayer.cpp:832
msgid "Stack is too big."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1397
+#: src/being/localplayer.cpp:836
msgid "Item belongs to someone else."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1401
+#: src/being/localplayer.cpp:840
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:1425
+#: src/being/localplayer.cpp:864
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
msgstr[0] ""
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1630 src/being/localplayer.cpp:1665
-#: src/being/localplayer.cpp:1666
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
msgid "xp"
msgstr ""
-#: src/being/localplayer.cpp:1671 src/being/localplayer.cpp:1678
-#: src/being/localplayer.cpp:1685
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
msgid "job"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1871
+#: src/being/localplayer.cpp:1285
msgid "(D) default moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1873
+#: src/being/localplayer.cpp:1287
msgid "(I) invert moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1875
+#: src/being/localplayer.cpp:1289
msgid "(c) moves with some crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1877
+#: src/being/localplayer.cpp:1291
msgid "(C) moves with crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1879
+#: src/being/localplayer.cpp:1293
msgid "(d) double normal + crazy"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1881
+#: src/being/localplayer.cpp:1295
msgid "(?) unknown move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1904
+#: src/being/localplayer.cpp:1318
#, c-format
msgid "(%u) crazy move number %u"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1910
+#: src/being/localplayer.cpp:1324
msgid "(a) custom crazy move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1915
+#: src/being/localplayer.cpp:1329
msgid "(?) crazy move"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1930
+#: src/being/localplayer.cpp:1344
msgid "(0) default moves to target"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1932
+#: src/being/localplayer.cpp:1346
msgid "(1) moves to target in distance 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1934
+#: src/being/localplayer.cpp:1348
msgid "(2) moves to target in distance 2"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1936
+#: src/being/localplayer.cpp:1350
msgid "(3) moves to target in distance 3"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1938
+#: src/being/localplayer.cpp:1352
msgid "(5) moves to target in distance 5"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1940
+#: src/being/localplayer.cpp:1354
msgid "(7) moves to target in distance 7"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1942
+#: src/being/localplayer.cpp:1356
msgid "(A) moves to target in attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1944
+#: src/being/localplayer.cpp:1358
msgid "(a) archer attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1946
+#: src/being/localplayer.cpp:1360
msgid "(B) moves to target in attack range - 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1948
+#: src/being/localplayer.cpp:1362
msgid "(?) move to target"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1968
+#: src/being/localplayer.cpp:1382
msgid "(D) default follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1970
+#: src/being/localplayer.cpp:1384
msgid "(R) relative follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1972
+#: src/being/localplayer.cpp:1386
msgid "(M) mirror follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1974
+#: src/being/localplayer.cpp:1388
msgid "(P) pet follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1976
+#: src/being/localplayer.cpp:1390
msgid "(?) unknown follow"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1996 src/being/localplayer.cpp:2004
-#: src/being/localplayer.cpp:2032
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
msgid "(?) attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1998 src/being/localplayer.cpp:2024
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
msgid "(D) default attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2000
+#: src/being/localplayer.cpp:1414
msgid "(s) switch attack without shield"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2002
+#: src/being/localplayer.cpp:1416
msgid "(S) switch attack with shield"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2026
+#: src/being/localplayer.cpp:1440
msgid "(G) go and attack"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2028
+#: src/being/localplayer.cpp:1442
msgid "(A) go, attack, pickup"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2030
+#: src/being/localplayer.cpp:1444
msgid "(d) without auto attack"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2084
+#: src/being/localplayer.cpp:1498
msgid "(S) small pick up 1x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2086
+#: src/being/localplayer.cpp:1500
msgid "(D) default pick up 2x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2088
+#: src/being/localplayer.cpp:1502
msgid "(F) forward pick up 2x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2090
+#: src/being/localplayer.cpp:1504
msgid "(3) pick up 3x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2092
+#: src/being/localplayer.cpp:1506
msgid "(g) go and pick up in distance 4"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2094
+#: src/being/localplayer.cpp:1508
msgid "(G) go and pick up in distance 8"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2096
+#: src/being/localplayer.cpp:1510
msgid "(A) go and pick up in max distance"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2098
+#: src/being/localplayer.cpp:1512
msgid "(?) pick up"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2112
+#: src/being/localplayer.cpp:1526
msgid "(N) normal map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2114
+#: src/being/localplayer.cpp:1528
msgid "(D) debug map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2116
+#: src/being/localplayer.cpp:1530
msgid "(u) ultra map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2118
+#: src/being/localplayer.cpp:1532
msgid "(U) ultra map view 2"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2120
+#: src/being/localplayer.cpp:1534
msgid "(e) empty map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2122
+#: src/being/localplayer.cpp:1536
msgid "(b) black & white map view"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2142
+#: src/being/localplayer.cpp:1556
msgid "(f) use #flar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2144
+#: src/being/localplayer.cpp:1558
msgid "(c) use #chiza for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2146
+#: src/being/localplayer.cpp:1560
msgid "(I) use #ingrav for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2148
+#: src/being/localplayer.cpp:1562
msgid "(F) use #frillyar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2150
+#: src/being/localplayer.cpp:1564
msgid "(U) use #upmarmu for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2152
+#: src/being/localplayer.cpp:1566
msgid "(?) magic attack"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2172
+#: src/being/localplayer.cpp:1586
msgid "(a) attack all players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2174
+#: src/being/localplayer.cpp:1588
msgid "(f) attack all except friends"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2176
+#: src/being/localplayer.cpp:1590
msgid "(b) attack bad relations"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2178
+#: src/being/localplayer.cpp:1592
msgid "(d) don't attack players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2180
+#: src/being/localplayer.cpp:1594
msgid "(?) pvp attack"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2200
+#: src/being/localplayer.cpp:1614
msgid "(D) default imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2202
+#: src/being/localplayer.cpp:1616
msgid "(O) outfits imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2204
+#: src/being/localplayer.cpp:1618
msgid "(?) imitation"
msgstr ""
#. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2233
+#: src/being/localplayer.cpp:1647
msgid "Away"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2256
+#: src/being/localplayer.cpp:1670
msgid "(O) on keyboard"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2258
+#: src/being/localplayer.cpp:1672
msgid "(A) away"
msgstr ""
#. TRANSLATORS: away type in status bar
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2260 src/being/localplayer.cpp:2278
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
msgid "(?) away"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2274
+#: src/being/localplayer.cpp:1688
msgid "(G) game camera mode"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2276
+#: src/being/localplayer.cpp:1690
msgid "(F) free camera mode"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2303
+#: src/being/localplayer.cpp:1717
msgid "Game modifiers are enabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2305
+#: src/being/localplayer.cpp:1719
msgid "Game modifiers are disabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2307
+#: src/being/localplayer.cpp:1721
msgid "Game modifiers are unknown"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3887
+#: src/being/localplayer.cpp:3287
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3893 src/being/localplayer.cpp:3918
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3903
+#: src/being/localplayer.cpp:3303
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3909 src/being/localplayer.cpp:3923
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4266
+#: src/being/localplayer.cpp:3666
#, c-format
msgid "You see %s"
msgstr ""
@@ -524,32 +524,32 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1139 src/gui/windowmenu.cpp:167
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
#: src/gui/windows/setupwindow.cpp:61
msgid "Setup"
msgstr ""
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1143 src/gui/widgets/tabs/setup_perfomance.cpp:51
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1146 src/gui/widgets/tabs/setup_video.cpp:225
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:225
msgid "Video"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1149 src/gui/widgets/tabs/setup_theme.cpp:269
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1152 src/gui/windowmenu.cpp:74
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr ""
@@ -562,41 +562,41 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1156 src/gui/popups/popupmenu.cpp:619
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
#: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:69
-#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:138
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
#: src/gui/windows/shopwindow.cpp:78
msgid "Close"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1324
msgid "Logging in"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1367
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1492
+#: src/client.cpp:1489
msgid "Requesting characters"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1532
+#: src/client.cpp:1529
msgid "Connecting to the game server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1545
+#: src/client.cpp:1541
msgid "Changing game servers"
msgstr ""
@@ -611,12 +611,12 @@ msgstr ""
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1606 src/client.cpp:1617 src/client.cpp:1801
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:349
#: src/gui/windows/charselectdialog.cpp:299
-#: src/gui/windows/editserverdialog.cpp:218
+#: src/gui/windows/editserverdialog.cpp:186
#: src/gui/windows/registerdialog.cpp:260
#: src/gui/windows/unregisterdialog.cpp:146
#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
@@ -624,65 +624,65 @@ msgid "Error"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1629
+#: src/client.cpp:1625
msgid "Requesting registration details"
msgstr ""
#. TRANSLATORS: password change message header
-#: src/client.cpp:1670
+#: src/client.cpp:1666
msgid "Password Change"
msgstr ""
#. TRANSLATORS: password change message text
-#: src/client.cpp:1672
+#: src/client.cpp:1668
msgid "Password changed successfully!"
msgstr ""
#. TRANSLATORS: email change message header
-#: src/client.cpp:1694
+#: src/client.cpp:1690
msgid "Email Change"
msgstr ""
#. TRANSLATORS: email change message text
-#: src/client.cpp:1696
+#: src/client.cpp:1692
msgid "Email changed successfully!"
msgstr ""
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1719
+#: src/client.cpp:1715
msgid "Unregister Successful"
msgstr ""
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1721
+#: src/client.cpp:1717
msgid "Farewell, come back any time..."
msgstr ""
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1998 src/client.cpp:2013 src/client.cpp:2058
-#: src/client.cpp:2074 src/client.cpp:2525 src/client.cpp:2533
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2230
+#: src/client.cpp:2232
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2271 src/client.cpp:2278
+#: src/client.cpp:2273 src/client.cpp:2280
msgid "Error creating updates directory!"
msgstr ""
-#: src/client.cpp:2300 src/client.cpp:2317
+#: src/client.cpp:2302 src/client.cpp:2319
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: error message question
-#: src/client.cpp:3001
+#: src/client.cpp:3003
msgid "Do you want to open support page?"
msgstr ""
@@ -928,99 +928,154 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:277 src/gui/widgets/tabs/chattab.cpp:464
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
msgid "General"
msgstr ""
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:293 src/gui/widgets/tabs/chattab.cpp:466
-#: src/gui/windowmenu.cpp:154 src/gui/windows/debugwindow.cpp:53
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:575
+#: src/game.cpp:563
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:585
+#: src/game.cpp:573
msgid "Saving screenshot failed!"
msgstr ""
#. TRANSLATORS: error message text
-#: src/game.cpp:656
+#: src/game.cpp:644
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:659
+#: src/game.cpp:647
msgid "Network Error"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
-msgid "black"
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
msgstr ""
+#. TRANSLATORS: chat color
#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
+msgid "black"
+msgstr ""
+
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
msgid "red"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
msgid "green"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
msgid "blue"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
msgid "gold"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
msgid "yellow"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
msgid "pink"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
msgid "purple"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
msgid "grey"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
msgid "brown"
msgstr ""
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr ""
+
#. TRANSLATORS: relation type
#: src/gui/models/playerrelationlistmodel.h:33
msgid "Neutral"
@@ -1056,46 +1111,61 @@ msgstr ""
msgid "Enemy"
msgstr ""
-#. TRANSLATORS: inventory sort mode
-#. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#: src/gui/models/sortlistmodelinv.h:34
-#: src/gui/widgets/tabs/setup_other.cpp:72
-#: src/gui/widgets/tabs/setup_visual.cpp:78 src/gui/windows/chatwindow.cpp:150
-msgid "default"
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:36 src/gui/windows/buydialog.cpp:62
-msgid "by name"
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
msgstr ""
+#. TRANSLATORS: buy dialog sort type.
#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
+msgid "by name"
+msgstr ""
+
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:38 src/gui/windows/buydialog.cpp:64
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
msgid "by id"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:40 src/gui/windows/buydialog.cpp:66
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
msgid "by weight"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:42 src/gui/windows/buydialog.cpp:68
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
msgid "by amount"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:44 src/gui/windows/buydialog.cpp:70
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
msgid "by type"
msgstr ""
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr ""
+
#. TRANSLATORS: update type
#. TRANSLATORS: onscreen button size
#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
@@ -1242,8 +1312,8 @@ msgstr ""
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
-#: src/gui/windows/buydialog.cpp:208 src/gui/windows/buydialog.cpp:220
-#: src/gui/windows/buydialog.cpp:274 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
msgid "Buy"
msgstr ""
@@ -1340,12 +1410,12 @@ msgstr ""
#: src/gui/windows/changepassworddialog.cpp:57
#: src/gui/windows/charcreatedialog.cpp:121
#: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:79
-#: src/gui/windows/itemamountwindow.cpp:163
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
-#: src/gui/windows/socialwindow.cpp:1238
-#: src/gui/windows/textcommandeditor.cpp:203 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:54
#: src/gui/windows/updaterwindow.cpp:186
msgid "Cancel"
@@ -1417,7 +1487,7 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:150 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
msgstr ""
@@ -1430,7 +1500,7 @@ msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:134
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
msgid "Spells"
msgstr ""
@@ -1486,7 +1556,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
#. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1311
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
msgid "Leave"
msgstr ""
@@ -1567,8 +1637,8 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
-#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:223
-#: src/gui/windows/inventorywindow.cpp:745 src/gui/windows/setupwindow.cpp:96
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
msgid "Store"
msgstr ""
@@ -1599,7 +1669,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
msgid "Retrieve"
msgstr ""
@@ -1632,8 +1702,8 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
-#: src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:656 src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr ""
@@ -1667,8 +1737,8 @@ msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: language
#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/widgets/tabs/setup_theme.cpp:127
-#: src/gui/windows/socialwindow.cpp:1003
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
msgid "(default)"
msgstr ""
@@ -1824,8 +1894,8 @@ msgstr ""
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:645
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
msgid "Unequip"
msgstr ""
@@ -1833,16 +1903,16 @@ msgstr ""
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:172
-#: src/gui/windows/inventorywindow.cpp:650 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:189
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
msgid "Drop..."
msgstr ""
@@ -1856,15 +1926,15 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:138
-#: src/gui/windows/inventorywindow.cpp:758
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
msgid "Drop"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
msgid "Split"
msgstr ""
@@ -2020,10 +2090,10 @@ msgstr ""
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:276
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/windows/serverdialog.cpp:198
msgid "Quit"
msgstr ""
@@ -2585,7 +2655,7 @@ msgstr ""
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: register dialog. button.
#: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:146
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:330
#: src/gui/widgets/tabs/setup_visual.cpp:189
@@ -2612,9 +2682,8 @@ msgstr ""
#. TRANSLATORS: command editor button
#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
#: src/gui/windows/charselectdialog.cpp:108
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:94
-#: src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/textcommandeditor.cpp:207
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
msgid "Delete"
msgstr ""
@@ -2650,7 +2719,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:130
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
msgid "Shortcuts"
msgstr ""
@@ -2658,7 +2727,7 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:151
msgid "Windows"
msgstr ""
@@ -2674,7 +2743,7 @@ msgstr ""
#. TRANSLATORS: settings tab name
#. TRANSLATORS: chat window name
#: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:88 src/gui/windows/chatwindow.cpp:203
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
msgid "Chat"
msgstr ""
@@ -2897,7 +2966,7 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:137
-#: src/gui/windows/inventorywindow.cpp:569
+#: src/gui/windows/inventorywindow.cpp:568
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
#, c-format
@@ -2917,7 +2986,7 @@ msgstr ""
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/windows/serverdialog.cpp:204
msgid "Edit"
msgstr ""
@@ -2970,7 +3039,7 @@ msgstr ""
#. TRANSLATORS: tab in social window
#. TRANSLATORS: guild chat tab name
#: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:184 src/gui/windows/socialwindow.cpp:320
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
#: src/net/ea/gui/guildtab.cpp:44
msgid "Guild"
msgstr ""
@@ -2981,142 +3050,142 @@ msgid "Lang"
msgstr ""
#. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:49
+#: src/gui/widgets/tabs/setup_audio.cpp:48
msgid "Audio"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:57
+#: src/gui/widgets/tabs/setup_audio.cpp:56
msgid "Basic settings"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:60
+#: src/gui/widgets/tabs/setup_audio.cpp:59
msgid "Enable Audio"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:63
+#: src/gui/widgets/tabs/setup_audio.cpp:62
msgid "Enable music"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:67
+#: src/gui/widgets/tabs/setup_audio.cpp:66
msgid "Enable game sfx"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:71
+#: src/gui/widgets/tabs/setup_audio.cpp:70
msgid "Enable gui sfx"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:74
msgid "Sfx volume"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:78
msgid "Music volume"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:82
msgid "Enable music fade out"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:86
msgid "Audio frequency"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:90
msgid "mono"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:93
+#: src/gui/widgets/tabs/setup_audio.cpp:92
msgid "stereo"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:94
msgid "surround"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:97
+#: src/gui/widgets/tabs/setup_audio.cpp:96
msgid "surround+center+lfe"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:98
msgid "Audio channels"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:104
+#: src/gui/widgets/tabs/setup_audio.cpp:103
msgid "Sound effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:106
msgid "Information dialog sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:110
msgid "Request dialog sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:115
+#: src/gui/widgets/tabs/setup_audio.cpp:114
msgid "Whisper message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:118
msgid "Guild / Party message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:122
msgid "Highlight message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:126
msgid "Global message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:130
msgid "Error message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:134
msgid "Trade request sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:138
msgid "Show window sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:142
msgid "Hide window sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:150
msgid "Enable mumble voice chat"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:156
+#: src/gui/widgets/tabs/setup_audio.cpp:155
msgid "Download music"
msgstr ""
@@ -3412,7 +3481,7 @@ msgstr ""
#. TRANSLATORS: unknown key name
#. TRANSLATORS: quests window quest name
#: src/gui/widgets/tabs/setup_input.cpp:364
-#: src/gui/windows/questswindow.cpp:263
+#: src/gui/windows/questswindow.cpp:249
msgid "unknown"
msgstr ""
@@ -3571,7 +3640,7 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: debug window tab
#. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:105
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
#: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
#: src/gui/windows/minimap.cpp:114
msgid "Map"
@@ -3739,9 +3808,9 @@ msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: shop window name
#. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:146
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
#: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windows/inventorywindow.cpp:194
msgid "Shop"
msgstr ""
@@ -4123,252 +4192,252 @@ msgid "When ignoring:"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:64
+#: src/gui/widgets/tabs/setup_theme.cpp:63
msgid "Very small (8)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:66
+#: src/gui/widgets/tabs/setup_theme.cpp:65
msgid "Very small (9)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:68
+#: src/gui/widgets/tabs/setup_theme.cpp:67
msgid "Tiny (10)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:70
+#: src/gui/widgets/tabs/setup_theme.cpp:69
msgid "Small (11)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:72
+#: src/gui/widgets/tabs/setup_theme.cpp:71
msgid "Medium (12)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:74
+#: src/gui/widgets/tabs/setup_theme.cpp:73
msgid "Normal (13)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:76
+#: src/gui/widgets/tabs/setup_theme.cpp:75
msgid "Large (14)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:78
+#: src/gui/widgets/tabs/setup_theme.cpp:77
msgid "Large (15)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:80
+#: src/gui/widgets/tabs/setup_theme.cpp:79
msgid "Large (16)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:82
+#: src/gui/widgets/tabs/setup_theme.cpp:81
msgid "Big (17)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:83
msgid "Big (18)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:85
msgid "Big (19)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:87
msgid "Very big (20)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:89
msgid "Very big (21)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:91
msgid "Very big (22)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:93
msgid "Huge (23)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:129
+#: src/gui/widgets/tabs/setup_theme.cpp:128
msgid "Chinese (China)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:131
+#: src/gui/widgets/tabs/setup_theme.cpp:130
msgid "Czech"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:133
+#: src/gui/widgets/tabs/setup_theme.cpp:132
msgid "English"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:135
+#: src/gui/widgets/tabs/setup_theme.cpp:134
msgid "Finnish"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:137
+#: src/gui/widgets/tabs/setup_theme.cpp:136
msgid "French"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:139
+#: src/gui/widgets/tabs/setup_theme.cpp:138
msgid "German"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:141
+#: src/gui/widgets/tabs/setup_theme.cpp:140
msgid "Indonesian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:143
+#: src/gui/widgets/tabs/setup_theme.cpp:142
msgid "Italian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:145
+#: src/gui/widgets/tabs/setup_theme.cpp:144
msgid "Polish"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:147
+#: src/gui/widgets/tabs/setup_theme.cpp:146
msgid "Japanese"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:148
msgid "Dutch (Belgium/Flemish)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:150
msgid "Portuguese"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:152
msgid "Portuguese (Brazilian)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:154
msgid "Russian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:156
msgid "Spanish (Castilian)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:158
msgid "Turkish"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:211
+#: src/gui/widgets/tabs/setup_theme.cpp:210
msgid "Gui theme"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:218
+#: src/gui/widgets/tabs/setup_theme.cpp:217
msgid "Main Font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:223
+#: src/gui/widgets/tabs/setup_theme.cpp:222
msgid "Language"
msgstr ""
#. TRANSLATORS: theme settings label
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:227 src/gui/windows/emotewindow.cpp:45
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
msgid "Bold font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:230
msgid "Particle font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:235
+#: src/gui/widgets/tabs/setup_theme.cpp:234
msgid "Help font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:239
+#: src/gui/widgets/tabs/setup_theme.cpp:238
msgid "Secure font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:242
msgid "Npc font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:247
+#: src/gui/widgets/tabs/setup_theme.cpp:246
msgid "Japanese font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:250
msgid "Chinese font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:256
+#: src/gui/widgets/tabs/setup_theme.cpp:255
msgid "Font size"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:261
+#: src/gui/widgets/tabs/setup_theme.cpp:260
msgid "Npc font size"
msgstr ""
#. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:265
+#: src/gui/widgets/tabs/setup_theme.cpp:264
msgid "i"
msgstr ""
#. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:404
+#: src/gui/widgets/tabs/setup_theme.cpp:403
msgid "Name: "
msgstr ""
-#: src/gui/widgets/tabs/setup_theme.cpp:405
+#: src/gui/widgets/tabs/setup_theme.cpp:404
msgid "Copyright:"
msgstr ""
#. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:470
+#: src/gui/widgets/tabs/setup_theme.cpp:469
msgid "Theme info"
msgstr ""
#. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:497
+#: src/gui/widgets/tabs/setup_theme.cpp:496
msgid "Theme Changed"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:497
+#: src/gui/widgets/tabs/setup_theme.cpp:496
#: src/gui/widgets/tabs/setup_video.cpp:499
#: src/gui/widgets/tabs/setup_video.cpp:508
msgid "Restart your client for the change to take effect."
@@ -4699,178 +4768,169 @@ msgid "Allow screensaver to run"
msgstr ""
#. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:67
msgid "ONL"
msgstr ""
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:68
msgid "Who is online"
msgstr ""
#. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:70
msgid "HLP"
msgstr ""
#. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:73
msgid "QE"
msgstr ""
#. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:77 src/gui/windows/questswindow.cpp:126
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
msgid "Quests"
msgstr ""
#. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:76
msgid "BC"
msgstr ""
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:77
msgid "Bot checker"
msgstr ""
#. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:82
+#: src/gui/windowmenu.cpp:79
msgid "KS"
msgstr ""
#. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:83 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
msgid "Kill stats"
msgstr ""
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:82
msgid "Smilies"
msgstr ""
#. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:87
+#: src/gui/windowmenu.cpp:84
msgid "CH"
msgstr ""
#. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:95
+#: src/gui/windowmenu.cpp:92
msgid "STA"
msgstr ""
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:93
msgid "Status"
msgstr ""
#. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:95
msgid "EQU"
msgstr ""
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:58
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
msgid "Equipment"
msgstr ""
#. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:98
msgid "INV"
msgstr ""
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:130
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
#: src/inventory.cpp:257
msgid "Inventory"
msgstr ""
#. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:104
+#: src/gui/windowmenu.cpp:101
msgid "MAP"
msgstr ""
#. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:110
+#: src/gui/windowmenu.cpp:107
msgid "SKI"
msgstr ""
#. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
msgid "Skills"
msgstr ""
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:118
-msgid "SPE"
-msgstr ""
-
-#: src/gui/windowmenu.cpp:119
-msgid "Specials"
-msgstr ""
-
#. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:124
+#: src/gui/windowmenu.cpp:112
msgid "SOC"
msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:126 src/gui/windows/socialwindow.cpp:1284
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
msgid "Social"
msgstr ""
#. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:128
+#: src/gui/windowmenu.cpp:116
msgid "SH"
msgstr ""
#. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:132
+#: src/gui/windowmenu.cpp:120
msgid "SP"
msgstr ""
#. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:124
msgid "DR"
msgstr ""
#. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:128
msgid "YK"
msgstr ""
#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:130
msgid "Did you know"
msgstr ""
#. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:144
+#: src/gui/windowmenu.cpp:132
msgid "SHP"
msgstr ""
#. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:148
+#: src/gui/windowmenu.cpp:136
msgid "OU"
msgstr ""
#. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:152
+#: src/gui/windowmenu.cpp:140
msgid "DBG"
msgstr ""
#. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:149
msgid "WIN"
msgstr ""
#. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:153
msgid "SET"
msgstr ""
#. TRANSLATORS: short key name
#. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:301 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
#: src/gui/windows/outfitwindow.cpp:561
#, c-format
msgid "Key: %s"
@@ -4892,31 +4952,21 @@ msgstr ""
msgid "Result"
msgstr ""
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:58
-msgid "unsorted"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:60
-msgid "by price"
-msgstr ""
-
#. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:196
+#: src/gui/windows/buydialog.cpp:162
msgid "Create items"
msgstr ""
#. TRANSLATORS: buy dialog label
#. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:254 src/gui/windows/buydialog.cpp:541
-#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:366
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
#, c-format
msgid "Price: %s / Total: %s"
msgstr ""
#. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:263
+#: src/gui/windows/buydialog.cpp:229
msgid "Amount:"
msgstr ""
@@ -4926,8 +4976,8 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/itemamountwindow.cpp:159
-#: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
msgid "+"
msgstr ""
@@ -4938,8 +4988,8 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:271 src/gui/windows/itemamountwindow.cpp:157
-#: src/gui/windows/itemamountwindow.cpp:191 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
msgid "-"
msgstr ""
@@ -4947,9 +4997,9 @@ msgstr ""
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:274 src/gui/windows/charcreatedialog.cpp:119
-#: src/gui/windows/charselectdialog.cpp:593
-#: src/gui/windows/socialwindow.cpp:1307
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
msgid "Create"
msgstr ""
@@ -4958,7 +5008,7 @@ msgstr ""
#. TRANSLATORS: status bar label
#. TRANSLATORS: status window label
#. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:278 src/gui/windows/selldialog.cpp:112
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
#: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
#: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
msgid "Max"
@@ -5057,7 +5107,7 @@ msgstr ""
#. TRANSLATORS: login dialog label
#. TRANSLATORS: register dialog. label.
#: src/gui/windows/charcreatedialog.cpp:73
-#: src/gui/windows/editserverdialog.cpp:89 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
#: src/gui/windows/registerdialog.cpp:89
msgid "Name:"
msgstr ""
@@ -5118,7 +5168,7 @@ msgstr ""
#. TRANSLATORS: char create dialog label
#: src/gui/windows/charcreatedialog.cpp:115
-#: src/gui/windows/charcreatedialog.cpp:469
+#: src/gui/windows/charcreatedialog.cpp:458
#, c-format
msgid "Please distribute %d points"
msgstr ""
@@ -5134,17 +5184,17 @@ msgid "Look:"
msgstr ""
#. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:362
+#: src/gui/windows/charcreatedialog.cpp:351
msgid "Your name needs to be at least 4 characters."
msgstr ""
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:459
+#: src/gui/windows/charcreatedialog.cpp:448
msgid "Character stats OK"
msgstr ""
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:475
+#: src/gui/windows/charcreatedialog.cpp:464
#, c-format
msgid "Please remove %d points"
msgstr ""
@@ -5173,7 +5223,7 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:104
-#: src/gui/windows/charselectdialog.cpp:588
+#: src/gui/windows/charselectdialog.cpp:580
#: src/gui/windows/updaterwindow.cpp:188
msgid "Play"
msgstr ""
@@ -5229,35 +5279,20 @@ msgstr ""
msgid "Enter password:"
msgstr ""
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:172
-msgid "rainbow 1"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:174
-msgid "rainbow 2"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:176
-msgid "rainbow 3"
-msgstr ""
-
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:755
+#: src/gui/windows/chatwindow.cpp:705
#, c-format
msgid "Present: %s; %d players are present."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1169
+#: src/gui/windows/chatwindow.cpp:1119
#, c-format
msgid "Whispering to %s: %s"
msgstr ""
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1613
+#: src/gui/windows/chatwindow.cpp:1563
#, c-format
msgid "%s's pet"
msgstr ""
@@ -5503,51 +5538,51 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:77
-#: src/gui/windows/itemamountwindow.cpp:161 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
msgid "OK"
msgstr ""
#. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:66
+#: src/gui/windows/editserverdialog.cpp:45
msgid "Edit Server"
msgstr ""
#. TRANSLATORS: edit server dialog button
#. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:75
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
msgid "Connect"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:91
+#: src/gui/windows/editserverdialog.cpp:70
msgid "Address:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:93
+#: src/gui/windows/editserverdialog.cpp:72
msgid "Port:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:95
+#: src/gui/windows/editserverdialog.cpp:74
msgid "Server type:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:97
+#: src/gui/windows/editserverdialog.cpp:76
msgid "Description:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:99
+#: src/gui/windows/editserverdialog.cpp:78
msgid "Online list url:"
msgstr ""
#. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:220
+#: src/gui/windows/editserverdialog.cpp:188
msgid "Please at least type both the address and the port of the server."
msgstr ""
@@ -5567,47 +5602,47 @@ msgid "Did you know..."
msgstr ""
#. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:165
+#: src/gui/windows/itemamountwindow.cpp:164
msgid "All"
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:221
+#: src/gui/windows/itemamountwindow.cpp:220
msgid "Select amount of items to trade."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:225
+#: src/gui/windows/itemamountwindow.cpp:224
msgid "Select amount of items to drop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:229
+#: src/gui/windows/itemamountwindow.cpp:228
msgid "Select amount of items to store."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:233
+#: src/gui/windows/itemamountwindow.cpp:232
msgid "Select amount of items to retrieve."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:237
+#: src/gui/windows/itemamountwindow.cpp:236
msgid "Select amount of items to split."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:241
+#: src/gui/windows/itemamountwindow.cpp:240
msgid "Add to buy shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:245
+#: src/gui/windows/itemamountwindow.cpp:244
msgid "Add to sell shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:249
+#: src/gui/windows/itemamountwindow.cpp:248
msgid "Unknown."
msgstr ""
@@ -5857,7 +5892,7 @@ msgstr ""
#. TRANSLATORS: shop window label
#. TRANSLATORS: shop window button
#. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:258
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
#: src/gui/windows/tradewindow.cpp:78
msgid "Add"
@@ -5959,53 +5994,53 @@ msgid "Do you really want to sell %s?"
msgstr ""
#. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
msgid "Choose Your Server"
msgstr ""
#. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
msgid "Load"
msgstr ""
#. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
msgid "Choose Your Server *** SAFE MODE ***"
msgstr ""
#. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
msgid "Use same ip for game sub servers"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
msgid "Waiting for server..."
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
msgid "Preparing download"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
msgid "Error retreiving server list!"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
msgid "requires a newer version"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
#, c-format
msgid "requires v%s"
msgstr ""
@@ -6086,277 +6121,277 @@ msgid "Skill %d"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:225
+#: src/gui/windows/socialwindow.cpp:227
#, c-format
msgid "Invited user %s to guild %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:240
+#: src/gui/windows/socialwindow.cpp:242
#, c-format
msgid "Guild %s quit requested."
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:254
+#: src/gui/windows/socialwindow.cpp:256
msgid "Member Invite to Guild"
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:256
+#: src/gui/windows/socialwindow.cpp:258
#, c-format
msgid "Who would you like to invite to guild %s?"
msgstr ""
#. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:266
+#: src/gui/windows/socialwindow.cpp:268
msgid "Leave Guild?"
msgstr ""
#. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:268
+#: src/gui/windows/socialwindow.cpp:270
#, c-format
msgid "Are you sure you want to leave guild %s?"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:279
+#: src/gui/windows/socialwindow.cpp:281
#, c-format
msgid "Members: %u/%u"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:301 src/gui/windows/socialwindow.cpp:373
-#: src/gui/windows/socialwindow.cpp:498
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
#, c-format
msgid "Players: %u/%u"
msgstr ""
#. TRANSLATORS: tab in social window
#. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:389 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
msgid "Party"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:429
+#: src/gui/windows/socialwindow.cpp:431
#, c-format
msgid "Invited user %s to party."
msgstr ""
#. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:444
+#: src/gui/windows/socialwindow.cpp:446
#, c-format
msgid "Party %s quit requested."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:458
+#: src/gui/windows/socialwindow.cpp:460
msgid "Member Invite to Party"
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:460
+#: src/gui/windows/socialwindow.cpp:462
#, c-format
msgid "Who would you like to invite to party %s?"
msgstr ""
#. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:470
+#: src/gui/windows/socialwindow.cpp:472
msgid "Leave Party?"
msgstr ""
#. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:472
+#: src/gui/windows/socialwindow.cpp:474
#, c-format
msgid "Are you sure you want to leave party %s?"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:698
+#: src/gui/windows/socialwindow.cpp:665
#, c-format
msgid "Visible players: %d"
msgstr ""
#. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:725
+#: src/gui/windows/socialwindow.cpp:692
msgid "Nav"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:827
+#: src/gui/windows/socialwindow.cpp:794
#, c-format
msgid "Portals: %u/%u"
msgstr ""
#. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1054
+#: src/gui/windows/socialwindow.cpp:1021
msgid "Atk"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1073
+#: src/gui/windows/socialwindow.cpp:1040
msgid "Priority mobs"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1075
+#: src/gui/windows/socialwindow.cpp:1042
msgid "Attack mobs"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1077
+#: src/gui/windows/socialwindow.cpp:1044
msgid "Ignore mobs"
msgstr ""
#. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1101
+#: src/gui/windows/socialwindow.cpp:1068
msgid "Pik"
msgstr ""
#. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1120
+#: src/gui/windows/socialwindow.cpp:1087
msgid "Pickup items"
msgstr ""
#. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1122
+#: src/gui/windows/socialwindow.cpp:1089
msgid "Ignore items"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1212
+#: src/gui/windows/socialwindow.cpp:1179
#, c-format
msgid "Friends: %u/%u"
msgstr ""
#. TRANSLATORS: party popup item
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1235 src/gui/windows/socialwindow.cpp:1727
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
msgid "Create Party"
msgstr ""
#. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1298
+#: src/gui/windows/socialwindow.cpp:1265
msgid "P"
msgstr ""
#. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1303
+#: src/gui/windows/socialwindow.cpp:1270
msgid "F"
msgstr ""
#. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1309
+#: src/gui/windows/socialwindow.cpp:1276
msgid "Invite"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1503
+#: src/gui/windows/socialwindow.cpp:1470
#, c-format
msgid "Accepted party invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1514
+#: src/gui/windows/socialwindow.cpp:1481
#, c-format
msgid "Rejected party invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1531
+#: src/gui/windows/socialwindow.cpp:1498
#, c-format
msgid "Accepted guild invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1545
+#: src/gui/windows/socialwindow.cpp:1512
#, c-format
msgid "Rejected guild invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1585
+#: src/gui/windows/socialwindow.cpp:1552
#, c-format
msgid "Creating guild called %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1606
+#: src/gui/windows/socialwindow.cpp:1573
#, c-format
msgid "Creating party called %s."
msgstr ""
#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1621
+#: src/gui/windows/socialwindow.cpp:1588
msgid "Guild Name"
msgstr ""
#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1623
+#: src/gui/windows/socialwindow.cpp:1590
msgid "Choose your guild's name."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1639
+#: src/gui/windows/socialwindow.cpp:1606
msgid "Received guild request, but one already exists."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1647
+#: src/gui/windows/socialwindow.cpp:1614
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1654
+#: src/gui/windows/socialwindow.cpp:1621
msgid "Accept Guild Invite"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1670
+#: src/gui/windows/socialwindow.cpp:1637
msgid "Received party request, but one already exists."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1682
+#: src/gui/windows/socialwindow.cpp:1649
msgid "You have been invited you to join a party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1687
+#: src/gui/windows/socialwindow.cpp:1654
#, c-format
msgid "You have been invited to join the %s party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1696
+#: src/gui/windows/socialwindow.cpp:1663
#, c-format
msgid "%s has invited you to join their party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1702
+#: src/gui/windows/socialwindow.cpp:1669
#, c-format
msgid "%s has invited you to join the %s party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1712
+#: src/gui/windows/socialwindow.cpp:1679
msgid "Accept Party Invite"
msgstr ""
-#: src/gui/windows/socialwindow.cpp:1728
+#: src/gui/windows/socialwindow.cpp:1695
msgid "Cannot create party. You are already in a party"
msgstr ""
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1734
+#: src/gui/windows/socialwindow.cpp:1701
msgid "Party Name"
msgstr ""
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1736
+#: src/gui/windows/socialwindow.cpp:1703
msgid "Choose your party's name."
msgstr ""
@@ -6398,113 +6433,68 @@ msgstr ""
msgid "Correction points: %d"
msgstr ""
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "No Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Allow Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:105
-msgid "Need Target"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "General Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "Life Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "War Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Transmute Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Nature Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:121
-msgid "Astral Magic"
-msgstr ""
-
#. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:164
+#: src/gui/windows/textcommandeditor.cpp:47
msgid "Command Editor"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:52
msgid "magic"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:54
msgid "other"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:173
+#: src/gui/windows/textcommandeditor.cpp:56
msgid "Symbol:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:176
+#: src/gui/windows/textcommandeditor.cpp:59
msgid "Command:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:179
+#: src/gui/windows/textcommandeditor.cpp:62
msgid "Comment:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:183
+#: src/gui/windows/textcommandeditor.cpp:66
msgid "Target Type:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:187
+#: src/gui/windows/textcommandeditor.cpp:70
msgid "Icon:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:190
+#: src/gui/windows/textcommandeditor.cpp:73
msgid "Mana:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:193
+#: src/gui/windows/textcommandeditor.cpp:76
msgid "Magic level:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:197
+#: src/gui/windows/textcommandeditor.cpp:80
msgid "Magic School:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:200
+#: src/gui/windows/textcommandeditor.cpp:83
msgid "School level:"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/windows/textcommandeditor.cpp:88
msgid "Save"
msgstr ""
@@ -6534,7 +6524,7 @@ msgid "Trade: You"
msgstr ""
#. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
#, c-format
msgid "You get %s"
msgstr ""
@@ -6550,12 +6540,12 @@ msgid "You give:"
msgstr ""
#. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
msgid "You don't have enough money."
msgstr ""
#. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
msgid ""
"Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
@@ -6626,17 +6616,17 @@ msgid "Who Is Online - Update"
msgstr ""
#. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:87
+#: src/gui/windows/worldselectdialog.cpp:49
msgid "Select World"
msgstr ""
#. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:93
+#: src/gui/windows/worldselectdialog.cpp:55
msgid "Change Login"
msgstr ""
#. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:95
+#: src/gui/windows/worldselectdialog.cpp:57
msgid "Choose World"
msgstr ""
@@ -6854,7 +6844,7 @@ msgid "Failed to create character. Most likely the name is already taken."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:281
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
msgid "Wrong name."
msgstr ""
@@ -7012,58 +7002,58 @@ msgid "Experience sharing unknown."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:154
+#: src/net/ea/loginhandler.cpp:149
msgid "Account was not found. Please re-login."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/ea/loginhandler.cpp:153
msgid "Old password incorrect."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:162
+#: src/net/ea/loginhandler.cpp:157
msgid "New password too short."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:166 src/net/ea/loginhandler.cpp:293
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
msgid "Unknown error."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:239
+#: src/net/ea/loginhandler.cpp:234
msgid "Unregistered ID."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:238
msgid "Wrong password."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:248
+#: src/net/ea/loginhandler.cpp:243
msgid "Account expired."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:252
+#: src/net/ea/loginhandler.cpp:247
msgid "Rejected from server."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:256
+#: src/net/ea/loginhandler.cpp:251
msgid ""
"You have been permanently banned from the game. Please contact the GM team."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:261
+#: src/net/ea/loginhandler.cpp:256
msgid "Client too old."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:265
+#: src/net/ea/loginhandler.cpp:260
#, c-format
msgid ""
"You have been temporarily banned from the game until %s.\n"
@@ -7071,22 +7061,22 @@ msgid ""
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:273
+#: src/net/ea/loginhandler.cpp:268
msgid "Server overpopulated."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:277
+#: src/net/ea/loginhandler.cpp:272
msgid "This user name is already taken."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:285
+#: src/net/ea/loginhandler.cpp:280
msgid "Incorrect email."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:289
+#: src/net/ea/loginhandler.cpp:284
msgid "Username permanently erased."
msgstr ""
@@ -7759,7 +7749,7 @@ msgstr ""
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
#: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr ""
diff --git a/po/nb.po b/po/nb.po
index 0ea8cecc2..a6c0d82c5 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: 2014-02-23 00:42+0300\n"
-"PO-Revision-Date: 2014-02-23 08:14+0000\n"
+"POT-Creation-Date: 2014-02-28 21:21+0300\n"
+"PO-Revision-Date: 2014-03-01 08:14+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"
@@ -29,7 +29,7 @@ msgid "Accepting incoming trade requests"
msgstr ""
#. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
msgid "Visible on map"
msgstr ""
@@ -38,68 +38,68 @@ msgstr ""
msgid "Human"
msgstr ""
-#: src/being/being.cpp:544
+#: src/being/being.cpp:496
msgid "dodge"
msgstr ""
-#: src/being/being.cpp:544
+#: src/being/being.cpp:496
msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1965 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1970 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr ""
#. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:392
+#: src/being/localplayer.cpp:376
#, c-format
msgid "You were killed by %s"
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1377
+#: src/being/localplayer.cpp:816
msgid "Tried to pick up nonexistent item."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1381
+#: src/being/localplayer.cpp:820
msgid "Item is too heavy."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1385
+#: src/being/localplayer.cpp:824
msgid "Item is too far away."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1389
+#: src/being/localplayer.cpp:828
msgid "Inventory is full."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1393
+#: src/being/localplayer.cpp:832
msgid "Stack is too big."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1397
+#: src/being/localplayer.cpp:836
msgid "Item belongs to someone else."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1401
+#: src/being/localplayer.cpp:840
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:1425
+#: src/being/localplayer.cpp:864
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -107,387 +107,387 @@ msgstr[0] ""
msgstr[1] ""
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1630 src/being/localplayer.cpp:1665
-#: src/being/localplayer.cpp:1666
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
msgid "xp"
msgstr ""
-#: src/being/localplayer.cpp:1671 src/being/localplayer.cpp:1678
-#: src/being/localplayer.cpp:1685
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
msgid "job"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1871
+#: src/being/localplayer.cpp:1285
msgid "(D) default moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1873
+#: src/being/localplayer.cpp:1287
msgid "(I) invert moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1875
+#: src/being/localplayer.cpp:1289
msgid "(c) moves with some crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1877
+#: src/being/localplayer.cpp:1291
msgid "(C) moves with crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1879
+#: src/being/localplayer.cpp:1293
msgid "(d) double normal + crazy"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1881
+#: src/being/localplayer.cpp:1295
msgid "(?) unknown move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1904
+#: src/being/localplayer.cpp:1318
#, c-format
msgid "(%u) crazy move number %u"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1910
+#: src/being/localplayer.cpp:1324
msgid "(a) custom crazy move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1915
+#: src/being/localplayer.cpp:1329
msgid "(?) crazy move"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1930
+#: src/being/localplayer.cpp:1344
msgid "(0) default moves to target"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1932
+#: src/being/localplayer.cpp:1346
msgid "(1) moves to target in distance 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1934
+#: src/being/localplayer.cpp:1348
msgid "(2) moves to target in distance 2"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1936
+#: src/being/localplayer.cpp:1350
msgid "(3) moves to target in distance 3"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1938
+#: src/being/localplayer.cpp:1352
msgid "(5) moves to target in distance 5"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1940
+#: src/being/localplayer.cpp:1354
msgid "(7) moves to target in distance 7"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1942
+#: src/being/localplayer.cpp:1356
msgid "(A) moves to target in attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1944
+#: src/being/localplayer.cpp:1358
msgid "(a) archer attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1946
+#: src/being/localplayer.cpp:1360
msgid "(B) moves to target in attack range - 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1948
+#: src/being/localplayer.cpp:1362
msgid "(?) move to target"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1968
+#: src/being/localplayer.cpp:1382
msgid "(D) default follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1970
+#: src/being/localplayer.cpp:1384
msgid "(R) relative follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1972
+#: src/being/localplayer.cpp:1386
msgid "(M) mirror follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1974
+#: src/being/localplayer.cpp:1388
msgid "(P) pet follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1976
+#: src/being/localplayer.cpp:1390
msgid "(?) unknown follow"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1996 src/being/localplayer.cpp:2004
-#: src/being/localplayer.cpp:2032
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
msgid "(?) attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1998 src/being/localplayer.cpp:2024
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
msgid "(D) default attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2000
+#: src/being/localplayer.cpp:1414
msgid "(s) switch attack without shield"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2002
+#: src/being/localplayer.cpp:1416
msgid "(S) switch attack with shield"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2026
+#: src/being/localplayer.cpp:1440
msgid "(G) go and attack"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2028
+#: src/being/localplayer.cpp:1442
msgid "(A) go, attack, pickup"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2030
+#: src/being/localplayer.cpp:1444
msgid "(d) without auto attack"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2084
+#: src/being/localplayer.cpp:1498
msgid "(S) small pick up 1x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2086
+#: src/being/localplayer.cpp:1500
msgid "(D) default pick up 2x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2088
+#: src/being/localplayer.cpp:1502
msgid "(F) forward pick up 2x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2090
+#: src/being/localplayer.cpp:1504
msgid "(3) pick up 3x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2092
+#: src/being/localplayer.cpp:1506
msgid "(g) go and pick up in distance 4"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2094
+#: src/being/localplayer.cpp:1508
msgid "(G) go and pick up in distance 8"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2096
+#: src/being/localplayer.cpp:1510
msgid "(A) go and pick up in max distance"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2098
+#: src/being/localplayer.cpp:1512
msgid "(?) pick up"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2112
+#: src/being/localplayer.cpp:1526
msgid "(N) normal map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2114
+#: src/being/localplayer.cpp:1528
msgid "(D) debug map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2116
+#: src/being/localplayer.cpp:1530
msgid "(u) ultra map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2118
+#: src/being/localplayer.cpp:1532
msgid "(U) ultra map view 2"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2120
+#: src/being/localplayer.cpp:1534
msgid "(e) empty map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2122
+#: src/being/localplayer.cpp:1536
msgid "(b) black & white map view"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2142
+#: src/being/localplayer.cpp:1556
msgid "(f) use #flar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2144
+#: src/being/localplayer.cpp:1558
msgid "(c) use #chiza for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2146
+#: src/being/localplayer.cpp:1560
msgid "(I) use #ingrav for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2148
+#: src/being/localplayer.cpp:1562
msgid "(F) use #frillyar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2150
+#: src/being/localplayer.cpp:1564
msgid "(U) use #upmarmu for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2152
+#: src/being/localplayer.cpp:1566
msgid "(?) magic attack"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2172
+#: src/being/localplayer.cpp:1586
msgid "(a) attack all players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2174
+#: src/being/localplayer.cpp:1588
msgid "(f) attack all except friends"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2176
+#: src/being/localplayer.cpp:1590
msgid "(b) attack bad relations"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2178
+#: src/being/localplayer.cpp:1592
msgid "(d) don't attack players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2180
+#: src/being/localplayer.cpp:1594
msgid "(?) pvp attack"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2200
+#: src/being/localplayer.cpp:1614
msgid "(D) default imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2202
+#: src/being/localplayer.cpp:1616
msgid "(O) outfits imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2204
+#: src/being/localplayer.cpp:1618
msgid "(?) imitation"
msgstr ""
#. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2233
+#: src/being/localplayer.cpp:1647
msgid "Away"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2256
+#: src/being/localplayer.cpp:1670
msgid "(O) on keyboard"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2258
+#: src/being/localplayer.cpp:1672
msgid "(A) away"
msgstr ""
#. TRANSLATORS: away type in status bar
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2260 src/being/localplayer.cpp:2278
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
msgid "(?) away"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2274
+#: src/being/localplayer.cpp:1688
msgid "(G) game camera mode"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2276
+#: src/being/localplayer.cpp:1690
msgid "(F) free camera mode"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2303
+#: src/being/localplayer.cpp:1717
msgid "Game modifiers are enabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2305
+#: src/being/localplayer.cpp:1719
msgid "Game modifiers are disabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2307
+#: src/being/localplayer.cpp:1721
msgid "Game modifiers are unknown"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3887
+#: src/being/localplayer.cpp:3287
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3893 src/being/localplayer.cpp:3918
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3903
+#: src/being/localplayer.cpp:3303
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3909 src/being/localplayer.cpp:3923
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4266
+#: src/being/localplayer.cpp:3666
#, c-format
msgid "You see %s"
msgstr ""
@@ -525,32 +525,32 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1139 src/gui/windowmenu.cpp:167
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
#: src/gui/windows/setupwindow.cpp:61
msgid "Setup"
msgstr ""
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1143 src/gui/widgets/tabs/setup_perfomance.cpp:51
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1146 src/gui/widgets/tabs/setup_video.cpp:225
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:225
msgid "Video"
msgstr "Video"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1149 src/gui/widgets/tabs/setup_theme.cpp:269
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1152 src/gui/windowmenu.cpp:74
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr "Hjelp"
@@ -563,41 +563,41 @@ msgstr "Hjelp"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1156 src/gui/popups/popupmenu.cpp:619
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
#: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:69
-#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:138
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
#: src/gui/windows/shopwindow.cpp:78
msgid "Close"
msgstr "Lukk"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1324
msgid "Logging in"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1367
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1492
+#: src/client.cpp:1489
msgid "Requesting characters"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1532
+#: src/client.cpp:1529
msgid "Connecting to the game server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1545
+#: src/client.cpp:1541
msgid "Changing game servers"
msgstr ""
@@ -612,12 +612,12 @@ msgstr ""
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1606 src/client.cpp:1617 src/client.cpp:1801
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:349
#: src/gui/windows/charselectdialog.cpp:299
-#: src/gui/windows/editserverdialog.cpp:218
+#: src/gui/windows/editserverdialog.cpp:186
#: src/gui/windows/registerdialog.cpp:260
#: src/gui/windows/unregisterdialog.cpp:146
#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
@@ -625,65 +625,65 @@ msgid "Error"
msgstr "Feil"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1629
+#: src/client.cpp:1625
msgid "Requesting registration details"
msgstr ""
#. TRANSLATORS: password change message header
-#: src/client.cpp:1670
+#: src/client.cpp:1666
msgid "Password Change"
msgstr ""
#. TRANSLATORS: password change message text
-#: src/client.cpp:1672
+#: src/client.cpp:1668
msgid "Password changed successfully!"
msgstr ""
#. TRANSLATORS: email change message header
-#: src/client.cpp:1694
+#: src/client.cpp:1690
msgid "Email Change"
msgstr ""
#. TRANSLATORS: email change message text
-#: src/client.cpp:1696
+#: src/client.cpp:1692
msgid "Email changed successfully!"
msgstr ""
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1719
+#: src/client.cpp:1715
msgid "Unregister Successful"
msgstr ""
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1721
+#: src/client.cpp:1717
msgid "Farewell, come back any time..."
msgstr ""
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1998 src/client.cpp:2013 src/client.cpp:2058
-#: src/client.cpp:2074 src/client.cpp:2525 src/client.cpp:2533
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2230
+#: src/client.cpp:2232
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2271 src/client.cpp:2278
+#: src/client.cpp:2273 src/client.cpp:2280
msgid "Error creating updates directory!"
msgstr ""
-#: src/client.cpp:2300 src/client.cpp:2317
+#: src/client.cpp:2302 src/client.cpp:2319
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: error message question
-#: src/client.cpp:3001
+#: src/client.cpp:3003
msgid "Do you want to open support page?"
msgstr ""
@@ -929,99 +929,154 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:277 src/gui/widgets/tabs/chattab.cpp:464
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
msgid "General"
msgstr "Generelt"
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:293 src/gui/widgets/tabs/chattab.cpp:466
-#: src/gui/windowmenu.cpp:154 src/gui/windows/debugwindow.cpp:53
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:575
+#: src/game.cpp:563
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:585
+#: src/game.cpp:573
msgid "Saving screenshot failed!"
msgstr "Lagring av skjermbilde feilet!"
#. TRANSLATORS: error message text
-#: src/game.cpp:656
+#: src/game.cpp:644
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:659
+#: src/game.cpp:647
msgid "Network Error"
msgstr "Nettverksfeil"
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
-msgid "black"
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
msgstr ""
+#. TRANSLATORS: chat color
#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
+msgid "black"
+msgstr ""
+
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
msgid "red"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
msgid "green"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
msgid "blue"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
msgid "gold"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
msgid "yellow"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
msgid "pink"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
msgid "purple"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
msgid "grey"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
msgid "brown"
msgstr ""
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr ""
+
#. TRANSLATORS: relation type
#: src/gui/models/playerrelationlistmodel.h:33
msgid "Neutral"
@@ -1057,46 +1112,61 @@ msgstr ""
msgid "Enemy"
msgstr ""
-#. TRANSLATORS: inventory sort mode
-#. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#: src/gui/models/sortlistmodelinv.h:34
-#: src/gui/widgets/tabs/setup_other.cpp:72
-#: src/gui/widgets/tabs/setup_visual.cpp:78 src/gui/windows/chatwindow.cpp:150
-msgid "default"
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:36 src/gui/windows/buydialog.cpp:62
-msgid "by name"
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
msgstr ""
+#. TRANSLATORS: buy dialog sort type.
#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
+msgid "by name"
+msgstr ""
+
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:38 src/gui/windows/buydialog.cpp:64
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
msgid "by id"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:40 src/gui/windows/buydialog.cpp:66
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
msgid "by weight"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:42 src/gui/windows/buydialog.cpp:68
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
msgid "by amount"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:44 src/gui/windows/buydialog.cpp:70
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
msgid "by type"
msgstr ""
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr ""
+
#. TRANSLATORS: update type
#. TRANSLATORS: onscreen button size
#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
@@ -1243,8 +1313,8 @@ msgstr ""
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
-#: src/gui/windows/buydialog.cpp:208 src/gui/windows/buydialog.cpp:220
-#: src/gui/windows/buydialog.cpp:274 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
msgid "Buy"
msgstr "Kjøp"
@@ -1341,12 +1411,12 @@ msgstr ""
#: src/gui/windows/changepassworddialog.cpp:57
#: src/gui/windows/charcreatedialog.cpp:121
#: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:79
-#: src/gui/windows/itemamountwindow.cpp:163
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
-#: src/gui/windows/socialwindow.cpp:1238
-#: src/gui/windows/textcommandeditor.cpp:203 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:54
#: src/gui/windows/updaterwindow.cpp:186
msgid "Cancel"
@@ -1418,7 +1488,7 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:150 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
msgstr ""
@@ -1431,7 +1501,7 @@ msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:134
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
msgid "Spells"
msgstr ""
@@ -1487,7 +1557,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
#. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1311
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
msgid "Leave"
msgstr ""
@@ -1568,8 +1638,8 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
-#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:223
-#: src/gui/windows/inventorywindow.cpp:745 src/gui/windows/setupwindow.cpp:96
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
msgid "Store"
msgstr ""
@@ -1600,7 +1670,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
msgid "Retrieve"
msgstr ""
@@ -1633,8 +1703,8 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
-#: src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:656 src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr "Bruk"
@@ -1668,8 +1738,8 @@ msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: language
#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/widgets/tabs/setup_theme.cpp:127
-#: src/gui/windows/socialwindow.cpp:1003
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
msgid "(default)"
msgstr ""
@@ -1825,8 +1895,8 @@ msgstr ""
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:645
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
msgid "Unequip"
msgstr ""
@@ -1834,16 +1904,16 @@ msgstr ""
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:172
-#: src/gui/windows/inventorywindow.cpp:650 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:189
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
msgid "Drop..."
msgstr ""
@@ -1857,15 +1927,15 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:138
-#: src/gui/windows/inventorywindow.cpp:758
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
msgid "Drop"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
msgid "Split"
msgstr "Del opp"
@@ -2021,10 +2091,10 @@ msgstr ""
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:276
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/windows/serverdialog.cpp:198
msgid "Quit"
msgstr "Avslutt"
@@ -2586,7 +2656,7 @@ msgstr ""
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: register dialog. button.
#: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:146
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:330
#: src/gui/widgets/tabs/setup_visual.cpp:189
@@ -2613,9 +2683,8 @@ msgstr ""
#. TRANSLATORS: command editor button
#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
#: src/gui/windows/charselectdialog.cpp:108
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:94
-#: src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/textcommandeditor.cpp:207
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
msgid "Delete"
msgstr "Slett"
@@ -2651,7 +2720,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:130
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
msgid "Shortcuts"
msgstr ""
@@ -2659,7 +2728,7 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:151
msgid "Windows"
msgstr ""
@@ -2675,7 +2744,7 @@ msgstr ""
#. TRANSLATORS: settings tab name
#. TRANSLATORS: chat window name
#: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:88 src/gui/windows/chatwindow.cpp:203
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
msgid "Chat"
msgstr ""
@@ -2898,7 +2967,7 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:137
-#: src/gui/windows/inventorywindow.cpp:569
+#: src/gui/windows/inventorywindow.cpp:568
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
#, c-format
@@ -2918,7 +2987,7 @@ msgstr ""
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/windows/serverdialog.cpp:204
msgid "Edit"
msgstr ""
@@ -2971,7 +3040,7 @@ msgstr ""
#. TRANSLATORS: tab in social window
#. TRANSLATORS: guild chat tab name
#: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:184 src/gui/windows/socialwindow.cpp:320
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
#: src/net/ea/gui/guildtab.cpp:44
msgid "Guild"
msgstr ""
@@ -2982,142 +3051,142 @@ msgid "Lang"
msgstr ""
#. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:49
+#: src/gui/widgets/tabs/setup_audio.cpp:48
msgid "Audio"
msgstr "Audio"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:57
+#: src/gui/widgets/tabs/setup_audio.cpp:56
msgid "Basic settings"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:60
+#: src/gui/widgets/tabs/setup_audio.cpp:59
msgid "Enable Audio"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:63
+#: src/gui/widgets/tabs/setup_audio.cpp:62
msgid "Enable music"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:67
+#: src/gui/widgets/tabs/setup_audio.cpp:66
msgid "Enable game sfx"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:71
+#: src/gui/widgets/tabs/setup_audio.cpp:70
msgid "Enable gui sfx"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:74
msgid "Sfx volume"
msgstr "Lydeffekt-volum"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:78
msgid "Music volume"
msgstr "Musikk-volum"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:82
msgid "Enable music fade out"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:86
msgid "Audio frequency"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:90
msgid "mono"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:93
+#: src/gui/widgets/tabs/setup_audio.cpp:92
msgid "stereo"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:94
msgid "surround"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:97
+#: src/gui/widgets/tabs/setup_audio.cpp:96
msgid "surround+center+lfe"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:98
msgid "Audio channels"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:104
+#: src/gui/widgets/tabs/setup_audio.cpp:103
msgid "Sound effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:106
msgid "Information dialog sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:110
msgid "Request dialog sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:115
+#: src/gui/widgets/tabs/setup_audio.cpp:114
msgid "Whisper message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:118
msgid "Guild / Party message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:122
msgid "Highlight message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:126
msgid "Global message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:130
msgid "Error message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:134
msgid "Trade request sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:138
msgid "Show window sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:142
msgid "Hide window sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:150
msgid "Enable mumble voice chat"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:156
+#: src/gui/widgets/tabs/setup_audio.cpp:155
msgid "Download music"
msgstr ""
@@ -3413,7 +3482,7 @@ msgstr ""
#. TRANSLATORS: unknown key name
#. TRANSLATORS: quests window quest name
#: src/gui/widgets/tabs/setup_input.cpp:364
-#: src/gui/windows/questswindow.cpp:263
+#: src/gui/windows/questswindow.cpp:249
msgid "unknown"
msgstr ""
@@ -3572,7 +3641,7 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: debug window tab
#. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:105
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
#: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
#: src/gui/windows/minimap.cpp:114
msgid "Map"
@@ -3740,9 +3809,9 @@ msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: shop window name
#. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:146
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
#: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windows/inventorywindow.cpp:194
msgid "Shop"
msgstr "Butikk"
@@ -4124,252 +4193,252 @@ msgid "When ignoring:"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:64
+#: src/gui/widgets/tabs/setup_theme.cpp:63
msgid "Very small (8)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:66
+#: src/gui/widgets/tabs/setup_theme.cpp:65
msgid "Very small (9)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:68
+#: src/gui/widgets/tabs/setup_theme.cpp:67
msgid "Tiny (10)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:70
+#: src/gui/widgets/tabs/setup_theme.cpp:69
msgid "Small (11)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:72
+#: src/gui/widgets/tabs/setup_theme.cpp:71
msgid "Medium (12)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:74
+#: src/gui/widgets/tabs/setup_theme.cpp:73
msgid "Normal (13)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:76
+#: src/gui/widgets/tabs/setup_theme.cpp:75
msgid "Large (14)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:78
+#: src/gui/widgets/tabs/setup_theme.cpp:77
msgid "Large (15)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:80
+#: src/gui/widgets/tabs/setup_theme.cpp:79
msgid "Large (16)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:82
+#: src/gui/widgets/tabs/setup_theme.cpp:81
msgid "Big (17)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:83
msgid "Big (18)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:85
msgid "Big (19)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:87
msgid "Very big (20)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:89
msgid "Very big (21)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:91
msgid "Very big (22)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:93
msgid "Huge (23)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:129
+#: src/gui/widgets/tabs/setup_theme.cpp:128
msgid "Chinese (China)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:131
+#: src/gui/widgets/tabs/setup_theme.cpp:130
msgid "Czech"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:133
+#: src/gui/widgets/tabs/setup_theme.cpp:132
msgid "English"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:135
+#: src/gui/widgets/tabs/setup_theme.cpp:134
msgid "Finnish"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:137
+#: src/gui/widgets/tabs/setup_theme.cpp:136
msgid "French"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:139
+#: src/gui/widgets/tabs/setup_theme.cpp:138
msgid "German"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:141
+#: src/gui/widgets/tabs/setup_theme.cpp:140
msgid "Indonesian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:143
+#: src/gui/widgets/tabs/setup_theme.cpp:142
msgid "Italian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:145
+#: src/gui/widgets/tabs/setup_theme.cpp:144
msgid "Polish"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:147
+#: src/gui/widgets/tabs/setup_theme.cpp:146
msgid "Japanese"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:148
msgid "Dutch (Belgium/Flemish)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:150
msgid "Portuguese"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:152
msgid "Portuguese (Brazilian)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:154
msgid "Russian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:156
msgid "Spanish (Castilian)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:158
msgid "Turkish"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:211
+#: src/gui/widgets/tabs/setup_theme.cpp:210
msgid "Gui theme"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:218
+#: src/gui/widgets/tabs/setup_theme.cpp:217
msgid "Main Font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:223
+#: src/gui/widgets/tabs/setup_theme.cpp:222
msgid "Language"
msgstr ""
#. TRANSLATORS: theme settings label
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:227 src/gui/windows/emotewindow.cpp:45
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
msgid "Bold font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:230
msgid "Particle font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:235
+#: src/gui/widgets/tabs/setup_theme.cpp:234
msgid "Help font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:239
+#: src/gui/widgets/tabs/setup_theme.cpp:238
msgid "Secure font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:242
msgid "Npc font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:247
+#: src/gui/widgets/tabs/setup_theme.cpp:246
msgid "Japanese font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:250
msgid "Chinese font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:256
+#: src/gui/widgets/tabs/setup_theme.cpp:255
msgid "Font size"
msgstr "Skriftstørrelse"
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:261
+#: src/gui/widgets/tabs/setup_theme.cpp:260
msgid "Npc font size"
msgstr ""
#. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:265
+#: src/gui/widgets/tabs/setup_theme.cpp:264
msgid "i"
msgstr ""
#. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:404
+#: src/gui/widgets/tabs/setup_theme.cpp:403
msgid "Name: "
msgstr ""
-#: src/gui/widgets/tabs/setup_theme.cpp:405
+#: src/gui/widgets/tabs/setup_theme.cpp:404
msgid "Copyright:"
msgstr ""
#. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:470
+#: src/gui/widgets/tabs/setup_theme.cpp:469
msgid "Theme info"
msgstr ""
#. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:497
+#: src/gui/widgets/tabs/setup_theme.cpp:496
msgid "Theme Changed"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:497
+#: src/gui/widgets/tabs/setup_theme.cpp:496
#: src/gui/widgets/tabs/setup_video.cpp:499
#: src/gui/widgets/tabs/setup_video.cpp:508
msgid "Restart your client for the change to take effect."
@@ -4700,178 +4769,169 @@ msgid "Allow screensaver to run"
msgstr ""
#. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:67
msgid "ONL"
msgstr ""
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:68
msgid "Who is online"
msgstr ""
#. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:70
msgid "HLP"
msgstr ""
#. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:73
msgid "QE"
msgstr ""
#. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:77 src/gui/windows/questswindow.cpp:126
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
msgid "Quests"
msgstr ""
#. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:76
msgid "BC"
msgstr ""
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:77
msgid "Bot checker"
msgstr ""
#. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:82
+#: src/gui/windowmenu.cpp:79
msgid "KS"
msgstr ""
#. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:83 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
msgid "Kill stats"
msgstr ""
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:82
msgid "Smilies"
msgstr ""
#. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:87
+#: src/gui/windowmenu.cpp:84
msgid "CH"
msgstr ""
#. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:95
+#: src/gui/windowmenu.cpp:92
msgid "STA"
msgstr ""
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:93
msgid "Status"
msgstr ""
#. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:95
msgid "EQU"
msgstr ""
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:58
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
msgid "Equipment"
msgstr "Utstyr"
#. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:98
msgid "INV"
msgstr ""
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:130
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
#: src/inventory.cpp:257
msgid "Inventory"
msgstr ""
#. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:104
+#: src/gui/windowmenu.cpp:101
msgid "MAP"
msgstr ""
#. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:110
+#: src/gui/windowmenu.cpp:107
msgid "SKI"
msgstr ""
#. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
msgid "Skills"
msgstr "Ferdigheter"
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:118
-msgid "SPE"
-msgstr ""
-
-#: src/gui/windowmenu.cpp:119
-msgid "Specials"
-msgstr ""
-
#. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:124
+#: src/gui/windowmenu.cpp:112
msgid "SOC"
msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:126 src/gui/windows/socialwindow.cpp:1284
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
msgid "Social"
msgstr ""
#. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:128
+#: src/gui/windowmenu.cpp:116
msgid "SH"
msgstr ""
#. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:132
+#: src/gui/windowmenu.cpp:120
msgid "SP"
msgstr ""
#. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:124
msgid "DR"
msgstr ""
#. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:128
msgid "YK"
msgstr ""
#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:130
msgid "Did you know"
msgstr ""
#. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:144
+#: src/gui/windowmenu.cpp:132
msgid "SHP"
msgstr ""
#. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:148
+#: src/gui/windowmenu.cpp:136
msgid "OU"
msgstr ""
#. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:152
+#: src/gui/windowmenu.cpp:140
msgid "DBG"
msgstr ""
#. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:149
msgid "WIN"
msgstr ""
#. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:153
msgid "SET"
msgstr ""
#. TRANSLATORS: short key name
#. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:301 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
#: src/gui/windows/outfitwindow.cpp:561
#, c-format
msgid "Key: %s"
@@ -4893,31 +4953,21 @@ msgstr "Tilbakestill"
msgid "Result"
msgstr ""
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:58
-msgid "unsorted"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:60
-msgid "by price"
-msgstr ""
-
#. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:196
+#: src/gui/windows/buydialog.cpp:162
msgid "Create items"
msgstr ""
#. TRANSLATORS: buy dialog label
#. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:254 src/gui/windows/buydialog.cpp:541
-#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:366
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Pris: %s / Totalt: %s"
#. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:263
+#: src/gui/windows/buydialog.cpp:229
msgid "Amount:"
msgstr ""
@@ -4927,8 +4977,8 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/itemamountwindow.cpp:159
-#: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
msgid "+"
msgstr ""
@@ -4939,8 +4989,8 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:271 src/gui/windows/itemamountwindow.cpp:157
-#: src/gui/windows/itemamountwindow.cpp:191 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
msgid "-"
msgstr ""
@@ -4948,9 +4998,9 @@ msgstr ""
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:274 src/gui/windows/charcreatedialog.cpp:119
-#: src/gui/windows/charselectdialog.cpp:593
-#: src/gui/windows/socialwindow.cpp:1307
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
msgid "Create"
msgstr "Lag"
@@ -4959,7 +5009,7 @@ msgstr "Lag"
#. TRANSLATORS: status bar label
#. TRANSLATORS: status window label
#. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:278 src/gui/windows/selldialog.cpp:112
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
#: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
#: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
msgid "Max"
@@ -5058,7 +5108,7 @@ msgstr ""
#. TRANSLATORS: login dialog label
#. TRANSLATORS: register dialog. label.
#: src/gui/windows/charcreatedialog.cpp:73
-#: src/gui/windows/editserverdialog.cpp:89 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
#: src/gui/windows/registerdialog.cpp:89
msgid "Name:"
msgstr "Navn:"
@@ -5119,7 +5169,7 @@ msgstr "Kvinne"
#. TRANSLATORS: char create dialog label
#: src/gui/windows/charcreatedialog.cpp:115
-#: src/gui/windows/charcreatedialog.cpp:469
+#: src/gui/windows/charcreatedialog.cpp:458
#, c-format
msgid "Please distribute %d points"
msgstr "Vennligst distribuer %d poeng"
@@ -5135,17 +5185,17 @@ msgid "Look:"
msgstr ""
#. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:362
+#: src/gui/windows/charcreatedialog.cpp:351
msgid "Your name needs to be at least 4 characters."
msgstr "Navnet ditt må minst være 4 bokstaver."
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:459
+#: src/gui/windows/charcreatedialog.cpp:448
msgid "Character stats OK"
msgstr ""
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:475
+#: src/gui/windows/charcreatedialog.cpp:464
#, c-format
msgid "Please remove %d points"
msgstr "Vennligst fjern %d poeng"
@@ -5174,7 +5224,7 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:104
-#: src/gui/windows/charselectdialog.cpp:588
+#: src/gui/windows/charselectdialog.cpp:580
#: src/gui/windows/updaterwindow.cpp:188
msgid "Play"
msgstr ""
@@ -5230,35 +5280,20 @@ msgstr ""
msgid "Enter password:"
msgstr ""
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:172
-msgid "rainbow 1"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:174
-msgid "rainbow 2"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:176
-msgid "rainbow 3"
-msgstr ""
-
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:755
+#: src/gui/windows/chatwindow.cpp:705
#, c-format
msgid "Present: %s; %d players are present."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1169
+#: src/gui/windows/chatwindow.cpp:1119
#, c-format
msgid "Whispering to %s: %s"
msgstr ""
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1613
+#: src/gui/windows/chatwindow.cpp:1563
#, c-format
msgid "%s's pet"
msgstr ""
@@ -5504,51 +5539,51 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:77
-#: src/gui/windows/itemamountwindow.cpp:161 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
msgid "OK"
msgstr "OK"
#. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:66
+#: src/gui/windows/editserverdialog.cpp:45
msgid "Edit Server"
msgstr ""
#. TRANSLATORS: edit server dialog button
#. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:75
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
msgid "Connect"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:91
+#: src/gui/windows/editserverdialog.cpp:70
msgid "Address:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:93
+#: src/gui/windows/editserverdialog.cpp:72
msgid "Port:"
msgstr "Port:"
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:95
+#: src/gui/windows/editserverdialog.cpp:74
msgid "Server type:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:97
+#: src/gui/windows/editserverdialog.cpp:76
msgid "Description:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:99
+#: src/gui/windows/editserverdialog.cpp:78
msgid "Online list url:"
msgstr ""
#. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:220
+#: src/gui/windows/editserverdialog.cpp:188
msgid "Please at least type both the address and the port of the server."
msgstr ""
@@ -5568,47 +5603,47 @@ msgid "Did you know..."
msgstr ""
#. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:165
+#: src/gui/windows/itemamountwindow.cpp:164
msgid "All"
msgstr "Alt"
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:221
+#: src/gui/windows/itemamountwindow.cpp:220
msgid "Select amount of items to trade."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:225
+#: src/gui/windows/itemamountwindow.cpp:224
msgid "Select amount of items to drop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:229
+#: src/gui/windows/itemamountwindow.cpp:228
msgid "Select amount of items to store."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:233
+#: src/gui/windows/itemamountwindow.cpp:232
msgid "Select amount of items to retrieve."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:237
+#: src/gui/windows/itemamountwindow.cpp:236
msgid "Select amount of items to split."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:241
+#: src/gui/windows/itemamountwindow.cpp:240
msgid "Add to buy shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:245
+#: src/gui/windows/itemamountwindow.cpp:244
msgid "Add to sell shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:249
+#: src/gui/windows/itemamountwindow.cpp:248
msgid "Unknown."
msgstr ""
@@ -5860,7 +5895,7 @@ msgstr "Bekreft"
#. TRANSLATORS: shop window label
#. TRANSLATORS: shop window button
#. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:258
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
#: src/gui/windows/tradewindow.cpp:78
msgid "Add"
@@ -5962,53 +5997,53 @@ msgid "Do you really want to sell %s?"
msgstr ""
#. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
msgid "Choose Your Server"
msgstr ""
#. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
msgid "Load"
msgstr ""
#. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
msgid "Choose Your Server *** SAFE MODE ***"
msgstr ""
#. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
msgid "Use same ip for game sub servers"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
msgid "Waiting for server..."
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
msgid "Preparing download"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
msgid "Error retreiving server list!"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
msgid "requires a newer version"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
#, c-format
msgid "requires v%s"
msgstr ""
@@ -6089,277 +6124,277 @@ msgid "Skill %d"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:225
+#: src/gui/windows/socialwindow.cpp:227
#, c-format
msgid "Invited user %s to guild %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:240
+#: src/gui/windows/socialwindow.cpp:242
#, c-format
msgid "Guild %s quit requested."
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:254
+#: src/gui/windows/socialwindow.cpp:256
msgid "Member Invite to Guild"
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:256
+#: src/gui/windows/socialwindow.cpp:258
#, c-format
msgid "Who would you like to invite to guild %s?"
msgstr ""
#. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:266
+#: src/gui/windows/socialwindow.cpp:268
msgid "Leave Guild?"
msgstr ""
#. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:268
+#: src/gui/windows/socialwindow.cpp:270
#, c-format
msgid "Are you sure you want to leave guild %s?"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:279
+#: src/gui/windows/socialwindow.cpp:281
#, c-format
msgid "Members: %u/%u"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:301 src/gui/windows/socialwindow.cpp:373
-#: src/gui/windows/socialwindow.cpp:498
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
#, c-format
msgid "Players: %u/%u"
msgstr ""
#. TRANSLATORS: tab in social window
#. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:389 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
msgid "Party"
msgstr "Gruppe"
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:429
+#: src/gui/windows/socialwindow.cpp:431
#, c-format
msgid "Invited user %s to party."
msgstr ""
#. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:444
+#: src/gui/windows/socialwindow.cpp:446
#, c-format
msgid "Party %s quit requested."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:458
+#: src/gui/windows/socialwindow.cpp:460
msgid "Member Invite to Party"
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:460
+#: src/gui/windows/socialwindow.cpp:462
#, c-format
msgid "Who would you like to invite to party %s?"
msgstr ""
#. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:470
+#: src/gui/windows/socialwindow.cpp:472
msgid "Leave Party?"
msgstr ""
#. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:472
+#: src/gui/windows/socialwindow.cpp:474
#, c-format
msgid "Are you sure you want to leave party %s?"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:698
+#: src/gui/windows/socialwindow.cpp:665
#, c-format
msgid "Visible players: %d"
msgstr ""
#. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:725
+#: src/gui/windows/socialwindow.cpp:692
msgid "Nav"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:827
+#: src/gui/windows/socialwindow.cpp:794
#, c-format
msgid "Portals: %u/%u"
msgstr ""
#. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1054
+#: src/gui/windows/socialwindow.cpp:1021
msgid "Atk"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1073
+#: src/gui/windows/socialwindow.cpp:1040
msgid "Priority mobs"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1075
+#: src/gui/windows/socialwindow.cpp:1042
msgid "Attack mobs"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1077
+#: src/gui/windows/socialwindow.cpp:1044
msgid "Ignore mobs"
msgstr ""
#. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1101
+#: src/gui/windows/socialwindow.cpp:1068
msgid "Pik"
msgstr ""
#. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1120
+#: src/gui/windows/socialwindow.cpp:1087
msgid "Pickup items"
msgstr ""
#. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1122
+#: src/gui/windows/socialwindow.cpp:1089
msgid "Ignore items"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1212
+#: src/gui/windows/socialwindow.cpp:1179
#, c-format
msgid "Friends: %u/%u"
msgstr ""
#. TRANSLATORS: party popup item
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1235 src/gui/windows/socialwindow.cpp:1727
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
msgid "Create Party"
msgstr ""
#. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1298
+#: src/gui/windows/socialwindow.cpp:1265
msgid "P"
msgstr ""
#. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1303
+#: src/gui/windows/socialwindow.cpp:1270
msgid "F"
msgstr ""
#. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1309
+#: src/gui/windows/socialwindow.cpp:1276
msgid "Invite"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1503
+#: src/gui/windows/socialwindow.cpp:1470
#, c-format
msgid "Accepted party invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1514
+#: src/gui/windows/socialwindow.cpp:1481
#, c-format
msgid "Rejected party invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1531
+#: src/gui/windows/socialwindow.cpp:1498
#, c-format
msgid "Accepted guild invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1545
+#: src/gui/windows/socialwindow.cpp:1512
#, c-format
msgid "Rejected guild invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1585
+#: src/gui/windows/socialwindow.cpp:1552
#, c-format
msgid "Creating guild called %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1606
+#: src/gui/windows/socialwindow.cpp:1573
#, c-format
msgid "Creating party called %s."
msgstr ""
#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1621
+#: src/gui/windows/socialwindow.cpp:1588
msgid "Guild Name"
msgstr ""
#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1623
+#: src/gui/windows/socialwindow.cpp:1590
msgid "Choose your guild's name."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1639
+#: src/gui/windows/socialwindow.cpp:1606
msgid "Received guild request, but one already exists."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1647
+#: src/gui/windows/socialwindow.cpp:1614
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1654
+#: src/gui/windows/socialwindow.cpp:1621
msgid "Accept Guild Invite"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1670
+#: src/gui/windows/socialwindow.cpp:1637
msgid "Received party request, but one already exists."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1682
+#: src/gui/windows/socialwindow.cpp:1649
msgid "You have been invited you to join a party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1687
+#: src/gui/windows/socialwindow.cpp:1654
#, c-format
msgid "You have been invited to join the %s party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1696
+#: src/gui/windows/socialwindow.cpp:1663
#, 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/windows/socialwindow.cpp:1702
+#: src/gui/windows/socialwindow.cpp:1669
#, c-format
msgid "%s has invited you to join the %s party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1712
+#: src/gui/windows/socialwindow.cpp:1679
msgid "Accept Party Invite"
msgstr "Godta Gruppeinvitasjon"
-#: src/gui/windows/socialwindow.cpp:1728
+#: src/gui/windows/socialwindow.cpp:1695
msgid "Cannot create party. You are already in a party"
msgstr ""
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1734
+#: src/gui/windows/socialwindow.cpp:1701
msgid "Party Name"
msgstr ""
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1736
+#: src/gui/windows/socialwindow.cpp:1703
msgid "Choose your party's name."
msgstr ""
@@ -6401,113 +6436,68 @@ msgstr ""
msgid "Correction points: %d"
msgstr ""
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "No Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Allow Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:105
-msgid "Need Target"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "General Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "Life Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "War Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Transmute Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Nature Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:121
-msgid "Astral Magic"
-msgstr ""
-
#. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:164
+#: src/gui/windows/textcommandeditor.cpp:47
msgid "Command Editor"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:52
msgid "magic"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:54
msgid "other"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:173
+#: src/gui/windows/textcommandeditor.cpp:56
msgid "Symbol:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:176
+#: src/gui/windows/textcommandeditor.cpp:59
msgid "Command:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:179
+#: src/gui/windows/textcommandeditor.cpp:62
msgid "Comment:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:183
+#: src/gui/windows/textcommandeditor.cpp:66
msgid "Target Type:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:187
+#: src/gui/windows/textcommandeditor.cpp:70
msgid "Icon:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:190
+#: src/gui/windows/textcommandeditor.cpp:73
msgid "Mana:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:193
+#: src/gui/windows/textcommandeditor.cpp:76
msgid "Magic level:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:197
+#: src/gui/windows/textcommandeditor.cpp:80
msgid "Magic School:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:200
+#: src/gui/windows/textcommandeditor.cpp:83
msgid "School level:"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/windows/textcommandeditor.cpp:88
msgid "Save"
msgstr ""
@@ -6537,7 +6527,7 @@ msgid "Trade: You"
msgstr ""
#. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
#, c-format
msgid "You get %s"
msgstr ""
@@ -6553,12 +6543,12 @@ msgid "You give:"
msgstr ""
#. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
msgid "You don't have enough money."
msgstr ""
#. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
msgid ""
"Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
@@ -6629,17 +6619,17 @@ msgid "Who Is Online - Update"
msgstr ""
#. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:87
+#: src/gui/windows/worldselectdialog.cpp:49
msgid "Select World"
msgstr ""
#. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:93
+#: src/gui/windows/worldselectdialog.cpp:55
msgid "Change Login"
msgstr ""
#. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:95
+#: src/gui/windows/worldselectdialog.cpp:57
msgid "Choose World"
msgstr ""
@@ -6857,7 +6847,7 @@ msgid "Failed to create character. Most likely the name is already taken."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:281
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
msgid "Wrong name."
msgstr ""
@@ -7015,58 +7005,58 @@ msgid "Experience sharing unknown."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:154
+#: src/net/ea/loginhandler.cpp:149
msgid "Account was not found. Please re-login."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/ea/loginhandler.cpp:153
msgid "Old password incorrect."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:162
+#: src/net/ea/loginhandler.cpp:157
msgid "New password too short."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:166 src/net/ea/loginhandler.cpp:293
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
msgid "Unknown error."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:239
+#: src/net/ea/loginhandler.cpp:234
msgid "Unregistered ID."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:238
msgid "Wrong password."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:248
+#: src/net/ea/loginhandler.cpp:243
msgid "Account expired."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:252
+#: src/net/ea/loginhandler.cpp:247
msgid "Rejected from server."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:256
+#: src/net/ea/loginhandler.cpp:251
msgid ""
"You have been permanently banned from the game. Please contact the GM team."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:261
+#: src/net/ea/loginhandler.cpp:256
msgid "Client too old."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:265
+#: src/net/ea/loginhandler.cpp:260
#, c-format
msgid ""
"You have been temporarily banned from the game until %s.\n"
@@ -7074,22 +7064,22 @@ msgid ""
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:273
+#: src/net/ea/loginhandler.cpp:268
msgid "Server overpopulated."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:277
+#: src/net/ea/loginhandler.cpp:272
msgid "This user name is already taken."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:285
+#: src/net/ea/loginhandler.cpp:280
msgid "Incorrect email."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:289
+#: src/net/ea/loginhandler.cpp:284
msgid "Username permanently erased."
msgstr ""
@@ -7762,7 +7752,7 @@ msgstr ""
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
#: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr ""
diff --git a/po/nl.po b/po/nl.po
index 1f1cb89d8..0c8e4d39c 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: 2014-02-23 00:42+0300\n"
-"PO-Revision-Date: 2014-02-23 08:14+0000\n"
+"POT-Creation-Date: 2014-02-28 21:21+0300\n"
+"PO-Revision-Date: 2014-03-01 08:14+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"
@@ -30,7 +30,7 @@ msgid "Accepting incoming trade requests"
msgstr "Inkomende handelsaanvragen accepteren"
#. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
msgid "Visible on map"
msgstr ""
@@ -39,68 +39,68 @@ msgstr ""
msgid "Human"
msgstr ""
-#: src/being/being.cpp:544
+#: src/being/being.cpp:496
msgid "dodge"
msgstr "ontwijk"
-#: src/being/being.cpp:544
+#: src/being/being.cpp:496
msgid "miss"
msgstr "mis"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1965 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1970 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr ""
#. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:392
+#: src/being/localplayer.cpp:376
#, c-format
msgid "You were killed by %s"
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1377
+#: src/being/localplayer.cpp:816
msgid "Tried to pick up nonexistent item."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1381
+#: src/being/localplayer.cpp:820
msgid "Item is too heavy."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1385
+#: src/being/localplayer.cpp:824
msgid "Item is too far away."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1389
+#: src/being/localplayer.cpp:828
msgid "Inventory is full."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1393
+#: src/being/localplayer.cpp:832
msgid "Stack is too big."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1397
+#: src/being/localplayer.cpp:836
msgid "Item belongs to someone else."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1401
+#: src/being/localplayer.cpp:840
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:1425
+#: src/being/localplayer.cpp:864
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -108,387 +108,387 @@ msgstr[0] ""
msgstr[1] ""
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1630 src/being/localplayer.cpp:1665
-#: src/being/localplayer.cpp:1666
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
msgid "xp"
msgstr ""
-#: src/being/localplayer.cpp:1671 src/being/localplayer.cpp:1678
-#: src/being/localplayer.cpp:1685
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
msgid "job"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1871
+#: src/being/localplayer.cpp:1285
msgid "(D) default moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1873
+#: src/being/localplayer.cpp:1287
msgid "(I) invert moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1875
+#: src/being/localplayer.cpp:1289
msgid "(c) moves with some crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1877
+#: src/being/localplayer.cpp:1291
msgid "(C) moves with crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1879
+#: src/being/localplayer.cpp:1293
msgid "(d) double normal + crazy"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1881
+#: src/being/localplayer.cpp:1295
msgid "(?) unknown move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1904
+#: src/being/localplayer.cpp:1318
#, c-format
msgid "(%u) crazy move number %u"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1910
+#: src/being/localplayer.cpp:1324
msgid "(a) custom crazy move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1915
+#: src/being/localplayer.cpp:1329
msgid "(?) crazy move"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1930
+#: src/being/localplayer.cpp:1344
msgid "(0) default moves to target"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1932
+#: src/being/localplayer.cpp:1346
msgid "(1) moves to target in distance 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1934
+#: src/being/localplayer.cpp:1348
msgid "(2) moves to target in distance 2"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1936
+#: src/being/localplayer.cpp:1350
msgid "(3) moves to target in distance 3"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1938
+#: src/being/localplayer.cpp:1352
msgid "(5) moves to target in distance 5"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1940
+#: src/being/localplayer.cpp:1354
msgid "(7) moves to target in distance 7"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1942
+#: src/being/localplayer.cpp:1356
msgid "(A) moves to target in attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1944
+#: src/being/localplayer.cpp:1358
msgid "(a) archer attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1946
+#: src/being/localplayer.cpp:1360
msgid "(B) moves to target in attack range - 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1948
+#: src/being/localplayer.cpp:1362
msgid "(?) move to target"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1968
+#: src/being/localplayer.cpp:1382
msgid "(D) default follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1970
+#: src/being/localplayer.cpp:1384
msgid "(R) relative follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1972
+#: src/being/localplayer.cpp:1386
msgid "(M) mirror follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1974
+#: src/being/localplayer.cpp:1388
msgid "(P) pet follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1976
+#: src/being/localplayer.cpp:1390
msgid "(?) unknown follow"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1996 src/being/localplayer.cpp:2004
-#: src/being/localplayer.cpp:2032
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
msgid "(?) attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1998 src/being/localplayer.cpp:2024
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
msgid "(D) default attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2000
+#: src/being/localplayer.cpp:1414
msgid "(s) switch attack without shield"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2002
+#: src/being/localplayer.cpp:1416
msgid "(S) switch attack with shield"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2026
+#: src/being/localplayer.cpp:1440
msgid "(G) go and attack"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2028
+#: src/being/localplayer.cpp:1442
msgid "(A) go, attack, pickup"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2030
+#: src/being/localplayer.cpp:1444
msgid "(d) without auto attack"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2084
+#: src/being/localplayer.cpp:1498
msgid "(S) small pick up 1x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2086
+#: src/being/localplayer.cpp:1500
msgid "(D) default pick up 2x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2088
+#: src/being/localplayer.cpp:1502
msgid "(F) forward pick up 2x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2090
+#: src/being/localplayer.cpp:1504
msgid "(3) pick up 3x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2092
+#: src/being/localplayer.cpp:1506
msgid "(g) go and pick up in distance 4"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2094
+#: src/being/localplayer.cpp:1508
msgid "(G) go and pick up in distance 8"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2096
+#: src/being/localplayer.cpp:1510
msgid "(A) go and pick up in max distance"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2098
+#: src/being/localplayer.cpp:1512
msgid "(?) pick up"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2112
+#: src/being/localplayer.cpp:1526
msgid "(N) normal map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2114
+#: src/being/localplayer.cpp:1528
msgid "(D) debug map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2116
+#: src/being/localplayer.cpp:1530
msgid "(u) ultra map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2118
+#: src/being/localplayer.cpp:1532
msgid "(U) ultra map view 2"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2120
+#: src/being/localplayer.cpp:1534
msgid "(e) empty map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2122
+#: src/being/localplayer.cpp:1536
msgid "(b) black & white map view"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2142
+#: src/being/localplayer.cpp:1556
msgid "(f) use #flar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2144
+#: src/being/localplayer.cpp:1558
msgid "(c) use #chiza for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2146
+#: src/being/localplayer.cpp:1560
msgid "(I) use #ingrav for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2148
+#: src/being/localplayer.cpp:1562
msgid "(F) use #frillyar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2150
+#: src/being/localplayer.cpp:1564
msgid "(U) use #upmarmu for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2152
+#: src/being/localplayer.cpp:1566
msgid "(?) magic attack"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2172
+#: src/being/localplayer.cpp:1586
msgid "(a) attack all players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2174
+#: src/being/localplayer.cpp:1588
msgid "(f) attack all except friends"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2176
+#: src/being/localplayer.cpp:1590
msgid "(b) attack bad relations"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2178
+#: src/being/localplayer.cpp:1592
msgid "(d) don't attack players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2180
+#: src/being/localplayer.cpp:1594
msgid "(?) pvp attack"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2200
+#: src/being/localplayer.cpp:1614
msgid "(D) default imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2202
+#: src/being/localplayer.cpp:1616
msgid "(O) outfits imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2204
+#: src/being/localplayer.cpp:1618
msgid "(?) imitation"
msgstr ""
#. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2233
+#: src/being/localplayer.cpp:1647
msgid "Away"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2256
+#: src/being/localplayer.cpp:1670
msgid "(O) on keyboard"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2258
+#: src/being/localplayer.cpp:1672
msgid "(A) away"
msgstr ""
#. TRANSLATORS: away type in status bar
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2260 src/being/localplayer.cpp:2278
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
msgid "(?) away"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2274
+#: src/being/localplayer.cpp:1688
msgid "(G) game camera mode"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2276
+#: src/being/localplayer.cpp:1690
msgid "(F) free camera mode"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2303
+#: src/being/localplayer.cpp:1717
msgid "Game modifiers are enabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2305
+#: src/being/localplayer.cpp:1719
msgid "Game modifiers are disabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2307
+#: src/being/localplayer.cpp:1721
msgid "Game modifiers are unknown"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3887
+#: src/being/localplayer.cpp:3287
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3893 src/being/localplayer.cpp:3918
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3903
+#: src/being/localplayer.cpp:3303
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3909 src/being/localplayer.cpp:3923
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4266
+#: src/being/localplayer.cpp:3666
#, c-format
msgid "You see %s"
msgstr ""
@@ -526,32 +526,32 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1139 src/gui/windowmenu.cpp:167
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
#: src/gui/windows/setupwindow.cpp:61
msgid "Setup"
msgstr "Configureren"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1143 src/gui/widgets/tabs/setup_perfomance.cpp:51
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1146 src/gui/widgets/tabs/setup_video.cpp:225
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:225
msgid "Video"
msgstr "Video"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1149 src/gui/widgets/tabs/setup_theme.cpp:269
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1152 src/gui/windowmenu.cpp:74
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr "Help"
@@ -564,41 +564,41 @@ msgstr "Help"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1156 src/gui/popups/popupmenu.cpp:619
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
#: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:69
-#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:138
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
#: src/gui/windows/shopwindow.cpp:78
msgid "Close"
msgstr "Sluiten"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr "Verbinden met server"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1324
msgid "Logging in"
msgstr "Aanmelden"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1367
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr "Spelwereld binnengaan"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1492
+#: src/client.cpp:1489
msgid "Requesting characters"
msgstr "Personages aanvragen"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1532
+#: src/client.cpp:1529
msgid "Connecting to the game server"
msgstr "Verbinden met de spelserver"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1545
+#: src/client.cpp:1541
msgid "Changing game servers"
msgstr "Van spelserver wissellen"
@@ -613,12 +613,12 @@ msgstr "Van spelserver wissellen"
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1606 src/client.cpp:1617 src/client.cpp:1801
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:349
#: src/gui/windows/charselectdialog.cpp:299
-#: src/gui/windows/editserverdialog.cpp:218
+#: src/gui/windows/editserverdialog.cpp:186
#: src/gui/windows/registerdialog.cpp:260
#: src/gui/windows/unregisterdialog.cpp:146
#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
@@ -626,65 +626,65 @@ msgid "Error"
msgstr "Fout"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1629
+#: src/client.cpp:1625
msgid "Requesting registration details"
msgstr "Registratiedetails aanvragen"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1670
+#: src/client.cpp:1666
msgid "Password Change"
msgstr "Verander Wachtwoord"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1672
+#: src/client.cpp:1668
msgid "Password changed successfully!"
msgstr "Wachtwoord veranderen geslaagd!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1694
+#: src/client.cpp:1690
msgid "Email Change"
msgstr "Verander E-mail"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1696
+#: src/client.cpp:1692
msgid "Email changed successfully!"
msgstr "E-mail veranderen geslaagd!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1719
+#: src/client.cpp:1715
msgid "Unregister Successful"
msgstr "Uitschrijven geslaagd!"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1721
+#: src/client.cpp:1717
msgid "Farewell, come back any time..."
msgstr "Vaarwel, je mag altijd terugkomen..."
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1998 src/client.cpp:2013 src/client.cpp:2058
-#: src/client.cpp:2074 src/client.cpp:2525 src/client.cpp:2533
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s bestaat niet en kan niet worden aangemaakt! Sluiten."
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2230
+#: src/client.cpp:2232
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2271 src/client.cpp:2278
+#: src/client.cpp:2273 src/client.cpp:2280
msgid "Error creating updates directory!"
msgstr "Fout bij het creëren van de update map!"
-#: src/client.cpp:2300 src/client.cpp:2317
+#: src/client.cpp:2302 src/client.cpp:2319
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Fout: %s bestaat niet en kan niet worden aangemaakt! Sluiten."
#. TRANSLATORS: error message question
-#: src/client.cpp:3001
+#: src/client.cpp:3003
msgid "Do you want to open support page?"
msgstr ""
@@ -930,99 +930,154 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:277 src/gui/widgets/tabs/chattab.cpp:464
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
msgid "General"
msgstr "Algemeen"
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:293 src/gui/widgets/tabs/chattab.cpp:466
-#: src/gui/windowmenu.cpp:154 src/gui/windows/debugwindow.cpp:53
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:575
+#: src/game.cpp:563
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:585
+#: src/game.cpp:573
msgid "Saving screenshot failed!"
msgstr "Opslaan van screenshot mislukt!"
#. TRANSLATORS: error message text
-#: src/game.cpp:656
+#: src/game.cpp:644
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:659
+#: src/game.cpp:647
msgid "Network Error"
msgstr "Netwerkfout"
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
-msgid "black"
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
msgstr ""
+#. TRANSLATORS: chat color
#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
+msgid "black"
+msgstr ""
+
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
msgid "red"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
msgid "green"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
msgid "blue"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
msgid "gold"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
msgid "yellow"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
msgid "pink"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
msgid "purple"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
msgid "grey"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
msgid "brown"
msgstr ""
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr ""
+
#. TRANSLATORS: relation type
#: src/gui/models/playerrelationlistmodel.h:33
msgid "Neutral"
@@ -1058,46 +1113,61 @@ msgstr ""
msgid "Enemy"
msgstr ""
-#. TRANSLATORS: inventory sort mode
-#. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#: src/gui/models/sortlistmodelinv.h:34
-#: src/gui/widgets/tabs/setup_other.cpp:72
-#: src/gui/widgets/tabs/setup_visual.cpp:78 src/gui/windows/chatwindow.cpp:150
-msgid "default"
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:36 src/gui/windows/buydialog.cpp:62
-msgid "by name"
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
msgstr ""
+#. TRANSLATORS: buy dialog sort type.
#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
+msgid "by name"
+msgstr ""
+
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:38 src/gui/windows/buydialog.cpp:64
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
msgid "by id"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:40 src/gui/windows/buydialog.cpp:66
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
msgid "by weight"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:42 src/gui/windows/buydialog.cpp:68
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
msgid "by amount"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:44 src/gui/windows/buydialog.cpp:70
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
msgid "by type"
msgstr ""
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr ""
+
#. TRANSLATORS: update type
#. TRANSLATORS: onscreen button size
#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
@@ -1244,8 +1314,8 @@ msgstr "Spreken"
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
-#: src/gui/windows/buydialog.cpp:208 src/gui/windows/buydialog.cpp:220
-#: src/gui/windows/buydialog.cpp:274 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
msgid "Buy"
msgstr "Kopen"
@@ -1342,12 +1412,12 @@ msgstr ""
#: src/gui/windows/changepassworddialog.cpp:57
#: src/gui/windows/charcreatedialog.cpp:121
#: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:79
-#: src/gui/windows/itemamountwindow.cpp:163
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
-#: src/gui/windows/socialwindow.cpp:1238
-#: src/gui/windows/textcommandeditor.cpp:203 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:54
#: src/gui/windows/updaterwindow.cpp:186
msgid "Cancel"
@@ -1419,7 +1489,7 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:150 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
msgstr ""
@@ -1432,7 +1502,7 @@ msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:134
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
msgid "Spells"
msgstr ""
@@ -1488,7 +1558,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
#. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1311
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
msgid "Leave"
msgstr ""
@@ -1569,8 +1639,8 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
-#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:223
-#: src/gui/windows/inventorywindow.cpp:745 src/gui/windows/setupwindow.cpp:96
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
msgid "Store"
msgstr "Opslaan"
@@ -1601,7 +1671,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
msgid "Retrieve"
msgstr "Afhalen"
@@ -1634,8 +1704,8 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
-#: src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:656 src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr "Gebruiken"
@@ -1669,8 +1739,8 @@ msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: language
#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/widgets/tabs/setup_theme.cpp:127
-#: src/gui/windows/socialwindow.cpp:1003
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
msgid "(default)"
msgstr ""
@@ -1826,8 +1896,8 @@ msgstr ""
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:645
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
msgid "Unequip"
msgstr "Afdoen"
@@ -1835,16 +1905,16 @@ msgstr "Afdoen"
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:172
-#: src/gui/windows/inventorywindow.cpp:650 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr "Uitrusten"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:189
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
msgid "Drop..."
msgstr ""
@@ -1858,15 +1928,15 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:138
-#: src/gui/windows/inventorywindow.cpp:758
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
msgid "Drop"
msgstr "Neerleggen"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
msgid "Split"
msgstr "Splitsen"
@@ -2022,10 +2092,10 @@ msgstr "OK selecteren"
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:276
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/windows/serverdialog.cpp:198
msgid "Quit"
msgstr "Afsluiten"
@@ -2587,7 +2657,7 @@ msgstr ""
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: register dialog. button.
#: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:146
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:330
#: src/gui/widgets/tabs/setup_visual.cpp:189
@@ -2614,9 +2684,8 @@ msgstr ""
#. TRANSLATORS: command editor button
#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
#: src/gui/windows/charselectdialog.cpp:108
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:94
-#: src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/textcommandeditor.cpp:207
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
msgid "Delete"
msgstr "Verwijderen"
@@ -2652,7 +2721,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:130
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
msgid "Shortcuts"
msgstr ""
@@ -2660,7 +2729,7 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:151
msgid "Windows"
msgstr ""
@@ -2676,7 +2745,7 @@ msgstr ""
#. TRANSLATORS: settings tab name
#. TRANSLATORS: chat window name
#: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:88 src/gui/windows/chatwindow.cpp:203
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
msgid "Chat"
msgstr "Chat"
@@ -2899,7 +2968,7 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:137
-#: src/gui/windows/inventorywindow.cpp:569
+#: src/gui/windows/inventorywindow.cpp:568
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
#, c-format
@@ -2919,7 +2988,7 @@ msgstr ""
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/windows/serverdialog.cpp:204
msgid "Edit"
msgstr ""
@@ -2972,7 +3041,7 @@ msgstr ""
#. TRANSLATORS: tab in social window
#. TRANSLATORS: guild chat tab name
#: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:184 src/gui/windows/socialwindow.cpp:320
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
#: src/net/ea/gui/guildtab.cpp:44
msgid "Guild"
msgstr "Guild"
@@ -2983,142 +3052,142 @@ msgid "Lang"
msgstr ""
#. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:49
+#: src/gui/widgets/tabs/setup_audio.cpp:48
msgid "Audio"
msgstr "Audio"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:57
+#: src/gui/widgets/tabs/setup_audio.cpp:56
msgid "Basic settings"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:60
+#: src/gui/widgets/tabs/setup_audio.cpp:59
msgid "Enable Audio"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:63
+#: src/gui/widgets/tabs/setup_audio.cpp:62
msgid "Enable music"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:67
+#: src/gui/widgets/tabs/setup_audio.cpp:66
msgid "Enable game sfx"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:71
+#: src/gui/widgets/tabs/setup_audio.cpp:70
msgid "Enable gui sfx"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:74
msgid "Sfx volume"
msgstr "Volume van geluiden"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:78
msgid "Music volume"
msgstr "Muziek volume"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:82
msgid "Enable music fade out"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:86
msgid "Audio frequency"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:90
msgid "mono"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:93
+#: src/gui/widgets/tabs/setup_audio.cpp:92
msgid "stereo"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:94
msgid "surround"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:97
+#: src/gui/widgets/tabs/setup_audio.cpp:96
msgid "surround+center+lfe"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:98
msgid "Audio channels"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:104
+#: src/gui/widgets/tabs/setup_audio.cpp:103
msgid "Sound effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:106
msgid "Information dialog sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:110
msgid "Request dialog sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:115
+#: src/gui/widgets/tabs/setup_audio.cpp:114
msgid "Whisper message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:118
msgid "Guild / Party message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:122
msgid "Highlight message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:126
msgid "Global message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:130
msgid "Error message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:134
msgid "Trade request sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:138
msgid "Show window sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:142
msgid "Hide window sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:150
msgid "Enable mumble voice chat"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:156
+#: src/gui/widgets/tabs/setup_audio.cpp:155
msgid "Download music"
msgstr ""
@@ -3414,7 +3483,7 @@ msgstr ""
#. TRANSLATORS: unknown key name
#. TRANSLATORS: quests window quest name
#: src/gui/widgets/tabs/setup_input.cpp:364
-#: src/gui/windows/questswindow.cpp:263
+#: src/gui/windows/questswindow.cpp:249
msgid "unknown"
msgstr ""
@@ -3573,7 +3642,7 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: debug window tab
#. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:105
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
#: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
#: src/gui/windows/minimap.cpp:114
msgid "Map"
@@ -3741,9 +3810,9 @@ msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: shop window name
#. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:146
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
#: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windows/inventorywindow.cpp:194
msgid "Shop"
msgstr "Winkel"
@@ -4125,252 +4194,252 @@ msgid "When ignoring:"
msgstr "Tijdens negeren:"
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:64
+#: src/gui/widgets/tabs/setup_theme.cpp:63
msgid "Very small (8)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:66
+#: src/gui/widgets/tabs/setup_theme.cpp:65
msgid "Very small (9)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:68
+#: src/gui/widgets/tabs/setup_theme.cpp:67
msgid "Tiny (10)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:70
+#: src/gui/widgets/tabs/setup_theme.cpp:69
msgid "Small (11)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:72
+#: src/gui/widgets/tabs/setup_theme.cpp:71
msgid "Medium (12)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:74
+#: src/gui/widgets/tabs/setup_theme.cpp:73
msgid "Normal (13)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:76
+#: src/gui/widgets/tabs/setup_theme.cpp:75
msgid "Large (14)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:78
+#: src/gui/widgets/tabs/setup_theme.cpp:77
msgid "Large (15)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:80
+#: src/gui/widgets/tabs/setup_theme.cpp:79
msgid "Large (16)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:82
+#: src/gui/widgets/tabs/setup_theme.cpp:81
msgid "Big (17)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:83
msgid "Big (18)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:85
msgid "Big (19)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:87
msgid "Very big (20)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:89
msgid "Very big (21)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:91
msgid "Very big (22)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:93
msgid "Huge (23)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:129
+#: src/gui/widgets/tabs/setup_theme.cpp:128
msgid "Chinese (China)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:131
+#: src/gui/widgets/tabs/setup_theme.cpp:130
msgid "Czech"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:133
+#: src/gui/widgets/tabs/setup_theme.cpp:132
msgid "English"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:135
+#: src/gui/widgets/tabs/setup_theme.cpp:134
msgid "Finnish"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:137
+#: src/gui/widgets/tabs/setup_theme.cpp:136
msgid "French"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:139
+#: src/gui/widgets/tabs/setup_theme.cpp:138
msgid "German"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:141
+#: src/gui/widgets/tabs/setup_theme.cpp:140
msgid "Indonesian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:143
+#: src/gui/widgets/tabs/setup_theme.cpp:142
msgid "Italian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:145
+#: src/gui/widgets/tabs/setup_theme.cpp:144
msgid "Polish"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:147
+#: src/gui/widgets/tabs/setup_theme.cpp:146
msgid "Japanese"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:148
msgid "Dutch (Belgium/Flemish)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:150
msgid "Portuguese"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:152
msgid "Portuguese (Brazilian)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:154
msgid "Russian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:156
msgid "Spanish (Castilian)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:158
msgid "Turkish"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:211
+#: src/gui/widgets/tabs/setup_theme.cpp:210
msgid "Gui theme"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:218
+#: src/gui/widgets/tabs/setup_theme.cpp:217
msgid "Main Font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:223
+#: src/gui/widgets/tabs/setup_theme.cpp:222
msgid "Language"
msgstr ""
#. TRANSLATORS: theme settings label
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:227 src/gui/windows/emotewindow.cpp:45
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
msgid "Bold font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:230
msgid "Particle font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:235
+#: src/gui/widgets/tabs/setup_theme.cpp:234
msgid "Help font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:239
+#: src/gui/widgets/tabs/setup_theme.cpp:238
msgid "Secure font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:242
msgid "Npc font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:247
+#: src/gui/widgets/tabs/setup_theme.cpp:246
msgid "Japanese font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:250
msgid "Chinese font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:256
+#: src/gui/widgets/tabs/setup_theme.cpp:255
msgid "Font size"
msgstr "Lettergrootte"
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:261
+#: src/gui/widgets/tabs/setup_theme.cpp:260
msgid "Npc font size"
msgstr ""
#. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:265
+#: src/gui/widgets/tabs/setup_theme.cpp:264
msgid "i"
msgstr ""
#. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:404
+#: src/gui/widgets/tabs/setup_theme.cpp:403
msgid "Name: "
msgstr ""
-#: src/gui/widgets/tabs/setup_theme.cpp:405
+#: src/gui/widgets/tabs/setup_theme.cpp:404
msgid "Copyright:"
msgstr ""
#. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:470
+#: src/gui/widgets/tabs/setup_theme.cpp:469
msgid "Theme info"
msgstr ""
#. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:497
+#: src/gui/widgets/tabs/setup_theme.cpp:496
msgid "Theme Changed"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:497
+#: src/gui/widgets/tabs/setup_theme.cpp:496
#: src/gui/widgets/tabs/setup_video.cpp:499
#: src/gui/widgets/tabs/setup_video.cpp:508
msgid "Restart your client for the change to take effect."
@@ -4701,178 +4770,169 @@ msgid "Allow screensaver to run"
msgstr ""
#. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:67
msgid "ONL"
msgstr ""
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:68
msgid "Who is online"
msgstr ""
#. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:70
msgid "HLP"
msgstr ""
#. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:73
msgid "QE"
msgstr ""
#. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:77 src/gui/windows/questswindow.cpp:126
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
msgid "Quests"
msgstr ""
#. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:76
msgid "BC"
msgstr ""
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:77
msgid "Bot checker"
msgstr ""
#. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:82
+#: src/gui/windowmenu.cpp:79
msgid "KS"
msgstr ""
#. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:83 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
msgid "Kill stats"
msgstr ""
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:82
msgid "Smilies"
msgstr ""
#. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:87
+#: src/gui/windowmenu.cpp:84
msgid "CH"
msgstr ""
#. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:95
+#: src/gui/windowmenu.cpp:92
msgid "STA"
msgstr ""
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:93
msgid "Status"
msgstr "Status"
#. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:95
msgid "EQU"
msgstr ""
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:58
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
msgid "Equipment"
msgstr "Uitrusting"
#. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:98
msgid "INV"
msgstr ""
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:130
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
#: src/inventory.cpp:257
msgid "Inventory"
msgstr "Inventaris"
#. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:104
+#: src/gui/windowmenu.cpp:101
msgid "MAP"
msgstr ""
#. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:110
+#: src/gui/windowmenu.cpp:107
msgid "SKI"
msgstr ""
#. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
msgid "Skills"
msgstr "Vaardigheden"
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:118
-msgid "SPE"
-msgstr ""
-
-#: src/gui/windowmenu.cpp:119
-msgid "Specials"
-msgstr ""
-
#. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:124
+#: src/gui/windowmenu.cpp:112
msgid "SOC"
msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:126 src/gui/windows/socialwindow.cpp:1284
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
msgid "Social"
msgstr ""
#. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:128
+#: src/gui/windowmenu.cpp:116
msgid "SH"
msgstr ""
#. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:132
+#: src/gui/windowmenu.cpp:120
msgid "SP"
msgstr ""
#. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:124
msgid "DR"
msgstr ""
#. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:128
msgid "YK"
msgstr ""
#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:130
msgid "Did you know"
msgstr ""
#. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:144
+#: src/gui/windowmenu.cpp:132
msgid "SHP"
msgstr ""
#. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:148
+#: src/gui/windowmenu.cpp:136
msgid "OU"
msgstr ""
#. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:152
+#: src/gui/windowmenu.cpp:140
msgid "DBG"
msgstr ""
#. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:149
msgid "WIN"
msgstr ""
#. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:153
msgid "SET"
msgstr ""
#. TRANSLATORS: short key name
#. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:301 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
#: src/gui/windows/outfitwindow.cpp:561
#, c-format
msgid "Key: %s"
@@ -4894,31 +4954,21 @@ msgstr "Reset"
msgid "Result"
msgstr ""
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:58
-msgid "unsorted"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:60
-msgid "by price"
-msgstr ""
-
#. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:196
+#: src/gui/windows/buydialog.cpp:162
msgid "Create items"
msgstr ""
#. TRANSLATORS: buy dialog label
#. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:254 src/gui/windows/buydialog.cpp:541
-#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:366
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Prijs: %s / Totaal: %s"
#. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:263
+#: src/gui/windows/buydialog.cpp:229
msgid "Amount:"
msgstr ""
@@ -4928,8 +4978,8 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/itemamountwindow.cpp:159
-#: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
msgid "+"
msgstr ""
@@ -4940,8 +4990,8 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:271 src/gui/windows/itemamountwindow.cpp:157
-#: src/gui/windows/itemamountwindow.cpp:191 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
msgid "-"
msgstr ""
@@ -4949,9 +4999,9 @@ msgstr ""
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:274 src/gui/windows/charcreatedialog.cpp:119
-#: src/gui/windows/charselectdialog.cpp:593
-#: src/gui/windows/socialwindow.cpp:1307
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
msgid "Create"
msgstr "Aanmaken"
@@ -4960,7 +5010,7 @@ msgstr "Aanmaken"
#. TRANSLATORS: status bar label
#. TRANSLATORS: status window label
#. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:278 src/gui/windows/selldialog.cpp:112
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
#: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
#: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
msgid "Max"
@@ -5059,7 +5109,7 @@ msgstr ""
#. TRANSLATORS: login dialog label
#. TRANSLATORS: register dialog. label.
#: src/gui/windows/charcreatedialog.cpp:73
-#: src/gui/windows/editserverdialog.cpp:89 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
#: src/gui/windows/registerdialog.cpp:89
msgid "Name:"
msgstr "Naam:"
@@ -5120,7 +5170,7 @@ msgstr "Vrouwelijk"
#. TRANSLATORS: char create dialog label
#: src/gui/windows/charcreatedialog.cpp:115
-#: src/gui/windows/charcreatedialog.cpp:469
+#: src/gui/windows/charcreatedialog.cpp:458
#, c-format
msgid "Please distribute %d points"
msgstr "Nog %d punten te verdelen"
@@ -5136,17 +5186,17 @@ msgid "Look:"
msgstr ""
#. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:362
+#: src/gui/windows/charcreatedialog.cpp:351
msgid "Your name needs to be at least 4 characters."
msgstr "Je naam moet uit tenminste 4 tekens bestaan"
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:459
+#: src/gui/windows/charcreatedialog.cpp:448
msgid "Character stats OK"
msgstr "Attributen van personage OK"
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:475
+#: src/gui/windows/charcreatedialog.cpp:464
#, c-format
msgid "Please remove %d points"
msgstr "Verwijder alstublieft %d punten"
@@ -5175,7 +5225,7 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:104
-#: src/gui/windows/charselectdialog.cpp:588
+#: src/gui/windows/charselectdialog.cpp:580
#: src/gui/windows/updaterwindow.cpp:188
msgid "Play"
msgstr "Spelen"
@@ -5231,35 +5281,20 @@ msgstr ""
msgid "Enter password:"
msgstr ""
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:172
-msgid "rainbow 1"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:174
-msgid "rainbow 2"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:176
-msgid "rainbow 3"
-msgstr ""
-
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:755
+#: src/gui/windows/chatwindow.cpp:705
#, c-format
msgid "Present: %s; %d players are present."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1169
+#: src/gui/windows/chatwindow.cpp:1119
#, c-format
msgid "Whispering to %s: %s"
msgstr "Fluisteren naar %s: %s"
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1613
+#: src/gui/windows/chatwindow.cpp:1563
#, c-format
msgid "%s's pet"
msgstr ""
@@ -5505,51 +5540,51 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:77
-#: src/gui/windows/itemamountwindow.cpp:161 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
msgid "OK"
msgstr "OK"
#. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:66
+#: src/gui/windows/editserverdialog.cpp:45
msgid "Edit Server"
msgstr ""
#. TRANSLATORS: edit server dialog button
#. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:75
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
msgid "Connect"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:91
+#: src/gui/windows/editserverdialog.cpp:70
msgid "Address:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:93
+#: src/gui/windows/editserverdialog.cpp:72
msgid "Port:"
msgstr "Poort:"
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:95
+#: src/gui/windows/editserverdialog.cpp:74
msgid "Server type:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:97
+#: src/gui/windows/editserverdialog.cpp:76
msgid "Description:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:99
+#: src/gui/windows/editserverdialog.cpp:78
msgid "Online list url:"
msgstr ""
#. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:220
+#: src/gui/windows/editserverdialog.cpp:188
msgid "Please at least type both the address and the port of the server."
msgstr ""
@@ -5569,47 +5604,47 @@ msgid "Did you know..."
msgstr ""
#. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:165
+#: src/gui/windows/itemamountwindow.cpp:164
msgid "All"
msgstr "Alle"
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:221
+#: src/gui/windows/itemamountwindow.cpp:220
msgid "Select amount of items to trade."
msgstr "Selecteer het aantal exemplaren om te verhandelen"
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:225
+#: src/gui/windows/itemamountwindow.cpp:224
msgid "Select amount of items to drop."
msgstr "Selecteer het aantal exemplaren om neer te leggen"
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:229
+#: src/gui/windows/itemamountwindow.cpp:228
msgid "Select amount of items to store."
msgstr "Selecteer hoeveelheid voorwerpen te bewaren."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:233
+#: src/gui/windows/itemamountwindow.cpp:232
msgid "Select amount of items to retrieve."
msgstr "Selecteer hoeveelheid voorwerpen terug te nemen."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:237
+#: src/gui/windows/itemamountwindow.cpp:236
msgid "Select amount of items to split."
msgstr "Selecteer hoeveelheid voorwerpen om te splitsen."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:241
+#: src/gui/windows/itemamountwindow.cpp:240
msgid "Add to buy shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:245
+#: src/gui/windows/itemamountwindow.cpp:244
msgid "Add to sell shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:249
+#: src/gui/windows/itemamountwindow.cpp:248
msgid "Unknown."
msgstr ""
@@ -5861,7 +5896,7 @@ msgstr "Indienen"
#. TRANSLATORS: shop window label
#. TRANSLATORS: shop window button
#. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:258
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
#: src/gui/windows/tradewindow.cpp:78
msgid "Add"
@@ -5963,53 +5998,53 @@ msgid "Do you really want to sell %s?"
msgstr ""
#. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
msgid "Choose Your Server"
msgstr ""
#. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
msgid "Load"
msgstr ""
#. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
msgid "Choose Your Server *** SAFE MODE ***"
msgstr ""
#. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
msgid "Use same ip for game sub servers"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
msgid "Waiting for server..."
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
msgid "Preparing download"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
msgid "Error retreiving server list!"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
msgid "requires a newer version"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
#, c-format
msgid "requires v%s"
msgstr ""
@@ -6090,277 +6125,277 @@ msgid "Skill %d"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:225
+#: src/gui/windows/socialwindow.cpp:227
#, c-format
msgid "Invited user %s to guild %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:240
+#: src/gui/windows/socialwindow.cpp:242
#, c-format
msgid "Guild %s quit requested."
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:254
+#: src/gui/windows/socialwindow.cpp:256
msgid "Member Invite to Guild"
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:256
+#: src/gui/windows/socialwindow.cpp:258
#, c-format
msgid "Who would you like to invite to guild %s?"
msgstr ""
#. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:266
+#: src/gui/windows/socialwindow.cpp:268
msgid "Leave Guild?"
msgstr ""
#. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:268
+#: src/gui/windows/socialwindow.cpp:270
#, c-format
msgid "Are you sure you want to leave guild %s?"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:279
+#: src/gui/windows/socialwindow.cpp:281
#, c-format
msgid "Members: %u/%u"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:301 src/gui/windows/socialwindow.cpp:373
-#: src/gui/windows/socialwindow.cpp:498
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
#, c-format
msgid "Players: %u/%u"
msgstr ""
#. TRANSLATORS: tab in social window
#. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:389 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
msgid "Party"
msgstr "Groep"
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:429
+#: src/gui/windows/socialwindow.cpp:431
#, c-format
msgid "Invited user %s to party."
msgstr ""
#. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:444
+#: src/gui/windows/socialwindow.cpp:446
#, c-format
msgid "Party %s quit requested."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:458
+#: src/gui/windows/socialwindow.cpp:460
msgid "Member Invite to Party"
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:460
+#: src/gui/windows/socialwindow.cpp:462
#, c-format
msgid "Who would you like to invite to party %s?"
msgstr ""
#. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:470
+#: src/gui/windows/socialwindow.cpp:472
msgid "Leave Party?"
msgstr ""
#. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:472
+#: src/gui/windows/socialwindow.cpp:474
#, c-format
msgid "Are you sure you want to leave party %s?"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:698
+#: src/gui/windows/socialwindow.cpp:665
#, c-format
msgid "Visible players: %d"
msgstr ""
#. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:725
+#: src/gui/windows/socialwindow.cpp:692
msgid "Nav"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:827
+#: src/gui/windows/socialwindow.cpp:794
#, c-format
msgid "Portals: %u/%u"
msgstr ""
#. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1054
+#: src/gui/windows/socialwindow.cpp:1021
msgid "Atk"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1073
+#: src/gui/windows/socialwindow.cpp:1040
msgid "Priority mobs"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1075
+#: src/gui/windows/socialwindow.cpp:1042
msgid "Attack mobs"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1077
+#: src/gui/windows/socialwindow.cpp:1044
msgid "Ignore mobs"
msgstr ""
#. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1101
+#: src/gui/windows/socialwindow.cpp:1068
msgid "Pik"
msgstr ""
#. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1120
+#: src/gui/windows/socialwindow.cpp:1087
msgid "Pickup items"
msgstr ""
#. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1122
+#: src/gui/windows/socialwindow.cpp:1089
msgid "Ignore items"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1212
+#: src/gui/windows/socialwindow.cpp:1179
#, c-format
msgid "Friends: %u/%u"
msgstr ""
#. TRANSLATORS: party popup item
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1235 src/gui/windows/socialwindow.cpp:1727
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
msgid "Create Party"
msgstr ""
#. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1298
+#: src/gui/windows/socialwindow.cpp:1265
msgid "P"
msgstr ""
#. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1303
+#: src/gui/windows/socialwindow.cpp:1270
msgid "F"
msgstr ""
#. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1309
+#: src/gui/windows/socialwindow.cpp:1276
msgid "Invite"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1503
+#: src/gui/windows/socialwindow.cpp:1470
#, c-format
msgid "Accepted party invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1514
+#: src/gui/windows/socialwindow.cpp:1481
#, c-format
msgid "Rejected party invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1531
+#: src/gui/windows/socialwindow.cpp:1498
#, c-format
msgid "Accepted guild invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1545
+#: src/gui/windows/socialwindow.cpp:1512
#, c-format
msgid "Rejected guild invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1585
+#: src/gui/windows/socialwindow.cpp:1552
#, c-format
msgid "Creating guild called %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1606
+#: src/gui/windows/socialwindow.cpp:1573
#, c-format
msgid "Creating party called %s."
msgstr ""
#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1621
+#: src/gui/windows/socialwindow.cpp:1588
msgid "Guild Name"
msgstr ""
#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1623
+#: src/gui/windows/socialwindow.cpp:1590
msgid "Choose your guild's name."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1639
+#: src/gui/windows/socialwindow.cpp:1606
msgid "Received guild request, but one already exists."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1647
+#: src/gui/windows/socialwindow.cpp:1614
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1654
+#: src/gui/windows/socialwindow.cpp:1621
msgid "Accept Guild Invite"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1670
+#: src/gui/windows/socialwindow.cpp:1637
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/windows/socialwindow.cpp:1682
+#: src/gui/windows/socialwindow.cpp:1649
msgid "You have been invited you to join a party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1687
+#: src/gui/windows/socialwindow.cpp:1654
#, c-format
msgid "You have been invited to join the %s party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1696
+#: src/gui/windows/socialwindow.cpp:1663
#, 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/windows/socialwindow.cpp:1702
+#: src/gui/windows/socialwindow.cpp:1669
#, 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/windows/socialwindow.cpp:1712
+#: src/gui/windows/socialwindow.cpp:1679
msgid "Accept Party Invite"
msgstr "Groepsuitnodiging aanvaarden"
-#: src/gui/windows/socialwindow.cpp:1728
+#: src/gui/windows/socialwindow.cpp:1695
msgid "Cannot create party. You are already in a party"
msgstr ""
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1734
+#: src/gui/windows/socialwindow.cpp:1701
msgid "Party Name"
msgstr ""
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1736
+#: src/gui/windows/socialwindow.cpp:1703
msgid "Choose your party's name."
msgstr ""
@@ -6402,113 +6437,68 @@ msgstr ""
msgid "Correction points: %d"
msgstr ""
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "No Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Allow Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:105
-msgid "Need Target"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "General Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "Life Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "War Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Transmute Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Nature Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:121
-msgid "Astral Magic"
-msgstr ""
-
#. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:164
+#: src/gui/windows/textcommandeditor.cpp:47
msgid "Command Editor"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:52
msgid "magic"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:54
msgid "other"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:173
+#: src/gui/windows/textcommandeditor.cpp:56
msgid "Symbol:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:176
+#: src/gui/windows/textcommandeditor.cpp:59
msgid "Command:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:179
+#: src/gui/windows/textcommandeditor.cpp:62
msgid "Comment:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:183
+#: src/gui/windows/textcommandeditor.cpp:66
msgid "Target Type:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:187
+#: src/gui/windows/textcommandeditor.cpp:70
msgid "Icon:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:190
+#: src/gui/windows/textcommandeditor.cpp:73
msgid "Mana:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:193
+#: src/gui/windows/textcommandeditor.cpp:76
msgid "Magic level:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:197
+#: src/gui/windows/textcommandeditor.cpp:80
msgid "Magic School:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:200
+#: src/gui/windows/textcommandeditor.cpp:83
msgid "School level:"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/windows/textcommandeditor.cpp:88
msgid "Save"
msgstr ""
@@ -6538,7 +6528,7 @@ msgid "Trade: You"
msgstr "Handel: Jij"
#. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
#, c-format
msgid "You get %s"
msgstr ""
@@ -6554,12 +6544,12 @@ msgid "You give:"
msgstr "Je geeft:"
#. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
msgid "You don't have enough money."
msgstr "Je hebt niet genoeg geld."
#. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
msgid ""
"Failed adding item. You can not overlap one kind of item on the window."
msgstr "Kan dat voorwerp niet toevoegen. Je kan één type voorwerp niet overlappen in het venster."
@@ -6630,17 +6620,17 @@ msgid "Who Is Online - Update"
msgstr ""
#. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:87
+#: src/gui/windows/worldselectdialog.cpp:49
msgid "Select World"
msgstr ""
#. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:93
+#: src/gui/windows/worldselectdialog.cpp:55
msgid "Change Login"
msgstr ""
#. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:95
+#: src/gui/windows/worldselectdialog.cpp:57
msgid "Choose World"
msgstr ""
@@ -6858,7 +6848,7 @@ msgid "Failed to create character. Most likely the name is already taken."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:281
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
msgid "Wrong name."
msgstr ""
@@ -7016,58 +7006,58 @@ msgid "Experience sharing unknown."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:154
+#: src/net/ea/loginhandler.cpp:149
msgid "Account was not found. Please re-login."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/ea/loginhandler.cpp:153
msgid "Old password incorrect."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:162
+#: src/net/ea/loginhandler.cpp:157
msgid "New password too short."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:166 src/net/ea/loginhandler.cpp:293
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
msgid "Unknown error."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:239
+#: src/net/ea/loginhandler.cpp:234
msgid "Unregistered ID."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:238
msgid "Wrong password."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:248
+#: src/net/ea/loginhandler.cpp:243
msgid "Account expired."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:252
+#: src/net/ea/loginhandler.cpp:247
msgid "Rejected from server."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:256
+#: src/net/ea/loginhandler.cpp:251
msgid ""
"You have been permanently banned from the game. Please contact the GM team."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:261
+#: src/net/ea/loginhandler.cpp:256
msgid "Client too old."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:265
+#: src/net/ea/loginhandler.cpp:260
#, c-format
msgid ""
"You have been temporarily banned from the game until %s.\n"
@@ -7075,22 +7065,22 @@ msgid ""
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:273
+#: src/net/ea/loginhandler.cpp:268
msgid "Server overpopulated."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:277
+#: src/net/ea/loginhandler.cpp:272
msgid "This user name is already taken."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:285
+#: src/net/ea/loginhandler.cpp:280
msgid "Incorrect email."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:289
+#: src/net/ea/loginhandler.cpp:284
msgid "Username permanently erased."
msgstr ""
@@ -7763,7 +7753,7 @@ msgstr ""
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
#: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "naamloos"
diff --git a/po/nl_BE.po b/po/nl_BE.po
index 1c097dd8b..0ae76bf62 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -11,7 +11,7 @@ msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
"POT-Creation-Date: 2014-02-28 21:21+0300\n"
-"PO-Revision-Date: 2014-02-23 08:14+0000\n"
+"PO-Revision-Date: 2014-03-01 08:14+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"
@@ -7814,6 +7814,3 @@ msgstr "Onbekend voorwerp"
#: src/resources/db/petdb.cpp:99
msgid "pet"
msgstr ""
-
-#~ msgid "Specials"
-#~ msgstr "Specialen"
diff --git a/po/pl.po b/po/pl.po
index 6df99c6a8..2e07d6793 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -13,7 +13,7 @@ msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
"POT-Creation-Date: 2014-02-28 21:21+0300\n"
-"PO-Revision-Date: 2014-02-23 08:14+0000\n"
+"PO-Revision-Date: 2014-03-01 08:14+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/manaplus/language/"
"pl/)\n"
@@ -7828,9 +7828,3 @@ msgstr "Nieznany przedmiot"
#: src/resources/db/petdb.cpp:99
msgid "pet"
msgstr ""
-
-#~ msgid "SPE"
-#~ msgstr "SPE"
-
-#~ msgid "Specials"
-#~ msgstr "Specjalne"
diff --git a/po/pt.po b/po/pt.po
index 54c736199..9c95164a1 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -12,7 +12,7 @@ msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
"POT-Creation-Date: 2014-02-28 21:21+0300\n"
-"PO-Revision-Date: 2014-02-23 08:14+0000\n"
+"PO-Revision-Date: 2014-03-01 08:14+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Portuguese (http://www.transifex.com/projects/p/manaplus/"
"language/pt/)\n"
@@ -7826,9 +7826,3 @@ msgstr "Item desconhecido"
#: src/resources/db/petdb.cpp:99
msgid "pet"
msgstr ""
-
-#~ msgid "SPE"
-#~ msgstr "SPE"
-
-#~ msgid "Specials"
-#~ msgstr "Especiais"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index bd777b546..bf8d707c8 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -18,7 +18,7 @@ msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
"POT-Creation-Date: 2014-02-28 21:21+0300\n"
-"PO-Revision-Date: 2014-02-23 08:14+0000\n"
+"PO-Revision-Date: 2014-03-01 08:14+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"
@@ -7832,9 +7832,3 @@ msgstr "Item desconhecido"
#: src/resources/db/petdb.cpp:99
msgid "pet"
msgstr ""
-
-#~ msgid "SPE"
-#~ msgstr "SPE"
-
-#~ msgid "Specials"
-#~ msgstr "Especiais"
diff --git a/po/ru.po b/po/ru.po
index 0e9cea643..92289a1c4 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -16,7 +16,7 @@ msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
"POT-Creation-Date: 2014-02-28 21:21+0300\n"
-"PO-Revision-Date: 2014-02-23 08:14+0000\n"
+"PO-Revision-Date: 2014-03-01 08:14+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/manaplus/"
"language/ru/)\n"
@@ -7839,9 +7839,3 @@ msgstr "Неизвестный предмет"
#: src/resources/db/petdb.cpp:99
msgid "pet"
msgstr "животное"
-
-#~ msgid "SPE"
-#~ msgstr "СПЕ"
-
-#~ msgid "Specials"
-#~ msgstr "Особые"
diff --git a/po/sk.po b/po/sk.po
index 9dd039380..d49bc884d 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: 2014-02-23 00:42+0300\n"
-"PO-Revision-Date: 2014-02-23 08:14+0000\n"
+"POT-Creation-Date: 2014-02-28 21:21+0300\n"
+"PO-Revision-Date: 2014-03-01 08:14+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"
@@ -29,7 +29,7 @@ msgid "Accepting incoming trade requests"
msgstr ""
#. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
msgid "Visible on map"
msgstr ""
@@ -38,68 +38,68 @@ msgstr ""
msgid "Human"
msgstr ""
-#: src/being/being.cpp:544
+#: src/being/being.cpp:496
msgid "dodge"
msgstr ""
-#: src/being/being.cpp:544
+#: src/being/being.cpp:496
msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1965 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1970 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr ""
#. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:392
+#: src/being/localplayer.cpp:376
#, c-format
msgid "You were killed by %s"
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1377
+#: src/being/localplayer.cpp:816
msgid "Tried to pick up nonexistent item."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1381
+#: src/being/localplayer.cpp:820
msgid "Item is too heavy."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1385
+#: src/being/localplayer.cpp:824
msgid "Item is too far away."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1389
+#: src/being/localplayer.cpp:828
msgid "Inventory is full."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1393
+#: src/being/localplayer.cpp:832
msgid "Stack is too big."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1397
+#: src/being/localplayer.cpp:836
msgid "Item belongs to someone else."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1401
+#: src/being/localplayer.cpp:840
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:1425
+#: src/being/localplayer.cpp:864
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -108,387 +108,387 @@ msgstr[1] ""
msgstr[2] ""
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1630 src/being/localplayer.cpp:1665
-#: src/being/localplayer.cpp:1666
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
msgid "xp"
msgstr ""
-#: src/being/localplayer.cpp:1671 src/being/localplayer.cpp:1678
-#: src/being/localplayer.cpp:1685
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
msgid "job"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1871
+#: src/being/localplayer.cpp:1285
msgid "(D) default moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1873
+#: src/being/localplayer.cpp:1287
msgid "(I) invert moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1875
+#: src/being/localplayer.cpp:1289
msgid "(c) moves with some crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1877
+#: src/being/localplayer.cpp:1291
msgid "(C) moves with crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1879
+#: src/being/localplayer.cpp:1293
msgid "(d) double normal + crazy"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1881
+#: src/being/localplayer.cpp:1295
msgid "(?) unknown move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1904
+#: src/being/localplayer.cpp:1318
#, c-format
msgid "(%u) crazy move number %u"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1910
+#: src/being/localplayer.cpp:1324
msgid "(a) custom crazy move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1915
+#: src/being/localplayer.cpp:1329
msgid "(?) crazy move"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1930
+#: src/being/localplayer.cpp:1344
msgid "(0) default moves to target"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1932
+#: src/being/localplayer.cpp:1346
msgid "(1) moves to target in distance 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1934
+#: src/being/localplayer.cpp:1348
msgid "(2) moves to target in distance 2"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1936
+#: src/being/localplayer.cpp:1350
msgid "(3) moves to target in distance 3"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1938
+#: src/being/localplayer.cpp:1352
msgid "(5) moves to target in distance 5"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1940
+#: src/being/localplayer.cpp:1354
msgid "(7) moves to target in distance 7"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1942
+#: src/being/localplayer.cpp:1356
msgid "(A) moves to target in attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1944
+#: src/being/localplayer.cpp:1358
msgid "(a) archer attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1946
+#: src/being/localplayer.cpp:1360
msgid "(B) moves to target in attack range - 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1948
+#: src/being/localplayer.cpp:1362
msgid "(?) move to target"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1968
+#: src/being/localplayer.cpp:1382
msgid "(D) default follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1970
+#: src/being/localplayer.cpp:1384
msgid "(R) relative follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1972
+#: src/being/localplayer.cpp:1386
msgid "(M) mirror follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1974
+#: src/being/localplayer.cpp:1388
msgid "(P) pet follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1976
+#: src/being/localplayer.cpp:1390
msgid "(?) unknown follow"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1996 src/being/localplayer.cpp:2004
-#: src/being/localplayer.cpp:2032
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
msgid "(?) attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1998 src/being/localplayer.cpp:2024
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
msgid "(D) default attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2000
+#: src/being/localplayer.cpp:1414
msgid "(s) switch attack without shield"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2002
+#: src/being/localplayer.cpp:1416
msgid "(S) switch attack with shield"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2026
+#: src/being/localplayer.cpp:1440
msgid "(G) go and attack"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2028
+#: src/being/localplayer.cpp:1442
msgid "(A) go, attack, pickup"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2030
+#: src/being/localplayer.cpp:1444
msgid "(d) without auto attack"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2084
+#: src/being/localplayer.cpp:1498
msgid "(S) small pick up 1x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2086
+#: src/being/localplayer.cpp:1500
msgid "(D) default pick up 2x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2088
+#: src/being/localplayer.cpp:1502
msgid "(F) forward pick up 2x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2090
+#: src/being/localplayer.cpp:1504
msgid "(3) pick up 3x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2092
+#: src/being/localplayer.cpp:1506
msgid "(g) go and pick up in distance 4"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2094
+#: src/being/localplayer.cpp:1508
msgid "(G) go and pick up in distance 8"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2096
+#: src/being/localplayer.cpp:1510
msgid "(A) go and pick up in max distance"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2098
+#: src/being/localplayer.cpp:1512
msgid "(?) pick up"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2112
+#: src/being/localplayer.cpp:1526
msgid "(N) normal map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2114
+#: src/being/localplayer.cpp:1528
msgid "(D) debug map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2116
+#: src/being/localplayer.cpp:1530
msgid "(u) ultra map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2118
+#: src/being/localplayer.cpp:1532
msgid "(U) ultra map view 2"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2120
+#: src/being/localplayer.cpp:1534
msgid "(e) empty map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2122
+#: src/being/localplayer.cpp:1536
msgid "(b) black & white map view"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2142
+#: src/being/localplayer.cpp:1556
msgid "(f) use #flar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2144
+#: src/being/localplayer.cpp:1558
msgid "(c) use #chiza for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2146
+#: src/being/localplayer.cpp:1560
msgid "(I) use #ingrav for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2148
+#: src/being/localplayer.cpp:1562
msgid "(F) use #frillyar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2150
+#: src/being/localplayer.cpp:1564
msgid "(U) use #upmarmu for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2152
+#: src/being/localplayer.cpp:1566
msgid "(?) magic attack"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2172
+#: src/being/localplayer.cpp:1586
msgid "(a) attack all players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2174
+#: src/being/localplayer.cpp:1588
msgid "(f) attack all except friends"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2176
+#: src/being/localplayer.cpp:1590
msgid "(b) attack bad relations"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2178
+#: src/being/localplayer.cpp:1592
msgid "(d) don't attack players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2180
+#: src/being/localplayer.cpp:1594
msgid "(?) pvp attack"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2200
+#: src/being/localplayer.cpp:1614
msgid "(D) default imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2202
+#: src/being/localplayer.cpp:1616
msgid "(O) outfits imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2204
+#: src/being/localplayer.cpp:1618
msgid "(?) imitation"
msgstr ""
#. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2233
+#: src/being/localplayer.cpp:1647
msgid "Away"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2256
+#: src/being/localplayer.cpp:1670
msgid "(O) on keyboard"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2258
+#: src/being/localplayer.cpp:1672
msgid "(A) away"
msgstr ""
#. TRANSLATORS: away type in status bar
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2260 src/being/localplayer.cpp:2278
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
msgid "(?) away"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2274
+#: src/being/localplayer.cpp:1688
msgid "(G) game camera mode"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2276
+#: src/being/localplayer.cpp:1690
msgid "(F) free camera mode"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2303
+#: src/being/localplayer.cpp:1717
msgid "Game modifiers are enabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2305
+#: src/being/localplayer.cpp:1719
msgid "Game modifiers are disabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2307
+#: src/being/localplayer.cpp:1721
msgid "Game modifiers are unknown"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3887
+#: src/being/localplayer.cpp:3287
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3893 src/being/localplayer.cpp:3918
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3903
+#: src/being/localplayer.cpp:3303
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3909 src/being/localplayer.cpp:3923
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4266
+#: src/being/localplayer.cpp:3666
#, c-format
msgid "You see %s"
msgstr ""
@@ -526,32 +526,32 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1139 src/gui/windowmenu.cpp:167
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
#: src/gui/windows/setupwindow.cpp:61
msgid "Setup"
msgstr "Nastavenie"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1143 src/gui/widgets/tabs/setup_perfomance.cpp:51
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1146 src/gui/widgets/tabs/setup_video.cpp:225
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:225
msgid "Video"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1149 src/gui/widgets/tabs/setup_theme.cpp:269
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1152 src/gui/windowmenu.cpp:74
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr "Nápoveda"
@@ -564,41 +564,41 @@ msgstr "Nápoveda"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1156 src/gui/popups/popupmenu.cpp:619
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
#: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:69
-#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:138
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
#: src/gui/windows/shopwindow.cpp:78
msgid "Close"
msgstr "Zatvoriť"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1324
msgid "Logging in"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1367
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1492
+#: src/client.cpp:1489
msgid "Requesting characters"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1532
+#: src/client.cpp:1529
msgid "Connecting to the game server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1545
+#: src/client.cpp:1541
msgid "Changing game servers"
msgstr ""
@@ -613,12 +613,12 @@ msgstr ""
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1606 src/client.cpp:1617 src/client.cpp:1801
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:349
#: src/gui/windows/charselectdialog.cpp:299
-#: src/gui/windows/editserverdialog.cpp:218
+#: src/gui/windows/editserverdialog.cpp:186
#: src/gui/windows/registerdialog.cpp:260
#: src/gui/windows/unregisterdialog.cpp:146
#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
@@ -626,65 +626,65 @@ msgid "Error"
msgstr "Chyba"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1629
+#: src/client.cpp:1625
msgid "Requesting registration details"
msgstr ""
#. TRANSLATORS: password change message header
-#: src/client.cpp:1670
+#: src/client.cpp:1666
msgid "Password Change"
msgstr ""
#. TRANSLATORS: password change message text
-#: src/client.cpp:1672
+#: src/client.cpp:1668
msgid "Password changed successfully!"
msgstr ""
#. TRANSLATORS: email change message header
-#: src/client.cpp:1694
+#: src/client.cpp:1690
msgid "Email Change"
msgstr ""
#. TRANSLATORS: email change message text
-#: src/client.cpp:1696
+#: src/client.cpp:1692
msgid "Email changed successfully!"
msgstr ""
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1719
+#: src/client.cpp:1715
msgid "Unregister Successful"
msgstr ""
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1721
+#: src/client.cpp:1717
msgid "Farewell, come back any time..."
msgstr ""
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1998 src/client.cpp:2013 src/client.cpp:2058
-#: src/client.cpp:2074 src/client.cpp:2525 src/client.cpp:2533
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2230
+#: src/client.cpp:2232
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2271 src/client.cpp:2278
+#: src/client.cpp:2273 src/client.cpp:2280
msgid "Error creating updates directory!"
msgstr ""
-#: src/client.cpp:2300 src/client.cpp:2317
+#: src/client.cpp:2302 src/client.cpp:2319
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: error message question
-#: src/client.cpp:3001
+#: src/client.cpp:3003
msgid "Do you want to open support page?"
msgstr ""
@@ -930,99 +930,154 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:277 src/gui/widgets/tabs/chattab.cpp:464
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
msgid "General"
msgstr ""
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:293 src/gui/widgets/tabs/chattab.cpp:466
-#: src/gui/windowmenu.cpp:154 src/gui/windows/debugwindow.cpp:53
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:575
+#: src/game.cpp:563
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:585
+#: src/game.cpp:573
msgid "Saving screenshot failed!"
msgstr ""
#. TRANSLATORS: error message text
-#: src/game.cpp:656
+#: src/game.cpp:644
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:659
+#: src/game.cpp:647
msgid "Network Error"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
-msgid "black"
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
msgstr ""
+#. TRANSLATORS: chat color
#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
+msgid "black"
+msgstr ""
+
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
msgid "red"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
msgid "green"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
msgid "blue"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
msgid "gold"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
msgid "yellow"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
msgid "pink"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
msgid "purple"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
msgid "grey"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
msgid "brown"
msgstr ""
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr ""
+
#. TRANSLATORS: relation type
#: src/gui/models/playerrelationlistmodel.h:33
msgid "Neutral"
@@ -1058,46 +1113,61 @@ msgstr ""
msgid "Enemy"
msgstr ""
-#. TRANSLATORS: inventory sort mode
-#. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#: src/gui/models/sortlistmodelinv.h:34
-#: src/gui/widgets/tabs/setup_other.cpp:72
-#: src/gui/widgets/tabs/setup_visual.cpp:78 src/gui/windows/chatwindow.cpp:150
-msgid "default"
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:36 src/gui/windows/buydialog.cpp:62
-msgid "by name"
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
msgstr ""
+#. TRANSLATORS: buy dialog sort type.
#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
+msgid "by name"
+msgstr ""
+
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:38 src/gui/windows/buydialog.cpp:64
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
msgid "by id"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:40 src/gui/windows/buydialog.cpp:66
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
msgid "by weight"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:42 src/gui/windows/buydialog.cpp:68
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
msgid "by amount"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:44 src/gui/windows/buydialog.cpp:70
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
msgid "by type"
msgstr ""
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr ""
+
#. TRANSLATORS: update type
#. TRANSLATORS: onscreen button size
#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
@@ -1244,8 +1314,8 @@ msgstr ""
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
-#: src/gui/windows/buydialog.cpp:208 src/gui/windows/buydialog.cpp:220
-#: src/gui/windows/buydialog.cpp:274 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
msgid "Buy"
msgstr "Kúpiť"
@@ -1342,12 +1412,12 @@ msgstr ""
#: src/gui/windows/changepassworddialog.cpp:57
#: src/gui/windows/charcreatedialog.cpp:121
#: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:79
-#: src/gui/windows/itemamountwindow.cpp:163
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
-#: src/gui/windows/socialwindow.cpp:1238
-#: src/gui/windows/textcommandeditor.cpp:203 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:54
#: src/gui/windows/updaterwindow.cpp:186
msgid "Cancel"
@@ -1419,7 +1489,7 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:150 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
msgstr ""
@@ -1432,7 +1502,7 @@ msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:134
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
msgid "Spells"
msgstr ""
@@ -1488,7 +1558,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
#. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1311
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
msgid "Leave"
msgstr ""
@@ -1569,8 +1639,8 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
-#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:223
-#: src/gui/windows/inventorywindow.cpp:745 src/gui/windows/setupwindow.cpp:96
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
msgid "Store"
msgstr ""
@@ -1601,7 +1671,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
msgid "Retrieve"
msgstr ""
@@ -1634,8 +1704,8 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
-#: src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:656 src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr "Použiť"
@@ -1669,8 +1739,8 @@ msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: language
#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/widgets/tabs/setup_theme.cpp:127
-#: src/gui/windows/socialwindow.cpp:1003
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
msgid "(default)"
msgstr ""
@@ -1826,8 +1896,8 @@ msgstr ""
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:645
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
msgid "Unequip"
msgstr "Odstrojiť"
@@ -1835,16 +1905,16 @@ msgstr "Odstrojiť"
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:172
-#: src/gui/windows/inventorywindow.cpp:650 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr "Vystrojiť"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:189
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
msgid "Drop..."
msgstr ""
@@ -1858,15 +1928,15 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:138
-#: src/gui/windows/inventorywindow.cpp:758
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
msgid "Drop"
msgstr "Zahodiť"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
msgid "Split"
msgstr ""
@@ -2022,10 +2092,10 @@ msgstr ""
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:276
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/windows/serverdialog.cpp:198
msgid "Quit"
msgstr "Ukončiť"
@@ -2587,7 +2657,7 @@ msgstr ""
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: register dialog. button.
#: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:146
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:330
#: src/gui/widgets/tabs/setup_visual.cpp:189
@@ -2614,9 +2684,8 @@ msgstr ""
#. TRANSLATORS: command editor button
#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
#: src/gui/windows/charselectdialog.cpp:108
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:94
-#: src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/textcommandeditor.cpp:207
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
msgid "Delete"
msgstr "Vymazať"
@@ -2652,7 +2721,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:130
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
msgid "Shortcuts"
msgstr ""
@@ -2660,7 +2729,7 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:151
msgid "Windows"
msgstr ""
@@ -2676,7 +2745,7 @@ msgstr ""
#. TRANSLATORS: settings tab name
#. TRANSLATORS: chat window name
#: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:88 src/gui/windows/chatwindow.cpp:203
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
msgid "Chat"
msgstr ""
@@ -2899,7 +2968,7 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:137
-#: src/gui/windows/inventorywindow.cpp:569
+#: src/gui/windows/inventorywindow.cpp:568
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
#, c-format
@@ -2919,7 +2988,7 @@ msgstr ""
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/windows/serverdialog.cpp:204
msgid "Edit"
msgstr ""
@@ -2972,7 +3041,7 @@ msgstr ""
#. TRANSLATORS: tab in social window
#. TRANSLATORS: guild chat tab name
#: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:184 src/gui/windows/socialwindow.cpp:320
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
#: src/net/ea/gui/guildtab.cpp:44
msgid "Guild"
msgstr ""
@@ -2983,142 +3052,142 @@ msgid "Lang"
msgstr ""
#. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:49
+#: src/gui/widgets/tabs/setup_audio.cpp:48
msgid "Audio"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:57
+#: src/gui/widgets/tabs/setup_audio.cpp:56
msgid "Basic settings"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:60
+#: src/gui/widgets/tabs/setup_audio.cpp:59
msgid "Enable Audio"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:63
+#: src/gui/widgets/tabs/setup_audio.cpp:62
msgid "Enable music"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:67
+#: src/gui/widgets/tabs/setup_audio.cpp:66
msgid "Enable game sfx"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:71
+#: src/gui/widgets/tabs/setup_audio.cpp:70
msgid "Enable gui sfx"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:74
msgid "Sfx volume"
msgstr "Sfx zvuk"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:78
msgid "Music volume"
msgstr "Hudobný zvuk"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:82
msgid "Enable music fade out"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:86
msgid "Audio frequency"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:90
msgid "mono"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:93
+#: src/gui/widgets/tabs/setup_audio.cpp:92
msgid "stereo"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:94
msgid "surround"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:97
+#: src/gui/widgets/tabs/setup_audio.cpp:96
msgid "surround+center+lfe"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:98
msgid "Audio channels"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:104
+#: src/gui/widgets/tabs/setup_audio.cpp:103
msgid "Sound effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:106
msgid "Information dialog sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:110
msgid "Request dialog sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:115
+#: src/gui/widgets/tabs/setup_audio.cpp:114
msgid "Whisper message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:118
msgid "Guild / Party message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:122
msgid "Highlight message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:126
msgid "Global message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:130
msgid "Error message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:134
msgid "Trade request sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:138
msgid "Show window sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:142
msgid "Hide window sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:150
msgid "Enable mumble voice chat"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:156
+#: src/gui/widgets/tabs/setup_audio.cpp:155
msgid "Download music"
msgstr ""
@@ -3414,7 +3483,7 @@ msgstr ""
#. TRANSLATORS: unknown key name
#. TRANSLATORS: quests window quest name
#: src/gui/widgets/tabs/setup_input.cpp:364
-#: src/gui/windows/questswindow.cpp:263
+#: src/gui/windows/questswindow.cpp:249
msgid "unknown"
msgstr ""
@@ -3573,7 +3642,7 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: debug window tab
#. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:105
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
#: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
#: src/gui/windows/minimap.cpp:114
msgid "Map"
@@ -3741,9 +3810,9 @@ msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: shop window name
#. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:146
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
#: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windows/inventorywindow.cpp:194
msgid "Shop"
msgstr "Obchod"
@@ -4125,252 +4194,252 @@ msgid "When ignoring:"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:64
+#: src/gui/widgets/tabs/setup_theme.cpp:63
msgid "Very small (8)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:66
+#: src/gui/widgets/tabs/setup_theme.cpp:65
msgid "Very small (9)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:68
+#: src/gui/widgets/tabs/setup_theme.cpp:67
msgid "Tiny (10)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:70
+#: src/gui/widgets/tabs/setup_theme.cpp:69
msgid "Small (11)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:72
+#: src/gui/widgets/tabs/setup_theme.cpp:71
msgid "Medium (12)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:74
+#: src/gui/widgets/tabs/setup_theme.cpp:73
msgid "Normal (13)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:76
+#: src/gui/widgets/tabs/setup_theme.cpp:75
msgid "Large (14)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:78
+#: src/gui/widgets/tabs/setup_theme.cpp:77
msgid "Large (15)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:80
+#: src/gui/widgets/tabs/setup_theme.cpp:79
msgid "Large (16)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:82
+#: src/gui/widgets/tabs/setup_theme.cpp:81
msgid "Big (17)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:83
msgid "Big (18)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:85
msgid "Big (19)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:87
msgid "Very big (20)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:89
msgid "Very big (21)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:91
msgid "Very big (22)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:93
msgid "Huge (23)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:129
+#: src/gui/widgets/tabs/setup_theme.cpp:128
msgid "Chinese (China)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:131
+#: src/gui/widgets/tabs/setup_theme.cpp:130
msgid "Czech"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:133
+#: src/gui/widgets/tabs/setup_theme.cpp:132
msgid "English"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:135
+#: src/gui/widgets/tabs/setup_theme.cpp:134
msgid "Finnish"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:137
+#: src/gui/widgets/tabs/setup_theme.cpp:136
msgid "French"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:139
+#: src/gui/widgets/tabs/setup_theme.cpp:138
msgid "German"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:141
+#: src/gui/widgets/tabs/setup_theme.cpp:140
msgid "Indonesian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:143
+#: src/gui/widgets/tabs/setup_theme.cpp:142
msgid "Italian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:145
+#: src/gui/widgets/tabs/setup_theme.cpp:144
msgid "Polish"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:147
+#: src/gui/widgets/tabs/setup_theme.cpp:146
msgid "Japanese"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:148
msgid "Dutch (Belgium/Flemish)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:150
msgid "Portuguese"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:152
msgid "Portuguese (Brazilian)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:154
msgid "Russian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:156
msgid "Spanish (Castilian)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:158
msgid "Turkish"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:211
+#: src/gui/widgets/tabs/setup_theme.cpp:210
msgid "Gui theme"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:218
+#: src/gui/widgets/tabs/setup_theme.cpp:217
msgid "Main Font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:223
+#: src/gui/widgets/tabs/setup_theme.cpp:222
msgid "Language"
msgstr ""
#. TRANSLATORS: theme settings label
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:227 src/gui/windows/emotewindow.cpp:45
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
msgid "Bold font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:230
msgid "Particle font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:235
+#: src/gui/widgets/tabs/setup_theme.cpp:234
msgid "Help font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:239
+#: src/gui/widgets/tabs/setup_theme.cpp:238
msgid "Secure font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:242
msgid "Npc font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:247
+#: src/gui/widgets/tabs/setup_theme.cpp:246
msgid "Japanese font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:250
msgid "Chinese font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:256
+#: src/gui/widgets/tabs/setup_theme.cpp:255
msgid "Font size"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:261
+#: src/gui/widgets/tabs/setup_theme.cpp:260
msgid "Npc font size"
msgstr ""
#. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:265
+#: src/gui/widgets/tabs/setup_theme.cpp:264
msgid "i"
msgstr ""
#. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:404
+#: src/gui/widgets/tabs/setup_theme.cpp:403
msgid "Name: "
msgstr ""
-#: src/gui/widgets/tabs/setup_theme.cpp:405
+#: src/gui/widgets/tabs/setup_theme.cpp:404
msgid "Copyright:"
msgstr ""
#. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:470
+#: src/gui/widgets/tabs/setup_theme.cpp:469
msgid "Theme info"
msgstr ""
#. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:497
+#: src/gui/widgets/tabs/setup_theme.cpp:496
msgid "Theme Changed"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:497
+#: src/gui/widgets/tabs/setup_theme.cpp:496
#: src/gui/widgets/tabs/setup_video.cpp:499
#: src/gui/widgets/tabs/setup_video.cpp:508
msgid "Restart your client for the change to take effect."
@@ -4701,178 +4770,169 @@ msgid "Allow screensaver to run"
msgstr ""
#. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:67
msgid "ONL"
msgstr ""
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:68
msgid "Who is online"
msgstr ""
#. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:70
msgid "HLP"
msgstr ""
#. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:73
msgid "QE"
msgstr ""
#. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:77 src/gui/windows/questswindow.cpp:126
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
msgid "Quests"
msgstr ""
#. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:76
msgid "BC"
msgstr ""
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:77
msgid "Bot checker"
msgstr ""
#. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:82
+#: src/gui/windowmenu.cpp:79
msgid "KS"
msgstr ""
#. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:83 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
msgid "Kill stats"
msgstr ""
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:82
msgid "Smilies"
msgstr ""
#. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:87
+#: src/gui/windowmenu.cpp:84
msgid "CH"
msgstr ""
#. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:95
+#: src/gui/windowmenu.cpp:92
msgid "STA"
msgstr ""
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:93
msgid "Status"
msgstr "Stav"
#. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:95
msgid "EQU"
msgstr ""
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:58
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
msgid "Equipment"
msgstr "Vybavenie"
#. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:98
msgid "INV"
msgstr ""
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:130
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
#: src/inventory.cpp:257
msgid "Inventory"
msgstr "Inventár"
#. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:104
+#: src/gui/windowmenu.cpp:101
msgid "MAP"
msgstr ""
#. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:110
+#: src/gui/windowmenu.cpp:107
msgid "SKI"
msgstr ""
#. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
msgid "Skills"
msgstr "Schopnosti"
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:118
-msgid "SPE"
-msgstr ""
-
-#: src/gui/windowmenu.cpp:119
-msgid "Specials"
-msgstr ""
-
#. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:124
+#: src/gui/windowmenu.cpp:112
msgid "SOC"
msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:126 src/gui/windows/socialwindow.cpp:1284
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
msgid "Social"
msgstr ""
#. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:128
+#: src/gui/windowmenu.cpp:116
msgid "SH"
msgstr ""
#. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:132
+#: src/gui/windowmenu.cpp:120
msgid "SP"
msgstr ""
#. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:124
msgid "DR"
msgstr ""
#. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:128
msgid "YK"
msgstr ""
#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:130
msgid "Did you know"
msgstr ""
#. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:144
+#: src/gui/windowmenu.cpp:132
msgid "SHP"
msgstr ""
#. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:148
+#: src/gui/windowmenu.cpp:136
msgid "OU"
msgstr ""
#. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:152
+#: src/gui/windowmenu.cpp:140
msgid "DBG"
msgstr ""
#. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:149
msgid "WIN"
msgstr ""
#. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:153
msgid "SET"
msgstr ""
#. TRANSLATORS: short key name
#. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:301 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
#: src/gui/windows/outfitwindow.cpp:561
#, c-format
msgid "Key: %s"
@@ -4894,31 +4954,21 @@ msgstr ""
msgid "Result"
msgstr ""
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:58
-msgid "unsorted"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:60
-msgid "by price"
-msgstr ""
-
#. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:196
+#: src/gui/windows/buydialog.cpp:162
msgid "Create items"
msgstr ""
#. TRANSLATORS: buy dialog label
#. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:254 src/gui/windows/buydialog.cpp:541
-#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:366
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
#, c-format
msgid "Price: %s / Total: %s"
msgstr ""
#. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:263
+#: src/gui/windows/buydialog.cpp:229
msgid "Amount:"
msgstr ""
@@ -4928,8 +4978,8 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/itemamountwindow.cpp:159
-#: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
msgid "+"
msgstr ""
@@ -4940,8 +4990,8 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:271 src/gui/windows/itemamountwindow.cpp:157
-#: src/gui/windows/itemamountwindow.cpp:191 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
msgid "-"
msgstr ""
@@ -4949,9 +4999,9 @@ msgstr ""
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:274 src/gui/windows/charcreatedialog.cpp:119
-#: src/gui/windows/charselectdialog.cpp:593
-#: src/gui/windows/socialwindow.cpp:1307
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
msgid "Create"
msgstr "Vytvoriť"
@@ -4960,7 +5010,7 @@ msgstr "Vytvoriť"
#. TRANSLATORS: status bar label
#. TRANSLATORS: status window label
#. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:278 src/gui/windows/selldialog.cpp:112
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
#: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
#: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
msgid "Max"
@@ -5059,7 +5109,7 @@ msgstr ""
#. TRANSLATORS: login dialog label
#. TRANSLATORS: register dialog. label.
#: src/gui/windows/charcreatedialog.cpp:73
-#: src/gui/windows/editserverdialog.cpp:89 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
#: src/gui/windows/registerdialog.cpp:89
msgid "Name:"
msgstr "Meno"
@@ -5120,7 +5170,7 @@ msgstr "Žena"
#. TRANSLATORS: char create dialog label
#: src/gui/windows/charcreatedialog.cpp:115
-#: src/gui/windows/charcreatedialog.cpp:469
+#: src/gui/windows/charcreatedialog.cpp:458
#, c-format
msgid "Please distribute %d points"
msgstr "Prosím rozdeľ %d bodov"
@@ -5136,17 +5186,17 @@ msgid "Look:"
msgstr ""
#. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:362
+#: src/gui/windows/charcreatedialog.cpp:351
msgid "Your name needs to be at least 4 characters."
msgstr "Tvoje meno musí mať aspoň 4 písmená."
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:459
+#: src/gui/windows/charcreatedialog.cpp:448
msgid "Character stats OK"
msgstr "Charakterové staty OK"
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:475
+#: src/gui/windows/charcreatedialog.cpp:464
#, c-format
msgid "Please remove %d points"
msgstr "Prosím odstráň %d bodov"
@@ -5175,7 +5225,7 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:104
-#: src/gui/windows/charselectdialog.cpp:588
+#: src/gui/windows/charselectdialog.cpp:580
#: src/gui/windows/updaterwindow.cpp:188
msgid "Play"
msgstr ""
@@ -5231,35 +5281,20 @@ msgstr ""
msgid "Enter password:"
msgstr ""
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:172
-msgid "rainbow 1"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:174
-msgid "rainbow 2"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:176
-msgid "rainbow 3"
-msgstr ""
-
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:755
+#: src/gui/windows/chatwindow.cpp:705
#, c-format
msgid "Present: %s; %d players are present."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1169
+#: src/gui/windows/chatwindow.cpp:1119
#, c-format
msgid "Whispering to %s: %s"
msgstr "Nápoveda pre %s: %s"
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1613
+#: src/gui/windows/chatwindow.cpp:1563
#, c-format
msgid "%s's pet"
msgstr ""
@@ -5505,51 +5540,51 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:77
-#: src/gui/windows/itemamountwindow.cpp:161 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
msgid "OK"
msgstr "Potvrdiť"
#. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:66
+#: src/gui/windows/editserverdialog.cpp:45
msgid "Edit Server"
msgstr ""
#. TRANSLATORS: edit server dialog button
#. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:75
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
msgid "Connect"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:91
+#: src/gui/windows/editserverdialog.cpp:70
msgid "Address:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:93
+#: src/gui/windows/editserverdialog.cpp:72
msgid "Port:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:95
+#: src/gui/windows/editserverdialog.cpp:74
msgid "Server type:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:97
+#: src/gui/windows/editserverdialog.cpp:76
msgid "Description:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:99
+#: src/gui/windows/editserverdialog.cpp:78
msgid "Online list url:"
msgstr ""
#. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:220
+#: src/gui/windows/editserverdialog.cpp:188
msgid "Please at least type both the address and the port of the server."
msgstr ""
@@ -5569,47 +5604,47 @@ msgid "Did you know..."
msgstr ""
#. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:165
+#: src/gui/windows/itemamountwindow.cpp:164
msgid "All"
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:221
+#: src/gui/windows/itemamountwindow.cpp:220
msgid "Select amount of items to trade."
msgstr "Zvoľte množstvo vecí k predaju."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:225
+#: src/gui/windows/itemamountwindow.cpp:224
msgid "Select amount of items to drop."
msgstr "Zvoľte množstvo vecí k zahodeniu."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:229
+#: src/gui/windows/itemamountwindow.cpp:228
msgid "Select amount of items to store."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:233
+#: src/gui/windows/itemamountwindow.cpp:232
msgid "Select amount of items to retrieve."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:237
+#: src/gui/windows/itemamountwindow.cpp:236
msgid "Select amount of items to split."
msgstr "Zvoľte množstvo vecí k rozdeleniu."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:241
+#: src/gui/windows/itemamountwindow.cpp:240
msgid "Add to buy shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:245
+#: src/gui/windows/itemamountwindow.cpp:244
msgid "Add to sell shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:249
+#: src/gui/windows/itemamountwindow.cpp:248
msgid "Unknown."
msgstr ""
@@ -5863,7 +5898,7 @@ msgstr ""
#. TRANSLATORS: shop window label
#. TRANSLATORS: shop window button
#. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:258
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
#: src/gui/windows/tradewindow.cpp:78
msgid "Add"
@@ -5965,53 +6000,53 @@ msgid "Do you really want to sell %s?"
msgstr ""
#. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
msgid "Choose Your Server"
msgstr ""
#. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
msgid "Load"
msgstr ""
#. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
msgid "Choose Your Server *** SAFE MODE ***"
msgstr ""
#. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
msgid "Use same ip for game sub servers"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
msgid "Waiting for server..."
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
msgid "Preparing download"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
msgid "Error retreiving server list!"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
msgid "requires a newer version"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
#, c-format
msgid "requires v%s"
msgstr ""
@@ -6092,277 +6127,277 @@ msgid "Skill %d"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:225
+#: src/gui/windows/socialwindow.cpp:227
#, c-format
msgid "Invited user %s to guild %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:240
+#: src/gui/windows/socialwindow.cpp:242
#, c-format
msgid "Guild %s quit requested."
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:254
+#: src/gui/windows/socialwindow.cpp:256
msgid "Member Invite to Guild"
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:256
+#: src/gui/windows/socialwindow.cpp:258
#, c-format
msgid "Who would you like to invite to guild %s?"
msgstr ""
#. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:266
+#: src/gui/windows/socialwindow.cpp:268
msgid "Leave Guild?"
msgstr ""
#. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:268
+#: src/gui/windows/socialwindow.cpp:270
#, c-format
msgid "Are you sure you want to leave guild %s?"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:279
+#: src/gui/windows/socialwindow.cpp:281
#, c-format
msgid "Members: %u/%u"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:301 src/gui/windows/socialwindow.cpp:373
-#: src/gui/windows/socialwindow.cpp:498
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
#, c-format
msgid "Players: %u/%u"
msgstr ""
#. TRANSLATORS: tab in social window
#. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:389 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
msgid "Party"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:429
+#: src/gui/windows/socialwindow.cpp:431
#, c-format
msgid "Invited user %s to party."
msgstr ""
#. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:444
+#: src/gui/windows/socialwindow.cpp:446
#, c-format
msgid "Party %s quit requested."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:458
+#: src/gui/windows/socialwindow.cpp:460
msgid "Member Invite to Party"
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:460
+#: src/gui/windows/socialwindow.cpp:462
#, c-format
msgid "Who would you like to invite to party %s?"
msgstr ""
#. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:470
+#: src/gui/windows/socialwindow.cpp:472
msgid "Leave Party?"
msgstr ""
#. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:472
+#: src/gui/windows/socialwindow.cpp:474
#, c-format
msgid "Are you sure you want to leave party %s?"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:698
+#: src/gui/windows/socialwindow.cpp:665
#, c-format
msgid "Visible players: %d"
msgstr ""
#. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:725
+#: src/gui/windows/socialwindow.cpp:692
msgid "Nav"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:827
+#: src/gui/windows/socialwindow.cpp:794
#, c-format
msgid "Portals: %u/%u"
msgstr ""
#. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1054
+#: src/gui/windows/socialwindow.cpp:1021
msgid "Atk"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1073
+#: src/gui/windows/socialwindow.cpp:1040
msgid "Priority mobs"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1075
+#: src/gui/windows/socialwindow.cpp:1042
msgid "Attack mobs"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1077
+#: src/gui/windows/socialwindow.cpp:1044
msgid "Ignore mobs"
msgstr ""
#. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1101
+#: src/gui/windows/socialwindow.cpp:1068
msgid "Pik"
msgstr ""
#. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1120
+#: src/gui/windows/socialwindow.cpp:1087
msgid "Pickup items"
msgstr ""
#. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1122
+#: src/gui/windows/socialwindow.cpp:1089
msgid "Ignore items"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1212
+#: src/gui/windows/socialwindow.cpp:1179
#, c-format
msgid "Friends: %u/%u"
msgstr ""
#. TRANSLATORS: party popup item
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1235 src/gui/windows/socialwindow.cpp:1727
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
msgid "Create Party"
msgstr ""
#. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1298
+#: src/gui/windows/socialwindow.cpp:1265
msgid "P"
msgstr ""
#. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1303
+#: src/gui/windows/socialwindow.cpp:1270
msgid "F"
msgstr ""
#. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1309
+#: src/gui/windows/socialwindow.cpp:1276
msgid "Invite"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1503
+#: src/gui/windows/socialwindow.cpp:1470
#, c-format
msgid "Accepted party invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1514
+#: src/gui/windows/socialwindow.cpp:1481
#, c-format
msgid "Rejected party invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1531
+#: src/gui/windows/socialwindow.cpp:1498
#, c-format
msgid "Accepted guild invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1545
+#: src/gui/windows/socialwindow.cpp:1512
#, c-format
msgid "Rejected guild invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1585
+#: src/gui/windows/socialwindow.cpp:1552
#, c-format
msgid "Creating guild called %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1606
+#: src/gui/windows/socialwindow.cpp:1573
#, c-format
msgid "Creating party called %s."
msgstr ""
#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1621
+#: src/gui/windows/socialwindow.cpp:1588
msgid "Guild Name"
msgstr ""
#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1623
+#: src/gui/windows/socialwindow.cpp:1590
msgid "Choose your guild's name."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1639
+#: src/gui/windows/socialwindow.cpp:1606
msgid "Received guild request, but one already exists."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1647
+#: src/gui/windows/socialwindow.cpp:1614
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1654
+#: src/gui/windows/socialwindow.cpp:1621
msgid "Accept Guild Invite"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1670
+#: src/gui/windows/socialwindow.cpp:1637
msgid "Received party request, but one already exists."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1682
+#: src/gui/windows/socialwindow.cpp:1649
msgid "You have been invited you to join a party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1687
+#: src/gui/windows/socialwindow.cpp:1654
#, c-format
msgid "You have been invited to join the %s party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1696
+#: src/gui/windows/socialwindow.cpp:1663
#, c-format
msgid "%s has invited you to join their party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1702
+#: src/gui/windows/socialwindow.cpp:1669
#, c-format
msgid "%s has invited you to join the %s party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1712
+#: src/gui/windows/socialwindow.cpp:1679
msgid "Accept Party Invite"
msgstr ""
-#: src/gui/windows/socialwindow.cpp:1728
+#: src/gui/windows/socialwindow.cpp:1695
msgid "Cannot create party. You are already in a party"
msgstr ""
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1734
+#: src/gui/windows/socialwindow.cpp:1701
msgid "Party Name"
msgstr ""
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1736
+#: src/gui/windows/socialwindow.cpp:1703
msgid "Choose your party's name."
msgstr ""
@@ -6404,113 +6439,68 @@ msgstr ""
msgid "Correction points: %d"
msgstr ""
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "No Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Allow Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:105
-msgid "Need Target"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "General Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "Life Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "War Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Transmute Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Nature Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:121
-msgid "Astral Magic"
-msgstr ""
-
#. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:164
+#: src/gui/windows/textcommandeditor.cpp:47
msgid "Command Editor"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:52
msgid "magic"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:54
msgid "other"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:173
+#: src/gui/windows/textcommandeditor.cpp:56
msgid "Symbol:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:176
+#: src/gui/windows/textcommandeditor.cpp:59
msgid "Command:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:179
+#: src/gui/windows/textcommandeditor.cpp:62
msgid "Comment:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:183
+#: src/gui/windows/textcommandeditor.cpp:66
msgid "Target Type:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:187
+#: src/gui/windows/textcommandeditor.cpp:70
msgid "Icon:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:190
+#: src/gui/windows/textcommandeditor.cpp:73
msgid "Mana:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:193
+#: src/gui/windows/textcommandeditor.cpp:76
msgid "Magic level:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:197
+#: src/gui/windows/textcommandeditor.cpp:80
msgid "Magic School:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:200
+#: src/gui/windows/textcommandeditor.cpp:83
msgid "School level:"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/windows/textcommandeditor.cpp:88
msgid "Save"
msgstr ""
@@ -6540,7 +6530,7 @@ msgid "Trade: You"
msgstr ""
#. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
#, c-format
msgid "You get %s"
msgstr ""
@@ -6556,12 +6546,12 @@ msgid "You give:"
msgstr ""
#. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
msgid "You don't have enough money."
msgstr ""
#. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
msgid ""
"Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
@@ -6632,17 +6622,17 @@ msgid "Who Is Online - Update"
msgstr ""
#. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:87
+#: src/gui/windows/worldselectdialog.cpp:49
msgid "Select World"
msgstr ""
#. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:93
+#: src/gui/windows/worldselectdialog.cpp:55
msgid "Change Login"
msgstr ""
#. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:95
+#: src/gui/windows/worldselectdialog.cpp:57
msgid "Choose World"
msgstr ""
@@ -6860,7 +6850,7 @@ msgid "Failed to create character. Most likely the name is already taken."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:281
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
msgid "Wrong name."
msgstr ""
@@ -7018,58 +7008,58 @@ msgid "Experience sharing unknown."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:154
+#: src/net/ea/loginhandler.cpp:149
msgid "Account was not found. Please re-login."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/ea/loginhandler.cpp:153
msgid "Old password incorrect."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:162
+#: src/net/ea/loginhandler.cpp:157
msgid "New password too short."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:166 src/net/ea/loginhandler.cpp:293
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
msgid "Unknown error."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:239
+#: src/net/ea/loginhandler.cpp:234
msgid "Unregistered ID."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:238
msgid "Wrong password."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:248
+#: src/net/ea/loginhandler.cpp:243
msgid "Account expired."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:252
+#: src/net/ea/loginhandler.cpp:247
msgid "Rejected from server."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:256
+#: src/net/ea/loginhandler.cpp:251
msgid ""
"You have been permanently banned from the game. Please contact the GM team."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:261
+#: src/net/ea/loginhandler.cpp:256
msgid "Client too old."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:265
+#: src/net/ea/loginhandler.cpp:260
#, c-format
msgid ""
"You have been temporarily banned from the game until %s.\n"
@@ -7077,22 +7067,22 @@ msgid ""
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:273
+#: src/net/ea/loginhandler.cpp:268
msgid "Server overpopulated."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:277
+#: src/net/ea/loginhandler.cpp:272
msgid "This user name is already taken."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:285
+#: src/net/ea/loginhandler.cpp:280
msgid "Incorrect email."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:289
+#: src/net/ea/loginhandler.cpp:284
msgid "Username permanently erased."
msgstr ""
@@ -7765,7 +7755,7 @@ msgstr ""
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
#: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr ""
diff --git a/po/sq.po b/po/sq.po
index 4cd57ab8e..2faa8eaf0 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: 2014-02-23 00:42+0300\n"
-"PO-Revision-Date: 2014-02-23 08:14+0000\n"
+"POT-Creation-Date: 2014-02-28 21:21+0300\n"
+"PO-Revision-Date: 2014-03-01 08:14+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"
@@ -29,7 +29,7 @@ msgid "Accepting incoming trade requests"
msgstr ""
#. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
msgid "Visible on map"
msgstr ""
@@ -38,68 +38,68 @@ msgstr ""
msgid "Human"
msgstr ""
-#: src/being/being.cpp:544
+#: src/being/being.cpp:496
msgid "dodge"
msgstr ""
-#: src/being/being.cpp:544
+#: src/being/being.cpp:496
msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1965 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1970 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr ""
#. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:392
+#: src/being/localplayer.cpp:376
#, c-format
msgid "You were killed by %s"
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1377
+#: src/being/localplayer.cpp:816
msgid "Tried to pick up nonexistent item."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1381
+#: src/being/localplayer.cpp:820
msgid "Item is too heavy."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1385
+#: src/being/localplayer.cpp:824
msgid "Item is too far away."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1389
+#: src/being/localplayer.cpp:828
msgid "Inventory is full."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1393
+#: src/being/localplayer.cpp:832
msgid "Stack is too big."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1397
+#: src/being/localplayer.cpp:836
msgid "Item belongs to someone else."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1401
+#: src/being/localplayer.cpp:840
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:1425
+#: src/being/localplayer.cpp:864
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -107,387 +107,387 @@ msgstr[0] ""
msgstr[1] ""
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1630 src/being/localplayer.cpp:1665
-#: src/being/localplayer.cpp:1666
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
msgid "xp"
msgstr ""
-#: src/being/localplayer.cpp:1671 src/being/localplayer.cpp:1678
-#: src/being/localplayer.cpp:1685
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
msgid "job"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1871
+#: src/being/localplayer.cpp:1285
msgid "(D) default moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1873
+#: src/being/localplayer.cpp:1287
msgid "(I) invert moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1875
+#: src/being/localplayer.cpp:1289
msgid "(c) moves with some crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1877
+#: src/being/localplayer.cpp:1291
msgid "(C) moves with crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1879
+#: src/being/localplayer.cpp:1293
msgid "(d) double normal + crazy"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1881
+#: src/being/localplayer.cpp:1295
msgid "(?) unknown move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1904
+#: src/being/localplayer.cpp:1318
#, c-format
msgid "(%u) crazy move number %u"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1910
+#: src/being/localplayer.cpp:1324
msgid "(a) custom crazy move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1915
+#: src/being/localplayer.cpp:1329
msgid "(?) crazy move"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1930
+#: src/being/localplayer.cpp:1344
msgid "(0) default moves to target"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1932
+#: src/being/localplayer.cpp:1346
msgid "(1) moves to target in distance 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1934
+#: src/being/localplayer.cpp:1348
msgid "(2) moves to target in distance 2"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1936
+#: src/being/localplayer.cpp:1350
msgid "(3) moves to target in distance 3"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1938
+#: src/being/localplayer.cpp:1352
msgid "(5) moves to target in distance 5"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1940
+#: src/being/localplayer.cpp:1354
msgid "(7) moves to target in distance 7"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1942
+#: src/being/localplayer.cpp:1356
msgid "(A) moves to target in attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1944
+#: src/being/localplayer.cpp:1358
msgid "(a) archer attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1946
+#: src/being/localplayer.cpp:1360
msgid "(B) moves to target in attack range - 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1948
+#: src/being/localplayer.cpp:1362
msgid "(?) move to target"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1968
+#: src/being/localplayer.cpp:1382
msgid "(D) default follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1970
+#: src/being/localplayer.cpp:1384
msgid "(R) relative follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1972
+#: src/being/localplayer.cpp:1386
msgid "(M) mirror follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1974
+#: src/being/localplayer.cpp:1388
msgid "(P) pet follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1976
+#: src/being/localplayer.cpp:1390
msgid "(?) unknown follow"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1996 src/being/localplayer.cpp:2004
-#: src/being/localplayer.cpp:2032
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
msgid "(?) attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1998 src/being/localplayer.cpp:2024
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
msgid "(D) default attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2000
+#: src/being/localplayer.cpp:1414
msgid "(s) switch attack without shield"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2002
+#: src/being/localplayer.cpp:1416
msgid "(S) switch attack with shield"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2026
+#: src/being/localplayer.cpp:1440
msgid "(G) go and attack"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2028
+#: src/being/localplayer.cpp:1442
msgid "(A) go, attack, pickup"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2030
+#: src/being/localplayer.cpp:1444
msgid "(d) without auto attack"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2084
+#: src/being/localplayer.cpp:1498
msgid "(S) small pick up 1x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2086
+#: src/being/localplayer.cpp:1500
msgid "(D) default pick up 2x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2088
+#: src/being/localplayer.cpp:1502
msgid "(F) forward pick up 2x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2090
+#: src/being/localplayer.cpp:1504
msgid "(3) pick up 3x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2092
+#: src/being/localplayer.cpp:1506
msgid "(g) go and pick up in distance 4"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2094
+#: src/being/localplayer.cpp:1508
msgid "(G) go and pick up in distance 8"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2096
+#: src/being/localplayer.cpp:1510
msgid "(A) go and pick up in max distance"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2098
+#: src/being/localplayer.cpp:1512
msgid "(?) pick up"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2112
+#: src/being/localplayer.cpp:1526
msgid "(N) normal map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2114
+#: src/being/localplayer.cpp:1528
msgid "(D) debug map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2116
+#: src/being/localplayer.cpp:1530
msgid "(u) ultra map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2118
+#: src/being/localplayer.cpp:1532
msgid "(U) ultra map view 2"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2120
+#: src/being/localplayer.cpp:1534
msgid "(e) empty map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2122
+#: src/being/localplayer.cpp:1536
msgid "(b) black & white map view"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2142
+#: src/being/localplayer.cpp:1556
msgid "(f) use #flar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2144
+#: src/being/localplayer.cpp:1558
msgid "(c) use #chiza for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2146
+#: src/being/localplayer.cpp:1560
msgid "(I) use #ingrav for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2148
+#: src/being/localplayer.cpp:1562
msgid "(F) use #frillyar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2150
+#: src/being/localplayer.cpp:1564
msgid "(U) use #upmarmu for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2152
+#: src/being/localplayer.cpp:1566
msgid "(?) magic attack"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2172
+#: src/being/localplayer.cpp:1586
msgid "(a) attack all players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2174
+#: src/being/localplayer.cpp:1588
msgid "(f) attack all except friends"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2176
+#: src/being/localplayer.cpp:1590
msgid "(b) attack bad relations"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2178
+#: src/being/localplayer.cpp:1592
msgid "(d) don't attack players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2180
+#: src/being/localplayer.cpp:1594
msgid "(?) pvp attack"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2200
+#: src/being/localplayer.cpp:1614
msgid "(D) default imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2202
+#: src/being/localplayer.cpp:1616
msgid "(O) outfits imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2204
+#: src/being/localplayer.cpp:1618
msgid "(?) imitation"
msgstr ""
#. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2233
+#: src/being/localplayer.cpp:1647
msgid "Away"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2256
+#: src/being/localplayer.cpp:1670
msgid "(O) on keyboard"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2258
+#: src/being/localplayer.cpp:1672
msgid "(A) away"
msgstr ""
#. TRANSLATORS: away type in status bar
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2260 src/being/localplayer.cpp:2278
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
msgid "(?) away"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2274
+#: src/being/localplayer.cpp:1688
msgid "(G) game camera mode"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2276
+#: src/being/localplayer.cpp:1690
msgid "(F) free camera mode"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2303
+#: src/being/localplayer.cpp:1717
msgid "Game modifiers are enabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2305
+#: src/being/localplayer.cpp:1719
msgid "Game modifiers are disabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2307
+#: src/being/localplayer.cpp:1721
msgid "Game modifiers are unknown"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3887
+#: src/being/localplayer.cpp:3287
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3893 src/being/localplayer.cpp:3918
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3903
+#: src/being/localplayer.cpp:3303
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3909 src/being/localplayer.cpp:3923
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4266
+#: src/being/localplayer.cpp:3666
#, c-format
msgid "You see %s"
msgstr ""
@@ -525,32 +525,32 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1139 src/gui/windowmenu.cpp:167
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
#: src/gui/windows/setupwindow.cpp:61
msgid "Setup"
msgstr ""
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1143 src/gui/widgets/tabs/setup_perfomance.cpp:51
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1146 src/gui/widgets/tabs/setup_video.cpp:225
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:225
msgid "Video"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1149 src/gui/widgets/tabs/setup_theme.cpp:269
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1152 src/gui/windowmenu.cpp:74
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr ""
@@ -563,41 +563,41 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1156 src/gui/popups/popupmenu.cpp:619
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
#: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:69
-#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:138
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
#: src/gui/windows/shopwindow.cpp:78
msgid "Close"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1324
msgid "Logging in"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1367
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1492
+#: src/client.cpp:1489
msgid "Requesting characters"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1532
+#: src/client.cpp:1529
msgid "Connecting to the game server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1545
+#: src/client.cpp:1541
msgid "Changing game servers"
msgstr ""
@@ -612,12 +612,12 @@ msgstr ""
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1606 src/client.cpp:1617 src/client.cpp:1801
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:349
#: src/gui/windows/charselectdialog.cpp:299
-#: src/gui/windows/editserverdialog.cpp:218
+#: src/gui/windows/editserverdialog.cpp:186
#: src/gui/windows/registerdialog.cpp:260
#: src/gui/windows/unregisterdialog.cpp:146
#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
@@ -625,65 +625,65 @@ msgid "Error"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1629
+#: src/client.cpp:1625
msgid "Requesting registration details"
msgstr ""
#. TRANSLATORS: password change message header
-#: src/client.cpp:1670
+#: src/client.cpp:1666
msgid "Password Change"
msgstr ""
#. TRANSLATORS: password change message text
-#: src/client.cpp:1672
+#: src/client.cpp:1668
msgid "Password changed successfully!"
msgstr ""
#. TRANSLATORS: email change message header
-#: src/client.cpp:1694
+#: src/client.cpp:1690
msgid "Email Change"
msgstr ""
#. TRANSLATORS: email change message text
-#: src/client.cpp:1696
+#: src/client.cpp:1692
msgid "Email changed successfully!"
msgstr ""
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1719
+#: src/client.cpp:1715
msgid "Unregister Successful"
msgstr ""
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1721
+#: src/client.cpp:1717
msgid "Farewell, come back any time..."
msgstr ""
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1998 src/client.cpp:2013 src/client.cpp:2058
-#: src/client.cpp:2074 src/client.cpp:2525 src/client.cpp:2533
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2230
+#: src/client.cpp:2232
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2271 src/client.cpp:2278
+#: src/client.cpp:2273 src/client.cpp:2280
msgid "Error creating updates directory!"
msgstr ""
-#: src/client.cpp:2300 src/client.cpp:2317
+#: src/client.cpp:2302 src/client.cpp:2319
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: error message question
-#: src/client.cpp:3001
+#: src/client.cpp:3003
msgid "Do you want to open support page?"
msgstr ""
@@ -929,99 +929,154 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:277 src/gui/widgets/tabs/chattab.cpp:464
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
msgid "General"
msgstr ""
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:293 src/gui/widgets/tabs/chattab.cpp:466
-#: src/gui/windowmenu.cpp:154 src/gui/windows/debugwindow.cpp:53
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:575
+#: src/game.cpp:563
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:585
+#: src/game.cpp:573
msgid "Saving screenshot failed!"
msgstr ""
#. TRANSLATORS: error message text
-#: src/game.cpp:656
+#: src/game.cpp:644
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:659
+#: src/game.cpp:647
msgid "Network Error"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
-msgid "black"
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
msgstr ""
+#. TRANSLATORS: chat color
#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
+msgid "black"
+msgstr ""
+
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
msgid "red"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
msgid "green"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
msgid "blue"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
msgid "gold"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
msgid "yellow"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
msgid "pink"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
msgid "purple"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
msgid "grey"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
msgid "brown"
msgstr ""
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr ""
+
#. TRANSLATORS: relation type
#: src/gui/models/playerrelationlistmodel.h:33
msgid "Neutral"
@@ -1057,46 +1112,61 @@ msgstr ""
msgid "Enemy"
msgstr ""
-#. TRANSLATORS: inventory sort mode
-#. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#: src/gui/models/sortlistmodelinv.h:34
-#: src/gui/widgets/tabs/setup_other.cpp:72
-#: src/gui/widgets/tabs/setup_visual.cpp:78 src/gui/windows/chatwindow.cpp:150
-msgid "default"
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:36 src/gui/windows/buydialog.cpp:62
-msgid "by name"
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
msgstr ""
+#. TRANSLATORS: buy dialog sort type.
#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
+msgid "by name"
+msgstr ""
+
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:38 src/gui/windows/buydialog.cpp:64
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
msgid "by id"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:40 src/gui/windows/buydialog.cpp:66
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
msgid "by weight"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:42 src/gui/windows/buydialog.cpp:68
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
msgid "by amount"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:44 src/gui/windows/buydialog.cpp:70
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
msgid "by type"
msgstr ""
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr ""
+
#. TRANSLATORS: update type
#. TRANSLATORS: onscreen button size
#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
@@ -1243,8 +1313,8 @@ msgstr ""
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
-#: src/gui/windows/buydialog.cpp:208 src/gui/windows/buydialog.cpp:220
-#: src/gui/windows/buydialog.cpp:274 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
msgid "Buy"
msgstr ""
@@ -1341,12 +1411,12 @@ msgstr ""
#: src/gui/windows/changepassworddialog.cpp:57
#: src/gui/windows/charcreatedialog.cpp:121
#: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:79
-#: src/gui/windows/itemamountwindow.cpp:163
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
-#: src/gui/windows/socialwindow.cpp:1238
-#: src/gui/windows/textcommandeditor.cpp:203 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:54
#: src/gui/windows/updaterwindow.cpp:186
msgid "Cancel"
@@ -1418,7 +1488,7 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:150 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
msgstr ""
@@ -1431,7 +1501,7 @@ msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:134
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
msgid "Spells"
msgstr ""
@@ -1487,7 +1557,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
#. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1311
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
msgid "Leave"
msgstr ""
@@ -1568,8 +1638,8 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
-#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:223
-#: src/gui/windows/inventorywindow.cpp:745 src/gui/windows/setupwindow.cpp:96
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
msgid "Store"
msgstr ""
@@ -1600,7 +1670,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
msgid "Retrieve"
msgstr ""
@@ -1633,8 +1703,8 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
-#: src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:656 src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr ""
@@ -1668,8 +1738,8 @@ msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: language
#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/widgets/tabs/setup_theme.cpp:127
-#: src/gui/windows/socialwindow.cpp:1003
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
msgid "(default)"
msgstr ""
@@ -1825,8 +1895,8 @@ msgstr ""
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:645
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
msgid "Unequip"
msgstr ""
@@ -1834,16 +1904,16 @@ msgstr ""
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:172
-#: src/gui/windows/inventorywindow.cpp:650 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:189
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
msgid "Drop..."
msgstr ""
@@ -1857,15 +1927,15 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:138
-#: src/gui/windows/inventorywindow.cpp:758
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
msgid "Drop"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
msgid "Split"
msgstr ""
@@ -2021,10 +2091,10 @@ msgstr ""
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:276
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/windows/serverdialog.cpp:198
msgid "Quit"
msgstr ""
@@ -2586,7 +2656,7 @@ msgstr ""
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: register dialog. button.
#: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:146
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:330
#: src/gui/widgets/tabs/setup_visual.cpp:189
@@ -2613,9 +2683,8 @@ msgstr ""
#. TRANSLATORS: command editor button
#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
#: src/gui/windows/charselectdialog.cpp:108
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:94
-#: src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/textcommandeditor.cpp:207
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
msgid "Delete"
msgstr ""
@@ -2651,7 +2720,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:130
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
msgid "Shortcuts"
msgstr ""
@@ -2659,7 +2728,7 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:151
msgid "Windows"
msgstr ""
@@ -2675,7 +2744,7 @@ msgstr ""
#. TRANSLATORS: settings tab name
#. TRANSLATORS: chat window name
#: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:88 src/gui/windows/chatwindow.cpp:203
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
msgid "Chat"
msgstr ""
@@ -2898,7 +2967,7 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:137
-#: src/gui/windows/inventorywindow.cpp:569
+#: src/gui/windows/inventorywindow.cpp:568
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
#, c-format
@@ -2918,7 +2987,7 @@ msgstr ""
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/windows/serverdialog.cpp:204
msgid "Edit"
msgstr ""
@@ -2971,7 +3040,7 @@ msgstr ""
#. TRANSLATORS: tab in social window
#. TRANSLATORS: guild chat tab name
#: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:184 src/gui/windows/socialwindow.cpp:320
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
#: src/net/ea/gui/guildtab.cpp:44
msgid "Guild"
msgstr ""
@@ -2982,142 +3051,142 @@ msgid "Lang"
msgstr ""
#. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:49
+#: src/gui/widgets/tabs/setup_audio.cpp:48
msgid "Audio"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:57
+#: src/gui/widgets/tabs/setup_audio.cpp:56
msgid "Basic settings"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:60
+#: src/gui/widgets/tabs/setup_audio.cpp:59
msgid "Enable Audio"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:63
+#: src/gui/widgets/tabs/setup_audio.cpp:62
msgid "Enable music"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:67
+#: src/gui/widgets/tabs/setup_audio.cpp:66
msgid "Enable game sfx"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:71
+#: src/gui/widgets/tabs/setup_audio.cpp:70
msgid "Enable gui sfx"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:74
msgid "Sfx volume"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:78
msgid "Music volume"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:82
msgid "Enable music fade out"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:86
msgid "Audio frequency"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:90
msgid "mono"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:93
+#: src/gui/widgets/tabs/setup_audio.cpp:92
msgid "stereo"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:94
msgid "surround"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:97
+#: src/gui/widgets/tabs/setup_audio.cpp:96
msgid "surround+center+lfe"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:98
msgid "Audio channels"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:104
+#: src/gui/widgets/tabs/setup_audio.cpp:103
msgid "Sound effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:106
msgid "Information dialog sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:110
msgid "Request dialog sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:115
+#: src/gui/widgets/tabs/setup_audio.cpp:114
msgid "Whisper message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:118
msgid "Guild / Party message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:122
msgid "Highlight message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:126
msgid "Global message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:130
msgid "Error message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:134
msgid "Trade request sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:138
msgid "Show window sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:142
msgid "Hide window sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:150
msgid "Enable mumble voice chat"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:156
+#: src/gui/widgets/tabs/setup_audio.cpp:155
msgid "Download music"
msgstr ""
@@ -3413,7 +3482,7 @@ msgstr ""
#. TRANSLATORS: unknown key name
#. TRANSLATORS: quests window quest name
#: src/gui/widgets/tabs/setup_input.cpp:364
-#: src/gui/windows/questswindow.cpp:263
+#: src/gui/windows/questswindow.cpp:249
msgid "unknown"
msgstr ""
@@ -3572,7 +3641,7 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: debug window tab
#. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:105
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
#: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
#: src/gui/windows/minimap.cpp:114
msgid "Map"
@@ -3740,9 +3809,9 @@ msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: shop window name
#. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:146
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
#: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windows/inventorywindow.cpp:194
msgid "Shop"
msgstr ""
@@ -4124,252 +4193,252 @@ msgid "When ignoring:"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:64
+#: src/gui/widgets/tabs/setup_theme.cpp:63
msgid "Very small (8)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:66
+#: src/gui/widgets/tabs/setup_theme.cpp:65
msgid "Very small (9)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:68
+#: src/gui/widgets/tabs/setup_theme.cpp:67
msgid "Tiny (10)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:70
+#: src/gui/widgets/tabs/setup_theme.cpp:69
msgid "Small (11)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:72
+#: src/gui/widgets/tabs/setup_theme.cpp:71
msgid "Medium (12)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:74
+#: src/gui/widgets/tabs/setup_theme.cpp:73
msgid "Normal (13)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:76
+#: src/gui/widgets/tabs/setup_theme.cpp:75
msgid "Large (14)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:78
+#: src/gui/widgets/tabs/setup_theme.cpp:77
msgid "Large (15)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:80
+#: src/gui/widgets/tabs/setup_theme.cpp:79
msgid "Large (16)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:82
+#: src/gui/widgets/tabs/setup_theme.cpp:81
msgid "Big (17)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:83
msgid "Big (18)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:85
msgid "Big (19)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:87
msgid "Very big (20)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:89
msgid "Very big (21)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:91
msgid "Very big (22)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:93
msgid "Huge (23)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:129
+#: src/gui/widgets/tabs/setup_theme.cpp:128
msgid "Chinese (China)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:131
+#: src/gui/widgets/tabs/setup_theme.cpp:130
msgid "Czech"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:133
+#: src/gui/widgets/tabs/setup_theme.cpp:132
msgid "English"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:135
+#: src/gui/widgets/tabs/setup_theme.cpp:134
msgid "Finnish"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:137
+#: src/gui/widgets/tabs/setup_theme.cpp:136
msgid "French"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:139
+#: src/gui/widgets/tabs/setup_theme.cpp:138
msgid "German"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:141
+#: src/gui/widgets/tabs/setup_theme.cpp:140
msgid "Indonesian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:143
+#: src/gui/widgets/tabs/setup_theme.cpp:142
msgid "Italian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:145
+#: src/gui/widgets/tabs/setup_theme.cpp:144
msgid "Polish"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:147
+#: src/gui/widgets/tabs/setup_theme.cpp:146
msgid "Japanese"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:148
msgid "Dutch (Belgium/Flemish)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:150
msgid "Portuguese"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:152
msgid "Portuguese (Brazilian)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:154
msgid "Russian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:156
msgid "Spanish (Castilian)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:158
msgid "Turkish"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:211
+#: src/gui/widgets/tabs/setup_theme.cpp:210
msgid "Gui theme"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:218
+#: src/gui/widgets/tabs/setup_theme.cpp:217
msgid "Main Font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:223
+#: src/gui/widgets/tabs/setup_theme.cpp:222
msgid "Language"
msgstr ""
#. TRANSLATORS: theme settings label
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:227 src/gui/windows/emotewindow.cpp:45
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
msgid "Bold font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:230
msgid "Particle font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:235
+#: src/gui/widgets/tabs/setup_theme.cpp:234
msgid "Help font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:239
+#: src/gui/widgets/tabs/setup_theme.cpp:238
msgid "Secure font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:242
msgid "Npc font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:247
+#: src/gui/widgets/tabs/setup_theme.cpp:246
msgid "Japanese font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:250
msgid "Chinese font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:256
+#: src/gui/widgets/tabs/setup_theme.cpp:255
msgid "Font size"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:261
+#: src/gui/widgets/tabs/setup_theme.cpp:260
msgid "Npc font size"
msgstr ""
#. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:265
+#: src/gui/widgets/tabs/setup_theme.cpp:264
msgid "i"
msgstr ""
#. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:404
+#: src/gui/widgets/tabs/setup_theme.cpp:403
msgid "Name: "
msgstr ""
-#: src/gui/widgets/tabs/setup_theme.cpp:405
+#: src/gui/widgets/tabs/setup_theme.cpp:404
msgid "Copyright:"
msgstr ""
#. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:470
+#: src/gui/widgets/tabs/setup_theme.cpp:469
msgid "Theme info"
msgstr ""
#. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:497
+#: src/gui/widgets/tabs/setup_theme.cpp:496
msgid "Theme Changed"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:497
+#: src/gui/widgets/tabs/setup_theme.cpp:496
#: src/gui/widgets/tabs/setup_video.cpp:499
#: src/gui/widgets/tabs/setup_video.cpp:508
msgid "Restart your client for the change to take effect."
@@ -4700,178 +4769,169 @@ msgid "Allow screensaver to run"
msgstr ""
#. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:67
msgid "ONL"
msgstr ""
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:68
msgid "Who is online"
msgstr ""
#. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:70
msgid "HLP"
msgstr ""
#. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:73
msgid "QE"
msgstr ""
#. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:77 src/gui/windows/questswindow.cpp:126
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
msgid "Quests"
msgstr ""
#. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:76
msgid "BC"
msgstr ""
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:77
msgid "Bot checker"
msgstr ""
#. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:82
+#: src/gui/windowmenu.cpp:79
msgid "KS"
msgstr ""
#. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:83 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
msgid "Kill stats"
msgstr ""
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:82
msgid "Smilies"
msgstr ""
#. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:87
+#: src/gui/windowmenu.cpp:84
msgid "CH"
msgstr ""
#. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:95
+#: src/gui/windowmenu.cpp:92
msgid "STA"
msgstr ""
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:93
msgid "Status"
msgstr ""
#. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:95
msgid "EQU"
msgstr ""
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:58
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
msgid "Equipment"
msgstr ""
#. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:98
msgid "INV"
msgstr ""
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:130
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
#: src/inventory.cpp:257
msgid "Inventory"
msgstr ""
#. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:104
+#: src/gui/windowmenu.cpp:101
msgid "MAP"
msgstr ""
#. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:110
+#: src/gui/windowmenu.cpp:107
msgid "SKI"
msgstr ""
#. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
msgid "Skills"
msgstr ""
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:118
-msgid "SPE"
-msgstr ""
-
-#: src/gui/windowmenu.cpp:119
-msgid "Specials"
-msgstr ""
-
#. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:124
+#: src/gui/windowmenu.cpp:112
msgid "SOC"
msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:126 src/gui/windows/socialwindow.cpp:1284
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
msgid "Social"
msgstr ""
#. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:128
+#: src/gui/windowmenu.cpp:116
msgid "SH"
msgstr ""
#. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:132
+#: src/gui/windowmenu.cpp:120
msgid "SP"
msgstr ""
#. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:124
msgid "DR"
msgstr ""
#. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:128
msgid "YK"
msgstr ""
#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:130
msgid "Did you know"
msgstr ""
#. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:144
+#: src/gui/windowmenu.cpp:132
msgid "SHP"
msgstr ""
#. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:148
+#: src/gui/windowmenu.cpp:136
msgid "OU"
msgstr ""
#. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:152
+#: src/gui/windowmenu.cpp:140
msgid "DBG"
msgstr ""
#. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:149
msgid "WIN"
msgstr ""
#. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:153
msgid "SET"
msgstr ""
#. TRANSLATORS: short key name
#. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:301 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
#: src/gui/windows/outfitwindow.cpp:561
#, c-format
msgid "Key: %s"
@@ -4893,31 +4953,21 @@ msgstr ""
msgid "Result"
msgstr ""
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:58
-msgid "unsorted"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:60
-msgid "by price"
-msgstr ""
-
#. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:196
+#: src/gui/windows/buydialog.cpp:162
msgid "Create items"
msgstr ""
#. TRANSLATORS: buy dialog label
#. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:254 src/gui/windows/buydialog.cpp:541
-#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:366
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
#, c-format
msgid "Price: %s / Total: %s"
msgstr ""
#. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:263
+#: src/gui/windows/buydialog.cpp:229
msgid "Amount:"
msgstr ""
@@ -4927,8 +4977,8 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/itemamountwindow.cpp:159
-#: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
msgid "+"
msgstr ""
@@ -4939,8 +4989,8 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:271 src/gui/windows/itemamountwindow.cpp:157
-#: src/gui/windows/itemamountwindow.cpp:191 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
msgid "-"
msgstr ""
@@ -4948,9 +4998,9 @@ msgstr ""
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:274 src/gui/windows/charcreatedialog.cpp:119
-#: src/gui/windows/charselectdialog.cpp:593
-#: src/gui/windows/socialwindow.cpp:1307
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
msgid "Create"
msgstr ""
@@ -4959,7 +5009,7 @@ msgstr ""
#. TRANSLATORS: status bar label
#. TRANSLATORS: status window label
#. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:278 src/gui/windows/selldialog.cpp:112
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
#: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
#: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
msgid "Max"
@@ -5058,7 +5108,7 @@ msgstr ""
#. TRANSLATORS: login dialog label
#. TRANSLATORS: register dialog. label.
#: src/gui/windows/charcreatedialog.cpp:73
-#: src/gui/windows/editserverdialog.cpp:89 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
#: src/gui/windows/registerdialog.cpp:89
msgid "Name:"
msgstr ""
@@ -5119,7 +5169,7 @@ msgstr ""
#. TRANSLATORS: char create dialog label
#: src/gui/windows/charcreatedialog.cpp:115
-#: src/gui/windows/charcreatedialog.cpp:469
+#: src/gui/windows/charcreatedialog.cpp:458
#, c-format
msgid "Please distribute %d points"
msgstr ""
@@ -5135,17 +5185,17 @@ msgid "Look:"
msgstr ""
#. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:362
+#: src/gui/windows/charcreatedialog.cpp:351
msgid "Your name needs to be at least 4 characters."
msgstr ""
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:459
+#: src/gui/windows/charcreatedialog.cpp:448
msgid "Character stats OK"
msgstr ""
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:475
+#: src/gui/windows/charcreatedialog.cpp:464
#, c-format
msgid "Please remove %d points"
msgstr ""
@@ -5174,7 +5224,7 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:104
-#: src/gui/windows/charselectdialog.cpp:588
+#: src/gui/windows/charselectdialog.cpp:580
#: src/gui/windows/updaterwindow.cpp:188
msgid "Play"
msgstr ""
@@ -5230,35 +5280,20 @@ msgstr ""
msgid "Enter password:"
msgstr ""
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:172
-msgid "rainbow 1"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:174
-msgid "rainbow 2"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:176
-msgid "rainbow 3"
-msgstr ""
-
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:755
+#: src/gui/windows/chatwindow.cpp:705
#, c-format
msgid "Present: %s; %d players are present."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1169
+#: src/gui/windows/chatwindow.cpp:1119
#, c-format
msgid "Whispering to %s: %s"
msgstr ""
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1613
+#: src/gui/windows/chatwindow.cpp:1563
#, c-format
msgid "%s's pet"
msgstr ""
@@ -5504,51 +5539,51 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:77
-#: src/gui/windows/itemamountwindow.cpp:161 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
msgid "OK"
msgstr ""
#. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:66
+#: src/gui/windows/editserverdialog.cpp:45
msgid "Edit Server"
msgstr ""
#. TRANSLATORS: edit server dialog button
#. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:75
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
msgid "Connect"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:91
+#: src/gui/windows/editserverdialog.cpp:70
msgid "Address:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:93
+#: src/gui/windows/editserverdialog.cpp:72
msgid "Port:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:95
+#: src/gui/windows/editserverdialog.cpp:74
msgid "Server type:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:97
+#: src/gui/windows/editserverdialog.cpp:76
msgid "Description:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:99
+#: src/gui/windows/editserverdialog.cpp:78
msgid "Online list url:"
msgstr ""
#. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:220
+#: src/gui/windows/editserverdialog.cpp:188
msgid "Please at least type both the address and the port of the server."
msgstr ""
@@ -5568,47 +5603,47 @@ msgid "Did you know..."
msgstr ""
#. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:165
+#: src/gui/windows/itemamountwindow.cpp:164
msgid "All"
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:221
+#: src/gui/windows/itemamountwindow.cpp:220
msgid "Select amount of items to trade."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:225
+#: src/gui/windows/itemamountwindow.cpp:224
msgid "Select amount of items to drop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:229
+#: src/gui/windows/itemamountwindow.cpp:228
msgid "Select amount of items to store."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:233
+#: src/gui/windows/itemamountwindow.cpp:232
msgid "Select amount of items to retrieve."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:237
+#: src/gui/windows/itemamountwindow.cpp:236
msgid "Select amount of items to split."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:241
+#: src/gui/windows/itemamountwindow.cpp:240
msgid "Add to buy shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:245
+#: src/gui/windows/itemamountwindow.cpp:244
msgid "Add to sell shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:249
+#: src/gui/windows/itemamountwindow.cpp:248
msgid "Unknown."
msgstr ""
@@ -5860,7 +5895,7 @@ msgstr ""
#. TRANSLATORS: shop window label
#. TRANSLATORS: shop window button
#. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:258
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
#: src/gui/windows/tradewindow.cpp:78
msgid "Add"
@@ -5962,53 +5997,53 @@ msgid "Do you really want to sell %s?"
msgstr ""
#. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
msgid "Choose Your Server"
msgstr ""
#. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
msgid "Load"
msgstr ""
#. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
msgid "Choose Your Server *** SAFE MODE ***"
msgstr ""
#. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
msgid "Use same ip for game sub servers"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
msgid "Waiting for server..."
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
msgid "Preparing download"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
msgid "Error retreiving server list!"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
msgid "requires a newer version"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
#, c-format
msgid "requires v%s"
msgstr ""
@@ -6089,277 +6124,277 @@ msgid "Skill %d"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:225
+#: src/gui/windows/socialwindow.cpp:227
#, c-format
msgid "Invited user %s to guild %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:240
+#: src/gui/windows/socialwindow.cpp:242
#, c-format
msgid "Guild %s quit requested."
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:254
+#: src/gui/windows/socialwindow.cpp:256
msgid "Member Invite to Guild"
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:256
+#: src/gui/windows/socialwindow.cpp:258
#, c-format
msgid "Who would you like to invite to guild %s?"
msgstr ""
#. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:266
+#: src/gui/windows/socialwindow.cpp:268
msgid "Leave Guild?"
msgstr ""
#. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:268
+#: src/gui/windows/socialwindow.cpp:270
#, c-format
msgid "Are you sure you want to leave guild %s?"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:279
+#: src/gui/windows/socialwindow.cpp:281
#, c-format
msgid "Members: %u/%u"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:301 src/gui/windows/socialwindow.cpp:373
-#: src/gui/windows/socialwindow.cpp:498
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
#, c-format
msgid "Players: %u/%u"
msgstr ""
#. TRANSLATORS: tab in social window
#. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:389 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
msgid "Party"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:429
+#: src/gui/windows/socialwindow.cpp:431
#, c-format
msgid "Invited user %s to party."
msgstr ""
#. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:444
+#: src/gui/windows/socialwindow.cpp:446
#, c-format
msgid "Party %s quit requested."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:458
+#: src/gui/windows/socialwindow.cpp:460
msgid "Member Invite to Party"
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:460
+#: src/gui/windows/socialwindow.cpp:462
#, c-format
msgid "Who would you like to invite to party %s?"
msgstr ""
#. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:470
+#: src/gui/windows/socialwindow.cpp:472
msgid "Leave Party?"
msgstr ""
#. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:472
+#: src/gui/windows/socialwindow.cpp:474
#, c-format
msgid "Are you sure you want to leave party %s?"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:698
+#: src/gui/windows/socialwindow.cpp:665
#, c-format
msgid "Visible players: %d"
msgstr ""
#. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:725
+#: src/gui/windows/socialwindow.cpp:692
msgid "Nav"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:827
+#: src/gui/windows/socialwindow.cpp:794
#, c-format
msgid "Portals: %u/%u"
msgstr ""
#. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1054
+#: src/gui/windows/socialwindow.cpp:1021
msgid "Atk"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1073
+#: src/gui/windows/socialwindow.cpp:1040
msgid "Priority mobs"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1075
+#: src/gui/windows/socialwindow.cpp:1042
msgid "Attack mobs"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1077
+#: src/gui/windows/socialwindow.cpp:1044
msgid "Ignore mobs"
msgstr ""
#. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1101
+#: src/gui/windows/socialwindow.cpp:1068
msgid "Pik"
msgstr ""
#. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1120
+#: src/gui/windows/socialwindow.cpp:1087
msgid "Pickup items"
msgstr ""
#. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1122
+#: src/gui/windows/socialwindow.cpp:1089
msgid "Ignore items"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1212
+#: src/gui/windows/socialwindow.cpp:1179
#, c-format
msgid "Friends: %u/%u"
msgstr ""
#. TRANSLATORS: party popup item
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1235 src/gui/windows/socialwindow.cpp:1727
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
msgid "Create Party"
msgstr ""
#. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1298
+#: src/gui/windows/socialwindow.cpp:1265
msgid "P"
msgstr ""
#. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1303
+#: src/gui/windows/socialwindow.cpp:1270
msgid "F"
msgstr ""
#. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1309
+#: src/gui/windows/socialwindow.cpp:1276
msgid "Invite"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1503
+#: src/gui/windows/socialwindow.cpp:1470
#, c-format
msgid "Accepted party invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1514
+#: src/gui/windows/socialwindow.cpp:1481
#, c-format
msgid "Rejected party invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1531
+#: src/gui/windows/socialwindow.cpp:1498
#, c-format
msgid "Accepted guild invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1545
+#: src/gui/windows/socialwindow.cpp:1512
#, c-format
msgid "Rejected guild invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1585
+#: src/gui/windows/socialwindow.cpp:1552
#, c-format
msgid "Creating guild called %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1606
+#: src/gui/windows/socialwindow.cpp:1573
#, c-format
msgid "Creating party called %s."
msgstr ""
#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1621
+#: src/gui/windows/socialwindow.cpp:1588
msgid "Guild Name"
msgstr ""
#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1623
+#: src/gui/windows/socialwindow.cpp:1590
msgid "Choose your guild's name."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1639
+#: src/gui/windows/socialwindow.cpp:1606
msgid "Received guild request, but one already exists."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1647
+#: src/gui/windows/socialwindow.cpp:1614
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1654
+#: src/gui/windows/socialwindow.cpp:1621
msgid "Accept Guild Invite"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1670
+#: src/gui/windows/socialwindow.cpp:1637
msgid "Received party request, but one already exists."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1682
+#: src/gui/windows/socialwindow.cpp:1649
msgid "You have been invited you to join a party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1687
+#: src/gui/windows/socialwindow.cpp:1654
#, c-format
msgid "You have been invited to join the %s party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1696
+#: src/gui/windows/socialwindow.cpp:1663
#, c-format
msgid "%s has invited you to join their party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1702
+#: src/gui/windows/socialwindow.cpp:1669
#, c-format
msgid "%s has invited you to join the %s party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1712
+#: src/gui/windows/socialwindow.cpp:1679
msgid "Accept Party Invite"
msgstr ""
-#: src/gui/windows/socialwindow.cpp:1728
+#: src/gui/windows/socialwindow.cpp:1695
msgid "Cannot create party. You are already in a party"
msgstr ""
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1734
+#: src/gui/windows/socialwindow.cpp:1701
msgid "Party Name"
msgstr ""
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1736
+#: src/gui/windows/socialwindow.cpp:1703
msgid "Choose your party's name."
msgstr ""
@@ -6401,113 +6436,68 @@ msgstr ""
msgid "Correction points: %d"
msgstr ""
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "No Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Allow Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:105
-msgid "Need Target"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "General Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "Life Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "War Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Transmute Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Nature Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:121
-msgid "Astral Magic"
-msgstr ""
-
#. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:164
+#: src/gui/windows/textcommandeditor.cpp:47
msgid "Command Editor"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:52
msgid "magic"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:54
msgid "other"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:173
+#: src/gui/windows/textcommandeditor.cpp:56
msgid "Symbol:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:176
+#: src/gui/windows/textcommandeditor.cpp:59
msgid "Command:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:179
+#: src/gui/windows/textcommandeditor.cpp:62
msgid "Comment:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:183
+#: src/gui/windows/textcommandeditor.cpp:66
msgid "Target Type:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:187
+#: src/gui/windows/textcommandeditor.cpp:70
msgid "Icon:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:190
+#: src/gui/windows/textcommandeditor.cpp:73
msgid "Mana:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:193
+#: src/gui/windows/textcommandeditor.cpp:76
msgid "Magic level:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:197
+#: src/gui/windows/textcommandeditor.cpp:80
msgid "Magic School:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:200
+#: src/gui/windows/textcommandeditor.cpp:83
msgid "School level:"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/windows/textcommandeditor.cpp:88
msgid "Save"
msgstr ""
@@ -6537,7 +6527,7 @@ msgid "Trade: You"
msgstr ""
#. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
#, c-format
msgid "You get %s"
msgstr ""
@@ -6553,12 +6543,12 @@ msgid "You give:"
msgstr ""
#. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
msgid "You don't have enough money."
msgstr ""
#. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
msgid ""
"Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
@@ -6629,17 +6619,17 @@ msgid "Who Is Online - Update"
msgstr ""
#. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:87
+#: src/gui/windows/worldselectdialog.cpp:49
msgid "Select World"
msgstr ""
#. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:93
+#: src/gui/windows/worldselectdialog.cpp:55
msgid "Change Login"
msgstr ""
#. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:95
+#: src/gui/windows/worldselectdialog.cpp:57
msgid "Choose World"
msgstr ""
@@ -6857,7 +6847,7 @@ msgid "Failed to create character. Most likely the name is already taken."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:281
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
msgid "Wrong name."
msgstr ""
@@ -7015,58 +7005,58 @@ msgid "Experience sharing unknown."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:154
+#: src/net/ea/loginhandler.cpp:149
msgid "Account was not found. Please re-login."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/ea/loginhandler.cpp:153
msgid "Old password incorrect."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:162
+#: src/net/ea/loginhandler.cpp:157
msgid "New password too short."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:166 src/net/ea/loginhandler.cpp:293
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
msgid "Unknown error."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:239
+#: src/net/ea/loginhandler.cpp:234
msgid "Unregistered ID."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:238
msgid "Wrong password."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:248
+#: src/net/ea/loginhandler.cpp:243
msgid "Account expired."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:252
+#: src/net/ea/loginhandler.cpp:247
msgid "Rejected from server."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:256
+#: src/net/ea/loginhandler.cpp:251
msgid ""
"You have been permanently banned from the game. Please contact the GM team."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:261
+#: src/net/ea/loginhandler.cpp:256
msgid "Client too old."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:265
+#: src/net/ea/loginhandler.cpp:260
#, c-format
msgid ""
"You have been temporarily banned from the game until %s.\n"
@@ -7074,22 +7064,22 @@ msgid ""
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:273
+#: src/net/ea/loginhandler.cpp:268
msgid "Server overpopulated."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:277
+#: src/net/ea/loginhandler.cpp:272
msgid "This user name is already taken."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:285
+#: src/net/ea/loginhandler.cpp:280
msgid "Incorrect email."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:289
+#: src/net/ea/loginhandler.cpp:284
msgid "Username permanently erased."
msgstr ""
@@ -7762,7 +7752,7 @@ msgstr ""
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
#: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 4d04d8366..f245d181e 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: 2014-02-23 00:42+0300\n"
-"PO-Revision-Date: 2014-02-23 08:14+0000\n"
+"POT-Creation-Date: 2014-02-28 21:21+0300\n"
+"PO-Revision-Date: 2014-03-01 08:14+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"
@@ -29,7 +29,7 @@ msgid "Accepting incoming trade requests"
msgstr "Accepterar handelserbjudanden"
#. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
msgid "Visible on map"
msgstr ""
@@ -38,68 +38,68 @@ msgstr ""
msgid "Human"
msgstr ""
-#: src/being/being.cpp:544
+#: src/being/being.cpp:496
msgid "dodge"
msgstr ""
-#: src/being/being.cpp:544
+#: src/being/being.cpp:496
msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1965 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1970 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr ""
#. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:392
+#: src/being/localplayer.cpp:376
#, c-format
msgid "You were killed by %s"
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1377
+#: src/being/localplayer.cpp:816
msgid "Tried to pick up nonexistent item."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1381
+#: src/being/localplayer.cpp:820
msgid "Item is too heavy."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1385
+#: src/being/localplayer.cpp:824
msgid "Item is too far away."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1389
+#: src/being/localplayer.cpp:828
msgid "Inventory is full."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1393
+#: src/being/localplayer.cpp:832
msgid "Stack is too big."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1397
+#: src/being/localplayer.cpp:836
msgid "Item belongs to someone else."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1401
+#: src/being/localplayer.cpp:840
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:1425
+#: src/being/localplayer.cpp:864
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -107,387 +107,387 @@ msgstr[0] ""
msgstr[1] ""
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1630 src/being/localplayer.cpp:1665
-#: src/being/localplayer.cpp:1666
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
msgid "xp"
msgstr ""
-#: src/being/localplayer.cpp:1671 src/being/localplayer.cpp:1678
-#: src/being/localplayer.cpp:1685
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
msgid "job"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1871
+#: src/being/localplayer.cpp:1285
msgid "(D) default moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1873
+#: src/being/localplayer.cpp:1287
msgid "(I) invert moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1875
+#: src/being/localplayer.cpp:1289
msgid "(c) moves with some crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1877
+#: src/being/localplayer.cpp:1291
msgid "(C) moves with crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1879
+#: src/being/localplayer.cpp:1293
msgid "(d) double normal + crazy"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1881
+#: src/being/localplayer.cpp:1295
msgid "(?) unknown move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1904
+#: src/being/localplayer.cpp:1318
#, c-format
msgid "(%u) crazy move number %u"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1910
+#: src/being/localplayer.cpp:1324
msgid "(a) custom crazy move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1915
+#: src/being/localplayer.cpp:1329
msgid "(?) crazy move"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1930
+#: src/being/localplayer.cpp:1344
msgid "(0) default moves to target"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1932
+#: src/being/localplayer.cpp:1346
msgid "(1) moves to target in distance 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1934
+#: src/being/localplayer.cpp:1348
msgid "(2) moves to target in distance 2"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1936
+#: src/being/localplayer.cpp:1350
msgid "(3) moves to target in distance 3"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1938
+#: src/being/localplayer.cpp:1352
msgid "(5) moves to target in distance 5"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1940
+#: src/being/localplayer.cpp:1354
msgid "(7) moves to target in distance 7"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1942
+#: src/being/localplayer.cpp:1356
msgid "(A) moves to target in attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1944
+#: src/being/localplayer.cpp:1358
msgid "(a) archer attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1946
+#: src/being/localplayer.cpp:1360
msgid "(B) moves to target in attack range - 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1948
+#: src/being/localplayer.cpp:1362
msgid "(?) move to target"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1968
+#: src/being/localplayer.cpp:1382
msgid "(D) default follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1970
+#: src/being/localplayer.cpp:1384
msgid "(R) relative follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1972
+#: src/being/localplayer.cpp:1386
msgid "(M) mirror follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1974
+#: src/being/localplayer.cpp:1388
msgid "(P) pet follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1976
+#: src/being/localplayer.cpp:1390
msgid "(?) unknown follow"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1996 src/being/localplayer.cpp:2004
-#: src/being/localplayer.cpp:2032
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
msgid "(?) attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1998 src/being/localplayer.cpp:2024
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
msgid "(D) default attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2000
+#: src/being/localplayer.cpp:1414
msgid "(s) switch attack without shield"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2002
+#: src/being/localplayer.cpp:1416
msgid "(S) switch attack with shield"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2026
+#: src/being/localplayer.cpp:1440
msgid "(G) go and attack"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2028
+#: src/being/localplayer.cpp:1442
msgid "(A) go, attack, pickup"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2030
+#: src/being/localplayer.cpp:1444
msgid "(d) without auto attack"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2084
+#: src/being/localplayer.cpp:1498
msgid "(S) small pick up 1x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2086
+#: src/being/localplayer.cpp:1500
msgid "(D) default pick up 2x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2088
+#: src/being/localplayer.cpp:1502
msgid "(F) forward pick up 2x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2090
+#: src/being/localplayer.cpp:1504
msgid "(3) pick up 3x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2092
+#: src/being/localplayer.cpp:1506
msgid "(g) go and pick up in distance 4"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2094
+#: src/being/localplayer.cpp:1508
msgid "(G) go and pick up in distance 8"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2096
+#: src/being/localplayer.cpp:1510
msgid "(A) go and pick up in max distance"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2098
+#: src/being/localplayer.cpp:1512
msgid "(?) pick up"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2112
+#: src/being/localplayer.cpp:1526
msgid "(N) normal map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2114
+#: src/being/localplayer.cpp:1528
msgid "(D) debug map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2116
+#: src/being/localplayer.cpp:1530
msgid "(u) ultra map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2118
+#: src/being/localplayer.cpp:1532
msgid "(U) ultra map view 2"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2120
+#: src/being/localplayer.cpp:1534
msgid "(e) empty map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2122
+#: src/being/localplayer.cpp:1536
msgid "(b) black & white map view"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2142
+#: src/being/localplayer.cpp:1556
msgid "(f) use #flar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2144
+#: src/being/localplayer.cpp:1558
msgid "(c) use #chiza for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2146
+#: src/being/localplayer.cpp:1560
msgid "(I) use #ingrav for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2148
+#: src/being/localplayer.cpp:1562
msgid "(F) use #frillyar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2150
+#: src/being/localplayer.cpp:1564
msgid "(U) use #upmarmu for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2152
+#: src/being/localplayer.cpp:1566
msgid "(?) magic attack"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2172
+#: src/being/localplayer.cpp:1586
msgid "(a) attack all players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2174
+#: src/being/localplayer.cpp:1588
msgid "(f) attack all except friends"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2176
+#: src/being/localplayer.cpp:1590
msgid "(b) attack bad relations"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2178
+#: src/being/localplayer.cpp:1592
msgid "(d) don't attack players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2180
+#: src/being/localplayer.cpp:1594
msgid "(?) pvp attack"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2200
+#: src/being/localplayer.cpp:1614
msgid "(D) default imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2202
+#: src/being/localplayer.cpp:1616
msgid "(O) outfits imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2204
+#: src/being/localplayer.cpp:1618
msgid "(?) imitation"
msgstr ""
#. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2233
+#: src/being/localplayer.cpp:1647
msgid "Away"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2256
+#: src/being/localplayer.cpp:1670
msgid "(O) on keyboard"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2258
+#: src/being/localplayer.cpp:1672
msgid "(A) away"
msgstr ""
#. TRANSLATORS: away type in status bar
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2260 src/being/localplayer.cpp:2278
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
msgid "(?) away"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2274
+#: src/being/localplayer.cpp:1688
msgid "(G) game camera mode"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2276
+#: src/being/localplayer.cpp:1690
msgid "(F) free camera mode"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2303
+#: src/being/localplayer.cpp:1717
msgid "Game modifiers are enabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2305
+#: src/being/localplayer.cpp:1719
msgid "Game modifiers are disabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2307
+#: src/being/localplayer.cpp:1721
msgid "Game modifiers are unknown"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3887
+#: src/being/localplayer.cpp:3287
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3893 src/being/localplayer.cpp:3918
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3903
+#: src/being/localplayer.cpp:3303
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3909 src/being/localplayer.cpp:3923
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4266
+#: src/being/localplayer.cpp:3666
#, c-format
msgid "You see %s"
msgstr ""
@@ -525,32 +525,32 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1139 src/gui/windowmenu.cpp:167
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
#: src/gui/windows/setupwindow.cpp:61
msgid "Setup"
msgstr "Inställningar"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1143 src/gui/widgets/tabs/setup_perfomance.cpp:51
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1146 src/gui/widgets/tabs/setup_video.cpp:225
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:225
msgid "Video"
msgstr "Video"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1149 src/gui/widgets/tabs/setup_theme.cpp:269
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1152 src/gui/windowmenu.cpp:74
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr "Hjälp"
@@ -563,41 +563,41 @@ msgstr "Hjälp"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1156 src/gui/popups/popupmenu.cpp:619
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
#: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:69
-#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:138
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
#: src/gui/windows/shopwindow.cpp:78
msgid "Close"
msgstr "Stäng"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1324
msgid "Logging in"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1367
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1492
+#: src/client.cpp:1489
msgid "Requesting characters"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1532
+#: src/client.cpp:1529
msgid "Connecting to the game server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1545
+#: src/client.cpp:1541
msgid "Changing game servers"
msgstr ""
@@ -612,12 +612,12 @@ msgstr ""
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1606 src/client.cpp:1617 src/client.cpp:1801
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:349
#: src/gui/windows/charselectdialog.cpp:299
-#: src/gui/windows/editserverdialog.cpp:218
+#: src/gui/windows/editserverdialog.cpp:186
#: src/gui/windows/registerdialog.cpp:260
#: src/gui/windows/unregisterdialog.cpp:146
#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
@@ -625,65 +625,65 @@ msgid "Error"
msgstr "Fel"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1629
+#: src/client.cpp:1625
msgid "Requesting registration details"
msgstr ""
#. TRANSLATORS: password change message header
-#: src/client.cpp:1670
+#: src/client.cpp:1666
msgid "Password Change"
msgstr ""
#. TRANSLATORS: password change message text
-#: src/client.cpp:1672
+#: src/client.cpp:1668
msgid "Password changed successfully!"
msgstr ""
#. TRANSLATORS: email change message header
-#: src/client.cpp:1694
+#: src/client.cpp:1690
msgid "Email Change"
msgstr ""
#. TRANSLATORS: email change message text
-#: src/client.cpp:1696
+#: src/client.cpp:1692
msgid "Email changed successfully!"
msgstr ""
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1719
+#: src/client.cpp:1715
msgid "Unregister Successful"
msgstr ""
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1721
+#: src/client.cpp:1717
msgid "Farewell, come back any time..."
msgstr ""
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1998 src/client.cpp:2013 src/client.cpp:2058
-#: src/client.cpp:2074 src/client.cpp:2525 src/client.cpp:2533
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2230
+#: src/client.cpp:2232
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2271 src/client.cpp:2278
+#: src/client.cpp:2273 src/client.cpp:2280
msgid "Error creating updates directory!"
msgstr "Kunde inte skapa katalog för uppdateringar!"
-#: src/client.cpp:2300 src/client.cpp:2317
+#: src/client.cpp:2302 src/client.cpp:2319
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: error message question
-#: src/client.cpp:3001
+#: src/client.cpp:3003
msgid "Do you want to open support page?"
msgstr ""
@@ -929,99 +929,154 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:277 src/gui/widgets/tabs/chattab.cpp:464
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
msgid "General"
msgstr "Allmänt"
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:293 src/gui/widgets/tabs/chattab.cpp:466
-#: src/gui/windowmenu.cpp:154 src/gui/windows/debugwindow.cpp:53
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:575
+#: src/game.cpp:563
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:585
+#: src/game.cpp:573
msgid "Saving screenshot failed!"
msgstr "Kunde inte spara skärmbild!"
#. TRANSLATORS: error message text
-#: src/game.cpp:656
+#: src/game.cpp:644
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:659
+#: src/game.cpp:647
msgid "Network Error"
msgstr "Nätverksfel"
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
-msgid "black"
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
msgstr ""
+#. TRANSLATORS: chat color
#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
+msgid "black"
+msgstr ""
+
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
msgid "red"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
msgid "green"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
msgid "blue"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
msgid "gold"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
msgid "yellow"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
msgid "pink"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
msgid "purple"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
msgid "grey"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
msgid "brown"
msgstr ""
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr ""
+
#. TRANSLATORS: relation type
#: src/gui/models/playerrelationlistmodel.h:33
msgid "Neutral"
@@ -1057,46 +1112,61 @@ msgstr ""
msgid "Enemy"
msgstr ""
-#. TRANSLATORS: inventory sort mode
-#. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#: src/gui/models/sortlistmodelinv.h:34
-#: src/gui/widgets/tabs/setup_other.cpp:72
-#: src/gui/widgets/tabs/setup_visual.cpp:78 src/gui/windows/chatwindow.cpp:150
-msgid "default"
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:36 src/gui/windows/buydialog.cpp:62
-msgid "by name"
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
msgstr ""
+#. TRANSLATORS: buy dialog sort type.
#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
+msgid "by name"
+msgstr ""
+
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:38 src/gui/windows/buydialog.cpp:64
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
msgid "by id"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:40 src/gui/windows/buydialog.cpp:66
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
msgid "by weight"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:42 src/gui/windows/buydialog.cpp:68
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
msgid "by amount"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:44 src/gui/windows/buydialog.cpp:70
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
msgid "by type"
msgstr ""
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr ""
+
#. TRANSLATORS: update type
#. TRANSLATORS: onscreen button size
#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
@@ -1243,8 +1313,8 @@ msgstr "Prata"
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
-#: src/gui/windows/buydialog.cpp:208 src/gui/windows/buydialog.cpp:220
-#: src/gui/windows/buydialog.cpp:274 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
msgid "Buy"
msgstr "Köp"
@@ -1341,12 +1411,12 @@ msgstr ""
#: src/gui/windows/changepassworddialog.cpp:57
#: src/gui/windows/charcreatedialog.cpp:121
#: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:79
-#: src/gui/windows/itemamountwindow.cpp:163
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
-#: src/gui/windows/socialwindow.cpp:1238
-#: src/gui/windows/textcommandeditor.cpp:203 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:54
#: src/gui/windows/updaterwindow.cpp:186
msgid "Cancel"
@@ -1418,7 +1488,7 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:150 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
msgstr ""
@@ -1431,7 +1501,7 @@ msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:134
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
msgid "Spells"
msgstr ""
@@ -1487,7 +1557,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
#. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1311
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
msgid "Leave"
msgstr ""
@@ -1568,8 +1638,8 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
-#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:223
-#: src/gui/windows/inventorywindow.cpp:745 src/gui/windows/setupwindow.cpp:96
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
msgid "Store"
msgstr "Lagra"
@@ -1600,7 +1670,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
msgid "Retrieve"
msgstr "Hämta"
@@ -1633,8 +1703,8 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
-#: src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:656 src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr "Använd"
@@ -1668,8 +1738,8 @@ msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: language
#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/widgets/tabs/setup_theme.cpp:127
-#: src/gui/windows/socialwindow.cpp:1003
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
msgid "(default)"
msgstr ""
@@ -1825,8 +1895,8 @@ msgstr ""
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:645
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
msgid "Unequip"
msgstr "Avrusta"
@@ -1834,16 +1904,16 @@ msgstr "Avrusta"
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:172
-#: src/gui/windows/inventorywindow.cpp:650 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr "Utrusta"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:189
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
msgid "Drop..."
msgstr ""
@@ -1857,15 +1927,15 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:138
-#: src/gui/windows/inventorywindow.cpp:758
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
msgid "Drop"
msgstr "Släpp"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
msgid "Split"
msgstr "Dela"
@@ -2021,10 +2091,10 @@ msgstr "Välj okej"
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:276
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/windows/serverdialog.cpp:198
msgid "Quit"
msgstr "Avsluta"
@@ -2586,7 +2656,7 @@ msgstr ""
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: register dialog. button.
#: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:146
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:330
#: src/gui/widgets/tabs/setup_visual.cpp:189
@@ -2613,9 +2683,8 @@ msgstr ""
#. TRANSLATORS: command editor button
#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
#: src/gui/windows/charselectdialog.cpp:108
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:94
-#: src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/textcommandeditor.cpp:207
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
msgid "Delete"
msgstr "Ta bort"
@@ -2651,7 +2720,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:130
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
msgid "Shortcuts"
msgstr ""
@@ -2659,7 +2728,7 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:151
msgid "Windows"
msgstr ""
@@ -2675,7 +2744,7 @@ msgstr ""
#. TRANSLATORS: settings tab name
#. TRANSLATORS: chat window name
#: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:88 src/gui/windows/chatwindow.cpp:203
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
msgid "Chat"
msgstr "Chatt"
@@ -2898,7 +2967,7 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:137
-#: src/gui/windows/inventorywindow.cpp:569
+#: src/gui/windows/inventorywindow.cpp:568
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
#, c-format
@@ -2918,7 +2987,7 @@ msgstr ""
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/windows/serverdialog.cpp:204
msgid "Edit"
msgstr ""
@@ -2971,7 +3040,7 @@ msgstr ""
#. TRANSLATORS: tab in social window
#. TRANSLATORS: guild chat tab name
#: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:184 src/gui/windows/socialwindow.cpp:320
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
#: src/net/ea/gui/guildtab.cpp:44
msgid "Guild"
msgstr "Gille"
@@ -2982,142 +3051,142 @@ msgid "Lang"
msgstr ""
#. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:49
+#: src/gui/widgets/tabs/setup_audio.cpp:48
msgid "Audio"
msgstr "Ljud"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:57
+#: src/gui/widgets/tabs/setup_audio.cpp:56
msgid "Basic settings"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:60
+#: src/gui/widgets/tabs/setup_audio.cpp:59
msgid "Enable Audio"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:63
+#: src/gui/widgets/tabs/setup_audio.cpp:62
msgid "Enable music"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:67
+#: src/gui/widgets/tabs/setup_audio.cpp:66
msgid "Enable game sfx"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:71
+#: src/gui/widgets/tabs/setup_audio.cpp:70
msgid "Enable gui sfx"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:74
msgid "Sfx volume"
msgstr "Volym för ljudeffekter"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:78
msgid "Music volume"
msgstr "Musikvolym"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:82
msgid "Enable music fade out"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:86
msgid "Audio frequency"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:90
msgid "mono"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:93
+#: src/gui/widgets/tabs/setup_audio.cpp:92
msgid "stereo"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:94
msgid "surround"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:97
+#: src/gui/widgets/tabs/setup_audio.cpp:96
msgid "surround+center+lfe"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:98
msgid "Audio channels"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:104
+#: src/gui/widgets/tabs/setup_audio.cpp:103
msgid "Sound effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:106
msgid "Information dialog sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:110
msgid "Request dialog sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:115
+#: src/gui/widgets/tabs/setup_audio.cpp:114
msgid "Whisper message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:118
msgid "Guild / Party message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:122
msgid "Highlight message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:126
msgid "Global message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:130
msgid "Error message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:134
msgid "Trade request sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:138
msgid "Show window sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:142
msgid "Hide window sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:150
msgid "Enable mumble voice chat"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:156
+#: src/gui/widgets/tabs/setup_audio.cpp:155
msgid "Download music"
msgstr ""
@@ -3413,7 +3482,7 @@ msgstr ""
#. TRANSLATORS: unknown key name
#. TRANSLATORS: quests window quest name
#: src/gui/widgets/tabs/setup_input.cpp:364
-#: src/gui/windows/questswindow.cpp:263
+#: src/gui/windows/questswindow.cpp:249
msgid "unknown"
msgstr ""
@@ -3572,7 +3641,7 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: debug window tab
#. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:105
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
#: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
#: src/gui/windows/minimap.cpp:114
msgid "Map"
@@ -3740,9 +3809,9 @@ msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: shop window name
#. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:146
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
#: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windows/inventorywindow.cpp:194
msgid "Shop"
msgstr "Affär"
@@ -4124,252 +4193,252 @@ msgid "When ignoring:"
msgstr "Vid ignorering:"
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:64
+#: src/gui/widgets/tabs/setup_theme.cpp:63
msgid "Very small (8)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:66
+#: src/gui/widgets/tabs/setup_theme.cpp:65
msgid "Very small (9)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:68
+#: src/gui/widgets/tabs/setup_theme.cpp:67
msgid "Tiny (10)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:70
+#: src/gui/widgets/tabs/setup_theme.cpp:69
msgid "Small (11)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:72
+#: src/gui/widgets/tabs/setup_theme.cpp:71
msgid "Medium (12)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:74
+#: src/gui/widgets/tabs/setup_theme.cpp:73
msgid "Normal (13)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:76
+#: src/gui/widgets/tabs/setup_theme.cpp:75
msgid "Large (14)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:78
+#: src/gui/widgets/tabs/setup_theme.cpp:77
msgid "Large (15)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:80
+#: src/gui/widgets/tabs/setup_theme.cpp:79
msgid "Large (16)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:82
+#: src/gui/widgets/tabs/setup_theme.cpp:81
msgid "Big (17)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:83
msgid "Big (18)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:85
msgid "Big (19)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:87
msgid "Very big (20)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:89
msgid "Very big (21)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:91
msgid "Very big (22)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:93
msgid "Huge (23)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:129
+#: src/gui/widgets/tabs/setup_theme.cpp:128
msgid "Chinese (China)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:131
+#: src/gui/widgets/tabs/setup_theme.cpp:130
msgid "Czech"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:133
+#: src/gui/widgets/tabs/setup_theme.cpp:132
msgid "English"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:135
+#: src/gui/widgets/tabs/setup_theme.cpp:134
msgid "Finnish"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:137
+#: src/gui/widgets/tabs/setup_theme.cpp:136
msgid "French"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:139
+#: src/gui/widgets/tabs/setup_theme.cpp:138
msgid "German"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:141
+#: src/gui/widgets/tabs/setup_theme.cpp:140
msgid "Indonesian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:143
+#: src/gui/widgets/tabs/setup_theme.cpp:142
msgid "Italian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:145
+#: src/gui/widgets/tabs/setup_theme.cpp:144
msgid "Polish"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:147
+#: src/gui/widgets/tabs/setup_theme.cpp:146
msgid "Japanese"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:148
msgid "Dutch (Belgium/Flemish)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:150
msgid "Portuguese"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:152
msgid "Portuguese (Brazilian)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:154
msgid "Russian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:156
msgid "Spanish (Castilian)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:158
msgid "Turkish"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:211
+#: src/gui/widgets/tabs/setup_theme.cpp:210
msgid "Gui theme"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:218
+#: src/gui/widgets/tabs/setup_theme.cpp:217
msgid "Main Font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:223
+#: src/gui/widgets/tabs/setup_theme.cpp:222
msgid "Language"
msgstr ""
#. TRANSLATORS: theme settings label
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:227 src/gui/windows/emotewindow.cpp:45
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
msgid "Bold font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:230
msgid "Particle font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:235
+#: src/gui/widgets/tabs/setup_theme.cpp:234
msgid "Help font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:239
+#: src/gui/widgets/tabs/setup_theme.cpp:238
msgid "Secure font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:242
msgid "Npc font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:247
+#: src/gui/widgets/tabs/setup_theme.cpp:246
msgid "Japanese font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:250
msgid "Chinese font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:256
+#: src/gui/widgets/tabs/setup_theme.cpp:255
msgid "Font size"
msgstr "Typsnittsgrad"
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:261
+#: src/gui/widgets/tabs/setup_theme.cpp:260
msgid "Npc font size"
msgstr ""
#. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:265
+#: src/gui/widgets/tabs/setup_theme.cpp:264
msgid "i"
msgstr ""
#. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:404
+#: src/gui/widgets/tabs/setup_theme.cpp:403
msgid "Name: "
msgstr ""
-#: src/gui/widgets/tabs/setup_theme.cpp:405
+#: src/gui/widgets/tabs/setup_theme.cpp:404
msgid "Copyright:"
msgstr ""
#. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:470
+#: src/gui/widgets/tabs/setup_theme.cpp:469
msgid "Theme info"
msgstr ""
#. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:497
+#: src/gui/widgets/tabs/setup_theme.cpp:496
msgid "Theme Changed"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:497
+#: src/gui/widgets/tabs/setup_theme.cpp:496
#: src/gui/widgets/tabs/setup_video.cpp:499
#: src/gui/widgets/tabs/setup_video.cpp:508
msgid "Restart your client for the change to take effect."
@@ -4700,178 +4769,169 @@ msgid "Allow screensaver to run"
msgstr ""
#. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:67
msgid "ONL"
msgstr ""
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:68
msgid "Who is online"
msgstr ""
#. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:70
msgid "HLP"
msgstr ""
#. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:73
msgid "QE"
msgstr ""
#. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:77 src/gui/windows/questswindow.cpp:126
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
msgid "Quests"
msgstr ""
#. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:76
msgid "BC"
msgstr ""
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:77
msgid "Bot checker"
msgstr ""
#. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:82
+#: src/gui/windowmenu.cpp:79
msgid "KS"
msgstr ""
#. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:83 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
msgid "Kill stats"
msgstr ""
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:82
msgid "Smilies"
msgstr ""
#. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:87
+#: src/gui/windowmenu.cpp:84
msgid "CH"
msgstr ""
#. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:95
+#: src/gui/windowmenu.cpp:92
msgid "STA"
msgstr ""
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:93
msgid "Status"
msgstr "Status"
#. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:95
msgid "EQU"
msgstr ""
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:58
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
msgid "Equipment"
msgstr "Utrustning"
#. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:98
msgid "INV"
msgstr ""
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:130
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
#: src/inventory.cpp:257
msgid "Inventory"
msgstr "Inventarium"
#. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:104
+#: src/gui/windowmenu.cpp:101
msgid "MAP"
msgstr ""
#. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:110
+#: src/gui/windowmenu.cpp:107
msgid "SKI"
msgstr ""
#. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
msgid "Skills"
msgstr "Färdigheter"
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:118
-msgid "SPE"
-msgstr ""
-
-#: src/gui/windowmenu.cpp:119
-msgid "Specials"
-msgstr ""
-
#. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:124
+#: src/gui/windowmenu.cpp:112
msgid "SOC"
msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:126 src/gui/windows/socialwindow.cpp:1284
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
msgid "Social"
msgstr ""
#. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:128
+#: src/gui/windowmenu.cpp:116
msgid "SH"
msgstr ""
#. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:132
+#: src/gui/windowmenu.cpp:120
msgid "SP"
msgstr ""
#. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:124
msgid "DR"
msgstr ""
#. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:128
msgid "YK"
msgstr ""
#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:130
msgid "Did you know"
msgstr ""
#. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:144
+#: src/gui/windowmenu.cpp:132
msgid "SHP"
msgstr ""
#. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:148
+#: src/gui/windowmenu.cpp:136
msgid "OU"
msgstr ""
#. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:152
+#: src/gui/windowmenu.cpp:140
msgid "DBG"
msgstr ""
#. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:149
msgid "WIN"
msgstr ""
#. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:153
msgid "SET"
msgstr ""
#. TRANSLATORS: short key name
#. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:301 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
#: src/gui/windows/outfitwindow.cpp:561
#, c-format
msgid "Key: %s"
@@ -4893,31 +4953,21 @@ msgstr "Återställ"
msgid "Result"
msgstr ""
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:58
-msgid "unsorted"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:60
-msgid "by price"
-msgstr ""
-
#. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:196
+#: src/gui/windows/buydialog.cpp:162
msgid "Create items"
msgstr ""
#. TRANSLATORS: buy dialog label
#. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:254 src/gui/windows/buydialog.cpp:541
-#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:366
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Pris: %s / Totalt: %s"
#. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:263
+#: src/gui/windows/buydialog.cpp:229
msgid "Amount:"
msgstr ""
@@ -4927,8 +4977,8 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/itemamountwindow.cpp:159
-#: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
msgid "+"
msgstr ""
@@ -4939,8 +4989,8 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:271 src/gui/windows/itemamountwindow.cpp:157
-#: src/gui/windows/itemamountwindow.cpp:191 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
msgid "-"
msgstr ""
@@ -4948,9 +4998,9 @@ msgstr ""
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:274 src/gui/windows/charcreatedialog.cpp:119
-#: src/gui/windows/charselectdialog.cpp:593
-#: src/gui/windows/socialwindow.cpp:1307
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
msgid "Create"
msgstr "Skapa"
@@ -4959,7 +5009,7 @@ msgstr "Skapa"
#. TRANSLATORS: status bar label
#. TRANSLATORS: status window label
#. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:278 src/gui/windows/selldialog.cpp:112
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
#: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
#: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
msgid "Max"
@@ -5058,7 +5108,7 @@ msgstr ""
#. TRANSLATORS: login dialog label
#. TRANSLATORS: register dialog. label.
#: src/gui/windows/charcreatedialog.cpp:73
-#: src/gui/windows/editserverdialog.cpp:89 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
#: src/gui/windows/registerdialog.cpp:89
msgid "Name:"
msgstr "Namn:"
@@ -5119,7 +5169,7 @@ msgstr "Kvinna"
#. TRANSLATORS: char create dialog label
#: src/gui/windows/charcreatedialog.cpp:115
-#: src/gui/windows/charcreatedialog.cpp:469
+#: src/gui/windows/charcreatedialog.cpp:458
#, c-format
msgid "Please distribute %d points"
msgstr "Var vänlig fördela %d poäng"
@@ -5135,17 +5185,17 @@ msgid "Look:"
msgstr ""
#. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:362
+#: src/gui/windows/charcreatedialog.cpp:351
msgid "Your name needs to be at least 4 characters."
msgstr "Ditt namn måste vara minst 4 tecken långt."
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:459
+#: src/gui/windows/charcreatedialog.cpp:448
msgid "Character stats OK"
msgstr "Karaktärens värden okej"
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:475
+#: src/gui/windows/charcreatedialog.cpp:464
#, c-format
msgid "Please remove %d points"
msgstr "Var vänlig ta bort %d poäng"
@@ -5174,7 +5224,7 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:104
-#: src/gui/windows/charselectdialog.cpp:588
+#: src/gui/windows/charselectdialog.cpp:580
#: src/gui/windows/updaterwindow.cpp:188
msgid "Play"
msgstr "Spela"
@@ -5230,35 +5280,20 @@ msgstr ""
msgid "Enter password:"
msgstr ""
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:172
-msgid "rainbow 1"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:174
-msgid "rainbow 2"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:176
-msgid "rainbow 3"
-msgstr ""
-
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:755
+#: src/gui/windows/chatwindow.cpp:705
#, c-format
msgid "Present: %s; %d players are present."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1169
+#: src/gui/windows/chatwindow.cpp:1119
#, c-format
msgid "Whispering to %s: %s"
msgstr "Viskar till %s: %s"
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1613
+#: src/gui/windows/chatwindow.cpp:1563
#, c-format
msgid "%s's pet"
msgstr ""
@@ -5504,51 +5539,51 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:77
-#: src/gui/windows/itemamountwindow.cpp:161 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
msgid "OK"
msgstr "Okej"
#. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:66
+#: src/gui/windows/editserverdialog.cpp:45
msgid "Edit Server"
msgstr ""
#. TRANSLATORS: edit server dialog button
#. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:75
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
msgid "Connect"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:91
+#: src/gui/windows/editserverdialog.cpp:70
msgid "Address:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:93
+#: src/gui/windows/editserverdialog.cpp:72
msgid "Port:"
msgstr "Port:"
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:95
+#: src/gui/windows/editserverdialog.cpp:74
msgid "Server type:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:97
+#: src/gui/windows/editserverdialog.cpp:76
msgid "Description:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:99
+#: src/gui/windows/editserverdialog.cpp:78
msgid "Online list url:"
msgstr ""
#. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:220
+#: src/gui/windows/editserverdialog.cpp:188
msgid "Please at least type both the address and the port of the server."
msgstr ""
@@ -5568,47 +5603,47 @@ msgid "Did you know..."
msgstr ""
#. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:165
+#: src/gui/windows/itemamountwindow.cpp:164
msgid "All"
msgstr "Alla"
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:221
+#: src/gui/windows/itemamountwindow.cpp:220
msgid "Select amount of items to trade."
msgstr "Välj antal föremål att handla med."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:225
+#: src/gui/windows/itemamountwindow.cpp:224
msgid "Select amount of items to drop."
msgstr "Välj antal föremål att släppa."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:229
+#: src/gui/windows/itemamountwindow.cpp:228
msgid "Select amount of items to store."
msgstr "Välj antal att lagra."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:233
+#: src/gui/windows/itemamountwindow.cpp:232
msgid "Select amount of items to retrieve."
msgstr "Välj antal att hämta."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:237
+#: src/gui/windows/itemamountwindow.cpp:236
msgid "Select amount of items to split."
msgstr "Välj antal föremål att dela."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:241
+#: src/gui/windows/itemamountwindow.cpp:240
msgid "Add to buy shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:245
+#: src/gui/windows/itemamountwindow.cpp:244
msgid "Add to sell shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:249
+#: src/gui/windows/itemamountwindow.cpp:248
msgid "Unknown."
msgstr ""
@@ -5860,7 +5895,7 @@ msgstr "Vidare"
#. TRANSLATORS: shop window label
#. TRANSLATORS: shop window button
#. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:258
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
#: src/gui/windows/tradewindow.cpp:78
msgid "Add"
@@ -5962,53 +5997,53 @@ msgid "Do you really want to sell %s?"
msgstr ""
#. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
msgid "Choose Your Server"
msgstr ""
#. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
msgid "Load"
msgstr ""
#. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
msgid "Choose Your Server *** SAFE MODE ***"
msgstr ""
#. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
msgid "Use same ip for game sub servers"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
msgid "Waiting for server..."
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
msgid "Preparing download"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
msgid "Error retreiving server list!"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
msgid "requires a newer version"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
#, c-format
msgid "requires v%s"
msgstr ""
@@ -6089,277 +6124,277 @@ msgid "Skill %d"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:225
+#: src/gui/windows/socialwindow.cpp:227
#, c-format
msgid "Invited user %s to guild %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:240
+#: src/gui/windows/socialwindow.cpp:242
#, c-format
msgid "Guild %s quit requested."
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:254
+#: src/gui/windows/socialwindow.cpp:256
msgid "Member Invite to Guild"
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:256
+#: src/gui/windows/socialwindow.cpp:258
#, c-format
msgid "Who would you like to invite to guild %s?"
msgstr ""
#. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:266
+#: src/gui/windows/socialwindow.cpp:268
msgid "Leave Guild?"
msgstr ""
#. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:268
+#: src/gui/windows/socialwindow.cpp:270
#, c-format
msgid "Are you sure you want to leave guild %s?"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:279
+#: src/gui/windows/socialwindow.cpp:281
#, c-format
msgid "Members: %u/%u"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:301 src/gui/windows/socialwindow.cpp:373
-#: src/gui/windows/socialwindow.cpp:498
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
#, c-format
msgid "Players: %u/%u"
msgstr ""
#. TRANSLATORS: tab in social window
#. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:389 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
msgid "Party"
msgstr "Grupp"
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:429
+#: src/gui/windows/socialwindow.cpp:431
#, c-format
msgid "Invited user %s to party."
msgstr ""
#. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:444
+#: src/gui/windows/socialwindow.cpp:446
#, c-format
msgid "Party %s quit requested."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:458
+#: src/gui/windows/socialwindow.cpp:460
msgid "Member Invite to Party"
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:460
+#: src/gui/windows/socialwindow.cpp:462
#, c-format
msgid "Who would you like to invite to party %s?"
msgstr ""
#. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:470
+#: src/gui/windows/socialwindow.cpp:472
msgid "Leave Party?"
msgstr ""
#. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:472
+#: src/gui/windows/socialwindow.cpp:474
#, c-format
msgid "Are you sure you want to leave party %s?"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:698
+#: src/gui/windows/socialwindow.cpp:665
#, c-format
msgid "Visible players: %d"
msgstr ""
#. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:725
+#: src/gui/windows/socialwindow.cpp:692
msgid "Nav"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:827
+#: src/gui/windows/socialwindow.cpp:794
#, c-format
msgid "Portals: %u/%u"
msgstr ""
#. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1054
+#: src/gui/windows/socialwindow.cpp:1021
msgid "Atk"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1073
+#: src/gui/windows/socialwindow.cpp:1040
msgid "Priority mobs"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1075
+#: src/gui/windows/socialwindow.cpp:1042
msgid "Attack mobs"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1077
+#: src/gui/windows/socialwindow.cpp:1044
msgid "Ignore mobs"
msgstr ""
#. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1101
+#: src/gui/windows/socialwindow.cpp:1068
msgid "Pik"
msgstr ""
#. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1120
+#: src/gui/windows/socialwindow.cpp:1087
msgid "Pickup items"
msgstr ""
#. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1122
+#: src/gui/windows/socialwindow.cpp:1089
msgid "Ignore items"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1212
+#: src/gui/windows/socialwindow.cpp:1179
#, c-format
msgid "Friends: %u/%u"
msgstr ""
#. TRANSLATORS: party popup item
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1235 src/gui/windows/socialwindow.cpp:1727
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
msgid "Create Party"
msgstr ""
#. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1298
+#: src/gui/windows/socialwindow.cpp:1265
msgid "P"
msgstr ""
#. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1303
+#: src/gui/windows/socialwindow.cpp:1270
msgid "F"
msgstr ""
#. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1309
+#: src/gui/windows/socialwindow.cpp:1276
msgid "Invite"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1503
+#: src/gui/windows/socialwindow.cpp:1470
#, c-format
msgid "Accepted party invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1514
+#: src/gui/windows/socialwindow.cpp:1481
#, c-format
msgid "Rejected party invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1531
+#: src/gui/windows/socialwindow.cpp:1498
#, c-format
msgid "Accepted guild invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1545
+#: src/gui/windows/socialwindow.cpp:1512
#, c-format
msgid "Rejected guild invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1585
+#: src/gui/windows/socialwindow.cpp:1552
#, c-format
msgid "Creating guild called %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1606
+#: src/gui/windows/socialwindow.cpp:1573
#, c-format
msgid "Creating party called %s."
msgstr ""
#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1621
+#: src/gui/windows/socialwindow.cpp:1588
msgid "Guild Name"
msgstr ""
#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1623
+#: src/gui/windows/socialwindow.cpp:1590
msgid "Choose your guild's name."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1639
+#: src/gui/windows/socialwindow.cpp:1606
msgid "Received guild request, but one already exists."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1647
+#: src/gui/windows/socialwindow.cpp:1614
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1654
+#: src/gui/windows/socialwindow.cpp:1621
msgid "Accept Guild Invite"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1670
+#: src/gui/windows/socialwindow.cpp:1637
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/windows/socialwindow.cpp:1682
+#: src/gui/windows/socialwindow.cpp:1649
msgid "You have been invited you to join a party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1687
+#: src/gui/windows/socialwindow.cpp:1654
#, c-format
msgid "You have been invited to join the %s party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1696
+#: src/gui/windows/socialwindow.cpp:1663
#, 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/windows/socialwindow.cpp:1702
+#: src/gui/windows/socialwindow.cpp:1669
#, 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/windows/socialwindow.cpp:1712
+#: src/gui/windows/socialwindow.cpp:1679
msgid "Accept Party Invite"
msgstr "Acceptera gruppinbjudan"
-#: src/gui/windows/socialwindow.cpp:1728
+#: src/gui/windows/socialwindow.cpp:1695
msgid "Cannot create party. You are already in a party"
msgstr ""
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1734
+#: src/gui/windows/socialwindow.cpp:1701
msgid "Party Name"
msgstr ""
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1736
+#: src/gui/windows/socialwindow.cpp:1703
msgid "Choose your party's name."
msgstr ""
@@ -6401,113 +6436,68 @@ msgstr ""
msgid "Correction points: %d"
msgstr ""
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "No Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Allow Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:105
-msgid "Need Target"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "General Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "Life Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "War Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Transmute Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Nature Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:121
-msgid "Astral Magic"
-msgstr ""
-
#. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:164
+#: src/gui/windows/textcommandeditor.cpp:47
msgid "Command Editor"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:52
msgid "magic"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:54
msgid "other"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:173
+#: src/gui/windows/textcommandeditor.cpp:56
msgid "Symbol:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:176
+#: src/gui/windows/textcommandeditor.cpp:59
msgid "Command:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:179
+#: src/gui/windows/textcommandeditor.cpp:62
msgid "Comment:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:183
+#: src/gui/windows/textcommandeditor.cpp:66
msgid "Target Type:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:187
+#: src/gui/windows/textcommandeditor.cpp:70
msgid "Icon:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:190
+#: src/gui/windows/textcommandeditor.cpp:73
msgid "Mana:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:193
+#: src/gui/windows/textcommandeditor.cpp:76
msgid "Magic level:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:197
+#: src/gui/windows/textcommandeditor.cpp:80
msgid "Magic School:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:200
+#: src/gui/windows/textcommandeditor.cpp:83
msgid "School level:"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/windows/textcommandeditor.cpp:88
msgid "Save"
msgstr ""
@@ -6537,7 +6527,7 @@ msgid "Trade: You"
msgstr "Byteshandel: du"
#. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
#, c-format
msgid "You get %s"
msgstr ""
@@ -6553,12 +6543,12 @@ msgid "You give:"
msgstr "Du ger:"
#. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
msgid "You don't have enough money."
msgstr "Du har inte tillräckligt med pengar."
#. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
msgid ""
"Failed adding item. You can not overlap one kind of item on the window."
msgstr "Kan inte lägga till vald sak. Det går inte att byteshandla med samma slags sak flera gånger."
@@ -6629,17 +6619,17 @@ msgid "Who Is Online - Update"
msgstr ""
#. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:87
+#: src/gui/windows/worldselectdialog.cpp:49
msgid "Select World"
msgstr ""
#. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:93
+#: src/gui/windows/worldselectdialog.cpp:55
msgid "Change Login"
msgstr ""
#. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:95
+#: src/gui/windows/worldselectdialog.cpp:57
msgid "Choose World"
msgstr ""
@@ -6857,7 +6847,7 @@ msgid "Failed to create character. Most likely the name is already taken."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:281
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
msgid "Wrong name."
msgstr ""
@@ -7015,58 +7005,58 @@ msgid "Experience sharing unknown."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:154
+#: src/net/ea/loginhandler.cpp:149
msgid "Account was not found. Please re-login."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/ea/loginhandler.cpp:153
msgid "Old password incorrect."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:162
+#: src/net/ea/loginhandler.cpp:157
msgid "New password too short."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:166 src/net/ea/loginhandler.cpp:293
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
msgid "Unknown error."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:239
+#: src/net/ea/loginhandler.cpp:234
msgid "Unregistered ID."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:238
msgid "Wrong password."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:248
+#: src/net/ea/loginhandler.cpp:243
msgid "Account expired."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:252
+#: src/net/ea/loginhandler.cpp:247
msgid "Rejected from server."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:256
+#: src/net/ea/loginhandler.cpp:251
msgid ""
"You have been permanently banned from the game. Please contact the GM team."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:261
+#: src/net/ea/loginhandler.cpp:256
msgid "Client too old."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:265
+#: src/net/ea/loginhandler.cpp:260
#, c-format
msgid ""
"You have been temporarily banned from the game until %s.\n"
@@ -7074,22 +7064,22 @@ msgid ""
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:273
+#: src/net/ea/loginhandler.cpp:268
msgid "Server overpopulated."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:277
+#: src/net/ea/loginhandler.cpp:272
msgid "This user name is already taken."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:285
+#: src/net/ea/loginhandler.cpp:280
msgid "Incorrect email."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:289
+#: src/net/ea/loginhandler.cpp:284
msgid "Username permanently erased."
msgstr ""
@@ -7762,7 +7752,7 @@ msgstr ""
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
#: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "namnlös"
diff --git a/po/sv_SE.po b/po/sv_SE.po
index ef48348ab..63ad53095 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-02-23 00:42+0300\n"
-"PO-Revision-Date: 2014-02-23 08:14+0000\n"
+"POT-Creation-Date: 2014-02-28 21:21+0300\n"
+"PO-Revision-Date: 2014-03-01 08:14+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"
@@ -29,7 +29,7 @@ msgid "Accepting incoming trade requests"
msgstr "Acceptera inkommande bytes-förfrågningar"
#. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
msgid "Visible on map"
msgstr "Synlig på karta"
@@ -38,68 +38,68 @@ msgstr "Synlig på karta"
msgid "Human"
msgstr "Människa"
-#: src/being/being.cpp:544
+#: src/being/being.cpp:496
msgid "dodge"
msgstr "undvika"
-#: src/being/being.cpp:544
+#: src/being/being.cpp:496
msgid "miss"
msgstr "missa"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1965 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1970 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr "I"
#. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:392
+#: src/being/localplayer.cpp:376
#, c-format
msgid "You were killed by %s"
msgstr "Du blev dödad av herr %s"
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1377
+#: src/being/localplayer.cpp:816
msgid "Tried to pick up nonexistent item."
msgstr "Försökte plocka upp icke existerande item."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1381
+#: src/being/localplayer.cpp:820
msgid "Item is too heavy."
msgstr "Item är för tung."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1385
+#: src/being/localplayer.cpp:824
msgid "Item is too far away."
msgstr "Item:en är för långt bort."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1389
+#: src/being/localplayer.cpp:828
msgid "Inventory is full."
msgstr "Inventory är fullt."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1393
+#: src/being/localplayer.cpp:832
msgid "Stack is too big."
msgstr "Stack är för stor."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1397
+#: src/being/localplayer.cpp:836
msgid "Item belongs to someone else."
msgstr "Item:et tillhör någon annan."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1401
+#: src/being/localplayer.cpp:840
msgid "Unknown problem picking up item."
msgstr "Okänt fel vid upplockning av item."
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:1425
+#: src/being/localplayer.cpp:864
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -107,387 +107,387 @@ msgstr[0] "Du plockade upp %d [@@%d|%s@@]."
msgstr[1] "You picked up %d [@@%d|%s@@]."
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1630 src/being/localplayer.cpp:1665
-#: src/being/localplayer.cpp:1666
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
msgid "xp"
msgstr "xp"
-#: src/being/localplayer.cpp:1671 src/being/localplayer.cpp:1678
-#: src/being/localplayer.cpp:1685
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
msgid "job"
msgstr "jobb"
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1871
+#: src/being/localplayer.cpp:1285
msgid "(D) default moves"
msgstr "(D) standardrörelse"
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1873
+#: src/being/localplayer.cpp:1287
msgid "(I) invert moves"
msgstr "(I) invertera rörelse"
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1875
+#: src/being/localplayer.cpp:1289
msgid "(c) moves with some crazy moves"
msgstr "(c) rör sig med några crazy moves"
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1877
+#: src/being/localplayer.cpp:1291
msgid "(C) moves with crazy moves"
msgstr "(C) rör sig med crazy moves"
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1879
+#: src/being/localplayer.cpp:1293
msgid "(d) double normal + crazy"
msgstr "(d) dubbel normal + crazy"
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1881
+#: src/being/localplayer.cpp:1295
msgid "(?) unknown move"
msgstr "(?) okänt move"
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1904
+#: src/being/localplayer.cpp:1318
#, c-format
msgid "(%u) crazy move number %u"
msgstr "(%u) crazy move nummer %u"
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1910
+#: src/being/localplayer.cpp:1324
msgid "(a) custom crazy move"
msgstr "(a) standard crazy move"
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1915
+#: src/being/localplayer.cpp:1329
msgid "(?) crazy move"
msgstr "(?) crazy move"
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1930
+#: src/being/localplayer.cpp:1344
msgid "(0) default moves to target"
msgstr "(0) standardrörelse mot target"
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1932
+#: src/being/localplayer.cpp:1346
msgid "(1) moves to target in distance 1"
msgstr "(1) närmar sig target med distans 1"
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1934
+#: src/being/localplayer.cpp:1348
msgid "(2) moves to target in distance 2"
msgstr "(2) närmar sig target med distance 2"
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1936
+#: src/being/localplayer.cpp:1350
msgid "(3) moves to target in distance 3"
msgstr " (3) närmar sig target med distans 3"
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1938
+#: src/being/localplayer.cpp:1352
msgid "(5) moves to target in distance 5"
msgstr " (5) närmar sig target med distans 5"
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1940
+#: src/being/localplayer.cpp:1354
msgid "(7) moves to target in distance 7"
msgstr " (7) närmar sig target med distans 7"
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1942
+#: src/being/localplayer.cpp:1356
msgid "(A) moves to target in attack range"
msgstr " (A) närmar sig target till attack range"
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1944
+#: src/being/localplayer.cpp:1358
msgid "(a) archer attack range"
msgstr "(a) archer attack-range"
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1946
+#: src/being/localplayer.cpp:1360
msgid "(B) moves to target in attack range - 1"
msgstr "(B) flyttar till target för attack-range - 1"
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1948
+#: src/being/localplayer.cpp:1362
msgid "(?) move to target"
msgstr "(?) förflyttar sig till target"
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1968
+#: src/being/localplayer.cpp:1382
msgid "(D) default follow"
msgstr "(D) standard follow"
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1970
+#: src/being/localplayer.cpp:1384
msgid "(R) relative follow"
msgstr "(R) relativ follow"
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1972
+#: src/being/localplayer.cpp:1386
msgid "(M) mirror follow"
msgstr "(M) härma follow"
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1974
+#: src/being/localplayer.cpp:1388
msgid "(P) pet follow"
msgstr "(P) pet follow"
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1976
+#: src/being/localplayer.cpp:1390
msgid "(?) unknown follow"
msgstr "(?) okänd follow"
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1996 src/being/localplayer.cpp:2004
-#: src/being/localplayer.cpp:2032
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
msgid "(?) attack"
msgstr "(?) attack"
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1998 src/being/localplayer.cpp:2024
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
msgid "(D) default attack"
msgstr "(D) standardattack"
#. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2000
+#: src/being/localplayer.cpp:1414
msgid "(s) switch attack without shield"
msgstr "(s) växla attack utan shield"
#. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2002
+#: src/being/localplayer.cpp:1416
msgid "(S) switch attack with shield"
msgstr "(S) växla attack med shield"
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2026
+#: src/being/localplayer.cpp:1440
msgid "(G) go and attack"
msgstr "(G) gå och attackera"
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2028
+#: src/being/localplayer.cpp:1442
msgid "(A) go, attack, pickup"
msgstr "(A) gå, attackera, pickup"
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2030
+#: src/being/localplayer.cpp:1444
msgid "(d) without auto attack"
msgstr "(d) utan automatisk attack"
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2084
+#: src/being/localplayer.cpp:1498
msgid "(S) small pick up 1x1 cells"
msgstr "(S) liten pick up 1x1 cells"
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2086
+#: src/being/localplayer.cpp:1500
msgid "(D) default pick up 2x1 cells"
msgstr "(D) standard pick up 2x1 cells"
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2088
+#: src/being/localplayer.cpp:1502
msgid "(F) forward pick up 2x3 cells"
msgstr "(F) framåt pick up 2x3 cells"
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2090
+#: src/being/localplayer.cpp:1504
msgid "(3) pick up 3x3 cells"
msgstr "(3) pick up 3x3 cells"
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2092
+#: src/being/localplayer.cpp:1506
msgid "(g) go and pick up in distance 4"
msgstr "(g) gå och pick up med distans 4"
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2094
+#: src/being/localplayer.cpp:1508
msgid "(G) go and pick up in distance 8"
msgstr "(G) gå och pick up med distans 8"
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2096
+#: src/being/localplayer.cpp:1510
msgid "(A) go and pick up in max distance"
msgstr "(A) gå och pick up med maximal distans"
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2098
+#: src/being/localplayer.cpp:1512
msgid "(?) pick up"
msgstr "(?) pick up"
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2112
+#: src/being/localplayer.cpp:1526
msgid "(N) normal map view"
msgstr "(N) normal kartvy"
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2114
+#: src/being/localplayer.cpp:1528
msgid "(D) debug map view"
msgstr "(D) debug kartvy"
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2116
+#: src/being/localplayer.cpp:1530
msgid "(u) ultra map view"
msgstr "(u) ultra-kartvy"
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2118
+#: src/being/localplayer.cpp:1532
msgid "(U) ultra map view 2"
msgstr "(U) ultra-kartvy 2"
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2120
+#: src/being/localplayer.cpp:1534
msgid "(e) empty map view"
msgstr "(e) tom kartvy"
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2122
+#: src/being/localplayer.cpp:1536
msgid "(b) black & white map view"
msgstr "(b) svartvit kartvy"
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2142
+#: src/being/localplayer.cpp:1556
msgid "(f) use #flar for magic attack"
msgstr "(f) använd #flar för magic attack"
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2144
+#: src/being/localplayer.cpp:1558
msgid "(c) use #chiza for magic attack"
msgstr "(c) använd #chiza för magic attack"
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2146
+#: src/being/localplayer.cpp:1560
msgid "(I) use #ingrav for magic attack"
msgstr "(I) använd #ingrav för magic attack"
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2148
+#: src/being/localplayer.cpp:1562
msgid "(F) use #frillyar for magic attack"
msgstr "(F) använd #frillyar för magic attack"
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2150
+#: src/being/localplayer.cpp:1564
msgid "(U) use #upmarmu for magic attack"
msgstr "(U) använd #upmarmu för magic attack"
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2152
+#: src/being/localplayer.cpp:1566
msgid "(?) magic attack"
msgstr "(?) magic attack"
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2172
+#: src/being/localplayer.cpp:1586
msgid "(a) attack all players"
msgstr "(a) attackera alla spelare"
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2174
+#: src/being/localplayer.cpp:1588
msgid "(f) attack all except friends"
msgstr "(f) attackera alla utom dina friends"
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2176
+#: src/being/localplayer.cpp:1590
msgid "(b) attack bad relations"
msgstr "(b) attackera dåliga relationer"
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2178
+#: src/being/localplayer.cpp:1592
msgid "(d) don't attack players"
msgstr "(d) attackera inte spelare"
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2180
+#: src/being/localplayer.cpp:1594
msgid "(?) pvp attack"
msgstr "(?) pvp-attack"
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2200
+#: src/being/localplayer.cpp:1614
msgid "(D) default imitation"
msgstr "(D) Standardimitation"
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2202
+#: src/being/localplayer.cpp:1616
msgid "(O) outfits imitation"
msgstr "(O) klädselimitation"
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2204
+#: src/being/localplayer.cpp:1618
msgid "(?) imitation"
msgstr "(?) imitation"
#. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2233
+#: src/being/localplayer.cpp:1647
msgid "Away"
msgstr "Iväg"
#. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2256
+#: src/being/localplayer.cpp:1670
msgid "(O) on keyboard"
msgstr "(O) på tangentbord"
#. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2258
+#: src/being/localplayer.cpp:1672
msgid "(A) away"
msgstr "(A) away"
#. TRANSLATORS: away type in status bar
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2260 src/being/localplayer.cpp:2278
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
msgid "(?) away"
msgstr "(?) away"
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2274
+#: src/being/localplayer.cpp:1688
msgid "(G) game camera mode"
msgstr "(G) spelkamera-läge"
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2276
+#: src/being/localplayer.cpp:1690
msgid "(F) free camera mode"
msgstr "(F) fritt kamera-läge"
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2303
+#: src/being/localplayer.cpp:1717
msgid "Game modifiers are enabled"
msgstr "Game modifiers är aktiverade"
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2305
+#: src/being/localplayer.cpp:1719
msgid "Game modifiers are disabled"
msgstr "Game modifiers är inaktiverade"
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2307
+#: src/being/localplayer.cpp:1721
msgid "Game modifiers are unknown"
msgstr "Game modifiers är okända"
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3887
+#: src/being/localplayer.cpp:3287
#, c-format
msgid "Follow: %s"
msgstr "Follow: %s"
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3893 src/being/localplayer.cpp:3918
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
msgid "Follow canceled"
msgstr "Follow avbruten"
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3903
+#: src/being/localplayer.cpp:3303
#, c-format
msgid "Imitation: %s"
msgstr "Imitation: %s"
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3909 src/being/localplayer.cpp:3923
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
msgid "Imitation canceled"
msgstr "Imitation avbruten"
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4266
+#: src/being/localplayer.cpp:3666
#, c-format
msgid "You see %s"
msgstr "Du ser %s"
@@ -525,32 +525,32 @@ msgstr "Floating bubble"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1139 src/gui/windowmenu.cpp:167
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
#: src/gui/windows/setupwindow.cpp:61
msgid "Setup"
msgstr "Inställningar"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1143 src/gui/widgets/tabs/setup_perfomance.cpp:51
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1146 src/gui/widgets/tabs/setup_video.cpp:225
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:225
msgid "Video"
msgstr "Video"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1149 src/gui/widgets/tabs/setup_theme.cpp:269
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
msgid "Theme"
msgstr "Tema"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1152 src/gui/windowmenu.cpp:74
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr "Hjälp"
@@ -563,41 +563,41 @@ msgstr "Hjälp"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1156 src/gui/popups/popupmenu.cpp:619
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
#: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:69
-#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:138
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
#: src/gui/windows/shopwindow.cpp:78
msgid "Close"
msgstr "Stäng"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr "Ansluter till server"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1324
msgid "Logging in"
msgstr "Loggar in"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1367
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr "Går in i spelvärld"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1492
+#: src/client.cpp:1489
msgid "Requesting characters"
msgstr "Begär karaktärer"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1532
+#: src/client.cpp:1529
msgid "Connecting to the game server"
msgstr "Ansluter till spelservern"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1545
+#: src/client.cpp:1541
msgid "Changing game servers"
msgstr "Ändrar spelserver"
@@ -612,12 +612,12 @@ msgstr "Ändrar spelserver"
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1606 src/client.cpp:1617 src/client.cpp:1801
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:349
#: src/gui/windows/charselectdialog.cpp:299
-#: src/gui/windows/editserverdialog.cpp:218
+#: src/gui/windows/editserverdialog.cpp:186
#: src/gui/windows/registerdialog.cpp:260
#: src/gui/windows/unregisterdialog.cpp:146
#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
@@ -625,65 +625,65 @@ msgid "Error"
msgstr "Error"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1629
+#: src/client.cpp:1625
msgid "Requesting registration details"
msgstr "Begär registreringsuppgifter"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1670
+#: src/client.cpp:1666
msgid "Password Change"
msgstr "Lösenordsändring"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1672
+#: src/client.cpp:1668
msgid "Password changed successfully!"
msgstr "Lösenordsändring har lyckats!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1694
+#: src/client.cpp:1690
msgid "Email Change"
msgstr "Byte av E-post"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1696
+#: src/client.cpp:1692
msgid "Email changed successfully!"
msgstr "E-posten har ändrats!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1719
+#: src/client.cpp:1715
msgid "Unregister Successful"
msgstr "Avregistrering lyckad"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1721
+#: src/client.cpp:1717
msgid "Farewell, come back any time..."
msgstr "Farväl, kom gärna tillbaka snart igen..."
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1998 src/client.cpp:2013 src/client.cpp:2058
-#: src/client.cpp:2074 src/client.cpp:2525 src/client.cpp:2533
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s existerar inte och kan inte bli skapat! Avslutar."
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2230
+#: src/client.cpp:2232
#, c-format
msgid "Invalid update host: %s."
msgstr "Felaktig uppdaterings-host: %s."
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2271 src/client.cpp:2278
+#: src/client.cpp:2273 src/client.cpp:2280
msgid "Error creating updates directory!"
msgstr "Error uppstod då uppdateringskatalog skulle skapas!"
-#: src/client.cpp:2300 src/client.cpp:2317
+#: src/client.cpp:2302 src/client.cpp:2319
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Error: %s existerar inte och kan inte bli skapat! Avslutar."
#. TRANSLATORS: error message question
-#: src/client.cpp:3001
+#: src/client.cpp:3003
msgid "Do you want to open support page?"
msgstr "Vill du öppna support-sidan?"
@@ -929,99 +929,154 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:277 src/gui/widgets/tabs/chattab.cpp:464
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
msgid "General"
msgstr "General"
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:293 src/gui/widgets/tabs/chattab.cpp:466
-#: src/gui/windowmenu.cpp:154 src/gui/windows/debugwindow.cpp:53
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
msgid "Debug"
msgstr "Debug"
#. TRANSLATORS: save file message
-#: src/game.cpp:575
+#: src/game.cpp:563
#, c-format
msgid "Screenshot saved as %s"
msgstr "Skärmdump sparades som %s"
#. TRANSLATORS: save file message
-#: src/game.cpp:585
+#: src/game.cpp:573
msgid "Saving screenshot failed!"
msgstr "Spara skärmdump misslyckades!"
#. TRANSLATORS: error message text
-#: src/game.cpp:656
+#: src/game.cpp:644
msgid "The connection to the server was lost."
msgstr "Anslutningen till servern förlorades."
#. TRANSLATORS: error message header
-#: src/game.cpp:659
+#: src/game.cpp:647
msgid "Network Error"
msgstr "Nätverksfel"
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
+msgstr "standard"
+
+#. TRANSLATORS: chat color
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
msgid "black"
msgstr "svart"
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
msgid "red"
msgstr "röd"
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
msgid "green"
msgstr "grön"
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
msgid "blue"
msgstr "blå"
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
msgid "gold"
msgstr "guld"
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
msgid "yellow"
msgstr "gul"
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
msgid "pink"
msgstr "rosa"
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
msgid "purple"
msgstr "lila"
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
msgid "grey"
msgstr "grå"
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
msgid "brown"
msgstr "brun"
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr "regnbåge 1"
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr "regnbåge 2"
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr "regnbåge 3"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr "General Magic"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr "Life Magic"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr "War Magic"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr "Transmute Magic"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr "Nature Magic"
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr "Astral Magic"
+
#. TRANSLATORS: relation type
#: src/gui/models/playerrelationlistmodel.h:33
msgid "Neutral"
@@ -1057,46 +1112,61 @@ msgstr "Blacklistad"
msgid "Enemy"
msgstr "Enemy"
-#. TRANSLATORS: inventory sort mode
-#. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#: src/gui/models/sortlistmodelinv.h:34
-#: src/gui/widgets/tabs/setup_other.cpp:72
-#: src/gui/widgets/tabs/setup_visual.cpp:78 src/gui/windows/chatwindow.cpp:150
-msgid "default"
-msgstr "standard"
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
+msgstr "osorterad"
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:36 src/gui/windows/buydialog.cpp:62
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
+msgstr "efter pris"
+
+#. TRANSLATORS: buy dialog sort type.
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
msgid "by name"
msgstr "efter namn"
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:38 src/gui/windows/buydialog.cpp:64
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
msgid "by id"
msgstr "efter id"
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:40 src/gui/windows/buydialog.cpp:66
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
msgid "by weight"
msgstr "efter vikt"
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:42 src/gui/windows/buydialog.cpp:68
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
msgid "by amount"
msgstr "efter antal"
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:44 src/gui/windows/buydialog.cpp:70
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
msgid "by type"
msgstr "efter typ"
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr "Ingen Target"
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr "Tillåt Target"
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr "Behöver Target"
+
#. TRANSLATORS: update type
#. TRANSLATORS: onscreen button size
#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
@@ -1243,8 +1313,8 @@ msgstr "Prata med"
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
-#: src/gui/windows/buydialog.cpp:208 src/gui/windows/buydialog.cpp:220
-#: src/gui/windows/buydialog.cpp:274 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
msgid "Buy"
msgstr "Köp"
@@ -1341,12 +1411,12 @@ msgstr "Lägg till namnet i chat"
#: src/gui/windows/changepassworddialog.cpp:57
#: src/gui/windows/charcreatedialog.cpp:121
#: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:79
-#: src/gui/windows/itemamountwindow.cpp:163
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
-#: src/gui/windows/socialwindow.cpp:1238
-#: src/gui/windows/textcommandeditor.cpp:203 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:54
#: src/gui/windows/updaterwindow.cpp:186
msgid "Cancel"
@@ -1418,7 +1488,7 @@ msgstr "Rör kamera"
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:150 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
msgstr "Utstyrsel"
@@ -1431,7 +1501,7 @@ msgstr "Rensa klädsel"
#. TRANSLATORS: popup menu header
#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:134
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
msgid "Spells"
msgstr "Spells"
@@ -1487,7 +1557,7 @@ msgstr "Avaktivera away"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
#. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1311
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
msgid "Leave"
msgstr "Lämna"
@@ -1568,8 +1638,8 @@ msgstr "Lägg till alla för trade"
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
-#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:223
-#: src/gui/windows/inventorywindow.cpp:745 src/gui/windows/setupwindow.cpp:96
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
msgid "Store"
msgstr "Lagra"
@@ -1600,7 +1670,7 @@ msgstr "Lagra alla"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
msgid "Retrieve"
msgstr "Ta emot"
@@ -1633,8 +1703,8 @@ msgstr "Hämta ut alla"
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
-#: src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:656 src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr "Använd"
@@ -1668,8 +1738,8 @@ msgstr "Kopiera till chat"
#. TRANSLATORS: popup menu header
#. TRANSLATORS: language
#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/widgets/tabs/setup_theme.cpp:127
-#: src/gui/windows/socialwindow.cpp:1003
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
msgid "(default)"
msgstr "(standard)"
@@ -1825,8 +1895,8 @@ msgstr "Skydda item"
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:645
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
msgid "Unequip"
msgstr "Unequip"
@@ -1834,16 +1904,16 @@ msgstr "Unequip"
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:172
-#: src/gui/windows/inventorywindow.cpp:650 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr "Equip"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:189
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
msgid "Drop..."
msgstr "Släng..."
@@ -1857,15 +1927,15 @@ msgstr "Släng allt"
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:138
-#: src/gui/windows/inventorywindow.cpp:758
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
msgid "Drop"
msgstr "Släng"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
msgid "Split"
msgstr "Dela"
@@ -2021,10 +2091,10 @@ msgstr "Välj OK"
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:276
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/windows/serverdialog.cpp:198
msgid "Quit"
msgstr "Avsluta"
@@ -2586,7 +2656,7 @@ msgstr ""
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: register dialog. button.
#: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:146
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:330
#: src/gui/widgets/tabs/setup_visual.cpp:189
@@ -2613,9 +2683,8 @@ msgstr ""
#. TRANSLATORS: command editor button
#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
#: src/gui/windows/charselectdialog.cpp:108
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:94
-#: src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/textcommandeditor.cpp:207
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
msgid "Delete"
msgstr "Radera"
@@ -2651,7 +2720,7 @@ msgstr "Enkel"
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:130
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
msgid "Shortcuts"
msgstr "Genvägar"
@@ -2659,7 +2728,7 @@ msgstr "Genvägar"
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:151
msgid "Windows"
msgstr "Fönster"
@@ -2675,7 +2744,7 @@ msgstr "Emotes"
#. TRANSLATORS: settings tab name
#. TRANSLATORS: chat window name
#: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:88 src/gui/windows/chatwindow.cpp:203
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
msgid "Chat"
msgstr "Chat"
@@ -2898,7 +2967,7 @@ msgstr "Level: %u"
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:137
-#: src/gui/windows/inventorywindow.cpp:569
+#: src/gui/windows/inventorywindow.cpp:568
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
#, c-format
@@ -2918,7 +2987,7 @@ msgstr "Öppna url"
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/windows/serverdialog.cpp:204
msgid "Edit"
msgstr "Ändra"
@@ -2971,7 +3040,7 @@ msgstr "GM"
#. TRANSLATORS: tab in social window
#. TRANSLATORS: guild chat tab name
#: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:184 src/gui/windows/socialwindow.cpp:320
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
#: src/net/ea/gui/guildtab.cpp:44
msgid "Guild"
msgstr "Guild"
@@ -2982,142 +3051,142 @@ msgid "Lang"
msgstr "Lang"
#. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:49
+#: src/gui/widgets/tabs/setup_audio.cpp:48
msgid "Audio"
msgstr "Ljud"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:57
+#: src/gui/widgets/tabs/setup_audio.cpp:56
msgid "Basic settings"
msgstr "Enkla inställningar"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:60
+#: src/gui/widgets/tabs/setup_audio.cpp:59
msgid "Enable Audio"
msgstr "Aktivera Ljud"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:63
+#: src/gui/widgets/tabs/setup_audio.cpp:62
msgid "Enable music"
msgstr "Aktivera musik"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:67
+#: src/gui/widgets/tabs/setup_audio.cpp:66
msgid "Enable game sfx"
msgstr "Aktivera spel-sfx"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:71
+#: src/gui/widgets/tabs/setup_audio.cpp:70
msgid "Enable gui sfx"
msgstr "Aktivera grafiskt användargränssnitts-sfx"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:74
msgid "Sfx volume"
msgstr "Sfx volym"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:78
msgid "Music volume"
msgstr "Musik-volym"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:82
msgid "Enable music fade out"
msgstr "Aktivera fade-ut för musik"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:86
msgid "Audio frequency"
msgstr "Ljudfrekvens"
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:90
msgid "mono"
msgstr "mono"
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:93
+#: src/gui/widgets/tabs/setup_audio.cpp:92
msgid "stereo"
msgstr "stereo"
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:94
msgid "surround"
msgstr "surround"
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:97
+#: src/gui/widgets/tabs/setup_audio.cpp:96
msgid "surround+center+lfe"
msgstr "surround+center+lfe"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:98
msgid "Audio channels"
msgstr "Ljudkanaler"
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:104
+#: src/gui/widgets/tabs/setup_audio.cpp:103
msgid "Sound effects"
msgstr "Ljudeffekter"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:106
msgid "Information dialog sound"
msgstr "Informationsdialog-ljud"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:110
msgid "Request dialog sound"
msgstr "Förfrågningsdialogs-ljud"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:115
+#: src/gui/widgets/tabs/setup_audio.cpp:114
msgid "Whisper message sound"
msgstr "Viskningsmeddelande-ljud"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:118
msgid "Guild / Party message sound"
msgstr "Guild / Party-meddelande-ljud"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:122
msgid "Highlight message sound"
msgstr "Highlight-meddelande-ljud"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:126
msgid "Global message sound"
msgstr "Globalmeddelande-ljud"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:130
msgid "Error message sound"
msgstr "Felmeddelande-ljud"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:134
msgid "Trade request sound"
msgstr "Trade-förfrågnings-ljud"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:138
msgid "Show window sound"
msgstr "Ljud för visa fönster"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:142
msgid "Hide window sound"
msgstr "Ljud för dölj fönster"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:150
msgid "Enable mumble voice chat"
msgstr "Aktivera mumble röst chat"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:156
+#: src/gui/widgets/tabs/setup_audio.cpp:155
msgid "Download music"
msgstr "Ladda hem musik"
@@ -3413,7 +3482,7 @@ msgstr "Konflikt mellan knapparna \"%s\" och \"%s\". Om detta inte löses kan sp
#. TRANSLATORS: unknown key name
#. TRANSLATORS: quests window quest name
#: src/gui/widgets/tabs/setup_input.cpp:364
-#: src/gui/windows/questswindow.cpp:263
+#: src/gui/windows/questswindow.cpp:249
msgid "unknown"
msgstr "okänd"
@@ -3572,7 +3641,7 @@ msgstr "Cycle monsters targets"
#. TRANSLATORS: settings group
#. TRANSLATORS: debug window tab
#. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:105
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
#: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
#: src/gui/windows/minimap.cpp:114
msgid "Map"
@@ -3740,9 +3809,9 @@ msgstr "Aktivera vikt-notationer"
#. TRANSLATORS: full button name
#. TRANSLATORS: shop window name
#. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:146
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
#: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windows/inventorywindow.cpp:194
msgid "Shop"
msgstr "Shop"
@@ -4124,252 +4193,252 @@ msgid "When ignoring:"
msgstr "Vid ignorering:"
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:64
+#: src/gui/widgets/tabs/setup_theme.cpp:63
msgid "Very small (8)"
msgstr "Väldigt liten (8)"
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:66
+#: src/gui/widgets/tabs/setup_theme.cpp:65
msgid "Very small (9)"
msgstr "Väldigt liten (9)"
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:68
+#: src/gui/widgets/tabs/setup_theme.cpp:67
msgid "Tiny (10)"
msgstr "Pytte (10)"
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:70
+#: src/gui/widgets/tabs/setup_theme.cpp:69
msgid "Small (11)"
msgstr "Liten (11)"
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:72
+#: src/gui/widgets/tabs/setup_theme.cpp:71
msgid "Medium (12)"
msgstr "Medium (12)"
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:74
+#: src/gui/widgets/tabs/setup_theme.cpp:73
msgid "Normal (13)"
msgstr "Normal (13)"
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:76
+#: src/gui/widgets/tabs/setup_theme.cpp:75
msgid "Large (14)"
msgstr "Stor (14)"
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:78
+#: src/gui/widgets/tabs/setup_theme.cpp:77
msgid "Large (15)"
msgstr "Rätt stor (15)"
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:80
+#: src/gui/widgets/tabs/setup_theme.cpp:79
msgid "Large (16)"
msgstr "Rätt stor (16)"
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:82
+#: src/gui/widgets/tabs/setup_theme.cpp:81
msgid "Big (17)"
msgstr "Stor (17)"
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:83
msgid "Big (18)"
msgstr "Stor (18)"
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:85
msgid "Big (19)"
msgstr "Stor (19)"
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:87
msgid "Very big (20)"
msgstr "Väldigt stor (20)"
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:89
msgid "Very big (21)"
msgstr "Väldigt stor (21)"
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:91
msgid "Very big (22)"
msgstr "Väldigt stor (22)"
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:93
msgid "Huge (23)"
msgstr "Skitstor (23)"
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:129
+#: src/gui/widgets/tabs/setup_theme.cpp:128
msgid "Chinese (China)"
msgstr "Kinesiska (Du vet Kina)"
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:131
+#: src/gui/widgets/tabs/setup_theme.cpp:130
msgid "Czech"
msgstr "Tjeckiska"
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:133
+#: src/gui/widgets/tabs/setup_theme.cpp:132
msgid "English"
msgstr "Engelska"
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:135
+#: src/gui/widgets/tabs/setup_theme.cpp:134
msgid "Finnish"
msgstr "Finska"
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:137
+#: src/gui/widgets/tabs/setup_theme.cpp:136
msgid "French"
msgstr "Franska"
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:139
+#: src/gui/widgets/tabs/setup_theme.cpp:138
msgid "German"
msgstr "Tyska"
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:141
+#: src/gui/widgets/tabs/setup_theme.cpp:140
msgid "Indonesian"
msgstr "Indonesiska"
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:143
+#: src/gui/widgets/tabs/setup_theme.cpp:142
msgid "Italian"
msgstr "Italienska"
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:145
+#: src/gui/widgets/tabs/setup_theme.cpp:144
msgid "Polish"
msgstr "Polska"
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:147
+#: src/gui/widgets/tabs/setup_theme.cpp:146
msgid "Japanese"
msgstr "Japanska"
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:148
msgid "Dutch (Belgium/Flemish)"
msgstr "Nederländska (Belgien / Flandern)"
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:150
msgid "Portuguese"
msgstr "Portugisiska"
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:152
msgid "Portuguese (Brazilian)"
msgstr "Portugisiska (brasilianska)"
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:154
msgid "Russian"
msgstr "Ryska"
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:156
msgid "Spanish (Castilian)"
msgstr "Spanska (Castilian)"
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:158
msgid "Turkish"
msgstr "Turkiska"
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:211
+#: src/gui/widgets/tabs/setup_theme.cpp:210
msgid "Gui theme"
msgstr "Gui-tema"
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:218
+#: src/gui/widgets/tabs/setup_theme.cpp:217
msgid "Main Font"
msgstr "Main Font"
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:223
+#: src/gui/widgets/tabs/setup_theme.cpp:222
msgid "Language"
msgstr "Språk"
#. TRANSLATORS: theme settings label
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:227 src/gui/windows/emotewindow.cpp:45
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
msgid "Bold font"
msgstr "Bold font"
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:230
msgid "Particle font"
msgstr "Partikel-font"
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:235
+#: src/gui/widgets/tabs/setup_theme.cpp:234
msgid "Help font"
msgstr "Hjälp-font"
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:239
+#: src/gui/widgets/tabs/setup_theme.cpp:238
msgid "Secure font"
msgstr "Säkra font"
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:242
msgid "Npc font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:247
+#: src/gui/widgets/tabs/setup_theme.cpp:246
msgid "Japanese font"
msgstr "Japansk font"
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:250
msgid "Chinese font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:256
+#: src/gui/widgets/tabs/setup_theme.cpp:255
msgid "Font size"
msgstr "Font-storlek"
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:261
+#: src/gui/widgets/tabs/setup_theme.cpp:260
msgid "Npc font size"
msgstr "NPC font-storlek"
#. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:265
+#: src/gui/widgets/tabs/setup_theme.cpp:264
msgid "i"
msgstr "i"
#. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:404
+#: src/gui/widgets/tabs/setup_theme.cpp:403
msgid "Name: "
msgstr "Namn:"
-#: src/gui/widgets/tabs/setup_theme.cpp:405
+#: src/gui/widgets/tabs/setup_theme.cpp:404
msgid "Copyright:"
msgstr "Copyright:"
#. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:470
+#: src/gui/widgets/tabs/setup_theme.cpp:469
msgid "Theme info"
msgstr "Temainformation"
#. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:497
+#: src/gui/widgets/tabs/setup_theme.cpp:496
msgid "Theme Changed"
msgstr "Tema ändrat"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:497
+#: src/gui/widgets/tabs/setup_theme.cpp:496
#: src/gui/widgets/tabs/setup_video.cpp:499
#: src/gui/widgets/tabs/setup_video.cpp:508
msgid "Restart your client for the change to take effect."
@@ -4700,178 +4769,169 @@ msgid "Allow screensaver to run"
msgstr "Tillåt skärmsläckare att starta"
#. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:67
msgid "ONL"
msgstr "ONL"
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:68
msgid "Who is online"
msgstr "Vem är online"
#. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:70
msgid "HLP"
msgstr "HLP"
#. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:73
msgid "QE"
msgstr "QE"
#. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:77 src/gui/windows/questswindow.cpp:126
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
msgid "Quests"
msgstr "Uppdrag"
#. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:76
msgid "BC"
msgstr "BC"
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:77
msgid "Bot checker"
msgstr "Bot checker"
#. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:82
+#: src/gui/windowmenu.cpp:79
msgid "KS"
msgstr "KS"
#. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:83 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
msgid "Kill stats"
msgstr "Dödsstatistik"
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:82
msgid "Smilies"
msgstr "Smilies"
#. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:87
+#: src/gui/windowmenu.cpp:84
msgid "CH"
msgstr "CH"
#. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:95
+#: src/gui/windowmenu.cpp:92
msgid "STA"
msgstr "STA"
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:93
msgid "Status"
msgstr "Status"
#. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:95
msgid "EQU"
msgstr "EQU"
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:58
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
msgid "Equipment"
msgstr "Equipment"
#. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:98
msgid "INV"
msgstr "INV"
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:130
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
#: src/inventory.cpp:257
msgid "Inventory"
msgstr "Inventory"
#. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:104
+#: src/gui/windowmenu.cpp:101
msgid "MAP"
msgstr "MAP"
#. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:110
+#: src/gui/windowmenu.cpp:107
msgid "SKI"
msgstr "SKI"
#. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
msgid "Skills"
msgstr "Skills"
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:118
-msgid "SPE"
-msgstr "SPE"
-
-#: src/gui/windowmenu.cpp:119
-msgid "Specials"
-msgstr "Specials"
-
#. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:124
+#: src/gui/windowmenu.cpp:112
msgid "SOC"
msgstr "SOC"
#. TRANSLATORS: full button name
#. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:126 src/gui/windows/socialwindow.cpp:1284
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
msgid "Social"
msgstr "Social"
#. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:128
+#: src/gui/windowmenu.cpp:116
msgid "SH"
msgstr "SH"
#. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:132
+#: src/gui/windowmenu.cpp:120
msgid "SP"
msgstr "SP"
#. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:124
msgid "DR"
msgstr "DR"
#. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:128
msgid "YK"
msgstr "YK"
#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:130
msgid "Did you know"
msgstr "Visste du att"
#. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:144
+#: src/gui/windowmenu.cpp:132
msgid "SHP"
msgstr "SHP"
#. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:148
+#: src/gui/windowmenu.cpp:136
msgid "OU"
msgstr "OU"
#. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:152
+#: src/gui/windowmenu.cpp:140
msgid "DBG"
msgstr "DBG"
#. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:149
msgid "WIN"
msgstr "WIN"
#. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:153
msgid "SET"
msgstr "SET"
#. TRANSLATORS: short key name
#. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:301 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
#: src/gui/windows/outfitwindow.cpp:561
#, c-format
msgid "Key: %s"
@@ -4893,31 +4953,21 @@ msgstr "Återställ"
msgid "Result"
msgstr "Resultat"
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:58
-msgid "unsorted"
-msgstr "osorterad"
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:60
-msgid "by price"
-msgstr "efter pris"
-
#. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:196
+#: src/gui/windows/buydialog.cpp:162
msgid "Create items"
msgstr "Skapa items"
#. TRANSLATORS: buy dialog label
#. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:254 src/gui/windows/buydialog.cpp:541
-#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:366
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Pris: %s / Totalt: %s"
#. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:263
+#: src/gui/windows/buydialog.cpp:229
msgid "Amount:"
msgstr "Antal:"
@@ -4927,8 +4977,8 @@ msgstr "Antal:"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/itemamountwindow.cpp:159
-#: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
msgid "+"
msgstr "+"
@@ -4939,8 +4989,8 @@ msgstr "+"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:271 src/gui/windows/itemamountwindow.cpp:157
-#: src/gui/windows/itemamountwindow.cpp:191 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
msgid "-"
msgstr "-"
@@ -4948,9 +4998,9 @@ msgstr "-"
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:274 src/gui/windows/charcreatedialog.cpp:119
-#: src/gui/windows/charselectdialog.cpp:593
-#: src/gui/windows/socialwindow.cpp:1307
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
msgid "Create"
msgstr "Skapa"
@@ -4959,7 +5009,7 @@ msgstr "Skapa"
#. TRANSLATORS: status bar label
#. TRANSLATORS: status window label
#. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:278 src/gui/windows/selldialog.cpp:112
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
#: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
#: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
msgid "Max"
@@ -5058,7 +5108,7 @@ msgstr "Ny karaktär"
#. TRANSLATORS: login dialog label
#. TRANSLATORS: register dialog. label.
#: src/gui/windows/charcreatedialog.cpp:73
-#: src/gui/windows/editserverdialog.cpp:89 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
#: src/gui/windows/registerdialog.cpp:89
msgid "Name:"
msgstr "Namn:"
@@ -5119,7 +5169,7 @@ msgstr "Kvinna"
#. TRANSLATORS: char create dialog label
#: src/gui/windows/charcreatedialog.cpp:115
-#: src/gui/windows/charcreatedialog.cpp:469
+#: src/gui/windows/charcreatedialog.cpp:458
#, c-format
msgid "Please distribute %d points"
msgstr "Vänligen distribuera %d poäng"
@@ -5135,17 +5185,17 @@ msgid "Look:"
msgstr "Utseende:"
#. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:362
+#: src/gui/windows/charcreatedialog.cpp:351
msgid "Your name needs to be at least 4 characters."
msgstr "Ditt namn måste vara minst 4 tecken långt."
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:459
+#: src/gui/windows/charcreatedialog.cpp:448
msgid "Character stats OK"
msgstr "Karaktär-stats OK"
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:475
+#: src/gui/windows/charcreatedialog.cpp:464
#, c-format
msgid "Please remove %d points"
msgstr "Vänligen ta bort %d poäng"
@@ -5174,7 +5224,7 @@ msgstr "Ändra inloggad"
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:104
-#: src/gui/windows/charselectdialog.cpp:588
+#: src/gui/windows/charselectdialog.cpp:580
#: src/gui/windows/updaterwindow.cpp:188
msgid "Play"
msgstr "Spela"
@@ -5230,35 +5280,20 @@ msgstr "Skriv in lösenordet för att radera karaktär"
msgid "Enter password:"
msgstr "Skriv lösenord:"
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:172
-msgid "rainbow 1"
-msgstr "regnbåge 1"
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:174
-msgid "rainbow 2"
-msgstr "regnbåge 2"
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:176
-msgid "rainbow 3"
-msgstr "regnbåge 3"
-
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:755
+#: src/gui/windows/chatwindow.cpp:705
#, c-format
msgid "Present: %s; %d players are present."
msgstr "Presentera: %s; %d spelare är presenterad."
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1169
+#: src/gui/windows/chatwindow.cpp:1119
#, c-format
msgid "Whispering to %s: %s"
msgstr "Viskar till %s: %s"
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1613
+#: src/gui/windows/chatwindow.cpp:1563
#, c-format
msgid "%s's pet"
msgstr ""
@@ -5504,51 +5539,51 @@ msgstr "Öppna automatiskt detta fönster"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:77
-#: src/gui/windows/itemamountwindow.cpp:161 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
msgid "OK"
msgstr "OK"
#. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:66
+#: src/gui/windows/editserverdialog.cpp:45
msgid "Edit Server"
msgstr "Editera Server"
#. TRANSLATORS: edit server dialog button
#. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:75
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
msgid "Connect"
msgstr "Anslut"
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:91
+#: src/gui/windows/editserverdialog.cpp:70
msgid "Address:"
msgstr "Adress:"
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:93
+#: src/gui/windows/editserverdialog.cpp:72
msgid "Port:"
msgstr "Port:"
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:95
+#: src/gui/windows/editserverdialog.cpp:74
msgid "Server type:"
msgstr "Server-typ:"
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:97
+#: src/gui/windows/editserverdialog.cpp:76
msgid "Description:"
msgstr "Notering:"
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:99
+#: src/gui/windows/editserverdialog.cpp:78
msgid "Online list url:"
msgstr "Online-lista url:"
#. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:220
+#: src/gui/windows/editserverdialog.cpp:188
msgid "Please at least type both the address and the port of the server."
msgstr "Snälla, kan du inte bara vara vänlig och skriva in både adress och port till servern."
@@ -5568,47 +5603,47 @@ msgid "Did you know..."
msgstr "Viste du att..."
#. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:165
+#: src/gui/windows/itemamountwindow.cpp:164
msgid "All"
msgstr "Alla"
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:221
+#: src/gui/windows/itemamountwindow.cpp:220
msgid "Select amount of items to trade."
msgstr "Välj antal items att byta."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:225
+#: src/gui/windows/itemamountwindow.cpp:224
msgid "Select amount of items to drop."
msgstr "Välj antal items att slänga."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:229
+#: src/gui/windows/itemamountwindow.cpp:228
msgid "Select amount of items to store."
msgstr "Välj antal items att lagra."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:233
+#: src/gui/windows/itemamountwindow.cpp:232
msgid "Select amount of items to retrieve."
msgstr "Välj antal items att apportera."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:237
+#: src/gui/windows/itemamountwindow.cpp:236
msgid "Select amount of items to split."
msgstr "Välj antal items att dela."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:241
+#: src/gui/windows/itemamountwindow.cpp:240
msgid "Add to buy shop."
msgstr "Lägg till i buy shop."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:245
+#: src/gui/windows/itemamountwindow.cpp:244
msgid "Add to sell shop."
msgstr "Lägg till i sell shop."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:249
+#: src/gui/windows/itemamountwindow.cpp:248
msgid "Unknown."
msgstr "Okänd."
@@ -5860,7 +5895,7 @@ msgstr "Submit"
#. TRANSLATORS: shop window label
#. TRANSLATORS: shop window button
#. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:258
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
#: src/gui/windows/tradewindow.cpp:78
msgid "Add"
@@ -5962,53 +5997,53 @@ msgid "Do you really want to sell %s?"
msgstr "Vill du verkligen sälja %s?"
#. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
msgid "Choose Your Server"
msgstr "Välj server"
#. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
msgid "Load"
msgstr "Ladda"
#. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
msgid "Choose Your Server *** SAFE MODE ***"
msgstr "Välj din server *** FELSÄKERT LÄGE ***"
#. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
msgid "Use same ip for game sub servers"
msgstr "Använd samma ip för spelunderservrar"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr "Laddar hem server-lista...%2.2f%%"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
msgid "Waiting for server..."
msgstr "Väntar på server..."
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
msgid "Preparing download"
msgstr "Förbereder hemladdning"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
msgid "Error retreiving server list!"
msgstr "Fel uppstod när serverlistan hämtades!"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
msgid "requires a newer version"
msgstr "Nyare version behövs"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
#, c-format
msgid "requires v%s"
msgstr "v%s behövs"
@@ -6089,277 +6124,277 @@ msgid "Skill %d"
msgstr "Skill %d"
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:225
+#: src/gui/windows/socialwindow.cpp:227
#, c-format
msgid "Invited user %s to guild %s."
msgstr "Bjud in användare %s till guilden %s."
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:240
+#: src/gui/windows/socialwindow.cpp:242
#, c-format
msgid "Guild %s quit requested."
msgstr "Guild %s avslutning förfrågad."
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:254
+#: src/gui/windows/socialwindow.cpp:256
msgid "Member Invite to Guild"
msgstr "Medlem bjuder in till Guild"
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:256
+#: src/gui/windows/socialwindow.cpp:258
#, c-format
msgid "Who would you like to invite to guild %s?"
msgstr "Vem vill du bjuda in till guild %s?"
#. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:266
+#: src/gui/windows/socialwindow.cpp:268
msgid "Leave Guild?"
msgstr "Lämna Guild?"
#. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:268
+#: src/gui/windows/socialwindow.cpp:270
#, c-format
msgid "Are you sure you want to leave guild %s?"
msgstr "Är du säker på att du vill lämna guild %s?"
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:279
+#: src/gui/windows/socialwindow.cpp:281
#, c-format
msgid "Members: %u/%u"
msgstr "Medlemmar: %u/%u"
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:301 src/gui/windows/socialwindow.cpp:373
-#: src/gui/windows/socialwindow.cpp:498
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
#, c-format
msgid "Players: %u/%u"
msgstr "Spelare: %u/%u"
#. TRANSLATORS: tab in social window
#. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:389 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
msgid "Party"
msgstr "Party"
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:429
+#: src/gui/windows/socialwindow.cpp:431
#, c-format
msgid "Invited user %s to party."
msgstr "Bjud in spelare %s till party."
#. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:444
+#: src/gui/windows/socialwindow.cpp:446
#, c-format
msgid "Party %s quit requested."
msgstr "Party %s avslutning förfrågad."
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:458
+#: src/gui/windows/socialwindow.cpp:460
msgid "Member Invite to Party"
msgstr "Medlem bjuder in till Party"
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:460
+#: src/gui/windows/socialwindow.cpp:462
#, c-format
msgid "Who would you like to invite to party %s?"
msgstr "Vem vill du bjuda in till party %s?"
#. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:470
+#: src/gui/windows/socialwindow.cpp:472
msgid "Leave Party?"
msgstr "Lämna Party?"
#. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:472
+#: src/gui/windows/socialwindow.cpp:474
#, c-format
msgid "Are you sure you want to leave party %s?"
msgstr "Är du säker på att du vill lämna party %s?"
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:698
+#: src/gui/windows/socialwindow.cpp:665
#, c-format
msgid "Visible players: %d"
msgstr "Synliga spelare: %d"
#. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:725
+#: src/gui/windows/socialwindow.cpp:692
msgid "Nav"
msgstr "Nav"
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:827
+#: src/gui/windows/socialwindow.cpp:794
#, c-format
msgid "Portals: %u/%u"
msgstr "Portaler: %u/%u"
#. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1054
+#: src/gui/windows/socialwindow.cpp:1021
msgid "Atk"
msgstr "Atk"
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1073
+#: src/gui/windows/socialwindow.cpp:1040
msgid "Priority mobs"
msgstr "Prioriterings-mobs"
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1075
+#: src/gui/windows/socialwindow.cpp:1042
msgid "Attack mobs"
msgstr "Attackera mobs"
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1077
+#: src/gui/windows/socialwindow.cpp:1044
msgid "Ignore mobs"
msgstr "Ignorera mobs"
#. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1101
+#: src/gui/windows/socialwindow.cpp:1068
msgid "Pik"
msgstr "Pik"
#. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1120
+#: src/gui/windows/socialwindow.cpp:1087
msgid "Pickup items"
msgstr "Pickupa items"
#. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1122
+#: src/gui/windows/socialwindow.cpp:1089
msgid "Ignore items"
msgstr "Ignorera items"
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1212
+#: src/gui/windows/socialwindow.cpp:1179
#, c-format
msgid "Friends: %u/%u"
msgstr "Vänner: %u/%u"
#. TRANSLATORS: party popup item
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1235 src/gui/windows/socialwindow.cpp:1727
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
msgid "Create Party"
msgstr "Skapa Party"
#. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1298
+#: src/gui/windows/socialwindow.cpp:1265
msgid "P"
msgstr "P"
#. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1303
+#: src/gui/windows/socialwindow.cpp:1270
msgid "F"
msgstr "F"
#. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1309
+#: src/gui/windows/socialwindow.cpp:1276
msgid "Invite"
msgstr "Bjud in"
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1503
+#: src/gui/windows/socialwindow.cpp:1470
#, c-format
msgid "Accepted party invite from %s."
msgstr "Accepterad party-inbjudning från %s."
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1514
+#: src/gui/windows/socialwindow.cpp:1481
#, c-format
msgid "Rejected party invite from %s."
msgstr "Nekad party-inbjudning från %s."
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1531
+#: src/gui/windows/socialwindow.cpp:1498
#, c-format
msgid "Accepted guild invite from %s."
msgstr "Accepterad guild-inbjudning från %s."
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1545
+#: src/gui/windows/socialwindow.cpp:1512
#, c-format
msgid "Rejected guild invite from %s."
msgstr "Nekad guild-inbjudning från %s."
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1585
+#: src/gui/windows/socialwindow.cpp:1552
#, c-format
msgid "Creating guild called %s."
msgstr "Skapar guilden %s."
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1606
+#: src/gui/windows/socialwindow.cpp:1573
#, c-format
msgid "Creating party called %s."
msgstr "Skapar partyt %s."
#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1621
+#: src/gui/windows/socialwindow.cpp:1588
msgid "Guild Name"
msgstr "Guild-namn"
#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1623
+#: src/gui/windows/socialwindow.cpp:1590
msgid "Choose your guild's name."
msgstr "Välj ditt guild-namn."
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1639
+#: src/gui/windows/socialwindow.cpp:1606
msgid "Received guild request, but one already exists."
msgstr "Tog emot guild-request, då ett redan existerar."
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1647
+#: src/gui/windows/socialwindow.cpp:1614
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr "%s har bjudit in dig att joina guilden %s."
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1654
+#: src/gui/windows/socialwindow.cpp:1621
msgid "Accept Guild Invite"
msgstr "Acceptera Guild-inbjudningar"
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1670
+#: src/gui/windows/socialwindow.cpp:1637
msgid "Received party request, but one already exists."
msgstr "Tog emot party-request, även om ett redan existerar."
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1682
+#: src/gui/windows/socialwindow.cpp:1649
msgid "You have been invited you to join a party."
msgstr "Du har blivit inbjuden att joina ett party."
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1687
+#: src/gui/windows/socialwindow.cpp:1654
#, c-format
msgid "You have been invited to join the %s party."
msgstr "Du har blivit inbjuden att joina %s party."
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1696
+#: src/gui/windows/socialwindow.cpp:1663
#, c-format
msgid "%s has invited you to join their party."
msgstr "%s har bjudit in dig att joina deras party."
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1702
+#: src/gui/windows/socialwindow.cpp:1669
#, c-format
msgid "%s has invited you to join the %s party."
msgstr "%s har bjudit in dig att joina %s party."
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1712
+#: src/gui/windows/socialwindow.cpp:1679
msgid "Accept Party Invite"
msgstr "Acceptera Party-invite"
-#: src/gui/windows/socialwindow.cpp:1728
+#: src/gui/windows/socialwindow.cpp:1695
msgid "Cannot create party. You are already in a party"
msgstr "Kan inte skapa party. Du är redan i ett party"
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1734
+#: src/gui/windows/socialwindow.cpp:1701
msgid "Party Name"
msgstr "Party-namn"
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1736
+#: src/gui/windows/socialwindow.cpp:1703
msgid "Choose your party's name."
msgstr "Välj ditt party-namn."
@@ -6401,113 +6436,68 @@ msgstr "Karaktär-points: %d"
msgid "Correction points: %d"
msgstr "Correction points: %d"
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "No Target"
-msgstr "Ingen Target"
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Allow Target"
-msgstr "Tillåt Target"
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:105
-msgid "Need Target"
-msgstr "Behöver Target"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "General Magic"
-msgstr "General Magic"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "Life Magic"
-msgstr "Life Magic"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "War Magic"
-msgstr "War Magic"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Transmute Magic"
-msgstr "Transmute Magic"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Nature Magic"
-msgstr "Nature Magic"
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:121
-msgid "Astral Magic"
-msgstr "Astral Magic"
-
#. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:164
+#: src/gui/windows/textcommandeditor.cpp:47
msgid "Command Editor"
msgstr "Kommandotolk"
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:52
msgid "magic"
msgstr "magic"
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:54
msgid "other"
msgstr "Annat"
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:173
+#: src/gui/windows/textcommandeditor.cpp:56
msgid "Symbol:"
msgstr "Symbol:"
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:176
+#: src/gui/windows/textcommandeditor.cpp:59
msgid "Command:"
msgstr "Kommando:"
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:179
+#: src/gui/windows/textcommandeditor.cpp:62
msgid "Comment:"
msgstr "Kommentar:"
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:183
+#: src/gui/windows/textcommandeditor.cpp:66
msgid "Target Type:"
msgstr "Target Typ:"
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:187
+#: src/gui/windows/textcommandeditor.cpp:70
msgid "Icon:"
msgstr "Ikon:"
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:190
+#: src/gui/windows/textcommandeditor.cpp:73
msgid "Mana:"
msgstr "Mana:"
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:193
+#: src/gui/windows/textcommandeditor.cpp:76
msgid "Magic level:"
msgstr "Magic level:"
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:197
+#: src/gui/windows/textcommandeditor.cpp:80
msgid "Magic School:"
msgstr "Magic School:"
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:200
+#: src/gui/windows/textcommandeditor.cpp:83
msgid "School level:"
msgstr "School level:"
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/windows/textcommandeditor.cpp:88
msgid "Save"
msgstr "Spara"
@@ -6537,7 +6527,7 @@ msgid "Trade: You"
msgstr "Trade: Dig"
#. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
#, c-format
msgid "You get %s"
msgstr "Du får %s"
@@ -6553,12 +6543,12 @@ msgid "You give:"
msgstr "Du ger:"
#. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
msgid "You don't have enough money."
msgstr "Du har inte tillräckligt med pengar."
#. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
msgid ""
"Failed adding item. You can not overlap one kind of item on the window."
msgstr "Misslyckades att lägga till item. Du kan inte överlappa ens sorts item i fönstret."
@@ -6629,17 +6619,17 @@ msgid "Who Is Online - Update"
msgstr "Vem är Online - Uppdatering"
#. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:87
+#: src/gui/windows/worldselectdialog.cpp:49
msgid "Select World"
msgstr "Välj värld"
#. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:93
+#: src/gui/windows/worldselectdialog.cpp:55
msgid "Change Login"
msgstr "Ändra login"
#. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:95
+#: src/gui/windows/worldselectdialog.cpp:57
msgid "Choose World"
msgstr "Välj värld"
@@ -6857,7 +6847,7 @@ msgid "Failed to create character. Most likely the name is already taken."
msgstr "Misslyckades att skapa karaktär. Troligen på grund av att namnet redan är taget."
#. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:281
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
msgid "Wrong name."
msgstr "Fel namn."
@@ -7015,58 +7005,58 @@ msgid "Experience sharing unknown."
msgstr "Exp-delning är okänd."
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:154
+#: src/net/ea/loginhandler.cpp:149
msgid "Account was not found. Please re-login."
msgstr "Kontot hittades inte. Vänligen logga ut och logga in igen."
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/ea/loginhandler.cpp:153
msgid "Old password incorrect."
msgstr "Gamla lösenordet är felaktigt."
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:162
+#: src/net/ea/loginhandler.cpp:157
msgid "New password too short."
msgstr "Det nya lösenordet är för kort."
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:166 src/net/ea/loginhandler.cpp:293
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
msgid "Unknown error."
msgstr "Okänt fel."
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:239
+#: src/net/ea/loginhandler.cpp:234
msgid "Unregistered ID."
msgstr "Oregistrerat ID."
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:238
msgid "Wrong password."
msgstr "Fel lösenord."
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:248
+#: src/net/ea/loginhandler.cpp:243
msgid "Account expired."
msgstr "Kotot har löpt ut ur tid."
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:252
+#: src/net/ea/loginhandler.cpp:247
msgid "Rejected from server."
msgstr "Nekad från servern."
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:256
+#: src/net/ea/loginhandler.cpp:251
msgid ""
"You have been permanently banned from the game. Please contact the GM team."
msgstr "Du har blivit permanent bannad från spelet. Vänligen kontakta GM-teamet."
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:261
+#: src/net/ea/loginhandler.cpp:256
msgid "Client too old."
msgstr "Klienten är uråldrig."
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:265
+#: src/net/ea/loginhandler.cpp:260
#, c-format
msgid ""
"You have been temporarily banned from the game until %s.\n"
@@ -7074,22 +7064,22 @@ msgid ""
msgstr "Du har blivit temporärt bannad från spelet tills %s.⏎ Vänligen kontakta GM-teamet via forumet."
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:273
+#: src/net/ea/loginhandler.cpp:268
msgid "Server overpopulated."
msgstr "Servern är överbefolkad."
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:277
+#: src/net/ea/loginhandler.cpp:272
msgid "This user name is already taken."
msgstr "Detta användarnamn är redan taget."
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:285
+#: src/net/ea/loginhandler.cpp:280
msgid "Incorrect email."
msgstr "Felaktig epost."
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:289
+#: src/net/ea/loginhandler.cpp:284
msgid "Username permanently erased."
msgstr "Användarnamnet är permanent raderat."
@@ -7762,7 +7752,7 @@ msgstr "Säker OpenGL"
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
#: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "Inte namngiven"
diff --git a/po/te.po b/po/te.po
index 356495f86..83cb4833b 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: 2014-02-23 00:42+0300\n"
-"PO-Revision-Date: 2014-02-23 08:14+0000\n"
+"POT-Creation-Date: 2014-02-28 21:21+0300\n"
+"PO-Revision-Date: 2014-03-01 08:14+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"
@@ -29,7 +29,7 @@ msgid "Accepting incoming trade requests"
msgstr ""
#. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
msgid "Visible on map"
msgstr ""
@@ -38,68 +38,68 @@ msgstr ""
msgid "Human"
msgstr ""
-#: src/being/being.cpp:544
+#: src/being/being.cpp:496
msgid "dodge"
msgstr ""
-#: src/being/being.cpp:544
+#: src/being/being.cpp:496
msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1965 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1970 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr ""
#. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:392
+#: src/being/localplayer.cpp:376
#, c-format
msgid "You were killed by %s"
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1377
+#: src/being/localplayer.cpp:816
msgid "Tried to pick up nonexistent item."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1381
+#: src/being/localplayer.cpp:820
msgid "Item is too heavy."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1385
+#: src/being/localplayer.cpp:824
msgid "Item is too far away."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1389
+#: src/being/localplayer.cpp:828
msgid "Inventory is full."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1393
+#: src/being/localplayer.cpp:832
msgid "Stack is too big."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1397
+#: src/being/localplayer.cpp:836
msgid "Item belongs to someone else."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1401
+#: src/being/localplayer.cpp:840
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:1425
+#: src/being/localplayer.cpp:864
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -107,387 +107,387 @@ msgstr[0] ""
msgstr[1] ""
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1630 src/being/localplayer.cpp:1665
-#: src/being/localplayer.cpp:1666
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
msgid "xp"
msgstr ""
-#: src/being/localplayer.cpp:1671 src/being/localplayer.cpp:1678
-#: src/being/localplayer.cpp:1685
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
msgid "job"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1871
+#: src/being/localplayer.cpp:1285
msgid "(D) default moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1873
+#: src/being/localplayer.cpp:1287
msgid "(I) invert moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1875
+#: src/being/localplayer.cpp:1289
msgid "(c) moves with some crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1877
+#: src/being/localplayer.cpp:1291
msgid "(C) moves with crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1879
+#: src/being/localplayer.cpp:1293
msgid "(d) double normal + crazy"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1881
+#: src/being/localplayer.cpp:1295
msgid "(?) unknown move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1904
+#: src/being/localplayer.cpp:1318
#, c-format
msgid "(%u) crazy move number %u"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1910
+#: src/being/localplayer.cpp:1324
msgid "(a) custom crazy move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1915
+#: src/being/localplayer.cpp:1329
msgid "(?) crazy move"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1930
+#: src/being/localplayer.cpp:1344
msgid "(0) default moves to target"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1932
+#: src/being/localplayer.cpp:1346
msgid "(1) moves to target in distance 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1934
+#: src/being/localplayer.cpp:1348
msgid "(2) moves to target in distance 2"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1936
+#: src/being/localplayer.cpp:1350
msgid "(3) moves to target in distance 3"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1938
+#: src/being/localplayer.cpp:1352
msgid "(5) moves to target in distance 5"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1940
+#: src/being/localplayer.cpp:1354
msgid "(7) moves to target in distance 7"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1942
+#: src/being/localplayer.cpp:1356
msgid "(A) moves to target in attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1944
+#: src/being/localplayer.cpp:1358
msgid "(a) archer attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1946
+#: src/being/localplayer.cpp:1360
msgid "(B) moves to target in attack range - 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1948
+#: src/being/localplayer.cpp:1362
msgid "(?) move to target"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1968
+#: src/being/localplayer.cpp:1382
msgid "(D) default follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1970
+#: src/being/localplayer.cpp:1384
msgid "(R) relative follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1972
+#: src/being/localplayer.cpp:1386
msgid "(M) mirror follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1974
+#: src/being/localplayer.cpp:1388
msgid "(P) pet follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1976
+#: src/being/localplayer.cpp:1390
msgid "(?) unknown follow"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1996 src/being/localplayer.cpp:2004
-#: src/being/localplayer.cpp:2032
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
msgid "(?) attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1998 src/being/localplayer.cpp:2024
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
msgid "(D) default attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2000
+#: src/being/localplayer.cpp:1414
msgid "(s) switch attack without shield"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2002
+#: src/being/localplayer.cpp:1416
msgid "(S) switch attack with shield"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2026
+#: src/being/localplayer.cpp:1440
msgid "(G) go and attack"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2028
+#: src/being/localplayer.cpp:1442
msgid "(A) go, attack, pickup"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2030
+#: src/being/localplayer.cpp:1444
msgid "(d) without auto attack"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2084
+#: src/being/localplayer.cpp:1498
msgid "(S) small pick up 1x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2086
+#: src/being/localplayer.cpp:1500
msgid "(D) default pick up 2x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2088
+#: src/being/localplayer.cpp:1502
msgid "(F) forward pick up 2x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2090
+#: src/being/localplayer.cpp:1504
msgid "(3) pick up 3x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2092
+#: src/being/localplayer.cpp:1506
msgid "(g) go and pick up in distance 4"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2094
+#: src/being/localplayer.cpp:1508
msgid "(G) go and pick up in distance 8"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2096
+#: src/being/localplayer.cpp:1510
msgid "(A) go and pick up in max distance"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2098
+#: src/being/localplayer.cpp:1512
msgid "(?) pick up"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2112
+#: src/being/localplayer.cpp:1526
msgid "(N) normal map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2114
+#: src/being/localplayer.cpp:1528
msgid "(D) debug map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2116
+#: src/being/localplayer.cpp:1530
msgid "(u) ultra map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2118
+#: src/being/localplayer.cpp:1532
msgid "(U) ultra map view 2"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2120
+#: src/being/localplayer.cpp:1534
msgid "(e) empty map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2122
+#: src/being/localplayer.cpp:1536
msgid "(b) black & white map view"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2142
+#: src/being/localplayer.cpp:1556
msgid "(f) use #flar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2144
+#: src/being/localplayer.cpp:1558
msgid "(c) use #chiza for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2146
+#: src/being/localplayer.cpp:1560
msgid "(I) use #ingrav for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2148
+#: src/being/localplayer.cpp:1562
msgid "(F) use #frillyar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2150
+#: src/being/localplayer.cpp:1564
msgid "(U) use #upmarmu for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2152
+#: src/being/localplayer.cpp:1566
msgid "(?) magic attack"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2172
+#: src/being/localplayer.cpp:1586
msgid "(a) attack all players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2174
+#: src/being/localplayer.cpp:1588
msgid "(f) attack all except friends"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2176
+#: src/being/localplayer.cpp:1590
msgid "(b) attack bad relations"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2178
+#: src/being/localplayer.cpp:1592
msgid "(d) don't attack players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2180
+#: src/being/localplayer.cpp:1594
msgid "(?) pvp attack"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2200
+#: src/being/localplayer.cpp:1614
msgid "(D) default imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2202
+#: src/being/localplayer.cpp:1616
msgid "(O) outfits imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2204
+#: src/being/localplayer.cpp:1618
msgid "(?) imitation"
msgstr ""
#. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2233
+#: src/being/localplayer.cpp:1647
msgid "Away"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2256
+#: src/being/localplayer.cpp:1670
msgid "(O) on keyboard"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2258
+#: src/being/localplayer.cpp:1672
msgid "(A) away"
msgstr ""
#. TRANSLATORS: away type in status bar
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2260 src/being/localplayer.cpp:2278
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
msgid "(?) away"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2274
+#: src/being/localplayer.cpp:1688
msgid "(G) game camera mode"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2276
+#: src/being/localplayer.cpp:1690
msgid "(F) free camera mode"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2303
+#: src/being/localplayer.cpp:1717
msgid "Game modifiers are enabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2305
+#: src/being/localplayer.cpp:1719
msgid "Game modifiers are disabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2307
+#: src/being/localplayer.cpp:1721
msgid "Game modifiers are unknown"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3887
+#: src/being/localplayer.cpp:3287
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3893 src/being/localplayer.cpp:3918
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3903
+#: src/being/localplayer.cpp:3303
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3909 src/being/localplayer.cpp:3923
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4266
+#: src/being/localplayer.cpp:3666
#, c-format
msgid "You see %s"
msgstr ""
@@ -525,32 +525,32 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1139 src/gui/windowmenu.cpp:167
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
#: src/gui/windows/setupwindow.cpp:61
msgid "Setup"
msgstr ""
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1143 src/gui/widgets/tabs/setup_perfomance.cpp:51
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1146 src/gui/widgets/tabs/setup_video.cpp:225
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:225
msgid "Video"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1149 src/gui/widgets/tabs/setup_theme.cpp:269
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1152 src/gui/windowmenu.cpp:74
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr "సహాయం"
@@ -563,41 +563,41 @@ msgstr "సహాయం"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1156 src/gui/popups/popupmenu.cpp:619
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
#: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:69
-#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:138
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
#: src/gui/windows/shopwindow.cpp:78
msgid "Close"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1324
msgid "Logging in"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1367
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1492
+#: src/client.cpp:1489
msgid "Requesting characters"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1532
+#: src/client.cpp:1529
msgid "Connecting to the game server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1545
+#: src/client.cpp:1541
msgid "Changing game servers"
msgstr ""
@@ -612,12 +612,12 @@ msgstr ""
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1606 src/client.cpp:1617 src/client.cpp:1801
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:349
#: src/gui/windows/charselectdialog.cpp:299
-#: src/gui/windows/editserverdialog.cpp:218
+#: src/gui/windows/editserverdialog.cpp:186
#: src/gui/windows/registerdialog.cpp:260
#: src/gui/windows/unregisterdialog.cpp:146
#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
@@ -625,65 +625,65 @@ msgid "Error"
msgstr "పొరపాటు"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1629
+#: src/client.cpp:1625
msgid "Requesting registration details"
msgstr ""
#. TRANSLATORS: password change message header
-#: src/client.cpp:1670
+#: src/client.cpp:1666
msgid "Password Change"
msgstr ""
#. TRANSLATORS: password change message text
-#: src/client.cpp:1672
+#: src/client.cpp:1668
msgid "Password changed successfully!"
msgstr ""
#. TRANSLATORS: email change message header
-#: src/client.cpp:1694
+#: src/client.cpp:1690
msgid "Email Change"
msgstr ""
#. TRANSLATORS: email change message text
-#: src/client.cpp:1696
+#: src/client.cpp:1692
msgid "Email changed successfully!"
msgstr ""
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1719
+#: src/client.cpp:1715
msgid "Unregister Successful"
msgstr ""
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1721
+#: src/client.cpp:1717
msgid "Farewell, come back any time..."
msgstr ""
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1998 src/client.cpp:2013 src/client.cpp:2058
-#: src/client.cpp:2074 src/client.cpp:2525 src/client.cpp:2533
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2230
+#: src/client.cpp:2232
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2271 src/client.cpp:2278
+#: src/client.cpp:2273 src/client.cpp:2280
msgid "Error creating updates directory!"
msgstr ""
-#: src/client.cpp:2300 src/client.cpp:2317
+#: src/client.cpp:2302 src/client.cpp:2319
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: error message question
-#: src/client.cpp:3001
+#: src/client.cpp:3003
msgid "Do you want to open support page?"
msgstr ""
@@ -929,99 +929,154 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:277 src/gui/widgets/tabs/chattab.cpp:464
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
msgid "General"
msgstr "సాధారణ"
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:293 src/gui/widgets/tabs/chattab.cpp:466
-#: src/gui/windowmenu.cpp:154 src/gui/windows/debugwindow.cpp:53
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:575
+#: src/game.cpp:563
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:585
+#: src/game.cpp:573
msgid "Saving screenshot failed!"
msgstr ""
#. TRANSLATORS: error message text
-#: src/game.cpp:656
+#: src/game.cpp:644
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:659
+#: src/game.cpp:647
msgid "Network Error"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
-msgid "black"
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
msgstr ""
+#. TRANSLATORS: chat color
#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
+msgid "black"
+msgstr ""
+
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
msgid "red"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
msgid "green"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
msgid "blue"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
msgid "gold"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
msgid "yellow"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
msgid "pink"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
msgid "purple"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
msgid "grey"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
msgid "brown"
msgstr ""
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr ""
+
#. TRANSLATORS: relation type
#: src/gui/models/playerrelationlistmodel.h:33
msgid "Neutral"
@@ -1057,46 +1112,61 @@ msgstr ""
msgid "Enemy"
msgstr ""
-#. TRANSLATORS: inventory sort mode
-#. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#: src/gui/models/sortlistmodelinv.h:34
-#: src/gui/widgets/tabs/setup_other.cpp:72
-#: src/gui/widgets/tabs/setup_visual.cpp:78 src/gui/windows/chatwindow.cpp:150
-msgid "default"
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:36 src/gui/windows/buydialog.cpp:62
-msgid "by name"
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
msgstr ""
+#. TRANSLATORS: buy dialog sort type.
#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
+msgid "by name"
+msgstr ""
+
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:38 src/gui/windows/buydialog.cpp:64
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
msgid "by id"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:40 src/gui/windows/buydialog.cpp:66
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
msgid "by weight"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:42 src/gui/windows/buydialog.cpp:68
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
msgid "by amount"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:44 src/gui/windows/buydialog.cpp:70
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
msgid "by type"
msgstr ""
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr ""
+
#. TRANSLATORS: update type
#. TRANSLATORS: onscreen button size
#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
@@ -1243,8 +1313,8 @@ msgstr ""
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
-#: src/gui/windows/buydialog.cpp:208 src/gui/windows/buydialog.cpp:220
-#: src/gui/windows/buydialog.cpp:274 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
msgid "Buy"
msgstr ""
@@ -1341,12 +1411,12 @@ msgstr ""
#: src/gui/windows/changepassworddialog.cpp:57
#: src/gui/windows/charcreatedialog.cpp:121
#: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:79
-#: src/gui/windows/itemamountwindow.cpp:163
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
-#: src/gui/windows/socialwindow.cpp:1238
-#: src/gui/windows/textcommandeditor.cpp:203 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:54
#: src/gui/windows/updaterwindow.cpp:186
msgid "Cancel"
@@ -1418,7 +1488,7 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:150 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
msgstr ""
@@ -1431,7 +1501,7 @@ msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:134
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
msgid "Spells"
msgstr ""
@@ -1487,7 +1557,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
#. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1311
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
msgid "Leave"
msgstr ""
@@ -1568,8 +1638,8 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
-#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:223
-#: src/gui/windows/inventorywindow.cpp:745 src/gui/windows/setupwindow.cpp:96
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
msgid "Store"
msgstr ""
@@ -1600,7 +1670,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
msgid "Retrieve"
msgstr ""
@@ -1633,8 +1703,8 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
-#: src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:656 src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr ""
@@ -1668,8 +1738,8 @@ msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: language
#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/widgets/tabs/setup_theme.cpp:127
-#: src/gui/windows/socialwindow.cpp:1003
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
msgid "(default)"
msgstr ""
@@ -1825,8 +1895,8 @@ msgstr ""
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:645
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
msgid "Unequip"
msgstr ""
@@ -1834,16 +1904,16 @@ msgstr ""
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:172
-#: src/gui/windows/inventorywindow.cpp:650 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:189
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
msgid "Drop..."
msgstr ""
@@ -1857,15 +1927,15 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:138
-#: src/gui/windows/inventorywindow.cpp:758
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
msgid "Drop"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
msgid "Split"
msgstr ""
@@ -2021,10 +2091,10 @@ msgstr ""
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:276
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/windows/serverdialog.cpp:198
msgid "Quit"
msgstr "నిష్క్రమించు"
@@ -2586,7 +2656,7 @@ msgstr ""
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: register dialog. button.
#: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:146
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:330
#: src/gui/widgets/tabs/setup_visual.cpp:189
@@ -2613,9 +2683,8 @@ msgstr ""
#. TRANSLATORS: command editor button
#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
#: src/gui/windows/charselectdialog.cpp:108
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:94
-#: src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/textcommandeditor.cpp:207
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
msgid "Delete"
msgstr "తొలగించు"
@@ -2651,7 +2720,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:130
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
msgid "Shortcuts"
msgstr ""
@@ -2659,7 +2728,7 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:151
msgid "Windows"
msgstr ""
@@ -2675,7 +2744,7 @@ msgstr ""
#. TRANSLATORS: settings tab name
#. TRANSLATORS: chat window name
#: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:88 src/gui/windows/chatwindow.cpp:203
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
msgid "Chat"
msgstr ""
@@ -2898,7 +2967,7 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:137
-#: src/gui/windows/inventorywindow.cpp:569
+#: src/gui/windows/inventorywindow.cpp:568
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
#, c-format
@@ -2918,7 +2987,7 @@ msgstr ""
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/windows/serverdialog.cpp:204
msgid "Edit"
msgstr ""
@@ -2971,7 +3040,7 @@ msgstr ""
#. TRANSLATORS: tab in social window
#. TRANSLATORS: guild chat tab name
#: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:184 src/gui/windows/socialwindow.cpp:320
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
#: src/net/ea/gui/guildtab.cpp:44
msgid "Guild"
msgstr ""
@@ -2982,142 +3051,142 @@ msgid "Lang"
msgstr ""
#. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:49
+#: src/gui/widgets/tabs/setup_audio.cpp:48
msgid "Audio"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:57
+#: src/gui/widgets/tabs/setup_audio.cpp:56
msgid "Basic settings"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:60
+#: src/gui/widgets/tabs/setup_audio.cpp:59
msgid "Enable Audio"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:63
+#: src/gui/widgets/tabs/setup_audio.cpp:62
msgid "Enable music"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:67
+#: src/gui/widgets/tabs/setup_audio.cpp:66
msgid "Enable game sfx"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:71
+#: src/gui/widgets/tabs/setup_audio.cpp:70
msgid "Enable gui sfx"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:74
msgid "Sfx volume"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:78
msgid "Music volume"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:82
msgid "Enable music fade out"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:86
msgid "Audio frequency"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:90
msgid "mono"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:93
+#: src/gui/widgets/tabs/setup_audio.cpp:92
msgid "stereo"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:94
msgid "surround"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:97
+#: src/gui/widgets/tabs/setup_audio.cpp:96
msgid "surround+center+lfe"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:98
msgid "Audio channels"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:104
+#: src/gui/widgets/tabs/setup_audio.cpp:103
msgid "Sound effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:106
msgid "Information dialog sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:110
msgid "Request dialog sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:115
+#: src/gui/widgets/tabs/setup_audio.cpp:114
msgid "Whisper message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:118
msgid "Guild / Party message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:122
msgid "Highlight message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:126
msgid "Global message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:130
msgid "Error message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:134
msgid "Trade request sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:138
msgid "Show window sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:142
msgid "Hide window sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:150
msgid "Enable mumble voice chat"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:156
+#: src/gui/widgets/tabs/setup_audio.cpp:155
msgid "Download music"
msgstr ""
@@ -3413,7 +3482,7 @@ msgstr ""
#. TRANSLATORS: unknown key name
#. TRANSLATORS: quests window quest name
#: src/gui/widgets/tabs/setup_input.cpp:364
-#: src/gui/windows/questswindow.cpp:263
+#: src/gui/windows/questswindow.cpp:249
msgid "unknown"
msgstr ""
@@ -3572,7 +3641,7 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: debug window tab
#. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:105
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
#: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
#: src/gui/windows/minimap.cpp:114
msgid "Map"
@@ -3740,9 +3809,9 @@ msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: shop window name
#. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:146
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
#: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windows/inventorywindow.cpp:194
msgid "Shop"
msgstr ""
@@ -4124,252 +4193,252 @@ msgid "When ignoring:"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:64
+#: src/gui/widgets/tabs/setup_theme.cpp:63
msgid "Very small (8)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:66
+#: src/gui/widgets/tabs/setup_theme.cpp:65
msgid "Very small (9)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:68
+#: src/gui/widgets/tabs/setup_theme.cpp:67
msgid "Tiny (10)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:70
+#: src/gui/widgets/tabs/setup_theme.cpp:69
msgid "Small (11)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:72
+#: src/gui/widgets/tabs/setup_theme.cpp:71
msgid "Medium (12)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:74
+#: src/gui/widgets/tabs/setup_theme.cpp:73
msgid "Normal (13)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:76
+#: src/gui/widgets/tabs/setup_theme.cpp:75
msgid "Large (14)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:78
+#: src/gui/widgets/tabs/setup_theme.cpp:77
msgid "Large (15)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:80
+#: src/gui/widgets/tabs/setup_theme.cpp:79
msgid "Large (16)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:82
+#: src/gui/widgets/tabs/setup_theme.cpp:81
msgid "Big (17)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:83
msgid "Big (18)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:85
msgid "Big (19)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:87
msgid "Very big (20)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:89
msgid "Very big (21)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:91
msgid "Very big (22)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:93
msgid "Huge (23)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:129
+#: src/gui/widgets/tabs/setup_theme.cpp:128
msgid "Chinese (China)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:131
+#: src/gui/widgets/tabs/setup_theme.cpp:130
msgid "Czech"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:133
+#: src/gui/widgets/tabs/setup_theme.cpp:132
msgid "English"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:135
+#: src/gui/widgets/tabs/setup_theme.cpp:134
msgid "Finnish"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:137
+#: src/gui/widgets/tabs/setup_theme.cpp:136
msgid "French"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:139
+#: src/gui/widgets/tabs/setup_theme.cpp:138
msgid "German"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:141
+#: src/gui/widgets/tabs/setup_theme.cpp:140
msgid "Indonesian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:143
+#: src/gui/widgets/tabs/setup_theme.cpp:142
msgid "Italian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:145
+#: src/gui/widgets/tabs/setup_theme.cpp:144
msgid "Polish"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:147
+#: src/gui/widgets/tabs/setup_theme.cpp:146
msgid "Japanese"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:148
msgid "Dutch (Belgium/Flemish)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:150
msgid "Portuguese"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:152
msgid "Portuguese (Brazilian)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:154
msgid "Russian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:156
msgid "Spanish (Castilian)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:158
msgid "Turkish"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:211
+#: src/gui/widgets/tabs/setup_theme.cpp:210
msgid "Gui theme"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:218
+#: src/gui/widgets/tabs/setup_theme.cpp:217
msgid "Main Font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:223
+#: src/gui/widgets/tabs/setup_theme.cpp:222
msgid "Language"
msgstr ""
#. TRANSLATORS: theme settings label
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:227 src/gui/windows/emotewindow.cpp:45
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
msgid "Bold font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:230
msgid "Particle font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:235
+#: src/gui/widgets/tabs/setup_theme.cpp:234
msgid "Help font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:239
+#: src/gui/widgets/tabs/setup_theme.cpp:238
msgid "Secure font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:242
msgid "Npc font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:247
+#: src/gui/widgets/tabs/setup_theme.cpp:246
msgid "Japanese font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:250
msgid "Chinese font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:256
+#: src/gui/widgets/tabs/setup_theme.cpp:255
msgid "Font size"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:261
+#: src/gui/widgets/tabs/setup_theme.cpp:260
msgid "Npc font size"
msgstr ""
#. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:265
+#: src/gui/widgets/tabs/setup_theme.cpp:264
msgid "i"
msgstr ""
#. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:404
+#: src/gui/widgets/tabs/setup_theme.cpp:403
msgid "Name: "
msgstr ""
-#: src/gui/widgets/tabs/setup_theme.cpp:405
+#: src/gui/widgets/tabs/setup_theme.cpp:404
msgid "Copyright:"
msgstr ""
#. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:470
+#: src/gui/widgets/tabs/setup_theme.cpp:469
msgid "Theme info"
msgstr ""
#. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:497
+#: src/gui/widgets/tabs/setup_theme.cpp:496
msgid "Theme Changed"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:497
+#: src/gui/widgets/tabs/setup_theme.cpp:496
#: src/gui/widgets/tabs/setup_video.cpp:499
#: src/gui/widgets/tabs/setup_video.cpp:508
msgid "Restart your client for the change to take effect."
@@ -4700,178 +4769,169 @@ msgid "Allow screensaver to run"
msgstr ""
#. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:67
msgid "ONL"
msgstr ""
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:68
msgid "Who is online"
msgstr ""
#. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:70
msgid "HLP"
msgstr ""
#. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:73
msgid "QE"
msgstr ""
#. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:77 src/gui/windows/questswindow.cpp:126
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
msgid "Quests"
msgstr ""
#. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:76
msgid "BC"
msgstr ""
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:77
msgid "Bot checker"
msgstr ""
#. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:82
+#: src/gui/windowmenu.cpp:79
msgid "KS"
msgstr ""
#. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:83 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
msgid "Kill stats"
msgstr ""
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:82
msgid "Smilies"
msgstr ""
#. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:87
+#: src/gui/windowmenu.cpp:84
msgid "CH"
msgstr ""
#. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:95
+#: src/gui/windowmenu.cpp:92
msgid "STA"
msgstr ""
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:93
msgid "Status"
msgstr ""
#. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:95
msgid "EQU"
msgstr ""
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:58
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
msgid "Equipment"
msgstr ""
#. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:98
msgid "INV"
msgstr ""
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:130
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
#: src/inventory.cpp:257
msgid "Inventory"
msgstr ""
#. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:104
+#: src/gui/windowmenu.cpp:101
msgid "MAP"
msgstr ""
#. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:110
+#: src/gui/windowmenu.cpp:107
msgid "SKI"
msgstr ""
#. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
msgid "Skills"
msgstr ""
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:118
-msgid "SPE"
-msgstr ""
-
-#: src/gui/windowmenu.cpp:119
-msgid "Specials"
-msgstr ""
-
#. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:124
+#: src/gui/windowmenu.cpp:112
msgid "SOC"
msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:126 src/gui/windows/socialwindow.cpp:1284
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
msgid "Social"
msgstr ""
#. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:128
+#: src/gui/windowmenu.cpp:116
msgid "SH"
msgstr ""
#. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:132
+#: src/gui/windowmenu.cpp:120
msgid "SP"
msgstr ""
#. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:124
msgid "DR"
msgstr ""
#. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:128
msgid "YK"
msgstr ""
#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:130
msgid "Did you know"
msgstr ""
#. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:144
+#: src/gui/windowmenu.cpp:132
msgid "SHP"
msgstr ""
#. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:148
+#: src/gui/windowmenu.cpp:136
msgid "OU"
msgstr ""
#. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:152
+#: src/gui/windowmenu.cpp:140
msgid "DBG"
msgstr ""
#. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:149
msgid "WIN"
msgstr ""
#. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:153
msgid "SET"
msgstr ""
#. TRANSLATORS: short key name
#. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:301 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
#: src/gui/windows/outfitwindow.cpp:561
#, c-format
msgid "Key: %s"
@@ -4893,31 +4953,21 @@ msgstr ""
msgid "Result"
msgstr ""
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:58
-msgid "unsorted"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:60
-msgid "by price"
-msgstr ""
-
#. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:196
+#: src/gui/windows/buydialog.cpp:162
msgid "Create items"
msgstr ""
#. TRANSLATORS: buy dialog label
#. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:254 src/gui/windows/buydialog.cpp:541
-#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:366
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
#, c-format
msgid "Price: %s / Total: %s"
msgstr "వెల: %s / మొత్తం: %s"
#. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:263
+#: src/gui/windows/buydialog.cpp:229
msgid "Amount:"
msgstr ""
@@ -4927,8 +4977,8 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/itemamountwindow.cpp:159
-#: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
msgid "+"
msgstr ""
@@ -4939,8 +4989,8 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:271 src/gui/windows/itemamountwindow.cpp:157
-#: src/gui/windows/itemamountwindow.cpp:191 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
msgid "-"
msgstr ""
@@ -4948,9 +4998,9 @@ msgstr ""
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:274 src/gui/windows/charcreatedialog.cpp:119
-#: src/gui/windows/charselectdialog.cpp:593
-#: src/gui/windows/socialwindow.cpp:1307
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
msgid "Create"
msgstr "సృష్టించు"
@@ -4959,7 +5009,7 @@ msgstr "సృష్టించు"
#. TRANSLATORS: status bar label
#. TRANSLATORS: status window label
#. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:278 src/gui/windows/selldialog.cpp:112
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
#: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
#: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
msgid "Max"
@@ -5058,7 +5108,7 @@ msgstr ""
#. TRANSLATORS: login dialog label
#. TRANSLATORS: register dialog. label.
#: src/gui/windows/charcreatedialog.cpp:73
-#: src/gui/windows/editserverdialog.cpp:89 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
#: src/gui/windows/registerdialog.cpp:89
msgid "Name:"
msgstr "పేరు:"
@@ -5119,7 +5169,7 @@ msgstr "స్త్రీ"
#. TRANSLATORS: char create dialog label
#: src/gui/windows/charcreatedialog.cpp:115
-#: src/gui/windows/charcreatedialog.cpp:469
+#: src/gui/windows/charcreatedialog.cpp:458
#, c-format
msgid "Please distribute %d points"
msgstr ""
@@ -5135,17 +5185,17 @@ msgid "Look:"
msgstr ""
#. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:362
+#: src/gui/windows/charcreatedialog.cpp:351
msgid "Your name needs to be at least 4 characters."
msgstr "మీ పేరు కనీసం 4 అక్షరాల పొడవుండాలి."
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:459
+#: src/gui/windows/charcreatedialog.cpp:448
msgid "Character stats OK"
msgstr ""
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:475
+#: src/gui/windows/charcreatedialog.cpp:464
#, c-format
msgid "Please remove %d points"
msgstr ""
@@ -5174,7 +5224,7 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:104
-#: src/gui/windows/charselectdialog.cpp:588
+#: src/gui/windows/charselectdialog.cpp:580
#: src/gui/windows/updaterwindow.cpp:188
msgid "Play"
msgstr ""
@@ -5230,35 +5280,20 @@ msgstr ""
msgid "Enter password:"
msgstr ""
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:172
-msgid "rainbow 1"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:174
-msgid "rainbow 2"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:176
-msgid "rainbow 3"
-msgstr ""
-
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:755
+#: src/gui/windows/chatwindow.cpp:705
#, c-format
msgid "Present: %s; %d players are present."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1169
+#: src/gui/windows/chatwindow.cpp:1119
#, c-format
msgid "Whispering to %s: %s"
msgstr ""
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1613
+#: src/gui/windows/chatwindow.cpp:1563
#, c-format
msgid "%s's pet"
msgstr ""
@@ -5504,51 +5539,51 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:77
-#: src/gui/windows/itemamountwindow.cpp:161 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
msgid "OK"
msgstr "సరే"
#. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:66
+#: src/gui/windows/editserverdialog.cpp:45
msgid "Edit Server"
msgstr ""
#. TRANSLATORS: edit server dialog button
#. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:75
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
msgid "Connect"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:91
+#: src/gui/windows/editserverdialog.cpp:70
msgid "Address:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:93
+#: src/gui/windows/editserverdialog.cpp:72
msgid "Port:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:95
+#: src/gui/windows/editserverdialog.cpp:74
msgid "Server type:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:97
+#: src/gui/windows/editserverdialog.cpp:76
msgid "Description:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:99
+#: src/gui/windows/editserverdialog.cpp:78
msgid "Online list url:"
msgstr ""
#. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:220
+#: src/gui/windows/editserverdialog.cpp:188
msgid "Please at least type both the address and the port of the server."
msgstr ""
@@ -5568,47 +5603,47 @@ msgid "Did you know..."
msgstr ""
#. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:165
+#: src/gui/windows/itemamountwindow.cpp:164
msgid "All"
msgstr "అన్నీ"
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:221
+#: src/gui/windows/itemamountwindow.cpp:220
msgid "Select amount of items to trade."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:225
+#: src/gui/windows/itemamountwindow.cpp:224
msgid "Select amount of items to drop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:229
+#: src/gui/windows/itemamountwindow.cpp:228
msgid "Select amount of items to store."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:233
+#: src/gui/windows/itemamountwindow.cpp:232
msgid "Select amount of items to retrieve."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:237
+#: src/gui/windows/itemamountwindow.cpp:236
msgid "Select amount of items to split."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:241
+#: src/gui/windows/itemamountwindow.cpp:240
msgid "Add to buy shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:245
+#: src/gui/windows/itemamountwindow.cpp:244
msgid "Add to sell shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:249
+#: src/gui/windows/itemamountwindow.cpp:248
msgid "Unknown."
msgstr ""
@@ -5860,7 +5895,7 @@ msgstr ""
#. TRANSLATORS: shop window label
#. TRANSLATORS: shop window button
#. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:258
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
#: src/gui/windows/tradewindow.cpp:78
msgid "Add"
@@ -5962,53 +5997,53 @@ msgid "Do you really want to sell %s?"
msgstr ""
#. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
msgid "Choose Your Server"
msgstr ""
#. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
msgid "Load"
msgstr ""
#. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
msgid "Choose Your Server *** SAFE MODE ***"
msgstr ""
#. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
msgid "Use same ip for game sub servers"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
msgid "Waiting for server..."
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
msgid "Preparing download"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
msgid "Error retreiving server list!"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
msgid "requires a newer version"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
#, c-format
msgid "requires v%s"
msgstr ""
@@ -6089,277 +6124,277 @@ msgid "Skill %d"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:225
+#: src/gui/windows/socialwindow.cpp:227
#, c-format
msgid "Invited user %s to guild %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:240
+#: src/gui/windows/socialwindow.cpp:242
#, c-format
msgid "Guild %s quit requested."
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:254
+#: src/gui/windows/socialwindow.cpp:256
msgid "Member Invite to Guild"
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:256
+#: src/gui/windows/socialwindow.cpp:258
#, c-format
msgid "Who would you like to invite to guild %s?"
msgstr ""
#. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:266
+#: src/gui/windows/socialwindow.cpp:268
msgid "Leave Guild?"
msgstr ""
#. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:268
+#: src/gui/windows/socialwindow.cpp:270
#, c-format
msgid "Are you sure you want to leave guild %s?"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:279
+#: src/gui/windows/socialwindow.cpp:281
#, c-format
msgid "Members: %u/%u"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:301 src/gui/windows/socialwindow.cpp:373
-#: src/gui/windows/socialwindow.cpp:498
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
#, c-format
msgid "Players: %u/%u"
msgstr ""
#. TRANSLATORS: tab in social window
#. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:389 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
msgid "Party"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:429
+#: src/gui/windows/socialwindow.cpp:431
#, c-format
msgid "Invited user %s to party."
msgstr ""
#. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:444
+#: src/gui/windows/socialwindow.cpp:446
#, c-format
msgid "Party %s quit requested."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:458
+#: src/gui/windows/socialwindow.cpp:460
msgid "Member Invite to Party"
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:460
+#: src/gui/windows/socialwindow.cpp:462
#, c-format
msgid "Who would you like to invite to party %s?"
msgstr ""
#. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:470
+#: src/gui/windows/socialwindow.cpp:472
msgid "Leave Party?"
msgstr ""
#. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:472
+#: src/gui/windows/socialwindow.cpp:474
#, c-format
msgid "Are you sure you want to leave party %s?"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:698
+#: src/gui/windows/socialwindow.cpp:665
#, c-format
msgid "Visible players: %d"
msgstr ""
#. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:725
+#: src/gui/windows/socialwindow.cpp:692
msgid "Nav"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:827
+#: src/gui/windows/socialwindow.cpp:794
#, c-format
msgid "Portals: %u/%u"
msgstr ""
#. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1054
+#: src/gui/windows/socialwindow.cpp:1021
msgid "Atk"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1073
+#: src/gui/windows/socialwindow.cpp:1040
msgid "Priority mobs"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1075
+#: src/gui/windows/socialwindow.cpp:1042
msgid "Attack mobs"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1077
+#: src/gui/windows/socialwindow.cpp:1044
msgid "Ignore mobs"
msgstr ""
#. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1101
+#: src/gui/windows/socialwindow.cpp:1068
msgid "Pik"
msgstr ""
#. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1120
+#: src/gui/windows/socialwindow.cpp:1087
msgid "Pickup items"
msgstr ""
#. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1122
+#: src/gui/windows/socialwindow.cpp:1089
msgid "Ignore items"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1212
+#: src/gui/windows/socialwindow.cpp:1179
#, c-format
msgid "Friends: %u/%u"
msgstr ""
#. TRANSLATORS: party popup item
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1235 src/gui/windows/socialwindow.cpp:1727
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
msgid "Create Party"
msgstr ""
#. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1298
+#: src/gui/windows/socialwindow.cpp:1265
msgid "P"
msgstr ""
#. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1303
+#: src/gui/windows/socialwindow.cpp:1270
msgid "F"
msgstr ""
#. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1309
+#: src/gui/windows/socialwindow.cpp:1276
msgid "Invite"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1503
+#: src/gui/windows/socialwindow.cpp:1470
#, c-format
msgid "Accepted party invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1514
+#: src/gui/windows/socialwindow.cpp:1481
#, c-format
msgid "Rejected party invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1531
+#: src/gui/windows/socialwindow.cpp:1498
#, c-format
msgid "Accepted guild invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1545
+#: src/gui/windows/socialwindow.cpp:1512
#, c-format
msgid "Rejected guild invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1585
+#: src/gui/windows/socialwindow.cpp:1552
#, c-format
msgid "Creating guild called %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1606
+#: src/gui/windows/socialwindow.cpp:1573
#, c-format
msgid "Creating party called %s."
msgstr ""
#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1621
+#: src/gui/windows/socialwindow.cpp:1588
msgid "Guild Name"
msgstr ""
#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1623
+#: src/gui/windows/socialwindow.cpp:1590
msgid "Choose your guild's name."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1639
+#: src/gui/windows/socialwindow.cpp:1606
msgid "Received guild request, but one already exists."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1647
+#: src/gui/windows/socialwindow.cpp:1614
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1654
+#: src/gui/windows/socialwindow.cpp:1621
msgid "Accept Guild Invite"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1670
+#: src/gui/windows/socialwindow.cpp:1637
msgid "Received party request, but one already exists."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1682
+#: src/gui/windows/socialwindow.cpp:1649
msgid "You have been invited you to join a party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1687
+#: src/gui/windows/socialwindow.cpp:1654
#, c-format
msgid "You have been invited to join the %s party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1696
+#: src/gui/windows/socialwindow.cpp:1663
#, c-format
msgid "%s has invited you to join their party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1702
+#: src/gui/windows/socialwindow.cpp:1669
#, c-format
msgid "%s has invited you to join the %s party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1712
+#: src/gui/windows/socialwindow.cpp:1679
msgid "Accept Party Invite"
msgstr ""
-#: src/gui/windows/socialwindow.cpp:1728
+#: src/gui/windows/socialwindow.cpp:1695
msgid "Cannot create party. You are already in a party"
msgstr ""
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1734
+#: src/gui/windows/socialwindow.cpp:1701
msgid "Party Name"
msgstr ""
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1736
+#: src/gui/windows/socialwindow.cpp:1703
msgid "Choose your party's name."
msgstr ""
@@ -6401,113 +6436,68 @@ msgstr ""
msgid "Correction points: %d"
msgstr ""
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "No Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Allow Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:105
-msgid "Need Target"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "General Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "Life Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "War Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Transmute Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Nature Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:121
-msgid "Astral Magic"
-msgstr ""
-
#. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:164
+#: src/gui/windows/textcommandeditor.cpp:47
msgid "Command Editor"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:52
msgid "magic"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:54
msgid "other"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:173
+#: src/gui/windows/textcommandeditor.cpp:56
msgid "Symbol:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:176
+#: src/gui/windows/textcommandeditor.cpp:59
msgid "Command:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:179
+#: src/gui/windows/textcommandeditor.cpp:62
msgid "Comment:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:183
+#: src/gui/windows/textcommandeditor.cpp:66
msgid "Target Type:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:187
+#: src/gui/windows/textcommandeditor.cpp:70
msgid "Icon:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:190
+#: src/gui/windows/textcommandeditor.cpp:73
msgid "Mana:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:193
+#: src/gui/windows/textcommandeditor.cpp:76
msgid "Magic level:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:197
+#: src/gui/windows/textcommandeditor.cpp:80
msgid "Magic School:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:200
+#: src/gui/windows/textcommandeditor.cpp:83
msgid "School level:"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/windows/textcommandeditor.cpp:88
msgid "Save"
msgstr ""
@@ -6537,7 +6527,7 @@ msgid "Trade: You"
msgstr ""
#. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
#, c-format
msgid "You get %s"
msgstr ""
@@ -6553,12 +6543,12 @@ msgid "You give:"
msgstr ""
#. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
msgid "You don't have enough money."
msgstr ""
#. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
msgid ""
"Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
@@ -6629,17 +6619,17 @@ msgid "Who Is Online - Update"
msgstr ""
#. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:87
+#: src/gui/windows/worldselectdialog.cpp:49
msgid "Select World"
msgstr ""
#. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:93
+#: src/gui/windows/worldselectdialog.cpp:55
msgid "Change Login"
msgstr ""
#. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:95
+#: src/gui/windows/worldselectdialog.cpp:57
msgid "Choose World"
msgstr ""
@@ -6857,7 +6847,7 @@ msgid "Failed to create character. Most likely the name is already taken."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:281
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
msgid "Wrong name."
msgstr ""
@@ -7015,58 +7005,58 @@ msgid "Experience sharing unknown."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:154
+#: src/net/ea/loginhandler.cpp:149
msgid "Account was not found. Please re-login."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/ea/loginhandler.cpp:153
msgid "Old password incorrect."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:162
+#: src/net/ea/loginhandler.cpp:157
msgid "New password too short."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:166 src/net/ea/loginhandler.cpp:293
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
msgid "Unknown error."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:239
+#: src/net/ea/loginhandler.cpp:234
msgid "Unregistered ID."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:238
msgid "Wrong password."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:248
+#: src/net/ea/loginhandler.cpp:243
msgid "Account expired."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:252
+#: src/net/ea/loginhandler.cpp:247
msgid "Rejected from server."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:256
+#: src/net/ea/loginhandler.cpp:251
msgid ""
"You have been permanently banned from the game. Please contact the GM team."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:261
+#: src/net/ea/loginhandler.cpp:256
msgid "Client too old."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:265
+#: src/net/ea/loginhandler.cpp:260
#, c-format
msgid ""
"You have been temporarily banned from the game until %s.\n"
@@ -7074,22 +7064,22 @@ msgid ""
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:273
+#: src/net/ea/loginhandler.cpp:268
msgid "Server overpopulated."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:277
+#: src/net/ea/loginhandler.cpp:272
msgid "This user name is already taken."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:285
+#: src/net/ea/loginhandler.cpp:280
msgid "Incorrect email."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:289
+#: src/net/ea/loginhandler.cpp:284
msgid "Username permanently erased."
msgstr ""
@@ -7762,7 +7752,7 @@ msgstr ""
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
#: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr ""
diff --git a/po/th.po b/po/th.po
index 5960718c2..eab189b06 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: 2014-02-23 00:42+0300\n"
-"PO-Revision-Date: 2014-02-23 08:14+0000\n"
+"POT-Creation-Date: 2014-02-28 21:21+0300\n"
+"PO-Revision-Date: 2014-03-01 08:14+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"
@@ -29,7 +29,7 @@ msgid "Accepting incoming trade requests"
msgstr ""
#. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
msgid "Visible on map"
msgstr ""
@@ -38,455 +38,455 @@ msgstr ""
msgid "Human"
msgstr ""
-#: src/being/being.cpp:544
+#: src/being/being.cpp:496
msgid "dodge"
msgstr ""
-#: src/being/being.cpp:544
+#: src/being/being.cpp:496
msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1965 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1970 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr ""
#. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:392
+#: src/being/localplayer.cpp:376
#, c-format
msgid "You were killed by %s"
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1377
+#: src/being/localplayer.cpp:816
msgid "Tried to pick up nonexistent item."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1381
+#: src/being/localplayer.cpp:820
msgid "Item is too heavy."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1385
+#: src/being/localplayer.cpp:824
msgid "Item is too far away."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1389
+#: src/being/localplayer.cpp:828
msgid "Inventory is full."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1393
+#: src/being/localplayer.cpp:832
msgid "Stack is too big."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1397
+#: src/being/localplayer.cpp:836
msgid "Item belongs to someone else."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1401
+#: src/being/localplayer.cpp:840
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:1425
+#: src/being/localplayer.cpp:864
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
msgstr[0] ""
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1630 src/being/localplayer.cpp:1665
-#: src/being/localplayer.cpp:1666
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
msgid "xp"
msgstr ""
-#: src/being/localplayer.cpp:1671 src/being/localplayer.cpp:1678
-#: src/being/localplayer.cpp:1685
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
msgid "job"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1871
+#: src/being/localplayer.cpp:1285
msgid "(D) default moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1873
+#: src/being/localplayer.cpp:1287
msgid "(I) invert moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1875
+#: src/being/localplayer.cpp:1289
msgid "(c) moves with some crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1877
+#: src/being/localplayer.cpp:1291
msgid "(C) moves with crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1879
+#: src/being/localplayer.cpp:1293
msgid "(d) double normal + crazy"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1881
+#: src/being/localplayer.cpp:1295
msgid "(?) unknown move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1904
+#: src/being/localplayer.cpp:1318
#, c-format
msgid "(%u) crazy move number %u"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1910
+#: src/being/localplayer.cpp:1324
msgid "(a) custom crazy move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1915
+#: src/being/localplayer.cpp:1329
msgid "(?) crazy move"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1930
+#: src/being/localplayer.cpp:1344
msgid "(0) default moves to target"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1932
+#: src/being/localplayer.cpp:1346
msgid "(1) moves to target in distance 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1934
+#: src/being/localplayer.cpp:1348
msgid "(2) moves to target in distance 2"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1936
+#: src/being/localplayer.cpp:1350
msgid "(3) moves to target in distance 3"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1938
+#: src/being/localplayer.cpp:1352
msgid "(5) moves to target in distance 5"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1940
+#: src/being/localplayer.cpp:1354
msgid "(7) moves to target in distance 7"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1942
+#: src/being/localplayer.cpp:1356
msgid "(A) moves to target in attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1944
+#: src/being/localplayer.cpp:1358
msgid "(a) archer attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1946
+#: src/being/localplayer.cpp:1360
msgid "(B) moves to target in attack range - 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1948
+#: src/being/localplayer.cpp:1362
msgid "(?) move to target"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1968
+#: src/being/localplayer.cpp:1382
msgid "(D) default follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1970
+#: src/being/localplayer.cpp:1384
msgid "(R) relative follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1972
+#: src/being/localplayer.cpp:1386
msgid "(M) mirror follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1974
+#: src/being/localplayer.cpp:1388
msgid "(P) pet follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1976
+#: src/being/localplayer.cpp:1390
msgid "(?) unknown follow"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1996 src/being/localplayer.cpp:2004
-#: src/being/localplayer.cpp:2032
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
msgid "(?) attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1998 src/being/localplayer.cpp:2024
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
msgid "(D) default attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2000
+#: src/being/localplayer.cpp:1414
msgid "(s) switch attack without shield"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2002
+#: src/being/localplayer.cpp:1416
msgid "(S) switch attack with shield"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2026
+#: src/being/localplayer.cpp:1440
msgid "(G) go and attack"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2028
+#: src/being/localplayer.cpp:1442
msgid "(A) go, attack, pickup"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2030
+#: src/being/localplayer.cpp:1444
msgid "(d) without auto attack"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2084
+#: src/being/localplayer.cpp:1498
msgid "(S) small pick up 1x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2086
+#: src/being/localplayer.cpp:1500
msgid "(D) default pick up 2x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2088
+#: src/being/localplayer.cpp:1502
msgid "(F) forward pick up 2x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2090
+#: src/being/localplayer.cpp:1504
msgid "(3) pick up 3x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2092
+#: src/being/localplayer.cpp:1506
msgid "(g) go and pick up in distance 4"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2094
+#: src/being/localplayer.cpp:1508
msgid "(G) go and pick up in distance 8"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2096
+#: src/being/localplayer.cpp:1510
msgid "(A) go and pick up in max distance"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2098
+#: src/being/localplayer.cpp:1512
msgid "(?) pick up"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2112
+#: src/being/localplayer.cpp:1526
msgid "(N) normal map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2114
+#: src/being/localplayer.cpp:1528
msgid "(D) debug map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2116
+#: src/being/localplayer.cpp:1530
msgid "(u) ultra map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2118
+#: src/being/localplayer.cpp:1532
msgid "(U) ultra map view 2"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2120
+#: src/being/localplayer.cpp:1534
msgid "(e) empty map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2122
+#: src/being/localplayer.cpp:1536
msgid "(b) black & white map view"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2142
+#: src/being/localplayer.cpp:1556
msgid "(f) use #flar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2144
+#: src/being/localplayer.cpp:1558
msgid "(c) use #chiza for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2146
+#: src/being/localplayer.cpp:1560
msgid "(I) use #ingrav for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2148
+#: src/being/localplayer.cpp:1562
msgid "(F) use #frillyar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2150
+#: src/being/localplayer.cpp:1564
msgid "(U) use #upmarmu for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2152
+#: src/being/localplayer.cpp:1566
msgid "(?) magic attack"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2172
+#: src/being/localplayer.cpp:1586
msgid "(a) attack all players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2174
+#: src/being/localplayer.cpp:1588
msgid "(f) attack all except friends"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2176
+#: src/being/localplayer.cpp:1590
msgid "(b) attack bad relations"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2178
+#: src/being/localplayer.cpp:1592
msgid "(d) don't attack players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2180
+#: src/being/localplayer.cpp:1594
msgid "(?) pvp attack"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2200
+#: src/being/localplayer.cpp:1614
msgid "(D) default imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2202
+#: src/being/localplayer.cpp:1616
msgid "(O) outfits imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2204
+#: src/being/localplayer.cpp:1618
msgid "(?) imitation"
msgstr ""
#. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2233
+#: src/being/localplayer.cpp:1647
msgid "Away"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2256
+#: src/being/localplayer.cpp:1670
msgid "(O) on keyboard"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2258
+#: src/being/localplayer.cpp:1672
msgid "(A) away"
msgstr ""
#. TRANSLATORS: away type in status bar
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2260 src/being/localplayer.cpp:2278
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
msgid "(?) away"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2274
+#: src/being/localplayer.cpp:1688
msgid "(G) game camera mode"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2276
+#: src/being/localplayer.cpp:1690
msgid "(F) free camera mode"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2303
+#: src/being/localplayer.cpp:1717
msgid "Game modifiers are enabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2305
+#: src/being/localplayer.cpp:1719
msgid "Game modifiers are disabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2307
+#: src/being/localplayer.cpp:1721
msgid "Game modifiers are unknown"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3887
+#: src/being/localplayer.cpp:3287
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3893 src/being/localplayer.cpp:3918
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3903
+#: src/being/localplayer.cpp:3303
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3909 src/being/localplayer.cpp:3923
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4266
+#: src/being/localplayer.cpp:3666
#, c-format
msgid "You see %s"
msgstr ""
@@ -524,32 +524,32 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1139 src/gui/windowmenu.cpp:167
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
#: src/gui/windows/setupwindow.cpp:61
msgid "Setup"
msgstr "ตั้งค่า"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1143 src/gui/widgets/tabs/setup_perfomance.cpp:51
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1146 src/gui/widgets/tabs/setup_video.cpp:225
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:225
msgid "Video"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1149 src/gui/widgets/tabs/setup_theme.cpp:269
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1152 src/gui/windowmenu.cpp:74
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr ""
@@ -562,41 +562,41 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1156 src/gui/popups/popupmenu.cpp:619
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
#: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:69
-#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:138
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
#: src/gui/windows/shopwindow.cpp:78
msgid "Close"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1324
msgid "Logging in"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1367
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1492
+#: src/client.cpp:1489
msgid "Requesting characters"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1532
+#: src/client.cpp:1529
msgid "Connecting to the game server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1545
+#: src/client.cpp:1541
msgid "Changing game servers"
msgstr ""
@@ -611,12 +611,12 @@ msgstr ""
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1606 src/client.cpp:1617 src/client.cpp:1801
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:349
#: src/gui/windows/charselectdialog.cpp:299
-#: src/gui/windows/editserverdialog.cpp:218
+#: src/gui/windows/editserverdialog.cpp:186
#: src/gui/windows/registerdialog.cpp:260
#: src/gui/windows/unregisterdialog.cpp:146
#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
@@ -624,65 +624,65 @@ msgid "Error"
msgstr "ผิดพลาด"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1629
+#: src/client.cpp:1625
msgid "Requesting registration details"
msgstr ""
#. TRANSLATORS: password change message header
-#: src/client.cpp:1670
+#: src/client.cpp:1666
msgid "Password Change"
msgstr ""
#. TRANSLATORS: password change message text
-#: src/client.cpp:1672
+#: src/client.cpp:1668
msgid "Password changed successfully!"
msgstr ""
#. TRANSLATORS: email change message header
-#: src/client.cpp:1694
+#: src/client.cpp:1690
msgid "Email Change"
msgstr ""
#. TRANSLATORS: email change message text
-#: src/client.cpp:1696
+#: src/client.cpp:1692
msgid "Email changed successfully!"
msgstr ""
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1719
+#: src/client.cpp:1715
msgid "Unregister Successful"
msgstr ""
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1721
+#: src/client.cpp:1717
msgid "Farewell, come back any time..."
msgstr ""
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1998 src/client.cpp:2013 src/client.cpp:2058
-#: src/client.cpp:2074 src/client.cpp:2525 src/client.cpp:2533
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2230
+#: src/client.cpp:2232
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2271 src/client.cpp:2278
+#: src/client.cpp:2273 src/client.cpp:2280
msgid "Error creating updates directory!"
msgstr ""
-#: src/client.cpp:2300 src/client.cpp:2317
+#: src/client.cpp:2302 src/client.cpp:2319
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: error message question
-#: src/client.cpp:3001
+#: src/client.cpp:3003
msgid "Do you want to open support page?"
msgstr ""
@@ -928,99 +928,154 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:277 src/gui/widgets/tabs/chattab.cpp:464
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
msgid "General"
msgstr ""
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:293 src/gui/widgets/tabs/chattab.cpp:466
-#: src/gui/windowmenu.cpp:154 src/gui/windows/debugwindow.cpp:53
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:575
+#: src/game.cpp:563
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:585
+#: src/game.cpp:573
msgid "Saving screenshot failed!"
msgstr ""
#. TRANSLATORS: error message text
-#: src/game.cpp:656
+#: src/game.cpp:644
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:659
+#: src/game.cpp:647
msgid "Network Error"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
-msgid "black"
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
msgstr ""
+#. TRANSLATORS: chat color
#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
+msgid "black"
+msgstr ""
+
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
msgid "red"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
msgid "green"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
msgid "blue"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
msgid "gold"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
msgid "yellow"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
msgid "pink"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
msgid "purple"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
msgid "grey"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
msgid "brown"
msgstr ""
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr ""
+
#. TRANSLATORS: relation type
#: src/gui/models/playerrelationlistmodel.h:33
msgid "Neutral"
@@ -1056,46 +1111,61 @@ msgstr ""
msgid "Enemy"
msgstr ""
-#. TRANSLATORS: inventory sort mode
-#. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#: src/gui/models/sortlistmodelinv.h:34
-#: src/gui/widgets/tabs/setup_other.cpp:72
-#: src/gui/widgets/tabs/setup_visual.cpp:78 src/gui/windows/chatwindow.cpp:150
-msgid "default"
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:36 src/gui/windows/buydialog.cpp:62
-msgid "by name"
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
msgstr ""
+#. TRANSLATORS: buy dialog sort type.
#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
+msgid "by name"
+msgstr ""
+
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:38 src/gui/windows/buydialog.cpp:64
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
msgid "by id"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:40 src/gui/windows/buydialog.cpp:66
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
msgid "by weight"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:42 src/gui/windows/buydialog.cpp:68
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
msgid "by amount"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:44 src/gui/windows/buydialog.cpp:70
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
msgid "by type"
msgstr ""
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr ""
+
#. TRANSLATORS: update type
#. TRANSLATORS: onscreen button size
#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
@@ -1242,8 +1312,8 @@ msgstr ""
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
-#: src/gui/windows/buydialog.cpp:208 src/gui/windows/buydialog.cpp:220
-#: src/gui/windows/buydialog.cpp:274 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
msgid "Buy"
msgstr "ซื้อ"
@@ -1340,12 +1410,12 @@ msgstr ""
#: src/gui/windows/changepassworddialog.cpp:57
#: src/gui/windows/charcreatedialog.cpp:121
#: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:79
-#: src/gui/windows/itemamountwindow.cpp:163
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
-#: src/gui/windows/socialwindow.cpp:1238
-#: src/gui/windows/textcommandeditor.cpp:203 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:54
#: src/gui/windows/updaterwindow.cpp:186
msgid "Cancel"
@@ -1417,7 +1487,7 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:150 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
msgstr ""
@@ -1430,7 +1500,7 @@ msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:134
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
msgid "Spells"
msgstr ""
@@ -1486,7 +1556,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
#. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1311
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
msgid "Leave"
msgstr ""
@@ -1567,8 +1637,8 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
-#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:223
-#: src/gui/windows/inventorywindow.cpp:745 src/gui/windows/setupwindow.cpp:96
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
msgid "Store"
msgstr ""
@@ -1599,7 +1669,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
msgid "Retrieve"
msgstr ""
@@ -1632,8 +1702,8 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
-#: src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:656 src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr "ใช้"
@@ -1667,8 +1737,8 @@ msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: language
#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/widgets/tabs/setup_theme.cpp:127
-#: src/gui/windows/socialwindow.cpp:1003
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
msgid "(default)"
msgstr ""
@@ -1824,8 +1894,8 @@ msgstr ""
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:645
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
msgid "Unequip"
msgstr ""
@@ -1833,16 +1903,16 @@ msgstr ""
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:172
-#: src/gui/windows/inventorywindow.cpp:650 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:189
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
msgid "Drop..."
msgstr ""
@@ -1856,15 +1926,15 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:138
-#: src/gui/windows/inventorywindow.cpp:758
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
msgid "Drop"
msgstr "ทิ้ง"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
msgid "Split"
msgstr ""
@@ -2020,10 +2090,10 @@ msgstr ""
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:276
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/windows/serverdialog.cpp:198
msgid "Quit"
msgstr "ออก"
@@ -2585,7 +2655,7 @@ msgstr ""
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: register dialog. button.
#: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:146
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:330
#: src/gui/widgets/tabs/setup_visual.cpp:189
@@ -2612,9 +2682,8 @@ msgstr ""
#. TRANSLATORS: command editor button
#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
#: src/gui/windows/charselectdialog.cpp:108
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:94
-#: src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/textcommandeditor.cpp:207
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
msgid "Delete"
msgstr "ลบทิ้ง"
@@ -2650,7 +2719,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:130
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
msgid "Shortcuts"
msgstr ""
@@ -2658,7 +2727,7 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:151
msgid "Windows"
msgstr ""
@@ -2674,7 +2743,7 @@ msgstr ""
#. TRANSLATORS: settings tab name
#. TRANSLATORS: chat window name
#: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:88 src/gui/windows/chatwindow.cpp:203
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
msgid "Chat"
msgstr ""
@@ -2897,7 +2966,7 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:137
-#: src/gui/windows/inventorywindow.cpp:569
+#: src/gui/windows/inventorywindow.cpp:568
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
#, c-format
@@ -2917,7 +2986,7 @@ msgstr ""
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/windows/serverdialog.cpp:204
msgid "Edit"
msgstr ""
@@ -2970,7 +3039,7 @@ msgstr ""
#. TRANSLATORS: tab in social window
#. TRANSLATORS: guild chat tab name
#: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:184 src/gui/windows/socialwindow.cpp:320
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
#: src/net/ea/gui/guildtab.cpp:44
msgid "Guild"
msgstr ""
@@ -2981,142 +3050,142 @@ msgid "Lang"
msgstr ""
#. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:49
+#: src/gui/widgets/tabs/setup_audio.cpp:48
msgid "Audio"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:57
+#: src/gui/widgets/tabs/setup_audio.cpp:56
msgid "Basic settings"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:60
+#: src/gui/widgets/tabs/setup_audio.cpp:59
msgid "Enable Audio"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:63
+#: src/gui/widgets/tabs/setup_audio.cpp:62
msgid "Enable music"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:67
+#: src/gui/widgets/tabs/setup_audio.cpp:66
msgid "Enable game sfx"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:71
+#: src/gui/widgets/tabs/setup_audio.cpp:70
msgid "Enable gui sfx"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:74
msgid "Sfx volume"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:78
msgid "Music volume"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:82
msgid "Enable music fade out"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:86
msgid "Audio frequency"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:90
msgid "mono"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:93
+#: src/gui/widgets/tabs/setup_audio.cpp:92
msgid "stereo"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:94
msgid "surround"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:97
+#: src/gui/widgets/tabs/setup_audio.cpp:96
msgid "surround+center+lfe"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:98
msgid "Audio channels"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:104
+#: src/gui/widgets/tabs/setup_audio.cpp:103
msgid "Sound effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:106
msgid "Information dialog sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:110
msgid "Request dialog sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:115
+#: src/gui/widgets/tabs/setup_audio.cpp:114
msgid "Whisper message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:118
msgid "Guild / Party message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:122
msgid "Highlight message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:126
msgid "Global message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:130
msgid "Error message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:134
msgid "Trade request sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:138
msgid "Show window sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:142
msgid "Hide window sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:150
msgid "Enable mumble voice chat"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:156
+#: src/gui/widgets/tabs/setup_audio.cpp:155
msgid "Download music"
msgstr ""
@@ -3412,7 +3481,7 @@ msgstr ""
#. TRANSLATORS: unknown key name
#. TRANSLATORS: quests window quest name
#: src/gui/widgets/tabs/setup_input.cpp:364
-#: src/gui/windows/questswindow.cpp:263
+#: src/gui/windows/questswindow.cpp:249
msgid "unknown"
msgstr ""
@@ -3571,7 +3640,7 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: debug window tab
#. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:105
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
#: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
#: src/gui/windows/minimap.cpp:114
msgid "Map"
@@ -3739,9 +3808,9 @@ msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: shop window name
#. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:146
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
#: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windows/inventorywindow.cpp:194
msgid "Shop"
msgstr ""
@@ -4123,252 +4192,252 @@ msgid "When ignoring:"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:64
+#: src/gui/widgets/tabs/setup_theme.cpp:63
msgid "Very small (8)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:66
+#: src/gui/widgets/tabs/setup_theme.cpp:65
msgid "Very small (9)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:68
+#: src/gui/widgets/tabs/setup_theme.cpp:67
msgid "Tiny (10)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:70
+#: src/gui/widgets/tabs/setup_theme.cpp:69
msgid "Small (11)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:72
+#: src/gui/widgets/tabs/setup_theme.cpp:71
msgid "Medium (12)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:74
+#: src/gui/widgets/tabs/setup_theme.cpp:73
msgid "Normal (13)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:76
+#: src/gui/widgets/tabs/setup_theme.cpp:75
msgid "Large (14)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:78
+#: src/gui/widgets/tabs/setup_theme.cpp:77
msgid "Large (15)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:80
+#: src/gui/widgets/tabs/setup_theme.cpp:79
msgid "Large (16)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:82
+#: src/gui/widgets/tabs/setup_theme.cpp:81
msgid "Big (17)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:83
msgid "Big (18)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:85
msgid "Big (19)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:87
msgid "Very big (20)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:89
msgid "Very big (21)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:91
msgid "Very big (22)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:93
msgid "Huge (23)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:129
+#: src/gui/widgets/tabs/setup_theme.cpp:128
msgid "Chinese (China)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:131
+#: src/gui/widgets/tabs/setup_theme.cpp:130
msgid "Czech"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:133
+#: src/gui/widgets/tabs/setup_theme.cpp:132
msgid "English"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:135
+#: src/gui/widgets/tabs/setup_theme.cpp:134
msgid "Finnish"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:137
+#: src/gui/widgets/tabs/setup_theme.cpp:136
msgid "French"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:139
+#: src/gui/widgets/tabs/setup_theme.cpp:138
msgid "German"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:141
+#: src/gui/widgets/tabs/setup_theme.cpp:140
msgid "Indonesian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:143
+#: src/gui/widgets/tabs/setup_theme.cpp:142
msgid "Italian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:145
+#: src/gui/widgets/tabs/setup_theme.cpp:144
msgid "Polish"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:147
+#: src/gui/widgets/tabs/setup_theme.cpp:146
msgid "Japanese"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:148
msgid "Dutch (Belgium/Flemish)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:150
msgid "Portuguese"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:152
msgid "Portuguese (Brazilian)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:154
msgid "Russian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:156
msgid "Spanish (Castilian)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:158
msgid "Turkish"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:211
+#: src/gui/widgets/tabs/setup_theme.cpp:210
msgid "Gui theme"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:218
+#: src/gui/widgets/tabs/setup_theme.cpp:217
msgid "Main Font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:223
+#: src/gui/widgets/tabs/setup_theme.cpp:222
msgid "Language"
msgstr ""
#. TRANSLATORS: theme settings label
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:227 src/gui/windows/emotewindow.cpp:45
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
msgid "Bold font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:230
msgid "Particle font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:235
+#: src/gui/widgets/tabs/setup_theme.cpp:234
msgid "Help font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:239
+#: src/gui/widgets/tabs/setup_theme.cpp:238
msgid "Secure font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:242
msgid "Npc font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:247
+#: src/gui/widgets/tabs/setup_theme.cpp:246
msgid "Japanese font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:250
msgid "Chinese font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:256
+#: src/gui/widgets/tabs/setup_theme.cpp:255
msgid "Font size"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:261
+#: src/gui/widgets/tabs/setup_theme.cpp:260
msgid "Npc font size"
msgstr ""
#. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:265
+#: src/gui/widgets/tabs/setup_theme.cpp:264
msgid "i"
msgstr ""
#. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:404
+#: src/gui/widgets/tabs/setup_theme.cpp:403
msgid "Name: "
msgstr ""
-#: src/gui/widgets/tabs/setup_theme.cpp:405
+#: src/gui/widgets/tabs/setup_theme.cpp:404
msgid "Copyright:"
msgstr ""
#. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:470
+#: src/gui/widgets/tabs/setup_theme.cpp:469
msgid "Theme info"
msgstr ""
#. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:497
+#: src/gui/widgets/tabs/setup_theme.cpp:496
msgid "Theme Changed"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:497
+#: src/gui/widgets/tabs/setup_theme.cpp:496
#: src/gui/widgets/tabs/setup_video.cpp:499
#: src/gui/widgets/tabs/setup_video.cpp:508
msgid "Restart your client for the change to take effect."
@@ -4699,178 +4768,169 @@ msgid "Allow screensaver to run"
msgstr ""
#. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:67
msgid "ONL"
msgstr ""
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:68
msgid "Who is online"
msgstr ""
#. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:70
msgid "HLP"
msgstr ""
#. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:73
msgid "QE"
msgstr ""
#. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:77 src/gui/windows/questswindow.cpp:126
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
msgid "Quests"
msgstr ""
#. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:76
msgid "BC"
msgstr ""
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:77
msgid "Bot checker"
msgstr ""
#. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:82
+#: src/gui/windowmenu.cpp:79
msgid "KS"
msgstr ""
#. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:83 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
msgid "Kill stats"
msgstr ""
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:82
msgid "Smilies"
msgstr ""
#. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:87
+#: src/gui/windowmenu.cpp:84
msgid "CH"
msgstr ""
#. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:95
+#: src/gui/windowmenu.cpp:92
msgid "STA"
msgstr ""
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:93
msgid "Status"
msgstr "สถานะ"
#. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:95
msgid "EQU"
msgstr ""
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:58
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
msgid "Equipment"
msgstr ""
#. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:98
msgid "INV"
msgstr ""
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:130
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
#: src/inventory.cpp:257
msgid "Inventory"
msgstr ""
#. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:104
+#: src/gui/windowmenu.cpp:101
msgid "MAP"
msgstr ""
#. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:110
+#: src/gui/windowmenu.cpp:107
msgid "SKI"
msgstr ""
#. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
msgid "Skills"
msgstr ""
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:118
-msgid "SPE"
-msgstr ""
-
-#: src/gui/windowmenu.cpp:119
-msgid "Specials"
-msgstr ""
-
#. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:124
+#: src/gui/windowmenu.cpp:112
msgid "SOC"
msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:126 src/gui/windows/socialwindow.cpp:1284
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
msgid "Social"
msgstr ""
#. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:128
+#: src/gui/windowmenu.cpp:116
msgid "SH"
msgstr ""
#. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:132
+#: src/gui/windowmenu.cpp:120
msgid "SP"
msgstr ""
#. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:124
msgid "DR"
msgstr ""
#. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:128
msgid "YK"
msgstr ""
#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:130
msgid "Did you know"
msgstr ""
#. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:144
+#: src/gui/windowmenu.cpp:132
msgid "SHP"
msgstr ""
#. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:148
+#: src/gui/windowmenu.cpp:136
msgid "OU"
msgstr ""
#. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:152
+#: src/gui/windowmenu.cpp:140
msgid "DBG"
msgstr ""
#. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:149
msgid "WIN"
msgstr ""
#. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:153
msgid "SET"
msgstr ""
#. TRANSLATORS: short key name
#. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:301 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
#: src/gui/windows/outfitwindow.cpp:561
#, c-format
msgid "Key: %s"
@@ -4892,31 +4952,21 @@ msgstr ""
msgid "Result"
msgstr ""
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:58
-msgid "unsorted"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:60
-msgid "by price"
-msgstr ""
-
#. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:196
+#: src/gui/windows/buydialog.cpp:162
msgid "Create items"
msgstr ""
#. TRANSLATORS: buy dialog label
#. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:254 src/gui/windows/buydialog.cpp:541
-#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:366
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
#, c-format
msgid "Price: %s / Total: %s"
msgstr ""
#. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:263
+#: src/gui/windows/buydialog.cpp:229
msgid "Amount:"
msgstr ""
@@ -4926,8 +4976,8 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/itemamountwindow.cpp:159
-#: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
msgid "+"
msgstr ""
@@ -4938,8 +4988,8 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:271 src/gui/windows/itemamountwindow.cpp:157
-#: src/gui/windows/itemamountwindow.cpp:191 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
msgid "-"
msgstr ""
@@ -4947,9 +4997,9 @@ msgstr ""
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:274 src/gui/windows/charcreatedialog.cpp:119
-#: src/gui/windows/charselectdialog.cpp:593
-#: src/gui/windows/socialwindow.cpp:1307
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
msgid "Create"
msgstr "สร้าง"
@@ -4958,7 +5008,7 @@ msgstr "สร้าง"
#. TRANSLATORS: status bar label
#. TRANSLATORS: status window label
#. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:278 src/gui/windows/selldialog.cpp:112
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
#: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
#: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
msgid "Max"
@@ -5057,7 +5107,7 @@ msgstr ""
#. TRANSLATORS: login dialog label
#. TRANSLATORS: register dialog. label.
#: src/gui/windows/charcreatedialog.cpp:73
-#: src/gui/windows/editserverdialog.cpp:89 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
#: src/gui/windows/registerdialog.cpp:89
msgid "Name:"
msgstr "ชื่อ:"
@@ -5118,7 +5168,7 @@ msgstr "หญิง"
#. TRANSLATORS: char create dialog label
#: src/gui/windows/charcreatedialog.cpp:115
-#: src/gui/windows/charcreatedialog.cpp:469
+#: src/gui/windows/charcreatedialog.cpp:458
#, c-format
msgid "Please distribute %d points"
msgstr ""
@@ -5134,17 +5184,17 @@ msgid "Look:"
msgstr ""
#. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:362
+#: src/gui/windows/charcreatedialog.cpp:351
msgid "Your name needs to be at least 4 characters."
msgstr ""
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:459
+#: src/gui/windows/charcreatedialog.cpp:448
msgid "Character stats OK"
msgstr ""
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:475
+#: src/gui/windows/charcreatedialog.cpp:464
#, c-format
msgid "Please remove %d points"
msgstr ""
@@ -5173,7 +5223,7 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:104
-#: src/gui/windows/charselectdialog.cpp:588
+#: src/gui/windows/charselectdialog.cpp:580
#: src/gui/windows/updaterwindow.cpp:188
msgid "Play"
msgstr ""
@@ -5229,35 +5279,20 @@ msgstr ""
msgid "Enter password:"
msgstr ""
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:172
-msgid "rainbow 1"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:174
-msgid "rainbow 2"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:176
-msgid "rainbow 3"
-msgstr ""
-
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:755
+#: src/gui/windows/chatwindow.cpp:705
#, c-format
msgid "Present: %s; %d players are present."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1169
+#: src/gui/windows/chatwindow.cpp:1119
#, c-format
msgid "Whispering to %s: %s"
msgstr ""
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1613
+#: src/gui/windows/chatwindow.cpp:1563
#, c-format
msgid "%s's pet"
msgstr ""
@@ -5503,51 +5538,51 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:77
-#: src/gui/windows/itemamountwindow.cpp:161 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
msgid "OK"
msgstr ""
#. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:66
+#: src/gui/windows/editserverdialog.cpp:45
msgid "Edit Server"
msgstr ""
#. TRANSLATORS: edit server dialog button
#. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:75
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
msgid "Connect"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:91
+#: src/gui/windows/editserverdialog.cpp:70
msgid "Address:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:93
+#: src/gui/windows/editserverdialog.cpp:72
msgid "Port:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:95
+#: src/gui/windows/editserverdialog.cpp:74
msgid "Server type:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:97
+#: src/gui/windows/editserverdialog.cpp:76
msgid "Description:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:99
+#: src/gui/windows/editserverdialog.cpp:78
msgid "Online list url:"
msgstr ""
#. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:220
+#: src/gui/windows/editserverdialog.cpp:188
msgid "Please at least type both the address and the port of the server."
msgstr ""
@@ -5567,47 +5602,47 @@ msgid "Did you know..."
msgstr ""
#. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:165
+#: src/gui/windows/itemamountwindow.cpp:164
msgid "All"
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:221
+#: src/gui/windows/itemamountwindow.cpp:220
msgid "Select amount of items to trade."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:225
+#: src/gui/windows/itemamountwindow.cpp:224
msgid "Select amount of items to drop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:229
+#: src/gui/windows/itemamountwindow.cpp:228
msgid "Select amount of items to store."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:233
+#: src/gui/windows/itemamountwindow.cpp:232
msgid "Select amount of items to retrieve."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:237
+#: src/gui/windows/itemamountwindow.cpp:236
msgid "Select amount of items to split."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:241
+#: src/gui/windows/itemamountwindow.cpp:240
msgid "Add to buy shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:245
+#: src/gui/windows/itemamountwindow.cpp:244
msgid "Add to sell shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:249
+#: src/gui/windows/itemamountwindow.cpp:248
msgid "Unknown."
msgstr ""
@@ -5857,7 +5892,7 @@ msgstr ""
#. TRANSLATORS: shop window label
#. TRANSLATORS: shop window button
#. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:258
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
#: src/gui/windows/tradewindow.cpp:78
msgid "Add"
@@ -5959,53 +5994,53 @@ msgid "Do you really want to sell %s?"
msgstr ""
#. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
msgid "Choose Your Server"
msgstr ""
#. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
msgid "Load"
msgstr ""
#. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
msgid "Choose Your Server *** SAFE MODE ***"
msgstr ""
#. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
msgid "Use same ip for game sub servers"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
msgid "Waiting for server..."
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
msgid "Preparing download"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
msgid "Error retreiving server list!"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
msgid "requires a newer version"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
#, c-format
msgid "requires v%s"
msgstr ""
@@ -6086,277 +6121,277 @@ msgid "Skill %d"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:225
+#: src/gui/windows/socialwindow.cpp:227
#, c-format
msgid "Invited user %s to guild %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:240
+#: src/gui/windows/socialwindow.cpp:242
#, c-format
msgid "Guild %s quit requested."
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:254
+#: src/gui/windows/socialwindow.cpp:256
msgid "Member Invite to Guild"
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:256
+#: src/gui/windows/socialwindow.cpp:258
#, c-format
msgid "Who would you like to invite to guild %s?"
msgstr ""
#. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:266
+#: src/gui/windows/socialwindow.cpp:268
msgid "Leave Guild?"
msgstr ""
#. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:268
+#: src/gui/windows/socialwindow.cpp:270
#, c-format
msgid "Are you sure you want to leave guild %s?"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:279
+#: src/gui/windows/socialwindow.cpp:281
#, c-format
msgid "Members: %u/%u"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:301 src/gui/windows/socialwindow.cpp:373
-#: src/gui/windows/socialwindow.cpp:498
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
#, c-format
msgid "Players: %u/%u"
msgstr ""
#. TRANSLATORS: tab in social window
#. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:389 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
msgid "Party"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:429
+#: src/gui/windows/socialwindow.cpp:431
#, c-format
msgid "Invited user %s to party."
msgstr ""
#. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:444
+#: src/gui/windows/socialwindow.cpp:446
#, c-format
msgid "Party %s quit requested."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:458
+#: src/gui/windows/socialwindow.cpp:460
msgid "Member Invite to Party"
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:460
+#: src/gui/windows/socialwindow.cpp:462
#, c-format
msgid "Who would you like to invite to party %s?"
msgstr ""
#. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:470
+#: src/gui/windows/socialwindow.cpp:472
msgid "Leave Party?"
msgstr ""
#. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:472
+#: src/gui/windows/socialwindow.cpp:474
#, c-format
msgid "Are you sure you want to leave party %s?"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:698
+#: src/gui/windows/socialwindow.cpp:665
#, c-format
msgid "Visible players: %d"
msgstr ""
#. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:725
+#: src/gui/windows/socialwindow.cpp:692
msgid "Nav"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:827
+#: src/gui/windows/socialwindow.cpp:794
#, c-format
msgid "Portals: %u/%u"
msgstr ""
#. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1054
+#: src/gui/windows/socialwindow.cpp:1021
msgid "Atk"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1073
+#: src/gui/windows/socialwindow.cpp:1040
msgid "Priority mobs"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1075
+#: src/gui/windows/socialwindow.cpp:1042
msgid "Attack mobs"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1077
+#: src/gui/windows/socialwindow.cpp:1044
msgid "Ignore mobs"
msgstr ""
#. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1101
+#: src/gui/windows/socialwindow.cpp:1068
msgid "Pik"
msgstr ""
#. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1120
+#: src/gui/windows/socialwindow.cpp:1087
msgid "Pickup items"
msgstr ""
#. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1122
+#: src/gui/windows/socialwindow.cpp:1089
msgid "Ignore items"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1212
+#: src/gui/windows/socialwindow.cpp:1179
#, c-format
msgid "Friends: %u/%u"
msgstr ""
#. TRANSLATORS: party popup item
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1235 src/gui/windows/socialwindow.cpp:1727
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
msgid "Create Party"
msgstr ""
#. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1298
+#: src/gui/windows/socialwindow.cpp:1265
msgid "P"
msgstr ""
#. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1303
+#: src/gui/windows/socialwindow.cpp:1270
msgid "F"
msgstr ""
#. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1309
+#: src/gui/windows/socialwindow.cpp:1276
msgid "Invite"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1503
+#: src/gui/windows/socialwindow.cpp:1470
#, c-format
msgid "Accepted party invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1514
+#: src/gui/windows/socialwindow.cpp:1481
#, c-format
msgid "Rejected party invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1531
+#: src/gui/windows/socialwindow.cpp:1498
#, c-format
msgid "Accepted guild invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1545
+#: src/gui/windows/socialwindow.cpp:1512
#, c-format
msgid "Rejected guild invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1585
+#: src/gui/windows/socialwindow.cpp:1552
#, c-format
msgid "Creating guild called %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1606
+#: src/gui/windows/socialwindow.cpp:1573
#, c-format
msgid "Creating party called %s."
msgstr ""
#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1621
+#: src/gui/windows/socialwindow.cpp:1588
msgid "Guild Name"
msgstr ""
#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1623
+#: src/gui/windows/socialwindow.cpp:1590
msgid "Choose your guild's name."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1639
+#: src/gui/windows/socialwindow.cpp:1606
msgid "Received guild request, but one already exists."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1647
+#: src/gui/windows/socialwindow.cpp:1614
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1654
+#: src/gui/windows/socialwindow.cpp:1621
msgid "Accept Guild Invite"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1670
+#: src/gui/windows/socialwindow.cpp:1637
msgid "Received party request, but one already exists."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1682
+#: src/gui/windows/socialwindow.cpp:1649
msgid "You have been invited you to join a party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1687
+#: src/gui/windows/socialwindow.cpp:1654
#, c-format
msgid "You have been invited to join the %s party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1696
+#: src/gui/windows/socialwindow.cpp:1663
#, c-format
msgid "%s has invited you to join their party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1702
+#: src/gui/windows/socialwindow.cpp:1669
#, c-format
msgid "%s has invited you to join the %s party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1712
+#: src/gui/windows/socialwindow.cpp:1679
msgid "Accept Party Invite"
msgstr ""
-#: src/gui/windows/socialwindow.cpp:1728
+#: src/gui/windows/socialwindow.cpp:1695
msgid "Cannot create party. You are already in a party"
msgstr ""
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1734
+#: src/gui/windows/socialwindow.cpp:1701
msgid "Party Name"
msgstr ""
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1736
+#: src/gui/windows/socialwindow.cpp:1703
msgid "Choose your party's name."
msgstr ""
@@ -6398,113 +6433,68 @@ msgstr ""
msgid "Correction points: %d"
msgstr ""
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "No Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Allow Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:105
-msgid "Need Target"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "General Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "Life Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "War Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Transmute Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Nature Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:121
-msgid "Astral Magic"
-msgstr ""
-
#. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:164
+#: src/gui/windows/textcommandeditor.cpp:47
msgid "Command Editor"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:52
msgid "magic"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:54
msgid "other"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:173
+#: src/gui/windows/textcommandeditor.cpp:56
msgid "Symbol:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:176
+#: src/gui/windows/textcommandeditor.cpp:59
msgid "Command:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:179
+#: src/gui/windows/textcommandeditor.cpp:62
msgid "Comment:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:183
+#: src/gui/windows/textcommandeditor.cpp:66
msgid "Target Type:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:187
+#: src/gui/windows/textcommandeditor.cpp:70
msgid "Icon:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:190
+#: src/gui/windows/textcommandeditor.cpp:73
msgid "Mana:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:193
+#: src/gui/windows/textcommandeditor.cpp:76
msgid "Magic level:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:197
+#: src/gui/windows/textcommandeditor.cpp:80
msgid "Magic School:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:200
+#: src/gui/windows/textcommandeditor.cpp:83
msgid "School level:"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/windows/textcommandeditor.cpp:88
msgid "Save"
msgstr ""
@@ -6534,7 +6524,7 @@ msgid "Trade: You"
msgstr ""
#. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
#, c-format
msgid "You get %s"
msgstr ""
@@ -6550,12 +6540,12 @@ msgid "You give:"
msgstr ""
#. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
msgid "You don't have enough money."
msgstr ""
#. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
msgid ""
"Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
@@ -6626,17 +6616,17 @@ msgid "Who Is Online - Update"
msgstr ""
#. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:87
+#: src/gui/windows/worldselectdialog.cpp:49
msgid "Select World"
msgstr ""
#. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:93
+#: src/gui/windows/worldselectdialog.cpp:55
msgid "Change Login"
msgstr ""
#. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:95
+#: src/gui/windows/worldselectdialog.cpp:57
msgid "Choose World"
msgstr ""
@@ -6854,7 +6844,7 @@ msgid "Failed to create character. Most likely the name is already taken."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:281
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
msgid "Wrong name."
msgstr ""
@@ -7012,58 +7002,58 @@ msgid "Experience sharing unknown."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:154
+#: src/net/ea/loginhandler.cpp:149
msgid "Account was not found. Please re-login."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/ea/loginhandler.cpp:153
msgid "Old password incorrect."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:162
+#: src/net/ea/loginhandler.cpp:157
msgid "New password too short."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:166 src/net/ea/loginhandler.cpp:293
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
msgid "Unknown error."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:239
+#: src/net/ea/loginhandler.cpp:234
msgid "Unregistered ID."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:238
msgid "Wrong password."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:248
+#: src/net/ea/loginhandler.cpp:243
msgid "Account expired."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:252
+#: src/net/ea/loginhandler.cpp:247
msgid "Rejected from server."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:256
+#: src/net/ea/loginhandler.cpp:251
msgid ""
"You have been permanently banned from the game. Please contact the GM team."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:261
+#: src/net/ea/loginhandler.cpp:256
msgid "Client too old."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:265
+#: src/net/ea/loginhandler.cpp:260
#, c-format
msgid ""
"You have been temporarily banned from the game until %s.\n"
@@ -7071,22 +7061,22 @@ msgid ""
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:273
+#: src/net/ea/loginhandler.cpp:268
msgid "Server overpopulated."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:277
+#: src/net/ea/loginhandler.cpp:272
msgid "This user name is already taken."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:285
+#: src/net/ea/loginhandler.cpp:280
msgid "Incorrect email."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:289
+#: src/net/ea/loginhandler.cpp:284
msgid "Username permanently erased."
msgstr ""
@@ -7759,7 +7749,7 @@ msgstr ""
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
#: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr ""
diff --git a/po/tr.po b/po/tr.po
index 99654e22b..ce2cf5551 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -11,7 +11,7 @@ msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
"POT-Creation-Date: 2014-02-28 21:21+0300\n"
-"PO-Revision-Date: 2014-02-23 08:14+0000\n"
+"PO-Revision-Date: 2014-03-01 08:14+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/manaplus/"
"language/tr/)\n"
@@ -7804,9 +7804,3 @@ msgstr "Bilinmeyen nesne"
#: src/resources/db/petdb.cpp:99
msgid "pet"
msgstr ""
-
-#~ msgid "SPE"
-#~ msgstr "ÖZL"
-
-#~ msgid "Specials"
-#~ msgstr "Özellikler"
diff --git a/po/vls.po b/po/vls.po
index 6e0afb1f8..e4514ff6d 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: 2014-02-23 00:42+0300\n"
-"PO-Revision-Date: 2014-02-23 08:14+0000\n"
+"POT-Creation-Date: 2014-02-28 21:21+0300\n"
+"PO-Revision-Date: 2014-03-01 08:14+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"
@@ -28,7 +28,7 @@ msgid "Accepting incoming trade requests"
msgstr ""
#. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
msgid "Visible on map"
msgstr ""
@@ -37,68 +37,68 @@ msgstr ""
msgid "Human"
msgstr ""
-#: src/being/being.cpp:544
+#: src/being/being.cpp:496
msgid "dodge"
msgstr ""
-#: src/being/being.cpp:544
+#: src/being/being.cpp:496
msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1965 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1970 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr ""
#. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:392
+#: src/being/localplayer.cpp:376
#, c-format
msgid "You were killed by %s"
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1377
+#: src/being/localplayer.cpp:816
msgid "Tried to pick up nonexistent item."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1381
+#: src/being/localplayer.cpp:820
msgid "Item is too heavy."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1385
+#: src/being/localplayer.cpp:824
msgid "Item is too far away."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1389
+#: src/being/localplayer.cpp:828
msgid "Inventory is full."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1393
+#: src/being/localplayer.cpp:832
msgid "Stack is too big."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1397
+#: src/being/localplayer.cpp:836
msgid "Item belongs to someone else."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1401
+#: src/being/localplayer.cpp:840
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:1425
+#: src/being/localplayer.cpp:864
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -106,387 +106,387 @@ msgstr[0] ""
msgstr[1] ""
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1630 src/being/localplayer.cpp:1665
-#: src/being/localplayer.cpp:1666
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
msgid "xp"
msgstr ""
-#: src/being/localplayer.cpp:1671 src/being/localplayer.cpp:1678
-#: src/being/localplayer.cpp:1685
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
msgid "job"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1871
+#: src/being/localplayer.cpp:1285
msgid "(D) default moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1873
+#: src/being/localplayer.cpp:1287
msgid "(I) invert moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1875
+#: src/being/localplayer.cpp:1289
msgid "(c) moves with some crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1877
+#: src/being/localplayer.cpp:1291
msgid "(C) moves with crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1879
+#: src/being/localplayer.cpp:1293
msgid "(d) double normal + crazy"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1881
+#: src/being/localplayer.cpp:1295
msgid "(?) unknown move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1904
+#: src/being/localplayer.cpp:1318
#, c-format
msgid "(%u) crazy move number %u"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1910
+#: src/being/localplayer.cpp:1324
msgid "(a) custom crazy move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1915
+#: src/being/localplayer.cpp:1329
msgid "(?) crazy move"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1930
+#: src/being/localplayer.cpp:1344
msgid "(0) default moves to target"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1932
+#: src/being/localplayer.cpp:1346
msgid "(1) moves to target in distance 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1934
+#: src/being/localplayer.cpp:1348
msgid "(2) moves to target in distance 2"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1936
+#: src/being/localplayer.cpp:1350
msgid "(3) moves to target in distance 3"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1938
+#: src/being/localplayer.cpp:1352
msgid "(5) moves to target in distance 5"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1940
+#: src/being/localplayer.cpp:1354
msgid "(7) moves to target in distance 7"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1942
+#: src/being/localplayer.cpp:1356
msgid "(A) moves to target in attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1944
+#: src/being/localplayer.cpp:1358
msgid "(a) archer attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1946
+#: src/being/localplayer.cpp:1360
msgid "(B) moves to target in attack range - 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1948
+#: src/being/localplayer.cpp:1362
msgid "(?) move to target"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1968
+#: src/being/localplayer.cpp:1382
msgid "(D) default follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1970
+#: src/being/localplayer.cpp:1384
msgid "(R) relative follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1972
+#: src/being/localplayer.cpp:1386
msgid "(M) mirror follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1974
+#: src/being/localplayer.cpp:1388
msgid "(P) pet follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1976
+#: src/being/localplayer.cpp:1390
msgid "(?) unknown follow"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1996 src/being/localplayer.cpp:2004
-#: src/being/localplayer.cpp:2032
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
msgid "(?) attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1998 src/being/localplayer.cpp:2024
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
msgid "(D) default attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2000
+#: src/being/localplayer.cpp:1414
msgid "(s) switch attack without shield"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2002
+#: src/being/localplayer.cpp:1416
msgid "(S) switch attack with shield"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2026
+#: src/being/localplayer.cpp:1440
msgid "(G) go and attack"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2028
+#: src/being/localplayer.cpp:1442
msgid "(A) go, attack, pickup"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2030
+#: src/being/localplayer.cpp:1444
msgid "(d) without auto attack"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2084
+#: src/being/localplayer.cpp:1498
msgid "(S) small pick up 1x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2086
+#: src/being/localplayer.cpp:1500
msgid "(D) default pick up 2x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2088
+#: src/being/localplayer.cpp:1502
msgid "(F) forward pick up 2x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2090
+#: src/being/localplayer.cpp:1504
msgid "(3) pick up 3x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2092
+#: src/being/localplayer.cpp:1506
msgid "(g) go and pick up in distance 4"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2094
+#: src/being/localplayer.cpp:1508
msgid "(G) go and pick up in distance 8"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2096
+#: src/being/localplayer.cpp:1510
msgid "(A) go and pick up in max distance"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2098
+#: src/being/localplayer.cpp:1512
msgid "(?) pick up"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2112
+#: src/being/localplayer.cpp:1526
msgid "(N) normal map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2114
+#: src/being/localplayer.cpp:1528
msgid "(D) debug map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2116
+#: src/being/localplayer.cpp:1530
msgid "(u) ultra map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2118
+#: src/being/localplayer.cpp:1532
msgid "(U) ultra map view 2"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2120
+#: src/being/localplayer.cpp:1534
msgid "(e) empty map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2122
+#: src/being/localplayer.cpp:1536
msgid "(b) black & white map view"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2142
+#: src/being/localplayer.cpp:1556
msgid "(f) use #flar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2144
+#: src/being/localplayer.cpp:1558
msgid "(c) use #chiza for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2146
+#: src/being/localplayer.cpp:1560
msgid "(I) use #ingrav for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2148
+#: src/being/localplayer.cpp:1562
msgid "(F) use #frillyar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2150
+#: src/being/localplayer.cpp:1564
msgid "(U) use #upmarmu for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2152
+#: src/being/localplayer.cpp:1566
msgid "(?) magic attack"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2172
+#: src/being/localplayer.cpp:1586
msgid "(a) attack all players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2174
+#: src/being/localplayer.cpp:1588
msgid "(f) attack all except friends"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2176
+#: src/being/localplayer.cpp:1590
msgid "(b) attack bad relations"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2178
+#: src/being/localplayer.cpp:1592
msgid "(d) don't attack players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2180
+#: src/being/localplayer.cpp:1594
msgid "(?) pvp attack"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2200
+#: src/being/localplayer.cpp:1614
msgid "(D) default imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2202
+#: src/being/localplayer.cpp:1616
msgid "(O) outfits imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2204
+#: src/being/localplayer.cpp:1618
msgid "(?) imitation"
msgstr ""
#. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2233
+#: src/being/localplayer.cpp:1647
msgid "Away"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2256
+#: src/being/localplayer.cpp:1670
msgid "(O) on keyboard"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2258
+#: src/being/localplayer.cpp:1672
msgid "(A) away"
msgstr ""
#. TRANSLATORS: away type in status bar
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2260 src/being/localplayer.cpp:2278
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
msgid "(?) away"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2274
+#: src/being/localplayer.cpp:1688
msgid "(G) game camera mode"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2276
+#: src/being/localplayer.cpp:1690
msgid "(F) free camera mode"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2303
+#: src/being/localplayer.cpp:1717
msgid "Game modifiers are enabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2305
+#: src/being/localplayer.cpp:1719
msgid "Game modifiers are disabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2307
+#: src/being/localplayer.cpp:1721
msgid "Game modifiers are unknown"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3887
+#: src/being/localplayer.cpp:3287
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3893 src/being/localplayer.cpp:3918
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3903
+#: src/being/localplayer.cpp:3303
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3909 src/being/localplayer.cpp:3923
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4266
+#: src/being/localplayer.cpp:3666
#, c-format
msgid "You see %s"
msgstr ""
@@ -524,32 +524,32 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1139 src/gui/windowmenu.cpp:167
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
#: src/gui/windows/setupwindow.cpp:61
msgid "Setup"
msgstr ""
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1143 src/gui/widgets/tabs/setup_perfomance.cpp:51
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1146 src/gui/widgets/tabs/setup_video.cpp:225
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:225
msgid "Video"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1149 src/gui/widgets/tabs/setup_theme.cpp:269
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1152 src/gui/windowmenu.cpp:74
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr ""
@@ -562,41 +562,41 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1156 src/gui/popups/popupmenu.cpp:619
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
#: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:69
-#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:138
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
#: src/gui/windows/shopwindow.cpp:78
msgid "Close"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1324
msgid "Logging in"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1367
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1492
+#: src/client.cpp:1489
msgid "Requesting characters"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1532
+#: src/client.cpp:1529
msgid "Connecting to the game server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1545
+#: src/client.cpp:1541
msgid "Changing game servers"
msgstr ""
@@ -611,12 +611,12 @@ msgstr ""
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1606 src/client.cpp:1617 src/client.cpp:1801
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:349
#: src/gui/windows/charselectdialog.cpp:299
-#: src/gui/windows/editserverdialog.cpp:218
+#: src/gui/windows/editserverdialog.cpp:186
#: src/gui/windows/registerdialog.cpp:260
#: src/gui/windows/unregisterdialog.cpp:146
#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
@@ -624,65 +624,65 @@ msgid "Error"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1629
+#: src/client.cpp:1625
msgid "Requesting registration details"
msgstr ""
#. TRANSLATORS: password change message header
-#: src/client.cpp:1670
+#: src/client.cpp:1666
msgid "Password Change"
msgstr ""
#. TRANSLATORS: password change message text
-#: src/client.cpp:1672
+#: src/client.cpp:1668
msgid "Password changed successfully!"
msgstr ""
#. TRANSLATORS: email change message header
-#: src/client.cpp:1694
+#: src/client.cpp:1690
msgid "Email Change"
msgstr ""
#. TRANSLATORS: email change message text
-#: src/client.cpp:1696
+#: src/client.cpp:1692
msgid "Email changed successfully!"
msgstr ""
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1719
+#: src/client.cpp:1715
msgid "Unregister Successful"
msgstr ""
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1721
+#: src/client.cpp:1717
msgid "Farewell, come back any time..."
msgstr ""
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1998 src/client.cpp:2013 src/client.cpp:2058
-#: src/client.cpp:2074 src/client.cpp:2525 src/client.cpp:2533
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2230
+#: src/client.cpp:2232
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2271 src/client.cpp:2278
+#: src/client.cpp:2273 src/client.cpp:2280
msgid "Error creating updates directory!"
msgstr ""
-#: src/client.cpp:2300 src/client.cpp:2317
+#: src/client.cpp:2302 src/client.cpp:2319
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: error message question
-#: src/client.cpp:3001
+#: src/client.cpp:3003
msgid "Do you want to open support page?"
msgstr ""
@@ -928,99 +928,154 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:277 src/gui/widgets/tabs/chattab.cpp:464
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
msgid "General"
msgstr ""
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:293 src/gui/widgets/tabs/chattab.cpp:466
-#: src/gui/windowmenu.cpp:154 src/gui/windows/debugwindow.cpp:53
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:575
+#: src/game.cpp:563
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:585
+#: src/game.cpp:573
msgid "Saving screenshot failed!"
msgstr ""
#. TRANSLATORS: error message text
-#: src/game.cpp:656
+#: src/game.cpp:644
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:659
+#: src/game.cpp:647
msgid "Network Error"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
-msgid "black"
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
msgstr ""
+#. TRANSLATORS: chat color
#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
+msgid "black"
+msgstr ""
+
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
msgid "red"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
msgid "green"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
msgid "blue"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
msgid "gold"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
msgid "yellow"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
msgid "pink"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
msgid "purple"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
msgid "grey"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
msgid "brown"
msgstr ""
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr ""
+
#. TRANSLATORS: relation type
#: src/gui/models/playerrelationlistmodel.h:33
msgid "Neutral"
@@ -1056,46 +1111,61 @@ msgstr ""
msgid "Enemy"
msgstr ""
-#. TRANSLATORS: inventory sort mode
-#. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#: src/gui/models/sortlistmodelinv.h:34
-#: src/gui/widgets/tabs/setup_other.cpp:72
-#: src/gui/widgets/tabs/setup_visual.cpp:78 src/gui/windows/chatwindow.cpp:150
-msgid "default"
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:36 src/gui/windows/buydialog.cpp:62
-msgid "by name"
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
msgstr ""
+#. TRANSLATORS: buy dialog sort type.
#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
+msgid "by name"
+msgstr ""
+
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:38 src/gui/windows/buydialog.cpp:64
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
msgid "by id"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:40 src/gui/windows/buydialog.cpp:66
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
msgid "by weight"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:42 src/gui/windows/buydialog.cpp:68
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
msgid "by amount"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:44 src/gui/windows/buydialog.cpp:70
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
msgid "by type"
msgstr ""
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr ""
+
#. TRANSLATORS: update type
#. TRANSLATORS: onscreen button size
#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
@@ -1242,8 +1312,8 @@ msgstr ""
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
-#: src/gui/windows/buydialog.cpp:208 src/gui/windows/buydialog.cpp:220
-#: src/gui/windows/buydialog.cpp:274 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
msgid "Buy"
msgstr ""
@@ -1340,12 +1410,12 @@ msgstr ""
#: src/gui/windows/changepassworddialog.cpp:57
#: src/gui/windows/charcreatedialog.cpp:121
#: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:79
-#: src/gui/windows/itemamountwindow.cpp:163
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
-#: src/gui/windows/socialwindow.cpp:1238
-#: src/gui/windows/textcommandeditor.cpp:203 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:54
#: src/gui/windows/updaterwindow.cpp:186
msgid "Cancel"
@@ -1417,7 +1487,7 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:150 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
msgstr ""
@@ -1430,7 +1500,7 @@ msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:134
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
msgid "Spells"
msgstr ""
@@ -1486,7 +1556,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
#. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1311
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
msgid "Leave"
msgstr ""
@@ -1567,8 +1637,8 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
-#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:223
-#: src/gui/windows/inventorywindow.cpp:745 src/gui/windows/setupwindow.cpp:96
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
msgid "Store"
msgstr ""
@@ -1599,7 +1669,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
msgid "Retrieve"
msgstr ""
@@ -1632,8 +1702,8 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
-#: src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:656 src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr ""
@@ -1667,8 +1737,8 @@ msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: language
#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/widgets/tabs/setup_theme.cpp:127
-#: src/gui/windows/socialwindow.cpp:1003
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
msgid "(default)"
msgstr ""
@@ -1824,8 +1894,8 @@ msgstr ""
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:645
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
msgid "Unequip"
msgstr ""
@@ -1833,16 +1903,16 @@ msgstr ""
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:172
-#: src/gui/windows/inventorywindow.cpp:650 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:189
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
msgid "Drop..."
msgstr ""
@@ -1856,15 +1926,15 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:138
-#: src/gui/windows/inventorywindow.cpp:758
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
msgid "Drop"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
msgid "Split"
msgstr ""
@@ -2020,10 +2090,10 @@ msgstr ""
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:276
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/windows/serverdialog.cpp:198
msgid "Quit"
msgstr ""
@@ -2585,7 +2655,7 @@ msgstr ""
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: register dialog. button.
#: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:146
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:330
#: src/gui/widgets/tabs/setup_visual.cpp:189
@@ -2612,9 +2682,8 @@ msgstr ""
#. TRANSLATORS: command editor button
#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
#: src/gui/windows/charselectdialog.cpp:108
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:94
-#: src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/textcommandeditor.cpp:207
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
msgid "Delete"
msgstr ""
@@ -2650,7 +2719,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:130
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
msgid "Shortcuts"
msgstr ""
@@ -2658,7 +2727,7 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:151
msgid "Windows"
msgstr ""
@@ -2674,7 +2743,7 @@ msgstr ""
#. TRANSLATORS: settings tab name
#. TRANSLATORS: chat window name
#: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:88 src/gui/windows/chatwindow.cpp:203
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
msgid "Chat"
msgstr ""
@@ -2897,7 +2966,7 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:137
-#: src/gui/windows/inventorywindow.cpp:569
+#: src/gui/windows/inventorywindow.cpp:568
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
#, c-format
@@ -2917,7 +2986,7 @@ msgstr ""
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/windows/serverdialog.cpp:204
msgid "Edit"
msgstr ""
@@ -2970,7 +3039,7 @@ msgstr ""
#. TRANSLATORS: tab in social window
#. TRANSLATORS: guild chat tab name
#: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:184 src/gui/windows/socialwindow.cpp:320
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
#: src/net/ea/gui/guildtab.cpp:44
msgid "Guild"
msgstr ""
@@ -2981,142 +3050,142 @@ msgid "Lang"
msgstr ""
#. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:49
+#: src/gui/widgets/tabs/setup_audio.cpp:48
msgid "Audio"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:57
+#: src/gui/widgets/tabs/setup_audio.cpp:56
msgid "Basic settings"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:60
+#: src/gui/widgets/tabs/setup_audio.cpp:59
msgid "Enable Audio"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:63
+#: src/gui/widgets/tabs/setup_audio.cpp:62
msgid "Enable music"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:67
+#: src/gui/widgets/tabs/setup_audio.cpp:66
msgid "Enable game sfx"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:71
+#: src/gui/widgets/tabs/setup_audio.cpp:70
msgid "Enable gui sfx"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:74
msgid "Sfx volume"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:78
msgid "Music volume"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:82
msgid "Enable music fade out"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:86
msgid "Audio frequency"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:90
msgid "mono"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:93
+#: src/gui/widgets/tabs/setup_audio.cpp:92
msgid "stereo"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:94
msgid "surround"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:97
+#: src/gui/widgets/tabs/setup_audio.cpp:96
msgid "surround+center+lfe"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:98
msgid "Audio channels"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:104
+#: src/gui/widgets/tabs/setup_audio.cpp:103
msgid "Sound effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:106
msgid "Information dialog sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:110
msgid "Request dialog sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:115
+#: src/gui/widgets/tabs/setup_audio.cpp:114
msgid "Whisper message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:118
msgid "Guild / Party message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:122
msgid "Highlight message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:126
msgid "Global message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:130
msgid "Error message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:134
msgid "Trade request sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:138
msgid "Show window sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:142
msgid "Hide window sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:150
msgid "Enable mumble voice chat"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:156
+#: src/gui/widgets/tabs/setup_audio.cpp:155
msgid "Download music"
msgstr ""
@@ -3412,7 +3481,7 @@ msgstr ""
#. TRANSLATORS: unknown key name
#. TRANSLATORS: quests window quest name
#: src/gui/widgets/tabs/setup_input.cpp:364
-#: src/gui/windows/questswindow.cpp:263
+#: src/gui/windows/questswindow.cpp:249
msgid "unknown"
msgstr ""
@@ -3571,7 +3640,7 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: debug window tab
#. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:105
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
#: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
#: src/gui/windows/minimap.cpp:114
msgid "Map"
@@ -3739,9 +3808,9 @@ msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: shop window name
#. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:146
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
#: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windows/inventorywindow.cpp:194
msgid "Shop"
msgstr ""
@@ -4123,252 +4192,252 @@ msgid "When ignoring:"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:64
+#: src/gui/widgets/tabs/setup_theme.cpp:63
msgid "Very small (8)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:66
+#: src/gui/widgets/tabs/setup_theme.cpp:65
msgid "Very small (9)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:68
+#: src/gui/widgets/tabs/setup_theme.cpp:67
msgid "Tiny (10)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:70
+#: src/gui/widgets/tabs/setup_theme.cpp:69
msgid "Small (11)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:72
+#: src/gui/widgets/tabs/setup_theme.cpp:71
msgid "Medium (12)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:74
+#: src/gui/widgets/tabs/setup_theme.cpp:73
msgid "Normal (13)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:76
+#: src/gui/widgets/tabs/setup_theme.cpp:75
msgid "Large (14)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:78
+#: src/gui/widgets/tabs/setup_theme.cpp:77
msgid "Large (15)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:80
+#: src/gui/widgets/tabs/setup_theme.cpp:79
msgid "Large (16)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:82
+#: src/gui/widgets/tabs/setup_theme.cpp:81
msgid "Big (17)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:83
msgid "Big (18)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:85
msgid "Big (19)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:87
msgid "Very big (20)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:89
msgid "Very big (21)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:91
msgid "Very big (22)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:93
msgid "Huge (23)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:129
+#: src/gui/widgets/tabs/setup_theme.cpp:128
msgid "Chinese (China)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:131
+#: src/gui/widgets/tabs/setup_theme.cpp:130
msgid "Czech"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:133
+#: src/gui/widgets/tabs/setup_theme.cpp:132
msgid "English"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:135
+#: src/gui/widgets/tabs/setup_theme.cpp:134
msgid "Finnish"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:137
+#: src/gui/widgets/tabs/setup_theme.cpp:136
msgid "French"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:139
+#: src/gui/widgets/tabs/setup_theme.cpp:138
msgid "German"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:141
+#: src/gui/widgets/tabs/setup_theme.cpp:140
msgid "Indonesian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:143
+#: src/gui/widgets/tabs/setup_theme.cpp:142
msgid "Italian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:145
+#: src/gui/widgets/tabs/setup_theme.cpp:144
msgid "Polish"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:147
+#: src/gui/widgets/tabs/setup_theme.cpp:146
msgid "Japanese"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:148
msgid "Dutch (Belgium/Flemish)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:150
msgid "Portuguese"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:152
msgid "Portuguese (Brazilian)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:154
msgid "Russian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:156
msgid "Spanish (Castilian)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:158
msgid "Turkish"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:211
+#: src/gui/widgets/tabs/setup_theme.cpp:210
msgid "Gui theme"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:218
+#: src/gui/widgets/tabs/setup_theme.cpp:217
msgid "Main Font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:223
+#: src/gui/widgets/tabs/setup_theme.cpp:222
msgid "Language"
msgstr ""
#. TRANSLATORS: theme settings label
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:227 src/gui/windows/emotewindow.cpp:45
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
msgid "Bold font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:230
msgid "Particle font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:235
+#: src/gui/widgets/tabs/setup_theme.cpp:234
msgid "Help font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:239
+#: src/gui/widgets/tabs/setup_theme.cpp:238
msgid "Secure font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:242
msgid "Npc font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:247
+#: src/gui/widgets/tabs/setup_theme.cpp:246
msgid "Japanese font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:250
msgid "Chinese font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:256
+#: src/gui/widgets/tabs/setup_theme.cpp:255
msgid "Font size"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:261
+#: src/gui/widgets/tabs/setup_theme.cpp:260
msgid "Npc font size"
msgstr ""
#. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:265
+#: src/gui/widgets/tabs/setup_theme.cpp:264
msgid "i"
msgstr ""
#. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:404
+#: src/gui/widgets/tabs/setup_theme.cpp:403
msgid "Name: "
msgstr ""
-#: src/gui/widgets/tabs/setup_theme.cpp:405
+#: src/gui/widgets/tabs/setup_theme.cpp:404
msgid "Copyright:"
msgstr ""
#. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:470
+#: src/gui/widgets/tabs/setup_theme.cpp:469
msgid "Theme info"
msgstr ""
#. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:497
+#: src/gui/widgets/tabs/setup_theme.cpp:496
msgid "Theme Changed"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:497
+#: src/gui/widgets/tabs/setup_theme.cpp:496
#: src/gui/widgets/tabs/setup_video.cpp:499
#: src/gui/widgets/tabs/setup_video.cpp:508
msgid "Restart your client for the change to take effect."
@@ -4699,178 +4768,169 @@ msgid "Allow screensaver to run"
msgstr ""
#. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:67
msgid "ONL"
msgstr ""
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:68
msgid "Who is online"
msgstr ""
#. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:70
msgid "HLP"
msgstr ""
#. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:73
msgid "QE"
msgstr ""
#. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:77 src/gui/windows/questswindow.cpp:126
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
msgid "Quests"
msgstr ""
#. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:76
msgid "BC"
msgstr ""
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:77
msgid "Bot checker"
msgstr ""
#. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:82
+#: src/gui/windowmenu.cpp:79
msgid "KS"
msgstr ""
#. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:83 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
msgid "Kill stats"
msgstr ""
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:82
msgid "Smilies"
msgstr ""
#. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:87
+#: src/gui/windowmenu.cpp:84
msgid "CH"
msgstr ""
#. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:95
+#: src/gui/windowmenu.cpp:92
msgid "STA"
msgstr ""
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:93
msgid "Status"
msgstr ""
#. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:95
msgid "EQU"
msgstr ""
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:58
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
msgid "Equipment"
msgstr ""
#. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:98
msgid "INV"
msgstr ""
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:130
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
#: src/inventory.cpp:257
msgid "Inventory"
msgstr ""
#. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:104
+#: src/gui/windowmenu.cpp:101
msgid "MAP"
msgstr ""
#. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:110
+#: src/gui/windowmenu.cpp:107
msgid "SKI"
msgstr ""
#. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
msgid "Skills"
msgstr ""
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:118
-msgid "SPE"
-msgstr ""
-
-#: src/gui/windowmenu.cpp:119
-msgid "Specials"
-msgstr ""
-
#. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:124
+#: src/gui/windowmenu.cpp:112
msgid "SOC"
msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:126 src/gui/windows/socialwindow.cpp:1284
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
msgid "Social"
msgstr ""
#. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:128
+#: src/gui/windowmenu.cpp:116
msgid "SH"
msgstr ""
#. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:132
+#: src/gui/windowmenu.cpp:120
msgid "SP"
msgstr ""
#. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:124
msgid "DR"
msgstr ""
#. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:128
msgid "YK"
msgstr ""
#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:130
msgid "Did you know"
msgstr ""
#. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:144
+#: src/gui/windowmenu.cpp:132
msgid "SHP"
msgstr ""
#. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:148
+#: src/gui/windowmenu.cpp:136
msgid "OU"
msgstr ""
#. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:152
+#: src/gui/windowmenu.cpp:140
msgid "DBG"
msgstr ""
#. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:149
msgid "WIN"
msgstr ""
#. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:153
msgid "SET"
msgstr ""
#. TRANSLATORS: short key name
#. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:301 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
#: src/gui/windows/outfitwindow.cpp:561
#, c-format
msgid "Key: %s"
@@ -4892,31 +4952,21 @@ msgstr ""
msgid "Result"
msgstr ""
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:58
-msgid "unsorted"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:60
-msgid "by price"
-msgstr ""
-
#. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:196
+#: src/gui/windows/buydialog.cpp:162
msgid "Create items"
msgstr ""
#. TRANSLATORS: buy dialog label
#. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:254 src/gui/windows/buydialog.cpp:541
-#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:366
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
#, c-format
msgid "Price: %s / Total: %s"
msgstr ""
#. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:263
+#: src/gui/windows/buydialog.cpp:229
msgid "Amount:"
msgstr ""
@@ -4926,8 +4976,8 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/itemamountwindow.cpp:159
-#: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
msgid "+"
msgstr ""
@@ -4938,8 +4988,8 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:271 src/gui/windows/itemamountwindow.cpp:157
-#: src/gui/windows/itemamountwindow.cpp:191 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
msgid "-"
msgstr ""
@@ -4947,9 +4997,9 @@ msgstr ""
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:274 src/gui/windows/charcreatedialog.cpp:119
-#: src/gui/windows/charselectdialog.cpp:593
-#: src/gui/windows/socialwindow.cpp:1307
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
msgid "Create"
msgstr ""
@@ -4958,7 +5008,7 @@ msgstr ""
#. TRANSLATORS: status bar label
#. TRANSLATORS: status window label
#. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:278 src/gui/windows/selldialog.cpp:112
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
#: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
#: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
msgid "Max"
@@ -5057,7 +5107,7 @@ msgstr ""
#. TRANSLATORS: login dialog label
#. TRANSLATORS: register dialog. label.
#: src/gui/windows/charcreatedialog.cpp:73
-#: src/gui/windows/editserverdialog.cpp:89 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
#: src/gui/windows/registerdialog.cpp:89
msgid "Name:"
msgstr ""
@@ -5118,7 +5168,7 @@ msgstr ""
#. TRANSLATORS: char create dialog label
#: src/gui/windows/charcreatedialog.cpp:115
-#: src/gui/windows/charcreatedialog.cpp:469
+#: src/gui/windows/charcreatedialog.cpp:458
#, c-format
msgid "Please distribute %d points"
msgstr ""
@@ -5134,17 +5184,17 @@ msgid "Look:"
msgstr ""
#. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:362
+#: src/gui/windows/charcreatedialog.cpp:351
msgid "Your name needs to be at least 4 characters."
msgstr ""
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:459
+#: src/gui/windows/charcreatedialog.cpp:448
msgid "Character stats OK"
msgstr ""
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:475
+#: src/gui/windows/charcreatedialog.cpp:464
#, c-format
msgid "Please remove %d points"
msgstr ""
@@ -5173,7 +5223,7 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:104
-#: src/gui/windows/charselectdialog.cpp:588
+#: src/gui/windows/charselectdialog.cpp:580
#: src/gui/windows/updaterwindow.cpp:188
msgid "Play"
msgstr ""
@@ -5229,35 +5279,20 @@ msgstr ""
msgid "Enter password:"
msgstr ""
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:172
-msgid "rainbow 1"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:174
-msgid "rainbow 2"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:176
-msgid "rainbow 3"
-msgstr ""
-
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:755
+#: src/gui/windows/chatwindow.cpp:705
#, c-format
msgid "Present: %s; %d players are present."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1169
+#: src/gui/windows/chatwindow.cpp:1119
#, c-format
msgid "Whispering to %s: %s"
msgstr ""
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1613
+#: src/gui/windows/chatwindow.cpp:1563
#, c-format
msgid "%s's pet"
msgstr ""
@@ -5503,51 +5538,51 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:77
-#: src/gui/windows/itemamountwindow.cpp:161 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
msgid "OK"
msgstr ""
#. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:66
+#: src/gui/windows/editserverdialog.cpp:45
msgid "Edit Server"
msgstr ""
#. TRANSLATORS: edit server dialog button
#. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:75
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
msgid "Connect"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:91
+#: src/gui/windows/editserverdialog.cpp:70
msgid "Address:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:93
+#: src/gui/windows/editserverdialog.cpp:72
msgid "Port:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:95
+#: src/gui/windows/editserverdialog.cpp:74
msgid "Server type:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:97
+#: src/gui/windows/editserverdialog.cpp:76
msgid "Description:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:99
+#: src/gui/windows/editserverdialog.cpp:78
msgid "Online list url:"
msgstr ""
#. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:220
+#: src/gui/windows/editserverdialog.cpp:188
msgid "Please at least type both the address and the port of the server."
msgstr ""
@@ -5567,47 +5602,47 @@ msgid "Did you know..."
msgstr ""
#. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:165
+#: src/gui/windows/itemamountwindow.cpp:164
msgid "All"
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:221
+#: src/gui/windows/itemamountwindow.cpp:220
msgid "Select amount of items to trade."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:225
+#: src/gui/windows/itemamountwindow.cpp:224
msgid "Select amount of items to drop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:229
+#: src/gui/windows/itemamountwindow.cpp:228
msgid "Select amount of items to store."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:233
+#: src/gui/windows/itemamountwindow.cpp:232
msgid "Select amount of items to retrieve."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:237
+#: src/gui/windows/itemamountwindow.cpp:236
msgid "Select amount of items to split."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:241
+#: src/gui/windows/itemamountwindow.cpp:240
msgid "Add to buy shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:245
+#: src/gui/windows/itemamountwindow.cpp:244
msgid "Add to sell shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:249
+#: src/gui/windows/itemamountwindow.cpp:248
msgid "Unknown."
msgstr ""
@@ -5859,7 +5894,7 @@ msgstr ""
#. TRANSLATORS: shop window label
#. TRANSLATORS: shop window button
#. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:258
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
#: src/gui/windows/tradewindow.cpp:78
msgid "Add"
@@ -5961,53 +5996,53 @@ msgid "Do you really want to sell %s?"
msgstr ""
#. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
msgid "Choose Your Server"
msgstr ""
#. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
msgid "Load"
msgstr ""
#. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
msgid "Choose Your Server *** SAFE MODE ***"
msgstr ""
#. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
msgid "Use same ip for game sub servers"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
msgid "Waiting for server..."
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
msgid "Preparing download"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
msgid "Error retreiving server list!"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
msgid "requires a newer version"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
#, c-format
msgid "requires v%s"
msgstr ""
@@ -6088,277 +6123,277 @@ msgid "Skill %d"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:225
+#: src/gui/windows/socialwindow.cpp:227
#, c-format
msgid "Invited user %s to guild %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:240
+#: src/gui/windows/socialwindow.cpp:242
#, c-format
msgid "Guild %s quit requested."
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:254
+#: src/gui/windows/socialwindow.cpp:256
msgid "Member Invite to Guild"
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:256
+#: src/gui/windows/socialwindow.cpp:258
#, c-format
msgid "Who would you like to invite to guild %s?"
msgstr ""
#. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:266
+#: src/gui/windows/socialwindow.cpp:268
msgid "Leave Guild?"
msgstr ""
#. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:268
+#: src/gui/windows/socialwindow.cpp:270
#, c-format
msgid "Are you sure you want to leave guild %s?"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:279
+#: src/gui/windows/socialwindow.cpp:281
#, c-format
msgid "Members: %u/%u"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:301 src/gui/windows/socialwindow.cpp:373
-#: src/gui/windows/socialwindow.cpp:498
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
#, c-format
msgid "Players: %u/%u"
msgstr ""
#. TRANSLATORS: tab in social window
#. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:389 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
msgid "Party"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:429
+#: src/gui/windows/socialwindow.cpp:431
#, c-format
msgid "Invited user %s to party."
msgstr ""
#. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:444
+#: src/gui/windows/socialwindow.cpp:446
#, c-format
msgid "Party %s quit requested."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:458
+#: src/gui/windows/socialwindow.cpp:460
msgid "Member Invite to Party"
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:460
+#: src/gui/windows/socialwindow.cpp:462
#, c-format
msgid "Who would you like to invite to party %s?"
msgstr ""
#. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:470
+#: src/gui/windows/socialwindow.cpp:472
msgid "Leave Party?"
msgstr ""
#. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:472
+#: src/gui/windows/socialwindow.cpp:474
#, c-format
msgid "Are you sure you want to leave party %s?"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:698
+#: src/gui/windows/socialwindow.cpp:665
#, c-format
msgid "Visible players: %d"
msgstr ""
#. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:725
+#: src/gui/windows/socialwindow.cpp:692
msgid "Nav"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:827
+#: src/gui/windows/socialwindow.cpp:794
#, c-format
msgid "Portals: %u/%u"
msgstr ""
#. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1054
+#: src/gui/windows/socialwindow.cpp:1021
msgid "Atk"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1073
+#: src/gui/windows/socialwindow.cpp:1040
msgid "Priority mobs"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1075
+#: src/gui/windows/socialwindow.cpp:1042
msgid "Attack mobs"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1077
+#: src/gui/windows/socialwindow.cpp:1044
msgid "Ignore mobs"
msgstr ""
#. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1101
+#: src/gui/windows/socialwindow.cpp:1068
msgid "Pik"
msgstr ""
#. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1120
+#: src/gui/windows/socialwindow.cpp:1087
msgid "Pickup items"
msgstr ""
#. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1122
+#: src/gui/windows/socialwindow.cpp:1089
msgid "Ignore items"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1212
+#: src/gui/windows/socialwindow.cpp:1179
#, c-format
msgid "Friends: %u/%u"
msgstr ""
#. TRANSLATORS: party popup item
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1235 src/gui/windows/socialwindow.cpp:1727
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
msgid "Create Party"
msgstr ""
#. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1298
+#: src/gui/windows/socialwindow.cpp:1265
msgid "P"
msgstr ""
#. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1303
+#: src/gui/windows/socialwindow.cpp:1270
msgid "F"
msgstr ""
#. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1309
+#: src/gui/windows/socialwindow.cpp:1276
msgid "Invite"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1503
+#: src/gui/windows/socialwindow.cpp:1470
#, c-format
msgid "Accepted party invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1514
+#: src/gui/windows/socialwindow.cpp:1481
#, c-format
msgid "Rejected party invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1531
+#: src/gui/windows/socialwindow.cpp:1498
#, c-format
msgid "Accepted guild invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1545
+#: src/gui/windows/socialwindow.cpp:1512
#, c-format
msgid "Rejected guild invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1585
+#: src/gui/windows/socialwindow.cpp:1552
#, c-format
msgid "Creating guild called %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1606
+#: src/gui/windows/socialwindow.cpp:1573
#, c-format
msgid "Creating party called %s."
msgstr ""
#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1621
+#: src/gui/windows/socialwindow.cpp:1588
msgid "Guild Name"
msgstr ""
#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1623
+#: src/gui/windows/socialwindow.cpp:1590
msgid "Choose your guild's name."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1639
+#: src/gui/windows/socialwindow.cpp:1606
msgid "Received guild request, but one already exists."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1647
+#: src/gui/windows/socialwindow.cpp:1614
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1654
+#: src/gui/windows/socialwindow.cpp:1621
msgid "Accept Guild Invite"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1670
+#: src/gui/windows/socialwindow.cpp:1637
msgid "Received party request, but one already exists."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1682
+#: src/gui/windows/socialwindow.cpp:1649
msgid "You have been invited you to join a party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1687
+#: src/gui/windows/socialwindow.cpp:1654
#, c-format
msgid "You have been invited to join the %s party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1696
+#: src/gui/windows/socialwindow.cpp:1663
#, c-format
msgid "%s has invited you to join their party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1702
+#: src/gui/windows/socialwindow.cpp:1669
#, c-format
msgid "%s has invited you to join the %s party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1712
+#: src/gui/windows/socialwindow.cpp:1679
msgid "Accept Party Invite"
msgstr ""
-#: src/gui/windows/socialwindow.cpp:1728
+#: src/gui/windows/socialwindow.cpp:1695
msgid "Cannot create party. You are already in a party"
msgstr ""
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1734
+#: src/gui/windows/socialwindow.cpp:1701
msgid "Party Name"
msgstr ""
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1736
+#: src/gui/windows/socialwindow.cpp:1703
msgid "Choose your party's name."
msgstr ""
@@ -6400,113 +6435,68 @@ msgstr ""
msgid "Correction points: %d"
msgstr ""
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "No Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Allow Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:105
-msgid "Need Target"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "General Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "Life Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "War Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Transmute Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Nature Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:121
-msgid "Astral Magic"
-msgstr ""
-
#. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:164
+#: src/gui/windows/textcommandeditor.cpp:47
msgid "Command Editor"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:52
msgid "magic"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:54
msgid "other"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:173
+#: src/gui/windows/textcommandeditor.cpp:56
msgid "Symbol:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:176
+#: src/gui/windows/textcommandeditor.cpp:59
msgid "Command:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:179
+#: src/gui/windows/textcommandeditor.cpp:62
msgid "Comment:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:183
+#: src/gui/windows/textcommandeditor.cpp:66
msgid "Target Type:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:187
+#: src/gui/windows/textcommandeditor.cpp:70
msgid "Icon:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:190
+#: src/gui/windows/textcommandeditor.cpp:73
msgid "Mana:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:193
+#: src/gui/windows/textcommandeditor.cpp:76
msgid "Magic level:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:197
+#: src/gui/windows/textcommandeditor.cpp:80
msgid "Magic School:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:200
+#: src/gui/windows/textcommandeditor.cpp:83
msgid "School level:"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/windows/textcommandeditor.cpp:88
msgid "Save"
msgstr ""
@@ -6536,7 +6526,7 @@ msgid "Trade: You"
msgstr ""
#. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
#, c-format
msgid "You get %s"
msgstr ""
@@ -6552,12 +6542,12 @@ msgid "You give:"
msgstr ""
#. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
msgid "You don't have enough money."
msgstr ""
#. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
msgid ""
"Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
@@ -6628,17 +6618,17 @@ msgid "Who Is Online - Update"
msgstr ""
#. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:87
+#: src/gui/windows/worldselectdialog.cpp:49
msgid "Select World"
msgstr ""
#. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:93
+#: src/gui/windows/worldselectdialog.cpp:55
msgid "Change Login"
msgstr ""
#. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:95
+#: src/gui/windows/worldselectdialog.cpp:57
msgid "Choose World"
msgstr ""
@@ -6856,7 +6846,7 @@ msgid "Failed to create character. Most likely the name is already taken."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:281
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
msgid "Wrong name."
msgstr ""
@@ -7014,58 +7004,58 @@ msgid "Experience sharing unknown."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:154
+#: src/net/ea/loginhandler.cpp:149
msgid "Account was not found. Please re-login."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/ea/loginhandler.cpp:153
msgid "Old password incorrect."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:162
+#: src/net/ea/loginhandler.cpp:157
msgid "New password too short."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:166 src/net/ea/loginhandler.cpp:293
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
msgid "Unknown error."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:239
+#: src/net/ea/loginhandler.cpp:234
msgid "Unregistered ID."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:238
msgid "Wrong password."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:248
+#: src/net/ea/loginhandler.cpp:243
msgid "Account expired."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:252
+#: src/net/ea/loginhandler.cpp:247
msgid "Rejected from server."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:256
+#: src/net/ea/loginhandler.cpp:251
msgid ""
"You have been permanently banned from the game. Please contact the GM team."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:261
+#: src/net/ea/loginhandler.cpp:256
msgid "Client too old."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:265
+#: src/net/ea/loginhandler.cpp:260
#, c-format
msgid ""
"You have been temporarily banned from the game until %s.\n"
@@ -7073,22 +7063,22 @@ msgid ""
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:273
+#: src/net/ea/loginhandler.cpp:268
msgid "Server overpopulated."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:277
+#: src/net/ea/loginhandler.cpp:272
msgid "This user name is already taken."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:285
+#: src/net/ea/loginhandler.cpp:280
msgid "Incorrect email."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:289
+#: src/net/ea/loginhandler.cpp:284
msgid "Username permanently erased."
msgstr ""
@@ -7761,7 +7751,7 @@ msgstr ""
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
#: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 3fbbbd924..ae786b51c 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
"POT-Creation-Date: 2014-02-28 21:21+0300\n"
-"PO-Revision-Date: 2014-02-23 08:14+0000\n"
+"PO-Revision-Date: 2014-03-01 08:14+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"
@@ -7797,6 +7797,3 @@ msgstr "未知物品"
#: src/resources/db/petdb.cpp:99
msgid "pet"
msgstr ""
-
-#~ msgid "Specials"
-#~ msgstr "特价商品"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 9d5b92eaf..691831dec 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: 2014-02-23 00:42+0300\n"
-"PO-Revision-Date: 2014-02-23 08:14+0000\n"
+"POT-Creation-Date: 2014-02-28 21:21+0300\n"
+"PO-Revision-Date: 2014-03-01 08:14+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"
@@ -29,7 +29,7 @@ msgid "Accepting incoming trade requests"
msgstr ""
#. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
msgid "Visible on map"
msgstr ""
@@ -38,455 +38,455 @@ msgstr ""
msgid "Human"
msgstr ""
-#: src/being/being.cpp:544
+#: src/being/being.cpp:496
msgid "dodge"
msgstr ""
-#: src/being/being.cpp:544
+#: src/being/being.cpp:496
msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1965 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1970 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr ""
#. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:392
+#: src/being/localplayer.cpp:376
#, c-format
msgid "You were killed by %s"
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1377
+#: src/being/localplayer.cpp:816
msgid "Tried to pick up nonexistent item."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1381
+#: src/being/localplayer.cpp:820
msgid "Item is too heavy."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1385
+#: src/being/localplayer.cpp:824
msgid "Item is too far away."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1389
+#: src/being/localplayer.cpp:828
msgid "Inventory is full."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1393
+#: src/being/localplayer.cpp:832
msgid "Stack is too big."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1397
+#: src/being/localplayer.cpp:836
msgid "Item belongs to someone else."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1401
+#: src/being/localplayer.cpp:840
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:1425
+#: src/being/localplayer.cpp:864
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
msgstr[0] ""
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1630 src/being/localplayer.cpp:1665
-#: src/being/localplayer.cpp:1666
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
msgid "xp"
msgstr ""
-#: src/being/localplayer.cpp:1671 src/being/localplayer.cpp:1678
-#: src/being/localplayer.cpp:1685
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
msgid "job"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1871
+#: src/being/localplayer.cpp:1285
msgid "(D) default moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1873
+#: src/being/localplayer.cpp:1287
msgid "(I) invert moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1875
+#: src/being/localplayer.cpp:1289
msgid "(c) moves with some crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1877
+#: src/being/localplayer.cpp:1291
msgid "(C) moves with crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1879
+#: src/being/localplayer.cpp:1293
msgid "(d) double normal + crazy"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1881
+#: src/being/localplayer.cpp:1295
msgid "(?) unknown move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1904
+#: src/being/localplayer.cpp:1318
#, c-format
msgid "(%u) crazy move number %u"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1910
+#: src/being/localplayer.cpp:1324
msgid "(a) custom crazy move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1915
+#: src/being/localplayer.cpp:1329
msgid "(?) crazy move"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1930
+#: src/being/localplayer.cpp:1344
msgid "(0) default moves to target"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1932
+#: src/being/localplayer.cpp:1346
msgid "(1) moves to target in distance 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1934
+#: src/being/localplayer.cpp:1348
msgid "(2) moves to target in distance 2"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1936
+#: src/being/localplayer.cpp:1350
msgid "(3) moves to target in distance 3"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1938
+#: src/being/localplayer.cpp:1352
msgid "(5) moves to target in distance 5"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1940
+#: src/being/localplayer.cpp:1354
msgid "(7) moves to target in distance 7"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1942
+#: src/being/localplayer.cpp:1356
msgid "(A) moves to target in attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1944
+#: src/being/localplayer.cpp:1358
msgid "(a) archer attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1946
+#: src/being/localplayer.cpp:1360
msgid "(B) moves to target in attack range - 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1948
+#: src/being/localplayer.cpp:1362
msgid "(?) move to target"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1968
+#: src/being/localplayer.cpp:1382
msgid "(D) default follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1970
+#: src/being/localplayer.cpp:1384
msgid "(R) relative follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1972
+#: src/being/localplayer.cpp:1386
msgid "(M) mirror follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1974
+#: src/being/localplayer.cpp:1388
msgid "(P) pet follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1976
+#: src/being/localplayer.cpp:1390
msgid "(?) unknown follow"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1996 src/being/localplayer.cpp:2004
-#: src/being/localplayer.cpp:2032
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
msgid "(?) attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1998 src/being/localplayer.cpp:2024
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
msgid "(D) default attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2000
+#: src/being/localplayer.cpp:1414
msgid "(s) switch attack without shield"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2002
+#: src/being/localplayer.cpp:1416
msgid "(S) switch attack with shield"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2026
+#: src/being/localplayer.cpp:1440
msgid "(G) go and attack"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2028
+#: src/being/localplayer.cpp:1442
msgid "(A) go, attack, pickup"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2030
+#: src/being/localplayer.cpp:1444
msgid "(d) without auto attack"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2084
+#: src/being/localplayer.cpp:1498
msgid "(S) small pick up 1x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2086
+#: src/being/localplayer.cpp:1500
msgid "(D) default pick up 2x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2088
+#: src/being/localplayer.cpp:1502
msgid "(F) forward pick up 2x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2090
+#: src/being/localplayer.cpp:1504
msgid "(3) pick up 3x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2092
+#: src/being/localplayer.cpp:1506
msgid "(g) go and pick up in distance 4"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2094
+#: src/being/localplayer.cpp:1508
msgid "(G) go and pick up in distance 8"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2096
+#: src/being/localplayer.cpp:1510
msgid "(A) go and pick up in max distance"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2098
+#: src/being/localplayer.cpp:1512
msgid "(?) pick up"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2112
+#: src/being/localplayer.cpp:1526
msgid "(N) normal map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2114
+#: src/being/localplayer.cpp:1528
msgid "(D) debug map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2116
+#: src/being/localplayer.cpp:1530
msgid "(u) ultra map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2118
+#: src/being/localplayer.cpp:1532
msgid "(U) ultra map view 2"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2120
+#: src/being/localplayer.cpp:1534
msgid "(e) empty map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2122
+#: src/being/localplayer.cpp:1536
msgid "(b) black & white map view"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2142
+#: src/being/localplayer.cpp:1556
msgid "(f) use #flar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2144
+#: src/being/localplayer.cpp:1558
msgid "(c) use #chiza for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2146
+#: src/being/localplayer.cpp:1560
msgid "(I) use #ingrav for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2148
+#: src/being/localplayer.cpp:1562
msgid "(F) use #frillyar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2150
+#: src/being/localplayer.cpp:1564
msgid "(U) use #upmarmu for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2152
+#: src/being/localplayer.cpp:1566
msgid "(?) magic attack"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2172
+#: src/being/localplayer.cpp:1586
msgid "(a) attack all players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2174
+#: src/being/localplayer.cpp:1588
msgid "(f) attack all except friends"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2176
+#: src/being/localplayer.cpp:1590
msgid "(b) attack bad relations"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2178
+#: src/being/localplayer.cpp:1592
msgid "(d) don't attack players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2180
+#: src/being/localplayer.cpp:1594
msgid "(?) pvp attack"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2200
+#: src/being/localplayer.cpp:1614
msgid "(D) default imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2202
+#: src/being/localplayer.cpp:1616
msgid "(O) outfits imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2204
+#: src/being/localplayer.cpp:1618
msgid "(?) imitation"
msgstr ""
#. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2233
+#: src/being/localplayer.cpp:1647
msgid "Away"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2256
+#: src/being/localplayer.cpp:1670
msgid "(O) on keyboard"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2258
+#: src/being/localplayer.cpp:1672
msgid "(A) away"
msgstr ""
#. TRANSLATORS: away type in status bar
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2260 src/being/localplayer.cpp:2278
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
msgid "(?) away"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2274
+#: src/being/localplayer.cpp:1688
msgid "(G) game camera mode"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2276
+#: src/being/localplayer.cpp:1690
msgid "(F) free camera mode"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2303
+#: src/being/localplayer.cpp:1717
msgid "Game modifiers are enabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2305
+#: src/being/localplayer.cpp:1719
msgid "Game modifiers are disabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2307
+#: src/being/localplayer.cpp:1721
msgid "Game modifiers are unknown"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3887
+#: src/being/localplayer.cpp:3287
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3893 src/being/localplayer.cpp:3918
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3903
+#: src/being/localplayer.cpp:3303
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3909 src/being/localplayer.cpp:3923
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4266
+#: src/being/localplayer.cpp:3666
#, c-format
msgid "You see %s"
msgstr ""
@@ -524,32 +524,32 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1139 src/gui/windowmenu.cpp:167
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
#: src/gui/windows/setupwindow.cpp:61
msgid "Setup"
msgstr "設定"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1143 src/gui/widgets/tabs/setup_perfomance.cpp:51
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1146 src/gui/widgets/tabs/setup_video.cpp:225
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:225
msgid "Video"
msgstr "顯示"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1149 src/gui/widgets/tabs/setup_theme.cpp:269
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1152 src/gui/windowmenu.cpp:74
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr "說明"
@@ -562,41 +562,41 @@ msgstr "說明"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1156 src/gui/popups/popupmenu.cpp:619
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
#: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:69
-#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:138
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
#: src/gui/windows/shopwindow.cpp:78
msgid "Close"
msgstr "關閉"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1324
msgid "Logging in"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1367
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1492
+#: src/client.cpp:1489
msgid "Requesting characters"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1532
+#: src/client.cpp:1529
msgid "Connecting to the game server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1545
+#: src/client.cpp:1541
msgid "Changing game servers"
msgstr ""
@@ -611,12 +611,12 @@ msgstr ""
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1606 src/client.cpp:1617 src/client.cpp:1801
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:349
#: src/gui/windows/charselectdialog.cpp:299
-#: src/gui/windows/editserverdialog.cpp:218
+#: src/gui/windows/editserverdialog.cpp:186
#: src/gui/windows/registerdialog.cpp:260
#: src/gui/windows/unregisterdialog.cpp:146
#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
@@ -624,65 +624,65 @@ msgid "Error"
msgstr "錯誤"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1629
+#: src/client.cpp:1625
msgid "Requesting registration details"
msgstr ""
#. TRANSLATORS: password change message header
-#: src/client.cpp:1670
+#: src/client.cpp:1666
msgid "Password Change"
msgstr ""
#. TRANSLATORS: password change message text
-#: src/client.cpp:1672
+#: src/client.cpp:1668
msgid "Password changed successfully!"
msgstr ""
#. TRANSLATORS: email change message header
-#: src/client.cpp:1694
+#: src/client.cpp:1690
msgid "Email Change"
msgstr ""
#. TRANSLATORS: email change message text
-#: src/client.cpp:1696
+#: src/client.cpp:1692
msgid "Email changed successfully!"
msgstr ""
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1719
+#: src/client.cpp:1715
msgid "Unregister Successful"
msgstr ""
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1721
+#: src/client.cpp:1717
msgid "Farewell, come back any time..."
msgstr ""
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1998 src/client.cpp:2013 src/client.cpp:2058
-#: src/client.cpp:2074 src/client.cpp:2525 src/client.cpp:2533
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2230
+#: src/client.cpp:2232
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2271 src/client.cpp:2278
+#: src/client.cpp:2273 src/client.cpp:2280
msgid "Error creating updates directory!"
msgstr ""
-#: src/client.cpp:2300 src/client.cpp:2317
+#: src/client.cpp:2302 src/client.cpp:2319
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: error message question
-#: src/client.cpp:3001
+#: src/client.cpp:3003
msgid "Do you want to open support page?"
msgstr ""
@@ -928,99 +928,154 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:277 src/gui/widgets/tabs/chattab.cpp:464
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
msgid "General"
msgstr ""
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:293 src/gui/widgets/tabs/chattab.cpp:466
-#: src/gui/windowmenu.cpp:154 src/gui/windows/debugwindow.cpp:53
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:575
+#: src/game.cpp:563
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:585
+#: src/game.cpp:573
msgid "Saving screenshot failed!"
msgstr ""
#. TRANSLATORS: error message text
-#: src/game.cpp:656
+#: src/game.cpp:644
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:659
+#: src/game.cpp:647
msgid "Network Error"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
-msgid "black"
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
msgstr ""
+#. TRANSLATORS: chat color
#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
+msgid "black"
+msgstr ""
+
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
msgid "red"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
msgid "green"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
msgid "blue"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
msgid "gold"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
msgid "yellow"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
msgid "pink"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
msgid "purple"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
msgid "grey"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
msgid "brown"
msgstr ""
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr ""
+
#. TRANSLATORS: relation type
#: src/gui/models/playerrelationlistmodel.h:33
msgid "Neutral"
@@ -1056,46 +1111,61 @@ msgstr ""
msgid "Enemy"
msgstr ""
-#. TRANSLATORS: inventory sort mode
-#. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#: src/gui/models/sortlistmodelinv.h:34
-#: src/gui/widgets/tabs/setup_other.cpp:72
-#: src/gui/widgets/tabs/setup_visual.cpp:78 src/gui/windows/chatwindow.cpp:150
-msgid "default"
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:36 src/gui/windows/buydialog.cpp:62
-msgid "by name"
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
msgstr ""
+#. TRANSLATORS: buy dialog sort type.
#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
+msgid "by name"
+msgstr ""
+
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:38 src/gui/windows/buydialog.cpp:64
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
msgid "by id"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:40 src/gui/windows/buydialog.cpp:66
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
msgid "by weight"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:42 src/gui/windows/buydialog.cpp:68
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
msgid "by amount"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:44 src/gui/windows/buydialog.cpp:70
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
msgid "by type"
msgstr ""
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr ""
+
#. TRANSLATORS: update type
#. TRANSLATORS: onscreen button size
#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
@@ -1242,8 +1312,8 @@ msgstr ""
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
-#: src/gui/windows/buydialog.cpp:208 src/gui/windows/buydialog.cpp:220
-#: src/gui/windows/buydialog.cpp:274 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
msgid "Buy"
msgstr "購買"
@@ -1340,12 +1410,12 @@ msgstr ""
#: src/gui/windows/changepassworddialog.cpp:57
#: src/gui/windows/charcreatedialog.cpp:121
#: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:79
-#: src/gui/windows/itemamountwindow.cpp:163
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
-#: src/gui/windows/socialwindow.cpp:1238
-#: src/gui/windows/textcommandeditor.cpp:203 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:54
#: src/gui/windows/updaterwindow.cpp:186
msgid "Cancel"
@@ -1417,7 +1487,7 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:150 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
msgstr ""
@@ -1430,7 +1500,7 @@ msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:134
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
msgid "Spells"
msgstr ""
@@ -1486,7 +1556,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
#. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1311
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
msgid "Leave"
msgstr ""
@@ -1567,8 +1637,8 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
-#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:223
-#: src/gui/windows/inventorywindow.cpp:745 src/gui/windows/setupwindow.cpp:96
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
msgid "Store"
msgstr ""
@@ -1599,7 +1669,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
msgid "Retrieve"
msgstr ""
@@ -1632,8 +1702,8 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
-#: src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:656 src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr "使用"
@@ -1667,8 +1737,8 @@ msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: language
#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/widgets/tabs/setup_theme.cpp:127
-#: src/gui/windows/socialwindow.cpp:1003
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
msgid "(default)"
msgstr ""
@@ -1824,8 +1894,8 @@ msgstr ""
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:645
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
msgid "Unequip"
msgstr "卸下裝備"
@@ -1833,16 +1903,16 @@ msgstr "卸下裝備"
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:172
-#: src/gui/windows/inventorywindow.cpp:650 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr "裝備"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:189
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
msgid "Drop..."
msgstr ""
@@ -1856,15 +1926,15 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:138
-#: src/gui/windows/inventorywindow.cpp:758
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
msgid "Drop"
msgstr "丟棄"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
msgid "Split"
msgstr "分開"
@@ -2020,10 +2090,10 @@ msgstr ""
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:276
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/windows/serverdialog.cpp:198
msgid "Quit"
msgstr "離開"
@@ -2585,7 +2655,7 @@ msgstr ""
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: register dialog. button.
#: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:146
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:330
#: src/gui/widgets/tabs/setup_visual.cpp:189
@@ -2612,9 +2682,8 @@ msgstr ""
#. TRANSLATORS: command editor button
#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
#: src/gui/windows/charselectdialog.cpp:108
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:94
-#: src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/textcommandeditor.cpp:207
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
msgid "Delete"
msgstr "刪除"
@@ -2650,7 +2719,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:130
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
msgid "Shortcuts"
msgstr ""
@@ -2658,7 +2727,7 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:151
msgid "Windows"
msgstr ""
@@ -2674,7 +2743,7 @@ msgstr ""
#. TRANSLATORS: settings tab name
#. TRANSLATORS: chat window name
#: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:88 src/gui/windows/chatwindow.cpp:203
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
msgid "Chat"
msgstr ""
@@ -2897,7 +2966,7 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:137
-#: src/gui/windows/inventorywindow.cpp:569
+#: src/gui/windows/inventorywindow.cpp:568
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
#, c-format
@@ -2917,7 +2986,7 @@ msgstr ""
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/windows/serverdialog.cpp:204
msgid "Edit"
msgstr ""
@@ -2970,7 +3039,7 @@ msgstr ""
#. TRANSLATORS: tab in social window
#. TRANSLATORS: guild chat tab name
#: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:184 src/gui/windows/socialwindow.cpp:320
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
#: src/net/ea/gui/guildtab.cpp:44
msgid "Guild"
msgstr ""
@@ -2981,142 +3050,142 @@ msgid "Lang"
msgstr ""
#. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:49
+#: src/gui/widgets/tabs/setup_audio.cpp:48
msgid "Audio"
msgstr "音效"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:57
+#: src/gui/widgets/tabs/setup_audio.cpp:56
msgid "Basic settings"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:60
+#: src/gui/widgets/tabs/setup_audio.cpp:59
msgid "Enable Audio"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:63
+#: src/gui/widgets/tabs/setup_audio.cpp:62
msgid "Enable music"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:67
+#: src/gui/widgets/tabs/setup_audio.cpp:66
msgid "Enable game sfx"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:71
+#: src/gui/widgets/tabs/setup_audio.cpp:70
msgid "Enable gui sfx"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:74
msgid "Sfx volume"
msgstr "音效音量"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:78
msgid "Music volume"
msgstr "音樂音量"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:82
msgid "Enable music fade out"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:86
msgid "Audio frequency"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:90
msgid "mono"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:93
+#: src/gui/widgets/tabs/setup_audio.cpp:92
msgid "stereo"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:94
msgid "surround"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:97
+#: src/gui/widgets/tabs/setup_audio.cpp:96
msgid "surround+center+lfe"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:98
msgid "Audio channels"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:104
+#: src/gui/widgets/tabs/setup_audio.cpp:103
msgid "Sound effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:106
msgid "Information dialog sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:110
msgid "Request dialog sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:115
+#: src/gui/widgets/tabs/setup_audio.cpp:114
msgid "Whisper message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:118
msgid "Guild / Party message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:122
msgid "Highlight message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:126
msgid "Global message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:130
msgid "Error message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:134
msgid "Trade request sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:138
msgid "Show window sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:142
msgid "Hide window sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:150
msgid "Enable mumble voice chat"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:156
+#: src/gui/widgets/tabs/setup_audio.cpp:155
msgid "Download music"
msgstr ""
@@ -3412,7 +3481,7 @@ msgstr ""
#. TRANSLATORS: unknown key name
#. TRANSLATORS: quests window quest name
#: src/gui/widgets/tabs/setup_input.cpp:364
-#: src/gui/windows/questswindow.cpp:263
+#: src/gui/windows/questswindow.cpp:249
msgid "unknown"
msgstr ""
@@ -3571,7 +3640,7 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: debug window tab
#. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:105
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
#: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
#: src/gui/windows/minimap.cpp:114
msgid "Map"
@@ -3739,9 +3808,9 @@ msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: shop window name
#. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:146
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
#: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windows/inventorywindow.cpp:194
msgid "Shop"
msgstr "商店"
@@ -4123,252 +4192,252 @@ msgid "When ignoring:"
msgstr "當忽略時："
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:64
+#: src/gui/widgets/tabs/setup_theme.cpp:63
msgid "Very small (8)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:66
+#: src/gui/widgets/tabs/setup_theme.cpp:65
msgid "Very small (9)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:68
+#: src/gui/widgets/tabs/setup_theme.cpp:67
msgid "Tiny (10)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:70
+#: src/gui/widgets/tabs/setup_theme.cpp:69
msgid "Small (11)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:72
+#: src/gui/widgets/tabs/setup_theme.cpp:71
msgid "Medium (12)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:74
+#: src/gui/widgets/tabs/setup_theme.cpp:73
msgid "Normal (13)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:76
+#: src/gui/widgets/tabs/setup_theme.cpp:75
msgid "Large (14)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:78
+#: src/gui/widgets/tabs/setup_theme.cpp:77
msgid "Large (15)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:80
+#: src/gui/widgets/tabs/setup_theme.cpp:79
msgid "Large (16)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:82
+#: src/gui/widgets/tabs/setup_theme.cpp:81
msgid "Big (17)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:83
msgid "Big (18)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:85
msgid "Big (19)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:87
msgid "Very big (20)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:89
msgid "Very big (21)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:91
msgid "Very big (22)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:93
msgid "Huge (23)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:129
+#: src/gui/widgets/tabs/setup_theme.cpp:128
msgid "Chinese (China)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:131
+#: src/gui/widgets/tabs/setup_theme.cpp:130
msgid "Czech"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:133
+#: src/gui/widgets/tabs/setup_theme.cpp:132
msgid "English"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:135
+#: src/gui/widgets/tabs/setup_theme.cpp:134
msgid "Finnish"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:137
+#: src/gui/widgets/tabs/setup_theme.cpp:136
msgid "French"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:139
+#: src/gui/widgets/tabs/setup_theme.cpp:138
msgid "German"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:141
+#: src/gui/widgets/tabs/setup_theme.cpp:140
msgid "Indonesian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:143
+#: src/gui/widgets/tabs/setup_theme.cpp:142
msgid "Italian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:145
+#: src/gui/widgets/tabs/setup_theme.cpp:144
msgid "Polish"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:147
+#: src/gui/widgets/tabs/setup_theme.cpp:146
msgid "Japanese"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:148
msgid "Dutch (Belgium/Flemish)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:150
msgid "Portuguese"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:152
msgid "Portuguese (Brazilian)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:154
msgid "Russian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:156
msgid "Spanish (Castilian)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:158
msgid "Turkish"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:211
+#: src/gui/widgets/tabs/setup_theme.cpp:210
msgid "Gui theme"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:218
+#: src/gui/widgets/tabs/setup_theme.cpp:217
msgid "Main Font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:223
+#: src/gui/widgets/tabs/setup_theme.cpp:222
msgid "Language"
msgstr ""
#. TRANSLATORS: theme settings label
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:227 src/gui/windows/emotewindow.cpp:45
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
msgid "Bold font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:230
msgid "Particle font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:235
+#: src/gui/widgets/tabs/setup_theme.cpp:234
msgid "Help font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:239
+#: src/gui/widgets/tabs/setup_theme.cpp:238
msgid "Secure font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:242
msgid "Npc font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:247
+#: src/gui/widgets/tabs/setup_theme.cpp:246
msgid "Japanese font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:250
msgid "Chinese font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:256
+#: src/gui/widgets/tabs/setup_theme.cpp:255
msgid "Font size"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:261
+#: src/gui/widgets/tabs/setup_theme.cpp:260
msgid "Npc font size"
msgstr ""
#. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:265
+#: src/gui/widgets/tabs/setup_theme.cpp:264
msgid "i"
msgstr ""
#. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:404
+#: src/gui/widgets/tabs/setup_theme.cpp:403
msgid "Name: "
msgstr ""
-#: src/gui/widgets/tabs/setup_theme.cpp:405
+#: src/gui/widgets/tabs/setup_theme.cpp:404
msgid "Copyright:"
msgstr ""
#. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:470
+#: src/gui/widgets/tabs/setup_theme.cpp:469
msgid "Theme info"
msgstr ""
#. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:497
+#: src/gui/widgets/tabs/setup_theme.cpp:496
msgid "Theme Changed"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:497
+#: src/gui/widgets/tabs/setup_theme.cpp:496
#: src/gui/widgets/tabs/setup_video.cpp:499
#: src/gui/widgets/tabs/setup_video.cpp:508
msgid "Restart your client for the change to take effect."
@@ -4699,178 +4768,169 @@ msgid "Allow screensaver to run"
msgstr ""
#. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:67
msgid "ONL"
msgstr ""
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:68
msgid "Who is online"
msgstr ""
#. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:70
msgid "HLP"
msgstr ""
#. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:73
msgid "QE"
msgstr ""
#. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:77 src/gui/windows/questswindow.cpp:126
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
msgid "Quests"
msgstr ""
#. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:76
msgid "BC"
msgstr ""
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:77
msgid "Bot checker"
msgstr ""
#. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:82
+#: src/gui/windowmenu.cpp:79
msgid "KS"
msgstr ""
#. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:83 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
msgid "Kill stats"
msgstr ""
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:82
msgid "Smilies"
msgstr ""
#. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:87
+#: src/gui/windowmenu.cpp:84
msgid "CH"
msgstr ""
#. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:95
+#: src/gui/windowmenu.cpp:92
msgid "STA"
msgstr ""
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:93
msgid "Status"
msgstr "狀態"
#. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:95
msgid "EQU"
msgstr ""
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:58
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
msgid "Equipment"
msgstr "裝備"
#. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:98
msgid "INV"
msgstr ""
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:130
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
#: src/inventory.cpp:257
msgid "Inventory"
msgstr "物品攔"
#. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:104
+#: src/gui/windowmenu.cpp:101
msgid "MAP"
msgstr ""
#. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:110
+#: src/gui/windowmenu.cpp:107
msgid "SKI"
msgstr ""
#. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
msgid "Skills"
msgstr "技能"
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:118
-msgid "SPE"
-msgstr ""
-
-#: src/gui/windowmenu.cpp:119
-msgid "Specials"
-msgstr ""
-
#. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:124
+#: src/gui/windowmenu.cpp:112
msgid "SOC"
msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:126 src/gui/windows/socialwindow.cpp:1284
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
msgid "Social"
msgstr ""
#. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:128
+#: src/gui/windowmenu.cpp:116
msgid "SH"
msgstr ""
#. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:132
+#: src/gui/windowmenu.cpp:120
msgid "SP"
msgstr ""
#. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:124
msgid "DR"
msgstr ""
#. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:128
msgid "YK"
msgstr ""
#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:130
msgid "Did you know"
msgstr ""
#. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:144
+#: src/gui/windowmenu.cpp:132
msgid "SHP"
msgstr ""
#. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:148
+#: src/gui/windowmenu.cpp:136
msgid "OU"
msgstr ""
#. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:152
+#: src/gui/windowmenu.cpp:140
msgid "DBG"
msgstr ""
#. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:149
msgid "WIN"
msgstr ""
#. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:153
msgid "SET"
msgstr ""
#. TRANSLATORS: short key name
#. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:301 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
#: src/gui/windows/outfitwindow.cpp:561
#, c-format
msgid "Key: %s"
@@ -4892,31 +4952,21 @@ msgstr ""
msgid "Result"
msgstr ""
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:58
-msgid "unsorted"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:60
-msgid "by price"
-msgstr ""
-
#. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:196
+#: src/gui/windows/buydialog.cpp:162
msgid "Create items"
msgstr ""
#. TRANSLATORS: buy dialog label
#. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:254 src/gui/windows/buydialog.cpp:541
-#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:366
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
#, c-format
msgid "Price: %s / Total: %s"
msgstr ""
#. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:263
+#: src/gui/windows/buydialog.cpp:229
msgid "Amount:"
msgstr ""
@@ -4926,8 +4976,8 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/itemamountwindow.cpp:159
-#: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
msgid "+"
msgstr ""
@@ -4938,8 +4988,8 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:271 src/gui/windows/itemamountwindow.cpp:157
-#: src/gui/windows/itemamountwindow.cpp:191 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
msgid "-"
msgstr ""
@@ -4947,9 +4997,9 @@ msgstr ""
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:274 src/gui/windows/charcreatedialog.cpp:119
-#: src/gui/windows/charselectdialog.cpp:593
-#: src/gui/windows/socialwindow.cpp:1307
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
msgid "Create"
msgstr "創造"
@@ -4958,7 +5008,7 @@ msgstr "創造"
#. TRANSLATORS: status bar label
#. TRANSLATORS: status window label
#. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:278 src/gui/windows/selldialog.cpp:112
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
#: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
#: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
msgid "Max"
@@ -5057,7 +5107,7 @@ msgstr ""
#. TRANSLATORS: login dialog label
#. TRANSLATORS: register dialog. label.
#: src/gui/windows/charcreatedialog.cpp:73
-#: src/gui/windows/editserverdialog.cpp:89 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
#: src/gui/windows/registerdialog.cpp:89
msgid "Name:"
msgstr "名字："
@@ -5118,7 +5168,7 @@ msgstr "女生"
#. TRANSLATORS: char create dialog label
#: src/gui/windows/charcreatedialog.cpp:115
-#: src/gui/windows/charcreatedialog.cpp:469
+#: src/gui/windows/charcreatedialog.cpp:458
#, c-format
msgid "Please distribute %d points"
msgstr "請分配%d點數"
@@ -5134,17 +5184,17 @@ msgid "Look:"
msgstr ""
#. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:362
+#: src/gui/windows/charcreatedialog.cpp:351
msgid "Your name needs to be at least 4 characters."
msgstr "你的名字至少需要4個字元"
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:459
+#: src/gui/windows/charcreatedialog.cpp:448
msgid "Character stats OK"
msgstr "角色狀態確定"
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:475
+#: src/gui/windows/charcreatedialog.cpp:464
#, c-format
msgid "Please remove %d points"
msgstr "請移除%d點數"
@@ -5173,7 +5223,7 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:104
-#: src/gui/windows/charselectdialog.cpp:588
+#: src/gui/windows/charselectdialog.cpp:580
#: src/gui/windows/updaterwindow.cpp:188
msgid "Play"
msgstr "開始"
@@ -5229,35 +5279,20 @@ msgstr ""
msgid "Enter password:"
msgstr ""
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:172
-msgid "rainbow 1"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:174
-msgid "rainbow 2"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:176
-msgid "rainbow 3"
-msgstr ""
-
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:755
+#: src/gui/windows/chatwindow.cpp:705
#, c-format
msgid "Present: %s; %d players are present."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1169
+#: src/gui/windows/chatwindow.cpp:1119
#, c-format
msgid "Whispering to %s: %s"
msgstr "對%s竊竊私語：%s"
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1613
+#: src/gui/windows/chatwindow.cpp:1563
#, c-format
msgid "%s's pet"
msgstr ""
@@ -5503,51 +5538,51 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:77
-#: src/gui/windows/itemamountwindow.cpp:161 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
msgid "OK"
msgstr "確定"
#. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:66
+#: src/gui/windows/editserverdialog.cpp:45
msgid "Edit Server"
msgstr ""
#. TRANSLATORS: edit server dialog button
#. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:75
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
msgid "Connect"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:91
+#: src/gui/windows/editserverdialog.cpp:70
msgid "Address:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:93
+#: src/gui/windows/editserverdialog.cpp:72
msgid "Port:"
msgstr "Port："
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:95
+#: src/gui/windows/editserverdialog.cpp:74
msgid "Server type:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:97
+#: src/gui/windows/editserverdialog.cpp:76
msgid "Description:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:99
+#: src/gui/windows/editserverdialog.cpp:78
msgid "Online list url:"
msgstr ""
#. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:220
+#: src/gui/windows/editserverdialog.cpp:188
msgid "Please at least type both the address and the port of the server."
msgstr ""
@@ -5567,47 +5602,47 @@ msgid "Did you know..."
msgstr ""
#. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:165
+#: src/gui/windows/itemamountwindow.cpp:164
msgid "All"
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:221
+#: src/gui/windows/itemamountwindow.cpp:220
msgid "Select amount of items to trade."
msgstr "請選擇交易的物品數量"
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:225
+#: src/gui/windows/itemamountwindow.cpp:224
msgid "Select amount of items to drop."
msgstr "請選擇丟棄的物品數量"
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:229
+#: src/gui/windows/itemamountwindow.cpp:228
msgid "Select amount of items to store."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:233
+#: src/gui/windows/itemamountwindow.cpp:232
msgid "Select amount of items to retrieve."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:237
+#: src/gui/windows/itemamountwindow.cpp:236
msgid "Select amount of items to split."
msgstr "請選擇你要分離的物品數量"
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:241
+#: src/gui/windows/itemamountwindow.cpp:240
msgid "Add to buy shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:245
+#: src/gui/windows/itemamountwindow.cpp:244
msgid "Add to sell shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:249
+#: src/gui/windows/itemamountwindow.cpp:248
msgid "Unknown."
msgstr ""
@@ -5857,7 +5892,7 @@ msgstr ""
#. TRANSLATORS: shop window label
#. TRANSLATORS: shop window button
#. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:258
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
#: src/gui/windows/tradewindow.cpp:78
msgid "Add"
@@ -5959,53 +5994,53 @@ msgid "Do you really want to sell %s?"
msgstr ""
#. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
msgid "Choose Your Server"
msgstr ""
#. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
msgid "Load"
msgstr ""
#. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
msgid "Choose Your Server *** SAFE MODE ***"
msgstr ""
#. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
msgid "Use same ip for game sub servers"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
msgid "Waiting for server..."
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
msgid "Preparing download"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
msgid "Error retreiving server list!"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
msgid "requires a newer version"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
#, c-format
msgid "requires v%s"
msgstr ""
@@ -6086,277 +6121,277 @@ msgid "Skill %d"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:225
+#: src/gui/windows/socialwindow.cpp:227
#, c-format
msgid "Invited user %s to guild %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:240
+#: src/gui/windows/socialwindow.cpp:242
#, c-format
msgid "Guild %s quit requested."
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:254
+#: src/gui/windows/socialwindow.cpp:256
msgid "Member Invite to Guild"
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:256
+#: src/gui/windows/socialwindow.cpp:258
#, c-format
msgid "Who would you like to invite to guild %s?"
msgstr ""
#. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:266
+#: src/gui/windows/socialwindow.cpp:268
msgid "Leave Guild?"
msgstr ""
#. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:268
+#: src/gui/windows/socialwindow.cpp:270
#, c-format
msgid "Are you sure you want to leave guild %s?"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:279
+#: src/gui/windows/socialwindow.cpp:281
#, c-format
msgid "Members: %u/%u"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:301 src/gui/windows/socialwindow.cpp:373
-#: src/gui/windows/socialwindow.cpp:498
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
#, c-format
msgid "Players: %u/%u"
msgstr ""
#. TRANSLATORS: tab in social window
#. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:389 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
msgid "Party"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:429
+#: src/gui/windows/socialwindow.cpp:431
#, c-format
msgid "Invited user %s to party."
msgstr ""
#. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:444
+#: src/gui/windows/socialwindow.cpp:446
#, c-format
msgid "Party %s quit requested."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:458
+#: src/gui/windows/socialwindow.cpp:460
msgid "Member Invite to Party"
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:460
+#: src/gui/windows/socialwindow.cpp:462
#, c-format
msgid "Who would you like to invite to party %s?"
msgstr ""
#. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:470
+#: src/gui/windows/socialwindow.cpp:472
msgid "Leave Party?"
msgstr ""
#. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:472
+#: src/gui/windows/socialwindow.cpp:474
#, c-format
msgid "Are you sure you want to leave party %s?"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:698
+#: src/gui/windows/socialwindow.cpp:665
#, c-format
msgid "Visible players: %d"
msgstr ""
#. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:725
+#: src/gui/windows/socialwindow.cpp:692
msgid "Nav"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:827
+#: src/gui/windows/socialwindow.cpp:794
#, c-format
msgid "Portals: %u/%u"
msgstr ""
#. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1054
+#: src/gui/windows/socialwindow.cpp:1021
msgid "Atk"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1073
+#: src/gui/windows/socialwindow.cpp:1040
msgid "Priority mobs"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1075
+#: src/gui/windows/socialwindow.cpp:1042
msgid "Attack mobs"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1077
+#: src/gui/windows/socialwindow.cpp:1044
msgid "Ignore mobs"
msgstr ""
#. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1101
+#: src/gui/windows/socialwindow.cpp:1068
msgid "Pik"
msgstr ""
#. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1120
+#: src/gui/windows/socialwindow.cpp:1087
msgid "Pickup items"
msgstr ""
#. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1122
+#: src/gui/windows/socialwindow.cpp:1089
msgid "Ignore items"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1212
+#: src/gui/windows/socialwindow.cpp:1179
#, c-format
msgid "Friends: %u/%u"
msgstr ""
#. TRANSLATORS: party popup item
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1235 src/gui/windows/socialwindow.cpp:1727
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
msgid "Create Party"
msgstr ""
#. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1298
+#: src/gui/windows/socialwindow.cpp:1265
msgid "P"
msgstr ""
#. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1303
+#: src/gui/windows/socialwindow.cpp:1270
msgid "F"
msgstr ""
#. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1309
+#: src/gui/windows/socialwindow.cpp:1276
msgid "Invite"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1503
+#: src/gui/windows/socialwindow.cpp:1470
#, c-format
msgid "Accepted party invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1514
+#: src/gui/windows/socialwindow.cpp:1481
#, c-format
msgid "Rejected party invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1531
+#: src/gui/windows/socialwindow.cpp:1498
#, c-format
msgid "Accepted guild invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1545
+#: src/gui/windows/socialwindow.cpp:1512
#, c-format
msgid "Rejected guild invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1585
+#: src/gui/windows/socialwindow.cpp:1552
#, c-format
msgid "Creating guild called %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1606
+#: src/gui/windows/socialwindow.cpp:1573
#, c-format
msgid "Creating party called %s."
msgstr ""
#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1621
+#: src/gui/windows/socialwindow.cpp:1588
msgid "Guild Name"
msgstr ""
#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1623
+#: src/gui/windows/socialwindow.cpp:1590
msgid "Choose your guild's name."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1639
+#: src/gui/windows/socialwindow.cpp:1606
msgid "Received guild request, but one already exists."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1647
+#: src/gui/windows/socialwindow.cpp:1614
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1654
+#: src/gui/windows/socialwindow.cpp:1621
msgid "Accept Guild Invite"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1670
+#: src/gui/windows/socialwindow.cpp:1637
msgid "Received party request, but one already exists."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1682
+#: src/gui/windows/socialwindow.cpp:1649
msgid "You have been invited you to join a party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1687
+#: src/gui/windows/socialwindow.cpp:1654
#, c-format
msgid "You have been invited to join the %s party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1696
+#: src/gui/windows/socialwindow.cpp:1663
#, c-format
msgid "%s has invited you to join their party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1702
+#: src/gui/windows/socialwindow.cpp:1669
#, c-format
msgid "%s has invited you to join the %s party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1712
+#: src/gui/windows/socialwindow.cpp:1679
msgid "Accept Party Invite"
msgstr ""
-#: src/gui/windows/socialwindow.cpp:1728
+#: src/gui/windows/socialwindow.cpp:1695
msgid "Cannot create party. You are already in a party"
msgstr ""
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1734
+#: src/gui/windows/socialwindow.cpp:1701
msgid "Party Name"
msgstr ""
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1736
+#: src/gui/windows/socialwindow.cpp:1703
msgid "Choose your party's name."
msgstr ""
@@ -6398,113 +6433,68 @@ msgstr ""
msgid "Correction points: %d"
msgstr ""
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "No Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Allow Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:105
-msgid "Need Target"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "General Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "Life Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "War Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Transmute Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Nature Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:121
-msgid "Astral Magic"
-msgstr ""
-
#. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:164
+#: src/gui/windows/textcommandeditor.cpp:47
msgid "Command Editor"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:52
msgid "magic"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:54
msgid "other"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:173
+#: src/gui/windows/textcommandeditor.cpp:56
msgid "Symbol:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:176
+#: src/gui/windows/textcommandeditor.cpp:59
msgid "Command:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:179
+#: src/gui/windows/textcommandeditor.cpp:62
msgid "Comment:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:183
+#: src/gui/windows/textcommandeditor.cpp:66
msgid "Target Type:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:187
+#: src/gui/windows/textcommandeditor.cpp:70
msgid "Icon:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:190
+#: src/gui/windows/textcommandeditor.cpp:73
msgid "Mana:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:193
+#: src/gui/windows/textcommandeditor.cpp:76
msgid "Magic level:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:197
+#: src/gui/windows/textcommandeditor.cpp:80
msgid "Magic School:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:200
+#: src/gui/windows/textcommandeditor.cpp:83
msgid "School level:"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/windows/textcommandeditor.cpp:88
msgid "Save"
msgstr ""
@@ -6534,7 +6524,7 @@ msgid "Trade: You"
msgstr ""
#. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
#, c-format
msgid "You get %s"
msgstr ""
@@ -6550,12 +6540,12 @@ msgid "You give:"
msgstr "你付出:"
#. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
msgid "You don't have enough money."
msgstr ""
#. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
msgid ""
"Failed adding item. You can not overlap one kind of item on the window."
msgstr "增加物品失敗。你不能覆蓋視窗中的該類物品能。"
@@ -6626,17 +6616,17 @@ msgid "Who Is Online - Update"
msgstr ""
#. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:87
+#: src/gui/windows/worldselectdialog.cpp:49
msgid "Select World"
msgstr ""
#. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:93
+#: src/gui/windows/worldselectdialog.cpp:55
msgid "Change Login"
msgstr ""
#. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:95
+#: src/gui/windows/worldselectdialog.cpp:57
msgid "Choose World"
msgstr ""
@@ -6854,7 +6844,7 @@ msgid "Failed to create character. Most likely the name is already taken."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:281
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
msgid "Wrong name."
msgstr ""
@@ -7012,58 +7002,58 @@ msgid "Experience sharing unknown."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:154
+#: src/net/ea/loginhandler.cpp:149
msgid "Account was not found. Please re-login."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/ea/loginhandler.cpp:153
msgid "Old password incorrect."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:162
+#: src/net/ea/loginhandler.cpp:157
msgid "New password too short."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:166 src/net/ea/loginhandler.cpp:293
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
msgid "Unknown error."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:239
+#: src/net/ea/loginhandler.cpp:234
msgid "Unregistered ID."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:238
msgid "Wrong password."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:248
+#: src/net/ea/loginhandler.cpp:243
msgid "Account expired."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:252
+#: src/net/ea/loginhandler.cpp:247
msgid "Rejected from server."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:256
+#: src/net/ea/loginhandler.cpp:251
msgid ""
"You have been permanently banned from the game. Please contact the GM team."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:261
+#: src/net/ea/loginhandler.cpp:256
msgid "Client too old."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:265
+#: src/net/ea/loginhandler.cpp:260
#, c-format
msgid ""
"You have been temporarily banned from the game until %s.\n"
@@ -7071,22 +7061,22 @@ msgid ""
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:273
+#: src/net/ea/loginhandler.cpp:268
msgid "Server overpopulated."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:277
+#: src/net/ea/loginhandler.cpp:272
msgid "This user name is already taken."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:285
+#: src/net/ea/loginhandler.cpp:280
msgid "Incorrect email."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:289
+#: src/net/ea/loginhandler.cpp:284
msgid "Username permanently erased."
msgstr ""
@@ -7759,7 +7749,7 @@ msgstr ""
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
#: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr ""
diff --git a/po/zh_TW.po b/po/zh_TW.po
index d9db415ad..a64ce6c9c 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: 2014-02-23 00:42+0300\n"
-"PO-Revision-Date: 2014-02-23 08:14+0000\n"
+"POT-Creation-Date: 2014-02-28 21:21+0300\n"
+"PO-Revision-Date: 2014-03-01 08:14+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"
@@ -29,7 +29,7 @@ msgid "Accepting incoming trade requests"
msgstr "接受收到的交易要求"
#. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1268
+#: src/actormanager.cpp:1255
msgid "Visible on map"
msgstr ""
@@ -38,455 +38,455 @@ msgstr ""
msgid "Human"
msgstr ""
-#: src/being/being.cpp:544
+#: src/being/being.cpp:496
msgid "dodge"
msgstr ""
-#: src/being/being.cpp:544
+#: src/being/being.cpp:496
msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1965 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1818 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1970 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1823 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr ""
#. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:392
+#: src/being/localplayer.cpp:376
#, c-format
msgid "You were killed by %s"
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1377
+#: src/being/localplayer.cpp:816
msgid "Tried to pick up nonexistent item."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1381
+#: src/being/localplayer.cpp:820
msgid "Item is too heavy."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1385
+#: src/being/localplayer.cpp:824
msgid "Item is too far away."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1389
+#: src/being/localplayer.cpp:828
msgid "Inventory is full."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1393
+#: src/being/localplayer.cpp:832
msgid "Stack is too big."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1397
+#: src/being/localplayer.cpp:836
msgid "Item belongs to someone else."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:1401
+#: src/being/localplayer.cpp:840
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:1425
+#: src/being/localplayer.cpp:864
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
msgstr[0] ""
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1630 src/being/localplayer.cpp:1665
-#: src/being/localplayer.cpp:1666
+#: src/being/localplayer.cpp:1044 src/being/localplayer.cpp:1079
+#: src/being/localplayer.cpp:1080
msgid "xp"
msgstr ""
-#: src/being/localplayer.cpp:1671 src/being/localplayer.cpp:1678
-#: src/being/localplayer.cpp:1685
+#: src/being/localplayer.cpp:1085 src/being/localplayer.cpp:1092
+#: src/being/localplayer.cpp:1099
msgid "job"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1871
+#: src/being/localplayer.cpp:1285
msgid "(D) default moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1873
+#: src/being/localplayer.cpp:1287
msgid "(I) invert moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1875
+#: src/being/localplayer.cpp:1289
msgid "(c) moves with some crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1877
+#: src/being/localplayer.cpp:1291
msgid "(C) moves with crazy moves"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1879
+#: src/being/localplayer.cpp:1293
msgid "(d) double normal + crazy"
msgstr ""
#. TRANSLATORS: move type in status bar
-#: src/being/localplayer.cpp:1881
+#: src/being/localplayer.cpp:1295
msgid "(?) unknown move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1904
+#: src/being/localplayer.cpp:1318
#, c-format
msgid "(%u) crazy move number %u"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1910
+#: src/being/localplayer.cpp:1324
msgid "(a) custom crazy move"
msgstr ""
#. TRANSLATORS: crazy move type in status bar
-#: src/being/localplayer.cpp:1915
+#: src/being/localplayer.cpp:1329
msgid "(?) crazy move"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1930
+#: src/being/localplayer.cpp:1344
msgid "(0) default moves to target"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1932
+#: src/being/localplayer.cpp:1346
msgid "(1) moves to target in distance 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1934
+#: src/being/localplayer.cpp:1348
msgid "(2) moves to target in distance 2"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1936
+#: src/being/localplayer.cpp:1350
msgid "(3) moves to target in distance 3"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1938
+#: src/being/localplayer.cpp:1352
msgid "(5) moves to target in distance 5"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1940
+#: src/being/localplayer.cpp:1354
msgid "(7) moves to target in distance 7"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1942
+#: src/being/localplayer.cpp:1356
msgid "(A) moves to target in attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1944
+#: src/being/localplayer.cpp:1358
msgid "(a) archer attack range"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1946
+#: src/being/localplayer.cpp:1360
msgid "(B) moves to target in attack range - 1"
msgstr ""
#. TRANSLATORS: move to target type in status bar
-#: src/being/localplayer.cpp:1948
+#: src/being/localplayer.cpp:1362
msgid "(?) move to target"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1968
+#: src/being/localplayer.cpp:1382
msgid "(D) default follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1970
+#: src/being/localplayer.cpp:1384
msgid "(R) relative follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1972
+#: src/being/localplayer.cpp:1386
msgid "(M) mirror follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1974
+#: src/being/localplayer.cpp:1388
msgid "(P) pet follow"
msgstr ""
#. TRANSLATORS: folow mode in status bar
-#: src/being/localplayer.cpp:1976
+#: src/being/localplayer.cpp:1390
msgid "(?) unknown follow"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1996 src/being/localplayer.cpp:2004
-#: src/being/localplayer.cpp:2032
+#: src/being/localplayer.cpp:1410 src/being/localplayer.cpp:1418
+#: src/being/localplayer.cpp:1446
msgid "(?) attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:1998 src/being/localplayer.cpp:2024
+#: src/being/localplayer.cpp:1412 src/being/localplayer.cpp:1438
msgid "(D) default attack"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2000
+#: src/being/localplayer.cpp:1414
msgid "(s) switch attack without shield"
msgstr ""
#. TRANSLATORS: switch attack type in status bar
-#: src/being/localplayer.cpp:2002
+#: src/being/localplayer.cpp:1416
msgid "(S) switch attack with shield"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2026
+#: src/being/localplayer.cpp:1440
msgid "(G) go and attack"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2028
+#: src/being/localplayer.cpp:1442
msgid "(A) go, attack, pickup"
msgstr ""
#. TRANSLATORS: attack type in status bar
-#: src/being/localplayer.cpp:2030
+#: src/being/localplayer.cpp:1444
msgid "(d) without auto attack"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2084
+#: src/being/localplayer.cpp:1498
msgid "(S) small pick up 1x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2086
+#: src/being/localplayer.cpp:1500
msgid "(D) default pick up 2x1 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2088
+#: src/being/localplayer.cpp:1502
msgid "(F) forward pick up 2x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2090
+#: src/being/localplayer.cpp:1504
msgid "(3) pick up 3x3 cells"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2092
+#: src/being/localplayer.cpp:1506
msgid "(g) go and pick up in distance 4"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2094
+#: src/being/localplayer.cpp:1508
msgid "(G) go and pick up in distance 8"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2096
+#: src/being/localplayer.cpp:1510
msgid "(A) go and pick up in max distance"
msgstr ""
#. TRANSLATORS: pickup size in status bar
-#: src/being/localplayer.cpp:2098
+#: src/being/localplayer.cpp:1512
msgid "(?) pick up"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2112
+#: src/being/localplayer.cpp:1526
msgid "(N) normal map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2114
+#: src/being/localplayer.cpp:1528
msgid "(D) debug map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2116
+#: src/being/localplayer.cpp:1530
msgid "(u) ultra map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2118
+#: src/being/localplayer.cpp:1532
msgid "(U) ultra map view 2"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2120
+#: src/being/localplayer.cpp:1534
msgid "(e) empty map view"
msgstr ""
#. TRANSLATORS: map view type in status bar
-#: src/being/localplayer.cpp:2122
+#: src/being/localplayer.cpp:1536
msgid "(b) black & white map view"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2142
+#: src/being/localplayer.cpp:1556
msgid "(f) use #flar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2144
+#: src/being/localplayer.cpp:1558
msgid "(c) use #chiza for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2146
+#: src/being/localplayer.cpp:1560
msgid "(I) use #ingrav for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2148
+#: src/being/localplayer.cpp:1562
msgid "(F) use #frillyar for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2150
+#: src/being/localplayer.cpp:1564
msgid "(U) use #upmarmu for magic attack"
msgstr ""
#. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:2152
+#: src/being/localplayer.cpp:1566
msgid "(?) magic attack"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2172
+#: src/being/localplayer.cpp:1586
msgid "(a) attack all players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2174
+#: src/being/localplayer.cpp:1588
msgid "(f) attack all except friends"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2176
+#: src/being/localplayer.cpp:1590
msgid "(b) attack bad relations"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2178
+#: src/being/localplayer.cpp:1592
msgid "(d) don't attack players"
msgstr ""
#. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:2180
+#: src/being/localplayer.cpp:1594
msgid "(?) pvp attack"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2200
+#: src/being/localplayer.cpp:1614
msgid "(D) default imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2202
+#: src/being/localplayer.cpp:1616
msgid "(O) outfits imitation"
msgstr ""
#. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:2204
+#: src/being/localplayer.cpp:1618
msgid "(?) imitation"
msgstr ""
#. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:2233
+#: src/being/localplayer.cpp:1647
msgid "Away"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2256
+#: src/being/localplayer.cpp:1670
msgid "(O) on keyboard"
msgstr ""
#. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:2258
+#: src/being/localplayer.cpp:1672
msgid "(A) away"
msgstr ""
#. TRANSLATORS: away type in status bar
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2260 src/being/localplayer.cpp:2278
+#: src/being/localplayer.cpp:1674 src/being/localplayer.cpp:1692
msgid "(?) away"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2274
+#: src/being/localplayer.cpp:1688
msgid "(G) game camera mode"
msgstr ""
#. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:2276
+#: src/being/localplayer.cpp:1690
msgid "(F) free camera mode"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2303
+#: src/being/localplayer.cpp:1717
msgid "Game modifiers are enabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2305
+#: src/being/localplayer.cpp:1719
msgid "Game modifiers are disabled"
msgstr ""
#. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:2307
+#: src/being/localplayer.cpp:1721
msgid "Game modifiers are unknown"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3887
+#: src/being/localplayer.cpp:3287
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3893 src/being/localplayer.cpp:3918
+#: src/being/localplayer.cpp:3293 src/being/localplayer.cpp:3318
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3903
+#: src/being/localplayer.cpp:3303
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3909 src/being/localplayer.cpp:3923
+#: src/being/localplayer.cpp:3309 src/being/localplayer.cpp:3323
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:4266
+#: src/being/localplayer.cpp:3666
#, c-format
msgid "You see %s"
msgstr ""
@@ -524,32 +524,32 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1139 src/gui/windowmenu.cpp:167
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:155
#: src/gui/windows/setupwindow.cpp:61
msgid "Setup"
msgstr "設定"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1143 src/gui/widgets/tabs/setup_perfomance.cpp:51
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:51
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1146 src/gui/widgets/tabs/setup_video.cpp:225
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:225
msgid "Video"
msgstr "顯示"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1149 src/gui/widgets/tabs/setup_theme.cpp:269
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:268
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1152 src/gui/windowmenu.cpp:74
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:71
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr "說明"
@@ -562,41 +562,41 @@ msgstr "說明"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1156 src/gui/popups/popupmenu.cpp:619
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:619
#: src/gui/windows/didyouknowwindow.cpp:78
-#: src/gui/windows/inventorywindow.cpp:227 src/gui/windows/npcdialog.cpp:69
-#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:138
+#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:69
+#: src/gui/windows/npcdialog.cpp:107 src/gui/windows/questswindow.cpp:124
#: src/gui/windows/shopwindow.cpp:78
msgid "Close"
msgstr "關閉"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1281
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1325
+#: src/client.cpp:1324
msgid "Logging in"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1367
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1492
+#: src/client.cpp:1489
msgid "Requesting characters"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1532
+#: src/client.cpp:1529
msgid "Connecting to the game server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1545
+#: src/client.cpp:1541
msgid "Changing game servers"
msgstr ""
@@ -611,12 +611,12 @@ msgstr ""
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1606 src/client.cpp:1617 src/client.cpp:1801
+#: src/client.cpp:1602 src/client.cpp:1613 src/client.cpp:1797
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:349
#: src/gui/windows/charselectdialog.cpp:299
-#: src/gui/windows/editserverdialog.cpp:218
+#: src/gui/windows/editserverdialog.cpp:186
#: src/gui/windows/registerdialog.cpp:260
#: src/gui/windows/unregisterdialog.cpp:146
#: src/net/ea/charserverhandler.cpp:202 src/net/ea/charserverhandler.cpp:226
@@ -624,65 +624,65 @@ msgid "Error"
msgstr "錯誤"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1629
+#: src/client.cpp:1625
msgid "Requesting registration details"
msgstr ""
#. TRANSLATORS: password change message header
-#: src/client.cpp:1670
+#: src/client.cpp:1666
msgid "Password Change"
msgstr ""
#. TRANSLATORS: password change message text
-#: src/client.cpp:1672
+#: src/client.cpp:1668
msgid "Password changed successfully!"
msgstr ""
#. TRANSLATORS: email change message header
-#: src/client.cpp:1694
+#: src/client.cpp:1690
msgid "Email Change"
msgstr ""
#. TRANSLATORS: email change message text
-#: src/client.cpp:1696
+#: src/client.cpp:1692
msgid "Email changed successfully!"
msgstr ""
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1719
+#: src/client.cpp:1715
msgid "Unregister Successful"
msgstr ""
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1721
+#: src/client.cpp:1717
msgid "Farewell, come back any time..."
msgstr ""
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1998 src/client.cpp:2013 src/client.cpp:2058
-#: src/client.cpp:2074 src/client.cpp:2525 src/client.cpp:2533
+#: src/client.cpp:2000 src/client.cpp:2015 src/client.cpp:2060
+#: src/client.cpp:2076 src/client.cpp:2527 src/client.cpp:2535
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2230
+#: src/client.cpp:2232
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2271 src/client.cpp:2278
+#: src/client.cpp:2273 src/client.cpp:2280
msgid "Error creating updates directory!"
msgstr "建立更新目錄失敗！"
-#: src/client.cpp:2300 src/client.cpp:2317
+#: src/client.cpp:2302 src/client.cpp:2319
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: error message question
-#: src/client.cpp:3001
+#: src/client.cpp:3003
msgid "Do you want to open support page?"
msgstr ""
@@ -928,99 +928,154 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:277 src/gui/widgets/tabs/chattab.cpp:464
+#: src/game.cpp:268 src/gui/widgets/tabs/chattab.cpp:464
msgid "General"
msgstr "一般"
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:293 src/gui/widgets/tabs/chattab.cpp:466
-#: src/gui/windowmenu.cpp:154 src/gui/windows/debugwindow.cpp:53
+#: src/game.cpp:284 src/gui/widgets/tabs/chattab.cpp:466
+#: src/gui/windowmenu.cpp:142 src/gui/windows/debugwindow.cpp:53
msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:575
+#: src/game.cpp:563
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:585
+#: src/game.cpp:573
msgid "Saving screenshot failed!"
msgstr "儲存抓圖失敗!"
#. TRANSLATORS: error message text
-#: src/game.cpp:656
+#: src/game.cpp:644
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:659
+#: src/game.cpp:647
msgid "Network Error"
msgstr "網路錯誤"
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:74 src/gui/windows/chatwindow.cpp:152
-msgid "black"
+#. TRANSLATORS: inventory sort mode
+#. TRANSLATORS: screen density type
+#. TRANSLATORS: vsync type
+#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
+#: src/gui/widgets/tabs/setup_other.cpp:72
+#: src/gui/widgets/tabs/setup_visual.cpp:78
+msgid "default"
msgstr ""
+#. TRANSLATORS: chat color
#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:35 src/gui/models/colormodel.cpp:74
+msgid "black"
+msgstr ""
+
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:76 src/gui/windows/chatwindow.cpp:154
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:37 src/gui/models/colormodel.cpp:76
msgid "red"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:78 src/gui/windows/chatwindow.cpp:156
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:39 src/gui/models/colormodel.cpp:78
msgid "green"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:80 src/gui/windows/chatwindow.cpp:158
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:41 src/gui/models/colormodel.cpp:80
msgid "blue"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:82 src/gui/windows/chatwindow.cpp:160
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:43 src/gui/models/colormodel.cpp:82
msgid "gold"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:84 src/gui/windows/chatwindow.cpp:162
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:45 src/gui/models/colormodel.cpp:84
msgid "yellow"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:86 src/gui/windows/chatwindow.cpp:164
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:47 src/gui/models/colormodel.cpp:86
msgid "pink"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:88 src/gui/windows/chatwindow.cpp:166
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:49 src/gui/models/colormodel.cpp:88
msgid "purple"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:90 src/gui/windows/chatwindow.cpp:168
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:51 src/gui/models/colormodel.cpp:90
msgid "grey"
msgstr ""
-#. TRANSLATORS: color name
#. TRANSLATORS: chat color
-#: src/gui/models/colormodel.cpp:92 src/gui/windows/chatwindow.cpp:170
+#. TRANSLATORS: color name
+#: src/gui/models/colorlistmodel.h:53 src/gui/models/colormodel.cpp:92
msgid "brown"
msgstr ""
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:55
+msgid "rainbow 1"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:57
+msgid "rainbow 2"
+msgstr ""
+
+#. TRANSLATORS: chat color
+#: src/gui/models/colorlistmodel.h:59
+msgid "rainbow 3"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:35
+msgid "General Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:37
+msgid "Life Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:39
+msgid "War Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:41
+msgid "Transmute Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:43
+msgid "Nature Magic"
+msgstr ""
+
+#. TRANSLATORS: magic school
+#: src/gui/models/magicschoolmodel.h:45
+msgid "Astral Magic"
+msgstr ""
+
#. TRANSLATORS: relation type
#: src/gui/models/playerrelationlistmodel.h:33
msgid "Neutral"
@@ -1056,46 +1111,61 @@ msgstr ""
msgid "Enemy"
msgstr ""
-#. TRANSLATORS: inventory sort mode
-#. TRANSLATORS: screen density type
-#. TRANSLATORS: vsync type
-#. TRANSLATORS: chat color
-#: src/gui/models/sortlistmodelinv.h:34
-#: src/gui/widgets/tabs/setup_other.cpp:72
-#: src/gui/widgets/tabs/setup_visual.cpp:78 src/gui/windows/chatwindow.cpp:150
-msgid "default"
+#. TRANSLATORS: buy dialog sort type.
+#: src/gui/models/sortlistmodelbuy.h:33
+msgid "unsorted"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:36 src/gui/windows/buydialog.cpp:62
-msgid "by name"
+#: src/gui/models/sortlistmodelbuy.h:35
+msgid "by price"
msgstr ""
+#. TRANSLATORS: buy dialog sort type.
#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:37 src/gui/models/sortlistmodelinv.h:36
+msgid "by name"
+msgstr ""
+
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:38 src/gui/windows/buydialog.cpp:64
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:39 src/gui/models/sortlistmodelinv.h:38
msgid "by id"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:40 src/gui/windows/buydialog.cpp:66
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:41 src/gui/models/sortlistmodelinv.h:40
msgid "by weight"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:42 src/gui/windows/buydialog.cpp:68
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:43 src/gui/models/sortlistmodelinv.h:42
msgid "by amount"
msgstr ""
-#. TRANSLATORS: inventory sort mode
#. TRANSLATORS: buy dialog sort type.
-#: src/gui/models/sortlistmodelinv.h:44 src/gui/windows/buydialog.cpp:70
+#. TRANSLATORS: inventory sort mode
+#: src/gui/models/sortlistmodelbuy.h:45 src/gui/models/sortlistmodelinv.h:44
msgid "by type"
msgstr ""
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:32
+msgid "No Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:34
+msgid "Allow Target"
+msgstr ""
+
+#. TRANSLATORS: target type
+#: src/gui/models/targettypemodel.h:36
+msgid "Need Target"
+msgstr ""
+
#. TRANSLATORS: update type
#. TRANSLATORS: onscreen button size
#: src/gui/models/updatetypemodel.h:32 src/gui/widgets/tabs/setup_touch.cpp:42
@@ -1242,8 +1312,8 @@ msgstr "說話"
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
#: src/gui/popups/popupmenu.cpp:242 src/gui/popups/popupmenu.cpp:2599
-#: src/gui/windows/buydialog.cpp:208 src/gui/windows/buydialog.cpp:220
-#: src/gui/windows/buydialog.cpp:274 src/gui/windows/buyselldialog.cpp:67
+#: src/gui/windows/buydialog.cpp:174 src/gui/windows/buydialog.cpp:186
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/buyselldialog.cpp:67
msgid "Buy"
msgstr "購買"
@@ -1340,12 +1410,12 @@ msgstr ""
#: src/gui/windows/changepassworddialog.cpp:57
#: src/gui/windows/charcreatedialog.cpp:121
#: src/gui/windows/connectiondialog.cpp:48
-#: src/gui/windows/editserverdialog.cpp:79
-#: src/gui/windows/itemamountwindow.cpp:163
+#: src/gui/windows/editserverdialog.cpp:58
+#: src/gui/windows/itemamountwindow.cpp:162
#: src/gui/windows/npcpostdialog.cpp:68 src/gui/windows/quitdialog.cpp:70
#: src/gui/windows/registerdialog.cpp:77 src/gui/windows/setupwindow.cpp:94
-#: src/gui/windows/socialwindow.cpp:1238
-#: src/gui/windows/textcommandeditor.cpp:203 src/gui/windows/textdialog.cpp:55
+#: src/gui/windows/socialwindow.cpp:1205
+#: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:54
#: src/gui/windows/updaterwindow.cpp:186
msgid "Cancel"
@@ -1417,7 +1487,7 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
#: src/gui/popups/popupmenu.cpp:567 src/gui/setupactiondata.h:1950
-#: src/gui/windowmenu.cpp:150 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windowmenu.cpp:138 src/gui/windows/inventorywindow.cpp:192
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
msgstr ""
@@ -1430,7 +1500,7 @@ msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:134
+#: src/gui/popups/popupmenu.cpp:592 src/gui/windowmenu.cpp:122
msgid "Spells"
msgstr ""
@@ -1486,7 +1556,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
#. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1311
+#: src/gui/popups/popupmenu.cpp:668 src/gui/windows/socialwindow.cpp:1278
msgid "Leave"
msgstr ""
@@ -1567,8 +1637,8 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:2025
-#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:223
-#: src/gui/windows/inventorywindow.cpp:745 src/gui/windows/setupwindow.cpp:96
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:96
msgid "Store"
msgstr "寄放"
@@ -1599,7 +1669,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:225
+#: src/gui/popups/popupmenu.cpp:1924 src/gui/windows/inventorywindow.cpp:224
msgid "Retrieve"
msgstr "取回"
@@ -1632,8 +1702,8 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
#: src/gui/popups/popupmenu.cpp:1987 src/gui/popups/popupmenu.cpp:2765
-#: src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:656 src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/inventorywindow.cpp:173
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr "使用"
@@ -1667,8 +1737,8 @@ msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: language
#: src/gui/popups/popupmenu.cpp:2215 src/gui/popups/popupmenu.cpp:2293
-#: src/gui/widgets/tabs/setup_theme.cpp:127
-#: src/gui/windows/socialwindow.cpp:1003
+#: src/gui/widgets/tabs/setup_theme.cpp:126
+#: src/gui/windows/socialwindow.cpp:970
msgid "(default)"
msgstr ""
@@ -1824,8 +1894,8 @@ msgstr ""
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2750 src/gui/windows/equipmentwindow.cpp:66
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:645
+#: src/gui/windows/inventorywindow.cpp:175
+#: src/gui/windows/inventorywindow.cpp:644
msgid "Unequip"
msgstr "卸下裝備"
@@ -1833,16 +1903,16 @@ msgstr "卸下裝備"
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:172
-#: src/gui/windows/inventorywindow.cpp:650 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/popups/popupmenu.cpp:2756 src/gui/windows/inventorywindow.cpp:171
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr "裝備"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:189
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2776 src/gui/windows/inventorywindow.cpp:188
+#: src/gui/windows/inventorywindow.cpp:752
msgid "Drop..."
msgstr ""
@@ -1856,15 +1926,15 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:138
-#: src/gui/windows/inventorywindow.cpp:758
+#: src/gui/popups/popupmenu.cpp:2785 src/gui/windowmenu.cpp:126
+#: src/gui/windows/inventorywindow.cpp:757
msgid "Drop"
msgstr "丟棄"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:191
+#: src/gui/popups/popupmenu.cpp:2793 src/gui/windows/inventorywindow.cpp:190
msgid "Split"
msgstr "分開"
@@ -2020,10 +2090,10 @@ msgstr "選擇確定"
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: servers dialog button
-#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:276
+#: src/gui/setupactiondata.h:183 src/gui/windows/buydialog.cpp:242
#: src/gui/windows/quitdialog.cpp:52 src/gui/windows/quitdialog.cpp:57
#: src/gui/windows/quitdialog.cpp:59 src/gui/windows/selldialog.cpp:110
-#: src/gui/windows/serverdialog.cpp:254
+#: src/gui/windows/serverdialog.cpp:198
msgid "Quit"
msgstr "離開"
@@ -2585,7 +2655,7 @@ msgstr ""
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: register dialog. button.
#: src/gui/setupactiondata.h:1809 src/gui/setupactiondata.h:1954
-#: src/gui/widgets/tabs/setup_audio.cpp:147
+#: src/gui/widgets/tabs/setup_audio.cpp:146
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:330
#: src/gui/widgets/tabs/setup_visual.cpp:189
@@ -2612,9 +2682,8 @@ msgstr ""
#. TRANSLATORS: command editor button
#: src/gui/setupactiondata.h:1833 src/gui/widgets/tabs/setup_relations.cpp:200
#: src/gui/windows/charselectdialog.cpp:108
-#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:94
-#: src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/textcommandeditor.cpp:207
+#: src/gui/windows/serverdialog.cpp:206 src/gui/windows/shopwindow.cpp:94
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/textcommandeditor.cpp:90
msgid "Delete"
msgstr "刪除"
@@ -2650,7 +2719,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:130
+#: src/gui/setupactiondata.h:1944 src/gui/windowmenu.cpp:118
msgid "Shortcuts"
msgstr ""
@@ -2658,7 +2727,7 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
#: src/gui/setupactiondata.h:1946 src/gui/widgets/tabs/setup_other.cpp:308
-#: src/gui/windowmenu.cpp:163
+#: src/gui/windowmenu.cpp:151
msgid "Windows"
msgstr ""
@@ -2674,7 +2743,7 @@ msgstr ""
#. TRANSLATORS: settings tab name
#. TRANSLATORS: chat window name
#: src/gui/setupactiondata.h:1952 src/gui/widgets/tabs/setup_chat.cpp:41
-#: src/gui/windowmenu.cpp:88 src/gui/windows/chatwindow.cpp:203
+#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:153
msgid "Chat"
msgstr "聊天"
@@ -2897,7 +2966,7 @@ msgstr ""
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:137
-#: src/gui/windows/inventorywindow.cpp:569
+#: src/gui/windows/inventorywindow.cpp:568
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
#, c-format
@@ -2917,7 +2986,7 @@ msgstr ""
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
#: src/gui/widgets/setupitem.cpp:365 src/gui/widgets/setupitem.cpp:501
-#: src/gui/windows/serverdialog.cpp:260
+#: src/gui/windows/serverdialog.cpp:204
msgid "Edit"
msgstr ""
@@ -2970,7 +3039,7 @@ msgstr ""
#. TRANSLATORS: tab in social window
#. TRANSLATORS: guild chat tab name
#: src/gui/widgets/tabs/guildchattab.cpp:37
-#: src/gui/windows/socialwindow.cpp:184 src/gui/windows/socialwindow.cpp:320
+#: src/gui/windows/socialwindow.cpp:186 src/gui/windows/socialwindow.cpp:322
#: src/net/ea/gui/guildtab.cpp:44
msgid "Guild"
msgstr "公會"
@@ -2981,142 +3050,142 @@ msgid "Lang"
msgstr ""
#. TRANSLATORS: audio tab in settings
-#: src/gui/widgets/tabs/setup_audio.cpp:49
+#: src/gui/widgets/tabs/setup_audio.cpp:48
msgid "Audio"
msgstr "音效"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:57
+#: src/gui/widgets/tabs/setup_audio.cpp:56
msgid "Basic settings"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:60
+#: src/gui/widgets/tabs/setup_audio.cpp:59
msgid "Enable Audio"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:63
+#: src/gui/widgets/tabs/setup_audio.cpp:62
msgid "Enable music"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:67
+#: src/gui/widgets/tabs/setup_audio.cpp:66
msgid "Enable game sfx"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:71
+#: src/gui/widgets/tabs/setup_audio.cpp:70
msgid "Enable gui sfx"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:75
+#: src/gui/widgets/tabs/setup_audio.cpp:74
msgid "Sfx volume"
msgstr "音效音量"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:79
+#: src/gui/widgets/tabs/setup_audio.cpp:78
msgid "Music volume"
msgstr "音樂音量"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:83
+#: src/gui/widgets/tabs/setup_audio.cpp:82
msgid "Enable music fade out"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:87
+#: src/gui/widgets/tabs/setup_audio.cpp:86
msgid "Audio frequency"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:91
+#: src/gui/widgets/tabs/setup_audio.cpp:90
msgid "mono"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:93
+#: src/gui/widgets/tabs/setup_audio.cpp:92
msgid "stereo"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:95
+#: src/gui/widgets/tabs/setup_audio.cpp:94
msgid "surround"
msgstr ""
#. TRANSLATORS: audio type
-#: src/gui/widgets/tabs/setup_audio.cpp:97
+#: src/gui/widgets/tabs/setup_audio.cpp:96
msgid "surround+center+lfe"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:99
+#: src/gui/widgets/tabs/setup_audio.cpp:98
msgid "Audio channels"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_audio.cpp:104
+#: src/gui/widgets/tabs/setup_audio.cpp:103
msgid "Sound effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:107
+#: src/gui/widgets/tabs/setup_audio.cpp:106
msgid "Information dialog sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:111
+#: src/gui/widgets/tabs/setup_audio.cpp:110
msgid "Request dialog sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:115
+#: src/gui/widgets/tabs/setup_audio.cpp:114
msgid "Whisper message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:119
+#: src/gui/widgets/tabs/setup_audio.cpp:118
msgid "Guild / Party message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:123
+#: src/gui/widgets/tabs/setup_audio.cpp:122
msgid "Highlight message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:127
+#: src/gui/widgets/tabs/setup_audio.cpp:126
msgid "Global message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:131
+#: src/gui/widgets/tabs/setup_audio.cpp:130
msgid "Error message sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:135
+#: src/gui/widgets/tabs/setup_audio.cpp:134
msgid "Trade request sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:139
+#: src/gui/widgets/tabs/setup_audio.cpp:138
msgid "Show window sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:143
+#: src/gui/widgets/tabs/setup_audio.cpp:142
msgid "Hide window sound"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:151
+#: src/gui/widgets/tabs/setup_audio.cpp:150
msgid "Enable mumble voice chat"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:156
+#: src/gui/widgets/tabs/setup_audio.cpp:155
msgid "Download music"
msgstr ""
@@ -3412,7 +3481,7 @@ msgstr ""
#. TRANSLATORS: unknown key name
#. TRANSLATORS: quests window quest name
#: src/gui/widgets/tabs/setup_input.cpp:364
-#: src/gui/windows/questswindow.cpp:263
+#: src/gui/windows/questswindow.cpp:249
msgid "unknown"
msgstr ""
@@ -3571,7 +3640,7 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: debug window tab
#. TRANSLATORS: mini map window name
-#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:105
+#: src/gui/widgets/tabs/setup_other.cpp:126 src/gui/windowmenu.cpp:102
#: src/gui/windows/debugwindow.cpp:72 src/gui/windows/minimap.cpp:51
#: src/gui/windows/minimap.cpp:114
msgid "Map"
@@ -3739,9 +3808,9 @@ msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: shop window name
#. TRANSLATORS: inventory button
-#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:146
+#: src/gui/widgets/tabs/setup_other.cpp:256 src/gui/windowmenu.cpp:134
#: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windows/inventorywindow.cpp:194
msgid "Shop"
msgstr "商店"
@@ -4123,252 +4192,252 @@ msgid "When ignoring:"
msgstr "當忽略時："
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:64
+#: src/gui/widgets/tabs/setup_theme.cpp:63
msgid "Very small (8)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:66
+#: src/gui/widgets/tabs/setup_theme.cpp:65
msgid "Very small (9)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:68
+#: src/gui/widgets/tabs/setup_theme.cpp:67
msgid "Tiny (10)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:70
+#: src/gui/widgets/tabs/setup_theme.cpp:69
msgid "Small (11)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:72
+#: src/gui/widgets/tabs/setup_theme.cpp:71
msgid "Medium (12)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:74
+#: src/gui/widgets/tabs/setup_theme.cpp:73
msgid "Normal (13)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:76
+#: src/gui/widgets/tabs/setup_theme.cpp:75
msgid "Large (14)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:78
+#: src/gui/widgets/tabs/setup_theme.cpp:77
msgid "Large (15)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:80
+#: src/gui/widgets/tabs/setup_theme.cpp:79
msgid "Large (16)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:82
+#: src/gui/widgets/tabs/setup_theme.cpp:81
msgid "Big (17)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:84
+#: src/gui/widgets/tabs/setup_theme.cpp:83
msgid "Big (18)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:86
+#: src/gui/widgets/tabs/setup_theme.cpp:85
msgid "Big (19)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:88
+#: src/gui/widgets/tabs/setup_theme.cpp:87
msgid "Very big (20)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:90
+#: src/gui/widgets/tabs/setup_theme.cpp:89
msgid "Very big (21)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:92
+#: src/gui/widgets/tabs/setup_theme.cpp:91
msgid "Very big (22)"
msgstr ""
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:94
+#: src/gui/widgets/tabs/setup_theme.cpp:93
msgid "Huge (23)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:129
+#: src/gui/widgets/tabs/setup_theme.cpp:128
msgid "Chinese (China)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:131
+#: src/gui/widgets/tabs/setup_theme.cpp:130
msgid "Czech"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:133
+#: src/gui/widgets/tabs/setup_theme.cpp:132
msgid "English"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:135
+#: src/gui/widgets/tabs/setup_theme.cpp:134
msgid "Finnish"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:137
+#: src/gui/widgets/tabs/setup_theme.cpp:136
msgid "French"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:139
+#: src/gui/widgets/tabs/setup_theme.cpp:138
msgid "German"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:141
+#: src/gui/widgets/tabs/setup_theme.cpp:140
msgid "Indonesian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:143
+#: src/gui/widgets/tabs/setup_theme.cpp:142
msgid "Italian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:145
+#: src/gui/widgets/tabs/setup_theme.cpp:144
msgid "Polish"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:147
+#: src/gui/widgets/tabs/setup_theme.cpp:146
msgid "Japanese"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:149
+#: src/gui/widgets/tabs/setup_theme.cpp:148
msgid "Dutch (Belgium/Flemish)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:151
+#: src/gui/widgets/tabs/setup_theme.cpp:150
msgid "Portuguese"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:153
+#: src/gui/widgets/tabs/setup_theme.cpp:152
msgid "Portuguese (Brazilian)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:155
+#: src/gui/widgets/tabs/setup_theme.cpp:154
msgid "Russian"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:157
+#: src/gui/widgets/tabs/setup_theme.cpp:156
msgid "Spanish (Castilian)"
msgstr ""
#. TRANSLATORS: language
-#: src/gui/widgets/tabs/setup_theme.cpp:159
+#: src/gui/widgets/tabs/setup_theme.cpp:158
msgid "Turkish"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:211
+#: src/gui/widgets/tabs/setup_theme.cpp:210
msgid "Gui theme"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:218
+#: src/gui/widgets/tabs/setup_theme.cpp:217
msgid "Main Font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:223
+#: src/gui/widgets/tabs/setup_theme.cpp:222
msgid "Language"
msgstr ""
#. TRANSLATORS: theme settings label
#. TRANSLATORS: font size
-#: src/gui/widgets/tabs/setup_theme.cpp:227 src/gui/windows/emotewindow.cpp:45
+#: src/gui/widgets/tabs/setup_theme.cpp:226 src/gui/windows/emotewindow.cpp:45
msgid "Bold font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:231
+#: src/gui/widgets/tabs/setup_theme.cpp:230
msgid "Particle font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:235
+#: src/gui/widgets/tabs/setup_theme.cpp:234
msgid "Help font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:239
+#: src/gui/widgets/tabs/setup_theme.cpp:238
msgid "Secure font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:243
+#: src/gui/widgets/tabs/setup_theme.cpp:242
msgid "Npc font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:247
+#: src/gui/widgets/tabs/setup_theme.cpp:246
msgid "Japanese font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:251
+#: src/gui/widgets/tabs/setup_theme.cpp:250
msgid "Chinese font"
msgstr ""
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:256
+#: src/gui/widgets/tabs/setup_theme.cpp:255
msgid "Font size"
msgstr "字型大小"
#. TRANSLATORS: theme settings label
-#: src/gui/widgets/tabs/setup_theme.cpp:261
+#: src/gui/widgets/tabs/setup_theme.cpp:260
msgid "Npc font size"
msgstr ""
#. TRANSLATORS: button name with information about selected theme
-#: src/gui/widgets/tabs/setup_theme.cpp:265
+#: src/gui/widgets/tabs/setup_theme.cpp:264
msgid "i"
msgstr ""
#. TRANSLATORS: theme info dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:404
+#: src/gui/widgets/tabs/setup_theme.cpp:403
msgid "Name: "
msgstr ""
-#: src/gui/widgets/tabs/setup_theme.cpp:405
+#: src/gui/widgets/tabs/setup_theme.cpp:404
msgid "Copyright:"
msgstr ""
#. TRANSLATORS: theme info dialog header
-#: src/gui/widgets/tabs/setup_theme.cpp:470
+#: src/gui/widgets/tabs/setup_theme.cpp:469
msgid "Theme info"
msgstr ""
#. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:497
+#: src/gui/widgets/tabs/setup_theme.cpp:496
msgid "Theme Changed"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:497
+#: src/gui/widgets/tabs/setup_theme.cpp:496
#: src/gui/widgets/tabs/setup_video.cpp:499
#: src/gui/widgets/tabs/setup_video.cpp:508
msgid "Restart your client for the change to take effect."
@@ -4699,178 +4768,169 @@ msgid "Allow screensaver to run"
msgstr ""
#. TRANSLATORS: short button name for who is online window.
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:67
msgid "ONL"
msgstr ""
-#: src/gui/windowmenu.cpp:71
+#: src/gui/windowmenu.cpp:68
msgid "Who is online"
msgstr ""
#. TRANSLATORS: short button name for help window.
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:70
msgid "HLP"
msgstr ""
#. TRANSLATORS: short button name for quests window.
-#: src/gui/windowmenu.cpp:76
+#: src/gui/windowmenu.cpp:73
msgid "QE"
msgstr ""
#. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:77 src/gui/windows/questswindow.cpp:126
+#: src/gui/windowmenu.cpp:74 src/gui/windows/questswindow.cpp:112
msgid "Quests"
msgstr ""
#. TRANSLATORS: short button name for bot checker window.
-#: src/gui/windowmenu.cpp:79
+#: src/gui/windowmenu.cpp:76
msgid "BC"
msgstr ""
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:77
msgid "Bot checker"
msgstr ""
#. TRANSLATORS: short button name for kill stats window.
-#: src/gui/windowmenu.cpp:82
+#: src/gui/windowmenu.cpp:79
msgid "KS"
msgstr ""
#. TRANSLATORS: kill stats window name
-#: src/gui/windowmenu.cpp:83 src/gui/windows/killstats.cpp:42
+#: src/gui/windowmenu.cpp:80 src/gui/windows/killstats.cpp:42
msgid "Kill stats"
msgstr ""
-#: src/gui/windowmenu.cpp:85
+#: src/gui/windowmenu.cpp:82
msgid "Smilies"
msgstr ""
#. TRANSLATORS: short button name for chat window.
-#: src/gui/windowmenu.cpp:87
+#: src/gui/windowmenu.cpp:84
msgid "CH"
msgstr ""
#. TRANSLATORS: short button name for status window.
-#: src/gui/windowmenu.cpp:95
+#: src/gui/windowmenu.cpp:92
msgid "STA"
msgstr ""
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:93
msgid "Status"
msgstr "狀態"
#. TRANSLATORS: short button name for equipment window.
-#: src/gui/windowmenu.cpp:98
+#: src/gui/windowmenu.cpp:95
msgid "EQU"
msgstr ""
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:58
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windowmenu.cpp:96 src/gui/windows/equipmentwindow.cpp:58
+#: src/gui/windows/inventorywindow.cpp:196
msgid "Equipment"
msgstr "裝備"
#. TRANSLATORS: short button name for inventory window.
-#: src/gui/windowmenu.cpp:101
+#: src/gui/windowmenu.cpp:98
msgid "INV"
msgstr ""
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:102 src/gui/windows/inventorywindow.cpp:130
+#: src/gui/windowmenu.cpp:99 src/gui/windows/inventorywindow.cpp:129
#: src/inventory.cpp:257
msgid "Inventory"
msgstr "物品攔"
#. TRANSLATORS: short button name for map window.
-#: src/gui/windowmenu.cpp:104
+#: src/gui/windowmenu.cpp:101
msgid "MAP"
msgstr ""
#. TRANSLATORS: short button name for skills window.
-#: src/gui/windowmenu.cpp:110
+#: src/gui/windowmenu.cpp:107
msgid "SKI"
msgstr ""
#. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:111 src/gui/windows/skilldialog.cpp:283
+#: src/gui/windowmenu.cpp:108 src/gui/windows/skilldialog.cpp:283
msgid "Skills"
msgstr "技能"
-#. TRANSLATORS: short button name for specials window.
-#: src/gui/windowmenu.cpp:118
-msgid "SPE"
-msgstr ""
-
-#: src/gui/windowmenu.cpp:119
-msgid "Specials"
-msgstr ""
-
#. TRANSLATORS: short button name for social window.
-#: src/gui/windowmenu.cpp:124
+#: src/gui/windowmenu.cpp:112
msgid "SOC"
msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: social window name
-#: src/gui/windowmenu.cpp:126 src/gui/windows/socialwindow.cpp:1284
+#: src/gui/windowmenu.cpp:114 src/gui/windows/socialwindow.cpp:1251
msgid "Social"
msgstr ""
#. TRANSLATORS: short button name for shortcuts window.
-#: src/gui/windowmenu.cpp:128
+#: src/gui/windowmenu.cpp:116
msgid "SH"
msgstr ""
#. TRANSLATORS: short button name for spells window.
-#: src/gui/windowmenu.cpp:132
+#: src/gui/windowmenu.cpp:120
msgid "SP"
msgstr ""
#. TRANSLATORS: short button name for drops window.
-#: src/gui/windowmenu.cpp:136
+#: src/gui/windowmenu.cpp:124
msgid "DR"
msgstr ""
#. TRANSLATORS: short button name for did you know window.
-#: src/gui/windowmenu.cpp:140
+#: src/gui/windowmenu.cpp:128
msgid "YK"
msgstr ""
#. TRANSLATORS: full button name
-#: src/gui/windowmenu.cpp:142
+#: src/gui/windowmenu.cpp:130
msgid "Did you know"
msgstr ""
#. TRANSLATORS: short button name for shop window.
-#: src/gui/windowmenu.cpp:144
+#: src/gui/windowmenu.cpp:132
msgid "SHP"
msgstr ""
#. TRANSLATORS: short button name for outfits window.
-#: src/gui/windowmenu.cpp:148
+#: src/gui/windowmenu.cpp:136
msgid "OU"
msgstr ""
#. TRANSLATORS: short button name for debug window.
-#: src/gui/windowmenu.cpp:152
+#: src/gui/windowmenu.cpp:140
msgid "DBG"
msgstr ""
#. TRANSLATORS: short button name for windows list menu.
-#: src/gui/windowmenu.cpp:161
+#: src/gui/windowmenu.cpp:149
msgid "WIN"
msgstr ""
#. TRANSLATORS: short button name for setup window.
-#: src/gui/windowmenu.cpp:165
+#: src/gui/windowmenu.cpp:153
msgid "SET"
msgstr ""
#. TRANSLATORS: short key name
#. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:301 src/gui/windows/outfitwindow.cpp:71
+#: src/gui/windowmenu.cpp:289 src/gui/windows/outfitwindow.cpp:71
#: src/gui/windows/outfitwindow.cpp:561
#, c-format
msgid "Key: %s"
@@ -4892,31 +4952,21 @@ msgstr "重設"
msgid "Result"
msgstr ""
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:58
-msgid "unsorted"
-msgstr ""
-
-#. TRANSLATORS: buy dialog sort type.
-#: src/gui/windows/buydialog.cpp:60
-msgid "by price"
-msgstr ""
-
#. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:196
+#: src/gui/windows/buydialog.cpp:162
msgid "Create items"
msgstr ""
#. TRANSLATORS: buy dialog label
#. TRANSLATORS: sell dialog label
-#: src/gui/windows/buydialog.cpp:254 src/gui/windows/buydialog.cpp:541
-#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:366
+#: src/gui/windows/buydialog.cpp:220 src/gui/windows/buydialog.cpp:507
+#: src/gui/windows/selldialog.cpp:100 src/gui/windows/selldialog.cpp:356
#, c-format
msgid "Price: %s / Total: %s"
msgstr "價格: %s / 總共: %s"
#. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:263
+#: src/gui/windows/buydialog.cpp:229
msgid "Amount:"
msgstr ""
@@ -4926,8 +4976,8 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: status window label (plus sign)
-#: src/gui/windows/buydialog.cpp:268 src/gui/windows/itemamountwindow.cpp:159
-#: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/npcdialog.cpp:100
+#: src/gui/windows/buydialog.cpp:234 src/gui/windows/itemamountwindow.cpp:158
+#: src/gui/windows/itemamountwindow.cpp:193 src/gui/windows/npcdialog.cpp:100
#: src/gui/windows/selldialog.cpp:104 src/gui/windows/statuswindow.cpp:829
msgid "+"
msgstr "增加"
@@ -4938,8 +4988,8 @@ msgstr "增加"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: status window label (minus sign)
-#: src/gui/windows/buydialog.cpp:271 src/gui/windows/itemamountwindow.cpp:157
-#: src/gui/windows/itemamountwindow.cpp:191 src/gui/windows/npcdialog.cpp:102
+#: src/gui/windows/buydialog.cpp:237 src/gui/windows/itemamountwindow.cpp:156
+#: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/npcdialog.cpp:102
#: src/gui/windows/selldialog.cpp:106 src/gui/windows/statuswindow.cpp:842
msgid "-"
msgstr "減少"
@@ -4947,9 +4997,9 @@ msgstr "減少"
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:274 src/gui/windows/charcreatedialog.cpp:119
-#: src/gui/windows/charselectdialog.cpp:593
-#: src/gui/windows/socialwindow.cpp:1307
+#: src/gui/windows/buydialog.cpp:240 src/gui/windows/charcreatedialog.cpp:119
+#: src/gui/windows/charselectdialog.cpp:585
+#: src/gui/windows/socialwindow.cpp:1274
msgid "Create"
msgstr "創造"
@@ -4958,7 +5008,7 @@ msgstr "創造"
#. TRANSLATORS: status bar label
#. TRANSLATORS: status window label
#. TRANSLATORS: status bar label
-#: src/gui/windows/buydialog.cpp:278 src/gui/windows/selldialog.cpp:112
+#: src/gui/windows/buydialog.cpp:244 src/gui/windows/selldialog.cpp:112
#: src/gui/windows/statuswindow.cpp:568 src/gui/windows/statuswindow.cpp:623
#: src/gui/windows/statuswindow.cpp:826 src/gui/windows/statuswindow.cpp:858
msgid "Max"
@@ -5057,7 +5107,7 @@ msgstr ""
#. TRANSLATORS: login dialog label
#. TRANSLATORS: register dialog. label.
#: src/gui/windows/charcreatedialog.cpp:73
-#: src/gui/windows/editserverdialog.cpp:89 src/gui/windows/logindialog.cpp:122
+#: src/gui/windows/editserverdialog.cpp:68 src/gui/windows/logindialog.cpp:122
#: src/gui/windows/registerdialog.cpp:89
msgid "Name:"
msgstr "名字："
@@ -5118,7 +5168,7 @@ msgstr "女生"
#. TRANSLATORS: char create dialog label
#: src/gui/windows/charcreatedialog.cpp:115
-#: src/gui/windows/charcreatedialog.cpp:469
+#: src/gui/windows/charcreatedialog.cpp:458
#, c-format
msgid "Please distribute %d points"
msgstr "請分配%d點數"
@@ -5134,17 +5184,17 @@ msgid "Look:"
msgstr ""
#. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:362
+#: src/gui/windows/charcreatedialog.cpp:351
msgid "Your name needs to be at least 4 characters."
msgstr "你的名字至少需要4個字元"
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:459
+#: src/gui/windows/charcreatedialog.cpp:448
msgid "Character stats OK"
msgstr "角色狀態確定"
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:475
+#: src/gui/windows/charcreatedialog.cpp:464
#, c-format
msgid "Please remove %d points"
msgstr "請移除%d點數"
@@ -5173,7 +5223,7 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:104
-#: src/gui/windows/charselectdialog.cpp:588
+#: src/gui/windows/charselectdialog.cpp:580
#: src/gui/windows/updaterwindow.cpp:188
msgid "Play"
msgstr "開始"
@@ -5229,35 +5279,20 @@ msgstr ""
msgid "Enter password:"
msgstr ""
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:172
-msgid "rainbow 1"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:174
-msgid "rainbow 2"
-msgstr ""
-
-#. TRANSLATORS: chat color
-#: src/gui/windows/chatwindow.cpp:176
-msgid "rainbow 3"
-msgstr ""
-
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:755
+#: src/gui/windows/chatwindow.cpp:705
#, c-format
msgid "Present: %s; %d players are present."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1169
+#: src/gui/windows/chatwindow.cpp:1119
#, c-format
msgid "Whispering to %s: %s"
msgstr "對%s竊竊私語：%s"
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1613
+#: src/gui/windows/chatwindow.cpp:1563
#, c-format
msgid "%s's pet"
msgstr ""
@@ -5503,51 +5538,51 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: text dialog button
-#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:77
-#: src/gui/windows/itemamountwindow.cpp:161 src/gui/windows/okdialog.cpp:51
+#: src/gui/windows/editdialog.cpp:47 src/gui/windows/editserverdialog.cpp:56
+#: src/gui/windows/itemamountwindow.cpp:160 src/gui/windows/okdialog.cpp:51
#: src/gui/windows/quitdialog.cpp:68 src/gui/windows/textdialog.cpp:48
msgid "OK"
msgstr "確定"
#. TRANSLATORS: edit server dialog name
-#: src/gui/windows/editserverdialog.cpp:66
+#: src/gui/windows/editserverdialog.cpp:45
msgid "Edit Server"
msgstr ""
#. TRANSLATORS: edit server dialog button
#. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:75
-#: src/gui/windows/serverdialog.cpp:256
+#: src/gui/windows/editserverdialog.cpp:54
+#: src/gui/windows/serverdialog.cpp:200
msgid "Connect"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:91
+#: src/gui/windows/editserverdialog.cpp:70
msgid "Address:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:93
+#: src/gui/windows/editserverdialog.cpp:72
msgid "Port:"
msgstr "端口(port):"
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:95
+#: src/gui/windows/editserverdialog.cpp:74
msgid "Server type:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:97
+#: src/gui/windows/editserverdialog.cpp:76
msgid "Description:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:99
+#: src/gui/windows/editserverdialog.cpp:78
msgid "Online list url:"
msgstr ""
#. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:220
+#: src/gui/windows/editserverdialog.cpp:188
msgid "Please at least type both the address and the port of the server."
msgstr ""
@@ -5567,47 +5602,47 @@ msgid "Did you know..."
msgstr ""
#. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:165
+#: src/gui/windows/itemamountwindow.cpp:164
msgid "All"
msgstr "全部"
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:221
+#: src/gui/windows/itemamountwindow.cpp:220
msgid "Select amount of items to trade."
msgstr "請選擇交易的物品數量"
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:225
+#: src/gui/windows/itemamountwindow.cpp:224
msgid "Select amount of items to drop."
msgstr "請選擇丟棄的物品數量"
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:229
+#: src/gui/windows/itemamountwindow.cpp:228
msgid "Select amount of items to store."
msgstr "選擇要儲存的物品數量。"
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:233
+#: src/gui/windows/itemamountwindow.cpp:232
msgid "Select amount of items to retrieve."
msgstr "選擇要取回的物品數量。"
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:237
+#: src/gui/windows/itemamountwindow.cpp:236
msgid "Select amount of items to split."
msgstr "請選擇你要分離的物品數量"
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:241
+#: src/gui/windows/itemamountwindow.cpp:240
msgid "Add to buy shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:245
+#: src/gui/windows/itemamountwindow.cpp:244
msgid "Add to sell shop."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:249
+#: src/gui/windows/itemamountwindow.cpp:248
msgid "Unknown."
msgstr ""
@@ -5857,7 +5892,7 @@ msgstr "確認"
#. TRANSLATORS: shop window label
#. TRANSLATORS: shop window button
#. TRANSLATORS: trade window button
-#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:258
+#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/serverdialog.cpp:202
#: src/gui/windows/shopwindow.cpp:92 src/gui/windows/shopwindow.cpp:99
#: src/gui/windows/tradewindow.cpp:78
msgid "Add"
@@ -5959,53 +5994,53 @@ msgid "Do you really want to sell %s?"
msgstr ""
#. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:247
+#: src/gui/windows/serverdialog.cpp:191
msgid "Choose Your Server"
msgstr ""
#. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:264
+#: src/gui/windows/serverdialog.cpp:208
msgid "Load"
msgstr ""
#. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:280
+#: src/gui/windows/serverdialog.cpp:224
msgid "Choose Your Server *** SAFE MODE ***"
msgstr ""
#. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:289
+#: src/gui/windows/serverdialog.cpp:233
msgid "Use same ip for game sub servers"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:532
+#: src/gui/windows/serverdialog.cpp:476
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:538
+#: src/gui/windows/serverdialog.cpp:482
msgid "Waiting for server..."
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:543
+#: src/gui/windows/serverdialog.cpp:487
msgid "Preparing download"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:548
+#: src/gui/windows/serverdialog.cpp:492
msgid "Error retreiving server list!"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:639
+#: src/gui/windows/serverdialog.cpp:583
msgid "requires a newer version"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:644
+#: src/gui/windows/serverdialog.cpp:588
#, c-format
msgid "requires v%s"
msgstr ""
@@ -6086,277 +6121,277 @@ msgid "Skill %d"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:225
+#: src/gui/windows/socialwindow.cpp:227
#, c-format
msgid "Invited user %s to guild %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:240
+#: src/gui/windows/socialwindow.cpp:242
#, c-format
msgid "Guild %s quit requested."
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:254
+#: src/gui/windows/socialwindow.cpp:256
msgid "Member Invite to Guild"
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:256
+#: src/gui/windows/socialwindow.cpp:258
#, c-format
msgid "Who would you like to invite to guild %s?"
msgstr ""
#. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:266
+#: src/gui/windows/socialwindow.cpp:268
msgid "Leave Guild?"
msgstr ""
#. TRANSLATORS: guild leave message
-#: src/gui/windows/socialwindow.cpp:268
+#: src/gui/windows/socialwindow.cpp:270
#, c-format
msgid "Are you sure you want to leave guild %s?"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:279
+#: src/gui/windows/socialwindow.cpp:281
#, c-format
msgid "Members: %u/%u"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:301 src/gui/windows/socialwindow.cpp:373
-#: src/gui/windows/socialwindow.cpp:498
+#: src/gui/windows/socialwindow.cpp:303 src/gui/windows/socialwindow.cpp:375
+#: src/gui/windows/socialwindow.cpp:500
#, c-format
msgid "Players: %u/%u"
msgstr ""
#. TRANSLATORS: tab in social window
#. TRANSLATORS: party chat tab name
-#: src/gui/windows/socialwindow.cpp:389 src/net/ea/gui/partytab.cpp:46
+#: src/gui/windows/socialwindow.cpp:391 src/net/ea/gui/partytab.cpp:46
msgid "Party"
msgstr "隊伍"
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:429
+#: src/gui/windows/socialwindow.cpp:431
#, c-format
msgid "Invited user %s to party."
msgstr ""
#. TRANSLATORS: tab in social window
-#: src/gui/windows/socialwindow.cpp:444
+#: src/gui/windows/socialwindow.cpp:446
#, c-format
msgid "Party %s quit requested."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:458
+#: src/gui/windows/socialwindow.cpp:460
msgid "Member Invite to Party"
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:460
+#: src/gui/windows/socialwindow.cpp:462
#, c-format
msgid "Who would you like to invite to party %s?"
msgstr ""
#. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:470
+#: src/gui/windows/socialwindow.cpp:472
msgid "Leave Party?"
msgstr ""
#. TRANSLATORS: party leave message
-#: src/gui/windows/socialwindow.cpp:472
+#: src/gui/windows/socialwindow.cpp:474
#, c-format
msgid "Are you sure you want to leave party %s?"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:698
+#: src/gui/windows/socialwindow.cpp:665
#, c-format
msgid "Visible players: %d"
msgstr ""
#. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:725
+#: src/gui/windows/socialwindow.cpp:692
msgid "Nav"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:827
+#: src/gui/windows/socialwindow.cpp:794
#, c-format
msgid "Portals: %u/%u"
msgstr ""
#. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1054
+#: src/gui/windows/socialwindow.cpp:1021
msgid "Atk"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1073
+#: src/gui/windows/socialwindow.cpp:1040
msgid "Priority mobs"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1075
+#: src/gui/windows/socialwindow.cpp:1042
msgid "Attack mobs"
msgstr ""
#. TRANSLATORS: mobs group name in social window
-#: src/gui/windows/socialwindow.cpp:1077
+#: src/gui/windows/socialwindow.cpp:1044
msgid "Ignore mobs"
msgstr ""
#. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/windows/socialwindow.cpp:1101
+#: src/gui/windows/socialwindow.cpp:1068
msgid "Pik"
msgstr ""
#. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1120
+#: src/gui/windows/socialwindow.cpp:1087
msgid "Pickup items"
msgstr ""
#. TRANSLATORS: items group name in social window
-#: src/gui/windows/socialwindow.cpp:1122
+#: src/gui/windows/socialwindow.cpp:1089
msgid "Ignore items"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/windows/socialwindow.cpp:1212
+#: src/gui/windows/socialwindow.cpp:1179
#, c-format
msgid "Friends: %u/%u"
msgstr ""
#. TRANSLATORS: party popup item
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1235 src/gui/windows/socialwindow.cpp:1727
+#: src/gui/windows/socialwindow.cpp:1202 src/gui/windows/socialwindow.cpp:1694
msgid "Create Party"
msgstr ""
#. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:1298
+#: src/gui/windows/socialwindow.cpp:1265
msgid "P"
msgstr ""
#. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/socialwindow.cpp:1303
+#: src/gui/windows/socialwindow.cpp:1270
msgid "F"
msgstr ""
#. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:1309
+#: src/gui/windows/socialwindow.cpp:1276
msgid "Invite"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1503
+#: src/gui/windows/socialwindow.cpp:1470
#, c-format
msgid "Accepted party invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1514
+#: src/gui/windows/socialwindow.cpp:1481
#, c-format
msgid "Rejected party invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1531
+#: src/gui/windows/socialwindow.cpp:1498
#, c-format
msgid "Accepted guild invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1545
+#: src/gui/windows/socialwindow.cpp:1512
#, c-format
msgid "Rejected guild invite from %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1585
+#: src/gui/windows/socialwindow.cpp:1552
#, c-format
msgid "Creating guild called %s."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1606
+#: src/gui/windows/socialwindow.cpp:1573
#, c-format
msgid "Creating party called %s."
msgstr ""
#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1621
+#: src/gui/windows/socialwindow.cpp:1588
msgid "Guild Name"
msgstr ""
#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:1623
+#: src/gui/windows/socialwindow.cpp:1590
msgid "Choose your guild's name."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1639
+#: src/gui/windows/socialwindow.cpp:1606
msgid "Received guild request, but one already exists."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1647
+#: src/gui/windows/socialwindow.cpp:1614
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr ""
#. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:1654
+#: src/gui/windows/socialwindow.cpp:1621
msgid "Accept Guild Invite"
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:1670
+#: src/gui/windows/socialwindow.cpp:1637
msgid "Received party request, but one already exists."
msgstr "收到派對邀請,但而有另一個存在."
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1682
+#: src/gui/windows/socialwindow.cpp:1649
msgid "You have been invited you to join a party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1687
+#: src/gui/windows/socialwindow.cpp:1654
#, c-format
msgid "You have been invited to join the %s party."
msgstr ""
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1696
+#: src/gui/windows/socialwindow.cpp:1663
#, c-format
msgid "%s has invited you to join their party."
msgstr "%s 邀請你參加他們的派對."
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1702
+#: src/gui/windows/socialwindow.cpp:1669
#, c-format
msgid "%s has invited you to join the %s party."
msgstr "%s 邀請你參加 %s 派對."
#. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:1712
+#: src/gui/windows/socialwindow.cpp:1679
msgid "Accept Party Invite"
msgstr "接受派對邀請"
-#: src/gui/windows/socialwindow.cpp:1728
+#: src/gui/windows/socialwindow.cpp:1695
msgid "Cannot create party. You are already in a party"
msgstr ""
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1734
+#: src/gui/windows/socialwindow.cpp:1701
msgid "Party Name"
msgstr ""
#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:1736
+#: src/gui/windows/socialwindow.cpp:1703
msgid "Choose your party's name."
msgstr ""
@@ -6398,113 +6433,68 @@ msgstr ""
msgid "Correction points: %d"
msgstr ""
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:101
-msgid "No Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:103
-msgid "Allow Target"
-msgstr ""
-
-#. TRANSLATORS: target type
-#: src/gui/windows/textcommandeditor.cpp:105
-msgid "Need Target"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:111
-msgid "General Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:113
-msgid "Life Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:115
-msgid "War Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:117
-msgid "Transmute Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:119
-msgid "Nature Magic"
-msgstr ""
-
-#. TRANSLATORS: magic school
-#: src/gui/windows/textcommandeditor.cpp:121
-msgid "Astral Magic"
-msgstr ""
-
#. TRANSLATORS: command editor name
-#: src/gui/windows/textcommandeditor.cpp:164
+#: src/gui/windows/textcommandeditor.cpp:47
msgid "Command Editor"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:169
+#: src/gui/windows/textcommandeditor.cpp:52
msgid "magic"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:171
+#: src/gui/windows/textcommandeditor.cpp:54
msgid "other"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:173
+#: src/gui/windows/textcommandeditor.cpp:56
msgid "Symbol:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:176
+#: src/gui/windows/textcommandeditor.cpp:59
msgid "Command:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:179
+#: src/gui/windows/textcommandeditor.cpp:62
msgid "Comment:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:183
+#: src/gui/windows/textcommandeditor.cpp:66
msgid "Target Type:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:187
+#: src/gui/windows/textcommandeditor.cpp:70
msgid "Icon:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:190
+#: src/gui/windows/textcommandeditor.cpp:73
msgid "Mana:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:193
+#: src/gui/windows/textcommandeditor.cpp:76
msgid "Magic level:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:197
+#: src/gui/windows/textcommandeditor.cpp:80
msgid "Magic School:"
msgstr ""
#. TRANSLATORS: command editor label
-#: src/gui/windows/textcommandeditor.cpp:200
+#: src/gui/windows/textcommandeditor.cpp:83
msgid "School level:"
msgstr ""
#. TRANSLATORS: command editor button
-#: src/gui/windows/textcommandeditor.cpp:205
+#: src/gui/windows/textcommandeditor.cpp:88
msgid "Save"
msgstr ""
@@ -6534,7 +6524,7 @@ msgid "Trade: You"
msgstr "交易：您"
#. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:184
+#: src/gui/windows/tradewindow.cpp:76 src/gui/windows/tradewindow.cpp:183
#, c-format
msgid "You get %s"
msgstr ""
@@ -6550,12 +6540,12 @@ msgid "You give:"
msgstr "你付出:"
#. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:389
+#: src/gui/windows/tradewindow.cpp:388
msgid "You don't have enough money."
msgstr "你沒有足夠的金錢."
#. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:475
+#: src/gui/windows/tradewindow.cpp:474
msgid ""
"Failed adding item. You can not overlap one kind of item on the window."
msgstr "增加物品失敗。你不能覆蓋視窗中的該類物品能。"
@@ -6626,17 +6616,17 @@ msgid "Who Is Online - Update"
msgstr ""
#. TRANSLATORS: world select dialog name
-#: src/gui/windows/worldselectdialog.cpp:87
+#: src/gui/windows/worldselectdialog.cpp:49
msgid "Select World"
msgstr ""
#. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:93
+#: src/gui/windows/worldselectdialog.cpp:55
msgid "Change Login"
msgstr ""
#. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:95
+#: src/gui/windows/worldselectdialog.cpp:57
msgid "Choose World"
msgstr ""
@@ -6854,7 +6844,7 @@ msgid "Failed to create character. Most likely the name is already taken."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:281
+#: src/net/ea/charserverhandler.cpp:178 src/net/ea/loginhandler.cpp:276
msgid "Wrong name."
msgstr ""
@@ -7012,58 +7002,58 @@ msgid "Experience sharing unknown."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:154
+#: src/net/ea/loginhandler.cpp:149
msgid "Account was not found. Please re-login."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/ea/loginhandler.cpp:153
msgid "Old password incorrect."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:162
+#: src/net/ea/loginhandler.cpp:157
msgid "New password too short."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:166 src/net/ea/loginhandler.cpp:293
+#: src/net/ea/loginhandler.cpp:161 src/net/ea/loginhandler.cpp:288
msgid "Unknown error."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:239
+#: src/net/ea/loginhandler.cpp:234
msgid "Unregistered ID."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:238
msgid "Wrong password."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:248
+#: src/net/ea/loginhandler.cpp:243
msgid "Account expired."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:252
+#: src/net/ea/loginhandler.cpp:247
msgid "Rejected from server."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:256
+#: src/net/ea/loginhandler.cpp:251
msgid ""
"You have been permanently banned from the game. Please contact the GM team."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:261
+#: src/net/ea/loginhandler.cpp:256
msgid "Client too old."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:265
+#: src/net/ea/loginhandler.cpp:260
#, c-format
msgid ""
"You have been temporarily banned from the game until %s.\n"
@@ -7071,22 +7061,22 @@ msgid ""
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:273
+#: src/net/ea/loginhandler.cpp:268
msgid "Server overpopulated."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:277
+#: src/net/ea/loginhandler.cpp:272
msgid "This user name is already taken."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:285
+#: src/net/ea/loginhandler.cpp:280
msgid "Incorrect email."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:289
+#: src/net/ea/loginhandler.cpp:284
msgid "Username permanently erased."
msgstr ""
@@ -7759,7 +7749,7 @@ msgstr ""
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
#: src/resources/db/itemdb.cpp:331 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
+#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "未知物品"
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-06-26 19:49:08 +0000