diff po/no.po @ 8778:8bf735cf9d1c

[gaim-migrate @ 9540] (17:44:08) Faceprint: ping (17:44:17) Me: semi-pong (17:44:26) Faceprint: in a position to commit, or not? (17:44:40) Me: more or less (17:44:48) Me: not in a possition to think though (17:44:56) Faceprint: no real thought required (17:45:29) Faceprint: jabber.c, in jabber_login_callback, before the check to see if gc is in gaim_connections_get_all(), please add: (17:45:32) Faceprint: if (source < 0) { gaim_connection_error(gc, _("Couldn't connect to host")); return; } (17:45:53) Faceprint: and change the if statement in irc_login_cb in irc.c to be the same oh and vi automatically tabbing sucks and sometime i ran make dist committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Fri, 23 Apr 2004 21:50:17 +0000
parents 03b9ce930f0d
children c16b81557679
line wrap: on
line diff
--- a/po/no.po	Fri Apr 23 17:34:41 2004 +0000
+++ b/po/no.po	Fri Apr 23 21:50:17 2004 +0000
@@ -12,7 +12,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim 0.73\n"
-"POT-Creation-Date: 2003-11-12 19:48+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-04-22 22:29-0400\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"
@@ -28,14 +29,15 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:104
+#: plugins/autorecon.c:110
 msgid "Auto-Reconnect"
 msgstr "Automatisk tilkobling ved brudd"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/autorecon.c:107 plugins/autorecon.c:109
+#. *  description
+#: plugins/autorecon.c:113 plugins/autorecon.c:115
 msgid "When you are kicked offline, this reconnects you."
 msgstr ""
 "Dette tillegget vil koble deg til på nytt dersom du mister forbindelsen."
@@ -117,8 +119,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
@@ -135,12 +137,12 @@
 msgid "Gaim - Away"
 msgstr "Gaim - Borte"
 
-#: plugins/docklet/docklet.c:114 src/gtkaccount.c:482 src/gtkaccount.c:1768
+#: plugins/docklet/docklet.c:114 src/gtkaccount.c:497 src/gtkaccount.c:1891
 msgid "Auto-login"
 msgstr "Automatisk pålogging"
 
+#
 #: plugins/docklet/docklet.c:117
-#
 msgid "New Message..."
 msgstr "Ny melding..."
 
@@ -152,16 +154,19 @@
 msgid "New..."
 msgstr "Ny..."
 
-#: 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
+#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1637 src/protocols/gg/gg.c:51
+#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:952
+#: src/protocols/jabber/jutil.c:32 src/protocols/jabber/presence.c:63
+#: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2147
+#: src/protocols/novell/novell.c:2262 src/protocols/novell/novell.c:2314
+#: src/protocols/oscar/oscar.c:520 src/protocols/oscar/oscar.c:4825
+#: src/protocols/oscar/oscar.c:5808 src/protocols/oscar/oscar.c:6426
 msgid "Away"
 msgstr "Borte"
 
-#: plugins/docklet/docklet.c:159 src/away.c:515
+#. else...
+#: plugins/docklet/docklet.c:159 src/away.c:522
+#: src/protocols/oscar/oscar.c:4743 src/protocols/oscar/oscar.c:6434
 msgid "Back"
 msgstr "Tilbake"
 
@@ -169,16 +174,16 @@
 msgid "Mute Sounds"
 msgstr "Skru av lyder"
 
-#: plugins/docklet/docklet.c:172 src/gtkft.c:559
+#: plugins/docklet/docklet.c:172 src/gtkft.c:605
 msgid "File Transfers"
 msgstr "Filoverføringer"
 
 #. And now for the buttons
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:1927 src/main.c:323
+#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2070 src/main.c:286
 msgid "Accounts"
 msgstr "Kontoer"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2331 src/main.c:333
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2594 src/main.c:292
 msgid "Preferences"
 msgstr "Innstillinger"
 
@@ -236,33 +241,46 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/filectl.c:201
+#: plugins/filectl.c:222
 msgid "Gaim File Control"
 msgstr "Styre Gaim fra kontrollfil"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/filectl.c:204 plugins/filectl.c:206
+#. *  description
+#: plugins/filectl.c:225 plugins/filectl.c:227
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr "Lar deg kontrollere Gaim ved å skrive inn kommandoer i en fil."
 
-#: plugins/gaim-remote/remote.c:88
+#: plugins/gaim-remote/remote.c:89
 msgid "Not connected to AIM"
 msgstr "Ikke tilkoblet til AIM"
 
-#: plugins/gaim-remote/remote.c:97 plugins/gaim-remote/remote.c:136
+#: plugins/gaim-remote/remote.c:98 plugins/gaim-remote/remote.c:137
 msgid "No screenname given."
 msgstr "Skjermnavn ikke oppgitt."
 
-#: plugins/gaim-remote/remote.c:173
+#: plugins/gaim-remote/remote.c:174
 msgid "No roomname given."
 msgstr "Romnavn ikke oppgitt."
 
-#: plugins/gaim-remote/remote.c:192
+#: plugins/gaim-remote/remote.c:193
 msgid "Invalid AIM URI"
 msgstr "Ugyldig AIM URI"
 
+#: plugins/gaim-remote/remote.c:651
+#, fuzzy, c-format
+msgid ""
+"Failed to assign %s to a socket:\n"
+"%s"
+msgstr "Klarte ikke å lagre bilde: %s\n"
+
+#: plugins/gaim-remote/remote.c:674
+#, fuzzy
+msgid "Unable to open socket"
+msgstr "Kunne ikke lese socket"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -270,19 +288,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaim-remote/remote.c:714
+#: plugins/gaim-remote/remote.c:722
 msgid "Remote Control"
 msgstr "Styre Gaim fra kontrollfil"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaim-remote/remote.c:717
+#: plugins/gaim-remote/remote.c:725
 msgid "Provides remote control for gaim applications."
 msgstr "Muliggjør fjernstyring for Gaim-applikasjoner."
 
 #. *  description
-#: plugins/gaim-remote/remote.c:719
+#: plugins/gaim-remote/remote.c:727
 msgid ""
 "Gives Gaim the ability to be remote-controlled through third-party "
 "applications or through the gaim-remote tool."
@@ -297,19 +315,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaiminc.c:81
+#: plugins/gaiminc.c:87
 msgid "Gaim Demonstration Plugin"
 msgstr "Gaim eksempeltillegg"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaiminc.c:84
+#: plugins/gaiminc.c:90
 msgid "An example plugin that does stuff - see the description."
 msgstr "Et eksempeltillegg som gjør noe - se beskrivelsen."
 
 #. *  description
-#: plugins/gaiminc.c:86
+#: plugins/gaiminc.c:92
 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"
@@ -374,47 +392,190 @@
 "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/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
+#: plugins/gevolution/add_buddy_dialog.c:136
+#: plugins/gevolution/assoc-buddy.c:74
+#, 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:84 plugins/gevolution/assoc-buddy.c:95
+#: src/gtkblist.c:2964 src/gtkprefs.c:884 src/gtkprefs.c:1665
+#: src/protocols/jabber/jabber.c:916
+msgid "None"
+msgstr "Ingen"
+
+#: plugins/gevolution/add_buddy_dialog.c:190
+#: plugins/gevolution/assoc-buddy.c:178 src/gtkprefs.c:2006
+#: src/gtkroomlist.c:561 src/protocols/jabber/jabber.c:591
+#: src/protocols/msn/msn.c:1395 src/protocols/trepia/trepia.c:398
+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:383 src/protocols/oscar/oscar.c:6697
+msgid "Search"
+msgstr "Søk"
+
+#: plugins/gevolution/add_buddy_dialog.c:566
+#: plugins/gevolution/new_person_dialog.c:310 src/gtkblist.c:3982
+#: src/gtkblist.c:4310
+msgid "Group:"
+msgstr "Gruppe:"
+
+#. "New Person" button
+#: plugins/gevolution/add_buddy_dialog.c:592
+#: plugins/gevolution/assoc-buddy.c:486
+#, 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:370
+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:449
+#, fuzzy
+msgid "Show user details"
+msgstr "Vis nedlastingsdetaljer"
+
+#: plugins/gevolution/assoc-buddy.c:450
+#, fuzzy
+msgid "Hide user details"
+msgstr "Skjul nedlastingsdetaljer"
+
+#. "Associate Buddy" button
+#: plugins/gevolution/assoc-buddy.c:503
+#, fuzzy
+msgid "_Associate Buddy"
+msgstr "Alias for kontakt"
+
+#: plugins/gevolution/gevo-util.c:66 plugins/gevolution/gevolution.c:90
+#: src/blist.c:685 src/blist.c:872 src/blist.c:2105 src/gtkblist.c:3807
+#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:793
+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:320
+#: src/protocols/oscar/oscar.c:425
+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:70
 msgid "History"
 msgstr "Historikk"
 
-#: plugins/history.c:67
+#: plugins/history.c:72
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Viser tidligere loggede samtaler i nye samtaler."
 
-#: 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."
+#: plugins/history.c:73
+#, fuzzy
+msgid ""
+"When a new conversation is opened this plugin will insert 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."
@@ -433,6 +594,7 @@
 #. *< 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."
@@ -492,6 +654,7 @@
 "Test IPC-støtte for tillegg (som klient). Dette finner tjenertillegget og "
 "kaller de registrerte kommandoene."
 
+#
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -500,7 +663,6 @@
 #. *< priority
 #. *< id
 #: plugins/ipc-test-server.c:71
-#
 msgid "IPC Test Server"
 msgstr "IPC testtjener"
 
@@ -514,16 +676,21 @@
 #. *  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."
-
-#: plugins/mailchk.c:156
+msgstr ""
+"Test IPC-støtte for tillegg (som tjener). Dette registrerer IPC-kommandoene."
+
+#: plugins/mailchk.c:157
 msgid "Mail Checker"
 msgstr "Sjekker e-post"
 
-#: plugins/mailchk.c:158 plugins/mailchk.c:159
+#: plugins/mailchk.c:159
 msgid "Checks for new local mail."
 msgstr "Sjekker for ny lokal e-post."
 
+#: plugins/mailchk.c:160
+msgid "Adds a small box to the buddy list that shows if you have new mail."
+msgstr ""
+
 #. ---------- "Notify For" ----------
 #: plugins/notify.c:572
 msgid "Notify For"
@@ -533,13 +700,13 @@
 msgid "_IM windows"
 msgstr "Vinduer for direktemeldinger"
 
+#
 #: plugins/notify.c:583
-#
 msgid "C_hat windows"
 msgstr "_Samtalevinduer"
 
+#
 #: plugins/notify.c:590
-#
 msgid "_Focused windows"
 msgstr "Vinduer som har _fokus"
 
@@ -557,9 +724,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"
 
@@ -568,9 +735,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"
 
@@ -584,15 +751,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 ""
 
@@ -610,6 +777,7 @@
 #. *< 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."
@@ -621,13 +789,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/perl/perl.c:524
+#: plugins/perl/perl.c:531
 msgid "Perl Plugin Loader"
 msgstr "Perl-tilleggslaster"
 
 #. *< name
 #. *< version
-#: plugins/perl/perl.c:526 plugins/perl/perl.c:527
+#. *< summary
+#: plugins/perl/perl.c:533 plugins/perl/perl.c:534
 msgid "Provides support for loading perl plugins."
 msgstr "Lar deg laste perl-tillegg."
 
@@ -647,6 +816,30 @@
 "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
@@ -654,15 +847,42 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/signals-test.c:502
-msgid "Signals Test"
-msgstr "Signaltest"
+#: plugins/relnot.c:134
+#, fuzzy
+msgid "Release Notification"
+msgstr "Beskjedvarsling"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/signals-test.c:505 plugins/signals-test.c:507
+#: 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"
+
 #
+#. *< 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."
 
@@ -680,6 +900,7 @@
 #. *< 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."
@@ -723,14 +944,15 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-gnutls.c:197
+#: plugins/ssl/ssl-gnutls.c:223
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/ssl/ssl-gnutls.c:200 plugins/ssl/ssl-gnutls.c:202
+#. *  description
+#: plugins/ssl/ssl-gnutls.c:226 plugins/ssl/ssl-gnutls.c:228
 msgid "Provides SSL support through GNUTLS."
 msgstr "Tilbyr SSL-støtte gjennom GNUTLS."
 
@@ -741,14 +963,15 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-nss.c:296
+#: plugins/ssl/ssl-nss.c:312
 msgid "NSS"
 msgstr "NSS"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/ssl/ssl-nss.c:299 plugins/ssl/ssl-nss.c:301
+#. *  description
+#: plugins/ssl/ssl-nss.c:315 plugins/ssl/ssl-nss.c:317
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Tilbyr SSL-støtte gjennom Mozillas NSS."
 
@@ -766,11 +989,12 @@
 #. *< 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:793
+#: plugins/statenotify.c:30 src/gtkpounce.c:820
 #, c-format
 msgid "%s has gone away."
 msgstr "%s er borte."
@@ -804,6 +1028,7 @@
 #. *< 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 "
@@ -812,13 +1037,13 @@
 "Varsler i et samtalevindu når en kontakt blir borte/inaktiv, eller "
 "returnerer."
 
-#: plugins/tcl/tcl.c:344
 #
+#: plugins/tcl/tcl.c:350
 msgid "Tcl Plugin Loader"
 msgstr "Tcl-tilleggslaster"
 
-#: plugins/tcl/tcl.c:346 plugins/tcl/tcl.c:347
 #
+#: plugins/tcl/tcl.c:352 plugins/tcl/tcl.c:353
 msgid "Provides support for loading Tcl plugins"
 msgstr "Lar deg laste Tcl-tillegg."
 
@@ -829,14 +1054,15 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ticker/ticker.c:74 plugins/ticker/ticker.c:330
+#: plugins/ticker/ticker.c:74 plugins/ticker/ticker.c:328
 msgid "Buddy Ticker"
 msgstr "Rullende kontaktliste"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/ticker/ticker.c:333 plugins/ticker/ticker.c:335
+#. *  description
+#: plugins/ticker/ticker.c:331 plugins/ticker/ticker.c:333
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "En horisontalt rullende versjon av kontaktlisten."
 
@@ -866,6 +1092,7 @@
 #. *< 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."
@@ -890,7 +1117,7 @@
 msgstr "Vis glideknapp i direktemeldingsvindu"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:844
+#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:887
 msgid "Buddy List Window"
 msgstr "Kontaktlistevindu"
 
@@ -912,6 +1139,7 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/win32/transparency/win2ktrans.c:425
 #: plugins/win32/transparency/win2ktrans.c:427
 msgid ""
@@ -923,63 +1151,71 @@
 "\n"
 "* Merk: du må ha Win2000 eller WinXP for at denne skal virke."
 
-#: plugins/win32/winprefs/winprefs.c:348
+#: plugins/win32/winprefs/winprefs.c:344
 msgid "GTK+ Runtime Version"
 msgstr "GTK+ kjøremiljø versjon"
 
 #. Autostart
-#: plugins/win32/winprefs/winprefs.c:356
+#: plugins/win32/winprefs/winprefs.c:352
 msgid "Startup"
 msgstr "Oppstart"
 
-#: plugins/win32/winprefs/winprefs.c:357
+#: plugins/win32/winprefs/winprefs.c:353
 msgid "_Start Gaim on Windows startup"
 msgstr "Start Gaim når Windows starter"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:2150
-#: src/gtkprefs.c:2264
+#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3005
+#: src/gtkprefs.c:2505
 msgid "Buddy List"
 msgstr "Kontaktliste"
 
-#: plugins/win32/winprefs/winprefs.c:367
+#: plugins/win32/winprefs/winprefs.c:363
 msgid "_Dockable Buddy List"
 msgstr "Dockable kontaktliste"
 
 #. Docked Blist On Top
-#: plugins/win32/winprefs/winprefs.c:371
+#: plugins/win32/winprefs/winprefs.c:367
 msgid "Docked _Buddy List is always on top"
 msgstr "Dockable kontaktliste er alltid øverst"
 
 #. Blist On Top
-#: plugins/win32/winprefs/winprefs.c:381
+#: plugins/win32/winprefs/winprefs.c:377
 msgid "_Keep Buddy List window on top"
 msgstr "Hold kontaktlistevinduet øverst"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:880
-#: src/gtkprefs.c:2265
+#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:925
+#: src/gtkprefs.c:2506 src/protocols/msn/msn.c:1621
 msgid "Conversations"
 msgstr "Samtaler"
 
-#: plugins/win32/winprefs/winprefs.c:387
+#: plugins/win32/winprefs/winprefs.c:383
 msgid "_Flash Window when messages are received"
 msgstr "_Blink vinduet når nye beskjeder mottas"
 
-#: plugins/win32/winprefs/winprefs.c:409
+#: plugins/win32/winprefs/winprefs.c:405
 msgid "WinGaim Options"
 msgstr "Innstilinger for WinGaim"
 
-#: plugins/win32/winprefs/winprefs.c:411 plugins/win32/winprefs/winprefs.c:412
+#: plugins/win32/winprefs/winprefs.c:407 plugins/win32/winprefs/winprefs.c:408
 msgid "Options specific to Windows Gaim."
 msgstr "Innstillinger som er spesifikke for Windows Gaim."
 
-#: src/about.c:57
-#, c-format
-msgid "About Gaim v%s"
+#: src/about.c:59
+#, fuzzy
+msgid "About Gaim"
 msgstr "Om Gaim v%s"
 
-#: src/about.c:89
+#: 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
 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 "
@@ -989,104 +1225,109 @@
 "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:99
-msgid "<FONT SIZE=\"3\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
+#: src/about.c:104
+#, fuzzy
+msgid "<FONT SIZE=\"4\">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:104
+#: src/about.c:109
 msgid "Active Developers"
 msgstr "Aktive utviklere"
 
-#: src/about.c:105
 #
+#: src/about.c:110
 msgid "maintainer"
 msgstr "ansvarlig"
 
-#: src/about.c:107
+#: src/about.c:112
 msgid "lead developer"
 msgstr "hovedutvikler"
 
-#: src/about.c:110
+#: src/about.c:115
 msgid "developer & webmaster"
 msgstr "utvikler og vevansvarlig"
 
-#: src/about.c:111
+#: src/about.c:116
 msgid "win32 port"
 msgstr "windows-versjon"
 
-#: src/about.c:114 src/about.c:115 src/about.c:116
+#: src/about.c:119 src/about.c:120 src/about.c:121
 msgid "developer"
 msgstr "utvikler"
 
-#: src/about.c:117
 #
+#: src/about.c:122
 msgid "support"
 msgstr "støtte"
 
-#: src/about.c:124
+#: src/about.c:129
 msgid "Crazy Patch Writers"
 msgstr "folk som har bidratt med rettelser"
 
-#: src/about.c:145
+#: src/about.c:144
 msgid "Retired Developers"
 msgstr "tidligere utviklere"
 
-#: src/about.c:146
+#: src/about.c:145
 msgid "former libfaim maintainer"
 msgstr "tidligere libfaim-ansvarlig"
 
-#: src/about.c:147
+#: src/about.c:146
 msgid "former lead developer"
 msgstr "tidligere hovedutvikler"
 
-#: src/about.c:150
+#: src/about.c:149
 msgid "former maintainer"
 msgstr "tidligere ansvarlig"
 
-#: src/about.c:151
+#: src/about.c:150
 msgid "former Jabber developer"
 msgstr "tidligere jabber-utvikler"
 
-#: src/about.c:152
 #
+#: src/about.c:151
 msgid "original author"
 msgstr "opprinnelig laget av"
 
-#: src/about.c:155
+#: src/about.c:154
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hacker og sjåfør (avslappet fyr)"
 
-#: src/about.c:163
+#: src/about.c:162
 msgid "Current Translators"
 msgstr "Aktive oversettere"
 
-#: src/about.c:164 src/about.c:194
+#: src/about.c:163 src/about.c:197
 msgid "Catalan"
 msgstr "Katalansk"
 
-#: src/about.c:165 src/about.c:195
+#: src/about.c:164 src/about.c:198
 msgid "Czech"
 msgstr "Tsjekkisk"
 
+#
+#: src/about.c:165
+msgid "Danish"
+msgstr "Dansk"
+
 #: src/about.c:166
-#
-msgid "Danish"
-msgstr "Dansk"
-
-#: src/about.c:167 src/about.c:196
+msgid "British English"
+msgstr ""
+
+#: src/about.c:167 src/about.c:199
 msgid "German"
 msgstr "Tysk"
 
-#: src/about.c:168 src/about.c:197
+#: src/about.c:168 src/about.c:200
 msgid "Spanish"
 msgstr "Spansk"
 
-#: src/about.c:169
 #
+#: src/about.c:169 src/about.c:201
 msgid "Finnish"
 msgstr "Finsk"
 
-#: src/about.c:170 src/about.c:198
+#: src/about.c:170 src/about.c:202
 msgid "French"
 msgstr "Fransk"
 
@@ -1098,12 +1339,12 @@
 msgid "Hungarian"
 msgstr "Ungarsk"
 
-#: src/about.c:173 src/about.c:200
 #
+#: src/about.c:173 src/about.c:204
 msgid "Italian"
 msgstr "Italiensk"
 
-#: src/about.c:174 src/about.c:202
+#: src/about.c:174 src/about.c:206
 msgid "Korean"
 msgstr "Koreansk"
 
@@ -1111,195 +1352,198 @@
 msgid "Dutch; Flemish"
 msgstr "Nederlansk, flamsk"
 
-#: src/about.c:176 src/about.c:204
+#: src/about.c:176
+msgid "Macedonian"
+msgstr ""
+
+#: src/about.c:177
+msgid "Norwegian"
+msgstr "Norsk"
+
 #
+#: src/about.c:178 src/about.c:207
 msgid "Polish"
 msgstr "Polsk"
 
-#: src/about.c:177
+#: src/about.c:179
 msgid "Portuguese"
 msgstr "Portugisisk"
 
-#: src/about.c:178
+#: src/about.c:180
 msgid "Portuguese-Brazil"
 msgstr "Portugisisk (Brasil)"
 
-#: src/about.c:179
 #
+#: src/about.c:181
 msgid "Romanian"
 msgstr "Rumensk"
 
-#: src/about.c:180 src/about.c:205
+#: src/about.c:182 src/about.c:208
 msgid "Russian"
 msgstr "Russisk"
 
-#: src/about.c:181
+#: src/about.c:183
 msgid "Serbian"
 msgstr "Serbisk"
 
-#: src/about.c:182 src/about.c:207
+#: src/about.c:184 src/about.c:210
 msgid "Swedish"
 msgstr "Svensk"
 
-#: src/about.c:183
+#: src/about.c:185
+#, fuzzy
+msgid "Vietnamese"
+msgstr "Filnavn"
+
+#: src/about.c:185
+msgid "Gnome Vi Team"
+msgstr ""
+
+#: src/about.c:186
 msgid "Simplified Chinese"
 msgstr "Forenklet kinesisk"
 
-#: src/about.c:184
+#: src/about.c:187
 msgid "Traditional Chinese"
 msgstr "Tradisjonell kinesisk"
 
-#: src/about.c:191
+#: src/about.c:194
 msgid "Past Translators"
 msgstr "Tidligere oversettere"
 
-#: src/about.c:192
 #
+#: src/about.c:195
 msgid "Amharic"
 msgstr "Amharisk"
 
-#: src/about.c:193
+#: src/about.c:196
 msgid "Bulgarian"
 msgstr "Bulgarsk"
 
-#: src/about.c:199
+#: src/about.c:203
 msgid "Hebrew"
 msgstr "Hebraisk"
 
-#: src/about.c:201
+#: src/about.c:205
 msgid "Japanese"
 msgstr "Japansk"
 
-#: src/about.c:203
-msgid "Norwegian"
-msgstr "Norsk"
-
-#: src/about.c:206
+#: src/about.c:209
 msgid "Slovak"
 msgstr "Slovakisk"
 
-#: src/about.c:208
 #
+#: src/about.c:211
 msgid "Chinese"
 msgstr "Kinesisk"
 
-#: 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
+#: src/account.c:279 src/protocols/jabber/jabber.c:993
 msgid "New passwords do not match."
 msgstr "De nye passordene stemmer ikke overens."
 
-#: src/account.c:283
+#: src/account.c:288
 msgid "Fill out all fields completely."
 msgstr "Fyll ut alle feltene fullstendig."
 
-#: src/account.c:308
 #
+#: src/account.c:313
 msgid "Original password"
 msgstr "Opprinnelig passord"
 
-#: src/account.c:314
 #
+#: src/account.c:320
 msgid "New password"
 msgstr "Nytt passord"
 
-#: src/account.c:320
 #
+#: src/account.c:327
 msgid "New password (again)"
 msgstr "Nytt passord (igjen)"
 
-#: src/account.c:325
+#: src/account.c:333
 #, c-format
 msgid "Change password for %s"
 msgstr "Endre passord for %s:"
 
-#: src/account.c:331
 #
+#: src/account.c:341
 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: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
+#: src/account.c:344 src/connection.c:198 src/dialogs.c:471 src/dialogs.c:527
+#: src/gtkblist.c:2363 src/gtkrequest.c:235 src/protocols/jabber/jabber.c:1038
+#: src/protocols/jabber/xdata.c:337 src/protocols/msn/msn.c:195
+#: src/protocols/msn/msn.c:206 src/protocols/msn/msn.c:217
+#: src/protocols/msn/msn.c:228 src/protocols/oscar/oscar.c:2760
+#: src/protocols/oscar/oscar.c:2841 src/protocols/oscar/oscar.c:6487
+#: src/protocols/oscar/oscar.c:6583 src/protocols/oscar/oscar.c:6632
+#: src/protocols/oscar/oscar.c:6714 src/protocols/yahoo/yahoo.c:2504
+#: src/protocols/yahoo/yahoo.c:2512 src/request.h:1240
 msgid "OK"
 msgstr "_OK"
 
-#. 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
+#: src/account.c:345 src/account.c:383 src/connection.c:199 src/dialogs.c:305
+#: src/dialogs.c:317 src/dialogs.c:330 src/dialogs.c:351 src/dialogs.c:472
+#: src/dialogs.c:528 src/dialogs.c:851 src/dialogs.c:872 src/dialogs.c:889
+#: src/dialogs.c:908 src/gtkaccount.c:1744 src/gtkaccount.c:2235
+#: src/gtkblist.c:2364 src/gtkblist.c:4349 src/gtkconn.c:168
+#: src/gtkimhtmltoolbar.c:399 src/gtkprivacy.c:575 src/gtkprivacy.c:588
+#: src/gtkprivacy.c:613 src/gtkprivacy.c:624 src/gtkrequest.c:236
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/jabber/buddy.c:514
+#: src/protocols/jabber/chat.c:693 src/protocols/jabber/jabber.c:660
+#: src/protocols/jabber/jabber.c:1039 src/protocols/jabber/xdata.c:338
+#: src/protocols/msn/msn.c:196 src/protocols/msn/msn.c:207
+#: src/protocols/msn/msn.c:218 src/protocols/msn/msn.c:229
+#: src/protocols/msn/msn.c:242 src/protocols/oscar/oscar.c:2722
+#: src/protocols/oscar/oscar.c:2761 src/protocols/oscar/oscar.c:2797
+#: src/protocols/oscar/oscar.c:2842 src/protocols/oscar/oscar.c:6305
+#: src/protocols/oscar/oscar.c:6488 src/protocols/oscar/oscar.c:6584
+#: src/protocols/oscar/oscar.c:6633 src/protocols/oscar/oscar.c:6698
+#: src/protocols/oscar/oscar.c:6715 src/protocols/trepia/trepia.c:347
+#: src/protocols/yahoo/yahoo.c:2505 src/protocols/yahoo/yahoo.c:2513
+#: src/request.h:1240 src/request.h:1250
 msgid "Cancel"
 msgstr "_Avbryt"
 
-#: src/account.c:361
+#: src/account.c:374
 #, c-format
 msgid "Change user information for %s"
 msgstr "Endre brukerinformasjon for %s"
 
-#: 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
+#: src/account.c:382 src/dialogs.c:839 src/gtkrequest.c:242
+#: src/protocols/jabber/buddy.c:513 src/protocols/trepia/trepia.c:346
 msgid "Save"
 msgstr "Lagre"
 
-#: src/away.c:208
-msgid "Gaim - Away!"
-msgstr "Gaim - Borte!"
-
-#: src/away.c:269
+#: src/away.c:210
+#, fuzzy
+msgid "Away!"
+msgstr "Borte"
+
+#: src/away.c:275
 msgid "I'm Back!"
 msgstr "Tilbake!"
 
-#: src/away.c:368
+#: src/away.c:375
 msgid "New Away Message"
 msgstr "Ny fraværsbeskjed"
 
-#: src/away.c:388
+#: src/away.c:395
 msgid "Remove Away Message"
 msgstr "Fjern fraværsbeskjed"
 
-#: src/away.c:583
+#: src/away.c:590
 msgid "Set All Away"
 msgstr "Marker som borte på alle"
 
-#: src/blist.c:550 src/gtkprefs.c:2267
+#: src/blist.c:590 src/gtkprefs.c:2508
 msgid "Chats"
 msgstr "Samtaler"
 
-#: 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
+#: src/blist.c:1192
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1314,140 +1558,118 @@
 "%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:1142
+#: src/blist.c:1201
 msgid "Group not removed"
 msgstr "Gruppe ikke fjernet"
 
-#: src/blist.c:1192 src/gtkaccount.c:159 src/gtkutils.c:841
-#: src/protocols/jabber/auth.c:110 src/protocols/jabber/buddy.c:563
+#: src/blist.c:1251 src/gtkaccount.c:164 src/gtkft.c:153 src/gtkutils.c:696
+#: src/protocols/jabber/buddy.c:569 src/protocols/novell/novell.c:2159
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: src/blist.c:1515
+#: src/blist.c:1578
 msgid "Invalid Groupname"
 msgstr "Ugyldig gruppenavn"
 
-#: src/blist.c:2158
+#: src/blist.c:2220
 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:2160
+#: src/blist.c:2222
 msgid "Buddy List Error"
 msgstr "Feil i kontaktliste"
 
-#: 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
+#: src/connection.c:119 src/connection.c:170
 #, 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:170
+#: src/connection.c:175
 msgid "Connection Error"
 msgstr "Feil ved tilkobling"
 
-#: src/connection.c:191
+#: src/connection.c:196
 #, c-format
 msgid "Enter password for %s"
 msgstr "Oppgi passord for %s"
 
-#: src/conversation.c:324
+#: src/conversation.c:296
 msgid "Unable to send message. The message is too large."
 msgstr "Kunne ikke sende beskjed. Beskjeden er for stor."
 
-#: src/conversation.c:332
+#: src/conversation.c:304
 msgid "Unable to send message."
 msgstr "Kunne ikke sende beskjed."
 
-#: src/conversation.c:1907
+#: src/conversation.c:1969
 #, c-format
 msgid "%s entered the room."
 msgstr "%s kom inn i rommet."
 
-#: src/conversation.c:1910
+#: src/conversation.c:1972
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] kom inn i rommet."
 
-#: src/conversation.c:1995
+#: src/conversation.c:2064
+#, fuzzy, c-format
+msgid "You are now known as %s"
+msgstr "%s heter nå %s"
+
+#: src/conversation.c:2067
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s heter nå %s"
 
-#: src/conversation.c:2037
+#: src/conversation.c:2110
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s forlot rommet (%s)."
 
-#: src/conversation.c:2039
+#: src/conversation.c:2112
 #, c-format
 msgid "%s left the room."
 msgstr "%s forlot rommet."
 
-#: src/conversation.c:2112
+#: src/conversation.c:2185
 #, c-format
 msgid "(+%d more)"
 msgstr "(+%d flere)"
 
-#: src/conversation.c:2114
+#: src/conversation.c:2187
 #, c-format
 msgid " left the room (%s)."
 msgstr " forlot rommet (%s)."
 
-#: src/conversation.c:2396
+#: src/conversation.c:2467
 msgid "Last created window"
 msgstr "Sist lagde vindu"
 
-#: src/conversation.c:2398
+#: src/conversation.c:2469 src/gtkprefs.c:1413
 msgid "New window"
 msgstr "Nytt vindu"
 
-#: src/conversation.c:2400
+#: src/conversation.c:2471
 msgid "By group"
 msgstr "Etter gruppe"
 
-#: src/conversation.c:2402
+#: src/conversation.c:2473
 msgid "By account"
 msgstr "Etter konto"
 
-#: src/dialogs.c:315
+#: src/dialogs.c:154
 msgid "Warn User"
 msgstr "Advar bruker"
 
-#: src/dialogs.c:318
-msgid "_Warn"
-msgstr "Advar"
-
-#: src/dialogs.c:334
+#: src/dialogs.c:173
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1460,25 +1682,25 @@
 "Dette vil øke advarselsnivået til %s og vedkommende vil måtte tåle strengere "
 "hastighetsbegrensning.\n"
 
-#: src/dialogs.c:343
+#: src/dialogs.c:182
 msgid "Warn _anonymously?"
 msgstr "Advar anonymt"
 
-#: src/dialogs.c:350
+#: src/dialogs.c:189
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>Anonyme advarsler er mindre betydningsfulle.</b>"
 
-#: src/dialogs.c:463
+#: src/dialogs.c:301
 #, 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:465 src/dialogs.c:466
+#: src/dialogs.c:303 src/dialogs.c:304
 msgid "Remove Buddy"
 msgstr "Fjern kontakt"
 
-#: src/dialogs.c:475
+#: src/dialogs.c:313
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -1486,11 +1708,11 @@
 msgstr ""
 "Er du sikker på at du vil fjerne samtalegruppen %s fra kontaktlisten din?"
 
-#: src/dialogs.c:477 src/dialogs.c:478
+#: src/dialogs.c:315 src/dialogs.c:316
 msgid "Remove Chat"
 msgstr "Fjern samtalegruppe"
 
-#: src/dialogs.c:487
+#: src/dialogs.c:325
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -1499,255 +1721,149 @@
 "Er du sikker på at du vil fjerne gruppen %s med alle medlemmer fra "
 "kontaktlisten din?"
 
-#: src/dialogs.c:490 src/dialogs.c:491
+#: src/dialogs.c:328 src/dialogs.c:329
 msgid "Remove Group"
 msgstr "Fjern gruppe"
 
-#: src/dialogs.c:508
+#: src/dialogs.c:346
 #, 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?"
-
-#: src/dialogs.c:511 src/dialogs.c:512
+"Er du sikker på at du vil fjerne kontakten som inneholder %s og %d andre "
+"kontakter fra kontaktlisten din?"
+
 #
+#: src/dialogs.c:349 src/dialogs.c:350
 msgid "Remove Contact"
 msgstr "Fjern kontakt"
 
-#: 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"
+#: src/dialogs.c:453 src/dialogs.c:509
+#, fuzzy
+msgid "_Screen name"
+msgstr "_Skjermnavn"
+
+#: src/dialogs.c:459 src/dialogs.c:515
+#, fuzzy
+msgid "_Account"
+msgstr "Konto:"
+
+#: src/dialogs.c:466
+#, fuzzy
+msgid "New Instant Message"
+msgstr "/Kontakter/_Ny direktemelding..."
+
+#: src/dialogs.c:468
+#, fuzzy
+msgid "Please enter the screen name of the person you would like to IM."
 msgstr ""
 "Vennligst skriv inn skjermnavnet på den personen du vil sende direktemelding "
 "til.\n"
 
-#: 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
+#: src/dialogs.c:522
 msgid "Get User Info"
 msgstr "Hent brukerinfo"
 
-#: src/dialogs.c:759
-msgid ""
-"Please enter the screenname of the person whose info you would like to "
-"view.\n"
+#: src/dialogs.c:524
+#, fuzzy
+msgid ""
+"Please enter the screen name of the person whose info you would like to view."
 msgstr ""
 "Vennligst skriv inn skjermnavnet til den personen du vil se informasjon om.\n"
 
-#: 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
+#: src/dialogs.c:552 src/gtkimhtmltoolbar.c:240
 msgid "Select Text Color"
 msgstr "Velg tekstfarge"
 
-#: src/dialogs.c:1217 src/dialogs.c:1234
+#: src/dialogs.c:580 src/gtkimhtmltoolbar.c:310
 msgid "Select Background Color"
 msgstr "Velg bakgrunnsfarge"
 
-#: src/dialogs.c:1319 src/dialogs.c:1345
+#: src/dialogs.c:619 src/gtkimhtmltoolbar.c:164
 msgid "Select Font"
 msgstr "Velg skrifttype"
 
-#: src/dialogs.c:1411
+#: src/dialogs.c:692
 msgid "You cannot save an away message with a blank title"
 msgstr "Du kan ikke lagre en fraværsbeskjed uten tittel"
 
-#: src/dialogs.c:1413
+#: src/dialogs.c:694
 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:1423
+#: src/dialogs.c:704
 msgid "You cannot create an empty away message"
 msgstr "Du kan ikke lage en tom fraværsbeskjed"
 
-#: src/dialogs.c:1488 src/dialogs.c:1496
+#: src/dialogs.c:766
 msgid "New away message"
 msgstr "Ny fraværsbeskjed"
 
-#: src/dialogs.c:1506
+#: src/dialogs.c:787
 msgid "Away title: "
 msgstr "Tittel: "
 
-#: src/dialogs.c:1556
+#: src/dialogs.c:843
 msgid "Save & Use"
 msgstr "Lagre & bruk"
 
-#: src/dialogs.c:1560
+#: src/dialogs.c:847
 msgid "Use"
 msgstr "Bruk"
 
-#. show everything
-#: src/dialogs.c:1709
-msgid "Smile!"
-msgstr "Smil!"
-
-#: src/dialogs.c:1727
+#: src/dialogs.c:868
 msgid "Alias Chat"
 msgstr "Samtalealias"
 
-#: src/dialogs.c:1727
-msgid "Alias chat"
-msgstr "Samtalealias"
-
-#: src/dialogs.c:1728
-msgid "Please enter an aliased name for this chat."
+#: src/dialogs.c:869
+#, fuzzy
+msgid "Enter an alias for this chat."
 msgstr "Vennligst skriv inn aliasnavn for denne samtalen."
 
-#: src/dialogs.c:1744
+#: src/dialogs.c:871 src/dialogs.c:888 src/dialogs.c:907 src/gtkrequest.c:243
+msgid "Alias"
+msgstr "Alias"
+
 #
+#: src/dialogs.c:885
 msgid "Alias Contact"
 msgstr "Kontaktalias"
 
-#: src/dialogs.c:1744
 #
-msgid "Alias contact"
-msgstr "Kontaktalias"
-
-#: src/dialogs.c:1745
-#
-msgid "Please enter an aliased name for this contact."
+#: src/dialogs.c:886
+#, fuzzy
+msgid "Enter an alias for this contact."
 msgstr "Vennligst skriv inn aliasnavn for denne kontakten."
 
-#: 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
+#: src/dialogs.c:903
+#, fuzzy, c-format
+msgid "Enter an alias for %s."
+msgstr "Oppgi passord for %s"
+
+#: src/dialogs.c:905
 msgid "Alias Buddy"
 msgstr "Alias for kontakt"
 
-#: 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
+#: src/ft.c:144
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s er ikke et gyldig filnavn.\n"
 
-#: src/ft.c:137
+#: src/ft.c:157
 #, c-format
 msgid "%s was not found.\n"
 msgstr "%s ble ikke funnet.\n"
 
-#: src/ft.c:693
+#: src/ft.c:786
 #, c-format
 msgid "File transfer to %s aborted.\n"
 msgstr "Filoverføring til %s avbrutt.\n"
 
-#: src/ft.c:695
+#: src/ft.c:788
 #, c-format
 msgid "File transfer from %s aborted.\n"
 msgstr "Filoverføring fra %s avbrutt.\n"
@@ -1760,7 +1876,7 @@
 msgid "Size of the expander arrow"
 msgstr "Størrelse på utvider-pil"
 
-#: src/gaim-remote.c:33
+#: src/gaim-remote.c:65
 #, c-format
 msgid ""
 "Usage: %s command [OPTIONS] [URI]\n"
@@ -1781,30 +1897,31 @@
 "    FLAGG:\n"
 "       -h, --help [kommando]    Vis hjelp for kommando\n"
 
-#: src/gaim-remote.c:139 src/gaim-remote.c:155
+#: src/gaim-remote.c:174 src/gaim-remote.c:190
 msgid "Gaim not running (on session 0)\n"
 msgstr "Gaim kjører ikke (på sesjon 0)\n"
 
-#: src/gaim-remote.c:167
+#: src/gaim-remote.c:203
+#, fuzzy
 msgid ""
 "\n"
 "Using AIM: URIs:\n"
-"Sending an IM to a screenname:\n"
+"Sending an IM to a screen name:\n"
 "\tgaim-remote uri 'aim:goim?screenname=Penguin&message=hello+world'\n"
-"In this case, 'Penguin' is the screenname we wish to IM, and 'hello world'\n"
+"In this case, 'Penguin' is the screen name 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 screenname,\n"
+"Also,the following will just open a conversation window to a screen name,\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"
@@ -1829,7 +1946,7 @@
 "\tgaim-remote uri aim:addbuddy?screenname=Penguin\n"
 "...vil spørre deg om å legge til Penguin i kontaktlisten.\n"
 
-#: src/gaim-remote.c:187
+#: src/gaim-remote.c:222
 msgid ""
 "\n"
 "Close running copy of Gaim\n"
@@ -1838,32 +1955,27 @@
 "Lukk eksisterende Gaim-program\n"
 
 #. for people like myself, who are too lazy to add an away msg :)
-#: src/gaimrc.c:44
+#: src/gaimrc.c:46
 msgid "sorry, i ran out for a while. bbl"
 msgstr "tilbake om en stund"
 
-#: src/gaimrc.c:373 src/gaimrc.c:1464
+#: src/gaimrc.c:375 src/gaimrc.c:1451
 msgid "boring default"
 msgstr "kjedelig standardsvar"
 
-#: src/gaimrc.c:1271 src/gtkblist.c:2111
+#: src/gaimrc.c:1260 src/gtkblist.c:2966
 msgid "Alphabetical"
 msgstr "Alfabetisk"
 
-#: src/gaimrc.c:1273 src/gtkblist.c:2112
+#: src/gaimrc.c:1262 src/gtkblist.c:2967
 msgid "By status"
 msgstr "Etter status"
 
-#: src/gaimrc.c:1275 src/gtkblist.c:2113
+#: src/gaimrc.c:1264 src/gtkblist.c:2968
 msgid "By log size"
 msgstr "Etter loggstørrelse"
 
-#: src/gaimrc.c:1562
-#, c-format
-msgid "Could not open config file %s."
-msgstr "Kunne ikke åpne konfigurasjonsfil %s."
-
-#: src/gtkaccount.c:287
+#: src/gtkaccount.c:289
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -1874,178 +1986,173 @@
 "<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:369
+#: src/gtkaccount.c:384
 msgid "Login Options"
 msgstr "Innloggingsvalg"
 
-#: src/gtkaccount.c:386
+#: src/gtkaccount.c:401
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: src/gtkaccount.c:391
-msgid "Screenname:"
+#: src/gtkaccount.c:406 src/gtkblist.c:3954
+msgid "Screen Name:"
 msgstr "Skjermnavn:"
 
-#: src/gtkaccount.c:464 src/main.c:307 src/protocols/irc/irc.c:161
-#: src/protocols/jabber/chat.c:56
+#: src/gtkaccount.c:479
 msgid "Password:"
 msgstr "Passord:"
 
-#: src/gtkaccount.c:469 src/gtkblist.c:3084 src/gtkblist.c:3403
+#: src/gtkaccount.c:484 src/gtkblist.c:3968 src/gtkblist.c:4296
 msgid "Alias:"
 msgstr "Alias:"
 
-#: src/gtkaccount.c:473
+#: src/gtkaccount.c:488
 msgid "Remember password"
 msgstr "Husk passord"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:527
+#: src/gtkaccount.c:542
 msgid "User Options"
 msgstr "Brukervalg"
 
-#: src/gtkaccount.c:540
+#: src/gtkaccount.c:555
 msgid "New mail notifications"
 msgstr "Varsling om ny e-post"
 
-#: src/gtkaccount.c:549
+#: src/gtkaccount.c:564
 msgid "Buddy icon file:"
 msgstr "Fil for kontaktikoner:"
 
-#: src/gtkaccount.c:558
+#: src/gtkaccount.c:574
 msgid "_Browse"
 msgstr "_Bla gjennom"
 
-#: src/gtkaccount.c:564
+#: src/gtkaccount.c:580
 msgid "_Reset"
 msgstr "_Nullstill"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:626
+#: src/gtkaccount.c:642
 #, c-format
 msgid "%s Options"
 msgstr "%s brukervalg"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:747
+#: src/gtkaccount.c:778 src/gtkaccount.c:825
 msgid "Use Global Proxy Settings"
 msgstr "Bruk globale proxyinnstilinger"
 
 #. No Proxy
-#: src/gtkaccount.c:754
+#: src/gtkaccount.c:784 src/gtkaccount.c:832
 msgid "No Proxy"
 msgstr "Ingen proxy"
 
 #. HTTP
-#: src/gtkaccount.c:761
+#: src/gtkaccount.c:790 src/gtkaccount.c:839
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:768
+#: src/gtkaccount.c:796 src/gtkaccount.c:846
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:775
+#: src/gtkaccount.c:802 src/gtkaccount.c:853
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
+#
 #. Use Environmental Settings
-#: src/gtkaccount.c:782 src/gtkprefs.c:1101
-#
+#: src/gtkaccount.c:808 src/gtkaccount.c:860 src/gtkprefs.c:1214
 msgid "Use Environmental Settings"
 msgstr "Bruk innstillinger fra miljøet"
 
-#: src/gtkaccount.c:815
+#: src/gtkaccount.c:899
 msgid "you can see the butterflies mating"
 msgstr "sommerfugler svermer"
 
-#: src/gtkaccount.c:819
+#: src/gtkaccount.c:903
 msgid "If you look real closely"
 msgstr "hvis du ser virkelig godt etter"
 
-#: src/gtkaccount.c:835
+#: src/gtkaccount.c:919
 msgid "Proxy Options"
 msgstr "Proxyinnstillinger"
 
-#: src/gtkaccount.c:851 src/gtkprefs.c:1095
+#: src/gtkaccount.c:937 src/gtkprefs.c:1208
 msgid "Proxy _type:"
 msgstr "Proxytype:"
 
-#: src/gtkaccount.c:860
+#: src/gtkaccount.c:946 src/gtkprefs.c:1238
 msgid "_Host:"
 msgstr "Adresse:"
 
-#: src/gtkaccount.c:864
+#: src/gtkaccount.c:950 src/gtkprefs.c:1256
 msgid "_Port:"
 msgstr "_Port:"
 
-#: src/gtkaccount.c:872
+#: src/gtkaccount.c:958
 msgid "_Username:"
 msgstr "_Brukernavn:"
 
-#: src/gtkaccount.c:877
+#: src/gtkaccount.c:963 src/gtkprefs.c:1293
 msgid "Pa_ssword:"
 msgstr "Passord:"
 
-#: src/gtkaccount.c:1218
+#: src/gtkaccount.c:1331
 msgid "Add Account"
 msgstr "Legg til konto"
 
-#: src/gtkaccount.c:1220
+#: src/gtkaccount.c:1333
 msgid "Modify Account"
 msgstr "Endre konto"
 
 #. Add the disclosure
-#: src/gtkaccount.c:1244
+#: src/gtkaccount.c:1357
 msgid "Show more options"
 msgstr "Vis flere valg"
 
-#: src/gtkaccount.c:1245
+#: src/gtkaccount.c:1358
 msgid "Show fewer options"
 msgstr "Vis færre valg"
 
 #. Register button
-#: src/gtkaccount.c:1272 src/protocols/jabber/jabber.c:656
+#: src/gtkaccount.c:1385 src/protocols/jabber/jabber.c:659
 msgid "Register"
 msgstr "Registrer"
 
-#: src/gtkaccount.c:1617
+#: src/gtkaccount.c:1739
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Er du sikker på at du vil slette %s?"
 
-#: src/gtkaccount.c:1621 src/gtkrequest.c:206
+#: src/gtkaccount.c:1743 src/gtkrequest.c:239
 msgid "Delete"
 msgstr "Slett"
 
-#: src/gtkaccount.c:1734
+#: src/gtkaccount.c:1857 src/protocols/oscar/oscar.c:3365
 msgid "Screen Name"
 msgstr "Skjermnavn"
 
-#: 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
+#: src/gtkaccount.c:1880 src/protocols/jabber/jabber.c:950
+#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:4823
+#: src/protocols/oscar/oscar.c:6425 src/protocols/yahoo/yahoo.c:2299
+#: src/protocols/zephyr/zephyr.c:1182 src/protocols/zephyr/zephyr.c:1192
 msgid "Online"
 msgstr "Pålogget"
 
-#: src/gtkaccount.c:1775
+#: src/gtkaccount.c:1898
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: src/gtkaccount.c:2065
+#: src/gtkaccount.c:2210
 #, 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:2079
+#: src/gtkaccount.c:2224
 msgid ""
 "\n"
 "\n"
@@ -2055,184 +2162,237 @@
 "\n"
 "Ønsker du å legge vedkommende til i din kontaktliste?"
 
-#: src/gtkaccount.c:2083
-msgid "Gaim - Information"
-msgstr "Gaim - Informasjon"
-
-#: src/gtkaccount.c:2087
+#: src/gtkaccount.c:2228
+#, fuzzy
+msgid "Information"
+msgstr "Arbeid ekstra info"
+
+#: src/gtkaccount.c:2232
 msgid "Add buddy to your list?"
 msgstr "Legg til brukeren i kontaktlisten din?"
 
-#: 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
+#. Add button
+#: src/gtkaccount.c:2234 src/gtkblist.c:4348 src/gtkconv.c:1113
+#: src/gtkconv.c:3332 src/gtkconv.c:3423 src/gtkrequest.c:240
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3004
 msgid "Add"
 msgstr "Legg til"
 
-#: src/gtkblist.c:811
-msgid "_Get Info"
-msgstr "Info"
+#: src/gtkblist.c:801 src/gtkblist.c:4236
+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:814
-msgid "_IM"
-msgstr "Direktemelding"
-
-#: src/gtkblist.c:816
+#, fuzzy
+msgid "Join a Chat"
+msgstr "Bli med i samtalegruppe"
+
+#: src/gtkblist.c:835
+#, 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:848 src/gtkpounce.c:361 src/gtkroomlist.c:365
+msgid "_Account:"
+msgstr "Konto:"
+
+#: src/gtkblist.c:1087 src/gtkblist.c:3155
+#, fuzzy
+msgid "Get _Info"
+msgstr "Info"
+
+#: src/gtkblist.c:1090 src/gtkblist.c:3146
+#, fuzzy
+msgid "I_M"
+msgstr "Beskjed"
+
+#: src/gtkblist.c:1092
 msgid "Add Buddy _Pounce"
 msgstr "Legg til kompisvarsling"
 
-#: src/gtkblist.c:818
+#: src/gtkblist.c:1094
 msgid "View _Log"
 msgstr "Vis logg"
 
-#: src/gtkblist.c:840 src/gtkblist.c:933 src/gtkblist.c:942
+#: src/gtkblist.c:1159 src/gtkblist.c:1260 src/gtkblist.c:1274
+#, fuzzy
+msgid "_Alias..."
+msgstr "_Alias"
+
+#: src/gtkblist.c:1161 src/gtkblist.c:1262 src/gtkblist.c:1279
+#: src/gtkconn.c:361
 msgid "_Remove"
 msgstr "Fjern"
 
-#: src/gtkblist.c:912
+#: src/gtkblist.c:1206
 msgid "Add a _Buddy"
 msgstr "Legg til kontakt"
 
-#: src/gtkblist.c:914
+#: src/gtkblist.c:1208
 msgid "Add a C_hat"
 msgstr "Legg til samtale"
 
-#: src/gtkblist.c:916
+#: src/gtkblist.c:1210
 msgid "_Delete Group"
 msgstr "Slett gruppe"
 
-#: src/gtkblist.c:918
+#: src/gtkblist.c:1212
 msgid "_Rename"
 msgstr "Endre navn"
 
-#: src/gtkblist.c:926
+#. join button
+#: src/gtkblist.c:1238 src/gtkroomlist.c:261 src/gtkroomlist.c:417
+#: src/stock.c:87
 msgid "_Join"
 msgstr "_Bli med i samtalegruppe"
 
-#: src/gtkblist.c:928
+#: src/gtkblist.c:1240
 msgid "Auto-Join"
 msgstr "Automatisk pålogging"
 
-#: src/gtkblist.c:939 src/gtkblist.c:969
+#: src/gtkblist.c:1276 src/gtkblist.c:1302
 msgid "_Collapse"
 msgstr "_Lukk"
 
-#: src/gtkblist.c:974
+#: src/gtkblist.c:1307
 msgid "_Expand"
 msgstr "_Utvid"
 
+#: src/gtkblist.c:1964 src/gtkconv.c:3911
+#, 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:1462
+#: src/gtkblist.c:2312
 msgid "/_Buddies"
 msgstr "/_Kontakter"
 
-#: src/gtkblist.c:1463
-msgid "/Buddies/New _Instant Message..."
+#: src/gtkblist.c:2313
+#, fuzzy
+msgid "/Buddies/New Instant _Message..."
 msgstr "/Kontakter/_Ny direktemelding..."
 
-#: src/gtkblist.c:1464
+#: src/gtkblist.c:2314
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Kontakter/_Bli med i samtalegruppe..."
 
-#: src/gtkblist.c:1465
-msgid "/Buddies/Get _User Info..."
+#: src/gtkblist.c:2315
+#, fuzzy
+msgid "/Buddies/Get User _Info..."
 msgstr "/Kontakter/_Hent brukerinfo..."
 
-#: src/gtkblist.c:1467
+#: src/gtkblist.c:2317
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Kontakter/Vis _avloggede kontakter"
 
-#: src/gtkblist.c:1468
+#: src/gtkblist.c:2318
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Kontakter/Vis _tomme grupper"
 
-#: src/gtkblist.c:1469
-msgid "/Buddies/_Add a Buddy..."
+#: src/gtkblist.c:2319
+#, fuzzy
+msgid "/Buddies/_Add Buddy..."
 msgstr "/Kontakter/_Legg til kontakt..."
 
-#: src/gtkblist.c:1470
-msgid "/Buddies/Add a C_hat..."
+#: src/gtkblist.c:2320
+#, fuzzy
+msgid "/Buddies/Add C_hat..."
 msgstr "/Kontakter/Legg til _samtalegruppe..."
 
-#: src/gtkblist.c:1471
-msgid "/Buddies/Add a _Group..."
+#: src/gtkblist.c:2321
+#, fuzzy
+msgid "/Buddies/Add _Group..."
 msgstr "/Kontakter/Legg til _gruppe..."
 
-#: src/gtkblist.c:1473
+#: src/gtkblist.c:2323
 msgid "/Buddies/_Signoff"
 msgstr "/Kontakter/L_ogge av"
 
-#: src/gtkblist.c:1474
+#: src/gtkblist.c:2324
 msgid "/Buddies/_Quit"
 msgstr "/Kontakter/_Avslutt"
 
 #. Tools
-#: src/gtkblist.c:1477
+#: src/gtkblist.c:2327
 msgid "/_Tools"
 msgstr "/_Verktøy"
 
-#: src/gtkblist.c:1478
+#: src/gtkblist.c:2328
 msgid "/Tools/_Away"
 msgstr "/Verktøy/_Borte"
 
-#: src/gtkblist.c:1479
+#: src/gtkblist.c:2329
 msgid "/Tools/Buddy _Pounce"
 msgstr "/Verktøy/_Kompisvarsling"
 
-#: src/gtkblist.c:1480
+#: src/gtkblist.c:2330
 msgid "/Tools/P_rotocol Actions"
 msgstr "/Verktøy/_Handlinger"
 
-#: src/gtkblist.c:1482
+#: src/gtkblist.c:2332
 msgid "/Tools/A_ccounts"
 msgstr "/Verktøy/K_ontoer"
 
-#: src/gtkblist.c:1483
-msgid "/Tools/_File Transfers..."
+#: src/gtkblist.c:2333
+#, fuzzy
+msgid "/Tools/_File Transfers"
 msgstr "/Verktøy/_Filoverføringer..."
 
-#: src/gtkblist.c:1484
-msgid "/Tools/Preferences"
+#: src/gtkblist.c:2334
+#, fuzzy
+msgid "/Tools/R_oom List"
+msgstr "/Verktøy/_Handlinger"
+
+#: src/gtkblist.c:2335
+#, fuzzy
+msgid "/Tools/Pr_eferences"
 msgstr "/Verktøy/_Innstillinger"
 
-#: src/gtkblist.c:1485
+#: src/gtkblist.c:2336
 msgid "/Tools/Pr_ivacy"
 msgstr "/Verktøy/_Sikkerhet"
 
-#: src/gtkblist.c:1487
+#: src/gtkblist.c:2338
 msgid "/Tools/View System _Log"
 msgstr "/Verktøy/_Vis systemlogg"
 
 #. Help
-#: src/gtkblist.c:1490
+#: src/gtkblist.c:2341
 msgid "/_Help"
 msgstr "/_Hjelp"
 
-#: src/gtkblist.c:1491
+#: src/gtkblist.c:2342
 msgid "/Help/Online _Help"
 msgstr "/Hjelp/Hjelp på _nettet"
 
-#: src/gtkblist.c:1492
+#: src/gtkblist.c:2343
 msgid "/Help/_Debug Window"
 msgstr "/Hjelp/_Avlusningsvindu"
 
-#: src/gtkblist.c:1493
+#: src/gtkblist.c:2344
 msgid "/Help/_About"
 msgstr "/Hjelp/_Om"
 
-#: src/gtkblist.c:1509
+#: src/gtkblist.c:2360
 msgid "Rename Group"
 msgstr "Endre gruppenavn"
 
-#: src/gtkblist.c:1509
+#: src/gtkblist.c:2360
 msgid "New group name"
 msgstr "Nytt gruppenavn:"
 
-#: src/gtkblist.c:1510
+#: src/gtkblist.c:2361
 msgid "Please enter a new name for the selected group."
 msgstr "Vennligst skriv inn nytt navn for gruppen."
 
-#: src/gtkblist.c:1539
+#: src/gtkblist.c:2389
 #, c-format
 msgid ""
 "\n"
@@ -2241,16 +2401,16 @@
 "\n"
 "<b>Konto:</b> %s"
 
-#: src/gtkblist.c:1602 src/protocols/oscar/oscar.c:5512
+#: src/gtkblist.c:2453
 msgid "<b>Status:</b> Offline"
 msgstr "<b>Status:</b> Avlogget"
 
-#: src/gtkblist.c:1614
+#: src/gtkblist.c:2468
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:1629
+#: src/gtkblist.c:2484
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2258,8 +2418,8 @@
 "\n"
 "<b>Konto:</b>"
 
-#: src/gtkblist.c:1630
 #
+#: src/gtkblist.c:2485
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
@@ -2267,7 +2427,7 @@
 "\n"
 "<b>Kontaktalias:</b>"
 
-#: src/gtkblist.c:1631
+#: src/gtkblist.c:2486
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2275,7 +2435,7 @@
 "\n"
 "<b>Alias:</b>"
 
-#: src/gtkblist.c:1632
+#: src/gtkblist.c:2487
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2283,7 +2443,14 @@
 "\n"
 "<b>Kallenavn:</b>"
 
-#: src/gtkblist.c:1633
+#: src/gtkblist.c:2488
+#, fuzzy
+msgid ""
+"\n"
+"<b>Logged In:</b>"
+msgstr "<b>Pålogget:</b> "
+
+#: src/gtkblist.c:2489
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2291,7 +2458,7 @@
 "\n"
 "<b>Inaktiv:</b>"
 
-#: src/gtkblist.c:1634
+#: src/gtkblist.c:2490
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2299,7 +2466,7 @@
 "\n"
 "<b>Advart:</b>"
 
-#: src/gtkblist.c:1636
+#: src/gtkblist.c:2492
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2307,7 +2474,7 @@
 "\n"
 "<b>Beskrivelse:</b> Skummel"
 
-#: src/gtkblist.c:1637
+#: src/gtkblist.c:2493
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2315,7 +2482,7 @@
 "\n"
 "<b>Status:</b> Fantastisk"
 
-#: src/gtkblist.c:1638
+#: src/gtkblist.c:2494
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2323,85 +2490,79 @@
 "\n"
 "<b>Status:</b> Rockin'"
 
-#: src/gtkblist.c:1906
+#: src/gtkblist.c:2764
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "Inaktiv (%dt%02dm) "
 
-#: src/gtkblist.c:1908
+#: src/gtkblist.c:2766
 #, c-format
 msgid "Idle (%dm) "
 msgstr "Inaktiv (%dm) "
 
-#: src/gtkblist.c:1913
+#: src/gtkblist.c:2771
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "Advart (%d%%) "
 
-#: src/gtkblist.c:1916
+#: src/gtkblist.c:2774
 msgid "Offline "
 msgstr "Avlogget"
 
-#: src/gtkblist.c:2109 src/gtkprefs.c:841 src/gtkprefs.c:1495
-msgid "None"
-msgstr "Ingen"
-
-#: src/gtkblist.c:2177
+#: src/gtkblist.c:3032
 msgid "/Tools/Away"
 msgstr "/Verktøy/Borte"
 
-#: src/gtkblist.c:2180
+#: src/gtkblist.c:3035
 msgid "/Tools/Buddy Pounce"
 msgstr "/Verktøy/Kompisvarsel"
 
-#: src/gtkblist.c:2183
+#: src/gtkblist.c:3038
 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:2267
+#: src/gtkblist.c:3126
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Kontakter/Vis _avloggede kontakter"
 
-#: src/gtkblist.c:2269
+#: src/gtkblist.c:3128
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Kontakter/Vis tomme grupper"
 
-#: src/gtkblist.c:2287 src/gtkconv.c:1217
-msgid "IM"
-msgstr "Beskjed"
-
-#: src/gtkblist.c:2293
+#: src/gtkblist.c:3152
 msgid "Send a message to the selected buddy"
 msgstr "Send beskjed til den valgte kontakten"
 
-#: src/gtkblist.c:2296 src/protocols/napster/napster.c:529
-msgid "Get Info"
-msgstr "Info"
-
-#: src/gtkblist.c:2302
+#: src/gtkblist.c:3161
 msgid "Get information on the selected buddy"
 msgstr "Hent informasjon om den valgte kontakten"
 
-#: src/gtkblist.c:2305 src/protocols/oscar/oscar.c:3084
-msgid "Chat"
+#: src/gtkblist.c:3164
+#, fuzzy
+msgid "_Chat"
 msgstr "Samtale"
 
-#: src/gtkblist.c:2310
+#: src/gtkblist.c:3169
 msgid "Join a chat room"
 msgstr "Bli med i samtalegruppe"
 
-#: src/gtkblist.c:2318
+#: src/gtkblist.c:3172
+#, fuzzy
+msgid "_Away"
+msgstr "Borte"
+
+#: src/gtkblist.c:3177
 msgid "Set an away message"
 msgstr "Sett en fraværsbeskjed"
 
-#: src/gtkblist.c:3026 src/protocols/yahoo/yahoo.c:2166
+#: src/gtkblist.c:3909 src/protocols/yahoo/yahoo.c:2431
 msgid "Add Buddy"
 msgstr "Legg til kontakt"
 
-#: src/gtkblist.c:3049
+#: src/gtkblist.c:3932
 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. "
@@ -2412,104 +2573,103 @@
 "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:3106 src/gtkblist.c:3384
+#: src/gtkblist.c:3992 src/gtkblist.c:4276
 msgid "Account:"
 msgstr "Konto:"
 
-#: src/gtkblist.c:3351
+#: src/gtkblist.c:4243
 msgid "Add Chat"
 msgstr "Legg til samtale"
 
-#: src/gtkblist.c:3374
+#: src/gtkblist.c:4266
 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:3448
+#: src/gtkblist.c:4345
 msgid "Add Group"
 msgstr "Legg til gruppe"
 
-#: src/gtkblist.c:3448
-msgid "Add a new group"
-msgstr "Legg til gruppe"
-
-#: src/gtkblist.c:3449
+#: src/gtkblist.c:4346
 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:3964
+#: src/gtkblist.c:4866
 msgid "No actions available"
 msgstr "Ingen handlinger tilgjengelig"
 
-#: src/gtkconn.c:58 src/gtkconn.c:242 src/gtkconn.c:253
+#: src/gtkconn.c:78 src/gtkconn.c:250 src/gtkconn.c:261
 msgid "Done."
 msgstr "Ferdig."
 
-#: src/gtkconn.c:137
+#: src/gtkconn.c:157
 msgid "Signon: "
 msgstr "Pålogging: "
 
-#: src/gtkconn.c:195
+#: src/gtkconn.c:203
 msgid "Signon"
 msgstr "Pålogging"
 
-#: src/gtkconn.c:208
+#: src/gtkconn.c:216
 msgid "Cancel All"
 msgstr "A_vbryt alle"
 
-#: src/gtkconn.c:347
+#
+#: 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
 msgid "Reason Unknown."
 msgstr "Ukjent årsak."
 
-#: src/gtkconn.c:356
 #
-msgid "Reconnect"
+#: src/gtkconn.c:598
+#, fuzzy
+msgid "Reconnect _All"
 msgstr "Automatisk tilkobling ved brudd"
 
-#: src/gtkconn.c:404
 #
-msgid "Account"
-msgstr "Konto"
-
-#: src/gtkconn.c:412
-#
+#: src/gtkconn.c:628
 msgid "Time"
 msgstr "Tid"
 
-#: src/gtkconv.c:186
+#: src/gtkconv.c:172
+#, fuzzy, c-format
+msgid "<h1>Conversation with %s</h1>\n"
+msgstr "Samtale med %s"
+
+#: src/gtkconv.c:190
 msgid "That file already exists"
 msgstr "Filen eksisterer allerede."
 
-#: src/gtkconv.c:187 src/gtkft.c:1034
+#: src/gtkconv.c:191 src/gtkft.c:1106
 msgid "Would you like to overwrite it?"
 msgstr "Ønsker du å overskrive den?"
 
-#: 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"
+#: src/gtkconv.c:505
+#, fuzzy
+msgid "Invite Buddy Into Chat Room"
 msgstr "Gaim - Inviter kontakt til samtalegruppe"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:644
+#: src/gtkconv.c:533
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -2517,470 +2677,486 @@
 "Vennligst skriv inn navnet på brukeren som du vil invitere, og en eventuell "
 "invitasjonsbeskjed."
 
-#: src/gtkconv.c:665
+#: src/gtkconv.c:554
 msgid "_Buddy:"
 msgstr "Kontakt:"
 
-#: src/gtkconv.c:685
+#: src/gtkconv.c:574
 msgid "_Message:"
 msgstr "Beskjed:"
 
-#: src/gtkconv.c:781
+#: src/gtkconv.c:667
+#, fuzzy
+msgid "Find"
+msgstr "Hindi"
+
 #
-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: "
+#: src/gtkconv.c:693
+#, fuzzy
+msgid "_Search for:"
 msgstr "Søkeord: "
 
-#: src/gtkconv.c:1225
+#: src/gtkconv.c:1071
+msgid "IM"
+msgstr "Beskjed"
+
+#: src/gtkconv.c:1079
 msgid "Un-Ignore"
 msgstr "Fjern ignorer"
 
-#: src/gtkconv.c:1227 src/gtkprefs.c:774
+#: src/gtkconv.c:1081 src/gtkprefs.c:817
 msgid "Ignore"
 msgstr "Ignorer"
 
 #. Info button
-#: src/gtkconv.c:1236 src/gtkconv.c:3172
+#: src/gtkconv.c:1090 src/gtkconv.c:3346
 msgid "Info"
 msgstr "Info"
 
-#: src/gtkconv.c:1245
+#: src/gtkconv.c:1099
 msgid "Get Away Msg"
 msgstr "Hent fraværsbeskjed"
 
-#: src/gtkconv.c:1256 src/gtkconv.c:3155 src/gtkconv.c:4340
-#: src/gtkrequest.c:208
+#. Remove button
+#: src/gtkconv.c:1111 src/gtkconv.c:3339 src/gtkconv.c:3430
+#: src/gtkrequest.c:241
 msgid "Remove"
 msgstr "Fjern"
 
-#: src/gtkconv.c:2373
+#
+#: src/gtkconv.c:2201
+msgid "Animate"
+msgstr "Animer"
+
+#: src/gtkconv.c:2206
+msgid "Hide Icon"
+msgstr "Skjul ikon"
+
+#: src/gtkconv.c:2212
+msgid "Save Icon As..."
+msgstr "Lagre ikon som..."
+
+#: src/gtkconv.c:2579
 msgid "User is typing..."
 msgstr "Brukeren skriver en melding..."
 
-#: src/gtkconv.c:2381
+#: src/gtkconv.c:2587
 msgid "User has typed something and paused"
 msgstr "Brukeren har skrevet noe og tatt pause"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2484
+#: src/gtkconv.c:2690
 msgid "_Send As"
 msgstr "Send som"
 
-#: src/gtkconv.c:2944
-msgid "Gaim - Save Conversation"
+#: src/gtkconv.c:3110
+#, fuzzy
+msgid "Save Conversation"
 msgstr "Gaim - Lagre samtale"
 
 #. Conversation menu
-#: src/gtkconv.c:2961
+#: src/gtkconv.c:3127
 msgid "/_Conversation"
 msgstr "/_Samtale"
 
-#: src/gtkconv.c:2963
-msgid "/Conversation/_Save As..."
-msgstr "/Samtale/_Lagre som..."
-
-#: src/gtkconv.c:2965
+#: src/gtkconv.c:3129
+#, fuzzy
+msgid "/Conversation/New Instant _Message..."
+msgstr "/Samtale/Sett inn _bilde..."
+
+#: src/gtkconv.c:3134
+#, fuzzy
+msgid "/Conversation/_Find..."
+msgstr "/Samtale/_Legg til..."
+
 #
+#: src/gtkconv.c:3136
 msgid "/Conversation/View _Log"
 msgstr "/Samtale/_Vis logg..."
 
-#: src/gtkconv.c:2966
-#
-msgid "/Conversation/Search..."
-msgstr "/Samtale/Søk..."
-
-#: src/gtkconv.c:2970
+#: src/gtkconv.c:3137
+msgid "/Conversation/_Save As..."
+msgstr "/Samtale/_Lagre som..."
+
+#: src/gtkconv.c:3142
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Samtale/Legg til _kompisvarsling"
 
-#: src/gtkconv.c:2972
+#: src/gtkconv.c:3144
+#, fuzzy
+msgid "/Conversation/_Get Info"
+msgstr "/Samtale/_Hent info..."
+
+#: src/gtkconv.c:3146
+msgid "/Conversation/_Warn..."
+msgstr "/Samtale/A_dvar..."
+
+#: src/gtkconv.c:3148
+msgid "/Conversation/In_vite..."
+msgstr "/Samtale/_Inviter..."
+
+#: src/gtkconv.c:3153
 msgid "/Conversation/A_lias..."
 msgstr "/Samtale/_Alias..."
 
-#: src/gtkconv.c:2974
-msgid "/Conversation/_Get Info..."
-msgstr "/Samtale/_Hent info..."
-
-#: 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:2990
+#: src/gtkconv.c:3155
 msgid "/Conversation/_Block..."
 msgstr "/Samtale/_Blokker..."
 
-#: src/gtkconv.c:2992
+#: src/gtkconv.c:3157
 msgid "/Conversation/_Add..."
 msgstr "/Samtale/_Legg til..."
 
-#: src/gtkconv.c:2994
+#: src/gtkconv.c:3159
 msgid "/Conversation/_Remove..."
 msgstr "/Samtale/_Fjern..."
 
-#: src/gtkconv.c:2999
+#: src/gtkconv.c:3164
+#, fuzzy
+msgid "/Conversation/Insert Lin_k..."
+msgstr "/Samtale/Sett inn URL..."
+
+#: src/gtkconv.c:3166
+#, fuzzy
+msgid "/Conversation/Insert Imag_e..."
+msgstr "/Samtale/Sett inn bilde..."
+
+#: src/gtkconv.c:3171
 msgid "/Conversation/_Close"
 msgstr "/Samtale/L_ukk"
 
 #. Options
-#: src/gtkconv.c:3003
+#: src/gtkconv.c:3175
 msgid "/_Options"
 msgstr "/_Brukervalg"
 
-#: src/gtkconv.c:3004
+#: src/gtkconv.c:3176
 msgid "/Options/Enable _Logging"
 msgstr "/Brukervalg/Slå på _logging"
 
-#: src/gtkconv.c:3005
+#: src/gtkconv.c:3177
 msgid "/Options/Enable _Sounds"
 msgstr "/Brukervalg/Slå på l_yder"
 
-#: src/gtkconv.c:3006
+#: src/gtkconv.c:3178
 msgid "/Options/Show Formatting _Toolbar"
 msgstr "/Brukervalg/Vis _formateringsverktøy"
 
-#: src/gtkconv.c:3048
 #
+#: src/gtkconv.c:3220
 msgid "/Conversation/View Log"
 msgstr "/Samtale/Vis logg"
 
-#: src/gtkconv.c:3053
+#: src/gtkconv.c:3225
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Samtale/Legg til kompisvarsling..."
 
-#: src/gtkconv.c:3057
+#: src/gtkconv.c:3231
+#, fuzzy
+msgid "/Conversation/Get Info"
+msgstr "/Samtale/Hent info..."
+
+#: src/gtkconv.c:3235
+msgid "/Conversation/Warn..."
+msgstr "/Samtale/Advar..."
+
+#: src/gtkconv.c:3239
+msgid "/Conversation/Invite..."
+msgstr "/Samtale/Inviter..."
+
+#: src/gtkconv.c:3245
 msgid "/Conversation/Alias..."
 msgstr "/Samtale/Alias..."
 
-#: src/gtkconv.c:3061
-msgid "/Conversation/Get Info..."
-msgstr "/Samtale/Hent info..."
-
-#: src/gtkconv.c:3065
-msgid "/Conversation/Invite..."
-msgstr "/Samtale/Inviter..."
-
-#: src/gtkconv.c:3071
-msgid "/Conversation/Insert URL..."
+#: src/gtkconv.c:3249
+msgid "/Conversation/Block..."
+msgstr "/Samtale/Blokker..."
+
+#: src/gtkconv.c:3253
+msgid "/Conversation/Add..."
+msgstr "/Samtale/Legg til..."
+
+#: src/gtkconv.c:3257
+msgid "/Conversation/Remove..."
+msgstr "/Samtale/Fjern..."
+
+#: src/gtkconv.c:3263
+#, fuzzy
+msgid "/Conversation/Insert Link..."
 msgstr "/Samtale/Sett inn URL..."
 
-#: src/gtkconv.c:3075
+#: src/gtkconv.c:3267
 msgid "/Conversation/Insert Image..."
 msgstr "/Samtale/Sett inn bilde..."
 
-#: src/gtkconv.c:3081
-msgid "/Conversation/Warn..."
-msgstr "/Samtale/Advar..."
-
-#: src/gtkconv.c:3085
-msgid "/Conversation/Block..."
-msgstr "/Samtale/Blokker..."
-
-#: src/gtkconv.c:3089
-msgid "/Conversation/Add..."
-msgstr "/Samtale/Legg til..."
-
-#: src/gtkconv.c:3093
-msgid "/Conversation/Remove..."
-msgstr "/Samtale/Fjern..."
-
-#: src/gtkconv.c:3099
+#: src/gtkconv.c:3273
 msgid "/Options/Enable Logging"
 msgstr "/Brukervalg/Slå på logging"
 
-#: src/gtkconv.c:3102
+#: src/gtkconv.c:3276
 msgid "/Options/Enable Sounds"
 msgstr "/Brukervalg/Slå på lyder"
 
-#: src/gtkconv.c:3105
+#: src/gtkconv.c:3279
 msgid "/Options/Show Formatting Toolbar"
 msgstr "/Brukervalg/Vis formateringsverktøy"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:3129 src/gtkconv.c:3131 src/gtkconv.c:3229 src/gtkconv.c:3231
-#: src/gtkconv.c:6063
+#: src/gtkconv.c:3302 src/gtkconv.c:3304 src/gtkconv.c:3402 src/gtkconv.c:3404
 msgid "Send"
 msgstr "Send"
 
-#: 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:3158 src/gtkconv.c:4343
-msgid "Remove the user from your buddy list"
-msgstr "Fjern brukeren fra kontaktlisten din"
-
+#. Now, um, just kind of all over the place. Huh?
 #. Warn button
-#: src/gtkconv.c:3165
+#: src/gtkconv.c:3318
 msgid "Warn"
 msgstr "Advar"
 
-#: src/gtkconv.c:3169
+#: src/gtkconv.c:3321
 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
+#: src/gtkconv.c:3325 src/gtkprivacy.c:612 src/gtkprivacy.c:623
 msgid "Block"
 msgstr "Blokker"
 
-#: src/gtkconv.c:3183
+#: src/gtkconv.c:3328
 msgid "Block the user"
 msgstr "Blokker brukeren"
 
+#: src/gtkconv.c:3335
+msgid "Add the user to your buddy list"
+msgstr "Legg til brukeren i kontaktlisten din"
+
+#: src/gtkconv.c:3342
+msgid "Remove the user from your buddy list"
+msgstr "Fjern brukeren fra kontaktlisten din"
+
+#: src/gtkconv.c:3349 src/gtkconv.c:3671
+msgid "Get the user's information"
+msgstr "Hent brukerinformasjon"
+
 #. Invite
-#: src/gtkconv.c:3241 src/gtkconv.c:6066
+#: src/gtkconv.c:3416
 msgid "Invite"
 msgstr "Inviter"
 
-#: src/gtkconv.c:3244
+#: src/gtkconv.c:3419
 msgid "Invite a user"
 msgstr "Inviter en bruker"
 
-#: 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
+#: src/gtkconv.c:3426
+#, fuzzy
+msgid "Add the chat to your buddy list"
+msgstr "Legg til brukeren i kontaktlisten din"
+
+#: src/gtkconv.c:3433
+#, fuzzy
+msgid "Remove the chat from your buddy list"
+msgstr "Fjern brukeren fra kontaktlisten din"
+
+#: src/gtkconv.c:3533
 msgid "Topic:"
 msgstr "Tema:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3534
+#: src/gtkconv.c:3593
 msgid "0 people in room"
 msgstr "0 brukere i rommet"
 
-#: src/gtkconv.c:3591
+#: src/gtkconv.c:3648
 msgid "IM the user"
 msgstr "Send beskjed til bruker"
 
-#: src/gtkconv.c:3603
+#: src/gtkconv.c:3660
 msgid "Ignore the user"
 msgstr "Ignorer bruker"
 
-#: src/gtkconv.c:4156
+#: src/gtkconv.c:4202
 msgid "Close conversation"
 msgstr "Lukk samtalen"
 
-#: src/gtkconv.c:4756 src/gtkconv.c:4788 src/gtkconv.c:4909 src/gtkconv.c:4976
+#: src/gtkconv.c:4747 src/gtkconv.c:4779 src/gtkconv.c:4900 src/gtkconv.c:4967
 #, 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: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
+#: src/gtkconv.c:5484 src/gtkconv.c:5487
 msgid "<main>/Conversation/Close"
 msgstr "<main>/Samtale/Lukk"
 
-#: src/gtkdebug.c:133
+#: src/gtkdebug.c:135
 msgid "Debug Window"
 msgstr "Avlusningsvindu"
 
-#: src/gtkdebug.c:173
+#: src/gtkdebug.c:175
 msgid "Pause"
 msgstr "Pause"
 
-#: src/gtkdebug.c:179
+#: src/gtkdebug.c:181
 msgid "Timestamps"
 msgstr "Tidsstempler"
 
-#: src/gtkft.c:126
+#: src/gtkft.c:135
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f KB/s"
 
-#: src/gtkft.c:200
+#
+#: src/gtkft.c:156 src/gtkft.c:957
+#, fuzzy
+msgid "Finished"
+msgstr "Finsk"
+
+#: src/gtkft.c:209
 msgid "<b>Receiving From:</b>"
 msgstr "<b>Mottar fra:</b>"
 
-#: src/gtkft.c:203
+#: src/gtkft.c:212
 msgid "<b>Sending To:</b>"
 msgstr "<b>Sender til:</b>"
 
-#: src/gtkft.c:436
+#: 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
 msgid "Progress"
 msgstr "Framdrift"
 
-#: src/gtkft.c:443
+#: src/gtkft.c:489
 msgid "Filename"
 msgstr "Filnavn"
 
-#: src/gtkft.c:450
+#: src/gtkft.c:496
 msgid "Size"
 msgstr "Størrelse"
 
-#: src/gtkft.c:457
+#: src/gtkft.c:503
 msgid "Remaining"
 msgstr "Gjenstår"
 
-#: src/gtkft.c:487
+#: src/gtkft.c:533
 msgid "Filename:"
 msgstr "Filnavn:"
 
-#: src/gtkft.c:488
+#: src/gtkft.c:534
 msgid "Status:"
 msgstr "Status:"
 
-#: src/gtkft.c:489
+#: src/gtkft.c:535
 msgid "Speed:"
 msgstr "Hastighet:"
 
-#: src/gtkft.c:490
+#: src/gtkft.c:536
 msgid "Time Elapsed:"
 msgstr "Tid brukt:"
 
-#: src/gtkft.c:491
+#: src/gtkft.c:537
 msgid "Time Remaining:"
 msgstr "Tid gjenstår:"
 
-#: src/gtkft.c:588
+#: src/gtkft.c:634
 msgid "_Keep the dialog open"
 msgstr "Hold dialogen åpen"
 
-#: src/gtkft.c:598
+#: src/gtkft.c:644
 msgid "_Clear finished transfers"
 msgstr "Fjern fullførte overføringer"
 
 #. "Download Details" arrow
-#: src/gtkft.c:607
-msgid "Show download details"
+#: src/gtkft.c:653
+#, fuzzy
+msgid "Show transfer details"
 msgstr "Vis nedlastingsdetaljer"
 
-#: src/gtkft.c:608
-msgid "Hide download details"
+#: src/gtkft.c:654
+#, fuzzy
+msgid "Hide transfer details"
 msgstr "Skjul nedlastingsdetaljer"
 
 #. Pause button
-#: src/gtkft.c:650 src/stock.c:86
+#: src/gtkft.c:696 src/stock.c:90
 msgid "_Pause"
 msgstr "_Pause"
 
 #. Resume button
-#: src/gtkft.c:660
+#: src/gtkft.c:706
 msgid "_Resume"
 msgstr "_Fortsett"
 
-#: src/gtkft.c:1011
+#: src/gtkft.c:908
+#, fuzzy
+msgid "Canceled"
+msgstr "_Avbryt"
+
+#: src/gtkft.c:910
+#, fuzzy
+msgid "Failed"
+msgstr "Feil."
+
+#: src/gtkft.c:1082
 msgid "That file does not exist."
 msgstr "Filen eksisterer ikke."
 
-#: src/gtkft.c:1020
+#: src/gtkft.c:1091
 msgid "Cannot send a file of 0 bytes."
 msgstr "Kan ikke sende en fil som er 0 bytes."
 
-#: src/gtkft.c:1033
+#: src/gtkft.c:1105
 msgid "That file already exists."
 msgstr "Filen eksisterer allerede."
 
-#: src/gtkft.c:1058
-msgid "Gaim - Open..."
+#: src/gtkft.c:1131
+#, fuzzy
+msgid "Open..."
 msgstr "Gaim - Åpne..."
 
-#: src/gtkft.c:1060 src/protocols/toc/toc.c:2042
-msgid "Gaim - Save As..."
-msgstr "Gaim - Lagre som..."
-
-#: src/gtkft.c:1107
+#: src/gtkft.c:1133
+#, fuzzy
+msgid "Save As..."
+msgstr "Lagre ikon som..."
+
+#: src/gtkft.c:1183
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s ønsker å sende deg %s (%s)"
 
-#: src/gtkimhtml.c:614
+#: src/gtkft.c:1216
+#, fuzzy, c-format
+msgid "Accept file transfer request from %s?"
+msgstr "Mottok en ugyldig filsendingsforespørsel fra %s."
+
+#: src/gtkft.c:1220
+#, c-format
+msgid ""
+"A file is available for download from:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+
 #
+#: src/gtkimhtml.c:1139
 msgid "_Copy E-Mail Address"
 msgstr "Kopier e-postadresse"
 
-#: src/gtkimhtml.c:626
+#: src/gtkimhtml.c:1151
 msgid "_Copy Link Location"
 msgstr "Kopier snarvei"
 
-#: src/gtkimhtml.c:636
+#: src/gtkimhtml.c:1161
 msgid "_Open Link in Browser"
 msgstr "Åpne i nettleser"
 
-#: src/gtkimhtml.c:1744
+#: src/gtkimhtml.c:2643
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
@@ -2988,37 +3164,135 @@
 "Gaim kunne ikke gjette bildetypen ut fra filtypen (siste del av filnavnet). "
 "Antar PNG-format."
 
-#: src/gtkimhtml.c:1752
+#: src/gtkimhtml.c:2651
 #, c-format
 msgid "Error saving image: %s"
 msgstr "Feil under lagring av bilde: %s"
 
-#: src/gtkimhtml.c:1761
+#: src/gtkimhtml.c:2660
 msgid "Save Image"
 msgstr "Lagre bilde"
 
-#: src/gtkimhtml.c:1784
+#: src/gtkimhtml.c:2683
 msgid "_Save Image..."
 msgstr "Lagre bilde..."
 
-#: src/gtknotify.c:211
+#: src/gtkimhtmltoolbar.c:383
+#, fuzzy
+msgid "_URL"
+msgstr "URL"
+
+#: src/gtkimhtmltoolbar.c:387
+#, fuzzy
+msgid "_Description"
+msgstr "Beskrivelse"
+
+#: src/gtkimhtmltoolbar.c:392
+msgid "Insert Link"
+msgstr "Sett inn lenke"
+
+#: src/gtkimhtmltoolbar.c:394
+#, 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:398
+#, fuzzy
+msgid "_Insert"
+msgstr "Sett inn"
+
+#: src/gtkimhtmltoolbar.c:455
+#, c-format
+msgid "Failed to store image: %s\n"
+msgstr "Klarte ikke å lagre bilde: %s\n"
+
+#: src/gtkimhtmltoolbar.c:481
+#, fuzzy
+msgid "Insert Image"
+msgstr "Sett inn bilde"
+
+#. show everything
+#: src/gtkimhtmltoolbar.c:625
+msgid "Smile!"
+msgstr "Smil!"
+
+#: src/gtkimhtmltoolbar.c:825
+msgid "Bold"
+msgstr "Fet"
+
+#: src/gtkimhtmltoolbar.c:836
+msgid "Italic"
+msgstr "Kursiv"
+
+#: src/gtkimhtmltoolbar.c:847
+msgid "Underline"
+msgstr "Understrek"
+
+#: src/gtkimhtmltoolbar.c:863
+msgid "Larger font size"
+msgstr "Større skrift"
+
+#: src/gtkimhtmltoolbar.c:875
+msgid "Smaller font size"
+msgstr "Mindre skrift"
+
+#: src/gtkimhtmltoolbar.c:892
+msgid "Font Face"
+msgstr "Skrifttype"
+
+#: src/gtkimhtmltoolbar.c:904
+msgid "Foreground font color"
+msgstr "Forgrunnsfarge"
+
+#: src/gtkimhtmltoolbar.c:916
+msgid "Background color"
+msgstr "Bakgrunnsfarge"
+
+#: src/gtkimhtmltoolbar.c:931
+msgid "Insert link"
+msgstr "Sett inn lenke"
+
+#: src/gtkimhtmltoolbar.c:941
+msgid "Insert image"
+msgstr "Sett inn bilde"
+
+#: src/gtkimhtmltoolbar.c:952
+msgid "Insert smiley"
+msgstr "Sett inn smilefjes"
+
+#: src/gtklog.c:282
+#, fuzzy
+msgid "Conversations with"
+msgstr "Samtale med %s"
+
+#. Window **********
+#: src/gtklog.c:368 src/gtklog.c:384
+msgid "System Log"
+msgstr "Systemlogg"
+
+#. Descriptive label
+#: src/gtknotify.c:217
 #, 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:219
+#: src/gtknotify.c:229
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr "<span weight=\"bold\">Fra:</span> %s\n"
 
-#: src/gtknotify.c:224
+#: src/gtknotify.c:235
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr "<span weight=\"bold\">Emne:</span> %s\n"
 
-#: src/gtknotify.c:228
+#: src/gtknotify.c:239
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3029,7 +3303,7 @@
 "\n"
 "%s%s%s%s"
 
-#: src/gtknotify.c:243
+#: src/gtknotify.c:255
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3040,177 +3314,201 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:428 src/gtknotify.c:448 src/gtknotify.c:456
+#: src/gtknotify.c:441
+#, fuzzy, c-format
+msgid "The browser command \"%s\" is invalid."
+msgstr "Nettleseren \"%s\" er ugyldig."
+
+#: src/gtknotify.c:444 src/gtknotify.c:458 src/gtknotify.c:473
+#: src/gtknotify.c:581
 msgid "Unable to open URL"
 msgstr "Kunne ikke åpne URL"
 
-#: src/gtknotify.c:429
+#: src/gtknotify.c:455 src/gtknotify.c:470
+#, fuzzy, c-format
+msgid "Error launching \"%s\": %s"
+msgstr "Feil under starting av kommando: %s"
+
+#: src/gtknotify.c:582
 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/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
+#: src/gtkpounce.c:143
 msgid "Select a file"
 msgstr "Velg fil"
 
-#: src/gtkpounce.c:189
+#: src/gtkpounce.c:192
 msgid "Please enter a buddy to pounce."
 msgstr "Navnet på kompisen du vil varsle."
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:333 src/gtkpounce.c:738
+#: src/gtkpounce.c:336 src/gtkpounce.c:756
 msgid "New Buddy Pounce"
 msgstr "Legg til kompisvarsling"
 
-#: src/gtkpounce.c:333
+#: src/gtkpounce.c:336
 msgid "Edit Buddy Pounce"
 msgstr "Rediger kompisvarsling"
 
 #. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:351
+#: src/gtkpounce.c:354
 msgid "Pounce Who"
 msgstr "Varsling for"
 
-#: src/gtkpounce.c:377
+#: src/gtkpounce.c:381
 msgid "_Buddy Name:"
 msgstr "Kontakt:"
 
 #. Create the "Pounce When" frame.
-#: src/gtkpounce.c:399
+#: src/gtkpounce.c:404
 msgid "Pounce When"
 msgstr "Varsle når"
 
-#: src/gtkpounce.c:407 src/main.c:339
-msgid "Sign on"
+#: src/gtkpounce.c:412
+#, fuzzy
+msgid "_Sign on"
 msgstr "Pålogging"
 
-#: src/gtkpounce.c:409
-msgid "Sign off"
+#: src/gtkpounce.c:414
+#, fuzzy
+msgid "Sign _off"
 msgstr "Logge av"
 
-#: src/gtkpounce.c:413
-msgid "Return from away"
+#: src/gtkpounce.c:416
+#, fuzzy
+msgid "A_way"
+msgstr "Borte"
+
+#: src/gtkpounce.c:418
+#, fuzzy
+msgid "Re_turn from away"
 msgstr "Returnere fra fravær"
 
-#: src/gtkpounce.c:415 src/gtkprefs.c:1492 src/protocols/msn/state.c:30
-#: src/protocols/yahoo/yahoo.c:2028
-msgid "Idle"
+#: src/gtkpounce.c:420
+#, fuzzy
+msgid "_Idle"
 msgstr "Inaktiv"
 
-#: src/gtkpounce.c:417
-msgid "Return from idle"
+#: src/gtkpounce.c:422
+#, fuzzy
+msgid "Retur_n from idle"
 msgstr "Returner fra inaktivitet"
 
-#: src/gtkpounce.c:419
-msgid "Buddy starts typing"
+#: src/gtkpounce.c:424
+#, fuzzy
+msgid "Buddy starts _typing"
 msgstr "Kontakt skriver til deg"
 
-#: src/gtkpounce.c:421
-msgid "Buddy stops typing"
+#: src/gtkpounce.c:426
+#, fuzzy
+msgid "Buddy stops t_yping"
 msgstr "Kontakt slutter å skrive til deg"
 
 #. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:450
+#: src/gtkpounce.c:455
 msgid "Pounce Action"
 msgstr "Varslingsmåte"
 
-#: src/gtkpounce.c:457
-msgid "Open an IM window"
+#: src/gtkpounce.c:462
+#, fuzzy
+msgid "Op_en an IM window"
 msgstr "Åpne vindu for direktemelding"
 
-#: src/gtkpounce.c:458
-msgid "Popup notification"
+#: src/gtkpounce.c:463
+#, fuzzy
+msgid "_Popup notification"
 msgstr "Varslingsvindu spretter opp"
 
-#: src/gtkpounce.c:459
-msgid "Send a message"
+#: src/gtkpounce.c:464
+#, fuzzy
+msgid "Send a _message"
 msgstr "Send beskjed"
 
-#: src/gtkpounce.c:460
-msgid "Execute a command"
+#: src/gtkpounce.c:465
+#, fuzzy
+msgid "E_xecute a command"
 msgstr "Kjør kommando"
 
-#: src/gtkpounce.c:461
-msgid "Play a sound"
+#: src/gtkpounce.c:466
+#, fuzzy
+msgid "P_lay a sound"
 msgstr "Spill av en lyd"
 
-#: src/gtkpounce.c:465 src/gtkpounce.c:467
-msgid "Browse"
+#: src/gtkpounce.c:470
+#, fuzzy
+msgid "B_rowse..."
 msgstr "Bla gjennom"
 
-#: src/gtkpounce.c:468 src/gtkprefs.c:2081
-msgid "Test"
-msgstr "Test"
-
-#: src/gtkpounce.c:551
-msgid "_Save this pounce after activation"
+#: 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"
 msgstr "Lagre denne varslingen etter aktivisering"
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:745
+#: src/gtkpounce.c:763
 msgid "Remove Buddy Pounce"
 msgstr "Fjern kompisvarsling"
 
-#: src/gtkpounce.c:786
+#: src/gtkpounce.c:813
 #, c-format
 msgid "%s has started typing to you"
 msgstr "%s starter å skrive til deg"
 
-#: src/gtkpounce.c:787
+#: src/gtkpounce.c:814
 #, c-format
 msgid "%s has signed on"
 msgstr "%s har logget på"
 
-#: src/gtkpounce.c:788
+#: src/gtkpounce.c:815
 #, c-format
 msgid "%s has returned from being idle"
 msgstr "%s har blitt aktiv igjen"
 
-#: src/gtkpounce.c:789
+#: src/gtkpounce.c:816
 #, c-format
 msgid "%s has returned from being away"
 msgstr "%s har kommet tilbake"
 
-#: src/gtkpounce.c:790
+#: src/gtkpounce.c:817
 #, c-format
 msgid "%s has stopped typing to you"
 msgstr "%s har sluttet å skrive til deg"
 
-#: src/gtkpounce.c:791
+#: src/gtkpounce.c:818
 #, c-format
 msgid "%s has signed off"
 msgstr "%s har logget av"
 
-#: src/gtkpounce.c:792
+#: src/gtkpounce.c:819
 #, c-format
 msgid "%s has become idle"
 msgstr "%s har blitt inaktiv"
 
-#: src/gtkpounce.c:794
+#: src/gtkpounce.c:821
 msgid "Unknown pounce event. Please report this!"
 msgstr "Ukjent varslingshendelse. Vennligst rapporter dette!"
 
-#: src/gtkprefs.c:373
+#: src/gtkprefs.c:399
 msgid "Interface Options"
 msgstr "Valg for grensesnitt"
 
-#: src/gtkprefs.c:375
+#: src/gtkprefs.c:401
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr "Vis kallenavn for personer hvis de ikke har noe alias"
 
-#: src/gtkprefs.c:561
+#: src/gtkprefs.c:595
 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."
@@ -3218,361 +3516,434 @@
 "Velg smilefjes-temaet du vil bruke fra listen nedenfor. Nye temaer kan "
 "installeres ved å dra og slippe dem over temalisten."
 
-#: src/gtkprefs.c:594
+#: src/gtkprefs.c:630
 msgid "Icon"
 msgstr "Ikon"
 
-#: src/gtkprefs.c:668
+#: src/gtkprefs.c:637 src/gtkprefs.c:2043 src/protocols/jabber/buddy.c:265
+#: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:684
+msgid "Description"
+msgstr "Beskrivelse"
+
+#: src/gtkprefs.c:704
 msgid "Style"
 msgstr "Stil"
 
-#: src/gtkprefs.c:669
+#: src/gtkprefs.c:705
 msgid "_Bold"
 msgstr "Fet"
 
-#: src/gtkprefs.c:671
-msgid "_Italics"
+#: src/gtkprefs.c:707
+#, fuzzy
+msgid "_Italic"
 msgstr "Kursiv"
 
-#: src/gtkprefs.c:673
+#: src/gtkprefs.c:709
 msgid "_Underline"
 msgstr "Understrek"
 
-#: src/gtkprefs.c:675
+#. 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:719
 msgid "_Strikethrough"
 msgstr "Gjennomstreking"
 
-#: src/gtkprefs.c:678
+#: src/gtkprefs.c:722
 msgid "Face"
 msgstr "Skrift"
 
-#: src/gtkprefs.c:681
+#: src/gtkprefs.c:725
 msgid "Use custo_m face"
 msgstr "Bruk egen skrifttype"
 
-#: src/gtkprefs.c:698
+#: src/gtkprefs.c:742
 msgid "Use custom si_ze"
 msgstr "Bruk egen størrelse"
 
-#: src/gtkprefs.c:711
+#: src/gtkprefs.c:754
 msgid "Color"
 msgstr "Farge"
 
-#: src/gtkprefs.c:715
+#: src/gtkprefs.c:758
 msgid "_Text color"
 msgstr "Tekstfarge"
 
-#: src/gtkprefs.c:734
+#: src/gtkprefs.c:777
 msgid "Bac_kground color"
 msgstr "Bakgrunnsfarge"
 
-#: src/gtkprefs.c:762 src/gtkprefs.c:992 src/gtkprefs.c:1045
+#: src/gtkprefs.c:805 src/gtkprefs.c:1037 src/gtkprefs.c:1085
 msgid "Display"
 msgstr "Vis"
 
-#: src/gtkprefs.c:763
+#: src/gtkprefs.c:806
 msgid "Show graphical _smileys"
 msgstr "Vis smilefjes som grafikk"
 
-#: src/gtkprefs.c:765
+#: src/gtkprefs.c:808
 msgid "Show _timestamp on messages"
 msgstr "Vis tidsstempel på beskjeder"
 
-#: src/gtkprefs.c:767
+#: src/gtkprefs.c:810
 msgid "Show _URLs as links"
 msgstr "Vis URLer som lenker"
 
-#: src/gtkprefs.c:771
+#: src/gtkprefs.c:814
 msgid "_Highlight misspelled words"
 msgstr "Marker stavefeil"
 
-#: src/gtkprefs.c:775
+#: src/gtkprefs.c:818
 msgid "Ignore c_olors"
 msgstr "Ignorer farger"
 
-#: src/gtkprefs.c:777
+#: src/gtkprefs.c:820
 msgid "Ignore font _faces"
 msgstr "Ignorer skrifttyper"
 
-#: src/gtkprefs.c:779
+#: src/gtkprefs.c:822
 msgid "Ignore font si_zes"
 msgstr "Ignorer skriftstørrelser"
 
-#: src/gtkprefs.c:792
+#: src/gtkprefs.c:835
 msgid "Send Message"
 msgstr "Send beskjed"
 
-#: src/gtkprefs.c:793
+#: src/gtkprefs.c:836
 msgid "Enter _sends message"
 msgstr "Enter _sender beskjeden"
 
-#: src/gtkprefs.c:795
+#: src/gtkprefs.c:838
 msgid "C_ontrol-Enter sends message"
 msgstr "CTRL-Enter sender beskjeden"
 
-#: src/gtkprefs.c:798
+#: src/gtkprefs.c:841
 msgid "Window Closing"
 msgstr "Lukke vindu"
 
-#: src/gtkprefs.c:799
+#: src/gtkprefs.c:842
 msgid "_Escape closes window"
 msgstr "_ESC lukker vinduet"
 
-#: src/gtkprefs.c:802
+#: src/gtkprefs.c:845
 msgid "Insertions"
 msgstr "Innsettinger"
 
-#: src/gtkprefs.c:803
+#: src/gtkprefs.c:846
 msgid "Control-{B/I/U} inserts _HTML tags"
 msgstr "CTRL-{b/i/u/s} setter inn _HTML-koder"
 
-#: src/gtkprefs.c:805
+#: src/gtkprefs.c:848
 msgid "Control-(number) _inserts smileys"
 msgstr "CTRL-(tall) setter _inn smilefjes"
 
-#: src/gtkprefs.c:821
+#: src/gtkprefs.c:864
 msgid "Buddy List Sorting"
 msgstr "Kontaktlistesortering"
 
-#: src/gtkprefs.c:830
-msgid "Sorting:"
+#: src/gtkprefs.c:873
+#, fuzzy
+msgid "_Sorting:"
 msgstr "Sortering:"
 
-#: src/gtkprefs.c:835
+#: src/gtkprefs.c:878
 msgid "Buddy List Toolbar"
 msgstr "Kontaktverktøylinje"
 
-#: src/gtkprefs.c:836 src/gtkprefs.c:962 src/gtkprefs.c:1018
+#: src/gtkprefs.c:879 src/gtkprefs.c:1010 src/gtkprefs.c:1061
 msgid "Show _buttons as:"
 msgstr "Vis knapper som:"
 
-#: src/gtkprefs.c:838 src/gtkprefs.c:964 src/gtkprefs.c:1020
+#: src/gtkprefs.c:881 src/gtkprefs.c:1012 src/gtkprefs.c:1063
 msgid "Pictures"
 msgstr "Bilder"
 
-#: src/gtkprefs.c:839 src/gtkprefs.c:965 src/gtkprefs.c:1021
+#: src/gtkprefs.c:882 src/gtkprefs.c:1013 src/gtkprefs.c:1064
 msgid "Text"
 msgstr "Tekst"
 
-#: src/gtkprefs.c:840 src/gtkprefs.c:966 src/gtkprefs.c:1022
+#: src/gtkprefs.c:883 src/gtkprefs.c:1014 src/gtkprefs.c:1065
 msgid "Pictures and text"
 msgstr "Bilder og tekst"
 
-#: src/gtkprefs.c:845 src/gtkprefs.c:980 src/gtkprefs.c:1036
+#: src/gtkprefs.c:888 src/gtkprefs.c:1025 src/gtkprefs.c:1076
 msgid "_Raise window on events"
 msgstr "Flytt vinduet øverst ved hendelser"
 
-#: src/gtkprefs.c:848
-msgid "Group Display"
-msgstr "Gruppevisning"
-
-#: src/gtkprefs.c:849
-msgid "Show _numbers in groups"
-msgstr "Vis antall gruppemedlemmer"
-
-#: src/gtkprefs.c:852
-msgid "Buddy Display"
-msgstr "Kontaktvisning"
-
-#: src/gtkprefs.c:853 src/gtkprefs.c:987
-msgid "Show buddy _icons"
-msgstr "Vis kontaktikoner"
-
-#: src/gtkprefs.c:855
-msgid "Show _warning levels"
-msgstr "Vis advarselsnivåer"
-
-#: src/gtkprefs.c:857
-msgid "Show idle _times"
-msgstr "Vis inaktiv tid"
-
-#: src/gtkprefs.c:859
-msgid "Dim i_dle buddies"
-msgstr "Dimme ned inaktive kontakter"
-
-#: src/gtkprefs.c:884
-msgid "_Placement:"
-msgstr "Plassering:"
-
 #: src/gtkprefs.c:891
-msgid "Send _URLs as Links"
-msgstr "Send _URLer som lenker"
-
-#: src/gtkprefs.c:894
-msgid "Show Formatting Toolbar"
-msgstr "Vis formateringsverktøy"
-
-#: src/gtkprefs.c:897
-msgid "Tab Options"
-msgstr "Fanevalg"
-
-#: src/gtkprefs.c:899
-msgid "_Tab Placement:"
-msgstr "_Faneplassering:"
-
-#: src/gtkprefs.c:901
-msgid "Top"
-msgstr "Øverst"
+msgid "Group Display"
+msgstr "Gruppevisning"
+
+#: src/gtkprefs.c:892
+msgid "Show _numbers in groups"
+msgstr "Vis antall gruppemedlemmer"
+
+#: src/gtkprefs.c:895
+msgid "Buddy Display"
+msgstr "Kontaktvisning"
+
+#: src/gtkprefs.c:896 src/gtkprefs.c:1032
+msgid "Show buddy _icons"
+msgstr "Vis kontaktikoner"
+
+#: src/gtkprefs.c:898
+msgid "Show _warning levels"
+msgstr "Vis advarselsnivåer"
+
+#: src/gtkprefs.c:900
+msgid "Show idle _times"
+msgstr "Vis inaktiv tid"
 
 #: src/gtkprefs.c:902
+msgid "Dim i_dle buddies"
+msgstr "Dimme ned inaktive kontakter"
+
+#: src/gtkprefs.c:904
+msgid "_Automatically expand contacts"
+msgstr ""
+
+#: src/gtkprefs.c:929
+msgid "_Placement:"
+msgstr "Plassering:"
+
+#: src/gtkprefs.c:936
+#, fuzzy
+msgid "Send _URLs as links"
+msgstr "Send _URLer som lenker"
+
+#: src/gtkprefs.c:939
+#, fuzzy
+msgid "Show _formatting toolbar"
+msgstr "Vis formateringsverktøy"
+
+#: src/gtkprefs.c:942
+msgid "Show a_liases in tabs/titles"
+msgstr "Vis aliasnavn i titteltekster"
+
+#: src/gtkprefs.c:945
+msgid "Tab Options"
+msgstr "Fanevalg"
+
+#: src/gtkprefs.c:947
+msgid "_Tab Placement:"
+msgstr "_Faneplassering:"
+
+#: src/gtkprefs.c:949
+msgid "Top"
+msgstr "Øverst"
+
+#: src/gtkprefs.c:950
 msgid "Bottom"
 msgstr "Nederst"
 
-#: src/gtkprefs.c:903
+#: src/gtkprefs.c:951
 msgid "Left"
 msgstr "Venstre"
 
-#: src/gtkprefs.c:904
+#: src/gtkprefs.c:952
 msgid "Right"
 msgstr "Høyre"
 
-#: src/gtkprefs.c:910
+#: src/gtkprefs.c:958
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Vis direktemeldinger og samtalegrupper i _faner"
 
-#: src/gtkprefs.c:913
+#: src/gtkprefs.c:961
 msgid "Show IMs and chats in _same tabbed window"
 msgstr "Vis direktemeldinger og samtalegrupper i samme _vindu"
 
-#: src/gtkprefs.c:923
+#: src/gtkprefs.c:971
 msgid "Show _close button on tabs"
 msgstr "Vis _lukkeknapp på faner"
 
-#: src/gtkprefs.c:934
+#: src/gtkprefs.c:982
 msgid "Show status _icons on tabs"
 msgstr "Vis _statusikoner på faner"
 
-#: src/gtkprefs.c:961 src/gtkprefs.c:1017
+#: src/gtkprefs.c:1009 src/gtkprefs.c:1060
 msgid "Window"
 msgstr "Vindu"
 
-#: src/gtkprefs.c:971 src/gtkprefs.c:1027
+#: src/gtkprefs.c:1019 src/gtkprefs.c:1070
 msgid "New window _width:"
 msgstr "Bredde for nye vinduer:"
 
-#: src/gtkprefs.c:974 src/gtkprefs.c:1030
+#: src/gtkprefs.c:1021 src/gtkprefs.c:1072
 msgid "New window _height:"
 msgstr "Høyde for nye vinduer:"
 
-#: src/gtkprefs.c:977 src/gtkprefs.c:1033
+#: src/gtkprefs.c:1023 src/gtkprefs.c:1074
 msgid "_Entry field height:"
 msgstr "Høyde for tekstboks:"
 
-#: src/gtkprefs.c:982
+#: src/gtkprefs.c:1027
 msgid "Hide window on _send"
 msgstr "Skjul vindu ved sending"
 
-#: src/gtkprefs.c:986
+#: src/gtkprefs.c:1031
 msgid "Buddy Icons"
 msgstr "Kontaktikoner"
 
-#: src/gtkprefs.c:989
+#: src/gtkprefs.c:1034
 msgid "Enable buddy icon a_nimation"
 msgstr "Slå på _animasjoner i kontaktikoner"
 
-#: src/gtkprefs.c:993
+#: src/gtkprefs.c:1038
 msgid "Show _logins in window"
 msgstr "Vis _innlogginger i vinduet"
 
-#: src/gtkprefs.c:995
-msgid "Show a_liases in tabs/titles"
-msgstr "Vis aliasnavn i titteltekster"
-
-#: src/gtkprefs.c:998
+#: src/gtkprefs.c:1041
 msgid "Typing Notification"
 msgstr "Skrivevarsling"
 
-#: src/gtkprefs.c:999
+#: src/gtkprefs.c:1042
 msgid "Notify buddies that you are _typing to them"
 msgstr "Varsle kontakter når du skriver til dem"
 
-#: src/gtkprefs.c:1039
+#: src/gtkprefs.c:1079
 msgid "Tab Completion"
 msgstr "TAB-fullføring"
 
-#: src/gtkprefs.c:1040
+#: src/gtkprefs.c:1080
 msgid "_Tab-complete nicks"
 msgstr "TAB-fullfør kallenavn"
 
-#: src/gtkprefs.c:1042
+#: src/gtkprefs.c:1082
 msgid "_Old-style tab completion"
 msgstr "Gammel TAB-fullføringsmetode"
 
-#: src/gtkprefs.c:1046
+#: src/gtkprefs.c:1086
 msgid "_Show people joining in window"
 msgstr "_Vis når folk logger på"
 
-#: src/gtkprefs.c:1048
+#: src/gtkprefs.c:1088
 msgid "_Show people leaving in window"
 msgstr "_Vis når folk logger av"
 
-#: src/gtkprefs.c:1050
-msgid "Co_lorize screennames"
+#: src/gtkprefs.c:1090
+#, fuzzy
+msgid "Co_lorize screen names"
 msgstr "_Fargelegg skjermnavn"
 
-#: src/gtkprefs.c:1094
+#: src/gtkprefs.c:1111 src/protocols/oscar/oscar.c:584
+#: src/protocols/oscar/oscar.c:4220
+#, fuzzy
+msgid "IP Address"
+msgstr "Adresse"
+
+#: src/gtkprefs.c:1113
+#, fuzzy
+msgid "_Autodetect IP Address"
+msgstr "Gateadresse"
+
+#: src/gtkprefs.c:1122
+msgid "Public _IP:"
+msgstr ""
+
+#: src/gtkprefs.c:1146
+#, fuzzy
+msgid "Ports"
+msgstr "Port"
+
+#: src/gtkprefs.c:1149
+msgid "_Manually specify range of ports to listen on"
+msgstr ""
+
+#: src/gtkprefs.c:1152
+#, fuzzy
+msgid "_Start Port:"
+msgstr "_Port:"
+
+#: src/gtkprefs.c:1159
+#, fuzzy
+msgid "_End Port:"
+msgstr "_Port:"
+
+#: src/gtkprefs.c:1207
 msgid "Proxy Type"
 msgstr "Proxytype"
 
-#: src/gtkprefs.c:1097
+#: src/gtkprefs.c:1210
 msgid "No proxy"
 msgstr "Ingen proxy"
 
-#: src/gtkprefs.c:1104
+#: src/gtkprefs.c:1217
 msgid "Proxy Server"
 msgstr "Proxytjener"
 
-#: 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"
+#: src/gtkprefs.c:1275
+#, fuzzy
+msgid "_User:"
 msgstr "Bruker"
 
-#: src/gtkprefs.c:1177
-msgid "Pa_ssword"
-msgstr "Passord"
-
-#: src/gtkprefs.c:1214
+#: src/gtkprefs.c:1331
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1215
+#: src/gtkprefs.c:1332
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1216
+#: src/gtkprefs.c:1333
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1217
+#: src/gtkprefs.c:1334
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1218
+#: src/gtkprefs.c:1335
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1227
+#: src/gtkprefs.c:1336
+msgid "Firebird"
+msgstr ""
+
+#: src/gtkprefs.c:1337
+msgid "Firefox"
+msgstr ""
+
+#: src/gtkprefs.c:1338
+msgid "Gnome Default"
+msgstr ""
+
+#: src/gtkprefs.c:1347
 msgid "Manual"
 msgstr "Egendefinert"
 
-#: src/gtkprefs.c:1268
+#: src/gtkprefs.c:1398
 msgid "Browser Selection"
 msgstr "Valg av nettleser"
 
-#: src/gtkprefs.c:1272
+#: src/gtkprefs.c:1402
 msgid "_Browser:"
 msgstr "_Nettleser:"
 
-#: src/gtkprefs.c:1282
+#: src/gtkprefs.c:1409
+#, fuzzy
+msgid "_Open link in:"
+msgstr "Åpne i nettleser"
+
+#: src/gtkprefs.c:1411
+#, fuzzy
+msgid "Browser default"
+msgstr "kjedelig standardsvar"
+
+#: src/gtkprefs.c:1412
+msgid "Existing window"
+msgstr ""
+
+#: src/gtkprefs.c:1414
+#, fuzzy
+msgid "New tab"
+msgstr "Ny"
+
+#: src/gtkprefs.c:1428
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3581,87 +3952,86 @@
 "_Egendefinert:\n"
 "(%s for URL)"
 
-#: 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
+#: src/gtkprefs.c:1465
 msgid "Message Logs"
 msgstr "Beskjedlogging"
 
-#: src/gtkprefs.c:1323
+#: src/gtkprefs.c:1468
 msgid "Log _Format:"
 msgstr "Logg_format:"
 
-#: src/gtkprefs.c:1327
+#: src/gtkprefs.c:1471
 msgid "_Log all instant messages"
 msgstr "Logg alle direktemeldinger"
 
-#: src/gtkprefs.c:1329
+#: src/gtkprefs.c:1473
 msgid "Log all c_hats"
 msgstr "Logg alle samtaler"
 
-#: src/gtkprefs.c:1332
+#: src/gtkprefs.c:1476
 msgid "System Logs"
 msgstr "Systemlogging"
 
-#: src/gtkprefs.c:1333
+#: src/gtkprefs.c:1478
+msgid "_Enable system log"
+msgstr ""
+
+#: src/gtkprefs.c:1481
 msgid "Log when buddies _sign on/sign off"
 msgstr "Skriv til logg når kontakter logger av/på"
 
-#: src/gtkprefs.c:1335
+#: src/gtkprefs.c:1487
 msgid "Log when buddies become _idle/un-idle"
 msgstr "Skriv til logg når kontakter blir aktiv/inaktiv"
 
-#: src/gtkprefs.c:1337
+#: src/gtkprefs.c:1493
 msgid "Log when buddies go away/come _back"
 msgstr "Skriv til logg når kontakter blir borte/kommer tilbake"
 
-#: src/gtkprefs.c:1339
+#: src/gtkprefs.c:1499
 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
+#: src/gtkprefs.c:1550
 msgid "Sound Options"
 msgstr "Lydinnstillinger"
 
-#: src/gtkprefs.c:1385
-msgid "_No sounds when you log in"
+#: src/gtkprefs.c:1551
+#, fuzzy
+msgid "Sounds when you _log in"
 msgstr "Ingen lyder ved pålogging"
 
-#: src/gtkprefs.c:1387
+#
+#: src/gtkprefs.c:1553
+#, fuzzy
+msgid "Sounds when conversation has _focus"
+msgstr "Fjern når samtalevinduet får fokus"
+
+#: src/gtkprefs.c:1555
 msgid "_Sounds while away"
 msgstr "Ingen lyder når du er fraværsmarkert"
 
-#: src/gtkprefs.c:1391
+#: src/gtkprefs.c:1559
 msgid "Sound Method"
 msgstr "Lydtype"
 
-#: src/gtkprefs.c:1392
+#: src/gtkprefs.c:1560
 msgid "_Method:"
 msgstr "_Metode:"
 
-#: src/gtkprefs.c:1394
+#: src/gtkprefs.c:1562
 msgid "Console beep"
 msgstr "Konsollpip"
 
-#: src/gtkprefs.c:1396
+#: src/gtkprefs.c:1564
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: src/gtkprefs.c:1403
+#: src/gtkprefs.c:1571
 msgid "Command"
 msgstr "Kommando"
 
-#: src/gtkprefs.c:1413
+#: src/gtkprefs.c:1581
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -3670,67 +4040,73 @@
 "_Program for lydavspilling\n"
 "(%s for filnavn)"
 
-#: src/gtkprefs.c:1468
+#: src/gtkprefs.c:1638
 msgid "_Sending messages removes away status"
 msgstr "Beskjedsending fjerner eventuell fraværsmarkering"
 
-#: src/gtkprefs.c:1470
+#: src/gtkprefs.c:1640
 msgid "_Queue new messages when away"
 msgstr "Når borte, legg nye beskjeder i kø"
 
-#: src/gtkprefs.c:1473
+#: src/gtkprefs.c:1643
 msgid "Auto-response"
 msgstr "Automatisk svar"
 
-#: src/gtkprefs.c:1476
+#: src/gtkprefs.c:1646
 msgid "Seconds before _resending:"
 msgstr "Antall sekunder før sending på nytt:"
 
-#: src/gtkprefs.c:1479
+#: src/gtkprefs.c:1649
 msgid "_Send auto-response"
 msgstr "_Send automatisk svar"
 
-#: src/gtkprefs.c:1481
+#: src/gtkprefs.c:1651
 msgid "_Only send auto-response when idle"
 msgstr "Bare send automatisk svar når inaktiv"
 
-#: src/gtkprefs.c:1483
+#: src/gtkprefs.c:1653
 msgid "Send auto-response in _active conversations"
 msgstr "Send automatisk svar i aktive samtaler"
 
-#: src/gtkprefs.c:1493
+#: src/gtkprefs.c:1662 src/protocols/msn/state.c:30
+#: src/protocols/novell/novell.c:2153 src/protocols/oscar/oscar.c:3378
+#: src/protocols/yahoo/yahoo.c:2295
+msgid "Idle"
+msgstr "Inaktiv"
+
+#: src/gtkprefs.c:1663
 msgid "Idle _time reporting:"
 msgstr "Rapportering av inaktiv _tid:"
 
-#: src/gtkprefs.c:1496
+#: src/gtkprefs.c:1666
 msgid "Gaim usage"
 msgstr "Gaim-bruk"
 
-#: src/gtkprefs.c:1499
+#: src/gtkprefs.c:1669
 msgid "X usage"
 msgstr "X-bruk"
 
-#: src/gtkprefs.c:1501
+#: src/gtkprefs.c:1671
 msgid "Windows usage"
 msgstr "Windows-bruk"
 
-#: src/gtkprefs.c:1509
+#: src/gtkprefs.c:1679
 msgid "Auto-away"
 msgstr "Automatisk fraværsmarkering"
 
-#: src/gtkprefs.c:1510
+#: src/gtkprefs.c:1680
 msgid "Set away _when idle"
 msgstr "Sett som borte når inaktiv"
 
-#: src/gtkprefs.c:1512
+#: src/gtkprefs.c:1684
 msgid "_Minutes before setting away:"
 msgstr "Antall minutter før fraværsmarkert:"
 
-#: src/gtkprefs.c:1519
+#: src/gtkprefs.c:1692
 msgid "Away m_essage:"
 msgstr "Fraværsbeskjed:"
 
-#: src/gtkprefs.c:1581
+#: src/gtkprefs.c:1767
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3745,7 +4121,7 @@
 "<span weight=\"bold\">Webside:</span>\t\t%s\n"
 "<span weight=\"bold\">Filnavn:</span>\t%s"
 
-#: src/gtkprefs.c:1586
+#: src/gtkprefs.c:1772
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3760,178 +4136,192 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">Filnavn:</span>  %s"
 
-#: src/gtkprefs.c:1767
+#: src/gtkprefs.c:1999
 msgid "Load"
 msgstr "Last"
 
-#: 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
+#: src/gtkprefs.c:2013
+msgid "Summary"
+msgstr ""
+
+#: src/gtkprefs.c:2061
 msgid "Details"
 msgstr "Detaljer"
 
-#: src/gtkprefs.c:1948
+#: src/gtkprefs.c:2188
 msgid "Sound Selection"
 msgstr "Lydvalg"
 
-#: src/gtkprefs.c:2055
+#: src/gtkprefs.c:2295
 msgid "Play"
 msgstr "Spill av"
 
-#: src/gtkprefs.c:2062
+#: src/gtkprefs.c:2302
 msgid "Event"
 msgstr "Hendelse"
 
-#: src/gtkprefs.c:2085
+#: src/gtkprefs.c:2321
+msgid "Test"
+msgstr "Test"
+
+#: src/gtkprefs.c:2325
 msgid "Reset"
 msgstr "Nullstill"
 
-#: src/gtkprefs.c:2089
+#: src/gtkprefs.c:2329
 msgid "Choose..."
 msgstr "Bla gjennom..."
 
-#: src/gtkprefs.c:2223
+#: src/gtkprefs.c:2464
 msgid "_Edit"
 msgstr "Rediger"
 
-#: src/gtkprefs.c:2259
+#: src/gtkprefs.c:2500
 msgid "Interface"
 msgstr "Grensesnitt"
 
-#: src/gtkprefs.c:2260
+#: src/gtkprefs.c:2501
 msgid "Smiley Themes"
 msgstr "Smilefjes-tema"
 
-#: src/gtkprefs.c:2261
+#: src/gtkprefs.c:2502
 msgid "Fonts"
 msgstr "Skrifttyper"
 
-#: src/gtkprefs.c:2262
+#: src/gtkprefs.c:2503
 msgid "Message Text"
 msgstr "Beskjeder"
 
-#: src/gtkprefs.c:2263
+#: src/gtkprefs.c:2504
 msgid "Shortcuts"
 msgstr "Hurtigtaster"
 
-#: src/gtkprefs.c:2266
+#: src/gtkprefs.c:2507
 msgid "IMs"
 msgstr "Direktemeldinger"
 
-#: src/gtkprefs.c:2268
+#: src/gtkprefs.c:2509
+#, fuzzy
+msgid "Network"
+msgstr "Ny"
+
+#: src/gtkprefs.c:2510
 msgid "Proxy"
 msgstr "Proxy"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2271
+#: src/gtkprefs.c:2513
 msgid "Browser"
 msgstr "Nettleser"
 
-#: src/gtkprefs.c:2273
+#: src/gtkprefs.c:2515
 msgid "Logging"
 msgstr "Logging"
 
-#: src/gtkprefs.c:2274
+#: src/gtkprefs.c:2516
 msgid "Sounds"
 msgstr "Lyder"
 
-#: src/gtkprefs.c:2275
+#: src/gtkprefs.c:2517
 msgid "Sound Events"
 msgstr "Lydhendelser"
 
-#: src/gtkprefs.c:2276
+#: src/gtkprefs.c:2518
 msgid "Away / Idle"
 msgstr "Borte / inaktiv"
 
-#: src/gtkprefs.c:2277
+#: src/gtkprefs.c:2519
 msgid "Away Messages"
 msgstr "Fraværsbeskjeder"
 
-#: src/gtkprefs.c:2280
+#: src/gtkprefs.c:2522
+#, fuzzy
+msgid "Protocols"
+msgstr "Protokoll"
+
+#: src/gtkprefs.c:2523
 msgid "Plugins"
 msgstr "Tillegg"
 
-#: src/gtkprivacy.c:86
+#: src/gtkprivacy.c:77
 msgid "Allow all users to contact me"
 msgstr "Tillat alle brukere å kontakte meg"
 
-#: src/gtkprivacy.c:87
+#: src/gtkprivacy.c:78
 msgid "Allow only the users on my buddy list"
 msgstr "Tillat bare brukere fra kontaktlisten min"
 
-#: src/gtkprivacy.c:88
+#: src/gtkprivacy.c:79
 msgid "Allow only the users below"
 msgstr "Tillat bare brukerne vist nedenfor"
 
-#: src/gtkprivacy.c:89
+#: src/gtkprivacy.c:80
 msgid "Block all users"
 msgstr "Blokker alle brukere"
 
-#: src/gtkprivacy.c:90
-msgid "Block the users below"
+#: src/gtkprivacy.c:81
+#, fuzzy
+msgid "Block only the users below"
 msgstr "Blokker brukerne vist nedenfor"
 
-#: src/gtkprivacy.c:368
+#: src/gtkprivacy.c:374 src/protocols/jabber/jabber.c:1272
 msgid "Privacy"
 msgstr "Sikkerhet"
 
-#: src/gtkprivacy.c:383
+#: src/gtkprivacy.c:389
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Endringer i sikkerhetsinnstillingene skjer umiddelbart."
 
 #. "Set privacy for:" label
-#: src/gtkprivacy.c:395
+#: src/gtkprivacy.c:401
 msgid "Set privacy for:"
 msgstr "Sett sikkerhet for:"
 
-#: src/gtkprivacy.c:562 src/gtkprivacy.c:578
+#: src/gtkprivacy.c:569 src/gtkprivacy.c:585
 msgid "Permit User"
 msgstr "Tillat bruker"
 
-#: src/gtkprivacy.c:563
+#: src/gtkprivacy.c:570
 msgid "Type a user you permit to contact you."
 msgstr "Skriv brukernavnet til den som får kontakte deg."
 
-#: src/gtkprivacy.c:564
+#: src/gtkprivacy.c:571
 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:567 src/gtkprivacy.c:580
+#: src/gtkprivacy.c:574 src/gtkprivacy.c:587
 msgid "Permit"
 msgstr "Tillat"
 
-#: src/gtkprivacy.c:572
+#: src/gtkprivacy.c:579
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Tillate %s å kontakte deg?"
 
-#: src/gtkprivacy.c:574
+#: src/gtkprivacy.c:581
 #, 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:601 src/gtkprivacy.c:614
+#: src/gtkprivacy.c:608 src/gtkprivacy.c:621
 msgid "Block User"
 msgstr "Blokker bruker"
 
-#: src/gtkprivacy.c:602
+#: src/gtkprivacy.c:609
 msgid "Type a user to block."
 msgstr "Skriv inn brukernavnet på den som skal blokkeres."
 
-#: src/gtkprivacy.c:603
+#: src/gtkprivacy.c:610
 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:610
+#: src/gtkprivacy.c:617
 #, c-format
 msgid "Block %s?"
 msgstr "Blokkere %s?"
 
-#: src/gtkprivacy.c:612
+#: src/gtkprivacy.c:619
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Er du sikker på at du vil blokkere %s?"
@@ -3939,64 +4329,88 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:200 src/protocols/gg/gg.c:660 src/request.h:843
+#: src/gtkrequest.c:233 src/protocols/gg/gg.c:663
+#: src/protocols/novell/novell.c:1317 src/request.h:1231
 msgid "Yes"
 msgstr "Ja"
 
-#: src/gtkrequest.c:201 src/protocols/gg/gg.c:660 src/request.h:843
+#: src/gtkrequest.c:234 src/protocols/gg/gg.c:663
+#: src/protocols/novell/novell.c:1318 src/request.h:1231
 msgid "No"
 msgstr "Nei"
 
-#: src/gtkrequest.c:204
+#: src/gtkrequest.c:237
 msgid "Apply"
 msgstr "Bruk"
 
-#: src/gtksound.c:61
+#: src/gtkrequest.c:238 src/protocols/msn/msn.c:261
+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
 msgid "Buddy logs in"
 msgstr "Kontakt logger inn"
 
-#: src/gtksound.c:62
+#: src/gtksound.c:63
 msgid "Buddy logs out"
 msgstr "Kontakt logger ut"
 
-#: src/gtksound.c:63
+#: src/gtksound.c:64
 msgid "Message received"
 msgstr "Beskjed mottatt"
 
-#: src/gtksound.c:64
+#: src/gtksound.c:65
 msgid "Message received begins conversation"
 msgstr "Beskjed mottas og samtale starter"
 
-#: src/gtksound.c:65
+#: src/gtksound.c:66
 msgid "Message sent"
 msgstr "Beskjed sendt"
 
-#: src/gtksound.c:66
+#: src/gtksound.c:67
 msgid "Person enters chat"
 msgstr "Person blir med i samtalen"
 
-#: src/gtksound.c:67
-msgid "Person leaves chat"
-msgstr "Person forlater samtalen"
-
 #: src/gtksound.c:68
+msgid "Person leaves chat"
+msgstr "Person forlater samtalen"
+
+#: src/gtksound.c:69
 msgid "You talk in chat"
 msgstr "Du snakker i samtalen"
 
-#: src/gtksound.c:69
+#: src/gtksound.c:70
 msgid "Others talk in chat"
 msgstr "Andre snakker i samtalen"
 
-#: src/gtksound.c:72
+#: src/gtksound.c:73
 msgid "Someone says your name in chat"
 msgstr "Noen sier navnet ditt i en samtale"
 
-#: src/gtksound.c:156
+#: src/gtksound.c:158
 #, 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:172
+#: src/gtksound.c:174
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
@@ -4004,7 +4418,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:184
+#: src/gtksound.c:186
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
@@ -4013,54 +4427,86 @@
 "Kunne ikke spille av lyd fordi det konfigurerte avspillingsprogrammet ikke "
 "kunne startes: %s"
 
-#: src/gtkutils.c:288
+#: src/gtkutils.c:133
 msgid "Can't save icon file to disk."
 msgstr "Kan ikke lagre ikonfil."
 
-#: src/gtkutils.c:323
-msgid "Gaim - Save Icon"
-msgstr "Gaim - Lagre ikon"
-
-#: src/log.c:79
+#: src/gtkutils.c:168
+#, fuzzy
+msgid "Save Icon"
+msgstr "Lagre ikon som..."
+
+#: src/log.c:106
 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:369
+#: src/log.c:476
 msgid "XML"
 msgstr "XML"
 
-#: 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
+#: src/log.c:561
+#, 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:563
+#, 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:614 src/log.c:800
+#, 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:624 src/log.c:812
 #, 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:475
+#: src/log.c:661
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:584
+#: src/log.c:745
+#, c-format
+msgid "(%s) %s <AUTO-REPLY>: %s\n"
+msgstr ""
+
+#: src/log.c:845
 msgid "Plain text"
 msgstr "Ren tekst"
 
-#: src/main.c:148
-msgid "Please enter your login."
+#: src/main.c:155
+#, fuzzy
+msgid "Please create an account."
 msgstr "Skriv inn innloggingsnavn."
 
-#: src/main.c:231
-msgid "<New User>"
-msgstr "<Ny bruker>"
-
-#: src/main.c:273
+#: src/main.c:237
 msgid "Login"
 msgstr "Innlogging"
 
+#: src/main.c:255
+#, fuzzy
+msgid "<b>Screen Name:</b>"
+msgstr "Skjermnavn:"
+
+#: src/main.c:269
+#, fuzzy
+msgid "<b>Password:</b>"
+msgstr "Passord:"
+
+#: src/main.c:298
+msgid "Sign on"
+msgstr "Pålogging"
+
 #. full help text
-#: src/main.c:550
-#, c-format
+#: src/main.c:522
+#, fuzzy, c-format
 msgid ""
 "Gaim %s\n"
 "Usage: %s [OPTION]...\n"
@@ -4072,7 +4518,7 @@
 "                      account(s) to use, seperated by commas)\n"
 "  -n, --loginwin      don't automatically login; show login window\n"
 "  -u, --user=NAME     use account NAME\n"
-"  -f, --file=FILE     use FILE as config\n"
+"  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
 "  -v, --version       display the current version and exit\n"
 "  -h, --help          display this help and exit\n"
@@ -4094,12 +4540,12 @@
 "  -h, --help          vis denne hjelpeteksten og avslutt\n"
 
 #. short message
-#: src/main.c:565
+#: src/main.c:537
 #, 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:260
+#: src/plugin.c:277
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
@@ -4108,24 +4554,26 @@
 "Det nødvendige tillegget %s ble ikke funnet. Installer dette tillegget og "
 "prøv igjen."
 
-#: src/plugin.c:265 src/plugin.c:293
+#: src/plugin.c:282 src/plugin.c:310
 msgid "Gaim was unable to load your plugin."
 msgstr "Gaim klarte ikke å laste tillegget."
 
-#: src/plugin.c:289
+#: src/plugin.c:306
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "Det nødvendige tillegget %s kunne ikke lastes."
 
-#: src/prefs.c:111 src/status.c:270
+#: src/prefs.c:113 src/status.c:273
 msgid "Slightly less boring default"
 msgstr "kjedelig standardsvar"
 
-#: 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/gg/gg.c:49 src/protocols/jabber/jutil.c:44
+#: src/protocols/msn/msn.c:360 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:2304
-#: src/protocols/yahoo/yahoo.c:2405
+#: src/protocols/msn/state.c:36 src/protocols/novell/novell.c:2144
+#: src/protocols/novell/novell.c:2261 src/protocols/novell/novell.c:2312
+#: src/protocols/oscar/oscar.c:603 src/protocols/yahoo/yahoo.c:2599
+#: src/protocols/yahoo/yahoo.c:2714
 msgid "Available"
 msgstr "Tilgjengelig"
 
@@ -4137,11 +4585,12 @@
 msgid "Away for friends only"
 msgstr "Borte bare for venner"
 
-#: 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
+#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:956
+#: src/protocols/jabber/presence.c:126 src/protocols/oscar/oscar.c:524
+#: src/protocols/oscar/oscar.c:4738 src/protocols/oscar/oscar.c:4816
+#: src/protocols/oscar/oscar.c:4840 src/protocols/oscar/oscar.c:6431
+#: src/protocols/oscar/oscar.c:6436 src/protocols/yahoo/yahoo.c:2293
+#: src/protocols/yahoo/yahoo.c:2619 src/protocols/yahoo/yahoo.c:2724
 msgid "Invisible"
 msgstr "Usynlig"
 
@@ -4157,11 +4606,14 @@
 msgid "Unable to resolve hostname."
 msgstr "Kan ikke finne datamaskinnavnet."
 
-#: src/protocols/gg/gg.c:139
+#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1159
 msgid "Unable to connect to server."
 msgstr "Kan ikke koble til tjener."
 
-#: src/protocols/gg/gg.c:142
+#: 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:104
 msgid "Invalid response from server."
 msgstr "Ugyldig svar fra tjener."
 
@@ -4195,151 +4647,160 @@
 msgstr "Kunne ikke lese socket"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/gg/gg.c:399 src/protocols/icq/gaim_icq.c:344
-#: src/protocols/toc/toc.c:200
+#: src/protocols/gg/gg.c:402 src/protocols/icq/gaim_icq.c:344
+#: src/protocols/msn/dispatch.c:208 src/protocols/msn/msn.c:514
+#: src/protocols/msn/servconn.c:77 src/protocols/napster/napster.c:475
+#: src/protocols/napster/napster.c:506 src/protocols/toc/toc.c:200
+#: src/protocols/yahoo/yahoo.c:1958 src/protocols/yahoo/yahoo.c:1989
+#: src/protocols/yahoo/yahoo.c:2052 src/protocols/yahoo/yahoo_filexfer.c:68
+#: src/protocols/yahoo/yahoo_filexfer.c:139
 msgid "Unable to connect."
 msgstr "Kunne ikke koble til."
 
-#: src/protocols/gg/gg.c:415
+#: src/protocols/gg/gg.c:418
 msgid "Reading data"
 msgstr "Leser data"
 
-#: src/protocols/gg/gg.c:418
+#: src/protocols/gg/gg.c:421
 msgid "Balancer handshake"
 msgstr "Finner ledig tjener"
 
-#: src/protocols/gg/gg.c:421
+#: src/protocols/gg/gg.c:424
 msgid "Reading server key"
 msgstr "Leser tjenernøkkel"
 
-#: src/protocols/gg/gg.c:424
+#: src/protocols/gg/gg.c:427
 msgid "Exchanging key hash"
 msgstr "Utveksler nøkkel-hash"
 
-#: src/protocols/gg/gg.c:434
+#: src/protocols/gg/gg.c:437
 msgid "Critical error in GG library\n"
 msgstr "Kritisk feil i GG-biblioteket\n"
 
-#: src/protocols/gg/gg.c:452 src/protocols/gg/gg.c:543
+#: src/protocols/gg/gg.c:455 src/protocols/gg/gg.c:546
 #: src/protocols/toc/toc.c:176
 #, c-format
 msgid "Connect to %s failed"
 msgstr "Tilkobling til %s feilet"
 
-#: src/protocols/gg/gg.c:500
+#: src/protocols/gg/gg.c:503
 msgid "Unable to ping server"
 msgstr "Kunne ikke pinge tjener"
 
-#: src/protocols/gg/gg.c:512
+#: src/protocols/gg/gg.c:515
 msgid "Send as message"
 msgstr "Send som beskjed"
 
-#: src/protocols/gg/gg.c:517
+#: src/protocols/gg/gg.c:520
 msgid "Looking up GG server"
 msgstr "Søker etter GG-tjener"
 
-#: src/protocols/gg/gg.c:520
+#: src/protocols/gg/gg.c:523
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "Ugyldig Gadu-Gadu UIN oppgitt"
 
-#: src/protocols/gg/gg.c:567
+#: src/protocols/gg/gg.c:570
 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:629
+#: src/protocols/gg/gg.c:632
 msgid "Couldn't get search results"
 msgstr "Kunne ikke laste ned søkeresultater"
 
-#: src/protocols/gg/gg.c:634
+#: src/protocols/gg/gg.c:637
 msgid "Gadu-Gadu Search Engine"
 msgstr "Gadu-Gadu søkemotor"
 
-#: src/protocols/gg/gg.c:659
+#: src/protocols/gg/gg.c:662
 msgid "Active"
 msgstr "Aktiv"
 
-#: src/protocols/gg/gg.c:664 src/protocols/oscar/oscar.c:3952
+#: src/protocols/gg/gg.c:667 src/protocols/oscar/oscar.c:4212
 msgid "UIN"
 msgstr "UIN"
 
-#: src/protocols/gg/gg.c:668
-msgid "First name"
+#. First Name
+#: src/protocols/gg/gg.c:671 src/protocols/jabber/jabber.c:606
+#: src/protocols/oscar/oscar.c:4223 src/protocols/trepia/trepia.c:267
+msgid "First Name"
 msgstr "Fornavn"
 
 #. Last Name
-#: src/protocols/gg/gg.c:673 src/protocols/jabber/jabber.c:608
-#: src/protocols/oscar/oscar.c:3960 src/protocols/trepia/trepia.c:274
+#: src/protocols/gg/gg.c:676 src/protocols/jabber/jabber.c:611
+#: src/protocols/oscar/oscar.c:4224 src/protocols/trepia/trepia.c:274
 msgid "Last Name"
 msgstr "Etternavn"
 
-#: src/protocols/gg/gg.c:677 src/protocols/gg/gg.c:1389
-#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:3954
+#: src/protocols/gg/gg.c:680 src/protocols/gg/gg.c:1393
+#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4213
 msgid "Nick"
 msgstr "Kallenavn"
 
-#: src/protocols/gg/gg.c:684 src/protocols/gg/gg.c:687
-msgid "Birth year"
+#: src/protocols/gg/gg.c:687 src/protocols/gg/gg.c:690
+#, fuzzy
+msgid "Birth Year"
 msgstr "Fødselsår"
 
-#: src/protocols/gg/gg.c:693 src/protocols/gg/gg.c:695
-#: src/protocols/gg/gg.c:697
+#: src/protocols/gg/gg.c:696 src/protocols/gg/gg.c:698
+#: src/protocols/gg/gg.c:700
 msgid "Sex"
 msgstr "Kjønn"
 
 #. City
-#: 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
+#: src/protocols/gg/gg.c:704 src/protocols/jabber/jabber.c:621
+#: src/protocols/oscar/oscar.c:4266 src/protocols/oscar/oscar.c:4274
+#: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:410
 msgid "City"
 msgstr "By"
 
 #. res[0] == username
-#: 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
+#. show it to the user
+#: src/protocols/gg/gg.c:725 src/protocols/msn/msn.c:1331
+#: src/protocols/msn/msn.c:1575 src/protocols/napster/napster.c:393
+#: src/protocols/oscar/oscar.c:3190 src/protocols/oscar/oscar.c:3406
+#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2898
+#: src/protocols/yahoo/yahoo.c:2920 src/protocols/yahoo/yahoo.c:2943
+#: src/protocols/yahoo/yahoo.c:3101 src/protocols/zephyr/zephyr.c:567
 msgid "Buddy Information"
 msgstr "Kontaktinformasjon"
 
-#: src/protocols/gg/gg.c:741
+#: src/protocols/gg/gg.c:744
 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:749
+#: src/protocols/gg/gg.c:752
 msgid "Couldn't Import Buddy List from Server"
 msgstr "Kunne ikke importere kontaktliste fra tjeneren"
 
-#: src/protocols/gg/gg.c:812
+#: src/protocols/gg/gg.c:815
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "Kontaktlisten ble overført til Gadu-Gadu-tjeneren"
 
-#: src/protocols/gg/gg.c:820
+#: src/protocols/gg/gg.c:823
 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:828
+#: src/protocols/gg/gg.c:831
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "Kontaktlisten ble slettet fra Gadu-Gadu-tjeneren"
 
-#: src/protocols/gg/gg.c:836
+#: src/protocols/gg/gg.c:839
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "Kunne ikke slette kontaktlisten fra Gadu-Gadu-tjeneren"
 
-#: src/protocols/gg/gg.c:844
+#: src/protocols/gg/gg.c:847
 msgid "Password changed successfully"
 msgstr "Passordet er endret"
 
-#: src/protocols/gg/gg.c:851
+#: src/protocols/gg/gg.c:854
 msgid "Password couldn't be changed"
 msgstr "Passordet kunne ikke endres"
 
-#: src/protocols/gg/gg.c:968
+#: src/protocols/gg/gg.c:971
 msgid "Error communicating with Gadu-Gadu server"
 msgstr "Feil i kommunikasjonen med Gadu-Gadu-tjeneren"
 
-#: src/protocols/gg/gg.c:969
+#: src/protocols/gg/gg.c:972
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
@@ -4347,11 +4808,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:997
+#: src/protocols/gg/gg.c:1000
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr "Kunne ikke importere Gadu-Gadu-kontaktliste"
 
-#: src/protocols/gg/gg.c:998
+#: src/protocols/gg/gg.c:1001
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
@@ -4359,26 +4820,26 @@
 "Gaim kunne ikke koble til kontaktliste-tjeneren for Gadu-Gadu. Vennligst "
 "forsøk igjen senere."
 
-#: src/protocols/gg/gg.c:1071
+#: src/protocols/gg/gg.c:1074
 msgid "Couldn't export buddy list"
 msgstr "Kunne ikke eksportere kontaktliste"
 
-#: src/protocols/gg/gg.c:1072 src/protocols/gg/gg.c:1095
+#: src/protocols/gg/gg.c:1075 src/protocols/gg/gg.c:1098
 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:1094
+#: src/protocols/gg/gg.c:1097
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr "Kunne ikke slette kontaktliste for Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:1143
+#: src/protocols/gg/gg.c:1146
 msgid "Unable to access directory"
 msgstr "Fikk ikke tilgang til katalogen"
 
-#: src/protocols/gg/gg.c:1144
+#: src/protocols/gg/gg.c:1147
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
@@ -4386,11 +4847,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:1177
+#: src/protocols/gg/gg.c:1180
 msgid "Unable to change Gadu-Gadu password"
 msgstr "Kunne ikke bytte Gadu-Gadu-passord"
 
-#: src/protocols/gg/gg.c:1178
+#: src/protocols/gg/gg.c:1181
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
@@ -4398,32 +4859,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:1195
+#: src/protocols/gg/gg.c:1198
 msgid "Directory Search"
 msgstr "Katalogsøk"
 
-#: src/protocols/gg/gg.c:1204 src/protocols/jabber/jabber.c:1043
-#: src/protocols/oscar/oscar.c:6493 src/protocols/toc/toc.c:1546
+#: src/protocols/gg/gg.c:1207 src/protocols/jabber/jabber.c:1055
+#: src/protocols/toc/toc.c:1546
 msgid "Change Password"
 msgstr "Bytt passord"
 
-#: src/protocols/gg/gg.c:1212
+#: src/protocols/gg/gg.c:1215
 msgid "Import Buddy List from Server"
 msgstr "Importer kontaktliste fra tjener"
 
-#: src/protocols/gg/gg.c:1218
+#: src/protocols/gg/gg.c:1221
 msgid "Export Buddy List to Server"
 msgstr "Eksporter kontaktliste til tjener"
 
-#: src/protocols/gg/gg.c:1224
+#: src/protocols/gg/gg.c:1227
 msgid "Delete Buddy List from Server"
 msgstr "Slett kontaktliste fra tjener"
 
-#: src/protocols/gg/gg.c:1257
+#: src/protocols/gg/gg.c:1260
 msgid "Unable to access user profile."
 msgstr "Fikk ikke tilgang til brukerprofilen."
 
-#: src/protocols/gg/gg.c:1258
+#: src/protocols/gg/gg.c:1261
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
@@ -4441,7 +4902,8 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/gg/gg.c:1370 src/protocols/gg/gg.c:1372
+#. *  description
+#: src/protocols/gg/gg.c:1374 src/protocols/gg/gg.c:1376
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu protokolltillegg"
 
@@ -4454,17 +4916,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: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
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:229
+#: src/protocols/msn/notification.c:588 src/protocols/msn/notification.c:909
+#: src/protocols/msn/notification.c:1076 src/protocols/oscar/oscar.c:2932
+#: src/protocols/oscar/oscar.c:5451
 msgid "Authorize"
 msgstr "Godkjenn"
 
-#: 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
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:230
+#: src/protocols/msn/notification.c:589 src/protocols/msn/notification.c:911
+#: src/protocols/msn/notification.c:1078 src/protocols/oscar/oscar.c:2934
+#: src/protocols/oscar/oscar.c:5452
 msgid "Deny"
 msgstr "Nekt"
 
@@ -4484,12 +4946,12 @@
 msgid "Gaim User"
 msgstr "Gaim-bruker"
 
-#: src/protocols/irc/cmds.c:41
+#: src/protocols/irc/cmds.c:43
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Ukjent kommando: %s"
 
-#: src/protocols/irc/cmds.c:135
+#: src/protocols/irc/cmds.c:137
 msgid ""
 "<B>Supported IRC Commands:</B><BR>AWAY INVITE JOIN KICK<BR>ME MODE MSG "
 "NAMES<BR>NICK OP DEOP OPERWALL<BR>PART PING QUERY QUIT<BR>QUOTE REMOVE TOPIC "
@@ -4499,7 +4961,7 @@
 "NAMES<BR>NICK OP DEOP OPERWALL<BR>PART PING QUERY QUIT<BR>QUOTE REMOVE TOPIC "
 "UMODE<BR>VOICE DEVOICE WALLOPS WHOIS<BR>"
 
-#: src/protocols/irc/cmds.c:144
+#: src/protocols/irc/cmds.c:146
 msgid ""
 "<B>Supported IRC Commands:</B><BR>AWAY JOIN ME MODE<BR>MSG NICK OPERWALL "
 "PING<BR>QUERY QUIT QUOTE UMODE<BR>WALLOPS WHOIS"
@@ -4507,53 +4969,89 @@
 "<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:459
+#: src/protocols/irc/cmds.c:469 src/protocols/jabber/chat.c:527
 #, c-format
 msgid "current topic is: %s"
 msgstr "gjeldende tema er: %s"
 
-#: src/protocols/irc/cmds.c:461
+#: src/protocols/irc/cmds.c:472 src/protocols/jabber/chat.c:529
 msgid "No topic is set"
 msgstr "Intet tema for kanalen"
 
-#: src/protocols/irc/irc.c:64
+#: 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
 msgid "Error displaying MOTD"
 msgstr "Feil under visning av MOTD"
 
-#: src/protocols/irc/irc.c:64
+#: src/protocols/irc/irc.c:73
 msgid "No MOTD available"
 msgstr "MOTD er ikke tilgjengelig"
 
-#: src/protocols/irc/irc.c:65
+#: src/protocols/irc/irc.c:74
 msgid "There is no MOTD associated with this connection."
 msgstr "Det er ingen MOTD assosiert med denne tilkoblingen."
 
-#: src/protocols/irc/irc.c:68
+#: src/protocols/irc/irc.c:77
 #, c-format
 msgid "MOTD for %s"
 msgstr "MOTD for %s"
 
-#: src/protocols/irc/irc.c:137
+#: src/protocols/irc/irc.c:140
 msgid "View MOTD"
 msgstr "Vis MOTD"
 
-#: src/protocols/irc/irc.c:156
-msgid "Channel:"
+#: src/protocols/irc/irc.c:154 src/protocols/jabber/buddy.c:883
+#: src/protocols/oscar/oscar.c:440 src/protocols/oscar/oscar.c:6532
+#: src/protocols/yahoo/yahoo.c:2456
+msgid "Send File"
+msgstr "Send fil"
+
+#: src/protocols/irc/irc.c:168
+#, fuzzy
+msgid "_Channel:"
 msgstr "Kanal:"
 
-#: src/protocols/irc/irc.c:180
+#: src/protocols/irc/irc.c:173 src/protocols/jabber/chat.c:59
+#, fuzzy
+msgid "_Password:"
+msgstr "Passord"
+
+#: src/protocols/irc/irc.c:193
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC-kallenavn kan ikke inneholde mellomrom"
 
-#: src/protocols/irc/irc.c:199 src/protocols/toc/toc.c:228
+#: src/protocols/irc/irc.c:212 src/protocols/toc/toc.c:228
 #, c-format
 msgid "Signon: %s"
 msgstr "Pålogget: %s"
 
-#: src/protocols/irc/irc.c:208
+#: src/protocols/irc/irc.c:221
 msgid "Couldn't create socket"
 msgstr "Kunne ikke opprette socket"
 
+#: src/protocols/irc/irc.c:370 src/protocols/trepia/trepia.c:926
+msgid "Read error"
+msgstr "Lesefeil"
+
+#: src/protocols/irc/irc.c:504 src/protocols/yahoo/yahoochat.c:1343
+#, fuzzy
+msgid "Users"
+msgstr "Bruker"
+
+#: src/protocols/irc/irc.c:507 src/protocols/yahoo/yahoochat.c:1352
+#, fuzzy
+msgid "Topic"
+msgstr "Tema:"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -4563,26 +5061,32 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:532
+#: src/protocols/irc/irc.c:613
 msgid "IRC Protocol Plugin"
 msgstr "IRC-protokolltillegg"
 
 #. *  summary
-#: src/protocols/irc/irc.c:533
+#: src/protocols/irc/irc.c:614
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "IRC-protokolltillegg"
 
-#: src/protocols/irc/irc.c:550 src/protocols/irc/msgs.c:197
-#: src/protocols/jabber/jabber.c:1142 src/protocols/napster/napster.c:637
+#: src/protocols/irc/irc.c:631 src/protocols/irc/msgs.c:197
+#: src/protocols/jabber/jabber.c:1383 src/protocols/napster/napster.c:658
 msgid "Server"
 msgstr "Tjener"
 
-#: src/protocols/irc/irc.c:556
+#: src/protocols/irc/irc.c:634 src/protocols/jabber/jabber.c:1404
+#: src/protocols/msn/msn.c:1742 src/protocols/napster/napster.c:663
+#: src/protocols/trepia/trepia.c:1307
+msgid "Port"
+msgstr "Port"
+
+#: src/protocols/irc/irc.c:637 src/protocols/zephyr/zephyr.c:1401
 msgid "Encoding"
 msgstr "Tegnkoding:"
 
-#: src/protocols/irc/irc.c:559 src/protocols/irc/msgs.c:191
-#: src/protocols/jabber/jabber.c:578
+#: src/protocols/irc/irc.c:640 src/protocols/irc/msgs.c:191
+#: src/protocols/jabber/jabber.c:581
 msgid "Username"
 msgstr "Bruker"
 
@@ -4607,7 +5111,7 @@
 msgid " <i>(identified)</i>"
 msgstr " <i>(registrert)</i>"
 
-#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:2681
+#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:3001
 msgid "Realname"
 msgstr "Virkelig navn"
 
@@ -4633,107 +5137,112 @@
 msgid "Buddy Information for %s"
 msgstr "Kontaktinformasjon for %s"
 
-#: src/protocols/irc/msgs.c:247
+#: src/protocols/irc/msgs.c:278
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s har endret kanaltema til: %s"
 
-#: src/protocols/irc/msgs.c:252
+#: src/protocols/irc/msgs.c:283
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "Kanaltema for %s er %s"
 
-#: src/protocols/irc/msgs.c:266
+#: src/protocols/irc/msgs.c:299
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Ukjent beskjed '%s'"
 
-#: src/protocols/irc/msgs.c:267
+#: src/protocols/irc/msgs.c:300
 msgid "Unknown message"
 msgstr "Ukjent beskjed"
 
-#: src/protocols/irc/msgs.c:267
+#: src/protocols/irc/msgs.c:300
 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:403
+#, fuzzy
+msgid "No such channel"
+msgstr "kanalen eksisterer ikke"
+
 #. does this happen?
-#: src/protocols/irc/msgs.c:371
+#: src/protocols/irc/msgs.c:414
 msgid "no such channel"
 msgstr "kanalen eksisterer ikke"
 
-#: src/protocols/irc/msgs.c:374
+#: src/protocols/irc/msgs.c:417
 msgid "User is not logged in"
 msgstr "Brukeren er ikke pålogget"
 
-#: src/protocols/irc/msgs.c:379
+#: src/protocols/irc/msgs.c:422
 msgid "No such nick or channel"
 msgstr "Dette kallenavnet/kanalnavnet finnes ikke"
 
-#: src/protocols/irc/msgs.c:399
+#: src/protocols/irc/msgs.c:442
 msgid "Could not send"
 msgstr "Kunne ikke sende"
 
-#: src/protocols/irc/msgs.c:455
+#: src/protocols/irc/msgs.c:498
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Kanalen %s krever at du er invitert først."
 
-#: src/protocols/irc/msgs.c:456
+#: src/protocols/irc/msgs.c:499
 msgid "Invitation only"
 msgstr "Bare inviterte"
 
-#: src/protocols/irc/msgs.c:552
+#: src/protocols/irc/msgs.c:595
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Du har blitt sparket ut fra %s: %s"
 
-#: src/protocols/irc/msgs.c:560
+#: src/protocols/irc/msgs.c:600
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Sparket av %s: %s"
 
-#: src/protocols/irc/msgs.c:581
+#: src/protocols/irc/msgs.c:621
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "mode (%s %s) av %s"
 
-#: src/protocols/irc/msgs.c:660
+#: src/protocols/irc/msgs.c:700
 msgid "Could not change nick"
 msgstr "Kunne ikke endre kallenavn"
 
-#: src/protocols/irc/msgs.c:661
+#: src/protocols/irc/msgs.c:701
 msgid "Cannot change nick"
 msgstr "Kan ikke endre kallenavn"
 
-#: src/protocols/irc/msgs.c:682
+#: src/protocols/irc/msgs.c:722
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Du har forlatt kanalen%s%s"
 
-#: src/protocols/irc/msgs.c:720
+#: src/protocols/irc/msgs.c:762
 msgid "Error: invalid PONG from server"
 msgstr "Feil: ugyldig PONG fra tjener"
 
-#: src/protocols/irc/msgs.c:722
+#: src/protocols/irc/msgs.c:764
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING-svar -- lag: %lu sekunder"
 
-#: src/protocols/irc/msgs.c:792
+#: src/protocols/irc/msgs.c:839
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Kan ikke bli med i %s:"
 
-#: src/protocols/irc/msgs.c:793
+#: src/protocols/irc/msgs.c:840
 msgid "Cannot join channel"
 msgstr "Kan ikke bli med i kanal"
 
-#: src/protocols/irc/msgs.c:823
+#: src/protocols/irc/msgs.c:870
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops fra %s"
 
-#: src/protocols/irc/parse.c:160
+#: src/protocols/irc/parse.c:165 src/protocols/zephyr/zephyr.c:199
 msgid ""
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
@@ -4741,158 +5250,137 @@
 "(Det oppstod en feil under konverteringen av denne beskjeden. Sjekk "
 "'encoding'-innstillingen i kontooppsettet)"
 
-#: src/protocols/irc/parse.c:291
+#: src/protocols/irc/parse.c:318
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Svartid fra %s: %lu sekunder"
 
-#: src/protocols/irc/parse.c:292
+#: src/protocols/irc/parse.c:319
 msgid "PONG"
 msgstr "PONG"
 
-#: src/protocols/irc/parse.c:292
+#: src/protocols/irc/parse.c:319
 msgid "CTCP PING reply"
 msgstr "CTCP PING-svar"
 
-#: src/protocols/irc/parse.c:391
-msgid "Disconnected"
-msgstr "Frakoblet"
+#: src/protocols/irc/parse.c:421 src/protocols/oscar/oscar.c:777
+#: 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/jabber/auth.c:51
 msgid "Server requires SSL for login"
 msgstr "Tjeneren krever SSL for å logge inn"
 
-#: 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
+#: 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
 msgid "Server does not use any supported authentication method"
 msgstr "Tjeneren bruker ikke noen av de støttede autentiseringsmetodene"
 
-#: src/protocols/jabber/auth.c:296
+#: src/protocols/jabber/auth.c:375
 msgid "Invalid challenge from server"
 msgstr "Ugyldig utfordring fra tjener."
 
-#: 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
+#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:603
 msgid "Full Name"
 msgstr "Fullt navn"
 
-#: src/protocols/jabber/buddy.c:246 src/protocols/jabber/buddy.c:610
+#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:616
 msgid "Family Name"
 msgstr "Etternavn"
 
-#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:614
+#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:620
 msgid "Given Name"
 msgstr "Fornavn"
 
-#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:625
-#: src/protocols/jabber/jabber.c:598 src/protocols/yahoo/yahoo.c:2675
+#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:635
+#: src/protocols/jabber/jabber.c:601 src/protocols/yahoo/yahoo.c:2997
 msgid "Nickname"
 msgstr "Kallenavn"
 
-#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:653
+#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/jabber.c:641
+msgid "URL"
+msgstr "URL"
+
+#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:663
 msgid "Street Address"
 msgstr "Gateadresse"
 
-#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:649
+#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:659
 msgid "Extended Address"
 msgstr "Ekstra adresse"
 
-#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:657
+#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:667
 msgid "Locality"
 msgstr "Sted"
 
-#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:661
+#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:671
 msgid "Region"
 msgstr "Region"
 
-#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:665
-#: src/protocols/jabber/jabber.c:628
+#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:675
+#: src/protocols/jabber/jabber.c:631
 msgid "Postal Code"
 msgstr "Postnummer"
 
 #. Country
-#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:670
-#: src/protocols/trepia/trepia.c:339 src/protocols/trepia/trepia.c:448
+#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:680
+#: src/protocols/trepia/trepia.c:339 src/protocols/trepia/trepia.c:416
 msgid "Country"
 msgstr "Land"
 
-#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:681
-#: src/protocols/jabber/buddy.c:688
+#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:691
+#: src/protocols/jabber/buddy.c:698
 msgid "Telephone"
 msgstr "Telefonnummer"
 
-#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:699
-#: src/protocols/jabber/buddy.c:707 src/protocols/yahoo/yahoo.c:2669
+#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:709
+#: src/protocols/jabber/buddy.c:717 src/protocols/yahoo/yahoo.c:2993
 msgid "Email"
 msgstr "E-post"
 
-#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:722
+#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:732
 msgid "Organization Name"
 msgstr "Organisasjonsnavn"
 
-#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:726
+#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:736
 msgid "Organization Unit"
 msgstr "Organisasjonsenhet"
 
-#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:732
+#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:742
 msgid "Title"
 msgstr "Tittel"
 
-#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:735
+#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:745
 msgid "Role"
 msgstr "Rolle"
 
-#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:628
-#: src/protocols/oscar/oscar.c:3986
+#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:638
+#: src/protocols/oscar/oscar.c:4247
 msgid "Birthday"
 msgstr "Fødselsdag"
 
-#: src/protocols/jabber/buddy.c:506 src/protocols/jabber/buddy.c:507
+#: src/protocols/jabber/buddy.c:508 src/protocols/jabber/buddy.c:509
 msgid "Edit Jabber vCard"
 msgstr "Rediger vCard for Jabber"
 
-#: src/protocols/jabber/buddy.c:508
+#: src/protocols/jabber/buddy.c:510
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -4900,372 +5388,596 @@
 "Alle feltene nedenfor er valgfrie. Du trenger bare å skrive den "
 "informasjonen du ønsker"
 
-#: src/protocols/jabber/buddy.c:546
+#: src/protocols/jabber/buddy.c:552
 msgid "Jabber ID"
 msgstr "Jabber-feil"
 
-#: 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
+#: 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/msn/msn.c:348 src/protocols/oscar/oscar.c:566
+#: src/protocols/oscar/oscar.c:572 src/protocols/oscar/oscar.c:574
+#: src/protocols/yahoo/yahoo.c:2407
 msgid "Status"
 msgstr "Status"
 
-#: src/protocols/jabber/buddy.c:572 src/protocols/jabber/jabber.c:1145
+#: src/protocols/jabber/buddy.c:578 src/protocols/jabber/jabber.c:1386
 msgid "Resource"
 msgstr "Ressurs"
 
-#: src/protocols/jabber/buddy.c:618
+#: src/protocols/jabber/buddy.c:624
 msgid "Middle Name"
 msgstr "Mellomnavn"
 
-#: src/protocols/jabber/buddy.c:633 src/protocols/jabber/jabber.c:613
-#: src/protocols/oscar/oscar.c:4003 src/protocols/oscar/oscar.c:4019
+#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:616
+#: src/protocols/oscar/oscar.c:4265 src/protocols/oscar/oscar.c:4273
 msgid "Address"
 msgstr "Adresse"
 
-#: src/protocols/jabber/buddy.c:645
+#: src/protocols/jabber/buddy.c:655
 msgid "P.O. Box"
 msgstr "Postboks"
 
-#: src/protocols/jabber/buddy.c:751
+#: src/protocols/jabber/buddy.c:761
 msgid "Photo"
 msgstr "Bilde"
 
-#: src/protocols/jabber/buddy.c:751
+#: src/protocols/jabber/buddy.c:761
 msgid "Logo"
 msgstr "Logo"
 
-#: src/protocols/jabber/buddy.c:765
+#: src/protocols/jabber/buddy.c:777
 msgid "Jabber Profile"
 msgstr "Jabber-profil"
 
-#: src/protocols/jabber/buddy.c:904
+#: src/protocols/jabber/buddy.c:893
 msgid "Un-hide From"
 msgstr "Fjern fraværsmarkering for"
 
-#: src/protocols/jabber/buddy.c:907
+#: src/protocols/jabber/buddy.c:896
 msgid "Temporarily Hide From"
 msgstr "Midlertidig borte for"
 
-#: src/protocols/jabber/buddy.c:915
+#: src/protocols/jabber/buddy.c:905
 msgid "Cancel Presence Notification"
 msgstr "Avbryt varsling av tilstedeværelse"
 
-#: src/protocols/jabber/buddy.c:923
+#: src/protocols/jabber/buddy.c:913
 msgid "(Re-)Request authorization"
 msgstr "Spør på nytt om godkjenning"
 
-#: src/protocols/jabber/buddy.c:929
+#: src/protocols/jabber/buddy.c:919
 msgid "Unsubscribe"
 msgstr "Fjern abonnement"
 
-#: src/protocols/jabber/chat.c:37 src/protocols/yahoo/yahoochat.c:870
-msgid "Room:"
+#: src/protocols/jabber/chat.c:42 src/protocols/yahoo/yahoochat.c:965
+#, fuzzy
+msgid "_Room:"
 msgstr "Rom:"
 
-#: src/protocols/jabber/chat.c:44
-msgid "Server:"
+#: src/protocols/jabber/chat.c:47
+#, fuzzy
+msgid "_Server:"
 msgstr "Tjener:"
 
-#: src/protocols/jabber/chat.c:50
-msgid "Handle:"
+#: src/protocols/jabber/chat.c:53
+#, fuzzy
+msgid "_Handle:"
 msgstr "Navn:"
 
-#: src/protocols/jabber/chat.c:158
+#: src/protocols/jabber/chat.c:164
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s er ikke et gyldig romnavn"
 
-#: src/protocols/jabber/chat.c:159
+#: src/protocols/jabber/chat.c:165
 msgid "Invalid Room Name"
 msgstr "Ugyldig romnavn"
 
-#: src/protocols/jabber/chat.c:164
+#: src/protocols/jabber/chat.c:170
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s er ikke et gyldig tjenernavn"
 
-#: src/protocols/jabber/chat.c:165 src/protocols/jabber/chat.c:166
+#: src/protocols/jabber/chat.c:171 src/protocols/jabber/chat.c:172
 msgid "Invalid Server Name"
 msgstr "Ugyldig tjenernavn"
 
-#: src/protocols/jabber/chat.c:170
+#: src/protocols/jabber/chat.c:176
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s er ikke en gyldig rom-identifikator"
 
-#: src/protocols/jabber/chat.c:171 src/protocols/jabber/chat.c:172
+#: src/protocols/jabber/chat.c:177 src/protocols/jabber/chat.c:178
 msgid "Invalid Room Handle"
 msgstr "Ugyldig romidentifikator"
 
-#: src/protocols/jabber/jabber.c:82
+#: 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:600 src/protocols/jabber/chat.c:611
+#, fuzzy
+msgid "Roomlist Error"
+msgstr "Registreringsfeil"
+
+#: src/protocols/jabber/chat.c:601 src/protocols/jabber/chat.c:612
+#, fuzzy
+msgid "Error retreiving roomlist"
+msgstr "Feil ved lesing fra tjener"
+
+#: src/protocols/jabber/chat.c:652
+#, fuzzy
+msgid "Invalid Server"
+msgstr "Ugyldig tjenernavn"
+
+#: src/protocols/jabber/chat.c:689
+#, fuzzy
+msgid "Enter a Conference Server"
+msgstr "Start konferanse"
+
+#: src/protocols/jabber/chat.c:690
+msgid "Select a conference server to query"
+msgstr ""
+
+#: src/protocols/jabber/chat.c:693
+#, fuzzy
+msgid "Find Rooms"
+msgstr "Samtalerom"
+
+#: src/protocols/jabber/jabber.c:74
 msgid "Error initializing session"
 msgstr "Feil under oppretting av sesjon"
 
-#: 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
+#: src/protocols/jabber/jabber.c:204 src/protocols/msn/httpmethod.c:255
+#: src/protocols/msn/msn.c:84 src/protocols/msn/msn.c:104
+#: src/protocols/msn/msn.c:174 src/protocols/msn/msn.c:274
+#: src/protocols/msn/msn.c:571 src/protocols/msn/msn.c:743
+#: src/protocols/msn/msn.c:772 src/protocols/msn/msn.c:804
+#: src/protocols/msn/msn.c:812 src/protocols/msn/msn.c:845
+#: src/protocols/msn/msn.c:853 src/protocols/msn/msn.c:867
+#: src/protocols/msn/msn.c:876 src/protocols/msn/msn.c:891
+#: src/protocols/msn/msn.c:901 src/protocols/msn/msn.c:923
+#: src/protocols/msn/msn.c:973 src/protocols/msn/msn.c:1011
+#: src/protocols/msn/msn.c:1113 src/protocols/msn/msn.c:1146
+#: src/protocols/msn/msn.c:1167 src/protocols/msn/msn.c:1178
+#: src/protocols/msn/msn.c:1189 src/protocols/msn/msn.c:1213
+#: src/protocols/msn/msn.c:1225 src/protocols/msn/msn.c:1306
+#: src/protocols/msn/notification.c:147 src/protocols/msn/notification.c:175
+#: src/protocols/msn/notification.c:1299 src/protocols/msn/notification.c:1319
+#: src/protocols/msn/session.c:209 src/protocols/trepia/trepia.c:248
+#: src/protocols/trepia/trepia.c:698 src/protocols/trepia/trepia.c:987
+#: src/protocols/trepia/trepia.c:1031 src/protocols/trepia/trepia.c:1130
+#: src/protocols/trepia/trepia.c:1186
 msgid "Write error"
 msgstr "Feil ved skriving"
 
-#: src/protocols/jabber/jabber.c:282 src/protocols/jabber/jabber.c:302
+#: src/protocols/jabber/jabber.c:242 src/protocols/jabber/jabber.c:262
 msgid "Read Error"
 msgstr "Lesefeil"
 
-#: src/protocols/jabber/jabber.c:356
+#: src/protocols/jabber/jabber.c:317
+#, fuzzy
+msgid "Connection Failed"
+msgstr "Kunne ikke koble til"
+
+#: src/protocols/jabber/jabber.c:320
 msgid "SSL Handshake Failed"
 msgstr "SSL-utveksling feilet"
 
-#: src/protocols/jabber/jabber.c:393 src/protocols/jabber/jabber.c:687
+#: src/protocols/jabber/jabber.c:363 src/protocols/jabber/jabber.c:692
 msgid "Invalid Jabber ID"
 msgstr "Ugyldig jabber-ID"
 
-#: src/protocols/jabber/jabber.c:427 src/protocols/jabber/jabber.c:721
-#: src/protocols/trepia/trepia.c:1116
+#: src/protocols/jabber/jabber.c:391 src/protocols/jabber/jabber.c:719
+#, fuzzy
+msgid "SSL support unavailable"
+msgstr "Tjeneren er ikke tilgjengelig"
+
+#: src/protocols/jabber/jabber.c:401 src/protocols/jabber/jabber.c:729
+#: src/protocols/trepia/trepia.c:1070
 msgid "Unable to create socket"
 msgstr "Kunne ikke opprette socket"
 
-#: src/protocols/jabber/jabber.c:452
+#: src/protocols/jabber/jabber.c:426
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registrering av %s@%s vellykket"
 
-#: src/protocols/jabber/jabber.c:454 src/protocols/jabber/jabber.c:455
+#: src/protocols/jabber/jabber.c:428 src/protocols/jabber/jabber.c:429
 msgid "Registration Successful"
 msgstr "Registreringen var vellykket!"
 
-#: src/protocols/jabber/jabber.c:464
+#: src/protocols/jabber/jabber.c:435 src/protocols/jabber/jabber.c:1175
 msgid "Unknown Error"
 msgstr "Ukjent feil"
 
-#: 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
+#: src/protocols/jabber/jabber.c:437 src/protocols/jabber/jabber.c:438
 msgid "Registration Failed"
 msgstr "Registrering feilet"
 
-#: src/protocols/jabber/jabber.c:568 src/protocols/jabber/jabber.c:569
+#: src/protocols/jabber/jabber.c:549 src/protocols/jabber/jabber.c:550
 msgid "Already Registered"
 msgstr "Du er allerede registrert"
 
-#: src/protocols/jabber/jabber.c:582 src/protocols/jabber/jabber.c:1013
+#: src/protocols/jabber/jabber.c:585 src/protocols/jabber/jabber.c:1026
 msgid "Password"
 msgstr "Passord"
 
-#: src/protocols/jabber/jabber.c:593
+#: src/protocols/jabber/jabber.c:596
 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: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
+#: src/protocols/jabber/jabber.c:626 src/protocols/oscar/oscar.c:4267
+#: src/protocols/oscar/oscar.c:4275 src/protocols/trepia/trepia.c:335
+#: src/protocols/trepia/trepia.c:413
 msgid "State"
 msgstr "Fylke/stat"
 
-#: src/protocols/jabber/jabber.c:633
+#: src/protocols/jabber/jabber.c:636
 msgid "Phone"
 msgstr "Telefon"
 
-#: src/protocols/jabber/jabber.c:651
+#: src/protocols/jabber/jabber.c:646
+msgid "Date"
+msgstr "Dato"
+
+#: src/protocols/jabber/jabber.c:654
 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:654 src/protocols/jabber/jabber.c:655
+#: src/protocols/jabber/jabber.c:657 src/protocols/jabber/jabber.c:658
 msgid "Register New Jabber Account"
 msgstr "Registrere ny jabber-konto"
 
-#: 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
+#. connect to the server
+#: src/protocols/jabber/jabber.c:775 src/protocols/msn/dispatch.c:212
+#: src/protocols/msn/msn.c:505 src/protocols/napster/napster.c:499
+#: src/protocols/novell/novell.c:1575 src/protocols/oscar/oscar.c:944
+#: src/protocols/trepia/trepia.c:1064 src/protocols/yahoo/yahoo.c:2177
+#: src/protocols/zephyr/zephyr.c:864
 msgid "Connecting"
 msgstr "Kobler til"
 
-#: src/protocols/jabber/jabber.c:773
+#: src/protocols/jabber/jabber.c:779
 msgid "Initializing Stream"
 msgstr "Nullstiller datastrøm"
 
-#: src/protocols/jabber/jabber.c:779
+#: src/protocols/jabber/jabber.c:785
 msgid "Authenticating"
 msgstr "Autentiserer"
 
-#: src/protocols/jabber/jabber.c:787
+#: src/protocols/jabber/jabber.c:794
 msgid "Re-initializing Stream"
 msgstr "Nullstiller datastrøm på nytt"
 
-#: src/protocols/jabber/jabber.c:911 src/protocols/jabber/jabber.c:964
-#: src/protocols/jabber/presence.c:270
+#: src/protocols/jabber/jabber.c:874 src/protocols/jabber/jabber.c:1153
+#: src/protocols/jabber/jabber.c:1194 src/protocols/jabber/jabber.c:1227
+#: src/protocols/oscar/oscar.c:572 src/protocols/oscar/oscar.c:5816
+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
 msgid "Error"
 msgstr "Feil"
 
-#: src/protocols/jabber/jabber.c:927 src/protocols/jabber/jutil.c:101
-#: src/protocols/jabber/presence.c:82
+#: src/protocols/jabber/jabber.c:951 src/protocols/jabber/jutil.c:35
+#: src/protocols/jabber/presence.c:66 src/protocols/jabber/presence.c:117
 msgid "Chatty"
 msgstr "Pratsom"
 
-#: src/protocols/jabber/jabber.c:929 src/protocols/jabber/jutil.c:104
-#: src/protocols/jabber/presence.c:87
+#: src/protocols/jabber/jabber.c:953 src/protocols/jabber/jutil.c:38
+#: src/protocols/jabber/presence.c:68 src/protocols/jabber/presence.c:122
 msgid "Extended Away"
 msgstr "Utvidet borte"
 
-#: 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
+#: src/protocols/jabber/jabber.c:954 src/protocols/jabber/jutil.c:41
+#: src/protocols/jabber/presence.c:70 src/protocols/jabber/presence.c:124
+#: src/protocols/oscar/oscar.c:514 src/protocols/oscar/oscar.c:4828
+#: src/protocols/oscar/oscar.c:6427
 msgid "Do Not Disturb"
 msgstr "Ikke forstyrr"
 
-#: src/protocols/jabber/jabber.c:946
+#: src/protocols/jabber/jabber.c:971
 msgid "Password Changed"
 msgstr "Passordet er endret"
 
-#: src/protocols/jabber/jabber.c:947
+#: src/protocols/jabber/jabber.c:972
 msgid "Your password has been changed."
 msgstr "Passordet ditt har blitt endret."
 
-#: src/protocols/jabber/jabber.c:957
-#, c-format
-msgid "Error changing password: %s"
+#: src/protocols/jabber/jabber.c:976 src/protocols/jabber/jabber.c:977
+#, fuzzy
+msgid "Error changing password"
 msgstr "Feil under endring av passord: %s"
 
-#: 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
+#: src/protocols/jabber/jabber.c:1031
 msgid "Password (again)"
 msgstr "Passord (igjen)"
 
-#: src/protocols/jabber/jabber.c:1023 src/protocols/jabber/jabber.c:1024
+#: src/protocols/jabber/jabber.c:1036 src/protocols/jabber/jabber.c:1037
 msgid "Change Jabber Password"
 msgstr "Bytt jabber-passord"
 
-#: src/protocols/jabber/jabber.c:1024
+#: src/protocols/jabber/jabber.c:1037
 msgid "Please enter your new password"
 msgstr "Skriv inn ditt nye passord"
 
+#: src/protocols/jabber/jabber.c:1048 src/protocols/toc/toc.c:1532
+msgid "Set User Info"
+msgstr "Sett brukerinfo"
+
+#: src/protocols/jabber/jabber.c:1133
+msgid "Bad Request"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1135
+#, fuzzy
+msgid "Conflict"
+msgstr "Koble til"
+
+#: src/protocols/jabber/jabber.c:1137
+msgid "Feature Not Implemented"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1139
+#, fuzzy
+msgid "Forbidden"
+msgstr "Usynlig"
+
+#: src/protocols/jabber/jabber.c:1141
+#, fuzzy
+msgid "Gone"
+msgstr "Ingen"
+
+#: src/protocols/jabber/jabber.c:1143 src/protocols/jabber/jabber.c:1217
+msgid "Internal Server Error"
+msgstr "Intern tjenerfeil"
+
+#: src/protocols/jabber/jabber.c:1145
+msgid "Item Not Found"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1147
+#, fuzzy
+msgid "Malformed Jabber ID"
+msgstr "Ugyldig jabber-ID"
+
+#: src/protocols/jabber/jabber.c:1149
+#, fuzzy
+msgid "Not Acceptable"
+msgstr "Ikke tilgjengelig"
+
+#: src/protocols/jabber/jabber.c:1151
+#, fuzzy
+msgid "Not Allowed"
+msgstr "Ikke tilgjengelig"
+
+#: src/protocols/jabber/jabber.c:1155
+#, fuzzy
+msgid "Payment Required"
+msgstr "Kryptering kreves"
+
+#: src/protocols/jabber/jabber.c:1157
+#, fuzzy
+msgid "Recipient Unavailable"
+msgstr "Tjenesten er ikke tilgjengelig"
+
+#: src/protocols/jabber/jabber.c:1161
+#, fuzzy
+msgid "Registration Required"
+msgstr "Registrering feilet"
+
+#: src/protocols/jabber/jabber.c:1163
+msgid "Remote Server Not Found"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1165
+msgid "Remote Server Timeout"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1167
+#, fuzzy
+msgid "Server Overloaded"
+msgstr "Tjeneren er ikke tilgjengelig"
+
+#: src/protocols/jabber/jabber.c:1169
+#, fuzzy
+msgid "Service Unavailable"
+msgstr "Tjenesten er ikke tilgjengelig"
+
+#: src/protocols/jabber/jabber.c:1171
+#, fuzzy
+msgid "Subscription Required"
+msgstr "Kryptering kreves"
+
+#: src/protocols/jabber/jabber.c:1173
+msgid "Unexpected Request"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1180
+#, fuzzy
+msgid "Authorization Aborted"
+msgstr "Godkjent"
+
+#: src/protocols/jabber/jabber.c:1182
+#, fuzzy
+msgid "Incorrect encoding in authorization"
+msgstr "Mottok godkjenning"
+
+#: src/protocols/jabber/jabber.c:1185
+msgid "Invalid authzid"
+msgstr "Ugyldig authzid"
+
+#: src/protocols/jabber/jabber.c:1188
+#, fuzzy
+msgid "Invalid Authorization Mechanism"
+msgstr "Ugyldig mekanisme"
+
+#: src/protocols/jabber/jabber.c:1191
+#, fuzzy
+msgid "Authorization mechanism too weak"
+msgstr "Ikke godkjent"
+
+#: src/protocols/jabber/jabber.c:1196
+msgid "Temporary Authentication Failure"
+msgstr "Midlertidig autentiseringsfeil"
+
+#: src/protocols/jabber/jabber.c:1198
+msgid "Authentication Failure"
+msgstr "Autentiseringsfeil"
+
+#: src/protocols/jabber/jabber.c:1202
+msgid "Bad Format"
+msgstr "Ugyldig format"
+
+#: src/protocols/jabber/jabber.c:1204
+msgid "Bad Namespace Prefix"
+msgstr "Ugyldig navneromprefiks"
+
+#: src/protocols/jabber/jabber.c:1207
+msgid "Resource Conflict"
+msgstr "Ressurskonflikt"
+
+#: src/protocols/jabber/jabber.c:1209
+msgid "Connection Timeout"
+msgstr "Tilkoblingen lyktes ikke innenfor tidsgrensen"
+
+#: src/protocols/jabber/jabber.c:1211
+msgid "Host Gone"
+msgstr "Maskin borte"
+
+#: src/protocols/jabber/jabber.c:1213
+msgid "Host Unknown"
+msgstr "Maskin ukjent"
+
+#: src/protocols/jabber/jabber.c:1215
+msgid "Improper Addressing"
+msgstr "Uriktig adressering"
+
+#: src/protocols/jabber/jabber.c:1219
+msgid "Invalid ID"
+msgstr "Ugyldig ID"
+
+#: src/protocols/jabber/jabber.c:1221
+msgid "Invalid Namespace"
+msgstr "Ugyldig navnerom"
+
+#: src/protocols/jabber/jabber.c:1223
+msgid "Invalid XML"
+msgstr "Ugyldig XML"
+
+#: src/protocols/jabber/jabber.c:1225
+msgid "Non-matching Hosts"
+msgstr "Maskiner som ikke matcher"
+
+#: src/protocols/jabber/jabber.c:1229
+msgid "Policy Violation"
+msgstr "Brudd på policy"
+
+#: src/protocols/jabber/jabber.c:1231
+msgid "Remote Connection Failed"
+msgstr "Kunne ikke koble til"
+
+#: src/protocols/jabber/jabber.c:1233
+msgid "Resource Constraint"
+msgstr "Ressursbegrensning"
+
+#: src/protocols/jabber/jabber.c:1235
+msgid "Restricted XML"
+msgstr "Begrenset XML"
+
+#: src/protocols/jabber/jabber.c:1237
+msgid "See Other Host"
+msgstr "Se annen maskin"
+
+#: src/protocols/jabber/jabber.c:1239
+msgid "System Shutdown"
+msgstr "Systemet avslutter"
+
+#: src/protocols/jabber/jabber.c:1241
+msgid "Undefined Condition"
+msgstr "Udefinert hendelse"
+
+#: src/protocols/jabber/jabber.c:1243
+msgid "Unsupported Encoding"
+msgstr "Tegnkodingen er ikke støttet"
+
+#: src/protocols/jabber/jabber.c:1245
+msgid "Unsupported Stanza Type"
+msgstr "Stanzatypen er ikke støttet"
+
+#: src/protocols/jabber/jabber.c:1247
+msgid "Unsupported Version"
+msgstr "Denne versjonen er ikke støttet"
+
+#: src/protocols/jabber/jabber.c:1249
+msgid "XML Not Well Formed"
+msgstr "XML ikke velformet"
+
+#: src/protocols/jabber/jabber.c:1251
+msgid "Stream Error"
+msgstr "Feil i datastrøm"
+
+#: src/protocols/jabber/jabber.c:1276
+msgid "Hide Operating System"
+msgstr ""
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -5276,86 +5988,122 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/jabber/jabber.c:1122 src/protocols/jabber/jabber.c:1124
+#. *  description
+#: src/protocols/jabber/jabber.c:1362 src/protocols/jabber/jabber.c:1364
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber-protokolltillegg"
 
-#: src/protocols/jabber/jabber.c:1148
-msgid "Force Old SSL"
+#: src/protocols/jabber/jabber.c:1389
+#, fuzzy
+msgid "Use TLS if available"
+msgstr "MOTD er ikke tilgjengelig"
+
+#: src/protocols/jabber/jabber.c:1394
+#, fuzzy
+msgid "Force old SSL"
 msgstr "Tving bruk av gammel SSL"
 
-#: src/protocols/jabber/jabber.c:1156
+#: src/protocols/jabber/jabber.c:1399
+msgid "Allow plaintext auth over unencrypted streams"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1408
 msgid "Connect server"
 msgstr "Koble til tjener"
 
-#: src/protocols/jabber/message.c:125
+#: src/protocols/jabber/message.c:111
 #, c-format
 msgid "Message from %s"
 msgstr "Beskjedlogging"
 
-#: src/protocols/jabber/message.c:219
+#: 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:225
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Beskjedlevering til %s feilet: %s"
 
-#: src/protocols/jabber/message.c:222
+#: src/protocols/jabber/message.c:228
 msgid "Jabber Message Error"
 msgstr "Jabber beskjedfeil"
 
-#: src/protocols/jabber/message.c:281
+#: src/protocols/jabber/message.c:291
 #, c-format
 msgid " (Code %s)"
 msgstr " (kode %s)"
 
-#: src/protocols/jabber/parser.c:129
+#: src/protocols/jabber/parser.c:131
 msgid "XML Parse error"
 msgstr "XML-parsefeil"
 
-#: src/protocols/jabber/presence.c:170
-#, c-format
-msgid "%s (Code %s)"
-msgstr "%s (kode %s)"
-
-#: src/protocols/jabber/presence.c:175
+#: src/protocols/jabber/presence.c:221
 msgid "Unknown Error in presence"
 msgstr "Ukjent feil i tilstedeværelse"
 
-#: src/protocols/jabber/presence.c:179
+#: src/protocols/jabber/presence.c:224
 #, 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: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
+#: src/protocols/jabber/presence.c:277 src/protocols/jabber/presence.c:278
+#, fuzzy
+msgid "Create New Room"
+msgstr "Samtalerom"
+
+#: src/protocols/jabber/presence.c:279
+msgid ""
+"You are creating a new room.  Would you like to configure it, or accept the "
+"default settings?"
+msgstr ""
+
+#: src/protocols/jabber/presence.c:281
+msgid "Configure Room"
+msgstr ""
+
+#: src/protocols/jabber/presence.c:283
+msgid "Accept Defaults"
+msgstr ""
+
+#: src/protocols/jabber/presence.c:303
+#, fuzzy, c-format
+msgid "Error in chat %s"
+msgstr "Feil under lagring av bilde: %s"
+
+#: src/protocols/jabber/presence.c:306
+#, 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
 msgid "File Send Failed"
 msgstr "Filsending feilet"
 
-#: src/protocols/msn/dispatch.c:42 src/protocols/msn/notification.c:278
-#: src/protocols/msn/notification.c:520
+#: src/protocols/msn/dispatch.c:42 src/protocols/msn/notification.c:240
 msgid "Unable to request USR\n"
 msgstr "Kunne ikke be om USR\n"
 
-#: src/protocols/msn/dispatch.c:59 src/protocols/msn/notification.c:295
+#: src/protocols/msn/dispatch.c:59 src/protocols/msn/notification.c:257
 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:304
+#: src/protocols/msn/dispatch.c:68 src/protocols/msn/notification.c:266
 msgid "Unable to send USR"
 msgstr "Kunne ikke sende USR"
 
-#: src/protocols/msn/dispatch.c:73 src/protocols/msn/notification.c:309
+#: src/protocols/msn/dispatch.c:73 src/protocols/msn/notification.c:271
 msgid "Requesting to send password"
 msgstr "Forespør sending av passord"
 
@@ -5363,15 +6111,15 @@
 msgid "Protocol version not supported"
 msgstr "Protokollversjonen er ikke støttet"
 
-#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:784
+#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:410
 msgid "Unable to request CVR\n"
 msgstr "Kunne ikke be om CVR\n"
 
-#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:793
+#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:419
 msgid "Unable to request INF\n"
 msgstr "Kunne ikke be om INF\n"
 
-#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1915
+#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1564
 msgid "Got invalid XFR"
 msgstr "Mottok ugyldig XFR"
 
@@ -5379,452 +6127,480 @@
 msgid "Unable to transfer"
 msgstr "Kunne ikke overføre"
 
-#: src/protocols/msn/dispatch.c:199
+#: src/protocols/msn/dispatch.c:192
 msgid "Unable to parse message."
 msgstr "Kunne ikke tolke beskjed."
 
-#: 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
+#: src/protocols/msn/dispatch.c:232 src/protocols/msn/notification.c:528
+#: src/protocols/msn/notification.c:1826
 msgid "Unable to write to server"
 msgstr "Kunne ikke skrive til tjener"
 
-#: src/protocols/msn/dispatch.c:243 src/protocols/msn/notification.c:2174
+#: src/protocols/msn/dispatch.c:236 src/protocols/msn/notification.c:1833
 msgid "Syncing with server"
 msgstr "Synkroniserer med tjeneren"
 
-#: src/protocols/msn/dispatch.c:257 src/protocols/msn/notification.c:2188
+#: src/protocols/msn/dispatch.c:250
 msgid "Error reading from server"
 msgstr "Feil ved lesing fra tjener"
 
 #: src/protocols/msn/error.c:33
+#, fuzzy
+msgid "Unable to parse message"
+msgstr "Kunne ikke tolke beskjed."
+
+#: src/protocols/msn/error.c:36
 msgid "Syntax Error (probably a Gaim bug)"
 msgstr "Syntaksfeil (sannsynligvis en Gaim-bug)"
 
-#: src/protocols/msn/error.c:37
-msgid "Invalid Parameter (probably a Gaim bug)"
-msgstr "Ugyldig parameter (sannsynligvis en Gaim-bug)"
-
 #: src/protocols/msn/error.c:40
-msgid "Invalid User"
-msgstr "Ugyldig bruker"
-
-#: src/protocols/msn/error.c:44
+#, fuzzy
+msgid "Invalid email address"
+msgstr "Ugyldig romidentifikator"
+
+#: src/protocols/msn/error.c:43
+#, fuzzy
+msgid "User does not exist"
+msgstr "Filen eksisterer ikke."
+
+#: src/protocols/msn/error.c:47
 msgid "Fully Qualified Domain Name missing"
 msgstr "Fullstending domenenavn mangler"
 
-#: src/protocols/msn/error.c:47
-msgid "Already Logged In"
-msgstr "Allerede logget inn"
-
 #: src/protocols/msn/error.c:50
-msgid "Invalid Username"
-msgstr "Ugyldig brukernavn"
+msgid "Already Logged In"
+msgstr "Allerede logget inn"
 
 #: src/protocols/msn/error.c:53
+msgid "Invalid Username"
+msgstr "Ugyldig brukernavn"
+
+#: src/protocols/msn/error.c:56
 msgid "Invalid Friendly Name"
 msgstr "Ugyldig kallenavn"
 
-#: src/protocols/msn/error.c:56
+#: src/protocols/msn/error.c:59
 msgid "List Full"
 msgstr "Listen er full"
 
-#: src/protocols/msn/error.c:59
+#: src/protocols/msn/error.c:62
 msgid "Already there"
 msgstr "Du er allerede der"
 
-#: src/protocols/msn/error.c:62
+#: src/protocols/msn/error.c:65
 msgid "Not on list"
 msgstr "Ikke på listen"
 
-#: src/protocols/msn/error.c:65
+#: src/protocols/msn/error.c:68 src/protocols/zephyr/zephyr.c:527
 msgid "User is offline"
 msgstr "Brukeren er avlogget"
 
-#: src/protocols/msn/error.c:68
+#: src/protocols/msn/error.c:71
 msgid "Already in the mode"
 msgstr "Du er allerede i modusen"
 
-#: src/protocols/msn/error.c:71
-msgid "Already in opposite list"
-msgstr "Du er allerede i den andre listen"
-
 #: src/protocols/msn/error.c:74
-msgid "Too many groups"
-msgstr "For mange grupper"
+msgid "Already in opposite list"
+msgstr "Du er allerede i den andre listen"
 
 #: src/protocols/msn/error.c:77
+msgid "Too many groups"
+msgstr "For mange grupper"
+
+#: src/protocols/msn/error.c:80
 msgid "Invalid group"
 msgstr "Ugyldig gruppe"
 
-#: src/protocols/msn/error.c:80
-msgid "User not in group"
-msgstr "Brukeren er ikke i gruppen"
-
 #: src/protocols/msn/error.c:83
-msgid "Group name too long"
-msgstr "Gruppenavnet er for langt"
+msgid "User not in group"
+msgstr "Brukeren er ikke i gruppen"
 
 #: src/protocols/msn/error.c:86
+msgid "Group name too long"
+msgstr "Gruppenavnet er for langt"
+
+#: src/protocols/msn/error.c:89
 msgid "Cannot remove group zero"
 msgstr "Kan ikke fjerne gruppe null"
 
-#: src/protocols/msn/error.c:90
+#: src/protocols/msn/error.c:93
 msgid "Tried to add a contact to a group that doesn't exist"
 msgstr "Prøvde å legge en kontakt til i en ikke-eksisterende gruppe"
 
-#: src/protocols/msn/error.c:94
+#: src/protocols/msn/error.c:97
 msgid "Switchboard failed"
 msgstr "Feil med switchboard-tjenesten"
 
-#: src/protocols/msn/error.c:97
+#: src/protocols/msn/error.c:100
 msgid "Notify Transfer failed"
 msgstr "Overføring av varsling feilet"
 
-#: src/protocols/msn/error.c:101
-msgid "Required fields missing"
-msgstr "Du har ikke fylt inn alle nødvendige felt"
-
 #: src/protocols/msn/error.c:104
+msgid "Required fields missing"
+msgstr "Du har ikke fylt inn alle nødvendige felt"
+
+#: src/protocols/msn/error.c:107
 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:183
+#: src/protocols/msn/error.c:110 src/protocols/oscar/oscar.c:186
 msgid "Not logged in"
 msgstr "Ikke pålogget"
 
-#: src/protocols/msn/error.c:111
-msgid "Internal server error"
-msgstr "Intern tjenerfeil"
-
 #: src/protocols/msn/error.c:114
+#, fuzzy
+msgid "Service Temporarily Unavailable"
+msgstr "Katalogtjenesten er midlertidig utilgjengelig."
+
+#: src/protocols/msn/error.c:117
 msgid "Database server error"
 msgstr "Feil på databasetjeneren"
 
-#: src/protocols/msn/error.c:117
-msgid "File operation error"
-msgstr "Filoperasjonsfeil"
-
 #: src/protocols/msn/error.c:120
-msgid "Memory allocation error"
-msgstr "Feil ved minneallokering"
+#, fuzzy
+msgid "Command disabled"
+msgstr "Kommando"
 
 #: src/protocols/msn/error.c:123
+msgid "File operation error"
+msgstr "Filoperasjonsfeil"
+
+#: src/protocols/msn/error.c:126
+msgid "Memory allocation error"
+msgstr "Feil ved minneallokering"
+
+#: src/protocols/msn/error.c:129
 msgid "Wrong CHL value sent to server"
 msgstr "Feil CHL-verdi sendt til tjener"
 
-#: src/protocols/msn/error.c:127
+#: src/protocols/msn/error.c:133
 msgid "Server busy"
 msgstr "Tjeneren er opptatt"
 
-#: src/protocols/msn/error.c:130 src/protocols/msn/error.c:143
-#: src/protocols/msn/error.c:198
+#: src/protocols/msn/error.c:136 src/protocols/msn/error.c:149
+#: src/protocols/msn/error.c:204
 msgid "Server unavailable"
 msgstr "Tjeneren er ikke tilgjengelig"
 
-#: src/protocols/msn/error.c:133
+#: src/protocols/msn/error.c:139
 msgid "Peer Notification server down"
 msgstr "Varslingstjeneren er ikke tilgjengelig"
 
-#: src/protocols/msn/error.c:136
+#: src/protocols/msn/error.c:142
 msgid "Database connect error"
 msgstr "Kunne ikke koble til databasen"
 
-#: src/protocols/msn/error.c:140
+#: src/protocols/msn/error.c:146
 msgid "Server is going down (abandon ship)"
 msgstr "Tjeneren er på vei nei (redde seg den som kan)"
 
-#: src/protocols/msn/error.c:147
+#: src/protocols/msn/error.c:153
 msgid "Error creating connection"
 msgstr "Feil: kunne ikke koble til"
 
-#: src/protocols/msn/error.c:151
+#: src/protocols/msn/error.c:157
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR-parametre er enten ukjent eller ikke tillatt"
 
-#: src/protocols/msn/error.c:154 src/protocols/msn/notification.c:635
-#: src/protocols/msn/notification.c:1282 src/protocols/msn/notification.c:1450
+#: src/protocols/msn/error.c:160 src/protocols/msn/notification.c:304
 msgid "Unable to write"
 msgstr "Kunne ikke skrive"
 
-#: src/protocols/msn/error.c:157
+#: src/protocols/msn/error.c:163
 msgid "Session overload"
 msgstr "Sesjonsoverlast"
 
-#: src/protocols/msn/error.c:160
+#: src/protocols/msn/error.c:166
 msgid "User is too active"
 msgstr "Brukeren er for aktiv"
 
-#: src/protocols/msn/error.c:163
-msgid "Too many sessions"
-msgstr "For mange sesjoner"
-
-#: src/protocols/msn/error.c:166 src/protocols/msn/error.c:172
-msgid "Not expected"
-msgstr "Uventet"
-
 #: src/protocols/msn/error.c:169
+msgid "Too many sessions"
+msgstr "For mange sesjoner"
+
+#: src/protocols/msn/error.c:172
+#, fuzzy
+msgid "Passport not verified"
+msgstr "Passport-konto er ikke blitt verifisert enda"
+
+#: src/protocols/msn/error.c:175
 msgid "Bad friend file"
 msgstr "Ugyldig 'friend'-fil"
 
-#: src/protocols/msn/error.c:177
+#: src/protocols/msn/error.c:178
+msgid "Not expected"
+msgstr "Uventet"
+
+#: src/protocols/msn/error.c:183
 msgid "Friendly name changes too rapidly"
 msgstr "Visningsnavnet endres for raskt"
 
-#: src/protocols/msn/error.c:186
+#: src/protocols/msn/error.c:192
 msgid "Server too busy"
 msgstr "Tjeneren er for opptatt"
 
-#: src/protocols/msn/error.c:190 src/protocols/oscar/oscar.c:1076
+#: src/protocols/msn/error.c:196 src/protocols/oscar/oscar.c:1357
 #: src/protocols/toc/toc.c:659
 msgid "Authentication failed"
 msgstr "Autentisering feilet"
 
-#: src/protocols/msn/error.c:193
+#: src/protocols/msn/error.c:199
 msgid "Not allowed when offline"
 msgstr "Ikke tillatt når avlogget"
 
-#: src/protocols/msn/error.c:201
+#: src/protocols/msn/error.c:207
 msgid "Not accepting new users"
 msgstr "Nye brukere vil ikke bli godtatt"
 
-#: src/protocols/msn/error.c:205
+#: src/protocols/msn/error.c:211
 msgid "Kids Passport without parental consent"
 msgstr "Passport for barn, men har ikke foreldregodkjenning"
 
-#: src/protocols/msn/error.c:209
+#: src/protocols/msn/error.c:215
 msgid "Passport account not yet verified"
 msgstr "Passport-konto er ikke blitt verifisert enda"
 
-#: src/protocols/msn/error.c:213
+#: src/protocols/msn/error.c:218
+#, fuzzy
+msgid "Bad ticket"
+msgstr "Rullende kontaktliste"
+
+#: src/protocols/msn/error.c:222
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "Ukjent feilkode %d"
 
-#: src/protocols/msn/msn.c:70
+#: src/protocols/msn/error.c:234
+#, c-format
+msgid "MSN Error: %s\n"
+msgstr "MSN Feil: %s\n"
+
+#: src/protocols/msn/msn.c:72
 msgid "Your new MSN friendly name is too long."
 msgstr "Det nye MSN-kallenavnet er for langt."
 
-#: src/protocols/msn/msn.c:177
+#: src/protocols/msn/msn.c:191
 msgid "Set your friendly name."
 msgstr "Sett kallenavn."
 
-#: src/protocols/msn/msn.c:178
+#: src/protocols/msn/msn.c:192
 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:190
+#: src/protocols/msn/msn.c:204
 msgid "Set your home phone number."
 msgstr "Sett telefonnummer (hjemme)."
 
-#: src/protocols/msn/msn.c:201
+#: src/protocols/msn/msn.c:215
 msgid "Set your work phone number."
 msgstr "Sett telefonnummer (arbeid)."
 
-#: src/protocols/msn/msn.c:212
+#: src/protocols/msn/msn.c:226
 msgid "Set your mobile phone number."
 msgstr "Sett mobiltelefonnummer"
 
-#: src/protocols/msn/msn.c:221
+#: src/protocols/msn/msn.c:235
 msgid "Allow MSN Mobile pages?"
 msgstr "Tillat tekstmeldinger via MSN"
 
-#: src/protocols/msn/msn.c:222
+#: src/protocols/msn/msn.c:236
 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:226
+#: src/protocols/msn/msn.c:240
 msgid "Allow"
 msgstr "Tillat"
 
-#: src/protocols/msn/msn.c:227
+#: src/protocols/msn/msn.c:241
 msgid "Disallow"
 msgstr "Forby"
 
-#: src/protocols/msn/msn.c:244
+#: src/protocols/msn/msn.c:258
 msgid "Send a mobile message."
 msgstr "Send tekstmelding"
 
-#: src/protocols/msn/msn.c:246
+#: src/protocols/msn/msn.c:260
 msgid "Page"
 msgstr "Send"
 
-#: 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:345 src/protocols/msn/msn.c:623
+#: src/protocols/msn/msn.c:361 src/protocols/msn/msn.c:662
 #: src/protocols/msn/state.c:32
 msgid "Away From Computer"
 msgstr "Borte"
 
-#: 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
+#: src/protocols/msn/msn.c:362 src/protocols/msn/msn.c:664
+#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2275
+#: src/protocols/yahoo/yahoo.c:2601 src/protocols/yahoo/yahoo.c:2715
 msgid "Be Right Back"
 msgstr "Straks tilbake"
 
-#: 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
+#: src/protocols/msn/msn.c:363 src/protocols/msn/msn.c:666
+#: src/protocols/msn/state.c:29 src/protocols/novell/novell.c:2150
+#: src/protocols/novell/novell.c:2263 src/protocols/novell/novell.c:2317
+#: src/protocols/yahoo/yahoo.c:2277 src/protocols/yahoo/yahoo.c:2603
+#: src/protocols/yahoo/yahoo.c:2716
 msgid "Busy"
 msgstr "Opptatt"
 
-#: 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
+#: src/protocols/msn/msn.c:364 src/protocols/msn/msn.c:668
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2285
+#: src/protocols/yahoo/yahoo.c:2611 src/protocols/yahoo/yahoo.c:2720
 msgid "On The Phone"
 msgstr "I telefonen"
 
-#: 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
+#: src/protocols/msn/msn.c:365 src/protocols/msn/msn.c:670
+#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2289
+#: src/protocols/yahoo/yahoo.c:2615 src/protocols/yahoo/yahoo.c:2722
 msgid "Out To Lunch"
 msgstr "Ute til lunsj"
 
-#: src/protocols/msn/msn.c:350 src/protocols/msn/msn.c:633
-#: src/protocols/zephyr/zephyr.c:883 src/protocols/zephyr/zephyr.c:898
+#: src/protocols/msn/msn.c:366 src/protocols/msn/msn.c:672
+#: src/protocols/zephyr/zephyr.c:1179 src/protocols/zephyr/zephyr.c:1194
 msgid "Hidden"
 msgstr "Usynlig"
 
-#: src/protocols/msn/msn.c:362
+#: src/protocols/msn/msn.c:378
 msgid "Set Friendly Name"
 msgstr "Sett kallenavn"
 
-#: src/protocols/msn/msn.c:370
+#: src/protocols/msn/msn.c:386
 msgid "Set Home Phone Number"
 msgstr "Sett telefonnummer (hjemme)"
 
-#: src/protocols/msn/msn.c:376
+#: src/protocols/msn/msn.c:392
 msgid "Set Work Phone Number"
 msgstr "Sett telefonnummer (arbeid)"
 
-#: src/protocols/msn/msn.c:382
+#: src/protocols/msn/msn.c:398
 msgid "Set Mobile Phone Number"
 msgstr "Sett mobiltelefonnummer"
 
-#: src/protocols/msn/msn.c:391
+#: src/protocols/msn/msn.c:407
 msgid "Enable/Disable Mobile Devices"
 msgstr "Bruk/ikke bruk mobile enheter"
 
-#: src/protocols/msn/msn.c:398
+#: src/protocols/msn/msn.c:414
 msgid "Allow/Disallow Mobile Pages"
 msgstr "Tillate/forby tekstmeldinger"
 
-#: src/protocols/msn/msn.c:424
+#: src/protocols/msn/msn.c:440
 msgid "Send to Mobile"
 msgstr "Send til mobil"
 
-#: src/protocols/msn/msn.c:433
+#: src/protocols/msn/msn.c:449
 msgid "Initiate Chat"
 msgstr "Start samtale"
 
-#: 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."
+#: src/protocols/msn/msn.c:473
+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:785
+#, 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."
 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:751 src/protocols/msn/msn.c:791
-msgid "Invalid MSN screenname"
+#: src/protocols/msn/msn.c:789 src/protocols/msn/msn.c:829
+#, fuzzy
+msgid "Invalid MSN screen name"
 msgstr "Ugyldig MSN skjermnavn"
 
-#: 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."
+#: src/protocols/msn/msn.c:825
+#, 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."
 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:1267 src/protocols/yahoo/yahoo.c:2582
+#: src/protocols/msn/msn.c:1332 src/protocols/yahoo/yahoo.c:2899
 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:1335 src/protocols/oscar/oscar.c:3991
-#: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:413
-#: src/protocols/yahoo/yahoo.c:2693
+#: src/protocols/msn/msn.c:1402 src/protocols/oscar/oscar.c:4252
+#: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:404
+#: src/protocols/yahoo/yahoo.c:3009
 msgid "Age"
 msgstr "Alder"
 
 #. Gender
-#: 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:2705
+#: src/protocols/msn/msn.c:1409 src/protocols/oscar/oscar.c:4239
+#: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:406
+#: src/protocols/yahoo/yahoo.c:3017
 msgid "Gender"
 msgstr "Kjønn"
 
-#: src/protocols/msn/msn.c:1350 src/protocols/yahoo/yahoo.c:2699
+#: src/protocols/msn/msn.c:1417 src/protocols/yahoo/yahoo.c:3013
 msgid "Marital Status"
 msgstr "Sivilstatus"
 
-#: src/protocols/msn/msn.c:1357 src/protocols/yahoo/yahoo.c:2687
+#: src/protocols/msn/msn.c:1424 src/protocols/yahoo/yahoo.c:3005
 msgid "Location"
 msgstr "Sted"
 
-#: src/protocols/msn/msn.c:1365 src/protocols/yahoo/yahoo.c:2711
+#: src/protocols/msn/msn.c:1432 src/protocols/yahoo/yahoo.c:3021
 msgid "Occupation"
 msgstr "Yrke"
 
-#: 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
+#: src/protocols/msn/msn.c:1449 src/protocols/msn/msn.c:1455
+#: src/protocols/msn/msn.c:1462 src/protocols/msn/msn.c:1469
+#: src/protocols/msn/msn.c:1476
 msgid "A Little About Me"
 msgstr "Noen ord om meg"
 
-#: src/protocols/msn/msn.c:1418 src/protocols/msn/msn.c:1431
-#: src/protocols/msn/msn.c:1438
+#: src/protocols/msn/msn.c:1485 src/protocols/msn/msn.c:1498
+#: src/protocols/msn/msn.c:1505
 msgid "Favorite Things"
 msgstr "Favoritt-ting"
 
-#: src/protocols/msn/msn.c:1447 src/protocols/msn/msn.c:1453
-#: src/protocols/msn/msn.c:1460
+#: src/protocols/msn/msn.c:1514 src/protocols/msn/msn.c:1520
+#: src/protocols/msn/msn.c:1527
 msgid "Hobbies and Interests"
 msgstr "Hobbyer og interesser"
 
-#: src/protocols/msn/msn.c:1469 src/protocols/msn/msn.c:1475
-#: src/protocols/yahoo/yahoo.c:2755
+#: src/protocols/msn/msn.c:1536 src/protocols/msn/msn.c:1542
+#: src/protocols/yahoo/yahoo.c:3056
 msgid "Favorite Quote"
 msgstr "Yndlingssitat"
 
-#: src/protocols/msn/msn.c:1483 src/protocols/yahoo/yahoo.c:2799
+#: src/protocols/msn/msn.c:1550 src/protocols/yahoo/yahoo.c:3092
 msgid "Last Updated"
 msgstr "Sist oppdatert"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1494 src/protocols/trepia/trepia.c:289
-#: src/protocols/trepia/trepia.c:457
+#: src/protocols/msn/msn.c:1561 src/protocols/trepia/trepia.c:289
+#: src/protocols/trepia/trepia.c:419
 msgid "Homepage"
 msgstr "Hjemmeside"
 
-#: src/protocols/msn/msn.c:1516 src/protocols/yahoo/yahoo.c:2817
+#: src/protocols/msn/msn.c:1583 src/protocols/yahoo/yahoo.c:3107
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "Brukerinformasjon for %s er ikke tilgjengelig"
 
-#: src/protocols/msn/msn.c:1518 src/protocols/yahoo/yahoo.c:2819
+#: src/protocols/msn/msn.c:1585 src/protocols/yahoo/yahoo.c:3109
 msgid "The user's profile is empty."
 msgstr "Brukerens profil er tom."
 
+#: src/protocols/msn/msn.c:1626
+msgid "Display conversation closed notices"
+msgstr ""
+
+#: src/protocols/msn/msn.c:1631
+msgid "Display timeout notices"
+msgstr ""
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -5835,92 +6611,83 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/msn/msn.c:1616 src/protocols/msn/msn.c:1618
+#. *  description
+#: src/protocols/msn/msn.c:1717 src/protocols/msn/msn.c:1719
 msgid "MSN Protocol Plugin"
 msgstr "MSN-protokolltillegg"
 
-#: src/protocols/msn/msn.c:1635 src/protocols/trepia/trepia.c:1340
+#: src/protocols/msn/msn.c:1737 src/protocols/trepia/trepia.c:1302
 msgid "Login server"
 msgstr "Påloggingstjener"
 
-#: src/protocols/msn/msn.c:1645
+#: src/protocols/msn/msn.c:1746
 msgid "Use HTTP Method"
 msgstr "Bruk HTTP-metode"
 
-#: src/protocols/msn/notification.c:247
-#, c-format
-msgid "MSN Error: %s\n"
-msgstr "MSN Feil: %s\n"
-
-#: src/protocols/msn/notification.c:322
+#: src/protocols/msn/nexus.c:56
 msgid "Unable to connect to server"
 msgstr "Kan ikke koble til tjener"
 
-#: src/protocols/msn/notification.c:376 src/protocols/msn/notification.c:545
+#: 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/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
+#: src/protocols/msn/nexus.c:147
 msgid "MSN Nexus server returned invalid redirect information."
 msgstr "MSN nexus-tjener returnerte ugyldig redirigeringsinformasjon."
 
-#: src/protocols/msn/notification.c:459
+#: 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: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
+#: src/protocols/msn/notification.c:309 src/protocols/trepia/trepia.c:635
 msgid "Retrieving buddy list"
 msgstr "Henter kontaktliste"
 
-#: 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
+#: src/protocols/msn/notification.c:334 src/protocols/msn/notification.c:366
+#: src/protocols/oscar/oscar.c:1646
 msgid "Password sent"
 msgstr "Passord sendt"
 
-#: src/protocols/msn/notification.c:735
+#: src/protocols/msn/notification.c:361
 msgid "Unable to send password"
 msgstr "Kunne ikke sende passord"
 
-#: src/protocols/msn/notification.c:771
+#: src/protocols/msn/notification.c:397
 msgid "Protocol not supported"
 msgstr "Protokollen er ikke støttet"
 
-#: src/protocols/msn/notification.c:813
+#: src/protocols/msn/notification.c:440
 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:818
+#: src/protocols/msn/notification.c:445
 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:944
+#: src/protocols/msn/notification.c:584
 #, 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:1263 src/protocols/msn/notification.c:1429
+#: src/protocols/msn/notification.c:903 src/protocols/msn/notification.c:1070
 #, 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:1960
+#: src/protocols/msn/notification.c:1362
+#, c-format
+msgid ""
+"Your MSN buddy list for %s is temporarily unavailable. Please wait and try "
+"again."
+msgstr ""
+
+#: src/protocols/msn/notification.c:1607
 msgid "Unable to transfer to notification server"
 msgstr "Kunne ikke overføre til varslingstjeneren"
 
-#: src/protocols/msn/notification.c:2108
+#: src/protocols/msn/notification.c:1776
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5947,20 +6714,25 @@
 "\n"
 "Etter at vedlikeholdsarbeidet er ferdig, kan du logge på igjen."
 
-#: src/protocols/msn/servconn.c:528
+#: src/protocols/msn/servconn.c:389
+#, fuzzy
+msgid "IO Error."
+msgstr "IRC-feil"
+
+#: src/protocols/msn/servconn.c:527
 msgid "Received HTTP error. Please report this."
 msgstr "Mottok HTTP-feil. Vennligst feilmeld dette."
 
-#: src/protocols/msn/switchboard.c:147
+#: src/protocols/msn/switchboard.c:150
 msgid "The conversation has become inactive and timed out."
 msgstr "Samtalen har blitt avsluttet pga. inaktivitet."
 
-#: src/protocols/msn/switchboard.c:154
+#: src/protocols/msn/switchboard.c:159
 #, c-format
 msgid "%s has closed the conversation window."
 msgstr "%s har lukket samtalevinduet."
 
-#: src/protocols/msn/switchboard.c:277
+#: src/protocols/msn/switchboard.c:300
 msgid "An MSN message may not have been received."
 msgstr "MSN-beskjeden har kanskje ikke blitt mottatt."
 
@@ -5973,43 +6745,236 @@
 msgid "Unable to read message from server.  Command is %hd, length is %hd."
 msgstr "Kunne ikke lese melding fra tjener. Kommando er %hd, lengde er %hd."
 
-#: src/protocols/napster/napster.c:303
+#: src/protocols/napster/napster.c:307
 #, c-format
 msgid "users: %s, files: %s, size: %sGB"
 msgstr "brukere: %s, filer: %s, størrelse %sGB"
 
 #. MSG_SERVER_HOTLIST_ERROR
-#: src/protocols/napster/napster.c:314
+#: src/protocols/napster/napster.c:318
 #, c-format
 msgid "Unable to add \"%s\" to your Napster hotlist"
 msgstr "Kunne ikke legge til \"%s\" i Napster-listen din"
 
-#: src/protocols/napster/napster.c:322
+#: src/protocols/napster/napster.c:326
 msgid "You were disconnected from the server."
 msgstr "Du har blitt koblet fra tjeneren."
 
 #. MSG_CLIENT_WHOIS
-#: src/protocols/napster/napster.c:378
+#: src/protocols/napster/napster.c:384
 #, c-format
 msgid "%s requested your information"
 msgstr "%s hentet informasjon om deg"
 
-#: src/protocols/napster/napster.c:410
+#: src/protocols/napster/napster.c:422
 msgid ""
 "You were disconnected from the server, because you logged on from a "
 "different location"
 msgstr "Du ble logget av fordi du har logget på et annet sted."
 
 #. MSG_CLIENT_PING
-#: src/protocols/napster/napster.c:416
+#: src/protocols/napster/napster.c:428
 #, c-format
 msgid "%s requested a PING"
 msgstr "%s pinget deg"
 
-#: src/protocols/napster/napster.c:543 src/protocols/oscar/oscar.c:5203
+#: src/protocols/napster/napster.c:541
+msgid "Get Info"
+msgstr "Info"
+
+#: src/protocols/napster/napster.c:555 src/protocols/oscar/oscar.c:5522
 #: src/protocols/toc/toc.c:1259
-msgid "Join what group:"
-msgstr "Navn på samtalegruppe:"
+msgid "_Group:"
+msgstr "Gruppe:"
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: src/protocols/napster/napster.c:640 src/protocols/napster/napster.c:642
+msgid "NAPSTER Protocol Plugin"
+msgstr "Napster-protokolltillegg"
+
+#: src/protocols/novell/novell.c:113
+#, c-format
+msgid "Login failed (0x%X)."
+msgstr ""
+
+#: src/protocols/novell/novell.c:225
+#, fuzzy, c-format
+msgid "Unable to send message. Could not get details for user (0x%X)."
+msgstr "Kunne ikke sende beskjed. Beskjeden er for stor."
+
+#: src/protocols/novell/novell.c:371
+#, fuzzy, c-format
+msgid "Unable to add %s to your buddy list (0x%X)."
+msgstr "Kunne ikke legge til \"%s\" i Napster-listen din"
+
+#. TODO: Improve this! message to who or for what conference?
+#: src/protocols/novell/novell.c:397
+#, fuzzy, c-format
+msgid "Unable to send message (0x%X)."
+msgstr "Kunne ikke sende beskjed."
+
+#: src/protocols/novell/novell.c:485
+#, c-format
+msgid "Unable to send message to %s. Could not create the conference (0x%X)."
+msgstr ""
+
+#: src/protocols/novell/novell.c:489
+#, fuzzy, c-format
+msgid "Unable to send message. Could not create the conference (0x%X)."
+msgstr "Kunne ikke sende beskjed. Beskjeden er for stor."
+
+#: src/protocols/novell/novell.c:536
+#, c-format
+msgid ""
+"Unable to move user %s to folder %s in the server side list. Error while "
+"creating folder (0x%X)."
+msgstr ""
+
+#: src/protocols/novell/novell.c:584
+#, c-format
+msgid ""
+"Unable to add %s to your buddy list. Error creating folder in server side "
+"list (0x%X)."
+msgstr ""
+
+#: src/protocols/novell/novell.c:615 src/protocols/novell/novell.c:1344
+#, fuzzy, c-format
+msgid "GroupWise Conference %d"
+msgstr "Start konferanse"
+
+#: src/protocols/novell/novell.c:659
+#, c-format
+msgid "Could not get details for user %s (0x%X)."
+msgstr ""
+
+#: src/protocols/novell/novell.c:773 src/protocols/novell/novell.c:1107
+#, fuzzy
+msgid "Error communicating with server. Closing connection."
+msgstr "Feil i kommunikasjonen med Gadu-Gadu-tjeneren"
+
+#: src/protocols/novell/novell.c:982
+#, fuzzy
+msgid "Userid"
+msgstr "Bruker"
+
+#. tag = _("DN");
+#. value = nm_user_record_get_dn(user_record);
+#. if (value) {
+#. g_string_append_printf(info_text, "<b>%s:</b> %s<br/>\n",
+#. tag, value);
+#. }
+#.
+#: src/protocols/novell/novell.c:996
+#, fuzzy
+msgid "Full name"
+msgstr "Fullt navn"
+
+#: src/protocols/novell/novell.c:1016
+#, fuzzy
+msgid "User Properties"
+msgstr "Brukervalg"
+
+#: src/protocols/novell/novell.c:1084
+#, fuzzy
+msgid "Unable to make SSL connection to server."
+msgstr "Kan ikke koble til tjener."
+
+#: src/protocols/novell/novell.c:1113
+#, c-format
+msgid "Error processing event or response. (0x%X)"
+msgstr ""
+
+#: src/protocols/novell/novell.c:1147
+#, fuzzy
+msgid "Authenticating..."
+msgstr "Autentiserer"
+
+#: src/protocols/novell/novell.c:1162
+#, fuzzy
+msgid "Waiting for response..."
+msgstr "Venter på svar..."
+
+#: src/protocols/novell/novell.c:1302
+#, fuzzy
+msgid "Invitation to Conversation"
+msgstr "Logge samtaler"
+
+#: src/protocols/novell/novell.c:1303
+#, c-format
+msgid ""
+"Invitation from: %s\n"
+"\n"
+"Sent: %s"
+msgstr ""
+
+#: src/protocols/novell/novell.c:1305
+#, fuzzy
+msgid "Would you like to join the conversation?"
+msgstr "Ønsker du å overskrive den?"
+
+#: src/protocols/novell/novell.c:1408
+#, fuzzy
+msgid "You have been logged out because you logged in at another workstation."
+msgstr ""
+"Du ble logget av fordi du har logget på med dette skjermnavnet et annet sted."
+
+#: src/protocols/novell/novell.c:1462
+#, c-format
+msgid ""
+"%s appears to be offline and did not receive the message that you just sent."
+msgstr ""
+
+#. TODO: Would be nice to prompt if not set!
+#. *  gaim_request_fields(gc, _("Server Address"),...);
+#.
+#. ...but for now just error out with a nice message.
+#: src/protocols/novell/novell.c:1560
+#, fuzzy
+msgid ""
+"Unable to connect to server. Please enter the address of the server you wish "
+"to connect to."
+msgstr "Vennligst skriv inn navnet på brukeren som du vil blokkere."
+
+#: src/protocols/novell/novell.c:1582
+#, fuzzy
+msgid "Error. SSL support is not installed."
+msgstr "SSL-støtte er nødvendig for MSN. Du må installere det."
+
+#: src/protocols/novell/novell.c:1846
+msgid "This conference has been closed. No more messages can be sent."
+msgstr ""
+
+#: src/protocols/novell/novell.c:2156 src/protocols/oscar/oscar.c:574
+#: src/protocols/oscar/oscar.c:5818 src/protocols/yahoo/yahoo.c:2297
+msgid "Offline"
+msgstr "Avlogget"
+
+#: src/protocols/novell/novell.c:2164
+#, fuzzy, c-format
+msgid ""
+"<b>Status:</b> %s\n"
+"<b>Message:</b> %s"
+msgstr "<b>Status:</b> %s%s%s"
+
+#: src/protocols/novell/novell.c:2168
+#, c-format
+msgid "<b>Status:</b> %s"
+msgstr "<b>Status:</b> %s"
+
+#: src/protocols/novell/novell.c:2264 src/protocols/novell/novell.c:2320
+#, fuzzy
+msgid "Appear Offline"
+msgstr "Avlogget"
 
 #. *< api_version
 #. *< type
@@ -6021,182 +6986,307 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/napster/napster.c:619 src/protocols/napster/napster.c:621
-msgid "NAPSTER Protocol Plugin"
-msgstr "Napster-protokolltillegg"
-
-#: src/protocols/oscar/oscar.c:179
+#. *  description
+#: src/protocols/novell/novell.c:2409 src/protocols/novell/novell.c:2411
+msgid "Novell GroupWise Messenger Protocol Plugin"
+msgstr ""
+
+#: src/protocols/novell/novell.c:2428
+#, fuzzy
+msgid "Server address"
+msgstr "Gateadresse"
+
+#: src/protocols/novell/novell.c:2432
+#, fuzzy
+msgid "Server port"
+msgstr "Tjener"
+
+#: src/protocols/oscar/oscar.c:182
 msgid "Invalid error"
 msgstr "Ugyldig feil"
 
-#: src/protocols/oscar/oscar.c:180
+#: src/protocols/oscar/oscar.c:183
 msgid "Invalid SNAC"
 msgstr "Ugyldig SNAC"
 
-#: src/protocols/oscar/oscar.c:181
+#: src/protocols/oscar/oscar.c:184
 msgid "Rate to host"
 msgstr "Hastighet til maskin"
 
-#: src/protocols/oscar/oscar.c:182
-msgid "Rate to client"
-msgstr "Hastighet til klient"
-
-#: src/protocols/oscar/oscar.c:184
-msgid "Service unavailable"
-msgstr "Tjenesten er ikke tilgjengelig"
-
 #: src/protocols/oscar/oscar.c:185
-msgid "Service not defined"
-msgstr "Tjenesten er ikke definert"
-
-#: src/protocols/oscar/oscar.c:186
-msgid "Obsolete SNAC"
-msgstr "Avlegs SNAC"
+msgid "Rate to client"
+msgstr "Hastighet til klient"
 
 #: src/protocols/oscar/oscar.c:187
-msgid "Not supported by host"
-msgstr "Ikke støttet av maskin"
+msgid "Service unavailable"
+msgstr "Tjenesten er ikke tilgjengelig"
 
 #: src/protocols/oscar/oscar.c:188
+msgid "Service not defined"
+msgstr "Tjenesten er ikke definert"
+
+#: src/protocols/oscar/oscar.c:189
+msgid "Obsolete SNAC"
+msgstr "Avlegs SNAC"
+
+#: src/protocols/oscar/oscar.c:190
+msgid "Not supported by host"
+msgstr "Ikke støttet av maskin"
+
+#: src/protocols/oscar/oscar.c:191
 msgid "Not supported by client"
 msgstr "Ikke støttet av klient"
 
-#: src/protocols/oscar/oscar.c:189
+#: src/protocols/oscar/oscar.c:192
 msgid "Refused by client"
 msgstr "Avvist av klient"
 
-#: src/protocols/oscar/oscar.c:190
+#: src/protocols/oscar/oscar.c:193
 msgid "Reply too big"
 msgstr "Svaret er for stort"
 
-#: src/protocols/oscar/oscar.c:191
+#: src/protocols/oscar/oscar.c:194
 msgid "Responses lost"
 msgstr "Svaret gikk tapt"
 
-#: src/protocols/oscar/oscar.c:192
+#: src/protocols/oscar/oscar.c:195
 msgid "Request denied"
 msgstr "Forespørsel avslått"
 
-#: src/protocols/oscar/oscar.c:193
+#: src/protocols/oscar/oscar.c:196
 msgid "Busted SNAC payload"
 msgstr "Innholdet i SNAC er ødelagt"
 
-#: src/protocols/oscar/oscar.c:194
+#: src/protocols/oscar/oscar.c:197
 msgid "Insufficient rights"
 msgstr "Ikke nok rettigheter"
 
-#: 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 "User temporarily unavailable"
-msgstr "Brukeren er midlertidig utilgjengelig"
+msgid "In local permit/deny"
+msgstr "I lokal tillat/nekt"
 
 #: src/protocols/oscar/oscar.c:199
-msgid "No match"
-msgstr "Ingen treff"
+msgid "Too evil (sender)"
+msgstr "Altfor ond (sender)"
 
 #: src/protocols/oscar/oscar.c:200
-msgid "List overflow"
-msgstr "List-overflyt"
+msgid "Too evil (receiver)"
+msgstr "Altfor ond (mottaker)"
 
 #: src/protocols/oscar/oscar.c:201
+msgid "User temporarily unavailable"
+msgstr "Brukeren er midlertidig utilgjengelig"
+
+#: src/protocols/oscar/oscar.c:202
+msgid "No match"
+msgstr "Ingen treff"
+
+#: src/protocols/oscar/oscar.c:203
+msgid "List overflow"
+msgstr "List-overflyt"
+
+#: src/protocols/oscar/oscar.c:204
 msgid "Request ambiguous"
 msgstr "Tvetydig forespørsel"
 
-#: src/protocols/oscar/oscar.c:202
+#: src/protocols/oscar/oscar.c:205
 msgid "Queue full"
 msgstr "Køen er full"
 
-#: src/protocols/oscar/oscar.c:203
+#: src/protocols/oscar/oscar.c:206
 msgid "Not while on AOL"
 msgstr "Ikke mens du er på AOL"
 
-#: src/protocols/oscar/oscar.c:475
+#: src/protocols/oscar/oscar.c:428
+msgid "Voice"
+msgstr "Lyd"
+
+#: src/protocols/oscar/oscar.c:431
+msgid "AIM Direct IM"
+msgstr "AIM direkte samtale"
+
+#: src/protocols/oscar/oscar.c:434
+msgid "Chat"
+msgstr "Samtale"
+
+#: src/protocols/oscar/oscar.c:437 src/protocols/oscar/oscar.c:6540
+msgid "Get File"
+msgstr "Laste ned fil"
+
+#: src/protocols/oscar/oscar.c:444
+msgid "Games"
+msgstr "Spill"
+
+#: src/protocols/oscar/oscar.c:447
+msgid "Add-Ins"
+msgstr "Tillegg"
+
+#: src/protocols/oscar/oscar.c:450
+msgid "Send Buddy List"
+msgstr "Sende kontaktliste"
+
+#: src/protocols/oscar/oscar.c:453
+msgid "ICQ Direct Connect"
+msgstr "ICQ direktekobling"
+
+#: src/protocols/oscar/oscar.c:456
+msgid "AP User"
+msgstr "AP-bruker"
+
+#: src/protocols/oscar/oscar.c:459
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+#: src/protocols/oscar/oscar.c:462
+msgid "Nihilist"
+msgstr "Nihilist"
+
+#: src/protocols/oscar/oscar.c:465
+msgid "ICQ Server Relay"
+msgstr "ICQ tjenervideresending"
+
+#: src/protocols/oscar/oscar.c:468
+msgid "Old ICQ UTF8"
+msgstr "Gammel ICQ UTF8"
+
+#: src/protocols/oscar/oscar.c:471
+msgid "Trillian Encryption"
+msgstr "Trillian-kryptering"
+
+#: src/protocols/oscar/oscar.c:474
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+#: src/protocols/oscar/oscar.c:477
+msgid "Hiptop"
+msgstr "Hiptop"
+
+#: src/protocols/oscar/oscar.c:480
+msgid "Security Enabled"
+msgstr "Sikkerhet slått på"
+
+#: src/protocols/oscar/oscar.c:483
+#, fuzzy
+msgid "Video Chat"
+msgstr "Legg til samtale"
+
+#: src/protocols/oscar/oscar.c:487
+#, fuzzy
+msgid "iChat AV"
+msgstr "Samtale"
+
+#: src/protocols/oscar/oscar.c:490
+msgid "Live Video"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:493
+#, fuzzy
+msgid "Camera"
+msgstr "Navn"
+
+#: src/protocols/oscar/oscar.c:512 src/protocols/oscar/oscar.c:4837
+#: src/protocols/oscar/oscar.c:6430
+msgid "Free For Chat"
+msgstr "Tilgjengelig for samtale"
+
+#: src/protocols/oscar/oscar.c:516 src/protocols/oscar/oscar.c:4831
+#: src/protocols/oscar/oscar.c:6428
+msgid "Not Available"
+msgstr "Ikke tilgjengelig"
+
+#: src/protocols/oscar/oscar.c:518 src/protocols/oscar/oscar.c:4834
+#: src/protocols/oscar/oscar.c:6429
+msgid "Occupied"
+msgstr "Opptatt"
+
+#: src/protocols/oscar/oscar.c:522
+msgid "Web Aware"
+msgstr "Web-oppmerksom"
+
+#: src/protocols/oscar/oscar.c:590
+#, fuzzy
+msgid "Capabilities"
+msgstr "<b>Evner:</b> "
+
+#: src/protocols/oscar/oscar.c:596
+#, fuzzy
+msgid "Buddy Comment"
+msgstr "Kontaktkommentar:"
+
+#: src/protocols/oscar/oscar.c:716
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Direkte samtale med %s stengt"
 
-#: src/protocols/oscar/oscar.c:477
+#: src/protocols/oscar/oscar.c:718
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "Direkte samtale med %s mislyktes"
 
-#: 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
+#: src/protocols/oscar/oscar.c:789 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:563
+#: src/protocols/oscar/oscar.c:805
 msgid "Chat is currently unavailable"
 msgstr "Samtalegrupper er for tiden utilgjengelig"
 
-#: src/protocols/oscar/oscar.c:634 src/protocols/oscar/oscar.c:690
+#: src/protocols/oscar/oscar.c:876 src/protocols/oscar/oscar.c:940
 msgid "Couldn't connect to host"
 msgstr "Kunne ikke koble til"
 
-#: src/protocols/oscar/oscar.c:644
+#: src/protocols/oscar/oscar.c:886
 msgid "Screen name sent"
 msgstr "Skjermnavn sendt"
 
-#: src/protocols/oscar/oscar.c:678
+#: src/protocols/oscar/oscar.c:900
+#, 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:928
 msgid "Unable to login to AIM"
 msgstr "Kunne ikke logge på AIM"
 
-#: src/protocols/oscar/oscar.c:779 src/protocols/oscar/oscar.c:1167
+#: src/protocols/oscar/oscar.c:1032 src/protocols/oscar/oscar.c:1450
 msgid "Could Not Connect"
 msgstr "Kunne ikke koble til"
 
-#: src/protocols/oscar/oscar.c:787
+#: src/protocols/oscar/oscar.c:1040
 msgid "Connection established, cookie sent"
 msgstr "Tilkoblet, informasjonskapsel sendt"
 
-#: 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
+#: src/protocols/oscar/oscar.c:1153 src/protocols/yahoo/yahoo_filexfer.c:209
+#: src/protocols/yahoo/yahoo_filexfer.c:218
+msgid "Unable to establish file descriptor."
+msgstr "Kunne ikke etablere fildeskriptor."
+
+#: src/protocols/oscar/oscar.c:1158
+msgid "Unable to create new connection."
+msgstr "Kunne ikke lage ny tilkobling."
+
+#: src/protocols/oscar/oscar.c:1229
 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:873
-msgid "Unable to create new connection."
-msgstr "Kunne ikke lage ny tilkobling."
-
-#: src/protocols/oscar/oscar.c:1053 src/protocols/toc/toc.c:571
+#: src/protocols/oscar/oscar.c:1334 src/protocols/toc/toc.c:571
 msgid "Incorrect nickname or password."
 msgstr "Feil kallenavn eller passord."
 
-#: src/protocols/oscar/oscar.c:1058
+#: src/protocols/oscar/oscar.c:1339
 msgid "Your account is currently suspended."
 msgstr "Kontoen din er frosset."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1062
+#: src/protocols/oscar/oscar.c:1343
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL Instant Messenger-tjenesten er midlertidig utilgjengelig."
 
-#: src/protocols/oscar/oscar.c:1067
+#: src/protocols/oscar/oscar.c:1348
 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."
@@ -6204,22 +7294,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:1072
+#: src/protocols/oscar/oscar.c:1353
 #, 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:1104
+#: src/protocols/oscar/oscar.c:1385
 msgid "Internal Error"
 msgstr "Intern feil"
 
-#: src/protocols/oscar/oscar.c:1174
+#: src/protocols/oscar/oscar.c:1457
 msgid "Received authorization"
 msgstr "Mottok godkjenning"
 
-#: src/protocols/oscar/oscar.c:1209 src/protocols/oscar/oscar.c:1239
-#: src/protocols/oscar/oscar.c:1327
+#: src/protocols/oscar/oscar.c:1493 src/protocols/oscar/oscar.c:1523
+#: src/protocols/oscar/oscar.c:1611
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -6228,29 +7318,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:1212 src/protocols/oscar/oscar.c:1242
+#: src/protocols/oscar/oscar.c:1496 src/protocols/oscar/oscar.c:1526
 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:1330
+#: src/protocols/oscar/oscar.c:1614
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim klarte ikke å motta en gyldig påloggingshash."
 
-#: src/protocols/oscar/oscar.c:1912 src/protocols/oscar/oscar.c:5641
+#: src/protocols/oscar/oscar.c:2196 src/protocols/oscar/oscar.c:5922
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Opprettet direkte samtale med %s"
 
-#: src/protocols/oscar/oscar.c:2241 src/protocols/oscar/oscar.c:2263
+#: src/protocols/oscar/oscar.c:2530 src/protocols/oscar/oscar.c:2552
 msgid "(There was an error receiving this message)"
 msgstr "(Det oppstod en feil i mottaket av denne beskjeden)"
 
-#: src/protocols/oscar/oscar.c:2410
+#: src/protocols/oscar/oscar.c:2713
 #, 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:2413
+#: src/protocols/oscar/oscar.c:2716
 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 "
@@ -6260,24 +7350,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:2418 src/protocols/oscar/oscar.c:6010
+#: src/protocols/oscar/oscar.c:2721 src/protocols/oscar/oscar.c:6304
 msgid "Connect"
 msgstr "Koble til"
 
-#: src/protocols/oscar/oscar.c:2445
+#: src/protocols/oscar/oscar.c:2750
 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:2453
+#: src/protocols/oscar/oscar.c:2758
 msgid "Authorization Request Message:"
 msgstr "Beskjed i godkjenningsforespørsel:"
 
-#: src/protocols/oscar/oscar.c:2454
+#: src/protocols/oscar/oscar.c:2759
 msgid "Please authorize me!"
 msgstr "Vennligst godkjenn meg!"
 
-#: src/protocols/oscar/oscar.c:2482
+#: src/protocols/oscar/oscar.c:2788
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -6286,23 +7376,23 @@
 "Brukeren %s krever godkjenning før vedkommende legges til i kontaktlisten. "
 "Vil du sende en godkjenningsforespørsel?"
 
-#: src/protocols/oscar/oscar.c:2487 src/protocols/oscar/oscar.c:2489
+#: src/protocols/oscar/oscar.c:2793 src/protocols/oscar/oscar.c:2795
 msgid "Request Authorization"
 msgstr "Spør om godkjenning"
 
-#: 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
+#: src/protocols/oscar/oscar.c:2831 src/protocols/oscar/oscar.c:2833
+#: src/protocols/oscar/oscar.c:2840 src/protocols/oscar/oscar.c:2922
+#: src/protocols/oscar/oscar.c:2942 src/protocols/oscar/oscar.c:3286
+#: src/protocols/oscar/oscar.c:3346 src/protocols/oscar/oscar.c:5443
+#: src/protocols/oscar/oscar.c:5489
 msgid "No reason given."
 msgstr "Ingen grunn spesifisert."
 
-#: src/protocols/oscar/oscar.c:2533
+#: src/protocols/oscar/oscar.c:2839
 msgid "Authorization Denied Message:"
 msgstr "Godkjenning nektet, grunn:"
 
-#: src/protocols/oscar/oscar.c:2610
+#: src/protocols/oscar/oscar.c:2922
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -6312,11 +7402,11 @@
 "grunn:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2618 src/protocols/oscar/oscar.c:5130
+#: src/protocols/oscar/oscar.c:2930 src/protocols/oscar/oscar.c:5449
 msgid "Authorization Request"
 msgstr "Godkjenningsforespørsel"
 
-#: src/protocols/oscar/oscar.c:2630
+#: src/protocols/oscar/oscar.c:2942
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -6327,19 +7417,19 @@
 "med følgende grunn:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2631
+#: src/protocols/oscar/oscar.c:2943
 msgid "ICQ authorization denied."
 msgstr "ICQ-godkjenning avslått."
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2638
+#: src/protocols/oscar/oscar.c:2950
 #, 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:2646
+#: src/protocols/oscar/oscar.c:2958
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -6352,7 +7442,7 @@
 "Fra: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2654
+#: src/protocols/oscar/oscar.c:2966
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -6365,7 +7455,7 @@
 "Fra: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2662
+#: src/protocols/oscar/oscar.c:2974
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -6378,34 +7468,34 @@
 "Beskjed:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2683
+#: src/protocols/oscar/oscar.c:2995
 #, 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:2689
+#: src/protocols/oscar/oscar.c:3001
 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:2693
+#: src/protocols/oscar/oscar.c:3005
 msgid "Decline"
 msgstr "Avslå"
 
-#: src/protocols/oscar/oscar.c:2775
+#: src/protocols/oscar/oscar.c:3090
 #, 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:2784
+#: src/protocols/oscar/oscar.c:3099
 #, 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:2793
+#: src/protocols/oscar/oscar.c:3108
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -6418,7 +7508,7 @@
 "Du har gått glipp av %hu beskjeder fra %s fordi hastighetsgrensen har blitt "
 "overskredet."
 
-#: src/protocols/oscar/oscar.c:2802
+#: src/protocols/oscar/oscar.c:3117
 #, 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."
@@ -6427,166 +7517,76 @@
 msgstr[1] ""
 "Du har gått glipp av %hu beskjeder fra %s fordi vedkommende var for ond."
 
-#: src/protocols/oscar/oscar.c:2811
+#: src/protocols/oscar/oscar.c:3126
 #, 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:2820
+#: src/protocols/oscar/oscar.c:3135
 #, 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: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:2840 src/protocols/oscar/oscar.c:4592
-#: src/protocols/oscar/oscar.c:6135
-msgid "Not Available"
-msgstr "Ikke tilgjengelig"
-
-#: 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:2846
-msgid "Web Aware"
-msgstr "Web-oppmerksom"
-
-#: src/protocols/oscar/oscar.c:2889
+#: src/protocols/oscar/oscar.c:3189
 #, 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:2948
+#: src/protocols/oscar/oscar.c:3248
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC-feil: %s\n"
 
+#: src/protocols/oscar/oscar.c:3249
+msgid "Unknown error"
+msgstr "Ukjent feil"
+
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:2984
+#: src/protocols/oscar/oscar.c:3284
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "Beskjeden din til %s ble ikke sendt:"
 
-#: src/protocols/oscar/oscar.c:3040
+#: src/protocols/oscar/oscar.c:3343
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "Brukerinformasjon for %s er ikke tilgjengelig:"
 
-#: src/protocols/oscar/oscar.c:3078
-msgid "Voice"
-msgstr "Lyd"
-
-#: src/protocols/oscar/oscar.c:3081
-msgid "AIM Direct IM"
-msgstr "AIM direkte samtale"
-
-#: src/protocols/oscar/oscar.c:3087 src/protocols/oscar/oscar.c:6236
-msgid "Get File"
-msgstr "Laste ned fil"
-
-#: 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:3097
-msgid "Add-Ins"
-msgstr "Tillegg"
-
-#: src/protocols/oscar/oscar.c:3100
-msgid "Send Buddy List"
-msgstr "Sende kontaktliste"
-
-#: src/protocols/oscar/oscar.c:3103
-msgid "ICQ Direct Connect"
-msgstr "ICQ direktekobling"
-
-#: src/protocols/oscar/oscar.c:3106
-msgid "AP User"
-msgstr "AP-bruker"
-
-#: src/protocols/oscar/oscar.c:3109
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-#: src/protocols/oscar/oscar.c:3112
-msgid "Nihilist"
-msgstr "Nihilist"
-
-#: src/protocols/oscar/oscar.c:3115
-msgid "ICQ Server Relay"
-msgstr "ICQ tjenervideresending"
-
-#: src/protocols/oscar/oscar.c:3118
-msgid "Old ICQ UTF8"
-msgstr "Gammel ICQ UTF8"
-
-#: src/protocols/oscar/oscar.c:3121
-msgid "Trillian Encryption"
-msgstr "Trillian-kryptering"
-
-#: src/protocols/oscar/oscar.c:3124
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-#: src/protocols/oscar/oscar.c:3127
-msgid "Hiptop"
-msgstr "Hiptop"
-
-#: src/protocols/oscar/oscar.c:3130
-msgid "Security Enabled"
-msgstr "Sikkerhet slått på"
-
-#: 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:3160
-#, c-format
-msgid "Warning Level: <b>%d%%</b><br>\n"
-msgstr "Advarselsnivå: <b>%d%%</b><br>\n"
-
-#: 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:3167
-#, c-format
-msgid "Member Since: <b>%s</b><br>\n"
-msgstr "Medlem siden: <b>%s</b><br>\n"
-
-#: src/protocols/oscar/oscar.c:3172
-#, c-format
-msgid "Idle: <b>%s</b>"
-msgstr "Inaktiv: <b>%s</b>"
-
-#: src/protocols/oscar/oscar.c:3175
-msgid "Idle: <b>Active</b>"
-msgstr "Inaktiv: <b>Ja</b>"
-
-#: src/protocols/oscar/oscar.c:3214
+#: src/protocols/oscar/oscar.c:3366
+#, fuzzy
+msgid "Warning Level"
+msgstr "Vis advarselsnivåer"
+
+#: src/protocols/oscar/oscar.c:3369
+#, fuzzy
+msgid "Online Since"
+msgstr "Pålogget siden"
+
+#: src/protocols/oscar/oscar.c:3373 src/protocols/yahoo/yahoo.c:3088
+msgid "Member Since"
+msgstr "Medlem siden"
+
+#: src/protocols/oscar/oscar.c:3455
 msgid "Your AIM connection may be lost."
 msgstr "AIM-tilkoblingen kan være brutt."
 
-#: src/protocols/oscar/oscar.c:3608
+#. The conversion failed!
+#: src/protocols/oscar/oscar.c:3641
+#, fuzzy
+msgid ""
+"[Unable to display a message from this user because it contained invalid "
+"characters.]"
+msgstr "Du har gått glipp av %hu beskjed fra %s fordi den var ugyldig."
+
+#: src/protocols/oscar/oscar.c:3859
 msgid "Rate limiting error."
 msgstr "Feil ved hastighetsbegrensning."
 
-#: src/protocols/oscar/oscar.c:3609
+#: src/protocols/oscar/oscar.c:3860
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -6594,116 +7594,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:3670
+#: src/protocols/oscar/oscar.c:3923
 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:3672
+#: src/protocols/oscar/oscar.c:3925
 msgid "You have been signed off for an unknown reason."
 msgstr "Du har blitt logget av, årsak ukjent."
 
-#: src/protocols/oscar/oscar.c:3703
+#: src/protocols/oscar/oscar.c:3956
 msgid "Finalizing connection"
 msgstr "Fullfører tilkobling"
 
-#: src/protocols/oscar/oscar.c:3963 src/protocols/oscar/oscar.c:3969
+#: src/protocols/oscar/oscar.c:4226 src/protocols/oscar/oscar.c:4233
 msgid "Email Address"
 msgstr "E-postadresse"
 
-#: src/protocols/oscar/oscar.c:3974
+#: src/protocols/oscar/oscar.c:4238
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: src/protocols/oscar/oscar.c:3977 src/protocols/trepia/trepia.c:281
-#: src/protocols/trepia/trepia.c:422
+#: src/protocols/oscar/oscar.c:4239 src/protocols/trepia/trepia.c:281
+#: src/protocols/trepia/trepia.c:407
 msgid "Female"
 msgstr "Hunkjønn"
 
-#: src/protocols/oscar/oscar.c:3977 src/protocols/trepia/trepia.c:280
-#: src/protocols/trepia/trepia.c:422
+#: src/protocols/oscar/oscar.c:4239 src/protocols/trepia/trepia.c:280
+#: src/protocols/trepia/trepia.c:407
 msgid "Male"
 msgstr "Hankjønn"
 
-#: src/protocols/oscar/oscar.c:3994
+#: src/protocols/oscar/oscar.c:4255
 msgid "Personal Web Page"
 msgstr "Personlig hjemmeside"
 
-#: src/protocols/oscar/oscar.c:3997
+#: src/protocols/oscar/oscar.c:4259
 msgid "Additional Information"
 msgstr "Tilleggsinformasjon"
 
-#: src/protocols/oscar/oscar.c:4001
+#: src/protocols/oscar/oscar.c:4264
 msgid "Home Address"
 msgstr "Hjemstedsadresse"
 
-#: src/protocols/oscar/oscar.c:4012 src/protocols/oscar/oscar.c:4028
+#: src/protocols/oscar/oscar.c:4268 src/protocols/oscar/oscar.c:4276
 msgid "Zip Code"
 msgstr "Postnummer"
 
-#: src/protocols/oscar/oscar.c:4017
+#: src/protocols/oscar/oscar.c:4272
 msgid "Work Address"
 msgstr "Arbeidsadresse"
 
-#: src/protocols/oscar/oscar.c:4033
+#: src/protocols/oscar/oscar.c:4280
 msgid "Work Information"
 msgstr "Arbeid ekstra info"
 
-#: src/protocols/oscar/oscar.c:4035
+#: src/protocols/oscar/oscar.c:4281
 msgid "Company"
 msgstr "Firma"
 
-#: src/protocols/oscar/oscar.c:4038
+#: src/protocols/oscar/oscar.c:4282
 msgid "Division"
 msgstr "Avdeling"
 
-#: src/protocols/oscar/oscar.c:4041
+#: src/protocols/oscar/oscar.c:4283
 msgid "Position"
 msgstr "Stilling"
 
-#: src/protocols/oscar/oscar.c:4044
+#: src/protocols/oscar/oscar.c:4285
 msgid "Web Page"
 msgstr "Hjemmeside"
 
-#: src/protocols/oscar/oscar.c:4050
+#: src/protocols/oscar/oscar.c:4291
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "ICQ-info for %s"
 
-#: src/protocols/oscar/oscar.c:4100
+#: src/protocols/oscar/oscar.c:4341
 msgid "Pop-Up Message"
 msgstr "Varslingsbeskjed"
 
-#: src/protocols/oscar/oscar.c:4121
-#, c-format
-msgid "The following screennames are associated with %s"
+#: src/protocols/oscar/oscar.c:4362
+#, fuzzy, c-format
+msgid "The following screen names are associated with %s"
 msgstr "De følgende skjermnavnene er assosierte med %s"
 
-#: src/protocols/oscar/oscar.c:4125
+#: src/protocols/oscar/oscar.c:4366
 msgid "Search Results"
 msgstr "Søkeresultater"
 
-#: src/protocols/oscar/oscar.c:4142
+#: src/protocols/oscar/oscar.c:4383
 #, c-format
 msgid "No results found for email address %s"
 msgstr "Ingen resultater funnet for e-postadresse %s"
 
-#: src/protocols/oscar/oscar.c:4163
+#: src/protocols/oscar/oscar.c:4404
 #, 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:4165
+#: src/protocols/oscar/oscar.c:4406
 msgid "Account Confirmation Requested"
 msgstr "Kontobekreftelse forespurt"
 
-#: src/protocols/oscar/oscar.c:4193
+#: src/protocols/oscar/oscar.c:4434
 msgid "Error Changing Account Info"
 msgstr "Feil ved endring av kontoinformasjon"
 
-#: src/protocols/oscar/oscar.c:4196
+#: src/protocols/oscar/oscar.c:4437
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -6712,7 +7712,7 @@
 "Feil 0x%04x: Kunne ikke formatere skjermnavnet fordi det forespurte "
 "skjermnavnet er forskjellig fra det opprinnelige."
 
-#: src/protocols/oscar/oscar.c:4199
+#: src/protocols/oscar/oscar.c:4440
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -6721,7 +7721,7 @@
 "Feil 0x%04x: Kunne ikke formatere skjermnavnet fordi det forespurte "
 "skjermnavnet slutter med et mellomrom."
 
-#: src/protocols/oscar/oscar.c:4202
+#: src/protocols/oscar/oscar.c:4443
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -6730,7 +7730,7 @@
 "Feil 0x%04x: Kunne ikke formatere skjermnavnet fordi det forespurte "
 "skjermnavnet er for langt."
 
-#: src/protocols/oscar/oscar.c:4205
+#: src/protocols/oscar/oscar.c:4446
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -6739,7 +7739,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:4208
+#: src/protocols/oscar/oscar.c:4449
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -6748,7 +7748,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:4211
+#: src/protocols/oscar/oscar.c:4452
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -6757,12 +7757,12 @@
 "Feil 0x%04x: Kunne ikke endre e-postadressen fordi den gitte adressen er "
 "ugyldig."
 
-#: src/protocols/oscar/oscar.c:4214
+#: src/protocols/oscar/oscar.c:4455
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Feil 0x%04x: Ukjent feil."
 
-#: src/protocols/oscar/oscar.c:4224
+#: src/protocols/oscar/oscar.c:4465
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -6771,20 +7771,20 @@
 "Skjermnavnet ditt er formatert slik:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4225 src/protocols/oscar/oscar.c:4232
+#: src/protocols/oscar/oscar.c:4466 src/protocols/oscar/oscar.c:4473
 msgid "Account Info"
 msgstr "Kontoinformasjon"
 
-#: src/protocols/oscar/oscar.c:4230
+#: src/protocols/oscar/oscar.c:4471
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "E-postadressen for %s er %s"
 
-#: src/protocols/oscar/oscar.c:4462
+#: src/protocols/oscar/oscar.c:4686
 msgid "Unable to set AIM profile."
 msgstr "Kunne ikke sette AIM-profil."
 
-#: src/protocols/oscar/oscar.c:4463
+#: src/protocols/oscar/oscar.c:4687
 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 "
@@ -6794,7 +7794,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:4490
+#: src/protocols/oscar/oscar.c:4714
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -6809,15 +7809,20 @@
 "Maksimum profillengde på %d bytes har blitt overskredet. Gaim har avkortet "
 "den før den ble lagret."
 
-#: src/protocols/oscar/oscar.c:4495
+#: src/protocols/oscar/oscar.c:4719
 msgid "Profile too long."
 msgstr "Profilen er for stor."
 
-#: src/protocols/oscar/oscar.c:4512
+#: src/protocols/oscar/oscar.c:4735 src/protocols/oscar/oscar.c:6435
+#, fuzzy
+msgid "Visible"
+msgstr "Usynlig"
+
+#: src/protocols/oscar/oscar.c:4753
 msgid "Unable to set AIM away message."
 msgstr "Kunne ikke sette fraværsbeskjed for AIM."
 
-#: src/protocols/oscar/oscar.c:4513
+#: src/protocols/oscar/oscar.c:4754
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -6827,7 +7832,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:4553
+#: src/protocols/oscar/oscar.c:4794
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -6842,15 +7847,28 @@
 "Maksimumslengden på %d bytes for fraværsbeskjeder har blitt overskredet. "
 "Gaim har avkortet den."
 
-#: src/protocols/oscar/oscar.c:4558
+#: src/protocols/oscar/oscar.c:4799
 msgid "Away message too long."
 msgstr "Fraværsbeskjeden er for lang."
 
-#: src/protocols/oscar/oscar.c:4772
+#: src/protocols/oscar/oscar.c:4892
+#, 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:4893 src/protocols/oscar/oscar.c:5310
+#: src/protocols/oscar/oscar.c:5323
+msgid "Unable To Add"
+msgstr "Kunne ikke legge til"
+
+#: src/protocols/oscar/oscar.c:5029
 msgid "Unable To Retrieve Buddy List"
 msgstr "Kunne ikke hente kontaktliste"
 
-#: src/protocols/oscar/oscar.c:4773
+#: src/protocols/oscar/oscar.c:5030
 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 "
@@ -6859,12 +7877,13 @@
 "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:4865 src/protocols/oscar/oscar.c:4866
-#: src/protocols/oscar/oscar.c:4871
+#: src/protocols/oscar/oscar.c:5206 src/protocols/oscar/oscar.c:5207
+#: src/protocols/oscar/oscar.c:5212 src/protocols/oscar/oscar.c:5367
+#: src/protocols/oscar/oscar.c:5368 src/protocols/oscar/oscar.c:5373
 msgid "Orphans"
 msgstr "Ugrupperte"
 
-#: src/protocols/oscar/oscar.c:5037
+#: src/protocols/oscar/oscar.c:5309
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -6873,15 +7892,11 @@
 "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:5037 src/protocols/oscar/oscar.c:5050
+#: src/protocols/oscar/oscar.c:5309 src/protocols/oscar/oscar.c:5322
 msgid "(no name)"
 msgstr "(uten navn)"
 
-#: 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
+#: src/protocols/oscar/oscar.c:5322
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -6892,7 +7907,7 @@
 "til dette er at du har nådd maksimalgrensen for antall kontakter i "
 "kontaktlisten din."
 
-#: src/protocols/oscar/oscar.c:5085
+#: src/protocols/oscar/oscar.c:5404
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -6901,11 +7916,11 @@
 "Brukeren %s har gitt deg tillatelse til å legge deg til i kontaktlisten sin. "
 "Ønsker du å legge til vedkommende?"
 
-#: src/protocols/oscar/oscar.c:5091
+#: src/protocols/oscar/oscar.c:5410
 msgid "Authorization Given"
 msgstr "Godkjent"
 
-#: src/protocols/oscar/oscar.c:5124
+#: src/protocols/oscar/oscar.c:5443
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -6915,19 +7930,19 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5166
+#: src/protocols/oscar/oscar.c:5485
 #, 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:5167
+#: src/protocols/oscar/oscar.c:5486
 msgid "Authorization Granted"
 msgstr "Godkjent"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5170
+#: src/protocols/oscar/oscar.c:5489
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -6938,56 +7953,35 @@
 "med følgende grun:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5171
+#: src/protocols/oscar/oscar.c:5490
 msgid "Authorization Denied"
 msgstr "Ikke godkjent"
 
-#: src/protocols/oscar/oscar.c:5208 src/protocols/toc/toc.c:1264
-msgid "Exchange:"
+#: src/protocols/oscar/oscar.c:5527 src/protocols/toc/toc.c:1264
+#, fuzzy
+msgid "_Exchange:"
 msgstr "Utveksling:"
 
-#: src/protocols/oscar/oscar.c:5445
-msgid "<b>Status:</b> "
-msgstr "<b>Status:</b> "
-
-#: 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:5474
-msgid "<b>Capabilities:</b> "
-msgstr "<b>Evner:</b> "
-
-#: src/protocols/oscar/oscar.c:5481
-msgid "<b>Available:</b> "
-msgstr "<b>Tilgjengelig:</b> "
-
-#: src/protocols/oscar/oscar.c:5499
-msgid "<b>Away Message:</b> "
-msgstr "<b>Fraværsbeskjed:</b> "
-
-#: src/protocols/oscar/oscar.c:5508
-msgid "<b>Status:</b> Not Authorized"
-msgstr "<b>Status:</b> Ikke godkjent"
-
-#: src/protocols/oscar/oscar.c:5542 src/protocols/yahoo/yahoo.c:2030
-msgid "Offline"
-msgstr "Avlogget"
-
-#: src/protocols/oscar/oscar.c:5990
+#: src/protocols/oscar/oscar.c:5549
+#, fuzzy
+msgid "Invalid chat name specified."
+msgstr "Ugyldig Gadu-Gadu UIN oppgitt"
+
+#: src/protocols/oscar/oscar.c:5790
+#, fuzzy
+msgid "Away Message"
+msgstr "Fraværsbeskjeder"
+
+#: src/protocols/oscar/oscar.c:6284
 msgid "Unable to open Direct IM"
 msgstr "Kunne ikke åpne direkte direktemelding"
 
-#: src/protocols/oscar/oscar.c:6003
+#: src/protocols/oscar/oscar.c:6297
 #, 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:6006
+#: src/protocols/oscar/oscar.c:6300
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -6995,117 +7989,140 @@
 "Dette vil avsløre din IP-adresse til mottakeren, og medføre en (minimal) "
 "sikkerhetsrisiko. Ønsker du å fortsette?"
 
-#: src/protocols/oscar/oscar.c:6181
+#: src/protocols/oscar/oscar.c:6485
 msgid "Buddy Comment:"
 msgstr "Kontaktkommentar:"
 
-#: src/protocols/oscar/oscar.c:6197
+#: src/protocols/oscar/oscar.c:6501
 msgid "Edit Buddy Comment"
 msgstr "Rediger kontaktkommentar"
 
-#: src/protocols/oscar/oscar.c:6205
+#: src/protocols/oscar/oscar.c:6509
 msgid "Get Status Msg"
 msgstr "Hent statusbeskjed"
 
-#: src/protocols/oscar/oscar.c:6220
+#: src/protocols/oscar/oscar.c:6524
 msgid "Direct IM"
 msgstr "Direkte samtale"
 
-#: src/protocols/oscar/oscar.c:6249
+#: src/protocols/oscar/oscar.c:6553
 msgid "Re-request Authorization"
 msgstr "Spør på nytt om godkjenning"
 
-#: src/protocols/oscar/oscar.c:6270
+#: src/protocols/oscar/oscar.c:6574
 msgid "The new formatting is invalid."
 msgstr "Den nye formateringen er ugyldig."
 
-#: src/protocols/oscar/oscar.c:6271
-msgid "Screenname formatting can change only capitalization and whitespace."
+#: src/protocols/oscar/oscar.c:6575
+#, fuzzy
+msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "Skjermnavn-formatering kan bare endre på store/små bokstaver og mellomrom."
 
-#: src/protocols/oscar/oscar.c:6277
-msgid "New screenname formatting:"
+#: src/protocols/oscar/oscar.c:6581
+#, fuzzy
+msgid "New screen name formatting:"
 msgstr "Ny skjermnavn-formatering:"
 
-#: src/protocols/oscar/oscar.c:6326
+#: src/protocols/oscar/oscar.c:6630
 msgid "Change Address To:"
 msgstr "Endre adresse til:"
 
-#: src/protocols/oscar/oscar.c:6370
+#: src/protocols/oscar/oscar.c:6674
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>du venter ikke på godkjenning</i>"
 
-#: src/protocols/oscar/oscar.c:6373
+#: src/protocols/oscar/oscar.c:6677
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Du venter på godkjenning fra disse kontaktene"
 
-#: src/protocols/oscar/oscar.c:6374
+#: src/protocols/oscar/oscar.c:6678
 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:6388
+"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:6692
 msgid "Find Buddy by E-mail"
 msgstr "Finn kontakt etter e-post"
 
-#: src/protocols/oscar/oscar.c:6389
+#: src/protocols/oscar/oscar.c:6693
 msgid "Search for a buddy by e-mail address"
 msgstr "Kontaktsøk etter e-postadresse"
 
-#: src/protocols/oscar/oscar.c:6390
+#: src/protocols/oscar/oscar.c:6694
 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:6393
-msgid "Search"
-msgstr "Søk"
-
-#: src/protocols/oscar/oscar.c:6407
+#: src/protocols/oscar/oscar.c:6711
 msgid "Available Message:"
 msgstr "Tilstedebeskjed:"
 
-#: src/protocols/oscar/oscar.c:6408
+#: src/protocols/oscar/oscar.c:6712
 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:6486
-msgid "Set Available Message"
+#: src/protocols/oscar/oscar.c:6788
+#, fuzzy
+msgid "Set User Info..."
+msgstr "Sett brukerinfo"
+
+#: src/protocols/oscar/oscar.c:6795
+#, fuzzy
+msgid "Set User Info (URL)..."
+msgstr "Sett brukerinfo"
+
+#: src/protocols/oscar/oscar.c:6803
+#, fuzzy
+msgid "Set Available Message..."
 msgstr "Sett tilstedebeskjed"
 
-#: src/protocols/oscar/oscar.c:6500
+#: src/protocols/oscar/oscar.c:6810
+#, fuzzy
+msgid "Change Password..."
+msgstr "Bytt passord"
+
+#: src/protocols/oscar/oscar.c:6817
 msgid "Change Password (URL)"
 msgstr "Endre passord (URL)"
 
-#: src/protocols/oscar/oscar.c:6508
+#: src/protocols/oscar/oscar.c:6825
 msgid "Configure IM Forwarding (URL)"
 msgstr "Konfigurer beskjedvideresending (URL)"
 
-#: src/protocols/oscar/oscar.c:6519
-msgid "Format Screenname"
+#: src/protocols/oscar/oscar.c:6836
+#, fuzzy
+msgid "Format Screen Name..."
 msgstr "Formatere skjermnavn"
 
-#: src/protocols/oscar/oscar.c:6525
+#: src/protocols/oscar/oscar.c:6842
 msgid "Confirm Account"
 msgstr "Bekrefte konto"
 
-#: src/protocols/oscar/oscar.c:6531
-msgid "Display Current Registered Address"
+#: src/protocols/oscar/oscar.c:6848
+#, fuzzy
+msgid "Display Currently Registered Address"
 msgstr "Vis registrert adresse"
 
-#: src/protocols/oscar/oscar.c:6537
-msgid "Change Current Registered Address"
+#: src/protocols/oscar/oscar.c:6854
+#, fuzzy
+msgid "Change Currently Registered Address..."
 msgstr "Endre registrert adresse"
 
-#: src/protocols/oscar/oscar.c:6546
+#: src/protocols/oscar/oscar.c:6863
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Vis kontakter som venter på godkjenning"
 
-#: src/protocols/oscar/oscar.c:6554
-msgid "Search for Buddy by Email"
+#: src/protocols/oscar/oscar.c:6871
+#, fuzzy
+msgid "Search for Buddy by Email..."
+msgstr "Kontaktsøk etter e-postadresse"
+
+#: src/protocols/oscar/oscar.c:6878
+#, fuzzy
+msgid "Search for Buddy by Information"
 msgstr "Kontaktsøk etter e-postadresse"
 
 #. *< api_version
@@ -7118,15 +8135,16 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/oscar/oscar.c:6675 src/protocols/oscar/oscar.c:6677
+#. *  description
+#: src/protocols/oscar/oscar.c:7002 src/protocols/oscar/oscar.c:7004
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ-protokolltillegg"
 
-#: src/protocols/oscar/oscar.c:6694
+#: src/protocols/oscar/oscar.c:7021
 msgid "Auth host"
 msgstr "Autentiseringsadresse:"
 
-#: src/protocols/oscar/oscar.c:6699
+#: src/protocols/oscar/oscar.c:7026
 msgid "Auth port"
 msgstr "Autentiseringsport:"
 
@@ -7299,18 +8317,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:1997
+#: src/protocols/toc/toc.c:1909 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"
@@ -7333,15 +8351,16 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/toc/toc.c:2159 src/protocols/toc/toc.c:2161
+#. *  description
+#: src/protocols/toc/toc.c:2168 src/protocols/toc/toc.c:2170
 msgid "TOC Protocol Plugin"
 msgstr "TOC-protokolltillegg"
 
-#: src/protocols/toc/toc.c:2178
+#: src/protocols/toc/toc.c:2187
 msgid "TOC host"
 msgstr "TOC-adresse:"
 
-#: src/protocols/toc/toc.c:2182
+#: src/protocols/toc/toc.c:2191
 msgid "TOC port"
 msgstr "TOC-port:"
 
@@ -7394,27 +8413,23 @@
 msgid "Set your Trepia profile data."
 msgstr "Skriv inn data i din Trepia-profil."
 
-#: src/protocols/trepia/trepia.c:468
+#: src/protocols/trepia/trepia.c:424
 msgid "Profile"
 msgstr "Profil"
 
-#: src/protocols/trepia/trepia.c:490
+#: src/protocols/trepia/trepia.c:439
 msgid "Set Profile"
 msgstr "Sett profil"
 
-#: src/protocols/trepia/trepia.c:526
+#: src/protocols/trepia/trepia.c:475
 msgid "Visit Homepage"
 msgstr "Besøk hjemmeside"
 
-#: src/protocols/trepia/trepia.c:872 src/protocols/trepia/trepia.c:875
+#: src/protocols/trepia/trepia.c:821 src/protocols/trepia/trepia.c:824
 msgid "Local Users"
 msgstr "Lokale brukere"
 
-#: src/protocols/trepia/trepia.c:972
-msgid "Read error"
-msgstr "Lesefeil"
-
-#: src/protocols/trepia/trepia.c:1073
+#: src/protocols/trepia/trepia.c:1027
 msgid "Logging in"
 msgstr "Logger på"
 
@@ -7428,50 +8443,66 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/trepia/trepia.c:1321 src/protocols/trepia/trepia.c:1323
+#. *  description
+#: src/protocols/trepia/trepia.c:1283 src/protocols/trepia/trepia.c:1285
 msgid "Trepia Protocol Plugin"
 msgstr "Trepia-protokolltillegg"
 
-#: src/protocols/yahoo/yahoo.c:700
+#: 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
 msgid "Your Yahoo! message did not get sent."
 msgstr "Din Yahoo!-beskjed ble ikke sendt."
 
-#: src/protocols/yahoo/yahoo.c:758
+#: 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
 #, 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:760
+"%s har (tilbakevirkende) avslått din forespørsel om å bli lagt til i "
+"kontaktlisten din."
+
+#: src/protocols/yahoo/yahoo.c:869
 #, 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:761
+"%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
 msgid "Add buddy rejected"
 msgstr "Legge til kontakt avslått"
 
-#: src/protocols/yahoo/yahoo.c:1381
+#: src/protocols/yahoo/yahoo.c:1599
 #, 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:1384
+"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:1602
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo!-autentisering feilet"
 
-#: src/protocols/yahoo/yahoo.c:1457
+#: src/protocols/yahoo/yahoo.c:1675
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -7480,139 +8511,160 @@
 "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:1460
+#: src/protocols/yahoo/yahoo.c:1678
 msgid "Ignore buddy?"
 msgstr "Ignorere kontakt?"
 
-#: src/protocols/yahoo/yahoo.c:1489
+#: src/protocols/yahoo/yahoo.c:1711
 msgid "Invalid username."
 msgstr "Ugyldig brukernavn,"
 
-#: src/protocols/yahoo/yahoo.c:1492
+#: src/protocols/yahoo/yahoo.c:1714
 msgid "Incorrect password."
 msgstr "Feil passord."
 
-#: src/protocols/yahoo/yahoo.c:1495
-msgid "Unknown error."
-msgstr "Ukjent feil."
-
-#: src/protocols/yahoo/yahoo.c:1542
+#: src/protocols/yahoo/yahoo.c:1717
+msgid "Your account is locked, please log in to the yahoo website."
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:1720
+#, fuzzy, c-format
+msgid "Unknown error number %d."
+msgstr "Ukjent feilkode %d"
+
+#: src/protocols/yahoo/yahoo.c:1777
 #, 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:1544
+msgstr ""
+"Kunne ikke legge til kontakt %s i gruppen %s i tjenerlisten på konto %s."
+
+#: src/protocols/yahoo/yahoo.c:1779
 msgid "Could not add buddy to server list"
 msgstr "Kunne ikke legge til kontakt i kontaktliste"
 
-#: src/protocols/yahoo/yahoo.c:1646 src/protocols/yahoo/yahoo.c:1776
+#: src/protocols/yahoo/yahoo.c:1889 src/protocols/yahoo/yahoo.c:2020
 msgid "Unable to read"
 msgstr "Kunne ikke lese"
 
-#: src/protocols/yahoo/yahoo.c:1801 src/protocols/yahoo/yahoo.c:1910
-#: src/protocols/yahoo/yahoo.c:1934
+#: src/protocols/yahoo/yahoo.c:2042 src/protocols/yahoo/yahoo.c:2152
+#: src/protocols/yahoo/yahoo.c:2195 src/protocols/yahoo/yahoochat.c:1360
+#: src/protocols/yahoo/yahoochat.c:1421
 msgid "Connection problem"
 msgstr "Problem ved tilkobling"
 
-#: src/protocols/yahoo/yahoo.c:2012 src/protocols/yahoo/yahoo.c:2310
-#: src/protocols/yahoo/yahoo.c:2408
+#: src/protocols/yahoo/yahoo.c:2279 src/protocols/yahoo/yahoo.c:2605
+#: src/protocols/yahoo/yahoo.c:2717
 msgid "Not At Home"
 msgstr "Ikke hjemme"
 
-#: src/protocols/yahoo/yahoo.c:2014 src/protocols/yahoo/yahoo.c:2312
-#: src/protocols/yahoo/yahoo.c:2409
+#: src/protocols/yahoo/yahoo.c:2281 src/protocols/yahoo/yahoo.c:2607
+#: src/protocols/yahoo/yahoo.c:2718
 msgid "Not At Desk"
 msgstr "Ikke ved skrivebordet"
 
-#: src/protocols/yahoo/yahoo.c:2016 src/protocols/yahoo/yahoo.c:2314
-#: src/protocols/yahoo/yahoo.c:2410
+#: src/protocols/yahoo/yahoo.c:2283 src/protocols/yahoo/yahoo.c:2609
+#: src/protocols/yahoo/yahoo.c:2719
 msgid "Not In Office"
 msgstr "Ikke på kontoret"
 
-#: src/protocols/yahoo/yahoo.c:2020 src/protocols/yahoo/yahoo.c:2318
-#: src/protocols/yahoo/yahoo.c:2412
+#: src/protocols/yahoo/yahoo.c:2287 src/protocols/yahoo/yahoo.c:2613
+#: src/protocols/yahoo/yahoo.c:2721
 msgid "On Vacation"
 msgstr "På ferie"
 
-#: src/protocols/yahoo/yahoo.c:2024 src/protocols/yahoo/yahoo.c:2322
-#: src/protocols/yahoo/yahoo.c:2414
+#: src/protocols/yahoo/yahoo.c:2291 src/protocols/yahoo/yahoo.c:2617
+#: src/protocols/yahoo/yahoo.c:2723
 msgid "Stepped Out"
 msgstr "Ute"
 
-#: src/protocols/yahoo/yahoo.c:2088 src/protocols/yahoo/yahoo.c:2122
+#: src/protocols/yahoo/yahoo.c:2355 src/protocols/yahoo/yahoo.c:2387
 msgid "Not on server list"
 msgstr "Ikke på tjenerlisten"
 
-#: src/protocols/yahoo/yahoo.c:2178
+#: src/protocols/yahoo/yahoo.c:2407
+#, fuzzy, c-format
+msgid ""
+"\n"
+"<b>%s:</b> %s"
+msgstr "<b>Status:</b> %s"
+
+#: src/protocols/yahoo/yahoo.c:2443
 msgid "Join in Chat"
 msgstr "Bli med i samtalegruppe"
 
-#: src/protocols/yahoo/yahoo.c:2184
+#: src/protocols/yahoo/yahoo.c:2449
 msgid "Initiate Conference"
 msgstr "Start konferanse"
 
-#: src/protocols/yahoo/yahoo.c:2230
+#: src/protocols/yahoo/yahoo.c:2502
 msgid "Active which ID?"
 msgstr "Aktiver hvilken ID?"
 
-#: src/protocols/yahoo/yahoo.c:2241
-msgid "Activate ID"
+#: src/protocols/yahoo/yahoo.c:2510
+#, fuzzy
+msgid "Join who in chat?"
+msgstr "Bli med i samtalegruppe"
+
+#: src/protocols/yahoo/yahoo.c:2521
+#, fuzzy
+msgid "Activate ID..."
 msgstr "Aktiver ID"
 
-#: src/protocols/yahoo/yahoo.c:2599
+#: src/protocols/yahoo/yahoo.c:2527
+#, fuzzy
+msgid "Join user in chat..."
+msgstr "Bli med i samtalegruppe..."
+
+#: src/protocols/yahoo/yahoo.c:2916
 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:2600 src/protocols/yahoo/yahoo.c:2620
+"<b>Beklager, profiler som er markert med vokseninnhold er ikke støttet.</"
+"b><br><br>\n"
+
+#: src/protocols/yahoo/yahoo.c:2917 src/protocols/yahoo/yahoo.c:2940
 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:2619
+"Hvis du ønsker å vise denne profilen, må du åpne denne lenken i en "
+"nettleser<br>"
+
+#: src/protocols/yahoo/yahoo.c:2939
 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:2664
+msgstr "<b>Beklager, ikke-engelske profiles støttes ikke ennå.</b><br><br>\n"
+
+#: src/protocols/yahoo/yahoo.c:2987 src/protocols/yahoo/yahoo.c:2988
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
 
-#: src/protocols/yahoo/yahoo.c:2724 src/protocols/yahoo/yahoo.c:2728
-#: src/protocols/yahoo/yahoo.c:2732
+#: src/protocols/yahoo/yahoo.c:3032 src/protocols/yahoo/yahoo.c:3035
+#: src/protocols/yahoo/yahoo.c:3038
 msgid "Hobbies"
 msgstr "Hobbyer"
 
-#: src/protocols/yahoo/yahoo.c:2743 src/protocols/yahoo/yahoo.c:2747
+#: src/protocols/yahoo/yahoo.c:3047 src/protocols/yahoo/yahoo.c:3050
 msgid "Latest News"
 msgstr "Siste nytt"
 
-#: src/protocols/yahoo/yahoo.c:2765
+#: src/protocols/yahoo/yahoo.c:3064
 msgid "Home Page"
 msgstr "Hjemmeside"
 
-#: src/protocols/yahoo/yahoo.c:2779
+#: src/protocols/yahoo/yahoo.c:3076
 msgid "Cool Link 1"
 msgstr "Kul lenke 1"
 
-#: src/protocols/yahoo/yahoo.c:2784
+#: src/protocols/yahoo/yahoo.c:3080
 msgid "Cool Link 2"
 msgstr "Kul lenke 2"
 
-#: src/protocols/yahoo/yahoo.c:2787
+#: src/protocols/yahoo/yahoo.c:3082
 msgid "Cool Link 3"
 msgstr "Kul lenke 3"
 
-#: src/protocols/yahoo/yahoo.c:2793
-msgid "Member Since"
-msgstr "Medlem siden"
-
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -7623,71 +8675,126 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/yahoo/yahoo.c:2958 src/protocols/yahoo/yahoo.c:2960
+#. *  description
+#: src/protocols/yahoo/yahoo.c:3295 src/protocols/yahoo/yahoo.c:3297
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo-protokolltillegg"
 
-#: src/protocols/yahoo/yahoo.c:2977
+#: src/protocols/yahoo/yahoo.c:3314
 msgid "Pager host"
 msgstr "Personsøker-adresse:"
 
-#: src/protocols/yahoo/yahoo.c:2982
+#: src/protocols/yahoo/yahoo.c:3317
 msgid "Pager port"
 msgstr "Personsøker-port:"
 
-#: src/protocols/yahoo/yahoochat.c:194
+#: src/protocols/yahoo/yahoo.c:3320
+#, fuzzy
+msgid "File transfer host"
+msgstr "Filoverføringer"
+
+#: src/protocols/yahoo/yahoo.c:3323
+#, fuzzy
+msgid "File transfer port"
+msgstr "Filoverføring avbrutt"
+
+#: src/protocols/yahoo/yahoo.c:3326
+#, 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
 #, 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:196
+#: src/protocols/yahoo/yahoochat.c:200
 msgid "Invitation Rejected"
 msgstr "Invitasjonen avslått"
 
-#: src/protocols/yahoo/yahoochat.c:333
+#: src/protocols/yahoo/yahoochat.c:350
 msgid "Failed to join chat"
 msgstr "Kunne ikke bli med i samtalegruppen"
 
-#: src/protocols/yahoo/yahoochat.c:333
+#: src/protocols/yahoo/yahoochat.c:350
 msgid "Maybe the room is full?"
 msgstr "Kanskje rommet er fullt?"
 
-#: src/protocols/yahoo/yahoochat.c:531
+#: 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
 msgid "Failed to join buddy in chat"
 msgstr "Kunne ikke bli med i samtalegruppen"
 
-#: src/protocols/yahoo/yahoochat.c:532
+#: src/protocols/yahoo/yahoochat.c:581
 msgid "Maybe they're not in a chat?"
 msgstr "Kanskje de ikke er i samtale?"
 
-#: src/protocols/zephyr/zephyr.c:344
+#: 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:557
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>Bruker:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:346
+#: src/protocols/zephyr/zephyr.c:559
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>Alias:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:348
+#: src/protocols/zephyr/zephyr.c:561
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>Gjemt eller ikke logget inn"
 
-#: src/protocols/zephyr/zephyr.c:352
+#: src/protocols/zephyr/zephyr.c:565
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>På %s siden %s"
 
-#: src/protocols/zephyr/zephyr.c:584 src/protocols/zephyr/zephyr.c:585
+#: src/protocols/zephyr/zephyr.c:831 src/protocols/zephyr/zephyr.c:832
 msgid "Anyone"
 msgstr "Alle"
 
-#: src/protocols/zephyr/zephyr.c:609
+#: src/protocols/zephyr/zephyr.c:858
 msgid "Already logged in with Zephyr"
 msgstr "Allerede innlogged med Zephyr"
 
-#: src/protocols/zephyr/zephyr.c:610
+#: src/protocols/zephyr/zephyr.c:858
 msgid ""
 "Because Zephyr uses your system username, you are unable to have multiple "
 "accounts on it when logged in as the same user."
@@ -7695,20 +8802,23 @@
 "Fordi Zephyr bruker systemets innloggingsnavn, kan du ikke ha flere kontoer "
 "så lenge du er innlogget med samme brukernavn."
 
-#: src/protocols/zephyr/zephyr.c:868
+#: src/protocols/zephyr/zephyr.c:1164
 msgid "ZLocate"
 msgstr "ZLocate"
 
-#: src/protocols/zephyr/zephyr.c:908
-msgid "Class:"
+#: src/protocols/zephyr/zephyr.c:1206
+#, fuzzy
+msgid "_Class:"
 msgstr "Klasse:"
 
-#: src/protocols/zephyr/zephyr.c:913
-msgid "Instance:"
+#: src/protocols/zephyr/zephyr.c:1212
+#, fuzzy
+msgid "_Instance:"
 msgstr "Instans:"
 
-#: src/protocols/zephyr/zephyr.c:918
-msgid "Recipient:"
+#: src/protocols/zephyr/zephyr.c:1218
+#, fuzzy
+msgid "_Recipient:"
 msgstr "Mottaker:"
 
 #. *< api_version
@@ -7721,59 +8831,111 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/zephyr/zephyr.c:1050 src/protocols/zephyr/zephyr.c:1052
+#. *  description
+#: src/protocols/zephyr/zephyr.c:1373 src/protocols/zephyr/zephyr.c:1375
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr-protokolltillegg"
 
-#: src/proxy.c:1681
+#: src/protocols/zephyr/zephyr.c:1392
+msgid "Export to .anyone"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:1395
+msgid "Export to .zephyr.subs"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:1398
+msgid "Exposure"
+msgstr ""
+
+#. Forbidden
+#: src/proxy.c:955
+msgid "Access denied: proxy server forbids port 80 tunnelling."
+msgstr ""
+
+#: src/proxy.c:957
+#, fuzzy, c-format
+msgid "Proxy connection error %d"
+msgstr "Feil ved tilkobling"
+
+#: src/proxy.c:1696
 msgid "Invalid proxy settings"
 msgstr "Ugyldige proxyinnstilinger"
 
-#: src/proxy.c:1681
+#: src/proxy.c:1696
 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:187
+#: src/prpl.h:195
 msgid "Custom"
 msgstr "Egendefinert"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:862
+#: src/request.h:1250
 msgid "Accept"
 msgstr "Godta"
 
-#: src/server.c:56
+#: src/server.c:58
 msgid "Please enter your password"
 msgstr "Skriv inn passord"
 
-#: src/server.c:948
+#: src/server.c:962
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "(%d beskjeder)"
 msgstr[1] "(%d beskjeder)"
 
-#: src/server.c:961
+#: src/server.c:976
 msgid "(1 message)"
 msgstr "(1 beskjed)"
 
-#: src/server.c:1142 src/server.c:1152
+#: src/server.c:1160 src/server.c:1170
 #, c-format
 msgid "%s logged in."
 msgstr "%s logget inn."
 
-#: src/server.c:1169 src/server.c:1177
+#: src/server.c:1184
+#, fuzzy, c-format
+msgid "%s signed on"
+msgstr "%s har logget på"
+
+#: src/server.c:1200
+#, fuzzy, c-format
+msgid "%s came back"
+msgstr "+++ %s (%s) kom tilbake @ %s"
+
+#: src/server.c:1202
+#, fuzzy, c-format
+msgid "%s went away"
+msgstr "%s er borte."
+
+#: src/server.c:1217
+#, fuzzy, c-format
+msgid "%s became idle"
+msgstr "%s har blitt inaktiv"
+
+#: src/server.c:1231
+#, fuzzy, c-format
+msgid "%s became unidle"
+msgstr "%s har blitt inaktiv"
+
+#: src/server.c:1244 src/server.c:1252
 #, c-format
 msgid "%s logged out."
 msgstr "%s logget ut."
 
-#: src/server.c:1224
+#: src/server.c:1267
+#, fuzzy, c-format
+msgid "%s signed off"
+msgstr "%s har logget av"
+
+#: src/server.c:1317
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -7782,11 +8944,11 @@
 "%s har blitt advart av %s.\n"
 "Ditt nye advarselsnivå er %d%%"
 
-#: src/server.c:1227
+#: src/server.c:1320
 msgid "an anonymous person"
 msgstr "en anonym person"
 
-#: src/server.c:1330
+#: src/server.c:1430
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -7795,70 +8957,313 @@
 "Brukeren '%s' inviterer %s til samtalerom: '%s'\n"
 "%s"
 
-#: src/server.c:1334
+#: src/server.c:1434
 #, 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:1340
+#: src/server.c:1440
 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:35
+#: src/status.c:36
 msgid "Sorry, I ran out for a bit!"
 msgstr "Borte litt, tilbake om en stund!"
 
-#: src/stock.c:84
+#: src/stock.c:86
+msgid "_Alias"
+msgstr "_Alias"
+
+#: src/stock.c:88
 msgid "_Modify"
 msgstr "_Endre"
 
-#: src/stock.c:85
+#: src/stock.c:89
 msgid "_Open Mail"
 msgstr "Åpne _e-post"
 
-#: src/util.c:1590
+#: src/stock.c:91
+msgid "_Warn"
+msgstr "Advar"
+
+#: src/util.c:2040
 msgid "Calculating..."
 msgstr "Beregner..."
 
-#: src/util.c:1593
+#: src/util.c:2043
 msgid "Unknown."
 msgstr "Ukjent."
 
-#: src/util.c:1624 src/util.c:1629 src/util.c:1634 src/util.c:1637
+#: src/util.c:2074 src/util.c:2079 src/util.c:2084 src/util.c:2087
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dag"
 msgstr[1] "dager"
 
-#: src/util.c:1625 src/util.c:1629 src/util.c:1643 src/util.c:1645
+#: src/util.c:2075 src/util.c:2079 src/util.c:2093 src/util.c:2095
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "time"
 msgstr[1] "timer"
 
-#: src/util.c:1625 src/util.c:1634 src/util.c:1643 src/util.c:1648
+#: src/util.c:2075 src/util.c:2084 src/util.c:2093 src/util.c:2098
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minutt"
 msgstr[1] "minutter"
 
-#: src/util.c:1980
+#: src/util.c:2430
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Feil ved tilkobling.\n"
 
-#: src/win32/win32dep.c:387
+#: 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
 msgid "Notification"
 msgstr "Varsling"
 
-#: 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"
+#~ 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 "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 "Could not open config file %s."
+#~ msgstr "Kunne ikke åpne konfigurasjonsfil %s."
+
+#~ 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 "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 "Invalid Parameter (probably a Gaim bug)"
+#~ msgstr "Ugyldig parameter (sannsynligvis en Gaim-bug)"
+
+#~ msgid "Invalid User"
+#~ msgstr "Ugyldig bruker"
+
+#~ msgid "Internal server error"
+#~ msgstr "Intern tjenerfeil"
+
+#~ 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 "Username: <b>%s</b><br>\n"
+#~ msgstr "Brukernavn: <b>%s</b><br>\n"
+
+#~ msgid "Warning Level: <b>%d%%</b><br>\n"
+#~ msgstr "Advarselsnivå: <b>%d%%</b><br>\n"
+
+#~ msgid "Online Since: <b>%s</b><br>\n"
+#~ msgstr "Pålogget siden: <b>%s</b><br>\n"
+
+#~ msgid "Member Since: <b>%s</b><br>\n"
+#~ msgstr "Medlem siden: <b>%s</b><br>\n"
+
+#~ msgid "Idle: <b>%s</b>"
+#~ msgstr "Inaktiv: <b>%s</b>"
+
+#~ msgid "Idle: <b>Active</b>"
+#~ msgstr "Inaktiv: <b>Ja</b>"
+
+#~ msgid "<b>Status:</b> "
+#~ msgstr "<b>Status:</b> "
+
+#~ msgid "<b>IP Address:</b> "
+#~ msgstr "<b>IP-adresse:</b> "
+
+#~ msgid "<b>Available:</b> "
+#~ msgstr "<b>Tilgjengelig:</b> "
+
+#~ msgid "<b>Away Message:</b> "
+#~ msgstr "<b>Fraværsbeskjed:</b> "
+
+#~ msgid "<b>Status:</b> Not Authorized"
+#~ msgstr "<b>Status:</b> Ikke godkjent"
+
+#~ msgid "Could not connect for transfer!"
+#~ msgstr "Kunne ikke koble til for dataoverføring!"
+
+#~ msgid "Unknown error."
+#~ msgstr "Ukjent feil."
 
 #~ msgid "Clear Log"
 #~ msgstr "Tøm logg"
@@ -7905,9 +9310,6 @@
 #~ msgid "+++ %s (%s) changed away state @ %s"
 #~ msgstr "+++ %s (%s) endret bortestatus @ %s"
 
-#~ msgid "+++ %s (%s) came back @ %s"
-#~ msgstr "+++ %s (%s) kom tilbake @ %s"
-
 #~ msgid "+++ %s (%s) became idle @ %s"
 #~ msgstr "+++ %s (%s) ble inaktiv @ %s"
 
@@ -8084,9 +9486,6 @@
 #~ msgid "First Name:"
 #~ msgstr "Fornavn:"
 
-#~ msgid "Last Name:"
-#~ msgstr "Etternavn:"
-
 #~ msgid "Gender:"
 #~ msgstr "Kjønn:"
 
@@ -8171,9 +9570,6 @@
 #~ 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"
 
@@ -8239,9 +9635,6 @@
 #~ msgid "DCC Chat with %s established"
 #~ msgstr "DCC-samtale med %s startet"
 
-#~ msgid "User"
-#~ msgstr "Bruker"
-
 #~ msgid "IRC Operator"
 #~ msgstr "IRC-operatør"
 
@@ -8254,9 +9647,6 @@
 #~ msgid "Rehashing server"
 #~ msgstr "Gjenleser data fra tjener"
 
-#~ msgid "IRC Error"
-#~ msgstr "IRC-feil"
-
 #~ msgid "No such server"
 #~ msgstr "Denne tjeneren finnes ikke"
 
@@ -8282,9 +9672,6 @@
 #~ "Dette gjør at en direktekobling mellom to datamaskiner blir opprettet. "
 #~ "Sendte beskjeder vil ikke gå gjennom IRC-tjeneren"
 
-#~ msgid "Received an invalid file send request from %s."
-#~ msgstr "Mottok en ugyldig filsendingsforespørsel fra %s."
-
 #~ msgid "CTCP ClientInfo"
 #~ msgstr "CTCP klientinfo"
 
@@ -8336,9 +9723,6 @@
 #~ msgid "User Identity"
 #~ msgstr "Brukerens identitet"
 
-#~ msgid "_Group:"
-#~ msgstr "Gruppe:"
-
 #~ msgid "Deny all users"
 #~ msgstr "Avvis alle brukere"
 
@@ -8387,9 +9771,6 @@
 #~ msgid "Send message:"
 #~ msgstr "Send beskjed:"
 
-#~ msgid "Rename Buddy"
-#~ msgstr "Endre kontaktnavn"
-
 #~ msgid "Unable to Save Preferences"
 #~ msgstr "Kunne ikke lagre innstillinger"
 
@@ -8418,9 +9799,6 @@
 #~ msgid "_Login"
 #~ msgstr "Innlogging"
 
-#~ msgid "_Password"
-#~ msgstr "Passord"
-
 #~ msgid "TOC not found."
 #~ msgstr "TOC ikke funnet."
 
@@ -8530,12 +9908,6 @@
 #~ 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"
 
@@ -8548,9 +9920,6 @@
 #~ msgid "Gaim Chat"
 #~ msgstr "Gaim Samtale"
 
-#~ msgid "Chat Rooms"
-#~ msgstr "Samtalerom"
-
 #~ msgid "Refresh"
 #~ msgstr "Gjenoppfrisk"
 
@@ -8560,9 +9929,6 @@
 #~ 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."
 
@@ -8576,9 +9942,6 @@
 #~ msgid "Gadu-Gadu User"
 #~ msgstr "Gadu-Gadu-bruker"
 
-#~ msgid "<b>Status:</b> %s%s%s"
-#~ msgstr "<b>Status:</b> %s%s%s"
-
 #~ msgid "User unverified"
 #~ msgstr "Bruker er ikke verifisert"