diff po/no.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 8bf735cf9d1c
line wrap: on
line diff
--- a/po/no.po	Tue Mar 16 20:35:22 2004 +0000
+++ b/po/no.po	Tue Mar 16 20:48:21 2004 +0000
@@ -12,8 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim 0.73\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-16 15:37-0500\n"
+"POT-Creation-Date: 2003-11-12 19:48+0100\n"
 "PO-Revision-Date: 2003-08-31 14:00+0100\n"
 "Last-Translator: Petter Johan Olsen <petter.olsen@cc.uit.no>\n"
 "Language-Team: Petter Johan Olsen <petter.olsen@cc.uit.no>\n"
@@ -29,15 +28,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:110
+#: plugins/autorecon.c:104
 msgid "Auto-Reconnect"
 msgstr "Automatisk tilkobling ved brudd"
 
 #. *< 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 ""
 "Dette tillegget vil koble deg til på nytt dersom du mister forbindelsen."
@@ -119,8 +117,8 @@
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
 msgstr ""
-"Lar deg endre vektingen for inaktiv/borte/avlogget for kontakter i "
-"kontaktprioritetsutregninger."
+"Lar deg endre vektingen for inaktiv/borte/avlogget for kontakter "
+"i kontaktprioritetsutregninger."
 
 #.
 #. *  DEFINES, MACROS & DATA TYPES
@@ -137,12 +135,12 @@
 msgid "Gaim - Away"
 msgstr "Gaim - Borte"
 
-#: plugins/docklet/docklet.c:114 src/gtkaccount.c:495 src/gtkaccount.c:1820
+#: plugins/docklet/docklet.c:114 src/gtkaccount.c:482 src/gtkaccount.c:1768
 msgid "Auto-login"
 msgstr "Automatisk pålogging"
 
+#: plugins/docklet/docklet.c:117
 #
-#: plugins/docklet/docklet.c:117
 msgid "New Message..."
 msgstr "Ny melding..."
 
@@ -154,16 +152,16 @@
 msgid "New..."
 msgstr "Ny..."
 
-#: 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:2313 src/gtkpounce.c:411
+#: src/gtkprefs.c:1467 src/protocols/gg/gg.c:51 src/protocols/irc/msgs.c:187
+#: src/protocols/jabber/jabber.c:928 src/protocols/jabber/jutil.c:98
+#: src/protocols/jabber/presence.c:84 src/protocols/oscar/oscar.c:2844
+#: src/protocols/oscar/oscar.c:4586 src/protocols/oscar/oscar.c:5532
+#: src/protocols/oscar/oscar.c:6133
 msgid "Away"
 msgstr "Borte"
 
-#: plugins/docklet/docklet.c:159 src/away.c:522
+#: plugins/docklet/docklet.c:159 src/away.c:515
 msgid "Back"
 msgstr "Tilbake"
 
@@ -171,16 +169,16 @@
 msgid "Mute Sounds"
 msgstr "Skru av lyder"
 
-#: plugins/docklet/docklet.c:172 src/gtkft.c:605
+#: plugins/docklet/docklet.c:172 src/gtkft.c:559
 msgid "File Transfers"
 msgstr "Filoverføringer"
 
 #. 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:1927 src/main.c:323
 msgid "Accounts"
 msgstr "Kontoer"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2564 src/main.c:294
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2331 src/main.c:333
 msgid "Preferences"
 msgstr "Innstillinger"
 
@@ -238,15 +236,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/filectl.c:223
+#: plugins/filectl.c:201
 msgid "Gaim File Control"
 msgstr "Styre Gaim fra kontrollfil"
 
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: plugins/filectl.c:226 plugins/filectl.c:228
+#: plugins/filectl.c:204 plugins/filectl.c:206
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr "Lar deg kontrollere Gaim ved å skrive inn kommandoer i en fil."
 
@@ -273,19 +270,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaim-remote/remote.c:715
+#: plugins/gaim-remote/remote.c:714
 msgid "Remote Control"
 msgstr "Styre Gaim fra kontrollfil"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaim-remote/remote.c:718
+#: plugins/gaim-remote/remote.c:717
 msgid "Provides remote control for gaim applications."
 msgstr "Muliggjør fjernstyring for Gaim-applikasjoner."
 
 #. *  description
-#: plugins/gaim-remote/remote.c:720
+#: plugins/gaim-remote/remote.c:719
 msgid ""
 "Gives Gaim the ability to be remote-controlled through third-party "
 "applications or through the gaim-remote tool."
@@ -300,19 +297,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaiminc.c:87
+#: plugins/gaiminc.c:81
 msgid "Gaim Demonstration Plugin"
 msgstr "Gaim eksempeltillegg"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaiminc.c:90
+#: plugins/gaiminc.c:84
 msgid "An example plugin that does stuff - see the description."
 msgstr "Et eksempeltillegg som gjør noe - se beskrivelsen."
 
 #. *  description
-#: plugins/gaiminc.c:92
+#: plugins/gaiminc.c:86
 msgid ""
 "This is a really cool plugin that does a lot of stuff:\n"
 "- It tells you who wrote the program when you log in\n"
@@ -377,190 +374,47 @@
 "Dra opp og deretter til venstre for å bytte til det forrige samtalevinduet.\n"
 "Dra opp og deretter til høyre for å bytte til det neste samtalevinduet."
 
-#: plugins/gevolution/add_buddy_dialog.c:136
-#: plugins/gevolution/assoc-buddy.c:76
-#, fuzzy
-msgid "Local Addressbook"
-msgstr "E-postadresse"
-
-#: 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 "Ingen"
-
-#: 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 "Navn"
-
-#: plugins/gevolution/add_buddy_dialog.c:201
-#, fuzzy
-msgid "Instant Messaging"
-msgstr "Gaim Instant Messenger - Borte"
-
-#. 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 "Gruppe:"
-
-#. "New Person" button
-#: plugins/gevolution/add_buddy_dialog.c:592
-#: plugins/gevolution/assoc-buddy.c:488
-#, fuzzy
-msgid "New Person"
-msgstr "<Ny bruker>"
-
-#. "Select Buddy" button
-#: plugins/gevolution/add_buddy_dialog.c:609
-#, fuzzy
-msgid "Select Buddy"
-msgstr "Endre kontaktnavn"
-
-#. 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 "Vis nedlastingsdetaljer"
-
-#: plugins/gevolution/assoc-buddy.c:452
-#, fuzzy
-msgid "Hide user details"
-msgstr "Skjul nedlastingsdetaljer"
-
-#. "Associate Buddy" button
-#: plugins/gevolution/assoc-buddy.c:505
-#, fuzzy
-msgid "_Associate Buddy"
-msgstr "Alias for kontakt"
-
-#: 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 "Kontakter"
-
-#: plugins/gevolution/gevolution.c:214
-msgid "Add to Address Book"
-msgstr ""
-
-#. Configuration frame
-#: plugins/gevolution/gevolution.c:347
-#, fuzzy
-msgid "Evolution Integration Configuration"
-msgstr "Innstillinger for trayikon"
-
-#. 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 "Tilleggsinformasjon"
-
-#. *< 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 "Hent brukerinformasjon"
-
-#: 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 "Skjermnavn:"
-
-#. Optional Information section
-#: plugins/gevolution/new_person_dialog.c:318
-#, fuzzy
-msgid "Optional information:"
-msgstr "Tilleggsinformasjon"
-
-#. Label
-#: plugins/gevolution/new_person_dialog.c:341 src/gtkaccount.c:318
-#: src/protocols/oscar/oscar.c:3174
-msgid "Buddy Icon"
-msgstr "Kontaktikon"
-
-#: plugins/gevolution/new_person_dialog.c:353
-#, fuzzy
-msgid "First name:"
-msgstr "Fornavn"
-
-#: plugins/gevolution/new_person_dialog.c:365
-#, fuzzy
-msgid "Last name:"
-msgstr "Etternavn:"
-
-#: plugins/gevolution/new_person_dialog.c:385
-#, fuzzy
-msgid "E-mail:"
-msgstr "E-post"
-
-#: plugins/history.c:74
+#: plugins/gtik.c:719
+msgid "Gnome Stock Ticker Properties"
+msgstr "Egenskaper for Gnome Stock Ticker"
+
+#: plugins/gtik.c:731
+msgid "Update Frequency in min"
+msgstr "Oppdateringsfrekvens i minutter"
+
+#: plugins/gtik.c:747
+msgid "Enter symbols delimited with \"+\" in the box below."
+msgstr "Skriv inn symboler atskilt med \"+\" i boksen under."
+
+#. OUTPUT FORMAT and SCROLL DIRECTION
+#: plugins/gtik.c:757
+msgid "Check this box to display only symbols and price:"
+msgstr "Kryss av denne boksen for å vise bare symboler og priser:"
+
+#: plugins/gtik.c:758
+msgid "Check this box to scroll left to right:"
+msgstr "Kryss av denne boksen for å rulle fra venstre mot høyre:"
+
+#: plugins/gtik.c:994
+msgid "(No"
+msgstr "(Nei"
+
+#: plugins/gtik.c:995
+msgid "Change"
+msgstr "Endre"
+
+#: plugins/history.c:65
 msgid "History"
 msgstr "Historikk"
 
-#: plugins/history.c:76
+#: plugins/history.c:67
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Viser tidligere loggede samtaler i nye samtaler."
 
-#: plugins/history.c:77
-#, fuzzy
-msgid ""
-"When a new conversation is opened this plugin will insert the last "
-"conversation into the current conversation."
+#: plugins/history.c:68
+msgid ""
+"When a new conversation is opened this plugin will insert the last XXX of "
+"the last conversation into the current conversation."
 msgstr ""
 "Når en ny samtale startes, vil dette tillegget sette inn siste XXX fra den "
 "forrige samtalen inn i det nye samtalevinduet."
@@ -579,7 +433,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 "Minimer kontaktlisten og samtalene når du er markert som borte."
@@ -639,7 +492,6 @@
 "Test IPC-støtte for tillegg (som klient). Dette finner tjenertillegget og "
 "kaller de registrerte kommandoene."
 
-#
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -648,6 +500,7 @@
 #. *< priority
 #. *< id
 #: plugins/ipc-test-server.c:71
+#
 msgid "IPC Test Server"
 msgstr "IPC testtjener"
 
@@ -661,8 +514,7 @@
 #. *  description
 #: plugins/ipc-test-server.c:76
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
-msgstr ""
-"Test IPC-støtte for tillegg (som tjener). Dette registrerer IPC-kommandoene."
+msgstr "Test IPC-støtte for tillegg (som tjener). Dette registrerer IPC-kommandoene."
 
 #: plugins/mailchk.c:156
 msgid "Mail Checker"
@@ -681,13 +533,13 @@
 msgid "_IM windows"
 msgstr "Vinduer for direktemeldinger"
 
+#: plugins/notify.c:583
 #
-#: plugins/notify.c:583
 msgid "C_hat windows"
 msgstr "_Samtalevinduer"
 
+#: plugins/notify.c:590
 #
-#: plugins/notify.c:590
 msgid "_Focused windows"
 msgstr "Vinduer som har _fokus"
 
@@ -705,9 +557,9 @@
 msgid "Insert c_ount of new messages into window title"
 msgstr "Sett inn antall nye beskjeder i vindustittelen"
 
-#
 #. Urgent method button
 #: plugins/notify.c:633
+#
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Sett \"URGENT\"-hintet for vindusbehandleren"
 
@@ -716,9 +568,9 @@
 msgid "Notification Removal"
 msgstr "Fjern varsling"
 
-#
 #. Remove on focus button
 #: plugins/notify.c:646
+#
 msgid "Remove when conversation window _gains focus"
 msgstr "Fjern når samtalevinduet får fokus"
 
@@ -732,15 +584,15 @@
 msgid "Remove when _typing in conversation window"
 msgstr "Fjern når du skriver i samtalevinduet"
 
-#
 #. Remove on message send button
 #: plugins/notify.c:670
+#
 msgid "Remove when a _message gets sent"
 msgstr "Fjern når en beskjed sendes"
 
-#
 #. Remove on conversation switch button
 #: plugins/notify.c:679
+#
 msgid "Remove on conversation ta_b switch"
 msgstr ""
 
@@ -758,7 +610,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 "Lar deg bli varslet om uleste meldinger på flere vis."
@@ -770,14 +621,13 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/perl/perl.c:530
+#: plugins/perl/perl.c:524
 msgid "Perl Plugin Loader"
 msgstr "Perl-tilleggslaster"
 
 #. *< 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 "Lar deg laste perl-tillegg."
 
@@ -797,30 +647,6 @@
 "Lar deg sende direktekommandoer til tekstbaserte protokoller (Jabber, MSN, "
 "IRC, TOC). Trykk 'Enter' for å sende, og sjekk avlusningsvinduet."
 
-#: plugins/relnot.c:62
-#, c-format
-msgid "You are using Gaim version %s.  The current version is %s.<hr>"
-msgstr ""
-
-#: plugins/relnot.c:68
-#, fuzzy, c-format
-msgid ""
-"<b>ChangeLog:</b>\n"
-"%s<br><br>"
-msgstr "<b>Bruker:</b> %s<br>"
-
-#: plugins/relnot.c:73
-#, c-format
-msgid ""
-"You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/"
-"\">http://gaim.sourceforge.net</a>."
-msgstr ""
-
-#: plugins/relnot.c:77 plugins/relnot.c:78
-#, fuzzy
-msgid "New Version Available"
-msgstr "Ikke tilgjengelig"
-
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -828,42 +654,15 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/relnot.c:134
-#, fuzzy
-msgid "Release Notification"
-msgstr "Beskjedvarsling"
+#: plugins/signals-test.c:502
+msgid "Signals Test"
+msgstr "Signaltest"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/relnot.c:137
-msgid "Checks periodically for new releases."
-msgstr ""
-
-#. *  description
-#: plugins/relnot.c:139
-msgid ""
-"Checks periodically for new releases and notifies the user with the "
-"ChangeLog."
-msgstr ""
-
-#. *< api_version
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/signals-test.c:465
-msgid "Signals Test"
-msgstr "Signaltest"
-
+#: plugins/signals-test.c:505 plugins/signals-test.c:507
 #
-#. *< 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 for å se om alle signaler fungerer korrekt."
 
@@ -881,7 +680,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/simple.c:34 plugins/simple.c:36
 msgid "Tests to see that most things are working."
 msgstr "Test for å se at mesteparten fungerer."
@@ -925,15 +723,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-gnutls.c:223
+#: plugins/ssl/ssl-gnutls.c:197
 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:200 plugins/ssl/ssl-gnutls.c:202
 msgid "Provides SSL support through GNUTLS."
 msgstr "Tilbyr SSL-støtte gjennom GNUTLS."
 
@@ -944,15 +741,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-nss.c:312
+#: plugins/ssl/ssl-nss.c:296
 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:299 plugins/ssl/ssl-nss.c:301
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Tilbyr SSL-støtte gjennom Mozillas NSS."
 
@@ -970,12 +766,11 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/ssl/ssl.c:94 plugins/ssl/ssl.c:96
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "Tilbyr ett felles grensesnitt for SSL-biblioteker."
 
-#: plugins/statenotify.c:30 src/gtkpounce.c:820
+#: plugins/statenotify.c:30 src/gtkpounce.c:793
 #, c-format
 msgid "%s has gone away."
 msgstr "%s er borte."
@@ -1009,7 +804,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,13 +812,13 @@
 "Varsler i et samtalevindu når en kontakt blir borte/inaktiv, eller "
 "returnerer."
 
+#: plugins/tcl/tcl.c:344
 #
-#: plugins/tcl/tcl.c:349
 msgid "Tcl Plugin Loader"
 msgstr "Tcl-tilleggslaster"
 
+#: plugins/tcl/tcl.c:346 plugins/tcl/tcl.c:347
 #
-#: plugins/tcl/tcl.c:351 plugins/tcl/tcl.c:352
 msgid "Provides support for loading Tcl plugins"
 msgstr "Lar deg laste Tcl-tillegg."
 
@@ -1035,15 +829,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 "Rullende kontaktliste"
 
 #. *< 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 horisontalt rullende versjon av kontaktlisten."
 
@@ -1073,7 +866,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/timestamp.c:176 plugins/timestamp.c:178
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr "Legger til tidsstempel i samtalevinduer a la iChat hvert Nte minutt."
@@ -1098,7 +890,7 @@
 msgstr "Vis glideknapp i direktemeldingsvindu"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:854
+#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:844
 msgid "Buddy List Window"
 msgstr "Kontaktlistevindu"
 
@@ -1120,7 +912,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/win32/transparency/win2ktrans.c:425
 #: plugins/win32/transparency/win2ktrans.c:427
 msgid ""
@@ -1146,8 +937,8 @@
 msgstr "Start Gaim når Windows starter"
 
 #. 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:2150
+#: src/gtkprefs.c:2264
 msgid "Buddy List"
 msgstr "Kontaktliste"
 
@@ -1166,8 +957,8 @@
 msgstr "Hold kontaktlistevinduet ø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:880
+#: src/gtkprefs.c:2265
 msgid "Conversations"
 msgstr "Samtaler"
 
@@ -1183,20 +974,12 @@
 msgid "Options specific to Windows Gaim."
 msgstr "Innstillinger som er spesifikke for Windows Gaim."
 
-#: src/about.c:59
-#, fuzzy
-msgid "About Gaim"
+#: src/about.c:57
+#, c-format
+msgid "About Gaim v%s"
 msgstr "Om Gaim v%s"
 
-#: src/about.c:74
-#, fuzzy, c-format
-msgid "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Du har e-post!</span>\n"
-"\n"
-"%s"
-
-#: src/about.c:94
+#: src/about.c:89
 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 "
@@ -1206,138 +989,130 @@
 "Yahoo!, MSN, IRC, Jabber, Napster, Zephyr og Gadu-Gadu samtidig. Programmet "
 "er bygget på Gtk+ og er lisensiert under GPL.<BR><BR>"
 
-#: src/about.c:104
+#: src/about.c:99
 msgid "<FONT SIZE=\"3\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"3\">IRC:</FONT> #gaim på irc.freenode.net<BR><BR>"
 
-#: src/about.c:109
+#: src/about.c:104
 msgid "Active Developers"
 msgstr "Aktive utviklere"
 
+#: src/about.c:105
 #
-#: src/about.c:110
 msgid "maintainer"
 msgstr "ansvarlig"
 
-#: src/about.c:112
+#: src/about.c:107
 msgid "lead developer"
 msgstr "hovedutvikler"
 
-#: src/about.c:115
+#: src/about.c:110
 msgid "developer & webmaster"
 msgstr "utvikler og vevansvarlig"
 
-#: src/about.c:116
+#: src/about.c:111
 msgid "win32 port"
 msgstr "windows-versjon"
 
-#: src/about.c:119 src/about.c:120 src/about.c:121
+#: src/about.c:114 src/about.c:115 src/about.c:116
 msgid "developer"
 msgstr "utvikler"
 
+#: src/about.c:117
 #
-#: src/about.c:122
 msgid "support"
 msgstr "støtte"
 
-#: src/about.c:129
+#: src/about.c:124
 msgid "Crazy Patch Writers"
 msgstr "folk som har bidratt med rettelser"
 
-#: src/about.c:143
-msgid "Retired Developers"
-msgstr "tidligere utviklere"
-
-#: src/about.c:144
-msgid "former libfaim maintainer"
-msgstr "tidligere libfaim-ansvarlig"
-
 #: src/about.c:145
+msgid "Retired Developers"
+msgstr "tidligere utviklere"
+
+#: src/about.c:146
+msgid "former libfaim maintainer"
+msgstr "tidligere libfaim-ansvarlig"
+
+#: src/about.c:147
 msgid "former lead developer"
 msgstr "tidligere hovedutvikler"
 
-#: src/about.c:148
+#: src/about.c:150
 msgid "former maintainer"
 msgstr "tidligere ansvarlig"
 
-#: src/about.c:149
+#: src/about.c:151
 msgid "former Jabber developer"
 msgstr "tidligere jabber-utvikler"
 
+#: src/about.c:152
 #
-#: src/about.c:150
 msgid "original author"
 msgstr "opprinnelig laget av"
 
-#: src/about.c:153
+#: src/about.c:155
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hacker og sjåfør (avslappet fyr)"
 
-#: src/about.c:161
+#: src/about.c:163
 msgid "Current Translators"
 msgstr "Aktive oversettere"
 
-#: src/about.c:162 src/about.c:195
+#: src/about.c:164 src/about.c:194
 msgid "Catalan"
 msgstr "Katalansk"
 
-#: src/about.c:163 src/about.c:196
+#: src/about.c:165 src/about.c:195
 msgid "Czech"
 msgstr "Tsjekkisk"
 
+#: src/about.c:166
 #
-#: src/about.c:164
 msgid "Danish"
 msgstr "Dansk"
 
-#: src/about.c:165
-msgid "British English"
-msgstr ""
-
-#: src/about.c:166 src/about.c:197
+#: src/about.c:167 src/about.c:196
 msgid "German"
 msgstr "Tysk"
 
-#: src/about.c:167 src/about.c:198
+#: src/about.c:168 src/about.c:197
 msgid "Spanish"
 msgstr "Spansk"
 
+#: src/about.c:169
 #
-#: src/about.c:168 src/about.c:199
 msgid "Finnish"
 msgstr "Finsk"
 
-#: src/about.c:169 src/about.c:200
+#: src/about.c:170 src/about.c:198
 msgid "French"
 msgstr "Fransk"
 
-#: src/about.c:170
+#: src/about.c:171
 msgid "Hindi"
 msgstr "Hindi"
 
-#: src/about.c:171
+#: src/about.c:172
 msgid "Hungarian"
 msgstr "Ungarsk"
 
+#: src/about.c:173 src/about.c:200
 #
-#: src/about.c:172 src/about.c:202
 msgid "Italian"
 msgstr "Italiensk"
 
-#: src/about.c:173 src/about.c:204
+#: src/about.c:174 src/about.c:202
 msgid "Korean"
 msgstr "Koreansk"
 
-#: src/about.c:174
+#: src/about.c:175
 msgid "Dutch; Flemish"
 msgstr "Nederlansk, flamsk"
 
-#: src/about.c:175
-msgid "Norwegian"
-msgstr "Norsk"
-
+#: src/about.c:176 src/about.c:204
 #
-#: src/about.c:176 src/about.c:205
 msgid "Polish"
 msgstr "Polsk"
 
@@ -1349,12 +1124,12 @@
 msgid "Portuguese-Brazil"
 msgstr "Portugisisk (Brasil)"
 
+#: src/about.c:179
 #
-#: src/about.c:179
 msgid "Romanian"
 msgstr "Rumensk"
 
-#: src/about.c:180 src/about.c:206
+#: src/about.c:180 src/about.c:205
 msgid "Russian"
 msgstr "Russisk"
 
@@ -1362,58 +1137,58 @@
 msgid "Serbian"
 msgstr "Serbisk"
 
-#: src/about.c:182 src/about.c:208
+#: src/about.c:182 src/about.c:207
 msgid "Swedish"
 msgstr "Svensk"
 
 #: src/about.c:183
-#, fuzzy
-msgid "Vietnamese"
-msgstr "Filnavn"
-
-#: src/about.c:183
-msgid "Gnome Vi Team"
-msgstr ""
-
-#: src/about.c:184
 msgid "Simplified Chinese"
 msgstr "Forenklet kinesisk"
 
-#: src/about.c:185
+#: src/about.c:184
 msgid "Traditional Chinese"
 msgstr "Tradisjonell kinesisk"
 
+#: src/about.c:191
+msgid "Past Translators"
+msgstr "Tidligere oversettere"
+
 #: src/about.c:192
-msgid "Past Translators"
-msgstr "Tidligere oversettere"
-
 #
-#: src/about.c:193
 msgid "Amharic"
 msgstr "Amharisk"
 
-#: src/about.c:194
+#: src/about.c:193
 msgid "Bulgarian"
 msgstr "Bulgarsk"
 
+#: src/about.c:199
+msgid "Hebrew"
+msgstr "Hebraisk"
+
 #: src/about.c:201
-msgid "Hebrew"
-msgstr "Hebraisk"
-
-#: src/about.c:203
 msgid "Japanese"
 msgstr "Japansk"
 
-#: src/about.c:207
+#: src/about.c:203
+msgid "Norwegian"
+msgstr "Norsk"
+
+#: src/about.c:206
 msgid "Slovak"
 msgstr "Slovakisk"
 
+#: src/about.c:208
 #
-#: src/about.c:209
 msgid "Chinese"
 msgstr "Kinesisk"
 
-#: src/account.c:275 src/protocols/jabber/jabber.c:1001
+#: src/about.c:221 src/dialogs.c:2190 src/gtkrequest.c:205
+#: src/protocols/msn/msn.c:247
+msgid "Close"
+msgstr "L_ukk"
+
+#: src/account.c:275 src/protocols/jabber/jabber.c:980
 msgid "New passwords do not match."
 msgstr "De nye passordene stemmer ikke overens."
 
@@ -1421,18 +1196,18 @@
 msgid "Fill out all fields completely."
 msgstr "Fyll ut alle feltene fullstendig."
 
+#: src/account.c:308
 #
-#: src/account.c:308
 msgid "Original password"
 msgstr "Opprinnelig passord"
 
+#: src/account.c:314
 #
-#: src/account.c:314
 msgid "New password"
 msgstr "Nytt passord"
 
+#: src/account.c:320
 #
-#: src/account.c:320
 msgid "New password (again)"
 msgstr "Nytt passord (igjen)"
 
@@ -1441,85 +1216,90 @@
 msgid "Change password for %s"
 msgstr "Endre passord for %s:"
 
+#: src/account.c:331
 #
-#: src/account.c:333
 msgid "Please enter your current password and your new password."
 msgstr "Skriv inn ditt nåværende passord og ditt nye passord."
 
 #. *
 #. * 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:334 src/connection.c:193 src/dialogs.c:1730
+#: src/dialogs.c:1747 src/dialogs.c:1790 src/gtkblist.c:1512
+#: src/gtkrequest.c:202 src/protocols/jabber/jabber.c:1025
+#: 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:2455 src/protocols/oscar/oscar.c:2535
+#: src/protocols/oscar/oscar.c:6183 src/protocols/oscar/oscar.c:6279
+#: src/protocols/oscar/oscar.c:6328 src/protocols/oscar/oscar.c:6410
+#: src/protocols/yahoo/yahoo.c:2232 src/request.h:852
 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
+#. Cancel button.
+#: src/account.c:335 src/account.c:369 src/buddy_chat.c:375
+#: src/connection.c:194 src/dialogs.c:467 src/dialogs.c:479 src/dialogs.c:492
+#: src/dialogs.c:513 src/dialogs.c:898 src/dialogs.c:1564 src/dialogs.c:1731
+#: src/dialogs.c:1748 src/dialogs.c:1791 src/dialogs.c:1907
+#: src/gtkaccount.c:1622 src/gtkaccount.c:2090 src/gtkblist.c:1513
+#: src/gtkblist.c:3452 src/gtkconn.c:148 src/gtkprivacy.c:568
+#: src/gtkprivacy.c:581 src/gtkprivacy.c:606 src/gtkprivacy.c:617
+#: src/gtkrequest.c:203 src/protocols/icq/gaim_icq.c:277
+#: src/protocols/jabber/buddy.c:512 src/protocols/jabber/jabber.c:657
+#: src/protocols/jabber/jabber.c:1026 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:2419 src/protocols/oscar/oscar.c:2456
+#: src/protocols/oscar/oscar.c:2491 src/protocols/oscar/oscar.c:2536
+#: src/protocols/oscar/oscar.c:6011 src/protocols/oscar/oscar.c:6184
+#: src/protocols/oscar/oscar.c:6280 src/protocols/oscar/oscar.c:6329
+#: src/protocols/oscar/oscar.c:6394 src/protocols/oscar/oscar.c:6411
+#: src/protocols/trepia/trepia.c:347 src/protocols/yahoo/yahoo.c:2233
+#: src/request.h:852 src/request.h:862
 msgid "Cancel"
 msgstr "_Avbryt"
 
-#: src/account.c:363
+#: src/account.c:361
 #, c-format
 msgid "Change user information for %s"
 msgstr "Endre brukerinformasjon for %s"
 
-#: 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:368 src/dialogs.c:894 src/dialogs.c:1552 src/dialogs.c:2199
+#: src/gtkrequest.c:209 src/protocols/jabber/buddy.c:511
+#: src/protocols/trepia/trepia.c:346
 msgid "Save"
 msgstr "Lagre"
 
-#: src/away.c:210
-#, fuzzy
-msgid "Away!"
-msgstr "Borte"
-
-#: src/away.c:275
+#: src/away.c:208
+msgid "Gaim - Away!"
+msgstr "Gaim - Borte!"
+
+#: src/away.c:269
 msgid "I'm Back!"
 msgstr "Tilbake!"
 
-#: src/away.c:375
+#: src/away.c:368
 msgid "New Away Message"
 msgstr "Ny fraværsbeskjed"
 
-#: src/away.c:395
+#: src/away.c:388
 msgid "Remove Away Message"
 msgstr "Fjern fraværsbeskjed"
 
-#: src/away.c:590
+#: src/away.c:583
 msgid "Set All Away"
 msgstr "Marker som borte på alle"
 
-#: src/blist.c:579 src/gtkprefs.c:2483
+#: src/blist.c:550 src/gtkprefs.c:2267
 msgid "Chats"
 msgstr "Samtaler"
 
-#: src/blist.c:1181
+#: src/blist.c:645 src/blist.c:833 src/blist.c:2041 src/gtkblist.c:2930
+#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:1159
+msgid "Buddies"
+msgstr "Kontakter"
+
+#: src/blist.c:1133
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1534,118 +1314,140 @@
 "%d kontakter fra gruppen %s ble ikke fjernet fordi kontoene deres ikke var "
 "innlogget. Disse kontaktene (og gruppen) ble ikke fjernet.\n"
 
-#: src/blist.c:1190
+#: src/blist.c:1142
 msgid "Group not removed"
 msgstr "Gruppe ikke fjernet"
 
-#: 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:1192 src/gtkaccount.c:159 src/gtkutils.c:841
+#: src/protocols/jabber/auth.c:110 src/protocols/jabber/buddy.c:563
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: src/blist.c:1567
+#: src/blist.c:1515
 msgid "Invalid Groupname"
 msgstr "Ugyldig gruppenavn"
 
-#: src/blist.c:2209
+#: src/blist.c:2158
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded."
 msgstr ""
 "Det oppstod en feil under innlasting av kontaktlisten din. Den har ikke "
 "blitt lastet."
 
-#: src/blist.c:2211
+#: src/blist.c:2160
 msgid "Buddy List Error"
 msgstr "Feil i kontaktliste"
 
-#: src/connection.c:119 src/connection.c:170
+#: src/buddy_chat.c:316 src/gtkblist.c:3344
+msgid ""
+"You are not currently signed on with any protocols that have the ability to "
+"chat."
+msgstr "Du er ikke pålogget med noen protokoller som støtter samtalegrupper."
+
+#: src/buddy_chat.c:330
+msgid "Join Chat"
+msgstr "Bli med i samtalegruppe"
+
+#: src/buddy_chat.c:336
+msgid "Buddy Chat"
+msgstr "Samtale"
+
+#: src/buddy_chat.c:346
+msgid "Join Chat As:"
+msgstr "Samtalegruppen er på denne kontoen:"
+
+#. Join button.
+#: src/buddy_chat.c:369
+msgid "Join"
+msgstr "_Start"
+
+#: src/connection.c:117 src/connection.c:165
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Mangler protokolltillegg for %s"
 
+#: src/connection.c:122
 #
-#: src/connection.c:124
 msgid "Registration Error"
 msgstr "Registreringsfeil"
 
-#: src/connection.c:175
+#: src/connection.c:170
 msgid "Connection Error"
 msgstr "Feil ved tilkobling"
 
-#: src/connection.c:196
+#: src/connection.c:191
 #, c-format
 msgid "Enter password for %s"
 msgstr "Oppgi passord for %s"
 
-#: src/conversation.c:296
+#: src/conversation.c:324
 msgid "Unable to send message. The message is too large."
 msgstr "Kunne ikke sende beskjed. Beskjeden er for stor."
 
-#: src/conversation.c:304
+#: src/conversation.c:332
 msgid "Unable to send message."
 msgstr "Kunne ikke sende beskjed."
 
-#: src/conversation.c:1968
+#: src/conversation.c:1907
 #, c-format
 msgid "%s entered the room."
 msgstr "%s kom inn i rommet."
 
-#: src/conversation.c:1971
+#: src/conversation.c:1910
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] kom inn i rommet."
 
-#: src/conversation.c:2063
-#, fuzzy, c-format
-msgid "You are now known as %s"
-msgstr "%s heter nå %s"
-
-#: src/conversation.c:2066
+#: src/conversation.c:1995
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s heter nå %s"
 
-#: src/conversation.c:2109
+#: src/conversation.c:2037
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s forlot rommet (%s)."
 
-#: src/conversation.c:2111
+#: src/conversation.c:2039
 #, c-format
 msgid "%s left the room."
 msgstr "%s forlot rommet."
 
-#: src/conversation.c:2184
+#: src/conversation.c:2112
 #, c-format
 msgid "(+%d more)"
 msgstr "(+%d flere)"
 
-#: src/conversation.c:2186
+#: src/conversation.c:2114
 #, c-format
 msgid " left the room (%s)."
 msgstr " forlot rommet (%s)."
 
-#: src/conversation.c:2466
+#: src/conversation.c:2396
 msgid "Last created window"
 msgstr "Sist lagde vindu"
 
-#: src/conversation.c:2468 src/gtkprefs.c:1380
+#: src/conversation.c:2398
 msgid "New window"
 msgstr "Nytt vindu"
 
-#: src/conversation.c:2470
+#: src/conversation.c:2400
 msgid "By group"
 msgstr "Etter gruppe"
 
-#: src/conversation.c:2472
+#: src/conversation.c:2402
 msgid "By account"
 msgstr "Etter konto"
 
-#: src/dialogs.c:155
+#: src/dialogs.c:315
 msgid "Warn User"
 msgstr "Advar bruker"
 
-#: src/dialogs.c:174
+#: src/dialogs.c:318
+msgid "_Warn"
+msgstr "Advar"
+
+#: src/dialogs.c:334
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1658,25 +1460,25 @@
 "Dette vil øke advarselsnivået til %s og vedkommende vil måtte tåle strengere "
 "hastighetsbegrensning.\n"
 
-#: src/dialogs.c:183
+#: src/dialogs.c:343
 msgid "Warn _anonymously?"
 msgstr "Advar anonymt"
 
-#: src/dialogs.c:190
+#: src/dialogs.c:350
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>Anonyme advarsler er mindre betydningsfulle.</b>"
 
-#: src/dialogs.c:302
+#: src/dialogs.c:463
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Er du sikker på at du vil fjerne %s fra kontaktlisten din?"
 
-#: src/dialogs.c:304 src/dialogs.c:305
+#: src/dialogs.c:465 src/dialogs.c:466
 msgid "Remove Buddy"
 msgstr "Fjern kontakt"
 
-#: src/dialogs.c:314
+#: src/dialogs.c:475
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -1684,11 +1486,11 @@
 msgstr ""
 "Er du sikker på at du vil fjerne samtalegruppen %s fra kontaktlisten din?"
 
-#: src/dialogs.c:316 src/dialogs.c:317
+#: src/dialogs.c:477 src/dialogs.c:478
 msgid "Remove Chat"
 msgstr "Fjern samtalegruppe"
 
-#: src/dialogs.c:326
+#: src/dialogs.c:487
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -1697,149 +1499,255 @@
 "Er du sikker på at du vil fjerne gruppen %s med alle medlemmer fra "
 "kontaktlisten din?"
 
-#: src/dialogs.c:329 src/dialogs.c:330
+#: src/dialogs.c:490 src/dialogs.c:491
 msgid "Remove Group"
 msgstr "Fjern gruppe"
 
-#: src/dialogs.c:347
+#: src/dialogs.c:508
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
 "your buddy list.  Do you want to continue?"
 msgstr ""
-"Er du sikker på at du vil fjerne kontakten som inneholder %s og %d andre "
-"kontakter fra kontaktlisten din?"
-
+"Er du sikker på at du vil fjerne kontakten som inneholder %s og %d andre kontakter "
+"fra kontaktlisten din?"
+
+#: src/dialogs.c:511 src/dialogs.c:512
 #
-#: src/dialogs.c:350 src/dialogs.c:351
 msgid "Remove Contact"
 msgstr "Fjern kontakt"
 
-#: src/dialogs.c:454 src/dialogs.c:510
-#, fuzzy
-msgid "_Screen name"
-msgstr "_Skjermnavn"
-
-#: src/dialogs.c:460 src/dialogs.c:516
-#, fuzzy
-msgid "_Account"
-msgstr "Konto:"
-
-#: src/dialogs.c:467
-#, fuzzy
-msgid "New Instant Message"
-msgstr "/Kontakter/_Ny direktemelding..."
-
-#: src/dialogs.c:469
-#, fuzzy
-msgid "Please enter the screen name of the person you would like to IM."
+#: src/dialogs.c:660
+msgid "New Message"
+msgstr "Ny beskjed"
+
+#: src/dialogs.c:678
+msgid "Please enter the screenname of the person you would like to IM.\n"
 msgstr ""
 "Vennligst skriv inn skjermnavnet på den personen du vil sende direktemelding "
 "til.\n"
 
-#: src/dialogs.c:523
+#: src/dialogs.c:694 src/dialogs.c:771
+msgid "_Screenname:"
+msgstr "Skjermnavn:"
+
+#: src/dialogs.c:709 src/dialogs.c:787 src/gtkpounce.c:358
+msgid "_Account:"
+msgstr "Konto:"
+
+#: src/dialogs.c:740
 msgid "Get User Info"
 msgstr "Hent brukerinfo"
 
-#: src/dialogs.c:525
-#, fuzzy
-msgid ""
-"Please enter the screen name of the person whose info you would like to view."
+#: src/dialogs.c:759
+msgid ""
+"Please enter the screenname of the person whose info you would like to "
+"view.\n"
 msgstr ""
 "Vennligst skriv inn skjermnavnet til den personen du vil se informasjon om.\n"
 
-#: src/dialogs.c:553 src/gtkimhtmltoolbar.c:209
+#: src/dialogs.c:853 src/protocols/jabber/jabber.c:1036
+#: src/protocols/oscar/oscar.c:6479 src/protocols/toc/toc.c:1532
+msgid "Set User Info"
+msgstr "Sett brukerinfo"
+
+#: src/dialogs.c:862
+#, c-format
+msgid "Changing info for %s:"
+msgstr "Endrer info for %s:"
+
+#: src/dialogs.c:977
+msgid "Insert Link"
+msgstr "Sett inn lenke"
+
+#: src/dialogs.c:979
+msgid "Insert"
+msgstr "Sett inn"
+
+#: src/dialogs.c:1001
+msgid ""
+"Please enter the URL and description of the link that you want to insert.  "
+"The description is optional.\n"
+msgstr ""
+"Vennligst skriv inn URL og beskrivelse av lenka du vil sette inn. "
+"Beskrivelsesfeltet er valgfritt.\n"
+
+#: src/dialogs.c:1019 src/protocols/jabber/buddy.c:249
+#: src/protocols/jabber/jabber.c:638
+msgid "URL"
+msgstr "URL"
+
+#: src/dialogs.c:1029 src/gtkprefs.c:601 src/gtkprefs.c:1803
+#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:738
+msgid "Description"
+msgstr "Beskrivelse"
+
+#: src/dialogs.c:1165 src/dialogs.c:1182
 msgid "Select Text Color"
 msgstr "Velg tekstfarge"
 
-#: src/dialogs.c:581 src/gtkimhtmltoolbar.c:279
+#: src/dialogs.c:1217 src/dialogs.c:1234
 msgid "Select Background Color"
 msgstr "Velg bakgrunnsfarge"
 
-#: src/dialogs.c:620 src/gtkimhtmltoolbar.c:133
+#: src/dialogs.c:1319 src/dialogs.c:1345
 msgid "Select Font"
 msgstr "Velg skrifttype"
 
-#: src/dialogs.c:682
+#: src/dialogs.c:1411
 msgid "You cannot save an away message with a blank title"
 msgstr "Du kan ikke lagre en fraværsbeskjed uten tittel"
 
-#: src/dialogs.c:684
+#: src/dialogs.c:1413
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr ""
 "Vennligst gi beskjeden en tittel, eller velg \"Bruk\" for å bruke uten "
 "lagring."
 
-#: src/dialogs.c:694
+#: src/dialogs.c:1423
 msgid "You cannot create an empty away message"
 msgstr "Du kan ikke lage en tom fraværsbeskjed"
 
-#: src/dialogs.c:756
+#: src/dialogs.c:1488 src/dialogs.c:1496
 msgid "New away message"
 msgstr "Ny fraværsbeskjed"
 
-#: src/dialogs.c:777
+#: src/dialogs.c:1506
 msgid "Away title: "
 msgstr "Tittel: "
 
-#: src/dialogs.c:829
+#: src/dialogs.c:1556
 msgid "Save & Use"
 msgstr "Lagre & bruk"
 
-#: src/dialogs.c:833
+#: src/dialogs.c:1560
 msgid "Use"
 msgstr "Bruk"
 
-#: src/dialogs.c:854
+#. show everything
+#: src/dialogs.c:1709
+msgid "Smile!"
+msgstr "Smil!"
+
+#: src/dialogs.c:1727
 msgid "Alias Chat"
 msgstr "Samtalealias"
 
-#: src/dialogs.c:855
-#, fuzzy
-msgid "Enter an alias for this chat."
+#: src/dialogs.c:1727
+msgid "Alias chat"
+msgstr "Samtalealias"
+
+#: src/dialogs.c:1728
+msgid "Please enter an aliased name for this chat."
 msgstr "Vennligst skriv inn aliasnavn for denne samtalen."
 
-#: src/dialogs.c:857 src/dialogs.c:874 src/dialogs.c:893 src/gtkrequest.c:233
-msgid "Alias"
-msgstr "Alias"
-
+#: src/dialogs.c:1744
 #
-#: src/dialogs.c:871
 msgid "Alias Contact"
 msgstr "Kontaktalias"
 
+#: src/dialogs.c:1744
 #
-#: src/dialogs.c:872
-#, fuzzy
-msgid "Enter an alias for this contact."
+msgid "Alias contact"
+msgstr "Kontaktalias"
+
+#: src/dialogs.c:1745
+#
+msgid "Please enter an aliased name for this contact."
 msgstr "Vennligst skriv inn aliasnavn for denne kontakten."
 
-#: src/dialogs.c:889
-#, fuzzy, c-format
-msgid "Enter an alias for %s."
-msgstr "Oppgi passord for %s"
-
-#: src/dialogs.c:891
+#: src/dialogs.c:1776
+msgid "_Screenname"
+msgstr "_Skjermnavn"
+
+#: src/dialogs.c:1781 src/gtkblist.c:838 src/gtkblist.c:931 src/gtkblist.c:937
+msgid "_Alias"
+msgstr "_Alias"
+
+#: src/dialogs.c:1785
 msgid "Alias Buddy"
 msgstr "Alias for kontakt"
 
-#: src/ft.c:139
+#: src/dialogs.c:1786
+msgid "Alias buddy"
+msgstr "Alias for kontakt"
+
+#: src/dialogs.c:1787
+msgid ""
+"Please enter an aliased name for the person below, or rename this contact in "
+"your buddy list."
+msgstr ""
+"Vennligst skriv inn et aliasnavn for personen under, eller endre kontakten i "
+"kontaktlisten."
+
+#: src/dialogs.c:1823 src/dialogs.c:1830
+#, c-format
+msgid "Couldn't write to %s."
+msgstr "Kunne ikke skrive til %s."
+
+#: src/dialogs.c:1854
+msgid "Save Log File"
+msgstr "Lagre loggfil"
+
+#: src/dialogs.c:1882
+#, c-format
+msgid "Couldn't remove file %s."
+msgstr "Kunne ikke fjerne fil %s."
+
+#: src/dialogs.c:1901
+#, c-format
+msgid "You are about to remove the log file for %s.  Do you want to continue?"
+msgstr ""
+"Er du sikker på at du vil fjerne loggfilen for %s?"
+
+#: src/dialogs.c:1902 src/dialogs.c:2072
+msgid "System Log"
+msgstr "Systemlogg"
+
+#: src/dialogs.c:1903 src/dialogs.c:1905
+#
+msgid "Remove Log"
+msgstr "Fjern logg"
+
+#: src/dialogs.c:1933 src/dialogs.c:2093
+#, c-format
+msgid "Couldn't open log file %s."
+msgstr "Kunne ikke åpne loggfil %s."
+
+#: src/dialogs.c:2070
+#, c-format
+msgid "Conversations with %s"
+msgstr "Samtale med %s"
+
+#: src/dialogs.c:2114 src/protocols/jabber/jabber.c:643
+msgid "Date"
+msgstr "Dato"
+
+#: src/dialogs.c:2171
+msgid "Log"
+msgstr "Logg"
+
+#: src/dialogs.c:2194
+msgid "Clear"
+msgstr "Tøm"
+
+#: src/ft.c:123
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s er ikke et gyldig filnavn.\n"
 
-#: src/ft.c:152
+#: src/ft.c:137
 #, c-format
 msgid "%s was not found.\n"
 msgstr "%s ble ikke funnet.\n"
 
-#: src/ft.c:769
+#: src/ft.c:693
 #, c-format
 msgid "File transfer to %s aborted.\n"
 msgstr "Filoverføring til %s avbrutt.\n"
 
-#: src/ft.c:771
+#: src/ft.c:695
 #, c-format
 msgid "File transfer from %s aborted.\n"
 msgstr "Filoverføring fra %s avbrutt.\n"
@@ -1852,7 +1760,7 @@
 msgid "Size of the expander arrow"
 msgstr "Størrelse på utvider-pil"
 
-#: src/gaim-remote.c:66
+#: src/gaim-remote.c:33
 #, c-format
 msgid ""
 "Usage: %s command [OPTIONS] [URI]\n"
@@ -1873,31 +1781,30 @@
 "    FLAGG:\n"
 "       -h, --help [kommando]    Vis hjelp for kommando\n"
 
-#: src/gaim-remote.c:175 src/gaim-remote.c:191
+#: src/gaim-remote.c:139 src/gaim-remote.c:155
 msgid "Gaim not running (on session 0)\n"
 msgstr "Gaim kjører ikke (på sesjon 0)\n"
 
-#: src/gaim-remote.c:204
-#, fuzzy
+#: src/gaim-remote.c:167
 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"
+"\tgaim-remote uri aim:goim?screenname=Penguin\n"
 "\n"
 "Joining a chat:\n"
-"\tgaim-remote uri 'aim:gochat?roomname=PenguinLounge'\n"
+"\tgaim-remote uri aim:gochat?roomname=PenguinLounge\n"
 "...joins the 'PenguinLounge' chat room.\n"
 "\n"
 "Adding a buddy to your buddy list:\n"
-"\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
+"\tgaim-remote uri aim:addbuddy?screenname=Penguin\n"
 "...prompts you to add 'Penguin' to your buddy list.\n"
 msgstr ""
 "\n"
@@ -1922,7 +1829,7 @@
 "\tgaim-remote uri aim:addbuddy?screenname=Penguin\n"
 "...vil spørre deg om å legge til Penguin i kontaktlisten.\n"
 
-#: src/gaim-remote.c:223
+#: src/gaim-remote.c:187
 msgid ""
 "\n"
 "Close running copy of Gaim\n"
@@ -1931,27 +1838,27 @@
 "Lukk eksisterende Gaim-program\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 "tilbake om en stund"
 
-#: src/gaimrc.c:375 src/gaimrc.c:1451
+#: src/gaimrc.c:373 src/gaimrc.c:1464
 msgid "boring default"
 msgstr "kjedelig standardsvar"
 
-#: src/gaimrc.c:1260 src/gtkblist.c:2881
+#: src/gaimrc.c:1271 src/gtkblist.c:2111
 msgid "Alphabetical"
 msgstr "Alfabetisk"
 
-#: src/gaimrc.c:1262 src/gtkblist.c:2882
+#: src/gaimrc.c:1273 src/gtkblist.c:2112
 msgid "By status"
 msgstr "Etter status"
 
-#: src/gaimrc.c:1264 src/gtkblist.c:2883
+#: src/gaimrc.c:1275 src/gtkblist.c:2113
 msgid "By log size"
 msgstr "Etter loggstørrelse"
 
-#: src/gaimrc.c:1549
+#: src/gaimrc.c:1562
 #, c-format
 msgid "Could not open config file %s."
 msgstr "Kunne ikke åpne konfigurasjonsfil %s."
@@ -1967,173 +1874,178 @@
 "<b>Filstørrelse:</b> %s\n"
 "<b>Bildestørrelse:</b> %dx%d"
 
+#: src/gtkaccount.c:318 src/protocols/oscar/oscar.c:3075
+msgid "Buddy Icon"
+msgstr "Kontaktikon"
+
 #. Build the login options frame.
-#: src/gtkaccount.c:382
+#: src/gtkaccount.c:369
 msgid "Login Options"
 msgstr "Innloggingsvalg"
 
-#: src/gtkaccount.c:399
+#: src/gtkaccount.c:386
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: src/gtkaccount.c:404 src/gtkblist.c:3869
-msgid "Screen Name:"
+#: src/gtkaccount.c:391
+msgid "Screenname:"
 msgstr "Skjermnavn:"
 
-#: src/gtkaccount.c:477
+#: src/gtkaccount.c:464 src/main.c:307 src/protocols/irc/irc.c:161
+#: src/protocols/jabber/chat.c:56
 msgid "Password:"
 msgstr "Passord:"
 
-#: src/gtkaccount.c:482 src/gtkblist.c:3883 src/gtkblist.c:4211
+#: src/gtkaccount.c:469 src/gtkblist.c:3084 src/gtkblist.c:3403
 msgid "Alias:"
 msgstr "Alias:"
 
-#: src/gtkaccount.c:486
+#: src/gtkaccount.c:473
 msgid "Remember password"
 msgstr "Husk passord"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:540
+#: src/gtkaccount.c:527
 msgid "User Options"
 msgstr "Brukervalg"
 
-#: src/gtkaccount.c:553
+#: src/gtkaccount.c:540
 msgid "New mail notifications"
 msgstr "Varsling om ny e-post"
 
-#: src/gtkaccount.c:562
+#: src/gtkaccount.c:549
 msgid "Buddy icon file:"
 msgstr "Fil for kontaktikoner:"
 
-#: src/gtkaccount.c:572
+#: src/gtkaccount.c:558
 msgid "_Browse"
 msgstr "_Bla gjennom"
 
-#: src/gtkaccount.c:578
+#: src/gtkaccount.c:564
 msgid "_Reset"
 msgstr "_Nullstill"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:640
+#: src/gtkaccount.c:626
 #, c-format
 msgid "%s Options"
 msgstr "%s brukervalg"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:772
+#: src/gtkaccount.c:747
 msgid "Use Global Proxy Settings"
 msgstr "Bruk globale proxyinnstilinger"
 
 #. No Proxy
-#: src/gtkaccount.c:779
+#: src/gtkaccount.c:754
 msgid "No Proxy"
 msgstr "Ingen proxy"
 
 #. HTTP
-#: src/gtkaccount.c:786
+#: src/gtkaccount.c:761
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:793
+#: src/gtkaccount.c:768
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:800
+#: src/gtkaccount.c:775
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
+#. Use Environmental Settings
+#: src/gtkaccount.c:782 src/gtkprefs.c:1101
 #
-#. Use Environmental Settings
-#: src/gtkaccount.c:807 src/gtkprefs.c:1181
 msgid "Use Environmental Settings"
 msgstr "Bruk innstillinger fra miljøet"
 
-#: src/gtkaccount.c:840
+#: src/gtkaccount.c:815
 msgid "you can see the butterflies mating"
 msgstr "sommerfugler svermer"
 
-#: src/gtkaccount.c:844
+#: src/gtkaccount.c:819
 msgid "If you look real closely"
 msgstr "hvis du ser virkelig godt etter"
 
-#: src/gtkaccount.c:860
+#: src/gtkaccount.c:835
 msgid "Proxy Options"
 msgstr "Proxyinnstillinger"
 
-#: src/gtkaccount.c:876 src/gtkprefs.c:1175
+#: src/gtkaccount.c:851 src/gtkprefs.c:1095
 msgid "Proxy _type:"
 msgstr "Proxytype:"
 
-#: src/gtkaccount.c:885 src/gtkprefs.c:1205
+#: src/gtkaccount.c:860
 msgid "_Host:"
 msgstr "Adresse:"
 
-#: src/gtkaccount.c:889 src/gtkprefs.c:1223
+#: src/gtkaccount.c:864
 msgid "_Port:"
 msgstr "_Port:"
 
-#: src/gtkaccount.c:897
+#: src/gtkaccount.c:872
 msgid "_Username:"
 msgstr "_Brukernavn:"
 
-#: src/gtkaccount.c:902 src/gtkprefs.c:1260
+#: src/gtkaccount.c:877
 msgid "Pa_ssword:"
 msgstr "Passord:"
 
-#: src/gtkaccount.c:1260
+#: src/gtkaccount.c:1218
 msgid "Add Account"
 msgstr "Legg til konto"
 
-#: src/gtkaccount.c:1262
+#: src/gtkaccount.c:1220
 msgid "Modify Account"
 msgstr "Endre konto"
 
 #. Add the disclosure
-#: src/gtkaccount.c:1286
+#: src/gtkaccount.c:1244
 msgid "Show more options"
 msgstr "Vis flere valg"
 
-#: src/gtkaccount.c:1287
+#: src/gtkaccount.c:1245
 msgid "Show fewer options"
 msgstr "Vis færre valg"
 
 #. Register button
-#: src/gtkaccount.c:1314 src/protocols/jabber/jabber.c:658
+#: src/gtkaccount.c:1272 src/protocols/jabber/jabber.c:656
 msgid "Register"
 msgstr "Registrer"
 
-#: src/gtkaccount.c:1668
+#: src/gtkaccount.c:1617
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Er du sikker på at du vil slette %s?"
 
-#: src/gtkaccount.c:1672 src/gtkrequest.c:229
+#: src/gtkaccount.c:1621 src/gtkrequest.c:206
 msgid "Delete"
 msgstr "Slett"
 
-#: src/gtkaccount.c:1786
+#: src/gtkaccount.c:1734
 msgid "Screen Name"
 msgstr "Skjermnavn"
 
-#: 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:1757 src/protocols/jabber/jabber.c:926
+#: src/protocols/oscar/oscar.c:2850 src/protocols/oscar/oscar.c:4584
+#: src/protocols/oscar/oscar.c:6132 src/protocols/yahoo/yahoo.c:2032
+#: src/protocols/zephyr/zephyr.c:886 src/protocols/zephyr/zephyr.c:896
 msgid "Online"
 msgstr "Pålogget"
 
-#: src/gtkaccount.c:1827
+#: src/gtkaccount.c:1775
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: src/gtkaccount.c:2139
+#: src/gtkaccount.c:2065
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s har lagt %s til i sin kontaktliste%s%s%s"
 
-#: src/gtkaccount.c:2153
+#: src/gtkaccount.c:2079
 msgid ""
 "\n"
 "\n"
@@ -2143,237 +2055,184 @@
 "\n"
 "Ønsker du å legge vedkommende til i din kontaktliste?"
 
-#: src/gtkaccount.c:2157
-#, fuzzy
-msgid "Information"
-msgstr "Arbeid ekstra info"
-
-#: src/gtkaccount.c:2161
+#: src/gtkaccount.c:2083
+msgid "Gaim - Information"
+msgstr "Gaim - Informasjon"
+
+#: src/gtkaccount.c:2087
 msgid "Add buddy to your list?"
 msgstr "Legg til brukeren i kontaktlisten din?"
 
-#. 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:2089 src/gtkblist.c:3451 src/gtkconv.c:1258
+#: src/gtkconv.c:3149 src/gtkconv.c:4355 src/gtkrequest.c:207
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2692
 msgid "Add"
 msgstr "Legg til"
 
-#: 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 er ikke pålogget med noen protokoller som støtter samtalegrupper."
+#: src/gtkblist.c:811
+msgid "_Get Info"
+msgstr "Info"
+
+#: src/gtkblist.c:814
+msgid "_IM"
+msgstr "Direktemelding"
 
 #: src/gtkblist.c:816
-#, fuzzy
-msgid "Join a Chat"
-msgstr "Bli med i samtalegruppe"
-
-#: src/gtkblist.c:837
-#, fuzzy
-msgid ""
-"Please enter the appropriate information about the chat you would like to "
-"join.\n"
-msgstr ""
-"Vennligst skriv inn et aliasnavn og annen informasjon for samtalegruppen.\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 "Beskjed"
-
-#: src/gtkblist.c:1093
 msgid "Add Buddy _Pounce"
 msgstr "Legg til kompisvarsling"
 
-#: src/gtkblist.c:1095
+#: src/gtkblist.c:818
 msgid "View _Log"
 msgstr "Vis logg"
 
-#: src/gtkblist.c:1115 src/gtkblist.c:1187 src/gtkblist.c:1200
-#, fuzzy
-msgid "_Alias..."
-msgstr "_Alias"
-
-#: src/gtkblist.c:1117 src/gtkblist.c:1189 src/gtkblist.c:1205
-#: src/gtkconn.c:361
+#: src/gtkblist.c:840 src/gtkblist.c:933 src/gtkblist.c:942
 msgid "_Remove"
 msgstr "Fjern"
 
-#: src/gtkblist.c:1162
+#: src/gtkblist.c:912
 msgid "Add a _Buddy"
 msgstr "Legg til kontakt"
 
-#: src/gtkblist.c:1164
+#: src/gtkblist.c:914
 msgid "Add a C_hat"
 msgstr "Legg til samtale"
 
-#: src/gtkblist.c:1166
+#: src/gtkblist.c:916
 msgid "_Delete Group"
 msgstr "Slett gruppe"
 
-#: src/gtkblist.c:1168
+#: src/gtkblist.c:918
 msgid "_Rename"
 msgstr "Endre navn"
 
-#. join button
-#: src/gtkblist.c:1182 src/gtkroomlist.c:261 src/gtkroomlist.c:417
-#: src/stock.c:87
+#: src/gtkblist.c:926
 msgid "_Join"
 msgstr "_Bli med i samtalegruppe"
 
-#: src/gtkblist.c:1184
+#: src/gtkblist.c:928
 msgid "Auto-Join"
 msgstr "Automatisk pålogging"
 
-#: src/gtkblist.c:1202 src/gtkblist.c:1228
+#: src/gtkblist.c:939 src/gtkblist.c:969
 msgid "_Collapse"
 msgstr "_Lukk"
 
-#: src/gtkblist.c:1233
+#: src/gtkblist.c:974
 msgid "_Expand"
 msgstr "_Utvid"
 
-#: src/gtkblist.c:1884 src/gtkconv.c:3864
-#, fuzzy
-msgid ""
-"You are not currently signed on with an account that can add that buddy."
-msgstr "Du er ikke pålogget med noen protokoller som støtter samtalegrupper."
-
 #. Buddies menu
-#: src/gtkblist.c:2225
+#: src/gtkblist.c:1462
 msgid "/_Buddies"
 msgstr "/_Kontakter"
 
-#: src/gtkblist.c:2226
-#, fuzzy
-msgid "/Buddies/New Instant _Message..."
+#: src/gtkblist.c:1463
+msgid "/Buddies/New _Instant Message..."
 msgstr "/Kontakter/_Ny direktemelding..."
 
-#: src/gtkblist.c:2227
+#: src/gtkblist.c:1464
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Kontakter/_Bli med i samtalegruppe..."
 
-#: src/gtkblist.c:2228
-#, fuzzy
-msgid "/Buddies/Get User _Info..."
+#: src/gtkblist.c:1465
+msgid "/Buddies/Get _User Info..."
 msgstr "/Kontakter/_Hent brukerinfo..."
 
-#: src/gtkblist.c:2230
+#: src/gtkblist.c:1467
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Kontakter/Vis _avloggede kontakter"
 
-#: src/gtkblist.c:2231
+#: src/gtkblist.c:1468
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Kontakter/Vis _tomme grupper"
 
-#: src/gtkblist.c:2232
-#, fuzzy
-msgid "/Buddies/_Add Buddy..."
+#: src/gtkblist.c:1469
+msgid "/Buddies/_Add a Buddy..."
 msgstr "/Kontakter/_Legg til kontakt..."
 
-#: src/gtkblist.c:2233
-#, fuzzy
-msgid "/Buddies/Add C_hat..."
+#: src/gtkblist.c:1470
+msgid "/Buddies/Add a C_hat..."
 msgstr "/Kontakter/Legg til _samtalegruppe..."
 
-#: src/gtkblist.c:2234
-#, fuzzy
-msgid "/Buddies/Add _Group..."
+#: src/gtkblist.c:1471
+msgid "/Buddies/Add a _Group..."
 msgstr "/Kontakter/Legg til _gruppe..."
 
-#: src/gtkblist.c:2236
+#: src/gtkblist.c:1473
 msgid "/Buddies/_Signoff"
 msgstr "/Kontakter/L_ogge av"
 
-#: src/gtkblist.c:2237
+#: src/gtkblist.c:1474
 msgid "/Buddies/_Quit"
 msgstr "/Kontakter/_Avslutt"
 
 #. Tools
-#: src/gtkblist.c:2240
+#: src/gtkblist.c:1477
 msgid "/_Tools"
 msgstr "/_Verktøy"
 
-#: src/gtkblist.c:2241
+#: src/gtkblist.c:1478
 msgid "/Tools/_Away"
 msgstr "/Verktøy/_Borte"
 
-#: src/gtkblist.c:2242
+#: src/gtkblist.c:1479
 msgid "/Tools/Buddy _Pounce"
 msgstr "/Verktøy/_Kompisvarsling"
 
-#: src/gtkblist.c:2243
+#: src/gtkblist.c:1480
 msgid "/Tools/P_rotocol Actions"
 msgstr "/Verktøy/_Handlinger"
 
-#: src/gtkblist.c:2245
+#: src/gtkblist.c:1482
 msgid "/Tools/A_ccounts"
 msgstr "/Verktøy/K_ontoer"
 
-#: src/gtkblist.c:2246
-#, fuzzy
-msgid "/Tools/_File Transfers"
+#: src/gtkblist.c:1483
+msgid "/Tools/_File Transfers..."
 msgstr "/Verktøy/_Filoverføringer..."
 
-#: src/gtkblist.c:2247
-#, fuzzy
-msgid "/Tools/R_oom List"
-msgstr "/Verktøy/_Handlinger"
-
-#: src/gtkblist.c:2248
-#, fuzzy
-msgid "/Tools/Pr_eferences"
+#: src/gtkblist.c:1484
+msgid "/Tools/Preferences"
 msgstr "/Verktøy/_Innstillinger"
 
-#: src/gtkblist.c:2249
+#: src/gtkblist.c:1485
 msgid "/Tools/Pr_ivacy"
 msgstr "/Verktøy/_Sikkerhet"
 
-#: src/gtkblist.c:2252
+#: src/gtkblist.c:1487
 msgid "/Tools/View System _Log"
 msgstr "/Verktøy/_Vis systemlogg"
 
 #. Help
-#: src/gtkblist.c:2256
+#: src/gtkblist.c:1490
 msgid "/_Help"
 msgstr "/_Hjelp"
 
-#: src/gtkblist.c:2257
+#: src/gtkblist.c:1491
 msgid "/Help/Online _Help"
 msgstr "/Hjelp/Hjelp på _nettet"
 
-#: src/gtkblist.c:2258
+#: src/gtkblist.c:1492
 msgid "/Help/_Debug Window"
 msgstr "/Hjelp/_Avlusningsvindu"
 
-#: src/gtkblist.c:2259
+#: src/gtkblist.c:1493
 msgid "/Help/_About"
 msgstr "/Hjelp/_Om"
 
-#: src/gtkblist.c:2275
+#: src/gtkblist.c:1509
 msgid "Rename Group"
 msgstr "Endre gruppenavn"
 
-#: src/gtkblist.c:2275
+#: src/gtkblist.c:1509
 msgid "New group name"
 msgstr "Nytt gruppenavn:"
 
-#: src/gtkblist.c:2276
+#: src/gtkblist.c:1510
 msgid "Please enter a new name for the selected group."
 msgstr "Vennligst skriv inn nytt navn for gruppen."
 
-#: src/gtkblist.c:2304
+#: src/gtkblist.c:1539
 #, c-format
 msgid ""
 "\n"
@@ -2382,16 +2241,16 @@
 "\n"
 "<b>Konto:</b> %s"
 
-#: src/gtkblist.c:2368 src/protocols/oscar/oscar.c:5772
+#: src/gtkblist.c:1602 src/protocols/oscar/oscar.c:5512
 msgid "<b>Status:</b> Offline"
 msgstr "<b>Status:</b> Avlogget"
 
-#: src/gtkblist.c:2383
+#: src/gtkblist.c:1614
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:2399
+#: src/gtkblist.c:1629
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2399,8 +2258,8 @@
 "\n"
 "<b>Konto:</b>"
 
+#: src/gtkblist.c:1630
 #
-#: src/gtkblist.c:2400
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
@@ -2408,7 +2267,7 @@
 "\n"
 "<b>Kontaktalias:</b>"
 
-#: src/gtkblist.c:2401
+#: src/gtkblist.c:1631
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2416,7 +2275,7 @@
 "\n"
 "<b>Alias:</b>"
 
-#: src/gtkblist.c:2402
+#: src/gtkblist.c:1632
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2424,14 +2283,7 @@
 "\n"
 "<b>Kallenavn:</b>"
 
-#: src/gtkblist.c:2403
-#, fuzzy
-msgid ""
-"\n"
-"<b>Logged In:</b>"
-msgstr "<b>Pålogget:</b> "
-
-#: src/gtkblist.c:2404
+#: src/gtkblist.c:1633
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2439,7 +2291,7 @@
 "\n"
 "<b>Inaktiv:</b>"
 
-#: src/gtkblist.c:2405
+#: src/gtkblist.c:1634
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2447,7 +2299,7 @@
 "\n"
 "<b>Advart:</b>"
 
-#: src/gtkblist.c:2407
+#: src/gtkblist.c:1636
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2455,7 +2307,7 @@
 "\n"
 "<b>Beskrivelse:</b> Skummel"
 
-#: src/gtkblist.c:2408
+#: src/gtkblist.c:1637
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2463,7 +2315,7 @@
 "\n"
 "<b>Status:</b> Fantastisk"
 
-#: src/gtkblist.c:2409
+#: src/gtkblist.c:1638
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2471,79 +2323,85 @@
 "\n"
 "<b>Status:</b> Rockin'"
 
-#: src/gtkblist.c:2679
+#: src/gtkblist.c:1906
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "Inaktiv (%dt%02dm) "
 
-#: src/gtkblist.c:2681
+#: src/gtkblist.c:1908
 #, c-format
 msgid "Idle (%dm) "
 msgstr "Inaktiv (%dm) "
 
-#: src/gtkblist.c:2686
+#: src/gtkblist.c:1913
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "Advart (%d%%) "
 
-#: src/gtkblist.c:2689
+#: src/gtkblist.c:1916
 msgid "Offline "
 msgstr "Avlogget"
 
-#: src/gtkblist.c:2947
+#: src/gtkblist.c:2109 src/gtkprefs.c:841 src/gtkprefs.c:1495
+msgid "None"
+msgstr "Ingen"
+
+#: src/gtkblist.c:2177
 msgid "/Tools/Away"
 msgstr "/Verktøy/Borte"
 
-#: src/gtkblist.c:2950
+#: src/gtkblist.c:2180
 msgid "/Tools/Buddy Pounce"
 msgstr "/Verktøy/Kompisvarsel"
 
-#: src/gtkblist.c:2953
+#: src/gtkblist.c:2183
 msgid "/Tools/Protocol Actions"
 msgstr "/Verktøy/Handlinger"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:3041
+#: src/gtkblist.c:2267
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Kontakter/Vis _avloggede kontakter"
 
-#: src/gtkblist.c:3043
+#: src/gtkblist.c:2269
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Kontakter/Vis tomme grupper"
 
-#: src/gtkblist.c:3067
+#: src/gtkblist.c:2287 src/gtkconv.c:1217
+msgid "IM"
+msgstr "Beskjed"
+
+#: src/gtkblist.c:2293
 msgid "Send a message to the selected buddy"
 msgstr "Send beskjed til den valgte kontakten"
 
-#: src/gtkblist.c:3076
+#: src/gtkblist.c:2296 src/protocols/napster/napster.c:529
+msgid "Get Info"
+msgstr "Info"
+
+#: src/gtkblist.c:2302
 msgid "Get information on the selected buddy"
 msgstr "Hent informasjon om den valgte kontakten"
 
-#: src/gtkblist.c:3079
-#, fuzzy
-msgid "_Chat"
+#: src/gtkblist.c:2305 src/protocols/oscar/oscar.c:3084
+msgid "Chat"
 msgstr "Samtale"
 
-#: src/gtkblist.c:3084
+#: src/gtkblist.c:2310
 msgid "Join a chat room"
 msgstr "Bli med i samtalegruppe"
 
-#: src/gtkblist.c:3087
-#, fuzzy
-msgid "_Away"
-msgstr "Borte"
-
-#: src/gtkblist.c:3092
+#: src/gtkblist.c:2318
 msgid "Set an away message"
 msgstr "Sett en fraværsbeskjed"
 
-#: src/gtkblist.c:3824 src/protocols/yahoo/yahoo.c:2427
+#: src/gtkblist.c:3026 src/protocols/yahoo/yahoo.c:2166
 msgid "Add Buddy"
 msgstr "Legg til kontakt"
 
-#: src/gtkblist.c:3847
+#: src/gtkblist.c:3049
 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. "
@@ -2554,98 +2412,104 @@
 "for kontakten. Aliaset vil bli vist i stedet for skjermnavnet der det er "
 "mulig.\n"
 
+#: src/gtkblist.c:3071 src/main.c:289
+msgid "Screen Name:"
+msgstr "Skjermnavn:"
+
+#: src/gtkblist.c:3097 src/gtkblist.c:3414
+msgid "Group:"
+msgstr "Gruppe:"
+
 #. Set up stuff for the account box
-#: src/gtkblist.c:3907 src/gtkblist.c:4191
+#: src/gtkblist.c:3106 src/gtkblist.c:3384
 msgid "Account:"
 msgstr "Konto:"
 
-#: src/gtkblist.c:4158
+#: src/gtkblist.c:3351
 msgid "Add Chat"
 msgstr "Legg til samtale"
 
-#: src/gtkblist.c:4181
+#: src/gtkblist.c:3374
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 msgstr ""
 "Vennligst skriv inn et aliasnavn og annen informasjon for samtalegruppen.\n"
 
-#: src/gtkblist.c:4260
+#: src/gtkblist.c:3448
 msgid "Add Group"
 msgstr "Legg til gruppe"
 
-#: src/gtkblist.c:4261
+#: src/gtkblist.c:3448
+msgid "Add a new group"
+msgstr "Legg til gruppe"
+
+#: src/gtkblist.c:3449
 msgid "Please enter the name of the group to be added."
 msgstr "Vennligst skriv inn navnet på gruppen som skal legges til."
 
-#: src/gtkblist.c:4780
+#: src/gtkblist.c:3964
 msgid "No actions available"
 msgstr "Ingen handlinger tilgjengelig"
 
-#: src/gtkconn.c:78 src/gtkconn.c:250 src/gtkconn.c:261
+#: src/gtkconn.c:58 src/gtkconn.c:242 src/gtkconn.c:253
 msgid "Done."
 msgstr "Ferdig."
 
-#: src/gtkconn.c:157
+#: src/gtkconn.c:137
 msgid "Signon: "
 msgstr "Pålogging: "
 
-#: src/gtkconn.c:203
+#: src/gtkconn.c:195
 msgid "Signon"
 msgstr "Pålogging"
 
-#: src/gtkconn.c:216
+#: src/gtkconn.c:208
 msgid "Cancel All"
 msgstr "A_vbryt alle"
 
-#
-#: src/gtkconn.c:361 src/gtkconn.c:593
-#, fuzzy
-msgid "_Reconnect"
-msgstr "Automatisk tilkobling ved brudd"
-
-#: src/gtkconn.c:557
-#, fuzzy, c-format
-msgid ""
-"<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
-"\n"
-"%s\n"
-"%s"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Du har e-post!</span>\n"
-"\n"
-"%s"
-
-#: src/gtkconn.c:559
+#: src/gtkconn.c:347
 msgid "Reason Unknown."
 msgstr "Ukjent årsak."
 
+#: src/gtkconn.c:356
 #
-#: src/gtkconn.c:598
-#, fuzzy
-msgid "Reconnect _All"
+msgid "Reconnect"
 msgstr "Automatisk tilkobling ved brudd"
 
+#: src/gtkconn.c:404
 #
-#: src/gtkconn.c:628
+msgid "Account"
+msgstr "Konto"
+
+#: src/gtkconn.c:412
+#
 msgid "Time"
 msgstr "Tid"
 
-#: src/gtkconv.c:183
+#: src/gtkconv.c:186
 msgid "That file already exists"
 msgstr "Filen eksisterer allerede."
 
-#: src/gtkconv.c:184 src/gtkft.c:1106
+#: src/gtkconv.c:187 src/gtkft.c:1034
 msgid "Would you like to overwrite it?"
 msgstr "Ønsker du å overskrive den?"
 
-#: src/gtkconv.c:470
-#, fuzzy
-msgid "Invite Buddy Into Chat Room"
+#: src/gtkconv.c:242
+#, c-format
+msgid "Failed to store image: %s\n"
+msgstr "Klarte ikke å lagre bilde: %s\n"
+
+#: src/gtkconv.c:312
+msgid "Gaim - Insert Image"
+msgstr "Gaim - Sett inn bilde"
+
+#: src/gtkconv.c:616
+msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - Inviter kontakt til samtalegruppe"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:498
+#: src/gtkconv.c:644
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -2653,473 +2517,470 @@
 "Vennligst skriv inn navnet på brukeren som du vil invitere, og en eventuell "
 "invitasjonsbeskjed."
 
-#: src/gtkconv.c:519
+#: src/gtkconv.c:665
 msgid "_Buddy:"
 msgstr "Kontakt:"
 
-#: src/gtkconv.c:539
+#: src/gtkconv.c:685
 msgid "_Message:"
 msgstr "Beskjed:"
 
-#: src/gtkconv.c:632
-#, fuzzy
-msgid "Find"
-msgstr "Hindi"
-
+#: src/gtkconv.c:781
 #
-#: src/gtkconv.c:658
-#, fuzzy
-msgid "_Search for:"
+msgid ""
+"<span weight='bold' size='larger'>Enter a search phrase\n"
+"</span>"
+msgstr ""
+"<span weight='bold' size='larger'>Skriv inn søkeuttrykk\n"
+"</span>"
+
+#: src/gtkconv.c:788
+#
+msgid "Search term: "
 msgstr "Søkeord: "
 
-#: src/gtkconv.c:1030
-msgid "IM"
-msgstr "Beskjed"
-
-#: src/gtkconv.c:1038
+#: src/gtkconv.c:1225
 msgid "Un-Ignore"
 msgstr "Fjern ignorer"
 
-#: src/gtkconv.c:1040 src/gtkprefs.c:784
+#: src/gtkconv.c:1227 src/gtkprefs.c:774
 msgid "Ignore"
 msgstr "Ignorer"
 
 #. Info button
-#: src/gtkconv.c:1049 src/gtkconv.c:3303
+#: src/gtkconv.c:1236 src/gtkconv.c:3172
 msgid "Info"
 msgstr "Info"
 
-#: src/gtkconv.c:1058
+#: src/gtkconv.c:1245
 msgid "Get Away Msg"
 msgstr "Hent fraværsbeskjed"
 
-#. Remove button
-#: src/gtkconv.c:1070 src/gtkconv.c:3296 src/gtkconv.c:3387
-#: src/gtkrequest.c:231
+#: src/gtkconv.c:1256 src/gtkconv.c:3155 src/gtkconv.c:4340
+#: src/gtkrequest.c:208
 msgid "Remove"
 msgstr "Fjern"
 
-#
-#: src/gtkconv.c:2162
-msgid "Animate"
-msgstr "Animer"
-
-#: src/gtkconv.c:2167
-msgid "Hide Icon"
-msgstr "Skjul ikon"
-
-#: src/gtkconv.c:2173
-msgid "Save Icon As..."
-msgstr "Lagre ikon som..."
-
-#: src/gtkconv.c:2536
+#: src/gtkconv.c:2373
 msgid "User is typing..."
 msgstr "Brukeren skriver en melding..."
 
-#: src/gtkconv.c:2544
+#: src/gtkconv.c:2381
 msgid "User has typed something and paused"
 msgstr "Brukeren har skrevet noe og tatt pause"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2647
+#: src/gtkconv.c:2484
 msgid "_Send As"
 msgstr "Send som"
 
-#: src/gtkconv.c:3067
-#, fuzzy
-msgid "Save Conversation"
+#: src/gtkconv.c:2944
+msgid "Gaim - Save Conversation"
 msgstr "Gaim - Lagre samtale"
 
 #. Conversation menu
-#: src/gtkconv.c:3084
+#: src/gtkconv.c:2961
 msgid "/_Conversation"
 msgstr "/_Samtale"
 
-#: src/gtkconv.c:3086
-#, fuzzy
-msgid "/Conversation/New Instant _Message..."
-msgstr "/Samtale/Sett inn _bilde..."
-
-#: src/gtkconv.c:3091
-#, fuzzy
-msgid "/Conversation/_Find..."
-msgstr "/Samtale/_Legg til..."
-
+#: src/gtkconv.c:2963
+msgid "/Conversation/_Save As..."
+msgstr "/Samtale/_Lagre som..."
+
+#: src/gtkconv.c:2965
 #
-#: src/gtkconv.c:3093
 msgid "/Conversation/View _Log"
 msgstr "/Samtale/_Vis logg..."
 
-#: src/gtkconv.c:3094
-msgid "/Conversation/_Save As..."
-msgstr "/Samtale/_Lagre som..."
-
-#: src/gtkconv.c:3099
+#: src/gtkconv.c:2966
+#
+msgid "/Conversation/Search..."
+msgstr "/Samtale/Søk..."
+
+#: src/gtkconv.c:2970
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Samtale/Legg til _kompisvarsling"
 
-#: src/gtkconv.c:3101
-#, fuzzy
-msgid "/Conversation/_Get Info"
+#: src/gtkconv.c:2972
+msgid "/Conversation/A_lias..."
+msgstr "/Samtale/_Alias..."
+
+#: src/gtkconv.c:2974
+msgid "/Conversation/_Get Info..."
 msgstr "/Samtale/_Hent info..."
 
-#: src/gtkconv.c:3103
+#: src/gtkconv.c:2976
+msgid "/Conversation/In_vite..."
+msgstr "/Samtale/_Inviter..."
+
+#: src/gtkconv.c:2981
+msgid "/Conversation/Insert _URL..."
+msgstr "/Samtale/Sett inn _URL..."
+
+#: src/gtkconv.c:2983
+msgid "/Conversation/Insert _Image..."
+msgstr "/Samtale/Sett inn _bilde..."
+
+#: src/gtkconv.c:2988
 msgid "/Conversation/_Warn..."
 msgstr "/Samtale/A_dvar..."
 
-#: src/gtkconv.c:3105
-msgid "/Conversation/In_vite..."
-msgstr "/Samtale/_Inviter..."
-
-#: src/gtkconv.c:3110
-msgid "/Conversation/A_lias..."
-msgstr "/Samtale/_Alias..."
-
-#: src/gtkconv.c:3112
+#: src/gtkconv.c:2990
 msgid "/Conversation/_Block..."
 msgstr "/Samtale/_Blokker..."
 
-#: src/gtkconv.c:3114
+#: src/gtkconv.c:2992
 msgid "/Conversation/_Add..."
 msgstr "/Samtale/_Legg til..."
 
-#: src/gtkconv.c:3116
+#: src/gtkconv.c:2994
 msgid "/Conversation/_Remove..."
 msgstr "/Samtale/_Fjern..."
 
-#: src/gtkconv.c:3121
-#, fuzzy
-msgid "/Conversation/Insert Lin_k..."
-msgstr "/Samtale/Sett inn URL..."
-
-#: src/gtkconv.c:3123
-#, fuzzy
-msgid "/Conversation/Insert Imag_e..."
-msgstr "/Samtale/Sett inn bilde..."
-
-#: src/gtkconv.c:3128
+#: src/gtkconv.c:2999
 msgid "/Conversation/_Close"
 msgstr "/Samtale/L_ukk"
 
 #. Options
-#: src/gtkconv.c:3132
+#: src/gtkconv.c:3003
 msgid "/_Options"
 msgstr "/_Brukervalg"
 
-#: src/gtkconv.c:3133
+#: src/gtkconv.c:3004
 msgid "/Options/Enable _Logging"
 msgstr "/Brukervalg/Slå på _logging"
 
-#: src/gtkconv.c:3134
+#: src/gtkconv.c:3005
 msgid "/Options/Enable _Sounds"
 msgstr "/Brukervalg/Slå på l_yder"
 
-#: src/gtkconv.c:3135
+#: src/gtkconv.c:3006
 msgid "/Options/Show Formatting _Toolbar"
 msgstr "/Brukervalg/Vis _formateringsverktøy"
 
+#: src/gtkconv.c:3048
 #
-#: src/gtkconv.c:3177
 msgid "/Conversation/View Log"
 msgstr "/Samtale/Vis logg"
 
-#: src/gtkconv.c:3182
+#: src/gtkconv.c:3053
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Samtale/Legg til kompisvarsling..."
 
-#: src/gtkconv.c:3188
-#, fuzzy
-msgid "/Conversation/Get Info"
+#: src/gtkconv.c:3057
+msgid "/Conversation/Alias..."
+msgstr "/Samtale/Alias..."
+
+#: src/gtkconv.c:3061
+msgid "/Conversation/Get Info..."
 msgstr "/Samtale/Hent info..."
 
-#: src/gtkconv.c:3192
+#: src/gtkconv.c:3065
+msgid "/Conversation/Invite..."
+msgstr "/Samtale/Inviter..."
+
+#: src/gtkconv.c:3071
+msgid "/Conversation/Insert URL..."
+msgstr "/Samtale/Sett inn URL..."
+
+#: src/gtkconv.c:3075
+msgid "/Conversation/Insert Image..."
+msgstr "/Samtale/Sett inn bilde..."
+
+#: src/gtkconv.c:3081
 msgid "/Conversation/Warn..."
 msgstr "/Samtale/Advar..."
 
-#: src/gtkconv.c:3196
-msgid "/Conversation/Invite..."
-msgstr "/Samtale/Inviter..."
-
-#: src/gtkconv.c:3202
-msgid "/Conversation/Alias..."
-msgstr "/Samtale/Alias..."
-
-#: src/gtkconv.c:3206
+#: src/gtkconv.c:3085
 msgid "/Conversation/Block..."
 msgstr "/Samtale/Blokker..."
 
-#: src/gtkconv.c:3210
+#: src/gtkconv.c:3089
 msgid "/Conversation/Add..."
 msgstr "/Samtale/Legg til..."
 
-#: src/gtkconv.c:3214
+#: src/gtkconv.c:3093
 msgid "/Conversation/Remove..."
 msgstr "/Samtale/Fjern..."
 
-#: src/gtkconv.c:3220
-#, fuzzy
-msgid "/Conversation/Insert Link..."
-msgstr "/Samtale/Sett inn URL..."
-
-#: src/gtkconv.c:3224
-msgid "/Conversation/Insert Image..."
-msgstr "/Samtale/Sett inn bilde..."
-
-#: src/gtkconv.c:3230
+#: src/gtkconv.c:3099
 msgid "/Options/Enable Logging"
 msgstr "/Brukervalg/Slå på logging"
 
-#: src/gtkconv.c:3233
+#: src/gtkconv.c:3102
 msgid "/Options/Enable Sounds"
 msgstr "/Brukervalg/Slå på lyder"
 
-#: src/gtkconv.c:3236
+#: src/gtkconv.c:3105
 msgid "/Options/Show Formatting Toolbar"
 msgstr "/Brukervalg/Vis formateringsverktøy"
 
 #. 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:3129 src/gtkconv.c:3131 src/gtkconv.c:3229 src/gtkconv.c:3231
+#: src/gtkconv.c:6063
 msgid "Send"
 msgstr "Send"
 
-#. Now, um, just kind of all over the place. Huh?
-#. Warn button
-#: src/gtkconv.c:3275
-msgid "Warn"
-msgstr "Advar"
-
-#: src/gtkconv.c:3278
-msgid "Warn the user"
-msgstr "Advar brukeren"
-
-#. Block button
-#: src/gtkconv.c:3282 src/gtkprivacy.c:598 src/gtkprivacy.c:609
-msgid "Block"
-msgstr "Blokker"
-
-#: src/gtkconv.c:3285
-msgid "Block the user"
-msgstr "Blokker brukeren"
-
-#: src/gtkconv.c:3292
+#: src/gtkconv.c:3152 src/gtkconv.c:4358
 msgid "Add the user to your buddy list"
 msgstr "Legg til brukeren i kontaktlisten din"
 
-#: src/gtkconv.c:3299
+#: src/gtkconv.c:3158 src/gtkconv.c:4343
 msgid "Remove the user from your buddy list"
 msgstr "Fjern brukeren fra kontaktlisten din"
 
-#: src/gtkconv.c:3306 src/gtkconv.c:3628
+#. Warn button
+#: src/gtkconv.c:3165
+msgid "Warn"
+msgstr "Advar"
+
+#: src/gtkconv.c:3169
+msgid "Warn the user"
+msgstr "Advar brukeren"
+
+#: src/gtkconv.c:3176 src/gtkconv.c:3614
 msgid "Get the user's information"
 msgstr "Hent brukerinformasjon"
 
+#. Block button
+#: src/gtkconv.c:3179 src/gtkprivacy.c:605 src/gtkprivacy.c:616
+msgid "Block"
+msgstr "Blokker"
+
+#: src/gtkconv.c:3183
+msgid "Block the user"
+msgstr "Blokker brukeren"
+
 #. Invite
-#: src/gtkconv.c:3373
+#: src/gtkconv.c:3241 src/gtkconv.c:6066
 msgid "Invite"
 msgstr "Inviter"
 
-#: src/gtkconv.c:3376
+#: src/gtkconv.c:3244
 msgid "Invite a user"
 msgstr "Inviter en bruker"
 
-#: src/gtkconv.c:3383
-#, fuzzy
-msgid "Add the chat to your buddy list"
-msgstr "Legg til brukeren i kontaktlisten din"
-
-#: src/gtkconv.c:3390
-#, fuzzy
-msgid "Remove the chat from your buddy list"
-msgstr "Fjern brukeren fra kontaktlisten din"
-
-#: src/gtkconv.c:3490
+#: src/gtkconv.c:3283
+msgid "Bold"
+msgstr "Fet"
+
+#: src/gtkconv.c:3294
+msgid "Italic"
+msgstr "Kursiv"
+
+#: src/gtkconv.c:3305
+msgid "Underline"
+msgstr "Understrek"
+
+#: src/gtkconv.c:3321
+msgid "Larger font size"
+msgstr "Større skrift"
+
+#: src/gtkconv.c:3333
+msgid "Normal font size"
+msgstr "Normal skriftstørrelse"
+
+#: src/gtkconv.c:3345
+msgid "Smaller font size"
+msgstr "Mindre skrift"
+
+#: src/gtkconv.c:3362
+msgid "Font Face"
+msgstr "Skrifttype"
+
+#: src/gtkconv.c:3374
+msgid "Foreground font color"
+msgstr "Forgrunnsfarge"
+
+#: src/gtkconv.c:3386
+msgid "Background color"
+msgstr "Bakgrunnsfarge"
+
+#: src/gtkconv.c:3401
+msgid "Insert image"
+msgstr "Sett inn bilde"
+
+#: src/gtkconv.c:3412
+msgid "Insert link"
+msgstr "Sett inn lenke"
+
+#: src/gtkconv.c:3423
+msgid "Insert smiley"
+msgstr "Sett inn smilefjes"
+
+#: src/gtkconv.c:3483
 msgid "Topic:"
 msgstr "Tema:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3550
+#: src/gtkconv.c:3534
 msgid "0 people in room"
 msgstr "0 brukere i rommet"
 
-#: src/gtkconv.c:3605
+#: src/gtkconv.c:3591
 msgid "IM the user"
 msgstr "Send beskjed til bruker"
 
-#: src/gtkconv.c:3617
+#: src/gtkconv.c:3603
 msgid "Ignore the user"
 msgstr "Ignorer bruker"
 
-#: src/gtkconv.c:4155
+#: src/gtkconv.c:4156
 msgid "Close conversation"
 msgstr "Lukk samtalen"
 
-#: src/gtkconv.c:4668 src/gtkconv.c:4700 src/gtkconv.c:4821 src/gtkconv.c:4888
+#: src/gtkconv.c:4756 src/gtkconv.c:4788 src/gtkconv.c:4909 src/gtkconv.c:4976
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d person i rommet"
 msgstr[1] "%d personer i rommet"
 
-#: src/gtkconv.c:5404 src/gtkconv.c:5407
+#: src/gtkconv.c:5310
+#
+msgid "Animate"
+msgstr "Animer"
+
+#: src/gtkconv.c:5315
+msgid "Hide Icon"
+msgstr "Skjul ikon"
+
+#: src/gtkconv.c:5321
+msgid "Save Icon As..."
+msgstr "Lagre ikon som..."
+
+#: src/gtkconv.c:5800 src/gtkconv.c:5803
 msgid "<main>/Conversation/Close"
 msgstr "<main>/Samtale/Lukk"
 
-#: src/gtkdebug.c:135
+#: src/gtkdebug.c:133
 msgid "Debug Window"
 msgstr "Avlusningsvindu"
 
-#: src/gtkdebug.c:175
+#: src/gtkdebug.c:173
 msgid "Pause"
 msgstr "Pause"
 
-#: src/gtkdebug.c:181
+#: src/gtkdebug.c:179
 msgid "Timestamps"
 msgstr "Tidsstempler"
 
-#: src/gtkft.c:135
+#: src/gtkft.c:126
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f KB/s"
 
-#
-#: src/gtkft.c:156 src/gtkft.c:957
-#, fuzzy
-msgid "Finished"
-msgstr "Finsk"
-
-#: src/gtkft.c:209
+#: src/gtkft.c:200
 msgid "<b>Receiving From:</b>"
 msgstr "<b>Mottar fra:</b>"
 
-#: src/gtkft.c:212
+#: src/gtkft.c:203
 msgid "<b>Sending To:</b>"
 msgstr "<b>Sender til:</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:436
 msgid "Progress"
 msgstr "Framdrift"
 
-#: src/gtkft.c:489
+#: src/gtkft.c:443
 msgid "Filename"
 msgstr "Filnavn"
 
-#: src/gtkft.c:496
+#: src/gtkft.c:450
 msgid "Size"
 msgstr "Størrelse"
 
-#: src/gtkft.c:503
+#: src/gtkft.c:457
 msgid "Remaining"
 msgstr "Gjenstår"
 
-#: src/gtkft.c:533
+#: src/gtkft.c:487
 msgid "Filename:"
 msgstr "Filnavn:"
 
-#: src/gtkft.c:534
+#: src/gtkft.c:488
 msgid "Status:"
 msgstr "Status:"
 
-#: src/gtkft.c:535
+#: src/gtkft.c:489
 msgid "Speed:"
 msgstr "Hastighet:"
 
-#: src/gtkft.c:536
+#: src/gtkft.c:490
 msgid "Time Elapsed:"
 msgstr "Tid brukt:"
 
-#: src/gtkft.c:537
+#: src/gtkft.c:491
 msgid "Time Remaining:"
 msgstr "Tid gjenstår:"
 
-#: src/gtkft.c:634
+#: src/gtkft.c:588
 msgid "_Keep the dialog open"
 msgstr "Hold dialogen åpen"
 
-#: src/gtkft.c:644
+#: src/gtkft.c:598
 msgid "_Clear finished transfers"
 msgstr "Fjern fullførte overføringer"
 
 #. "Download Details" arrow
-#: src/gtkft.c:653
-#, fuzzy
-msgid "Show transfer details"
+#: src/gtkft.c:607
+msgid "Show download details"
 msgstr "Vis nedlastingsdetaljer"
 
-#: src/gtkft.c:654
-#, fuzzy
-msgid "Hide transfer details"
+#: src/gtkft.c:608
+msgid "Hide download details"
 msgstr "Skjul nedlastingsdetaljer"
 
 #. Pause button
-#: src/gtkft.c:696 src/stock.c:90
+#: src/gtkft.c:650 src/stock.c:86
 msgid "_Pause"
 msgstr "_Pause"
 
 #. Resume button
-#: src/gtkft.c:706
+#: src/gtkft.c:660
 msgid "_Resume"
 msgstr "_Fortsett"
 
-#: src/gtkft.c:908
-#, fuzzy
-msgid "Canceled"
-msgstr "_Avbryt"
-
-#: src/gtkft.c:910
-#, fuzzy
-msgid "Failed"
-msgstr "Feil."
-
-#: src/gtkft.c:1082
+#: src/gtkft.c:1011
 msgid "That file does not exist."
 msgstr "Filen eksisterer ikke."
 
-#: src/gtkft.c:1091
+#: src/gtkft.c:1020
 msgid "Cannot send a file of 0 bytes."
 msgstr "Kan ikke sende en fil som er 0 bytes."
 
-#: src/gtkft.c:1105
+#: src/gtkft.c:1033
 msgid "That file already exists."
 msgstr "Filen eksisterer allerede."
 
-#: src/gtkft.c:1131
-#, fuzzy
-msgid "Open..."
+#: src/gtkft.c:1058
+msgid "Gaim - Open..."
 msgstr "Gaim - Åpne..."
 
-#: src/gtkft.c:1133
-#, fuzzy
-msgid "Save As..."
-msgstr "Lagre ikon som..."
-
-#: src/gtkft.c:1181
+#: src/gtkft.c:1060 src/protocols/toc/toc.c:2042
+msgid "Gaim - Save As..."
+msgstr "Gaim - Lagre som..."
+
+#: src/gtkft.c:1107
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s ønsker å sende deg %s (%s)"
 
+#: src/gtkimhtml.c:614
 #
-#: src/gtkimhtml.c:829
 msgid "_Copy E-Mail Address"
 msgstr "Kopier e-postadresse"
 
-#: src/gtkimhtml.c:841
+#: src/gtkimhtml.c:626
 msgid "_Copy Link Location"
 msgstr "Kopier snarvei"
 
-#: src/gtkimhtml.c:851
+#: src/gtkimhtml.c:636
 msgid "_Open Link in Browser"
 msgstr "Åpne i nettleser"
 
-#: src/gtkimhtml.c:2262
+#: src/gtkimhtml.c:1744
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
@@ -3127,130 +2988,37 @@
 "Gaim kunne ikke gjette bildetypen ut fra filtypen (siste del av filnavnet). "
 "Antar PNG-format."
 
-#: src/gtkimhtml.c:2270
+#: src/gtkimhtml.c:1752
 #, c-format
 msgid "Error saving image: %s"
 msgstr "Feil under lagring av bilde: %s"
 
-#: src/gtkimhtml.c:2279
+#: src/gtkimhtml.c:1761
 msgid "Save Image"
 msgstr "Lagre bilde"
 
-#: src/gtkimhtml.c:2302
+#: src/gtkimhtml.c:1784
 msgid "_Save Image..."
 msgstr "Lagre bilde..."
 
-#: src/gtkimhtmltoolbar.c:350
-#, fuzzy
-msgid "_URL"
-msgstr "URL"
-
-#: src/gtkimhtmltoolbar.c:354
-#, fuzzy
-msgid "_Description"
-msgstr "Beskrivelse"
-
-#: src/gtkimhtmltoolbar.c:359
-msgid "Insert Link"
-msgstr "Sett inn lenke"
-
-#: 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 ""
-"Vennligst skriv inn URL og beskrivelse av lenka du vil sette inn. "
-"Beskrivelsesfeltet er valgfritt.\n"
-
-#: src/gtkimhtmltoolbar.c:365
-#, fuzzy
-msgid "_Insert"
-msgstr "Sett inn"
-
-#: src/gtkimhtmltoolbar.c:422
-#, c-format
-msgid "Failed to store image: %s\n"
-msgstr "Klarte ikke å lagre bilde: %s\n"
-
-#: src/gtkimhtmltoolbar.c:448
-#, fuzzy
-msgid "Insert Image"
-msgstr "Sett inn bilde"
-
-#. show everything
-#: src/gtkimhtmltoolbar.c:592
-msgid "Smile!"
-msgstr "Smil!"
-
-#: src/gtkimhtmltoolbar.c:722
-msgid "Bold"
-msgstr "Fet"
-
-#: src/gtkimhtmltoolbar.c:733
-msgid "Italic"
-msgstr "Kursiv"
-
-#: src/gtkimhtmltoolbar.c:744
-msgid "Underline"
-msgstr "Understrek"
-
-#: src/gtkimhtmltoolbar.c:760
-msgid "Larger font size"
-msgstr "Større skrift"
-
-#: src/gtkimhtmltoolbar.c:772
-msgid "Smaller font size"
-msgstr "Mindre skrift"
-
-#: src/gtkimhtmltoolbar.c:789
-msgid "Font Face"
-msgstr "Skrifttype"
-
-#: src/gtkimhtmltoolbar.c:801
-msgid "Foreground font color"
-msgstr "Forgrunnsfarge"
-
-#: src/gtkimhtmltoolbar.c:813
-msgid "Background color"
-msgstr "Bakgrunnsfarge"
-
-#: src/gtkimhtmltoolbar.c:828
-msgid "Insert link"
-msgstr "Sett inn lenke"
-
-#: src/gtkimhtmltoolbar.c:838
-msgid "Insert image"
-msgstr "Sett inn bilde"
-
-#: src/gtkimhtmltoolbar.c:849
-msgid "Insert smiley"
-msgstr "Sett inn smilefjes"
-
-#: src/gtklog.c:257
-#, fuzzy
-msgid "Conversations with"
-msgstr "Samtale med %s"
-
-#. 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 ny beskjed."
 msgstr[1] "%s har %d nye beskjeder."
 
-#: src/gtknotify.c:227
+#: src/gtknotify.c:219
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr "<span weight=\"bold\">Fra:</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\">Emne:</span> %s\n"
 
-#: src/gtknotify.c:237
+#: src/gtknotify.c:228
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3261,7 +3029,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"
@@ -3272,201 +3040,177 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:439
-#, fuzzy, c-format
-msgid "The browser command \"%s\" is invalid."
-msgstr "Nettleseren \"%s\" er ugyldig."
-
-#: src/gtknotify.c:442 src/gtknotify.c:456 src/gtknotify.c:471
-#: src/gtknotify.c:579
+#: src/gtknotify.c:428 src/gtknotify.c:448 src/gtknotify.c:456
 msgid "Unable to open URL"
 msgstr "Kunne ikke åpne URL"
 
-#: src/gtknotify.c:453 src/gtknotify.c:468
-#, fuzzy, c-format
-msgid "Error launching \"%s\": %s"
-msgstr "Feil under starting av kommando: %s"
-
-#: src/gtknotify.c:580
+#: src/gtknotify.c:429
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 "Klarte ikke å starte en nettleser fordi 'Manuell' nettleserkommando er "
 "valgt, men ingen kommando for denne har blitt satt."
 
-#: src/gtkpounce.c:143
+#: src/gtknotify.c:446
+#, c-format
+msgid "The browser \"%s\" is invalid."
+msgstr "Nettleseren \"%s\" er ugyldig."
+
+#: src/gtknotify.c:453
+#, c-format
+msgid "Error launching \"command\": %s"
+msgstr "Feil under starting av kommando: %s"
+
+#: src/gtkpounce.c:140
 msgid "Select a file"
 msgstr "Velg fil"
 
-#: src/gtkpounce.c:192
+#: src/gtkpounce.c:189
 msgid "Please enter a buddy to pounce."
 msgstr "Navnet på kompisen du vil varsle."
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:336 src/gtkpounce.c:756
+#: src/gtkpounce.c:333 src/gtkpounce.c:738
 msgid "New Buddy Pounce"
 msgstr "Legg til kompisvarsling"
 
-#: src/gtkpounce.c:336
+#: src/gtkpounce.c:333
 msgid "Edit Buddy Pounce"
 msgstr "Rediger kompisvarsling"
 
 #. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:354
+#: src/gtkpounce.c:351
 msgid "Pounce Who"
 msgstr "Varsling for"
 
-#: src/gtkpounce.c:381
+#: src/gtkpounce.c:377
 msgid "_Buddy Name:"
 msgstr "Kontakt:"
 
 #. Create the "Pounce When" frame.
-#: src/gtkpounce.c:404
+#: src/gtkpounce.c:399
 msgid "Pounce When"
 msgstr "Varsle når"
 
-#: src/gtkpounce.c:412
-#, fuzzy
-msgid "_Sign on"
+#: src/gtkpounce.c:407 src/main.c:339
+msgid "Sign on"
 msgstr "Pålogging"
 
-#: src/gtkpounce.c:414
-#, fuzzy
-msgid "Sign _off"
+#: src/gtkpounce.c:409
+msgid "Sign off"
 msgstr "Logge av"
 
-#: src/gtkpounce.c:416
-#, fuzzy
-msgid "A_way"
-msgstr "Borte"
-
-#: src/gtkpounce.c:418
-#, fuzzy
-msgid "Re_turn from away"
+#: src/gtkpounce.c:413
+msgid "Return from away"
 msgstr "Returnere fra fravær"
 
-#: src/gtkpounce.c:420
-#, fuzzy
-msgid "_Idle"
+#: src/gtkpounce.c:415 src/gtkprefs.c:1492 src/protocols/msn/state.c:30
+#: src/protocols/yahoo/yahoo.c:2028
+msgid "Idle"
 msgstr "Inaktiv"
 
-#: src/gtkpounce.c:422
-#, fuzzy
-msgid "Retur_n from idle"
+#: src/gtkpounce.c:417
+msgid "Return from idle"
 msgstr "Returner fra inaktivitet"
 
-#: src/gtkpounce.c:424
-#, fuzzy
-msgid "Buddy starts _typing"
+#: src/gtkpounce.c:419
+msgid "Buddy starts typing"
 msgstr "Kontakt skriver til deg"
 
-#: src/gtkpounce.c:426
-#, fuzzy
-msgid "Buddy stops t_yping"
+#: src/gtkpounce.c:421
+msgid "Buddy stops typing"
 msgstr "Kontakt slutter å skrive til deg"
 
 #. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:455
+#: src/gtkpounce.c:450
 msgid "Pounce Action"
 msgstr "Varslingsmåte"
 
-#: src/gtkpounce.c:462
-#, fuzzy
-msgid "Op_en an IM window"
+#: src/gtkpounce.c:457
+msgid "Open an IM window"
 msgstr "Åpne vindu for direktemelding"
 
-#: src/gtkpounce.c:463
-#, fuzzy
-msgid "_Popup notification"
+#: src/gtkpounce.c:458
+msgid "Popup notification"
 msgstr "Varslingsvindu spretter opp"
 
-#: src/gtkpounce.c:464
-#, fuzzy
-msgid "Send a _message"
+#: src/gtkpounce.c:459
+msgid "Send a message"
 msgstr "Send beskjed"
 
-#: src/gtkpounce.c:465
-#, fuzzy
-msgid "E_xecute a command"
+#: src/gtkpounce.c:460
+msgid "Execute a command"
 msgstr "Kjør kommando"
 
-#: src/gtkpounce.c:466
-#, fuzzy
-msgid "P_lay a sound"
+#: src/gtkpounce.c:461
+msgid "Play a sound"
 msgstr "Spill av en lyd"
 
-#: src/gtkpounce.c:470
-#, fuzzy
-msgid "B_rowse..."
+#: src/gtkpounce.c:465 src/gtkpounce.c:467
+msgid "Browse"
 msgstr "Bla gjennom"
 
-#: src/gtkpounce.c:472
-#, fuzzy
-msgid "Bro_wse..."
-msgstr "Bla gjennom"
-
-#: 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:2081
+msgid "Test"
+msgstr "Test"
+
+#: src/gtkpounce.c:551
+msgid "_Save this pounce after activation"
 msgstr "Lagre denne varslingen etter aktivisering"
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:763
+#: src/gtkpounce.c:745
 msgid "Remove Buddy Pounce"
 msgstr "Fjern kompisvarsling"
 
-#: src/gtkpounce.c:813
+#: src/gtkpounce.c:786
 #, c-format
 msgid "%s has started typing to you"
 msgstr "%s starter å skrive til deg"
 
-#: src/gtkpounce.c:814
+#: src/gtkpounce.c:787
 #, c-format
 msgid "%s has signed on"
 msgstr "%s har logget på"
 
-#: src/gtkpounce.c:815
+#: src/gtkpounce.c:788
 #, c-format
 msgid "%s has returned from being idle"
 msgstr "%s har blitt aktiv igjen"
 
-#: src/gtkpounce.c:816
+#: src/gtkpounce.c:789
 #, c-format
 msgid "%s has returned from being away"
 msgstr "%s har kommet tilbake"
 
-#: src/gtkpounce.c:817
+#: src/gtkpounce.c:790
 #, c-format
 msgid "%s has stopped typing to you"
 msgstr "%s har sluttet å skrive til deg"
 
-#: src/gtkpounce.c:818
+#: src/gtkpounce.c:791
 #, c-format
 msgid "%s has signed off"
 msgstr "%s har logget av"
 
-#: src/gtkpounce.c:819
+#: src/gtkpounce.c:792
 #, c-format
 msgid "%s has become idle"
 msgstr "%s har blitt inaktiv"
 
-#: src/gtkpounce.c:821
+#: src/gtkpounce.c:794
 msgid "Unknown pounce event. Please report this!"
 msgstr "Ukjent varslingshendelse. Vennligst rapporter dette!"
 
-#: src/gtkprefs.c:374
+#: src/gtkprefs.c:373
 msgid "Interface Options"
 msgstr "Valg for grensesnitt"
 
-#: src/gtkprefs.c:376
+#: src/gtkprefs.c:375
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr "Vis kallenavn for personer hvis de ikke har noe alias"
 
-#: src/gtkprefs.c:562
+#: src/gtkprefs.c:561
 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."
@@ -3474,431 +3218,361 @@
 "Velg smilefjes-temaet du vil bruke fra listen nedenfor. Nye temaer kan "
 "installeres ved å dra og slippe dem over temalisten."
 
-#: src/gtkprefs.c:597
+#: src/gtkprefs.c:594
 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
-msgid "Description"
-msgstr "Beskrivelse"
+#: src/gtkprefs.c:668
+msgid "Style"
+msgstr "Stil"
+
+#: src/gtkprefs.c:669
+msgid "_Bold"
+msgstr "Fet"
 
 #: src/gtkprefs.c:671
-msgid "Style"
-msgstr "Stil"
-
-#: src/gtkprefs.c:672
-msgid "_Bold"
-msgstr "Fet"
-
-#: src/gtkprefs.c:674
 msgid "_Italics"
 msgstr "Kursiv"
 
-#: src/gtkprefs.c:676
+#: src/gtkprefs.c:673
 msgid "_Underline"
 msgstr "Understrek"
 
-#. 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:675
 msgid "_Strikethrough"
 msgstr "Gjennomstreking"
 
-#: src/gtkprefs.c:689
+#: src/gtkprefs.c:678
 msgid "Face"
 msgstr "Skrift"
 
-#: src/gtkprefs.c:692
+#: src/gtkprefs.c:681
 msgid "Use custo_m face"
 msgstr "Bruk egen skrifttype"
 
-#: src/gtkprefs.c:709
+#: src/gtkprefs.c:698
 msgid "Use custom si_ze"
 msgstr "Bruk egen størrelse"
 
-#: src/gtkprefs.c:721
+#: src/gtkprefs.c:711
 msgid "Color"
 msgstr "Farge"
 
-#: src/gtkprefs.c:725
+#: src/gtkprefs.c:715
 msgid "_Text color"
 msgstr "Tekstfarge"
 
-#: src/gtkprefs.c:744
+#: src/gtkprefs.c:734
 msgid "Bac_kground color"
 msgstr "Bakgrunnsfarge"
 
-#: src/gtkprefs.c:772 src/gtkprefs.c:1004 src/gtkprefs.c:1052
+#: src/gtkprefs.c:762 src/gtkprefs.c:992 src/gtkprefs.c:1045
 msgid "Display"
 msgstr "Vis"
 
-#: src/gtkprefs.c:773
+#: src/gtkprefs.c:763
 msgid "Show graphical _smileys"
 msgstr "Vis smilefjes som grafikk"
 
-#: src/gtkprefs.c:775
+#: src/gtkprefs.c:765
 msgid "Show _timestamp on messages"
 msgstr "Vis tidsstempel på beskjeder"
 
-#: src/gtkprefs.c:777
+#: src/gtkprefs.c:767
 msgid "Show _URLs as links"
 msgstr "Vis URLer som lenker"
 
-#: src/gtkprefs.c:781
+#: src/gtkprefs.c:771
 msgid "_Highlight misspelled words"
 msgstr "Marker stavefeil"
 
-#: src/gtkprefs.c:785
+#: src/gtkprefs.c:775
 msgid "Ignore c_olors"
 msgstr "Ignorer farger"
 
-#: src/gtkprefs.c:787
+#: src/gtkprefs.c:777
 msgid "Ignore font _faces"
 msgstr "Ignorer skrifttyper"
 
-#: src/gtkprefs.c:789
+#: src/gtkprefs.c:779
 msgid "Ignore font si_zes"
 msgstr "Ignorer skriftstørrelser"
 
-#: src/gtkprefs.c:802
+#: src/gtkprefs.c:792
 msgid "Send Message"
 msgstr "Send beskjed"
 
-#: src/gtkprefs.c:803
+#: src/gtkprefs.c:793
 msgid "Enter _sends message"
 msgstr "Enter _sender beskjeden"
 
-#: src/gtkprefs.c:805
+#: src/gtkprefs.c:795
 msgid "C_ontrol-Enter sends message"
 msgstr "CTRL-Enter sender beskjeden"
 
-#: src/gtkprefs.c:808
+#: src/gtkprefs.c:798
 msgid "Window Closing"
 msgstr "Lukke vindu"
 
-#: src/gtkprefs.c:809
+#: src/gtkprefs.c:799
 msgid "_Escape closes window"
 msgstr "_ESC lukker vinduet"
 
-#: src/gtkprefs.c:812
+#: src/gtkprefs.c:802
 msgid "Insertions"
 msgstr "Innsettinger"
 
-#: src/gtkprefs.c:813
+#: src/gtkprefs.c:803
 msgid "Control-{B/I/U} inserts _HTML tags"
 msgstr "CTRL-{b/i/u/s} setter inn _HTML-koder"
 
-#: src/gtkprefs.c:815
+#: src/gtkprefs.c:805
 msgid "Control-(number) _inserts smileys"
 msgstr "CTRL-(tall) setter _inn smilefjes"
 
-#: src/gtkprefs.c:831
+#: src/gtkprefs.c:821
 msgid "Buddy List Sorting"
 msgstr "Kontaktlistesortering"
 
-#: src/gtkprefs.c:840
-#, fuzzy
-msgid "_Sorting:"
+#: src/gtkprefs.c:830
+msgid "Sorting:"
 msgstr "Sortering:"
 
-#: src/gtkprefs.c:845
+#: src/gtkprefs.c:835
 msgid "Buddy List Toolbar"
 msgstr "Kontaktverktøylinje"
 
-#: src/gtkprefs.c:846 src/gtkprefs.c:977 src/gtkprefs.c:1028
+#: src/gtkprefs.c:836 src/gtkprefs.c:962 src/gtkprefs.c:1018
 msgid "Show _buttons as:"
 msgstr "Vis knapper som:"
 
-#: src/gtkprefs.c:848 src/gtkprefs.c:979 src/gtkprefs.c:1030
+#: src/gtkprefs.c:838 src/gtkprefs.c:964 src/gtkprefs.c:1020
 msgid "Pictures"
 msgstr "Bilder"
 
-#: src/gtkprefs.c:849 src/gtkprefs.c:980 src/gtkprefs.c:1031
+#: src/gtkprefs.c:839 src/gtkprefs.c:965 src/gtkprefs.c:1021
 msgid "Text"
 msgstr "Tekst"
 
-#: src/gtkprefs.c:850 src/gtkprefs.c:981 src/gtkprefs.c:1032
+#: src/gtkprefs.c:840 src/gtkprefs.c:966 src/gtkprefs.c:1022
 msgid "Pictures and text"
 msgstr "Bilder og tekst"
 
-#: src/gtkprefs.c:855 src/gtkprefs.c:992 src/gtkprefs.c:1043
+#: src/gtkprefs.c:845 src/gtkprefs.c:980 src/gtkprefs.c:1036
 msgid "_Raise window on events"
 msgstr "Flytt vinduet øverst ved hendelser"
 
-#: src/gtkprefs.c:858
+#: src/gtkprefs.c:848
 msgid "Group Display"
 msgstr "Gruppevisning"
 
-#: src/gtkprefs.c:859
+#: src/gtkprefs.c:849
 msgid "Show _numbers in groups"
 msgstr "Vis antall gruppemedlemmer"
 
-#: src/gtkprefs.c:862
+#: src/gtkprefs.c:852
 msgid "Buddy Display"
 msgstr "Kontaktvisning"
 
-#: src/gtkprefs.c:863 src/gtkprefs.c:999
+#: src/gtkprefs.c:853 src/gtkprefs.c:987
 msgid "Show buddy _icons"
 msgstr "Vis kontaktikoner"
 
-#: src/gtkprefs.c:865
+#: src/gtkprefs.c:855
 msgid "Show _warning levels"
 msgstr "Vis advarselsnivåer"
 
-#: src/gtkprefs.c:867
+#: src/gtkprefs.c:857
 msgid "Show idle _times"
 msgstr "Vis inaktiv tid"
 
-#: src/gtkprefs.c:869
+#: src/gtkprefs.c:859
 msgid "Dim i_dle buddies"
 msgstr "Dimme ned inaktive kontakter"
 
-#: src/gtkprefs.c:871
-msgid "_Automatically expand contacts"
-msgstr ""
-
-#: src/gtkprefs.c:896
+#: src/gtkprefs.c:884
 msgid "_Placement:"
 msgstr "Plassering:"
 
-#: src/gtkprefs.c:903
+#: src/gtkprefs.c:891
 msgid "Send _URLs as Links"
 msgstr "Send _URLer som lenker"
 
-#: src/gtkprefs.c:906
-#, fuzzy
-msgid "Show _Formatting Toolbar"
+#: src/gtkprefs.c:894
+msgid "Show Formatting Toolbar"
 msgstr "Vis formateringsverktøy"
 
-#: src/gtkprefs.c:909
-msgid "Show a_liases in tabs/titles"
-msgstr "Vis aliasnavn i titteltekster"
-
-#: src/gtkprefs.c:912
+#: src/gtkprefs.c:897
 msgid "Tab Options"
 msgstr "Fanevalg"
 
-#: src/gtkprefs.c:914
+#: src/gtkprefs.c:899
 msgid "_Tab Placement:"
 msgstr "_Faneplassering:"
 
-#: src/gtkprefs.c:916
+#: src/gtkprefs.c:901
 msgid "Top"
 msgstr "Øverst"
 
-#: src/gtkprefs.c:917
+#: src/gtkprefs.c:902
 msgid "Bottom"
 msgstr "Nederst"
 
-#: src/gtkprefs.c:918
+#: src/gtkprefs.c:903
 msgid "Left"
 msgstr "Venstre"
 
-#: src/gtkprefs.c:919
+#: src/gtkprefs.c:904
 msgid "Right"
 msgstr "Høyre"
 
-#: src/gtkprefs.c:925
+#: src/gtkprefs.c:910
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Vis direktemeldinger og samtalegrupper i _faner"
 
-#: src/gtkprefs.c:928
+#: src/gtkprefs.c:913
 msgid "Show IMs and chats in _same tabbed window"
 msgstr "Vis direktemeldinger og samtalegrupper i samme _vindu"
 
-#: src/gtkprefs.c:938
+#: src/gtkprefs.c:923
 msgid "Show _close button on tabs"
 msgstr "Vis _lukkeknapp på faner"
 
-#: src/gtkprefs.c:949
+#: src/gtkprefs.c:934
 msgid "Show status _icons on tabs"
 msgstr "Vis _statusikoner på faner"
 
-#: src/gtkprefs.c:976 src/gtkprefs.c:1027
+#: src/gtkprefs.c:961 src/gtkprefs.c:1017
 msgid "Window"
 msgstr "Vindu"
 
-#: src/gtkprefs.c:986 src/gtkprefs.c:1037
+#: src/gtkprefs.c:971 src/gtkprefs.c:1027
 msgid "New window _width:"
 msgstr "Bredde for nye vinduer:"
 
-#: src/gtkprefs.c:988 src/gtkprefs.c:1039
+#: src/gtkprefs.c:974 src/gtkprefs.c:1030
 msgid "New window _height:"
 msgstr "Høyde for nye vinduer:"
 
-#: src/gtkprefs.c:990 src/gtkprefs.c:1041
+#: src/gtkprefs.c:977 src/gtkprefs.c:1033
 msgid "_Entry field height:"
 msgstr "Høyde for tekstboks:"
 
-#: src/gtkprefs.c:994
+#: src/gtkprefs.c:982
 msgid "Hide window on _send"
 msgstr "Skjul vindu ved sending"
 
-#: src/gtkprefs.c:998
+#: src/gtkprefs.c:986
 msgid "Buddy Icons"
 msgstr "Kontaktikoner"
 
-#: src/gtkprefs.c:1001
+#: src/gtkprefs.c:989
 msgid "Enable buddy icon a_nimation"
 msgstr "Slå på _animasjoner i kontaktikoner"
 
-#: src/gtkprefs.c:1005
+#: src/gtkprefs.c:993
 msgid "Show _logins in window"
 msgstr "Vis _innlogginger i vinduet"
 
-#: src/gtkprefs.c:1008
+#: src/gtkprefs.c:995
+msgid "Show a_liases in tabs/titles"
+msgstr "Vis aliasnavn i titteltekster"
+
+#: src/gtkprefs.c:998
 msgid "Typing Notification"
 msgstr "Skrivevarsling"
 
-#: src/gtkprefs.c:1009
+#: src/gtkprefs.c:999
 msgid "Notify buddies that you are _typing to them"
 msgstr "Varsle kontakter når du skriver til dem"
 
-#: src/gtkprefs.c:1046
+#: src/gtkprefs.c:1039
 msgid "Tab Completion"
 msgstr "TAB-fullføring"
 
-#: src/gtkprefs.c:1047
+#: src/gtkprefs.c:1040
 msgid "_Tab-complete nicks"
 msgstr "TAB-fullfør kallenavn"
 
-#: src/gtkprefs.c:1049
+#: src/gtkprefs.c:1042
 msgid "_Old-style tab completion"
 msgstr "Gammel TAB-fullføringsmetode"
 
-#: src/gtkprefs.c:1053
+#: src/gtkprefs.c:1046
 msgid "_Show people joining in window"
 msgstr "_Vis når folk logger på"
 
-#: src/gtkprefs.c:1055
+#: src/gtkprefs.c:1048
 msgid "_Show people leaving in window"
 msgstr "_Vis når folk logger av"
 
-#: src/gtkprefs.c:1057
-#, fuzzy
-msgid "Co_lorize screen names"
+#: src/gtkprefs.c:1050
+msgid "Co_lorize screennames"
 msgstr "_Fargelegg skjermnavn"
 
-#: src/gtkprefs.c:1078
-#, fuzzy
-msgid "IP Address"
-msgstr "Adresse"
-
-#: src/gtkprefs.c:1080
-#, fuzzy
-msgid "_Autodetect IP Address"
-msgstr "Gateadresse"
-
-#: 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 "_Port:"
-
-#: src/gtkprefs.c:1126
-#, fuzzy
-msgid "_End Port:"
-msgstr "_Port:"
-
-#: src/gtkprefs.c:1174
+#: src/gtkprefs.c:1094
 msgid "Proxy Type"
 msgstr "Proxytype"
 
-#: src/gtkprefs.c:1177
+#: src/gtkprefs.c:1097
 msgid "No proxy"
 msgstr "Ingen proxy"
 
-#: src/gtkprefs.c:1184
+#: src/gtkprefs.c:1104
 msgid "Proxy Server"
 msgstr "Proxytjener"
 
-#: src/gtkprefs.c:1242
-#, fuzzy
-msgid "_User:"
+#: src/gtkprefs.c:1125
+msgid "_Host"
+msgstr "Adresse"
+
+#: src/gtkprefs.c:1142 src/protocols/irc/irc.c:553
+#: src/protocols/jabber/jabber.c:1152 src/protocols/msn/msn.c:1640
+#: src/protocols/napster/napster.c:642 src/protocols/trepia/trepia.c:1345
+msgid "Port"
+msgstr "Port"
+
+#: src/gtkprefs.c:1160
+msgid "_User"
 msgstr "Bruker"
 
-#: src/gtkprefs.c:1298
+#: src/gtkprefs.c:1177
+msgid "Pa_ssword"
+msgstr "Passord"
+
+#: src/gtkprefs.c:1214
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1299
+#: src/gtkprefs.c:1215
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1300
+#: src/gtkprefs.c:1216
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1301
+#: src/gtkprefs.c:1217
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1302
+#: src/gtkprefs.c:1218
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1303
-msgid "Firebird"
-msgstr ""
-
-#: src/gtkprefs.c:1304
-msgid "Firefox"
-msgstr ""
-
-#: src/gtkprefs.c:1305
-msgid "Gnome Default"
-msgstr ""
-
-#: src/gtkprefs.c:1314
+#: src/gtkprefs.c:1227
 msgid "Manual"
 msgstr "Egendefinert"
 
-#: src/gtkprefs.c:1365
+#: src/gtkprefs.c:1268
 msgid "Browser Selection"
 msgstr "Valg av nettleser"
 
-#: src/gtkprefs.c:1369
+#: src/gtkprefs.c:1272
 msgid "_Browser:"
 msgstr "_Nettleser:"
 
-#: src/gtkprefs.c:1376
-#, fuzzy
-msgid "_Open link in:"
-msgstr "Åpne i nettleser"
-
-#: src/gtkprefs.c:1378
-#, fuzzy
-msgid "Browser default"
-msgstr "kjedelig standardsvar"
-
-#: src/gtkprefs.c:1379
-msgid "Existing window"
-msgstr ""
-
-#: src/gtkprefs.c:1381
-#, fuzzy
-msgid "New tab"
-msgstr "Ny"
-
-#: src/gtkprefs.c:1395
+#: src/gtkprefs.c:1282
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3907,55 +3581,87 @@
 "_Egendefinert:\n"
 "(%s for URL)"
 
-#: src/gtkprefs.c:1428
+#: src/gtkprefs.c:1303
+msgid "Browser Options"
+msgstr "Nettleservalg"
+
+#: src/gtkprefs.c:1304
+msgid "Open new _window by default"
+msgstr "Åpne som standard i nytt vindu"
+
+#: src/gtkprefs.c:1320
 msgid "Message Logs"
 msgstr "Beskjedlogging"
 
-#: src/gtkprefs.c:1431
+#: src/gtkprefs.c:1323
 msgid "Log _Format:"
 msgstr "Logg_format:"
 
-#: src/gtkprefs.c:1434
+#: src/gtkprefs.c:1327
 msgid "_Log all instant messages"
 msgstr "Logg alle direktemeldinger"
 
-#: src/gtkprefs.c:1436
+#: src/gtkprefs.c:1329
 msgid "Log all c_hats"
 msgstr "Logg alle samtaler"
 
-#: src/gtkprefs.c:1491
+#: src/gtkprefs.c:1332
+msgid "System Logs"
+msgstr "Systemlogging"
+
+#: src/gtkprefs.c:1333
+msgid "Log when buddies _sign on/sign off"
+msgstr "Skriv til logg når kontakter logger av/på"
+
+#: src/gtkprefs.c:1335
+msgid "Log when buddies become _idle/un-idle"
+msgstr "Skriv til logg når kontakter blir aktiv/inaktiv"
+
+#: src/gtkprefs.c:1337
+msgid "Log when buddies go away/come _back"
+msgstr "Skriv til logg når kontakter blir borte/kommer tilbake"
+
+#: src/gtkprefs.c:1339
+msgid "Log your _own signons/idleness/awayness"
+msgstr "Skriv egne pålogginger/inaktivitet/bortemarkeringer til logg"
+
+#: src/gtkprefs.c:1341
+msgid "I_ndividual log file for each buddy's signons"
+msgstr "Egen loggfil for hver kontakts pålogginger"
+
+#: src/gtkprefs.c:1384
 msgid "Sound Options"
 msgstr "Lydinnstillinger"
 
-#: src/gtkprefs.c:1492
+#: src/gtkprefs.c:1385
 msgid "_No sounds when you log in"
 msgstr "Ingen lyder ved pålogging"
 
-#: src/gtkprefs.c:1494
+#: src/gtkprefs.c:1387
 msgid "_Sounds while away"
 msgstr "Ingen lyder når du er fraværsmarkert"
 
-#: src/gtkprefs.c:1498
+#: src/gtkprefs.c:1391
 msgid "Sound Method"
 msgstr "Lydtype"
 
-#: src/gtkprefs.c:1499
+#: src/gtkprefs.c:1392
 msgid "_Method:"
 msgstr "_Metode:"
 
-#: src/gtkprefs.c:1501
+#: src/gtkprefs.c:1394
 msgid "Console beep"
 msgstr "Konsollpip"
 
-#: src/gtkprefs.c:1503
+#: src/gtkprefs.c:1396
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: src/gtkprefs.c:1510
+#: src/gtkprefs.c:1403
 msgid "Command"
 msgstr "Kommando"
 
-#: src/gtkprefs.c:1520
+#: src/gtkprefs.c:1413
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -3964,72 +3670,67 @@
 "_Program for lydavspilling\n"
 "(%s for filnavn)"
 
-#: src/gtkprefs.c:1577
+#: src/gtkprefs.c:1468
 msgid "_Sending messages removes away status"
 msgstr "Beskjedsending fjerner eventuell fraværsmarkering"
 
-#: src/gtkprefs.c:1579
+#: src/gtkprefs.c:1470
 msgid "_Queue new messages when away"
 msgstr "Når borte, legg nye beskjeder i kø"
 
-#: src/gtkprefs.c:1582
+#: src/gtkprefs.c:1473
 msgid "Auto-response"
 msgstr "Automatisk svar"
 
-#: src/gtkprefs.c:1585
+#: src/gtkprefs.c:1476
 msgid "Seconds before _resending:"
 msgstr "Antall sekunder før sending på nytt:"
 
-#: src/gtkprefs.c:1588
+#: src/gtkprefs.c:1479
 msgid "_Send auto-response"
 msgstr "_Send automatisk svar"
 
-#: src/gtkprefs.c:1590
+#: src/gtkprefs.c:1481
 msgid "_Only send auto-response when idle"
 msgstr "Bare send automatisk svar når inaktiv"
 
-#: src/gtkprefs.c:1592
+#: src/gtkprefs.c:1483
 msgid "Send auto-response in _active conversations"
 msgstr "Send automatisk svar i aktive samtaler"
 
-#: 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:1493
 msgid "Idle _time reporting:"
 msgstr "Rapportering av inaktiv _tid:"
 
-#: src/gtkprefs.c:1605
+#: src/gtkprefs.c:1496
 msgid "Gaim usage"
 msgstr "Gaim-bruk"
 
-#: src/gtkprefs.c:1608
+#: src/gtkprefs.c:1499
 msgid "X usage"
 msgstr "X-bruk"
 
-#: src/gtkprefs.c:1610
+#: src/gtkprefs.c:1501
 msgid "Windows usage"
 msgstr "Windows-bruk"
 
-#: src/gtkprefs.c:1618
+#: src/gtkprefs.c:1509
 msgid "Auto-away"
 msgstr "Automatisk fraværsmarkering"
 
-#: src/gtkprefs.c:1619
+#: src/gtkprefs.c:1510
 msgid "Set away _when idle"
 msgstr "Sett som borte når inaktiv"
 
-#: src/gtkprefs.c:1623
+#: src/gtkprefs.c:1512
 msgid "_Minutes before setting away:"
 msgstr "Antall minutter før fraværsmarkert:"
 
-#: src/gtkprefs.c:1631
+#: src/gtkprefs.c:1519
 msgid "Away m_essage:"
 msgstr "Fraværsbeskjed:"
 
-#: src/gtkprefs.c:1786
+#: src/gtkprefs.c:1581
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4044,7 +3745,7 @@
 "<span weight=\"bold\">Webside:</span>\t\t%s\n"
 "<span weight=\"bold\">Filnavn:</span>\t%s"
 
-#: src/gtkprefs.c:1791
+#: src/gtkprefs.c:1586
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4059,192 +3760,178 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">Filnavn:</span>  %s"
 
-#: src/gtkprefs.c:1974
+#: src/gtkprefs.c:1767
 msgid "Load"
 msgstr "Last"
 
-#: src/gtkprefs.c:1988
-msgid "Summary"
-msgstr ""
-
-#: src/gtkprefs.c:2036
+#: src/gtkprefs.c:1774 src/protocols/jabber/jabber.c:588
+#: src/protocols/msn/msn.c:1328 src/protocols/trepia/trepia.c:401
+msgid "Name"
+msgstr "Navn"
+
+#: src/gtkprefs.c:1821
 msgid "Details"
 msgstr "Detaljer"
 
-#: src/gtkprefs.c:2163
+#: src/gtkprefs.c:1948
 msgid "Sound Selection"
 msgstr "Lydvalg"
 
-#: src/gtkprefs.c:2270
+#: src/gtkprefs.c:2055
 msgid "Play"
 msgstr "Spill av"
 
-#: src/gtkprefs.c:2277
+#: src/gtkprefs.c:2062
 msgid "Event"
 msgstr "Hendelse"
 
-#: src/gtkprefs.c:2296
-msgid "Test"
-msgstr "Test"
-
-#: src/gtkprefs.c:2300
+#: src/gtkprefs.c:2085
 msgid "Reset"
 msgstr "Nullstill"
 
-#: src/gtkprefs.c:2304
+#: src/gtkprefs.c:2089
 msgid "Choose..."
 msgstr "Bla gjennom..."
 
-#: src/gtkprefs.c:2439
+#: src/gtkprefs.c:2223
 msgid "_Edit"
 msgstr "Rediger"
 
-#: src/gtkprefs.c:2475
+#: src/gtkprefs.c:2259
 msgid "Interface"
 msgstr "Grensesnitt"
 
-#: src/gtkprefs.c:2476
+#: src/gtkprefs.c:2260
 msgid "Smiley Themes"
 msgstr "Smilefjes-tema"
 
-#: src/gtkprefs.c:2477
+#: src/gtkprefs.c:2261
 msgid "Fonts"
 msgstr "Skrifttyper"
 
-#: src/gtkprefs.c:2478
+#: src/gtkprefs.c:2262
 msgid "Message Text"
 msgstr "Beskjeder"
 
-#: src/gtkprefs.c:2479
+#: src/gtkprefs.c:2263
 msgid "Shortcuts"
 msgstr "Hurtigtaster"
 
-#: src/gtkprefs.c:2482
+#: src/gtkprefs.c:2266
 msgid "IMs"
 msgstr "Direktemeldinger"
 
-#: src/gtkprefs.c:2484
-#, fuzzy
-msgid "Network"
-msgstr "Ny"
-
-#: src/gtkprefs.c:2485
+#: src/gtkprefs.c:2268
 msgid "Proxy"
 msgstr "Proxy"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2488
+#: src/gtkprefs.c:2271
 msgid "Browser"
 msgstr "Nettleser"
 
-#: src/gtkprefs.c:2490
+#: src/gtkprefs.c:2273
 msgid "Logging"
 msgstr "Logging"
 
-#: src/gtkprefs.c:2491
+#: src/gtkprefs.c:2274
 msgid "Sounds"
 msgstr "Lyder"
 
-#: src/gtkprefs.c:2492
+#: src/gtkprefs.c:2275
 msgid "Sound Events"
 msgstr "Lydhendelser"
 
-#: src/gtkprefs.c:2493
+#: src/gtkprefs.c:2276
 msgid "Away / Idle"
 msgstr "Borte / inaktiv"
 
-#: src/gtkprefs.c:2494
+#: src/gtkprefs.c:2277
 msgid "Away Messages"
 msgstr "Fraværsbeskjeder"
 
-#: src/gtkprefs.c:2496
-#, fuzzy
-msgid "Protocols"
-msgstr "Protokoll"
-
-#: src/gtkprefs.c:2512
+#: src/gtkprefs.c:2280
 msgid "Plugins"
 msgstr "Tillegg"
 
-#: src/gtkprivacy.c:77
+#: src/gtkprivacy.c:86
 msgid "Allow all users to contact me"
 msgstr "Tillat alle brukere å kontakte meg"
 
-#: src/gtkprivacy.c:78
+#: src/gtkprivacy.c:87
 msgid "Allow only the users on my buddy list"
 msgstr "Tillat bare brukere fra kontaktlisten min"
 
-#: src/gtkprivacy.c:79
+#: src/gtkprivacy.c:88
 msgid "Allow only the users below"
 msgstr "Tillat bare brukerne vist nedenfor"
 
-#: src/gtkprivacy.c:80
+#: src/gtkprivacy.c:89
 msgid "Block all users"
 msgstr "Blokker alle brukere"
 
-#: src/gtkprivacy.c:81
-#, fuzzy
-msgid "Block only the users below"
+#: src/gtkprivacy.c:90
+msgid "Block the users below"
 msgstr "Blokker brukerne vist nedenfor"
 
-#: src/gtkprivacy.c:360 src/protocols/jabber/jabber.c:1406
+#: src/gtkprivacy.c:368
 msgid "Privacy"
 msgstr "Sikkerhet"
 
-#: src/gtkprivacy.c:375
+#: src/gtkprivacy.c:383
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Endringer i sikkerhetsinnstillingene skjer umiddelbart."
 
 #. "Set privacy for:" label
-#: src/gtkprivacy.c:387
+#: src/gtkprivacy.c:395
 msgid "Set privacy for:"
 msgstr "Sett sikkerhet for:"
 
-#: src/gtkprivacy.c:555 src/gtkprivacy.c:571
+#: src/gtkprivacy.c:562 src/gtkprivacy.c:578
 msgid "Permit User"
 msgstr "Tillat bruker"
 
-#: src/gtkprivacy.c:556
+#: src/gtkprivacy.c:563
 msgid "Type a user you permit to contact you."
 msgstr "Skriv brukernavnet til den som får kontakte deg."
 
-#: src/gtkprivacy.c:557
+#: src/gtkprivacy.c:564
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr ""
 "Vennligst skriv inn navnet på brukeren som du vil skal kunne kontakte deg."
 
-#: src/gtkprivacy.c:560 src/gtkprivacy.c:573
+#: src/gtkprivacy.c:567 src/gtkprivacy.c:580
 msgid "Permit"
 msgstr "Tillat"
 
-#: src/gtkprivacy.c:565
+#: src/gtkprivacy.c:572
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Tillate %s å kontakte deg?"
 
-#: src/gtkprivacy.c:567
+#: src/gtkprivacy.c:574
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Er du sikker på at du vil at %s skal kunne kontakte deg?"
 
-#: src/gtkprivacy.c:594 src/gtkprivacy.c:607
+#: src/gtkprivacy.c:601 src/gtkprivacy.c:614
 msgid "Block User"
 msgstr "Blokker bruker"
 
-#: src/gtkprivacy.c:595
+#: src/gtkprivacy.c:602
 msgid "Type a user to block."
 msgstr "Skriv inn brukernavnet på den som skal blokkeres."
 
-#: src/gtkprivacy.c:596
+#: src/gtkprivacy.c:603
 msgid "Please enter the name of the user you wish to block."
 msgstr "Vennligst skriv inn navnet på brukeren som du vil blokkere."
 
-#: src/gtkprivacy.c:603
+#: src/gtkprivacy.c:610
 #, c-format
 msgid "Block %s?"
 msgstr "Blokkere %s?"
 
-#: src/gtkprivacy.c:605
+#: src/gtkprivacy.c:612
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Er du sikker på at du vil blokkere %s?"
@@ -4252,86 +3939,64 @@
 #. *
 #. * 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:200 src/protocols/gg/gg.c:660 src/request.h:843
 msgid "Yes"
 msgstr "Ja"
 
-#: src/gtkrequest.c:224 src/protocols/gg/gg.c:663 src/request.h:1228
+#: src/gtkrequest.c:201 src/protocols/gg/gg.c:660 src/request.h:843
 msgid "No"
 msgstr "Nei"
 
-#: src/gtkrequest.c:227
+#: src/gtkrequest.c:204
 msgid "Apply"
 msgstr "Bruk"
 
-#: src/gtkrequest.c:228 src/protocols/msn/msn.c:248
-msgid "Close"
-msgstr "L_ukk"
-
-#: src/gtkroomlist.c:322
-#, fuzzy
-msgid ""
-"You are not currently signed on with any protocols that have the ability to "
-"list rooms."
-msgstr "Du er ikke pålogget med noen protokoller som støtter samtalegrupper."
-
-#: src/gtkroomlist.c:335
-#, fuzzy
-msgid "Room List"
-msgstr "Ikke på listen"
-
-#. list button
-#: src/gtkroomlist.c:410
-#, fuzzy
-msgid "_Get List"
-msgstr "Samtaleliste"
-
-#: src/gtksound.c:62
+#: src/gtksound.c:61
 msgid "Buddy logs in"
 msgstr "Kontakt logger inn"
 
-#: src/gtksound.c:63
+#: src/gtksound.c:62
 msgid "Buddy logs out"
 msgstr "Kontakt logger ut"
 
-#: src/gtksound.c:64
+#: src/gtksound.c:63
 msgid "Message received"
 msgstr "Beskjed mottatt"
 
+#: src/gtksound.c:64
+msgid "Message received begins conversation"
+msgstr "Beskjed mottas og samtale starter"
+
 #: src/gtksound.c:65
-msgid "Message received begins conversation"
-msgstr "Beskjed mottas og samtale starter"
+msgid "Message sent"
+msgstr "Beskjed sendt"
 
 #: src/gtksound.c:66
-msgid "Message sent"
-msgstr "Beskjed sendt"
-
-#: src/gtksound.c:67
 msgid "Person enters chat"
 msgstr "Person blir med i samtalen"
 
-#: src/gtksound.c:68
+#: src/gtksound.c:67
 msgid "Person leaves chat"
 msgstr "Person forlater samtalen"
 
-#: src/gtksound.c:69
+#: src/gtksound.c:68
 msgid "You talk in chat"
 msgstr "Du snakker i samtalen"
 
-#: src/gtksound.c:70
+#: src/gtksound.c:69
 msgid "Others talk in chat"
 msgstr "Andre snakker i samtalen"
 
-#: src/gtksound.c:73
+#: src/gtksound.c:72
 msgid "Someone says your name in chat"
 msgstr "Noen sier navnet ditt i en samtale"
 
-#: src/gtksound.c:157
+#: src/gtksound.c:156
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
 msgstr "Kunne ikke spille av lyd fordi lydfilen (%s) ikke eksisterer."
 
-#: 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."
@@ -4339,7 +4004,7 @@
 "Kunne ikke spille av lyd fordi du har valgt at et eksternt program skal "
 "spille av lyd, men ikke spesifisert navnet på programmet."
 
-#: src/gtksound.c:185
+#: src/gtksound.c:184
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
@@ -4348,85 +4013,53 @@
 "Kunne ikke spille av lyd fordi det konfigurerte avspillingsprogrammet ikke "
 "kunne startes: %s"
 
-#: src/gtkutils.c:297
+#: src/gtkutils.c:288
 msgid "Can't save icon file to disk."
 msgstr "Kan ikke lagre ikonfil."
 
-#: src/gtkutils.c:332
-#, fuzzy
-msgid "Save Icon"
-msgstr "Lagre ikon som..."
-
-#: src/log.c:88
+#: src/gtkutils.c:323
+msgid "Gaim - Save Icon"
+msgstr "Gaim - Lagre ikon"
+
+#: src/log.c:79
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">Loggeren har ingen lesefunksjon</font></b>"
 
-#: src/log.c:433
+#: src/log.c:369
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:514
-#, c-format
-msgid ""
-"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
-"REPLY&gt;:</b></font> %s<br/>\n"
-msgstr ""
-
-#: src/log.c:516
-#, c-format
-msgid ""
-"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
-"REPLY&gt;:</b></font> %s<br/>\n"
-msgstr ""
-
-#: src/log.c:560 src/log.c:696
-#, fuzzy
-msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
-msgstr "<font color=\"red\"><b>Kunne ikke lese fil: %s</b></font>"
-
-#: src/log.c:570 src/log.c:706
+#: src/log.c:461 src/log.c:570
+msgid "<font color=\"red\"><b>log->logger_data was NULL!</b></font>"
+msgstr "<font color=\"red\"><b>log->logger_data var NULL!</b></font>"
+
+#: src/log.c:471 src/log.c:580
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>Kunne ikke lese fil: %s</b></font>"
 
-#: src/log.c:574
+#: src/log.c:475
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:649
-#, c-format
-msgid "(%s) %s <AUTO-REPLY>: %s\n"
-msgstr ""
-
-#: src/log.c:710
+#: src/log.c:584
 msgid "Plain text"
 msgstr "Ren tekst"
 
-#: src/main.c:157
-#, fuzzy
-msgid "Please create an account."
+#: src/main.c:148
+msgid "Please enter your login."
 msgstr "Skriv inn innloggingsnavn."
 
-#: src/main.c:239
+#: src/main.c:231
+msgid "<New User>"
+msgstr "<Ny bruker>"
+
+#: src/main.c:273
 msgid "Login"
 msgstr "Innlogging"
 
-#: src/main.c:257
-#, fuzzy
-msgid "<b>Screen Name:</b>"
-msgstr "Skjermnavn:"
-
-#: src/main.c:271
-#, fuzzy
-msgid "<b>Password:</b>"
-msgstr "Passord:"
-
-#: src/main.c:300
-msgid "Sign on"
-msgstr "Pålogging"
-
 #. full help text
-#: src/main.c:524
+#: src/main.c:550
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -4461,12 +4094,12 @@
 "  -h, --help          vis denne hjelpeteksten og avslutt\n"
 
 #. short message
-#: src/main.c:539
+#: src/main.c:565
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s. Prøv '%s -h' for mer informasjon.\n"
 
-#: src/plugin.c:269
+#: src/plugin.c:260
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
@@ -4475,24 +4108,24 @@
 "Det nødvendige tillegget %s ble ikke funnet. Installer dette tillegget og "
 "prøv igjen."
 
-#: src/plugin.c:274 src/plugin.c:302
+#: src/plugin.c:265 src/plugin.c:293
 msgid "Gaim was unable to load your plugin."
 msgstr "Gaim klarte ikke å laste tillegget."
 
-#: src/plugin.c:298
+#: src/plugin.c:289
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "Det nødvendige tillegget %s kunne ikke lastes."
 
-#: src/prefs.c:113 src/status.c:271
+#: src/prefs.c:111 src/status.c:270
 msgid "Slightly less boring default"
 msgstr "kjedelig standardsvar"
 
-#: 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:2304
+#: src/protocols/yahoo/yahoo.c:2405
 msgid "Available"
 msgstr "Tilgjengelig"
 
@@ -4504,12 +4137,11 @@
 msgid "Away for friends only"
 msgstr "Borte bare for venner"
 
-#: 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:931
+#: src/protocols/jabber/presence.c:91 src/protocols/oscar/oscar.c:2848
+#: src/protocols/oscar/oscar.c:4574 src/protocols/oscar/oscar.c:4601
+#: src/protocols/oscar/oscar.c:6138 src/protocols/yahoo/yahoo.c:2026
+#: src/protocols/yahoo/yahoo.c:2324 src/protocols/yahoo/yahoo.c:2415
 msgid "Invisible"
 msgstr "Usynlig"
 
@@ -4529,10 +4161,7 @@
 msgid "Unable to connect to server."
 msgstr "Kan ikke koble til tjener."
 
-#: 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
 msgid "Invalid response from server."
 msgstr "Ugyldig svar fra tjener."
 
@@ -4566,160 +4195,151 @@
 msgstr "Kunne ikke lese socket"
 
 #. 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/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/gg/gg.c:399 src/protocols/icq/gaim_icq.c:344
+#: src/protocols/toc/toc.c:200
 msgid "Unable to connect."
 msgstr "Kunne ikke koble til."
 
-#: src/protocols/gg/gg.c:418
+#: src/protocols/gg/gg.c:415
 msgid "Reading data"
 msgstr "Leser data"
 
+#: src/protocols/gg/gg.c:418
+msgid "Balancer handshake"
+msgstr "Finner ledig tjener"
+
 #: src/protocols/gg/gg.c:421
-msgid "Balancer handshake"
-msgstr "Finner ledig tjener"
-
-#: src/protocols/gg/gg.c:424
 msgid "Reading server key"
 msgstr "Leser tjenernøkkel"
 
-#: src/protocols/gg/gg.c:427
+#: src/protocols/gg/gg.c:424
 msgid "Exchanging key hash"
 msgstr "Utveksler nøkkel-hash"
 
-#: src/protocols/gg/gg.c:437
+#: src/protocols/gg/gg.c:434
 msgid "Critical error in GG library\n"
 msgstr "Kritisk feil i GG-biblioteket\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 "Tilkobling til %s feilet"
 
-#: src/protocols/gg/gg.c:503
+#: src/protocols/gg/gg.c:500
 msgid "Unable to ping server"
 msgstr "Kunne ikke pinge tjener"
 
-#: src/protocols/gg/gg.c:515
+#: src/protocols/gg/gg.c:512
 msgid "Send as message"
 msgstr "Send som beskjed"
 
+#: src/protocols/gg/gg.c:517
+msgid "Looking up GG server"
+msgstr "Søker etter GG-tjener"
+
 #: src/protocols/gg/gg.c:520
-msgid "Looking up GG server"
-msgstr "Søker etter GG-tjener"
-
-#: src/protocols/gg/gg.c:523
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "Ugyldig Gadu-Gadu UIN oppgitt"
 
-#: 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 prøver å sende en beskjed til et ugyldig Gadu-Gadu UIN."
 
-#: src/protocols/gg/gg.c:632
+#: src/protocols/gg/gg.c:629
 msgid "Couldn't get search results"
 msgstr "Kunne ikke laste ned søkeresultater"
 
-#: src/protocols/gg/gg.c:637
+#: src/protocols/gg/gg.c:634
 msgid "Gadu-Gadu Search Engine"
 msgstr "Gadu-Gadu søkemotor"
 
-#: 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:3952
 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
-msgid "First Name"
+#: src/protocols/gg/gg.c:668
+msgid "First name"
 msgstr "Fornavn"
 
 #. 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:608
+#: src/protocols/oscar/oscar.c:3960 src/protocols/trepia/trepia.c:274
 msgid "Last Name"
 msgstr "Etternavn"
 
-#: 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:1389
+#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:3954
 msgid "Nick"
 msgstr "Kallenavn"
 
-#: 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ødselså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 "Kjønn"
 
 #. 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:618
+#: src/protocols/oscar/oscar.c:4006 src/protocols/oscar/oscar.c:4022
 #: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:430
 msgid "City"
 msgstr "By"
 
 #. 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:1266
+#: src/protocols/msn/msn.c:1508 src/protocols/napster/napster.c:387
+#: src/protocols/oscar/oscar.c:2890 src/protocols/oscar/oscar.c:3195
+#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2581
+#: src/protocols/yahoo/yahoo.c:2603 src/protocols/yahoo/yahoo.c:2623
+#: src/protocols/yahoo/yahoo.c:2810 src/protocols/zephyr/zephyr.c:355
 msgid "Buddy Information"
 msgstr "Kontaktinformasjon"
 
-#: 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 er ingen kontaktliste på Gadu-Gadu-tjeneren."
 
-#: src/protocols/gg/gg.c:752
+#: src/protocols/gg/gg.c:749
 msgid "Couldn't Import Buddy List from Server"
 msgstr "Kunne ikke importere kontaktliste fra tjeneren"
 
-#: src/protocols/gg/gg.c:815
+#: src/protocols/gg/gg.c:812
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "Kontaktlisten ble overført til Gadu-Gadu-tjeneren"
 
-#: src/protocols/gg/gg.c:823
+#: src/protocols/gg/gg.c:820
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "Kunne ikke overføre kontaktlisten til Gadu-Gadu-tjeneren"
 
-#: src/protocols/gg/gg.c:831
+#: src/protocols/gg/gg.c:828
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "Kontaktlisten ble slettet fra Gadu-Gadu-tjeneren"
 
-#: src/protocols/gg/gg.c:839
+#: src/protocols/gg/gg.c:836
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "Kunne ikke slette kontaktlisten fra Gadu-Gadu-tjeneren"
 
-#: src/protocols/gg/gg.c:847
+#: src/protocols/gg/gg.c:844
 msgid "Password changed successfully"
 msgstr "Passordet er endret"
 
-#: src/protocols/gg/gg.c:854
+#: src/protocols/gg/gg.c:851
 msgid "Password couldn't be changed"
 msgstr "Passordet kunne ikke endres"
 
-#: src/protocols/gg/gg.c:971
+#: src/protocols/gg/gg.c:968
 msgid "Error communicating with Gadu-Gadu server"
 msgstr "Feil i kommunikasjonen med Gadu-Gadu-tjeneren"
 
-#: 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."
@@ -4727,11 +4347,11 @@
 "Gaim kunne ikke fullføre oppgaven på grunn av kommunikasjonsproblemer med "
 "Gadu-Gadu-HTTP-tjeneren. Vennligst forsøk igjen senere."
 
-#: src/protocols/gg/gg.c:1000
+#: src/protocols/gg/gg.c:997
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr "Kunne ikke importere Gadu-Gadu-kontaktliste"
 
-#: 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."
@@ -4739,26 +4359,26 @@
 "Gaim kunne ikke koble til kontaktliste-tjeneren for Gadu-Gadu. Vennligst "
 "forsøk igjen senere."
 
-#: src/protocols/gg/gg.c:1074
+#: src/protocols/gg/gg.c:1071
 msgid "Couldn't export buddy list"
 msgstr "Kunne ikke eksportere kontaktliste"
 
-#: 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 kunne ikke koble til kontaktliste-tjeneren. Vennligst forsøk igjen "
 "senere."
 
-#: src/protocols/gg/gg.c:1097
+#: src/protocols/gg/gg.c:1094
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr "Kunne ikke slette kontaktliste for Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1146
+#: src/protocols/gg/gg.c:1143
 msgid "Unable to access directory"
 msgstr "Fikk ikke tilgang til 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."
@@ -4766,11 +4386,11 @@
 "Gaim kunne ikke søke i katalogen fordi den ikke fikk kontakt med "
 "katalogtjeneren. Vennligst prøv igjen senere."
 
-#: src/protocols/gg/gg.c:1180
+#: src/protocols/gg/gg.c:1177
 msgid "Unable to change Gadu-Gadu password"
 msgstr "Kunne ikke bytte Gadu-Gadu-passord"
 
-#: 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."
@@ -4778,32 +4398,32 @@
 "Gaim fikk ikke kontakt med Gadu-Gadu-tjeneren og kunne ikke endre passordet "
 "ditt. Vennligst forsøk igjen senere."
 
-#: src/protocols/gg/gg.c:1198
+#: src/protocols/gg/gg.c:1195
 msgid "Directory Search"
 msgstr "Katalogsøk"
 
-#: src/protocols/gg/gg.c:1207 src/protocols/jabber/jabber.c:1063
-#: src/protocols/toc/toc.c:1546
+#: src/protocols/gg/gg.c:1204 src/protocols/jabber/jabber.c:1043
+#: src/protocols/oscar/oscar.c:6493 src/protocols/toc/toc.c:1546
 msgid "Change Password"
 msgstr "Bytt passord"
 
-#: src/protocols/gg/gg.c:1215
+#: src/protocols/gg/gg.c:1212
 msgid "Import Buddy List from Server"
 msgstr "Importer kontaktliste fra tjener"
 
-#: src/protocols/gg/gg.c:1221
+#: src/protocols/gg/gg.c:1218
 msgid "Export Buddy List to Server"
 msgstr "Eksporter kontaktliste til tjener"
 
-#: src/protocols/gg/gg.c:1227
+#: src/protocols/gg/gg.c:1224
 msgid "Delete Buddy List from Server"
 msgstr "Slett kontaktliste fra tjener"
 
-#: src/protocols/gg/gg.c:1260
+#: src/protocols/gg/gg.c:1257
 msgid "Unable to access user profile."
 msgstr "Fikk ikke tilgang til brukerprofilen."
 
-#: 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."
@@ -4821,8 +4441,7 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/gg/gg.c:1373 src/protocols/gg/gg.c:1375
+#: src/protocols/gg/gg.c:1370 src/protocols/gg/gg.c:1372
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu protokolltillegg"
 
@@ -4835,17 +4454,17 @@
 msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
 msgstr "Brukeren %s (%s%s%s%s%s) ønsker å bli godkjent av deg."
 
-#: 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:184
+#: src/protocols/msn/notification.c:948 src/protocols/msn/notification.c:1269
+#: src/protocols/msn/notification.c:1435 src/protocols/oscar/oscar.c:2620
+#: src/protocols/oscar/oscar.c:5132
 msgid "Authorize"
 msgstr "Godkjenn"
 
-#: 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:185
+#: src/protocols/msn/notification.c:949 src/protocols/msn/notification.c:1271
+#: src/protocols/msn/notification.c:1437 src/protocols/oscar/oscar.c:2622
+#: src/protocols/oscar/oscar.c:5133
 msgid "Deny"
 msgstr "Nekt"
 
@@ -4888,89 +4507,53 @@
 "<B>Støttede IRC-kommandoer:</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
 #, c-format
 msgid "current topic is: %s"
 msgstr "gjeldende tema er: %s"
 
-#: src/protocols/irc/cmds.c:468 src/protocols/jabber/chat.c:529
+#: src/protocols/irc/cmds.c:461
 msgid "No topic is set"
 msgstr "Intet tema for kanalen"
 
-#: 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 "Filoverføring avbrutt"
-
-#: src/protocols/irc/dcc_send.c:273
-msgid "Gaim could not open a listening port."
-msgstr ""
-
-#: src/protocols/irc/irc.c:73
+#: src/protocols/irc/irc.c:64
 msgid "Error displaying MOTD"
 msgstr "Feil under visning av MOTD"
 
-#: src/protocols/irc/irc.c:73
+#: src/protocols/irc/irc.c:64
 msgid "No MOTD available"
 msgstr "MOTD er ikke tilgjengelig"
 
-#: src/protocols/irc/irc.c:74
+#: src/protocols/irc/irc.c:65
 msgid "There is no MOTD associated with this connection."
 msgstr "Det er ingen MOTD assosiert med denne tilkoblingen."
 
-#: src/protocols/irc/irc.c:77
+#: src/protocols/irc/irc.c:68
 #, c-format
 msgid "MOTD for %s"
 msgstr "MOTD for %s"
 
-#: src/protocols/irc/irc.c:140
+#: src/protocols/irc/irc.c:137
 msgid "View MOTD"
 msgstr "Vis 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 "Send fil"
-
-#: src/protocols/irc/irc.c:168
-#, fuzzy
-msgid "_Channel:"
+#: src/protocols/irc/irc.c:156
+msgid "Channel:"
 msgstr "Kanal:"
 
-#: src/protocols/irc/irc.c:173 src/protocols/jabber/chat.c:59
-#, fuzzy
-msgid "_Password:"
-msgstr "Passord"
-
-#: src/protocols/irc/irc.c:192
+#: src/protocols/irc/irc.c:180
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC-kallenavn kan ikke inneholde mellomrom"
 
-#: src/protocols/irc/irc.c:211 src/protocols/toc/toc.c:228
+#: src/protocols/irc/irc.c:199 src/protocols/toc/toc.c:228
 #, c-format
 msgid "Signon: %s"
 msgstr "Pålogget: %s"
 
-#: src/protocols/irc/irc.c:220
+#: src/protocols/irc/irc.c:208
 msgid "Couldn't create socket"
 msgstr "Kunne ikke opprette socket"
 
-#: src/protocols/irc/irc.c:369 src/protocols/trepia/trepia.c:977
-msgid "Read error"
-msgstr "Lesefeil"
-
-#: src/protocols/irc/irc.c:503 src/protocols/yahoo/yahoochat.c:1343
-#, fuzzy
-msgid "Users"
-msgstr "Bruker"
-
-#: src/protocols/irc/irc.c:506 src/protocols/yahoo/yahoochat.c:1352
-#, fuzzy
-msgid "Topic"
-msgstr "Tema:"
-
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -4980,32 +4563,26 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:611
+#: src/protocols/irc/irc.c:532
 msgid "IRC Protocol Plugin"
 msgstr "IRC-protokolltillegg"
 
 #. *  summary
-#: src/protocols/irc/irc.c:612
+#: src/protocols/irc/irc.c:533
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "IRC-protokolltillegg"
 
-#: 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:550 src/protocols/irc/msgs.c:197
+#: src/protocols/jabber/jabber.c:1142 src/protocols/napster/napster.c:637
 msgid "Server"
 msgstr "Tjener"
 
-#: 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
-msgid "Port"
-msgstr "Port"
-
-#: src/protocols/irc/irc.c:635
+#: src/protocols/irc/irc.c:556
 msgid "Encoding"
 msgstr "Tegnkoding:"
 
-#: src/protocols/irc/irc.c:638 src/protocols/irc/msgs.c:191
-#: src/protocols/jabber/jabber.c:580
+#: src/protocols/irc/irc.c:559 src/protocols/irc/msgs.c:191
+#: src/protocols/jabber/jabber.c:578
 msgid "Username"
 msgstr "Bruker"
 
@@ -5030,7 +4607,7 @@
 msgid " <i>(identified)</i>"
 msgstr " <i>(registrert)</i>"
 
-#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:2990
+#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:2681
 msgid "Realname"
 msgstr "Virkelig navn"
 
@@ -5056,112 +4633,107 @@
 msgid "Buddy Information for %s"
 msgstr "Kontaktinformasjon for %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 endret kanaltema til: %s"
 
-#: src/protocols/irc/msgs.c:282
+#: src/protocols/irc/msgs.c:252
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "Kanaltema for %s er %s"
 
-#: src/protocols/irc/msgs.c:296
+#: src/protocols/irc/msgs.c:266
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Ukjent beskjed '%s'"
 
-#: src/protocols/irc/msgs.c:297
+#: src/protocols/irc/msgs.c:267
 msgid "Unknown message"
 msgstr "Ukjent beskjed"
 
-#: 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 sendt en beskjed som IRC-tjeneren ikke forstod."
 
-#: src/protocols/irc/msgs.c:400
-#, fuzzy
-msgid "No such channel"
-msgstr "kanalen eksisterer ikke"
-
 #. does this happen?
-#: src/protocols/irc/msgs.c:411
+#: src/protocols/irc/msgs.c:371
 msgid "no such channel"
 msgstr "kanalen eksisterer ikke"
 
-#: src/protocols/irc/msgs.c:414
+#: src/protocols/irc/msgs.c:374
 msgid "User is not logged in"
 msgstr "Brukeren er ikke pålogget"
 
-#: src/protocols/irc/msgs.c:419
+#: src/protocols/irc/msgs.c:379
 msgid "No such nick or channel"
 msgstr "Dette kallenavnet/kanalnavnet finnes ikke"
 
-#: src/protocols/irc/msgs.c:439
+#: src/protocols/irc/msgs.c:399
 msgid "Could not send"
 msgstr "Kunne ikke sende"
 
-#: src/protocols/irc/msgs.c:495
+#: src/protocols/irc/msgs.c:455
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Kanalen %s krever at du er invitert først."
 
-#: src/protocols/irc/msgs.c:496
+#: src/protocols/irc/msgs.c:456
 msgid "Invitation only"
 msgstr "Bare inviterte"
 
-#: src/protocols/irc/msgs.c:592
+#: src/protocols/irc/msgs.c:552
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Du har blitt sparket ut fra %s: %s"
 
-#: src/protocols/irc/msgs.c:597
+#: src/protocols/irc/msgs.c:560
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Sparket av %s: %s"
 
-#: src/protocols/irc/msgs.c:618
+#: src/protocols/irc/msgs.c:581
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "mode (%s %s) av %s"
 
-#: src/protocols/irc/msgs.c:697
+#: src/protocols/irc/msgs.c:660
 msgid "Could not change nick"
 msgstr "Kunne ikke endre kallenavn"
 
-#: src/protocols/irc/msgs.c:698
+#: src/protocols/irc/msgs.c:661
 msgid "Cannot change nick"
 msgstr "Kan ikke endre kallenavn"
 
-#: src/protocols/irc/msgs.c:719
+#: src/protocols/irc/msgs.c:682
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Du har forlatt kanalen%s%s"
 
-#: src/protocols/irc/msgs.c:759
+#: src/protocols/irc/msgs.c:720
 msgid "Error: invalid PONG from server"
 msgstr "Feil: ugyldig PONG fra tjener"
 
-#: src/protocols/irc/msgs.c:761
+#: src/protocols/irc/msgs.c:722
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING-svar -- lag: %lu sekunder"
 
-#: src/protocols/irc/msgs.c:836
+#: src/protocols/irc/msgs.c:792
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Kan ikke bli med i %s:"
 
-#: src/protocols/irc/msgs.c:837
+#: src/protocols/irc/msgs.c:793
 msgid "Cannot join channel"
 msgstr "Kan ikke bli med i kanal"
 
-#: src/protocols/irc/msgs.c:867
+#: src/protocols/irc/msgs.c:823
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops fra %s"
 
-#: src/protocols/irc/parse.c:166
+#: src/protocols/irc/parse.c:160
 msgid ""
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
@@ -5169,137 +4741,158 @@
 "(Det oppstod en feil under konverteringen av denne beskjeden. Sjekk "
 "'encoding'-innstillingen i kontooppsettet)"
 
-#: src/protocols/irc/parse.c:297
+#: src/protocols/irc/parse.c:291
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Svartid fra %s: %lu sekunder"
 
-#: src/protocols/irc/parse.c:298
+#: src/protocols/irc/parse.c:292
 msgid "PONG"
 msgstr "PONG"
 
-#: src/protocols/irc/parse.c:298
+#: src/protocols/irc/parse.c:292
 msgid "CTCP PING reply"
 msgstr "CTCP PING-svar"
 
-#: src/protocols/irc/parse.c:400 src/protocols/oscar/oscar.c:581
-#: 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 "Frakoblet."
+#: src/protocols/irc/parse.c:391
+msgid "Disconnected"
+msgstr "Frakoblet"
 
 #: src/protocols/jabber/auth.c:51
 msgid "Server requires SSL for login"
 msgstr "Tjeneren krever SSL for å logge inn"
 
-#: 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 "Yahoo!-autentisering feilet"
-
-#: 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:59 src/protocols/jabber/auth.c:276
+#: src/protocols/jabber/auth.c:375 src/protocols/jabber/auth.c:387
+msgid "Invalid response from server"
+msgstr "Ugyldig svar fra tjener"
+
+#: src/protocols/jabber/auth.c:86 src/protocols/jabber/auth.c:139
 msgid "Server does not use any supported authentication method"
 msgstr "Tjeneren bruker ikke noen av de støttede autentiseringsmetodene"
 
-#: src/protocols/jabber/auth.c:375
+#: src/protocols/jabber/auth.c:296
 msgid "Invalid challenge from server"
 msgstr "Ugyldig utfordring fra tjener."
 
-#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:603
+#: src/protocols/jabber/auth.c:390
+msgid "Bad Protocol"
+msgstr "Ugyldig protokoll"
+
+#: src/protocols/jabber/auth.c:393
+msgid "Encryption Required"
+msgstr "Kryptering kreves"
+
+#: src/protocols/jabber/auth.c:396
+msgid "Invalid authzid"
+msgstr "Ugyldig authzid"
+
+#: src/protocols/jabber/auth.c:399
+msgid "Invalid Mechanism"
+msgstr "Ugyldig mekanisme"
+
+#: src/protocols/jabber/auth.c:401
+msgid "Invalid Realm"
+msgstr "Ugyldig område"
+
+#: src/protocols/jabber/auth.c:404
+msgid "Mechanism Too Weak"
+msgstr "Mekanismen er ikke sterk nok"
+
+#: src/protocols/jabber/auth.c:407 src/protocols/jabber/jabber.c:158
+#: src/protocols/jabber/jabber.c:866 src/protocols/jabber/jabber.c:916
+#: src/protocols/oscar/oscar.c:5540
+msgid "Not Authorized"
+msgstr "Ikke godkjent"
+
+#: src/protocols/jabber/auth.c:410
+msgid "Temporary Authentication Failure"
+msgstr "Midlertidig autentiseringsfeil"
+
+#: src/protocols/jabber/auth.c:412
+msgid "Authentication Failure"
+msgstr "Autentiseringsfeil"
+
+#: src/protocols/jabber/buddy.c:245 src/protocols/jabber/buddy.c:597
 msgid "Full Name"
 msgstr "Fullt navn"
 
-#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:616
+#: src/protocols/jabber/buddy.c:246 src/protocols/jabber/buddy.c:610
 msgid "Family Name"
 msgstr "Etternavn"
 
-#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:620
+#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:614
 msgid "Given Name"
 msgstr "Fornavn"
 
-#: 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:625
+#: src/protocols/jabber/jabber.c:598 src/protocols/yahoo/yahoo.c:2675
 msgid "Nickname"
 msgstr "Kallenavn"
 
-#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/jabber.c:640
-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:653
 msgid "Street Address"
 msgstr "Gateadresse"
 
-#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:659
+#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:649
 msgid "Extended Address"
 msgstr "Ekstra adresse"
 
-#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:667
+#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:657
 msgid "Locality"
 msgstr "Sted"
 
-#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:671
+#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:661
 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:665
+#: src/protocols/jabber/jabber.c:628
 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:670
 #: 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:698
+#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:681
+#: src/protocols/jabber/buddy.c:688
 msgid "Telephone"
 msgstr "Telefonnummer"
 
-#: 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:699
+#: src/protocols/jabber/buddy.c:707 src/protocols/yahoo/yahoo.c:2669
 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:722
 msgid "Organization Name"
 msgstr "Organisasjonsnavn"
 
-#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:736
+#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:726
 msgid "Organization Unit"
 msgstr "Organisasjonsenhet"
 
-#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:742
+#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:732
 msgid "Title"
 msgstr "Tittel"
 
-#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:745
+#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:735
 msgid "Role"
 msgstr "Rolle"
 
-#: 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:628
+#: src/protocols/oscar/oscar.c:3986
 msgid "Birthday"
 msgstr "Fødselsdag"
 
-#: 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 "Rediger vCard for Jabber"
 
-#: 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."
@@ -5307,587 +4900,372 @@
 "Alle feltene nedenfor er valgfrie. Du trenger bare å skrive den "
 "informasjonen du ønsker"
 
-#: src/protocols/jabber/buddy.c:552
+#: src/protocols/jabber/buddy.c:546
 msgid "Jabber ID"
 msgstr "Jabber-feil"
 
-#: 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:556 src/protocols/jabber/buddy.c:563
+#: src/protocols/jabber/buddy.c:574 src/protocols/jabber/jabber.c:903
+#: src/protocols/jabber/jabber.c:916
 msgid "Status"
 msgstr "Status"
 
-#: src/protocols/jabber/buddy.c:578 src/protocols/jabber/jabber.c:1372
+#: src/protocols/jabber/buddy.c:572 src/protocols/jabber/jabber.c:1145
 msgid "Resource"
 msgstr "Ressurs"
 
-#: src/protocols/jabber/buddy.c:624
+#: src/protocols/jabber/buddy.c:618
 msgid "Middle Name"
 msgstr "Mellomnavn"
 
-#: 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:633 src/protocols/jabber/jabber.c:613
+#: src/protocols/oscar/oscar.c:4003 src/protocols/oscar/oscar.c:4019
 msgid "Address"
 msgstr "Adresse"
 
-#: src/protocols/jabber/buddy.c:655
+#: src/protocols/jabber/buddy.c:645
 msgid "P.O. Box"
 msgstr "Postboks"
 
-#: src/protocols/jabber/buddy.c:761
+#: src/protocols/jabber/buddy.c:751
 msgid "Photo"
 msgstr "Bilde"
 
-#: src/protocols/jabber/buddy.c:761
+#: src/protocols/jabber/buddy.c:751
 msgid "Logo"
 msgstr "Logo"
 
-#: src/protocols/jabber/buddy.c:777
+#: src/protocols/jabber/buddy.c:765
 msgid "Jabber Profile"
 msgstr "Jabber-profil"
 
-#: src/protocols/jabber/buddy.c:893
+#: src/protocols/jabber/buddy.c:904
 msgid "Un-hide From"
 msgstr "Fjern fraværsmarkering for"
 
-#: src/protocols/jabber/buddy.c:896
+#: src/protocols/jabber/buddy.c:907
 msgid "Temporarily Hide From"
 msgstr "Midlertidig borte for"
 
-#: src/protocols/jabber/buddy.c:905
+#: src/protocols/jabber/buddy.c:915
 msgid "Cancel Presence Notification"
 msgstr "Avbryt varsling av tilstedeværelse"
 
-#: src/protocols/jabber/buddy.c:913
+#: src/protocols/jabber/buddy.c:923
 msgid "(Re-)Request authorization"
 msgstr "Spør på nytt om godkjenning"
 
-#: src/protocols/jabber/buddy.c:919
+#: src/protocols/jabber/buddy.c:929
 msgid "Unsubscribe"
 msgstr "Fjern abonnement"
 
-#: src/protocols/jabber/chat.c:42 src/protocols/yahoo/yahoochat.c:965
-#, fuzzy
-msgid "_Room:"
+#: src/protocols/jabber/chat.c:37 src/protocols/yahoo/yahoochat.c:870
+msgid "Room:"
 msgstr "Rom:"
 
-#: src/protocols/jabber/chat.c:47
-#, fuzzy
-msgid "_Server:"
+#: src/protocols/jabber/chat.c:44
+msgid "Server:"
 msgstr "Tjener:"
 
-#: src/protocols/jabber/chat.c:53
-#, fuzzy
-msgid "_Handle:"
+#: src/protocols/jabber/chat.c:50
+msgid "Handle:"
 msgstr "Navn:"
 
-#: src/protocols/jabber/chat.c:164
+#: src/protocols/jabber/chat.c:158
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s er ikke et gyldig romnavn"
 
-#: src/protocols/jabber/chat.c:165
+#: src/protocols/jabber/chat.c:159
 msgid "Invalid Room Name"
 msgstr "Ugyldig romnavn"
 
-#: src/protocols/jabber/chat.c:170
+#: src/protocols/jabber/chat.c:164
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s er ikke et gyldig tjenernavn"
 
-#: src/protocols/jabber/chat.c:171 src/protocols/jabber/chat.c:172
+#: src/protocols/jabber/chat.c:165 src/protocols/jabber/chat.c:166
 msgid "Invalid Server Name"
 msgstr "Ugyldig tjenernavn"
 
-#: src/protocols/jabber/chat.c:176
+#: src/protocols/jabber/chat.c:170
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s er ikke en gyldig rom-identifikator"
 
-#: src/protocols/jabber/chat.c:177 src/protocols/jabber/chat.c:178
+#: src/protocols/jabber/chat.c:171 src/protocols/jabber/chat.c:172
 msgid "Invalid Room Handle"
 msgstr "Ugyldig romidentifikator"
 
-#: src/protocols/jabber/chat.c:332
-#, fuzzy
-msgid "Configuration error"
-msgstr "Feil ved tilkobling"
-
-#: src/protocols/jabber/chat.c:341 src/protocols/jabber/chat.c:486
-#, fuzzy
-msgid "Unable to configure"
-msgstr "Kunne ikke koble til"
-
-#
-#: src/protocols/jabber/chat.c:357
-#, fuzzy
-msgid "Room Configuration Error"
-msgstr "Registreringsfeil"
-
-#: src/protocols/jabber/chat.c:358
-msgid "This room is not capable of being configured"
-msgstr ""
-
-#
-#: src/protocols/jabber/chat.c:408 src/protocols/jabber/chat.c:477
-#, fuzzy
-msgid "Registration error"
-msgstr "Registreringsfeil"
-
-#: src/protocols/jabber/chat.c:556
-msgid "Nick changing not supported in non-MUC chatrooms"
-msgstr ""
-
-#
-#: src/protocols/jabber/chat.c:599 src/protocols/jabber/chat.c:610
-#, fuzzy
-msgid "Roomlist Error"
-msgstr "Registreringsfeil"
-
-#: src/protocols/jabber/chat.c:600 src/protocols/jabber/chat.c:611
-#, fuzzy
-msgid "Error retreiving roomlist"
-msgstr "Feil ved lesing fra tjener"
-
-#: src/protocols/jabber/chat.c:651
-#, fuzzy
-msgid "Invalid Server"
-msgstr "Ugyldig tjenernavn"
-
-#: src/protocols/jabber/chat.c:688
-#, fuzzy
-msgid "Enter a Conference Server"
-msgstr "Start konferanse"
-
-#: src/protocols/jabber/chat.c:689
-msgid "Select a conference server to query"
-msgstr ""
-
-#: src/protocols/jabber/chat.c:691
-#, fuzzy
-msgid "Find Rooms"
-msgstr "Samtalerom"
-
-#: src/protocols/jabber/jabber.c:73
+#: src/protocols/jabber/jabber.c:82
 msgid "Error initializing session"
 msgstr "Feil under oppretting av sesjon"
 
-#: 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:133
+msgid "Bad Format"
+msgstr "Ugyldig format"
+
+#: src/protocols/jabber/jabber.c:135
+msgid "Bad Namespace Prefix"
+msgstr "Ugyldig navneromprefiks"
+
+#: src/protocols/jabber/jabber.c:138
+msgid "Resource Conflict"
+msgstr "Ressurskonflikt"
+
+#: src/protocols/jabber/jabber.c:140
+msgid "Connection Timeout"
+msgstr "Tilkoblingen lyktes ikke innenfor tidsgrensen"
+
+#: src/protocols/jabber/jabber.c:142
+msgid "Host Gone"
+msgstr "Maskin borte"
+
+#: src/protocols/jabber/jabber.c:144
+msgid "Host Unknown"
+msgstr "Maskin ukjent"
+
+#: src/protocols/jabber/jabber.c:146
+msgid "Improper Addressing"
+msgstr "Uriktig adressering"
+
+#: src/protocols/jabber/jabber.c:148
+msgid "Internal Server Error"
+msgstr "Intern tjenerfeil"
+
+#: src/protocols/jabber/jabber.c:150
+msgid "Invalid ID"
+msgstr "Ugyldig ID"
+
+#: src/protocols/jabber/jabber.c:152
+msgid "Invalid Namespace"
+msgstr "Ugyldig navnerom"
+
+#: src/protocols/jabber/jabber.c:154
+msgid "Invalid XML"
+msgstr "Ugyldig XML"
+
+#: src/protocols/jabber/jabber.c:156
+msgid "Non-matching Hosts"
+msgstr "Maskiner som ikke matcher"
+
+#: src/protocols/jabber/jabber.c:160
+msgid "Policy Violation"
+msgstr "Brudd på policy"
+
+#: src/protocols/jabber/jabber.c:162
+msgid "Remote Connection Failed"
+msgstr "Kunne ikke koble til"
+
+#: src/protocols/jabber/jabber.c:164
+msgid "Resource Constraint"
+msgstr "Ressursbegrensning"
+
+#: src/protocols/jabber/jabber.c:166
+msgid "Restricted XML"
+msgstr "Begrenset XML"
+
+#: src/protocols/jabber/jabber.c:168
+msgid "See Other Host"
+msgstr "Se annen maskin"
+
+#: src/protocols/jabber/jabber.c:170
+msgid "System Shutdown"
+msgstr "Systemet avslutter"
+
+#: src/protocols/jabber/jabber.c:172
+msgid "Undefined Condition"
+msgstr "Udefinert hendelse"
+
+#: src/protocols/jabber/jabber.c:174
+msgid "Unsupported Encoding"
+msgstr "Tegnkodingen er ikke støttet"
+
+#: src/protocols/jabber/jabber.c:176
+msgid "Unsupported Stanza Type"
+msgstr "Stanzatypen er ikke støttet"
+
+#: src/protocols/jabber/jabber.c:178
+msgid "Unsupported Version"
+msgstr "Denne versjonen er ikke støttet"
+
+#: src/protocols/jabber/jabber.c:180
+msgid "XML Not Well Formed"
+msgstr "XML ikke velformet"
+
+#: src/protocols/jabber/jabber.c:182
+msgid "Stream Error"
+msgstr "Feil i datastrøm"
+
+#: src/protocols/jabber/jabber.c:245 src/protocols/msn/httpmethod.c:216
+#: 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:536 src/protocols/msn/msn.c:647
+#: src/protocols/msn/msn.c:663 src/protocols/msn/msn.c:711
+#: src/protocols/msn/msn.c:734 src/protocols/msn/msn.c:766
+#: src/protocols/msn/msn.c:774 src/protocols/msn/msn.c:807
+#: src/protocols/msn/msn.c:815 src/protocols/msn/msn.c:829
+#: src/protocols/msn/msn.c:838 src/protocols/msn/msn.c:852
+#: src/protocols/msn/msn.c:876 src/protocols/msn/msn.c:926
+#: src/protocols/msn/msn.c:964 src/protocols/msn/msn.c:1062
+#: src/protocols/msn/msn.c:1094 src/protocols/msn/msn.c:1115
+#: src/protocols/msn/msn.c:1126 src/protocols/msn/msn.c:1137
+#: src/protocols/msn/msn.c:1161 src/protocols/msn/msn.c:1173
+#: src/protocols/msn/msn.c:1243 src/protocols/msn/notification.c:179
+#: src/protocols/msn/notification.c:207 src/protocols/msn/notification.c:1668
+#: src/protocols/msn/notification.c:1688 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 "Feil ved skriving"
 
-#: src/protocols/jabber/jabber.c:241 src/protocols/jabber/jabber.c:261
+#: src/protocols/jabber/jabber.c:282 src/protocols/jabber/jabber.c:302
 msgid "Read Error"
 msgstr "Lesefeil"
 
-#: src/protocols/jabber/jabber.c:316
-#, fuzzy
-msgid "Connection Failed"
-msgstr "Kunne ikke koble til"
-
-#: src/protocols/jabber/jabber.c:319
+#: src/protocols/jabber/jabber.c:356
 msgid "SSL Handshake Failed"
 msgstr "SSL-utveksling feilet"
 
-#: src/protocols/jabber/jabber.c:362 src/protocols/jabber/jabber.c:691
+#: src/protocols/jabber/jabber.c:393 src/protocols/jabber/jabber.c:687
 msgid "Invalid Jabber ID"
 msgstr "Ugyldig jabber-ID"
 
-#: src/protocols/jabber/jabber.c:390 src/protocols/jabber/jabber.c:718
-#, fuzzy
-msgid "SSL support unavailable"
-msgstr "Tjeneren er ikke tilgjengelig"
-
-#: src/protocols/jabber/jabber.c:400 src/protocols/jabber/jabber.c:728
-#: src/protocols/trepia/trepia.c:1121
+#: src/protocols/jabber/jabber.c:427 src/protocols/jabber/jabber.c:721
+#: src/protocols/trepia/trepia.c:1116
 msgid "Unable to create socket"
 msgstr "Kunne ikke opprette socket"
 
-#: src/protocols/jabber/jabber.c:425
+#: src/protocols/jabber/jabber.c:452
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registrering av %s@%s vellykket"
 
-#: src/protocols/jabber/jabber.c:427 src/protocols/jabber/jabber.c:428
+#: src/protocols/jabber/jabber.c:454 src/protocols/jabber/jabber.c:455
 msgid "Registration Successful"
 msgstr "Registreringen var vellykket!"
 
-#: src/protocols/jabber/jabber.c:434 src/protocols/jabber/jabber.c:1183
+#: src/protocols/jabber/jabber.c:464
 msgid "Unknown Error"
 msgstr "Ukjent feil"
 
-#: src/protocols/jabber/jabber.c:436 src/protocols/jabber/jabber.c:437
+#: src/protocols/jabber/jabber.c:467
+#, c-format
+msgid "Registration of %s@%s failed: %s"
+msgstr "Registrering av %s@%s feilet: %s"
+
+#: src/protocols/jabber/jabber.c:469 src/protocols/jabber/jabber.c:470
 msgid "Registration Failed"
 msgstr "Registrering feilet"
 
-#: src/protocols/jabber/jabber.c:548 src/protocols/jabber/jabber.c:549
+#: src/protocols/jabber/jabber.c:568 src/protocols/jabber/jabber.c:569
 msgid "Already Registered"
 msgstr "Du er allerede registrert"
 
-#: src/protocols/jabber/jabber.c:584 src/protocols/jabber/jabber.c:1034
+#: src/protocols/jabber/jabber.c:582 src/protocols/jabber/jabber.c:1013
 msgid "Password"
 msgstr "Passord"
 
-#: src/protocols/jabber/jabber.c:595
+#: src/protocols/jabber/jabber.c:593
 msgid "E-Mail"
 msgstr "E-post"
 
+#. First Name
+#: src/protocols/jabber/jabber.c:603 src/protocols/oscar/oscar.c:3957
+#: src/protocols/trepia/trepia.c:267
+msgid "First Name"
+msgstr "Fornavn"
+
 #. 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:623 src/protocols/oscar/oscar.c:4009
+#: src/protocols/oscar/oscar.c:4025 src/protocols/trepia/trepia.c:335
 #: src/protocols/trepia/trepia.c:439
 msgid "State"
 msgstr "Fylke/stat"
 
-#: src/protocols/jabber/jabber.c:635
+#: src/protocols/jabber/jabber.c:633
 msgid "Phone"
 msgstr "Telefon"
 
-#: src/protocols/jabber/jabber.c:645
-msgid "Date"
-msgstr "Dato"
-
-#: src/protocols/jabber/jabber.c:653
+#: src/protocols/jabber/jabber.c:651
 msgid "Please fill out the information below to register your new account."
 msgstr "Fyll ut feltene under for å registrere den nye kontoen din."
 
-#: src/protocols/jabber/jabber.c:656 src/protocols/jabber/jabber.c:657
+#: src/protocols/jabber/jabber.c:654 src/protocols/jabber/jabber.c:655
 msgid "Register New Jabber Account"
 msgstr "Registrere ny 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:769 src/protocols/msn/dispatch.c:219
+#: src/protocols/msn/msn.c:481 src/protocols/napster/napster.c:487
+#: src/protocols/oscar/oscar.c:694 src/protocols/trepia/trepia.c:1110
+#: src/protocols/yahoo/yahoo.c:1923
 msgid "Connecting"
 msgstr "Kobler til"
 
-#: src/protocols/jabber/jabber.c:778
+#: src/protocols/jabber/jabber.c:773
 msgid "Initializing Stream"
 msgstr "Nullstiller datastrøm"
 
-#: src/protocols/jabber/jabber.c:784
+#: src/protocols/jabber/jabber.c:779
 msgid "Authenticating"
 msgstr "Autentiserer"
 
-#: src/protocols/jabber/jabber.c:793
+#: src/protocols/jabber/jabber.c:787
 msgid "Re-initializing Stream"
 msgstr "Nullstiller datastrøm på nytt"
 
-#: 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 "Ikke godkjent"
-
-#: 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 "Jeg er fra"
-
-#: 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 "Beskrivelse"
-
-#: src/protocols/jabber/jabber.c:938
+#: src/protocols/jabber/jabber.c:911 src/protocols/jabber/jabber.c:964
+#: src/protocols/jabber/presence.c:270
 msgid "Error"
 msgstr "Feil"
 
-#: 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:927 src/protocols/jabber/jutil.c:101
+#: src/protocols/jabber/presence.c:82
 msgid "Chatty"
 msgstr "Pratsom"
 
-#: 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:929 src/protocols/jabber/jutil.c:104
+#: src/protocols/jabber/presence.c:87
 msgid "Extended Away"
 msgstr "Utvidet borte"
 
-#: 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:930 src/protocols/jabber/jutil.c:107
+#: src/protocols/jabber/presence.c:89 src/protocols/oscar/oscar.c:2838
+#: src/protocols/oscar/oscar.c:4589 src/protocols/oscar/oscar.c:6134
 msgid "Do Not Disturb"
 msgstr "Ikke forstyrr"
 
-#: src/protocols/jabber/jabber.c:979
+#: src/protocols/jabber/jabber.c:946
 msgid "Password Changed"
 msgstr "Passordet er endret"
 
-#: src/protocols/jabber/jabber.c:980
+#: src/protocols/jabber/jabber.c:947
 msgid "Your password has been changed."
 msgstr "Passordet ditt har blitt endret."
 
-#: src/protocols/jabber/jabber.c:984 src/protocols/jabber/jabber.c:985
-#, fuzzy
-msgid "Error changing password"
+#: src/protocols/jabber/jabber.c:957
+#, c-format
+msgid "Error changing password: %s"
 msgstr "Feil under endring av passord: %s"
 
-#: src/protocols/jabber/jabber.c:1039
+#: src/protocols/jabber/jabber.c:961
+msgid "Unknown error occurred changing password"
+msgstr "Ukjent feil under endring av passord"
+
+#: src/protocols/jabber/jabber.c:1018
 msgid "Password (again)"
 msgstr "Passord (igjen)"
 
-#: src/protocols/jabber/jabber.c:1044 src/protocols/jabber/jabber.c:1045
+#: src/protocols/jabber/jabber.c:1023 src/protocols/jabber/jabber.c:1024
 msgid "Change Jabber Password"
 msgstr "Bytt jabber-passord"
 
-#: src/protocols/jabber/jabber.c:1045
+#: src/protocols/jabber/jabber.c:1024
 msgid "Please enter your new password"
 msgstr "Skriv inn ditt nye passord"
 
-#: src/protocols/jabber/jabber.c:1056 src/protocols/toc/toc.c:1532
-msgid "Set User Info"
-msgstr "Sett brukerinfo"
-
-#: src/protocols/jabber/jabber.c:1141
-msgid "Bad Request"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1143
-#, fuzzy
-msgid "Conflict"
-msgstr "Koble til"
-
-#: src/protocols/jabber/jabber.c:1145
-msgid "Feature Not Implemented"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1147
-#, fuzzy
-msgid "Forbidden"
-msgstr "Usynlig"
-
-#: src/protocols/jabber/jabber.c:1149
-#, fuzzy
-msgid "Gone"
-msgstr "Ingen"
-
-#: src/protocols/jabber/jabber.c:1151 src/protocols/jabber/jabber.c:1225
-msgid "Internal Server Error"
-msgstr "Intern tjenerfeil"
-
-#: src/protocols/jabber/jabber.c:1153
-msgid "Item Not Found"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1155
-#, fuzzy
-msgid "Malformed Jabber ID"
-msgstr "Ugyldig jabber-ID"
-
-#: src/protocols/jabber/jabber.c:1157
-#, fuzzy
-msgid "Not Acceptable"
-msgstr "Ikke tilgjengelig"
-
-#: src/protocols/jabber/jabber.c:1159
-#, fuzzy
-msgid "Not Allowed"
-msgstr "Ikke tilgjengelig"
-
-#: src/protocols/jabber/jabber.c:1163
-#, fuzzy
-msgid "Payment Required"
-msgstr "Kryptering kreves"
-
-#: src/protocols/jabber/jabber.c:1165
-#, fuzzy
-msgid "Recipient Unavailable"
-msgstr "Tjenesten er ikke tilgjengelig"
-
-#: src/protocols/jabber/jabber.c:1169
-#, fuzzy
-msgid "Registration Required"
-msgstr "Registrering feilet"
-
-#: 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 "Tjeneren er ikke tilgjengelig"
-
-#: src/protocols/jabber/jabber.c:1177
-#, fuzzy
-msgid "Service Unavailable"
-msgstr "Tjenesten er ikke tilgjengelig"
-
-#: src/protocols/jabber/jabber.c:1179
-#, fuzzy
-msgid "Subscription Required"
-msgstr "Kryptering kreves"
-
-#: src/protocols/jabber/jabber.c:1181
-msgid "Unexpected Request"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1188
-#, fuzzy
-msgid "Authorization Aborted"
-msgstr "Godkjent"
-
-#: src/protocols/jabber/jabber.c:1190
-#, fuzzy
-msgid "Incorrect encoding in authorization"
-msgstr "Mottok godkjenning"
-
-#: src/protocols/jabber/jabber.c:1193
-msgid "Invalid authzid"
-msgstr "Ugyldig authzid"
-
-#: src/protocols/jabber/jabber.c:1196
-#, fuzzy
-msgid "Invalid Authorization Mechanism"
-msgstr "Ugyldig mekanisme"
-
-#: src/protocols/jabber/jabber.c:1199
-#, fuzzy
-msgid "Authorization mechanism too weak"
-msgstr "Ikke godkjent"
-
-#: src/protocols/jabber/jabber.c:1204
-msgid "Temporary Authentication Failure"
-msgstr "Midlertidig autentiseringsfeil"
-
-#: src/protocols/jabber/jabber.c:1206
-msgid "Authentication Failure"
-msgstr "Autentiseringsfeil"
-
-#: src/protocols/jabber/jabber.c:1210
-msgid "Bad Format"
-msgstr "Ugyldig format"
-
-#: src/protocols/jabber/jabber.c:1212
-msgid "Bad Namespace Prefix"
-msgstr "Ugyldig navneromprefiks"
-
-#: src/protocols/jabber/jabber.c:1215
-msgid "Resource Conflict"
-msgstr "Ressurskonflikt"
-
-#: src/protocols/jabber/jabber.c:1217
-msgid "Connection Timeout"
-msgstr "Tilkoblingen lyktes ikke innenfor tidsgrensen"
-
-#: src/protocols/jabber/jabber.c:1219
-msgid "Host Gone"
-msgstr "Maskin borte"
-
-#: src/protocols/jabber/jabber.c:1221
-msgid "Host Unknown"
-msgstr "Maskin ukjent"
-
-#: src/protocols/jabber/jabber.c:1223
-msgid "Improper Addressing"
-msgstr "Uriktig adressering"
-
-#: src/protocols/jabber/jabber.c:1227
-msgid "Invalid ID"
-msgstr "Ugyldig ID"
-
-#: src/protocols/jabber/jabber.c:1229
-msgid "Invalid Namespace"
-msgstr "Ugyldig navnerom"
-
-#: src/protocols/jabber/jabber.c:1231
-msgid "Invalid XML"
-msgstr "Ugyldig XML"
-
-#: src/protocols/jabber/jabber.c:1233
-msgid "Non-matching Hosts"
-msgstr "Maskiner som ikke matcher"
-
-#: src/protocols/jabber/jabber.c:1237
-msgid "Policy Violation"
-msgstr "Brudd på policy"
-
-#: src/protocols/jabber/jabber.c:1239
-msgid "Remote Connection Failed"
-msgstr "Kunne ikke koble til"
-
-#: src/protocols/jabber/jabber.c:1241
-msgid "Resource Constraint"
-msgstr "Ressursbegrensning"
-
-#: src/protocols/jabber/jabber.c:1243
-msgid "Restricted XML"
-msgstr "Begrenset XML"
-
-#: src/protocols/jabber/jabber.c:1245
-msgid "See Other Host"
-msgstr "Se annen maskin"
-
-#: src/protocols/jabber/jabber.c:1247
-msgid "System Shutdown"
-msgstr "Systemet avslutter"
-
-#: src/protocols/jabber/jabber.c:1249
-msgid "Undefined Condition"
-msgstr "Udefinert hendelse"
-
-#: src/protocols/jabber/jabber.c:1251
-msgid "Unsupported Encoding"
-msgstr "Tegnkodingen er ikke støttet"
-
-#: src/protocols/jabber/jabber.c:1253
-msgid "Unsupported Stanza Type"
-msgstr "Stanzatypen er ikke støttet"
-
-#: src/protocols/jabber/jabber.c:1255
-msgid "Unsupported Version"
-msgstr "Denne versjonen er ikke støttet"
-
-#: src/protocols/jabber/jabber.c:1257
-msgid "XML Not Well Formed"
-msgstr "XML ikke velformet"
-
-#: src/protocols/jabber/jabber.c:1259
-msgid "Stream Error"
-msgstr "Feil i datastrøm"
-
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -5898,126 +5276,86 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/jabber/jabber.c:1348 src/protocols/jabber/jabber.c:1350
+#: src/protocols/jabber/jabber.c:1122 src/protocols/jabber/jabber.c:1124
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber-protokolltillegg"
 
-#: src/protocols/jabber/jabber.c:1375
-#, fuzzy
-msgid "Use TLS if available"
-msgstr "MOTD er ikke tilgjengelig"
-
-#: src/protocols/jabber/jabber.c:1380
-#, fuzzy
-msgid "Force old SSL"
+#: src/protocols/jabber/jabber.c:1148
+msgid "Force Old SSL"
 msgstr "Tving bruk av gammel 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:1156
 msgid "Connect server"
 msgstr "Koble til tjener"
 
-#: 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 "Beskjedlogging"
 
-#: src/protocols/jabber/message.c:173
-#, fuzzy, c-format
-msgid "%s has set the topic to: %s"
-msgstr "%s har endret kanaltema til: %s"
-
-#: src/protocols/jabber/message.c:175
-#, fuzzy, c-format
-msgid "The topic is: %s"
-msgstr "Kanaltema for %s er %s"
-
-#: src/protocols/jabber/message.c:222
+#: src/protocols/jabber/message.c:219
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Beskjedlevering til %s feilet: %s"
 
-#: src/protocols/jabber/message.c:225
+#: src/protocols/jabber/message.c:222
 msgid "Jabber Message Error"
 msgstr "Jabber beskjedfeil"
 
-#: src/protocols/jabber/message.c:288
+#: src/protocols/jabber/message.c:281
 #, c-format
 msgid " (Code %s)"
 msgstr " (kode %s)"
 
-#: src/protocols/jabber/parser.c:131
+#: src/protocols/jabber/parser.c:129
 msgid "XML Parse error"
 msgstr "XML-parsefeil"
 
-#: src/protocols/jabber/presence.c:216
+#: src/protocols/jabber/presence.c:170
+#, c-format
+msgid "%s (Code %s)"
+msgstr "%s (kode %s)"
+
+#: src/protocols/jabber/presence.c:175
 msgid "Unknown Error in presence"
 msgstr "Ukjent feil i tilstedeværelse"
 
-#: src/protocols/jabber/presence.c:219
+#: src/protocols/jabber/presence.c:179
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr "Brukeren %s vil legge deg til i sin kontaktliste."
 
-#: src/protocols/jabber/presence.c:272 src/protocols/jabber/presence.c:273
-#, fuzzy
-msgid "Create New Room"
-msgstr "Samtalerom"
-
-#: src/protocols/jabber/presence.c:274
-msgid ""
-"You are creating a new room.  Would you like to configure it, or accept the "
-"default settings?"
-msgstr ""
-
-#: src/protocols/jabber/presence.c:276
-msgid "Configure Room"
-msgstr ""
-
-#: src/protocols/jabber/presence.c:278
-msgid "Accept Defaults"
-msgstr ""
-
-#: src/protocols/jabber/presence.c:298
-#, fuzzy, c-format
-msgid "Error in chat %s"
-msgstr "Feil under lagring av bilde: %s"
-
-#: src/protocols/jabber/presence.c:301
-#, fuzzy, c-format
-msgid "Error joining chat %s"
-msgstr "Feil under lagring av bilde: %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
+#: src/protocols/jabber/presence.c:260 src/protocols/oscar/oscar.c:2949
+msgid "Unknown error"
+msgstr "Ukjent feil"
+
+#: src/protocols/jabber/presence.c:266
+msgid "Unable to join chat"
+msgstr "Kunne ikke bli med i samtalegruppen"
+
+#: src/protocols/jabber/si.c:233
+#, c-format
+msgid "Could not send %s to %s, protocol not supported."
+msgstr "Kunne ikke sende %s til %s, protokollen er ikke støttet."
+
+#: src/protocols/jabber/si.c:234 src/protocols/jabber/si.c:235
 msgid "File Send Failed"
 msgstr "Filsending feilet"
 
-#: 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:520
 msgid "Unable to request USR\n"
 msgstr "Kunne ikke be om 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 "Kunne ikke å logge inn ved hjelp av 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 "Kunne ikke sende 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 "Forespør sending av passord"
 
@@ -6025,15 +5363,15 @@
 msgid "Protocol version not supported"
 msgstr "Protokollversjonen er ikke støttet"
 
-#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:416
+#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:784
 msgid "Unable to request CVR\n"
 msgstr "Kunne ikke be om 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:793
 msgid "Unable to request INF\n"
 msgstr "Kunne ikke be om 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:1915
 msgid "Got invalid XFR"
 msgstr "Mottok ugyldig XFR"
 
@@ -6041,20 +5379,27 @@
 msgid "Unable to transfer"
 msgstr "Kunne ikke overføre"
 
-#: src/protocols/msn/dispatch.c:192
+#: src/protocols/msn/dispatch.c:199
 msgid "Unable to parse message."
 msgstr "Kunne ikke tolke beskjed."
 
-#: src/protocols/msn/dispatch.c:232 src/protocols/msn/notification.c:521
-#: src/protocols/msn/notification.c:1811
+#: src/protocols/msn/dispatch.c:215 src/protocols/msn/msn.c:490
+#: src/protocols/msn/notification.c:2145 src/protocols/napster/napster.c:463
+#: src/protocols/napster/napster.c:494 src/protocols/yahoo/yahoo.c:1715
+#: src/protocols/yahoo/yahoo.c:1746 src/protocols/yahoo/yahoo.c:1811
+msgid "Unable to connect"
+msgstr "Kunne ikke koble til"
+
+#: src/protocols/msn/dispatch.c:239 src/protocols/msn/notification.c:889
+#: src/protocols/msn/notification.c:2167
 msgid "Unable to write to server"
 msgstr "Kunne ikke skrive til tjener"
 
-#: src/protocols/msn/dispatch.c:236 src/protocols/msn/notification.c:1818
+#: src/protocols/msn/dispatch.c:243 src/protocols/msn/notification.c:2174
 msgid "Syncing with server"
 msgstr "Synkroniserer med tjeneren"
 
-#: src/protocols/msn/dispatch.c:250 src/protocols/msn/notification.c:1832
+#: src/protocols/msn/dispatch.c:257 src/protocols/msn/notification.c:2188
 msgid "Error reading from server"
 msgstr "Feil ved lesing fra tjener"
 
@@ -6150,346 +5495,333 @@
 msgid "Too many hits to a FND"
 msgstr "For mange treff på en FND"
 
-#: src/protocols/msn/error.c:107 src/protocols/oscar/oscar.c:185
+#: src/protocols/msn/error.c:107 src/protocols/oscar/oscar.c:183
 msgid "Not logged in"
 msgstr "Ikke pålogget"
 
 #: src/protocols/msn/error.c:111
-#, fuzzy
-msgid "Service Temporarily Unavailable"
-msgstr "Katalogtjenesten er midlertidig utilgjengelig."
+msgid "Internal server error"
+msgstr "Intern tjenerfeil"
 
 #: src/protocols/msn/error.c:114
 msgid "Database server error"
 msgstr "Feil på databasetjeneren"
 
 #: src/protocols/msn/error.c:117
-#, fuzzy
-msgid "Command disabled"
-msgstr "Kommando"
-
-#: src/protocols/msn/error.c:120
 msgid "File operation error"
 msgstr "Filoperasjonsfeil"
 
-#: src/protocols/msn/error.c:123
+#: src/protocols/msn/error.c:120
 msgid "Memory allocation error"
 msgstr "Feil ved minneallokering"
 
-#: src/protocols/msn/error.c:126
+#: src/protocols/msn/error.c:123
 msgid "Wrong CHL value sent to server"
 msgstr "Feil CHL-verdi sendt til tjener"
 
-#: src/protocols/msn/error.c:130
+#: src/protocols/msn/error.c:127
 msgid "Server busy"
 msgstr "Tjeneren er opptatt"
 
-#: 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 "Tjeneren er ikke tilgjengelig"
 
-#: src/protocols/msn/error.c:136
+#: src/protocols/msn/error.c:133
 msgid "Peer Notification server down"
 msgstr "Varslingstjeneren er ikke tilgjengelig"
 
-#: src/protocols/msn/error.c:139
+#: src/protocols/msn/error.c:136
 msgid "Database connect error"
 msgstr "Kunne ikke koble til databasen"
 
-#: src/protocols/msn/error.c:143
+#: src/protocols/msn/error.c:140
 msgid "Server is going down (abandon ship)"
 msgstr "Tjeneren er på vei nei (redde seg den som kan)"
 
-#: src/protocols/msn/error.c:150
+#: src/protocols/msn/error.c:147
 msgid "Error creating connection"
 msgstr "Feil: kunne ikke koble til"
 
-#: src/protocols/msn/error.c:154
+#: src/protocols/msn/error.c:151
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR-parametre er enten ukjent eller ikke tillatt"
 
-#: src/protocols/msn/error.c:157 src/protocols/msn/notification.c:310
+#: src/protocols/msn/error.c:154 src/protocols/msn/notification.c:635
+#: src/protocols/msn/notification.c:1282 src/protocols/msn/notification.c:1450
 msgid "Unable to write"
 msgstr "Kunne ikke skrive"
 
+#: src/protocols/msn/error.c:157
+msgid "Session overload"
+msgstr "Sesjonsoverlast"
+
 #: src/protocols/msn/error.c:160
-msgid "Session overload"
-msgstr "Sesjonsoverlast"
-
-#: src/protocols/msn/error.c:163
 msgid "User is too active"
 msgstr "Brukeren er for aktiv"
 
-#: src/protocols/msn/error.c:166
+#: src/protocols/msn/error.c:163
 msgid "Too many sessions"
 msgstr "For mange sesjoner"
 
-#: 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 "Uventet"
 
-#: src/protocols/msn/error.c:172
+#: src/protocols/msn/error.c:169
 msgid "Bad friend file"
 msgstr "Ugyldig 'friend'-fil"
 
-#: src/protocols/msn/error.c:180
+#: src/protocols/msn/error.c:177
 msgid "Friendly name changes too rapidly"
 msgstr "Visningsnavnet endres for raskt"
 
-#: src/protocols/msn/error.c:189
+#: src/protocols/msn/error.c:186
 msgid "Server too busy"
 msgstr "Tjeneren er for opptatt"
 
-#: src/protocols/msn/error.c:193 src/protocols/oscar/oscar.c:1163
+#: src/protocols/msn/error.c:190 src/protocols/oscar/oscar.c:1076
 #: src/protocols/toc/toc.c:659
 msgid "Authentication failed"
 msgstr "Autentisering feilet"
 
-#: src/protocols/msn/error.c:196
+#: src/protocols/msn/error.c:193
 msgid "Not allowed when offline"
 msgstr "Ikke tillatt når avlogget"
 
-#: src/protocols/msn/error.c:204
+#: src/protocols/msn/error.c:201
 msgid "Not accepting new users"
 msgstr "Nye brukere vil ikke bli godtatt"
 
-#: src/protocols/msn/error.c:208
+#: src/protocols/msn/error.c:205
 msgid "Kids Passport without parental consent"
 msgstr "Passport for barn, men har ikke foreldregodkjenning"
 
-#: src/protocols/msn/error.c:212
+#: src/protocols/msn/error.c:209
 msgid "Passport account not yet verified"
 msgstr "Passport-konto er ikke blitt verifisert enda"
 
-#: src/protocols/msn/error.c:215
-#, fuzzy
-msgid "Bad ticket"
-msgstr "Rullende kontaktliste"
-
-#: src/protocols/msn/error.c:219
+#: src/protocols/msn/error.c:213
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "Ukjent feilkode %d"
 
-#: src/protocols/msn/msn.c:71
+#: src/protocols/msn/msn.c:70
 msgid "Your new MSN friendly name is too long."
 msgstr "Det nye MSN-kallenavnet er for langt."
 
-#: src/protocols/msn/msn.c:178
+#: src/protocols/msn/msn.c:177
 msgid "Set your friendly name."
 msgstr "Sett kallenavn."
 
-#: 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 "Dette er navnet som andre MSN-kompiser vil se deg som."
 
-#: src/protocols/msn/msn.c:191
+#: src/protocols/msn/msn.c:190
 msgid "Set your home phone number."
 msgstr "Sett telefonnummer (hjemme)."
 
-#: src/protocols/msn/msn.c:202
+#: src/protocols/msn/msn.c:201
 msgid "Set your work phone number."
 msgstr "Sett telefonnummer (arbeid)."
 
-#: src/protocols/msn/msn.c:213
+#: src/protocols/msn/msn.c:212
 msgid "Set your mobile phone number."
 msgstr "Sett mobiltelefonnummer"
 
-#: src/protocols/msn/msn.c:222
+#: src/protocols/msn/msn.c:221
 msgid "Allow MSN Mobile pages?"
 msgstr "Tillat tekstmeldinger via MSN"
 
-#: 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?"
 msgstr ""
 "Ønsker du å tillate eller forby kontakter å sende deg tekstmeldinger via MSN?"
 
-#: src/protocols/msn/msn.c:227
+#: src/protocols/msn/msn.c:226
 msgid "Allow"
 msgstr "Tillat"
 
-#: src/protocols/msn/msn.c:228
+#: src/protocols/msn/msn.c:227
 msgid "Disallow"
 msgstr "Forby"
 
-#: src/protocols/msn/msn.c:245
+#: src/protocols/msn/msn.c:244
 msgid "Send a mobile message."
 msgstr "Send tekstmelding"
 
-#: src/protocols/msn/msn.c:247
+#: src/protocols/msn/msn.c:246
 msgid "Page"
 msgstr "Send"
 
-#: src/protocols/msn/msn.c:333 src/protocols/yahoo/yahoo.c:2403
+#: src/protocols/msn/msn.c:332 src/protocols/yahoo/yahoo.c:2142
 #, 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:623
 #: src/protocols/msn/state.c:32
 msgid "Away From Computer"
 msgstr "Borte"
 
-#: 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:625
+#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2008
+#: src/protocols/yahoo/yahoo.c:2306 src/protocols/yahoo/yahoo.c:2406
 msgid "Be Right Back"
 msgstr "Straks tilbake"
 
-#: 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:627
+#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:2010
+#: src/protocols/yahoo/yahoo.c:2308 src/protocols/yahoo/yahoo.c:2407
 msgid "Busy"
 msgstr "Opptatt"
 
-#: 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:629
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2018
+#: src/protocols/yahoo/yahoo.c:2316 src/protocols/yahoo/yahoo.c:2411
 msgid "On The Phone"
 msgstr "I telefonen"
 
-#: 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:631
+#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2022
+#: src/protocols/yahoo/yahoo.c:2320 src/protocols/yahoo/yahoo.c:2413
 msgid "Out To Lunch"
 msgstr "Ute til lunsj"
 
-#: 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:633
+#: src/protocols/zephyr/zephyr.c:883 src/protocols/zephyr/zephyr.c:898
 msgid "Hidden"
 msgstr "Usynlig"
 
-#: src/protocols/msn/msn.c:363
+#: src/protocols/msn/msn.c:362
 msgid "Set Friendly Name"
 msgstr "Sett kallenavn"
 
-#: src/protocols/msn/msn.c:371
+#: src/protocols/msn/msn.c:370
 msgid "Set Home Phone Number"
 msgstr "Sett telefonnummer (hjemme)"
 
-#: src/protocols/msn/msn.c:377
+#: src/protocols/msn/msn.c:376
 msgid "Set Work Phone Number"
 msgstr "Sett telefonnummer (arbeid)"
 
-#: src/protocols/msn/msn.c:383
+#: src/protocols/msn/msn.c:382
 msgid "Set Mobile Phone Number"
 msgstr "Sett mobiltelefonnummer"
 
-#: src/protocols/msn/msn.c:392
+#: src/protocols/msn/msn.c:391
 msgid "Enable/Disable Mobile Devices"
 msgstr "Bruk/ikke bruk mobile enheter"
 
-#: src/protocols/msn/msn.c:399
+#: src/protocols/msn/msn.c:398
 msgid "Allow/Disallow Mobile Pages"
 msgstr "Tillate/forby tekstmeldinger"
 
-#: src/protocols/msn/msn.c:425
+#: src/protocols/msn/msn.c:424
 msgid "Send to Mobile"
 msgstr "Send til mobil"
 
-#: src/protocols/msn/msn.c:434
+#: src/protocols/msn/msn.c:433
 msgid "Initiate Chat"
 msgstr "Start samtale"
 
-#: src/protocols/msn/msn.c:458
-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 ""
-
-#: src/protocols/msn/msn.c:757
-#, fuzzy, 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."
+#: src/protocols/msn/msn.c:457
+msgid "SSL support is needed for MSN. Please install it."
+msgstr "SSL-støtte er nødvendig for MSN. Du må installere det."
+
+#: src/protocols/msn/msn.c:747
+#, c-format
+msgid ""
+"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 ""
 "Et MSN-skjermnavn må være på formen \"bruker@tjener.com\". Kanskje du mente %"
 "s@hotmail.com? Ingen endringer ble gjort i tillatt-listen din."
 
-#: src/protocols/msn/msn.c:761 src/protocols/msn/msn.c:801
-#, fuzzy
-msgid "Invalid MSN screen name"
+#: src/protocols/msn/msn.c:751 src/protocols/msn/msn.c:791
+msgid "Invalid MSN screenname"
 msgstr "Ugyldig MSN skjermnavn"
 
-#: src/protocols/msn/msn.c:797
-#, fuzzy, 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."
+#: src/protocols/msn/msn.c:787
+#, c-format
+msgid ""
+"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 ""
 "Et MSN-skjermnavn må være på formen \"bruker@tjener.com\". Kanskje du mente %"
 "s@hotmail.com? Ingen endringer ble gjort i blokkering-listen din."
 
-#: src/protocols/msn/msn.c:1304 src/protocols/yahoo/yahoo.c:2888
+#: src/protocols/msn/msn.c:1267 src/protocols/yahoo/yahoo.c:2582
 msgid "<html><body><b>Error retrieving profile</b></body></html>"
 msgstr "<html><body><b>Feil under lasting av profil</b></body></html>"
 
 #. Age
-#: src/protocols/msn/msn.c:1374 src/protocols/oscar/oscar.c:4145
+#: src/protocols/msn/msn.c:1335 src/protocols/oscar/oscar.c:3991
 #: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:413
-#: src/protocols/yahoo/yahoo.c:2998
+#: src/protocols/yahoo/yahoo.c:2693
 msgid "Age"
 msgstr "Alder"
 
 #. Gender
-#: src/protocols/msn/msn.c:1381 src/protocols/oscar/oscar.c:4131
+#: src/protocols/msn/msn.c:1342 src/protocols/oscar/oscar.c:3977
 #: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:421
-#: src/protocols/yahoo/yahoo.c:3006
+#: src/protocols/yahoo/yahoo.c:2705
 msgid "Gender"
 msgstr "Kjønn"
 
-#: src/protocols/msn/msn.c:1389 src/protocols/yahoo/yahoo.c:3002
+#: src/protocols/msn/msn.c:1350 src/protocols/yahoo/yahoo.c:2699
 msgid "Marital Status"
 msgstr "Sivilstatus"
 
-#: src/protocols/msn/msn.c:1396 src/protocols/yahoo/yahoo.c:2994
+#: src/protocols/msn/msn.c:1357 src/protocols/yahoo/yahoo.c:2687
 msgid "Location"
 msgstr "Sted"
 
-#: src/protocols/msn/msn.c:1404 src/protocols/yahoo/yahoo.c:3010
+#: src/protocols/msn/msn.c:1365 src/protocols/yahoo/yahoo.c:2711
 msgid "Occupation"
 msgstr "Yrke"
 
-#: 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:1382 src/protocols/msn/msn.c:1388
+#: src/protocols/msn/msn.c:1395 src/protocols/msn/msn.c:1402
+#: src/protocols/msn/msn.c:1409
 msgid "A Little About Me"
 msgstr "Noen ord om meg"
 
-#: src/protocols/msn/msn.c:1457 src/protocols/msn/msn.c:1470
-#: src/protocols/msn/msn.c:1477
+#: src/protocols/msn/msn.c:1418 src/protocols/msn/msn.c:1431
+#: src/protocols/msn/msn.c:1438
 msgid "Favorite Things"
 msgstr "Favoritt-ting"
 
-#: src/protocols/msn/msn.c:1486 src/protocols/msn/msn.c:1492
-#: src/protocols/msn/msn.c:1499
+#: src/protocols/msn/msn.c:1447 src/protocols/msn/msn.c:1453
+#: src/protocols/msn/msn.c:1460
 msgid "Hobbies and Interests"
 msgstr "Hobbyer og interesser"
 
-#: src/protocols/msn/msn.c:1508 src/protocols/msn/msn.c:1514
-#: src/protocols/yahoo/yahoo.c:3045
+#: src/protocols/msn/msn.c:1469 src/protocols/msn/msn.c:1475
+#: src/protocols/yahoo/yahoo.c:2755
 msgid "Favorite Quote"
 msgstr "Yndlingssitat"
 
-#: src/protocols/msn/msn.c:1522 src/protocols/yahoo/yahoo.c:3081
+#: src/protocols/msn/msn.c:1483 src/protocols/yahoo/yahoo.c:2799
 msgid "Last Updated"
 msgstr "Sist oppdatert"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1533 src/protocols/trepia/trepia.c:289
+#: src/protocols/msn/msn.c:1494 src/protocols/trepia/trepia.c:289
 #: src/protocols/trepia/trepia.c:457
 msgid "Homepage"
 msgstr "Hjemmeside"
 
-#: src/protocols/msn/msn.c:1555 src/protocols/yahoo/yahoo.c:3096
+#: src/protocols/msn/msn.c:1516 src/protocols/yahoo/yahoo.c:2817
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "Brukerinformasjon for %s er ikke tilgjengelig"
 
-#: src/protocols/msn/msn.c:1557 src/protocols/yahoo/yahoo.c:3098
+#: src/protocols/msn/msn.c:1518 src/protocols/yahoo/yahoo.c:2819
 msgid "The user's profile is empty."
 msgstr "Brukerens profil er tom."
 
@@ -6503,89 +5835,92 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/msn/msn.c:1655 src/protocols/msn/msn.c:1657
+#: src/protocols/msn/msn.c:1616 src/protocols/msn/msn.c:1618
 msgid "MSN Protocol Plugin"
 msgstr "MSN-protokolltillegg"
 
-#: src/protocols/msn/msn.c:1675 src/protocols/trepia/trepia.c:1345
+#: src/protocols/msn/msn.c:1635 src/protocols/trepia/trepia.c:1340
 msgid "Login server"
 msgstr "Påloggingstjener"
 
-#: src/protocols/msn/msn.c:1684
+#: src/protocols/msn/msn.c:1645
 msgid "Use HTTP Method"
 msgstr "Bruk HTTP-metode"
 
-#: 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 ikke koble til tjener"
-
-#: src/protocols/msn/nexus.c:121 src/protocols/msn/nexus.c:130
-msgid "Unable to write to MSN Nexus server."
-msgstr "Kunne ikke skrive til MSN nexus-tjener."
-
-#: src/protocols/msn/nexus.c:147
-msgid "MSN Nexus server returned invalid redirect information."
-msgstr "MSN nexus-tjener returnerte ugyldig redirigeringsinformasjon."
-
-#: src/protocols/msn/nexus.c:204
-msgid "Unknown error when attempting to authorize with MSN login server."
-msgstr "Ukjent feil under forsøk på å autentisere med MSNs innloggingstjener."
-
-#: src/protocols/msn/notification.c:215
+#: src/protocols/msn/notification.c:247
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "MSN Feil: %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 ikke koble til tjener"
+
+#: src/protocols/msn/notification.c:376 src/protocols/msn/notification.c:545
+msgid "Unable to write to MSN Nexus server."
+msgstr "Kunne ikke skrive til MSN nexus-tjener."
+
+#: src/protocols/msn/notification.c:385 src/protocols/msn/notification.c:560
+msgid "Unable to read from MSN Nexus server."
+msgstr "Kunne ikke lese fra MSN nexus-tjener"
+
+#: src/protocols/msn/notification.c:405
+msgid "MSN Nexus server returned invalid redirect information."
+msgstr "MSN nexus-tjener returnerte ugyldig redirigeringsinformasjon."
+
+#: src/protocols/msn/notification.c:459
+msgid "Unknown error when attempting to authorize with MSN login server."
+msgstr "Ukjent feil under forsøk på å autentisere med MSNs innloggingstjener."
+
+#: src/protocols/msn/notification.c:571
+msgid "MSN Nexus server returned invalid information."
+msgstr "MSN nexus-tjener returnerte ugyldig informasjon."
+
+#: src/protocols/msn/notification.c:640 src/protocols/trepia/trepia.c:686
 msgid "Retrieving buddy list"
 msgstr "Henter kontaktliste"
 
-#: src/protocols/msn/notification.c:340 src/protocols/msn/notification.c:372
-#: src/protocols/oscar/oscar.c:1452
+#: src/protocols/msn/notification.c:703
+msgid "Unable to connect to passport server"
+msgstr "Kunne ikke koble til passport-tjener"
+
+#: src/protocols/msn/notification.c:708 src/protocols/msn/notification.c:740
+#: src/protocols/oscar/oscar.c:1362
 msgid "Password sent"
 msgstr "Passord sendt"
 
-#: src/protocols/msn/notification.c:367
+#: src/protocols/msn/notification.c:735
 msgid "Unable to send password"
 msgstr "Kunne ikke sende passord"
 
-#: src/protocols/msn/notification.c:403
+#: src/protocols/msn/notification.c:771
 msgid "Protocol not supported"
 msgstr "Protokollen er ikke støttet"
 
-#: src/protocols/msn/notification.c:445
+#: src/protocols/msn/notification.c:813
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "Du ble logget av fordi du har logget på et annet sted."
 
-#: src/protocols/msn/notification.c:450
+#: src/protocols/msn/notification.c:818
 msgid "You have been disconnected. The MSN servers are going down temporarily."
 msgstr ""
 "Du ble logget av fordi MSN-tjenerne vil bli utilgjengelig en liten stund."
 
-#: src/protocols/msn/notification.c:577
+#: src/protocols/msn/notification.c:944
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "Brukeren %s (%s) ønsker å legge til %s i kontaktlisten sin."
 
-#: src/protocols/msn/notification.c:902 src/protocols/msn/notification.c:1069
+#: src/protocols/msn/notification.c:1263 src/protocols/msn/notification.c:1429
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list."
 msgstr "Brukeren %s (%s) ønsker å legge deg til i kontaktlisten sin."
 
-#: src/protocols/msn/notification.c:1596
+#: src/protocols/msn/notification.c:1960
 msgid "Unable to transfer to notification server"
 msgstr "Kunne ikke overføre til varslingstjeneren"
 
-#: src/protocols/msn/notification.c:1752
+#: src/protocols/msn/notification.c:2108
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -6612,20 +5947,20 @@
 "\n"
 "Etter at vedlikeholdsarbeidet er ferdig, kan du logge på igjen."
 
-#: src/protocols/msn/servconn.c:536
+#: src/protocols/msn/servconn.c:528
 msgid "Received HTTP error. Please report this."
 msgstr "Mottok HTTP-feil. Vennligst feilmeld dette."
 
-#: src/protocols/msn/switchboard.c:150
+#: src/protocols/msn/switchboard.c:147
 msgid "The conversation has become inactive and timed out."
 msgstr "Samtalen har blitt avsluttet pga. inaktivitet."
 
-#: src/protocols/msn/switchboard.c:159
+#: src/protocols/msn/switchboard.c:154
 #, c-format
 msgid "%s has closed the conversation window."
 msgstr "%s har lukket samtalevinduet."
 
-#: src/protocols/msn/switchboard.c:285
+#: src/protocols/msn/switchboard.c:277
 msgid "An MSN message may not have been received."
 msgstr "MSN-beskjeden har kanskje ikke blitt mottatt."
 
@@ -6671,14 +6006,10 @@
 msgid "%s requested a PING"
 msgstr "%s pinget deg"
 
-#: 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:5203
 #: src/protocols/toc/toc.c:1259
-msgid "_Group:"
-msgstr "Gruppe:"
+msgid "Join what group:"
+msgstr "Navn på samtalegruppe:"
 
 #. *< api_version
 #. *< type
@@ -6690,181 +6021,182 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: src/protocols/napster/napster.c:619 src/protocols/napster/napster.c:621
 msgid "NAPSTER Protocol Plugin"
 msgstr "Napster-protokolltillegg"
 
-#: src/protocols/oscar/oscar.c:181
+#: src/protocols/oscar/oscar.c:179
 msgid "Invalid error"
 msgstr "Ugyldig feil"
 
-#: src/protocols/oscar/oscar.c:182
+#: src/protocols/oscar/oscar.c:180
 msgid "Invalid SNAC"
 msgstr "Ugyldig SNAC"
 
-#: src/protocols/oscar/oscar.c:183
+#: src/protocols/oscar/oscar.c:181
 msgid "Rate to host"
 msgstr "Hastighet til maskin"
 
-#: src/protocols/oscar/oscar.c:184
+#: src/protocols/oscar/oscar.c:182
 msgid "Rate to client"
 msgstr "Hastighet til klient"
 
-#: src/protocols/oscar/oscar.c:186
+#: src/protocols/oscar/oscar.c:184
 msgid "Service unavailable"
 msgstr "Tjenesten er ikke tilgjengelig"
 
-#: src/protocols/oscar/oscar.c:187
+#: src/protocols/oscar/oscar.c:185
 msgid "Service not defined"
 msgstr "Tjenesten er ikke definert"
 
-#: src/protocols/oscar/oscar.c:188
+#: src/protocols/oscar/oscar.c:186
 msgid "Obsolete SNAC"
 msgstr "Avlegs SNAC"
 
-#: src/protocols/oscar/oscar.c:189
+#: src/protocols/oscar/oscar.c:187
 msgid "Not supported by host"
 msgstr "Ikke støttet av maskin"
 
-#: src/protocols/oscar/oscar.c:190
+#: src/protocols/oscar/oscar.c:188
 msgid "Not supported by client"
 msgstr "Ikke støttet av klient"
 
-#: src/protocols/oscar/oscar.c:191
+#: src/protocols/oscar/oscar.c:189
 msgid "Refused by client"
 msgstr "Avvist av klient"
 
+#: src/protocols/oscar/oscar.c:190
+msgid "Reply too big"
+msgstr "Svaret er for stort"
+
+#: src/protocols/oscar/oscar.c:191
+msgid "Responses lost"
+msgstr "Svaret gikk tapt"
+
 #: src/protocols/oscar/oscar.c:192
-msgid "Reply too big"
-msgstr "Svaret er for stort"
+msgid "Request denied"
+msgstr "Forespørsel avslått"
 
 #: src/protocols/oscar/oscar.c:193
-msgid "Responses lost"
-msgstr "Svaret gikk tapt"
+msgid "Busted SNAC payload"
+msgstr "Innholdet i SNAC er ødelagt"
 
 #: src/protocols/oscar/oscar.c:194
-msgid "Request denied"
-msgstr "Forespørsel avslått"
-
-#: src/protocols/oscar/oscar.c:195
-msgid "Busted SNAC payload"
-msgstr "Innholdet i SNAC er ødelagt"
-
-#: src/protocols/oscar/oscar.c:196
 msgid "Insufficient rights"
 msgstr "Ikke nok rettigheter"
 
-#: src/protocols/oscar/oscar.c:197
+#: src/protocols/oscar/oscar.c:195
 msgid "In local permit/deny"
 msgstr "I lokal tillat/nekt"
 
+#: src/protocols/oscar/oscar.c:196
+msgid "Too evil (sender)"
+msgstr "Altfor ond (sender)"
+
+#: src/protocols/oscar/oscar.c:197
+msgid "Too evil (receiver)"
+msgstr "Altfor ond (mottaker)"
+
 #: src/protocols/oscar/oscar.c:198
-msgid "Too evil (sender)"
-msgstr "Altfor ond (sender)"
+msgid "User temporarily unavailable"
+msgstr "Brukeren er midlertidig utilgjengelig"
 
 #: src/protocols/oscar/oscar.c:199
-msgid "Too evil (receiver)"
-msgstr "Altfor ond (mottaker)"
+msgid "No match"
+msgstr "Ingen treff"
 
 #: src/protocols/oscar/oscar.c:200
-msgid "User temporarily unavailable"
-msgstr "Brukeren er midlertidig utilgjengelig"
+msgid "List overflow"
+msgstr "List-overflyt"
 
 #: src/protocols/oscar/oscar.c:201
-msgid "No match"
-msgstr "Ingen treff"
+msgid "Request ambiguous"
+msgstr "Tvetydig forespørsel"
 
 #: src/protocols/oscar/oscar.c:202
-msgid "List overflow"
-msgstr "List-overflyt"
+msgid "Queue full"
+msgstr "Køen er full"
 
 #: src/protocols/oscar/oscar.c:203
-msgid "Request ambiguous"
-msgstr "Tvetydig forespørsel"
-
-#: src/protocols/oscar/oscar.c:204
-msgid "Queue full"
-msgstr "Køen er full"
-
-#: src/protocols/oscar/oscar.c:205
 msgid "Not while on AOL"
 msgstr "Ikke mens du er på AOL"
 
-#: src/protocols/oscar/oscar.c:520
+#: src/protocols/oscar/oscar.c:475
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Direkte samtale med %s stengt"
 
-#: src/protocols/oscar/oscar.c:522
+#: src/protocols/oscar/oscar.c:477
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "Direkte samtale med %s mislyktes"
 
-#: src/protocols/oscar/oscar.c:593 src/protocols/toc/toc.c:885
+#: src/protocols/oscar/oscar.c:535 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 "Frakoblet."
+
+#: src/protocols/oscar/oscar.c:547 src/protocols/toc/toc.c:885
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Du har blitt koblet fra samtalegruppen %s."
 
-#: src/protocols/oscar/oscar.c:609
+#: src/protocols/oscar/oscar.c:563
 msgid "Chat is currently unavailable"
 msgstr "Samtalegrupper er for tiden utilgjengelig"
 
-#: src/protocols/oscar/oscar.c:680 src/protocols/oscar/oscar.c:746
+#: src/protocols/oscar/oscar.c:634 src/protocols/oscar/oscar.c:690
 msgid "Couldn't connect to host"
 msgstr "Kunne ikke koble til"
 
-#: src/protocols/oscar/oscar.c:690
+#: src/protocols/oscar/oscar.c:644
 msgid "Screen name sent"
 msgstr "Skjermnavn sendt"
 
-#: 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:678
 msgid "Unable to login to AIM"
 msgstr "Kunne ikke logge på AIM"
 
-#: src/protocols/oscar/oscar.c:838 src/protocols/oscar/oscar.c:1256
+#: src/protocols/oscar/oscar.c:779 src/protocols/oscar/oscar.c:1167
 msgid "Could Not Connect"
 msgstr "Kunne ikke koble til"
 
-#: src/protocols/oscar/oscar.c:846
+#: src/protocols/oscar/oscar.c:787
 msgid "Connection established, cookie sent"
 msgstr "Tilkoblet, informasjonskapsel sendt"
 
-#: 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:854 src/protocols/oscar/oscar.c:867
+#: src/protocols/oscar/oscar.c:872
+msgid "File Transfer Aborted"
+msgstr "Filoverføring avbrutt"
+
+#: src/protocols/oscar/oscar.c:855
+msgid "Unable to establish listener socket."
+msgstr "Kunne ikke etablere lytte-socket."
+
+#: src/protocols/oscar/oscar.c:868
 msgid "Unable to establish file descriptor."
 msgstr "Kunne ikke etablere fildeskriptor."
 
-#: src/protocols/oscar/oscar.c:964
+#: src/protocols/oscar/oscar.c:873
 msgid "Unable to create new connection."
 msgstr "Kunne ikke lage ny tilkobling."
 
-#: src/protocols/oscar/oscar.c:1035
-msgid "Unable to establish listener socket."
-msgstr "Kunne ikke etablere lytte-socket."
-
-#: src/protocols/oscar/oscar.c:1140 src/protocols/toc/toc.c:571
+#: src/protocols/oscar/oscar.c:1053 src/protocols/toc/toc.c:571
 msgid "Incorrect nickname or password."
 msgstr "Feil kallenavn eller passord."
 
-#: src/protocols/oscar/oscar.c:1145
+#: src/protocols/oscar/oscar.c:1058
 msgid "Your account is currently suspended."
 msgstr "Kontoen din er frosset."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1149
+#: src/protocols/oscar/oscar.c:1062
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL Instant Messenger-tjenesten er midlertidig utilgjengelig."
 
-#: src/protocols/oscar/oscar.c:1154
+#: src/protocols/oscar/oscar.c:1067
 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."
@@ -6872,22 +6204,22 @@
 "Du har koblet til og koblet fra for hurtig. Vent ti minutter og prøv igjen. "
 "Hvis du fortsetter å prøve nå, vil du måtte vente enda lenger."
 
-#: src/protocols/oscar/oscar.c:1159
+#: src/protocols/oscar/oscar.c:1072
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "Klientversjonen av programmet er for gammel. Vennligst oppgrader her: %s"
 
-#: src/protocols/oscar/oscar.c:1191
+#: src/protocols/oscar/oscar.c:1104
 msgid "Internal Error"
 msgstr "Intern feil"
 
-#: src/protocols/oscar/oscar.c:1263
+#: src/protocols/oscar/oscar.c:1174
 msgid "Received authorization"
 msgstr "Mottok godkjenning"
 
-#: src/protocols/oscar/oscar.c:1299 src/protocols/oscar/oscar.c:1329
-#: src/protocols/oscar/oscar.c:1417
+#: src/protocols/oscar/oscar.c:1209 src/protocols/oscar/oscar.c:1239
+#: src/protocols/oscar/oscar.c:1327
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -6896,29 +6228,29 @@
 "Du kan bli frakoblet ganske snart. Du vil kanskje bruke TOC inntil dette er "
 "ordnet. Sjekk %s for oppdateringer."
 
-#: src/protocols/oscar/oscar.c:1302 src/protocols/oscar/oscar.c:1332
+#: src/protocols/oscar/oscar.c:1212 src/protocols/oscar/oscar.c:1242
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim klarte ikke å motta gyldig AIM-påloggingshash."
 
-#: src/protocols/oscar/oscar.c:1420
+#: src/protocols/oscar/oscar.c:1330
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim klarte ikke å motta en gyldig påloggingshash."
 
-#: src/protocols/oscar/oscar.c:2002 src/protocols/oscar/oscar.c:5906
+#: src/protocols/oscar/oscar.c:1912 src/protocols/oscar/oscar.c:5641
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Opprettet direkte samtale med %s"
 
-#: src/protocols/oscar/oscar.c:2333 src/protocols/oscar/oscar.c:2355
+#: src/protocols/oscar/oscar.c:2241 src/protocols/oscar/oscar.c:2263
 msgid "(There was an error receiving this message)"
 msgstr "(Det oppstod en feil i mottaket av denne beskjeden)"
 
-#: src/protocols/oscar/oscar.c:2504
+#: src/protocols/oscar/oscar.c:2410
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s har akkurat spurt om direkte tilkobling til %s"
 
-#: src/protocols/oscar/oscar.c:2507
+#: src/protocols/oscar/oscar.c:2413
 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 "
@@ -6928,24 +6260,24 @@
 "datamaskinene, men er nødvendig for å sende bilder. Dette kan være en "
 "(minimal) sikkerhetsrisiko fordi mottakeren da ser IP-adressen din."
 
-#: src/protocols/oscar/oscar.c:2512 src/protocols/oscar/oscar.c:6288
+#: src/protocols/oscar/oscar.c:2418 src/protocols/oscar/oscar.c:6010
 msgid "Connect"
 msgstr "Koble til"
 
-#: src/protocols/oscar/oscar.c:2539
+#: src/protocols/oscar/oscar.c:2445
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr ""
 "Vennligst godkjenn meg slik at jeg kan legge deg til i kontaktlisten min."
 
-#: src/protocols/oscar/oscar.c:2547
+#: src/protocols/oscar/oscar.c:2453
 msgid "Authorization Request Message:"
 msgstr "Beskjed i godkjenningsforespørsel:"
 
-#: src/protocols/oscar/oscar.c:2548
+#: src/protocols/oscar/oscar.c:2454
 msgid "Please authorize me!"
 msgstr "Vennligst godkjenn meg!"
 
-#: src/protocols/oscar/oscar.c:2577
+#: src/protocols/oscar/oscar.c:2482
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -6954,23 +6286,23 @@
 "Brukeren %s krever godkjenning før vedkommende legges til i kontaktlisten. "
 "Vil du sende en godkjenningsforespørsel?"
 
-#: src/protocols/oscar/oscar.c:2582 src/protocols/oscar/oscar.c:2584
+#: src/protocols/oscar/oscar.c:2487 src/protocols/oscar/oscar.c:2489
 msgid "Request Authorization"
 msgstr "Spør om godkjenning"
 
-#: 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:2525 src/protocols/oscar/oscar.c:2527
+#: src/protocols/oscar/oscar.c:2534 src/protocols/oscar/oscar.c:2610
+#: src/protocols/oscar/oscar.c:2630 src/protocols/oscar/oscar.c:2986
+#: src/protocols/oscar/oscar.c:3042 src/protocols/oscar/oscar.c:5124
+#: src/protocols/oscar/oscar.c:5170
 msgid "No reason given."
 msgstr "Ingen grunn spesifisert."
 
-#: src/protocols/oscar/oscar.c:2628
+#: src/protocols/oscar/oscar.c:2533
 msgid "Authorization Denied Message:"
 msgstr "Godkjenning nektet, grunn:"
 
-#: src/protocols/oscar/oscar.c:2705
+#: src/protocols/oscar/oscar.c:2610
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -6980,11 +6312,11 @@
 "grunn:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2713 src/protocols/oscar/oscar.c:5372
+#: src/protocols/oscar/oscar.c:2618 src/protocols/oscar/oscar.c:5130
 msgid "Authorization Request"
 msgstr "Godkjenningsforespørsel"
 
-#: src/protocols/oscar/oscar.c:2725
+#: src/protocols/oscar/oscar.c:2630
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -6995,19 +6327,19 @@
 "med følgende grunn:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2726
+#: src/protocols/oscar/oscar.c:2631
 msgid "ICQ authorization denied."
 msgstr "ICQ-godkjenning avslått."
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2733
+#: src/protocols/oscar/oscar.c:2638
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 "Brukeren %u har godtatt din forespørsel om å bli lagt til i kontaktlisten "
 "din."
 
-#: src/protocols/oscar/oscar.c:2741
+#: src/protocols/oscar/oscar.c:2646
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7020,7 +6352,7 @@
 "Fra: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2749
+#: src/protocols/oscar/oscar.c:2654
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7033,7 +6365,7 @@
 "Fra: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2757
+#: src/protocols/oscar/oscar.c:2662
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -7046,34 +6378,34 @@
 "Beskjed:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2778
+#: src/protocols/oscar/oscar.c:2683
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ-brukeren %u har sent deg en kontakt: %s (%s)"
 
-#: src/protocols/oscar/oscar.c:2784
+#: src/protocols/oscar/oscar.c:2689
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Ønsker du å legge denne kontakten til i kontaktlisten din?"
 
-#: src/protocols/oscar/oscar.c:2788
+#: src/protocols/oscar/oscar.c:2693
 msgid "Decline"
 msgstr "Avslå"
 
-#: src/protocols/oscar/oscar.c:2870
+#: src/protocols/oscar/oscar.c:2775
 #, 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 gått glipp av %hu beskjed fra %s fordi den var ugyldig."
 msgstr[1] "Du har gått glipp av %hu beskjeder fra %s fordi de var ugyldige."
 
-#: src/protocols/oscar/oscar.c:2879
+#: src/protocols/oscar/oscar.c:2784
 #, 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 har gått glipp av %hu beskjed fra %s fordi den var for stor."
 msgstr[1] "Du har gått glipp av %hu beskjeder fra %s fordi de var for store."
 
-#: src/protocols/oscar/oscar.c:2888
+#: src/protocols/oscar/oscar.c:2793
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7086,7 +6418,7 @@
 "Du har gått glipp av %hu beskjeder fra %s fordi hastighetsgrensen har blitt "
 "overskredet."
 
-#: src/protocols/oscar/oscar.c:2897
+#: src/protocols/oscar/oscar.c:2802
 #, 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."
@@ -7095,189 +6427,166 @@
 msgstr[1] ""
 "Du har gått glipp av %hu beskjeder fra %s fordi vedkommende var for ond."
 
-#: src/protocols/oscar/oscar.c:2906
+#: src/protocols/oscar/oscar.c:2811
 #, 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 har gått glipp av %hu beskjed fra %s fordi du er for ond."
 msgstr[1] "Du har gått glipp av %hu beskjeder fra %s fordi du er for ond."
 
-#: src/protocols/oscar/oscar.c:2915
+#: src/protocols/oscar/oscar.c:2820
 #, 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 har gått glipp av %hu beskjed fra %s, ingen grunn oppgitt."
 msgstr[1] "Du har gått glipp av %hu beskjeder fra %s, ingen grunn oppgitt."
 
-#: src/protocols/oscar/oscar.c:2931 src/protocols/oscar/oscar.c:4760
-#: src/protocols/oscar/oscar.c:6414
+#: src/protocols/oscar/oscar.c:2836 src/protocols/oscar/oscar.c:4598
+#: src/protocols/oscar/oscar.c:6137
 msgid "Free For Chat"
 msgstr "Tilgjengelig for samtale"
 
-#: src/protocols/oscar/oscar.c:2935 src/protocols/oscar/oscar.c:4754
-#: src/protocols/oscar/oscar.c:6412
+#: src/protocols/oscar/oscar.c:2840 src/protocols/oscar/oscar.c:4592
+#: src/protocols/oscar/oscar.c:6135
 msgid "Not Available"
 msgstr "Ikke tilgjengelig"
 
-#: src/protocols/oscar/oscar.c:2937 src/protocols/oscar/oscar.c:4757
-#: src/protocols/oscar/oscar.c:6413
+#: src/protocols/oscar/oscar.c:2842 src/protocols/oscar/oscar.c:4595
+#: src/protocols/oscar/oscar.c:6136
 msgid "Occupied"
 msgstr "Opptatt"
 
-#: src/protocols/oscar/oscar.c:2941
+#: src/protocols/oscar/oscar.c:2846
 msgid "Web Aware"
 msgstr "Web-oppmerksom"
 
-#: src/protocols/oscar/oscar.c:2984
+#: src/protocols/oscar/oscar.c:2889
 #, 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:2948
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC-feil: %s\n"
 
-#: src/protocols/oscar/oscar.c:3044
-msgid "Unknown error"
-msgstr "Ukjent feil"
-
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:3079
+#: src/protocols/oscar/oscar.c:2984
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "Beskjeden din til %s ble ikke sendt:"
 
-#: src/protocols/oscar/oscar.c:3138
+#: src/protocols/oscar/oscar.c:3040
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "Brukerinformasjon for %s er ikke tilgjengelig:"
 
-#: src/protocols/oscar/oscar.c:3177
+#: src/protocols/oscar/oscar.c:3078
 msgid "Voice"
 msgstr "Lyd"
 
-#: src/protocols/oscar/oscar.c:3180
+#: src/protocols/oscar/oscar.c:3081
 msgid "AIM Direct IM"
 msgstr "AIM direkte samtale"
 
-#: src/protocols/oscar/oscar.c:3183
-msgid "Chat"
-msgstr "Samtale"
-
-#: src/protocols/oscar/oscar.c:3186 src/protocols/oscar/oscar.c:6523
+#: src/protocols/oscar/oscar.c:3087 src/protocols/oscar/oscar.c:6236
 msgid "Get File"
 msgstr "Laste ned fil"
 
-#: src/protocols/oscar/oscar.c:3193
+#: src/protocols/oscar/oscar.c:3090 src/protocols/oscar/oscar.c:6228
+msgid "Send File"
+msgstr "Send fil"
+
+#: src/protocols/oscar/oscar.c:3094
 msgid "Games"
 msgstr "Spill"
 
-#: src/protocols/oscar/oscar.c:3196
+#: src/protocols/oscar/oscar.c:3097
 msgid "Add-Ins"
 msgstr "Tillegg"
 
-#: src/protocols/oscar/oscar.c:3199
+#: src/protocols/oscar/oscar.c:3100
 msgid "Send Buddy List"
 msgstr "Sende kontaktliste"
 
-#: src/protocols/oscar/oscar.c:3202
+#: src/protocols/oscar/oscar.c:3103
 msgid "ICQ Direct Connect"
 msgstr "ICQ direktekobling"
 
-#: src/protocols/oscar/oscar.c:3205
+#: src/protocols/oscar/oscar.c:3106
 msgid "AP User"
 msgstr "AP-bruker"
 
-#: src/protocols/oscar/oscar.c:3208
+#: src/protocols/oscar/oscar.c:3109
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:3211
+#: src/protocols/oscar/oscar.c:3112
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:3214
+#: src/protocols/oscar/oscar.c:3115
 msgid "ICQ Server Relay"
 msgstr "ICQ tjenervideresending"
 
-#: src/protocols/oscar/oscar.c:3217
+#: src/protocols/oscar/oscar.c:3118
 msgid "Old ICQ UTF8"
 msgstr "Gammel ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:3220
+#: src/protocols/oscar/oscar.c:3121
 msgid "Trillian Encryption"
 msgstr "Trillian-kryptering"
 
-#: src/protocols/oscar/oscar.c:3223
+#: src/protocols/oscar/oscar.c:3124
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:3226
+#: src/protocols/oscar/oscar.c:3127
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: src/protocols/oscar/oscar.c:3229
+#: src/protocols/oscar/oscar.c:3130
 msgid "Security Enabled"
 msgstr "Sikkerhet slått på"
 
-#: src/protocols/oscar/oscar.c:3232
-#, fuzzy
-msgid "Video Chat"
-msgstr "Legg til samtale"
-
-#: src/protocols/oscar/oscar.c:3236
-#, fuzzy
-msgid "iChat AV"
-msgstr "Samtale"
-
-#: src/protocols/oscar/oscar.c:3239
-msgid "Live Video"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:3242
-#, fuzzy
-msgid "Camera"
-msgstr "Navn"
-
-#: src/protocols/oscar/oscar.c:3271
+#: src/protocols/oscar/oscar.c:3159
 #, c-format
 msgid "Username: <b>%s</b><br>\n"
 msgstr "Brukernavn: <b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3272
+#: src/protocols/oscar/oscar.c:3160
 #, c-format
 msgid "Warning Level: <b>%d%%</b><br>\n"
 msgstr "Advarselsnivå: <b>%d%%</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3275
+#: src/protocols/oscar/oscar.c:3163
 #, c-format
 msgid "Online Since: <b>%s</b><br>\n"
 msgstr "Pålogget siden: <b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3279
+#: src/protocols/oscar/oscar.c:3167
 #, c-format
 msgid "Member Since: <b>%s</b><br>\n"
 msgstr "Medlem siden: <b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3284
+#: src/protocols/oscar/oscar.c:3172
 #, c-format
 msgid "Idle: <b>%s</b>"
 msgstr "Inaktiv: <b>%s</b>"
 
-#: src/protocols/oscar/oscar.c:3287
+#: src/protocols/oscar/oscar.c:3175
 msgid "Idle: <b>Active</b>"
 msgstr "Inaktiv: <b>Ja</b>"
 
-#: src/protocols/oscar/oscar.c:3359
+#: src/protocols/oscar/oscar.c:3214
 msgid "Your AIM connection may be lost."
 msgstr "AIM-tilkoblingen kan være brutt."
 
-#: src/protocols/oscar/oscar.c:3760
+#: src/protocols/oscar/oscar.c:3608
 msgid "Rate limiting error."
 msgstr "Feil ved hastighetsbegrensning."
 
-#: src/protocols/oscar/oscar.c:3761
+#: src/protocols/oscar/oscar.c:3609
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7285,116 +6594,116 @@
 "Den siste kommandoen ble ikke utført fordi du har overskredet "
 "hastighetsgrensen. Vennligst vent 10 sekunder og prøv igjen."
 
-#: src/protocols/oscar/oscar.c:3824
+#: src/protocols/oscar/oscar.c:3670
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 msgstr ""
 "Du ble logget av fordi du har logget på med dette skjermnavnet et annet sted."
 
-#: src/protocols/oscar/oscar.c:3826
+#: src/protocols/oscar/oscar.c:3672
 msgid "You have been signed off for an unknown reason."
 msgstr "Du har blitt logget av, årsak ukjent."
 
-#: src/protocols/oscar/oscar.c:3857
+#: src/protocols/oscar/oscar.c:3703
 msgid "Finalizing connection"
 msgstr "Fullfører tilkobling"
 
-#: src/protocols/oscar/oscar.c:4117 src/protocols/oscar/oscar.c:4123
+#: src/protocols/oscar/oscar.c:3963 src/protocols/oscar/oscar.c:3969
 msgid "Email Address"
 msgstr "E-postadresse"
 
-#: src/protocols/oscar/oscar.c:4128
+#: src/protocols/oscar/oscar.c:3974
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: src/protocols/oscar/oscar.c:4131 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:3977 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:422
 msgid "Female"
 msgstr "Hunkjønn"
 
-#: src/protocols/oscar/oscar.c:4131 src/protocols/trepia/trepia.c:280
+#: src/protocols/oscar/oscar.c:3977 src/protocols/trepia/trepia.c:280
 #: src/protocols/trepia/trepia.c:422
 msgid "Male"
 msgstr "Hankjønn"
 
-#: src/protocols/oscar/oscar.c:4148
+#: src/protocols/oscar/oscar.c:3994
 msgid "Personal Web Page"
 msgstr "Personlig hjemmeside"
 
-#: src/protocols/oscar/oscar.c:4151
+#: src/protocols/oscar/oscar.c:3997
 msgid "Additional Information"
 msgstr "Tilleggsinformasjon"
 
-#: src/protocols/oscar/oscar.c:4155
+#: src/protocols/oscar/oscar.c:4001
 msgid "Home Address"
 msgstr "Hjemstedsadresse"
 
-#: src/protocols/oscar/oscar.c:4166 src/protocols/oscar/oscar.c:4182
+#: src/protocols/oscar/oscar.c:4012 src/protocols/oscar/oscar.c:4028
 msgid "Zip Code"
 msgstr "Postnummer"
 
-#: src/protocols/oscar/oscar.c:4171
+#: src/protocols/oscar/oscar.c:4017
 msgid "Work Address"
 msgstr "Arbeidsadresse"
 
-#: src/protocols/oscar/oscar.c:4187
+#: src/protocols/oscar/oscar.c:4033
 msgid "Work Information"
 msgstr "Arbeid ekstra info"
 
-#: src/protocols/oscar/oscar.c:4189
+#: src/protocols/oscar/oscar.c:4035
 msgid "Company"
 msgstr "Firma"
 
-#: src/protocols/oscar/oscar.c:4192
+#: src/protocols/oscar/oscar.c:4038
 msgid "Division"
 msgstr "Avdeling"
 
-#: src/protocols/oscar/oscar.c:4195
+#: src/protocols/oscar/oscar.c:4041
 msgid "Position"
 msgstr "Stilling"
 
-#: src/protocols/oscar/oscar.c:4198
+#: src/protocols/oscar/oscar.c:4044
 msgid "Web Page"
 msgstr "Hjemmeside"
 
-#: src/protocols/oscar/oscar.c:4204
+#: src/protocols/oscar/oscar.c:4050
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "ICQ-info for %s"
 
-#: src/protocols/oscar/oscar.c:4254
+#: src/protocols/oscar/oscar.c:4100
 msgid "Pop-Up Message"
 msgstr "Varslingsbeskjed"
 
-#: src/protocols/oscar/oscar.c:4275
-#, fuzzy, c-format
-msgid "The following screen names are associated with %s"
+#: src/protocols/oscar/oscar.c:4121
+#, c-format
+msgid "The following screennames are associated with %s"
 msgstr "De følgende skjermnavnene er assosierte med %s"
 
-#: src/protocols/oscar/oscar.c:4279
+#: src/protocols/oscar/oscar.c:4125
 msgid "Search Results"
 msgstr "Søkeresultater"
 
-#: src/protocols/oscar/oscar.c:4296
+#: src/protocols/oscar/oscar.c:4142
 #, c-format
 msgid "No results found for email address %s"
 msgstr "Ingen resultater funnet for e-postadresse %s"
 
-#: src/protocols/oscar/oscar.c:4317
+#: src/protocols/oscar/oscar.c:4163
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "Du vil motta en e-post hvor du blir bedt om å bekrefte %s."
 
-#: src/protocols/oscar/oscar.c:4319
+#: src/protocols/oscar/oscar.c:4165
 msgid "Account Confirmation Requested"
 msgstr "Kontobekreftelse forespurt"
 
-#: src/protocols/oscar/oscar.c:4347
+#: src/protocols/oscar/oscar.c:4193
 msgid "Error Changing Account Info"
 msgstr "Feil ved endring av kontoinformasjon"
 
-#: src/protocols/oscar/oscar.c:4350
+#: src/protocols/oscar/oscar.c:4196
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7403,7 +6712,7 @@
 "Feil 0x%04x: Kunne ikke formatere skjermnavnet fordi det forespurte "
 "skjermnavnet er forskjellig fra det opprinnelige."
 
-#: src/protocols/oscar/oscar.c:4353
+#: src/protocols/oscar/oscar.c:4199
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7412,7 +6721,7 @@
 "Feil 0x%04x: Kunne ikke formatere skjermnavnet fordi det forespurte "
 "skjermnavnet slutter med et mellomrom."
 
-#: src/protocols/oscar/oscar.c:4356
+#: src/protocols/oscar/oscar.c:4202
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7421,7 +6730,7 @@
 "Feil 0x%04x: Kunne ikke formatere skjermnavnet fordi det forespurte "
 "skjermnavnet er for langt."
 
-#: src/protocols/oscar/oscar.c:4359
+#: src/protocols/oscar/oscar.c:4205
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -7430,7 +6739,7 @@
 "Feil 0x%04x: Kunne ikke endre e-postadressen fordi det finnes en utestående "
 "forespørsel for dette skjermnavnet."
 
-#: src/protocols/oscar/oscar.c:4362
+#: src/protocols/oscar/oscar.c:4208
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -7439,7 +6748,7 @@
 "Feil 0x%04x: Kunne ikke endre e-postadressen fordi den gitte adressen har "
 "for mange skjermnavn assosiert ved seg."
 
-#: src/protocols/oscar/oscar.c:4365
+#: src/protocols/oscar/oscar.c:4211
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -7448,12 +6757,12 @@
 "Feil 0x%04x: Kunne ikke endre e-postadressen fordi den gitte adressen er "
 "ugyldig."
 
-#: src/protocols/oscar/oscar.c:4368
+#: src/protocols/oscar/oscar.c:4214
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Feil 0x%04x: Ukjent feil."
 
-#: src/protocols/oscar/oscar.c:4378
+#: src/protocols/oscar/oscar.c:4224
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -7462,20 +6771,20 @@
 "Skjermnavnet ditt er formatert slik:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4379 src/protocols/oscar/oscar.c:4386
+#: src/protocols/oscar/oscar.c:4225 src/protocols/oscar/oscar.c:4232
 msgid "Account Info"
 msgstr "Kontoinformasjon"
 
-#: src/protocols/oscar/oscar.c:4384
+#: src/protocols/oscar/oscar.c:4230
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "E-postadressen for %s er %s"
 
-#: src/protocols/oscar/oscar.c:4616
+#: src/protocols/oscar/oscar.c:4462
 msgid "Unable to set AIM profile."
 msgstr "Kunne ikke sette AIM-profil."
 
-#: src/protocols/oscar/oscar.c:4617
+#: src/protocols/oscar/oscar.c:4463
 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 "
@@ -7485,7 +6794,7 @@
 "innloggingsprosedyren var ferdig. Din profil er ennå ikke blitt lagret. Prøv "
 "å lagre den igjen når du er ferdig pålogget."
 
-#: src/protocols/oscar/oscar.c:4644
+#: src/protocols/oscar/oscar.c:4490
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -7500,20 +6809,15 @@
 "Maksimum profillengde på %d bytes har blitt overskredet. Gaim har avkortet "
 "den før den ble lagret."
 
-#: src/protocols/oscar/oscar.c:4649
+#: src/protocols/oscar/oscar.c:4495
 msgid "Profile too long."
 msgstr "Profilen er for stor."
 
-#: src/protocols/oscar/oscar.c:4665 src/protocols/oscar/oscar.c:6418
-#, fuzzy
-msgid "Visible"
-msgstr "Usynlig"
-
-#: src/protocols/oscar/oscar.c:4676
+#: src/protocols/oscar/oscar.c:4512
 msgid "Unable to set AIM away message."
 msgstr "Kunne ikke sette fraværsbeskjed for AIM."
 
-#: src/protocols/oscar/oscar.c:4677
+#: src/protocols/oscar/oscar.c:4513
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -7523,7 +6827,7 @@
 "innloggingsprosedyren var ferdig. Du er fortsatt markert som til stede. Prøv "
 "å gjenta operasjonen når du er ferdig pålogget."
 
-#: src/protocols/oscar/oscar.c:4717
+#: src/protocols/oscar/oscar.c:4553
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -7538,28 +6842,15 @@
 "Maksimumslengden på %d bytes for fraværsbeskjeder har blitt overskredet. "
 "Gaim har avkortet den."
 
-#: src/protocols/oscar/oscar.c:4722
+#: src/protocols/oscar/oscar.c:4558
 msgid "Away message too long."
 msgstr "Fraværsbeskjeden er for lang."
 
-#: 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 "Kunne ikke legge til"
-
-#: src/protocols/oscar/oscar.c:4952
+#: src/protocols/oscar/oscar.c:4772
 msgid "Unable To Retrieve Buddy List"
 msgstr "Kunne ikke hente kontaktliste"
 
-#: src/protocols/oscar/oscar.c:4953
+#: src/protocols/oscar/oscar.c:4773
 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 "
@@ -7568,13 +6859,12 @@
 "Gaim klarte ikke å hente kontaktlisten din fra AIM-tjenerne. Kontaktlisten "
 "er ikke tapt, og vil sannsynligvis bli tilgjengelig i løpet av få timer."
 
-#: 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:4865 src/protocols/oscar/oscar.c:4866
+#: src/protocols/oscar/oscar.c:4871
 msgid "Orphans"
 msgstr "Ugrupperte"
 
-#: src/protocols/oscar/oscar.c:5232
+#: src/protocols/oscar/oscar.c:5037
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7583,11 +6873,15 @@
 "Kunne ikke legge til kontakten %s fordi du har for mange kontakter i listen. "
 "Vennligst fjern en og prøv igjen."
 
-#: src/protocols/oscar/oscar.c:5232 src/protocols/oscar/oscar.c:5245
+#: src/protocols/oscar/oscar.c:5037 src/protocols/oscar/oscar.c:5050
 msgid "(no name)"
 msgstr "(uten navn)"
 
-#: src/protocols/oscar/oscar.c:5245
+#: src/protocols/oscar/oscar.c:5038 src/protocols/oscar/oscar.c:5051
+msgid "Unable To Add"
+msgstr "Kunne ikke legge til"
+
+#: src/protocols/oscar/oscar.c:5050
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -7598,7 +6892,7 @@
 "til dette er at du har nådd maksimalgrensen for antall kontakter i "
 "kontaktlisten din."
 
-#: src/protocols/oscar/oscar.c:5327
+#: src/protocols/oscar/oscar.c:5085
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -7607,11 +6901,11 @@
 "Brukeren %s har gitt deg tillatelse til å legge deg til i kontaktlisten sin. "
 "Ønsker du å legge til vedkommende?"
 
-#: src/protocols/oscar/oscar.c:5333
+#: src/protocols/oscar/oscar.c:5091
 msgid "Authorization Given"
 msgstr "Godkjent"
 
-#: src/protocols/oscar/oscar.c:5366
+#: src/protocols/oscar/oscar.c:5124
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -7621,19 +6915,19 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5408
+#: src/protocols/oscar/oscar.c:5166
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
 "Brukeren %s har akseptert din forespørsel om å bli lagt til i kontaktlisten "
 "din."
 
-#: src/protocols/oscar/oscar.c:5409
+#: src/protocols/oscar/oscar.c:5167
 msgid "Authorization Granted"
 msgstr "Godkjent"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5412
+#: src/protocols/oscar/oscar.c:5170
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7644,63 +6938,56 @@
 "med følgende grun:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5413
+#: src/protocols/oscar/oscar.c:5171
 msgid "Authorization Denied"
 msgstr "Ikke godkjent"
 
-#: src/protocols/oscar/oscar.c:5450 src/protocols/toc/toc.c:1264
-#, fuzzy
-msgid "_Exchange:"
+#: src/protocols/oscar/oscar.c:5208 src/protocols/toc/toc.c:1264
+msgid "Exchange:"
 msgstr "Utveksling:"
 
-#: src/protocols/oscar/oscar.c:5472
-#, fuzzy
-msgid "Invalid chat name specified."
-msgstr "Ugyldig Gadu-Gadu UIN oppgitt"
-
-#: src/protocols/oscar/oscar.c:5703
+#: src/protocols/oscar/oscar.c:5445
 msgid "<b>Status:</b> "
 msgstr "<b>Status:</b> "
 
-#: src/protocols/oscar/oscar.c:5715
+#: src/protocols/oscar/oscar.c:5454
+msgid "<b>Logged In:</b> "
+msgstr "<b>Pålogget:</b> "
+
+#: src/protocols/oscar/oscar.c:5466
 msgid "<b>IP Address:</b> "
 msgstr "<b>IP-adresse:</b> "
 
-#: src/protocols/oscar/oscar.c:5723
+#: src/protocols/oscar/oscar.c:5474
 msgid "<b>Capabilities:</b> "
 msgstr "<b>Evner:</b> "
 
-#: src/protocols/oscar/oscar.c:5732
-#, fuzzy
-msgid "<b>Buddy Comment:</b> "
-msgstr "Kontaktkommentar:"
-
-#: src/protocols/oscar/oscar.c:5741
+#: src/protocols/oscar/oscar.c:5481
 msgid "<b>Available:</b> "
 msgstr "<b>Tilgjengelig:</b> "
 
-#: src/protocols/oscar/oscar.c:5760
+#: src/protocols/oscar/oscar.c:5499
 msgid "<b>Away Message:</b> "
 msgstr "<b>Fraværsbeskjed:</b> "
 
-#: src/protocols/oscar/oscar.c:5768
+#: src/protocols/oscar/oscar.c:5508
 msgid "<b>Status:</b> Not Authorized"
 msgstr "<b>Status:</b> Ikke godkjent"
 
-#: src/protocols/oscar/oscar.c:5802 src/protocols/yahoo/yahoo.c:2293
+#: src/protocols/oscar/oscar.c:5542 src/protocols/yahoo/yahoo.c:2030
 msgid "Offline"
 msgstr "Avlogget"
 
-#: src/protocols/oscar/oscar.c:6268
+#: src/protocols/oscar/oscar.c:5990
 msgid "Unable to open Direct IM"
 msgstr "Kunne ikke åpne direkte direktemelding"
 
-#: src/protocols/oscar/oscar.c:6281
+#: src/protocols/oscar/oscar.c:6003
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Du har valgt å åpne en direktemelding til %s."
 
-#: src/protocols/oscar/oscar.c:6284
+#: src/protocols/oscar/oscar.c:6006
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -7708,130 +6995,117 @@
 "Dette vil avsløre din IP-adresse til mottakeren, og medføre en (minimal) "
 "sikkerhetsrisiko. Ønsker du å fortsette?"
 
-#: src/protocols/oscar/oscar.c:6468
+#: src/protocols/oscar/oscar.c:6181
 msgid "Buddy Comment:"
 msgstr "Kontaktkommentar:"
 
-#: src/protocols/oscar/oscar.c:6484
+#: src/protocols/oscar/oscar.c:6197
 msgid "Edit Buddy Comment"
 msgstr "Rediger kontaktkommentar"
 
-#: src/protocols/oscar/oscar.c:6492
+#: src/protocols/oscar/oscar.c:6205
 msgid "Get Status Msg"
 msgstr "Hent statusbeskjed"
 
-#: src/protocols/oscar/oscar.c:6507
+#: src/protocols/oscar/oscar.c:6220
 msgid "Direct IM"
 msgstr "Direkte samtale"
 
-#: src/protocols/oscar/oscar.c:6536
+#: src/protocols/oscar/oscar.c:6249
 msgid "Re-request Authorization"
 msgstr "Spør på nytt om godkjenning"
 
-#: src/protocols/oscar/oscar.c:6557
+#: src/protocols/oscar/oscar.c:6270
 msgid "The new formatting is invalid."
 msgstr "Den nye formateringen er ugyldig."
 
-#: src/protocols/oscar/oscar.c:6558
-#, fuzzy
-msgid "Screen name formatting can change only capitalization and whitespace."
+#: src/protocols/oscar/oscar.c:6271
+msgid "Screenname formatting can change only capitalization and whitespace."
 msgstr ""
 "Skjermnavn-formatering kan bare endre på store/små bokstaver og mellomrom."
 
-#: src/protocols/oscar/oscar.c:6564
-#, fuzzy
-msgid "New screen name formatting:"
+#: src/protocols/oscar/oscar.c:6277
+msgid "New screenname formatting:"
 msgstr "Ny skjermnavn-formatering:"
 
-#: src/protocols/oscar/oscar.c:6613
+#: src/protocols/oscar/oscar.c:6326
 msgid "Change Address To:"
 msgstr "Endre adresse til:"
 
-#: src/protocols/oscar/oscar.c:6657
+#: src/protocols/oscar/oscar.c:6370
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>du venter ikke på godkjenning</i>"
 
-#: src/protocols/oscar/oscar.c:6660
+#: src/protocols/oscar/oscar.c:6373
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Du venter på godkjenning fra disse kontaktene"
 
-#: src/protocols/oscar/oscar.c:6661
+#: src/protocols/oscar/oscar.c:6374
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
 msgstr ""
-"Du kan spørre om godkjenning på nytt hos disse kontaktene ved å høyreklikke "
-"på dem og velge \"Spør på nytt om godkjenning\"."
-
-#: src/protocols/oscar/oscar.c:6675
+"Du kan spørre om godkjenning på nytt hos disse kontaktene ved å "
+"høyreklikke på dem og velge \"Spør på nytt om godkjenning\"."
+
+#: src/protocols/oscar/oscar.c:6388
 msgid "Find Buddy by E-mail"
 msgstr "Finn kontakt etter e-post"
 
-#: src/protocols/oscar/oscar.c:6676
+#: src/protocols/oscar/oscar.c:6389
 msgid "Search for a buddy by e-mail address"
 msgstr "Kontaktsøk etter e-postadresse"
 
-#: src/protocols/oscar/oscar.c:6677
+#: src/protocols/oscar/oscar.c:6390
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Skriv inn e-postadressen til den du søker etter."
 
-#: src/protocols/oscar/oscar.c:6694
+#: src/protocols/oscar/oscar.c:6393
+msgid "Search"
+msgstr "Søk"
+
+#: src/protocols/oscar/oscar.c:6407
 msgid "Available Message:"
 msgstr "Tilstedebeskjed:"
 
-#: src/protocols/oscar/oscar.c:6695
+#: src/protocols/oscar/oscar.c:6408
 msgid "I'm doing work and hoping for a distraction--IM me!"
 msgstr "Jeg jobber og håper at noen skal forstyrre - send meg en beskjed!"
 
-#: src/protocols/oscar/oscar.c:6766
-#, fuzzy
-msgid "Set User Info..."
-msgstr "Sett brukerinfo"
-
-#: src/protocols/oscar/oscar.c:6773
-#, fuzzy
-msgid "Set Available Message..."
+#: src/protocols/oscar/oscar.c:6486
+msgid "Set Available Message"
 msgstr "Sett tilstedebeskjed"
 
-#: src/protocols/oscar/oscar.c:6780
-#, fuzzy
-msgid "Change Password..."
-msgstr "Bytt passord"
-
-#: src/protocols/oscar/oscar.c:6787
+#: src/protocols/oscar/oscar.c:6500
 msgid "Change Password (URL)"
 msgstr "Endre passord (URL)"
 
-#: src/protocols/oscar/oscar.c:6795
+#: src/protocols/oscar/oscar.c:6508
 msgid "Configure IM Forwarding (URL)"
 msgstr "Konfigurer beskjedvideresending (URL)"
 
-#: src/protocols/oscar/oscar.c:6806
-#, fuzzy
-msgid "Format Screen Name..."
+#: src/protocols/oscar/oscar.c:6519
+msgid "Format Screenname"
 msgstr "Formatere skjermnavn"
 
-#: src/protocols/oscar/oscar.c:6812
+#: src/protocols/oscar/oscar.c:6525
 msgid "Confirm Account"
 msgstr "Bekrefte konto"
 
-#: src/protocols/oscar/oscar.c:6818
-#, fuzzy
-msgid "Display Currently Registered Address"
+#: src/protocols/oscar/oscar.c:6531
+msgid "Display Current Registered Address"
 msgstr "Vis registrert adresse"
 
-#: src/protocols/oscar/oscar.c:6824
-#, fuzzy
-msgid "Change Currently Registered Address..."
+#: src/protocols/oscar/oscar.c:6537
+msgid "Change Current Registered Address"
 msgstr "Endre registrert adresse"
 
-#: src/protocols/oscar/oscar.c:6833
+#: src/protocols/oscar/oscar.c:6546
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Vis kontakter som venter på godkjenning"
 
-#: src/protocols/oscar/oscar.c:6841
-#, fuzzy
-msgid "Search for Buddy by Email..."
+#: src/protocols/oscar/oscar.c:6554
+msgid "Search for Buddy by Email"
 msgstr "Kontaktsøk etter e-postadresse"
 
 #. *< api_version
@@ -7844,16 +7118,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/oscar/oscar.c:6962 src/protocols/oscar/oscar.c:6964
+#: src/protocols/oscar/oscar.c:6675 src/protocols/oscar/oscar.c:6677
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ-protokolltillegg"
 
-#: src/protocols/oscar/oscar.c:6981
+#: src/protocols/oscar/oscar.c:6694
 msgid "Auth host"
 msgstr "Autentiseringsadresse:"
 
-#: src/protocols/oscar/oscar.c:6986
+#: src/protocols/oscar/oscar.c:6699
 msgid "Auth port"
 msgstr "Autentiseringsport:"
 
@@ -8026,18 +7299,18 @@
 msgstr "Filoverføringen mislyktes - sannsynligvis avbrutt på den andre siden."
 
 #: src/protocols/toc/toc.c:1745 src/protocols/toc/toc.c:1785
-#: src/protocols/toc/toc.c:1909 src/protocols/toc/toc.c:1997
+#: src/protocols/toc/toc.c:1997
 msgid "Could not connect for transfer."
 msgstr "Kunne ikke koble til for dataoverføring."
 
+#: src/protocols/toc/toc.c:1909
+msgid "Could not connect for transfer!"
+msgstr "Kunne ikke koble til for dataoverføring!"
+
 #: src/protocols/toc/toc.c:1942
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "Kunne ikke skrive filhode. Filen vil ikke bli overført."
 
-#: src/protocols/toc/toc.c:2042
-msgid "Gaim - Save As..."
-msgstr "Gaim - Lagre som..."
-
 #: src/protocols/toc/toc.c:2076
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
@@ -8060,7 +7333,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: src/protocols/toc/toc.c:2159 src/protocols/toc/toc.c:2161
 msgid "TOC Protocol Plugin"
 msgstr "TOC-protokolltillegg"
@@ -8138,7 +7410,11 @@
 msgid "Local Users"
 msgstr "Lokale brukere"
 
-#: src/protocols/trepia/trepia.c:1078
+#: src/protocols/trepia/trepia.c:972
+msgid "Read error"
+msgstr "Lesefeil"
+
+#: src/protocols/trepia/trepia.c:1073
 msgid "Logging in"
 msgstr "Logger på"
 
@@ -8152,66 +7428,50 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/trepia/trepia.c:1326 src/protocols/trepia/trepia.c:1328
+#: src/protocols/trepia/trepia.c:1321 src/protocols/trepia/trepia.c:1323
 msgid "Trepia Protocol Plugin"
 msgstr "Trepia-protokolltillegg"
 
-#: src/protocols/yahoo/yahoo.c:308
-msgid ""
-"You have been logged off as you have logged in on a different machine or "
-"device."
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:747
+#: src/protocols/yahoo/yahoo.c:700
 msgid "Your Yahoo! message did not get sent."
 msgstr "Din Yahoo!-beskjed ble ikke sendt."
 
-#: src/protocols/yahoo/yahoo.c:765
-msgid "Buzz!!"
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:800
-#, c-format
-msgid "Yahoo! system message for %s:"
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:866
+#: src/protocols/yahoo/yahoo.c:758
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
-"%s har (tilbakevirkende) avslått din forespørsel om å bli lagt til i "
-"kontaktlisten din."
-
-#: src/protocols/yahoo/yahoo.c:869
+"%s har (tilbakevirkende) avslått din forespørsel om å bli lagt til i kontaktlisten "
+"din."
+
+#: src/protocols/yahoo/yahoo.c:760
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 msgstr ""
-"%s har (tilbakevirkende) avslått din forespørsel om å bli lagt til i "
-"kontaktlisten med følgende grunn: %s."
-
-#: src/protocols/yahoo/yahoo.c:872
+"%s har (tilbakevirkende) avslått din forespørsel om å bli lagt til i kontaktlisten "
+"med følgende grunn: %s."
+
+#: src/protocols/yahoo/yahoo.c:761
 msgid "Add buddy rejected"
 msgstr "Legge til kontakt avslått"
 
-#: src/protocols/yahoo/yahoo.c:1595
+#: src/protocols/yahoo/yahoo.c:1381
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
 "method.  This version of Gaim will likely not be able to successfully sign "
 "on to Yahoo.  Check %s for updates."
 msgstr ""
-"Yahoo-tjeneren har forespurt bruk av en ukjent autentiseringsmetode. Denne "
-"versjonen av Gaim vil antakeligvis ikke være i stand til å logge på Yahoo. "
-"Sjekk %s for oppdateringer."
-
-#: src/protocols/yahoo/yahoo.c:1598
+"Yahoo-tjeneren har forespurt bruk av en ukjent autentiseringsmetode. "
+"Denne versjonen av Gaim vil antakeligvis ikke være i stand til å logge på "
+"Yahoo. Sjekk %s for oppdateringer."
+
+#: src/protocols/yahoo/yahoo.c:1384
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo!-autentisering feilet"
 
-#: src/protocols/yahoo/yahoo.c:1671
+#: src/protocols/yahoo/yahoo.c:1457
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -8220,154 +7480,136 @@
 "Du forsøkte å ignorere %s, men vedkommende er i kontaktlisten din. Hvis du "
 "klikker på \"Ja\" vil kontakten fjernes og ignoreres."
 
-#: src/protocols/yahoo/yahoo.c:1674
+#: src/protocols/yahoo/yahoo.c:1460
 msgid "Ignore buddy?"
 msgstr "Ignorere kontakt?"
 
-#: src/protocols/yahoo/yahoo.c:1707
+#: src/protocols/yahoo/yahoo.c:1489
 msgid "Invalid username."
 msgstr "Ugyldig brukernavn,"
 
-#: src/protocols/yahoo/yahoo.c:1710
+#: src/protocols/yahoo/yahoo.c:1492
 msgid "Incorrect password."
 msgstr "Feil passord."
 
-#: src/protocols/yahoo/yahoo.c:1713
-msgid "Your account is locked, please log in to the yahoo website."
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:1716
-#, fuzzy, c-format
-msgid "Unknown error number %d."
-msgstr "Ukjent feilkode %d"
-
-#: src/protocols/yahoo/yahoo.c:1773
+#: src/protocols/yahoo/yahoo.c:1495
+msgid "Unknown error."
+msgstr "Ukjent feil."
+
+#: src/protocols/yahoo/yahoo.c:1542
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
-msgstr ""
-"Kunne ikke legge til kontakt %s i gruppen %s i tjenerlisten på konto %s."
-
-#: src/protocols/yahoo/yahoo.c:1775
+msgstr "Kunne ikke legge til kontakt %s i gruppen %s i tjenerlisten på konto %s."
+
+#: src/protocols/yahoo/yahoo.c:1544
 msgid "Could not add buddy to server list"
 msgstr "Kunne ikke legge til kontakt i kontaktliste"
 
-#: src/protocols/yahoo/yahoo.c:1885 src/protocols/yahoo/yahoo.c:2016
+#: src/protocols/yahoo/yahoo.c:1646 src/protocols/yahoo/yahoo.c:1776
 msgid "Unable to read"
 msgstr "Kunne ikke lese"
 
-#: 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:1801 src/protocols/yahoo/yahoo.c:1910
+#: src/protocols/yahoo/yahoo.c:1934
 msgid "Connection problem"
 msgstr "Problem ved tilkobling"
 
-#: src/protocols/yahoo/yahoo.c:2275 src/protocols/yahoo/yahoo.c:2600
-#: src/protocols/yahoo/yahoo.c:2706
+#: src/protocols/yahoo/yahoo.c:2012 src/protocols/yahoo/yahoo.c:2310
+#: src/protocols/yahoo/yahoo.c:2408
 msgid "Not At Home"
 msgstr "Ikke hjemme"
 
-#: src/protocols/yahoo/yahoo.c:2277 src/protocols/yahoo/yahoo.c:2602
-#: src/protocols/yahoo/yahoo.c:2707
+#: src/protocols/yahoo/yahoo.c:2014 src/protocols/yahoo/yahoo.c:2312
+#: src/protocols/yahoo/yahoo.c:2409
 msgid "Not At Desk"
 msgstr "Ikke ved skrivebordet"
 
-#: src/protocols/yahoo/yahoo.c:2279 src/protocols/yahoo/yahoo.c:2604
-#: src/protocols/yahoo/yahoo.c:2708
+#: src/protocols/yahoo/yahoo.c:2016 src/protocols/yahoo/yahoo.c:2314
+#: src/protocols/yahoo/yahoo.c:2410
 msgid "Not In Office"
 msgstr "Ikke 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:2020 src/protocols/yahoo/yahoo.c:2318
+#: src/protocols/yahoo/yahoo.c:2412
 msgid "On Vacation"
 msgstr "På ferie"
 
-#: src/protocols/yahoo/yahoo.c:2287 src/protocols/yahoo/yahoo.c:2612
-#: src/protocols/yahoo/yahoo.c:2712
+#: src/protocols/yahoo/yahoo.c:2024 src/protocols/yahoo/yahoo.c:2322
+#: src/protocols/yahoo/yahoo.c:2414
 msgid "Stepped Out"
 msgstr "Ute"
 
-#: src/protocols/yahoo/yahoo.c:2351 src/protocols/yahoo/yahoo.c:2383
+#: src/protocols/yahoo/yahoo.c:2088 src/protocols/yahoo/yahoo.c:2122
 msgid "Not on server list"
 msgstr "Ikke på tjenerlisten"
 
-#: src/protocols/yahoo/yahoo.c:2439
+#: src/protocols/yahoo/yahoo.c:2178
 msgid "Join in Chat"
 msgstr "Bli med i samtalegruppe"
 
-#: src/protocols/yahoo/yahoo.c:2445
+#: src/protocols/yahoo/yahoo.c:2184
 msgid "Initiate Conference"
 msgstr "Start konferanse"
 
-#: src/protocols/yahoo/yahoo.c:2498
+#: src/protocols/yahoo/yahoo.c:2230
 msgid "Active which ID?"
 msgstr "Aktiver hvilken ID?"
 
-#: src/protocols/yahoo/yahoo.c:2506
-#, fuzzy
-msgid "Join who in chat?"
-msgstr "Bli med i samtalegruppe"
-
-#: src/protocols/yahoo/yahoo.c:2517
-#, fuzzy
-msgid "Activate ID..."
+#: src/protocols/yahoo/yahoo.c:2241
+msgid "Activate ID"
 msgstr "Aktiver ID"
 
-#: src/protocols/yahoo/yahoo.c:2523
-#, fuzzy
-msgid "Join user in chat..."
-msgstr "Bli med i samtalegruppe..."
-
-#: src/protocols/yahoo/yahoo.c:2905
+#: src/protocols/yahoo/yahoo.c:2599
 msgid ""
 "<b>Sorry, profiles marked as containing adult content are not supported at "
 "this time.</b><br><br>\n"
 msgstr ""
-"<b>Beklager, profiler som er markert med vokseninnhold er ikke støttet.</"
-"b><br><br>\n"
-
-#: src/protocols/yahoo/yahoo.c:2906 src/protocols/yahoo/yahoo.c:2929
+"<b>Beklager, profiler som er markert med vokseninnhold er ikke støttet.</b>"
+"<br><br>\n"
+
+#: src/protocols/yahoo/yahoo.c:2600 src/protocols/yahoo/yahoo.c:2620
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser<br>"
 msgstr ""
-"Hvis du ønsker å vise denne profilen, må du åpne denne lenken i en "
-"nettleser<br>"
-
-#: src/protocols/yahoo/yahoo.c:2928
+"Hvis du ønsker å vise denne profilen, må du åpne denne lenken i en nettleser<br>"
+
+#: src/protocols/yahoo/yahoo.c:2619
 msgid ""
 "<b>Sorry, non-English profiles are not supported at this time.</b><br><br>\n"
-msgstr "<b>Beklager, ikke-engelske profiles støttes ikke ennå.</b><br><br>\n"
-
-#: src/protocols/yahoo/yahoo.c:2976 src/protocols/yahoo/yahoo.c:2977
+msgstr ""
+"<b>Beklager, ikke-engelske profiles støttes ikke ennå.</b><br><br>\n"
+
+#: src/protocols/yahoo/yahoo.c:2664
 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:2724 src/protocols/yahoo/yahoo.c:2728
+#: src/protocols/yahoo/yahoo.c:2732
 msgid "Hobbies"
 msgstr "Hobbyer"
 
-#: src/protocols/yahoo/yahoo.c:3036 src/protocols/yahoo/yahoo.c:3039
+#: src/protocols/yahoo/yahoo.c:2743 src/protocols/yahoo/yahoo.c:2747
 msgid "Latest News"
 msgstr "Siste nytt"
 
-#: src/protocols/yahoo/yahoo.c:3053
+#: src/protocols/yahoo/yahoo.c:2765
 msgid "Home Page"
 msgstr "Hjemmeside"
 
-#: src/protocols/yahoo/yahoo.c:3065
+#: src/protocols/yahoo/yahoo.c:2779
 msgid "Cool Link 1"
 msgstr "Kul lenke 1"
 
-#: src/protocols/yahoo/yahoo.c:3069
+#: src/protocols/yahoo/yahoo.c:2784
 msgid "Cool Link 2"
 msgstr "Kul lenke 2"
 
-#: src/protocols/yahoo/yahoo.c:3071
+#: src/protocols/yahoo/yahoo.c:2787
 msgid "Cool Link 3"
 msgstr "Kul lenke 3"
 
-#: src/protocols/yahoo/yahoo.c:3077
+#: src/protocols/yahoo/yahoo.c:2793
 msgid "Member Since"
 msgstr "Medlem siden"
 
@@ -8381,127 +7623,71 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/yahoo/yahoo.c:3283 src/protocols/yahoo/yahoo.c:3285
+#: src/protocols/yahoo/yahoo.c:2958 src/protocols/yahoo/yahoo.c:2960
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo-protokolltillegg"
 
-#: src/protocols/yahoo/yahoo.c:3302
+#: src/protocols/yahoo/yahoo.c:2977
 msgid "Pager host"
 msgstr "Personsøker-adresse:"
 
-#: src/protocols/yahoo/yahoo.c:3305
+#: src/protocols/yahoo/yahoo.c:2982
 msgid "Pager port"
 msgstr "Personsøker-port:"
 
-#: src/protocols/yahoo/yahoo.c:3308
-#, fuzzy
-msgid "File transfer host"
-msgstr "Filoverføringer"
-
-#: src/protocols/yahoo/yahoo.c:3311
-#, fuzzy
-msgid "File transfer port"
-msgstr "Filoverføring avbrutt"
-
-#: src/protocols/yahoo/yahoo.c:3314
-#, fuzzy
-msgid "Chat Room List Url"
-msgstr "Samtalerom"
-
-#: 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 avslo din konferanseinvitasjon i rommet \"%s\" på grunn av \"%s\"."
 
-#: src/protocols/yahoo/yahoochat.c:200
+#: src/protocols/yahoo/yahoochat.c:196
 msgid "Invitation Rejected"
 msgstr "Invitasjonen avslått"
 
-#: src/protocols/yahoo/yahoochat.c:350
+#: src/protocols/yahoo/yahoochat.c:333
 msgid "Failed to join chat"
 msgstr "Kunne ikke bli med i samtalegruppen"
 
-#: src/protocols/yahoo/yahoochat.c:350
+#: src/protocols/yahoo/yahoochat.c:333
 msgid "Maybe the room is full?"
 msgstr "Kanskje rommet er fullt?"
 
-#: src/protocols/yahoo/yahoochat.c:426
-#, fuzzy, c-format
-msgid "You are now chatting in %s."
-msgstr "Du har blitt bannlyst fra %s."
-
-#: src/protocols/yahoo/yahoochat.c:580
+#: src/protocols/yahoo/yahoochat.c:531
 msgid "Failed to join buddy in chat"
 msgstr "Kunne ikke bli med i samtalegruppen"
 
-#: src/protocols/yahoo/yahoochat.c:581
+#: src/protocols/yahoo/yahoochat.c:532
 msgid "Maybe they're not in a chat?"
 msgstr "Kanskje de ikke er i samtale?"
 
-#: src/protocols/yahoo/yahoochat.c:1301
-msgid "Unable to connect"
-msgstr "Kunne ikke koble til"
-
-#: src/protocols/yahoo/yahoochat.c:1301
-#, fuzzy
-msgid "Fetching the room list failed."
-msgstr "Kanskje rommet er fullt?"
-
-#: src/protocols/yahoo/yahoochat.c:1346
-#, fuzzy
-msgid "Voices"
-msgstr "Lyd"
-
-#: 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 "Kunne ikke sette AIM-profil."
-
-#: src/protocols/yahoo/yahoochat.c:1414
-#, fuzzy
-msgid "User Rooms"
-msgstr "Brukervalg"
-
-#: src/protocols/zephyr/zephyr.c:525
+#: src/protocols/zephyr/zephyr.c:344
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>Bruker:</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>Gjemt eller ikke logget inn"
 
-#: src/protocols/zephyr/zephyr.c:533
+#: src/protocols/zephyr/zephyr.c:352
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>På %s siden %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 "Alle"
 
-#: src/protocols/zephyr/zephyr.c:820
+#: src/protocols/zephyr/zephyr.c:609
 msgid "Already logged in with Zephyr"
 msgstr "Allerede innlogged 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."
@@ -8509,23 +7695,20 @@
 "Fordi Zephyr bruker systemets innloggingsnavn, kan du ikke ha flere kontoer "
 "så lenge du er innlogget med samme brukernavn."
 
-#: src/protocols/zephyr/zephyr.c:1158
+#: src/protocols/zephyr/zephyr.c:868
 msgid "ZLocate"
 msgstr "ZLocate"
 
-#: src/protocols/zephyr/zephyr.c:1198
-#, fuzzy
-msgid "_Class:"
+#: src/protocols/zephyr/zephyr.c:908
+msgid "Class:"
 msgstr "Klasse:"
 
-#: src/protocols/zephyr/zephyr.c:1203
-#, fuzzy
-msgid "_Instance:"
+#: src/protocols/zephyr/zephyr.c:913
+msgid "Instance:"
 msgstr "Instans:"
 
-#: src/protocols/zephyr/zephyr.c:1208
-#, fuzzy
-msgid "_Recipient:"
+#: src/protocols/zephyr/zephyr.c:918
+msgid "Recipient:"
 msgstr "Mottaker:"
 
 #. *< api_version
@@ -8538,81 +7721,59 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/zephyr/zephyr.c:1358 src/protocols/zephyr/zephyr.c:1360
+#: src/protocols/zephyr/zephyr.c:1050 src/protocols/zephyr/zephyr.c:1052
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr-protokolltillegg"
 
-#: 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
-msgid "Access denied: proxy server forbids port 80 tunnelling."
-msgstr ""
-
-#: src/proxy.c:956
-#, fuzzy, c-format
-msgid "Proxy connection error %d"
-msgstr "Feil ved tilkobling"
-
-#: src/proxy.c:1695
+#: src/proxy.c:1681
 msgid "Invalid proxy settings"
 msgstr "Ugyldige proxyinnstilinger"
 
-#: src/proxy.c:1695
+#: src/proxy.c:1681
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
-msgstr "Det spesifiserte maskinnavnet eller portnummeret for proxy er ugyldig."
+msgstr ""
+"Det spesifiserte maskinnavnet eller portnummeret for proxy er ugyldig."
 
 #. * Custom away message.
-#: src/prpl.h:189
+#: src/prpl.h:187
 msgid "Custom"
 msgstr "Egendefinert"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:1247
+#: src/request.h:862
 msgid "Accept"
 msgstr "Godta"
 
-#: src/server.c:58
+#: src/server.c:56
 msgid "Please enter your password"
 msgstr "Skriv inn passord"
 
-#: src/server.c:960
+#: src/server.c:948
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "(%d beskjeder)"
 msgstr[1] "(%d beskjeder)"
 
-#: src/server.c:974
+#: src/server.c:961
 msgid "(1 message)"
 msgstr "(1 beskjed)"
 
-#: src/server.c:1161 src/server.c:1171
+#: src/server.c:1142 src/server.c:1152
 #, c-format
 msgid "%s logged in."
 msgstr "%s logget inn."
 
-#: src/server.c:1188 src/server.c:1196
+#: src/server.c:1169 src/server.c:1177
 #, c-format
 msgid "%s logged out."
 msgstr "%s logget ut."
 
-#: src/server.c:1243
+#: src/server.c:1224
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -8621,11 +7782,11 @@
 "%s har blitt advart av %s.\n"
 "Ditt nye advarselsnivå er %d%%"
 
-#: src/server.c:1246
+#: src/server.c:1227
 msgid "an anonymous person"
 msgstr "en anonym person"
 
-#: src/server.c:1349
+#: src/server.c:1330
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -8634,292 +7795,67 @@
 "Brukeren '%s' inviterer %s til samtalerom: '%s'\n"
 "%s"
 
-#: src/server.c:1353
+#: src/server.c:1334
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr "Brukeren '%s' inviterer %s til samtalerom: '%s'\n"
 
-#: src/server.c:1359
+#: src/server.c:1340
 msgid "Accept chat invitation?"
 msgstr "Aksepter samtaleinvitasjon?"
 
 #. 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 "Borte litt, tilbake om en stund!"
 
-#: src/stock.c:86
-msgid "_Alias"
-msgstr "_Alias"
-
-#: src/stock.c:88
+#: src/stock.c:84
 msgid "_Modify"
 msgstr "_Endre"
 
-#: src/stock.c:89
+#: src/stock.c:85
 msgid "_Open Mail"
 msgstr "Åpne _e-post"
 
-#: src/stock.c:91
-msgid "_Warn"
-msgstr "Advar"
-
-#: src/util.c:1884
+#: src/util.c:1590
 msgid "Calculating..."
 msgstr "Beregner..."
 
-#: src/util.c:1887
+#: src/util.c:1593
 msgid "Unknown."
 msgstr "Ukjent."
 
-#: src/util.c:1918 src/util.c:1923 src/util.c:1928 src/util.c:1931
+#: src/util.c:1624 src/util.c:1629 src/util.c:1634 src/util.c:1637
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dag"
 msgstr[1] "dager"
 
-#: src/util.c:1919 src/util.c:1923 src/util.c:1937 src/util.c:1939
+#: src/util.c:1625 src/util.c:1629 src/util.c:1643 src/util.c:1645
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "time"
 msgstr[1] "timer"
 
-#: src/util.c:1919 src/util.c:1928 src/util.c:1937 src/util.c:1942
+#: src/util.c:1625 src/util.c:1634 src/util.c:1643 src/util.c:1648
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minutt"
 msgstr[1] "minutter"
 
-#: src/util.c:2274
+#: src/util.c:1980
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Feil ved tilkobling.\n"
 
-#: src/win32/win32dep.c:272
-#, fuzzy
-msgid "Moving Gaim Settings.."
-msgstr "Flytter katalog for Gaims brukerinnstillinger til:"
-
-#: src/win32/win32dep.c:275
-#, fuzzy
-msgid "Moving Gaim user settings to: "
-msgstr "Flytter katalog for Gaims brukerinnstillinger til:"
-
-#: src/win32/win32dep.c:277
+#: src/win32/win32dep.c:387
 msgid "Notification"
 msgstr "Varsling"
 
-#~ msgid "Gnome Stock Ticker Properties"
-#~ msgstr "Egenskaper for Gnome Stock Ticker"
-
-#~ msgid "Update Frequency in min"
-#~ msgstr "Oppdateringsfrekvens i minutter"
-
-#~ msgid "Enter symbols delimited with \"+\" in the box below."
-#~ msgstr "Skriv inn symboler atskilt med \"+\" i boksen under."
-
-#~ msgid "Check this box to display only symbols and price:"
-#~ msgstr "Kryss av denne boksen for å vise bare symboler og priser:"
-
-#~ msgid "Check this box to scroll left to right:"
-#~ msgstr "Kryss av denne boksen for å rulle fra venstre mot høyre:"
-
-#~ msgid "(No"
-#~ msgstr "(Nei"
-
-#~ msgid "Change"
-#~ msgstr "Endre"
-
-#~ msgid "Gaim - Away!"
-#~ msgstr "Gaim - Borte!"
-
-#~ msgid "Buddy Chat"
-#~ msgstr "Samtale"
-
-#~ msgid "Join Chat As:"
-#~ msgstr "Samtalegruppen er på denne kontoen:"
-
-#~ msgid "Join"
-#~ msgstr "_Start"
-
-#~ msgid "New Message"
-#~ msgstr "Ny beskjed"
-
-#~ msgid "_Screenname:"
-#~ msgstr "Skjermnavn:"
-
-#~ msgid "Changing info for %s:"
-#~ msgstr "Endrer info for %s:"
-
-#~ msgid "Alias chat"
-#~ msgstr "Samtalealias"
-
-#
-#~ msgid "Alias contact"
-#~ msgstr "Kontaktalias"
-
-#~ msgid "Alias buddy"
-#~ msgstr "Alias for kontakt"
-
-#~ msgid ""
-#~ "Please enter an aliased name for the person below, or rename this contact "
-#~ "in your buddy list."
-#~ msgstr ""
-#~ "Vennligst skriv inn et aliasnavn for personen under, eller endre "
-#~ "kontakten i kontaktlisten."
-
-#~ msgid "Couldn't write to %s."
-#~ msgstr "Kunne ikke skrive til %s."
-
-#~ msgid "Save Log File"
-#~ msgstr "Lagre loggfil"
-
-#~ msgid "Couldn't remove file %s."
-#~ msgstr "Kunne ikke fjerne fil %s."
-
-#~ msgid ""
-#~ "You are about to remove the log file for %s.  Do you want to continue?"
-#~ msgstr "Er du sikker på at du vil fjerne loggfilen for %s?"
-
-#~ msgid "System Log"
-#~ msgstr "Systemlogg"
-
-#
-#~ msgid "Remove Log"
-#~ msgstr "Fjern logg"
-
-#~ msgid "Couldn't open log file %s."
-#~ msgstr "Kunne ikke åpne loggfil %s."
-
-#~ msgid "Log"
-#~ msgstr "Logg"
-
-#~ msgid "Clear"
-#~ msgstr "Tøm"
-
-#~ msgid "Gaim - Information"
-#~ msgstr "Gaim - Informasjon"
-
-#~ msgid "_Get Info"
-#~ msgstr "Info"
-
-#~ msgid "_IM"
-#~ msgstr "Direktemelding"
-
-#~ msgid "Add a new group"
-#~ msgstr "Legg til gruppe"
-
-#~ msgid "Gaim - Insert Image"
-#~ msgstr "Gaim - Sett inn bilde"
-
-#
-#~ msgid ""
-#~ "<span weight='bold' size='larger'>Enter a search phrase\n"
-#~ "</span>"
-#~ msgstr ""
-#~ "<span weight='bold' size='larger'>Skriv inn søkeuttrykk\n"
-#~ "</span>"
-
-#
-#~ msgid "/Conversation/Search..."
-#~ msgstr "/Samtale/Søk..."
-
-#~ msgid "/Conversation/Insert _URL..."
-#~ msgstr "/Samtale/Sett inn _URL..."
-
-#~ msgid "Normal font size"
-#~ msgstr "Normal skriftstørrelse"
-
-#~ msgid "_Host"
-#~ msgstr "Adresse"
-
-#~ msgid "Pa_ssword"
-#~ msgstr "Passord"
-
-#~ msgid "Browser Options"
-#~ msgstr "Nettleservalg"
-
-#~ msgid "Open new _window by default"
-#~ msgstr "Åpne som standard i nytt vindu"
-
-#~ msgid "System Logs"
-#~ msgstr "Systemlogging"
-
-#~ msgid "Log when buddies _sign on/sign off"
-#~ msgstr "Skriv til logg når kontakter logger av/på"
-
-#~ msgid "Log when buddies become _idle/un-idle"
-#~ msgstr "Skriv til logg når kontakter blir aktiv/inaktiv"
-
-#~ msgid "Log when buddies go away/come _back"
-#~ msgstr "Skriv til logg når kontakter blir borte/kommer tilbake"
-
-#~ msgid "Log your _own signons/idleness/awayness"
-#~ msgstr "Skriv egne pålogginger/inaktivitet/bortemarkeringer til logg"
-
-#~ msgid "I_ndividual log file for each buddy's signons"
-#~ msgstr "Egen loggfil for hver kontakts pålogginger"
-
-#~ msgid "Gaim - Save Icon"
-#~ msgstr "Gaim - Lagre ikon"
-
-#~ msgid "<font color=\"red\"><b>log->logger_data was NULL!</b></font>"
-#~ msgstr "<font color=\"red\"><b>log->logger_data var NULL!</b></font>"
-
-#~ msgid "Disconnected"
-#~ msgstr "Frakoblet"
-
-#~ msgid "Invalid response from server"
-#~ msgstr "Ugyldig svar fra tjener"
-
-#~ msgid "Bad Protocol"
-#~ msgstr "Ugyldig protokoll"
-
-#~ msgid "Invalid Realm"
-#~ msgstr "Ugyldig område"
-
-#~ msgid "Mechanism Too Weak"
-#~ msgstr "Mekanismen er ikke sterk nok"
-
-#~ msgid "Registration of %s@%s failed: %s"
-#~ msgstr "Registrering av %s@%s feilet: %s"
-
-#~ msgid "Unknown error occurred changing password"
-#~ msgstr "Ukjent feil under endring av passord"
-
-#~ msgid "%s (Code %s)"
-#~ msgstr "%s (kode %s)"
-
-#~ msgid "Unable to join chat"
-#~ msgstr "Kunne ikke bli med i samtalegruppen"
-
-#~ msgid "Could not send %s to %s, protocol not supported."
-#~ msgstr "Kunne ikke sende %s til %s, protokollen er ikke støttet."
-
-#~ msgid "Internal server error"
-#~ msgstr "Intern tjenerfeil"
-
-#~ msgid "SSL support is needed for MSN. Please install it."
-#~ msgstr "SSL-støtte er nødvendig for MSN. Du må installere det."
-
-#~ msgid "Unable to read from MSN Nexus server."
-#~ msgstr "Kunne ikke lese fra MSN nexus-tjener"
-
-#~ msgid "MSN Nexus server returned invalid information."
-#~ msgstr "MSN nexus-tjener returnerte ugyldig informasjon."
-
-#~ msgid "Unable to connect to passport server"
-#~ msgstr "Kunne ikke koble til passport-tjener"
-
-#~ msgid "Join what group:"
-#~ msgstr "Navn på samtalegruppe:"
-
-#~ msgid "Could not connect for transfer!"
-#~ msgstr "Kunne ikke koble til for dataoverføring!"
-
-#~ msgid "Unknown error."
-#~ msgstr "Ukjent feil."
+#: src/win32/win32dep.c:388
+msgid "Moving Gaim user settings directory to:"
+msgstr "Flytter katalog for Gaims brukerinnstillinger til:"
 
 #~ msgid "Log Conversation"
 #~ msgstr "Logge samtaler"
@@ -9148,6 +8084,9 @@
 #~ msgid "First Name:"
 #~ msgstr "Fornavn:"
 
+#~ msgid "Last Name:"
+#~ msgstr "Etternavn:"
+
 #~ msgid "Gender:"
 #~ msgstr "Kjønn:"
 
@@ -9232,6 +8171,9 @@
 #~ msgid "There was an error launching your chosen browser: %s"
 #~ msgstr "Feil under starting av nettleseren din: %s"
 
+#~ msgid "Alias"
+#~ msgstr "Alias"
+
 #~ msgid "Group"
 #~ msgstr "Gruppe"
 
@@ -9297,6 +8239,9 @@
 #~ msgid "DCC Chat with %s established"
 #~ msgstr "DCC-samtale med %s startet"
 
+#~ msgid "User"
+#~ msgstr "Bruker"
+
 #~ msgid "IRC Operator"
 #~ msgstr "IRC-operatør"
 
@@ -9391,6 +8336,9 @@
 #~ msgid "User Identity"
 #~ msgstr "Brukerens identitet"
 
+#~ msgid "_Group:"
+#~ msgstr "Gruppe:"
+
 #~ msgid "Deny all users"
 #~ msgstr "Avvis alle brukere"
 
@@ -9439,6 +8387,9 @@
 #~ msgid "Send message:"
 #~ msgstr "Send beskjed:"
 
+#~ msgid "Rename Buddy"
+#~ msgstr "Endre kontaktnavn"
+
 #~ msgid "Unable to Save Preferences"
 #~ msgstr "Kunne ikke lagre innstillinger"
 
@@ -9467,6 +8418,9 @@
 #~ msgid "_Login"
 #~ msgstr "Innlogging"
 
+#~ msgid "_Password"
+#~ msgstr "Passord"
+
 #~ msgid "TOC not found."
 #~ msgstr "TOC ikke funnet."
 
@@ -9576,6 +8530,12 @@
 #~ msgid "Gaim Instant Messenger - Signed off"
 #~ msgstr "Gaim Instant Messenger - Logget av"
 
+#~ msgid "Gaim Instant Messenger - Away"
+#~ msgstr "Gaim Instant Messenger - Borte"
+
+#~ msgid "New"
+#~ msgstr "Ny"
+
 #~ msgid "I'm Back"
 #~ msgstr "Jeg er tilbake"
 
@@ -9588,6 +8548,9 @@
 #~ msgid "Gaim Chat"
 #~ msgstr "Gaim Samtale"
 
+#~ msgid "Chat Rooms"
+#~ msgstr "Samtalerom"
+
 #~ msgid "Refresh"
 #~ msgstr "Gjenoppfrisk"
 
@@ -9597,6 +8560,9 @@
 #~ msgid "List of subscribed chats"
 #~ msgstr "Samtaleliste - abonnerte"
 
+#~ msgid "Chat List"
+#~ msgstr "Samtaleliste"
+
 #~ msgid "Allows you to add chat rooms to your buddy list."
 #~ msgstr "Gir deg muligheten til å legge til snakkerom i kontaktlisten."