update translations.

1 files changed, 531 insertions, 541 deletions

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"