Refreshed translation files to contain the keyboard configuration

strings.

Signed-off-by: Ira Rice <irarice@gmail.com>

1 files changed, 564 insertions, 340 deletions

diff --git a/po/sv.po b/po/sv.po
index 35c6db70..f364b1ae 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tmw\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-29 13:19-0700\n"
+"POT-Creation-Date: 2009-02-05 09:19-0700\n"
 "PO-Revision-Date: 2009-01-29 01:20+0100\n"
 "Last-Translator: Kess Vargavind <vargavind@gmail.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -22,24 +22,25 @@ msgstr ""
 msgid "Buy"
 msgstr "Köp"
 
-#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:65
-#: ../src/gui/sell.cpp:259
+#: ../src/gui/buy.cpp:57 ../src/gui/buy.cpp:238 ../src/gui/sell.cpp:59
+#: ../src/gui/sell.cpp:253
 #, c-format
 msgid "Price: %d GP / Total: %d GP"
 msgstr "Pris: %d GP / Totalt: %d GP"
 
-#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:69 ../src/game.cpp:636
+#: ../src/gui/buy.cpp:61 ../src/gui/sell.cpp:63 ../src/game.cpp:590
+#: ../src/keyboardconfig.cpp:99
 msgid "Quit"
 msgstr "Avsluta"
 
 #: ../src/gui/buy.cpp:62 ../src/gui/buy.cpp:205 ../src/gui/buy.cpp:223
-#: ../src/gui/sell.cpp:70 ../src/gui/sell.cpp:230 ../src/gui/sell.cpp:244
+#: ../src/gui/sell.cpp:64 ../src/gui/sell.cpp:224 ../src/gui/sell.cpp:238
 #, c-format
 msgid "Description: %s"
 msgstr "Beskrivning: %s"
 
 #: ../src/gui/buy.cpp:63 ../src/gui/buy.cpp:207 ../src/gui/buy.cpp:224
-#: ../src/gui/sell.cpp:71 ../src/gui/sell.cpp:232 ../src/gui/sell.cpp:245
+#: ../src/gui/sell.cpp:65 ../src/gui/sell.cpp:226 ../src/gui/sell.cpp:239
 #, c-format
 msgid "Effect: %s"
 msgstr "Effekt: %s"
@@ -48,34 +49,34 @@ msgstr "Effekt: %s"
 msgid "Shop"
 msgstr "Affär"
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:48 ../src/gui/sell.cpp:68
+#: ../src/gui/buysell.cpp:34 ../src/gui/sell.cpp:42 ../src/gui/sell.cpp:62
 msgid "Sell"
 msgstr "Sälj"
 
-#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:102
-#: ../src/gui/char_select.cpp:266 ../src/gui/char_server.cpp:59
-#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
-#: ../src/gui/login.cpp:79 ../src/gui/npcintegerdialog.cpp:44
-#: ../src/gui/npclistdialog.cpp:46 ../src/gui/npcstringdialog.cpp:42
-#: ../src/gui/register.cpp:93 ../src/gui/setup.cpp:60 ../src/gui/trade.cpp:65
+#: ../src/gui/buysell.cpp:34 ../src/gui/char_select.cpp:103
+#: ../src/gui/char_select.cpp:267 ../src/gui/char_server.cpp:57
+#: ../src/gui/connection.cpp:47 ../src/gui/item_amount.cpp:60
+#: ../src/gui/login.cpp:80 ../src/gui/npcintegerdialog.cpp:40
+#: ../src/gui/npclistdialog.cpp:49 ../src/gui/npcstringdialog.cpp:38
+#: ../src/gui/register.cpp:89 ../src/gui/setup.cpp:57 ../src/gui/trade.cpp:63
 #: ../src/gui/updatewindow.cpp:114
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../src/gui/char_select.cpp:63
+#: ../src/gui/char_select.cpp:64
 msgid "Confirm Character Delete"
 msgstr "Bekräfta borttagning av karaktär"
 
-#: ../src/gui/char_select.cpp:64
+#: ../src/gui/char_select.cpp:65
 msgid "Are you sure you want to delete this character?"
 msgstr "Är du säker på att du vill ta bort den här karaktären?"
 
-#: ../src/gui/char_select.cpp:82
+#: ../src/gui/char_select.cpp:83
 msgid "Select Character"
 msgstr "Välj karaktär"
 
-#: ../src/gui/char_select.cpp:89 ../src/gui/char_select.cpp:176
-#: ../src/gui/char_select.cpp:188
+#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:177
+#: ../src/gui/char_select.cpp:189
 #, c-format
 msgid "Name: %s"
 msgstr "Namn: %s"
@@ -85,425 +86,453 @@ msgstr "Namn: %s"
 #. ----------------------
 #. Status Part
 #. -----------
-#: ../src/gui/char_select.cpp:90 ../src/gui/char_select.cpp:177
-#: ../src/gui/char_select.cpp:189 ../src/gui/status.cpp:49
-#: ../src/gui/status.cpp:230
+#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:178
+#: ../src/gui/char_select.cpp:190 ../src/gui/status.cpp:50
+#: ../src/gui/status.cpp:162
 #, c-format
 msgid "Level: %d"
 msgstr "Nivå: %d"
 
-#: ../src/gui/char_select.cpp:91 ../src/gui/char_select.cpp:178
-#: ../src/gui/char_select.cpp:190
+#: ../src/gui/char_select.cpp:92 ../src/gui/char_select.cpp:179
+#: ../src/gui/char_select.cpp:191
 #, c-format
 msgid "Job Level: %d"
 msgstr "Jobbnivå: %d"
 
-#: ../src/gui/char_select.cpp:92 ../src/gui/char_select.cpp:191
+#: ../src/gui/char_select.cpp:93 ../src/gui/char_select.cpp:192
 #, c-format
 msgid "Money: %d"
 msgstr "Pengar: %d"
 
-#: ../src/gui/char_select.cpp:94 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:192
+#: ../src/gui/char_select.cpp:95 ../src/gui/char_select.cpp:97
+#: ../src/gui/char_select.cpp:193
 msgid "New"
 msgstr "Ny"
 
-#: ../src/gui/char_select.cpp:95 ../src/gui/char_select.cpp:96
-#: ../src/gui/char_select.cpp:182 ../src/gui/setup_players.cpp:222
+#: ../src/gui/char_select.cpp:96 ../src/gui/char_select.cpp:97
+#: ../src/gui/char_select.cpp:183 ../src/gui/setup_players.cpp:228
 msgid "Delete"
 msgstr "Ta bort"
 
-#: ../src/gui/char_select.cpp:98
+#: ../src/gui/char_select.cpp:99
 msgid "Previous"
 msgstr "Föregående"
 
-#: ../src/gui/char_select.cpp:99
+#: ../src/gui/char_select.cpp:100
 msgid "Next"
 msgstr "Nästa"
 
-#: ../src/gui/char_select.cpp:101 ../src/gui/item_amount.cpp:59
-#: ../src/gui/ok_dialog.cpp:37 ../src/gui/trade.cpp:64
+#: ../src/gui/char_select.cpp:102 ../src/gui/item_amount.cpp:59
+#: ../src/gui/ok_dialog.cpp:40 ../src/gui/trade.cpp:62
 msgid "Ok"
 msgstr "Ok"
 
-#: ../src/gui/char_select.cpp:179
+#: ../src/gui/char_select.cpp:180
 #, c-format
 msgid "Gold: %d"
 msgstr "Guld: %d"
 
-#: ../src/gui/char_select.cpp:248
+#: ../src/gui/char_select.cpp:249
 msgid "Create Character"
 msgstr "Skapa karaktär"
 
-#: ../src/gui/char_select.cpp:258 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:80
+#: ../src/gui/char_select.cpp:259 ../src/gui/login.cpp:51
+#: ../src/gui/register.cpp:76
 msgid "Name:"
 msgstr "Namn:"
 
-#: ../src/gui/char_select.cpp:261
+#: ../src/gui/char_select.cpp:262
 msgid "Hair Color:"
 msgstr "Hårfärg:"
 
-#: ../src/gui/char_select.cpp:264
+#: ../src/gui/char_select.cpp:265
 msgid "Hair Style:"
 msgstr "Frisyr:"
 
-#: ../src/gui/char_select.cpp:265
+#: ../src/gui/char_select.cpp:266
 msgid "Create"
 msgstr "Skapa"
 
-#: ../src/gui/char_server.cpp:51
+#: ../src/gui/char_server.cpp:49
 msgid "Select Server"
 msgstr "Välj server"
 
-#: ../src/gui/char_server.cpp:58 ../src/gui/login.cpp:78
-#: ../src/gui/npcintegerdialog.cpp:43 ../src/gui/npclistdialog.cpp:45
-#: ../src/gui/npcstringdialog.cpp:41 ../src/gui/npc_text.cpp:50
+#: ../src/gui/char_server.cpp:56 ../src/gui/login.cpp:79
+#: ../src/gui/npcintegerdialog.cpp:39 ../src/gui/npclistdialog.cpp:48
+#: ../src/gui/npcstringdialog.cpp:37 ../src/gui/npc_text.cpp:48
 msgid "OK"
 msgstr "Ok"
 
-#: ../src/gui/chat.cpp:59 ../src/gui/colour.cpp:32
+#: ../src/gui/chat.cpp:55 ../src/gui/colour.cpp:31
 #: ../src/gui/menuwindow.cpp:62 ../src/gui/menuwindow.cpp:97
 #, fuzzy
 msgid "Chat"
 msgstr "Skapa"
 
-#: ../src/gui/chat.cpp:152
+#: ../src/gui/chat.cpp:148
 msgid "Global announcement: "
 msgstr "Globalt meddelande: "
 
-#: ../src/gui/chat.cpp:157
+#: ../src/gui/chat.cpp:153
 #, c-format
 msgid "Global announcement from %s: "
 msgstr "Globalt meddelande från %s: "
 
-#: ../src/gui/chat.cpp:171 ../src/gui/login.cpp:53 ../src/gui/register.cpp:83
+#: ../src/gui/chat.cpp:167 ../src/gui/login.cpp:53 ../src/gui/register.cpp:79
 msgid "Server:"
 msgstr "Server:"
 
-#: ../src/gui/chat.cpp:333
+#: ../src/gui/chat.cpp:329
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Viskar till %s: %s"
 
-#: ../src/gui/chat.cpp:357
+#: ../src/gui/chat.cpp:353
 msgid "Trying to send a blank party message."
 msgstr ""
 
-#: ../src/gui/chat.cpp:392 ../src/resources/itemdb.cpp:57
+#: ../src/gui/chat.cpp:388 ../src/resources/itemdb.cpp:57
 msgid "Unknown item"
 msgstr ""
 
-#: ../src/gui/chat.cpp:486
+#: ../src/gui/chat.cpp:482
 msgid "Return toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:487
+#: ../src/gui/chat.cpp:483
 msgid "Message closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:497
+#: ../src/gui/chat.cpp:493
 msgid "Return now toggles chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:505
+#: ../src/gui/chat.cpp:501
 msgid "Message now closes chat."
 msgstr ""
 
-#: ../src/gui/chat.cpp:510
+#: ../src/gui/chat.cpp:506
 msgid ""
 "Options to /toggle are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: ../src/gui/chat.cpp:517
+#: ../src/gui/chat.cpp:513
 msgid "Unknown party command... Type \"/help\" party for more information."
 msgstr ""
 
-#: ../src/gui/chat.cpp:563
+#: ../src/gui/chat.cpp:557
 msgid "No such spell!"
 msgstr ""
 
-#: ../src/gui/chat.cpp:566
-msgid "The current server doesn't support spells"
-msgstr ""
-
-#: ../src/gui/chat.cpp:601 ../src/gui/chat.cpp:606
+#: ../src/gui/chat.cpp:592 ../src/gui/chat.cpp:597
 msgid "Present: "
 msgstr ""
 
-#: ../src/gui/chat.cpp:602
+#: ../src/gui/chat.cpp:593
 msgid "Attendance written to record log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:611
+#: ../src/gui/chat.cpp:602
 msgid "Unknown command"
 msgstr "Okänt kommando"
 
-#: ../src/gui/chat.cpp:623
+#: ../src/gui/chat.cpp:614
 msgid "Trade failed!"
 msgstr "Byteshandel misslyckades!"
 
-#: ../src/gui/chat.cpp:626
+#: ../src/gui/chat.cpp:617
 msgid "Emote failed!"
 msgstr "Kan inte visa smiley!"
 
-#: ../src/gui/chat.cpp:629
+#: ../src/gui/chat.cpp:620
 msgid "Sit failed!"
 msgstr "Kan inte sitta ned!"
 
-#: ../src/gui/chat.cpp:632
+#: ../src/gui/chat.cpp:623
 msgid "Chat creating failed!"
 msgstr "Kan inte skicka chattmeddelande!"
 
-#: ../src/gui/chat.cpp:635
+#: ../src/gui/chat.cpp:626
 msgid "Could not join party!"
 msgstr "Kan inte ansluta till gruppen!"
 
-#: ../src/gui/chat.cpp:638
+#: ../src/gui/chat.cpp:629
 msgid "Cannot shout!"
 msgstr "Kan inte skrika!"
 
-#: ../src/gui/chat.cpp:647
+#: ../src/gui/chat.cpp:638
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Du har inte nått en tillräckligt hög nivå än!"
 
-#: ../src/gui/chat.cpp:650
+#: ../src/gui/chat.cpp:641
 msgid "Insufficient HP!"
 msgstr "Otillräckligt med HP!"
 
-#: ../src/gui/chat.cpp:653
+#: ../src/gui/chat.cpp:644
 msgid "Insufficient SP!"
 msgstr "Otillräckligt med SP!"
 
-#: ../src/gui/chat.cpp:656
+#: ../src/gui/chat.cpp:647
 msgid "You have no memos!"
 msgstr "Du har inga anteckningar!"
 
-#: ../src/gui/chat.cpp:659
+#: ../src/gui/chat.cpp:650
 msgid "You cannot do that right now!"
 msgstr "Du kan inte göra det just nu!"
 
-#: ../src/gui/chat.cpp:662
+#: ../src/gui/chat.cpp:653
 msgid "Seems you need more Zeny... ;-)"
 msgstr "Verkar som att du behöver mer zeny... ;-)"
 
-#: ../src/gui/chat.cpp:665
+#: ../src/gui/chat.cpp:656
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Det går inte att använda den här förmågan med det där vapenslaget!"
 
-#: ../src/gui/chat.cpp:668
+#: ../src/gui/chat.cpp:659
 msgid "You need another red gem!"
 msgstr "Du behöver en till röd juvel!"
 
-#: ../src/gui/chat.cpp:671
+#: ../src/gui/chat.cpp:662
 msgid "You need another blue gem!"
 msgstr "Du behöver en till blå juvel!"
 
-#: ../src/gui/chat.cpp:674
+#: ../src/gui/chat.cpp:665
 msgid "You're carrying to much to do this!"
 msgstr "Du bär på för mycket för att kunna göra det här!"
 
-#: ../src/gui/chat.cpp:677
+#: ../src/gui/chat.cpp:668
 msgid "Huh? What's that?"
 msgstr "Öh? Vad är det där?"
 
-#: ../src/gui/chat.cpp:686
+#: ../src/gui/chat.cpp:677
 msgid "Warp failed..."
 msgstr "Kartförflyttning misslyckades..."
 
-#: ../src/gui/chat.cpp:689
+#: ../src/gui/chat.cpp:680
 msgid "Could not steal anything..."
 msgstr "Kunde inte stjäla något..."
 
-#: ../src/gui/chat.cpp:692
+#: ../src/gui/chat.cpp:683
 msgid "Poison had no effect..."
 msgstr "Giftet tog inte..."
 
-#: ../src/gui/chat.cpp:775
+#: ../src/gui/chat.cpp:766
 msgid "The current party prefix is "
 msgstr ""
 
-#: ../src/gui/chat.cpp:780
+#: ../src/gui/chat.cpp:771
 msgid "Party prefix must be one character long."
 msgstr ""
 
-#: ../src/gui/chat.cpp:786
+#: ../src/gui/chat.cpp:777
 msgid "Cannot use a '/' as the prefix."
 msgstr ""
 
-#: ../src/gui/chat.cpp:791
+#: ../src/gui/chat.cpp:782
 #, fuzzy
 msgid "Changing prefix to "
 msgstr "Ändrar OpenGL"
 
-#: ../src/gui/chat.cpp:801
+#: ../src/gui/chat.cpp:792
 msgid "-- Help --"
 msgstr "-- Hjälp --"
 
-#: ../src/gui/chat.cpp:804
+#: ../src/gui/chat.cpp:795
 msgid "/announce: Global announcement (GM only)"
 msgstr "/announce: Globalt meddelande (endast GM)"
 
-#: ../src/gui/chat.cpp:805
+#: ../src/gui/chat.cpp:796
 msgid "/clear: Clears this window"
 msgstr "/clear: Tömmer det här fönstret på text"
 
-#: ../src/gui/chat.cpp:806
+#: ../src/gui/chat.cpp:797
 msgid "/help: Display this help"
 msgstr "/help: Visar den här hjälptexten"
 
-#: ../src/gui/chat.cpp:808
+#: ../src/gui/chat.cpp:798
+msgid "/party <command> <params>: Party commands."
+msgstr ""
+
+#: ../src/gui/chat.cpp:799
 msgid "/msg <nick> <message>: Alternate form for /whisper"
 msgstr ""
 
-#: ../src/gui/chat.cpp:809
+#: ../src/gui/chat.cpp:800
 msgid "/present: Get list of players present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:811
+#: ../src/gui/chat.cpp:801
+msgid "/record <filename>: Start recording the chat to an external file."
+msgstr ""
+
+#: ../src/gui/chat.cpp:803
 msgid "/toggle: Determine whether <return> toggles the chat log."
 msgstr ""
 
-#: ../src/gui/chat.cpp:813
+#: ../src/gui/chat.cpp:805
 msgid "/where: Display map name"
 msgstr "/where: Visar namnet på kartan där du befinner dig"
 
-#: ../src/gui/chat.cpp:814
+#: ../src/gui/chat.cpp:806
 msgid "/w <nick> <message>: Short form for /whisper"
 msgstr "/w <namn> <text>: Kortare variant av /whisper"
 
-#: ../src/gui/chat.cpp:815
+#: ../src/gui/chat.cpp:807
 msgid "/whisper <nick> <message>: Sends a private <message> to <nick>"
 msgstr "/whisper <namn> <text>: Skickar ett privat meddelande till en spelare"
 
-#: ../src/gui/chat.cpp:817
+#: ../src/gui/chat.cpp:809
 msgid "/who: Display number of online users"
 msgstr "/who: Visar antalet inloggade spelare"
 
-#: ../src/gui/chat.cpp:818
+#: ../src/gui/chat.cpp:810
 msgid "For more information, type /help <command>"
 msgstr "För mer information skriv /help <kommando>"
 
-#: ../src/gui/chat.cpp:822
+#: ../src/gui/chat.cpp:814
 msgid "Command: /announce <msg>"
 msgstr "Kommando: /announce <text>"
 
-#: ../src/gui/chat.cpp:823
+#: ../src/gui/chat.cpp:815
 msgid "*** only available to a GM ***"
 msgstr "*** endast en GM kan använda det här kommandot ***"
 
-#: ../src/gui/chat.cpp:824
+#: ../src/gui/chat.cpp:816
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 "Det här kommandot skickar meddelandet <text> till alla inloggade spelare."
 
-#: ../src/gui/chat.cpp:829
+#: ../src/gui/chat.cpp:821
 msgid "Command: /clear"
 msgstr "Kommando: /clear"
 
-#: ../src/gui/chat.cpp:830
+#: ../src/gui/chat.cpp:822
 msgid "This command clears the chat log of previous chat."
 msgstr "Det här kommandot tömmer chattloggen."
 
-#: ../src/gui/chat.cpp:835
+#: ../src/gui/chat.cpp:827
 msgid "Command: /help"
 msgstr "Kommando: /help"
 
-#: ../src/gui/chat.cpp:836
+#: ../src/gui/chat.cpp:828
 msgid "This command displays a list of all commands available."
 msgstr "Det här kommandot visar en lista över alla tillgängliga kommandon."
 
-#: ../src/gui/chat.cpp:838
+#: ../src/gui/chat.cpp:830
 msgid "Command: /help <command>"
 msgstr "Kommando: /help <kommando>"
 
-#: ../src/gui/chat.cpp:839
+#: ../src/gui/chat.cpp:831
 msgid "This command displays help on <command>."
 msgstr "Det här kommandot ger mer information om <kommando>."
 
-#: ../src/gui/chat.cpp:847
+#: ../src/gui/chat.cpp:839
 msgid "Command: /present"
 msgstr ""
 
-#: ../src/gui/chat.cpp:848
+#: ../src/gui/chat.cpp:840
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: ../src/gui/chat.cpp:858
+#: ../src/gui/chat.cpp:846
+#, fuzzy
+msgid "Command: /record <filename>"
+msgstr "Kommando: /clear"
+
+#: ../src/gui/chat.cpp:847
+#, fuzzy
+msgid "This command starts recording the chat log to the file <filename>."
+msgstr "Det här kommandot tömmer chattloggen."
+
+#: ../src/gui/chat.cpp:849
+#, fuzzy
+msgid "Command: /record"
+msgstr "Kommando: /clear"
+
+#: ../src/gui/chat.cpp:850
+msgid "This command finishes a recording session."
+msgstr ""
+
+#: ../src/gui/chat.cpp:854
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:859
+#: ../src/gui/chat.cpp:855
 msgid ""
 "This command sets whether the return key should toggle thechat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: ../src/gui/chat.cpp:862
+#: ../src/gui/chat.cpp:858
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: ../src/gui/chat.cpp:865
+#: ../src/gui/chat.cpp:861
 msgid "Command: /toggle"
 msgstr ""
 
-#: ../src/gui/chat.cpp:866
+#: ../src/gui/chat.cpp:862
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: ../src/gui/chat.cpp:870
+#: ../src/gui/chat.cpp:866
 msgid "Command: /where"
 msgstr "Kommando: /where"
 
-#: ../src/gui/chat.cpp:871
+#: ../src/gui/chat.cpp:867
 msgid "This command displays the name of the current map."
 msgstr "Det här kommandot visar namnet på den karta där du befinner dig."
 
-#: ../src/gui/chat.cpp:876
+#: ../src/gui/chat.cpp:872
 msgid "Command: /msg <nick> <msg>"
 msgstr ""
 
-#: ../src/gui/chat.cpp:877
+#: ../src/gui/chat.cpp:873
 msgid "Command: /whisper <nick> <msg>"
 msgstr "Kommando: /whisper <namn> <text>"
 
-#: ../src/gui/chat.cpp:878
+#: ../src/gui/chat.cpp:874
 msgid "Command: /w <nick> <msg>"
 msgstr "Kommando: /w <namn> <text>"
 
-#: ../src/gui/chat.cpp:879
+#: ../src/gui/chat.cpp:875
 msgid "This command sends the message <msg> to <nick>."
 msgstr "Det här kommandot skickar meddelandet <text> till karaktären <namn>."
 
-#: ../src/gui/chat.cpp:881
+#: ../src/gui/chat.cpp:877
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 "Om <namn> innehåller mellanslag, måste du sätta citattecken (\") runt det."
 
-#: ../src/gui/chat.cpp:886
+#: ../src/gui/chat.cpp:882
 msgid "Command: /who"
 msgstr "Kommando: /who"
 
-#: ../src/gui/chat.cpp:887
+#: ../src/gui/chat.cpp:883
 msgid "This command displays the number of players currently online."
 msgstr "Det här kommandot visar antalet spelare som är inloggade just nu."
 
-#: ../src/gui/chat.cpp:892
+#: ../src/gui/chat.cpp:888
 msgid "Unknown command."
 msgstr "Okänt kommando."
 
-#: ../src/gui/chat.cpp:893
+#: ../src/gui/chat.cpp:889
 msgid "Type /help for a list of commands."
 msgstr "Skriv /help för en lista med kommandon."
 
-#: ../src/gui/colour.cpp:33
+#: ../src/gui/colour.cpp:32
 msgid "GM"
 msgstr ""
 
+#: ../src/gui/colour.cpp:33
+#, fuzzy
+msgid "Highlight"
+msgstr "hög"
+
 #: ../src/gui/colour.cpp:34
 msgid "Player"
 msgstr ""
@@ -534,15 +563,15 @@ msgstr ""
 msgid "Hyperlink"
 msgstr ""
 
-#: ../src/gui/confirm_dialog.cpp:37
+#: ../src/gui/confirm_dialog.cpp:40
 msgid "Yes"
 msgstr "Ja"
 
-#: ../src/gui/confirm_dialog.cpp:38
+#: ../src/gui/confirm_dialog.cpp:41
 msgid "No"
 msgstr "Nej"
 
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
+#: ../src/gui/connection.cpp:49 ../src/gui/updatewindow.cpp:112
 msgid "Connecting..."
 msgstr "Ansluter..."
 
@@ -550,66 +579,66 @@ msgstr "Ansluter..."
 msgid "Unable to load selection.png"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:41 ../src/gui/emotewindow.cpp:43
+#: ../src/gui/emotewindow.cpp:36 ../src/gui/emotewindow.cpp:38
 #: ../src/gui/menuwindow.cpp:68 ../src/gui/menuwindow.cpp:121
 msgid "Emote"
 msgstr ""
 
-#: ../src/gui/emotewindow.cpp:50 ../src/gui/inventorywindow.cpp:63
-#: ../src/gui/inventorywindow.cpp:64 ../src/gui/inventorywindow.cpp:215
-#: ../src/gui/skill.cpp:141
+#: ../src/gui/emotewindow.cpp:45 ../src/gui/inventorywindow.cpp:62
+#: ../src/gui/inventorywindow.cpp:63 ../src/gui/inventorywindow.cpp:226
+#: ../src/gui/skill.cpp:144
 msgid "Use"
 msgstr "Använd"
 
-#: ../src/gui/equipmentwindow.cpp:59 ../src/gui/menuwindow.cpp:64
+#: ../src/gui/equipmentwindow.cpp:62 ../src/gui/menuwindow.cpp:64
 #: ../src/gui/menuwindow.cpp:105
 msgid "Equipment"
 msgstr "Utrustning"
 
-#: ../src/gui/equipmentwindow.cpp:74 ../src/gui/inventorywindow.cpp:67
-#: ../src/gui/inventorywindow.cpp:69 ../src/gui/inventorywindow.cpp:210
+#: ../src/gui/equipmentwindow.cpp:77 ../src/gui/inventorywindow.cpp:66
+#: ../src/gui/inventorywindow.cpp:68 ../src/gui/inventorywindow.cpp:221
 msgid "Unequip"
 msgstr "Avrusta"
 
-#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:37
+#: ../src/gui/help.cpp:34 ../src/gui/help.cpp:39
 msgid "Help"
 msgstr "Hjälp"
 
-#: ../src/gui/help.cpp:43
+#: ../src/gui/help.cpp:45
 msgid "Close"
 msgstr "Stäng"
 
-#: ../src/gui/inventorywindow.cpp:51 ../src/gui/inventorywindow.cpp:55
+#: ../src/gui/inventorywindow.cpp:50 ../src/gui/inventorywindow.cpp:54
 #: ../src/gui/menuwindow.cpp:65 ../src/gui/menuwindow.cpp:109
 msgid "Inventory"
 msgstr "Inventarium"
 
-#: ../src/gui/inventorywindow.cpp:62 ../src/gui/inventorywindow.cpp:64
-#: ../src/gui/inventorywindow.cpp:212
+#: ../src/gui/inventorywindow.cpp:61 ../src/gui/inventorywindow.cpp:63
+#: ../src/gui/inventorywindow.cpp:223
 msgid "Equip"
 msgstr "Utrusta"
 
-#: ../src/gui/inventorywindow.cpp:73
+#: ../src/gui/inventorywindow.cpp:72
 msgid "Drop"
 msgstr "Släpp"
 
-#: ../src/gui/inventorywindow.cpp:85
+#: ../src/gui/inventorywindow.cpp:84
 msgid "Slots: "
 msgstr "Utrymme: "
 
-#: ../src/gui/inventorywindow.cpp:86 ../src/gui/itempopup.cpp:104
+#: ../src/gui/inventorywindow.cpp:85 ../src/gui/itempopup.cpp:111
 msgid "Weight: "
 msgstr "Vikt: "
 
-#: ../src/gui/item_amount.cpp:75
+#: ../src/gui/item_amount.cpp:76
 msgid "Select amount of items to trade."
 msgstr "Välj antal föremål att handla med."
 
-#: ../src/gui/item_amount.cpp:79
+#: ../src/gui/item_amount.cpp:80
 msgid "Select amount of items to drop."
 msgstr "Välj antal föremål att släppa."
 
-#: ../src/gui/itempopup.cpp:105
+#: ../src/gui/itempopup.cpp:112
 msgid " grams"
 msgstr ""
 
@@ -617,11 +646,11 @@ msgstr ""
 msgid "Login"
 msgstr "Användarnamn"
 
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:81
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:77
 msgid "Password:"
 msgstr "Lösenord:"
 
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:84
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:80
 msgid "Port:"
 msgstr "Port:"
 
@@ -629,22 +658,22 @@ msgstr "Port:"
 msgid "Recent:"
 msgstr ""
 
-#: ../src/gui/login.cpp:77
+#: ../src/gui/login.cpp:78
 msgid "Keep"
 msgstr "Behåll"
 
-#: ../src/gui/login.cpp:80 ../src/gui/register.cpp:76
-#: ../src/gui/register.cpp:92
+#: ../src/gui/login.cpp:81 ../src/gui/register.cpp:72
+#: ../src/gui/register.cpp:88
 msgid "Register"
 msgstr "Registrera"
 
 #: ../src/gui/menuwindow.cpp:63 ../src/gui/menuwindow.cpp:101
-#: ../src/gui/status.cpp:39
+#: ../src/gui/status.cpp:41
 msgid "Status"
 msgstr "Status"
 
 #: ../src/gui/menuwindow.cpp:66 ../src/gui/menuwindow.cpp:113
-#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:130
+#: ../src/gui/skill.cpp:123 ../src/gui/skill.cpp:134
 msgid "Skills"
 msgstr "Färdigheter"
 
@@ -653,7 +682,7 @@ msgid "Shortcut"
 msgstr "Genvägar"
 
 #: ../src/gui/menuwindow.cpp:69 ../src/gui/menuwindow.cpp:125
-#: ../src/gui/setup.cpp:52 ../src/main.cpp:787
+#: ../src/gui/setup.cpp:49 ../src/main.cpp:788
 msgid "Setup"
 msgstr "Inställningar"
 
@@ -661,145 +690,179 @@ msgstr "Inställningar"
 msgid "MiniMap"
 msgstr "Minikarta"
 
-#: ../src/gui/npcintegerdialog.cpp:38
+#: ../src/gui/npcintegerdialog.cpp:33
 msgid "NPC Number Request"
 msgstr ""
 
-#: ../src/gui/npcintegerdialog.cpp:45
+#: ../src/gui/npcintegerdialog.cpp:41
 #, fuzzy
 msgid "Reset"
 msgstr "Registrera"
 
-#: ../src/gui/npclistdialog.cpp:34 ../src/gui/npc_text.cpp:36
+#: ../src/gui/npclistdialog.cpp:36 ../src/gui/npc_text.cpp:34
 msgid "NPC"
 msgstr "NPC"
 
-#: ../src/gui/npcstringdialog.cpp:38
+#: ../src/gui/npcstringdialog.cpp:33
 msgid "NPC Text Request"
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:82
+#: ../src/gui/popupmenu.cpp:78
 #, fuzzy
 msgid "@@trade|Trade With "
 msgstr "@@trade|Handla med %s@@"
 
-#: ../src/gui/popupmenu.cpp:83
+#: ../src/gui/popupmenu.cpp:79
 #, fuzzy
 msgid "@@attack|Attack "
 msgstr "@@attack|Attackera %s@@"
 
-#: ../src/gui/popupmenu.cpp:89
+#: ../src/gui/popupmenu.cpp:85
 msgid "@@friend|Befriend "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:92
+#: ../src/gui/popupmenu.cpp:88
 msgid "@@disregard|Disregard "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:93
+#: ../src/gui/popupmenu.cpp:89
 msgid "@@ignore|Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:97 ../src/gui/popupmenu.cpp:102
+#: ../src/gui/popupmenu.cpp:93 ../src/gui/popupmenu.cpp:98
 msgid "@@unignore|Un-Ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:98
+#: ../src/gui/popupmenu.cpp:94
 msgid "@@ignore|Completely ignore "
 msgstr ""
 
-#: ../src/gui/popupmenu.cpp:110
+#: ../src/gui/popupmenu.cpp:106
 msgid "@@party-invite|Invite "
 msgstr ""
 
 #. NPCs can be talked to (single option, candidate for removal
 #. unless more options would be added)
-#: ../src/gui/popupmenu.cpp:118
+#: ../src/gui/popupmenu.cpp:114
 msgid "@@talk|Talk To NPC@@"
 msgstr "@@talk|Prata med NPC@@"
 
-#: ../src/gui/popupmenu.cpp:128 ../src/gui/popupmenu.cpp:144
-#: ../src/gui/popupmenu.cpp:302
+#: ../src/gui/popupmenu.cpp:124 ../src/gui/popupmenu.cpp:140
+#: ../src/gui/popupmenu.cpp:298
 msgid "@@cancel|Cancel@@"
 msgstr "@@cancel|Avbryt@@"
 
-#: ../src/gui/popupmenu.cpp:140
+#: ../src/gui/popupmenu.cpp:136
 #, c-format
 msgid "@@pickup|Pick Up %s@@"
 msgstr "@@pickup|Plocka upp %s@@"
 
-#: ../src/gui/popupmenu.cpp:292
+#: ../src/gui/popupmenu.cpp:288
 msgid "@@use|Unequip@@"
 msgstr "@@use|Avrusta@@"
 
-#: ../src/gui/popupmenu.cpp:294
+#: ../src/gui/popupmenu.cpp:290
 msgid "@@use|Equip@@"
 msgstr "@@use|Utrusta@@"
 
-#: ../src/gui/popupmenu.cpp:297
+#: ../src/gui/popupmenu.cpp:293
 msgid "@@use|Use@@"
 msgstr "@@use|Använd@@"
 
-#: ../src/gui/popupmenu.cpp:299
+#: ../src/gui/popupmenu.cpp:295
 msgid "@@drop|Drop@@"
 msgstr "@@drop|Släpp@@"
 
-#: ../src/gui/popupmenu.cpp:300
+#: ../src/gui/popupmenu.cpp:296
 msgid "@@chat|Add to Chat@@"
 msgstr ""
 
-#: ../src/gui/recorder.h:41
+#: ../src/gui/recorder.cpp:37
+#, fuzzy
+msgid "Recorder"
+msgstr "Ansluter..."
+
+#.
+#. * Message should go after mStream is closed so that it isn't
+#. * recorded.
+#.
+#: ../src/gui/recorder.cpp:79
+msgid "Finishing recording."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:83
+msgid "Not currently recording."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:88
+#, fuzzy
+msgid "Already recording."
+msgstr "Ansluter..."
+
+#.
+#. * Message should go before mStream is opened so that it isn't
+#. * recorded.
+#.
+#: ../src/gui/recorder.cpp:96
+msgid "Starting to record..."
+msgstr ""
+
+#: ../src/gui/recorder.cpp:104
+msgid "Failed to start recording."
+msgstr ""
+
+#: ../src/gui/recorder.h:39
 #, fuzzy
 msgid "Recording..."
 msgstr "Ansluter..."
 
-#: ../src/gui/recorder.h:42
+#: ../src/gui/recorder.h:40
 msgid "Stop recording"
 msgstr ""
 
-#: ../src/gui/register.cpp:82
+#: ../src/gui/register.cpp:78
 msgid "Confirm:"
 msgstr "Bekräfta:"
 
-#: ../src/gui/register.cpp:90
+#: ../src/gui/register.cpp:86
 msgid "Male"
 msgstr "Man"
 
-#: ../src/gui/register.cpp:91
+#: ../src/gui/register.cpp:87
 msgid "Female"
 msgstr "Kvinna"
 
-#: ../src/gui/register.cpp:159
+#: ../src/gui/register.cpp:155
 #, c-format
 msgid "RegisterDialog::register Username is %s"
 msgstr ""
 
-#: ../src/gui/register.cpp:168
+#: ../src/gui/register.cpp:164
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Användarnamnet måste vara minst %d tecken långt."
 
-#: ../src/gui/register.cpp:176
+#: ../src/gui/register.cpp:172
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "Användarnamnet måste vara kortare än %d tecken."
 
-#: ../src/gui/register.cpp:184
+#: ../src/gui/register.cpp:180
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "Lösenordet måste vara minst %d tecken långt."
 
-#: ../src/gui/register.cpp:192
+#: ../src/gui/register.cpp:188
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "Lösenordet måste vara kortare än %d tecken."
 
 #. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:199
+#: ../src/gui/register.cpp:195
 msgid "Passwords do not match."
 msgstr "Lösenorden stämmer inte överens."
 
-#: ../src/gui/register.cpp:219 ../src/main.cpp:1055
+#: ../src/gui/register.cpp:215 ../src/main.cpp:1056
 msgid "Error"
 msgstr "Fel"
 
@@ -815,47 +878,47 @@ msgstr "Volym för ljudeffekter"
 msgid "Music volume"
 msgstr "Musikvolym"
 
-#: ../src/gui/setup.cpp:60
+#: ../src/gui/setup.cpp:57
 msgid "Apply"
 msgstr "Verkställ"
 
-#: ../src/gui/setup.cpp:60
+#: ../src/gui/setup.cpp:57
 msgid "Reset Windows"
 msgstr "Återställ fönster"
 
-#: ../src/gui/setup.cpp:81
+#: ../src/gui/setup.cpp:78
 msgid "Video"
 msgstr "Video"
 
-#: ../src/gui/setup.cpp:85
+#: ../src/gui/setup.cpp:82
 msgid "Audio"
 msgstr "Ljud"
 
-#: ../src/gui/setup.cpp:89
+#: ../src/gui/setup.cpp:86
 msgid "Joystick"
 msgstr "Joystick"
 
-#: ../src/gui/setup.cpp:93
+#: ../src/gui/setup.cpp:90
 msgid "Keyboard"
 msgstr "Tangentbord"
 
-#: ../src/gui/setup.cpp:97
+#: ../src/gui/setup.cpp:94
 msgid "Colors"
 msgstr ""
 
-#: ../src/gui/setup.cpp:101
+#: ../src/gui/setup.cpp:98
 msgid "Players"
 msgstr "Spelare"
 
-#: ../src/gui/setup_colours.cpp:53
+#: ../src/gui/setup_colours.cpp:52
 msgid "Red: "
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:67
+#: ../src/gui/setup_colours.cpp:66
 msgid "Green: "
 msgstr ""
 
-#: ../src/gui/setup_colours.cpp:81
+#: ../src/gui/setup_colours.cpp:80
 msgid "Blue: "
 msgstr ""
 
@@ -895,47 +958,47 @@ msgstr "Samma tangent används på flera ställen."
 msgid "Resolve them, or gameplay may result in strange behaviour."
 msgstr "Se till att använda olika tangenter, annars kan det bli konstigheter."
 
-#: ../src/gui/setup_players.cpp:54
+#: ../src/gui/setup_players.cpp:56
 msgid "Name"
 msgstr "Namn"
 
-#: ../src/gui/setup_players.cpp:55
+#: ../src/gui/setup_players.cpp:57
 msgid "Relation"
 msgstr "Relation"
 
-#: ../src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:61
 msgid "Neutral"
 msgstr "Neutral"
 
-#: ../src/gui/setup_players.cpp:60
+#: ../src/gui/setup_players.cpp:62
 msgid "Friend"
 msgstr "Vän"
 
-#: ../src/gui/setup_players.cpp:61
+#: ../src/gui/setup_players.cpp:63
 msgid "Disregarded"
 msgstr "Förbisedd"
 
-#: ../src/gui/setup_players.cpp:62
+#: ../src/gui/setup_players.cpp:64
 msgid "Ignored"
 msgstr "Ignorerad"
 
-#: ../src/gui/setup_players.cpp:200 ../src/gui/skill.cpp:83
+#: ../src/gui/setup_players.cpp:206 ../src/gui/skill.cpp:83
 msgid "???"
 msgstr ""
 
-#: ../src/gui/setup_players.cpp:216
+#: ../src/gui/setup_players.cpp:222
 msgid "Save player list"
 msgstr "Kom ihåg spelarlista"
 
-#: ../src/gui/setup_players.cpp:218
+#: ../src/gui/setup_players.cpp:224
 msgid "Allow trading"
 msgstr "Tillåt byteshandel"
 
-#: ../src/gui/setup_players.cpp:220
+#: ../src/gui/setup_players.cpp:226
 msgid "Allow whispers"
 msgstr "Tillåt viskningar"
 
-#: ../src/gui/setup_players.cpp:247
+#: ../src/gui/setup_players.cpp:257
 msgid "When ignoring:"
 msgstr "Vid ignorering:"
 
@@ -995,25 +1058,25 @@ msgstr "Omgivande FX"
 msgid "Particle Detail"
 msgstr "Partikeldetaljer"
 
-#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:474
+#: ../src/gui/setup_video.cpp:211 ../src/gui/setup_video.cpp:457
 msgid "off"
 msgstr "av"
 
 #: ../src/gui/setup_video.cpp:214 ../src/gui/setup_video.cpp:225
-#: ../src/gui/setup_video.cpp:477 ../src/gui/setup_video.cpp:491
+#: ../src/gui/setup_video.cpp:460 ../src/gui/setup_video.cpp:474
 msgid "low"
 msgstr "låg"
 
 #: ../src/gui/setup_video.cpp:217 ../src/gui/setup_video.cpp:231
-#: ../src/gui/setup_video.cpp:480 ../src/gui/setup_video.cpp:497
+#: ../src/gui/setup_video.cpp:463 ../src/gui/setup_video.cpp:480
 msgid "high"
 msgstr "hög"
 
-#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:494
+#: ../src/gui/setup_video.cpp:228 ../src/gui/setup_video.cpp:477
 msgid "medium"
 msgstr "medium"
 
-#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:500
+#: ../src/gui/setup_video.cpp:234 ../src/gui/setup_video.cpp:483
 msgid "max"
 msgstr "maximal"
 
@@ -1051,29 +1114,21 @@ msgstr "Ändrar OpenGL"
 msgid "Applying change to OpenGL requires restart."
 msgstr "Ändringar i OpenGL kräver omstart."
 
-#: ../src/gui/setup_video.cpp:403 ../src/main.cpp:425
-msgid "Couldn't set "
-msgstr ""
-
-#: ../src/gui/setup_video.cpp:404 ../src/main.cpp:426
-msgid " video mode: "
-msgstr ""
-
 #. TODO: Find out why the drawing area doesn't resize without a restart.
-#: ../src/gui/setup_video.cpp:415
+#: ../src/gui/setup_video.cpp:398
 msgid "Screen resolution changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:416
+#: ../src/gui/setup_video.cpp:399
 #, fuzzy
 msgid "Restart your client for the change to take effect."
 msgstr "Omstart krävs för att ändringarna ska synas."
 
-#: ../src/gui/setup_video.cpp:434
+#: ../src/gui/setup_video.cpp:417
 msgid "Particle effect settings changed"
 msgstr ""
 
-#: ../src/gui/setup_video.cpp:435
+#: ../src/gui/setup_video.cpp:418
 #, fuzzy
 msgid "Restart your client or change maps for the change to take effect."
 msgstr "Omstart krävs för att ändringarna ska synas."
@@ -1083,44 +1138,44 @@ msgstr "Omstart krävs för att ändringarna ska synas."
 msgid "skills.xml"
 msgstr "Färdigheter"
 
-#: ../src/gui/skill.cpp:139 ../src/gui/skill.cpp:190
+#: ../src/gui/skill.cpp:142 ../src/gui/skill.cpp:186
 #, c-format
 msgid "Skill points: %d"
 msgstr "Färdighetspoäng: %d"
 
-#: ../src/gui/skill.cpp:140
+#: ../src/gui/skill.cpp:143
 msgid "Up"
 msgstr "Upp"
 
-#: ../src/gui/skill.cpp:140
+#: ../src/gui/skill.cpp:143
 msgid "inc"
 msgstr ""
 
-#: ../src/gui/skill.cpp:141
+#: ../src/gui/skill.cpp:144
 #, fuzzy
 msgid "use"
 msgstr "Använd"
 
-#: ../src/gui/skill.cpp:266
+#: ../src/gui/skill.cpp:262
 #, c-format
 msgid "Error loading skills file: %s"
 msgstr ""
 
-#: ../src/gui/speechbubble.cpp:38
+#: ../src/gui/speechbubble.cpp:35
 msgid "Speech"
 msgstr ""
 
-#: ../src/gui/status.cpp:50 ../src/gui/status.cpp:233
+#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:165
 #, c-format
 msgid "Job: %d"
 msgstr "Jobb: %d"
 
-#: ../src/gui/status.cpp:51 ../src/gui/status.cpp:236
+#: ../src/gui/status.cpp:52 ../src/gui/status.cpp:168
 #, c-format
 msgid "Money: %d GP"
 msgstr "Pengar: %d GP"
 
-#: ../src/gui/status.cpp:53
+#: ../src/gui/status.cpp:54
 msgid "HP:"
 msgstr ""
 
@@ -1128,11 +1183,11 @@ msgstr ""
 msgid "Exp:"
 msgstr ""
 
-#: ../src/gui/status.cpp:61
+#: ../src/gui/status.cpp:60
 msgid "MP:"
 msgstr ""
 
-#: ../src/gui/status.cpp:65
+#: ../src/gui/status.cpp:63
 msgid "Job:"
 msgstr "Jobb:"
 
@@ -1140,100 +1195,100 @@ msgstr "Jobb:"
 #. Stats Part
 #. ----------------------
 #. Static Labels
-#: ../src/gui/status.cpp:125
+#: ../src/gui/status.cpp:71
 msgid "Stats"
 msgstr "Statistik"
 
-#: ../src/gui/status.cpp:126
+#: ../src/gui/status.cpp:72
 msgid "Total"
 msgstr "Totalt"
 
-#: ../src/gui/status.cpp:127
+#: ../src/gui/status.cpp:73
 msgid "Cost"
 msgstr "Kostnad"
 
 #. Derived Stats
-#: ../src/gui/status.cpp:130
+#: ../src/gui/status.cpp:76
 msgid "Attack:"
 msgstr "Attack:"
 
-#: ../src/gui/status.cpp:131
+#: ../src/gui/status.cpp:77
 msgid "Defense:"
 msgstr "Försvar:"
 
-#: ../src/gui/status.cpp:132
+#: ../src/gui/status.cpp:78
 msgid "M.Attack:"
 msgstr "M. attack:"
 
-#: ../src/gui/status.cpp:133
+#: ../src/gui/status.cpp:79
 msgid "M.Defense:"
 msgstr "M. försvar:"
 
-#: ../src/gui/status.cpp:134
+#: ../src/gui/status.cpp:80
 #, fuzzy, c-format
 msgid "% Accuracy:"
 msgstr "% Precision:"
 
-#: ../src/gui/status.cpp:135
+#: ../src/gui/status.cpp:81
 #, fuzzy, c-format
 msgid "% Evade:"
 msgstr "% Undvikan:"
 
-#: ../src/gui/status.cpp:136
+#: ../src/gui/status.cpp:82
 msgid "% Reflex:"
 msgstr "% Reflexer:"
 
-#: ../src/gui/status.cpp:280
+#: ../src/gui/status.cpp:208
 msgid "Strength"
 msgstr "Styrka"
 
-#: ../src/gui/status.cpp:281
+#: ../src/gui/status.cpp:209
 msgid "Agility"
 msgstr "Smidighet"
 
-#: ../src/gui/status.cpp:282
+#: ../src/gui/status.cpp:210
 msgid "Vitality"
 msgstr "Hälsa"
 
-#: ../src/gui/status.cpp:283
+#: ../src/gui/status.cpp:211
 msgid "Intelligence"
 msgstr "Intelligens"
 
-#: ../src/gui/status.cpp:284
+#: ../src/gui/status.cpp:212
 msgid "Dexterity"
 msgstr "Skicklighet"
 
-#: ../src/gui/status.cpp:285
+#: ../src/gui/status.cpp:213
 msgid "Luck"
 msgstr "Tur"
 
-#: ../src/gui/status.cpp:303
+#: ../src/gui/status.cpp:231
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr "Återstående statuspoäng: %d"
 
-#: ../src/gui/trade.cpp:51
+#: ../src/gui/trade.cpp:49
 msgid "Trade: You"
 msgstr ""
 
-#: ../src/gui/trade.cpp:56 ../src/gui/trade.cpp:66
+#: ../src/gui/trade.cpp:54 ../src/gui/trade.cpp:64
 msgid "Trade"
 msgstr "Byteshandla"
 
-#: ../src/gui/trade.cpp:63
+#: ../src/gui/trade.cpp:61
 msgid "Add"
 msgstr "Lägg till"
 
-#: ../src/gui/trade.cpp:82 ../src/gui/trade.cpp:124 ../src/gui/trade.cpp:174
+#: ../src/gui/trade.cpp:80 ../src/gui/trade.cpp:122 ../src/gui/trade.cpp:172
 #, c-format
 msgid "You get %d GP."
 msgstr "Du får %d GP."
 
-#: ../src/gui/trade.cpp:83
+#: ../src/gui/trade.cpp:81
 msgid "You give:"
 msgstr "Du ger:"
 
-#: ../src/gui/trade.cpp:252
+#: ../src/gui/trade.cpp:250
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Kan inte lägga till vald sak. Det går inte att byteshandla med samma slags "
@@ -1654,200 +1709,376 @@ msgstr ""
 msgid "The connection to the server was lost, the program will now quit"
 msgstr ""
 
-#: ../src/game.cpp:535
+#: ../src/game.cpp:591
+#, fuzzy
+msgid "Are you sure you want to quit?"
+msgstr "Är du säker på att du vill ta bort den här karaktären?"
+
+#: ../src/game.cpp:598
+msgid "no"
+msgstr ""
+
+#: ../src/game.cpp:727
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:542
+#: ../src/game.cpp:734
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: ../src/game.cpp:637
+#: ../src/game.cpp:770
+#, c-format
+msgid "Warning: guichan input exception: %s"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:42
+msgid "Move Up"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:43
+msgid "Move Down"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:44
+msgid "Move Left"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:45
+msgid "Move Right"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:46
 #, fuzzy
-msgid "Are you sure you want to quit?"
-msgstr "Är du säker på att du vill ta bort den här karaktären?"
+msgid "Attack"
+msgstr "Attack:"
 
-#: ../src/game.cpp:644
-msgid "no"
+#: ../src/keyboardconfig.cpp:47
+msgid "Smilie"
 msgstr ""
 
-#: ../src/game.cpp:784
-#, c-format
-msgid "Warning: guichan input exception: %s"
+#: ../src/keyboardconfig.cpp:48
+#, fuzzy
+msgid "Talk"
+msgstr "Totalt"
+
+#: ../src/keyboardconfig.cpp:49
+#, fuzzy
+msgid "Stop Attack"
+msgstr "Attack:"
+
+#: ../src/keyboardconfig.cpp:50
+msgid "Target Closest"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:51
+msgid "Target NPC"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:52
+#, fuzzy
+msgid "Target Player"
+msgstr "Spelare"
+
+#: ../src/keyboardconfig.cpp:53
+msgid "Pickup"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:54
+#, fuzzy
+msgid "Hide Windows"
+msgstr "Återställ fönster"
+
+#: ../src/keyboardconfig.cpp:55
+#, fuzzy
+msgid "Sit"
+msgstr "Dela"
+
+#: ../src/keyboardconfig.cpp:56
+msgid "Screenshot"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:57
+msgid "Enable/Disable Trading"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:58
+msgid "Find Path to Mouse"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:59 ../src/keyboardconfig.cpp:60
+#: ../src/keyboardconfig.cpp:61 ../src/keyboardconfig.cpp:62
+#: ../src/keyboardconfig.cpp:63 ../src/keyboardconfig.cpp:64
+#: ../src/keyboardconfig.cpp:65 ../src/keyboardconfig.cpp:66
+#: ../src/keyboardconfig.cpp:67 ../src/keyboardconfig.cpp:68
+#: ../src/keyboardconfig.cpp:69 ../src/keyboardconfig.cpp:70
+#, fuzzy, c-format
+msgid "Item Shortcut %d"
+msgstr "Genvägar"
+
+#: ../src/keyboardconfig.cpp:71
+#, fuzzy
+msgid "Help Window"
+msgstr "Återställ fönster"
+
+#: ../src/keyboardconfig.cpp:72
+#, fuzzy
+msgid "Status Window"
+msgstr "Status"
+
+#: ../src/keyboardconfig.cpp:73
+#, fuzzy
+msgid "Inventory Window"
+msgstr "Inventarium"
+
+#: ../src/keyboardconfig.cpp:74
+#, fuzzy
+msgid "Equipment WIndow"
+msgstr "Utrustning"
+
+#: ../src/keyboardconfig.cpp:75
+#, fuzzy
+msgid "Skill Window"
+msgstr "Färdighetspoäng: %d"
+
+#: ../src/keyboardconfig.cpp:76
+msgid "Minimap Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:77
+#, fuzzy
+msgid "Chat Window"
+msgstr "Återställ fönster"
+
+#: ../src/keyboardconfig.cpp:78
+msgid "Item Shortcut Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:79
+#, fuzzy
+msgid "Setup Window"
+msgstr "Återställ fönster"
+
+#: ../src/keyboardconfig.cpp:80
+#, fuzzy
+msgid "Debug Window"
+msgstr "Återställ fönster"
+
+#: ../src/keyboardconfig.cpp:81
+#, fuzzy
+msgid "Emote Window"
+msgstr "Kan inte visa smiley!"
+
+#: ../src/keyboardconfig.cpp:82
+msgid "Emote Shortcut Window"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:83 ../src/keyboardconfig.cpp:84
+#: ../src/keyboardconfig.cpp:85 ../src/keyboardconfig.cpp:86
+#: ../src/keyboardconfig.cpp:87 ../src/keyboardconfig.cpp:88
+#: ../src/keyboardconfig.cpp:89 ../src/keyboardconfig.cpp:90
+#: ../src/keyboardconfig.cpp:91 ../src/keyboardconfig.cpp:92
+#: ../src/keyboardconfig.cpp:93 ../src/keyboardconfig.cpp:94
+#, fuzzy, c-format
+msgid "Emote Shortcut %d"
+msgstr "Genvägar"
+
+#: ../src/keyboardconfig.cpp:95
+msgid "Toggle Chat"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:96
+msgid "Scroll Chat Up"
 msgstr ""
 
-#: ../src/main.cpp:213
+#: ../src/keyboardconfig.cpp:97
+msgid "Scroll Chat Down"
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:98
+#, fuzzy
+msgid "Select OK"
+msgstr "Välj server"
+
+#: ../src/main.cpp:214
 #, c-format
 msgid "Error: Invalid update host: %s"
 msgstr ""
 
-#: ../src/main.cpp:214
+#: ../src/main.cpp:215
 msgid "Invalid update host: "
 msgstr ""
 
-#: ../src/main.cpp:220
+#: ../src/main.cpp:221
 msgid "Warning: no protocol was specified for the update host"
 msgstr ""
 
-#: ../src/main.cpp:245
+#: ../src/main.cpp:246
 #, c-format
 msgid "Error: %s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:247 ../src/main.cpp:253
+#: ../src/main.cpp:248 ../src/main.cpp:254
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: ../src/main.cpp:251
+#: ../src/main.cpp:252
 #, c-format
 msgid "Error: %s/%s can't be made, but doesn't exist!"
 msgstr ""
 
-#: ../src/main.cpp:282
+#: ../src/main.cpp:283
 msgid " can't be created, but it doesn't exist! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:291
+#: ../src/main.cpp:292
 #, c-format
 msgid "Starting Aethyra Version %s"
 msgstr ""
 
-#: ../src/main.cpp:293
+#: ../src/main.cpp:294
 msgid "Starting Aethyra - Version not defined"
 msgstr ""
 
 #. Initialize SDL
-#: ../src/main.cpp:297
+#: ../src/main.cpp:298
 msgid "Initializing SDL..."
 msgstr ""
 
-#: ../src/main.cpp:299
+#: ../src/main.cpp:300
 msgid "Could not initialize SDL: "
 msgstr ""
 
-#: ../src/main.cpp:312
+#: ../src/main.cpp:313
 msgid " couldn't be set as home directory! Exiting."
 msgstr ""
 
-#: ../src/main.cpp:332
+#: ../src/main.cpp:333
 #, c-format
 msgid "Can't find Resources directory\n"
 msgstr ""
 
 #. Fill configuration with defaults
-#: ../src/main.cpp:342
+#: ../src/main.cpp:343
 msgid "Initializing configuration..."
 msgstr ""
 
-#: ../src/main.cpp:456
+#: ../src/main.cpp:426
+msgid "Couldn't set "
+msgstr ""
+
+#: ../src/main.cpp:427
+msgid " video mode: "
+msgstr ""
+
+#: ../src/main.cpp:457
 #, c-format
 msgid "Warning: %s"
 msgstr ""
 
-#: ../src/main.cpp:498
+#: ../src/main.cpp:499
 msgid "aethyra"
 msgstr ""
 
-#: ../src/main.cpp:499
+#: ../src/main.cpp:500
 msgid "Options: "
 msgstr ""
 
-#: ../src/main.cpp:500
+#: ../src/main.cpp:501
 msgid "  -C --configfile : Configuration file to use"
 msgstr ""
 
-#: ../src/main.cpp:501
+#: ../src/main.cpp:502
 msgid "  -d --data       : Directory to load game data from"
 msgstr ""
 
-#: ../src/main.cpp:502
+#: ../src/main.cpp:503
 msgid "  -D --default    : Bypass the login process with default settings"
 msgstr ""
 
-#: ../src/main.cpp:503
+#: ../src/main.cpp:504
 msgid "  -h --help       : Display this help"
 msgstr ""
 
-#: ../src/main.cpp:504
+#: ../src/main.cpp:505
 msgid "  -H --updatehost : Use this update host"
 msgstr ""
 
-#: ../src/main.cpp:505
+#: ../src/main.cpp:506
 msgid "  -p --playername : Login with this player"
 msgstr ""
 
-#: ../src/main.cpp:506
+#: ../src/main.cpp:507
 msgid "  -P --password   : Login with this password"
 msgstr ""
 
-#: ../src/main.cpp:507
+#: ../src/main.cpp:508
 msgid "  -u --skipupdate : Skip the update downloads"
 msgstr ""
 
-#: ../src/main.cpp:508
+#: ../src/main.cpp:509
 msgid "  -U --username   : Login with this username"
 msgstr ""
 
-#: ../src/main.cpp:509
+#: ../src/main.cpp:510
 msgid "  -v --version    : Display the version"
 msgstr ""
 
-#: ../src/main.cpp:515 ../src/main.cpp:518
+#: ../src/main.cpp:516 ../src/main.cpp:519
 msgid "Aethyra version "
 msgstr ""
 
-#: ../src/main.cpp:519
+#: ../src/main.cpp:520
 msgid "(local build?, PACKAGE_VERSION is not defined)"
 msgstr ""
 
-#: ../src/main.cpp:615
+#: ../src/main.cpp:616
 #, fuzzy
 msgid "Trying to connect to account server..."
 msgstr "Ansluter..."
 
-#: ../src/main.cpp:616
+#: ../src/main.cpp:617
 #, c-format
 msgid "Username is %s"
 msgstr ""
 
-#: ../src/main.cpp:670
+#: ../src/main.cpp:671
 #, fuzzy
 msgid "Trying to connect to char server..."
 msgstr "Ansluter..."
 
-#: ../src/main.cpp:692
+#: ../src/main.cpp:693
 #, c-format
 msgid "Memorizing selected character %s"
 msgstr ""
 
-#: ../src/main.cpp:698
+#: ../src/main.cpp:699
 #, fuzzy
 msgid "Trying to connect to map server..."
 msgstr "Ansluter..."
 
-#: ../src/main.cpp:699
+#: ../src/main.cpp:700
 #, fuzzy, c-format
 msgid "Map: %s"
 msgstr "Namn: %s"
 
-#: ../src/main.cpp:829
+#: ../src/main.cpp:830
 #, c-format
 msgid "Couldn't load %s as wallpaper"
 msgstr ""
 
-#: ../src/main.cpp:862
+#: ../src/main.cpp:863
 msgid "Got disconnected from server!"
 msgstr "Kopplades från servern!"
 
-#: ../src/main.cpp:1067
+#: ../src/main.cpp:1068
 msgid "Connecting to map server..."
 msgstr "Ansluter till kartservern..."
 
-#: ../src/main.cpp:1075
+#: ../src/main.cpp:1076
 msgid "Connecting to character server..."
 msgstr "Ansluter till karaktärsservern..."
 
-#: ../src/main.cpp:1083
+#: ../src/main.cpp:1084
 msgid "Connecting to account server..."
 msgstr "Ansluter till kontoservern..."
 
@@ -1913,90 +2144,86 @@ msgstr ""
 msgid "Party chat received, but being is not a player"
 msgstr ""
 
-#: ../src/party.cpp:171
-msgid "/party <command> <params>: Party commands."
-msgstr ""
-
-#: ../src/party.cpp:178
+#: ../src/party.cpp:173
 msgid "Command: /party <command> <args>"
 msgstr ""
 
-#: ../src/party.cpp:179
+#: ../src/party.cpp:174
 msgid "where <command> can be one of:"
 msgstr ""
 
-#: ../src/party.cpp:180
+#: ../src/party.cpp:175
 msgid "   /new"
 msgstr ""
 
-#: ../src/party.cpp:181
+#: ../src/party.cpp:176
 #, fuzzy
 msgid "   /create"
 msgstr "Skapa"
 
-#: ../src/party.cpp:182
+#: ../src/party.cpp:177
 msgid "   /prefix"
 msgstr ""
 
-#: ../src/party.cpp:183
+#: ../src/party.cpp:178
 msgid "   /leave"
 msgstr ""
 
-#: ../src/party.cpp:184
+#: ../src/party.cpp:179
 msgid "This command implements the partying function."
 msgstr ""
 
-#: ../src/party.cpp:186
+#: ../src/party.cpp:181
 msgid "Type /help party <command> for further help."
 msgstr ""
 
-#: ../src/party.cpp:192
+#: ../src/party.cpp:187
 msgid "Command: /party new <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:193
+#: ../src/party.cpp:188
 msgid "Command: /party create <party-name>"
 msgstr ""
 
-#: ../src/party.cpp:194
+#: ../src/party.cpp:189
 msgid "These commands create a new party <party-name."
 msgstr ""
 
-#: ../src/party.cpp:200
+#: ../src/party.cpp:195
 msgid "Command: /party prefix <prefix-char>"
 msgstr ""
 
-#: ../src/party.cpp:201
+#: ../src/party.cpp:196
 msgid "This command sets the party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:203
+#: ../src/party.cpp:198
 msgid ""
 "Any message preceded by <prefix-char> is sent to the party instead of "
 "everyone."
 msgstr ""
 
-#: ../src/party.cpp:205
+#: ../src/party.cpp:200
 msgid "Command: /party prefix"
 msgstr ""
 
-#: ../src/party.cpp:206
+#: ../src/party.cpp:201
 msgid "This command reports the current party prefix character."
 msgstr ""
 
-#: ../src/party.cpp:214
+#: ../src/party.cpp:209
 msgid "Command: /party leave"
 msgstr ""
 
-#: ../src/party.cpp:215
+#: ../src/party.cpp:210
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: ../src/party.cpp:219
+#: ../src/party.cpp:214
 msgid "Unknown /party command."
 msgstr ""
 
-#: ../src/party.cpp:220
+#: ../src/party.cpp:215
 msgid "Type /help party for a list of options."
 msgstr ""
 
@@ -2025,9 +2252,6 @@ msgstr ""
 #~ msgid "Please remove %d points"
 #~ msgstr "Var vänlig ta bort %d poäng"
 
-#~ msgid "Split"
-#~ msgstr "Dela"
-
 #~ msgid "Select amount of items to split."
 #~ msgstr "Välj antal föremål att dela."