diff po/sv.po @ 8460:03b9ce930f0d

[gaim-migrate @ 9190] undo the changes makedist produces committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Tue, 16 Mar 2004 20:48:21 +0000
parents 3afd1761da09
children 5ab3888ec58b
line wrap: on
line diff
--- a/po/sv.po	Tue Mar 16 20:35:22 2004 +0000
+++ b/po/sv.po	Tue Mar 16 20:48:21 2004 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gaim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-16 15:37-0500\n"
+"POT-Creation-Date: 2004-01-07 00:00-0500\n"
 "PO-Revision-Date: 2004-01-07 20:58+0100\n"
 "Last-Translator: Tore Lundqvist <tlt@mima.x.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -24,15 +24,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:110
+#: plugins/autorecon.c:104
 msgid "Auto-Reconnect"
 msgstr "Auto-återanslut"
 
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: plugins/autorecon.c:113 plugins/autorecon.c:115
+#: plugins/autorecon.c:107 plugins/autorecon.c:109
 msgid "When you are kicked offline, this reconnects you."
 msgstr "När du blir frånkopplad, återansluter detta dig."
 
@@ -136,7 +135,7 @@
 msgid "Gaim - Away"
 msgstr "Gaim - Frånvarande"
 
-#: plugins/docklet/docklet.c:114 src/gtkaccount.c:495 src/gtkaccount.c:1820
+#: plugins/docklet/docklet.c:114 src/gtkaccount.c:480 src/gtkaccount.c:1759
 msgid "Auto-login"
 msgstr "Logga in automatiskt"
 
@@ -152,17 +151,17 @@
 msgid "New..."
 msgstr "Nytt..."
 
-#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1576 src/protocols/gg/gg.c:51
-#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:960
-#: src/protocols/jabber/jutil.c:99 src/protocols/jabber/presence.c:58
-#: src/protocols/jabber/presence.c:114 src/protocols/oscar/oscar.c:2939
-#: src/protocols/oscar/oscar.c:4748 src/protocols/oscar/oscar.c:5792
-#: src/protocols/oscar/oscar.c:6410
+#: plugins/docklet/docklet.c:153 src/gtkblist.c:2552 src/gtkpounce.c:411
+#: src/gtkprefs.c:1457 src/protocols/gg/gg.c:51 src/protocols/irc/msgs.c:187
+#: src/protocols/jabber/jabber.c:965 src/protocols/jabber/jutil.c:98
+#: src/protocols/jabber/presence.c:84 src/protocols/oscar/oscar.c:2842
+#: src/protocols/oscar/oscar.c:4596 src/protocols/oscar/oscar.c:5545
+#: src/protocols/oscar/oscar.c:6146
 msgid "Away"
 msgstr "Frånvarande"
 
 # src/menus.c:327
-#: plugins/docklet/docklet.c:159 src/away.c:522
+#: plugins/docklet/docklet.c:159 src/away.c:515
 msgid "Back"
 msgstr "Tillbaka"
 
@@ -170,16 +169,16 @@
 msgid "Mute Sounds"
 msgstr "Stäng av ljud"
 
-#: plugins/docklet/docklet.c:172 src/gtkft.c:605
+#: plugins/docklet/docklet.c:172 src/gtkft.c:581
 msgid "File Transfers"
 msgstr "Filöverföringar"
 
 #. And now for the buttons
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:1999 src/main.c:288
+#: plugins/docklet/docklet.c:173 src/gtkaccount.c:1918 src/main.c:324
 msgid "Accounts"
 msgstr "Konton"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2564 src/main.c:294
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2323 src/main.c:330
 msgid "Preferences"
 msgstr "Inställningar"
 
@@ -244,7 +243,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/filectl.c:226 plugins/filectl.c:228
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr ""
@@ -378,176 +376,6 @@
 "Dra upp och sedan till vänster för att byta till föregående konversation.\n"
 "Dra upp och sedan till höger för att byta till nästa konversation."
 
-#: plugins/gevolution/add_buddy_dialog.c:136
-#: plugins/gevolution/assoc-buddy.c:76
-#, fuzzy
-msgid "Local Addressbook"
-msgstr "E-postadress"
-
-#: plugins/gevolution/add_buddy_dialog.c:146
-#: plugins/gevolution/add_buddy_dialog.c:157
-#: plugins/gevolution/assoc-buddy.c:86 plugins/gevolution/assoc-buddy.c:97
-#: src/gtkblist.c:2879 src/gtkprefs.c:851 src/gtkprefs.c:1604
-#: src/protocols/jabber/jabber.c:916
-msgid "None"
-msgstr "Inget"
-
-#: plugins/gevolution/add_buddy_dialog.c:190
-#: plugins/gevolution/assoc-buddy.c:180 src/gtkprefs.c:1981
-#: src/gtkroomlist.c:561 src/protocols/jabber/jabber.c:590
-#: src/protocols/msn/msn.c:1367 src/protocols/trepia/trepia.c:401
-msgid "Name"
-msgstr "Namn"
-
-#: plugins/gevolution/add_buddy_dialog.c:201
-#, fuzzy
-msgid "Instant Messaging"
-msgstr "Snabbmeddelanden"
-
-#. Add the label.
-#: plugins/gevolution/add_buddy_dialog.c:482
-msgid "Select a person from your address book below, or add a new person."
-msgstr ""
-
-#. "Search"
-#: plugins/gevolution/add_buddy_dialog.c:495
-#: plugins/gevolution/assoc-buddy.c:385 src/protocols/oscar/oscar.c:6680
-msgid "Search"
-msgstr "Sök"
-
-#: plugins/gevolution/add_buddy_dialog.c:566
-#: plugins/gevolution/new_person_dialog.c:310 src/gtkblist.c:3897
-#: src/gtkblist.c:4225
-msgid "Group:"
-msgstr "Grupp:"
-
-#. "New Person" button
-#: plugins/gevolution/add_buddy_dialog.c:592
-#: plugins/gevolution/assoc-buddy.c:488
-#, fuzzy
-msgid "New Person"
-msgstr "<Ny användare>"
-
-#. "Select Buddy" button
-#: plugins/gevolution/add_buddy_dialog.c:609
-#, fuzzy
-msgid "Select Buddy"
-msgstr "Ta bort kompis"
-
-#. Add the label.
-#: plugins/gevolution/assoc-buddy.c:372
-msgid ""
-"Select a person from your address book to add this buddy to, or create a new "
-"person."
-msgstr ""
-
-#. Add the disclosure
-#: plugins/gevolution/assoc-buddy.c:451
-#, fuzzy
-msgid "Show user details"
-msgstr "Visa överföringsdetaljer"
-
-#: plugins/gevolution/assoc-buddy.c:452
-#, fuzzy
-msgid "Hide user details"
-msgstr "Göm överföringsdetaljer"
-
-#. "Associate Buddy" button
-#: plugins/gevolution/assoc-buddy.c:505
-#, fuzzy
-msgid "_Associate Buddy"
-msgstr "Aliaskompis"
-
-#: plugins/gevolution/gevo-util.c:66 plugins/gevolution/gevolution.c:90
-#: src/blist.c:674 src/blist.c:861 src/blist.c:2094 src/gtkblist.c:3722
-#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:792
-msgid "Buddies"
-msgstr "Kompisar"
-
-#: plugins/gevolution/gevolution.c:214
-msgid "Add to Address Book"
-msgstr ""
-
-#. Configuration frame
-#: plugins/gevolution/gevolution.c:347
-#, fuzzy
-msgid "Evolution Integration Configuration"
-msgstr "konfiguration av panelikon"
-
-#. Label
-#: plugins/gevolution/gevolution.c:350
-msgid "Select all accounts that buddies should be auto-added to."
-msgstr ""
-
-#: plugins/gevolution/gevolution.c:380 src/gtkconn.c:620
-msgid "Account"
-msgstr "Konto"
-
-#. *< api_version
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/gevolution/gevolution.c:461
-#, fuzzy
-msgid "Evolution Integration"
-msgstr "Extra information"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: plugins/gevolution/gevolution.c:464 plugins/gevolution/gevolution.c:466
-msgid "Provides integration with Ximian Evolution."
-msgstr ""
-
-#: plugins/gevolution/new_person_dialog.c:270
-#, fuzzy
-msgid "Please enter the person's information below."
-msgstr "Hämta information om användaren"
-
-#: plugins/gevolution/new_person_dialog.c:274
-msgid "Please enter the buddy's screen name and account type below."
-msgstr ""
-
-#: plugins/gevolution/new_person_dialog.c:294
-#, fuzzy
-msgid "Account type:"
-msgstr "Konto:"
-
-#: plugins/gevolution/new_person_dialog.c:298
-msgid "Screenname:"
-msgstr "Användar-ID:"
-
-#. Optional Information section
-#: plugins/gevolution/new_person_dialog.c:318
-#, fuzzy
-msgid "Optional information:"
-msgstr "Extra information"
-
-#. Label
-#: plugins/gevolution/new_person_dialog.c:341 src/gtkaccount.c:318
-#: src/protocols/oscar/oscar.c:3174
-msgid "Buddy Icon"
-msgstr "Kompisikon"
-
-#: plugins/gevolution/new_person_dialog.c:353
-#, fuzzy
-msgid "First name:"
-msgstr "Förnamn"
-
-#: plugins/gevolution/new_person_dialog.c:365
-#, fuzzy
-msgid "Last name:"
-msgstr "Efternamn"
-
-#: plugins/gevolution/new_person_dialog.c:385
-#, fuzzy
-msgid "E-mail:"
-msgstr "E-post"
-
 #: plugins/history.c:74
 msgid "History"
 msgstr "Historik"
@@ -578,7 +406,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/iconaway.c:83 plugins/iconaway.c:85
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr ""
@@ -754,7 +581,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/notify.c:765 plugins/notify.c:767
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "Ger flera olika möjligheter att notifiera dig om olästa meddelanden."
@@ -766,14 +592,13 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/perl/perl.c:530
+#: plugins/perl/perl.c:524
 msgid "Perl Plugin Loader"
 msgstr "Perl-insticksmodulladdare"
 
 #. *< name
 #. *< version
-#. *< summary
-#: plugins/perl/perl.c:532 plugins/perl/perl.c:533
+#: plugins/perl/perl.c:526 plugins/perl/perl.c:527
 msgid "Provides support for loading perl plugins."
 msgstr "Ger möjlighet att ladda perl-insticksmoduler"
 
@@ -862,7 +687,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/signals-test.c:468 plugins/signals-test.c:470
 msgid "Test to see that all signals are working properly."
 msgstr "Test för att avgöra om alla signaler fungerar korrekt."
@@ -881,7 +705,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/simple.c:34 plugins/simple.c:36
 msgid "Tests to see that most things are working."
 msgstr "Testa för att se att det mästa fungerar."
@@ -925,15 +748,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-gnutls.c:223
+#: plugins/ssl/ssl-gnutls.c:218
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: plugins/ssl/ssl-gnutls.c:226 plugins/ssl/ssl-gnutls.c:228
+#: plugins/ssl/ssl-gnutls.c:221 plugins/ssl/ssl-gnutls.c:223
 msgid "Provides SSL support through GNUTLS."
 msgstr "Ger SSL-stöd genom GNUTLS."
 
@@ -944,15 +766,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-nss.c:312
+#: plugins/ssl/ssl-nss.c:306
 msgid "NSS"
 msgstr "NSS"
 
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: plugins/ssl/ssl-nss.c:315 plugins/ssl/ssl-nss.c:317
+#: plugins/ssl/ssl-nss.c:309 plugins/ssl/ssl-nss.c:311
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Ger SSL-stöd genom Mozilla NNS."
 
@@ -970,12 +791,11 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/ssl/ssl.c:94 plugins/ssl/ssl.c:96
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "Ger ett omslag runt SSL-stödsbibliotek"
 
-#: plugins/statenotify.c:30 src/gtkpounce.c:820
+#: plugins/statenotify.c:30 src/gtkpounce.c:799
 #, c-format
 msgid "%s has gone away."
 msgstr "%s har gått."
@@ -1009,7 +829,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/statenotify.c:81 plugins/statenotify.c:84
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
@@ -1018,11 +837,11 @@
 "Notifierar i ett konversationsfönster när en kompis blir frånvarande/inaktiv "
 "eller kommer tillbaka."
 
-#: plugins/tcl/tcl.c:349
+#: plugins/tcl/tcl.c:348
 msgid "Tcl Plugin Loader"
 msgstr "Tcl-insticksmodulladdare"
 
-#: plugins/tcl/tcl.c:351 plugins/tcl/tcl.c:352
+#: plugins/tcl/tcl.c:350 plugins/tcl/tcl.c:351
 msgid "Provides support for loading Tcl plugins"
 msgstr "Ger möjlighet att ladda Tcl-insticksmoduler"
 
@@ -1033,15 +852,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ticker/ticker.c:74 plugins/ticker/ticker.c:328
+#: plugins/ticker/ticker.c:74 plugins/ticker/ticker.c:330
 msgid "Buddy Ticker"
 msgstr "Kompistickare"
 
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: plugins/ticker/ticker.c:331 plugins/ticker/ticker.c:333
+#: plugins/ticker/ticker.c:333 plugins/ticker/ticker.c:335
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "En horisontellt rullande version av kompislistan."
 
@@ -1071,7 +889,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/timestamp.c:176 plugins/timestamp.c:178
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr "Lägg till tidsstämplar med iChat-stil i konversationer varje N minut."
@@ -1096,7 +913,7 @@
 msgstr "_Visa \"slider bar\" i snabbmeddelandefönster"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:854
+#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:837
 msgid "Buddy List Window"
 msgstr "Kompislistefönster"
 
@@ -1118,7 +935,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/win32/transparency/win2ktrans.c:425
 #: plugins/win32/transparency/win2ktrans.c:427
 msgid ""
@@ -1145,8 +961,8 @@
 msgstr "_Starta Gaim när Windows startar"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:2920
-#: src/gtkprefs.c:2480
+#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:2386
+#: src/gtkprefs.c:2256
 msgid "Buddy List"
 msgstr "Kompislista"
 
@@ -1165,8 +981,8 @@
 msgstr "_Håll kompislistefönstret överst"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:892
-#: src/gtkprefs.c:2481 src/protocols/msn/msn.c:1697
+#: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:875
+#: src/gtkprefs.c:2257
 msgid "Conversations"
 msgstr "Konversationer"
 
@@ -1182,16 +998,16 @@
 msgid "Options specific to Windows Gaim."
 msgstr "Inställningar specifika för Windows Gaim."
 
-#: src/about.c:59
+#: src/about.c:57
 msgid "About Gaim"
 msgstr "Om Gaim"
 
-#: src/about.c:74
+#: src/about.c:72
 #, c-format
 msgid "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
 
-#: src/about.c:94
+#: src/about.c:92
 msgid ""
 "Gaim is a modular Instant Messaging client capable of using AIM, ICQ, "
 "Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.  It is "
@@ -1201,305 +1017,310 @@
 "IRC, Jabber, Napster, Zephyr och Gadu-Gadu samtidigt. Den använder Gtk+ och "
 "är licensierad under GPL.<BR><BR>"
 
-#: src/about.c:104
+#: src/about.c:102
 msgid "<FONT SIZE=\"3\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"3\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 
-#: src/about.c:109
+#: src/about.c:107
 msgid "Active Developers"
 msgstr "Aktiva utvecklare"
 
-#: src/about.c:110
+#: src/about.c:108
 msgid "maintainer"
 msgstr "maintainer"
 
-#: src/about.c:112
+#: src/about.c:110
 msgid "lead developer"
 msgstr "Utvecklingsledare"
 
-#: src/about.c:115
+#: src/about.c:113
 msgid "developer & webmaster"
 msgstr "Utvecklare & webbansvarig"
 
-#: src/about.c:116
+#: src/about.c:114
 msgid "win32 port"
 msgstr "win32-portering"
 
-#: src/about.c:119 src/about.c:120 src/about.c:121
+#: src/about.c:117 src/about.c:118 src/about.c:119
 msgid "developer"
 msgstr "utvecklare"
 
-#: src/about.c:122
+#: src/about.c:120
 msgid "support"
 msgstr "support"
 
-#: src/about.c:129
+#: src/about.c:127
 msgid "Crazy Patch Writers"
 msgstr "Programerare av galna patchar"
 
+#: src/about.c:141
+msgid "Retired Developers"
+msgstr "Före detta utvecklare"
+
+#: src/about.c:142
+msgid "former libfaim maintainer"
+msgstr "Före detta libfaim-maintainer "
+
 #: src/about.c:143
-msgid "Retired Developers"
-msgstr "Före detta utvecklare"
-
-#: src/about.c:144
-msgid "former libfaim maintainer"
-msgstr "Före detta libfaim-maintainer "
-
-#: src/about.c:145
 msgid "former lead developer"
 msgstr "Före detta utvecklingsledare"
 
-#: src/about.c:148
+#: src/about.c:146
 msgid "former maintainer"
 msgstr "Före detta maintainer"
 
-#: src/about.c:149
+#: src/about.c:147
 msgid "former Jabber developer"
 msgstr "Före detta Jabber-utvecklare"
 
-#: src/about.c:150
+#: src/about.c:148
 msgid "original author"
 msgstr "Orginalupphovsman"
 
-#: src/about.c:153
+#: src/about.c:151
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hacker och fyllechaffis [lazy bum]"
 
-#: src/about.c:161
+#: src/about.c:159
 msgid "Current Translators"
 msgstr "Nuvarande översättare"
 
-#: src/about.c:162 src/about.c:195
+#: src/about.c:160 src/about.c:193
 msgid "Catalan"
 msgstr "Katalanska"
 
-#: src/about.c:163 src/about.c:196
+#: src/about.c:161 src/about.c:194
 msgid "Czech"
 msgstr "Tjeckiska"
 
-#: src/about.c:164
+#: src/about.c:162
 msgid "Danish"
 msgstr "Danska"
 
-#: src/about.c:165
+#: src/about.c:163
 msgid "British English"
 msgstr "Brittisk engelska"
 
-#: src/about.c:166 src/about.c:197
+#: src/about.c:164 src/about.c:195
 msgid "German"
 msgstr "Tyska"
 
-#: src/about.c:167 src/about.c:198
+#: src/about.c:165 src/about.c:196
 msgid "Spanish"
 msgstr "Spanska"
 
-#: src/about.c:168 src/about.c:199
+#: src/about.c:166 src/about.c:197
 msgid "Finnish"
 msgstr "Finska"
 
-#: src/about.c:169 src/about.c:200
+#: src/about.c:167 src/about.c:198
 msgid "French"
 msgstr "Franska"
 
-#: src/about.c:170
+#: src/about.c:168
 msgid "Hindi"
 msgstr "Hindi"
 
-#: src/about.c:171
+#: src/about.c:169
 msgid "Hungarian"
 msgstr "Ungerska"
 
-#: src/about.c:172 src/about.c:202
+#: src/about.c:170 src/about.c:200
 msgid "Italian"
 msgstr "Italienska"
 
-#: src/about.c:173 src/about.c:204
+#: src/about.c:171 src/about.c:202
 msgid "Korean"
 msgstr "Koreanska"
 
-#: src/about.c:174
+#: src/about.c:172
 msgid "Dutch; Flemish"
 msgstr "Holländska, flamländska"
 
+#: src/about.c:173
+msgid "Norwegian"
+msgstr "Norska"
+
+#: src/about.c:174 src/about.c:203
+msgid "Polish"
+msgstr "Polska"
+
 #: src/about.c:175
-msgid "Norwegian"
-msgstr "Norska"
-
-#: src/about.c:176 src/about.c:205
-msgid "Polish"
-msgstr "Polska"
-
-#: src/about.c:177
 msgid "Portuguese"
 msgstr "Portugisiska"
 
-#: src/about.c:178
+#: src/about.c:176
 msgid "Portuguese-Brazil"
 msgstr "Portugisiska (brasiliansk)"
 
-#: src/about.c:179
+#: src/about.c:177
 msgid "Romanian"
 msgstr "Rumänska"
 
-#: src/about.c:180 src/about.c:206
+#: src/about.c:178 src/about.c:204
 msgid "Russian"
 msgstr "Ryska"
 
-#: src/about.c:181
+#: src/about.c:179
 msgid "Serbian"
 msgstr "Serbiska"
 
-#: src/about.c:182 src/about.c:208
+#: src/about.c:180 src/about.c:206
 msgid "Swedish"
 msgstr "Svenska"
 
-#: src/about.c:183
+#: src/about.c:181
 msgid "Vietnamese"
 msgstr "Vietnamesiska"
 
-#: src/about.c:183
+#: src/about.c:181
 msgid "Gnome Vi Team"
 msgstr "Gnome Vi Team"
 
-#: src/about.c:184
+#: src/about.c:182
 msgid "Simplified Chinese"
 msgstr "Förenklad kinesiska"
 
-#: src/about.c:185
+#: src/about.c:183
 msgid "Traditional Chinese"
 msgstr "Traditionell kinesiska"
 
-#: src/about.c:192
+#: src/about.c:190
 msgid "Past Translators"
 msgstr "Före detta översättare"
 
-#: src/about.c:193
+#: src/about.c:191
 msgid "Amharic"
 msgstr "Amhariska"
 
-#: src/about.c:194
+#: src/about.c:192
 msgid "Bulgarian"
 msgstr "Bulgariska"
 
-#: src/about.c:201
+#: src/about.c:199
 msgid "Hebrew"
 msgstr "Hebreiska"
 
-#: src/about.c:203
+#: src/about.c:201
 msgid "Japanese"
 msgstr "Japanska"
 
-#: src/about.c:207
+#: src/about.c:205
 msgid "Slovak"
 msgstr "Slovakiska"
 
-#: src/about.c:209
+#: src/about.c:207
 msgid "Chinese"
 msgstr "Kinesiska"
 
-#: src/account.c:275 src/protocols/jabber/jabber.c:1001
+#: src/account.c:272 src/protocols/jabber/jabber.c:1017
 msgid "New passwords do not match."
 msgstr "De nya lösenorden stämmer inte överens."
 
-#: src/account.c:283
+#: src/account.c:280
 msgid "Fill out all fields completely."
 msgstr "Fyll i alla fält fullständigt."
 
-#: src/account.c:308
+#: src/account.c:305
 msgid "Original password"
 msgstr "Originallösenord"
 
-#: src/account.c:314
+#: src/account.c:311
 msgid "New password"
 msgstr "Nytt lösenord"
 
-#: src/account.c:320
+#: src/account.c:317
 msgid "New password (again)"
 msgstr "Nytt lösenord (igen)"
 
-#: src/account.c:325
+#: src/account.c:322
 #, c-format
 msgid "Change password for %s"
 msgstr "Ändra lösenord för %s"
 
-#: src/account.c:333
+#: src/account.c:330
 msgid "Please enter your current password and your new password."
 msgstr "Ange ditt nuvarande och nya lösenord."
 
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:336 src/connection.c:198 src/dialogs.c:472 src/dialogs.c:528
-#: src/gtkblist.c:2278 src/gtkrequest.c:225 src/protocols/jabber/jabber.c:1046
-#: src/protocols/jabber/xdata.c:337 src/protocols/msn/msn.c:182
-#: src/protocols/msn/msn.c:193 src/protocols/msn/msn.c:204
-#: src/protocols/msn/msn.c:215 src/protocols/oscar/oscar.c:2549
-#: src/protocols/oscar/oscar.c:2630 src/protocols/oscar/oscar.c:6470
-#: src/protocols/oscar/oscar.c:6566 src/protocols/oscar/oscar.c:6615
-#: src/protocols/oscar/oscar.c:6697 src/protocols/yahoo/yahoo.c:2500
-#: src/protocols/yahoo/yahoo.c:2508 src/request.h:1237
+#: src/account.c:333 src/connection.c:193 src/dialogs.c:1488
+#: src/dialogs.c:1505 src/dialogs.c:1524 src/gtkblist.c:1742
+#: src/gtkrequest.c:190 src/protocols/jabber/jabber.c:1062
+#: src/protocols/jabber/xdata.c:334 src/protocols/msn/msn.c:181
+#: src/protocols/msn/msn.c:192 src/protocols/msn/msn.c:203
+#: src/protocols/msn/msn.c:214 src/protocols/oscar/oscar.c:2453
+#: src/protocols/oscar/oscar.c:2533 src/protocols/oscar/oscar.c:6196
+#: src/protocols/oscar/oscar.c:6292 src/protocols/oscar/oscar.c:6341
+#: src/protocols/oscar/oscar.c:6423 src/protocols/yahoo/yahoo.c:2398
+#: src/protocols/yahoo/yahoo.c:2406 src/request.h:1018
 msgid "OK"
 msgstr "OK"
 
-#: src/account.c:337 src/account.c:371 src/connection.c:199 src/dialogs.c:306
-#: src/dialogs.c:318 src/dialogs.c:331 src/dialogs.c:352 src/dialogs.c:473
-#: src/dialogs.c:529 src/dialogs.c:837 src/dialogs.c:858 src/dialogs.c:875
-#: src/dialogs.c:894 src/gtkaccount.c:1673 src/gtkaccount.c:2164
-#: src/gtkblist.c:2279 src/gtkblist.c:4264 src/gtkconn.c:168
-#: src/gtkimhtmltoolbar.c:366 src/gtkprivacy.c:561 src/gtkprivacy.c:574
-#: src/gtkprivacy.c:599 src/gtkprivacy.c:610 src/gtkrequest.c:226
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/jabber/buddy.c:514
-#: src/protocols/jabber/chat.c:691 src/protocols/jabber/jabber.c:659
-#: src/protocols/jabber/jabber.c:1047 src/protocols/jabber/xdata.c:338
-#: src/protocols/msn/msn.c:183 src/protocols/msn/msn.c:194
-#: src/protocols/msn/msn.c:205 src/protocols/msn/msn.c:216
-#: src/protocols/msn/msn.c:229 src/protocols/oscar/oscar.c:2513
-#: src/protocols/oscar/oscar.c:2550 src/protocols/oscar/oscar.c:2586
-#: src/protocols/oscar/oscar.c:2631 src/protocols/oscar/oscar.c:6289
-#: src/protocols/oscar/oscar.c:6471 src/protocols/oscar/oscar.c:6567
-#: src/protocols/oscar/oscar.c:6616 src/protocols/oscar/oscar.c:6681
-#: src/protocols/oscar/oscar.c:6698 src/protocols/trepia/trepia.c:347
-#: src/protocols/yahoo/yahoo.c:2501 src/protocols/yahoo/yahoo.c:2509
-#: src/request.h:1237 src/request.h:1247
+#: src/account.c:334 src/account.c:368 src/connection.c:194 src/dialogs.c:351
+#: src/dialogs.c:363 src/dialogs.c:376 src/dialogs.c:397 src/dialogs.c:1322
+#: src/dialogs.c:1489 src/dialogs.c:1506 src/dialogs.c:1525
+#: src/gtkaccount.c:1612 src/gtkaccount.c:2081 src/gtkblist.c:1743
+#: src/gtkblist.c:3701 src/gtkconn.c:167 src/gtkprivacy.c:569
+#: src/gtkprivacy.c:582 src/gtkprivacy.c:607 src/gtkprivacy.c:618
+#: src/gtkrequest.c:191 src/protocols/icq/gaim_icq.c:277
+#: src/protocols/jabber/buddy.c:512 src/protocols/jabber/jabber.c:687
+#: src/protocols/jabber/jabber.c:1063 src/protocols/jabber/xdata.c:335
+#: src/protocols/msn/msn.c:182 src/protocols/msn/msn.c:193
+#: src/protocols/msn/msn.c:204 src/protocols/msn/msn.c:215
+#: src/protocols/msn/msn.c:228 src/protocols/oscar/oscar.c:2417
+#: src/protocols/oscar/oscar.c:2454 src/protocols/oscar/oscar.c:2489
+#: src/protocols/oscar/oscar.c:2534 src/protocols/oscar/oscar.c:6024
+#: src/protocols/oscar/oscar.c:6197 src/protocols/oscar/oscar.c:6293
+#: src/protocols/oscar/oscar.c:6342 src/protocols/oscar/oscar.c:6407
+#: src/protocols/oscar/oscar.c:6424 src/protocols/trepia/trepia.c:347
+#: src/protocols/yahoo/yahoo.c:2399 src/protocols/yahoo/yahoo.c:2407
+#: src/request.h:1018 src/request.h:1028
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: src/account.c:363
+#: src/account.c:360
 #, c-format
 msgid "Change user information for %s"
 msgstr "Ändra användarinformationen för %s"
 
 # src/menus.c:280
-#: src/account.c:370 src/dialogs.c:825 src/gtkrequest.c:232
-#: src/protocols/jabber/buddy.c:513 src/protocols/trepia/trepia.c:346
+#: src/account.c:367 src/dialogs.c:1310 src/gtkrequest.c:197
+#: src/protocols/jabber/buddy.c:511 src/protocols/trepia/trepia.c:346
 msgid "Save"
 msgstr "Spara"
 
-#: src/away.c:210
+#: src/away.c:208
 msgid "Away!"
 msgstr "Frånvarande"
 
-#: src/away.c:275
+#: src/away.c:269
 msgid "I'm Back!"
 msgstr "Jag är tillbaka!"
 
-#: src/away.c:375
+#: src/away.c:368
 msgid "New Away Message"
 msgstr "Nytt meddelande"
 
-#: src/away.c:395
+#: src/away.c:388
 msgid "Remove Away Message"
 msgstr "Ta bort meddelande"
 
-#: src/away.c:590
+#: src/away.c:583
 msgid "Set All Away"
 msgstr "Meddelande för alla"
 
-#: src/blist.c:579 src/gtkprefs.c:2483
+#: src/blist.c:576 src/gtkprefs.c:2259
 msgid "Chats"
 msgstr "Chattar"
 
-#: src/blist.c:1181
+#: src/blist.c:671 src/blist.c:858 src/blist.c:2077 src/gtkblist.c:3168
+#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:1168
+msgid "Buddies"
+msgstr "Kompisar"
+
+#: src/blist.c:1158
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1514,116 +1335,142 @@
 "%d kompisar från gruppen %s togs inte bort eftersom deras konton inte var "
 "inloggade. Den här kompisarna och gruppen togs inte bort.\n"
 
-#: src/blist.c:1190
+#: src/blist.c:1167
 msgid "Group not removed"
 msgstr "Gruppen togs inte bort"
 
-#: src/blist.c:1240 src/gtkaccount.c:162 src/gtkft.c:153 src/gtkutils.c:860
-#: src/protocols/jabber/buddy.c:569
+#: src/blist.c:1217 src/gtkaccount.c:158 src/gtkutils.c:850
+#: src/protocols/jabber/auth.c:135 src/protocols/jabber/buddy.c:568
 msgid "Unknown"
 msgstr "Okänd"
 
-#: src/blist.c:1567
+#: src/blist.c:1544
 msgid "Invalid Groupname"
 msgstr "Ogiltigt gruppnamn"
 
-#: src/blist.c:2209
+#: src/blist.c:2194
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded."
 msgstr ""
 "Ett fel upptäcktes när din kompislista lästes in, den har inte laddats."
 
-#: src/blist.c:2211
+#: src/blist.c:2196
 msgid "Buddy List Error"
 msgstr "Kompislistefel"
 
-#: src/connection.c:119 src/connection.c:170
+#: src/buddy_chat.c:212 src/gtkblist.c:3591
+msgid ""
+"You are not currently signed on with any protocols that have the ability to "
+"chat."
+msgstr ""
+"Du är för tillfället inte inloggad med något protokoll som har möjlighet "
+"till chatt."
+
+#: src/buddy_chat.c:223
+msgid "Join a Chat"
+msgstr "Anslut till chatt"
+
+#: src/buddy_chat.c:225 src/gtkblist.c:926
+msgid "_Join"
+msgstr "_Anslut"
+
+#: src/buddy_chat.c:242
+msgid ""
+"Please enter the appropriate information about the chat you would like to "
+"join.\n"
+msgstr "Ange rätt information om chatten du vill ansluta till.\n"
+
+#: src/buddy_chat.c:253 src/dialogs.c:587 src/dialogs.c:662
+#: src/gtkpounce.c:358
+msgid "_Account:"
+msgstr "_Konto:"
+
+#: src/connection.c:117 src/connection.c:165
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Saknar protokollmodul för %s"
 
-#: src/connection.c:124
+#: src/connection.c:122
 msgid "Registration Error"
 msgstr "Registreringsfel"
 
-#: src/connection.c:175
+#: src/connection.c:170
 msgid "Connection Error"
 msgstr "Anslutningsfel"
 
-#: src/connection.c:196
+#: src/connection.c:191
 #, c-format
 msgid "Enter password for %s"
 msgstr "Ange lösenord för %s"
 
-#: src/conversation.c:296
+#: src/conversation.c:297
 msgid "Unable to send message. The message is too large."
 msgstr "Kan inte skicka meddelandet, det är för stort."
 
-#: src/conversation.c:304
+#: src/conversation.c:305
 msgid "Unable to send message."
 msgstr "Kan inte skicka meddelandet."
 
-#: src/conversation.c:1968
+#: src/conversation.c:1898
 #, c-format
 msgid "%s entered the room."
 msgstr "%s kom in i rummet."
 
-#: src/conversation.c:1971
+#: src/conversation.c:1901
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] kom in i rummet. "
 
-#: src/conversation.c:2063
-#, fuzzy, c-format
-msgid "You are now known as %s"
-msgstr "%s är nu känd som %s"
-
-#: src/conversation.c:2066
+#: src/conversation.c:1986
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s är nu känd som %s"
 
-#: src/conversation.c:2109
+#: src/conversation.c:2028
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s lämnade rummet (%s)."
 
-#: src/conversation.c:2111
+#: src/conversation.c:2030
 #, c-format
 msgid "%s left the room."
 msgstr "%s lämnade rummet."
 
-#: src/conversation.c:2184
+#: src/conversation.c:2103
 #, c-format
 msgid "(+%d more)"
 msgstr "(+%d fler)"
 
-#: src/conversation.c:2186
+#: src/conversation.c:2105
 #, c-format
 msgid " left the room (%s)."
 msgstr " lämnade rummet (%s)."
 
-#: src/conversation.c:2466
+#: src/conversation.c:2387
 msgid "Last created window"
 msgstr "Senast skapade fönster"
 
-#: src/conversation.c:2468 src/gtkprefs.c:1380
+#: src/conversation.c:2389
 msgid "New window"
 msgstr "Nytt fönster"
 
-#: src/conversation.c:2470
+#: src/conversation.c:2391
 msgid "By group"
 msgstr "Grupp"
 
-#: src/conversation.c:2472
+#: src/conversation.c:2393
 msgid "By account"
 msgstr "Konto"
 
-#: src/dialogs.c:155
+#: src/dialogs.c:200
 msgid "Warn User"
 msgstr "Varna användaren"
 
-#: src/dialogs.c:174
+#: src/dialogs.c:203
+msgid "_Warn"
+msgstr "_Varna"
+
+#: src/dialogs.c:219
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1636,25 +1483,25 @@
 "Detta kommer att öka %ss varningsnivå och hon/han kommer få en hårdare "
 "bandbreddsbegränsning.\n"
 
-#: src/dialogs.c:183
+#: src/dialogs.c:228
 msgid "Warn _anonymously?"
 msgstr "Varna _anonymt?"
 
-#: src/dialogs.c:190
+#: src/dialogs.c:235
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>Anonyma varningar är mindre allvarliga.</b>"
 
-#: src/dialogs.c:302
+#: src/dialogs.c:347
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Du håller på att ta bort %s från din kompislista. Vill du fortsätta?"
 
-#: src/dialogs.c:304 src/dialogs.c:305
+#: src/dialogs.c:349 src/dialogs.c:350
 msgid "Remove Buddy"
 msgstr "Ta bort kompis"
 
-#: src/dialogs.c:314
+#: src/dialogs.c:359
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -1662,11 +1509,11 @@
 msgstr ""
 "Du håller på att ta bort chatten %s från din kompislista. Vill du fortsätta?"
 
-#: src/dialogs.c:316 src/dialogs.c:317
+#: src/dialogs.c:361 src/dialogs.c:362
 msgid "Remove Chat"
 msgstr "Ta bort chatt"
 
-#: src/dialogs.c:326
+#: src/dialogs.c:371
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -1675,11 +1522,11 @@
 "Du håller på att ta bort gruppen %s och alla dess medlemmar från din "
 "kompislista. Vill du fortsätta?"
 
-#: src/dialogs.c:329 src/dialogs.c:330
+#: src/dialogs.c:374 src/dialogs.c:375
 msgid "Remove Group"
 msgstr "Ta bort grupp"
 
-#: src/dialogs.c:347
+#: src/dialogs.c:392
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -1688,109 +1535,126 @@
 "Du håller på att ta bort kontakten som innehåller %s och %d andra kompisar "
 "från din kompislista. Vill du fortsätta?"
 
-#: src/dialogs.c:350 src/dialogs.c:351
+#: src/dialogs.c:395 src/dialogs.c:396
 msgid "Remove Contact"
 msgstr "Ta bort kontakt"
 
-#: src/dialogs.c:454 src/dialogs.c:510
-#, fuzzy
-msgid "_Screen name"
-msgstr "_Användar-ID:"
-
-#: src/dialogs.c:460 src/dialogs.c:516
-#, fuzzy
-msgid "_Account"
-msgstr "_Konto:"
-
-#: src/dialogs.c:467
+#: src/dialogs.c:541
 msgid "New Instant Message"
 msgstr "Nytt snabbmeddelanden"
 
-#: src/dialogs.c:469
-#, fuzzy
-msgid "Please enter the screen name of the person you would like to IM."
+#: src/dialogs.c:559
+msgid "Please enter the screenname of the person you would like to IM.\n"
 msgstr "Ange användar-ID för den person du vill skicka snabbmeddelande till.\n"
 
-#: src/dialogs.c:523
+#: src/dialogs.c:571 src/dialogs.c:646
+msgid "_Screenname:"
+msgstr "_Användar-ID:"
+
+#: src/dialogs.c:616
 msgid "Get User Info"
 msgstr "Hämta användarinformation"
 
-#: src/dialogs.c:525
-#, fuzzy
+#: src/dialogs.c:634
+msgid ""
+"Please enter the screenname of the person whose info you would like to "
+"view.\n"
+msgstr "Ange användar-ID för den person som du vill ha information om.\n"
+
+#: src/dialogs.c:740
+msgid "Insert Link"
+msgstr "Infoga länk"
+
+#: src/dialogs.c:742
+msgid "_Insert"
+msgstr "_Infoga"
+
+#: src/dialogs.c:767
 msgid ""
-"Please enter the screen name of the person whose info you would like to view."
-msgstr "Ange användar-ID för den person som du vill ha information om.\n"
-
-#: src/dialogs.c:553 src/gtkimhtmltoolbar.c:209
+"Please enter the URL and description of the link that you want to insert.  "
+"The description is optional.\n"
+msgstr ""
+"Ange en URL för länken du vill infoga, om du vill kan du även ange en "
+"beskrivning av länken.\n"
+
+#: src/dialogs.c:780
+msgid "_URL:"
+msgstr "_URL:"
+
+#: src/dialogs.c:793
+msgid "_Description:"
+msgstr "_Beskrivning:"
+
+#: src/dialogs.c:924 src/dialogs.c:941
 msgid "Select Text Color"
 msgstr "Välj textfärg"
 
-#: src/dialogs.c:581 src/gtkimhtmltoolbar.c:279
+#: src/dialogs.c:976 src/dialogs.c:993
 msgid "Select Background Color"
 msgstr "Välj bakgrundsfärg"
 
-#: src/dialogs.c:620 src/gtkimhtmltoolbar.c:133
+#: src/dialogs.c:1078 src/dialogs.c:1104
 msgid "Select Font"
 msgstr "Välj typsnitt"
 
-#: src/dialogs.c:682
+#: src/dialogs.c:1168
 msgid "You cannot save an away message with a blank title"
 msgstr "Du kan inte skapa ett frånvaromeddelande med en tom titel"
 
-#: src/dialogs.c:684
+#: src/dialogs.c:1170
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr ""
 "Ange en titel på meddelandet eller välj \"Använd\" för att använda utan att "
 "spara."
 
-#: src/dialogs.c:694
+#: src/dialogs.c:1180
 msgid "You cannot create an empty away message"
 msgstr "Kunde inte skapa ett tomt frånvaromeddelande"
 
-#: src/dialogs.c:756
+#: src/dialogs.c:1242
 msgid "New away message"
 msgstr "Nytt frånvaromeddelande"
 
-#: src/dialogs.c:777
+#: src/dialogs.c:1263
 msgid "Away title: "
 msgstr "Överskrift: "
 
-#: src/dialogs.c:829
+#: src/dialogs.c:1314
 msgid "Save & Use"
 msgstr "Spara och använd"
 
-#: src/dialogs.c:833
+#: src/dialogs.c:1318
 msgid "Use"
 msgstr "Använd"
 
-#: src/dialogs.c:854
+#. show everything
+#: src/dialogs.c:1467
+msgid "Smile!"
+msgstr "Le!"
+
+#: src/dialogs.c:1485
 msgid "Alias Chat"
 msgstr "Aliaschatt"
 
-#: src/dialogs.c:855
+#: src/dialogs.c:1486
 msgid "Enter an alias for this chat."
 msgstr "Ange ett alias för denna chatt."
 
-#: src/dialogs.c:857 src/dialogs.c:874 src/dialogs.c:893 src/gtkrequest.c:233
-#, fuzzy
-msgid "Alias"
-msgstr "Alias:"
-
-#: src/dialogs.c:871
+#: src/dialogs.c:1502
 msgid "Alias Contact"
 msgstr "Aliaskontakt"
 
-#: src/dialogs.c:872
+#: src/dialogs.c:1503
 msgid "Enter an alias for this contact."
 msgstr "Ange ett alias för denna kontakt."
 
-#: src/dialogs.c:889
+#: src/dialogs.c:1520
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Ange ett alias för %s."
 
-#: src/dialogs.c:891
+#: src/dialogs.c:1522
 msgid "Alias Buddy"
 msgstr "Aliaskompis"
 
@@ -1804,12 +1668,12 @@
 msgid "%s was not found.\n"
 msgstr "%s kunde inte hittas.\n"
 
-#: src/ft.c:769
+#: src/ft.c:754
 #, c-format
 msgid "File transfer to %s aborted.\n"
 msgstr "Filöverföring till %s avbröts.\n"
 
-#: src/ft.c:771
+#: src/ft.c:756
 #, c-format
 msgid "File transfer from %s aborted.\n"
 msgstr "Filöverföring från %s avbröts.\n"
@@ -1848,17 +1712,16 @@
 msgstr "Gaim körs inte (på session 0)\n"
 
 #: src/gaim-remote.c:204
-#, fuzzy
 msgid ""
 "\n"
 "Using AIM: URIs:\n"
-"Sending an IM to a screen name:\n"
+"Sending an IM to a screenname:\n"
 "\tgaim-remote uri 'aim:goim?screenname=Penguin&message=hello+world'\n"
-"In this case, 'Penguin' is the screen name we wish to IM, and 'hello world'\n"
+"In this case, 'Penguin' is the screenname we wish to IM, and 'hello world'\n"
 "is the message to be sent.  '+' must be used in place of spaces.\n"
 "Please note the quoting used above - if you run this from a shell the '&'\n"
 "needs to be escaped, or the command will stop at that point.\n"
-"Also,the following will just open a conversation window to a screen name,\n"
+"Also,the following will just open a conversation window to a screenname,\n"
 "with no message:\n"
 "\tgaim-remote uri 'aim:goim?screenname=Penguin'\n"
 "\n"
@@ -1899,32 +1762,32 @@
 "Stäng den körande kopian av Gaim\n"
 
 #. for people like myself, who are too lazy to add an away msg :)
-#: src/gaimrc.c:46
+#: src/gaimrc.c:44
 msgid "sorry, i ran out for a while. bbl"
 msgstr "Är inte vid datorn just nu, kommer tillbaka senare."
 
-#: src/gaimrc.c:375 src/gaimrc.c:1451
+#: src/gaimrc.c:373 src/gaimrc.c:1450
 msgid "boring default"
 msgstr "Tråkigt standardmeddelande"
 
-#: src/gaimrc.c:1260 src/gtkblist.c:2881
+#: src/gaimrc.c:1259 src/gtkblist.c:2348
 msgid "Alphabetical"
 msgstr "Alfabetisk"
 
-#: src/gaimrc.c:1262 src/gtkblist.c:2882
+#: src/gaimrc.c:1261 src/gtkblist.c:2349
 msgid "By status"
 msgstr "Efter status"
 
-#: src/gaimrc.c:1264 src/gtkblist.c:2883
+#: src/gaimrc.c:1263 src/gtkblist.c:2350
 msgid "By log size"
 msgstr "Efter loggstorlek"
 
-#: src/gaimrc.c:1549
+#: src/gaimrc.c:1548
 #, c-format
 msgid "Could not open config file %s."
 msgstr "Kunde inte öppna konfigurationsfilen %s."
 
-#: src/gtkaccount.c:287
+#: src/gtkaccount.c:285
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -1935,173 +1798,177 @@
 "<b>Filstorlek:</b> %s\n"
 "<b>Bildstorlek:</b> %dx%d"
 
+#: src/gtkaccount.c:316 src/protocols/oscar/oscar.c:3077
+msgid "Buddy Icon"
+msgstr "Kompisikon"
+
 #. Build the login options frame.
-#: src/gtkaccount.c:382
+#: src/gtkaccount.c:367
 msgid "Login Options"
 msgstr "Inloggningsalternativ"
 
-#: src/gtkaccount.c:399
+#: src/gtkaccount.c:384
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: src/gtkaccount.c:404 src/gtkblist.c:3869
-msgid "Screen Name:"
+#: src/gtkaccount.c:389
+msgid "Screenname:"
 msgstr "Användar-ID:"
 
-#: src/gtkaccount.c:477
+#: src/gtkaccount.c:462 src/main.c:308
 msgid "Password:"
 msgstr "Lösenord:"
 
-#: src/gtkaccount.c:482 src/gtkblist.c:3883 src/gtkblist.c:4211
+#: src/gtkaccount.c:467 src/gtkblist.c:3328 src/gtkblist.c:3650
 msgid "Alias:"
 msgstr "Alias:"
 
-#: src/gtkaccount.c:486
+#: src/gtkaccount.c:471
 msgid "Remember password"
 msgstr "Kom ihåg lösenord"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:540
+#: src/gtkaccount.c:525
 msgid "User Options"
 msgstr "Användaralternativ"
 
-#: src/gtkaccount.c:553
+#: src/gtkaccount.c:538
 msgid "New mail notifications"
 msgstr "Notifiering vid ny e-post"
 
+#: src/gtkaccount.c:547
+msgid "Buddy icon file:"
+msgstr "Fil med kompisikon:"
+
+#: src/gtkaccount.c:556
+msgid "_Browse"
+msgstr "_Bläddra"
+
 #: src/gtkaccount.c:562
-msgid "Buddy icon file:"
-msgstr "Fil med kompisikon:"
-
-#: src/gtkaccount.c:572
-msgid "_Browse"
-msgstr "_Bläddra"
-
-#: src/gtkaccount.c:578
 msgid "_Reset"
 msgstr "_Återställ"
 
 # src/menus.c:311
 #. Build the protocol options frame.
-#: src/gtkaccount.c:640
+#: src/gtkaccount.c:624
 #, c-format
 msgid "%s Options"
 msgstr "%s-alternativ"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:772
+#: src/gtkaccount.c:739
 msgid "Use Global Proxy Settings"
 msgstr "Använd globala proxyinställningar"
 
 #. No Proxy
-#: src/gtkaccount.c:779
+#: src/gtkaccount.c:746
 msgid "No Proxy"
 msgstr "Ingen proxy"
 
 #. HTTP
-#: src/gtkaccount.c:786
+#: src/gtkaccount.c:753
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:793
+#: src/gtkaccount.c:760
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:800
+#: src/gtkaccount.c:767
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:807 src/gtkprefs.c:1181
+#: src/gtkaccount.c:774 src/gtkprefs.c:1091
 msgid "Use Environmental Settings"
 msgstr "Använd miljöinställningar"
 
-#: src/gtkaccount.c:840
+#: src/gtkaccount.c:807
 msgid "you can see the butterflies mating"
 msgstr "kan du se fjärilarna para sig"
 
-#: src/gtkaccount.c:844
+#: src/gtkaccount.c:811
 msgid "If you look real closely"
 msgstr "Om du tittar riktigt nära"
 
-#: src/gtkaccount.c:860
+#: src/gtkaccount.c:827
 msgid "Proxy Options"
 msgstr "Proxyalternativ"
 
-#: src/gtkaccount.c:876 src/gtkprefs.c:1175
+#: src/gtkaccount.c:843 src/gtkprefs.c:1085
 msgid "Proxy _type:"
 msgstr "Proxy_typ:"
 
-#: src/gtkaccount.c:885 src/gtkprefs.c:1205
+#: src/gtkaccount.c:852 src/gtkprefs.c:1115
 msgid "_Host:"
 msgstr "_Värd:"
 
-#: src/gtkaccount.c:889 src/gtkprefs.c:1223
+#: src/gtkaccount.c:856 src/gtkprefs.c:1132
 msgid "_Port:"
 msgstr "_Port:"
 
-#: src/gtkaccount.c:897
+#: src/gtkaccount.c:864
 msgid "_Username:"
 msgstr "_Användarnamn:"
 
-#: src/gtkaccount.c:902 src/gtkprefs.c:1260
+#: src/gtkaccount.c:869 src/gtkprefs.c:1167
 msgid "Pa_ssword:"
 msgstr "_Lösenord:"
 
-#: src/gtkaccount.c:1260
+#: src/gtkaccount.c:1208
 msgid "Add Account"
 msgstr "Lägg till konto"
 
-#: src/gtkaccount.c:1262
+#: src/gtkaccount.c:1210
 msgid "Modify Account"
 msgstr "Ändra konto"
 
 #. Add the disclosure
-#: src/gtkaccount.c:1286
+#: src/gtkaccount.c:1234
 msgid "Show more options"
 msgstr "Visa fler alternativ"
 
-#: src/gtkaccount.c:1287
+#: src/gtkaccount.c:1235
 msgid "Show fewer options"
 msgstr "Visa färre alternativ"
 
 #. Register button
-#: src/gtkaccount.c:1314 src/protocols/jabber/jabber.c:658
+#: src/gtkaccount.c:1262 src/protocols/jabber/jabber.c:686
 msgid "Register"
 msgstr "Registrera"
 
-#: src/gtkaccount.c:1668
+#: src/gtkaccount.c:1607
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Är du säker på att du vill ta bort %s?"
 
-#: src/gtkaccount.c:1672 src/gtkrequest.c:229
+#: src/gtkaccount.c:1611 src/gtkrequest.c:194
 msgid "Delete"
 msgstr "Ta bort"
 
-#: src/gtkaccount.c:1786
+#: src/gtkaccount.c:1725
 msgid "Screen Name"
 msgstr "Användar-ID"
 
-#: src/gtkaccount.c:1809 src/protocols/jabber/jabber.c:958
-#: src/protocols/oscar/oscar.c:2945 src/protocols/oscar/oscar.c:4746
-#: src/protocols/oscar/oscar.c:6409 src/protocols/yahoo/yahoo.c:2295
-#: src/protocols/zephyr/zephyr.c:1176 src/protocols/zephyr/zephyr.c:1186
+#: src/gtkaccount.c:1748 src/protocols/jabber/jabber.c:963
+#: src/protocols/oscar/oscar.c:2848 src/protocols/oscar/oscar.c:4594
+#: src/protocols/oscar/oscar.c:6145 src/protocols/yahoo/yahoo.c:2193
+#: src/protocols/zephyr/zephyr.c:886 src/protocols/zephyr/zephyr.c:896
 msgid "Online"
 msgstr "Ansluten"
 
-#: src/gtkaccount.c:1827
+#: src/gtkaccount.c:1766
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: src/gtkaccount.c:2139
+#: src/gtkaccount.c:2056
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s har gjort %s till sin kompis%s%s%s"
 
-#: src/gtkaccount.c:2153
+#: src/gtkaccount.c:2070
 msgid ""
 "\n"
 "\n"
@@ -2111,229 +1978,190 @@
 "\n"
 "Vill du lägga till honom eller henne till din kompislista?"
 
-#: src/gtkaccount.c:2157
+#: src/gtkaccount.c:2074
 msgid "Information"
 msgstr "Information"
 
-#: src/gtkaccount.c:2161
+#: src/gtkaccount.c:2078
 msgid "Add buddy to your list?"
 msgstr "Lägg till kompisen i din kompislista?"
 
 #. Add button
-#: src/gtkaccount.c:2163 src/gtkblist.c:4263 src/gtkconv.c:1072
-#: src/gtkconv.c:3289 src/gtkconv.c:3380 src/gtkrequest.c:230
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2787
+#: src/gtkaccount.c:2080 src/gtkblist.c:3700 src/gtkconv.c:1256
+#: src/gtkconv.c:3239 src/gtkconv.c:3330 src/gtkrequest.c:195
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2690
 msgid "Add"
 msgstr "Lägg till"
 
-#: src/gtkblist.c:803 src/gtkblist.c:4151
-msgid ""
-"You are not currently signed on with any protocols that have the ability to "
-"chat."
-msgstr ""
-"Du är för tillfället inte inloggad med något protokoll som har möjlighet "
-"till chatt."
-
-#: src/gtkblist.c:816
-msgid "Join a Chat"
-msgstr "Anslut till chatt"
-
-#: src/gtkblist.c:837
-msgid ""
-"Please enter the appropriate information about the chat you would like to "
-"join.\n"
-msgstr "Ange rätt information om chatten du vill ansluta till.\n"
-
-#: src/gtkblist.c:850 src/gtkpounce.c:361 src/gtkroomlist.c:365
-msgid "_Account:"
-msgstr "_Konto:"
-
-#: src/gtkblist.c:1088 src/gtkblist.c:3070
-#, fuzzy
-msgid "Get _Info"
-msgstr "Info"
-
-#: src/gtkblist.c:1091 src/gtkblist.c:3061
-#, fuzzy
-msgid "I_M"
-msgstr "Meddelande"
-
-#: src/gtkblist.c:1093
+#: src/gtkblist.c:815
+msgid "_Get Info"
+msgstr "Hämta _information"
+
+#: src/gtkblist.c:818
+msgid "_IM"
+msgstr "_Snabbmeddelande"
+
+#: src/gtkblist.c:820
 msgid "Add Buddy _Pounce"
 msgstr "Lägg till _övervakning"
 
-#: src/gtkblist.c:1095
+#: src/gtkblist.c:822
 msgid "View _Log"
 msgstr "Visa _logg"
 
-#: src/gtkblist.c:1115 src/gtkblist.c:1187 src/gtkblist.c:1200
+#: src/gtkblist.c:842 src/gtkblist.c:931 src/gtkblist.c:950
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: src/gtkblist.c:1117 src/gtkblist.c:1189 src/gtkblist.c:1205
-#: src/gtkconn.c:361
+#: src/gtkblist.c:844 src/gtkblist.c:933 src/gtkblist.c:955 src/gtkconn.c:358
 msgid "_Remove"
 msgstr "_Ta bort"
 
-#: src/gtkblist.c:1162
+#: src/gtkblist.c:907
 msgid "Add a _Buddy"
 msgstr "_Lägg till kompis"
 
-#: src/gtkblist.c:1164
+#: src/gtkblist.c:909
 msgid "Add a C_hat"
 msgstr "Lägg till c_hatt"
 
-#: src/gtkblist.c:1166
+#: src/gtkblist.c:911
 msgid "_Delete Group"
 msgstr "_Ta bort grupp"
 
-#: src/gtkblist.c:1168
+#: src/gtkblist.c:913
 msgid "_Rename"
 msgstr "Byt _namn"
 
-#. join button
-#: src/gtkblist.c:1182 src/gtkroomlist.c:261 src/gtkroomlist.c:417
-#: src/stock.c:87
-msgid "_Join"
-msgstr "_Anslut"
-
-#: src/gtkblist.c:1184
+#: src/gtkblist.c:928
 msgid "Auto-Join"
 msgstr "Anslut automatiskt"
 
-#: src/gtkblist.c:1202 src/gtkblist.c:1228
+#: src/gtkblist.c:952 src/gtkblist.c:987
 msgid "_Collapse"
 msgstr "_Fäll ihop"
 
-#: src/gtkblist.c:1233
+#: src/gtkblist.c:992
 msgid "_Expand"
 msgstr "_Expandera"
 
-#: src/gtkblist.c:1884 src/gtkconv.c:3864
+#: src/gtkblist.c:1391 src/gtkconv.c:4006
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
-msgstr ""
-"Du är för tillfället inte inloggad med något konto som kan lägga till den "
-"kompisen."
+msgstr "Du är för tillfället inte inloggad med något konto som kan lägga till den kompisen."
 
 #. Buddies menu
-#: src/gtkblist.c:2225
+#: src/gtkblist.c:1690
 msgid "/_Buddies"
 msgstr "/_Kompisar"
 
-#: src/gtkblist.c:2226
+#: src/gtkblist.c:1691
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Kompisar/Nytt _snabbmeddelande..."
 
-#: src/gtkblist.c:2227
+#: src/gtkblist.c:1692
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Kompisar/Anslut till _chatt..."
 
-#: src/gtkblist.c:2228
-#, fuzzy
-msgid "/Buddies/Get User _Info..."
+#: src/gtkblist.c:1693
+msgid "/Buddies/Get _User Info..."
 msgstr "/Kompisar/Hämta användar_information..."
 
-#: src/gtkblist.c:2230
+#: src/gtkblist.c:1695
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Kompisar/Visa i_naktiva kompisar"
 
-#: src/gtkblist.c:2231
+#: src/gtkblist.c:1696
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Kompisar/Visa _tomma grupper"
 
-#: src/gtkblist.c:2232
+#: src/gtkblist.c:1697
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Kompisar/Lägg till _kompis..."
 
-#: src/gtkblist.c:2233
+#: src/gtkblist.c:1698
 msgid "/Buddies/Add C_hat..."
 msgstr "/Kompisar/Lägg till c_hatt..."
 
-#: src/gtkblist.c:2234
+#: src/gtkblist.c:1699
 msgid "/Buddies/Add _Group..."
 msgstr "/Kompisar/Lägg till _grupp..."
 
-#: src/gtkblist.c:2236
+#: src/gtkblist.c:1701
 msgid "/Buddies/_Signoff"
 msgstr "/Kompisar/_Logga ut"
 
-#: src/gtkblist.c:2237
+#: src/gtkblist.c:1702
 msgid "/Buddies/_Quit"
 msgstr "/Kompisar/_Avsluta"
 
 #. Tools
-#: src/gtkblist.c:2240
+#: src/gtkblist.c:1705
 msgid "/_Tools"
 msgstr "/_Verktyg"
 
-#: src/gtkblist.c:2241
+#: src/gtkblist.c:1706
 msgid "/Tools/_Away"
 msgstr "/Verktyg/_Meddelande vid frånvaro"
 
-#: src/gtkblist.c:2242
+#: src/gtkblist.c:1707
 msgid "/Tools/Buddy _Pounce"
 msgstr "/Verktyg/_Övervaka kompis"
 
-#: src/gtkblist.c:2243
+#: src/gtkblist.c:1708
 msgid "/Tools/P_rotocol Actions"
 msgstr "/Verktyg/_Protokollåtgärder"
 
-#: src/gtkblist.c:2245
+#: src/gtkblist.c:1710
 msgid "/Tools/A_ccounts"
 msgstr "/Verktyg/_Konton"
 
-#: src/gtkblist.c:2246
+#: src/gtkblist.c:1711
 msgid "/Tools/_File Transfers"
 msgstr "/Verktyg/_Filöverföringar"
 
-#: src/gtkblist.c:2247
-#, fuzzy
-msgid "/Tools/R_oom List"
-msgstr "/Verktyg/_Protokollåtgärder"
-
-#: src/gtkblist.c:2248
+#: src/gtkblist.c:1712
 msgid "/Tools/Pr_eferences"
 msgstr "/Verktyg/_Inställningar"
 
-#: src/gtkblist.c:2249
+#: src/gtkblist.c:1713
 msgid "/Tools/Pr_ivacy"
 msgstr "/Verktyg/_Spärrlista"
 
-#: src/gtkblist.c:2252
+#: src/gtkblist.c:1716
 msgid "/Tools/View System _Log"
 msgstr "/Verktyg/Visa system_logg"
 
 #. Help
-#: src/gtkblist.c:2256
+#: src/gtkblist.c:1720
 msgid "/_Help"
 msgstr "/_Hjälp"
 
-#: src/gtkblist.c:2257
+#: src/gtkblist.c:1721
 msgid "/Help/Online _Help"
 msgstr "/Hjälp/Online_hjälp"
 
-#: src/gtkblist.c:2258
+#: src/gtkblist.c:1722
 msgid "/Help/_Debug Window"
 msgstr "/Hjälp/_Felsökningsfönster"
 
-#: src/gtkblist.c:2259
+#: src/gtkblist.c:1723
 msgid "/Help/_About"
 msgstr "/Hjälp/_Om Gaim"
 
-#: src/gtkblist.c:2275
+#: src/gtkblist.c:1739
 msgid "Rename Group"
 msgstr "Byt namn på gruppen"
 
-#: src/gtkblist.c:2275
+#: src/gtkblist.c:1739
 msgid "New group name"
 msgstr "Nytt gruppnamn"
 
-#: src/gtkblist.c:2276
+#: src/gtkblist.c:1740
 msgid "Please enter a new name for the selected group."
 msgstr "Ange ett nytt namn på den markerade gruppen."
 
-#: src/gtkblist.c:2304
+#: src/gtkblist.c:1768
 #, c-format
 msgid ""
 "\n"
@@ -2342,16 +2170,16 @@
 "\n"
 "<b>Konto:</b> %s"
 
-#: src/gtkblist.c:2368 src/protocols/oscar/oscar.c:5772
+#: src/gtkblist.c:1832 src/protocols/oscar/oscar.c:5525
 msgid "<b>Status:</b> Offline"
 msgstr "<b>Status:</b> Ej ansluten"
 
-#: src/gtkblist.c:2383
+#: src/gtkblist.c:1847
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:2399
+#: src/gtkblist.c:1863
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2359,7 +2187,7 @@
 "\n"
 "<b>Konto:</b>"
 
-#: src/gtkblist.c:2400
+#: src/gtkblist.c:1864
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
@@ -2367,7 +2195,7 @@
 "\n"
 "<b>Kontakta Alias:</b>"
 
-#: src/gtkblist.c:2401
+#: src/gtkblist.c:1865
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2375,7 +2203,7 @@
 "\n"
 "<b>Alias:</b>"
 
-#: src/gtkblist.c:2402
+#: src/gtkblist.c:1866
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2383,15 +2211,13 @@
 "\n"
 "<b>Nick:</b>"
 
-#: src/gtkblist.c:2403
+#: src/gtkblist.c:1867
 msgid ""
 "\n"
 "<b>Logged In:</b>"
-msgstr ""
-"\n"
-"<b>Inloggad:</b>"
-
-#: src/gtkblist.c:2404
+msgstr "\n<b>Inloggad:</b>"
+
+#: src/gtkblist.c:1868
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2399,7 +2225,7 @@
 "\n"
 "<b>Inaktiv:</b>"
 
-#: src/gtkblist.c:2405
+#: src/gtkblist.c:1869
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2407,7 +2233,7 @@
 "\n"
 "<b>Varnad:</b>"
 
-#: src/gtkblist.c:2407
+#: src/gtkblist.c:1871
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2415,7 +2241,7 @@
 "\n"
 "<b>Beskrivning:</b> Kusligt"
 
-#: src/gtkblist.c:2408
+#: src/gtkblist.c:1872
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2423,7 +2249,7 @@
 "\n"
 "<b>Status</b>: Toppen"
 
-#: src/gtkblist.c:2409
+#: src/gtkblist.c:1873
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2431,79 +2257,85 @@
 "\n"
 "<b>Status</b>: Rockar"
 
-#: src/gtkblist.c:2679
+#: src/gtkblist.c:2143
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "Inaktiv (%dh%02dm) "
 
-#: src/gtkblist.c:2681
+#: src/gtkblist.c:2145
 #, c-format
 msgid "Idle (%dm) "
 msgstr "Inaktiv (%dm) "
 
-#: src/gtkblist.c:2686
+#: src/gtkblist.c:2150
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "Varnad (%d%%) "
 
-#: src/gtkblist.c:2689
+#: src/gtkblist.c:2153
 msgid "Offline "
 msgstr "Ej ansluten"
 
-#: src/gtkblist.c:2947
+#: src/gtkblist.c:2346 src/gtkprefs.c:834 src/gtkprefs.c:1485
+msgid "None"
+msgstr "Inget"
+
+#: src/gtkblist.c:2413
 msgid "/Tools/Away"
 msgstr "/Verktyg/Meddelande vid frånvaro"
 
-#: src/gtkblist.c:2950
+#: src/gtkblist.c:2416
 msgid "/Tools/Buddy Pounce"
 msgstr "/Verktyg/Övervaka kompis"
 
-#: src/gtkblist.c:2953
+#: src/gtkblist.c:2419
 msgid "/Tools/Protocol Actions"
 msgstr "/Verktyg/Protokollåtgärder"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:3041
+#: src/gtkblist.c:2506
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Kompisar/Visa inaktiva kompisar"
 
-#: src/gtkblist.c:3043
+#: src/gtkblist.c:2508
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Kompisar/Visa tomma grupper"
 
-#: src/gtkblist.c:3067
+#: src/gtkblist.c:2526 src/gtkconv.c:1215
+msgid "IM"
+msgstr "Meddelande"
+
+#: src/gtkblist.c:2532
 msgid "Send a message to the selected buddy"
 msgstr "Skicka ett meddelande till den markerade kompisen"
 
-#: src/gtkblist.c:3076
+#: src/gtkblist.c:2535 src/protocols/napster/napster.c:529
+msgid "Get Info"
+msgstr "Info"
+
+#: src/gtkblist.c:2541
 msgid "Get information on the selected buddy"
 msgstr "Hämta information om den markerade kompisen"
 
-#: src/gtkblist.c:3079
-#, fuzzy
-msgid "_Chat"
+#: src/gtkblist.c:2544 src/protocols/oscar/oscar.c:3086
+msgid "Chat"
 msgstr "Chatta"
 
-#: src/gtkblist.c:3084
+#: src/gtkblist.c:2549
 msgid "Join a chat room"
 msgstr "Anslut till ett chattrum"
 
-#: src/gtkblist.c:3087
-#, fuzzy
-msgid "_Away"
-msgstr "Frånvarande"
-
-#: src/gtkblist.c:3092
+#: src/gtkblist.c:2557
 msgid "Set an away message"
 msgstr "Aktivera meddelande vid frånvaro"
 
-#: src/gtkblist.c:3824 src/protocols/yahoo/yahoo.c:2427
+#: src/gtkblist.c:3270 src/protocols/yahoo/yahoo.c:2325
 msgid "Add Buddy"
 msgstr "Lägg till kompis"
 
-#: src/gtkblist.c:3847
+#: src/gtkblist.c:3293
 msgid ""
 "Please enter the screen name of the person you would like to add to your "
 "buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
@@ -2513,55 +2345,63 @@
 "alternativt ange ett alias eller ett nick. Alias kommer att visas i ställer "
 "för användar-ID när det är möjligt.\n"
 
+#: src/gtkblist.c:3315 src/main.c:290
+msgid "Screen Name:"
+msgstr "Användar-ID:"
+
+#: src/gtkblist.c:3341 src/gtkblist.c:3663
+msgid "Group:"
+msgstr "Grupp:"
+
 #. Set up stuff for the account box
-#: src/gtkblist.c:3907 src/gtkblist.c:4191
+#: src/gtkblist.c:3350 src/gtkblist.c:3631
 msgid "Account:"
 msgstr "Konto:"
 
-#: src/gtkblist.c:4158
+#: src/gtkblist.c:3598
 msgid "Add Chat"
 msgstr "Lägg till chatt"
 
-#: src/gtkblist.c:4181
+#: src/gtkblist.c:3621
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 msgstr ""
 "Ange ett alias och information om chatten som du villtill din kompislista.\n"
 
-#: src/gtkblist.c:4260
+#: src/gtkblist.c:3697
 msgid "Add Group"
 msgstr "Lägg till grupp"
 
-#: src/gtkblist.c:4261
+#: src/gtkblist.c:3698
 msgid "Please enter the name of the group to be added."
 msgstr "Ange namnet på den grupp du vill lägga till."
 
-#: src/gtkblist.c:4780
+#: src/gtkblist.c:4215
 msgid "No actions available"
 msgstr "Inga åtgärder tillgängliga"
 
-#: src/gtkconn.c:78 src/gtkconn.c:250 src/gtkconn.c:261
+#: src/gtkconn.c:77 src/gtkconn.c:249 src/gtkconn.c:260
 msgid "Done."
 msgstr "Klart."
 
-#: src/gtkconn.c:157
+#: src/gtkconn.c:156
 msgid "Signon: "
 msgstr "Loggar in: "
 
-#: src/gtkconn.c:203
+#: src/gtkconn.c:202
 msgid "Signon"
 msgstr "Loggar in"
 
-#: src/gtkconn.c:216
+#: src/gtkconn.c:215
 msgid "Cancel All"
 msgstr "Avbryt allt"
 
-#: src/gtkconn.c:361 src/gtkconn.c:593
+#: src/gtkconn.c:358 src/gtkconn.c:585
 msgid "_Reconnect"
 msgstr "_Återanslut"
 
-#: src/gtkconn.c:557
+#: src/gtkconn.c:549
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
@@ -2574,32 +2414,45 @@
 "%s\n"
 "%s"
 
-#: src/gtkconn.c:559
+#: src/gtkconn.c:551
 msgid "Reason Unknown."
 msgstr "Okänd orsak."
 
-#: src/gtkconn.c:598
+#: src/gtkconn.c:590
 msgid "Reconnect _All"
 msgstr "Återanslut _alla"
 
-#: src/gtkconn.c:628
+#: src/gtkconn.c:612
+msgid "Account"
+msgstr "Konto"
+
+#: src/gtkconn.c:620
 msgid "Time"
 msgstr "Tid"
 
-#: src/gtkconv.c:183
+#: src/gtkconv.c:187
 msgid "That file already exists"
 msgstr "Filen finns redan."
 
-#: src/gtkconv.c:184 src/gtkft.c:1106
+#: src/gtkconv.c:188 src/gtkft.c:1076
 msgid "Would you like to overwrite it?"
 msgstr "Vill du skriva över den?"
 
-#: src/gtkconv.c:470
+#: src/gtkconv.c:244
+#, c-format
+msgid "Failed to store image: %s\n"
+msgstr "Kunde inte spara bilden: %s\n"
+
+#: src/gtkconv.c:300
+msgid "Insert Image"
+msgstr "Infoga bild"
+
+#: src/gtkconv.c:629
 msgid "Invite Buddy Into Chat Room"
 msgstr "Bjud in kompis till chattrum"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:498
+#: src/gtkconv.c:657
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -2607,578 +2460,523 @@
 "Ange namnet på den användare du vill bjuda in, samt ett "
 "inbjudningsmeddelande om du vill"
 
-#: src/gtkconv.c:519
+#: src/gtkconv.c:678
 msgid "_Buddy:"
 msgstr "_Kompis:"
 
 # src/sidebar.c:103
-#: src/gtkconv.c:539
+#: src/gtkconv.c:698
 msgid "_Message:"
 msgstr "_Meddelande:"
 
-#: src/gtkconv.c:632
+#: src/gtkconv.c:788
 msgid "Find"
 msgstr "Sök"
 
-#: src/gtkconv.c:658
+#: src/gtkconv.c:810
 msgid "_Search for:"
 msgstr "_Sök efter:"
 
-#: src/gtkconv.c:1030
-msgid "IM"
-msgstr "Meddelande"
-
-#: src/gtkconv.c:1038
+#: src/gtkconv.c:1223
 msgid "Un-Ignore"
 msgstr "Avignorera"
 
-#: src/gtkconv.c:1040 src/gtkprefs.c:784
+#: src/gtkconv.c:1225 src/gtkprefs.c:767
 msgid "Ignore"
 msgstr "Ignorera"
 
 #. Info button
-#: src/gtkconv.c:1049 src/gtkconv.c:3303
+#: src/gtkconv.c:1234 src/gtkconv.c:3253
 msgid "Info"
 msgstr "Information"
 
-#: src/gtkconv.c:1058
+#: src/gtkconv.c:1243
 msgid "Get Away Msg"
 msgstr "Frånvaromeddelande"
 
 #. Remove button
-#: src/gtkconv.c:1070 src/gtkconv.c:3296 src/gtkconv.c:3387
-#: src/gtkrequest.c:231
+#: src/gtkconv.c:1254 src/gtkconv.c:3246 src/gtkconv.c:3337
+#: src/gtkrequest.c:196
 msgid "Remove"
 msgstr "Ta bort"
 
-#: src/gtkconv.c:2162
-msgid "Animate"
-msgstr "Animera"
-
-#: src/gtkconv.c:2167
-msgid "Hide Icon"
-msgstr "Dölj ikon"
-
-#: src/gtkconv.c:2173
-msgid "Save Icon As..."
-msgstr "Spara ikon som..."
-
-#: src/gtkconv.c:2536
+#: src/gtkconv.c:2489
 msgid "User is typing..."
 msgstr "Användaren skriver..."
 
-#: src/gtkconv.c:2544
+#: src/gtkconv.c:2497
 msgid "User has typed something and paused"
 msgstr "Användaren har skrivit något och tagit en paus"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2647
+#: src/gtkconv.c:2600
 msgid "_Send As"
 msgstr "_Skicka som"
 
-#: src/gtkconv.c:3067
+#: src/gtkconv.c:3018
 msgid "Save Conversation"
 msgstr "Spara konversation"
 
 #. Conversation menu
-#: src/gtkconv.c:3084
+#: src/gtkconv.c:3035
 msgid "/_Conversation"
 msgstr "/_Konversation"
 
-#: src/gtkconv.c:3086
+#: src/gtkconv.c:3037
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Konversation/Nytt snabbmeddelande..."
 
-#: src/gtkconv.c:3091
+#: src/gtkconv.c:3042
 msgid "/Conversation/_Find..."
 msgstr "/Konversation/_Sök..."
 
-#: src/gtkconv.c:3093
+#: src/gtkconv.c:3043
 msgid "/Conversation/View _Log"
 msgstr "/Konversation/Visa _Logg"
 
-#: src/gtkconv.c:3094
+#: src/gtkconv.c:3044
 msgid "/Conversation/_Save As..."
 msgstr "/Konversation/_Spara som..."
 
-#: src/gtkconv.c:3099
+#: src/gtkconv.c:3049
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Konversation/Lägg till _övervakning..."
 
-#: src/gtkconv.c:3101
+#: src/gtkconv.c:3051
 msgid "/Conversation/_Get Info"
 msgstr "/Konversation/_Hämta information"
 
-#: src/gtkconv.c:3103
+#: src/gtkconv.c:3053
 msgid "/Conversation/_Warn..."
 msgstr "/Konversation/_Varna..."
 
-#: src/gtkconv.c:3105
+#: src/gtkconv.c:3055
 msgid "/Conversation/In_vite..."
 msgstr "/Konversation/_Bjud in..."
 
-#: src/gtkconv.c:3110
+#: src/gtkconv.c:3060
 msgid "/Conversation/A_lias..."
 msgstr "/Konversation/_Alias..."
 
-#: src/gtkconv.c:3112
+#: src/gtkconv.c:3062
 msgid "/Conversation/_Block..."
 msgstr "/Konversatione/_Blockera"
 
-#: src/gtkconv.c:3114
+#: src/gtkconv.c:3064
 msgid "/Conversation/_Add..."
 msgstr "/Konversation/_Lägg till..."
 
-#: src/gtkconv.c:3116
+#: src/gtkconv.c:3066
 msgid "/Conversation/_Remove..."
 msgstr "/Konversation/_Ta bort..."
 
-#: src/gtkconv.c:3121
+#: src/gtkconv.c:3071
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Konversation/Infoga län_k..."
 
-#: src/gtkconv.c:3123
+#: src/gtkconv.c:3073
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Konversation/Infoga _bild..."
 
-#: src/gtkconv.c:3128
+#: src/gtkconv.c:3078
 msgid "/Conversation/_Close"
 msgstr "/Konversatione/_Stäng"
 
 # src/menus.c:311
 #. Options
-#: src/gtkconv.c:3132
+#: src/gtkconv.c:3082
 msgid "/_Options"
 msgstr "_Alternativ"
 
-#: src/gtkconv.c:3133
+#: src/gtkconv.c:3083
 msgid "/Options/Enable _Logging"
 msgstr "/Alternativ/Aktivera _loggning"
 
-#: src/gtkconv.c:3134
+#: src/gtkconv.c:3084
 msgid "/Options/Enable _Sounds"
 msgstr "/Alternativ/_Aktivera ljud"
 
-#: src/gtkconv.c:3135
+#: src/gtkconv.c:3085
 msgid "/Options/Show Formatting _Toolbar"
 msgstr "/Alternativ/Visa formateringsverktyg"
 
-#: src/gtkconv.c:3177
+#: src/gtkconv.c:3127
 msgid "/Conversation/View Log"
 msgstr "/Konversation/Visa logg"
 
-#: src/gtkconv.c:3182
+#: src/gtkconv.c:3132
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Konversation/Lägg till övervakning..."
 
-#: src/gtkconv.c:3188
+#: src/gtkconv.c:3138
 msgid "/Conversation/Get Info"
 msgstr "/Konversation/Hämta information"
 
-#: src/gtkconv.c:3192
+#: src/gtkconv.c:3142
 msgid "/Conversation/Warn..."
 msgstr "/Konversation/Varna..."
 
-#: src/gtkconv.c:3196
+#: src/gtkconv.c:3146
 msgid "/Conversation/Invite..."
 msgstr "/Konversation/Bjud in..."
 
-#: src/gtkconv.c:3202
+#: src/gtkconv.c:3152
 msgid "/Conversation/Alias..."
 msgstr "/Konversation/Alias..."
 
-#: src/gtkconv.c:3206
+#: src/gtkconv.c:3156
 msgid "/Conversation/Block..."
 msgstr "/Konversation/Blockera..."
 
-#: src/gtkconv.c:3210
+#: src/gtkconv.c:3160
 msgid "/Conversation/Add..."
 msgstr "/Konversation/Lägg till..."
 
-#: src/gtkconv.c:3214
+#: src/gtkconv.c:3164
 msgid "/Conversation/Remove..."
 msgstr "/Konversation/Ta bort..."
 
-#: src/gtkconv.c:3220
+#: src/gtkconv.c:3170
 msgid "/Conversation/Insert Link..."
 msgstr "/Konversation/Infoga länk..."
 
-#: src/gtkconv.c:3224
+#: src/gtkconv.c:3174
 msgid "/Conversation/Insert Image..."
 msgstr "/Konversation/Infoga bild..."
 
-#: src/gtkconv.c:3230
+#: src/gtkconv.c:3180
 msgid "/Options/Enable Logging"
 msgstr "/Alternativ/Aktivera loggning"
 
-#: src/gtkconv.c:3233
+#: src/gtkconv.c:3183
 msgid "/Options/Enable Sounds"
 msgstr "/Alternativ/Aktivera ljud"
 
-#: src/gtkconv.c:3236
+#: src/gtkconv.c:3186
 msgid "/Options/Show Formatting Toolbar"
 msgstr "/Alternativ/Visa formateringsverktyg"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:3259 src/gtkconv.c:3261 src/gtkconv.c:3359 src/gtkconv.c:3361
+#: src/gtkconv.c:3209 src/gtkconv.c:3211 src/gtkconv.c:3309 src/gtkconv.c:3311
 msgid "Send"
 msgstr "Skicka"
 
 #. Now, um, just kind of all over the place. Huh?
 #. Warn button
-#: src/gtkconv.c:3275
+#: src/gtkconv.c:3225
 msgid "Warn"
 msgstr "Varna"
 
-#: src/gtkconv.c:3278
+#: src/gtkconv.c:3228
 msgid "Warn the user"
 msgstr "Varna användaren"
 
 #. Block button
-#: src/gtkconv.c:3282 src/gtkprivacy.c:598 src/gtkprivacy.c:609
+#: src/gtkconv.c:3232 src/gtkprivacy.c:606 src/gtkprivacy.c:617
 msgid "Block"
 msgstr "Blockera"
 
-#: src/gtkconv.c:3285
+#: src/gtkconv.c:3235
 msgid "Block the user"
 msgstr "Blockera användaren"
 
-#: src/gtkconv.c:3292
+#: src/gtkconv.c:3242
 msgid "Add the user to your buddy list"
 msgstr "Lägg till användaren till din kompislista"
 
-#: src/gtkconv.c:3299
+#: src/gtkconv.c:3249
 msgid "Remove the user from your buddy list"
 msgstr "Ta bort användaren från din kompislista"
 
-#: src/gtkconv.c:3306 src/gtkconv.c:3628
+#: src/gtkconv.c:3256 src/gtkconv.c:3754
 msgid "Get the user's information"
 msgstr "Hämta information om användaren"
 
 #. Invite
-#: src/gtkconv.c:3373
+#: src/gtkconv.c:3323
 msgid "Invite"
 msgstr "Bjud in"
 
-#: src/gtkconv.c:3376
+#: src/gtkconv.c:3326
 msgid "Invite a user"
 msgstr "Bjud in en användare"
 
-#: src/gtkconv.c:3383
+#: src/gtkconv.c:3333
 msgid "Add the chat to your buddy list"
 msgstr "Lägg till chatten till din kompislista"
 
-#: src/gtkconv.c:3390
+#: src/gtkconv.c:3340
 msgid "Remove the chat from your buddy list"
 msgstr "Ta bort chatten från din kompislista"
 
-#: src/gtkconv.c:3490
+#: src/gtkconv.c:3396
+msgid "Bold"
+msgstr "Fet"
+
+#: src/gtkconv.c:3407
+msgid "Italic"
+msgstr "Kursiv"
+
+#: src/gtkconv.c:3418
+msgid "Underline"
+msgstr "Understruken"
+
+#: src/gtkconv.c:3434
+msgid "Larger font size"
+msgstr "Större typsnittsstorlek"
+
+#: src/gtkconv.c:3446
+msgid "Normal font size"
+msgstr "Normal typsnittsstorlek"
+
+#: src/gtkconv.c:3458
+msgid "Smaller font size"
+msgstr "Mindre typsnittsstorlek"
+
+#: src/gtkconv.c:3475
+msgid "Font Face"
+msgstr "Typsnitt"
+
+#: src/gtkconv.c:3487
+msgid "Foreground font color"
+msgstr "Textfärg"
+
+#: src/gtkconv.c:3499
+msgid "Background color"
+msgstr "Bakgrundsfärg"
+
+#: src/gtkconv.c:3514
+msgid "Insert link"
+msgstr "Infoga länk"
+
+#: src/gtkconv.c:3525
+msgid "Insert image"
+msgstr "Infoga bild"
+
+#: src/gtkconv.c:3536
+msgid "Insert smiley"
+msgstr "Infoga smiley"
+
+#: src/gtkconv.c:3621
 msgid "Topic:"
 msgstr "Ämne:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3550
+#: src/gtkconv.c:3678
 msgid "0 people in room"
 msgstr "0 personer i rummet"
 
-#: src/gtkconv.c:3605
+#: src/gtkconv.c:3731
 msgid "IM the user"
 msgstr "Skicka snabbmeddelade till användaren"
 
-#: src/gtkconv.c:3617
+#: src/gtkconv.c:3743
 msgid "Ignore the user"
 msgstr "Ignorera användaren"
 
-#: src/gtkconv.c:4155
+#: src/gtkconv.c:4291
 msgid "Close conversation"
 msgstr "Stäng konversationen"
 
-#: src/gtkconv.c:4668 src/gtkconv.c:4700 src/gtkconv.c:4821 src/gtkconv.c:4888
+#: src/gtkconv.c:4815 src/gtkconv.c:4847 src/gtkconv.c:4968 src/gtkconv.c:5035
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d person är i rummet"
 msgstr[1] "%d personer är i rummet"
 
-#: src/gtkconv.c:5404 src/gtkconv.c:5407
+#: src/gtkconv.c:5367
+msgid "Animate"
+msgstr "Animera"
+
+#: src/gtkconv.c:5372
+msgid "Hide Icon"
+msgstr "Dölj ikon"
+
+#: src/gtkconv.c:5378
+msgid "Save Icon As..."
+msgstr "Spara ikon som..."
+
+#: src/gtkconv.c:5774 src/gtkconv.c:5777
 msgid "<main>/Conversation/Close"
 msgstr "/Konversatione/Stäng"
 
-#: src/gtkdebug.c:135
+#: src/gtkdebug.c:133
 msgid "Debug Window"
 msgstr "Felsökningsfönster"
 
-#: src/gtkdebug.c:175
+#: src/gtkdebug.c:173
 msgid "Pause"
 msgstr "Paus"
 
-#: src/gtkdebug.c:181
+#: src/gtkdebug.c:179
 msgid "Timestamps"
 msgstr "Tidsstämplar"
 
-#: src/gtkft.c:135
+#: src/gtkft.c:133
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f KB/s"
 
-#: src/gtkft.c:156 src/gtkft.c:957
-#, fuzzy
-msgid "Finished"
-msgstr "Finska"
-
-#: src/gtkft.c:209
+#: src/gtkft.c:207
 msgid "<b>Receiving From:</b>"
 msgstr "<b>Tar emot från:</b>"
 
-#: src/gtkft.c:212
+#: src/gtkft.c:210
 msgid "<b>Sending To:</b>"
 msgstr "<b>Skickar till:</b>"
 
-#: src/gtkft.c:386
-msgid "There is no application configured to open this type of file."
-msgstr ""
-
-#: src/gtkft.c:391
-msgid "An error occurred while opening the file."
-msgstr ""
-
-#: src/gtkft.c:482
+#: src/gtkft.c:458
 msgid "Progress"
 msgstr "Överfört"
 
-#: src/gtkft.c:489
+#: src/gtkft.c:465
 msgid "Filename"
 msgstr "Filnamn"
 
-#: src/gtkft.c:496
+#: src/gtkft.c:472
 msgid "Size"
 msgstr "Storlek"
 
-#: src/gtkft.c:503
+#: src/gtkft.c:479
 msgid "Remaining"
 msgstr "Återstår"
 
-#: src/gtkft.c:533
+#: src/gtkft.c:509
 msgid "Filename:"
 msgstr "Filnamn:"
 
-#: src/gtkft.c:534
+#: src/gtkft.c:510
 msgid "Status:"
 msgstr "Status:"
 
-#: src/gtkft.c:535
+#: src/gtkft.c:511
 msgid "Speed:"
 msgstr "Hastighet:"
 
-#: src/gtkft.c:536
+#: src/gtkft.c:512
 msgid "Time Elapsed:"
 msgstr "Tid som gått:"
 
-#: src/gtkft.c:537
+#: src/gtkft.c:513
 msgid "Time Remaining:"
 msgstr "Tid som återstår:"
 
-#: src/gtkft.c:634
+#: src/gtkft.c:610
 msgid "_Keep the dialog open"
 msgstr "_Håll dialogfönstret öppet"
 
-#: src/gtkft.c:644
+#: src/gtkft.c:620
 msgid "_Clear finished transfers"
 msgstr "Rensa bort färdiga överföringar"
 
 #. "Download Details" arrow
-#: src/gtkft.c:653
+#: src/gtkft.c:629
 msgid "Show transfer details"
 msgstr "Visa överföringsdetaljer"
 
-#: src/gtkft.c:654
+#: src/gtkft.c:630
 msgid "Hide transfer details"
 msgstr "Göm överföringsdetaljer"
 
 #. Pause button
-#: src/gtkft.c:696 src/stock.c:90
+#: src/gtkft.c:672 src/stock.c:85
 msgid "_Pause"
 msgstr "_Paus"
 
 #. Resume button
-#: src/gtkft.c:706
+#: src/gtkft.c:682
 msgid "_Resume"
 msgstr "_Återuppta"
 
-#: src/gtkft.c:908
+#: src/gtkft.c:882
 msgid "Canceled"
 msgstr "Avbruten"
 
-#: src/gtkft.c:910
+#: src/gtkft.c:884
 msgid "Failed"
 msgstr "Misslyckades"
 
-#: src/gtkft.c:1082
+#: src/gtkft.c:1053
 msgid "That file does not exist."
 msgstr "Filen finns inte."
 
-#: src/gtkft.c:1091
+#: src/gtkft.c:1062
 msgid "Cannot send a file of 0 bytes."
 msgstr "Kan inte skicka en fil med 0 bytes storlek."
 
-#: src/gtkft.c:1105
+#: src/gtkft.c:1075
 msgid "That file already exists."
 msgstr "Filen finns redan."
 
-#: src/gtkft.c:1131
+#: src/gtkft.c:1100
 msgid "Open..."
 msgstr "Öppna..."
 
-#: src/gtkft.c:1133
+#: src/gtkft.c:1102
 msgid "Save As..."
 msgstr "Spara som..."
 
-#: src/gtkft.c:1181
+#: src/gtkft.c:1149
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s vill skicka dig %s (%s)"
 
-#: src/gtkimhtml.c:829
+#: src/gtkimhtml.c:614
 msgid "_Copy E-Mail Address"
 msgstr "_Kopiera e-postadress"
 
-#: src/gtkimhtml.c:841
+#: src/gtkimhtml.c:626
 msgid "_Copy Link Location"
 msgstr "_Kopiera länk"
 
-#: src/gtkimhtml.c:851
+#: src/gtkimhtml.c:636
 msgid "_Open Link in Browser"
 msgstr "_Öppna länk i webbläsare"
 
-#: src/gtkimhtml.c:2262
+#: src/gtkimhtml.c:1754
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
 msgstr ""
 "Kunde inte gissa bildens format på filnamnsslutet. Förvalt format är PNG."
 
-#: src/gtkimhtml.c:2270
+#: src/gtkimhtml.c:1762
 #, c-format
 msgid "Error saving image: %s"
 msgstr "Fel vid sparning av bild: %s"
 
-#: src/gtkimhtml.c:2279
+#: src/gtkimhtml.c:1771
 msgid "Save Image"
 msgstr "Spara bild"
 
-#: src/gtkimhtml.c:2302
+#: src/gtkimhtml.c:1794
 msgid "_Save Image..."
 msgstr "_Spara bild..."
 
-#: src/gtkimhtmltoolbar.c:350
-#, fuzzy
-msgid "_URL"
-msgstr "_URL:"
-
-#: src/gtkimhtmltoolbar.c:354
-#, fuzzy
-msgid "_Description"
-msgstr "_Beskrivning:"
-
-#: src/gtkimhtmltoolbar.c:359
-msgid "Insert Link"
-msgstr "Infoga länk"
-
-#: src/gtkimhtmltoolbar.c:361
-#, fuzzy
-msgid ""
-"Please enter the URL and description of the link that you want to insert. "
-"The description is optional."
-msgstr ""
-"Ange en URL för länken du vill infoga, om du vill kan du även ange en "
-"beskrivning av länken.\n"
-
-#: src/gtkimhtmltoolbar.c:365
-msgid "_Insert"
-msgstr "_Infoga"
-
-#: src/gtkimhtmltoolbar.c:422
-#, c-format
-msgid "Failed to store image: %s\n"
-msgstr "Kunde inte spara bilden: %s\n"
-
-#: src/gtkimhtmltoolbar.c:448
-msgid "Insert Image"
-msgstr "Infoga bild"
-
-#. show everything
-#: src/gtkimhtmltoolbar.c:592
-msgid "Smile!"
-msgstr "Le!"
-
-#: src/gtkimhtmltoolbar.c:722
-msgid "Bold"
-msgstr "Fet"
-
-#: src/gtkimhtmltoolbar.c:733
-msgid "Italic"
-msgstr "Kursiv"
-
-#: src/gtkimhtmltoolbar.c:744
-msgid "Underline"
-msgstr "Understruken"
-
-#: src/gtkimhtmltoolbar.c:760
-msgid "Larger font size"
-msgstr "Större typsnittsstorlek"
-
-#: src/gtkimhtmltoolbar.c:772
-msgid "Smaller font size"
-msgstr "Mindre typsnittsstorlek"
-
-#: src/gtkimhtmltoolbar.c:789
-msgid "Font Face"
-msgstr "Typsnitt"
-
-#: src/gtkimhtmltoolbar.c:801
-msgid "Foreground font color"
-msgstr "Textfärg"
-
-#: src/gtkimhtmltoolbar.c:813
-msgid "Background color"
-msgstr "Bakgrundsfärg"
-
-#: src/gtkimhtmltoolbar.c:828
-msgid "Insert link"
-msgstr "Infoga länk"
-
-#: src/gtkimhtmltoolbar.c:838
-msgid "Insert image"
-msgstr "Infoga bild"
-
-#: src/gtkimhtmltoolbar.c:849
-msgid "Insert smiley"
-msgstr "Infoga smiley"
-
-#: src/gtklog.c:257
+#: src/gtklog.c:255
 msgid "Conversations with"
 msgstr "Konversationer med"
 
-#. Descriptive label
-#: src/gtknotify.c:215
+#: src/gtknotify.c:211
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s har %d nytt meddelande."
 msgstr[1] "%s har %d nya meddelanden."
 
-#: src/gtknotify.c:227
+#: src/gtknotify.c:219
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr "<span weight=\"bold\">Från:</span> %s\n"
 
-#: src/gtknotify.c:233
+#: src/gtknotify.c:224
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr "<span weight=\"bold\">Ämne:</span> %s\n"
 
-#: src/gtknotify.c:237
+#: src/gtknotify.c:228
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3189,7 +2987,7 @@
 "\n"
 "%s%s%s%s"
 
-#: src/gtknotify.c:253
+#: src/gtknotify.c:243
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3200,200 +2998,176 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:439
-#, fuzzy, c-format
-msgid "The browser command \"%s\" is invalid."
-msgstr "Webbläsaren \"%s\" är ogiltig."
-
-#: src/gtknotify.c:442 src/gtknotify.c:456 src/gtknotify.c:471
-#: src/gtknotify.c:579
+#: src/gtknotify.c:430 src/gtknotify.c:450 src/gtknotify.c:458
 msgid "Unable to open URL"
 msgstr "Kan inte öppna URL"
 
-#: src/gtknotify.c:453 src/gtknotify.c:468
-#, fuzzy, c-format
-msgid "Error launching \"%s\": %s"
-msgstr "Fel vid körning av \"kommando\": %s"
-
-#: src/gtknotify.c:580
+#: src/gtknotify.c:431
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "Manuellt webbläsarkommando har valts, men inget kommando angivits."
 
-#: src/gtkpounce.c:143
+#: src/gtknotify.c:448
+#, c-format
+msgid "The browser \"%s\" is invalid."
+msgstr "Webbläsaren \"%s\" är ogiltig."
+
+#: src/gtknotify.c:455
+#, c-format
+msgid "Error launching \"command\": %s"
+msgstr "Fel vid körning av \"kommando\": %s"
+
+#: src/gtkpounce.c:140
 msgid "Select a file"
 msgstr "Välj en fil"
 
-#: src/gtkpounce.c:192
+#: src/gtkpounce.c:189
 msgid "Please enter a buddy to pounce."
 msgstr "Ange en kompis att övervaka."
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:336 src/gtkpounce.c:756
+#: src/gtkpounce.c:333 src/gtkpounce.c:738
 msgid "New Buddy Pounce"
 msgstr "Ny övervakning"
 
-#: src/gtkpounce.c:336
+#: src/gtkpounce.c:333
 msgid "Edit Buddy Pounce"
 msgstr "Ändra övervakning"
 
 #. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:354
+#: src/gtkpounce.c:351
 msgid "Pounce Who"
 msgstr "Kompis att övervaka"
 
-#: src/gtkpounce.c:381
+#: src/gtkpounce.c:377
 msgid "_Buddy Name:"
 msgstr "K_ompisnamn:"
 
 #. Create the "Pounce When" frame.
-#: src/gtkpounce.c:404
+#: src/gtkpounce.c:399
 msgid "Pounce When"
 msgstr "Händelse"
 
-#: src/gtkpounce.c:412
-#, fuzzy
-msgid "_Sign on"
+#: src/gtkpounce.c:407 src/main.c:336
+msgid "Sign on"
 msgstr "Logga in"
 
-#: src/gtkpounce.c:414
-#, fuzzy
-msgid "Sign _off"
+#: src/gtkpounce.c:409
+msgid "Sign off"
 msgstr "Logga ut"
 
-#: src/gtkpounce.c:416
-#, fuzzy
-msgid "A_way"
-msgstr "Frånvarande"
-
-#: src/gtkpounce.c:418
-#, fuzzy
-msgid "Re_turn from away"
+#: src/gtkpounce.c:413
+msgid "Return from away"
 msgstr "Återvänder från frånvaro"
 
-#: src/gtkpounce.c:420
-#, fuzzy
-msgid "_Idle"
+#: src/gtkpounce.c:415 src/gtkprefs.c:1482 src/protocols/msn/state.c:30
+#: src/protocols/yahoo/yahoo.c:2189
+msgid "Idle"
 msgstr "Inaktiv"
 
-#: src/gtkpounce.c:422
-#, fuzzy
-msgid "Retur_n from idle"
+#: src/gtkpounce.c:417
+msgid "Return from idle"
 msgstr "Återvänder från inaktivitet"
 
-#: src/gtkpounce.c:424
-#, fuzzy
-msgid "Buddy starts _typing"
+#: src/gtkpounce.c:419
+msgid "Buddy starts typing"
 msgstr "Börjar skriva"
 
-#: src/gtkpounce.c:426
-#, fuzzy
-msgid "Buddy stops t_yping"
+#: src/gtkpounce.c:421
+msgid "Buddy stops typing"
 msgstr "Slutar skriva"
 
 #. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:455
+#: src/gtkpounce.c:450
 msgid "Pounce Action"
 msgstr "Åtgärd"
 
-#: src/gtkpounce.c:462
-#, fuzzy
-msgid "Op_en an IM window"
+#: src/gtkpounce.c:457
+msgid "Open an IM window"
 msgstr "Öppna ett snabbmeddelandefönster"
 
-#: src/gtkpounce.c:463
-#, fuzzy
-msgid "_Popup notification"
+#: src/gtkpounce.c:458
+msgid "Popup notification"
 msgstr "Visa en notifiering"
 
-#: src/gtkpounce.c:464
-#, fuzzy
-msgid "Send a _message"
+#: src/gtkpounce.c:459
+msgid "Send a message"
 msgstr "Skicka ett meddelande"
 
-#: src/gtkpounce.c:465
-#, fuzzy
-msgid "E_xecute a command"
+#: src/gtkpounce.c:460
+msgid "Execute a command"
 msgstr "Kör ett kommando"
 
-#: src/gtkpounce.c:466
-#, fuzzy
-msgid "P_lay a sound"
+#: src/gtkpounce.c:461
+msgid "Play a sound"
 msgstr "Spela upp ett ljud"
 
-#: src/gtkpounce.c:470
-#, fuzzy
-msgid "B_rowse..."
+#: src/gtkpounce.c:465 src/gtkpounce.c:467
+msgid "Browse"
 msgstr "Bläddra"
 
-#: src/gtkpounce.c:472
-#, fuzzy
-msgid "Bro_wse..."
-msgstr "Bläddra"
-
-#: src/gtkpounce.c:473
-msgid "Pre_view"
-msgstr ""
-
-#: src/gtkpounce.c:556
-#, fuzzy
-msgid "Sav_e this pounce after activation"
+#: src/gtkpounce.c:468 src/gtkprefs.c:2072
+msgid "Test"
+msgstr "Test"
+
+#: src/gtkpounce.c:551
+msgid "_Save this pounce after activation"
 msgstr "Spara övervakningen efter aktivering"
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:763
+#: src/gtkpounce.c:745
 msgid "Remove Buddy Pounce"
 msgstr "Ta bort övervakning"
 
-#: src/gtkpounce.c:813
+#: src/gtkpounce.c:792
 #, c-format
 msgid "%s has started typing to you"
 msgstr "%s har börjat skriva till dig"
 
-#: src/gtkpounce.c:814
+#: src/gtkpounce.c:793
 #, c-format
 msgid "%s has signed on"
 msgstr "%s har loggat in"
 
-#: src/gtkpounce.c:815
+#: src/gtkpounce.c:794
 #, c-format
 msgid "%s has returned from being idle"
 msgstr "%s har blivit aktiv igen"
 
-#: src/gtkpounce.c:816
+#: src/gtkpounce.c:795
 #, c-format
 msgid "%s has returned from being away"
 msgstr "%s har kommit tillbaka"
 
-#: src/gtkpounce.c:817
+#: src/gtkpounce.c:796
 #, c-format
 msgid "%s has stopped typing to you"
 msgstr "%s har slutat skriva till dig"
 
-#: src/gtkpounce.c:818
+#: src/gtkpounce.c:797
 #, c-format
 msgid "%s has signed off"
 msgstr "%s har loggat ut"
 
-#: src/gtkpounce.c:819
+#: src/gtkpounce.c:798
 #, c-format
 msgid "%s has become idle"
 msgstr "%s har blivit inaktiv"
 
-#: src/gtkpounce.c:821
+#: src/gtkpounce.c:800
 msgid "Unknown pounce event. Please report this!"
 msgstr ""
 "Okänd övervakningshändelse (pounce event), var snäll och rapportera detta!"
 
-#: src/gtkprefs.c:374
+#: src/gtkprefs.c:365
 msgid "Interface Options"
 msgstr "Gränssnittsalternativ"
 
-#: src/gtkprefs.c:376
+#: src/gtkprefs.c:367
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr "_Visa nick om inget alias är inställt"
 
-#: src/gtkprefs.c:562
+#: src/gtkprefs.c:553
 msgid ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
@@ -3401,430 +3175,360 @@
 "Välj det smileytema som du vill använda från listan nedanför. Nya teman kan "
 "installeras genom att dra och släppa dem på temalistan."
 
-#: src/gtkprefs.c:597
+#: src/gtkprefs.c:588
 msgid "Icon"
 msgstr "Ikon"
 
-#: src/gtkprefs.c:604 src/gtkprefs.c:2018 src/protocols/jabber/buddy.c:265
-#: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:683
+#: src/gtkprefs.c:595 src/gtkprefs.c:1794 src/protocols/jabber/buddy.c:263
+#: src/protocols/jabber/buddy.c:748
 msgid "Description"
 msgstr "Beskrivning"
 
-#: src/gtkprefs.c:671
+#: src/gtkprefs.c:662
 msgid "Style"
 msgstr "Stil"
 
-#: src/gtkprefs.c:672
+#: src/gtkprefs.c:663
 msgid "_Bold"
 msgstr "_Fet"
 
-#: src/gtkprefs.c:674
+#: src/gtkprefs.c:665
 msgid "_Italics"
 msgstr "_Kursiv"
 
-#: src/gtkprefs.c:676
+#: src/gtkprefs.c:667
 msgid "_Underline"
 msgstr "_Understruken"
 
-#. who in their right mind would use this as a default anyway?
-#. * and plus, it wouldn't work as the code currently existed,
-#. * and then i went and applied simguy's patch to remove the
-#. * non-functional code.
-#. *
-#. * remove this after string freeze ends
-#.
-#: src/gtkprefs.c:686
+#: src/gtkprefs.c:669
 msgid "_Strikethrough"
 msgstr "_Överstruken"
 
-#: src/gtkprefs.c:689
+#: src/gtkprefs.c:672
 msgid "Face"
 msgstr "Typsnitt"
 
-#: src/gtkprefs.c:692
+#: src/gtkprefs.c:675
 msgid "Use custo_m face"
 msgstr "Ändra _typsnitt"
 
-#: src/gtkprefs.c:709
+#: src/gtkprefs.c:692
 msgid "Use custom si_ze"
 msgstr "Ändra _storlek"
 
-#: src/gtkprefs.c:721
+#: src/gtkprefs.c:704
 msgid "Color"
 msgstr "Färg"
 
-#: src/gtkprefs.c:725
+#: src/gtkprefs.c:708
 msgid "_Text color"
 msgstr "Textf_ärg"
 
-#: src/gtkprefs.c:744
+#: src/gtkprefs.c:727
 msgid "Bac_kground color"
 msgstr "_Bakgrundsfärg"
 
-#: src/gtkprefs.c:772 src/gtkprefs.c:1004 src/gtkprefs.c:1052
+#: src/gtkprefs.c:755 src/gtkprefs.c:987 src/gtkprefs.c:1035
 msgid "Display"
 msgstr "Visa"
 
-#: src/gtkprefs.c:773
+#: src/gtkprefs.c:756
 msgid "Show graphical _smileys"
 msgstr "Visa grafiska _smileys"
 
-#: src/gtkprefs.c:775
+#: src/gtkprefs.c:758
 msgid "Show _timestamp on messages"
 msgstr "Visa _tidsstämplar på meddelanden"
 
-#: src/gtkprefs.c:777
+#: src/gtkprefs.c:760
 msgid "Show _URLs as links"
 msgstr "Visa _URL:er som länkar"
 
-#: src/gtkprefs.c:781
+#: src/gtkprefs.c:764
 msgid "_Highlight misspelled words"
 msgstr "_Markera felstavade ord"
 
-#: src/gtkprefs.c:785
+#: src/gtkprefs.c:768
 msgid "Ignore c_olors"
 msgstr "_Ignorera färger"
 
-#: src/gtkprefs.c:787
+#: src/gtkprefs.c:770
 msgid "Ignore font _faces"
 msgstr "Ignorera t_ypsnittsvarianter"
 
-#: src/gtkprefs.c:789
+#: src/gtkprefs.c:772
 msgid "Ignore font si_zes"
 msgstr "Ignorera typsnittsstor_lekar"
 
-#: src/gtkprefs.c:802
+#: src/gtkprefs.c:785
 msgid "Send Message"
 msgstr "Skicka meddelanden"
 
-#: src/gtkprefs.c:803
+#: src/gtkprefs.c:786
 msgid "Enter _sends message"
 msgstr "Enter _skickar meddelanden"
 
-#: src/gtkprefs.c:805
+#: src/gtkprefs.c:788
 msgid "C_ontrol-Enter sends message"
 msgstr "C_trl-Enter skickar meddelanden"
 
-#: src/gtkprefs.c:808
+#: src/gtkprefs.c:791
 msgid "Window Closing"
 msgstr "Stäng fönster"
 
-#: src/gtkprefs.c:809
+#: src/gtkprefs.c:792
 msgid "_Escape closes window"
 msgstr "_Esc stänger fönster"
 
-#: src/gtkprefs.c:812
+#: src/gtkprefs.c:795
 msgid "Insertions"
 msgstr "Infogningar"
 
-#: src/gtkprefs.c:813
+#: src/gtkprefs.c:796
 msgid "Control-{B/I/U} inserts _HTML tags"
 msgstr "Ctrl-{B/I/U} infogar _HTML-taggar"
 
-#: src/gtkprefs.c:815
+#: src/gtkprefs.c:798
 msgid "Control-(number) _inserts smileys"
 msgstr "Ctrl-(nummer) infogar _smileys"
 
-#: src/gtkprefs.c:831
+#: src/gtkprefs.c:814
 msgid "Buddy List Sorting"
 msgstr "Sortering av kompislista"
 
-#: src/gtkprefs.c:840
-#, fuzzy
-msgid "_Sorting:"
+#: src/gtkprefs.c:823
+msgid "Sorting:"
 msgstr "Sorterar:"
 
-#: src/gtkprefs.c:845
+#: src/gtkprefs.c:828
 msgid "Buddy List Toolbar"
 msgstr "Kompislista"
 
-#: src/gtkprefs.c:846 src/gtkprefs.c:977 src/gtkprefs.c:1028
+#: src/gtkprefs.c:829 src/gtkprefs.c:960 src/gtkprefs.c:1011
 msgid "Show _buttons as:"
 msgstr "Visa _knappar som:"
 
-#: src/gtkprefs.c:848 src/gtkprefs.c:979 src/gtkprefs.c:1030
+#: src/gtkprefs.c:831 src/gtkprefs.c:962 src/gtkprefs.c:1013
 msgid "Pictures"
 msgstr "Bilder"
 
-#: src/gtkprefs.c:849 src/gtkprefs.c:980 src/gtkprefs.c:1031
+#: src/gtkprefs.c:832 src/gtkprefs.c:963 src/gtkprefs.c:1014
 msgid "Text"
 msgstr "Text"
 
-#: src/gtkprefs.c:850 src/gtkprefs.c:981 src/gtkprefs.c:1032
+#: src/gtkprefs.c:833 src/gtkprefs.c:964 src/gtkprefs.c:1015
 msgid "Pictures and text"
 msgstr "Bilder och text"
 
-#: src/gtkprefs.c:855 src/gtkprefs.c:992 src/gtkprefs.c:1043
+#: src/gtkprefs.c:838 src/gtkprefs.c:975 src/gtkprefs.c:1026
 msgid "_Raise window on events"
 msgstr "_Visa upp fönster vid händelser"
 
-#: src/gtkprefs.c:858
+#: src/gtkprefs.c:841
 msgid "Group Display"
 msgstr "Gruppvy"
 
-#: src/gtkprefs.c:859
+#: src/gtkprefs.c:842
 msgid "Show _numbers in groups"
 msgstr "Visa _nummer i grupper"
 
-#: src/gtkprefs.c:862
+#: src/gtkprefs.c:845
 msgid "Buddy Display"
 msgstr "Kompisvy"
 
-#: src/gtkprefs.c:863 src/gtkprefs.c:999
+#: src/gtkprefs.c:846 src/gtkprefs.c:982
 msgid "Show buddy _icons"
 msgstr "Visa kompis_ikoner"
 
-#: src/gtkprefs.c:865
+#: src/gtkprefs.c:848
 msgid "Show _warning levels"
 msgstr "Visa v_arningsnivåer"
 
-#: src/gtkprefs.c:867
+#: src/gtkprefs.c:850
 msgid "Show idle _times"
 msgstr "Visa _inaktivitetstider"
 
-#: src/gtkprefs.c:869
+#: src/gtkprefs.c:852
 msgid "Dim i_dle buddies"
 msgstr "_Gråa ut inaktiva kompisar"
 
-#: src/gtkprefs.c:871
+#: src/gtkprefs.c:854
 msgid "_Automatically expand contacts"
 msgstr "_Expandera kontakter automatiskt"
 
-#: src/gtkprefs.c:896
+#: src/gtkprefs.c:879
 msgid "_Placement:"
 msgstr "_Placering:"
 
-#: src/gtkprefs.c:903
+#: src/gtkprefs.c:886
 msgid "Send _URLs as Links"
 msgstr "Skicka _URL:er som länkar"
 
-#: src/gtkprefs.c:906
-#, fuzzy
-msgid "Show _Formatting Toolbar"
+#: src/gtkprefs.c:889
+msgid "Show Formatting Toolbar"
 msgstr "Visa Formateringsverktyg"
 
-#: src/gtkprefs.c:909
+#: src/gtkprefs.c:892
 msgid "Show a_liases in tabs/titles"
 msgstr "Visa alias i flikar/_titlar"
 
-#: src/gtkprefs.c:912
+#: src/gtkprefs.c:895
 msgid "Tab Options"
 msgstr "Flikalternativ"
 
-#: src/gtkprefs.c:914
+#: src/gtkprefs.c:897
 msgid "_Tab Placement:"
 msgstr "_Flikplacering:"
 
-#: src/gtkprefs.c:916
+#: src/gtkprefs.c:899
 msgid "Top"
 msgstr "Överst"
 
-#: src/gtkprefs.c:917
+#: src/gtkprefs.c:900
 msgid "Bottom"
 msgstr "Nederst"
 
-#: src/gtkprefs.c:918
+#: src/gtkprefs.c:901
 msgid "Left"
 msgstr "Vänster"
 
-#: src/gtkprefs.c:919
+#: src/gtkprefs.c:902
 msgid "Right"
 msgstr "Höger"
 
-#: src/gtkprefs.c:925
+#: src/gtkprefs.c:908
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Visa snabbmeddelanden och chattar i _flikfönster."
 
-#: src/gtkprefs.c:928
+#: src/gtkprefs.c:911
 msgid "Show IMs and chats in _same tabbed window"
 msgstr "Visa snabbmeddelanden och chattar i _samma flikfönster"
 
-#: src/gtkprefs.c:938
+#: src/gtkprefs.c:921
 msgid "Show _close button on tabs"
 msgstr "Visa stängningsknapp på fliken"
 
-#: src/gtkprefs.c:949
+#: src/gtkprefs.c:932
 msgid "Show status _icons on tabs"
 msgstr "Visa statusikoner på flikarna."
 
-#: src/gtkprefs.c:976 src/gtkprefs.c:1027
+#: src/gtkprefs.c:959 src/gtkprefs.c:1010
 msgid "Window"
 msgstr "Fönster"
 
-#: src/gtkprefs.c:986 src/gtkprefs.c:1037
+#: src/gtkprefs.c:969 src/gtkprefs.c:1020
 msgid "New window _width:"
 msgstr "Ny fönster_bredd:"
 
-#: src/gtkprefs.c:988 src/gtkprefs.c:1039
+#: src/gtkprefs.c:971 src/gtkprefs.c:1022
 msgid "New window _height:"
 msgstr "Ny fönster_höjd:"
 
-#: src/gtkprefs.c:990 src/gtkprefs.c:1041
+#: src/gtkprefs.c:973 src/gtkprefs.c:1024
 msgid "_Entry field height:"
 msgstr "Ange _fälthöjd:"
 
-#: src/gtkprefs.c:994
+#: src/gtkprefs.c:977
 msgid "Hide window on _send"
 msgstr "Dölj fönstret efter att ha _skickat"
 
-#: src/gtkprefs.c:998
+#: src/gtkprefs.c:981
 msgid "Buddy Icons"
 msgstr "Kompisikoner"
 
-#: src/gtkprefs.c:1001
+#: src/gtkprefs.c:984
 msgid "Enable buddy icon a_nimation"
 msgstr "Aktivera kompisikon_animering"
 
-#: src/gtkprefs.c:1005
+#: src/gtkprefs.c:988
 msgid "Show _logins in window"
 msgstr "Visa in_loggningar i fönster"
 
-#: src/gtkprefs.c:1008
+#: src/gtkprefs.c:991
 msgid "Typing Notification"
 msgstr "Notifiering vid skrivande"
 
-#: src/gtkprefs.c:1009
+#: src/gtkprefs.c:992
 msgid "Notify buddies that you are _typing to them"
 msgstr "_Meddela kompisar att du skriver till dem"
 
-#: src/gtkprefs.c:1046
+#: src/gtkprefs.c:1029
 msgid "Tab Completion"
 msgstr "Tabbkomplettering"
 
-#: src/gtkprefs.c:1047
+#: src/gtkprefs.c:1030
 msgid "_Tab-complete nicks"
 msgstr "_Tabbkomplettera nick"
 
-#: src/gtkprefs.c:1049
+#: src/gtkprefs.c:1032
 msgid "_Old-style tab completion"
 msgstr "_Gammaldags tabbkomplettering"
 
-#: src/gtkprefs.c:1053
+#: src/gtkprefs.c:1036
 msgid "_Show people joining in window"
 msgstr "V_isa att personer ansluter i fönstret"
 
-#: src/gtkprefs.c:1055
+#: src/gtkprefs.c:1038
 msgid "_Show people leaving in window"
 msgstr "V_isa att personer lämnar i fönstret"
 
-#: src/gtkprefs.c:1057
-#, fuzzy
-msgid "Co_lorize screen names"
+#: src/gtkprefs.c:1040
+msgid "Co_lorize screennames"
 msgstr "_Färglägg användar-IDn"
 
-#: src/gtkprefs.c:1078
-#, fuzzy
-msgid "IP Address"
-msgstr "Adress"
-
-#: src/gtkprefs.c:1080
-#, fuzzy
-msgid "_Autodetect IP Address"
-msgstr "Gatuadress"
-
-#: src/gtkprefs.c:1089
-msgid "Public _IP:"
-msgstr ""
-
-#: src/gtkprefs.c:1113
-#, fuzzy
-msgid "Ports"
-msgstr "Port"
-
-#: src/gtkprefs.c:1116
-msgid "_Manually specify range of ports to listen on"
-msgstr ""
-
-#: src/gtkprefs.c:1119
-#, fuzzy
-msgid "_Start Port:"
-msgstr "_Sök efter:"
-
-#: src/gtkprefs.c:1126
-#, fuzzy
-msgid "_End Port:"
-msgstr "_Port:"
-
-#: src/gtkprefs.c:1174
+#: src/gtkprefs.c:1084
 msgid "Proxy Type"
 msgstr "Proxytyp"
 
-#: src/gtkprefs.c:1177
+#: src/gtkprefs.c:1087
 msgid "No proxy"
 msgstr "Ingen proxy"
 
-#: src/gtkprefs.c:1184
+#: src/gtkprefs.c:1094
 msgid "Proxy Server"
 msgstr "Proxyserver"
 
-#: src/gtkprefs.c:1242
+#: src/gtkprefs.c:1150
 msgid "_User:"
 msgstr "_Användare:"
 
-#: src/gtkprefs.c:1298
+#: src/gtkprefs.c:1204
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1299
+#: src/gtkprefs.c:1205
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1300
+#: src/gtkprefs.c:1206
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1301
+#: src/gtkprefs.c:1207
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1302
+#: src/gtkprefs.c:1208
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1303
+#: src/gtkprefs.c:1209
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1304
-msgid "Firefox"
-msgstr ""
-
-#: src/gtkprefs.c:1305
-#, fuzzy
-msgid "Gnome Default"
-msgstr "Förvalda inställningar"
-
-#: src/gtkprefs.c:1314
+#: src/gtkprefs.c:1218
 msgid "Manual"
 msgstr "Manuell"
 
-#: src/gtkprefs.c:1365
+#: src/gtkprefs.c:1259
 msgid "Browser Selection"
 msgstr "Val av webbläsare"
 
-#: src/gtkprefs.c:1369
+#: src/gtkprefs.c:1263
 msgid "_Browser:"
 msgstr "Webb_läsare:"
 
-#: src/gtkprefs.c:1376
-#, fuzzy
-msgid "_Open link in:"
-msgstr "_Öppna länk i webbläsare"
-
-#: src/gtkprefs.c:1378
-#, fuzzy
-msgid "Browser default"
-msgstr "Tråkigt standardmeddelande"
-
-#: src/gtkprefs.c:1379
-msgid "Existing window"
-msgstr ""
-
-#: src/gtkprefs.c:1381
-msgid "New tab"
-msgstr ""
-
-#: src/gtkprefs.c:1395
+#: src/gtkprefs.c:1273
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3833,55 +3537,63 @@
 "_Manuell:\n"
 "(%s för URL)"
 
-#: src/gtkprefs.c:1428
+#: src/gtkprefs.c:1294
+msgid "Browser Options"
+msgstr "Inställningar för webbläsaren"
+
+#: src/gtkprefs.c:1295
+msgid "Open new _window by default"
+msgstr "Öppna alltid nytt _fönster"
+
+#: src/gtkprefs.c:1311
 msgid "Message Logs"
 msgstr "Meddelandeloggar"
 
-#: src/gtkprefs.c:1431
+#: src/gtkprefs.c:1314
 msgid "Log _Format:"
 msgstr "Logg_format:"
 
-#: src/gtkprefs.c:1434
+#: src/gtkprefs.c:1317
 msgid "_Log all instant messages"
 msgstr "_Logga alla snabbmeddelanden"
 
-#: src/gtkprefs.c:1436
+#: src/gtkprefs.c:1319
 msgid "Log all c_hats"
 msgstr "Logga alla _chattar"
 
-#: src/gtkprefs.c:1491
+#: src/gtkprefs.c:1374
 msgid "Sound Options"
 msgstr "Ljudalternativ"
 
-#: src/gtkprefs.c:1492
+#: src/gtkprefs.c:1375
 msgid "_No sounds when you log in"
 msgstr "_Inga ljud när du loggar in"
 
-#: src/gtkprefs.c:1494
+#: src/gtkprefs.c:1377
 msgid "_Sounds while away"
 msgstr "Ljud medan du är _frånvarande"
 
-#: src/gtkprefs.c:1498
+#: src/gtkprefs.c:1381
 msgid "Sound Method"
 msgstr "Ljudmetod"
 
-#: src/gtkprefs.c:1499
+#: src/gtkprefs.c:1382
 msgid "_Method:"
 msgstr "_Metod:"
 
-#: src/gtkprefs.c:1501
+#: src/gtkprefs.c:1384
 msgid "Console beep"
 msgstr "Konsolpip"
 
-#: src/gtkprefs.c:1503
+#: src/gtkprefs.c:1386
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: src/gtkprefs.c:1510
+#: src/gtkprefs.c:1393
 msgid "Command"
 msgstr "Kommando"
 
-#: src/gtkprefs.c:1520
+#: src/gtkprefs.c:1403
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -3890,72 +3602,67 @@
 "Ljud_kommando:\n"
 "(%s för filnamn)"
 
-#: src/gtkprefs.c:1577
+#: src/gtkprefs.c:1458
 msgid "_Sending messages removes away status"
 msgstr "Att _skicka meddelanden tar bort frånvarostatus"
 
-#: src/gtkprefs.c:1579
+#: src/gtkprefs.c:1460
 msgid "_Queue new messages when away"
 msgstr "_Kölägg nya meddelanden vid frånvaro"
 
-#: src/gtkprefs.c:1582
+#: src/gtkprefs.c:1463
 msgid "Auto-response"
 msgstr "Automatiskt svar"
 
-#: src/gtkprefs.c:1585
+#: src/gtkprefs.c:1466
 msgid "Seconds before _resending:"
 msgstr "Sekunder innan sändnings_upprepning:"
 
-#: src/gtkprefs.c:1588
+#: src/gtkprefs.c:1469
 msgid "_Send auto-response"
 msgstr "Skicka _automatiskt svar"
 
-#: src/gtkprefs.c:1590
+#: src/gtkprefs.c:1471
 msgid "_Only send auto-response when idle"
 msgstr "Skicka _endast automatiskt svar vid inaktivitet"
 
-#: src/gtkprefs.c:1592
+#: src/gtkprefs.c:1473
 msgid "Send auto-response in _active conversations"
 msgstr "Skicka automatiskt svar i aktiva _konversationer"
 
-#: src/gtkprefs.c:1601 src/protocols/msn/state.c:30
-#: src/protocols/yahoo/yahoo.c:2291
-msgid "Idle"
-msgstr "Inaktiv"
-
-#: src/gtkprefs.c:1602
+#: src/gtkprefs.c:1483
 msgid "Idle _time reporting:"
 msgstr "Frånvaro_tidskälla:"
 
-#: src/gtkprefs.c:1605
+#: src/gtkprefs.c:1486
 msgid "Gaim usage"
 msgstr "Gaim-användning"
 
-#: src/gtkprefs.c:1608
+#: src/gtkprefs.c:1489
 msgid "X usage"
 msgstr "X-användning"
 
-#: src/gtkprefs.c:1610
+#: src/gtkprefs.c:1491
 msgid "Windows usage"
 msgstr "Windows användning"
 
-#: src/gtkprefs.c:1618
+#: src/gtkprefs.c:1499
 msgid "Auto-away"
 msgstr "Autofrånvaro"
 
-#: src/gtkprefs.c:1619
+#: src/gtkprefs.c:1500
 msgid "Set away _when idle"
 msgstr "Ange _frånvaro vid inaktivitet"
 
-#: src/gtkprefs.c:1623
+#: src/gtkprefs.c:1503
 msgid "_Minutes before setting away:"
 msgstr "_Minuter innan frånvaro anges:"
 
-#: src/gtkprefs.c:1631
+#: src/gtkprefs.c:1509
 msgid "Away m_essage:"
 msgstr "Frånvarome_ddelanden:"
 
-#: src/gtkprefs.c:1786
+#: src/gtkprefs.c:1571
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3970,7 +3677,7 @@
 "<span weight=\"bold\">Webbsajt:</span>\t\t%s\n"
 "<span weight=\"bold\">Filnamn:</span>\t%s"
 
-#: src/gtkprefs.c:1791
+#: src/gtkprefs.c:1576
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3985,190 +3692,177 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">Filnamn:</span>  %s"
 
-#: src/gtkprefs.c:1974
+#: src/gtkprefs.c:1758
 msgid "Load"
 msgstr "Läs in"
 
-#: src/gtkprefs.c:1988
-msgid "Summary"
-msgstr ""
-
-#: src/gtkprefs.c:2036
+#: src/gtkprefs.c:1765 src/protocols/jabber/jabber.c:618
+#: src/protocols/msn/msn.c:1350 src/protocols/trepia/trepia.c:401
+msgid "Name"
+msgstr "Namn"
+
+#: src/gtkprefs.c:1812
 msgid "Details"
 msgstr "Detaljer"
 
-#: src/gtkprefs.c:2163
+#: src/gtkprefs.c:1939
 msgid "Sound Selection"
 msgstr "Ljudalternativ"
 
-#: src/gtkprefs.c:2270
+#: src/gtkprefs.c:2046
 msgid "Play"
 msgstr "Spela upp"
 
-#: src/gtkprefs.c:2277
+#: src/gtkprefs.c:2053
 msgid "Event"
 msgstr "Händelse"
 
-#: src/gtkprefs.c:2296
-msgid "Test"
-msgstr "Test"
-
-#: src/gtkprefs.c:2300
+#: src/gtkprefs.c:2076
 msgid "Reset"
 msgstr "Återställ"
 
-#: src/gtkprefs.c:2304
+#: src/gtkprefs.c:2080
 msgid "Choose..."
 msgstr "Välj..."
 
-#: src/gtkprefs.c:2439
+#: src/gtkprefs.c:2215
 msgid "_Edit"
 msgstr "_Redigera"
 
-#: src/gtkprefs.c:2475
+#: src/gtkprefs.c:2251
 msgid "Interface"
 msgstr "Gränssnitt"
 
-#: src/gtkprefs.c:2476
+#: src/gtkprefs.c:2252
 msgid "Smiley Themes"
 msgstr "Smileyteman"
 
-#: src/gtkprefs.c:2477
+#: src/gtkprefs.c:2253
 msgid "Fonts"
 msgstr "Typsnitt"
 
-#: src/gtkprefs.c:2478
+#: src/gtkprefs.c:2254
 msgid "Message Text"
 msgstr "Meddelandetext"
 
-#: src/gtkprefs.c:2479
+#: src/gtkprefs.c:2255
 msgid "Shortcuts"
 msgstr "Genvägar"
 
-#: src/gtkprefs.c:2482
+#: src/gtkprefs.c:2258
 msgid "IMs"
 msgstr "Snabbmeddelanden"
 
-#: src/gtkprefs.c:2484
-msgid "Network"
-msgstr ""
-
-#: src/gtkprefs.c:2485
+#: src/gtkprefs.c:2260
 msgid "Proxy"
 msgstr "Proxyserver"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2488
+#: src/gtkprefs.c:2263
 msgid "Browser"
 msgstr "Webbläsare"
 
-#: src/gtkprefs.c:2490
+#: src/gtkprefs.c:2265
 msgid "Logging"
 msgstr "Loggning"
 
-#: src/gtkprefs.c:2491
+#: src/gtkprefs.c:2266
 msgid "Sounds"
 msgstr "Ljud"
 
-#: src/gtkprefs.c:2492
+#: src/gtkprefs.c:2267
 msgid "Sound Events"
 msgstr "Ljudhändelser"
 
-#: src/gtkprefs.c:2493
+#: src/gtkprefs.c:2268
 msgid "Away / Idle"
 msgstr "Frånvarande / Inaktiv"
 
-#: src/gtkprefs.c:2494
+#: src/gtkprefs.c:2269
 msgid "Away Messages"
 msgstr "Frånvaromeddelanden"
 
-#: src/gtkprefs.c:2496
-#, fuzzy
-msgid "Protocols"
-msgstr "Protokoll"
-
-#: src/gtkprefs.c:2512
+#: src/gtkprefs.c:2272
 msgid "Plugins"
 msgstr "Insticksmoduler"
 
-#: src/gtkprivacy.c:77
+#: src/gtkprivacy.c:86
 msgid "Allow all users to contact me"
 msgstr "Tillåt alla användare att kontakta mig"
 
-#: src/gtkprivacy.c:78
+#: src/gtkprivacy.c:87
 msgid "Allow only the users on my buddy list"
 msgstr "Tillåt endast användarna i min kompislista"
 
-#: src/gtkprivacy.c:79
+#: src/gtkprivacy.c:88
 msgid "Allow only the users below"
 msgstr "Tillåt endast användarna nedan"
 
-#: src/gtkprivacy.c:80
+#: src/gtkprivacy.c:89
 msgid "Block all users"
 msgstr "Blockera alla användare"
 
-#: src/gtkprivacy.c:81
-#, fuzzy
-msgid "Block only the users below"
+#: src/gtkprivacy.c:90
+msgid "Block the users below"
 msgstr "Blockera användarna nedan"
 
-#: src/gtkprivacy.c:360 src/protocols/jabber/jabber.c:1406
+#: src/gtkprivacy.c:369
 msgid "Privacy"
 msgstr "Spärrlista"
 
-#: src/gtkprivacy.c:375
+#: src/gtkprivacy.c:384
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Ändringar i spärrlistans inställningar börjar gälla direkt."
 
 #. "Set privacy for:" label
-#: src/gtkprivacy.c:387
+#: src/gtkprivacy.c:396
 msgid "Set privacy for:"
 msgstr "Ställ in spärrlista för:"
 
-#: src/gtkprivacy.c:555 src/gtkprivacy.c:571
+#: src/gtkprivacy.c:563 src/gtkprivacy.c:579
 msgid "Permit User"
 msgstr "Tillåt användare"
 
-#: src/gtkprivacy.c:556
+#: src/gtkprivacy.c:564
 msgid "Type a user you permit to contact you."
 msgstr "Ange en användare du tillåter att kontakta dig."
 
-#: src/gtkprivacy.c:557
+#: src/gtkprivacy.c:565
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "Ange namnet på den användare du vill ska kunna kontakta dig."
 
-#: src/gtkprivacy.c:560 src/gtkprivacy.c:573
+#: src/gtkprivacy.c:568 src/gtkprivacy.c:581
 msgid "Permit"
 msgstr "Tillåt"
 
-#: src/gtkprivacy.c:565
+#: src/gtkprivacy.c:573
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Tillåt %s att kontakta dig?"
 
-#: src/gtkprivacy.c:567
+#: src/gtkprivacy.c:575
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Är du säker på att du vill tillåta %s att kontakta dig?"
 
-#: src/gtkprivacy.c:594 src/gtkprivacy.c:607
+#: src/gtkprivacy.c:602 src/gtkprivacy.c:615
 msgid "Block User"
 msgstr "Blockera användare"
 
-#: src/gtkprivacy.c:595
+#: src/gtkprivacy.c:603
 msgid "Type a user to block."
 msgstr "Ange en användare som ska blockeras."
 
-#: src/gtkprivacy.c:596
+#: src/gtkprivacy.c:604
 msgid "Please enter the name of the user you wish to block."
 msgstr "Ange namnet på den användare du vill blockera."
 
-#: src/gtkprivacy.c:603
+#: src/gtkprivacy.c:611
 #, c-format
 msgid "Block %s?"
 msgstr "Blockera %s?"
 
-#: src/gtkprivacy.c:605
+#: src/gtkprivacy.c:613
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Är du säker på att du vill blockera %s?"
@@ -4176,87 +3870,68 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:223 src/protocols/gg/gg.c:663 src/request.h:1228
+#: src/gtkrequest.c:188 src/protocols/gg/gg.c:660 src/request.h:1009
 msgid "Yes"
 msgstr "Ja"
 
-#: src/gtkrequest.c:224 src/protocols/gg/gg.c:663 src/request.h:1228
+#: src/gtkrequest.c:189 src/protocols/gg/gg.c:660 src/request.h:1009
 msgid "No"
 msgstr "Nej"
 
-#: src/gtkrequest.c:227
+#: src/gtkrequest.c:192
 msgid "Apply"
 msgstr "Verkställ"
 
-#: src/gtkrequest.c:228 src/protocols/msn/msn.c:248
+#: src/gtkrequest.c:193 src/protocols/msn/msn.c:247
 msgid "Close"
 msgstr "Stäng"
 
-#: src/gtkroomlist.c:322
-#, fuzzy
-msgid ""
-"You are not currently signed on with any protocols that have the ability to "
-"list rooms."
-msgstr ""
-"Du är för tillfället inte inloggad med något protokoll som har möjlighet "
-"till chatt."
-
-#: src/gtkroomlist.c:335
-#, fuzzy
-msgid "Room List"
-msgstr "Finns inte i listan"
-
-#. list button
-#: src/gtkroomlist.c:410
-msgid "_Get List"
-msgstr ""
-
-#: src/gtksound.c:62
+#: src/gtksound.c:61
 msgid "Buddy logs in"
 msgstr "Kompis loggar in"
 
-#: src/gtksound.c:63
+#: src/gtksound.c:62
 msgid "Buddy logs out"
 msgstr "Kompis loggar ut"
 
-#: src/gtksound.c:64
+#: src/gtksound.c:63
 msgid "Message received"
 msgstr "Meddelande mottas"
 
+#: src/gtksound.c:64
+msgid "Message received begins conversation"
+msgstr "Mottaget meddelande inleder konversationen"
+
 #: src/gtksound.c:65
-msgid "Message received begins conversation"
-msgstr "Mottaget meddelande inleder konversationen"
+msgid "Message sent"
+msgstr "Meddelande skickat"
 
 #: src/gtksound.c:66
-msgid "Message sent"
-msgstr "Meddelande skickat"
-
-#: src/gtksound.c:67
 msgid "Person enters chat"
 msgstr "Person går in i chatt"
 
-#: src/gtksound.c:68
+#: src/gtksound.c:67
 msgid "Person leaves chat"
 msgstr "Person lämnar chatt"
 
-#: src/gtksound.c:69
+#: src/gtksound.c:68
 msgid "You talk in chat"
 msgstr "Du pratar i chatt"
 
-#: src/gtksound.c:70
+#: src/gtksound.c:69
 msgid "Others talk in chat"
 msgstr "Andra pratar i chatt"
 
-#: src/gtksound.c:73
+#: src/gtksound.c:72
 msgid "Someone says your name in chat"
 msgstr "Någon säger ditt namn i chatt"
 
-#: src/gtksound.c:157
+#: src/gtksound.c:156
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
 msgstr "Kunde inte spela upp ljudet eftersom den valda filen (%s) inte finns."
 
-#: src/gtksound.c:173
+#: src/gtksound.c:172
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
@@ -4264,7 +3939,7 @@
 "Kunde inte spela upp ljudet eftersom \"kommando\"-metoden valts och inget "
 "kommando angivits."
 
-#: src/gtksound.c:185
+#: src/gtksound.c:184
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
@@ -4272,83 +3947,68 @@
 msgstr ""
 "Kunde inte spela upp ljudet eftersom det valda kommandot inte kunde köras: %s"
 
-#: src/gtkutils.c:297
+#: src/gtkutils.c:298
 msgid "Can't save icon file to disk."
 msgstr "Kan inte spara ikonfil på disken."
 
-#: src/gtkutils.c:332
+#: src/gtkutils.c:333
 msgid "Save Icon"
 msgstr "Spara ikon"
 
-#: src/log.c:88
+#: src/log.c:83
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">Loggaren har ingen läsfunktion</font></b>"
 
-#: src/log.c:433
+#: src/log.c:408
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:514
-#, fuzzy, c-format
-msgid ""
-"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
-"REPLY&gt;:</b></font> %s<br/>\n"
+#: src/log.c:488
+#, c-format
+msgid "<font color=\"#16569E\">(%s) <b>%s <AUTO-REPLY>:</b></font> %s<br/>\n"
 msgstr "<font color=\"#16569E\">(%s) <b>%s <AUTO-SVAR>:</b></font> %s<br/>\n"
 
-#: src/log.c:516
-#, fuzzy, c-format
-msgid ""
-"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
-"REPLY&gt;:</b></font> %s<br/>\n"
+#: src/log.c:490
+#, c-format
+msgid "<font color=\"#A82F2F\">(%s) <b>%s <AUTO-REPLY>:</b></font> %s<br/>\n"
 msgstr "<font color=\"#A82F2F\">(%s) <b>%s <AUTO-SVAR>:</b></font> %s<br/>\n"
 
-#: src/log.c:560 src/log.c:696
+#: src/log.c:534 src/log.c:669
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>Kunde inte hitta loggens sökväg!</b></font>"
 
-#: src/log.c:570 src/log.c:706
+#: src/log.c:544 src/log.c:679
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>Kunde inte läsa fil: %s</b></font>"
 
-#: src/log.c:574
+#: src/log.c:548
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:649
+#: src/log.c:622
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-SVAR>: %s\n"
 
-#: src/log.c:710
+#: src/log.c:683
 msgid "Plain text"
 msgstr "Vanlig text"
 
-#: src/main.c:157
-#, fuzzy
-msgid "Please create an account."
+#: src/main.c:149
+msgid "Please enter your login."
 msgstr "Ange ditt användar-ID"
 
-#: src/main.c:239
+#: src/main.c:232
+msgid "<New User>"
+msgstr "<Ny användare>"
+
+#: src/main.c:274
 msgid "Login"
 msgstr "Inloggning"
 
-#: src/main.c:257
-#, fuzzy
-msgid "<b>Screen Name:</b>"
-msgstr "Användar-ID:"
-
-#: src/main.c:271
-#, fuzzy
-msgid "<b>Password:</b>"
-msgstr "Lösenord:"
-
-#: src/main.c:300
-msgid "Sign on"
-msgstr "Logga in"
-
 #. full help text
-#: src/main.c:524
+#: src/main.c:553
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -4384,12 +4044,12 @@
 "  -h, --help          visa den här hjälpen och avsluta\n"
 
 #. short message
-#: src/main.c:539
+#: src/main.c:568
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s. Försök med \"%s -h\" för mer information.\n"
 
-#: src/plugin.c:269
+#: src/plugin.c:267
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
@@ -4398,24 +4058,24 @@
 "Den efterfrågade insticksmodulen kunde inte hittas. Installera "
 "insticksmodulen och försök igen."
 
-#: src/plugin.c:274 src/plugin.c:302
+#: src/plugin.c:272 src/plugin.c:300
 msgid "Gaim was unable to load your plugin."
 msgstr "Gaim kunde inte ladda din insticksmodul."
 
-#: src/plugin.c:298
+#: src/plugin.c:296
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "Den begärda insticksmodulen %s kunde inte laddas."
 
-#: src/prefs.c:113 src/status.c:271
+#: src/prefs.c:111 src/status.c:270
 msgid "Slightly less boring default"
 msgstr "Något mindre tråkigt förval"
 
-#: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:111
-#: src/protocols/msn/msn.c:345 src/protocols/msn/state.c:27
+#: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:110
+#: src/protocols/msn/msn.c:344 src/protocols/msn/state.c:27
 #: src/protocols/msn/state.c:28 src/protocols/msn/state.c:35
-#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2594
-#: src/protocols/yahoo/yahoo.c:2703
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2492
+#: src/protocols/yahoo/yahoo.c:2601
 msgid "Available"
 msgstr "Tillgänglig"
 
@@ -4427,12 +4087,11 @@
 msgid "Away for friends only"
 msgstr "Frånvarande endast för vänner"
 
-#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:964
-#: src/protocols/jabber/presence.c:121 src/protocols/oscar/oscar.c:2943
-#: src/protocols/oscar/oscar.c:4668 src/protocols/oscar/oscar.c:4739
-#: src/protocols/oscar/oscar.c:4763 src/protocols/oscar/oscar.c:6415
-#: src/protocols/oscar/oscar.c:6419 src/protocols/yahoo/yahoo.c:2289
-#: src/protocols/yahoo/yahoo.c:2614 src/protocols/yahoo/yahoo.c:2713
+#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:968
+#: src/protocols/jabber/presence.c:91 src/protocols/oscar/oscar.c:2846
+#: src/protocols/oscar/oscar.c:4584 src/protocols/oscar/oscar.c:4611
+#: src/protocols/oscar/oscar.c:6151 src/protocols/yahoo/yahoo.c:2187
+#: src/protocols/yahoo/yahoo.c:2512 src/protocols/yahoo/yahoo.c:2611
 msgid "Invisible"
 msgstr "Osynlig"
 
@@ -4452,10 +4111,9 @@
 msgid "Unable to connect to server."
 msgstr "Kan inte ansluta till servern."
 
-#: src/protocols/gg/gg.c:142 src/protocols/jabber/auth.c:130
-#: src/protocols/jabber/auth.c:204 src/protocols/jabber/auth.c:354
-#: src/protocols/jabber/auth.c:452 src/protocols/jabber/auth.c:464
-#: src/protocols/jabber/jabber.c:103
+#: src/protocols/gg/gg.c:142 src/protocols/jabber/auth.c:65
+#: src/protocols/jabber/auth.c:158 src/protocols/jabber/auth.c:317
+#: src/protocols/jabber/auth.c:417 src/protocols/jabber/auth.c:429
 msgid "Invalid response from server."
 msgstr "Ogiltigt svar från servern."
 
@@ -4489,161 +4147,159 @@
 msgstr "Kan inte läsa från uttag"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/gg/gg.c:402 src/protocols/icq/gaim_icq.c:344
-#: src/protocols/msn/dispatch.c:208 src/protocols/msn/msn.c:496
-#: src/protocols/msn/notification.c:1789 src/protocols/napster/napster.c:463
+#: src/protocols/gg/gg.c:399 src/protocols/icq/gaim_icq.c:344
+#: src/protocols/msn/dispatch.c:208 src/protocols/msn/msn.c:492
+#: src/protocols/msn/notification.c:2165 src/protocols/napster/napster.c:463
 #: src/protocols/napster/napster.c:494 src/protocols/toc/toc.c:200
-#: src/protocols/yahoo/yahoo.c:1954 src/protocols/yahoo/yahoo.c:1985
-#: src/protocols/yahoo/yahoo.c:2048 src/protocols/yahoo/yahoo_filexfer.c:68
-#: src/protocols/yahoo/yahoo_filexfer.c:139
+#: src/protocols/yahoo/yahoo.c:1853 src/protocols/yahoo/yahoo.c:1884
+#: src/protocols/yahoo/yahoo.c:1949 src/protocols/yahoo/yahoo_filexfer.c:70
+#: src/protocols/yahoo/yahoo_filexfer.c:141
 msgid "Unable to connect."
 msgstr "Kan inte ansluta."
 
-#: src/protocols/gg/gg.c:418
+#: src/protocols/gg/gg.c:415
 msgid "Reading data"
 msgstr "Läser data"
 
+#: src/protocols/gg/gg.c:418
+msgid "Balancer handshake"
+msgstr "Balanserarhandskakning"
+
 #: src/protocols/gg/gg.c:421
-msgid "Balancer handshake"
-msgstr "Balanserarhandskakning"
-
-#: src/protocols/gg/gg.c:424
 msgid "Reading server key"
 msgstr "Läser servernyckel"
 
-#: src/protocols/gg/gg.c:427
+#: src/protocols/gg/gg.c:424
 msgid "Exchanging key hash"
 msgstr "Byter ut nyckelhash"
 
-#: src/protocols/gg/gg.c:437
+#: src/protocols/gg/gg.c:434
 msgid "Critical error in GG library\n"
 msgstr "Kritiskt fel i GG-bibliotek\n"
 
-#: src/protocols/gg/gg.c:455 src/protocols/gg/gg.c:546
+#: src/protocols/gg/gg.c:452 src/protocols/gg/gg.c:543
 #: src/protocols/toc/toc.c:176
 #, c-format
 msgid "Connect to %s failed"
 msgstr "Anslutning till %s misslyckades"
 
-#: src/protocols/gg/gg.c:503
+#: src/protocols/gg/gg.c:500
 msgid "Unable to ping server"
 msgstr "Kan inte pinga server"
 
-#: src/protocols/gg/gg.c:515
+#: src/protocols/gg/gg.c:512
 msgid "Send as message"
 msgstr "Skicka som meddelande"
 
+#: src/protocols/gg/gg.c:517
+msgid "Looking up GG server"
+msgstr "Slår upp GG-server"
+
 #: src/protocols/gg/gg.c:520
-msgid "Looking up GG server"
-msgstr "Slår upp GG-server"
-
-#: src/protocols/gg/gg.c:523
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "Ogiltigt Gadu-Gadu-UIN angivet"
 
-#: src/protocols/gg/gg.c:570
+#: src/protocols/gg/gg.c:567
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "Du försöker skicka ett meddelande till ett ogiltigt Gadu-Gadu-UIN."
 
 # src/message.c:76
-#: src/protocols/gg/gg.c:632
+#: src/protocols/gg/gg.c:629
 msgid "Couldn't get search results"
 msgstr "Kunde inte få tag i sökresultat"
 
-#: src/protocols/gg/gg.c:637
+#: src/protocols/gg/gg.c:634
 msgid "Gadu-Gadu Search Engine"
 msgstr "Gadu-Gadu-sökmotor"
 
-#: src/protocols/gg/gg.c:662
+#: src/protocols/gg/gg.c:659
 msgid "Active"
 msgstr "Aktiv"
 
-#: src/protocols/gg/gg.c:667 src/protocols/oscar/oscar.c:4106
+#: src/protocols/gg/gg.c:664 src/protocols/oscar/oscar.c:3962
 msgid "UIN"
 msgstr "UIN"
 
 #. First Name
-#: src/protocols/gg/gg.c:671 src/protocols/jabber/jabber.c:605
-#: src/protocols/oscar/oscar.c:4111 src/protocols/trepia/trepia.c:267
+#: src/protocols/gg/gg.c:668 src/protocols/jabber/jabber.c:633
+#: src/protocols/oscar/oscar.c:3967 src/protocols/trepia/trepia.c:267
 msgid "First Name"
 msgstr "Förnamn"
 
 #. Last Name
-#: src/protocols/gg/gg.c:676 src/protocols/jabber/jabber.c:610
-#: src/protocols/oscar/oscar.c:4114 src/protocols/trepia/trepia.c:274
+#: src/protocols/gg/gg.c:673 src/protocols/jabber/jabber.c:638
+#: src/protocols/oscar/oscar.c:3970 src/protocols/trepia/trepia.c:274
 msgid "Last Name"
 msgstr "Efternamn"
 
-#: src/protocols/gg/gg.c:680 src/protocols/gg/gg.c:1392
-#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4108
+#: src/protocols/gg/gg.c:677 src/protocols/gg/gg.c:1388
+#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:3964
 msgid "Nick"
 msgstr "Nick"
 
-#: src/protocols/gg/gg.c:687 src/protocols/gg/gg.c:690
-#, fuzzy
-msgid "Birth Year"
+#: src/protocols/gg/gg.c:684 src/protocols/gg/gg.c:687
+msgid "Birth year"
 msgstr "Födelseår"
 
-#: src/protocols/gg/gg.c:696 src/protocols/gg/gg.c:698
-#: src/protocols/gg/gg.c:700
+#: src/protocols/gg/gg.c:693 src/protocols/gg/gg.c:695
+#: src/protocols/gg/gg.c:697
 msgid "Sex"
 msgstr "Kön"
 
 #. City
-#: src/protocols/gg/gg.c:704 src/protocols/jabber/jabber.c:620
-#: src/protocols/oscar/oscar.c:4160 src/protocols/oscar/oscar.c:4176
+#: src/protocols/gg/gg.c:701 src/protocols/jabber/jabber.c:648
+#: src/protocols/oscar/oscar.c:4016 src/protocols/oscar/oscar.c:4032
 #: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:430
 msgid "City"
 msgstr "Ort"
 
 #. res[0] == username
-#. show it to the user
-#: src/protocols/gg/gg.c:725 src/protocols/msn/msn.c:1303
-#: src/protocols/msn/msn.c:1547 src/protocols/napster/napster.c:387
-#: src/protocols/oscar/oscar.c:2985 src/protocols/oscar/oscar.c:3311
-#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2887
-#: src/protocols/yahoo/yahoo.c:2909 src/protocols/yahoo/yahoo.c:2932
-#: src/protocols/yahoo/yahoo.c:3090 src/protocols/zephyr/zephyr.c:536
+#: src/protocols/gg/gg.c:722 src/protocols/msn/msn.c:1286
+#: src/protocols/msn/msn.c:1530 src/protocols/napster/napster.c:387
+#: src/protocols/oscar/oscar.c:2888 src/protocols/oscar/oscar.c:3203
+#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2785
+#: src/protocols/yahoo/yahoo.c:2807 src/protocols/yahoo/yahoo.c:2830
+#: src/protocols/yahoo/yahoo.c:2988 src/protocols/zephyr/zephyr.c:355
 msgid "Buddy Information"
 msgstr "Information om kompis"
 
-#: src/protocols/gg/gg.c:744
+#: src/protocols/gg/gg.c:741
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "Det finns ingen kompislista lagrad på Gadu-Gadu-servern."
 
-#: src/protocols/gg/gg.c:752
+#: src/protocols/gg/gg.c:749
 msgid "Couldn't Import Buddy List from Server"
 msgstr "Kunde inte importera kompislista från servern"
 
-#: src/protocols/gg/gg.c:815
+#: src/protocols/gg/gg.c:812
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "Kompislistan skickades utan problem till Gadu-Gadu-servern"
 
-#: src/protocols/gg/gg.c:823
+#: src/protocols/gg/gg.c:820
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "Kunde inte överföra kompislista till Gadu-Gadu-servern"
 
-#: src/protocols/gg/gg.c:831
+#: src/protocols/gg/gg.c:828
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "Kompislistan togs utan problem bort från Gadu-Gadu-servern"
 
-#: src/protocols/gg/gg.c:839
+#: src/protocols/gg/gg.c:836
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "Kunde inte ta bort kompislistan från Gadu-Gadu-servern"
 
-#: src/protocols/gg/gg.c:847
+#: src/protocols/gg/gg.c:844
 msgid "Password changed successfully"
 msgstr "Lösenordet ändrades utan problem"
 
-#: src/protocols/gg/gg.c:854
+#: src/protocols/gg/gg.c:851
 msgid "Password couldn't be changed"
 msgstr "Lösenordet kunde inte ändras"
 
-#: src/protocols/gg/gg.c:971
+#: src/protocols/gg/gg.c:968
 msgid "Error communicating with Gadu-Gadu server"
 msgstr "Fel vid kommunikation med Gadu-Gadu-servern"
 
-#: src/protocols/gg/gg.c:972
+#: src/protocols/gg/gg.c:969
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
@@ -4651,35 +4307,35 @@
 "Gaim kunde inte genomföra din begäran på grund av ett kommunikationsproblem "
 "med Gadu-Gadu-HTTPservern. Försök igen senare."
 
-#: src/protocols/gg/gg.c:1000
+#: src/protocols/gg/gg.c:997
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr "Kunde inte importera Gadu-Gadu-kompislistan"
 
-#: src/protocols/gg/gg.c:1001
+#: src/protocols/gg/gg.c:998
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
 msgstr ""
 "Gaim kunde inte ansluta till Gadu-Gadu-kompislistservern. Försök igen senare."
 
-#: src/protocols/gg/gg.c:1074
+#: src/protocols/gg/gg.c:1071
 msgid "Couldn't export buddy list"
 msgstr "Kunde inte exportera kompislista"
 
-#: src/protocols/gg/gg.c:1075 src/protocols/gg/gg.c:1098
+#: src/protocols/gg/gg.c:1072 src/protocols/gg/gg.c:1095
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr "Gaim kunde inte ansluta till kompislistservern. Försök igen senare."
 
-#: src/protocols/gg/gg.c:1097
+#: src/protocols/gg/gg.c:1094
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr "Kunde inte radera Gadu-Gadu-kompislista"
 
-#: src/protocols/gg/gg.c:1146
+#: src/protocols/gg/gg.c:1143
 msgid "Unable to access directory"
 msgstr "Kan inte komma åt katalogen"
 
-#: src/protocols/gg/gg.c:1147
+#: src/protocols/gg/gg.c:1144
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
@@ -4687,11 +4343,11 @@
 "Gaim kunde inte söka i katalogen eftersom det inte gick att ansluta till "
 "katalogservern. Försök igen senare."
 
-#: src/protocols/gg/gg.c:1180
+#: src/protocols/gg/gg.c:1177
 msgid "Unable to change Gadu-Gadu password"
 msgstr "Kan inte ändra Gadu-Gadu lösenord"
 
-#: src/protocols/gg/gg.c:1181
+#: src/protocols/gg/gg.c:1178
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
@@ -4699,32 +4355,32 @@
 "Gaim kunde inte byta ditt lösenord på grund av ett fel vid anslutningen till "
 "Gadu-Gadu-servern. Försök igen senare."
 
-#: src/protocols/gg/gg.c:1198
+#: src/protocols/gg/gg.c:1195
 msgid "Directory Search"
 msgstr "Katalogsökning"
 
-#: src/protocols/gg/gg.c:1207 src/protocols/jabber/jabber.c:1063
+#: src/protocols/gg/gg.c:1204 src/protocols/jabber/jabber.c:1080
 #: src/protocols/toc/toc.c:1546
 msgid "Change Password"
 msgstr "Byt lösenord"
 
-#: src/protocols/gg/gg.c:1215
+#: src/protocols/gg/gg.c:1212
 msgid "Import Buddy List from Server"
 msgstr "Importera kompislista från servern"
 
-#: src/protocols/gg/gg.c:1221
+#: src/protocols/gg/gg.c:1218
 msgid "Export Buddy List to Server"
 msgstr "Exportera kompislista till servern"
 
-#: src/protocols/gg/gg.c:1227
+#: src/protocols/gg/gg.c:1224
 msgid "Delete Buddy List from Server"
 msgstr "Ta bort kompislista från server"
 
-#: src/protocols/gg/gg.c:1260
+#: src/protocols/gg/gg.c:1257
 msgid "Unable to access user profile."
 msgstr "Kan inte komma åt användarprofil."
 
-#: src/protocols/gg/gg.c:1261
+#: src/protocols/gg/gg.c:1258
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
@@ -4742,8 +4398,7 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/gg/gg.c:1373 src/protocols/gg/gg.c:1375
+#: src/protocols/gg/gg.c:1369 src/protocols/gg/gg.c:1371
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Insticksmodul för Gadu-Gadu-protokoll"
 
@@ -4756,17 +4411,17 @@
 msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
 msgstr "Användaren %s (%s%s%s%s%s) vill bli auktoriserad av dig."
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:224
-#: src/protocols/msn/notification.c:581 src/protocols/msn/notification.c:908
-#: src/protocols/msn/notification.c:1075 src/protocols/oscar/oscar.c:2715
-#: src/protocols/oscar/oscar.c:5374
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:197
+#: src/protocols/msn/notification.c:957 src/protocols/msn/notification.c:1284
+#: src/protocols/msn/notification.c:1451 src/protocols/oscar/oscar.c:2618
+#: src/protocols/oscar/oscar.c:5142
 msgid "Authorize"
 msgstr "Auktorisera"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:225
-#: src/protocols/msn/notification.c:582 src/protocols/msn/notification.c:910
-#: src/protocols/msn/notification.c:1077 src/protocols/oscar/oscar.c:2717
-#: src/protocols/oscar/oscar.c:5375
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:198
+#: src/protocols/msn/notification.c:958 src/protocols/msn/notification.c:1286
+#: src/protocols/msn/notification.c:1453 src/protocols/oscar/oscar.c:2620
+#: src/protocols/oscar/oscar.c:5143
 msgid "Deny"
 msgstr "Neka"
 
@@ -4809,87 +4464,61 @@
 "<B>IRC-kommandon som stöds:</B><BR>AWAY JOIN ME MODE<BR>MSG NICK OPERWALL "
 "PING<BR>QUERY QUIT QUOTE UMODE<BR>WALLOPS WHOIS"
 
-#: src/protocols/irc/cmds.c:466 src/protocols/jabber/chat.c:527
+#: src/protocols/irc/cmds.c:459 src/protocols/jabber/chat.c:544
 #, c-format
 msgid "current topic is: %s"
 msgstr "Det aktuella ämnet är: %s"
 
-#: src/protocols/irc/cmds.c:468 src/protocols/jabber/chat.c:529
+#: src/protocols/irc/cmds.c:461 src/protocols/jabber/chat.c:546
 msgid "No topic is set"
 msgstr "Inget ämne är inställt"
 
-#: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:199
-#: src/protocols/yahoo/yahoo_filexfer.c:208
-#: src/protocols/yahoo/yahoo_filexfer.c:217
-msgid "File Transfer Aborted"
-msgstr "Filöverföring avbruten"
-
-#: src/protocols/irc/dcc_send.c:273
-msgid "Gaim could not open a listening port."
-msgstr ""
+#: src/protocols/irc/irc.c:72
+msgid "Error displaying MOTD"
+msgstr "Fel vid visning av MOTD"
+
+#: src/protocols/irc/irc.c:72
+msgid "No MOTD available"
+msgstr "Ingen MOTD tillgänglig"
 
 #: src/protocols/irc/irc.c:73
-msgid "Error displaying MOTD"
-msgstr "Fel vid visning av MOTD"
-
-#: src/protocols/irc/irc.c:73
-msgid "No MOTD available"
-msgstr "Ingen MOTD tillgänglig"
-
-#: src/protocols/irc/irc.c:74
 msgid "There is no MOTD associated with this connection."
 msgstr "Det finns ingen MOTD associerad med denna anslutning."
 
-#: src/protocols/irc/irc.c:77
+#: src/protocols/irc/irc.c:76
 #, c-format
 msgid "MOTD for %s"
 msgstr "MOTD för %s"
 
-#: src/protocols/irc/irc.c:140
+#: src/protocols/irc/irc.c:139
 msgid "View MOTD"
 msgstr "Visa MOTD"
 
-#: src/protocols/irc/irc.c:154 src/protocols/jabber/buddy.c:883
-#: src/protocols/oscar/oscar.c:3189 src/protocols/oscar/oscar.c:6515
-#: src/protocols/yahoo/yahoo.c:2452
-msgid "Send File"
-msgstr "Skicka fil"
-
-#: src/protocols/irc/irc.c:168
+#: src/protocols/irc/irc.c:158
 msgid "_Channel:"
 msgstr "_Kanal:"
 
-#: src/protocols/irc/irc.c:173 src/protocols/jabber/chat.c:59
+#: src/protocols/irc/irc.c:163 src/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "_Lösenord:"
 
-#: src/protocols/irc/irc.c:192
+#: src/protocols/irc/irc.c:182
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC-nickar får inte innehålla blanksteg"
 
-#: src/protocols/irc/irc.c:211 src/protocols/toc/toc.c:228
+#: src/protocols/irc/irc.c:201 src/protocols/toc/toc.c:228
 #, c-format
 msgid "Signon: %s"
 msgstr "Inloggning: %s"
 
-#: src/protocols/irc/irc.c:220
+#: src/protocols/irc/irc.c:210
 msgid "Couldn't create socket"
 msgstr "Kunde inte skapa socket"
 
-#: src/protocols/irc/irc.c:369 src/protocols/trepia/trepia.c:977
+#: src/protocols/irc/irc.c:359 src/protocols/trepia/trepia.c:972
 msgid "Read error"
 msgstr "Läsfel"
 
-#: src/protocols/irc/irc.c:503 src/protocols/yahoo/yahoochat.c:1343
-#, fuzzy
-msgid "Users"
-msgstr "Använd"
-
-#: src/protocols/irc/irc.c:506 src/protocols/yahoo/yahoochat.c:1352
-#, fuzzy
-msgid "Topic"
-msgstr "Ämne:"
-
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -4899,32 +4528,32 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:611
+#: src/protocols/irc/irc.c:533
 msgid "IRC Protocol Plugin"
 msgstr "Insticksmodul för IRC-protokoll"
 
 #. *  summary
-#: src/protocols/irc/irc.c:612
+#: src/protocols/irc/irc.c:534
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Insticksmodulen för IRC-protokollet som inte suger lika mycket"
 
-#: src/protocols/irc/irc.c:629 src/protocols/irc/msgs.c:197
-#: src/protocols/jabber/jabber.c:1369 src/protocols/napster/napster.c:637
+#: src/protocols/irc/irc.c:551 src/protocols/irc/msgs.c:197
+#: src/protocols/jabber/jabber.c:1213 src/protocols/napster/napster.c:636
 msgid "Server"
 msgstr "Server"
 
-#: src/protocols/irc/irc.c:632 src/protocols/jabber/jabber.c:1390
-#: src/protocols/msn/msn.c:1680 src/protocols/napster/napster.c:642
-#: src/protocols/trepia/trepia.c:1350
+#: src/protocols/irc/irc.c:554 src/protocols/jabber/jabber.c:1228
+#: src/protocols/msn/msn.c:1661 src/protocols/napster/napster.c:641
+#: src/protocols/trepia/trepia.c:1344
 msgid "Port"
 msgstr "Port"
 
-#: src/protocols/irc/irc.c:635
+#: src/protocols/irc/irc.c:557
 msgid "Encoding"
 msgstr "Kodning"
 
-#: src/protocols/irc/irc.c:638 src/protocols/irc/msgs.c:191
-#: src/protocols/jabber/jabber.c:580
+#: src/protocols/irc/irc.c:560 src/protocols/irc/msgs.c:191
+#: src/protocols/jabber/jabber.c:608
 msgid "Username"
 msgstr "Användarnamn"
 
@@ -4949,7 +4578,7 @@
 msgid " <i>(identified)</i>"
 msgstr " <i>(identifierad)</i>"
 
-#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:2990
+#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:2888
 msgid "Realname"
 msgstr "För- och efternamn"
 
@@ -4975,111 +4604,111 @@
 msgid "Buddy Information for %s"
 msgstr "Kompisinformation om %s"
 
-#: src/protocols/irc/msgs.c:277
+#: src/protocols/irc/msgs.c:247
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s har bytt ämne till: %s"
 
-#: src/protocols/irc/msgs.c:282
+#: src/protocols/irc/msgs.c:252
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "Ämnet för %s är: %s"
 
-#: src/protocols/irc/msgs.c:296
+#: src/protocols/irc/msgs.c:266
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Okänt meddelande '%s'"
 
-#: src/protocols/irc/msgs.c:297
+#: src/protocols/irc/msgs.c:267
 msgid "Unknown message"
 msgstr "Okänt meddelande"
 
-#: src/protocols/irc/msgs.c:297
+#: src/protocols/irc/msgs.c:267
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim har skickat ett meddelande som IRC-servern inte förstod."
 
-#: src/protocols/irc/msgs.c:400
+#: src/protocols/irc/msgs.c:370
 msgid "No such channel"
 msgstr "Finns ingen sådan kanal"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:411
+#: src/protocols/irc/msgs.c:381
 msgid "no such channel"
 msgstr "Ingen sådan kanal"
 
-#: src/protocols/irc/msgs.c:414
+#: src/protocols/irc/msgs.c:384
 msgid "User is not logged in"
 msgstr "Användaren är inte inloggad"
 
-#: src/protocols/irc/msgs.c:419
+#: src/protocols/irc/msgs.c:389
 msgid "No such nick or channel"
 msgstr "Inget sådant nick eller kanal"
 
-#: src/protocols/irc/msgs.c:439
+#: src/protocols/irc/msgs.c:409
 msgid "Could not send"
 msgstr "Kunde inte skicka"
 
-#: src/protocols/irc/msgs.c:495
+#: src/protocols/irc/msgs.c:465
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Det krävs en inbjudan för att gå in i %s."
 
-#: src/protocols/irc/msgs.c:496
+#: src/protocols/irc/msgs.c:466
 msgid "Invitation only"
 msgstr "Endast inbjudna"
 
-#: src/protocols/irc/msgs.c:592
+#: src/protocols/irc/msgs.c:562
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Du har sparkats ut av %s: (%s)"
 
-#: src/protocols/irc/msgs.c:597
+#: src/protocols/irc/msgs.c:570
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Utsparkad av %s (%s)"
 
-#: src/protocols/irc/msgs.c:618
+#: src/protocols/irc/msgs.c:591
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "läge (%s %s) av %s"
 
-#: src/protocols/irc/msgs.c:697
+#: src/protocols/irc/msgs.c:670
 msgid "Could not change nick"
 msgstr "Kunde inte byta nick"
 
-#: src/protocols/irc/msgs.c:698
+#: src/protocols/irc/msgs.c:671
 msgid "Cannot change nick"
 msgstr "Kan inte ändra nick"
 
-#: src/protocols/irc/msgs.c:719
+#: src/protocols/irc/msgs.c:692
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Du har lämnat kanalen%s%s"
 
-#: src/protocols/irc/msgs.c:759
+#: src/protocols/irc/msgs.c:730
 msgid "Error: invalid PONG from server"
 msgstr "Fel: Ogiltig PONG från server"
 
-#: src/protocols/irc/msgs.c:761
+#: src/protocols/irc/msgs.c:732
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING-svar -- Fördröjning: %lu sekunder"
 
-#: src/protocols/irc/msgs.c:836
+#: src/protocols/irc/msgs.c:802
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Kan inte ansluta till %s:"
 
-#: src/protocols/irc/msgs.c:837
+#: src/protocols/irc/msgs.c:803
 msgid "Cannot join channel"
 msgstr "Kan inte ansluta till kanalen"
 
-#: src/protocols/irc/msgs.c:867
+#: src/protocols/irc/msgs.c:833
 #, c-format
 msgid "Wallops from %s"
 msgstr "Smocka från %s"
 
-#: src/protocols/irc/parse.c:166
+#: src/protocols/irc/parse.c:161
 msgid ""
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
@@ -5087,137 +4716,163 @@
 "(Det blev ett fel vid konverteringen av detta meddelande. Kontrollera "
 "\"Kodning\" inställningen för kontot.)"
 
-#: src/protocols/irc/parse.c:297
+#: src/protocols/irc/parse.c:292
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Svarstid från %s: %lu sekunder"
 
-#: src/protocols/irc/parse.c:298
+#: src/protocols/irc/parse.c:293
 msgid "PONG"
 msgstr "PONG"
 
-#: src/protocols/irc/parse.c:298
+#: src/protocols/irc/parse.c:293
 msgid "CTCP PING reply"
 msgstr "CTCP PING-svar"
 
-#: src/protocols/irc/parse.c:400 src/protocols/oscar/oscar.c:581
+#: src/protocols/irc/parse.c:392 src/protocols/oscar/oscar.c:534
 #: src/protocols/toc/toc.c:218 src/protocols/toc/toc.c:625
 #: src/protocols/toc/toc.c:641 src/protocols/toc/toc.c:709
 msgid "Disconnected."
 msgstr "Frånkopplad."
 
-#: src/protocols/jabber/auth.c:51
+#: src/protocols/jabber/auth.c:52
 msgid "Server requires SSL for login"
 msgstr "Servern kräver SSL vid inloggning"
 
-#: src/protocols/jabber/auth.c:111
-msgid "Server requires plaintext authentication over an unencrypted stream"
-msgstr ""
-
-#: src/protocols/jabber/auth.c:160 src/protocols/jabber/auth.c:161
-#: src/protocols/jabber/auth.c:238 src/protocols/jabber/auth.c:239
-#, fuzzy
-msgid "Plaintext Authentication"
-msgstr "Misslyckad Yahoo!-autentisering"
-
-#: src/protocols/jabber/auth.c:162 src/protocols/jabber/auth.c:240
-msgid ""
-"This server requires plaintext authentication over an unencrypted "
-"connection.  Allow this and continue authentication?"
-msgstr ""
-
-#: src/protocols/jabber/auth.c:170 src/protocols/jabber/auth.c:248
+#: src/protocols/jabber/auth.c:106 src/protocols/jabber/auth.c:181
 msgid "Server does not use any supported authentication method"
 msgstr "Servern använder inga autentiseringsmetoder som stöds"
 
-#: src/protocols/jabber/auth.c:375
+#: src/protocols/jabber/auth.c:170 src/protocols/jabber/jabber.c:462
+msgid "Unknown Error"
+msgstr "Okänt fel"
+
+#: src/protocols/jabber/auth.c:338
 msgid "Invalid challenge from server"
 msgstr "Ogiltigt utmaning från servern"
 
-#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:603
+#: src/protocols/jabber/auth.c:432
+msgid "Bad Protocol"
+msgstr "Fel i protokollet"
+
+#: src/protocols/jabber/auth.c:435
+msgid "Encryption Required"
+msgstr "Kryptering krävs"
+
+#: src/protocols/jabber/auth.c:438
+msgid "Invalid authzid"
+msgstr "Ogiltigt \"authzid\""
+
+#: src/protocols/jabber/auth.c:441
+msgid "Invalid Mechanism"
+msgstr "Ogiltigt mekanism"
+
+#: src/protocols/jabber/auth.c:443
+msgid "Invalid Realm"
+msgstr "Ogiltig gräns"
+
+#: src/protocols/jabber/auth.c:446
+msgid "Mechanism Too Weak"
+msgstr "Mekanism för svag"
+
+#: src/protocols/jabber/auth.c:449 src/protocols/jabber/jabber.c:148
+#: src/protocols/jabber/jabber.c:903 src/protocols/jabber/jabber.c:953
+#: src/protocols/oscar/oscar.c:5553
+msgid "Not Authorized"
+msgstr "Inte auktoriserad"
+
+#: src/protocols/jabber/auth.c:452
+msgid "Temporary Authentication Failure"
+msgstr "Tillfälligt Autentiserings fel"
+
+#: src/protocols/jabber/auth.c:454
+msgid "Authentication Failure"
+msgstr "Autentiseringen misslyckades"
+
+#: src/protocols/jabber/buddy.c:245 src/protocols/jabber/buddy.c:603
 msgid "Full Name"
 msgstr "Fullständigt namn"
 
-#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:616
+#: src/protocols/jabber/buddy.c:246 src/protocols/jabber/buddy.c:616
 msgid "Family Name"
 msgstr "Efternamn"
 
-#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:620
+#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:620
 msgid "Given Name"
 msgstr "Förnamn"
 
-#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:635
-#: src/protocols/jabber/jabber.c:600 src/protocols/yahoo/yahoo.c:2986
+#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:635
+#: src/protocols/jabber/jabber.c:628 src/protocols/yahoo/yahoo.c:2884
 msgid "Nickname"
 msgstr "Nick"
 
-#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/jabber.c:640
+#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/jabber.c:668
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:663
+#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:663
 msgid "Street Address"
 msgstr "Gatuadress"
 
-#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:659
+#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:659
 msgid "Extended Address"
 msgstr "Utökad adress"
 
-#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:667
+#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:667
 msgid "Locality"
 msgstr "Lokalitet"
 
-#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:671
+#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:671
 msgid "Region"
 msgstr "Region"
 
-#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:675
-#: src/protocols/jabber/jabber.c:630
+#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:675
+#: src/protocols/jabber/jabber.c:658
 msgid "Postal Code"
 msgstr "Postnummer"
 
 #. Country
-#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:680
+#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:680
 #: src/protocols/trepia/trepia.c:339 src/protocols/trepia/trepia.c:448
 msgid "Country"
 msgstr "Land"
 
-#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:691
+#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:691
 #: src/protocols/jabber/buddy.c:698
 msgid "Telephone"
 msgstr "Telefon"
 
-#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:709
-#: src/protocols/jabber/buddy.c:717 src/protocols/yahoo/yahoo.c:2982
+#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:709
+#: src/protocols/jabber/buddy.c:717 src/protocols/yahoo/yahoo.c:2880
 msgid "Email"
 msgstr "E-post"
 
-#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:732
+#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:732
 msgid "Organization Name"
 msgstr "Organisationsnamn"
 
-#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:736
+#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:736
 msgid "Organization Unit"
 msgstr "Organisationsenhet"
 
-#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:742
+#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:742
 msgid "Title"
 msgstr "Titel"
 
-#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:745
+#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:745
 msgid "Role"
 msgstr "Roll"
 
-#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:638
-#: src/protocols/oscar/oscar.c:4140
+#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:638
+#: src/protocols/oscar/oscar.c:3996
 msgid "Birthday"
 msgstr "Födelsedag"
 
-#: src/protocols/jabber/buddy.c:508 src/protocols/jabber/buddy.c:509
+#: src/protocols/jabber/buddy.c:506 src/protocols/jabber/buddy.c:507
 msgid "Edit Jabber vCard"
 msgstr "Redigera Jabber-vCard"
 
-#: src/protocols/jabber/buddy.c:510
+#: src/protocols/jabber/buddy.c:508
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -5225,16 +4880,17 @@
 "Alla poster nedan är valfria. Ange endast den information som du vill lämna "
 "ut."
 
-#: src/protocols/jabber/buddy.c:552
+#: src/protocols/jabber/buddy.c:551
 msgid "Jabber ID"
 msgstr "Jabber-ID"
 
-#: src/protocols/jabber/buddy.c:562 src/protocols/jabber/buddy.c:569
-#: src/protocols/jabber/buddy.c:580 src/protocols/jabber/jabber.c:930
+#: src/protocols/jabber/buddy.c:561 src/protocols/jabber/buddy.c:568
+#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:940
+#: src/protocols/jabber/jabber.c:953
 msgid "Status"
 msgstr "Status"
 
-#: src/protocols/jabber/buddy.c:578 src/protocols/jabber/jabber.c:1372
+#: src/protocols/jabber/buddy.c:577 src/protocols/jabber/jabber.c:1216
 msgid "Resource"
 msgstr "Tillgång"
 
@@ -5242,8 +4898,8 @@
 msgid "Middle Name"
 msgstr "Andranamn"
 
-#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:615
-#: src/protocols/oscar/oscar.c:4157 src/protocols/oscar/oscar.c:4173
+#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:643
+#: src/protocols/oscar/oscar.c:4013 src/protocols/oscar/oscar.c:4029
 msgid "Address"
 msgstr "Adress"
 
@@ -5259,31 +4915,31 @@
 msgid "Logo"
 msgstr "Logga"
 
-#: src/protocols/jabber/buddy.c:777
+#: src/protocols/jabber/buddy.c:775
 msgid "Jabber Profile"
 msgstr "Jabber-profil"
 
-#: src/protocols/jabber/buddy.c:893
+#: src/protocols/jabber/buddy.c:915
 msgid "Un-hide From"
 msgstr "Göm inte \"Från\""
 
-#: src/protocols/jabber/buddy.c:896
+#: src/protocols/jabber/buddy.c:918
 msgid "Temporarily Hide From"
 msgstr "Göm temporärt \"Från\""
 
-#: src/protocols/jabber/buddy.c:905
+#: src/protocols/jabber/buddy.c:926
 msgid "Cancel Presence Notification"
 msgstr "Avbryt närvaronotifiering"
 
-#: src/protocols/jabber/buddy.c:913
+#: src/protocols/jabber/buddy.c:934
 msgid "(Re-)Request authorization"
 msgstr "Begär auktorisering (igen)"
 
-#: src/protocols/jabber/buddy.c:919
+#: src/protocols/jabber/buddy.c:940
 msgid "Unsubscribe"
 msgstr "Sluta prenumerera"
 
-#: src/protocols/jabber/chat.c:42 src/protocols/yahoo/yahoochat.c:965
+#: src/protocols/jabber/chat.c:40 src/protocols/yahoo/yahoochat.c:938
 msgid "_Room:"
 msgstr "_Rum:"
 
@@ -5295,505 +4951,333 @@
 msgid "_Handle:"
 msgstr "_Alias:"
 
-#: src/protocols/jabber/chat.c:164
+#: src/protocols/jabber/chat.c:161
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s är inte ett giltigt rumsnamn"
 
-#: src/protocols/jabber/chat.c:165
+#: src/protocols/jabber/chat.c:162
 msgid "Invalid Room Name"
 msgstr "Ogiltigt rumsnamn"
 
-#: src/protocols/jabber/chat.c:170
+#: src/protocols/jabber/chat.c:167
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s är inte ett giltigt servernamn"
 
-#: src/protocols/jabber/chat.c:171 src/protocols/jabber/chat.c:172
+#: src/protocols/jabber/chat.c:168 src/protocols/jabber/chat.c:169
 msgid "Invalid Server Name"
 msgstr "Ogiltigt servernamn"
 
-#: src/protocols/jabber/chat.c:176
+#: src/protocols/jabber/chat.c:173
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s är inte en giltig rumstitel"
 
-#: src/protocols/jabber/chat.c:177 src/protocols/jabber/chat.c:178
+#: src/protocols/jabber/chat.c:174 src/protocols/jabber/chat.c:175
 msgid "Invalid Room Handle"
 msgstr "Ogiltig rumstitel"
 
-#: src/protocols/jabber/chat.c:332
+#: src/protocols/jabber/chat.c:336 src/protocols/jabber/chat.c:489
+#: src/protocols/jabber/message.c:299
+#, c-format
+msgid " (Code %s)"
+msgstr " (Kod %s)"
+
+#: src/protocols/jabber/chat.c:339
 msgid "Configuration error"
 msgstr "Anslutningsfel"
 
-#: src/protocols/jabber/chat.c:341 src/protocols/jabber/chat.c:486
+#: src/protocols/jabber/chat.c:350 src/protocols/jabber/chat.c:503
 msgid "Unable to configure"
 msgstr "Kan inte konfigurera"
 
-#: src/protocols/jabber/chat.c:357
+#: src/protocols/jabber/chat.c:364
 msgid "Room Configuration Error"
 msgstr "Rumkonfigurationsfel"
 
-#: src/protocols/jabber/chat.c:358
+#: src/protocols/jabber/chat.c:365
 msgid "This room is not capable of being configured"
 msgstr "Det här rummet kan inte konfigureras"
 
-#: src/protocols/jabber/chat.c:408 src/protocols/jabber/chat.c:477
+#: src/protocols/jabber/chat.c:492
 msgid "Registration error"
 msgstr "Registreringsfel"
 
-#: src/protocols/jabber/chat.c:556
+#: src/protocols/jabber/chat.c:573
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "Nick ändring stöds inte i \"non-MUC\"-chattrum"
 
-#: src/protocols/jabber/chat.c:599 src/protocols/jabber/chat.c:610
-#, fuzzy
-msgid "Roomlist Error"
-msgstr "Rumkonfigurationsfel"
-
-#: src/protocols/jabber/chat.c:600 src/protocols/jabber/chat.c:611
-#, fuzzy
-msgid "Error retreiving roomlist"
-msgstr "Fel vid läsning från server"
-
-#: src/protocols/jabber/chat.c:651
-#, fuzzy
-msgid "Invalid Server"
-msgstr "Ogiltigt servernamn"
-
-#: src/protocols/jabber/chat.c:688
-#, fuzzy
-msgid "Enter a Conference Server"
-msgstr "Starta konferens"
-
-#: src/protocols/jabber/chat.c:689
-msgid "Select a conference server to query"
-msgstr ""
-
-#: src/protocols/jabber/chat.c:691
-msgid "Find Rooms"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:73
+#: src/protocols/jabber/jabber.c:72
 msgid "Error initializing session"
 msgstr "Fel vid initiering av session"
 
-#: src/protocols/jabber/jabber.c:203 src/protocols/msn/httpmethod.c:255
-#: src/protocols/msn/msn.c:83 src/protocols/msn/msn.c:103
-#: src/protocols/msn/msn.c:161 src/protocols/msn/msn.c:261
-#: src/protocols/msn/msn.c:548 src/protocols/msn/msn.c:721
-#: src/protocols/msn/msn.c:744 src/protocols/msn/msn.c:776
-#: src/protocols/msn/msn.c:784 src/protocols/msn/msn.c:817
-#: src/protocols/msn/msn.c:825 src/protocols/msn/msn.c:839
-#: src/protocols/msn/msn.c:848 src/protocols/msn/msn.c:863
-#: src/protocols/msn/msn.c:873 src/protocols/msn/msn.c:895
-#: src/protocols/msn/msn.c:945 src/protocols/msn/msn.c:983
-#: src/protocols/msn/msn.c:1085 src/protocols/msn/msn.c:1118
-#: src/protocols/msn/msn.c:1139 src/protocols/msn/msn.c:1150
-#: src/protocols/msn/msn.c:1161 src/protocols/msn/msn.c:1185
-#: src/protocols/msn/msn.c:1197 src/protocols/msn/msn.c:1278
-#: src/protocols/msn/notification.c:147 src/protocols/msn/notification.c:175
-#: src/protocols/msn/notification.c:1304 src/protocols/msn/notification.c:1324
-#: src/protocols/msn/session.c:205 src/protocols/trepia/trepia.c:248
-#: src/protocols/trepia/trepia.c:749 src/protocols/trepia/trepia.c:1038
-#: src/protocols/trepia/trepia.c:1082 src/protocols/trepia/trepia.c:1181
-#: src/protocols/trepia/trepia.c:1237
+#: src/protocols/jabber/jabber.c:123
+msgid "Bad Format"
+msgstr "Felaktigt format"
+
+#: src/protocols/jabber/jabber.c:125
+msgid "Bad Namespace Prefix"
+msgstr "Felaktigt namnrymdsprefix"
+
+#: src/protocols/jabber/jabber.c:128
+msgid "Resource Conflict"
+msgstr "Resurskonflikt"
+
+#: src/protocols/jabber/jabber.c:130
+msgid "Connection Timeout"
+msgstr "Anslutningen överskred en tidsgräns och tappades"
+
+#: src/protocols/jabber/jabber.c:132
+msgid "Host Gone"
+msgstr "Värden försvann"
+
+#: src/protocols/jabber/jabber.c:134
+msgid "Host Unknown"
+msgstr "Värd okänd"
+
+#: src/protocols/jabber/jabber.c:136
+msgid "Improper Addressing"
+msgstr "Olämplig adressering"
+
+#: src/protocols/jabber/jabber.c:138
+msgid "Internal Server Error"
+msgstr "Internt serverfel"
+
+#: src/protocols/jabber/jabber.c:140
+msgid "Invalid ID"
+msgstr "Ogiltigt ID"
+
+#: src/protocols/jabber/jabber.c:142
+msgid "Invalid Namespace"
+msgstr "Ogiltig namnrymd"
+
+#: src/protocols/jabber/jabber.c:144
+msgid "Invalid XML"
+msgstr "Ogiltig XML"
+
+#: src/protocols/jabber/jabber.c:146
+msgid "Non-matching Hosts"
+msgstr "Ej överensstämmande värdar"
+
+#: src/protocols/jabber/jabber.c:150
+msgid "Policy Violation"
+msgstr "Policyöverträdelse"
+
+#: src/protocols/jabber/jabber.c:152
+msgid "Remote Connection Failed"
+msgstr "Fjärranslutning misslyckades"
+
+#: src/protocols/jabber/jabber.c:154
+msgid "Resource Constraint"
+msgstr "Resursbegränsning"
+
+#: src/protocols/jabber/jabber.c:156
+msgid "Restricted XML"
+msgstr "Begränsad XML"
+
+#: src/protocols/jabber/jabber.c:158
+msgid "See Other Host"
+msgstr "Se andra värdar"
+
+#: src/protocols/jabber/jabber.c:160
+msgid "System Shutdown"
+msgstr "Systemet stängs av"
+
+#: src/protocols/jabber/jabber.c:162
+msgid "Undefined Condition"
+msgstr "odefinierade villkor"
+
+#: src/protocols/jabber/jabber.c:164
+msgid "Unsupported Encoding"
+msgstr "Stödjer ej kodningen"
+
+#: src/protocols/jabber/jabber.c:166
+msgid "Unsupported Stanza Type"
+msgstr "Ej stöd stroftyp"
+
+#: src/protocols/jabber/jabber.c:168
+msgid "Unsupported Version"
+msgstr "Ej stöd version"
+
+#: src/protocols/jabber/jabber.c:170
+msgid "XML Not Well Formed"
+msgstr "XML:en är inte väl utformad"
+
+#: src/protocols/jabber/jabber.c:172
+msgid "Stream Error"
+msgstr "strömningsfel"
+
+#: src/protocols/jabber/jabber.c:237 src/protocols/msn/httpmethod.c:234
+#: src/protocols/msn/msn.c:82 src/protocols/msn/msn.c:102
+#: src/protocols/msn/msn.c:160 src/protocols/msn/msn.c:260
+#: src/protocols/msn/msn.c:538 src/protocols/msn/msn.c:709
+#: src/protocols/msn/msn.c:732 src/protocols/msn/msn.c:764
+#: src/protocols/msn/msn.c:772 src/protocols/msn/msn.c:805
+#: src/protocols/msn/msn.c:813 src/protocols/msn/msn.c:827
+#: src/protocols/msn/msn.c:836 src/protocols/msn/msn.c:851
+#: src/protocols/msn/msn.c:861 src/protocols/msn/msn.c:883
+#: src/protocols/msn/msn.c:933 src/protocols/msn/msn.c:971
+#: src/protocols/msn/msn.c:1069 src/protocols/msn/msn.c:1101
+#: src/protocols/msn/msn.c:1122 src/protocols/msn/msn.c:1133
+#: src/protocols/msn/msn.c:1144 src/protocols/msn/msn.c:1168
+#: src/protocols/msn/msn.c:1180 src/protocols/msn/msn.c:1261
+#: src/protocols/msn/notification.c:179 src/protocols/msn/notification.c:207
+#: src/protocols/msn/notification.c:1680 src/protocols/msn/notification.c:1700
+#: src/protocols/msn/session.c:208 src/protocols/trepia/trepia.c:248
+#: src/protocols/trepia/trepia.c:749 src/protocols/trepia/trepia.c:1033
+#: src/protocols/trepia/trepia.c:1077 src/protocols/trepia/trepia.c:1176
+#: src/protocols/trepia/trepia.c:1232
 msgid "Write error"
 msgstr "Skrivfel"
 
-#: src/protocols/jabber/jabber.c:241 src/protocols/jabber/jabber.c:261
+#: src/protocols/jabber/jabber.c:275 src/protocols/jabber/jabber.c:295
 msgid "Read Error"
 msgstr "Läsfel"
 
-#: src/protocols/jabber/jabber.c:316
-#, fuzzy
-msgid "Connection Failed"
-msgstr "Fjärranslutning misslyckades"
-
-#: src/protocols/jabber/jabber.c:319
+#: src/protocols/jabber/jabber.c:349
 msgid "SSL Handshake Failed"
 msgstr "SSL-handskakning misslyckades"
 
-#: src/protocols/jabber/jabber.c:362 src/protocols/jabber/jabber.c:691
+#: src/protocols/jabber/jabber.c:387 src/protocols/jabber/jabber.c:717
 msgid "Invalid Jabber ID"
 msgstr "Ogiltigt Jabber-ID"
 
-#: src/protocols/jabber/jabber.c:390 src/protocols/jabber/jabber.c:718
+#: src/protocols/jabber/jabber.c:415 src/protocols/jabber/jabber.c:744
 msgid "SSL support unavailable"
 msgstr "SSL-stöd ej tillgängligt"
 
-#: src/protocols/jabber/jabber.c:400 src/protocols/jabber/jabber.c:728
-#: src/protocols/trepia/trepia.c:1121
+#: src/protocols/jabber/jabber.c:425 src/protocols/jabber/jabber.c:754
+#: src/protocols/trepia/trepia.c:1116
 msgid "Unable to create socket"
 msgstr "Kan inte skapa socket"
 
-#: src/protocols/jabber/jabber.c:425
+#: src/protocols/jabber/jabber.c:450
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registrering av %s@%s lyckades"
 
-#: src/protocols/jabber/jabber.c:427 src/protocols/jabber/jabber.c:428
+#: src/protocols/jabber/jabber.c:452 src/protocols/jabber/jabber.c:453
 msgid "Registration Successful"
 msgstr "Registreringen lyckades"
 
-#: src/protocols/jabber/jabber.c:434 src/protocols/jabber/jabber.c:1183
-msgid "Unknown Error"
-msgstr "Okänt fel"
-
-#: src/protocols/jabber/jabber.c:436 src/protocols/jabber/jabber.c:437
+#: src/protocols/jabber/jabber.c:465
+#, c-format
+msgid "Registration of %s@%s failed: %s"
+msgstr "Registrering av %s@%s misslyckades: %s"
+
+#: src/protocols/jabber/jabber.c:467 src/protocols/jabber/jabber.c:468
 msgid "Registration Failed"
 msgstr "Registreringen misslyckades"
 
-#: src/protocols/jabber/jabber.c:548 src/protocols/jabber/jabber.c:549
+#: src/protocols/jabber/jabber.c:580 src/protocols/jabber/jabber.c:581
 msgid "Already Registered"
 msgstr "Redan registrerad"
 
-#: src/protocols/jabber/jabber.c:584 src/protocols/jabber/jabber.c:1034
+#: src/protocols/jabber/jabber.c:612 src/protocols/jabber/jabber.c:1050
 msgid "Password"
 msgstr "Lösenord"
 
-#: src/protocols/jabber/jabber.c:595
+#: src/protocols/jabber/jabber.c:623
 msgid "E-Mail"
 msgstr "E-post"
 
 #. State
-#: src/protocols/jabber/jabber.c:625 src/protocols/oscar/oscar.c:4163
-#: src/protocols/oscar/oscar.c:4179 src/protocols/trepia/trepia.c:335
+#: src/protocols/jabber/jabber.c:653 src/protocols/oscar/oscar.c:4019
+#: src/protocols/oscar/oscar.c:4035 src/protocols/trepia/trepia.c:335
 #: src/protocols/trepia/trepia.c:439
 msgid "State"
 msgstr "Delstat"
 
-#: src/protocols/jabber/jabber.c:635
+#: src/protocols/jabber/jabber.c:663
 msgid "Phone"
 msgstr "Telefon"
 
-#: src/protocols/jabber/jabber.c:645
+#: src/protocols/jabber/jabber.c:673
 msgid "Date"
 msgstr "Datum"
 
-#: src/protocols/jabber/jabber.c:653
+#: src/protocols/jabber/jabber.c:681
 msgid "Please fill out the information below to register your new account."
 msgstr "Fyll i informationen nedan för att registrera ditt nya konto."
 
-#: src/protocols/jabber/jabber.c:656 src/protocols/jabber/jabber.c:657
+#: src/protocols/jabber/jabber.c:684 src/protocols/jabber/jabber.c:685
 msgid "Register New Jabber Account"
 msgstr "Registrera nytt Jabber-konto"
 
-#: src/protocols/jabber/jabber.c:774 src/protocols/msn/dispatch.c:212
-#: src/protocols/msn/msn.c:487 src/protocols/napster/napster.c:487
-#: src/protocols/oscar/oscar.c:750 src/protocols/trepia/trepia.c:1115
-#: src/protocols/yahoo/yahoo.c:2173
+#: src/protocols/jabber/jabber.c:803 src/protocols/msn/dispatch.c:212
+#: src/protocols/msn/msn.c:483 src/protocols/napster/napster.c:487
+#: src/protocols/oscar/oscar.c:693 src/protocols/trepia/trepia.c:1110
+#: src/protocols/yahoo/yahoo.c:2073
 msgid "Connecting"
 msgstr "Ansluter"
 
-#: src/protocols/jabber/jabber.c:778
+#: src/protocols/jabber/jabber.c:807
 msgid "Initializing Stream"
 msgstr "Initierar flöde"
 
-#: src/protocols/jabber/jabber.c:784
+#: src/protocols/jabber/jabber.c:813
 msgid "Authenticating"
 msgstr "Autentiserar"
 
-#: src/protocols/jabber/jabber.c:793
+#: src/protocols/jabber/jabber.c:823
 msgid "Re-initializing Stream"
 msgstr "Initiera om flöde"
 
-#: src/protocols/jabber/jabber.c:873 src/protocols/jabber/jabber.c:1161
-#: src/protocols/jabber/jabber.c:1202 src/protocols/jabber/jabber.c:1235
-#: src/protocols/oscar/oscar.c:5800
-msgid "Not Authorized"
-msgstr "Inte auktoriserad"
-
-#: src/protocols/jabber/jabber.c:905
-#, fuzzy
-msgid "Both"
-msgstr "Nederst"
-
-#: src/protocols/jabber/jabber.c:907
-msgid "From (To pending)"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:909
-#, fuzzy
-msgid "From"
-msgstr "Jag är ifrån"
-
-#: src/protocols/jabber/jabber.c:912
-#, fuzzy
-msgid "To"
-msgstr "Överst"
-
-#: src/protocols/jabber/jabber.c:914
-msgid "None (To pending)"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:918
-#, fuzzy
-msgid "Subscription"
-msgstr "Beskrivning"
-
-#: src/protocols/jabber/jabber.c:938
+#: src/protocols/jabber/jabber.c:948 src/protocols/jabber/jabber.c:1001
+#: src/protocols/jabber/presence.c:302
 msgid "Error"
 msgstr "Fel"
 
-#: src/protocols/jabber/jabber.c:959 src/protocols/jabber/jutil.c:102
-#: src/protocols/jabber/presence.c:61 src/protocols/jabber/presence.c:112
+#: src/protocols/jabber/jabber.c:964 src/protocols/jabber/jutil.c:101
+#: src/protocols/jabber/presence.c:82
 msgid "Chatty"
 msgstr "Pratig"
 
-#: src/protocols/jabber/jabber.c:961 src/protocols/jabber/jutil.c:105
-#: src/protocols/jabber/presence.c:63 src/protocols/jabber/presence.c:117
+#: src/protocols/jabber/jabber.c:966 src/protocols/jabber/jutil.c:104
+#: src/protocols/jabber/presence.c:87
 msgid "Extended Away"
 msgstr "Utökad frånvaro"
 
-#: src/protocols/jabber/jabber.c:962 src/protocols/jabber/jutil.c:108
-#: src/protocols/jabber/presence.c:65 src/protocols/jabber/presence.c:119
-#: src/protocols/oscar/oscar.c:2933 src/protocols/oscar/oscar.c:4751
-#: src/protocols/oscar/oscar.c:6411
+#: src/protocols/jabber/jabber.c:967 src/protocols/jabber/jutil.c:107
+#: src/protocols/jabber/presence.c:89 src/protocols/oscar/oscar.c:2836
+#: src/protocols/oscar/oscar.c:4599 src/protocols/oscar/oscar.c:6147
 msgid "Do Not Disturb"
 msgstr "Stör inte"
 
-#: src/protocols/jabber/jabber.c:979
+#: src/protocols/jabber/jabber.c:983
 msgid "Password Changed"
 msgstr "Lösenord ändrat"
 
-#: src/protocols/jabber/jabber.c:980
+#: src/protocols/jabber/jabber.c:984
 msgid "Your password has been changed."
 msgstr "Ditt lösenord har ändrats."
 
-#: src/protocols/jabber/jabber.c:984 src/protocols/jabber/jabber.c:985
-#, fuzzy
-msgid "Error changing password"
+#: src/protocols/jabber/jabber.c:994
+#, c-format
+msgid "Error changing password: %s"
 msgstr "Fel vid ändring av lösenord: %s"
 
-#: src/protocols/jabber/jabber.c:1039
+#: src/protocols/jabber/jabber.c:998
+msgid "Unknown error occurred changing password"
+msgstr "Okänt fel uppstod vid lösenordsbyte"
+
+#: src/protocols/jabber/jabber.c:1055
 msgid "Password (again)"
 msgstr "Lösenord (igen)"
 
-#: src/protocols/jabber/jabber.c:1044 src/protocols/jabber/jabber.c:1045
+#: src/protocols/jabber/jabber.c:1060 src/protocols/jabber/jabber.c:1061
 msgid "Change Jabber Password"
 msgstr "Byt Jabber-lösenord"
 
-#: src/protocols/jabber/jabber.c:1045
+#: src/protocols/jabber/jabber.c:1061
 msgid "Please enter your new password"
 msgstr "Ange ditt nya lösenord"
 
-#: src/protocols/jabber/jabber.c:1056 src/protocols/toc/toc.c:1532
+#: src/protocols/jabber/jabber.c:1073 src/protocols/toc/toc.c:1532
 msgid "Set User Info"
 msgstr "Ändra användarinformation"
 
-#: src/protocols/jabber/jabber.c:1141
-msgid "Bad Request"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1143
-#, fuzzy
-msgid "Conflict"
-msgstr "Anslut"
-
-#: src/protocols/jabber/jabber.c:1145
-msgid "Feature Not Implemented"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1147
-#, fuzzy
-msgid "Forbidden"
-msgstr "Dold"
-
-#: src/protocols/jabber/jabber.c:1149
-#, fuzzy
-msgid "Gone"
-msgstr "Inget"
-
-#: src/protocols/jabber/jabber.c:1151 src/protocols/jabber/jabber.c:1225
-msgid "Internal Server Error"
-msgstr "Internt serverfel"
-
-#: src/protocols/jabber/jabber.c:1153
-msgid "Item Not Found"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1155
-#, fuzzy
-msgid "Malformed Jabber ID"
-msgstr "Ogiltigt Jabber-ID"
-
-#: src/protocols/jabber/jabber.c:1157
-#, fuzzy
-msgid "Not Acceptable"
-msgstr "Ej tillgänglig"
-
-#: src/protocols/jabber/jabber.c:1159
-#, fuzzy
-msgid "Not Allowed"
-msgstr "Ej tillgänglig"
-
-#: src/protocols/jabber/jabber.c:1163
-#, fuzzy
-msgid "Payment Required"
-msgstr "Kryptering krävs"
-
-#: src/protocols/jabber/jabber.c:1165
-#, fuzzy
-msgid "Recipient Unavailable"
-msgstr "Tjänsten är otillgänglig"
-
-#: src/protocols/jabber/jabber.c:1169
-#, fuzzy
-msgid "Registration Required"
-msgstr "Registreringen misslyckades"
-
-#: src/protocols/jabber/jabber.c:1171
-msgid "Remote Server Not Found"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1173
-msgid "Remote Server Timeout"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1175
-#, fuzzy
-msgid "Server Overloaded"
-msgstr "Servern är ej tillgänglig"
-
-#: src/protocols/jabber/jabber.c:1177
-#, fuzzy
-msgid "Service Unavailable"
-msgstr "Tjänsten är otillgänglig"
-
-#: src/protocols/jabber/jabber.c:1179
-#, fuzzy
-msgid "Subscription Required"
-msgstr "Kryptering krävs"
-
-#: src/protocols/jabber/jabber.c:1181
-msgid "Unexpected Request"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1188
-#, fuzzy
-msgid "Authorization Aborted"
-msgstr "Auktorisering beviljades"
-
-#: src/protocols/jabber/jabber.c:1190
-#, fuzzy
-msgid "Incorrect encoding in authorization"
-msgstr "Mottog auktorisering"
-
-#: src/protocols/jabber/jabber.c:1193
-msgid "Invalid authzid"
-msgstr "Ogiltigt \"authzid\""
-
-#: src/protocols/jabber/jabber.c:1196
-#, fuzzy
-msgid "Invalid Authorization Mechanism"
-msgstr "Ogiltigt mekanism"
-
-#: src/protocols/jabber/jabber.c:1199
-#, fuzzy
-msgid "Authorization mechanism too weak"
-msgstr "Auktorisering nekades"
-
-#: src/protocols/jabber/jabber.c:1204
-msgid "Temporary Authentication Failure"
-msgstr "Tillfälligt Autentiserings fel"
-
-#: src/protocols/jabber/jabber.c:1206
-msgid "Authentication Failure"
-msgstr "Autentiseringen misslyckades"
-
-#: src/protocols/jabber/jabber.c:1210
-msgid "Bad Format"
-msgstr "Felaktigt format"
-
-#: src/protocols/jabber/jabber.c:1212
-msgid "Bad Namespace Prefix"
-msgstr "Felaktigt namnrymdsprefix"
-
-#: src/protocols/jabber/jabber.c:1215
-msgid "Resource Conflict"
-msgstr "Resurskonflikt"
-
-#: src/protocols/jabber/jabber.c:1217
-msgid "Connection Timeout"
-msgstr "Anslutningen överskred en tidsgräns och tappades"
-
-#: src/protocols/jabber/jabber.c:1219
-msgid "Host Gone"
-msgstr "Värden försvann"
-
-#: src/protocols/jabber/jabber.c:1221
-msgid "Host Unknown"
-msgstr "Värd okänd"
-
-#: src/protocols/jabber/jabber.c:1223
-msgid "Improper Addressing"
-msgstr "Olämplig adressering"
-
-#: src/protocols/jabber/jabber.c:1227
-msgid "Invalid ID"
-msgstr "Ogiltigt ID"
-
-#: src/protocols/jabber/jabber.c:1229
-msgid "Invalid Namespace"
-msgstr "Ogiltig namnrymd"
-
-#: src/protocols/jabber/jabber.c:1231
-msgid "Invalid XML"
-msgstr "Ogiltig XML"
-
-#: src/protocols/jabber/jabber.c:1233
-msgid "Non-matching Hosts"
-msgstr "Ej överensstämmande värdar"
-
-#: src/protocols/jabber/jabber.c:1237
-msgid "Policy Violation"
-msgstr "Policyöverträdelse"
-
-#: src/protocols/jabber/jabber.c:1239
-msgid "Remote Connection Failed"
-msgstr "Fjärranslutning misslyckades"
-
-#: src/protocols/jabber/jabber.c:1241
-msgid "Resource Constraint"
-msgstr "Resursbegränsning"
-
-#: src/protocols/jabber/jabber.c:1243
-msgid "Restricted XML"
-msgstr "Begränsad XML"
-
-#: src/protocols/jabber/jabber.c:1245
-msgid "See Other Host"
-msgstr "Se andra värdar"
-
-#: src/protocols/jabber/jabber.c:1247
-msgid "System Shutdown"
-msgstr "Systemet stängs av"
-
-#: src/protocols/jabber/jabber.c:1249
-msgid "Undefined Condition"
-msgstr "odefinierade villkor"
-
-#: src/protocols/jabber/jabber.c:1251
-msgid "Unsupported Encoding"
-msgstr "Stödjer ej kodningen"
-
-#: src/protocols/jabber/jabber.c:1253
-msgid "Unsupported Stanza Type"
-msgstr "Ej stöd stroftyp"
-
-#: src/protocols/jabber/jabber.c:1255
-msgid "Unsupported Version"
-msgstr "Ej stöd version"
-
-#: src/protocols/jabber/jabber.c:1257
-msgid "XML Not Well Formed"
-msgstr "XML:en är inte väl utformad"
-
-#: src/protocols/jabber/jabber.c:1259
-msgid "Stream Error"
-msgstr "strömningsfel"
-
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -5804,125 +5288,108 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/jabber/jabber.c:1348 src/protocols/jabber/jabber.c:1350
+#: src/protocols/jabber/jabber.c:1193 src/protocols/jabber/jabber.c:1195
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber-insticksmodul"
 
-#: src/protocols/jabber/jabber.c:1375
+#: src/protocols/jabber/jabber.c:1219
 msgid "Use TLS if available"
 msgstr "Använd TLS om tillgänglig"
 
-#: src/protocols/jabber/jabber.c:1380
+#: src/protocols/jabber/jabber.c:1224
 msgid "Force old SSL"
 msgstr "Tvinga till gammal SSL"
 
-#: src/protocols/jabber/jabber.c:1385
-msgid "Allow plaintext auth over unencrypted streams"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1394
+#: src/protocols/jabber/jabber.c:1232
 msgid "Connect server"
 msgstr "Anslut server"
 
-#: src/protocols/jabber/jabber.c:1411
-msgid "Hide Operating System"
-msgstr ""
-
-#: src/protocols/jabber/message.c:111
+#: src/protocols/jabber/message.c:125
 #, c-format
 msgid "Message from %s"
 msgstr "Meddelande från %s"
 
-#: src/protocols/jabber/message.c:173
+#: src/protocols/jabber/message.c:187
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s har satt ämnet till: %s"
 
-#: src/protocols/jabber/message.c:175
+#: src/protocols/jabber/message.c:189
 #, c-format
 msgid "The topic is: %s"
 msgstr "Ämnet är: %s"
 
-#: src/protocols/jabber/message.c:222
+#: src/protocols/jabber/message.c:236
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Leverans av meddelande till %s misslyckades: %s"
 
-#: src/protocols/jabber/message.c:225
+#: src/protocols/jabber/message.c:239
 msgid "Jabber Message Error"
 msgstr "Jabber-meddelandefel"
 
-#: src/protocols/jabber/message.c:288
-#, c-format
-msgid " (Code %s)"
-msgstr " (Kod %s)"
-
-#: src/protocols/jabber/parser.c:131
+#: src/protocols/jabber/parser.c:129
 msgid "XML Parse error"
 msgstr "XML tolkningsfel"
 
-#: src/protocols/jabber/presence.c:216
+#: src/protocols/jabber/presence.c:187
 msgid "Unknown Error in presence"
 msgstr "Okänt fel i närvaro"
 
-#: src/protocols/jabber/presence.c:219
+#: src/protocols/jabber/presence.c:192
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr "Användaren %s vill lägga till dig i dennes kompislista."
 
-#: src/protocols/jabber/presence.c:272 src/protocols/jabber/presence.c:273
+#: src/protocols/jabber/presence.c:253 src/protocols/jabber/presence.c:254
 msgid "Create New Room"
 msgstr "Skapa nytt rum"
 
-#: src/protocols/jabber/presence.c:274
+#: src/protocols/jabber/presence.c:255
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
-msgstr ""
-"Du skapar ett nytt rum. Vill du konfigurera det eller nöjer du dig med "
-"förvalda inställningar?"
-
-#: src/protocols/jabber/presence.c:276
+msgstr "Du skapar ett nytt rum. Vill du konfigurera det eller nöjer du dig med förvalda inställningar?"
+
+#: src/protocols/jabber/presence.c:257
 msgid "Configure Room"
 msgstr "Konfigurera rum"
 
-#: src/protocols/jabber/presence.c:278
+#: src/protocols/jabber/presence.c:259
 msgid "Accept Defaults"
 msgstr "Förvalda inställningar"
 
+#: src/protocols/jabber/presence.c:292 src/protocols/oscar/oscar.c:2947
+msgid "Unknown error"
+msgstr "Okänt fel"
+
 #: src/protocols/jabber/presence.c:298
-#, fuzzy, c-format
-msgid "Error in chat %s"
-msgstr "Fel vid sparning av bild: %s"
-
-#: src/protocols/jabber/presence.c:301
-#, fuzzy, c-format
-msgid "Error joining chat %s"
-msgstr "Fel vid sparning av bild: %s"
-
-#: src/protocols/jabber/si.c:579
-#, c-format
-msgid "Unable to send file to %s, user does not support file transfers"
-msgstr ""
-
-#: src/protocols/jabber/si.c:580 src/protocols/jabber/si.c:581
+msgid "Unable to join chat"
+msgstr "Kan inte ansluta till chatt"
+
+#: src/protocols/jabber/si.c:233
+#, c-format
+msgid "Could not send %s to %s, protocol not supported."
+msgstr "Kunde inte skicka %s till %s, protokollet stöds ej."
+
+#: src/protocols/jabber/si.c:234 src/protocols/jabber/si.c:235
 msgid "File Send Failed"
 msgstr "Filsändning misslyckades"
 
-#: src/protocols/msn/dispatch.c:42 src/protocols/msn/notification.c:246
+#: src/protocols/msn/dispatch.c:42 src/protocols/msn/notification.c:278
+#: src/protocols/msn/notification.c:521
 msgid "Unable to request USR\n"
 msgstr "Kan inte begära USR\n"
 
-#: src/protocols/msn/dispatch.c:59 src/protocols/msn/notification.c:263
+#: src/protocols/msn/dispatch.c:59 src/protocols/msn/notification.c:295
 msgid "Unable to login using MD5"
 msgstr "Kan inte logga in med MD5"
 
-#: src/protocols/msn/dispatch.c:68 src/protocols/msn/notification.c:272
+#: src/protocols/msn/dispatch.c:68 src/protocols/msn/notification.c:304
 msgid "Unable to send USR"
 msgstr "Kan inte skicka USR"
 
-#: src/protocols/msn/dispatch.c:73 src/protocols/msn/notification.c:277
+#: src/protocols/msn/dispatch.c:73 src/protocols/msn/notification.c:309
 msgid "Requesting to send password"
 msgstr "Begär att få skicka lösenord"
 
@@ -5930,15 +5397,15 @@
 msgid "Protocol version not supported"
 msgstr "Protokollversionen stöds inte"
 
-#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:416
+#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:792
 msgid "Unable to request CVR\n"
 msgstr "Kan inte begära CVR\n"
 
-#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:425
+#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:801
 msgid "Unable to request INF\n"
 msgstr "Kan inte begära INF\n"
 
-#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1551
+#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1927
 msgid "Got invalid XFR"
 msgstr "Har felaktig XFR"
 
@@ -5950,16 +5417,16 @@
 msgid "Unable to parse message."
 msgstr "Kan inte avkoda meddelandet."
 
-#: src/protocols/msn/dispatch.c:232 src/protocols/msn/notification.c:521
-#: src/protocols/msn/notification.c:1811
+#: src/protocols/msn/dispatch.c:232 src/protocols/msn/notification.c:897
+#: src/protocols/msn/notification.c:2187
 msgid "Unable to write to server"
 msgstr "Kan inte skriva till servern"
 
-#: src/protocols/msn/dispatch.c:236 src/protocols/msn/notification.c:1818
+#: src/protocols/msn/dispatch.c:236 src/protocols/msn/notification.c:2194
 msgid "Syncing with server"
 msgstr "Synkroniserar med server"
 
-#: src/protocols/msn/dispatch.c:250 src/protocols/msn/notification.c:1832
+#: src/protocols/msn/dispatch.c:250 src/protocols/msn/notification.c:2208
 msgid "Error reading from server"
 msgstr "Fel vid läsning från server"
 
@@ -6055,157 +5522,146 @@
 msgid "Too many hits to a FND"
 msgstr "För många träffar på ett FND"
 
-#: src/protocols/msn/error.c:107 src/protocols/oscar/oscar.c:185
+#: src/protocols/msn/error.c:107 src/protocols/oscar/oscar.c:182
 msgid "Not logged in"
 msgstr "Inte inloggad"
 
 #: src/protocols/msn/error.c:111
-#, fuzzy
-msgid "Service Temporarily Unavailable"
-msgstr "Katalogtjänsten är tillfälligt onåbar."
+msgid "Internal server error"
+msgstr "Internt serverfel"
 
 #: src/protocols/msn/error.c:114
 msgid "Database server error"
 msgstr "Databasserverfel"
 
 #: src/protocols/msn/error.c:117
-#, fuzzy
-msgid "Command disabled"
-msgstr "Kommando"
-
-#: src/protocols/msn/error.c:120
 msgid "File operation error"
 msgstr "Filoperationsfel"
 
-#: src/protocols/msn/error.c:123
+#: src/protocols/msn/error.c:120
 msgid "Memory allocation error"
 msgstr "Minnesallokeringsfel"
 
-#: src/protocols/msn/error.c:126
+#: src/protocols/msn/error.c:123
 msgid "Wrong CHL value sent to server"
 msgstr "Fel CHL-värde skickat till servern"
 
-#: src/protocols/msn/error.c:130
+#: src/protocols/msn/error.c:127
 msgid "Server busy"
 msgstr "Servern upptagen"
 
-#: src/protocols/msn/error.c:133 src/protocols/msn/error.c:146
-#: src/protocols/msn/error.c:201
+#: src/protocols/msn/error.c:130 src/protocols/msn/error.c:143
+#: src/protocols/msn/error.c:198
 msgid "Server unavailable"
 msgstr "Servern är ej tillgänglig"
 
-#: src/protocols/msn/error.c:136
+#: src/protocols/msn/error.c:133
 msgid "Peer Notification server down"
 msgstr "Motpartsnotifieringsserver nere"
 
-#: src/protocols/msn/error.c:139
+#: src/protocols/msn/error.c:136
 msgid "Database connect error"
 msgstr "Databasanslutningsfel"
 
-#: src/protocols/msn/error.c:143
+#: src/protocols/msn/error.c:140
 msgid "Server is going down (abandon ship)"
 msgstr "Servern är påväg ner (överge skeppet)"
 
-#: src/protocols/msn/error.c:150
+#: src/protocols/msn/error.c:147
 msgid "Error creating connection"
 msgstr "Fel vid skapandet av anslutning"
 
-#: src/protocols/msn/error.c:154
+#: src/protocols/msn/error.c:151
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR-parametrar är antingen okända eller inte tillåtna"
 
-#: src/protocols/msn/error.c:157 src/protocols/msn/notification.c:310
+#: src/protocols/msn/error.c:154 src/protocols/msn/notification.c:636
 msgid "Unable to write"
 msgstr "Kan inte skriva"
 
+#: src/protocols/msn/error.c:157
+msgid "Session overload"
+msgstr "Sessionsöverlast"
+
 #: src/protocols/msn/error.c:160
-msgid "Session overload"
-msgstr "Sessionsöverlast"
-
-#: src/protocols/msn/error.c:163
 msgid "User is too active"
 msgstr "Användaren är för aktiv"
 
-#: src/protocols/msn/error.c:166
+#: src/protocols/msn/error.c:163
 msgid "Too many sessions"
 msgstr "För många sessioner"
 
-#: src/protocols/msn/error.c:169 src/protocols/msn/error.c:175
+#: src/protocols/msn/error.c:166 src/protocols/msn/error.c:172
 msgid "Not expected"
 msgstr "Ej väntat"
 
-#: src/protocols/msn/error.c:172
+#: src/protocols/msn/error.c:169
 msgid "Bad friend file"
 msgstr "Fel på friend-fil"
 
-#: src/protocols/msn/error.c:180
+#: src/protocols/msn/error.c:177
 msgid "Friendly name changes too rapidly"
 msgstr "Smeknamn ändras för ofta"
 
-#: src/protocols/msn/error.c:189
+#: src/protocols/msn/error.c:186
 msgid "Server too busy"
 msgstr "Servern är för upptagen"
 
-#: src/protocols/msn/error.c:193 src/protocols/oscar/oscar.c:1163
+#: src/protocols/msn/error.c:190 src/protocols/oscar/oscar.c:1075
 #: src/protocols/toc/toc.c:659
 msgid "Authentication failed"
 msgstr "Autentisering misslyckades"
 
-#: src/protocols/msn/error.c:196
+#: src/protocols/msn/error.c:193
 msgid "Not allowed when offline"
 msgstr "Inte tillåtet vid ej ansluten"
 
-#: src/protocols/msn/error.c:204
+#: src/protocols/msn/error.c:201
 msgid "Not accepting new users"
 msgstr "Accepterar inte nya användare"
 
-#: src/protocols/msn/error.c:208
+#: src/protocols/msn/error.c:205
 msgid "Kids Passport without parental consent"
 msgstr "Barn-passport utan förälders medgivande"
 
-#: src/protocols/msn/error.c:212
+#: src/protocols/msn/error.c:209
 msgid "Passport account not yet verified"
 msgstr "Passkonto ännu inte verifierat"
 
-#: src/protocols/msn/error.c:215
-#, fuzzy
-msgid "Bad ticket"
-msgstr "Kompistickare"
-
-#: src/protocols/msn/error.c:219
+#: src/protocols/msn/error.c:213
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "Okänd felkod %d"
 
-#: src/protocols/msn/msn.c:71
+#: src/protocols/msn/msn.c:70
 msgid "Your new MSN friendly name is too long."
 msgstr "Ditt nya MSN-alias är för långt."
 
-#: src/protocols/msn/msn.c:178
+#: src/protocols/msn/msn.c:177
 msgid "Set your friendly name."
 msgstr "Ställ in alias."
 
-#: src/protocols/msn/msn.c:179
+#: src/protocols/msn/msn.c:178
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Detta är det namn som andra MSN-användare kommer att se."
 
-#: src/protocols/msn/msn.c:191
+#: src/protocols/msn/msn.c:190
 msgid "Set your home phone number."
 msgstr "Ange ditt hemtelefonnummer."
 
-#: src/protocols/msn/msn.c:202
+#: src/protocols/msn/msn.c:201
 msgid "Set your work phone number."
 msgstr "Ange ditt jobbtelefonnummer."
 
-#: src/protocols/msn/msn.c:213
+#: src/protocols/msn/msn.c:212
 msgid "Set your mobile phone number."
 msgstr "Ange ditt mobiltelefonnummer."
 
-#: src/protocols/msn/msn.c:222
+#: src/protocols/msn/msn.c:221
 msgid "Allow MSN Mobile pages?"
 msgstr "Tillåt MSN-mobilsökning?"
 
-#: src/protocols/msn/msn.c:223
+#: src/protocols/msn/msn.c:222
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
@@ -6213,191 +5669,188 @@
 "Vill du tillåta kompisar i din kompislista att skicka MSN-mobilsökningar "
 "till din mobiltelefon eller annan mobil enhet?"
 
-#: src/protocols/msn/msn.c:227
+#: src/protocols/msn/msn.c:226
 msgid "Allow"
 msgstr "Tillåt"
 
-#: src/protocols/msn/msn.c:228
+#: src/protocols/msn/msn.c:227
 msgid "Disallow"
 msgstr "Tillåt ej"
 
-#: src/protocols/msn/msn.c:245
+#: src/protocols/msn/msn.c:244
 msgid "Send a mobile message."
 msgstr "Skicka ett mobilmeddelande."
 
-#: src/protocols/msn/msn.c:247
+#: src/protocols/msn/msn.c:246
 msgid "Page"
 msgstr "Sök"
 
-#: src/protocols/msn/msn.c:333 src/protocols/yahoo/yahoo.c:2403
+#: src/protocols/msn/msn.c:332 src/protocols/yahoo/yahoo.c:2301
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>Status:</b> %s"
 
-#: src/protocols/msn/msn.c:346 src/protocols/msn/msn.c:640
+#: src/protocols/msn/msn.c:345 src/protocols/msn/msn.c:628
 #: src/protocols/msn/state.c:32
 msgid "Away From Computer"
 msgstr "Borta från Datorn"
 
-#: src/protocols/msn/msn.c:347 src/protocols/msn/msn.c:642
-#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2271
-#: src/protocols/yahoo/yahoo.c:2596 src/protocols/yahoo/yahoo.c:2704
+#: src/protocols/msn/msn.c:346 src/protocols/msn/msn.c:630
+#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2169
+#: src/protocols/yahoo/yahoo.c:2494 src/protocols/yahoo/yahoo.c:2602
 msgid "Be Right Back"
 msgstr "Strax tillbaka"
 
-#: src/protocols/msn/msn.c:348 src/protocols/msn/msn.c:644
-#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:2273
-#: src/protocols/yahoo/yahoo.c:2598 src/protocols/yahoo/yahoo.c:2705
+#: src/protocols/msn/msn.c:347 src/protocols/msn/msn.c:632
+#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:2171
+#: src/protocols/yahoo/yahoo.c:2496 src/protocols/yahoo/yahoo.c:2603
 msgid "Busy"
 msgstr "Upptagen"
 
-#: src/protocols/msn/msn.c:349 src/protocols/msn/msn.c:646
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2281
-#: src/protocols/yahoo/yahoo.c:2606 src/protocols/yahoo/yahoo.c:2709
+#: src/protocols/msn/msn.c:348 src/protocols/msn/msn.c:634
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2179
+#: src/protocols/yahoo/yahoo.c:2504 src/protocols/yahoo/yahoo.c:2607
 msgid "On The Phone"
 msgstr "Pratar i telefon"
 
-#: src/protocols/msn/msn.c:350 src/protocols/msn/msn.c:648
-#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2285
-#: src/protocols/yahoo/yahoo.c:2610 src/protocols/yahoo/yahoo.c:2711
+#: src/protocols/msn/msn.c:349 src/protocols/msn/msn.c:636
+#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2183
+#: src/protocols/yahoo/yahoo.c:2508 src/protocols/yahoo/yahoo.c:2609
 msgid "Out To Lunch"
 msgstr "På lunch"
 
-#: src/protocols/msn/msn.c:351 src/protocols/msn/msn.c:650
-#: src/protocols/zephyr/zephyr.c:1173 src/protocols/zephyr/zephyr.c:1188
+#: src/protocols/msn/msn.c:350 src/protocols/msn/msn.c:638
+#: src/protocols/zephyr/zephyr.c:883 src/protocols/zephyr/zephyr.c:898
 msgid "Hidden"
 msgstr "Dold"
 
-#: src/protocols/msn/msn.c:363
+#: src/protocols/msn/msn.c:362
 msgid "Set Friendly Name"
 msgstr "Ange alias"
 
-#: src/protocols/msn/msn.c:371
+#: src/protocols/msn/msn.c:370
 msgid "Set Home Phone Number"
 msgstr "Ange hemtelefonnummer"
 
-#: src/protocols/msn/msn.c:377
+#: src/protocols/msn/msn.c:376
 msgid "Set Work Phone Number"
 msgstr "Ange jobbtelefonnummer"
 
-#: src/protocols/msn/msn.c:383
+#: src/protocols/msn/msn.c:382
 msgid "Set Mobile Phone Number"
 msgstr "Ställ in mobilnummer"
 
-#: src/protocols/msn/msn.c:392
+#: src/protocols/msn/msn.c:391
 msgid "Enable/Disable Mobile Devices"
 msgstr "Tillåt mobila enheter"
 
-#: src/protocols/msn/msn.c:399
+#: src/protocols/msn/msn.c:398
 msgid "Allow/Disallow Mobile Pages"
 msgstr "Tillåt mobilsökningar"
 
-#: src/protocols/msn/msn.c:425
+#: src/protocols/msn/msn.c:424
 msgid "Send to Mobile"
 msgstr "Skicka till mobil"
 
-#: src/protocols/msn/msn.c:434
+#: src/protocols/msn/msn.c:433
 msgid "Initiate Chat"
 msgstr "Starta chatt"
 
-#: src/protocols/msn/msn.c:458
+#: src/protocols/msn/msn.c:457
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
-msgstr ""
-"SSL-stöd krävs för att använda MSN. Installera ett SSL-bibliotek som stöds "
-"av Gaim. Se http://gaim.sf.net/faq-ssl.php för mer information (på engelska)."
-
-#: src/protocols/msn/msn.c:757
-#, fuzzy, c-format
+msgstr "SSL-stöd krävs för att använda MSN. Installera ett SSL-bibliotek som stöds av Gaim. Se http://gaim.sf.net/faq-ssl.php för mer information (på engelska)."
+
+#: src/protocols/msn/msn.c:745
+#, c-format
 msgid ""
-"An MSN screen name must be in the form \"user@server.com\". Perhaps you "
-"meant %s@hotmail.com. No changes were made to your allow list."
+"An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
+"%s@hotmail.com. No changes were made to your allow list."
 msgstr ""
 "Ett MSN användar-ID måste ha formatet \"användare@server.com\". Du kanske "
 "menade %s@hotmail.com. Ingen förändring gjordes i din godkännlista."
 
-#: src/protocols/msn/msn.c:761 src/protocols/msn/msn.c:801
-#, fuzzy
-msgid "Invalid MSN screen name"
+#: src/protocols/msn/msn.c:749 src/protocols/msn/msn.c:789
+msgid "Invalid MSN screenname"
 msgstr "Ogiltigt MSN användar-ID"
 
-#: src/protocols/msn/msn.c:797
-#, fuzzy, c-format
+#: src/protocols/msn/msn.c:785
+#, c-format
 msgid ""
-"An MSN screen name must be in the form \"user@server.com\". Perhaps you "
-"meant %s@hotmail.com. No changes were made to your block list."
+"An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
+"%s@hotmail.com. No changes were made to your block list."
 msgstr ""
 "Ett MSN användar-ID måste ha formatet \"användare@server.com\". Du kanske "
 "menade %s@hotmail.com. Ingen förändring gjordes i din blockeringslista."
 
-#: src/protocols/msn/msn.c:1304 src/protocols/yahoo/yahoo.c:2888
+#: src/protocols/msn/msn.c:1287 src/protocols/yahoo/yahoo.c:2786
 msgid "<html><body><b>Error retrieving profile</b></body></html>"
 msgstr "<html><body><b>Fel vid hämtning av profil</b></body></html>"
 
 #. Age
-#: src/protocols/msn/msn.c:1374 src/protocols/oscar/oscar.c:4145
+#: src/protocols/msn/msn.c:1357 src/protocols/oscar/oscar.c:4001
 #: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:413
-#: src/protocols/yahoo/yahoo.c:2998
+#: src/protocols/yahoo/yahoo.c:2896
 msgid "Age"
 msgstr "Ålder"
 
 #. Gender
-#: src/protocols/msn/msn.c:1381 src/protocols/oscar/oscar.c:4131
+#: src/protocols/msn/msn.c:1364 src/protocols/oscar/oscar.c:3987
 #: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:421
-#: src/protocols/yahoo/yahoo.c:3006
+#: src/protocols/yahoo/yahoo.c:2904
 msgid "Gender"
 msgstr "Kön"
 
-#: src/protocols/msn/msn.c:1389 src/protocols/yahoo/yahoo.c:3002
+#: src/protocols/msn/msn.c:1372 src/protocols/yahoo/yahoo.c:2900
 msgid "Marital Status"
 msgstr "Civilstånd"
 
-#: src/protocols/msn/msn.c:1396 src/protocols/yahoo/yahoo.c:2994
+#: src/protocols/msn/msn.c:1379 src/protocols/yahoo/yahoo.c:2892
 msgid "Location"
 msgstr "Plats"
 
-#: src/protocols/msn/msn.c:1404 src/protocols/yahoo/yahoo.c:3010
+#: src/protocols/msn/msn.c:1387 src/protocols/yahoo/yahoo.c:2908
 msgid "Occupation"
 msgstr "Sysselsättning"
 
-#: src/protocols/msn/msn.c:1421 src/protocols/msn/msn.c:1427
-#: src/protocols/msn/msn.c:1434 src/protocols/msn/msn.c:1441
-#: src/protocols/msn/msn.c:1448
+#: src/protocols/msn/msn.c:1404 src/protocols/msn/msn.c:1410
+#: src/protocols/msn/msn.c:1417 src/protocols/msn/msn.c:1424
+#: src/protocols/msn/msn.c:1431
 msgid "A Little About Me"
 msgstr "Lite om mig"
 
-#: src/protocols/msn/msn.c:1457 src/protocols/msn/msn.c:1470
-#: src/protocols/msn/msn.c:1477
+#: src/protocols/msn/msn.c:1440 src/protocols/msn/msn.c:1453
+#: src/protocols/msn/msn.c:1460
 msgid "Favorite Things"
 msgstr "Favoritsaker"
 
-#: src/protocols/msn/msn.c:1486 src/protocols/msn/msn.c:1492
-#: src/protocols/msn/msn.c:1499
+#: src/protocols/msn/msn.c:1469 src/protocols/msn/msn.c:1475
+#: src/protocols/msn/msn.c:1482
 msgid "Hobbies and Interests"
 msgstr "Hobbies och intressen"
 
-#: src/protocols/msn/msn.c:1508 src/protocols/msn/msn.c:1514
-#: src/protocols/yahoo/yahoo.c:3045
+#: src/protocols/msn/msn.c:1491 src/protocols/msn/msn.c:1497
+#: src/protocols/yahoo/yahoo.c:2943
 msgid "Favorite Quote"
 msgstr "Favoritcitat"
 
-#: src/protocols/msn/msn.c:1522 src/protocols/yahoo/yahoo.c:3081
+#: src/protocols/msn/msn.c:1505 src/protocols/yahoo/yahoo.c:2979
 msgid "Last Updated"
 msgstr "Senast uppdaterad"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1533 src/protocols/trepia/trepia.c:289
+#: src/protocols/msn/msn.c:1516 src/protocols/trepia/trepia.c:289
 #: src/protocols/trepia/trepia.c:457
 msgid "Homepage"
 msgstr "Hemsida"
 
-#: src/protocols/msn/msn.c:1555 src/protocols/yahoo/yahoo.c:3096
+#: src/protocols/msn/msn.c:1538 src/protocols/yahoo/yahoo.c:2994
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "Användarinformation om %s är inte tillgänglig"
 
-#: src/protocols/msn/msn.c:1557 src/protocols/yahoo/yahoo.c:3098
+#: src/protocols/msn/msn.c:1540 src/protocols/yahoo/yahoo.c:2996
 msgid "The user's profile is empty."
 msgstr "Användarens profil är tom."
 
@@ -6411,88 +5864,91 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/msn/msn.c:1655 src/protocols/msn/msn.c:1657
+#: src/protocols/msn/msn.c:1637 src/protocols/msn/msn.c:1639
 msgid "MSN Protocol Plugin"
 msgstr "Insticksmodul för MSN-Protokollet"
 
-#: src/protocols/msn/msn.c:1675 src/protocols/trepia/trepia.c:1345
+#: src/protocols/msn/msn.c:1656 src/protocols/trepia/trepia.c:1339
 msgid "Login server"
 msgstr "Inloggningsserver"
 
-#: src/protocols/msn/msn.c:1684
+#: src/protocols/msn/msn.c:1666
 msgid "Use HTTP Method"
 msgstr "Använd HTTP-metod"
 
-#: src/protocols/msn/msn.c:1702
-msgid "Display conversation closed notices"
-msgstr ""
-
-#: src/protocols/msn/msn.c:1707
-msgid "Display timeout notices"
-msgstr ""
-
-#: src/protocols/msn/nexus.c:56
-msgid "Unable to connect to server"
-msgstr "Kan inte ansluta till servern"
-
-#: src/protocols/msn/nexus.c:121 src/protocols/msn/nexus.c:130
-msgid "Unable to write to MSN Nexus server."
-msgstr "Kan inte skriva till MSN Nexus-server."
-
-#: src/protocols/msn/nexus.c:147
-msgid "MSN Nexus server returned invalid redirect information."
-msgstr "MSN Nexus-servern svarade med ogiltig omdirigeringsinformation."
-
-#: src/protocols/msn/nexus.c:204
-msgid "Unknown error when attempting to authorize with MSN login server."
-msgstr "Okänt fel vid försök att auktorisera med MSN-inloggningsserver."
-
-#: src/protocols/msn/notification.c:215
+#: src/protocols/msn/notification.c:247
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "MSN-fel: %s\n"
 
-#: src/protocols/msn/notification.c:315 src/protocols/trepia/trepia.c:686
+#: src/protocols/msn/notification.c:322
+msgid "Unable to connect to server"
+msgstr "Kan inte ansluta till servern"
+
+#: src/protocols/msn/notification.c:377 src/protocols/msn/notification.c:546
+msgid "Unable to write to MSN Nexus server."
+msgstr "Kan inte skriva till MSN Nexus-server."
+
+#: src/protocols/msn/notification.c:386 src/protocols/msn/notification.c:561
+msgid "Unable to read from MSN Nexus server."
+msgstr "Kan inte läsa huvud från MSN Nexus-server."
+
+#: src/protocols/msn/notification.c:406
+msgid "MSN Nexus server returned invalid redirect information."
+msgstr "MSN Nexus-servern svarade med ogiltig omdirigeringsinformation."
+
+#: src/protocols/msn/notification.c:460
+msgid "Unknown error when attempting to authorize with MSN login server."
+msgstr "Okänt fel vid försök att auktorisera med MSN-inloggningsserver."
+
+#: src/protocols/msn/notification.c:572
+msgid "MSN Nexus server returned invalid information."
+msgstr "MSN Nexus-server svarade med ogiltig information."
+
+#: src/protocols/msn/notification.c:641 src/protocols/trepia/trepia.c:686
 msgid "Retrieving buddy list"
 msgstr "Tar emot kompislista"
 
-#: src/protocols/msn/notification.c:340 src/protocols/msn/notification.c:372
-#: src/protocols/oscar/oscar.c:1452
+#: src/protocols/msn/notification.c:711
+msgid "Unable to connect to passport server"
+msgstr "Kan inte ansluta till passport-servern."
+
+#: src/protocols/msn/notification.c:716 src/protocols/msn/notification.c:748
+#: src/protocols/oscar/oscar.c:1361
 msgid "Password sent"
 msgstr "Lösenord skickat"
 
-#: src/protocols/msn/notification.c:367
+#: src/protocols/msn/notification.c:743
 msgid "Unable to send password"
 msgstr "Kan inte skicka lösenord"
 
-#: src/protocols/msn/notification.c:403
+#: src/protocols/msn/notification.c:779
 msgid "Protocol not supported"
 msgstr "Protokollet stöds inte"
 
-#: src/protocols/msn/notification.c:445
+#: src/protocols/msn/notification.c:821
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "Du har blivit frånkopplad. Du har loggat in från en annan plats."
 
-#: src/protocols/msn/notification.c:450
+#: src/protocols/msn/notification.c:826
 msgid "You have been disconnected. The MSN servers are going down temporarily."
 msgstr "Du har blivit frånkopplad. MSN-servrarna tas tillfälligt ner."
 
-#: src/protocols/msn/notification.c:577
+#: src/protocols/msn/notification.c:953
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "Användaren %s (%s) vill lägga till %s i sin kompislista."
 
-#: src/protocols/msn/notification.c:902 src/protocols/msn/notification.c:1069
+#: src/protocols/msn/notification.c:1278 src/protocols/msn/notification.c:1445
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list."
 msgstr "Användaren %s (%s) vill lägga till dig i sin kompislista."
 
-#: src/protocols/msn/notification.c:1596
+#: src/protocols/msn/notification.c:1972
 msgid "Unable to transfer to notification server"
 msgstr "Kan inte skicka till notifieringsserver"
 
-#: src/protocols/msn/notification.c:1752
+#: src/protocols/msn/notification.c:2128
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -6517,20 +5973,20 @@
 "automatiskt att loggas ut. Passa på att avsluta dina konversationer innan "
 "tiden löper ut."
 
-#: src/protocols/msn/servconn.c:536
+#: src/protocols/msn/servconn.c:533
 msgid "Received HTTP error. Please report this."
 msgstr "Mottog HTTP-fel, var snäll och rapportera detta."
 
-#: src/protocols/msn/switchboard.c:150
+#: src/protocols/msn/switchboard.c:147
 msgid "The conversation has become inactive and timed out."
 msgstr "Konversationen har blivit inaktiv och väntetiden har tagit slut."
 
-#: src/protocols/msn/switchboard.c:159
+#: src/protocols/msn/switchboard.c:154
 #, c-format
 msgid "%s has closed the conversation window."
 msgstr "%s har stängt konversationsfönstret."
 
-#: src/protocols/msn/switchboard.c:285
+#: src/protocols/msn/switchboard.c:277
 msgid "An MSN message may not have been received."
 msgstr "Ett MSN-meddelande kanske inte blev mottaget."
 
@@ -6579,11 +6035,7 @@
 msgid "%s requested a PING"
 msgstr "%s begärde en PING"
 
-#: src/protocols/napster/napster.c:529
-msgid "Get Info"
-msgstr "Info"
-
-#: src/protocols/napster/napster.c:543 src/protocols/oscar/oscar.c:5445
+#: src/protocols/napster/napster.c:543 src/protocols/oscar/oscar.c:5213
 #: src/protocols/toc/toc.c:1259
 msgid "_Group:"
 msgstr "_Grupp:"
@@ -6598,181 +6050,178 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/napster/napster.c:619 src/protocols/napster/napster.c:621
+#: src/protocols/napster/napster.c:618 src/protocols/napster/napster.c:620
 msgid "NAPSTER Protocol Plugin"
 msgstr "Insticksmodul för Napster-protokoll"
 
-#: src/protocols/oscar/oscar.c:181
+#: src/protocols/oscar/oscar.c:178
 msgid "Invalid error"
 msgstr "Ogiltigt fel"
 
-#: src/protocols/oscar/oscar.c:182
+#: src/protocols/oscar/oscar.c:179
 msgid "Invalid SNAC"
 msgstr "Ogiltig SNAC"
 
-#: src/protocols/oscar/oscar.c:183
+#: src/protocols/oscar/oscar.c:180
 msgid "Rate to host"
 msgstr "Hastighet till värd"
 
-#: src/protocols/oscar/oscar.c:184
+#: src/protocols/oscar/oscar.c:181
 msgid "Rate to client"
 msgstr "Hastighet till klient"
 
-#: src/protocols/oscar/oscar.c:186
+#: src/protocols/oscar/oscar.c:183
 msgid "Service unavailable"
 msgstr "Tjänsten är otillgänglig"
 
-#: src/protocols/oscar/oscar.c:187
+#: src/protocols/oscar/oscar.c:184
 msgid "Service not defined"
 msgstr "Tjänst ej definierad"
 
-#: src/protocols/oscar/oscar.c:188
+#: src/protocols/oscar/oscar.c:185
 msgid "Obsolete SNAC"
 msgstr "Obsolet SNAC"
 
-#: src/protocols/oscar/oscar.c:189
+#: src/protocols/oscar/oscar.c:186
 msgid "Not supported by host"
 msgstr "Ej stödd av värd"
 
-#: src/protocols/oscar/oscar.c:190
+#: src/protocols/oscar/oscar.c:187
 msgid "Not supported by client"
 msgstr "Ej stödd av klient"
 
+#: src/protocols/oscar/oscar.c:188
+msgid "Refused by client"
+msgstr "Vägrad av klient"
+
+#: src/protocols/oscar/oscar.c:189
+msgid "Reply too big"
+msgstr "Svar förstort"
+
+#: src/protocols/oscar/oscar.c:190
+msgid "Responses lost"
+msgstr "Svar förlorade"
+
 #: src/protocols/oscar/oscar.c:191
-msgid "Refused by client"
-msgstr "Vägrad av klient"
+msgid "Request denied"
+msgstr "Begäran nekad"
 
 #: src/protocols/oscar/oscar.c:192
-msgid "Reply too big"
-msgstr "Svar förstort"
+msgid "Busted SNAC payload"
+msgstr "Spräckt SNAC-last"
 
 #: src/protocols/oscar/oscar.c:193
-msgid "Responses lost"
-msgstr "Svar förlorade"
+msgid "Insufficient rights"
+msgstr "Otillräckliga rättigheter"
 
 #: src/protocols/oscar/oscar.c:194
-msgid "Request denied"
-msgstr "Begäran nekad"
+msgid "In local permit/deny"
+msgstr "I lokal tillåt/neka"
 
 #: src/protocols/oscar/oscar.c:195
-msgid "Busted SNAC payload"
-msgstr "Spräckt SNAC-last"
+msgid "Too evil (sender)"
+msgstr "För onskefull (avsändare)"
 
 #: src/protocols/oscar/oscar.c:196
-msgid "Insufficient rights"
-msgstr "Otillräckliga rättigheter"
-
-#: src/protocols/oscar/oscar.c:197
-msgid "In local permit/deny"
-msgstr "I lokal tillåt/neka"
-
-#: src/protocols/oscar/oscar.c:198
-msgid "Too evil (sender)"
-msgstr "För onskefull (avsändare)"
-
-#: src/protocols/oscar/oscar.c:199
 msgid "Too evil (receiver)"
 msgstr "För onskefull (mottagare)"
 
-#: src/protocols/oscar/oscar.c:200
+#: src/protocols/oscar/oscar.c:197
 msgid "User temporarily unavailable"
 msgstr "Användare är tillfälligt oåtkommlig"
 
-#: src/protocols/oscar/oscar.c:201
+#: src/protocols/oscar/oscar.c:198
 msgid "No match"
 msgstr "Ingen träff"
 
-#: src/protocols/oscar/oscar.c:202
+#: src/protocols/oscar/oscar.c:199
 msgid "List overflow"
 msgstr "Listöverflöde"
 
-#: src/protocols/oscar/oscar.c:203
+#: src/protocols/oscar/oscar.c:200
 msgid "Request ambiguous"
 msgstr "Begäran tvetydig"
 
-#: src/protocols/oscar/oscar.c:204
+#: src/protocols/oscar/oscar.c:201
 msgid "Queue full"
 msgstr "Kö full"
 
-#: src/protocols/oscar/oscar.c:205
+#: src/protocols/oscar/oscar.c:202
 msgid "Not while on AOL"
 msgstr "Inte på AOL"
 
-#: src/protocols/oscar/oscar.c:520
+#: src/protocols/oscar/oscar.c:474
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Direktmeddelande med %s stängd"
 
-#: src/protocols/oscar/oscar.c:522
+#: src/protocols/oscar/oscar.c:476
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "Direktmeddelande med %s misslyckades"
 
-#: src/protocols/oscar/oscar.c:593 src/protocols/toc/toc.c:885
+#: src/protocols/oscar/oscar.c:546 src/protocols/toc/toc.c:885
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Du har blivit frånkopplad från chattrummet %s."
 
-#: src/protocols/oscar/oscar.c:609
+#: src/protocols/oscar/oscar.c:562
 msgid "Chat is currently unavailable"
 msgstr "Chatt är inte tillgängligt för tillfället"
 
-#: src/protocols/oscar/oscar.c:680 src/protocols/oscar/oscar.c:746
+#: src/protocols/oscar/oscar.c:633 src/protocols/oscar/oscar.c:689
 msgid "Couldn't connect to host"
 msgstr "Kunde inte ansluta till värden"
 
-#: src/protocols/oscar/oscar.c:690
+#: src/protocols/oscar/oscar.c:643
 msgid "Screen name sent"
 msgstr "Användar-ID skickat"
 
-#: src/protocols/oscar/oscar.c:705
-#, c-format
-msgid ""
-"Unable to login: Could not sign on as %s because the screen name is "
-"invalid.  Screen names must either start with a letter and contain only "
-"letters, numbers and spaces, or contain only numbers."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:734
+#: src/protocols/oscar/oscar.c:677
 msgid "Unable to login to AIM"
 msgstr "Kan inte logga in till AIM"
 
-#: src/protocols/oscar/oscar.c:838 src/protocols/oscar/oscar.c:1256
+#: src/protocols/oscar/oscar.c:778 src/protocols/oscar/oscar.c:1166
 msgid "Could Not Connect"
 msgstr "Kunde inte ansluta"
 
-#: src/protocols/oscar/oscar.c:846
+#: src/protocols/oscar/oscar.c:786
 msgid "Connection established, cookie sent"
 msgstr "Anslutning etablerad, kaka skickad"
 
-#: src/protocols/oscar/oscar.c:959 src/protocols/yahoo/yahoo_filexfer.c:209
-#: src/protocols/yahoo/yahoo_filexfer.c:218
+#: src/protocols/oscar/oscar.c:853 src/protocols/oscar/oscar.c:866
+#: src/protocols/oscar/oscar.c:871 src/protocols/yahoo/yahoo_filexfer.c:204
+#: src/protocols/yahoo/yahoo_filexfer.c:212
+msgid "File Transfer Aborted"
+msgstr "Filöverföring avbruten"
+
+#: src/protocols/oscar/oscar.c:854
+msgid "Unable to establish listener socket."
+msgstr "Kan inte etablera lyssnar socket."
+
+#: src/protocols/oscar/oscar.c:867 src/protocols/yahoo/yahoo_filexfer.c:205
+#: src/protocols/yahoo/yahoo_filexfer.c:213
 msgid "Unable to establish file descriptor."
 msgstr "Kan inte inte etablera filbeskrivning."
 
-#: src/protocols/oscar/oscar.c:964
+#: src/protocols/oscar/oscar.c:872
 msgid "Unable to create new connection."
 msgstr "Kan inte skapa ny anslutning."
 
-#: src/protocols/oscar/oscar.c:1035
-msgid "Unable to establish listener socket."
-msgstr "Kan inte etablera lyssnar socket."
-
-#: src/protocols/oscar/oscar.c:1140 src/protocols/toc/toc.c:571
+#: src/protocols/oscar/oscar.c:1052 src/protocols/toc/toc.c:571
 msgid "Incorrect nickname or password."
 msgstr "Felaktigt nick eller lösenord."
 
-#: src/protocols/oscar/oscar.c:1145
+#: src/protocols/oscar/oscar.c:1057
 msgid "Your account is currently suspended."
 msgstr "Ditt konto är avstängt för tillfället."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1149
+#: src/protocols/oscar/oscar.c:1061
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Tjänsten är tillfälligt onåbar."
 
-#: src/protocols/oscar/oscar.c:1154
+#: src/protocols/oscar/oscar.c:1066
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -6780,21 +6229,21 @@
 "Du har anslutit och kopplat ifrån för många gånger. Vänta tio minuter och "
 "prova igen. Om du fortsätter att försöka kommer du att få vänta ännu längre."
 
-#: src/protocols/oscar/oscar.c:1159
+#: src/protocols/oscar/oscar.c:1071
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "Versionen av klienten du använder är för gammal. Uppgradera på %s"
 
-#: src/protocols/oscar/oscar.c:1191
+#: src/protocols/oscar/oscar.c:1103
 msgid "Internal Error"
 msgstr "Internt fel"
 
-#: src/protocols/oscar/oscar.c:1263
+#: src/protocols/oscar/oscar.c:1173
 msgid "Received authorization"
 msgstr "Mottog auktorisering"
 
-#: src/protocols/oscar/oscar.c:1299 src/protocols/oscar/oscar.c:1329
-#: src/protocols/oscar/oscar.c:1417
+#: src/protocols/oscar/oscar.c:1208 src/protocols/oscar/oscar.c:1238
+#: src/protocols/oscar/oscar.c:1326
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -6803,29 +6252,29 @@
 "Du kanske snart blir frånkopplad, du kanske ska använda TOC tills detta är "
 "fixat. Kolla på %s efter uppdateringar."
 
-#: src/protocols/oscar/oscar.c:1302 src/protocols/oscar/oscar.c:1332
+#: src/protocols/oscar/oscar.c:1211 src/protocols/oscar/oscar.c:1241
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim kunde inte hämta en giltig AIM-inloggnings-hash."
 
-#: src/protocols/oscar/oscar.c:1420
+#: src/protocols/oscar/oscar.c:1329
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim kunde inte hämta en giltig login-hash."
 
-#: src/protocols/oscar/oscar.c:2002 src/protocols/oscar/oscar.c:5906
+#: src/protocols/oscar/oscar.c:1910 src/protocols/oscar/oscar.c:5654
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Direktmeddelande med %s etablerat"
 
-#: src/protocols/oscar/oscar.c:2333 src/protocols/oscar/oscar.c:2355
+#: src/protocols/oscar/oscar.c:2239 src/protocols/oscar/oscar.c:2261
 msgid "(There was an error receiving this message)"
 msgstr "(Det uppstod ett fel när detta meddelande hämtades)"
 
-#: src/protocols/oscar/oscar.c:2504
+#: src/protocols/oscar/oscar.c:2408
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s har just frågat om att koppla sig direkt till %s"
 
-#: src/protocols/oscar/oscar.c:2507
+#: src/protocols/oscar/oscar.c:2411
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
@@ -6835,23 +6284,23 @@
 "IM-bilder ska fungera. Eftersom din IP-adress kommer att avslöjas kan detta "
 "betraktas som en säkerhetsrisk."
 
-#: src/protocols/oscar/oscar.c:2512 src/protocols/oscar/oscar.c:6288
+#: src/protocols/oscar/oscar.c:2416 src/protocols/oscar/oscar.c:6023
 msgid "Connect"
 msgstr "Anslut"
 
-#: src/protocols/oscar/oscar.c:2539
+#: src/protocols/oscar/oscar.c:2443
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Användaren vill lägga till dig i dennes kompislista."
 
-#: src/protocols/oscar/oscar.c:2547
+#: src/protocols/oscar/oscar.c:2451
 msgid "Authorization Request Message:"
 msgstr "Meddelande om auktoriseringsbegäran:"
 
-#: src/protocols/oscar/oscar.c:2548
+#: src/protocols/oscar/oscar.c:2452
 msgid "Please authorize me!"
 msgstr "Snälla auktorisera mig!"
 
-#: src/protocols/oscar/oscar.c:2577
+#: src/protocols/oscar/oscar.c:2480
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -6860,23 +6309,23 @@
 "Användaren %s kräver auktorisering innan hon/han kan läggas till i din "
 "kompislista. Vill du skicka en auktoriseringsförfrågan?"
 
-#: src/protocols/oscar/oscar.c:2582 src/protocols/oscar/oscar.c:2584
+#: src/protocols/oscar/oscar.c:2485 src/protocols/oscar/oscar.c:2487
 msgid "Request Authorization"
 msgstr "Begär auktorisering"
 
-#: src/protocols/oscar/oscar.c:2620 src/protocols/oscar/oscar.c:2622
-#: src/protocols/oscar/oscar.c:2629 src/protocols/oscar/oscar.c:2705
-#: src/protocols/oscar/oscar.c:2725 src/protocols/oscar/oscar.c:3081
-#: src/protocols/oscar/oscar.c:3141 src/protocols/oscar/oscar.c:5366
-#: src/protocols/oscar/oscar.c:5412
+#: src/protocols/oscar/oscar.c:2523 src/protocols/oscar/oscar.c:2525
+#: src/protocols/oscar/oscar.c:2532 src/protocols/oscar/oscar.c:2608
+#: src/protocols/oscar/oscar.c:2628 src/protocols/oscar/oscar.c:2984
+#: src/protocols/oscar/oscar.c:3044 src/protocols/oscar/oscar.c:5134
+#: src/protocols/oscar/oscar.c:5180
 msgid "No reason given."
 msgstr "Ingen motivering angiven."
 
-#: src/protocols/oscar/oscar.c:2628
+#: src/protocols/oscar/oscar.c:2531
 msgid "Authorization Denied Message:"
 msgstr "Meddelande om auktorisering nekad:"
 
-#: src/protocols/oscar/oscar.c:2705
+#: src/protocols/oscar/oscar.c:2608
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -6885,11 +6334,11 @@
 "Användaren %u vill lägga till dig i sin kompislista av följande anledning:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2713 src/protocols/oscar/oscar.c:5372
+#: src/protocols/oscar/oscar.c:2616 src/protocols/oscar/oscar.c:5140
 msgid "Authorization Request"
 msgstr "Auktoriseringsbegäran"
 
-#: src/protocols/oscar/oscar.c:2725
+#: src/protocols/oscar/oscar.c:2628
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -6900,18 +6349,18 @@
 "följande orsak:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2726
+#: src/protocols/oscar/oscar.c:2629
 msgid "ICQ authorization denied."
 msgstr "ICQ-auktorisering nekades."
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2733
+#: src/protocols/oscar/oscar.c:2636
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 "Användaren %u har tillåtit dig att lägga till honom/henne i din kompislista."
 
-#: src/protocols/oscar/oscar.c:2741
+#: src/protocols/oscar/oscar.c:2644
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -6924,7 +6373,7 @@
 "Från: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2749
+#: src/protocols/oscar/oscar.c:2652
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -6937,7 +6386,7 @@
 "Från: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2757
+#: src/protocols/oscar/oscar.c:2660
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -6950,34 +6399,34 @@
 "Meddelandet är:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2778
+#: src/protocols/oscar/oscar.c:2681
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ-användaren %u har skickat dig en kompis:  %s (%s)"
 
-#: src/protocols/oscar/oscar.c:2784
+#: src/protocols/oscar/oscar.c:2687
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Vill du lägga till den här kompisen till din kompislista?"
 
-#: src/protocols/oscar/oscar.c:2788
+#: src/protocols/oscar/oscar.c:2691
 msgid "Decline"
 msgstr "Understrykning"
 
-#: src/protocols/oscar/oscar.c:2870
+#: src/protocols/oscar/oscar.c:2773
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "Du har missat %hu meddelande från %s eftersom det var ogiltigt."
 msgstr[1] "Du har missat %hu meddelanden från %s eftersom det var ogiltigt."
 
-#: src/protocols/oscar/oscar.c:2879
+#: src/protocols/oscar/oscar.c:2782
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "Du missade %hu meddelande från %s eftersom det var för stort."
 msgstr[1] "Du missade %hu meddelanden från %s eftersom det var för stort."
 
-#: src/protocols/oscar/oscar.c:2888
+#: src/protocols/oscar/oscar.c:2791
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -6988,7 +6437,7 @@
 msgstr[1] ""
 "Du missade %hu meddelanden från %s eftersom frekvensgränsen har överskridits."
 
-#: src/protocols/oscar/oscar.c:2897
+#: src/protocols/oscar/oscar.c:2800
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
@@ -6997,187 +6446,175 @@
 msgstr[1] ""
 "Du missade %hu meddelanden från %s eftersom hon/han var för onskefull."
 
-#: src/protocols/oscar/oscar.c:2906
+#: src/protocols/oscar/oscar.c:2809
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "Du missade %hu meddelande från %s eftersom du är för onskefull."
 msgstr[1] "Du missade %hu meddelanden från %s eftersom du är för onskefull."
 
-#: src/protocols/oscar/oscar.c:2915
+#: src/protocols/oscar/oscar.c:2818
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "Du missade %hu meddelande från %s av okända orsaker."
 msgstr[1] "Du missade %hu meddelanden från %s av okända orsaker."
 
-#: src/protocols/oscar/oscar.c:2931 src/protocols/oscar/oscar.c:4760
-#: src/protocols/oscar/oscar.c:6414
+#: src/protocols/oscar/oscar.c:2834 src/protocols/oscar/oscar.c:4608
+#: src/protocols/oscar/oscar.c:6150
 msgid "Free For Chat"
 msgstr "Tillgänglig för chatt"
 
-#: src/protocols/oscar/oscar.c:2935 src/protocols/oscar/oscar.c:4754
-#: src/protocols/oscar/oscar.c:6412
+#: src/protocols/oscar/oscar.c:2838 src/protocols/oscar/oscar.c:4602
+#: src/protocols/oscar/oscar.c:6148
 msgid "Not Available"
 msgstr "Ej tillgänglig"
 
-#: src/protocols/oscar/oscar.c:2937 src/protocols/oscar/oscar.c:4757
-#: src/protocols/oscar/oscar.c:6413
+#: src/protocols/oscar/oscar.c:2840 src/protocols/oscar/oscar.c:4605
+#: src/protocols/oscar/oscar.c:6149
 msgid "Occupied"
 msgstr "Upptagen"
 
-#: src/protocols/oscar/oscar.c:2941
+#: src/protocols/oscar/oscar.c:2844
 msgid "Web Aware"
 msgstr "Webbmedveten"
 
-#: src/protocols/oscar/oscar.c:2984
+#: src/protocols/oscar/oscar.c:2887
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:3043
+#: src/protocols/oscar/oscar.c:2946
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC gav fel: %s\n"
 
-#: src/protocols/oscar/oscar.c:3044
-msgid "Unknown error"
-msgstr "Okänt fel"
-
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:3079
+#: src/protocols/oscar/oscar.c:2982
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "Ditt meddelande till %s skickades inte: "
 
-#: src/protocols/oscar/oscar.c:3138
+#: src/protocols/oscar/oscar.c:3041
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "Användarinformation om %s är inte tillgänglig:"
 
-#: src/protocols/oscar/oscar.c:3177
+#: src/protocols/oscar/oscar.c:3080
 msgid "Voice"
 msgstr "Röst"
 
-#: src/protocols/oscar/oscar.c:3180
+#: src/protocols/oscar/oscar.c:3083
 msgid "AIM Direct IM"
 msgstr "AIM-direktmeddelande"
 
-#: src/protocols/oscar/oscar.c:3183
-msgid "Chat"
-msgstr "Chatta"
-
-#: src/protocols/oscar/oscar.c:3186 src/protocols/oscar/oscar.c:6523
+#: src/protocols/oscar/oscar.c:3089 src/protocols/oscar/oscar.c:6249
 msgid "Get File"
 msgstr "Hämta fil"
 
-#: src/protocols/oscar/oscar.c:3193
+#: src/protocols/oscar/oscar.c:3092 src/protocols/oscar/oscar.c:6241
+#: src/protocols/yahoo/yahoo.c:2350
+msgid "Send File"
+msgstr "Skicka fil"
+
+#: src/protocols/oscar/oscar.c:3096
 msgid "Games"
 msgstr "Spel"
 
-#: src/protocols/oscar/oscar.c:3196
+#: src/protocols/oscar/oscar.c:3099
 msgid "Add-Ins"
 msgstr "Lägg till"
 
-#: src/protocols/oscar/oscar.c:3199
+#: src/protocols/oscar/oscar.c:3102
 msgid "Send Buddy List"
 msgstr "Skicka kompislista"
 
-#: src/protocols/oscar/oscar.c:3202
+#: src/protocols/oscar/oscar.c:3105
 msgid "ICQ Direct Connect"
 msgstr "ICQ-direktkoppling"
 
-#: src/protocols/oscar/oscar.c:3205
+#: src/protocols/oscar/oscar.c:3108
 msgid "AP User"
 msgstr "AP-användare"
 
-#: src/protocols/oscar/oscar.c:3208
+#: src/protocols/oscar/oscar.c:3111
 msgid "ICQ RTF"
 msgstr "ICQ-RTF"
 
-#: src/protocols/oscar/oscar.c:3211
+#: src/protocols/oscar/oscar.c:3114
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:3214
+#: src/protocols/oscar/oscar.c:3117
 msgid "ICQ Server Relay"
 msgstr "ICQ-serverrelay"
 
-#: src/protocols/oscar/oscar.c:3217
+#: src/protocols/oscar/oscar.c:3120
 msgid "Old ICQ UTF8"
 msgstr "Gamla ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:3220
+#: src/protocols/oscar/oscar.c:3123
 msgid "Trillian Encryption"
 msgstr "Trillansk kryptering"
 
-#: src/protocols/oscar/oscar.c:3223
+#: src/protocols/oscar/oscar.c:3126
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:3226
+#: src/protocols/oscar/oscar.c:3129
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: src/protocols/oscar/oscar.c:3229
+#: src/protocols/oscar/oscar.c:3132
 msgid "Security Enabled"
 msgstr "Säkerhet aktiverad"
 
-#: src/protocols/oscar/oscar.c:3232
+#: src/protocols/oscar/oscar.c:3135
 msgid "Video Chat"
 msgstr "Videochatt"
 
-#: src/protocols/oscar/oscar.c:3236
+#: src/protocols/oscar/oscar.c:3138
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: src/protocols/oscar/oscar.c:3239
-msgid "Live Video"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3242
-#, fuzzy
-msgid "Camera"
-msgstr "Namn"
-
-#: src/protocols/oscar/oscar.c:3271
+#: src/protocols/oscar/oscar.c:3167
 #, c-format
 msgid "Username: <b>%s</b><br>\n"
 msgstr "Användarnamn: <b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3272
+#: src/protocols/oscar/oscar.c:3168
 #, c-format
 msgid "Warning Level: <b>%d%%</b><br>\n"
 msgstr "Varningsnivå: <b>%d%%</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3275
+#: src/protocols/oscar/oscar.c:3171
 #, c-format
 msgid "Online Since: <b>%s</b><br>\n"
 msgstr "Ansluten sedan: <b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3279
+#: src/protocols/oscar/oscar.c:3175
 #, c-format
 msgid "Member Since: <b>%s</b><br>\n"
 msgstr "Medlem sedan: <b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3284
+#: src/protocols/oscar/oscar.c:3180
 #, c-format
 msgid "Idle: <b>%s</b>"
 msgstr "Inaktiv: <b>%s</b>"
 
-#: src/protocols/oscar/oscar.c:3287
+#: src/protocols/oscar/oscar.c:3183
 msgid "Idle: <b>Active</b>"
 msgstr "Inaktiv: <b>Aktiv</b>"
 
-#: src/protocols/oscar/oscar.c:3359
+#: src/protocols/oscar/oscar.c:3222
 msgid "Your AIM connection may be lost."
 msgstr "Din anslutning kan vara borta."
 
-#: src/protocols/oscar/oscar.c:3760
+#: src/protocols/oscar/oscar.c:3616
 msgid "Rate limiting error."
 msgstr "Frekvensgränsfel."
 
-#: src/protocols/oscar/oscar.c:3761
+#: src/protocols/oscar/oscar.c:3617
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7185,115 +6622,115 @@
 "Det senaste meddelandet skickades inte eftersom du är över frekvensgränsen. "
 "Vänta 10 sekunder och försök igen."
 
-#: src/protocols/oscar/oscar.c:3824
+#: src/protocols/oscar/oscar.c:3680
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 msgstr "Du har blivit frånkopplad. Du har loggat in från en annan plats."
 
-#: src/protocols/oscar/oscar.c:3826
+#: src/protocols/oscar/oscar.c:3682
 msgid "You have been signed off for an unknown reason."
 msgstr "Du har blivit utloggad av okänd anledning."
 
-#: src/protocols/oscar/oscar.c:3857
+#: src/protocols/oscar/oscar.c:3713
 msgid "Finalizing connection"
 msgstr "Avsluta anslutning"
 
-#: src/protocols/oscar/oscar.c:4117 src/protocols/oscar/oscar.c:4123
+#: src/protocols/oscar/oscar.c:3973 src/protocols/oscar/oscar.c:3979
 msgid "Email Address"
 msgstr "E-postadress"
 
-#: src/protocols/oscar/oscar.c:4128
+#: src/protocols/oscar/oscar.c:3984
 msgid "Mobile Phone"
 msgstr "Mobilnummer"
 
-#: src/protocols/oscar/oscar.c:4131 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:3987 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:422
 msgid "Female"
 msgstr "Kvinna"
 
-#: src/protocols/oscar/oscar.c:4131 src/protocols/trepia/trepia.c:280
+#: src/protocols/oscar/oscar.c:3987 src/protocols/trepia/trepia.c:280
 #: src/protocols/trepia/trepia.c:422
 msgid "Male"
 msgstr "Man"
 
-#: src/protocols/oscar/oscar.c:4148
+#: src/protocols/oscar/oscar.c:4004
 msgid "Personal Web Page"
 msgstr "Personlig webbsida"
 
-#: src/protocols/oscar/oscar.c:4151
+#: src/protocols/oscar/oscar.c:4007
 msgid "Additional Information"
 msgstr "Extra information"
 
-#: src/protocols/oscar/oscar.c:4155
+#: src/protocols/oscar/oscar.c:4011
 msgid "Home Address"
 msgstr "Hemadress"
 
-#: src/protocols/oscar/oscar.c:4166 src/protocols/oscar/oscar.c:4182
+#: src/protocols/oscar/oscar.c:4022 src/protocols/oscar/oscar.c:4038
 msgid "Zip Code"
 msgstr "Postnummer"
 
-#: src/protocols/oscar/oscar.c:4171
+#: src/protocols/oscar/oscar.c:4027
 msgid "Work Address"
 msgstr "Jobbadress"
 
-#: src/protocols/oscar/oscar.c:4187
+#: src/protocols/oscar/oscar.c:4043
 msgid "Work Information"
 msgstr "Information om arbete"
 
-#: src/protocols/oscar/oscar.c:4189
+#: src/protocols/oscar/oscar.c:4045
 msgid "Company"
 msgstr "Företag"
 
-#: src/protocols/oscar/oscar.c:4192
+#: src/protocols/oscar/oscar.c:4048
 msgid "Division"
 msgstr "Avdelning"
 
-#: src/protocols/oscar/oscar.c:4195
+#: src/protocols/oscar/oscar.c:4051
 msgid "Position"
 msgstr "Befattning"
 
-#: src/protocols/oscar/oscar.c:4198
+#: src/protocols/oscar/oscar.c:4054
 msgid "Web Page"
 msgstr "Webbsida"
 
-#: src/protocols/oscar/oscar.c:4204
+#: src/protocols/oscar/oscar.c:4060
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "ICQ-information om %s"
 
-#: src/protocols/oscar/oscar.c:4254
+#: src/protocols/oscar/oscar.c:4110
 msgid "Pop-Up Message"
 msgstr "Popup-meddelande"
 
-#: src/protocols/oscar/oscar.c:4275
-#, fuzzy, c-format
-msgid "The following screen names are associated with %s"
+#: src/protocols/oscar/oscar.c:4131
+#, c-format
+msgid "The following screennames are associated with %s"
 msgstr "Följande användar-ID är associerat med %s"
 
-#: src/protocols/oscar/oscar.c:4279
+#: src/protocols/oscar/oscar.c:4135
 msgid "Search Results"
 msgstr "Sökresultat"
 
-#: src/protocols/oscar/oscar.c:4296
+#: src/protocols/oscar/oscar.c:4152
 #, c-format
 msgid "No results found for email address %s"
 msgstr "Inget resultat funnet för e-postadress %s"
 
-#: src/protocols/oscar/oscar.c:4317
+#: src/protocols/oscar/oscar.c:4173
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "Du borde få ett e-postmeddelande som ber dig bekräfta %s."
 
-#: src/protocols/oscar/oscar.c:4319
+#: src/protocols/oscar/oscar.c:4175
 msgid "Account Confirmation Requested"
 msgstr "Kontobekräftelsebegäran"
 
-#: src/protocols/oscar/oscar.c:4347
+#: src/protocols/oscar/oscar.c:4203
 msgid "Error Changing Account Info"
 msgstr "Fel vid ändring av kontoinformation"
 
-#: src/protocols/oscar/oscar.c:4350
+#: src/protocols/oscar/oscar.c:4206
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7302,7 +6739,7 @@
 "Fel 0x%04x: Kan inte formatera användar-ID eftersom det begärda användar-IDt "
 "skiljer sig från orginalet."
 
-#: src/protocols/oscar/oscar.c:4353
+#: src/protocols/oscar/oscar.c:4209
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7311,7 +6748,7 @@
 "Fel 0x%04x: Kan inte formatera användar-ID eftersom det begärda användar-IDt "
 "slutar med ett mellanslag."
 
-#: src/protocols/oscar/oscar.c:4356
+#: src/protocols/oscar/oscar.c:4212
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7320,7 +6757,7 @@
 "Fel 0x%04x: Kan inte formatera användar-ID eftersom det begärda användar-IDt "
 "är för långt."
 
-#: src/protocols/oscar/oscar.c:4359
+#: src/protocols/oscar/oscar.c:4215
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -7329,7 +6766,7 @@
 "Fel 0x%04x: Kan inte ändra e-postadressen eftersom det redan finns en "
 "begäran om ändring som väntar för detta användar-ID."
 
-#: src/protocols/oscar/oscar.c:4362
+#: src/protocols/oscar/oscar.c:4218
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -7338,7 +6775,7 @@
 "Fel 0x%04x: Kan inte ändra e-postadress eftersom den angivna adressen har "
 "för många användar-IDn associerade med sig."
 
-#: src/protocols/oscar/oscar.c:4365
+#: src/protocols/oscar/oscar.c:4221
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -7347,12 +6784,12 @@
 "Fel 0x%04x: Kan inte ändra e-postadress eftersom den angivna adressen inte "
 "är giltig."
 
-#: src/protocols/oscar/oscar.c:4368
+#: src/protocols/oscar/oscar.c:4224
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Fel 0x%04x: Okänt fel."
 
-#: src/protocols/oscar/oscar.c:4378
+#: src/protocols/oscar/oscar.c:4234
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -7361,20 +6798,20 @@
 "Ditt användar-ID är för tillfället formaterat som följer:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4379 src/protocols/oscar/oscar.c:4386
+#: src/protocols/oscar/oscar.c:4235 src/protocols/oscar/oscar.c:4242
 msgid "Account Info"
 msgstr "Kontoinformation"
 
-#: src/protocols/oscar/oscar.c:4384
+#: src/protocols/oscar/oscar.c:4240
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "E-postaderssen för %s är %s"
 
-#: src/protocols/oscar/oscar.c:4616
+#: src/protocols/oscar/oscar.c:4472
 msgid "Unable to set AIM profile."
 msgstr "Kan inte ändra i AIM-profil."
 
-#: src/protocols/oscar/oscar.c:4617
+#: src/protocols/oscar/oscar.c:4473
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
@@ -7384,7 +6821,7 @@
 "slutförts. Din profil är oförändrad, försök ändra den igen när du är helt "
 "ansluten."
 
-#: src/protocols/oscar/oscar.c:4644
+#: src/protocols/oscar/oscar.c:4500
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -7399,20 +6836,15 @@
 "Den maximala profillängden på %d byte har överskridits. Gaim har trunkerat "
 "profilen åt dig."
 
-#: src/protocols/oscar/oscar.c:4649
+#: src/protocols/oscar/oscar.c:4505
 msgid "Profile too long."
 msgstr "Profilen är för lång."
 
-#: src/protocols/oscar/oscar.c:4665 src/protocols/oscar/oscar.c:6418
-#, fuzzy
-msgid "Visible"
-msgstr "Osynlig"
-
-#: src/protocols/oscar/oscar.c:4676
+#: src/protocols/oscar/oscar.c:4522
 msgid "Unable to set AIM away message."
 msgstr "Kan inte ställa in AIM-frånvaromeddelande."
 
-#: src/protocols/oscar/oscar.c:4677
+#: src/protocols/oscar/oscar.c:4523
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -7422,7 +6854,7 @@
 "inloggningsprocessen var färdig. Du har kvar ditt nuvarande läge, försök "
 "ändra det igen när du är helt ansluten."
 
-#: src/protocols/oscar/oscar.c:4717
+#: src/protocols/oscar/oscar.c:4563
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -7437,28 +6869,15 @@
 "Den maximala längden på meddelande vid frånvaro som är %d byte har "
 "överskridits. Gaim har trunkerat meddelandet åt dig."
 
-#: src/protocols/oscar/oscar.c:4722
+#: src/protocols/oscar/oscar.c:4568
 msgid "Away message too long."
 msgstr "Frånvaromeddelandet är för långt."
 
-#: src/protocols/oscar/oscar.c:4815
-#, c-format
-msgid ""
-"Could not add the buddy %s because the screen name is invalid.  Screen names "
-"must either start with a letter and contain only letters, numbers and "
-"spaces, or contain only numbers."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4816 src/protocols/oscar/oscar.c:5233
-#: src/protocols/oscar/oscar.c:5246
-msgid "Unable To Add"
-msgstr "Kan inte lägga till"
-
-#: src/protocols/oscar/oscar.c:4952
+#: src/protocols/oscar/oscar.c:4782
 msgid "Unable To Retrieve Buddy List"
 msgstr "Kunde inte hämta kompislista"
 
-#: src/protocols/oscar/oscar.c:4953
+#: src/protocols/oscar/oscar.c:4783
 msgid ""
 "Gaim was temporarily unable to retrieve your buddy list from the AIM "
 "servers.  Your buddy list is not lost, and will probably become available in "
@@ -7467,13 +6886,12 @@
 "Gaim kunde inte hämta din kompislista från AIM-servern. Din kompislista är "
 "inte borta och kommer antagligen vara tillgänglig om några timmar."
 
-#: src/protocols/oscar/oscar.c:5129 src/protocols/oscar/oscar.c:5130
-#: src/protocols/oscar/oscar.c:5135 src/protocols/oscar/oscar.c:5290
-#: src/protocols/oscar/oscar.c:5291 src/protocols/oscar/oscar.c:5296
+#: src/protocols/oscar/oscar.c:4875 src/protocols/oscar/oscar.c:4876
+#: src/protocols/oscar/oscar.c:4881
 msgid "Orphans"
 msgstr "Föräldralösa"
 
-#: src/protocols/oscar/oscar.c:5232
+#: src/protocols/oscar/oscar.c:5047
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7482,11 +6900,15 @@
 "Kunde inte lägga till kompisen %s eftersom du har för många kompisar i din "
 "kompislista. Ta bort en och försök igen."
 
-#: src/protocols/oscar/oscar.c:5232 src/protocols/oscar/oscar.c:5245
+#: src/protocols/oscar/oscar.c:5047 src/protocols/oscar/oscar.c:5060
 msgid "(no name)"
 msgstr "(inget namn)"
 
-#: src/protocols/oscar/oscar.c:5245
+#: src/protocols/oscar/oscar.c:5048 src/protocols/oscar/oscar.c:5061
+msgid "Unable To Add"
+msgstr "Kan inte lägga till"
+
+#: src/protocols/oscar/oscar.c:5060
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -7497,7 +6919,7 @@
 "till detta är att du har det maximalt tillåtna antalet kompisar i din "
 "kompislista."
 
-#: src/protocols/oscar/oscar.c:5327
+#: src/protocols/oscar/oscar.c:5095
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -7506,11 +6928,11 @@
 "Användaren %s har givit dig tillåtelse att lägga till den till din "
 "kompislista, vill du göra det?"
 
-#: src/protocols/oscar/oscar.c:5333
+#: src/protocols/oscar/oscar.c:5101
 msgid "Authorization Given"
 msgstr "Auktorisering given"
 
-#: src/protocols/oscar/oscar.c:5366
+#: src/protocols/oscar/oscar.c:5134
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -7520,19 +6942,19 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5408
+#: src/protocols/oscar/oscar.c:5176
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
 "Användaren %s har tillåtit dig att lägga till henne/honom till din "
 "kompislista."
 
-#: src/protocols/oscar/oscar.c:5409
+#: src/protocols/oscar/oscar.c:5177
 msgid "Authorization Granted"
 msgstr "Auktorisering beviljades"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5412
+#: src/protocols/oscar/oscar.c:5180
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7543,62 +6965,57 @@
 "kompislista av följande orsak:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5413
+#: src/protocols/oscar/oscar.c:5181
 msgid "Authorization Denied"
 msgstr "Auktorisering nekades"
 
-#: src/protocols/oscar/oscar.c:5450 src/protocols/toc/toc.c:1264
+#: src/protocols/oscar/oscar.c:5218 src/protocols/toc/toc.c:1264
 msgid "_Exchange:"
 msgstr "_Utbyte:"
 
-#: src/protocols/oscar/oscar.c:5472
-#, fuzzy
-msgid "Invalid chat name specified."
-msgstr "Ogiltigt Gadu-Gadu-UIN angivet"
-
-#: src/protocols/oscar/oscar.c:5703
+#: src/protocols/oscar/oscar.c:5456
 msgid "<b>Status:</b> "
 msgstr "<b>Status:</b> "
 
-#: src/protocols/oscar/oscar.c:5715
+#: src/protocols/oscar/oscar.c:5468
 msgid "<b>IP Address:</b> "
 msgstr "<b>IP-adress:</b>"
 
-#: src/protocols/oscar/oscar.c:5723
+#: src/protocols/oscar/oscar.c:5476
 msgid "<b>Capabilities:</b> "
 msgstr "<b>Kapabiliteter:</b> "
 
-#: src/protocols/oscar/oscar.c:5732
+#: src/protocols/oscar/oscar.c:5485
 msgid "<b>Buddy Comment:</b> "
 msgstr "<b>Kompiskommentar:</b>"
 
-#: src/protocols/oscar/oscar.c:5741
+#: src/protocols/oscar/oscar.c:5494
 msgid "<b>Available:</b> "
 msgstr "<b>Tillgänglig:</b> "
 
-#: src/protocols/oscar/oscar.c:5760
+#: src/protocols/oscar/oscar.c:5512
 msgid "<b>Away Message:</b> "
 msgstr "<b>Frånvaromeddelande:</b>"
 
-#: src/protocols/oscar/oscar.c:5768
+#: src/protocols/oscar/oscar.c:5521
 msgid "<b>Status:</b> Not Authorized"
 msgstr "<b>Status:</b> Ej auktoriserad"
 
-#: src/protocols/oscar/oscar.c:5802 src/protocols/yahoo/yahoo.c:2293
+#: src/protocols/oscar/oscar.c:5555 src/protocols/yahoo/yahoo.c:2191
 msgid "Offline"
 msgstr "Ej ansluten"
 
-#: src/protocols/oscar/oscar.c:6268
+#: src/protocols/oscar/oscar.c:6003
 msgid "Unable to open Direct IM"
 msgstr "Kan inte öppna direktmeddelande"
 
-#: src/protocols/oscar/oscar.c:6281
+#: src/protocols/oscar/oscar.c:6016
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr ""
 "Du har valt att öppna en direktanslutning för snabbmeddelanden till %s."
 
-#: src/protocols/oscar/oscar.c:6284
+#: src/protocols/oscar/oscar.c:6019
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -7606,55 +7023,53 @@
 "Eftersom detta avslöjar din IP-adress kan det ses som en säkerhetsrisk. Vill "
 "du fortsätta?"
 
-#: src/protocols/oscar/oscar.c:6468
+#: src/protocols/oscar/oscar.c:6194
 msgid "Buddy Comment:"
 msgstr "Kompiskommentar:"
 
-#: src/protocols/oscar/oscar.c:6484
+#: src/protocols/oscar/oscar.c:6210
 msgid "Edit Buddy Comment"
 msgstr "Ändra kompiskommentar"
 
-#: src/protocols/oscar/oscar.c:6492
+#: src/protocols/oscar/oscar.c:6218
 msgid "Get Status Msg"
 msgstr "Hämta statusmeddelande"
 
-#: src/protocols/oscar/oscar.c:6507
+#: src/protocols/oscar/oscar.c:6233
 msgid "Direct IM"
 msgstr "Direktmeddelande"
 
-#: src/protocols/oscar/oscar.c:6536
+#: src/protocols/oscar/oscar.c:6262
 msgid "Re-request Authorization"
 msgstr "Begär autentiserings igen"
 
-#: src/protocols/oscar/oscar.c:6557
+#: src/protocols/oscar/oscar.c:6283
 msgid "The new formatting is invalid."
 msgstr "Den nya formateringen är ogiltig."
 
-#: src/protocols/oscar/oscar.c:6558
-#, fuzzy
-msgid "Screen name formatting can change only capitalization and whitespace."
+#: src/protocols/oscar/oscar.c:6284
+msgid "Screenname formatting can change only capitalization and whitespace."
 msgstr ""
 "Användar-ID formatering kan endast förändra stora-/småbokstäver och "
 "mellanslag."
 
-#: src/protocols/oscar/oscar.c:6564
-#, fuzzy
-msgid "New screen name formatting:"
+#: src/protocols/oscar/oscar.c:6290
+msgid "New screenname formatting:"
 msgstr "Ny formatering av användar-ID:"
 
-#: src/protocols/oscar/oscar.c:6613
+#: src/protocols/oscar/oscar.c:6339
 msgid "Change Address To:"
 msgstr "Ändra adress till:"
 
-#: src/protocols/oscar/oscar.c:6657
+#: src/protocols/oscar/oscar.c:6383
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>du väntar inte på auktorisering</i>"
 
-#: src/protocols/oscar/oscar.c:6660
+#: src/protocols/oscar/oscar.c:6386
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Du väntar på auktorisering från följande kompisar"
 
-#: src/protocols/oscar/oscar.c:6661
+#: src/protocols/oscar/oscar.c:6387
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7662,70 +7077,73 @@
 "Du kan begära auktorisering igen från dessa kompisar genom att högerkilcka "
 "på dem och välja \"Begär auktorisering igen.\""
 
-#: src/protocols/oscar/oscar.c:6675
+#: src/protocols/oscar/oscar.c:6401
 msgid "Find Buddy by E-mail"
 msgstr "Hitta kompis på e-postadress"
 
-#: src/protocols/oscar/oscar.c:6676
+#: src/protocols/oscar/oscar.c:6402
 msgid "Search for a buddy by e-mail address"
 msgstr "Sök efter en kompis på e-postadress"
 
-#: src/protocols/oscar/oscar.c:6677
+#: src/protocols/oscar/oscar.c:6403
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Skriv e-postadress för den kompis du söker."
 
-#: src/protocols/oscar/oscar.c:6694
+#: src/protocols/oscar/oscar.c:6406
+msgid "Search"
+msgstr "Sök"
+
+#: src/protocols/oscar/oscar.c:6420
 msgid "Available Message:"
 msgstr "Tillgängligt meddelande:"
 
-#: src/protocols/oscar/oscar.c:6695
+#: src/protocols/oscar/oscar.c:6421
 msgid "I'm doing work and hoping for a distraction--IM me!"
 msgstr ""
 "Jag jobbar och hoppas på att en distraktion ska dyka upp, skicka mig ett "
 "meddelande!"
 
-#: src/protocols/oscar/oscar.c:6766
+#: src/protocols/oscar/oscar.c:6492
 msgid "Set User Info..."
 msgstr "Ändra användarinfo..."
 
-#: src/protocols/oscar/oscar.c:6773
+#: src/protocols/oscar/oscar.c:6499
 msgid "Set Available Message..."
 msgstr "Ställ in tillgängligt meddelande..."
 
-#: src/protocols/oscar/oscar.c:6780
+#: src/protocols/oscar/oscar.c:6506
 msgid "Change Password..."
 msgstr "Byt lösenord"
 
-#: src/protocols/oscar/oscar.c:6787
+#: src/protocols/oscar/oscar.c:6513
 msgid "Change Password (URL)"
 msgstr "Byt lösenord (URL)"
 
-#: src/protocols/oscar/oscar.c:6795
+#: src/protocols/oscar/oscar.c:6521
 msgid "Configure IM Forwarding (URL)"
 msgstr "Konfigurera vidarebefordring av snabbmeddelanden (URL)"
 
-#: src/protocols/oscar/oscar.c:6806
-#, fuzzy
-msgid "Format Screen Name..."
+#: src/protocols/oscar/oscar.c:6532
+msgid "Format Screenname..."
 msgstr "Formatera användar-ID..."
 
-#: src/protocols/oscar/oscar.c:6812
+#: src/protocols/oscar/oscar.c:6538
 msgid "Confirm Account"
 msgstr "Bekräfta konto"
 
-#: src/protocols/oscar/oscar.c:6818
+#: src/protocols/oscar/oscar.c:6544
 msgid "Display Currently Registered Address"
 msgstr "Visa aktuell registrerad adress"
 
-#: src/protocols/oscar/oscar.c:6824
+#: src/protocols/oscar/oscar.c:6550
 msgid "Change Currently Registered Address..."
 msgstr "Ändra aktuell registrerad adress..."
 
-#: src/protocols/oscar/oscar.c:6833
+#: src/protocols/oscar/oscar.c:6559
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Visa kompisar som väntar på auktorisering"
 
-#: src/protocols/oscar/oscar.c:6841
+#: src/protocols/oscar/oscar.c:6567
 msgid "Search for Buddy by Email..."
 msgstr "Sök efter kompis på e-postadress..."
 
@@ -7739,16 +7157,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/oscar/oscar.c:6962 src/protocols/oscar/oscar.c:6964
+#: src/protocols/oscar/oscar.c:6687 src/protocols/oscar/oscar.c:6689
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "Insticksmodul för AIM/ICQ-protokoll"
 
-#: src/protocols/oscar/oscar.c:6981
+#: src/protocols/oscar/oscar.c:6706
 msgid "Auth host"
 msgstr "Autentiseringsvärd"
 
-#: src/protocols/oscar/oscar.c:6986
+#: src/protocols/oscar/oscar.c:6711
 msgid "Auth port"
 msgstr "Auktoriseringsport"
 
@@ -7957,16 +7374,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/toc/toc.c:2159 src/protocols/toc/toc.c:2161
+#: src/protocols/toc/toc.c:2158 src/protocols/toc/toc.c:2160
 msgid "TOC Protocol Plugin"
 msgstr "Insticksmodul för TOC-protokoll"
 
-#: src/protocols/toc/toc.c:2178
+#: src/protocols/toc/toc.c:2177
 msgid "TOC host"
 msgstr "TOC-värd"
 
-#: src/protocols/toc/toc.c:2182
+#: src/protocols/toc/toc.c:2181
 msgid "TOC port"
 msgstr "TOC-port"
 
@@ -8035,7 +7451,7 @@
 msgid "Local Users"
 msgstr "Lokala användare"
 
-#: src/protocols/trepia/trepia.c:1078
+#: src/protocols/trepia/trepia.c:1073
 msgid "Logging in"
 msgstr "Logga in"
 
@@ -8049,38 +7465,33 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/trepia/trepia.c:1326 src/protocols/trepia/trepia.c:1328
+#: src/protocols/trepia/trepia.c:1320 src/protocols/trepia/trepia.c:1322
 msgid "Trepia Protocol Plugin"
 msgstr "Insticksmodul för Trepia-protokoll"
 
-#: src/protocols/yahoo/yahoo.c:308
+#: src/protocols/yahoo/yahoo.c:297
 msgid ""
 "You have been logged off as you have logged in on a different machine or "
 "device."
 msgstr "Du har blivit utloggad eftersom du loggat in från en annan dator."
 
-#: src/protocols/yahoo/yahoo.c:747
+#: src/protocols/yahoo/yahoo.c:730
 msgid "Your Yahoo! message did not get sent."
 msgstr "Ditt Yahoo!-meddelande skickades inte."
 
-#: src/protocols/yahoo/yahoo.c:765
-msgid "Buzz!!"
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:800
+#: src/protocols/yahoo/yahoo.c:772
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Yahoo!-systemmeddelande till %s:"
 
-#: src/protocols/yahoo/yahoo.c:866
+#: src/protocols/yahoo/yahoo.c:838
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 "%s har (retroaktivt) nekat din att lägga till henne/honom till din "
 "kontaktlista."
 
-#: src/protocols/yahoo/yahoo.c:869
+#: src/protocols/yahoo/yahoo.c:841
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -8089,11 +7500,11 @@
 "%s har (retroaktivt) nekat din att lägga till henne/honom till din "
 "kontaktlista med följande motivering: %s."
 
-#: src/protocols/yahoo/yahoo.c:872
+#: src/protocols/yahoo/yahoo.c:844
 msgid "Add buddy rejected"
 msgstr "Lägg till kompisavvisning"
 
-#: src/protocols/yahoo/yahoo.c:1595
+#: src/protocols/yahoo/yahoo.c:1494
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -8104,11 +7515,11 @@
 "version av Gaim kommer antagligen inte kunna logga in i Yahoo. Kontrollera "
 "om det finns uppdateringar på %s."
 
-#: src/protocols/yahoo/yahoo.c:1598
+#: src/protocols/yahoo/yahoo.c:1497
 msgid "Failed Yahoo! Authentication"
 msgstr "Misslyckad Yahoo!-autentisering"
 
-#: src/protocols/yahoo/yahoo.c:1671
+#: src/protocols/yahoo/yahoo.c:1570
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -8117,147 +7528,146 @@
 "Du har försökt ignorera %s men hon/han finns i din kompislista. Genom att "
 "klicka \"Ja\" tar du bort och blockerar kompisen.  "
 
-#: src/protocols/yahoo/yahoo.c:1674
+#: src/protocols/yahoo/yahoo.c:1573
 msgid "Ignore buddy?"
 msgstr "Ignorera kompis?"
 
-#: src/protocols/yahoo/yahoo.c:1707
+#: src/protocols/yahoo/yahoo.c:1606
 msgid "Invalid username."
 msgstr "Ogiltigt användarnamn."
 
-#: src/protocols/yahoo/yahoo.c:1710
+#: src/protocols/yahoo/yahoo.c:1609
 msgid "Incorrect password."
 msgstr "Felaktigt lösenord."
 
-#: src/protocols/yahoo/yahoo.c:1713
+#: src/protocols/yahoo/yahoo.c:1612
 msgid "Your account is locked, please log in to the yahoo website."
 msgstr "Ditt konto är låst, var vänlig och logga in på Yahoo!s webbplats."
 
-#: src/protocols/yahoo/yahoo.c:1716
+#: src/protocols/yahoo/yahoo.c:1615
 #, c-format
 msgid "Unknown error number %d."
 msgstr "Okänt felnummer %d."
 
-#: src/protocols/yahoo/yahoo.c:1773
+#: src/protocols/yahoo/yahoo.c:1672
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "Kan inte lägga till kompis %s i grupp %s på serverlistan för konto %s."
 
-#: src/protocols/yahoo/yahoo.c:1775
+#: src/protocols/yahoo/yahoo.c:1674
 msgid "Could not add buddy to server list"
 msgstr "Kunde inte lägga till kompis i listan på servern"
 
-#: src/protocols/yahoo/yahoo.c:1885 src/protocols/yahoo/yahoo.c:2016
+#: src/protocols/yahoo/yahoo.c:1784 src/protocols/yahoo/yahoo.c:1914
 msgid "Unable to read"
 msgstr "Kan inte läsa"
 
-#: src/protocols/yahoo/yahoo.c:2038 src/protocols/yahoo/yahoo.c:2148
-#: src/protocols/yahoo/yahoo.c:2191 src/protocols/yahoo/yahoochat.c:1360
-#: src/protocols/yahoo/yahoochat.c:1421
+#: src/protocols/yahoo/yahoo.c:1939 src/protocols/yahoo/yahoo.c:2048
+#: src/protocols/yahoo/yahoo.c:2089
 msgid "Connection problem"
 msgstr "Problem med anslutning"
 
-#: src/protocols/yahoo/yahoo.c:2275 src/protocols/yahoo/yahoo.c:2600
-#: src/protocols/yahoo/yahoo.c:2706
+#: src/protocols/yahoo/yahoo.c:2173 src/protocols/yahoo/yahoo.c:2498
+#: src/protocols/yahoo/yahoo.c:2604
 msgid "Not At Home"
 msgstr "Inte hemma"
 
-#: src/protocols/yahoo/yahoo.c:2277 src/protocols/yahoo/yahoo.c:2602
-#: src/protocols/yahoo/yahoo.c:2707
+#: src/protocols/yahoo/yahoo.c:2175 src/protocols/yahoo/yahoo.c:2500
+#: src/protocols/yahoo/yahoo.c:2605
 msgid "Not At Desk"
 msgstr "Inte vid skrivbordet"
 
-#: src/protocols/yahoo/yahoo.c:2279 src/protocols/yahoo/yahoo.c:2604
-#: src/protocols/yahoo/yahoo.c:2708
+#: src/protocols/yahoo/yahoo.c:2177 src/protocols/yahoo/yahoo.c:2502
+#: src/protocols/yahoo/yahoo.c:2606
 msgid "Not In Office"
 msgstr "Inte på kontoret"
 
-#: src/protocols/yahoo/yahoo.c:2283 src/protocols/yahoo/yahoo.c:2608
-#: src/protocols/yahoo/yahoo.c:2710
+#: src/protocols/yahoo/yahoo.c:2181 src/protocols/yahoo/yahoo.c:2506
+#: src/protocols/yahoo/yahoo.c:2608
 msgid "On Vacation"
 msgstr "På semester"
 
-#: src/protocols/yahoo/yahoo.c:2287 src/protocols/yahoo/yahoo.c:2612
-#: src/protocols/yahoo/yahoo.c:2712
+#: src/protocols/yahoo/yahoo.c:2185 src/protocols/yahoo/yahoo.c:2510
+#: src/protocols/yahoo/yahoo.c:2610
 msgid "Stepped Out"
 msgstr "Gått ut"
 
-#: src/protocols/yahoo/yahoo.c:2351 src/protocols/yahoo/yahoo.c:2383
+#: src/protocols/yahoo/yahoo.c:2249 src/protocols/yahoo/yahoo.c:2281
 msgid "Not on server list"
 msgstr "Finns inte i listan på servern"
 
-#: src/protocols/yahoo/yahoo.c:2439
+#: src/protocols/yahoo/yahoo.c:2337
 msgid "Join in Chat"
 msgstr "Anslut till chatt"
 
-#: src/protocols/yahoo/yahoo.c:2445
+#: src/protocols/yahoo/yahoo.c:2343
 msgid "Initiate Conference"
 msgstr "Starta konferens"
 
-#: src/protocols/yahoo/yahoo.c:2498
+#: src/protocols/yahoo/yahoo.c:2396
 msgid "Active which ID?"
 msgstr "Vilket ID ska aktiveras?"
 
-#: src/protocols/yahoo/yahoo.c:2506
+#: src/protocols/yahoo/yahoo.c:2404
 msgid "Join who in chat?"
 msgstr "Anslut vem till chatten?"
 
-#: src/protocols/yahoo/yahoo.c:2517
+#: src/protocols/yahoo/yahoo.c:2415
 msgid "Activate ID..."
 msgstr "Aktivera ID..."
 
-#: src/protocols/yahoo/yahoo.c:2523
+#: src/protocols/yahoo/yahoo.c:2421
 msgid "Join user in chat..."
 msgstr "Anslut användare till chatt..."
 
-#: src/protocols/yahoo/yahoo.c:2905
+#: src/protocols/yahoo/yahoo.c:2803
 msgid ""
 "<b>Sorry, profiles marked as containing adult content are not supported at "
 "this time.</b><br><br>\n"
 msgstr ""
 "<b>Profiler märkta att innehålla vuxeninnehåll stöds ännu inte.</b><br><br>\n"
 
-#: src/protocols/yahoo/yahoo.c:2906 src/protocols/yahoo/yahoo.c:2929
+#: src/protocols/yahoo/yahoo.c:2804 src/protocols/yahoo/yahoo.c:2827
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser<br>"
 msgstr "Om du vill se denna profil måste du besöka länken i din webbläsare<br>"
 
-#: src/protocols/yahoo/yahoo.c:2928
+#: src/protocols/yahoo/yahoo.c:2826
 msgid ""
 "<b>Sorry, non-English profiles are not supported at this time.</b><br><br>\n"
 msgstr "<b>Ej engelska profiler stöds ännu inte.</b><br><br>\n"
 
-#: src/protocols/yahoo/yahoo.c:2976 src/protocols/yahoo/yahoo.c:2977
+#: src/protocols/yahoo/yahoo.c:2874 src/protocols/yahoo/yahoo.c:2875
 msgid "Yahoo! ID"
 msgstr "Yahoo!-ID"
 
-#: src/protocols/yahoo/yahoo.c:3021 src/protocols/yahoo/yahoo.c:3024
-#: src/protocols/yahoo/yahoo.c:3027
+#: src/protocols/yahoo/yahoo.c:2919 src/protocols/yahoo/yahoo.c:2922
+#: src/protocols/yahoo/yahoo.c:2925
 msgid "Hobbies"
 msgstr "Hobbyer"
 
-#: src/protocols/yahoo/yahoo.c:3036 src/protocols/yahoo/yahoo.c:3039
+#: src/protocols/yahoo/yahoo.c:2934 src/protocols/yahoo/yahoo.c:2937
 msgid "Latest News"
 msgstr "Senaste nytt"
 
-#: src/protocols/yahoo/yahoo.c:3053
+#: src/protocols/yahoo/yahoo.c:2951
 msgid "Home Page"
 msgstr "Hemsida"
 
-#: src/protocols/yahoo/yahoo.c:3065
+#: src/protocols/yahoo/yahoo.c:2963
 msgid "Cool Link 1"
 msgstr "Tuff länk 1"
 
-#: src/protocols/yahoo/yahoo.c:3069
+#: src/protocols/yahoo/yahoo.c:2967
 msgid "Cool Link 2"
 msgstr "Tuff länk 2"
 
-#: src/protocols/yahoo/yahoo.c:3071
+#: src/protocols/yahoo/yahoo.c:2969
 msgid "Cool Link 3"
 msgstr "Tuff länk 3"
 
-#: src/protocols/yahoo/yahoo.c:3077
+#: src/protocols/yahoo/yahoo.c:2975
 msgid "Member Since"
 msgstr "Medlem sedan"
 
@@ -8271,125 +7681,79 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/yahoo/yahoo.c:3283 src/protocols/yahoo/yahoo.c:3285
+#: src/protocols/yahoo/yahoo.c:3175 src/protocols/yahoo/yahoo.c:3177
 msgid "Yahoo Protocol Plugin"
 msgstr "Insticksmodul för Yahoo-protokoll"
 
-#: src/protocols/yahoo/yahoo.c:3302
+#: src/protocols/yahoo/yahoo.c:3194
 msgid "Pager host"
 msgstr "Sökarevärd"
 
-#: src/protocols/yahoo/yahoo.c:3305
+#: src/protocols/yahoo/yahoo.c:3197
 msgid "Pager port"
 msgstr "Sökareport"
 
-#: src/protocols/yahoo/yahoo.c:3308
+#: src/protocols/yahoo/yahoo.c:3200
 msgid "File transfer host"
 msgstr "Värd för filöverföring"
 
-#: src/protocols/yahoo/yahoo.c:3311
+#: src/protocols/yahoo/yahoo.c:3203
 msgid "File transfer port"
 msgstr "Port för filöverföring"
 
-#: src/protocols/yahoo/yahoo.c:3314
-msgid "Chat Room List Url"
-msgstr ""
-
-#: src/protocols/yahoo/yahoo_filexfer.c:200
-msgid ""
-"Gaim cannot send files over Yahoo! that are bigger than One Megabyte "
-"(1,048,576 bytes)."
-msgstr ""
-
-#: src/protocols/yahoo/yahoochat.c:198
+#: src/protocols/yahoo/yahoochat.c:194
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr "%s tackade nej till din inbjudan till rum \"%s\" eftersom \"%s\"."
 
-#: src/protocols/yahoo/yahoochat.c:200
+#: src/protocols/yahoo/yahoochat.c:196
 msgid "Invitation Rejected"
 msgstr "Inbjudan avvisad"
 
-#: src/protocols/yahoo/yahoochat.c:350
+#: src/protocols/yahoo/yahoochat.c:346
 msgid "Failed to join chat"
 msgstr "Kunde inte ansluta till chatt"
 
-#: src/protocols/yahoo/yahoochat.c:350
+#: src/protocols/yahoo/yahoochat.c:346
 msgid "Maybe the room is full?"
 msgstr "Rummet kanske är fullt?"
 
-#: src/protocols/yahoo/yahoochat.c:426
-#, fuzzy, c-format
-msgid "You are now chatting in %s."
-msgstr "Du är bannlyst i %s."
-
-#: src/protocols/yahoo/yahoochat.c:580
+#: src/protocols/yahoo/yahoochat.c:558
 msgid "Failed to join buddy in chat"
 msgstr "Kunde inte ansluta kompis till chatt"
 
-#: src/protocols/yahoo/yahoochat.c:581
+#: src/protocols/yahoo/yahoochat.c:559
 msgid "Maybe they're not in a chat?"
 msgstr "De kanske inte är i någon chatt?"
 
-#: src/protocols/yahoo/yahoochat.c:1301
-#, fuzzy
-msgid "Unable to connect"
-msgstr "Kan inte ansluta."
-
-#: src/protocols/yahoo/yahoochat.c:1301
-#, fuzzy
-msgid "Fetching the room list failed."
-msgstr "Rummet kanske är fullt?"
-
-#: src/protocols/yahoo/yahoochat.c:1346
-#, fuzzy
-msgid "Voices"
-msgstr "Röst"
-
-#: src/protocols/yahoo/yahoochat.c:1349
-msgid "Webcams"
-msgstr ""
-
-#: src/protocols/yahoo/yahoochat.c:1360 src/protocols/yahoo/yahoochat.c:1421
-#, fuzzy
-msgid "Unable to fetch room list."
-msgstr "Kan inte ändra i AIM-profil."
-
-#: src/protocols/yahoo/yahoochat.c:1414
-#, fuzzy
-msgid "User Rooms"
-msgstr "Användaralternativ"
-
-#: src/protocols/zephyr/zephyr.c:525
+#: src/protocols/zephyr/zephyr.c:344
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>Användare:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:527
+#: src/protocols/zephyr/zephyr.c:346
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>Alias:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:529
+#: src/protocols/zephyr/zephyr.c:348
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>Gömd eller inte inloggad"
 
-#: src/protocols/zephyr/zephyr.c:533
+#: src/protocols/zephyr/zephyr.c:352
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>%s sedan %s"
 
-#: src/protocols/zephyr/zephyr.c:793 src/protocols/zephyr/zephyr.c:794
-#: src/protocols/zephyr/zephyr.c:982 src/protocols/zephyr/zephyr.c:983
+#: src/protocols/zephyr/zephyr.c:584 src/protocols/zephyr/zephyr.c:585
 msgid "Anyone"
 msgstr "Någon"
 
-#: src/protocols/zephyr/zephyr.c:820
+#: src/protocols/zephyr/zephyr.c:609
 msgid "Already logged in with Zephyr"
 msgstr "Redan inloggad med Zephyr"
 
-#: src/protocols/zephyr/zephyr.c:821
+#: src/protocols/zephyr/zephyr.c:610
 msgid ""
 "Because Zephyr uses your system username, you are unable to have multiple "
 "accounts on it when logged in as the same user."
@@ -8397,19 +7761,19 @@
 "Eftersom Zephyr använder ditt systemanvändarnamn, kan du inte ha flera "
 "konton i det när du är inloggad som samma användare."
 
-#: src/protocols/zephyr/zephyr.c:1158
+#: src/protocols/zephyr/zephyr.c:868
 msgid "ZLocate"
 msgstr "ZLocate"
 
-#: src/protocols/zephyr/zephyr.c:1198
+#: src/protocols/zephyr/zephyr.c:908
 msgid "_Class:"
 msgstr "_Klass:"
 
-#: src/protocols/zephyr/zephyr.c:1203
+#: src/protocols/zephyr/zephyr.c:913
 msgid "_Instance:"
 msgstr "_Instans:"
 
-#: src/protocols/zephyr/zephyr.c:1208
+#: src/protocols/zephyr/zephyr.c:918
 msgid "_Recipient:"
 msgstr "_Mottagare:"
 
@@ -8423,38 +7787,25 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/zephyr/zephyr.c:1358 src/protocols/zephyr/zephyr.c:1360
+#: src/protocols/zephyr/zephyr.c:1049 src/protocols/zephyr/zephyr.c:1051
 msgid "Zephyr Protocol Plugin"
 msgstr "Insticksmodul för Zephyr-protokoll"
 
-#: src/protocols/zephyr/zephyr.c:1377
-msgid "Export to .anyone"
-msgstr ""
-
-#: src/protocols/zephyr/zephyr.c:1380
-msgid "Export to .zephyr.subs"
-msgstr ""
-
-#: src/protocols/zephyr/zephyr.c:1383
-msgid "Exposure"
-msgstr ""
-
 #. Forbidden
-#: src/proxy.c:954
+#: src/proxy.c:1014
 msgid "Access denied: proxy server forbids port 80 tunnelling."
 msgstr "Åtkomst nekad: proxy-servern tillåter inte \"port 80\"-tunnling."
 
-#: src/proxy.c:956
+#: src/proxy.c:1016
 #, c-format
 msgid "Proxy connection error %d"
 msgstr "Proxy-anslutningsfel %d"
 
-#: src/proxy.c:1695
+#: src/proxy.c:1736
 msgid "Invalid proxy settings"
 msgstr "Felaktiga proxyinställningar"
 
-#: src/proxy.c:1695
+#: src/proxy.c:1736
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -8463,43 +7814,43 @@
 "ogiltigt."
 
 #. * Custom away message.
-#: src/prpl.h:189
+#: src/prpl.h:187
 msgid "Custom"
 msgstr "Anpassat"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:1247
+#: src/request.h:1028
 msgid "Accept"
 msgstr "Acceptera"
 
-#: src/server.c:58
+#: src/server.c:56
 msgid "Please enter your password"
 msgstr "Ange ditt lösenord"
 
-#: src/server.c:960
+#: src/server.c:948
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "(%d meddelande)"
 msgstr[1] "(%d meddelanden)"
 
-#: src/server.c:974
+#: src/server.c:961
 msgid "(1 message)"
 msgstr "(1 meddelande)"
 
-#: src/server.c:1161 src/server.c:1171
+#: src/server.c:1145 src/server.c:1155
 #, c-format
 msgid "%s logged in."
 msgstr "%s loggade in."
 
-#: src/server.c:1188 src/server.c:1196
+#: src/server.c:1172 src/server.c:1180
 #, c-format
 msgid "%s logged out."
 msgstr "%s loggade ut."
 
-#: src/server.c:1243
+#: src/server.c:1227
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -8508,11 +7859,11 @@
 "%s har just blivit varnad av %s.\n"
 "Din nya varningsnivå är %d%%"
 
-#: src/server.c:1246
+#: src/server.c:1230
 msgid "an anonymous person"
 msgstr "en anonym person"
 
-#: src/server.c:1349
+#: src/server.c:1333
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -8521,125 +7872,68 @@
 "Användaren '%s' bjuder in %s till kompischattrum: '%s'\n"
 "%s"
 
-#: src/server.c:1353
+#: src/server.c:1337
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr "Användaren '%s' bjuder in %s till kompischattrum: '%s'\n"
 
-#: src/server.c:1359
+#: src/server.c:1343
 msgid "Accept chat invitation?"
 msgstr "Tacka ja till chattinbjudan?"
 
 #. for people like myself who are too lazy to add an away msg :)
 #. I don't know who "myself" is in this context.  The exclamation point
 #. * makes it slightly less boring ;)
-#: src/status.c:36
+#: src/status.c:35
 msgid "Sorry, I ran out for a bit!"
 msgstr "Gick ut ett tag, strax tillbaka!"
 
-#: src/stock.c:86
-#, fuzzy
-msgid "_Alias"
-msgstr "Alias:"
-
-#: src/stock.c:88
+#: src/stock.c:83
 msgid "_Modify"
 msgstr "_Ändra"
 
-#: src/stock.c:89
+#: src/stock.c:84
 msgid "_Open Mail"
 msgstr "_Öppna brev"
 
-#: src/stock.c:91
-msgid "_Warn"
-msgstr "_Varna"
-
-#: src/util.c:1884
+#: src/util.c:1892
 msgid "Calculating..."
 msgstr "Beräknar..."
 
-#: src/util.c:1887
+#: src/util.c:1895
 msgid "Unknown."
 msgstr "Okänd."
 
-#: src/util.c:1918 src/util.c:1923 src/util.c:1928 src/util.c:1931
+#: src/util.c:1926 src/util.c:1931 src/util.c:1936 src/util.c:1939
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dag"
 msgstr[1] "dagar"
 
-#: src/util.c:1919 src/util.c:1923 src/util.c:1937 src/util.c:1939
+#: src/util.c:1927 src/util.c:1931 src/util.c:1945 src/util.c:1947
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "timme"
 msgstr[1] "timmar"
 
-#: src/util.c:1919 src/util.c:1928 src/util.c:1937 src/util.c:1942
+#: src/util.c:1927 src/util.c:1936 src/util.c:1945 src/util.c:1950
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minut"
 msgstr[1] "minuter"
 
-#: src/util.c:2274
+#: src/util.c:2282
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Fel vid öppnande av anslutning.\n"
 
-#: src/win32/win32dep.c:272
+#: src/win32/win32dep.c:271
 msgid "Moving Gaim Settings.."
 msgstr "Flyttar Gaim-inställningar.."
 
-#: src/win32/win32dep.c:275
+#: src/win32/win32dep.c:274
 msgid "Moving Gaim user settings to: "
 msgstr "Flyttar Gaim-användarinställningar till:"
 
-#: src/win32/win32dep.c:277
+#: src/win32/win32dep.c:276
 msgid "Notification"
 msgstr "Notifiering"
-
-#~ msgid "_Get Info"
-#~ msgstr "Hämta _information"
-
-#~ msgid "_IM"
-#~ msgstr "_Snabbmeddelande"
-
-#~ msgid "Normal font size"
-#~ msgstr "Normal typsnittsstorlek"
-
-#~ msgid "Browser Options"
-#~ msgstr "Inställningar för webbläsaren"
-
-#~ msgid "Open new _window by default"
-#~ msgstr "Öppna alltid nytt _fönster"
-
-#~ msgid "Bad Protocol"
-#~ msgstr "Fel i protokollet"
-
-#~ msgid "Invalid Realm"
-#~ msgstr "Ogiltig gräns"
-
-#~ msgid "Mechanism Too Weak"
-#~ msgstr "Mekanism för svag"
-
-#~ msgid "Registration of %s@%s failed: %s"
-#~ msgstr "Registrering av %s@%s misslyckades: %s"
-
-#~ msgid "Unknown error occurred changing password"
-#~ msgstr "Okänt fel uppstod vid lösenordsbyte"
-
-#~ msgid "Unable to join chat"
-#~ msgstr "Kan inte ansluta till chatt"
-
-#~ msgid "Could not send %s to %s, protocol not supported."
-#~ msgstr "Kunde inte skicka %s till %s, protokollet stöds ej."
-
-#~ msgid "Internal server error"
-#~ msgstr "Internt serverfel"
-
-#~ msgid "Unable to read from MSN Nexus server."
-#~ msgstr "Kan inte läsa huvud från MSN Nexus-server."
-
-#~ msgid "MSN Nexus server returned invalid information."
-#~ msgstr "MSN Nexus-server svarade med ogiltig information."
-
-#~ msgid "Unable to connect to passport server"
-#~ msgstr "Kan inte ansluta till passport-servern."