diff po/nb.po @ 11762:81e26b7f262e

[gaim-migrate @ 14053] I feel like committing make dist'ed po files is a good thing at this point in time committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Sun, 23 Oct 2005 21:06:17 +0000
parents 4be6232ffcd3
children f244cd5647af
line wrap: on
line diff
--- a/po/nb.po	Sun Oct 23 20:43:02 2005 +0000
+++ b/po/nb.po	Sun Oct 23 21:06:17 2005 +0000
@@ -16,7 +16,7 @@
 msgstr ""
 "Project-Id-Version: nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-10 16:02-0400\n"
+"POT-Creation-Date: 2005-10-23 16:42-0400\n"
 "PO-Revision-Date: 2005-06-08 15:51+0200\n"
 "Last-Translator: Kyrre Ness Sjobak <kyrre@solution-forge.net>\n"
 "Language-Team: Norsk bokmål <no@li.org>\n"
@@ -26,21 +26,22 @@
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: KBabel 1.3.1\n"
 
-#: plugins/autorecon.c:240
+#: plugins/autorecon.c:301
 msgid "Error Message Suppression"
 msgstr "Undertrykking av feilmeldinger"
 
-#: plugins/autorecon.c:244
+#: plugins/autorecon.c:305
 msgid "Hide Disconnect Errors"
 msgstr "Skjul frakoblingsfeil"
 
-#: plugins/autorecon.c:248
+#: plugins/autorecon.c:309
 msgid "Hide Login Errors"
 msgstr "Skjul påloggningsfeil"
 
-#: plugins/autorecon.c:252
-msgid "Restore Away State On Reconnect"
-msgstr "Fortsett som fraværende etter at forbindelsen har blitt gjennoprettet"
+#: plugins/autorecon.c:313
+#, fuzzy
+msgid "Hide Reconnecting Dialog"
+msgstr "Skjul frakoblingsfeil"
 
 #. *< type
 #. *< ui_requirement
@@ -48,7 +49,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:276
+#: plugins/autorecon.c:337
 msgid "Auto-Reconnect"
 msgstr "Automatisk tilkobling ved brudd"
 
@@ -56,28 +57,11 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/autorecon.c:279 plugins/autorecon.c:281
+#: plugins/autorecon.c:340 plugins/autorecon.c:342
 msgid "When you are kicked offline, this reconnects you."
 msgstr ""
 "Dette tillegget vil koble deg til på nytt dersom du mister forbindelsen."
 
-#: plugins/chkmail.c:94 plugins/chkmail.c:117 plugins/chkmail.c:126
-msgid "Mail Server"
-msgstr "E-posttjener"
-
-#: plugins/chkmail.c:136
-#, c-format
-msgid "%s (%d new/%d total)"
-msgstr "%s (%d nye/%d totalt)"
-
-#: plugins/chkmail.c:199
-msgid "Check Mail"
-msgstr "Sjekk e-post"
-
-#: plugins/chkmail.c:203
-msgid "Check email every X seconds.\n"
-msgstr "Sjekk e-post hvert Xte sekund.\n"
-
 #: plugins/contact_priority.c:84
 msgid "Point values to use when..."
 msgstr "Verdier for bruk når..."
@@ -100,12 +84,13 @@
 
 #. Explanation
 #: plugins/contact_priority.c:141
+#, fuzzy
 msgid ""
 "The buddy with the lowest score is the buddy who will have priority in the "
 "contact.\n"
-"The default values (offline = 4,away = 2, and idle = 1)\n"
-"will use what used to be the built-in order active->idle->away->away+idle-"
-">offline."
+"The default values (offline = 4, away = 2, and idle = 1) will use what used "
+"to be\n"
+"the built-in order: active, idle, away, away + idle, offline."
 msgstr ""
 "Kompisen med den laveste verdien er den som er prioritert i kontakten.\n"
 "Standardverdiene (frakoblet = 4, fraværende = 2, og ingen aktivitet = 1)\n"
@@ -114,7 +99,8 @@
 "ikke pålogget."
 
 #: plugins/contact_priority.c:144
-msgid "Point values to use for Account..."
+#, fuzzy
+msgid "Point values to use for account..."
 msgstr "Verdier til bruk for konto..."
 
 #. *< type
@@ -145,103 +131,6 @@
 "Lar deg endre vektingen for inaktiv/borte/avlogget for kontakter i "
 "kontaktprioritetsutregninger."
 
-#: plugins/docklet/docklet.c:137 src/gtkaccount.c:751 src/gtkaccount.c:2179
-msgid "Auto-login"
-msgstr "Automatisk pålogging"
-
-#
-#: plugins/docklet/docklet.c:140
-msgid "New Message..."
-msgstr "Ny melding..."
-
-#: plugins/docklet/docklet.c:141
-msgid "Join A Chat..."
-msgstr "Bli med i samtalegruppe..."
-
-#: plugins/docklet/docklet.c:173
-msgid "New..."
-msgstr "Ny..."
-
-#: plugins/docklet/docklet.c:177 src/gtkprefs.c:1813 src/protocols/gg/gg.c:52
-#: src/protocols/irc/msgs.c:227 src/protocols/jabber/jabber.c:998
-#: src/protocols/jabber/jutil.c:32 src/protocols/jabber/presence.c:69
-#: src/protocols/jabber/presence.c:132 src/protocols/novell/novell.c:2800
-#: src/protocols/novell/novell.c:2917 src/protocols/novell/novell.c:2969
-#: src/protocols/oscar/oscar.c:684 src/protocols/oscar/oscar.c:5788
-#: src/protocols/oscar/oscar.c:6785 src/protocols/oscar/oscar.c:6985
-#: src/protocols/silc/buddy.c:1388 src/protocols/silc/silc.c:47
-#: src/protocols/silc/silc.c:81
-msgid "Away"
-msgstr "Borte"
-
-#. else...
-#: plugins/docklet/docklet.c:183 src/away.c:595
-#: src/protocols/oscar/oscar.c:5706 src/protocols/oscar/oscar.c:6993
-msgid "Back"
-msgstr "Tilbake"
-
-#: plugins/docklet/docklet.c:191
-msgid "Mute Sounds"
-msgstr "Skru av lyder"
-
-#: plugins/docklet/docklet.c:196 src/gtkft.c:659
-msgid "File Transfers"
-msgstr "Filoverføringer"
-
-#: plugins/docklet/docklet.c:197 src/gtkaccount.c:2391
-msgid "Accounts"
-msgstr "Kontoer"
-
-#: plugins/docklet/docklet.c:198 src/gtkprefs.c:2514
-msgid "Preferences"
-msgstr "Innstillinger"
-
-#: plugins/docklet/docklet.c:207
-msgid "Signoff"
-msgstr "Logge av"
-
-#: plugins/docklet/docklet.c:211
-msgid "Quit"
-msgstr "Avslutt"
-
-#: plugins/docklet/docklet.c:527
-msgid "Tray Icon Configuration"
-msgstr "Innstillinger for trayikon"
-
-#: plugins/docklet/docklet.c:531
-msgid "_Hide new messages until tray icon is clicked"
-msgstr "Skjul nye beskjeder inntil trayikon klikkes"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/docklet/docklet.c:557
-msgid "System Tray Icon"
-msgstr "System-trayikon"
-
-#. *< name
-#. *< version
-#. *  summary
-#: plugins/docklet/docklet.c:560
-msgid "Displays an icon for Gaim in the system tray."
-msgstr "Viser et ikon for gaim i systemtray."
-
-#. *  description
-#: plugins/docklet/docklet.c:562
-msgid ""
-"Displays a system tray icon (in GNOME, KDE or Windows for example) to show "
-"the current status of Gaim, allow fast access to commonly used functions, "
-"and to toggle display of the buddy list or login window. Also allows "
-"messages to be queued until the icon is clicked, similar to ICQ."
-msgstr ""
-"Bruker et beskjedvarslings-applet (f.eks. i GNOME eller KDE) for å vise "
-"Gaims status, gi hurtig tilgang til ofte brukte funksjoner, og for å fjerne/"
-"vise kontaktlisten og påloggingsvinduet. Muliggjør også kølegging av "
-"beskjeder helt til ikonet klikkes, a la ICQ."
-
 #.
 #. *  DEFINES, MACROS & DATA TYPES
 #.
@@ -257,28 +146,87 @@
 msgid "Gaim - Away"
 msgstr "Gaim - Borte"
 
-#: plugins/docklet/eggtrayicon.c:122
-#, fuzzy
-msgid "Orientation"
-msgstr "Organisasjon"
-
-#: plugins/docklet/eggtrayicon.c:123
-msgid "The orientation of the tray."
-msgstr ""
-
-#: plugins/extplacement.c:77
+#: plugins/docklet/docklet.c:383
+#, fuzzy
+msgid "Show Buddy List"
+msgstr "Kontaktliste"
+
+#
+#: plugins/docklet/docklet.c:390
+msgid "New Message..."
+msgstr "Ny melding..."
+
+#: plugins/docklet/docklet.c:394
+msgid "Join A Chat..."
+msgstr "Bli med i samtalegruppe..."
+
+#: plugins/docklet/docklet.c:399
+msgid "Mute Sounds"
+msgstr "Skru av lyder"
+
+#: plugins/docklet/docklet.c:406 src/gtkft.c:691
+#: src/protocols/oscar/oscar.c:8351
+msgid "File Transfers"
+msgstr "Filoverføringer"
+
+#: plugins/docklet/docklet.c:407 src/gtkaccount.c:2406
+msgid "Accounts"
+msgstr "Kontoer"
+
+#: plugins/docklet/docklet.c:408 src/gtkprefs.c:1792
+msgid "Preferences"
+msgstr "Innstillinger"
+
+#. TODO: need a submenu to change status, this needs to "link"
+#. * to the status in the buddy list gtkstatusbox
+#.
+#: plugins/docklet/docklet.c:416
+msgid "Quit"
+msgstr "Avslutt"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/docklet/docklet.c:556
+msgid "System Tray Icon"
+msgstr "System-trayikon"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/docklet/docklet.c:559
+msgid "Displays an icon for Gaim in the system tray."
+msgstr "Viser et ikon for gaim i systemtray."
+
+#. *  description
+#: plugins/docklet/docklet.c:561
+msgid ""
+"Displays a system tray icon (in GNOME, KDE or Windows for example) to show "
+"the current status of Gaim, allow fast access to commonly used functions, "
+"and to toggle display of the buddy list or login window. Also allows "
+"messages to be queued until the icon is clicked, similar to ICQ."
+msgstr ""
+"Bruker et beskjedvarslings-applet (f.eks. i GNOME eller KDE) for å vise "
+"Gaims status, gi hurtig tilgang til ofte brukte funksjoner, og for å fjerne/"
+"vise kontaktlisten og påloggingsvinduet. Muliggjør også kølegging av "
+"beskjeder helt til ikonet klikkes, a la ICQ."
+
+#: plugins/extplacement.c:79
 msgid "By conversation count"
 msgstr "Etter samtaleantall"
 
-#: plugins/extplacement.c:98
+#: plugins/extplacement.c:100
 msgid "Conversation Placement"
 msgstr "Samtaleplassering"
 
-#: plugins/extplacement.c:103
+#: plugins/extplacement.c:105
 msgid "Number of conversations per window"
 msgstr "Antall samtaler per vindu"
 
-#: plugins/extplacement.c:109
+#: plugins/extplacement.c:111
 msgid "Separate IM and Chat windows when placing by number"
 msgstr ""
 "Separere direktemeldings- og chattevinduer når programet plasserer etter "
@@ -290,19 +238,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/extplacement.c:130
+#: plugins/extplacement.c:132
 msgid "ExtPlacement"
 msgstr "ExtPlacement"
 
 #. *< name
 #. *< version
-#: plugins/extplacement.c:132
+#: plugins/extplacement.c:134
 msgid "Extra conversation placement options."
 msgstr "Flere plasseringsmuligheter for samtaler"
 
 #. *< summary
 #. *  description
-#: plugins/extplacement.c:134
+#: plugins/extplacement.c:136
 msgid ""
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
@@ -316,7 +264,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/filectl.c:224
+#: plugins/filectl.c:245
 msgid "Gaim File Control"
 msgstr "Styre Gaim fra kontrollfil"
 
@@ -324,7 +272,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/filectl.c:227 plugins/filectl.c:229
+#: plugins/filectl.c:248 plugins/filectl.c:250
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr "Lar deg kontrollere Gaim ved å skrive inn kommandoer i en fil."
 
@@ -334,19 +282,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaiminc.c:90
+#: plugins/gaiminc.c:91
 msgid "Gaim Demonstration Plugin"
 msgstr "Gaim eksempeltillegg"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaiminc.c:93
+#: plugins/gaiminc.c:94
 msgid "An example plugin that does stuff - see the description."
 msgstr "Et eksempeltillegg som gjør noe - se beskrivelsen."
 
 #. *  description
-#: plugins/gaiminc.c:95
+#: plugins/gaiminc.c:96
 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"
@@ -358,76 +306,102 @@
 "- Det reverserer all tekst som du mottar\n"
 "- Det sender en beskjed til kontaktene i kontaktlisten straks de logger på"
 
-#: plugins/gaim-remote/remote.c:91
-msgid "Not connected to AIM"
-msgstr "Ikke tilkoblet til AIM"
-
-#: plugins/gaim-remote/remote.c:100 plugins/gaim-remote/remote.c:139
-msgid "No screenname given."
-msgstr "Skjermnavn ikke oppgitt."
-
-#: plugins/gaim-remote/remote.c:176
-msgid "No roomname given."
-msgstr "Romnavn ikke oppgitt."
-
-#: plugins/gaim-remote/remote.c:195
-msgid "Invalid AIM URI"
-msgstr "Ugyldig AIM URI"
-
-#: plugins/gaim-remote/remote.c:673
-#, c-format
-msgid ""
-"Failed to assign %s to a socket:\n"
-"%s"
-msgstr ""
-"Klarte ikke tilordne %s til en socket:\n"
-"%s"
-
-#: plugins/gaim-remote/remote.c:697
-msgid "Unable to open socket"
-msgstr "Klartie ikke åpne socket"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/gaim-remote/remote.c:747
-msgid "Remote Control"
+#: plugins/gaimrc.c:40
+msgid "Cursor Color"
+msgstr ""
+
+#: plugins/gaimrc.c:41
+msgid "Secondary Cursor Color"
+msgstr ""
+
+#: plugins/gaimrc.c:42
+#, fuzzy
+msgid "Hyperlink Color"
+msgstr "Farge på lenke"
+
+#: plugins/gaimrc.c:53
+#, fuzzy
+msgid "GtkTreeView Expander Size"
+msgstr "Utvider-størrelse"
+
+#: plugins/gaimrc.c:72
+#, fuzzy
+msgid "Conversation Entry"
+msgstr "Samtaler"
+
+#: plugins/gaimrc.c:73
+#, fuzzy
+msgid "Conversation History"
+msgstr "Samtaler"
+
+#: plugins/gaimrc.c:74
+#, fuzzy
+msgid "Log Viewer"
+msgstr "Påloggingstjener"
+
+#: plugins/gaimrc.c:75
+#, fuzzy
+msgid "Request Dialog"
+msgstr "Tvetydig forespørsel"
+
+#: plugins/gaimrc.c:76
+#, fuzzy
+msgid "Notify Dialog"
+msgstr "Bruk varsling for"
+
+#: plugins/gaimrc.c:209
+#, fuzzy, c-format
+msgid "Select Color for %s"
+msgstr "Velg tekstfarge"
+
+#: plugins/gaimrc.c:211
+#, fuzzy
+msgid "Select Color"
+msgstr "Velg tekstfarge"
+
+#: plugins/gaimrc.c:246
+#, fuzzy, c-format
+msgid "Select Font for %s"
+msgstr "Velg skrifttype"
+
+#: plugins/gaimrc.c:284
+#, fuzzy
+msgid "Select Interface Font"
+msgstr "Velg skrifttype"
+
+#: plugins/gaimrc.c:343
+#, fuzzy
+msgid "GTK+ Interface Font"
+msgstr "Valg for grensesnitt"
+
+#: plugins/gaimrc.c:362
+msgid "GTK+ Text Shortcut Theme"
+msgstr ""
+
+#: plugins/gaimrc.c:460
+#, fuzzy
+msgid "Gaim GTK+ Theme Control"
 msgstr "Styre Gaim fra kontrollfil"
 
-#. *< name
-#. *< version
-#. *  summary
-#: plugins/gaim-remote/remote.c:750
-msgid "Provides remote control for gaim applications."
-msgstr "Muliggjør fjernstyring for Gaim-applikasjoner."
-
-#. *  description
-#: plugins/gaim-remote/remote.c:752
-msgid ""
-"Gives Gaim the ability to be remote-controlled through third-party "
-"applications or through the gaim-remote tool."
-msgstr ""
-"Lar Gaim bli kontrollert fra tredjeparts-applikasjoner eller gjennom "
-"verktøyet gaim-remote."
+#: plugins/gaimrc.c:462 plugins/gaimrc.c:463
+msgid "Provides access to commonly used gtkrc settings."
+msgstr ""
 
 #. Configuration frame
-#: plugins/gestures/gestures.c:221
+#: plugins/gestures/gestures.c:243
 msgid "Mouse Gestures Configuration"
 msgstr "Innstillinger for musbevegelser"
 
-#: plugins/gestures/gestures.c:228
+#: plugins/gestures/gestures.c:250
 msgid "Middle mouse button"
 msgstr "Midterste musknapp"
 
-#: plugins/gestures/gestures.c:233
+#: plugins/gestures/gestures.c:255
 msgid "Right mouse button"
 msgstr "Høyre musknapp"
 
 #. "Visual gesture display" checkbox
-#: plugins/gestures/gestures.c:245
+#: plugins/gestures/gestures.c:267
 msgid "_Visual gesture display"
 msgstr "Visuell tilbakemelding når du gjør musbevegelser"
 
@@ -437,19 +411,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gestures/gestures.c:274
+#: plugins/gestures/gestures.c:296
 msgid "Mouse Gestures"
 msgstr "Musbevegelser"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gestures/gestures.c:277
+#: plugins/gestures/gestures.c:299
 msgid "Provides support for mouse gestures"
 msgstr "Lar deg bruke musbevegelser"
 
 #. *  description
-#: plugins/gestures/gestures.c:279
+#: plugins/gestures/gestures.c:301
 msgid ""
 "Allows support for mouse gestures in conversation windows.\n"
 "Drag the middle mouse button to perform certain actions:\n"
@@ -466,9 +440,8 @@
 "Dra opp og deretter til høyre for å bytte til det neste samtalevinduet."
 
 #: plugins/gevolution/add_buddy_dialog.c:132
-#: plugins/gevolution/assoc-buddy.c:120 src/gtkprefs.c:2168
-#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:609
-#: src/protocols/msn/msn.c:1474 src/protocols/trepia/trepia.c:399
+#: plugins/gevolution/assoc-buddy.c:120 src/gtkroomlist.c:572
+#: src/protocols/jabber/jabber.c:638 src/protocols/msn/msn.c:1539
 msgid "Name"
 msgstr "Navn"
 
@@ -478,32 +451,33 @@
 msgstr "Direktemelding"
 
 #. Add the label.
-#: plugins/gevolution/add_buddy_dialog.c:455
+#: plugins/gevolution/add_buddy_dialog.c:459
 msgid "Select a person from your address book below, or add a new person."
 msgstr ""
 "Velg en person fra adresseboken som er vist under, eller legg til en ny "
 "person"
 
 #. "Search"
-#: plugins/gevolution/add_buddy_dialog.c:468
-#: plugins/gevolution/assoc-buddy.c:354 src/protocols/oscar/oscar.c:7269
+#: plugins/gevolution/add_buddy_dialog.c:472
+#: plugins/gevolution/assoc-buddy.c:354 src/protocols/jabber/buddy.c:1357
+#: src/protocols/oscar/oscar.c:8122
 msgid "Search"
 msgstr "Søk"
 
-#: plugins/gevolution/add_buddy_dialog.c:549
-#: plugins/gevolution/new_person_dialog.c:304 src/gtkblist.c:4186
-#: src/gtkblist.c:4534
+#: plugins/gevolution/add_buddy_dialog.c:553
+#: plugins/gevolution/new_person_dialog.c:306 src/gtkblist.c:4069
+#: src/gtkblist.c:4446
 msgid "Group:"
 msgstr "Gruppe:"
 
 #. "New Person" button
-#: plugins/gevolution/add_buddy_dialog.c:575
-#: plugins/gevolution/assoc-buddy.c:466
+#: plugins/gevolution/add_buddy_dialog.c:579
+#: plugins/gevolution/assoc-buddy.c:465
 msgid "New Person"
 msgstr "Ny person"
 
 #. "Select Buddy" button
-#: plugins/gevolution/add_buddy_dialog.c:592
+#: plugins/gevolution/add_buddy_dialog.c:596
 msgid "Select Buddy"
 msgstr "Velg kompis"
 
@@ -516,49 +490,58 @@
 "Velg en person fra adresseboka for å legge til denne kontakten, eller lag en "
 "ny kontakt."
 
-#. Add the disclosure
+#. Add the expander
 #: plugins/gevolution/assoc-buddy.c:429
-msgid "Show user details"
-msgstr "Vis brukerdetaljer"
-
-#: plugins/gevolution/assoc-buddy.c:430
-msgid "Hide user details"
+#, fuzzy
+msgid "User _details"
 msgstr "Skjul brukerdetaljer"
 
 #. "Associate Buddy" button
-#: plugins/gevolution/assoc-buddy.c:483
+#: plugins/gevolution/assoc-buddy.c:482
 msgid "_Associate Buddy"
 msgstr "_Assosier kompis"
 
-#: plugins/gevolution/eds-utils.c:74 plugins/gevolution/eds-utils.c:87
-#: src/gtkblist.c:3122 src/gtkprefs.c:962 src/gtkprefs.c:1014
-#: src/gtkprefs.c:1827 src/protocols/jabber/jabber.c:949
-msgid "None"
-msgstr "Ingen"
-
-#: plugins/gevolution/gevolution.c:93 plugins/gevolution/gevo-util.c:64
-#: src/blist.c:776 src/blist.c:983 src/blist.c:1933 src/gtkblist.c:4001
-#: src/protocols/jabber/roster.c:67
+#: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:96
+#: src/blist.c:518 src/blist.c:1259 src/blist.c:1480 src/gtkblist.c:3884
+#: src/protocols/jabber/roster.c:66
 msgid "Buddies"
 msgstr "Kontakter"
 
-#: plugins/gevolution/gevolution.c:225
+#: plugins/gevolution/gevolution.c:262 plugins/gevolution/gevolution.c:268
+#, fuzzy
+msgid "Unable to send e-mail"
+msgstr "Kunne ikke sende beskjed."
+
+#: plugins/gevolution/gevolution.c:263
+msgid "The evolution executable was not found in the PATH."
+msgstr ""
+
+#: plugins/gevolution/gevolution.c:269
+msgid "The specified buddy was not found in the Evolution Contacts."
+msgstr ""
+
+#: plugins/gevolution/gevolution.c:286
 msgid "Add to Address Book"
 msgstr "Legg til i adresseboka"
 
+#: plugins/gevolution/gevolution.c:290
+#, fuzzy
+msgid "Send E-Mail"
+msgstr "E-post"
+
 #. Configuration frame
-#: plugins/gevolution/gevolution.c:348
+#: plugins/gevolution/gevolution.c:414
 msgid "Evolution Integration Configuration"
 msgstr "Instillinger for Evolution-integrasjon"
 
 #. Label
-#: plugins/gevolution/gevolution.c:351
+#: plugins/gevolution/gevolution.c:417
 #, fuzzy
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "Velg alle kontoer som kompiser skal legges til automatisk i."
 
 #
-#: plugins/gevolution/gevolution.c:381 plugins/idle.c:52 src/gtkconn.c:627
+#: plugins/gevolution/gevolution.c:447 plugins/idle.c:111 plugins/idle.c:140
 msgid "Account"
 msgstr "Konto"
 
@@ -568,7 +551,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gevolution/gevolution.c:464
+#: plugins/gevolution/gevolution.c:530
 msgid "Evolution Integration"
 msgstr "Evolution-integrasjon"
 
@@ -576,93 +559,89 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/gevolution/gevolution.c:467 plugins/gevolution/gevolution.c:469
-msgid "Provides integration with Ximian Evolution."
+#: plugins/gevolution/gevolution.c:533 plugins/gevolution/gevolution.c:535
+#, fuzzy
+msgid "Provides integration with Evolution."
 msgstr "Tilbyr integrasjon med Ximian Evolution"
 
-#: plugins/gevolution/new_person_dialog.c:264
+#: plugins/gevolution/new_person_dialog.c:266
 msgid "Please enter the person's information below."
 msgstr "Vennligst tast inn personens informasjon under."
 
-#: plugins/gevolution/new_person_dialog.c:268
+#: plugins/gevolution/new_person_dialog.c:270
 msgid "Please enter the buddy's screen name and account type below."
 msgstr ""
 "Venligst tast inn kontaktens brukernavn og hvilken protokoll kontakten "
 "finnes på under."
 
-#: plugins/gevolution/new_person_dialog.c:288
+#: plugins/gevolution/new_person_dialog.c:290
 msgid "Account type:"
 msgstr "Kontotype:"
 
-#: plugins/gevolution/new_person_dialog.c:292
+#: plugins/gevolution/new_person_dialog.c:294
 msgid "Screenname:"
 msgstr "Skjermnavn:"
 
 #. Optional Information section
-#: plugins/gevolution/new_person_dialog.c:312
+#: plugins/gevolution/new_person_dialog.c:314
 msgid "Optional information:"
 msgstr "Tilleggsinformasjon"
 
 #. Label
-#: plugins/gevolution/new_person_dialog.c:335 src/gtkaccount.c:379
-#: src/gtkaccount.c:409 src/protocols/oscar/oscar.c:590
+#: plugins/gevolution/new_person_dialog.c:337 src/gtkaccount.c:413
+#: src/gtkaccount.c:435 src/protocols/oscar/oscar.c:613
 msgid "Buddy Icon"
 msgstr "Kontaktikon"
 
-#: plugins/gevolution/new_person_dialog.c:347
+#: plugins/gevolution/new_person_dialog.c:349
 msgid "First name:"
 msgstr "Fornavn:"
 
-#: plugins/gevolution/new_person_dialog.c:359
+#: plugins/gevolution/new_person_dialog.c:361
 msgid "Last name:"
 msgstr "Etternavn:"
 
-#: plugins/gevolution/new_person_dialog.c:379
+#: plugins/gevolution/new_person_dialog.c:381
 msgid "E-mail:"
 msgstr "E-post:"
 
+#: plugins/history.c:138
+msgid "History Plugin Requires Logging"
+msgstr ""
+
+#: plugins/history.c:139
+msgid ""
+"Logging can be enabled from Tools -> Preferences -> Logging.\n"
+"\n"
+"Enabling logs for instant messages and/or chats will activate history for "
+"the same conversation type(s)."
+msgstr ""
+
+#: plugins/history.c:178
+msgid "History"
+msgstr "Historikk"
+
+#: plugins/history.c:180
+msgid "Shows recently logged conversations in new conversations."
+msgstr "Viser tidligere loggede samtaler i nye samtaler."
+
+#: plugins/history.c:181
+msgid ""
+"When a new conversation is opened this plugin will insert the last "
+"conversation into the current conversation.\n"
+"\n"
+"The history plugin requires logging be enabled. Logging can be enabled from "
+"Tools -> Preferences -> Logging. Enabling logs for instant messages and/or "
+"chats will activate history for the same conversation type(s)."
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gtk-signals-test.c:102
-msgid "GTK Signals Test"
-msgstr "GTK-signaltest"
-
-#
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: plugins/gtk-signals-test.c:105 plugins/gtk-signals-test.c:107
-msgid "Test to see that all ui signals are working properly."
-msgstr "Test for å se om alle brukergrensesnitts-signaler fungerer korrekt."
-
-#: plugins/history.c:92
-msgid "History"
-msgstr "Historikk"
-
-#: plugins/history.c:94
-msgid "Shows recently logged conversations in new conversations."
-msgstr "Viser tidligere loggede samtaler i nye samtaler."
-
-#: plugins/history.c:95
-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 den forrige "
-"samtalen i den pågående."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/iconaway.c:104
+#: plugins/iconaway.c:101
 msgid "Iconify on Away"
 msgstr "Minimer til ikon når borte"
 
@@ -670,33 +649,48 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/iconaway.c:107 plugins/iconaway.c:109
+#: plugins/iconaway.c:104 plugins/iconaway.c:106
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "Minimer kontaktlisten og samtalene når du er markert som borte."
 
-#: plugins/idle.c:56
+#: plugins/idle.c:115
 msgid "Minutes"
 msgstr "Minutter"
 
-#: plugins/idle.c:63 plugins/idle.c:98
+#: plugins/idle.c:122 plugins/idle.c:149 plugins/idle.c:215
 msgid "I'dle Mak'er"
 msgstr "I'dle Mak'er"
 
-#: plugins/idle.c:64 plugins/idle.c:79
+#: plugins/idle.c:123 plugins/idle.c:181
 #, fuzzy
 msgid "Set Account Idle Time"
 msgstr "Sett fraværstid for konto"
 
-#: plugins/idle.c:67
+#: plugins/idle.c:126
 msgid "_Set"
 msgstr "_Sett"
 
-#: plugins/idle.c:68 src/away.c:922
+#: plugins/idle.c:127 plugins/idle.c:154
 msgid "_Cancel"
 msgstr "_Avbryt"
 
-#: plugins/idle.c:100 plugins/idle.c:101
-msgid "Allows you to hand-configure how long you've been idle for"
+#: plugins/idle.c:150 plugins/idle.c:185
+#, fuzzy
+msgid "Unset Account Idle Time"
+msgstr "Sett fraværstid for konto"
+
+#: plugins/idle.c:153
+#, fuzzy
+msgid "_Unset"
+msgstr "Bruk"
+
+#: plugins/idle.c:190
+msgid "Unset Idle Time For All Idled Accounts"
+msgstr ""
+
+#: plugins/idle.c:217 plugins/idle.c:218
+#, fuzzy
+msgid "Allows you to hand-configure how long you've been idle"
 msgstr "Lar deg manuelt sette hvor lenge du har vært borte."
 
 #. *< type
@@ -763,73 +757,79 @@
 "Legger til en liten boks i kontaktlista som viser om du har fått e-post."
 
 #. ---------- "Notify For" ----------
-#: plugins/notify.c:614
+#: plugins/notify.c:638
 msgid "Notify For"
 msgstr "Bruk varsling for"
 
-#: plugins/notify.c:618
+#: plugins/notify.c:642
 msgid "_IM windows"
 msgstr "Vinduer for direktemeldinger"
 
 #
-#: plugins/notify.c:625
+#: plugins/notify.c:649
 msgid "C_hat windows"
 msgstr "_Samtalevinduer"
 
 #
-#: plugins/notify.c:632
+#: plugins/notify.c:656
 msgid "_Focused windows"
 msgstr "Vinduer som har _fokus"
 
 #. ---------- "Notification Methods" ----------
-#: plugins/notify.c:640
+#: plugins/notify.c:664
 msgid "Notification Methods"
 msgstr "Varslingsmetoder"
 
-#: plugins/notify.c:647
+#: plugins/notify.c:671
 msgid "Prepend _string into window title:"
 msgstr "Tilføy tekst i vindustittelen:"
 
 #. Count method button
-#: plugins/notify.c:666
+#: plugins/notify.c:690
 msgid "Insert c_ount of new messages into window title"
 msgstr "Sett inn antall nye beskjeder i vindustittelen"
 
 #
 #. Urgent method button
-#: plugins/notify.c:674
+#: plugins/notify.c:698
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Sett \"URGENT\"-hintet for vindusbehandleren"
 
+#. Raise window method button
+#: plugins/notify.c:706
+#, fuzzy
+msgid "R_aise conversation window"
+msgstr "Samtalevinduer for direktemeldinger"
+
 #. ---------- "Notification Removals" ----------
-#: plugins/notify.c:682
+#: plugins/notify.c:714
 msgid "Notification Removal"
 msgstr "Fjern varsling"
 
 #
 #. Remove on focus button
-#: plugins/notify.c:687
+#: plugins/notify.c:719
 msgid "Remove when conversation window _gains focus"
 msgstr "Fjern når samtalevinduet får fokus"
 
 #. Remove on click button
-#: plugins/notify.c:694
+#: plugins/notify.c:726
 msgid "Remove when conversation window _receives click"
 msgstr "Fjern når du klikker i samtalevinduet"
 
 #. Remove on type button
-#: plugins/notify.c:702
+#: plugins/notify.c:734
 msgid "Remove when _typing in conversation window"
 msgstr "Fjern når du skriver i samtalevinduet"
 
 #
 #. Remove on message send button
-#: plugins/notify.c:710
+#: plugins/notify.c:742
 msgid "Remove when a _message gets sent"
 msgstr "Fjern når en beskjed sendes"
 
 #. Remove on conversation switch button
-#: plugins/notify.c:719
+#: plugins/notify.c:751
 msgid "Remove on switch to conversation ta_b"
 msgstr "Fjern når du skriver i samtalevinduet"
 
@@ -839,7 +839,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/notify.c:809
+#: plugins/notify.c:841
 msgid "Message Notification"
 msgstr "Beskjedvarsling"
 
@@ -847,7 +847,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/notify.c:812 plugins/notify.c:814
+#: plugins/notify.c:844 plugins/notify.c:846
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "Lar deg bli varslet om uleste meldinger på flere vis."
 
@@ -857,14 +857,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/perl/perl.c:535
+#: plugins/perl/perl.c:583
 msgid "Perl Plugin Loader"
 msgstr "Perl-tilleggslaster"
 
 #. *< name
 #. *< version
 #. *< summary
-#: plugins/perl/perl.c:537 plugins/perl/perl.c:538
+#: plugins/perl/perl.c:585 plugins/perl/perl.c:586
 msgid "Provides support for loading perl plugins."
 msgstr "Lar deg laste perl-tillegg."
 
@@ -942,7 +942,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/signals-test.c:601
+#: plugins/signals-test.c:730
 msgid "Signals Test"
 msgstr "Signaltest"
 
@@ -951,7 +951,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/signals-test.c:604 plugins/signals-test.c:606
+#: plugins/signals-test.c:733 plugins/signals-test.c:735
 msgid "Test to see that all signals are working properly."
 msgstr "Test for å se om alle signaler fungerer korrekt."
 
@@ -973,35 +973,51 @@
 msgid "Tests to see that most things are working."
 msgstr "Test for å se at mesteparten fungerer."
 
-#: plugins/spellchk.c:416
+#: plugins/spellchk.c:1788
+msgid "Duplicate Correction"
+msgstr ""
+
+#: plugins/spellchk.c:1789
+msgid "The specified word already exists in the correction list."
+msgstr ""
+
+#: plugins/spellchk.c:1939
 msgid "Text Replacements"
 msgstr "Teksterstatninger"
 
-#: plugins/spellchk.c:440
+#: plugins/spellchk.c:1963
 msgid "You type"
 msgstr "Når du skriver"
 
-#: plugins/spellchk.c:452
+#: plugins/spellchk.c:1975
 msgid "You send"
 msgstr "Erstatt det til"
 
-#: plugins/spellchk.c:478
+#: plugins/spellchk.c:1987
+msgid "Whole words only"
+msgstr ""
+
+#: plugins/spellchk.c:2013
 msgid "Add a new text replacement"
 msgstr "Legg til teksterstatning"
 
-#: plugins/spellchk.c:485
+#: plugins/spellchk.c:2023
 msgid "You _type:"
 msgstr "Når du skriver:"
 
-#: plugins/spellchk.c:499
+#: plugins/spellchk.c:2039
 msgid "You _send:"
 msgstr "Erstatt det til: "
 
-#: plugins/spellchk.c:541
+#: plugins/spellchk.c:2051
+msgid "Only replace _whole words"
+msgstr ""
+
+#: plugins/spellchk.c:2088
 msgid "Text replacement"
 msgstr "Teksterstatter"
 
-#: plugins/spellchk.c:543 plugins/spellchk.c:544
+#: plugins/spellchk.c:2090 plugins/spellchk.c:2091
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Erstatter tekst i utgående beskjeder etter regler som du bestemmer."
 
@@ -1011,6 +1027,42 @@
 #. *< dependencies
 #. *< priority
 #. *< id
+#: plugins/ssl/ssl-gnutls.c:227
+msgid "GNUTLS"
+msgstr "GNUTLS"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: plugins/ssl/ssl-gnutls.c:230 plugins/ssl/ssl-gnutls.c:232
+msgid "Provides SSL support through GNUTLS."
+msgstr "Tilbyr SSL-støtte gjennom GNUTLS."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/ssl/ssl-nss.c:319
+msgid "NSS"
+msgstr "NSS"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: plugins/ssl/ssl-nss.c:322 plugins/ssl/ssl-nss.c:324
+msgid "Provides SSL support through Mozilla NSS."
+msgstr "Tilbyr SSL-støtte gjennom Mozillas NSS."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
 #: plugins/ssl/ssl.c:94
 msgid "SSL"
 msgstr "SSL"
@@ -1023,71 +1075,35 @@
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "Tilbyr ett felles grensesnitt for SSL-biblioteker."
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/ssl/ssl-gnutls.c:226
-msgid "GNUTLS"
-msgstr "GNUTLS"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: plugins/ssl/ssl-gnutls.c:229 plugins/ssl/ssl-gnutls.c:231
-msgid "Provides SSL support through GNUTLS."
-msgstr "Tilbyr SSL-støtte gjennom GNUTLS."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/ssl/ssl-nss.c:318
-msgid "NSS"
-msgstr "NSS"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: plugins/ssl/ssl-nss.c:321 plugins/ssl/ssl-nss.c:323
-msgid "Provides SSL support through Mozilla NSS."
-msgstr "Tilbyr SSL-støtte gjennom Mozillas NSS."
-
-#: plugins/statenotify.c:41
+#: plugins/statenotify.c:42
 #, c-format
 msgid "%s has gone away."
 msgstr "%s er borte."
 
-#: plugins/statenotify.c:48
+#: plugins/statenotify.c:49
 #, c-format
 msgid "%s is no longer away."
 msgstr "%s er tilbake."
 
-#: plugins/statenotify.c:55
+#: plugins/statenotify.c:56
 #, c-format
 msgid "%s has become idle."
 msgstr "%s har blitt inaktiv"
 
-#: plugins/statenotify.c:62
+#: plugins/statenotify.c:63
 #, c-format
 msgid "%s is no longer idle."
 msgstr "%s er ikke lenger inaktiv"
 
-#: plugins/statenotify.c:73
+#: plugins/statenotify.c:74
 msgid "Notify When"
 msgstr "Varsle når"
 
-#: plugins/statenotify.c:76
+#: plugins/statenotify.c:77
 msgid "Buddy Goes _Away"
 msgstr "Kontakt forsvinner"
 
-#: plugins/statenotify.c:79
+#: plugins/statenotify.c:80
 msgid "Buddy Goes _Idle"
 msgstr "Kontakt blir inaktiv:"
 
@@ -1097,7 +1113,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/statenotify.c:119
+#: plugins/statenotify.c:120
 msgid "Buddy State Notification"
 msgstr "Varsle når kontakt endrer tilstand"
 
@@ -1105,7 +1121,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/statenotify.c:122 plugins/statenotify.c:125
+#: plugins/statenotify.c:123 plugins/statenotify.c:126
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
@@ -1129,7 +1145,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ticker/ticker.c:75 plugins/ticker/ticker.c:331
+#: plugins/ticker/ticker.c:75 plugins/ticker/ticker.c:326
 msgid "Buddy Ticker"
 msgstr "Rullende kontaktliste"
 
@@ -1137,33 +1153,29 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ticker/ticker.c:334 plugins/ticker/ticker.c:336
+#: plugins/ticker/ticker.c:329 plugins/ticker/ticker.c:331
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "En horisontalt rullende versjon av kontaktlisten."
 
-#: plugins/timestamp.c:186
+#: plugins/timestamp.c:202
 msgid "iChat Timestamp"
 msgstr "iChat tidsstempel"
 
-#: plugins/timestamp.c:193
+#: plugins/timestamp.c:209
 msgid "Delay"
 msgstr "Sett inn hvert"
 
-#: plugins/timestamp.c:200
+#: plugins/timestamp.c:216
 msgid "minutes."
 msgstr "minutter"
 
-#: plugins/timestamp.c:206
-msgid "_Apply"
-msgstr "Bruk"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/timestamp.c:271
+#: plugins/timestamp.c:279
 msgid "Timestamp"
 msgstr "Tidsstempel"
 
@@ -1171,292 +1183,300 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/timestamp.c:274 plugins/timestamp.c:276
+#: plugins/timestamp.c:282 plugins/timestamp.c:284
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr "Legger til tidsstempel i samtalevinduer a la iChat hvert Nte minutt."
 
-#: plugins/win32/transparency/win2ktrans.c:134
-#: plugins/win32/transparency/win2ktrans.c:413
-#: plugins/win32/transparency/win2ktrans.c:444
+#: plugins/win32/transparency/win2ktrans.c:183
+#: plugins/win32/transparency/win2ktrans.c:569
+#: plugins/win32/transparency/win2ktrans.c:616
 msgid "Opacity:"
 msgstr "Ugjennomsiktighet:"
 
 #. IM Convo trans options
-#: plugins/win32/transparency/win2ktrans.c:394
+#: plugins/win32/transparency/win2ktrans.c:533
 msgid "IM Conversation Windows"
 msgstr "Samtalevinduer for direktemeldinger"
 
-#: plugins/win32/transparency/win2ktrans.c:395
+#: plugins/win32/transparency/win2ktrans.c:534
 msgid "_IM window transparency"
 msgstr "Gjennomsiktige vinduer for direktemeldinger"
 
-#: plugins/win32/transparency/win2ktrans.c:405
+#: plugins/win32/transparency/win2ktrans.c:548
 msgid "_Show slider bar in IM window"
 msgstr "Vis glideknapp i direktemeldingsvindu"
 
+#: plugins/win32/transparency/win2ktrans.c:555
+#, fuzzy
+msgid "Remove IM window transparency on focus"
+msgstr "Gjennomsiktige vinduer for direktemeldinger"
+
+#
+#: plugins/win32/transparency/win2ktrans.c:558
+#: plugins/win32/transparency/win2ktrans.c:606
+#, fuzzy
+msgid "Always on top"
+msgstr "Kontaktalias"
+
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:430 src/gtkprefs.c:956
+#: plugins/win32/transparency/win2ktrans.c:590
 msgid "Buddy List Window"
 msgstr "Kontaktlistevindu"
 
-#: plugins/win32/transparency/win2ktrans.c:431
+#: plugins/win32/transparency/win2ktrans.c:591
 msgid "_Buddy List window transparency"
 msgstr "Gjennomsiktighet for kontaktlistevindu"
 
+#: plugins/win32/transparency/win2ktrans.c:604
+#, fuzzy
+msgid "Remove Buddy List window transparency on focus"
+msgstr "Gjennomsiktighet for kontaktlistevindu"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/win32/transparency/win2ktrans.c:489
+#: plugins/win32/transparency/win2ktrans.c:657
 msgid "Transparency"
 msgstr "Gjennomsiktighet"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/win32/transparency/win2ktrans.c:492
+#: plugins/win32/transparency/win2ktrans.c:660
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "Variabel gjennomsiktighet for kontaktlisten og samtaler."
 
 #. *  description
-#: plugins/win32/transparency/win2ktrans.c:494
+#: plugins/win32/transparency/win2ktrans.c:662
+#, fuzzy
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
 "\n"
-"* Note: This plugin requires Win2000 or WinXP."
+"* Note: This plugin requires Win2000 or greater."
 msgstr ""
 "Dette tillegget gjør at samtalevinduene og kontaktlisten blir delvis "
 "gjennomsiktige.\n"
 "\n"
 "* Merk: du må ha Windows 2000 eller Windows XP for at denne skal virke."
 
-#: plugins/win32/winprefs/winprefs.c:344
+#: plugins/win32/winprefs/winprefs.c:385
 msgid "GTK+ Runtime Version"
 msgstr "GTK+ kjøremiljø versjon"
 
 #. Autostart
-#: plugins/win32/winprefs/winprefs.c:352
+#: plugins/win32/winprefs/winprefs.c:393
 msgid "Startup"
 msgstr "Oppstart"
 
-#: plugins/win32/winprefs/winprefs.c:353
+#: plugins/win32/winprefs/winprefs.c:394
 msgid "_Start Gaim on Windows startup"
 msgstr "Start Gaim når Windows starter"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3167
-#: src/gtkprefs.c:2421
+#: plugins/win32/winprefs/winprefs.c:405 src/gtkblist.c:3164
+#: src/gtkprefs.c:1755
 msgid "Buddy List"
 msgstr "Kontaktliste"
 
-#: plugins/win32/winprefs/winprefs.c:363
+#: plugins/win32/winprefs/winprefs.c:406
 msgid "_Dockable Buddy List"
 msgstr "Dockable kontaktliste"
 
-#. Docked Blist On Top
-#: 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:377
-msgid "_Keep Buddy List window on top"
+#: plugins/win32/winprefs/winprefs.c:410
+#, fuzzy
+msgid "_Keep Buddy List window on top:"
 msgstr "Hold kontaktlistevinduet øverst"
 
+#: plugins/win32/winprefs/winprefs.c:412 src/gtkprefs.c:1691
+msgid "Never"
+msgstr "Aldri"
+
+#: plugins/win32/winprefs/winprefs.c:413
+#, fuzzy
+msgid "Always"
+msgstr "Borte"
+
+#. XXX: Did this ever work?
+#: plugins/win32/winprefs/winprefs.c:415
+msgid "Only when docked"
+msgstr ""
+
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:1007
-#: src/gtkprefs.c:2422 src/protocols/msn/msn.c:1811
+#: plugins/win32/winprefs/winprefs.c:419 src/gtkprefs.c:837
+#: src/gtkprefs.c:1756
 msgid "Conversations"
 msgstr "Samtaler"
 
-#: plugins/win32/winprefs/winprefs.c:383
-msgid "_Flash Window when messages are received"
+#: plugins/win32/winprefs/winprefs.c:420
+#, fuzzy
+msgid "_Flash window when messages are received"
 msgstr "_Blink vinduet når nye beskjeder mottas"
 
-#: plugins/win32/winprefs/winprefs.c:407
+#: plugins/win32/winprefs/winprefs.c:443
 msgid "WinGaim Options"
 msgstr "Innstilinger for WinGaim"
 
-#: plugins/win32/winprefs/winprefs.c:409 plugins/win32/winprefs/winprefs.c:410
+#: plugins/win32/winprefs/winprefs.c:445
 msgid "Options specific to Windows Gaim."
 msgstr "Innstillinger som er spesifikke for Windows Gaim."
 
-#: src/account.c:298 src/protocols/jabber/jabber.c:1039
+#: plugins/win32/winprefs/winprefs.c:446
+msgid ""
+"Provides options specific to Windows Gaim, such as buddy list docking and "
+"conversation flashing."
+msgstr ""
+
+#: src/account.c:773
+#, fuzzy
+msgid "accounts"
+msgstr "Kontoer"
+
+#: src/account.c:915
+#, fuzzy
+msgid "Password is required to sign on."
+msgstr "Passordet har løpt ut"
+
+#: src/account.c:940
+#, c-format
+msgid "Enter password for %s (%s)"
+msgstr "Oppgi passord for %s (%s)"
+
+#: src/account.c:947
+#, fuzzy
+msgid "Enter Password"
+msgstr "Bytt passord"
+
+#
+#: src/account.c:952
+#, fuzzy
+msgid "Save password"
+msgstr "Nytt passord"
+
+#. *
+#. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
+#.
+#: src/account.c:960 src/account.c:1116 src/gtkdialogs.c:506
+#: src/gtkdialogs.c:647 src/gtkdialogs.c:703 src/gtkrequest.c:260
+#: src/protocols/gg/gg.c:434 src/protocols/gg/gg.c:581
+#: src/protocols/gg/gg.c:1497 src/protocols/jabber/jabber.c:1162
+#: src/protocols/jabber/xdata.c:337 src/protocols/msn/msn.c:250
+#: src/protocols/msn/msn.c:265 src/protocols/msn/msn.c:280
+#: src/protocols/msn/msn.c:295 src/protocols/oscar/oscar.c:2902
+#: src/protocols/oscar/oscar.c:4410 src/protocols/oscar/oscar.c:4491
+#: src/protocols/oscar/oscar.c:7851 src/protocols/oscar/oscar.c:7976
+#: src/protocols/oscar/oscar.c:8001 src/protocols/oscar/oscar.c:8053
+#: src/protocols/silc/buddy.c:465 src/protocols/silc/buddy.c:1137
+#: src/protocols/silc/chat.c:422 src/protocols/silc/chat.c:460
+#: src/protocols/silc/chat.c:723 src/protocols/silc/ops.c:1083
+#: src/protocols/silc/ops.c:1696 src/protocols/silc/silc.c:716
+#: src/protocols/yahoo/yahoo.c:2947 src/protocols/yahoo/yahoo.c:2956
+#: src/request.h:1331
+msgid "OK"
+msgstr "_OK"
+
+#: src/account.c:961 src/account.c:1117 src/account.c:1155
+#: src/gtkaccount.c:2108 src/gtkaccount.c:2570 src/gtkblist.c:4484
+#: src/gtkdialogs.c:507 src/gtkdialogs.c:648 src/gtkdialogs.c:704
+#: src/gtkdialogs.c:723 src/gtkdialogs.c:745 src/gtkdialogs.c:765
+#: src/gtkdialogs.c:809 src/gtkdialogs.c:871 src/gtkdialogs.c:913
+#: src/gtkdialogs.c:955 src/gtkimhtmltoolbar.c:419 src/gtkprivacy.c:595
+#: src/gtkprivacy.c:608 src/gtkprivacy.c:633 src/gtkprivacy.c:644
+#: src/gtkrequest.c:261 src/gtksavedstatuses.c:188 src/protocols/gg/gg.c:435
+#: src/protocols/gg/gg.c:582 src/protocols/gg/gg.c:656
+#: src/protocols/gg/gg.c:1498 src/protocols/jabber/buddy.c:573
+#: src/protocols/jabber/buddy.c:1358 src/protocols/jabber/buddy.c:1392
+#: src/protocols/jabber/chat.c:780 src/protocols/jabber/jabber.c:707
+#: src/protocols/jabber/jabber.c:1163 src/protocols/jabber/xdata.c:338
+#: src/protocols/msn/msn.c:251 src/protocols/msn/msn.c:266
+#: src/protocols/msn/msn.c:281 src/protocols/msn/msn.c:296
+#: src/protocols/msn/msn.c:313 src/protocols/oscar/oscar.c:1596
+#: src/protocols/oscar/oscar.c:2903 src/protocols/oscar/oscar.c:4368
+#: src/protocols/oscar/oscar.c:4411 src/protocols/oscar/oscar.c:4448
+#: src/protocols/oscar/oscar.c:4492 src/protocols/oscar/oscar.c:7852
+#: src/protocols/oscar/oscar.c:7977 src/protocols/oscar/oscar.c:8002
+#: src/protocols/oscar/oscar.c:8054 src/protocols/oscar/oscar.c:8123
+#: src/protocols/silc/buddy.c:466 src/protocols/silc/buddy.c:1042
+#: src/protocols/silc/buddy.c:1138 src/protocols/silc/chat.c:595
+#: src/protocols/silc/chat.c:724 src/protocols/silc/ops.c:1697
+#: src/protocols/silc/silc.c:717 src/protocols/yahoo/yahoo.c:2948
+#: src/protocols/yahoo/yahoo.c:2957 src/request.h:1331 src/request.h:1341
+msgid "Cancel"
+msgstr "_Avbryt"
+
+#: src/account.c:986 src/connection.c:96
+#, c-format
+msgid "Missing protocol plugin for %s"
+msgstr "Mangler protokolltillegg for %s"
+
+#: src/account.c:988 src/connection.c:99
+msgid "Connection Error"
+msgstr "Feil ved tilkobling"
+
+#: src/account.c:1052 src/protocols/gg/gg.c:470
+#: src/protocols/jabber/jabber.c:1115
 msgid "New passwords do not match."
 msgstr "De nye passordene stemmer ikke overens."
 
-#: src/account.c:307
+#: src/account.c:1061
 msgid "Fill out all fields completely."
 msgstr "Fyll ut alle feltene fullstendig."
 
 #
-#: src/account.c:332
+#: src/account.c:1085
 msgid "Original password"
 msgstr "Opprinnelig passord"
 
 #
-#: src/account.c:339
+#: src/account.c:1092
 msgid "New password"
 msgstr "Nytt passord"
 
 #
-#: src/account.c:346
+#: src/account.c:1099
 msgid "New password (again)"
 msgstr "Nytt passord (igjen)"
 
-#: src/account.c:352
+#: src/account.c:1105
 #, c-format
 msgid "Change password for %s"
 msgstr "Endre passord for %s:"
 
 #
-#: src/account.c:360
+#: src/account.c:1113
 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:363 src/connection.c:198 src/gtkblist.c:2492
-#: src/gtkdialogs.c:505 src/gtkdialogs.c:647 src/gtkdialogs.c:701
-#: src/gtkrequest.c:243 src/protocols/jabber/jabber.c:1086
-#: src/protocols/jabber/xdata.c:337 src/protocols/msn/msn.c:226
-#: src/protocols/msn/msn.c:241 src/protocols/msn/msn.c:256
-#: src/protocols/msn/msn.c:271 src/protocols/oscar/oscar.c:2413
-#: src/protocols/oscar/oscar.c:3686 src/protocols/oscar/oscar.c:3780
-#: src/protocols/oscar/oscar.c:7056 src/protocols/oscar/oscar.c:7148
-#: src/protocols/oscar/oscar.c:7200 src/protocols/oscar/oscar.c:7286
-#: src/protocols/silc/buddy.c:460 src/protocols/silc/buddy.c:1132
-#: src/protocols/silc/chat.c:421 src/protocols/silc/chat.c:459
-#: src/protocols/silc/chat.c:722 src/protocols/silc/ops.c:1081
-#: src/protocols/silc/ops.c:1699 src/protocols/silc/silc.c:711
-#: src/protocols/yahoo/yahoo.c:2938 src/protocols/yahoo/yahoo.c:2947
-#: src/request.h:1245
-msgid "OK"
-msgstr "_OK"
-
-#: src/account.c:364 src/account.c:402 src/away.c:367 src/connection.c:199
-#: src/gtkaccount.c:2029 src/gtkaccount.c:2568 src/gtkaccount.c:2599
-#: src/gtkblist.c:2493 src/gtkblist.c:4572 src/gtkconn.c:169
-#: src/gtkdialogs.c:506 src/gtkdialogs.c:648 src/gtkdialogs.c:702
-#: src/gtkdialogs.c:800 src/gtkdialogs.c:822 src/gtkdialogs.c:842
-#: src/gtkdialogs.c:879 src/gtkdialogs.c:939 src/gtkdialogs.c:982
-#: src/gtkdialogs.c:1023 src/gtkimhtmltoolbar.c:437 src/gtkprivacy.c:597
-#: src/gtkprivacy.c:610 src/gtkprivacy.c:635 src/gtkprivacy.c:646
-#: src/gtkrequest.c:244 src/protocols/icq/gaim_icq.c:276
-#: src/protocols/jabber/buddy.c:515 src/protocols/jabber/chat.c:754
-#: src/protocols/jabber/jabber.c:678 src/protocols/jabber/jabber.c:1087
-#: src/protocols/jabber/presence.c:213 src/protocols/jabber/xdata.c:338
-#: src/protocols/msn/msn.c:227 src/protocols/msn/msn.c:242
-#: src/protocols/msn/msn.c:257 src/protocols/msn/msn.c:272
-#: src/protocols/msn/msn.c:289 src/protocols/oscar/oscar.c:1534
-#: src/protocols/oscar/oscar.c:2414 src/protocols/oscar/oscar.c:3644
-#: src/protocols/oscar/oscar.c:3687 src/protocols/oscar/oscar.c:3724
-#: src/protocols/oscar/oscar.c:3781 src/protocols/oscar/oscar.c:7057
-#: src/protocols/oscar/oscar.c:7149 src/protocols/oscar/oscar.c:7201
-#: src/protocols/oscar/oscar.c:7270 src/protocols/oscar/oscar.c:7287
-#: src/protocols/silc/buddy.c:461 src/protocols/silc/buddy.c:1037
-#: src/protocols/silc/buddy.c:1133 src/protocols/silc/chat.c:594
-#: src/protocols/silc/chat.c:723 src/protocols/silc/ops.c:1700
-#: src/protocols/silc/silc.c:712 src/protocols/trepia/trepia.c:348
-#: src/protocols/yahoo/yahoo.c:2939 src/protocols/yahoo/yahoo.c:2948
-#: src/request.h:1245 src/request.h:1255
-msgid "Cancel"
-msgstr "_Avbryt"
-
-#: src/account.c:393
+#: src/account.c:1146
 #, c-format
 msgid "Change user information for %s"
 msgstr "Endre brukerinformasjon for %s"
 
-#: src/account.c:401 src/gtkrequest.c:250 src/protocols/jabber/buddy.c:514
-#: src/protocols/trepia/trepia.c:347
+#: src/account.c:1154 src/gtkdebug.c:684 src/gtkrequest.c:267
+#: src/protocols/jabber/buddy.c:572
 msgid "Save"
 msgstr "Lagre"
 
-#: src/account.c:760 src/gtkft.c:159 src/protocols/jabber/buddy.c:573
-#: src/protocols/novell/novell.c:2812
+#: src/account.c:1641 src/gtkft.c:156 src/protocols/jabber/buddy.c:633
+#: src/protocols/jabber/buddy.c:1083 src/protocols/jabber/buddy.c:1100
+#: src/protocols/novell/novell.c:2837
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: src/away.c:233
-msgid "Away!"
-msgstr "Borte"
-
-#: src/away.c:303
-msgid "Edit This Message"
-msgstr "Rediger denne meldingen"
-
-#: src/away.c:308
-msgid "I'm Back!"
-msgstr "Tilbake!"
-
-#: src/away.c:362
-#, c-format
-msgid "Are you sure you want to remove the away message \"%s\"?"
-msgstr "Er du sikker på at du vil slette \"%s\"?"
-
-#: src/away.c:364 src/away.c:442
-msgid "Remove Away Message"
-msgstr "Fjern fraværsbeskjed"
-
-#. Remove button
-#: src/away.c:366 src/gtkconv.c:1520 src/gtkconv.c:3902 src/gtkconv.c:3973
-#: src/gtkrequest.c:249
-msgid "Remove"
-msgstr "Fjern"
-
-#: src/away.c:436
-msgid "New Away Message"
-msgstr "Ny fraværsbeskjed"
-
-#: src/away.c:663
-msgid "Set All Away"
-msgstr "Marker som borte på alle"
-
-#: src/away.c:770
-msgid "You cannot save an away message with a blank title"
-msgstr "Du kan ikke lagre en fraværsbeskjed uten tittel"
-
-#: src/away.c:772
-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/away.c:782
-msgid "You cannot create an empty away message"
-msgstr "Du kan ikke lage en tom fraværsbeskjed"
-
-#: src/away.c:847
-msgid "New away message"
-msgstr "Ny fraværsbeskjed"
-
-#: src/away.c:862
-msgid "Away title: "
-msgstr "Tittel: "
-
-#: src/away.c:910
-msgid "_Save"
-msgstr "Lagre"
-
-#: src/away.c:914
-msgid "Sa_ve & Use"
-msgstr "Lagre & bruk"
-
-#: src/away.c:918
-msgid "_Use"
-msgstr "Bruk"
-
-#: src/blist.c:682
+#: src/blist.c:545
+#, fuzzy
+msgid "buddy list"
+msgstr "Kontaktliste"
+
+#: src/blist.c:1162
 msgid "Chats"
 msgstr "Samtaler"
 
-#: src/blist.c:1354
+#: src/blist.c:1863
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1471,120 +1491,74 @@
 "%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:1363
+#: src/blist.c:1872
 msgid "Group not removed"
 msgstr "Gruppe ikke fjernet"
 
-#: src/blist.c:2066
-msgid ""
-"An error was encountered parsing your buddy list.  It has not been loaded, "
-"and the old file has moved to blist.xml~."
-msgstr ""
-"Det oppstod en feil under innlasting av kontaktlisten din. Den har ikke "
-"blitt lastet, og den gamle filen ble flyttet til blist.xml~."
-
-#: src/blist.c:2069
-msgid "Buddy List Error"
-msgstr "Feil i kontaktliste"
-
-#: src/connection.c:118 src/connection.c:169
-#, c-format
-msgid "Missing protocol plugin for %s"
-msgstr "Mangler protokolltillegg for %s"
-
 #
-#: src/connection.c:123
+#: src/connection.c:98
 msgid "Registration Error"
 msgstr "Registreringsfeil"
 
-#: src/connection.c:174
-msgid "Connection Error"
-msgstr "Feil ved tilkobling"
-
-#: src/connection.c:195
-#, c-format
-msgid "Enter password for %s (%s)"
-msgstr "Oppgi passord for %s (%s)"
-
-#: src/conversation.c:233
-msgid "Unable to send message. The message is too large."
+#: src/conversation.c:205
+#, fuzzy
+msgid "Unable to send message: The message is too large."
 msgstr "Kunne ikke sende beskjed. Beskjeden er for stor."
 
-#: src/conversation.c:237 src/conversation.c:251
-#: src/protocols/oscar/oscar.c:4247
-#, c-format
-msgid "Unable to send message to %s:"
+#: src/conversation.c:208 src/conversation.c:221
+#, fuzzy, c-format
+msgid "Unable to send message to %s."
 msgstr "Kunne ikke sende beskjed til %s."
 
-#: src/conversation.c:239
+#: src/conversation.c:209
 msgid "The message is too large."
 msgstr "Meldingen er for stor."
 
-#: src/conversation.c:248
+#: src/conversation.c:218
 msgid "Unable to send message."
 msgstr "Kunne ikke sende beskjed."
 
-#: src/conversation.c:2070
+#: src/conversation.c:1497
 #, c-format
 msgid "%s entered the room."
 msgstr "%s kom inn i rommet."
 
-#: src/conversation.c:2073
+#: src/conversation.c:1499
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] kom inn i rommet."
 
-#: src/conversation.c:2171
+#: src/conversation.c:1598
 #, c-format
 msgid "You are now known as %s"
 msgstr "Du heter nå %s."
 
-#: src/conversation.c:2174
+#: src/conversation.c:1613
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s heter nå %s"
 
-#: src/conversation.c:2216
+#: src/conversation.c:1669
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s forlot rommet (%s)."
 
-#: src/conversation.c:2218
+#: src/conversation.c:1671
 #, c-format
 msgid "%s left the room."
 msgstr "%s forlot rommet."
 
-#: src/conversation.c:2291
+#: src/conversation.c:1748
 #, c-format
 msgid "(+%d more)"
 msgstr "(+%d flere)"
 
-#: src/conversation.c:2293
+#: src/conversation.c:1750
 #, c-format
 msgid " left the room (%s)."
 msgstr " forlot rommet (%s)."
 
-#: src/conversation.c:2698
-msgid "Last created window"
-msgstr "Sist lagde vindu"
-
-#: src/conversation.c:2700
-msgid "Separate IM and Chat windows"
-msgstr "Skill direktemeldings- og gruppesamtalevinduer."
-
-#: src/conversation.c:2702 src/gtkprefs.c:1387
-msgid "New window"
-msgstr "Nytt vindu"
-
-#: src/conversation.c:2704
-msgid "By group"
-msgstr "Etter gruppe"
-
-#: src/conversation.c:2706
-msgid "By account"
-msgstr "Etter konto"
-
-#: src/ft.c:148 src/protocols/msn/msn.c:369
+#: src/ft.c:188 src/protocols/msn/msn.c:412
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -1593,7 +1567,7 @@
 "Klarte ikke lese %s:\n"
 "%s\n"
 
-#: src/ft.c:152
+#: src/ft.c:192
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -1602,7 +1576,7 @@
 "Klarte ikke skrive %s:\n"
 "%s\n"
 
-#: src/ft.c:156
+#: src/ft.c:196
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -1611,37 +1585,37 @@
 "En feil oppstod under tilgang til %s:\n"
 "%s\n"
 
-#: src/ft.c:189
+#: src/ft.c:229
 msgid "Cannot send a file of 0 bytes."
 msgstr "Kan ikke sende en fil som er 0 bytes."
 
-#: src/ft.c:199
+#: src/ft.c:239
 msgid "Cannot send a directory."
 msgstr "Kan ikke sende en katalog."
 
-#: src/ft.c:208
+#: src/ft.c:248
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr ""
 "%s er ikke en vanlig fil. Gaim nekter å overskrive den for å ikke risikere å "
 "ødelegge noe.\n"
 
-#: src/ft.c:265
+#: src/ft.c:306
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s ønsker å sende deg %s (%s)"
 
-#: src/ft.c:273
+#: src/ft.c:313
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s ønsker å sende deg en fil."
 
-#: src/ft.c:311
+#: src/ft.c:354
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Aksepter forespørselen for filoverføring fra %s?"
 
-#: src/ft.c:315
+#: src/ft.c:358
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -1652,171 +1626,65 @@
 "Vert: %s\n"
 "Port: %d"
 
-#: src/ft.c:338
+#: src/ft.c:382
 #, fuzzy, c-format
 msgid "%s is offering to send file %s"
 msgstr "Tilbyr å sende %s til %s"
 
-#: src/ft.c:374
+#: src/ft.c:422
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s er ikke et gyldig filnavn.\n"
 
-#: src/ft.c:395
+#: src/ft.c:443
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "Tilbyr å sende %s til %s"
 
-#: src/ft.c:890
+#: src/ft.c:454
+#, fuzzy, c-format
+msgid "Starting transfer of %s from %s"
+msgstr "Aksepter forespørselen for filoverføring fra %s?"
+
+#: src/ft.c:608
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "Overføring av filen %s er ferdig."
 
-#: src/ft.c:893
+#: src/ft.c:611
 msgid "File transfer complete"
 msgstr "Filoverføring ferdig"
 
-#: src/ft.c:942
+#: src/ft.c:995
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Du avbrøt overføringen av %s."
 
-#: src/ft.c:948
+#: src/ft.c:1000
 msgid "File transfer cancelled"
 msgstr "Filoverføring avbrutt."
 
-#: src/ft.c:1001
+#: src/ft.c:1057
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s avbrøt overføringen av %s"
 
-#: src/ft.c:1007
+#: src/ft.c:1062
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s avbrøt filoverføringen."
 
-#: src/ft.c:1056
-#, c-format
-msgid "File transfer to %s aborted.\n"
+#: src/ft.c:1119
+#, fuzzy, c-format
+msgid "File transfer to %s failed."
 msgstr "Filoverføring til %s avbrutt.\n"
 
-#: src/ft.c:1058
-#, c-format
-msgid "File transfer from %s aborted.\n"
+#: src/ft.c:1121
+#, fuzzy, c-format
+msgid "File transfer from %s failed."
 msgstr "Filoverføring fra %s avbrutt.\n"
 
-#: src/gaim-disclosure.c:253
-msgid "Expander Size"
-msgstr "Utvider-størrelse"
-
-#: src/gaim-disclosure.c:254
-msgid "Size of the expander arrow"
-msgstr "Størrelse på utvider-pil"
-
-#: src/gaim-remote.c:108
-#, c-format
-msgid ""
-"Usage: %s command [OPTIONS] [URI]\n"
-"\n"
-"    COMMANDS:\n"
-"       uri                      Handle AIM: URI\n"
-"       away                     Popup the away dialog with the default "
-"message\n"
-"       back                     Remove the away dialog\n"
-"       quit                     Close running copy of Gaim\n"
-"\n"
-"    OPTIONS:\n"
-"       -h, --help [command]     Show help for command\n"
-msgstr ""
-"Bruksmåte: %s kommando [FLAGG] [URI]\n"
-"\n"
-"    KOMMANDOER:\n"
-"       uri                      Håndtere AIM-URI\n"
-"       away                      Sprett opp fraværsdialogen med "
-"standardmeldingen\n"
-"       back                     Fjern standardmeldingen\n"
-"       quit                     Lukk Gaim-program som kjører\n"
-"\n"
-"    FLAGG:\n"
-"       -h, --help [kommando]    Vis hjelp for kommando\n"
-
-#: src/gaim-remote.c:185 src/gaim-remote.c:203
-msgid ""
-"Gaim not running (on session 0)\n"
-"Is the \"Remote Control\" plugin loaded?\n"
-msgstr ""
-"Gaim kjører ikke (på sesjon 0)\n"
-"Er fjernstyringstillegget lastet?\n"
-
-#: src/gaim-remote.c:219
-msgid ""
-"\n"
-"Using AIM: URIs:\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 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 screen name,\n"
-"with no message:\n"
-"\tgaim-remote uri 'aim:goim?screenname=Penguin'\n"
-"\n"
-"Joining a chat:\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"
-"...prompts you to add 'Penguin' to your buddy list.\n"
-msgstr ""
-"\n"
-"Bruke AIM: URIer:\n"
-"Å sende en direktebeskjed til en kontakts skjermnavn:\n"
-"\tgaim-remote uri 'aim:goim?screenname=Penguin&message=hello+world'\n"
-"'Penguin' er skjermnavnet vi ønsker å sende direktebeskjed til, og 'hello\n"
-"world' er beskjeden. Tegnet '+' må brukes som erstatning for mellomrom.\n"
-"Merk at hvordan kommandoen over bruker anførselstegn - hvis du starter\n"
-"kommandoen fra et shell, må du passe på å 'escape' tegnet &, ellers vil "
-"resten\n"
-"av linja ignoreres. Hvis du bare ønsker å åpne et samtalevindu til en "
-"kontakt\n"
-"uten å sende noen beskjed først, kan du gjøre slik:\n"
-"\tgaim-remote uri aim:goim?screenname=Penguin\n"
-"\n"
-"For å bli med i en samtale:\n"
-"\tgaim-remote uri aim:gochat?roomname=PenguinLounge\n"
-"...starter en samtale i PenguinLounge-samtalerommet.\n"
-"\n"
-"For å legge til en kontakt i kontaktlisten:\n"
-"\tgaim-remote uri aim:addbuddy?screenname=Penguin\n"
-"...vil spørre deg om å legge til Penguin i kontaktlisten.\n"
-
-#: src/gaim-remote.c:239
-msgid ""
-"\n"
-"Close running copy of Gaim\n"
-msgstr ""
-"\n"
-"Lukk eksisterende Gaim-program\n"
-
-#: src/gaim-remote.c:243
-msgid ""
-"\n"
-"Mark all accounts as \"away\" with the default message.\n"
-msgstr ""
-"\n"
-"Merk alle kontoer som \"fraværende\" med standardmeldingen.\n"
-
-#: src/gaim-remote.c:247
-msgid ""
-"\n"
-"Set all accounts as not away.\n"
-msgstr ""
-"\n"
-"Sett alle kontoers status til ikke fraværende.\n"
-
-#: src/gtkaccount.c:331
+#: src/gtkaccount.c:363
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -1828,166 +1696,154 @@
 "<b>Bildestørrelse:</b> %dx%d"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:638
+#: src/gtkaccount.c:731
 msgid "Login Options"
 msgstr "Innloggingsvalg"
 
-#: src/gtkaccount.c:655 src/gtkft.c:585
+#: src/gtkaccount.c:748 src/gtkft.c:623
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: src/gtkaccount.c:660 src/gtkblist.c:4158
+#: src/gtkaccount.c:753 src/gtkblist.c:4038
 msgid "Screen Name:"
 msgstr "Skjermnavn:"
 
-#: src/gtkaccount.c:733
+#: src/gtkaccount.c:826
 msgid "Password:"
 msgstr "Passord:"
 
-#: src/gtkaccount.c:738 src/gtkblist.c:4172 src/gtkblist.c:4519
+#: src/gtkaccount.c:831 src/gtkblist.c:4052 src/gtkblist.c:4431
 msgid "Alias:"
 msgstr "Alias:"
 
-#: src/gtkaccount.c:742
+#: src/gtkaccount.c:835
 msgid "Remember password"
 msgstr "Husk passord"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:798
+#: src/gtkaccount.c:880
 msgid "User Options"
 msgstr "Brukervalg"
 
-#: src/gtkaccount.c:811
+#: src/gtkaccount.c:893
 msgid "New mail notifications"
 msgstr "Varsling om ny e-post"
 
-#: src/gtkaccount.c:820
+#: src/gtkaccount.c:902
 msgid "Buddy icon:"
 msgstr "Kontaktikon:"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:909
+#: src/gtkaccount.c:991
 #, c-format
 msgid "%s Options"
 msgstr "%s brukervalg"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:1048 src/gtkaccount.c:1095
+#: src/gtkaccount.c:1129 src/gtkaccount.c:1176
 msgid "Use Global Proxy Settings"
 msgstr "Bruk globale proxyinnstilinger"
 
 #. No Proxy
-#: src/gtkaccount.c:1054 src/gtkaccount.c:1102
+#: src/gtkaccount.c:1135 src/gtkaccount.c:1183
 msgid "No Proxy"
 msgstr "Ingen proxy"
 
 #. HTTP
-#: src/gtkaccount.c:1060 src/gtkaccount.c:1109
+#: src/gtkaccount.c:1141 src/gtkaccount.c:1190
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:1066 src/gtkaccount.c:1116
+#: src/gtkaccount.c:1147 src/gtkaccount.c:1197
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:1072 src/gtkaccount.c:1123
+#: src/gtkaccount.c:1153 src/gtkaccount.c:1204
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #
 #. Use Environmental Settings
-#: src/gtkaccount.c:1078 src/gtkaccount.c:1130 src/gtkprefs.c:1190
+#: src/gtkaccount.c:1159 src/gtkaccount.c:1211 src/gtkprefs.c:1041
 msgid "Use Environmental Settings"
 msgstr "Bruk innstillinger fra miljøet"
 
-#: src/gtkaccount.c:1169
+#: src/gtkaccount.c:1250
 msgid "you can see the butterflies mating"
 msgstr "sommerfugler svermer"
 
-#: src/gtkaccount.c:1173
+#: src/gtkaccount.c:1254
 msgid "If you look real closely"
 msgstr "hvis du ser virkelig godt etter"
 
-#: src/gtkaccount.c:1189
+#: src/gtkaccount.c:1270
 msgid "Proxy Options"
 msgstr "Proxyinnstillinger"
 
-#: src/gtkaccount.c:1207 src/gtkprefs.c:1184
+#: src/gtkaccount.c:1288 src/gtkprefs.c:1035
 msgid "Proxy _type:"
 msgstr "Proxytype:"
 
-#: src/gtkaccount.c:1216 src/gtkprefs.c:1211
+#: src/gtkaccount.c:1297 src/gtkprefs.c:1056
 msgid "_Host:"
 msgstr "Adresse:"
 
-#: src/gtkaccount.c:1220 src/gtkprefs.c:1229
+#: src/gtkaccount.c:1301 src/gtkprefs.c:1074
 msgid "_Port:"
 msgstr "_Port:"
 
-#: src/gtkaccount.c:1228
+#: src/gtkaccount.c:1309
 msgid "_Username:"
 msgstr "_Brukernavn:"
 
-#: src/gtkaccount.c:1233 src/gtkprefs.c:1266
+#: src/gtkaccount.c:1314 src/gtkprefs.c:1111
 msgid "Pa_ssword:"
 msgstr "Passord:"
 
-#: src/gtkaccount.c:1604
+#: src/gtkaccount.c:1720
 msgid "Add Account"
 msgstr "Legg til konto"
 
-#: src/gtkaccount.c:1606
+#: src/gtkaccount.c:1722
 msgid "Modify Account"
 msgstr "Endre konto"
 
-#. Add the disclosure
-#: src/gtkaccount.c:1630
-msgid "Show more options"
-msgstr "Vis flere valg"
-
-#: src/gtkaccount.c:1631
-msgid "Show fewer options"
-msgstr "Vis færre valg"
-
 #. Register button
-#: src/gtkaccount.c:1658 src/protocols/jabber/jabber.c:677
+#: src/gtkaccount.c:1770 src/protocols/jabber/jabber.c:706
 msgid "Register"
 msgstr "Registrer"
 
-#: src/gtkaccount.c:2023
+#: src/gtkaccount.c:2102 src/gtksavedstatuses.c:184
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Er du sikker på at du vil slette %s?"
 
-#: src/gtkaccount.c:2028 src/gtkrequest.c:247
+#: src/gtkaccount.c:2107 src/gtkrequest.c:264 src/gtksavedstatuses.c:187
 msgid "Delete"
 msgstr "Slett"
 
-#: src/gtkaccount.c:2142 src/protocols/oscar/oscar.c:4331
+#: src/gtkaccount.c:2171 src/gtksavedstatuses.c:629
+#: src/protocols/oscar/oscar.c:5055
 msgid "Screen Name"
 msgstr "Skjermnavn"
 
-#: src/gtkaccount.c:2166 src/protocols/jabber/jabber.c:996
-#: src/protocols/oscar/oscar.c:690 src/protocols/oscar/oscar.c:5786
-#: src/protocols/oscar/oscar.c:6984 src/protocols/silc/silc.c:45
-#: src/protocols/yahoo/yahoo.c:2701 src/protocols/zephyr/zephyr.c:2122
-#: src/protocols/zephyr/zephyr.c:2141
-msgid "Online"
-msgstr "Pålogget"
-
-#: src/gtkaccount.c:2187
+#: src/gtkaccount.c:2194
+#, fuzzy
+msgid "Enabled"
+msgstr "Feilet."
+
+#: src/gtkaccount.c:2202
 msgid "Protocol"
 msgstr "Protokoll"
 
-#. XXX: Tidy this up when not in string freeze
-#: src/gtkaccount.c:2521 src/protocols/jabber/presence.c:202
+#: src/gtkaccount.c:2545
 #, 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:2535 src/protocols/jabber/presence.c:208
+#: src/gtkaccount.c:2559
 msgid ""
 "\n"
 "\n"
@@ -1997,250 +1853,234 @@
 "\n"
 "Ønsker du å legge vedkommende til i din kontaktliste?"
 
-#: src/gtkaccount.c:2561
-msgid "Information"
-msgstr "Informasjon"
-
-#: src/gtkaccount.c:2565 src/gtkaccount.c:2596
-#: src/protocols/jabber/presence.c:210
+#: src/gtkaccount.c:2567
 msgid "Add buddy to your list?"
 msgstr "Legg til kontakten i listen din?"
 
-#. Add button
-#: src/gtkaccount.c:2567 src/gtkaccount.c:2598 src/gtkblist.c:4571
-#: src/gtkconv.c:1522 src/gtkconv.c:3895 src/gtkconv.c:3966
-#: src/gtkrequest.c:248 src/protocols/icq/gaim_icq.c:276
-#: src/protocols/jabber/presence.c:212 src/protocols/oscar/oscar.c:3958
-#: src/protocols/silc/chat.c:593
+#: src/gtkaccount.c:2569 src/gtkblist.c:4483 src/gtkconv.c:1501
+#: src/gtkrequest.c:265 src/protocols/gg/gg.c:655
+#: src/protocols/oscar/oscar.c:4680 src/protocols/silc/chat.c:594
 msgid "Add"
 msgstr "Legg til"
 
-#: src/gtkblist.c:846
+#: src/gtkblist.c:595
 msgid "Join a Chat"
 msgstr "Bli med i en samtalegruppe"
 
-#: src/gtkblist.c:867
+#: src/gtkblist.c:616
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr ""
 "Vennligst skriv inn informasjon om samtalegruppen du ønsker å bli med i.\n"
 
-#: src/gtkblist.c:878 src/gtkpounce.c:415 src/gtkroomlist.c:354
+#: src/gtkblist.c:627 src/gtkpounce.c:415 src/gtkroomlist.c:354
 msgid "_Account:"
 msgstr "Konto:"
 
-#: src/gtkblist.c:1173 src/gtkblist.c:3323
+#: src/gtkblist.c:935
 msgid "Get _Info"
 msgstr "_Info"
 
-#: src/gtkblist.c:1176 src/gtkblist.c:3313
+#: src/gtkblist.c:938
 msgid "I_M"
 msgstr "Direkte_melding"
 
-#: src/gtkblist.c:1182
+#: src/gtkblist.c:944
 msgid "_Send File"
 msgstr "_Send fil"
 
-#: src/gtkblist.c:1188
+#: src/gtkblist.c:950
 msgid "Add Buddy _Pounce"
 msgstr "Legg til kompisvarsling"
 
-#: src/gtkblist.c:1190 src/gtkblist.c:1287
+#: src/gtkblist.c:954 src/gtkblist.c:958 src/gtkblist.c:1056
+#: src/gtkblist.c:1079
 msgid "View _Log"
 msgstr "Vis _logg"
 
-#: src/gtkblist.c:1200
+#: src/gtkblist.c:969
 msgid "_Alias Buddy..."
 msgstr "_Alias for kontakt..."
 
-#: src/gtkblist.c:1202
+#: src/gtkblist.c:971
 msgid "_Remove Buddy"
 msgstr "Fje_rn kontakt"
 
 #
-#: src/gtkblist.c:1204
+#: src/gtkblist.c:973
 #, fuzzy
 msgid "Alias Contact..."
 msgstr "Kontaktalias..."
 
 #
-#: src/gtkblist.c:1207 src/gtkdialogs.c:876 src/gtkdialogs.c:878
+#: src/gtkblist.c:976 src/gtkdialogs.c:807 src/gtkdialogs.c:808
 msgid "Remove Contact"
 msgstr "Fje_rn kontakt"
 
-#: src/gtkblist.c:1211 src/gtkblist.c:1295 src/gtkblist.c:1309
+#: src/gtkblist.c:980 src/gtkblist.c:1064 src/gtkblist.c:1085
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: src/gtkblist.c:1213 src/gtkblist.c:1297 src/gtkblist.c:1314
-#: src/gtkconn.c:367
+#: src/gtkblist.c:982 src/gtkblist.c:1066 src/gtkblist.c:1087
 msgid "_Remove"
 msgstr "Fje_rn"
 
-#: src/gtkblist.c:1259
+#: src/gtkblist.c:1028
 msgid "Add a _Buddy"
 msgstr "Legg til kompis"
 
-#: src/gtkblist.c:1261
+#: src/gtkblist.c:1030
 msgid "Add a C_hat"
 msgstr "Legg til samtalegruppe"
 
-#: src/gtkblist.c:1263
+#: src/gtkblist.c:1032
 msgid "_Delete Group"
 msgstr "Slett gruppe"
 
-#: src/gtkblist.c:1265
+#: src/gtkblist.c:1034
 msgid "_Rename"
 msgstr "End_re navn"
 
 #. join button
-#: src/gtkblist.c:1283 src/gtkroomlist.c:264 src/gtkroomlist.c:409
-#: src/stock.c:88
+#: src/gtkblist.c:1052 src/gtkroomlist.c:264 src/gtkroomlist.c:409
+#: src/gtkstock.c:119
 msgid "_Join"
 msgstr "_Bli med i samtalegruppe"
 
-#: src/gtkblist.c:1285
+#: src/gtkblist.c:1054
 msgid "Auto-Join"
 msgstr "Automatisk pålogging"
 
-#: src/gtkblist.c:1311 src/gtkblist.c:1336
+#: src/gtkblist.c:1092 src/gtkblist.c:1115
 msgid "_Collapse"
 msgstr "_Lukk"
 
-#: src/gtkblist.c:1341
+#: src/gtkblist.c:1120
 msgid "_Expand"
 msgstr "_Utvid"
 
-#: src/gtkblist.c:2016 src/gtkconv.c:4538 src/gtkpounce.c:316
+#: src/gtkblist.c:1347 src/gtkblist.c:1357 src/gtkblist.c:3316
+#: src/gtkblist.c:3319
+#, fuzzy
+msgid "/Tools/Mute Sounds"
+msgstr "Skru av lyder"
+
+#: src/gtkblist.c:1816 src/gtkconv.c:3719 src/gtkpounce.c:314
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "Du er ikke pålogget med noen kontoer som kan legge til den kontakten."
 
 #. Buddies menu
-#: src/gtkblist.c:2437
+#: src/gtkblist.c:2323
 msgid "/_Buddies"
 msgstr "/_Kontakter"
 
-#: src/gtkblist.c:2438
+#: src/gtkblist.c:2324
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Kontakter/_Ny direktemelding..."
 
-#: src/gtkblist.c:2439
+#: src/gtkblist.c:2325
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Kontakter/_Bli med i samtalegruppe..."
 
-#: src/gtkblist.c:2440
+#: src/gtkblist.c:2326
 msgid "/Buddies/Get User _Info..."
 msgstr "/Kontakter/_Hent brukerinfo..."
 
-#: src/gtkblist.c:2441
+#: src/gtkblist.c:2327
 msgid "/Buddies/View User _Log..."
 msgstr "/Kontakter/Hent bruker_logg..."
 
-#: src/gtkblist.c:2443
+#: src/gtkblist.c:2329
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Kontakter/_Vis avloggede kontakter"
 
-#: src/gtkblist.c:2444
+#: src/gtkblist.c:2330
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Kontakter/Vis _tomme grupper"
 
-#: src/gtkblist.c:2445
+#: src/gtkblist.c:2331
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Kontakter/_Legg til kompis..."
 
-#: src/gtkblist.c:2446
+#: src/gtkblist.c:2332
 msgid "/Buddies/Add C_hat..."
 msgstr "/Kontakter/Legg til _samtalegruppe..."
 
-#: src/gtkblist.c:2447
+#: src/gtkblist.c:2333
 msgid "/Buddies/Add _Group..."
 msgstr "/Kontakter/Legg til _gruppe..."
 
-#: src/gtkblist.c:2449
-msgid "/Buddies/_Signoff"
-msgstr "/Kontakter/L_ogge av"
-
-#: src/gtkblist.c:2450
+#: src/gtkblist.c:2335
 msgid "/Buddies/_Quit"
 msgstr "/Kontakter/_Avslutt"
 
 #. Tools
-#: src/gtkblist.c:2453
+#: src/gtkblist.c:2338
 msgid "/_Tools"
 msgstr "/_Verktøy"
 
-#: src/gtkblist.c:2454
-msgid "/Tools/_Away"
-msgstr "/Verktøy/_Borte"
-
-#: src/gtkblist.c:2455
+#: src/gtkblist.c:2339
 msgid "/Tools/Buddy _Pounce"
 msgstr "/Verktøy/_Kompisvarsling"
 
-#: src/gtkblist.c:2456
+#: src/gtkblist.c:2340
 msgid "/Tools/Account Ac_tions"
 msgstr "/Verktøy/_Handlinger for kontoer"
 
-#: src/gtkblist.c:2457
-msgid "/Tools/Pl_ugin Actions"
-msgstr "/Verktøy/Handlinger for tillegg"
-
-#: src/gtkblist.c:2459
+#: src/gtkblist.c:2342
 msgid "/Tools/A_ccounts"
 msgstr "/Verktøy/K_ontoer"
 
-#: src/gtkblist.c:2460
+#: src/gtkblist.c:2343
+msgid "/Tools/Pr_eferences"
+msgstr "/Verktøy/_Innstillinger"
+
+#: src/gtkblist.c:2344
+#, fuzzy
+msgid "/Tools/P_lugins"
+msgstr "/Verktøy/Handlinger for tillegg"
+
+#: src/gtkblist.c:2345
+msgid "/Tools/Pr_ivacy"
+msgstr "/Verktøy/_Sikkerhet"
+
+#: src/gtkblist.c:2346
 msgid "/Tools/_File Transfers"
 msgstr "/Verktøy/_Filoverføringer..."
 
-#: src/gtkblist.c:2461
+#: src/gtkblist.c:2347
 msgid "/Tools/R_oom List"
 msgstr "/Verktøy/_Romliste"
 
-#: src/gtkblist.c:2462
-msgid "/Tools/Pr_eferences"
-msgstr "/Verktøy/_Innstillinger"
-
-#: src/gtkblist.c:2463
-msgid "/Tools/Pr_ivacy"
-msgstr "/Verktøy/_Sikkerhet"
-
-#: src/gtkblist.c:2465
+#: src/gtkblist.c:2349
+#, fuzzy
+msgid "/Tools/Mute _Sounds"
+msgstr "Skru av lyder"
+
+#: src/gtkblist.c:2350
 msgid "/Tools/View System _Log"
 msgstr "/Verktøy/_Vis systemlogg"
 
 #. Help
-#: src/gtkblist.c:2468
+#: src/gtkblist.c:2353
 msgid "/_Help"
 msgstr "/_Hjelp"
 
-#: src/gtkblist.c:2469
+#: src/gtkblist.c:2354
 msgid "/Help/Online _Help"
 msgstr "/Hjelp/Hjelp på _nettet"
 
-#: src/gtkblist.c:2470
+#: src/gtkblist.c:2355
 msgid "/Help/_Debug Window"
 msgstr "/Hjelp/_Avlusningsvindu"
 
-#: src/gtkblist.c:2471
+#: src/gtkblist.c:2356
 msgid "/Help/_About"
 msgstr "/Hjelp/_Om"
 
-#: src/gtkblist.c:2489
-msgid "Rename Group"
-msgstr "Endre gruppenavn"
-
-#: src/gtkblist.c:2489
-msgid "New group name"
-msgstr "Nytt gruppenavn:"
-
-#: src/gtkblist.c:2490
-msgid "Please enter a new name for the selected group."
-msgstr "Vennligst skriv inn nytt navn for gruppen."
-
-#: src/gtkblist.c:2519
+#: src/gtkblist.c:2388 src/gtkblist.c:2455
 #, c-format
 msgid ""
 "\n"
@@ -2249,7 +2089,62 @@
 "\n"
 "<b>Konto:</b> %s"
 
-#: src/gtkblist.c:2585
+#
+#: src/gtkblist.c:2464
+#, fuzzy, c-format
+msgid ""
+"\n"
+"<b>Contact Alias:</b> %s"
+msgstr ""
+"\n"
+"<b>Kontaktalias:</b>"
+
+#: src/gtkblist.c:2472
+#, fuzzy, c-format
+msgid ""
+"\n"
+"<b>Alias:</b> %s"
+msgstr ""
+"\n"
+"<b>Alias:</b>"
+
+#: src/gtkblist.c:2480
+#, fuzzy, c-format
+msgid ""
+"\n"
+"<b>Nickname:</b> %s"
+msgstr ""
+"\n"
+"<b>Kallenavn:</b>"
+
+#: src/gtkblist.c:2489
+#, fuzzy, c-format
+msgid ""
+"\n"
+"<b>Logged In:</b> %s"
+msgstr ""
+"\n"
+"<b>Pålogget:</b> "
+
+#: src/gtkblist.c:2501
+#, fuzzy, c-format
+msgid ""
+"\n"
+"<b>Idle:</b> %s"
+msgstr ""
+"\n"
+"<b>Inaktiv:</b>"
+
+#: src/gtkblist.c:2537
+#, fuzzy, c-format
+msgid ""
+"\n"
+"<b>Last Seen:</b> %s ago"
+msgstr ""
+"\n"
+"<b>%s:</b> %s"
+
+#: src/gtkblist.c:2545
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2257,69 +2152,7 @@
 "\n"
 "<b>Status:</b> Avlogget"
 
-#: src/gtkblist.c:2600
-#, c-format
-msgid "%d%%"
-msgstr "%d%%"
-
-#: src/gtkblist.c:2616
-msgid ""
-"\n"
-"<b>Account:</b>"
-msgstr ""
-"\n"
-"<b>Konto:</b>"
-
-#
-#: src/gtkblist.c:2617
-msgid ""
-"\n"
-"<b>Contact Alias:</b>"
-msgstr ""
-"\n"
-"<b>Kontaktalias:</b>"
-
-#: src/gtkblist.c:2618
-msgid ""
-"\n"
-"<b>Alias:</b>"
-msgstr ""
-"\n"
-"<b>Alias:</b>"
-
-#: src/gtkblist.c:2619
-msgid ""
-"\n"
-"<b>Nickname:</b>"
-msgstr ""
-"\n"
-"<b>Kallenavn:</b>"
-
-#: src/gtkblist.c:2620
-msgid ""
-"\n"
-"<b>Logged In:</b>"
-msgstr ""
-"\n"
-"<b>Pålogget:</b> "
-
-#: src/gtkblist.c:2621
-msgid ""
-"\n"
-"<b>Idle:</b>"
-msgstr ""
-"\n"
-"<b>Inaktiv:</b>"
-
-#: src/gtkblist.c:2622
-msgid ""
-"\n"
-"<b>Warned:</b>"
-msgstr ""
-"\n"
-"<b>Advart:</b>"
-
-#: src/gtkblist.c:2624
+#: src/gtkblist.c:2568
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2327,124 +2160,123 @@
 "\n"
 "<b>Beskrivelse:</b> Skummel"
 
-#: src/gtkblist.c:2625
+#: src/gtkblist.c:2570
+#, fuzzy
 msgid ""
 "\n"
-"<b>Status</b>: Awesome"
+"<b>Status:</b> Awesome"
 msgstr ""
 "\n"
 "<b>Status:</b> Fantastisk"
 
-#: src/gtkblist.c:2626
+#: src/gtkblist.c:2572
+#, fuzzy
 msgid ""
 "\n"
-"<b>Status</b>: Rockin'"
+"<b>Status:</b> Rockin'"
 msgstr ""
 "\n"
 "<b>Status:</b> Rockin'"
 
-#: src/gtkblist.c:2908
-#, c-format
-msgid "Idle (%dh%02dm) "
+#: src/gtkblist.c:2834
+#, fuzzy, c-format
+msgid "Idle (%dh %02dm) "
 msgstr "Inaktiv (%dt%02dm) "
 
-#: src/gtkblist.c:2910
+#: src/gtkblist.c:2836
 #, c-format
 msgid "Idle (%dm) "
 msgstr "Inaktiv (%dm) "
 
-#: src/gtkblist.c:2915
-#, c-format
-msgid "Warned (%d%%) "
-msgstr "Advart (%d%%) "
-
-#: src/gtkblist.c:2918
+#: src/gtkblist.c:2839
+#, fuzzy
+msgid "Idle "
+msgstr "Inaktiv"
+
+#: src/gtkblist.c:2843
 msgid "Offline "
 msgstr "Avlogget"
 
-#. Make menu items sensitive/insensitive where appropriate
-#: src/gtkblist.c:3036
+#: src/gtkblist.c:2959
+#, fuzzy
+msgid "/Buddies/New Instant Message..."
+msgstr "/Kontakter/_Ny direktemelding..."
+
+#: src/gtkblist.c:2960 src/gtkblist.c:2994
 msgid "/Buddies/Join a Chat..."
 msgstr "/Kontakter/_Bli med i samtalegruppe..."
 
-#: src/gtkblist.c:3039
+#: src/gtkblist.c:2961
+#, fuzzy
+msgid "/Buddies/Get User Info..."
+msgstr "/Kontakter/_Hent brukerinfo..."
+
+#: src/gtkblist.c:2962
+#, fuzzy
+msgid "/Buddies/Add Buddy..."
+msgstr "/Kontakter/_Legg til kompis..."
+
+#: src/gtkblist.c:2963
+#, fuzzy
+msgid "/Buddies/Add Chat..."
+msgstr "/Kontakter/Legg til _samtalegruppe..."
+
+#: src/gtkblist.c:2964
+#, fuzzy
+msgid "/Buddies/Add Group..."
+msgstr "/Kontakter/Legg til _gruppe..."
+
+#: src/gtkblist.c:2997
 msgid "/Tools/Room List"
 msgstr "/Verktøy/_Romliste"
 
-#: src/gtkblist.c:3042
+#: src/gtkblist.c:3000
 msgid "/Tools/Privacy"
 msgstr "/Verktøy/Blo_kkeringer"
 
-#: src/gtkblist.c:3124
+#: src/gtkblist.c:3076 src/protocols/jabber/jabber.c:982
+#: src/protocols/yahoo/yahoo.c:2776
+msgid "None"
+msgstr "Ingen"
+
+#: src/gtkblist.c:3078
 msgid "Alphabetical"
 msgstr "Alfabetisk"
 
-#: src/gtkblist.c:3125
+#: src/gtkblist.c:3079
 msgid "By status"
 msgstr "Etter status"
 
-#: src/gtkblist.c:3126
+#: src/gtkblist.c:3080
 msgid "By log size"
 msgstr "Etter loggstørrelse"
 
 #: src/gtkblist.c:3192
-msgid "/Tools/Away"
-msgstr "/Verktøy/Borte"
-
-#: src/gtkblist.c:3195
 msgid "/Tools/Buddy Pounce"
 msgstr "/Verktøy/Kompisvarsel"
 
-#: src/gtkblist.c:3198
+#: src/gtkblist.c:3193
 msgid "/Tools/Account Actions"
 msgstr "/Verktøy/_Handlinger for kontoe"
 
-#: src/gtkblist.c:3201
-msgid "/Tools/Plugin Actions"
-msgstr "/Verktøy/Handlinger for tillegg"
-
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:3292
+#: src/gtkblist.c:3312
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Kontakter/Vis _avloggede kontakter"
 
-#: src/gtkblist.c:3294
+#: src/gtkblist.c:3314
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Kontakter/Vis tomme grupper"
 
-#: src/gtkblist.c:3319
-msgid "Send a message to the selected buddy"
-msgstr "Send beskjed til den valgte kontakten"
-
-#: src/gtkblist.c:3329
-msgid "Get information on the selected buddy"
-msgstr "Hent informasjon om den valgte kontakten"
-
-#: src/gtkblist.c:3333
-msgid "_Chat"
-msgstr "_Gruppesamtale"
-
-#: src/gtkblist.c:3338
-msgid "Join a chat room"
-msgstr "Bli med i samtalegruppe"
-
-#: src/gtkblist.c:3343
-msgid "_Away"
-msgstr "_Borte"
-
-#: src/gtkblist.c:3348
-msgid "Set an away message"
-msgstr "Sett en fraværsbeskjed"
-
-#: src/gtkblist.c:4112 src/protocols/silc/buddy.c:731
-#: src/protocols/silc/buddy.c:989 src/protocols/silc/buddy.c:1034
-#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2868
+#: src/gtkblist.c:3992 src/protocols/silc/buddy.c:736
+#: src/protocols/silc/buddy.c:994 src/protocols/silc/buddy.c:1039
+#: src/protocols/silc/buddy.c:1129 src/protocols/yahoo/yahoo.c:2874
 msgid "Add Buddy"
 msgstr "Legg til kontakt"
 
-#: src/gtkblist.c:4136
+#: src/gtkblist.c:4016
 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. "
@@ -2456,153 +2288,125 @@
 "mulig.\n"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:4196 src/gtkblist.c:4499
+#: src/gtkblist.c:4079 src/gtkblist.c:4411
 msgid "Account:"
 msgstr "Konto:"
 
-#: src/gtkblist.c:4432
+#: src/gtkblist.c:4344
 msgid "This protocol does not support chat rooms."
 msgstr "Denne protokollversjonen støtter ikke samtalerom"
 
-#: src/gtkblist.c:4448
+#: src/gtkblist.c:4360
 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:4465
+#: src/gtkblist.c:4377
 msgid "Add Chat"
 msgstr "Legg til samtale"
 
-#: src/gtkblist.c:4489
+#: src/gtkblist.c:4401
 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:4568
+#: src/gtkblist.c:4480
 msgid "Add Group"
 msgstr "Legg til gruppe"
 
-#: src/gtkblist.c:4569
+#: src/gtkblist.c:4481
 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:5138 src/gtkblist.c:5235
+#: src/gtkblist.c:5005
 msgid "No actions available"
 msgstr "Ingen handlinger tilgjengelig"
 
-#: src/gtkconn.c:79 src/gtkconn.c:250 src/gtkconn.c:261
-msgid "Done."
-msgstr "Ferdig."
-
-#: src/gtkconn.c:158
-msgid "Signon: "
-msgstr "Pålogging: "
-
-#: src/gtkconn.c:204
-msgid "Signon"
-msgstr "Pålogging"
-
-#: src/gtkconn.c:216
-msgid "Cancel All"
-msgstr "A_vbryt alle"
-
-#
-#: src/gtkconn.c:367 src/gtkconn.c:600
-msgid "_Reconnect"
-msgstr "Kople til på nytt"
-
-#: src/gtkconn.c:564
-#, c-format
-msgid ""
-"<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
-"\n"
-"%s\n"
-"%s"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">%s har blitt koplet fra.</span>\n"
-"\n"
-"%s\n"
-"%s"
-
-#: src/gtkconn.c:566
-msgid "Reason Unknown."
-msgstr "Ukjent årsak."
-
-#
-#: src/gtkconn.c:605
-msgid "Reconnect _All"
-msgstr "Kople til _alle på nytt"
-
-#
-#: src/gtkconn.c:635
-msgid "Time"
-msgstr "Tid"
+#: src/gtkblist.c:5074
+#, fuzzy
+msgid "/Tools"
+msgstr "/_Verktøy"
+
+#: src/gtkconn.c:190
+#, fuzzy, c-format
+msgid "%s disconnected"
+msgstr "Frakoblet."
+
+#: src/gtkconn.c:191
+#, c-format
+msgid ""
+"%s was disconnected due to an error. %s The account has been disabled. "
+"Correct the error and reenable the account to connect."
+msgstr ""
 
 # Lot "me" stå, var usikker på om denne brukes "teknisk"
 # (denne meldingen kommer opp når du skriver "debug version"
 # - da byttes "me" ut med kallenavn)
-#: src/gtkconv.c:342
+#: src/gtkconv.c:325
 #, c-format
 msgid "me is using Gaim v%s."
 msgstr "me bruker Gaim v%s."
 
-#: src/gtkconv.c:351
+#: src/gtkconv.c:334
 msgid "Supported debug options are:  version"
 msgstr "Støttede avlusningsmuligheter er: version"
 
-#: src/gtkconv.c:375
+#: src/gtkconv.c:371
 msgid "No such command (in this context)."
 msgstr "Ingen slik kommando (i denne sammenheng)."
 
-#: src/gtkconv.c:378
+#: src/gtkconv.c:374
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
 msgstr ""
 
-#: src/gtkconv.c:450
+#: src/gtkconv.c:446
 msgid "No such command."
 msgstr "Ingen slik kommando"
 
-#: src/gtkconv.c:457
+#: src/gtkconv.c:453
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr "Syntaksfeil: Du skrev inn feil antall argumenter til den kommandoen"
 
-#: src/gtkconv.c:462
+#: src/gtkconv.c:458
 msgid "Your command failed for an unknown reason."
 msgstr "Din kommando feilet av ukjent årsak."
 
-#: src/gtkconv.c:469
-msgid "That command only works in Chats, not IMs."
+#: src/gtkconv.c:465
+#, fuzzy
+msgid "That command only works in chats, not IMs."
 msgstr "Den kommandoen virker bare i samtalegrupper, ikke i direktemeldinger"
 
+#: src/gtkconv.c:468
+#, fuzzy
+msgid "That command only works in IMs, not chats."
+msgstr "Den kommandoen virker bare i direktemeldinger, ikke samtalegrupper"
+
 #: src/gtkconv.c:472
-msgid "That command only works in IMs, not Chats."
-msgstr "Den kommandoen virker bare i direktemeldinger, ikke samtalegrupper"
-
-#: src/gtkconv.c:476
 msgid "That command doesn't work on this protocol."
 msgstr "Denne kommandoen virker ikke på denne protokollen"
 
-#: src/gtkconv.c:719 src/gtkconv.c:745
-msgid "That buddy is not on the same protocol as this chat"
+#: src/gtkconv.c:699 src/gtkconv.c:725
+#, fuzzy
+msgid "That buddy is not on the same protocol as this chat."
 msgstr "Denne vennen er ikke på den samme protokollen som denne samtalegruppa"
 
-#: src/gtkconv.c:739
+#: src/gtkconv.c:719
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr ""
 "Du er ikke pålogget pålogget med en konto som kan invitere denne kameraten."
 
-#: src/gtkconv.c:793
+#: src/gtkconv.c:772
 msgid "Invite Buddy Into Chat Room"
 msgstr "Inviter kamerat inn i samtalerom"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:823
+#: src/gtkconv.c:802
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -2610,697 +2414,662 @@
 "Vennligst skriv inn navnet på brukeren som du vil invitere, og en eventuell "
 "invitasjonsbeskjed."
 
-#: src/gtkconv.c:844
+#: src/gtkconv.c:823
 msgid "_Buddy:"
 msgstr "Kontakt:"
 
-#: src/gtkconv.c:864
+#: src/gtkconv.c:843 src/gtksavedstatuses.c:779
 msgid "_Message:"
 msgstr "Beskjed:"
 
-#: src/gtkconv.c:920 src/gtkconv.c:2645 src/gtkdebug.c:182
+#: src/gtkconv.c:900 src/gtkconv.c:2206 src/gtkdebug.c:217 src/gtkft.c:470
 msgid "Unable to open file."
 msgstr "Klarte ikke åpne fil."
 
-#: src/gtkconv.c:925
+#: src/gtkconv.c:906
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Samtale med %s</h1>\n"
 
-#: src/gtkconv.c:939
+#: src/gtkconv.c:930
 msgid "Save Conversation"
 msgstr "Lagre samtale"
 
-#: src/gtkconv.c:1024 src/gtkdebug.c:131
+#: src/gtkconv.c:1030 src/gtkdebug.c:165 src/gtkdebug.c:678
 msgid "Find"
 msgstr "Finn"
 
 #
-#: src/gtkconv.c:1050 src/gtkdebug.c:159
+#: src/gtkconv.c:1056 src/gtkdebug.c:193
 msgid "_Search for:"
 msgstr "_Søk etter:"
 
-#: src/gtkconv.c:1466
+#: src/gtkconv.c:1463
 msgid "IM"
 msgstr "Direktemelding"
 
-#. Send File button
-#: src/gtkconv.c:1475 src/gtkconv.c:3888 src/protocols/oscar/oscar.c:605
+#: src/gtkconv.c:1469 src/protocols/oscar/oscar.c:628
 msgid "Send File"
 msgstr "Send fil"
 
-#: src/gtkconv.c:1484
+#: src/gtkconv.c:1476
 msgid "Un-Ignore"
 msgstr "Fjern ignorer"
 
-#: src/gtkconv.c:1486 src/gtkprefs.c:831
+#: src/gtkconv.c:1479
 msgid "Ignore"
 msgstr "Ignorer"
 
-#. Info button
-#: src/gtkconv.c:1495 src/gtkconv.c:3909
+#: src/gtkconv.c:1485
 msgid "Info"
 msgstr "Info"
 
-#: src/gtkconv.c:1504
-msgid "Get Away Msg"
-msgstr "Hent fraværsbeskjed"
-
-#: src/gtkconv.c:2653
+#: src/gtkconv.c:1491
+#, fuzzy
+msgid "Get Away Message"
+msgstr "Ny fraværsbeskjed"
+
+#: src/gtkconv.c:1498 src/gtkrequest.c:266
+msgid "Remove"
+msgstr "Fjern"
+
+#: src/gtkconv.c:2214
 msgid "Unable to save icon file to disk."
 msgstr "Kan ikke lagre ikonfil."
 
-#: src/gtkconv.c:2675
+#: src/gtkconv.c:2237
 msgid "Save Icon"
 msgstr "Lagre ikon"
 
 #
-#: src/gtkconv.c:2705
+#: src/gtkconv.c:2287
 msgid "Animate"
 msgstr "Animer"
 
-#: src/gtkconv.c:2710
+#: src/gtkconv.c:2292
 msgid "Hide Icon"
 msgstr "Skjul ikon"
 
-#: src/gtkconv.c:2716
+#: src/gtkconv.c:2298
 msgid "Save Icon As..."
 msgstr "Lagre ikon som..."
 
-#: src/gtkconv.c:3093
-msgid "User is typing..."
-msgstr "Brukeren skriver en melding..."
-
-#: src/gtkconv.c:3101
-msgid "User has typed something and paused"
-msgstr "Brukeren har skrevet noe og tatt pause"
-
-#. Build the Send As menu
-#: src/gtkconv.c:3204
-msgid "_Send As"
-msgstr "Send som"
-
 #. Conversation menu
-#: src/gtkconv.c:3658
+#: src/gtkconv.c:2346
 msgid "/_Conversation"
 msgstr "/_Samtale"
 
-#: src/gtkconv.c:3660
+#: src/gtkconv.c:2348
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Samtale/Ny direktemelding..."
 
-#: src/gtkconv.c:3665
+#: src/gtkconv.c:2353
 msgid "/Conversation/_Find..."
 msgstr "/Samtale/_Finn..."
 
 #
-#: src/gtkconv.c:3667
+#: src/gtkconv.c:2355
 msgid "/Conversation/View _Log"
 msgstr "/Samtale/_Vis logg..."
 
-#: src/gtkconv.c:3668
+#: src/gtkconv.c:2356
 msgid "/Conversation/_Save As..."
 msgstr "/Samtale/_Lagre som..."
 
-#: src/gtkconv.c:3670
+#: src/gtkconv.c:2358
 msgid "/Conversation/Clear"
 msgstr "/Samtale/Tøm"
 
-#: src/gtkconv.c:3674
+#: src/gtkconv.c:2362
 msgid "/Conversation/Se_nd File..."
 msgstr "/Samtale/Se_nd fil..."
 
-#: src/gtkconv.c:3675
+#: src/gtkconv.c:2363
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Samtale/Legg til _kompisvarsling"
 
-#: src/gtkconv.c:3677
+#: src/gtkconv.c:2365
 msgid "/Conversation/_Get Info"
 msgstr "/Samtale/_Hent info"
 
-#: src/gtkconv.c:3679
-msgid "/Conversation/_Warn..."
-msgstr "/Samtale/A_dvar..."
-
-#: src/gtkconv.c:3681
+#: src/gtkconv.c:2367
 msgid "/Conversation/In_vite..."
 msgstr "/Samtale/_Inviter..."
 
-#: src/gtkconv.c:3686
-msgid "/Conversation/A_lias..."
-msgstr "/Samtale/_Alias..."
-
-#: src/gtkconv.c:3688
+#: src/gtkconv.c:2372
+#, fuzzy
+msgid "/Conversation/Al_ias..."
+msgstr "/Samtale/Alias..."
+
+#: src/gtkconv.c:2374
 msgid "/Conversation/_Block..."
 msgstr "/Samtale/_Blokker..."
 
-#: src/gtkconv.c:3690
+#: src/gtkconv.c:2376
 msgid "/Conversation/_Add..."
 msgstr "/Samtale/_Legg til..."
 
-#: src/gtkconv.c:3692
+#: src/gtkconv.c:2378
 msgid "/Conversation/_Remove..."
 msgstr "/Samtale/_Fjern..."
 
-#: src/gtkconv.c:3697
+#: src/gtkconv.c:2383
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Samtale/Sett inn len_ke..."
 
-#: src/gtkconv.c:3699
+#: src/gtkconv.c:2385
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Samtale/Sett inn bild_e..."
 
-#: src/gtkconv.c:3704
+#: src/gtkconv.c:2390
 msgid "/Conversation/_Close"
 msgstr "/Samtale/L_ukk"
 
 #. Options
-#: src/gtkconv.c:3708
+#: src/gtkconv.c:2394
 msgid "/_Options"
 msgstr "/_Brukervalg"
 
-#: src/gtkconv.c:3709
+#: src/gtkconv.c:2395
 msgid "/Options/Enable _Logging"
 msgstr "/Brukervalg/Slå på _logging"
 
-#: src/gtkconv.c:3710
+#: src/gtkconv.c:2396
 msgid "/Options/Enable _Sounds"
 msgstr "/Brukervalg/Slå på l_yder"
 
-#: src/gtkconv.c:3711
-msgid "/Options/Show Formatting _Toolbar"
+#: src/gtkconv.c:2397
+#, fuzzy
+msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Brukervalg/Vis _formateringsverktøy"
 
-#: src/gtkconv.c:3712
-msgid "/Options/Show T_imestamps"
-msgstr "/Brukervalg/Vis t_idsstempler"
+#: src/gtkconv.c:2398
+#, fuzzy
+msgid "/Options/Show Ti_mestamps"
+msgstr "/Brukervalg/Vis tidsstempler"
+
+#: src/gtkconv.c:2399
+#, fuzzy
+msgid "/Options/Show Buddy _Icon"
+msgstr "Vis kontaktikoner"
 
 #
-#: src/gtkconv.c:3754
+#: src/gtkconv.c:2439
 msgid "/Conversation/View Log"
 msgstr "/Samtale/Vis logg"
 
-#: src/gtkconv.c:3759
+#: src/gtkconv.c:2445
 msgid "/Conversation/Send File..."
 msgstr "/Samtale/Send fil..."
 
-#: src/gtkconv.c:3763
+#: src/gtkconv.c:2449
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Samtale/Legg til kompisvarsling..."
 
-#: src/gtkconv.c:3769
+#: src/gtkconv.c:2455
 msgid "/Conversation/Get Info"
 msgstr "/Samtale/Hent info"
 
-#: src/gtkconv.c:3773
-msgid "/Conversation/Warn..."
-msgstr "/Samtale/Advar..."
-
-#: src/gtkconv.c:3777
+#: src/gtkconv.c:2459
 msgid "/Conversation/Invite..."
 msgstr "/Samtale/Inviter..."
 
-#: src/gtkconv.c:3783
+#: src/gtkconv.c:2465
 msgid "/Conversation/Alias..."
 msgstr "/Samtale/Alias..."
 
-#: src/gtkconv.c:3787
+#: src/gtkconv.c:2469
 msgid "/Conversation/Block..."
 msgstr "/Samtale/Blokker..."
 
-#: src/gtkconv.c:3791
+#: src/gtkconv.c:2473
 msgid "/Conversation/Add..."
 msgstr "/Samtale/Legg til..."
 
-#: src/gtkconv.c:3795
+#: src/gtkconv.c:2477
 msgid "/Conversation/Remove..."
 msgstr "/Samtale/Fjern..."
 
-#: src/gtkconv.c:3801
+#: src/gtkconv.c:2483
 msgid "/Conversation/Insert Link..."
 msgstr "/Samtale/Sett inn lenke"
 
-#: src/gtkconv.c:3805
+#: src/gtkconv.c:2487
 msgid "/Conversation/Insert Image..."
 msgstr "/Samtale/Sett inn bilde..."
 
-#: src/gtkconv.c:3811
+#: src/gtkconv.c:2493
 msgid "/Options/Enable Logging"
 msgstr "/Brukervalg/Slå på logging"
 
-#: src/gtkconv.c:3814
+#: src/gtkconv.c:2496
 msgid "/Options/Enable Sounds"
 msgstr "/Brukervalg/Slå på lyder"
 
-#: src/gtkconv.c:3817
-msgid "/Options/Show Formatting Toolbar"
+#: src/gtkconv.c:2499
+#, fuzzy
+msgid "/Options/Show Formatting Toolbars"
 msgstr "/Brukervalg/Vis formateringsverktøy"
 
-#: src/gtkconv.c:3820
+#: src/gtkconv.c:2502
 msgid "/Options/Show Timestamps"
 msgstr "/Brukervalg/Vis tidsstempler"
 
-#. The buttons, from left to right
-#. Warn button
-#: src/gtkconv.c:3874
-msgid "Warn"
-msgstr "Advar"
-
-#: src/gtkconv.c:3875
-msgid "Warn the user"
-msgstr "Advar brukeren"
-
-#. Block button
-#: src/gtkconv.c:3881 src/gtkprivacy.c:634 src/gtkprivacy.c:645
-msgid "Block"
-msgstr "Blokker"
-
-#: src/gtkconv.c:3882
-msgid "Block the user"
-msgstr "Blokker brukeren"
-
-#: src/gtkconv.c:3889
-msgid "Send a file to the user"
-msgstr "Send en fil til brukeren"
-
-#: src/gtkconv.c:3896
-msgid "Add the user to your buddy list"
-msgstr "Legg til brukeren i kontaktlisten din"
-
-#: src/gtkconv.c:3903
-msgid "Remove the user from your buddy list"
-msgstr "Fjern brukeren fra kontaktlisten din"
-
-#: src/gtkconv.c:3910 src/gtkconv.c:4245
-msgid "Get the user's information"
-msgstr "Hent brukerinformasjon"
-
-#. Send button
-#: src/gtkconv.c:3916 src/gtkconv.c:3980
-msgid "Send"
-msgstr "Send"
-
-#: src/gtkconv.c:3917 src/gtkconv.c:3981
-msgid "Send message"
-msgstr "Send beskjed"
-
-#. The buttons, from left to right
-#. Invite
-#: src/gtkconv.c:3959
-msgid "Invite"
-msgstr "Inviter"
-
-#: src/gtkconv.c:3960
-msgid "Invite a user"
-msgstr "Inviter en bruker"
-
-#: src/gtkconv.c:3967
-msgid "Add the chat to your buddy list"
-msgstr "Legg til samtalen i kontaktlisten din"
-
-#: src/gtkconv.c:3974
-msgid "Remove the chat from your buddy list"
-msgstr "Fjern samtalen fra kontaktlisten din"
-
-#: src/gtkconv.c:4098
+#: src/gtkconv.c:2505
+#, fuzzy
+msgid "/Options/Show Buddy Icon"
+msgstr "Vis kontaktikoner"
+
+#: src/gtkconv.c:2578
+msgid "User is typing..."
+msgstr "Brukeren skriver en melding..."
+
+#: src/gtkconv.c:2584
+msgid "User has typed something and paused"
+msgstr "Brukeren har skrevet noe og tatt pause"
+
+#. Build the Send As menu
+#: src/gtkconv.c:2722
+#, fuzzy
+msgid "_Send To"
+msgstr "Send som"
+
+#: src/gtkconv.c:3351
 msgid "Topic:"
 msgstr "Tema:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:4161
+#: src/gtkconv.c:3399
 msgid "0 people in room"
 msgstr "0 brukere i rommet"
 
-#: src/gtkconv.c:4222
+#: src/gtkconv.c:3478
 msgid "IM the user"
 msgstr "Send beskjed til bruker"
 
-#: src/gtkconv.c:4234
+#: src/gtkconv.c:3491
 msgid "Ignore the user"
 msgstr "Ignorer bruker"
 
-#: src/gtkconv.c:4833
-msgid "Close conversation"
-msgstr "Lukk samtalen"
-
-#: src/gtkconv.c:5370 src/gtkconv.c:5399 src/gtkconv.c:5495 src/gtkconv.c:5553
+#: src/gtkconv.c:3503
+msgid "Get the user's information"
+msgstr "Hent brukerinformasjon"
+
+#: src/gtkconv.c:4310 src/gtkconv.c:4412 src/gtkconv.c:4467
 #, 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:6130 src/gtkconv.c:6133
-msgid "<main>/Conversation/Close"
-msgstr "<main>/Samtale/Lukk"
-
-#: src/gtkconv.c:6505
+#: src/gtkconv.c:5526
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr ""
 
-#: src/gtkconv.c:6508
+#: src/gtkconv.c:5529
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 
-#: src/gtkconv.c:6511
+#: src/gtkconv.c:5532
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr ""
 
-#: src/gtkconv.c:6515
+#: src/gtkconv.c:5535
+#, fuzzy
+msgid "clear: Clears the conversation scrollback."
+msgstr "%s har lukket samtalevinduet."
+
+#: src/gtkconv.c:5538
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr ""
 
-#: src/gtkdebug.c:197
+#: src/gtkconv.c:5643
+#, fuzzy
+msgid "Confirm close"
+msgstr "Bekrefte konto"
+
+#: src/gtkconv.c:5675
+#, fuzzy
+msgid "You have unread messages. Are you sure you want to close the window?"
+msgstr "Er du sikker på at du vil slette %s?"
+
+#: src/gtkconv.c:6340
+msgid "Close conversation"
+msgstr "Lukk samtalen"
+
+#: src/gtkconv.c:6801
+msgid "Last created window"
+msgstr "Sist lagde vindu"
+
+#: src/gtkconv.c:6803
+msgid "Separate IM and Chat windows"
+msgstr "Skill direktemeldings- og gruppesamtalevinduer."
+
+#: src/gtkconv.c:6805 src/gtkprefs.c:1239
+msgid "New window"
+msgstr "Nytt vindu"
+
+#: src/gtkconv.c:6807
+msgid "By group"
+msgstr "Etter gruppe"
+
+#: src/gtkconv.c:6809
+msgid "By account"
+msgstr "Etter konto"
+
+#: src/gtkdebug.c:232
 msgid "Save Debug Log"
 msgstr "Lagre avlusningslogg"
 
-#: src/gtkdebug.c:250
+#: src/gtkdebug.c:586
+#, fuzzy
+msgid "Invert"
+msgstr "Sett _inn"
+
+#: src/gtkdebug.c:589
+msgid "Highlight matches"
+msgstr ""
+
+#: src/gtkdebug.c:636
 msgid "Debug Window"
 msgstr "Avlusningsvindu"
 
-#: src/gtkdebug.c:288
+#: src/gtkdebug.c:689
+#, fuzzy
+msgid "Clear"
+msgstr "L_ukk"
+
+#: src/gtkdebug.c:698
 msgid "Pause"
 msgstr "Pause"
 
-#: src/gtkdebug.c:294
+#: src/gtkdebug.c:705 src/gtkdebug.c:706
 msgid "Timestamps"
 msgstr "Tidsstempler"
 
-#: src/gtkdialogs.c:63
+#: src/gtkdebug.c:724
+#, fuzzy
+msgid "Filter"
+msgstr "Feilet."
+
+#: src/gtkdebug.c:743
+#, fuzzy
+msgid "Right click for more options."
+msgstr "Vis flere valg"
+
+#: src/gtkdialogs.c:59 src/gtkdialogs.c:90
 msgid "lead developer"
 msgstr "hovedutvikler"
 
-#: src/gtkdialogs.c:64 src/gtkdialogs.c:67 src/gtkdialogs.c:68
+#: src/gtkdialogs.c:60 src/gtkdialogs.c:63 src/gtkdialogs.c:64
+#: src/gtkdialogs.c:65 src/gtkdialogs.c:66 src/gtkdialogs.c:67
 #: src/gtkdialogs.c:69 src/gtkdialogs.c:70 src/gtkdialogs.c:71
-#: src/gtkdialogs.c:73 src/gtkdialogs.c:74 src/gtkdialogs.c:75
 msgid "developer"
 msgstr "utvikler"
 
-#: src/gtkdialogs.c:65
+#: src/gtkdialogs.c:61
 msgid "developer & webmaster"
 msgstr "utvikler og vevansvarlig"
 
-#: src/gtkdialogs.c:66
+#: src/gtkdialogs.c:62
 msgid "win32 port"
 msgstr "windows-versjon"
 
 #
-#: src/gtkdialogs.c:72
+#: src/gtkdialogs.c:68
 msgid "support"
 msgstr "støtte"
 
 #
-#: src/gtkdialogs.c:91
+#: src/gtkdialogs.c:88 src/gtkdialogs.c:91
 msgid "maintainer"
 msgstr "ansvarlig"
 
+#: src/gtkdialogs.c:89
+#, fuzzy
+msgid "libfaim maintainer"
+msgstr "tidligere libfaim-ansvarlig"
+
 #: src/gtkdialogs.c:92
-msgid "former libfaim maintainer"
-msgstr "tidligere libfaim-ansvarlig"
-
-#: src/gtkdialogs.c:93
-msgid "former lead developer"
-msgstr "tidligere hovedutvikler"
-
-#: src/gtkdialogs.c:94
-msgid "former maintainer"
-msgstr "tidligere ansvarlig"
-
-#: src/gtkdialogs.c:95
-msgid "former Jabber developer"
+#, fuzzy
+msgid "Jabber developer"
 msgstr "tidligere jabber-utvikler"
 
 #
-#: src/gtkdialogs.c:96
+#: src/gtkdialogs.c:93
 msgid "original author"
 msgstr "opprinnelig laget av"
 
-#: src/gtkdialogs.c:97
+#: src/gtkdialogs.c:94
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hacker og sjåfør (avslappet fyr)"
 
-#: src/gtkdialogs.c:102
-#, fuzzy
-msgid "Azerbaijani"
-msgstr "Serbisk"
-
-#: src/gtkdialogs.c:103 src/gtkdialogs.c:149
+#: src/gtkdialogs.c:99 src/gtkdialogs.c:100 src/gtkdialogs.c:143
 msgid "Bulgarian"
 msgstr "Bulgarsk"
 
-#: src/gtkdialogs.c:103
-msgid "Vladimira Girginova and Vladimir (Kaladan) Petkov"
-msgstr ""
-
-#: src/gtkdialogs.c:104 src/gtkdialogs.c:150 src/gtkdialogs.c:151
+#: src/gtkdialogs.c:101 src/gtkdialogs.c:144 src/gtkdialogs.c:145
 msgid "Catalan"
 msgstr "Katalansk"
 
-#: src/gtkdialogs.c:105 src/gtkdialogs.c:152
+#: src/gtkdialogs.c:102 src/gtkdialogs.c:146
 msgid "Czech"
 msgstr "Tsjekkisk"
 
 #
-#: src/gtkdialogs.c:106
+#: src/gtkdialogs.c:103
 msgid "Danish"
 msgstr "Dansk"
 
-#: src/gtkdialogs.c:107 src/gtkdialogs.c:153
+#: src/gtkdialogs.c:104 src/gtkdialogs.c:147
 msgid "German"
 msgstr "Tysk"
 
-#: src/gtkdialogs.c:108
+#: src/gtkdialogs.c:105
 msgid "Australian English"
 msgstr "Australsk Engelsk"
 
-#: src/gtkdialogs.c:109
+#: src/gtkdialogs.c:106
+msgid "British English"
+msgstr "Britisk Engelsk"
+
+#: src/gtkdialogs.c:107
 msgid "Canadian English"
 msgstr "Kanadisk Engelsk"
 
-#: src/gtkdialogs.c:110
-msgid "British English"
-msgstr "Britisk Engelsk"
-
-#: src/gtkdialogs.c:111 src/gtkdialogs.c:154
+#: src/gtkdialogs.c:108 src/gtkdialogs.c:148
 msgid "Spanish"
 msgstr "Spansk"
 
 #
-#: src/gtkdialogs.c:112
-msgid "Estonian"
-msgstr "Estisk"
-
-#
-#: src/gtkdialogs.c:113 src/gtkdialogs.c:155
+#: src/gtkdialogs.c:109 src/gtkdialogs.c:149
 msgid "Finnish"
 msgstr "Finsk"
 
-#: src/gtkdialogs.c:114 src/gtkdialogs.c:156
+#: src/gtkdialogs.c:110 src/gtkdialogs.c:150
 msgid "French"
 msgstr "Fransk"
 
-#: src/gtkdialogs.c:115
+#: src/gtkdialogs.c:111
 msgid "Hebrew"
 msgstr "Hebraisk"
 
-#: src/gtkdialogs.c:116 src/gtkdialogs.c:157
+#: src/gtkdialogs.c:112
 msgid "Hindi"
 msgstr "Hindi"
 
-#: src/gtkdialogs.c:117 src/gtkdialogs.c:158
+#: src/gtkdialogs.c:113
 msgid "Hungarian"
 msgstr "Ungarsk"
 
 #
-#: src/gtkdialogs.c:118 src/gtkdialogs.c:159
+#: src/gtkdialogs.c:114 src/gtkdialogs.c:151
 msgid "Italian"
 msgstr "Italiensk"
 
-#: src/gtkdialogs.c:119 src/gtkdialogs.c:160
+#: src/gtkdialogs.c:115 src/gtkdialogs.c:152
 msgid "Japanese"
 msgstr "Japansk"
 
-#: src/gtkdialogs.c:120
+#: src/gtkdialogs.c:116
+msgid "Lithuanian"
+msgstr "Litauisk"
+
+#: src/gtkdialogs.c:117
 #, fuzzy
 msgid "Georgian"
 msgstr "Tysk"
 
-#: src/gtkdialogs.c:121 src/gtkdialogs.c:161
+#: src/gtkdialogs.c:118 src/gtkdialogs.c:153
 msgid "Korean"
 msgstr "Koreansk"
 
-#: src/gtkdialogs.c:122
-msgid "Lithuanian"
-msgstr "Litauisk"
-
-#: src/gtkdialogs.c:123
+#: src/gtkdialogs.c:119
+#, fuzzy
+msgid "Dutch, Flemish"
+msgstr "Nederlansk, flamsk"
+
+#: src/gtkdialogs.c:120
 msgid "Macedonian"
 msgstr "Makedons"
 
+#: src/gtkdialogs.c:121
+msgid "Norwegian"
+msgstr "Norsk"
+
+#
+#: src/gtkdialogs.c:122 src/gtkdialogs.c:123 src/gtkdialogs.c:154
+msgid "Polish"
+msgstr "Polsk"
+
 #: src/gtkdialogs.c:124
-msgid "Burmese"
-msgstr "Burmesisk"
+msgid "Portuguese"
+msgstr "Portugisisk"
 
 #: src/gtkdialogs.c:125
-msgid "Dutch; Flemish"
-msgstr "Nederlansk, flamsk"
-
-#: src/gtkdialogs.c:126
-#, fuzzy
-msgid "Norwegian (Nynorsk)"
-msgstr "Norsk"
-
-#: src/gtkdialogs.c:127 src/gtkdialogs.c:162
-msgid "Norwegian"
-msgstr "Norsk"
-
-#: src/gtkdialogs.c:128
-msgid "Punjabi"
-msgstr ""
-
-#
-#: src/gtkdialogs.c:129 src/gtkdialogs.c:163
-msgid "Polish"
-msgstr "Polsk"
-
-#: src/gtkdialogs.c:130
-msgid "Portuguese"
-msgstr "Portugisisk"
-
-#: src/gtkdialogs.c:131
 msgid "Portuguese-Brazil"
 msgstr "Portugisisk (Brasil)"
 
 #
-#: src/gtkdialogs.c:132
+#: src/gtkdialogs.c:126
 msgid "Romanian"
 msgstr "Rumensk"
 
-#: src/gtkdialogs.c:133 src/gtkdialogs.c:164 src/gtkdialogs.c:165
+#: src/gtkdialogs.c:127 src/gtkdialogs.c:155 src/gtkdialogs.c:156
 msgid "Russian"
 msgstr "Russisk"
 
-#: src/gtkdialogs.c:134
-msgid "Slovenian"
-msgstr "Slovensk"
-
-#
-#: src/gtkdialogs.c:135
-msgid "Albanian"
-msgstr "Albansk"
-
-#: src/gtkdialogs.c:136
+#: src/gtkdialogs.c:128 src/gtkdialogs.c:129
 msgid "Serbian"
 msgstr "Serbisk"
 
-#: src/gtkdialogs.c:137 src/gtkdialogs.c:167 src/gtkdialogs.c:168
+#: src/gtkdialogs.c:130
+msgid "Slovenian"
+msgstr "Slovensk"
+
+#: src/gtkdialogs.c:131 src/gtkdialogs.c:158
 msgid "Swedish"
 msgstr "Svensk"
 
-#: src/gtkdialogs.c:138
-msgid "Turkish"
-msgstr "Tyrkisk"
-
-#: src/gtkdialogs.c:139
-msgid "Ukrainian"
-msgstr "Ukrainsk"
-
-#: src/gtkdialogs.c:140
+#: src/gtkdialogs.c:132
+msgid "Telugu"
+msgstr ""
+
+#: src/gtkdialogs.c:133
 msgid "Vietnamese"
 msgstr "Vietnamesisk"
 
-#: src/gtkdialogs.c:140
+#: src/gtkdialogs.c:133
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr ""
 
-#: src/gtkdialogs.c:141
+#: src/gtkdialogs.c:134 src/gtkdialogs.c:159
 msgid "Simplified Chinese"
 msgstr "Forenklet kinesisk"
 
-#: src/gtkdialogs.c:142
+#: src/gtkdialogs.c:135 src/gtkdialogs.c:136 src/gtkdialogs.c:160
 msgid "Traditional Chinese"
 msgstr "Tradisjonell kinesisk"
 
 #
-#: src/gtkdialogs.c:148
+#: src/gtkdialogs.c:142
 msgid "Amharic"
 msgstr "Amharisk"
 
-#: src/gtkdialogs.c:166
+#: src/gtkdialogs.c:157
 msgid "Slovak"
 msgstr "Slovakisk"
 
-#
-#: src/gtkdialogs.c:169
-msgid "Chinese"
-msgstr "Kinesisk"
-
-#: src/gtkdialogs.c:211
+#: src/gtkdialogs.c:201
 msgid "About Gaim"
 msgstr "Om Gaim"
 
-#: src/gtkdialogs.c:226
-#, c-format
-msgid "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
-
-#: src/gtkdialogs.c:248
+#: src/gtkdialogs.c:225
+#, fuzzy
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
-"at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
+"at once.  It is written using GTK+ and is licensed under the GNU GPL.<BR><BR>"
 msgstr ""
 "Gaim er en modulbasert klient for direktemeldinger som kan bruke AIM, MSN, "
 "Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, og Gadu-"
 "Gadu samtidig. Programmet er bygget på Gtk+ og er lisensiert under GPL."
 "<BR><BR>"
 
-#: src/gtkdialogs.c:258
+#: src/gtkdialogs.c:234
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #wingaim på irc.freenode.net<BR><BR>"
 
-#: src/gtkdialogs.c:261
+#: src/gtkdialogs.c:237
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #gaim på irc.freenode.net<BR><BR>"
 
-#: src/gtkdialogs.c:267
+#: src/gtkdialogs.c:243
 msgid "Active Developers"
 msgstr "Aktive utviklere"
 
-#: src/gtkdialogs.c:282
+#: src/gtkdialogs.c:258
 msgid "Crazy Patch Writers"
 msgstr "folk som har bidratt med rettelser"
 
-#: src/gtkdialogs.c:297
+#: src/gtkdialogs.c:273
 msgid "Retired Developers"
 msgstr "tidligere utviklere"
 
-#: src/gtkdialogs.c:312
+#: src/gtkdialogs.c:288
 msgid "Current Translators"
 msgstr "Aktive oversettere"
 
-#: src/gtkdialogs.c:332
+#: src/gtkdialogs.c:308
 msgid "Past Translators"
 msgstr "Tidligere oversettere"
 
-#: src/gtkdialogs.c:487 src/gtkdialogs.c:629 src/gtkdialogs.c:682
-msgid "_Screen name"
-msgstr "_Skjermnavn"
-
-#: src/gtkdialogs.c:493 src/gtkdialogs.c:635 src/gtkdialogs.c:688
+#: src/gtkdialogs.c:326
+#, fuzzy
+msgid "Debugging Information"
+msgstr "Brukerinformasjon"
+
+#: src/gtkdialogs.c:488 src/gtkdialogs.c:629 src/gtkdialogs.c:684
+#, fuzzy
+msgid "_Name"
+msgstr "Navn"
+
+#: src/gtkdialogs.c:493 src/gtkdialogs.c:634 src/gtkdialogs.c:689
 msgid "_Account"
 msgstr "Konto:"
 
-#: src/gtkdialogs.c:500
+#: src/gtkdialogs.c:501
 msgid "New Instant Message"
 msgstr "Ny direktemelding"
 
-#: src/gtkdialogs.c:502
-msgid "Please enter the screen name of the person you would like to IM."
+#: src/gtkdialogs.c:503
+#, fuzzy
+msgid ""
+"Please enter the screen name or alias of the person you would like to IM."
 msgstr ""
 "Vennligst skriv inn skjermnavnet på den personen du vil sende direktemelding "
 "til."
@@ -3310,88 +3079,74 @@
 msgstr "Hent brukerinfo"
 
 #: src/gtkdialogs.c:644
-msgid ""
-"Please enter the screen name of the person whose info you would like to view."
+#, fuzzy
+msgid ""
+"Please enter the screen name or alias of the person whose info you would "
+"like to view."
 msgstr ""
 "Vennligst skriv inn skjermnavnet til den personen du vil se informasjon om."
 
-#: src/gtkdialogs.c:696
-msgid "Get User Log"
+#: src/gtkdialogs.c:698
+#, fuzzy
+msgid "View User Log"
 msgstr "Hent brukerlogg"
 
-#: src/gtkdialogs.c:698
-msgid ""
-"Please enter the screen name of the person whose log you would like to view."
+#: src/gtkdialogs.c:700
+#, fuzzy
+msgid ""
+"Please enter the screen name or alias of the person whose log you would like "
+"to view."
 msgstr ""
 "Vennligst skriv inn skjermnavnet til den personen du vil se loggen til."
 
-#: src/gtkdialogs.c:738
-msgid "Warn User"
-msgstr "Advar bruker"
-
-#: src/gtkdialogs.c:759
-#, c-format
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
-"\n"
-"This will increase %s's warning level and he or she will be subject to "
-"harsher rate limiting.\n"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Advar %s?</span>\n"
-"\n"
-"Dette vil øke advarselsnivået til %s og vedkommende vil måtte tåle strengere "
-"hastighetsbegrensning.\n"
-
-#: src/gtkdialogs.c:768
-msgid "Warn _anonymously?"
-msgstr "Advar anonymt"
-
-#: src/gtkdialogs.c:775
-msgid "<b>Anonymous warnings are less severe.</b>"
-msgstr "<b>Anonyme advarsler er mindre betydningsfulle.</b>"
-
 #
-#: src/gtkdialogs.c:796
+#: src/gtkdialogs.c:719
 msgid "Alias Contact"
 msgstr "Kontaktalias"
 
 #
-#: src/gtkdialogs.c:797
+#: src/gtkdialogs.c:720
 msgid "Enter an alias for this contact."
 msgstr "Vennligst skriv inn aliasnavn for denne kontakten."
 
-#: src/gtkdialogs.c:799 src/gtkdialogs.c:821 src/gtkdialogs.c:841
-#: src/gtkrequest.c:251 src/protocols/silc/chat.c:584
+#: src/gtkdialogs.c:722 src/gtkdialogs.c:744 src/gtkdialogs.c:764
+#: src/gtkrequest.c:268 src/protocols/silc/chat.c:585
 msgid "Alias"
 msgstr "Alias"
 
-#: src/gtkdialogs.c:817
+#: src/gtkdialogs.c:740
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Oppgi et alias for %s."
 
-#: src/gtkdialogs.c:819
+#: src/gtkdialogs.c:742
 msgid "Alias Buddy"
 msgstr "Alias for kontakt"
 
-#: src/gtkdialogs.c:838
+#: src/gtkdialogs.c:761
 msgid "Alias Chat"
 msgstr "Samtalealias"
 
-#: src/gtkdialogs.c:839
+#: src/gtkdialogs.c:762
 msgid "Enter an alias for this chat."
 msgstr "Vennligst skriv inn aliasnavn for denne samtalegruppa."
 
-#: src/gtkdialogs.c:873
-#, c-format
-msgid ""
+#: src/gtkdialogs.c:799
+#, fuzzy, c-format
+msgid ""
+"You are about to remove the contact containing %s and %d other buddy from "
+"your buddy list.  Do you want to continue?"
+msgid_plural ""
 "You are about to remove the contact containing %s and %d other buddies from "
 "your buddy list.  Do you want to continue?"
-msgstr ""
+msgstr[0] ""
 "Er du sikker på at du vil fjerne kontakten som inneholder %s og %d andre "
 "kontakter fra kontaktlisten din?"
-
-#: src/gtkdialogs.c:934
+msgstr[1] ""
+"Er du sikker på at du vil fjerne kontakten som inneholder %s og %d andre "
+"kontakter fra kontaktlisten din?"
+
+#: src/gtkdialogs.c:866
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -3400,21 +3155,21 @@
 "Er du sikker på at du vil fjerne gruppen %s med alle medlemmer fra "
 "kontaktlisten din?"
 
-#: src/gtkdialogs.c:937 src/gtkdialogs.c:938
+#: src/gtkdialogs.c:869 src/gtkdialogs.c:870
 msgid "Remove Group"
 msgstr "Fjern gruppe"
 
-#: src/gtkdialogs.c:976
+#: src/gtkdialogs.c:908
 #, 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/gtkdialogs.c:979 src/gtkdialogs.c:981
+#: src/gtkdialogs.c:911 src/gtkdialogs.c:912
 msgid "Remove Buddy"
 msgstr "Fjern kontakt"
 
-#: src/gtkdialogs.c:1018
+#: src/gtkdialogs.c:950
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -3422,164 +3177,187 @@
 msgstr ""
 "Er du sikker på at du vil fjerne samtalegruppen %s fra kontaktlisten din?"
 
-#: src/gtkdialogs.c:1021 src/gtkdialogs.c:1022
+#: src/gtkdialogs.c:953 src/gtkdialogs.c:954
 msgid "Remove Chat"
 msgstr "Fjern samtalegruppe"
 
-#: src/gtkft.c:141
+#: src/gtkft.c:138
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f KB/s"
 
 #
-#: src/gtkft.c:162 src/gtkft.c:1012
+#: src/gtkft.c:159 src/gtkft.c:1035
 msgid "Finished"
 msgstr "Ferdig"
 
-#: src/gtkft.c:165 src/gtkft.c:963
+#: src/gtkft.c:162 src/gtkft.c:986
 msgid "Canceled"
 msgstr "Avbrutt"
 
-#: src/gtkft.c:168 src/gtkft.c:882
+#: src/gtkft.c:165 src/gtkft.c:905
 msgid "Waiting for transfer to begin"
 msgstr "Venter på at overføringen skal starte"
 
-#: src/gtkft.c:221
+#: src/gtkft.c:218
 msgid "<b>Receiving As:</b>"
 msgstr "<b>Mottar som:</b>"
 
-#: src/gtkft.c:223
+#: src/gtkft.c:220
 msgid "<b>Receiving From:</b>"
 msgstr "<b>Mottar fra:</b>"
 
-#: src/gtkft.c:227
+#: src/gtkft.c:224
 msgid "<b>Sending To:</b>"
 msgstr "<b>Sender til:</b>"
 
-#: src/gtkft.c:229
+#: src/gtkft.c:226
 msgid "<b>Sending As:</b>"
 msgstr "<b>Sender som:</b>"
 
-#: src/gtkft.c:436
+#: src/gtkft.c:442
 msgid "There is no application configured to open this type of file."
 msgstr "Ingen applikasjon er assosiert med denne filtypen"
 
-#: src/gtkft.c:441
+#: src/gtkft.c:447
 msgid "An error occurred while opening the file."
 msgstr "En feil oppsto under åpningen av filen"
 
-#: src/gtkft.c:533
+#: src/gtkft.c:467
+#, fuzzy, c-format
+msgid "Error launching %s: %s"
+msgstr "Feil under starting av kommando: <b>%s</b>:%s"
+
+#: src/gtkft.c:476
+#, fuzzy, c-format
+msgid "Error running %s"
+msgstr "Klarte ikke bli med i gruppesamtale %s"
+
+#: src/gtkft.c:477
+#, c-format
+msgid "Process returned error code %d"
+msgstr ""
+
+#: src/gtkft.c:572
 msgid "Progress"
 msgstr "Framdrift"
 
-#: src/gtkft.c:540
+#: src/gtkft.c:579
 msgid "Filename"
 msgstr "Filnavn"
 
-#: src/gtkft.c:547
+#: src/gtkft.c:586
 msgid "Size"
 msgstr "Størrelse"
 
-#: src/gtkft.c:554
+#: src/gtkft.c:593
 msgid "Remaining"
 msgstr "Gjenstår"
 
-#: src/gtkft.c:586
+#: src/gtkft.c:624
 msgid "Filename:"
 msgstr "Filnavn:"
 
-#: src/gtkft.c:587
+#: src/gtkft.c:625
 #, fuzzy
 msgid "Local File:"
 msgstr "Lokale brukere"
 
-#: src/gtkft.c:588
+#: src/gtkft.c:626
 msgid "Status:"
 msgstr "Status:"
 
-#: src/gtkft.c:589
+#: src/gtkft.c:627
 msgid "Speed:"
 msgstr "Hastighet:"
 
-#: src/gtkft.c:590
+#: src/gtkft.c:628
 msgid "Time Elapsed:"
 msgstr "Tid brukt:"
 
-#: src/gtkft.c:591
+#: src/gtkft.c:629
 msgid "Time Remaining:"
 msgstr "Tid gjenstår:"
 
-#: src/gtkft.c:683
+#: src/gtkft.c:715
 msgid "_Keep the dialog open"
 msgstr "Hold dialogen åpen"
 
-#: src/gtkft.c:693
-msgid "_Clear finished transfers"
+#: src/gtkft.c:725
+#, fuzzy
+msgid "C_lear finished transfers"
 msgstr "Fjern fullførte overføringer"
 
 #. "Download Details" arrow
-#: src/gtkft.c:702
-msgid "Show transfer details"
-msgstr "Vis overføringsdetaljer"
-
-#: src/gtkft.c:703
-msgid "Hide transfer details"
+#: src/gtkft.c:734
+#, fuzzy
+msgid "File transfer _details"
 msgstr "Skjul overføringsdetaljer"
 
 #. Pause button
-#: src/gtkft.c:745 src/stock.c:92
+#: src/gtkft.c:764 src/gtkstock.c:123
 msgid "_Pause"
 msgstr "_Pause"
 
 #. Resume button
-#: src/gtkft.c:755
+#: src/gtkft.c:774
 msgid "_Resume"
 msgstr "_Fortsett"
 
-#: src/gtkft.c:965
+#: src/gtkft.c:988
 msgid "Failed"
 msgstr "Feilet."
 
-#: src/gtkimhtml.c:693
+#: src/gtkimhtml.c:817
 msgid "Pa_ste As Text"
 msgstr "Li_m inn som tekst"
 
-#: src/gtkimhtml.c:1087
+#: src/gtkimhtml.c:1314
 msgid "Hyperlink color"
 msgstr "Farge på lenke"
 
-#: src/gtkimhtml.c:1088
+#: src/gtkimhtml.c:1315
 msgid "Color to draw hyperlinks."
 msgstr "Farge på lenker"
 
+#: src/gtkimhtml.c:1318
+#, fuzzy
+msgid "Hyperlink prelight color"
+msgstr "Farge på lenke"
+
+#: src/gtkimhtml.c:1319
+#, fuzzy
+msgid "Color to draw hyperlinks when mouse is over them."
+msgstr "Farge på lenker"
+
 #
-#: src/gtkimhtml.c:1296
+#: src/gtkimhtml.c:1538
 msgid "_Copy E-Mail Address"
 msgstr "Kopier e-postadresse"
 
-#: src/gtkimhtml.c:1308
+#: src/gtkimhtml.c:1550
+msgid "_Open Link in Browser"
+msgstr "Åpne i nettleser"
+
+#: src/gtkimhtml.c:1560
 msgid "_Copy Link Location"
 msgstr "Kopier snarvei"
 
-#: src/gtkimhtml.c:1318
-msgid "_Open Link in Browser"
-msgstr "Åpne i nettleser"
-
-#: src/gtkimhtml.c:2915
+#: src/gtkimhtml.c:3239
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
 "Defaulting to PNG."
 msgstr ""
 
-#: src/gtkimhtml.c:2918
+#: src/gtkimhtml.c:3242
 msgid ""
 "Unrecognized file type\n"
 "\n"
 "Defaulting to PNG."
 msgstr ""
 
-#: src/gtkimhtml.c:2931
+#: src/gtkimhtml.c:3255
 #, fuzzy, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -3590,7 +3368,7 @@
 "\n"
 "%s"
 
-#: src/gtkimhtml.c:2934
+#: src/gtkimhtml.c:3258
 #, fuzzy, c-format
 msgid ""
 "Error saving image\n"
@@ -3598,36 +3376,36 @@
 "%s"
 msgstr "Feil under lagring av bilde: %s"
 
-#: src/gtkimhtml.c:3014 src/gtkimhtml.c:3026
+#: src/gtkimhtml.c:3338 src/gtkimhtml.c:3350
 msgid "Save Image"
 msgstr "Lagre bilde"
 
-#: src/gtkimhtml.c:3054
+#: src/gtkimhtml.c:3378
 msgid "_Save Image..."
 msgstr "Lagre bilde..."
 
-#: src/gtkimhtmltoolbar.c:176
+#: src/gtkimhtmltoolbar.c:147
 msgid "Select Font"
 msgstr "Velg skrifttype"
 
-#: src/gtkimhtmltoolbar.c:254
+#: src/gtkimhtmltoolbar.c:226
 msgid "Select Text Color"
 msgstr "Velg tekstfarge"
 
-#: src/gtkimhtmltoolbar.c:328
+#: src/gtkimhtmltoolbar.c:305
 msgid "Select Background Color"
 msgstr "Velg bakgrunnsfarge"
 
-#: src/gtkimhtmltoolbar.c:412
+#: src/gtkimhtmltoolbar.c:394
 msgid "_URL"
 msgstr "_URL"
 
-#: src/gtkimhtmltoolbar.c:420
+#: src/gtkimhtmltoolbar.c:402
 #, fuzzy
 msgid "_Description"
 msgstr "Beskrivelse"
 
-#: src/gtkimhtmltoolbar.c:423
+#: src/gtkimhtmltoolbar.c:405
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -3635,111 +3413,178 @@
 "Vennligst skriv inn URL og beskrivelse av lenka du vil sette inn. "
 "Beskrivelsesfeltet er valgfritt."
 
-#: src/gtkimhtmltoolbar.c:427
+#: src/gtkimhtmltoolbar.c:409
 msgid "Please enter the URL of the link that you want to insert."
 msgstr ""
 "Vennligst skriv inn URL og beskrivelse av lenka du vil sette inn. "
 "Beskrivelsesfeltet er valgfritt."
 
-#: src/gtkimhtmltoolbar.c:432
+#: src/gtkimhtmltoolbar.c:414
 msgid "Insert Link"
 msgstr "Sett inn lenke"
 
-#: src/gtkimhtmltoolbar.c:436
+#: src/gtkimhtmltoolbar.c:418
 msgid "_Insert"
 msgstr "Sett _inn"
 
-#: src/gtkimhtmltoolbar.c:505
+#: src/gtkimhtmltoolbar.c:487
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Klarte ikke å lagre bilde: %s\n"
 
-#: src/gtkimhtmltoolbar.c:531 src/gtkimhtmltoolbar.c:541
+#: src/gtkimhtmltoolbar.c:513 src/gtkimhtmltoolbar.c:523
 msgid "Insert Image"
 msgstr "Sett inn bilde"
 
-#: src/gtkimhtmltoolbar.c:679
+#: src/gtkimhtmltoolbar.c:721
 msgid "This theme has no available smileys."
 msgstr "Dette temaet har ingen tilgjengelige smileys (fjesinger)."
 
 #. show everything
-#: src/gtkimhtmltoolbar.c:694
+#: src/gtkimhtmltoolbar.c:735
 msgid "Smile!"
 msgstr "Smil!"
 
-#: src/gtkimhtmltoolbar.c:912
+#: src/gtkimhtmltoolbar.c:918
 msgid "Bold"
 msgstr "Fet"
 
-#: src/gtkimhtmltoolbar.c:923
+#: src/gtkimhtmltoolbar.c:929
 msgid "Italic"
 msgstr "Kursiv"
 
-#: src/gtkimhtmltoolbar.c:934
+#: src/gtkimhtmltoolbar.c:940
 msgid "Underline"
 msgstr "Understrek"
 
-#: src/gtkimhtmltoolbar.c:950
+#: src/gtkimhtmltoolbar.c:956
 msgid "Larger font size"
 msgstr "Større skrift"
 
-#: src/gtkimhtmltoolbar.c:962
+#: src/gtkimhtmltoolbar.c:968
 msgid "Smaller font size"
 msgstr "Mindre skrift"
 
-#: src/gtkimhtmltoolbar.c:979
+#: src/gtkimhtmltoolbar.c:985
 msgid "Font Face"
 msgstr "Skrifttype"
 
-#: src/gtkimhtmltoolbar.c:991
+#: src/gtkimhtmltoolbar.c:997
 msgid "Foreground font color"
 msgstr "Forgrunnsfarge"
 
-#: src/gtkimhtmltoolbar.c:1003
+#: src/gtkimhtmltoolbar.c:1009
 msgid "Background color"
 msgstr "Bakgrunnsfarge"
 
-#: src/gtkimhtmltoolbar.c:1018
+#: src/gtkimhtmltoolbar.c:1025
+#, fuzzy
+msgid "Clear formatting"
+msgstr "_Fjern formatering"
+
+#: src/gtkimhtmltoolbar.c:1040
 msgid "Insert link"
 msgstr "Sett inn lenke"
 
-#: src/gtkimhtmltoolbar.c:1028
+#: src/gtkimhtmltoolbar.c:1050
 msgid "Insert image"
 msgstr "Sett inn bilde"
 
-#: src/gtkimhtmltoolbar.c:1039
+#: src/gtkimhtmltoolbar.c:1061
 msgid "Insert smiley"
 msgstr "Sett inn smilefjes"
 
-#: src/gtklog.c:316
+#: src/gtklog.c:200
+#, fuzzy, c-format
+msgid "Conversation in %s on %s"
+msgstr "Samtaler med %s"
+
+#: src/gtklog.c:202
+#, fuzzy, c-format
+msgid "Conversation with %s on %s"
+msgstr "Samtaler med %s"
+
+#: src/gtklog.c:374
+#, fuzzy
+msgid "Total log size:"
+msgstr "Etter loggstørrelse"
+
+#: src/gtklog.c:422
+msgid ""
+"System events will only be logged if the <span style=\"italic\">Log all "
+"status changes to system log</span> preference is enabled."
+msgstr ""
+
+#: src/gtklog.c:426
+msgid ""
+"Instant messages will only be logged if the <span style=\"italic\">Log all "
+"instant messages</span> preference is enabled."
+msgstr ""
+
+#: src/gtklog.c:429
+msgid ""
+"Chats will only be logged if the <span style=\"italic\">Log all chats "
+"preference</span> is enabled."
+msgstr ""
+
+#: src/gtklog.c:434
+msgid "No logs were found."
+msgstr ""
+
+#: src/gtklog.c:480
+#, fuzzy, c-format
+msgid "Conversations in %s"
+msgstr "Samtaler med %s"
+
+#: src/gtklog.c:488 src/gtklog.c:539
 #, c-format
 msgid "Conversations with %s"
 msgstr "Samtaler med %s"
 
-#. Window **********
-#: src/gtklog.c:412 src/gtklog.c:429
+#: src/gtklog.c:564
 msgid "System Log"
 msgstr "Systemlogg"
 
+#: src/gtkmain.c:326
+#, c-format
+msgid "Gaim %s. Try `%s -h' for more information.\n"
+msgstr "Gaim %s. Prøv '%s -h' for mer informasjon.\n"
+
+#: src/gtkmain.c:328
+#, c-format
+msgid ""
+"Gaim %s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -a, --acct          display account editor window\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -h, --help          display this help and exit\n"
+"  -n, --nologin       don't automatically login\n"
+"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
+"                      account(s) to use, separated by commas)\n"
+"  -v, --version       display the current version and exit\n"
+msgstr ""
+
 #. Descriptive label
-#: src/gtknotify.c:216
+#: src/gtknotify.c:275
 #, 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:230
+#: src/gtknotify.c:289
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr "<span weight=\"bold\">Fra:</span> %s\n"
 
-#: src/gtknotify.c:239
+#: src/gtknotify.c:298
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr "<span weight=\"bold\">Emne:</span> %s\n"
 
-#: src/gtknotify.c:244
+#: src/gtknotify.c:303
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3750,7 +3595,7 @@
 "\n"
 "%s%s%s%s"
 
-#: src/gtknotify.c:260
+#: src/gtknotify.c:319
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3761,22 +3606,35 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:430
+#: src/gtknotify.c:504
+msgid "Search Results"
+msgstr "Søkeresultater"
+
+#: src/gtknotify.c:643 src/protocols/oscar/oscar.c:4864
+#, c-format
+msgid "Info for %s"
+msgstr "Info for %s"
+
+#: src/gtknotify.c:644 src/protocols/toc/toc.c:470
+msgid "Buddy Information"
+msgstr "Kontaktinformasjon"
+
+#: src/gtknotify.c:687
 #, c-format
 msgid "The browser command <b>%s</b> is invalid."
 msgstr "Nettleserkommandoen <b>%s</b> er ugyldig."
 
-#: src/gtknotify.c:432 src/gtknotify.c:444 src/gtknotify.c:457
-#: src/gtknotify.c:581
+#: src/gtknotify.c:689 src/gtknotify.c:701 src/gtknotify.c:714
+#: src/gtknotify.c:838
 msgid "Unable to open URL"
 msgstr "Kunne ikke åpne URL"
 
-#: src/gtknotify.c:442 src/gtknotify.c:455
+#: src/gtknotify.c:699 src/gtknotify.c:712
 #, c-format
 msgid "Error launching <b>%s</b>: %s"
 msgstr "Feil under starting av kommando: <b>%s</b>:%s"
 
-#: src/gtknotify.c:582
+#: src/gtknotify.c:839
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
@@ -3792,7 +3650,7 @@
 msgstr "Navnet på kontakten du vil varsle."
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:391 src/gtkpounce.c:895
+#: src/gtkpounce.c:391 src/gtkpounce.c:898
 msgid "New Buddy Pounce"
 msgstr "Legg til kompisvarsling"
 
@@ -3888,63 +3746,55 @@
 msgstr "Lagre denne varslingen etter aktivering"
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:902
+#: src/gtkpounce.c:906
 msgid "Remove Buddy Pounce"
 msgstr "Fjern kompisvarsling"
 
-#: src/gtkpounce.c:963
+#: src/gtkpounce.c:964
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s har begynt å skrive til deg (%s)"
 
-#: src/gtkpounce.c:965
+#: src/gtkpounce.c:966
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s har logget på (%s)"
 
-#: src/gtkpounce.c:967
+#: src/gtkpounce.c:968
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s har blitt aktiv igjen (%s)"
 
-#: src/gtkpounce.c:969
+#: src/gtkpounce.c:970
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s har kommet tilbake (%s)"
 
-#: src/gtkpounce.c:971
+#: src/gtkpounce.c:972
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s har sluttet å skrive til deg (%s)"
 
-#: src/gtkpounce.c:973
+#: src/gtkpounce.c:974
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s har logget av (%s)"
 
-#: src/gtkpounce.c:975
+#: src/gtkpounce.c:976
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s har blitt inaktiv (%s)"
 
-#: src/gtkpounce.c:977
+#: src/gtkpounce.c:978
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s er borte. (%s)"
 
-#: src/gtkpounce.c:978
+#: src/gtkpounce.c:979
 msgid "Unknown pounce event. Please report this!"
 msgstr "Ukjent varslingshendelse. Vennligst rapporter dette!"
 
-#: src/gtkprefs.c:447
-msgid "Interface Options"
-msgstr "Valg for grensesnitt"
-
-#: src/gtkprefs.c:449
-msgid "D_isplay remote nicknames if no alias is set"
-msgstr "Vis kallenavn for personer hvis de ikke har noe alias"
-
-#: src/gtkprefs.c:681
+#: src/gtkprefs.c:623
 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."
@@ -3952,48 +3802,58 @@
 "Velg smilefjes-temaet du vil bruke fra listen nedenfor. Nye temaer kan "
 "installeres ved å dra og slippe dem over temalisten."
 
-#: src/gtkprefs.c:721
+#: src/gtkprefs.c:658
 msgid "Icon"
 msgstr "Ikon"
 
-#: src/gtkprefs.c:728 src/gtkprefs.c:2205 src/protocols/jabber/buddy.c:264
-#: src/protocols/jabber/buddy.c:757 src/protocols/jabber/chat.c:743
+#: src/gtkprefs.c:665 src/protocols/jabber/buddy.c:267
+#: src/protocols/jabber/buddy.c:811 src/protocols/jabber/chat.c:769
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: src/gtkprefs.c:824
-msgid "Display"
-msgstr "Vis"
-
-#: src/gtkprefs.c:825
-msgid "Show _timestamp on messages"
-msgstr "Vis tidsstempel på beskjeder"
-
-#: src/gtkprefs.c:828
+#: src/gtkprefs.c:786
+msgid "Buddy List Sorting"
+msgstr "Kontaktlistesortering"
+
+#: src/gtkprefs.c:795
+msgid "_Sorting:"
+msgstr "_Sortering:"
+
+#: src/gtkprefs.c:800
+msgid "Buddy Display"
+msgstr "Kontaktvisning"
+
+#: src/gtkprefs.c:801
+#, fuzzy
+msgid "Show more buddy details"
+msgstr "Vis brukerdetaljer"
+
+#: src/gtkprefs.c:839
+msgid "Send unknown \"_slash\" commands as messages"
+msgstr "Send ukjente \"skråstreks\"-kommandoer som meldinger"
+
+#: src/gtkprefs.c:841
+#, fuzzy
+msgid "Show _formatting on incoming messages"
+msgstr "Vis formateringsverktøylinje"
+
+#: src/gtkprefs.c:843
+msgid "Show buddy _icons"
+msgstr "Vis kontaktikoner"
+
+#: src/gtkprefs.c:845
+msgid "Enable buddy ic_on animation"
+msgstr "Slå på _animasjoner i kontaktikoner"
+
+#: src/gtkprefs.c:847
+msgid "_Notify buddies that you are typing to them"
+msgstr "Varsle kontakter når skriver til dem"
+
+#: src/gtkprefs.c:850
 msgid "_Highlight misspelled words"
 msgstr "Marker stavefeil"
 
-#: src/gtkprefs.c:832
-msgid "Ignore c_olors"
-msgstr "Ignorer farger"
-
-#: src/gtkprefs.c:834
-msgid "Ignore font _faces"
-msgstr "Ignorer skrifttyper"
-
-#: src/gtkprefs.c:836
-msgid "Ignore font si_zes"
-msgstr "Ignorer skriftstørrelser"
-
-#: src/gtkprefs.c:839
-msgid "Default Formatting"
-msgstr "Standardformatering"
-
-#: src/gtkprefs.c:841
-msgid "_Send default formatting with outgoing messages"
-msgstr "_Send standardformatering med utgående meldinger"
-
-#: src/gtkprefs.c:873
+#: src/gtkprefs.c:868
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
@@ -4001,273 +3861,164 @@
 "Slik vil dine utgående meldinger se ut når du bruker protokoller som støtter "
 "formatering :)"
 
-#: src/gtkprefs.c:876
-msgid "_Clear Formatting"
-msgstr "_Fjern formatering"
-
-#: src/gtkprefs.c:913
-msgid "Send Message"
-msgstr "Send beskjed"
-
-#: src/gtkprefs.c:914
-msgid "Enter _sends message"
-msgstr "Enter _sender beskjeden"
-
-#: src/gtkprefs.c:916
-msgid "C_ontrol-Enter sends message"
-msgstr "CTRL-Enter sender beskjeden"
-
-#: src/gtkprefs.c:919
-msgid "Window Closing"
-msgstr "Lukke vindu"
-
-#: src/gtkprefs.c:920
-msgid "_Escape closes window"
-msgstr "_ESC lukker vinduet"
-
-#: src/gtkprefs.c:923
-msgid "Insertions"
-msgstr "Innsettinger"
-
-#: src/gtkprefs.c:924
-msgid "Control-{B/I/U} changes _formatting"
-msgstr "CTRL-{b/i/u/s} endrer _formatering"
-
-#: src/gtkprefs.c:926
-msgid "Control-(number) _inserts smileys"
-msgstr "CTRL-(tall) setter _inn smilefjes"
-
-#: src/gtkprefs.c:942
-msgid "Buddy List Sorting"
-msgstr "Kontaktlistesortering"
-
-#: src/gtkprefs.c:951
-msgid "_Sorting:"
-msgstr "_Sortering:"
-
-#: src/gtkprefs.c:957 src/gtkprefs.c:1009
-msgid "Show _buttons as:"
-msgstr "Vis knapper som:"
-
-#: src/gtkprefs.c:959 src/gtkprefs.c:1011
-msgid "Pictures"
-msgstr "Bilder"
-
-#: src/gtkprefs.c:960 src/gtkprefs.c:1012
-msgid "Text"
-msgstr "Tekst"
-
-#: src/gtkprefs.c:961 src/gtkprefs.c:1013
-msgid "Pictures and text"
-msgstr "Bilder og tekst"
-
-#: src/gtkprefs.c:964
-msgid "_Raise window on events"
-msgstr "Flytt vinduet øverst ved hendelser"
-
-#: src/gtkprefs.c:967
-msgid "Buddy Display"
-msgstr "Kontaktvisning"
-
-#: src/gtkprefs.c:968 src/gtkprefs.c:1030
-msgid "Show buddy _icons"
-msgstr "Vis kontaktikoner"
-
-#: src/gtkprefs.c:970
-msgid "Show _warning levels"
-msgstr "Vis advarselsnivåer"
-
-#: src/gtkprefs.c:972
-msgid "Show idle _times"
-msgstr "Vis inaktiv tid"
-
-#: src/gtkprefs.c:974
-msgid "Dim i_dle buddies"
-msgstr "Dimme ned inaktive kontakter"
-
-#: src/gtkprefs.c:976
-msgid "_Automatically expand contacts"
-msgstr "_Automatisk ekspander kontakter"
-
-#: src/gtkprefs.c:1020
-msgid "Enable \"_slash\" commands"
-msgstr "Skru på \"_skråstreks\"-kommandoer"
-
-#: src/gtkprefs.c:1023
-msgid "Send unknown \"_slash\" commands as messages"
-msgstr "Send ukjente \"skråstreks\"-kommandoer som meldinger"
-
-#: src/gtkprefs.c:1026
-msgid "Show _formatting toolbar"
-msgstr "Vis formateringsverktøylinje"
-
-#: src/gtkprefs.c:1028
-msgid "Show _aliases in tabs/titles"
-msgstr "Vis aliasnavn i titteltekster"
-
-#: src/gtkprefs.c:1032
-msgid "Enable buddy ic_on animation"
-msgstr "Slå på _animasjoner i kontaktikoner"
-
-#: src/gtkprefs.c:1034
-msgid "_Notify buddies that you are typing to them"
-msgstr "Varsle kontakter når skriver til dem"
-
-#: src/gtkprefs.c:1036
-msgid "_Raise IM window on events"
-msgstr "Flytt direktemeldingsvindu øverst ved hendelser"
-
-#: src/gtkprefs.c:1039
-msgid "Raise chat _window on events"
-msgstr "Flytt gruppesamtalevinduet øverst ved hendelser"
-
-#: src/gtkprefs.c:1041
-msgid "Use _multi-colored screen names in chats"
-msgstr "Bruk _flerfargede brukernavn i samtalegrupper"
-
 #. All the tab options!
-#: src/gtkprefs.c:1045
+#: src/gtkprefs.c:890
 msgid "Tab Options"
 msgstr "Fanevalg"
 
-#: src/gtkprefs.c:1047
+#: src/gtkprefs.c:892
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Vis direktemeldinger og samtalegrupper i _faner"
 
-#: src/gtkprefs.c:1062
+#: src/gtkprefs.c:906
 msgid "Show close b_utton on tabs"
 msgstr "Vis _lukkeknapp på faner"
 
-#: src/gtkprefs.c:1065
-msgid "Tab p_lacement:"
-msgstr "_Faneplassering:"
-
-#: src/gtkprefs.c:1067
+#: src/gtkprefs.c:912
+#, fuzzy
+msgid "_Placement:"
+msgstr "ExtPlacement"
+
+#: src/gtkprefs.c:914
 msgid "Top"
 msgstr "Øverst"
 
-#: src/gtkprefs.c:1068
+#: src/gtkprefs.c:915
 msgid "Bottom"
 msgstr "Nederst"
 
-#: src/gtkprefs.c:1069
+#: src/gtkprefs.c:916
 msgid "Left"
 msgstr "Venstre"
 
-#: src/gtkprefs.c:1070
+#: src/gtkprefs.c:917
 msgid "Right"
 msgstr "Høyre"
 
-#: src/gtkprefs.c:1076
-msgid "New conversation _placement:"
-msgstr "Ny samtale_plassering"
-
-#: src/gtkprefs.c:1127 src/protocols/oscar/oscar.c:748
-#: src/protocols/oscar/oscar.c:5198
+#: src/gtkprefs.c:919
+msgid "Left Vertical"
+msgstr ""
+
+#: src/gtkprefs.c:920
+msgid "Right Vertical"
+msgstr ""
+
+#: src/gtkprefs.c:925
+#, fuzzy
+msgid "N_ew conversations:"
+msgstr "Lukk samtalen"
+
+#: src/gtkprefs.c:976 src/protocols/oscar/oscar.c:779
+#: src/protocols/oscar/oscar.c:5951
 msgid "IP Address"
 msgstr "IP-adresse"
 
-#: src/gtkprefs.c:1129
+#: src/gtkprefs.c:978
+#, fuzzy
+msgid "STUN Server:"
+msgstr "_Tjener:"
+
+#: src/gtkprefs.c:980
 msgid "_Autodetect IP Address"
 msgstr "Finn IP-adresse _automatisk"
 
-#: src/gtkprefs.c:1138
+#: src/gtkprefs.c:989
 msgid "Public _IP:"
 msgstr "Offentlig _IP (ved NAT):"
 
-#: src/gtkprefs.c:1162
+#: src/gtkprefs.c:1013
 msgid "Ports"
 msgstr "Porter"
 
-#: src/gtkprefs.c:1165
+#: src/gtkprefs.c:1016
 msgid "_Manually specify range of ports to listen on"
 msgstr "_Manuellt spesifiser et intervall av porter å lytte på"
 
-#: src/gtkprefs.c:1168
+#: src/gtkprefs.c:1019
 msgid "_Start Port:"
 msgstr "_Startport:"
 
-#: src/gtkprefs.c:1175
+#: src/gtkprefs.c:1026
 msgid "_End Port:"
 msgstr "_Sluttport:"
 
-#: src/gtkprefs.c:1182
+#: src/gtkprefs.c:1033
 msgid "Proxy Server"
 msgstr "Proxytjener"
 
-#: src/gtkprefs.c:1186
+#: src/gtkprefs.c:1037
 msgid "No proxy"
 msgstr "Ingen proxy"
 
-#: src/gtkprefs.c:1248
+#: src/gtkprefs.c:1093
 msgid "_User:"
 msgstr "_Bruker:"
 
-#: src/gtkprefs.c:1304
+#: src/gtkprefs.c:1153
 msgid "Epiphany"
 msgstr ""
 
-#: src/gtkprefs.c:1305
+#: src/gtkprefs.c:1154
 msgid "Firebird"
 msgstr ""
 
-#: src/gtkprefs.c:1306
+#: src/gtkprefs.c:1155
 msgid "Firefox"
 msgstr ""
 
-#: src/gtkprefs.c:1307
+#: src/gtkprefs.c:1156
 msgid "Galeon"
 msgstr ""
 
-#: src/gtkprefs.c:1308
+#: src/gtkprefs.c:1157
 msgid "Gnome Default"
 msgstr "Gnome-standard"
 
-#: src/gtkprefs.c:1309
+#: src/gtkprefs.c:1158
 msgid "Konqueror"
 msgstr ""
 
-#: src/gtkprefs.c:1310
+#: src/gtkprefs.c:1159
 msgid "Mozilla"
 msgstr ""
 
-#: src/gtkprefs.c:1311
+#: src/gtkprefs.c:1160
 msgid "Netscape"
 msgstr ""
 
-#: src/gtkprefs.c:1312
+#: src/gtkprefs.c:1161
 msgid "Opera"
 msgstr ""
 
-#: src/gtkprefs.c:1321
+#: src/gtkprefs.c:1170
 msgid "Manual"
 msgstr "Egendefinert"
 
-#: src/gtkprefs.c:1372
+#: src/gtkprefs.c:1223
 msgid "Browser Selection"
 msgstr "Valg av nettleser"
 
-#: src/gtkprefs.c:1376
+#: src/gtkprefs.c:1227
 msgid "_Browser:"
 msgstr "_Nettleser:"
 
-#: src/gtkprefs.c:1383
+#: src/gtkprefs.c:1235
 msgid "_Open link in:"
 msgstr "_Åpne lenke i:"
 
-#: src/gtkprefs.c:1385
+#: src/gtkprefs.c:1237
 msgid "Browser default"
 msgstr "Standard for nettleser"
 
-#: src/gtkprefs.c:1386
+#: src/gtkprefs.c:1238
 msgid "Existing window"
 msgstr "Eksisterende vindu"
 
-#: src/gtkprefs.c:1388
+#: src/gtkprefs.c:1240
 msgid "New tab"
 msgstr "Ny tab"
 
-#: src/gtkprefs.c:1402
+#: src/gtkprefs.c:1254
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -4276,84 +4027,57 @@
 "_Egendefinert:\n"
 "(%s for URL)"
 
-#: src/gtkprefs.c:1439
-msgid "Message Logs"
-msgstr "Beskjedlogging"
-
-#: src/gtkprefs.c:1442
+#: src/gtkprefs.c:1290 src/gtkprefs.c:1767
+msgid "Logging"
+msgstr "Logging"
+
+#: src/gtkprefs.c:1293
 msgid "Log _Format:"
 msgstr "Logg_format:"
 
-#: src/gtkprefs.c:1445
-msgid "_Log all instant messages"
+#: src/gtkprefs.c:1298
+#, fuzzy
+msgid "Log all _instant messages"
 msgstr "Logg alle direktemeldinger"
 
-#: src/gtkprefs.c:1447
+#: src/gtkprefs.c:1300
 msgid "Log all c_hats"
 msgstr "Logg alle samtaler"
 
-#: src/gtkprefs.c:1450
-msgid "System Logs"
-msgstr "Systemlogging"
-
-#: src/gtkprefs.c:1452
-msgid "_Enable system log"
-msgstr "Skru på _systemlogg:"
-
-#: src/gtkprefs.c:1455
-msgid "Log when buddies _sign on/sign off"
-msgstr "Skriv til logg når kontakter logger av/på"
-
-#: src/gtkprefs.c:1461
-msgid "Log when buddies become _idle/un-idle"
-msgstr "Skriv til logg når kontakter blir aktiv/inaktiv"
-
-#: src/gtkprefs.c:1467
-msgid "Log when buddies go away/come _back"
-msgstr "Skriv til logg når kontakter blir borte/kommer tilbake"
-
-#: src/gtkprefs.c:1473
-msgid "Log your _own signons/idleness/awayness"
-msgstr "Skriv egne pålogginger/inaktivitet/bortemarkeringer til logg"
-
-#: src/gtkprefs.c:1600
+#: src/gtkprefs.c:1302
+msgid "Log all _status changes to system log"
+msgstr ""
+
+#: src/gtkprefs.c:1434
 msgid "Sound Selection"
 msgstr "Lydvalg"
 
-#: src/gtkprefs.c:1651
-msgid "Sound Options"
-msgstr "Lydinnstillinger"
-
-#
-#: src/gtkprefs.c:1652
-msgid "Sounds when conversation has _focus"
-msgstr "Lyder når samtalevinduet har _fokus"
-
-#: src/gtkprefs.c:1654
-msgid "_Sounds while away"
-msgstr "Lyder når du er fraværsmarkert"
-
-#: src/gtkprefs.c:1658
+#: src/gtkprefs.c:1488
 msgid "Sound Method"
 msgstr "Lydtype"
 
-#: src/gtkprefs.c:1659
+#: src/gtkprefs.c:1489
 msgid "_Method:"
 msgstr "_Metode:"
 
-#: src/gtkprefs.c:1661
+#: src/gtkprefs.c:1491
 msgid "Console beep"
 msgstr "Konsollpip"
 
-#: src/gtkprefs.c:1663
+#: src/gtkprefs.c:1493
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: src/gtkprefs.c:1670
+#: src/gtkprefs.c:1498
 msgid "Command"
 msgstr "Kommando"
 
-#: src/gtkprefs.c:1678
+#: src/gtkprefs.c:1499
+#, fuzzy
+msgid "No sounds"
+msgstr "Lyder"
+
+#: src/gtkprefs.c:1507
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -4362,179 +4086,114 @@
 "_Program for lydavspilling\n"
 "(%s for filnavn)"
 
-#: src/gtkprefs.c:1705
+#: src/gtkprefs.c:1533
+msgid "Sound Options"
+msgstr "Lydinnstillinger"
+
+#
+#: src/gtkprefs.c:1534
+msgid "Sounds when conversation has _focus"
+msgstr "Lyder når samtalevinduet har _fokus"
+
+#: src/gtkprefs.c:1536
+msgid "_Sounds while away"
+msgstr "Lyder når du er fraværsmarkert"
+
+#: src/gtkprefs.c:1546
 msgid "Sound Events"
 msgstr "Lydhendelser"
 
-#: src/gtkprefs.c:1756
+#: src/gtkprefs.c:1597
 msgid "Play"
 msgstr "Spill av"
 
-#: src/gtkprefs.c:1763
+#: src/gtkprefs.c:1604
 msgid "Event"
 msgstr "Hendelse"
 
-#: src/gtkprefs.c:1782
+#: src/gtkprefs.c:1623
 msgid "Test"
 msgstr "Test"
 
-#: src/gtkprefs.c:1786
+#: src/gtkprefs.c:1627
 msgid "Reset"
 msgstr "Nullstill"
 
-#: src/gtkprefs.c:1790
+#: src/gtkprefs.c:1631
 msgid "Choose..."
 msgstr "Bla gjennom..."
 
-#: src/gtkprefs.c:1814
+#: src/gtkprefs.c:1685 src/gtkstatusbox.c:288 src/protocols/irc/irc.c:176
+#: src/protocols/irc/msgs.c:221 src/protocols/jabber/buddy.c:1093
+#: src/protocols/jabber/jabber.c:1055 src/protocols/msn/msn.c:577
+#: src/protocols/novell/novell.c:2825 src/protocols/novell/novell.c:2959
+#: src/protocols/novell/novell.c:3041 src/protocols/oscar/oscar.c:707
+#: src/protocols/oscar/oscar.c:6510 src/protocols/oscar/oscar.c:6579
+#: src/protocols/oscar/oscar.c:7604 src/protocols/oscar/oscar.c:7758
+#: src/protocols/silc/buddy.c:1417 src/protocols/silc/silc.c:52
+#: src/protocols/yahoo/yahoo.c:3234 src/protocols/zephyr/zephyr.c:2259
+#: src/status.c:158
+msgid "Away"
+msgstr "Borte"
+
+#: src/gtkprefs.c:1686
 msgid "_Queue new messages when away"
 msgstr "Når borte, legg nye beskjeder i kø"
 
-#: src/gtkprefs.c:1817
+#: src/gtkprefs.c:1689
 msgid "_Auto-reply:"
 msgstr "_Automatisk svar"
 
-#: src/gtkprefs.c:1819
-msgid "Never"
-msgstr "Aldri"
-
-#: src/gtkprefs.c:1820
+#: src/gtkprefs.c:1692
 msgid "When away"
 msgstr "Når fraværende"
 
-#: src/gtkprefs.c:1821
-msgid "When away and idle"
+#: src/gtkprefs.c:1693
+#, fuzzy
+msgid "When both away and idle"
 msgstr "Når fraværende og inaktiv"
 
-#: src/gtkprefs.c:1824 src/protocols/msn/msn.c:1327
-#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2806
-#: src/protocols/oscar/oscar.c:4346 src/protocols/yahoo/yahoo.c:2697
-#: src/protocols/yahoo/yahoo_profile.c:664
-msgid "Idle"
-msgstr "Inaktiv"
-
-#: src/gtkprefs.c:1825
-msgid "Idle _time reporting:"
-msgstr "Rapportering av inaktiv _tid:"
-
-#: src/gtkprefs.c:1828
-msgid "Gaim usage"
-msgstr "Gaim-bruk"
-
-#: src/gtkprefs.c:1831
-msgid "X usage"
-msgstr "X-bruk"
-
-#: src/gtkprefs.c:1833
-msgid "Windows usage"
-msgstr "Windows-bruk"
-
-#: src/gtkprefs.c:1841
+#: src/gtkprefs.c:1696
+#, fuzzy
+msgid "_Report idle time"
+msgstr "Vis inaktiv tid"
+
+#: src/gtkprefs.c:1699
 msgid "Auto-away"
 msgstr "Automatisk fraværsmarkering"
 
-#: src/gtkprefs.c:1842
+#: src/gtkprefs.c:1700
 msgid "Set away _when idle"
 msgstr "Sett som borte når inaktiv"
 
-#: src/gtkprefs.c:1846
+#: src/gtkprefs.c:1704
 msgid "_Minutes before setting away:"
 msgstr "Antall minutter før fraværsmarkert:"
 
-#: src/gtkprefs.c:1854
+#: src/gtkprefs.c:1712
 msgid "Away m_essage:"
 msgstr "Fraværsbeskjed:"
 
-#: src/gtkprefs.c:1923
-#, c-format
-msgid ""
-"<span size=\"larger\">%s %s</span>\n"
-"\n"
-"<span weight=\"bold\">Written by:</span>\t%s\n"
-"<span weight=\"bold\">Web site:</span>\t\t%s\n"
-"<span weight=\"bold\">File name:</span>\t%s"
-msgstr ""
-"<span size=\"larger\">%s %s</span>\n"
-"\n"
-"<span weight=\"bold\">Skrevet av:</span>\t%s\n"
-"<span weight=\"bold\">Webside:</span>\t\t%s\n"
-"<span weight=\"bold\">Filnavn:</span>\t%s"
-
-#: src/gtkprefs.c:1928
-#, c-format
-msgid ""
-"<span size=\"larger\">%s %s</span>\n"
-"\n"
-"<span weight=\"bold\">Written by:</span>  %s\n"
-"<span weight=\"bold\">URL:</span>  %s\n"
-"<span weight=\"bold\">File name:</span>  %s"
-msgstr ""
-"<span size=\"larger\">%s %s</span>\n"
-"\n"
-"<span weight=\"bold\">Skrevet av:</span>  %s\n"
-"<span weight=\"bold\">URL:</span>  %s\n"
-"<span weight=\"bold\">Filnavn:</span>  %s"
-
-#: src/gtkprefs.c:2161
-msgid "Load"
-msgstr "Last"
-
-#: src/gtkprefs.c:2175
-msgid "Summary"
-msgstr "Oppsummering"
-
-#: src/gtkprefs.c:2223
-msgid "Details"
-msgstr "Detaljer"
-
-#: src/gtkprefs.c:2384
-msgid "_Edit"
-msgstr "Rediger"
-
-#: src/gtkprefs.c:2420
-msgid "Interface"
-msgstr "Grensesnitt"
-
-#: src/gtkprefs.c:2423
-msgid "Message Text"
-msgstr "Beskjeder"
-
-#: src/gtkprefs.c:2424
-msgid "Shortcuts"
-msgstr "Hurtigtaster"
-
-#: src/gtkprefs.c:2425
+#: src/gtkprefs.c:1757
 msgid "Smiley Themes"
 msgstr "Smilefjes-tema"
 
-#: src/gtkprefs.c:2426
+#: src/gtkprefs.c:1758
 msgid "Sounds"
 msgstr "Lyder"
 
-#: src/gtkprefs.c:2427 src/protocols/silc/silc.c:1588
+#: src/gtkprefs.c:1759 src/protocols/silc/silc.c:1589
 msgid "Network"
 msgstr "Nettverk"
 
-#: src/gtkprefs.c:2432
+#: src/gtkprefs.c:1764
 msgid "Browser"
 msgstr "Nettleser"
 
-#: src/gtkprefs.c:2435
-msgid "Logging"
-msgstr "Logging"
-
-#: src/gtkprefs.c:2436
+#: src/gtkprefs.c:1768
 msgid "Away / Idle"
 msgstr "Borte / inaktiv"
 
-#: src/gtkprefs.c:2437
-msgid "Away Messages"
-msgstr "Fraværsbeskjeder"
-
-#: src/gtkprefs.c:2440
-msgid "Plugins"
-msgstr "Tillegg"
-
 #: src/gtkprivacy.c:79
 msgid "Allow all users to contact me"
 msgstr "Tillat alle brukere å kontakte meg"
@@ -4555,64 +4214,68 @@
 msgid "Block only the users below"
 msgstr "Blokker kun brukerne vist nedenfor"
 
-#: src/gtkprivacy.c:397 src/protocols/jabber/jabber.c:1504
+#: src/gtkprivacy.c:398
 msgid "Privacy"
 msgstr "Sikkerhet"
 
-#: src/gtkprivacy.c:410
+#: src/gtkprivacy.c:411
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Endringer i sikkerhetsinnstillingene skjer umiddelbart."
 
 #. "Set privacy for:" label
-#: src/gtkprivacy.c:422
+#: src/gtkprivacy.c:423
 msgid "Set privacy for:"
 msgstr "Sett sikkerhet for:"
 
-#: src/gtkprivacy.c:591 src/gtkprivacy.c:607
+#: src/gtkprivacy.c:589 src/gtkprivacy.c:605
 msgid "Permit User"
 msgstr "Tillat bruker"
 
-#: src/gtkprivacy.c:592
+#: src/gtkprivacy.c:590
 msgid "Type a user you permit to contact you."
 msgstr "Skriv brukernavnet til den som får kontakte deg."
 
-#: src/gtkprivacy.c:593
+#: src/gtkprivacy.c:591
 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:596 src/gtkprivacy.c:609
+#: src/gtkprivacy.c:594 src/gtkprivacy.c:607
 msgid "Permit"
 msgstr "Tillat"
 
-#: src/gtkprivacy.c:601
+#: src/gtkprivacy.c:599
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Tillate %s å kontakte deg?"
 
-#: src/gtkprivacy.c:603
+#: src/gtkprivacy.c:601
 #, 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:630 src/gtkprivacy.c:643
+#: src/gtkprivacy.c:628 src/gtkprivacy.c:641
 msgid "Block User"
 msgstr "Blokker bruker"
 
-#: src/gtkprivacy.c:631
+#: src/gtkprivacy.c:629
 msgid "Type a user to block."
 msgstr "Skriv inn brukernavnet på den som skal blokkeres."
 
-#: src/gtkprivacy.c:632
+#: src/gtkprivacy.c:630
 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:639
+#: src/gtkprivacy.c:632 src/gtkprivacy.c:643 src/protocols/gg/gg.c:1135
+msgid "Block"
+msgstr "Blokker"
+
+#: src/gtkprivacy.c:637
 #, c-format
 msgid "Block %s?"
 msgstr "Blokkere %s?"
 
-#: src/gtkprivacy.c:641
+#: src/gtkprivacy.c:639
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Er du sikker på at du vil blokkere %s?"
@@ -4620,44 +4283,42 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:241 src/protocols/gg/gg.c:951
-#: src/protocols/msn/dialog.c:113 src/protocols/msn/msn.c:499
-#: src/protocols/msn/msn.c:502 src/protocols/novell/novell.c:1892
-#: src/protocols/silc/buddy.c:307 src/protocols/silc/pk.c:117
-#: src/request.h:1236
+#: src/gtkrequest.c:258 src/protocols/msn/dialog.c:113
+#: src/protocols/msn/msn.c:553 src/protocols/msn/msn.c:556
+#: src/protocols/novell/novell.c:1902 src/protocols/silc/buddy.c:312
+#: src/protocols/silc/pk.c:117 src/request.h:1322
 msgid "Yes"
 msgstr "Ja"
 
-#: src/gtkrequest.c:242 src/protocols/gg/gg.c:951
-#: src/protocols/msn/dialog.c:114 src/protocols/msn/msn.c:499
-#: src/protocols/msn/msn.c:502 src/protocols/novell/novell.c:1893
-#: src/protocols/silc/buddy.c:308 src/protocols/silc/pk.c:118
-#: src/request.h:1236
+#: src/gtkrequest.c:259 src/protocols/msn/dialog.c:114
+#: src/protocols/msn/msn.c:553 src/protocols/msn/msn.c:556
+#: src/protocols/novell/novell.c:1903 src/protocols/silc/buddy.c:313
+#: src/protocols/silc/pk.c:118 src/request.h:1322
 msgid "No"
 msgstr "Nei"
 
-#: src/gtkrequest.c:245
+#: src/gtkrequest.c:262
 msgid "Apply"
 msgstr "Bruk"
 
-#: src/gtkrequest.c:246 src/protocols/msn/msn.c:314
+#: src/gtkrequest.c:263 src/protocols/msn/msn.c:357
 #: src/protocols/silc/util.c:335
 msgid "Close"
 msgstr "L_ukk"
 
-#: src/gtkrequest.c:1421
+#: src/gtkrequest.c:1795
 msgid "That file already exists"
 msgstr "Filen eksisterer allerede."
 
-#: src/gtkrequest.c:1422
+#: src/gtkrequest.c:1796
 msgid "Would you like to overwrite it?"
 msgstr "Ønsker du å overskrive den?"
 
-#: src/gtkrequest.c:1460 src/gtkrequest.c:1481
+#: src/gtkrequest.c:1838 src/gtkrequest.c:1879
 msgid "Save File..."
 msgstr "Lagre fil..."
 
-#: src/gtkrequest.c:1461 src/gtkrequest.c:1482
+#: src/gtkrequest.c:1839 src/gtkrequest.c:1880
 msgid "Open File..."
 msgstr "Åpne fil..."
 
@@ -4670,52 +4331,113 @@
 msgid "_Get List"
 msgstr "Hent Liste"
 
-#: src/gtksound.c:63
+#: src/gtksavedstatuses.c:317 src/protocols/jabber/buddy.c:264
+#: src/protocols/jabber/buddy.c:805 src/protocols/novell/novell.c:1460
+msgid "Title"
+msgstr "Tittel"
+
+#: src/gtksavedstatuses.c:332
+msgid "Type"
+msgstr ""
+
+#: src/gtksavedstatuses.c:343 src/protocols/gg/gg.c:1083
+#: src/protocols/gg/gg.c:1088 src/protocols/gg/gg.c:1097
+#: src/protocols/gg/gg.c:1107 src/protocols/gg/gg.c:1112
+#: src/protocols/irc/irc.c:177 src/protocols/jabber/jabber.c:1032
+#: src/protocols/jabber/jabber.c:1040 src/protocols/jabber/jabber.c:1048
+#: src/protocols/jabber/jabber.c:1056 src/protocols/jabber/jabber.c:1064
+#: src/protocols/jabber/jabber.c:1072 src/protocols/novell/novell.c:2845
+#: src/protocols/oscar/oscar.c:7752 src/protocols/oscar/oscar.c:7759
+#: src/protocols/yahoo/yahoo.c:3202 src/protocols/yahoo/yahoo.c:3235
+#: src/protocols/zephyr/zephyr.c:2260
+msgid "Message"
+msgstr "Beskjed:"
+
+#: src/gtksavedstatuses.c:406
+#, fuzzy
+msgid "Saved Statuses"
+msgstr "Tjenerstatistikk"
+
+#: src/gtksavedstatuses.c:527
+msgid "Title already in use.  You must choose a unique title."
+msgstr ""
+
+#: src/gtksavedstatuses.c:618
+#, fuzzy
+msgid "Custom status"
+msgstr "Etter status"
+
+#: src/gtksavedstatuses.c:721 src/protocols/gg/gg.c:1064
+#: src/protocols/gg/gg.c:1069 src/protocols/jabber/buddy.c:626
+#: src/protocols/jabber/buddy.c:633 src/protocols/jabber/buddy.c:644
+#: src/protocols/jabber/jabber.c:1005 src/protocols/msn/msn.c:544
+#: src/protocols/novell/novell.c:2844 src/protocols/novell/novell.c:2848
+#: src/protocols/oscar/oscar.c:762 src/protocols/oscar/oscar.c:767
+#: src/protocols/oscar/oscar.c:769 src/protocols/yahoo/yahoo.c:2783
+msgid "Status"
+msgstr "Status"
+
+#: src/gtksavedstatuses.c:740
+#, fuzzy
+msgid "_Title:"
+msgstr "Tittel"
+
+#: src/gtksavedstatuses.c:760
+#, fuzzy
+msgid "_Status:"
+msgstr "Status:"
+
+#. Custom status message expander
+#: src/gtksavedstatuses.c:795
+msgid "Use a _different status for some accounts"
+msgstr ""
+
+#: src/gtksound.c:61
 msgid "Buddy logs in"
 msgstr "Kontakt logger inn"
 
-#: src/gtksound.c:64
+#: src/gtksound.c:62
 msgid "Buddy logs out"
 msgstr "Kontakt logger ut"
 
+#: src/gtksound.c:63
+msgid "Message received"
+msgstr "Beskjed mottatt"
+
+#: src/gtksound.c:64
+msgid "Message received begins conversation"
+msgstr "Beskjed mottas og samtale starter"
+
 #: src/gtksound.c:65
-msgid "Message received"
-msgstr "Beskjed mottatt"
+msgid "Message sent"
+msgstr "Beskjed sendt"
 
 #: src/gtksound.c:66
-msgid "Message received begins conversation"
-msgstr "Beskjed mottas og samtale starter"
+msgid "Person enters chat"
+msgstr "Person blir med i samtalen"
 
 #: src/gtksound.c:67
-msgid "Message sent"
-msgstr "Beskjed sendt"
+msgid "Person leaves chat"
+msgstr "Person forlater samtalen"
 
 #: src/gtksound.c:68
-msgid "Person enters chat"
-msgstr "Person blir med i samtalen"
-
-#: src/gtksound.c:69
-msgid "Person leaves chat"
-msgstr "Person forlater samtalen"
-
-#: src/gtksound.c:70
 msgid "You talk in chat"
 msgstr "Du snakker i samtalen"
 
-#: src/gtksound.c:71
+#: src/gtksound.c:69
 msgid "Others talk in chat"
 msgstr "Andre snakker i samtalen"
 
-#: src/gtksound.c:74
+#: src/gtksound.c:72
 msgid "Someone says your name in chat"
 msgstr "Noen sier navnet ditt i en samtale"
 
-#: src/gtksound.c:173
+#: src/gtksound.c:414
 #, 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:189
+#: src/gtksound.c:430
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
@@ -4723,7 +4445,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:201
+#: src/gtksound.c:442
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
@@ -4732,15 +4454,184 @@
 "Kunne ikke spille av lyd fordi det konfigurerte avspillingsprogrammet ikke "
 "kunne startes: %s"
 
-#: src/log.c:104
+#: src/gtkstatusbox.c:190
+#, fuzzy
+msgid "Typing"
+msgstr "Ping"
+
+#. connect to the server
+#: src/gtkstatusbox.c:193 src/protocols/irc/irc.c:258
+#: src/protocols/jabber/jabber.c:838 src/protocols/msn/session.c:362
+#: src/protocols/napster/napster.c:525 src/protocols/novell/novell.c:2164
+#: src/protocols/oscar/oscar.c:1824 src/protocols/yahoo/yahoo.c:2451
+#: src/protocols/zephyr/zephyr.c:1546
+msgid "Connecting"
+msgstr "Kobler til"
+
+#. hacks
+#: src/gtkstatusbox.c:287 src/protocols/irc/irc.c:172
+#: src/protocols/jabber/jabber.c:1039 src/protocols/msn/msn.c:573
+#: src/protocols/msn/state.c:29 src/protocols/msn/state.c:30
+#: src/protocols/msn/state.c:37 src/protocols/msn/state.c:38
+#: src/protocols/novell/novell.c:2822 src/protocols/novell/novell.c:2956
+#: src/protocols/novell/novell.c:3039 src/protocols/oscar/oscar.c:808
+#: src/protocols/oscar/oscar.c:7751 src/protocols/silc/silc.c:48
+#: src/protocols/yahoo/yahoo.c:3196 src/status.c:155
+msgid "Available"
+msgstr "Tilgjengelig"
+
+#.
+#. * Without this selecting Invisible as own status doesn't
+#. * work. It's not used and not needed to show status of buddies.
+#.
+#: src/gtkstatusbox.c:289 src/protocols/gg/gg.c:1096
+#: src/protocols/oscar/oscar.c:711 src/protocols/oscar/oscar.c:7765
+#: src/protocols/yahoo/yahoo.c:2629 src/protocols/yahoo/yahoo.c:3239
+msgid "Invisible"
+msgstr "Usynlig"
+
+#: src/gtkstatusbox.c:290 src/protocols/gg/gg.c:1082
+#: src/protocols/irc/irc.c:168 src/protocols/jabber/buddy.c:1087
+#: src/protocols/jabber/jabber.c:1032 src/protocols/msn/msn.c:569
+#: src/protocols/napster/napster.c:573 src/protocols/novell/novell.c:2834
+#: src/protocols/novell/novell.c:2953 src/protocols/oscar/oscar.c:769
+#: src/protocols/oscar/oscar.c:7585 src/protocols/oscar/oscar.c:7746
+#: src/protocols/silc/silc.c:46 src/protocols/yahoo/yahoo.c:2633
+#: src/protocols/yahoo/yahoo.c:3193 src/status.c:154
+msgid "Offline"
+msgstr "Avlogget"
+
+#: src/gtkstatusbox.c:292
+#, fuzzy
+msgid "Custom..."
+msgstr "Egendefinert"
+
+#: src/gtkstatusbox.c:293
+#, fuzzy
+msgid "Saved..."
+msgstr "Lagre fil..."
+
+#. TODO: Should save the previous status as a transient status?
+#. Save the newly selected status to prefs.xml and status.xml
+#: src/gtkstatusbox.c:655 src/gtkstatusbox.c:657 src/gtkstatusbox.c:660
+#: src/status.c:1696
+#, fuzzy
+msgid "Default"
+msgstr "Gnome-standard"
+
+#: src/gtkstock.c:118
+msgid "_Alias"
+msgstr "_Alias"
+
+#: src/gtkstock.c:120
+msgid "_Invite"
+msgstr "_Inviter"
+
+#: src/gtkstock.c:121
+msgid "_Modify"
+msgstr "_Endre"
+
+#: src/gtkstock.c:122
+msgid "_Open Mail"
+msgstr "Åpne _e-post"
+
+#: src/gtkstock.c:124
+msgid "_Warn"
+msgstr "Advar"
+
+#: src/gtkutils.c:1393 src/gtkutils.c:1418
+#, fuzzy, c-format
+msgid "The following error has occurred loading %s: %s"
+msgstr "En ukjent påloggingsfeil har inntruffet: %s."
+
+#: src/gtkutils.c:1395 src/gtkutils.c:1420
+#, fuzzy
+msgid "Failed to load image"
+msgstr "Klarte ikke å lagre bilde: %s\n"
+
+#: src/gtkutils.c:1495
+#, fuzzy, c-format
+msgid "Cannot send folder %s."
+msgstr "Kan ikke sende fil"
+
+#: src/gtkutils.c:1497
+msgid ""
+"Gaim cannot transfer a folder. You will need to send the files within "
+"individually"
+msgstr ""
+
+#: src/gtkutils.c:1525 src/gtkutils.c:1534 src/gtkutils.c:1539
+#, fuzzy
+msgid "You have dragged an image"
+msgstr "Du har tastet inn et ugyldig brukernavn"
+
+#: src/gtkutils.c:1526
+msgid ""
+"You can send this image as a file transfer, embed it into this message, or "
+"use it as the buddy icon for this user."
+msgstr ""
+
+#: src/gtkutils.c:1530 src/gtkutils.c:1545
+#, fuzzy
+msgid "Set as buddy icon"
+msgstr "Vis kontaktikoner"
+
+#: src/gtkutils.c:1531 src/gtkutils.c:1546
+#, fuzzy
+msgid "Send image file"
+msgstr "Send beskjed"
+
+#: src/gtkutils.c:1532 src/gtkutils.c:1546
+#, fuzzy
+msgid "Insert in message"
+msgstr "Sett inn bilde"
+
+#: src/gtkutils.c:1535
+#, fuzzy
+msgid "Would you like to set it as the buddy icon for this user?"
+msgstr "Ønsker du å bli med i samtalen?"
+
+#: src/gtkutils.c:1540
+msgid ""
+"You can send this image as a file transfer or embed it into this message, or "
+"use it as the buddy icon for this user."
+msgstr ""
+
+#: src/gtkutils.c:1542
+msgid ""
+"You can insert this image into this message, or use it as the buddy icon for "
+"this user"
+msgstr ""
+
+#. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
+#. * "MIME Type" (I have no clue how that would be a desktop item) and "Comment"... nothing we can really
+#. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
+#. * Probably not.  I'll just give an error and return.
+#. The original patch sent the icon used by the launcher.  That's probably wrong
+#: src/gtkutils.c:1596
+#, fuzzy
+msgid "Cannot send launcher"
+msgstr "Kan ikke sende fil"
+
+#: src/gtkutils.c:1596
+msgid ""
+"You dragged a desktop launcher. Most likely you wanted to send whatever this "
+"launcher points to instead of this launcher itself."
+msgstr ""
+
+#: src/log.c:129
 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:545
+#: src/log.c:577
+msgid "Logging of this conversation failed."
+msgstr ""
+
+#: src/log.c:839
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:608
+#: src/log.c:904
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4749,7 +4640,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;"
 "STANDARDSVAR&gt;:</b></font> %s<br/>\n"
 
-#: src/log.c:610
+#: src/log.c:906
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4758,114 +4649,21 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;"
 "STANDARDSVAR&gt;:</b></font> %s<br/>\n"
 
-#: src/log.c:661 src/log.c:791
+#: src/log.c:957 src/log.c:1074
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>Kunne ikke finne banen til loggen!</b></font>"
 
-#: src/log.c:671 src/log.c:803
+#: src/log.c:967 src/log.c:1086
 #, 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:675
-msgid "HTML"
-msgstr "HTML"
-
-#: src/log.c:736
+#: src/log.c:1019
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr ""
 
-#: src/log.c:807
-msgid "Plain text"
-msgstr "Ren tekst"
-
-#: src/main.c:150
-msgid "Please create an account."
-msgstr "Vennligst lag en konto."
-
-#: src/main.c:232
-msgid "Login"
-msgstr "Innlogging"
-
-#: src/main.c:248
-msgid "<b>_Account:</b>"
-msgstr "<b>_Konto:</b>"
-
-#: src/main.c:262
-msgid "<b>_Password:</b>"
-msgstr "<b>_Passord:</b>"
-
-#. And now for the buttons
-#: src/main.c:279
-msgid "A_ccounts"
-msgstr "Kontoer"
-
-#: src/main.c:285
-#, fuzzy
-msgid "P_references"
-msgstr "Innstillinger"
-
-#: src/main.c:291
-msgid "_Sign on"
-msgstr "Logg _på"
-
-#. full help text
-#: src/main.c:513
-#, c-format
-msgid ""
-"Gaim %s\n"
-"Usage: %s [OPTION]...\n"
-"\n"
-"  -a, --acct          display account editor window\n"
-"  -w, --away[=MESG]   make away on signon (optional argument MESG specifies\n"
-"                      name of away message to use)\n"
-"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
-"                      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"
-"  -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"
-msgstr ""
-"Gaim %s\n"
-"Bruksmåte: %s [BRUKERVALG]...\n"
-"\n"
-"  -a, --acct          vis redigeringsvindu for kontoer\n"
-"  -w, --away[=MESG]   marker som borte ved pålogging (valgfri MESG er "
-"navnet\n"
-"                      på bortebeskjeden du vil bruke)\n"
-"  -l, --login[=NAME]  logg inn automatisk (valgfri NAME er navnet på\n"
-"                      konto(er) du vil bruke, atskilt av komma)\n"
-"  -n, --loginwin      ikke logg inn automatisk, men vis påloggingsvindu\n"
-"  -u, --user=NAME     bruk kontoen NAME\n"
-"  -f, --file=FILE     bruk filen FILE som konfigurasjonsfil\n"
-"  -d, --debug         skriv avlusningsinfo til stdout\n"
-"  -v, --version       vis versjonsinformasjon og avslutt\n"
-"  -h, --help          vis denne hjelpeteksten og avslutt\n"
-
-#. short message
-#: src/main.c:528
-#, c-format
-msgid "Gaim %s. Try `%s -h' for more information.\n"
-msgstr "Gaim %s. Prøv '%s -h' for mer informasjon.\n"
-
-#: src/main.c:895
-msgid "Unable to load preferences"
-msgstr "Kunne ikke åpne innstillinger"
-
-#: src/main.c:895
-msgid ""
-"Gaim was not able to load your preferences because they are stored in an old "
-"format that is no longer used.  Please reconfigure your settings using the "
-"Preferences window."
-msgstr ""
-"Gaim kunne ikke åpne dine instillinger, da de er lagret i et gammelt format "
-"som ikke lenger er i bruk.  Vennligst rekonfigurer dine  instillinger ved "
-"hjelp av innstillingsvinduet"
-
-#: src/plugin.c:295
+#: src/plugin.c:331
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
@@ -4874,500 +4672,463 @@
 "Det nødvendige tillegget %s ble ikke funnet. Installer dette tillegget og "
 "prøv igjen."
 
-#: src/plugin.c:300 src/plugin.c:328
+#: src/plugin.c:336 src/plugin.c:364
 msgid "Gaim was unable to load your plugin."
 msgstr "Gaim klarte ikke å laste tillegget."
 
-#: src/plugin.c:324
+#: src/plugin.c:360
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "Det nødvendige tillegget %s kunne ikke lastes."
 
-#: src/prefs.c:113 src/status.c:273
-msgid "Slightly less boring default"
-msgstr "kjedelig standardsvar"
-
-#: src/protocols/gg/gg.c:50 src/protocols/jabber/jutil.c:44
-#: src/protocols/msn/msn.c:513 src/protocols/msn/state.c:29
-#: src/protocols/msn/state.c:30 src/protocols/msn/state.c:37
-#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2797
-#: src/protocols/novell/novell.c:2916 src/protocols/novell/novell.c:2967
-#: src/protocols/oscar/oscar.c:770 src/protocols/yahoo/yahoo.c:3042
-#: src/protocols/yahoo/yahoo.c:3158
-msgid "Available"
-msgstr "Tilgjengelig"
-
-#: src/protocols/gg/gg.c:51
-msgid "Available for friends only"
-msgstr "Tilgjengelig bare for venner"
-
-#: src/protocols/gg/gg.c:53
-msgid "Away for friends only"
-msgstr "Borte bare for venner"
-
-#: src/protocols/gg/gg.c:54 src/protocols/jabber/jabber.c:1002
-#: src/protocols/jabber/presence.c:139 src/protocols/oscar/oscar.c:688
-#: src/protocols/oscar/oscar.c:5701 src/protocols/oscar/oscar.c:5779
-#: src/protocols/oscar/oscar.c:5803 src/protocols/oscar/oscar.c:6990
-#: src/protocols/oscar/oscar.c:6995 src/protocols/yahoo/yahoo.c:2695
-#: src/protocols/yahoo/yahoo.c:3062 src/protocols/yahoo/yahoo.c:3170
-msgid "Invisible"
-msgstr "Usynlig"
-
-#: src/protocols/gg/gg.c:55
-msgid "Invisible for friends only"
-msgstr "Usynlig bare for venner"
-
-#: src/protocols/gg/gg.c:56
-msgid "Unavailable"
-msgstr "Ikke tilgjengelig"
+#: src/protocols/gg/gg.c:136 src/protocols/gg/gg.c:155
+#, fuzzy
+msgid "Save Buddylist..."
+msgstr "Sende kontaktliste"
 
 #: src/protocols/gg/gg.c:137
-msgid "Unable to resolve hostname."
-msgstr "Kan ikke finne datamaskinnavnet."
-
-#: src/protocols/gg/gg.c:140 src/protocols/novell/novell.c:1711
-msgid "Unable to connect to server."
-msgstr "Kan ikke koble til tjener."
-
-#: src/protocols/gg/gg.c:143 src/protocols/jabber/auth.c:134
-#: src/protocols/jabber/auth.c:208 src/protocols/jabber/auth.c:369
-#: src/protocols/jabber/auth.c:467 src/protocols/jabber/auth.c:479
-#: src/protocols/jabber/jabber.c:108
-msgid "Invalid response from server."
-msgstr "Ugyldig svar fra tjener."
-
-#: src/protocols/gg/gg.c:146
-msgid "Error while reading from socket."
-msgstr "Feil under lesing fra socket."
-
-#: src/protocols/gg/gg.c:149
-msgid "Error while writing to socket."
-msgstr "Feil under skriving til socket."
-
-#: src/protocols/gg/gg.c:152
-msgid "Authentication failed."
-msgstr "Autentisering feilet."
-
-#: src/protocols/gg/gg.c:155
-msgid "Unknown Error Code."
-msgstr "Ukjent feilkode."
-
-#: src/protocols/gg/gg.c:243 src/protocols/oscar/oscar.c:4147
-#, 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"
-
-#. res[0] == username
-#. XXX this should use gaim_notify_userinfo, but it is unclear to me what should be passed for 'who'
-#: src/protocols/gg/gg.c:244 src/protocols/gg/gg.c:1013
-#: src/protocols/napster/napster.c:404 src/protocols/oscar/oscar.c:4151
-#: src/protocols/oscar/oscar.c:4375 src/protocols/silc/ops.c:1086
-#: src/protocols/silc/ops.c:1148 src/protocols/toc/toc.c:468
-#: src/protocols/zephyr/zephyr.c:720 src/protocols/zephyr/zephyr.c:1130
-msgid "Buddy Information"
-msgstr "Kontaktinformasjon"
-
-#: src/protocols/gg/gg.c:294
-#, c-format
-msgid "Status: %s"
-msgstr "Status: %s"
-
-#: src/protocols/gg/gg.c:447
-msgid "Could not connect"
-msgstr "Kunne ikke koble til"
-
-#: src/protocols/gg/gg.c:454
+msgid "Your buddylist is empty, nothing was written to the file."
+msgstr ""
+
+#: src/protocols/gg/gg.c:143 src/protocols/gg/gg.c:145
+#: src/protocols/gg/gg.c:176
+#, fuzzy
+msgid "Couldn't open file"
+msgstr "Kan ikke sende fil"
+
+#: src/protocols/gg/gg.c:156
+#, fuzzy
+msgid "Buddylist saved successfully!"
+msgstr "Passordet er endret"
+
+#: src/protocols/gg/gg.c:178
+#, fuzzy
+msgid "Could't open file"
+msgstr "Kan ikke sende fil"
+
+#: src/protocols/gg/gg.c:199
+#, fuzzy
+msgid "Load Buddylist..."
+msgstr "_Alias for kontakt..."
+
+#: src/protocols/gg/gg.c:200
+#, fuzzy
+msgid "Buddylist loaded successfully!"
+msgstr "Passordet er endret"
+
+#: src/protocols/gg/gg.c:211
+#, fuzzy
+msgid "Save buddylist..."
+msgstr "Sende kontaktliste"
+
+#: src/protocols/gg/gg.c:254
+msgid "Fill in the registration fields."
+msgstr ""
+
+#: src/protocols/gg/gg.c:259
+#, fuzzy
+msgid "Passwords do not match."
+msgstr "De nye passordene stemmer ikke overens."
+
+#: src/protocols/gg/gg.c:266
+#, fuzzy
+msgid "Unable to register new account. Error occurred.\n"
+msgstr "Kunne ikke lage ny tilkobling."
+
+#: src/protocols/gg/gg.c:279
+msgid "New Gadu-Gadu Account Registered"
+msgstr ""
+
+#: src/protocols/gg/gg.c:280
+#, fuzzy
+msgid "Registration completed successfully!"
+msgstr "Registreringen var vellykket!"
+
+#: src/protocols/gg/gg.c:401
+#, fuzzy
+msgid "Last name"
+msgstr "Etternavn:"
+
+#: src/protocols/gg/gg.c:405
+#, fuzzy
+msgid "First name"
+msgstr "Fornavn:"
+
+#: src/protocols/gg/gg.c:409 src/protocols/gg/gg.c:1664
+#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:698
+#: src/protocols/jabber/buddy.c:1341 src/protocols/jabber/jabber.c:648
+#: src/protocols/msn/msn.c:1394 src/protocols/silc/buddy.c:1480
+#: src/protocols/silc/ops.c:822 src/protocols/silc/ops.c:965
+#: src/protocols/silc/ops.c:1114 src/protocols/yahoo/yahoo_profile.c:1000
+msgid "Nickname"
+msgstr "Kallenavn"
+
+#: src/protocols/gg/gg.c:413 src/protocols/jabber/jabber.c:668
+#: src/protocols/oscar/oscar.c:5998 src/protocols/oscar/oscar.c:6006
+msgid "City"
+msgstr "By"
+
+#: src/protocols/gg/gg.c:417
+msgid "Year of birth"
+msgstr ""
+
+#: src/protocols/gg/gg.c:426
+#, fuzzy
+msgid "Only online"
+msgstr "Pålogget"
+
+#: src/protocols/gg/gg.c:430 src/protocols/gg/gg.c:431
+#: src/protocols/gg/gg.c:1509
+#, fuzzy
+msgid "Find buddies"
+msgstr "Dimme ned inaktive kontakter"
+
+#: src/protocols/gg/gg.c:432
+#, fuzzy
+msgid "Please, enter your search criteria below"
+msgstr "Skriv inn ditt nye passord"
+
+#: src/protocols/gg/gg.c:465
+msgid "Fill in the fields."
+msgstr ""
+
+#: src/protocols/gg/gg.c:476
+msgid "Your current password is different from the one that you specified."
+msgstr ""
+
+#: src/protocols/gg/gg.c:491
+#, fuzzy
+msgid "Unable to change password. Error occured.\n"
+msgstr "Kunne ikke bytte Gadu-Gadu-passord"
+
+#: src/protocols/gg/gg.c:500
+#, fuzzy
+msgid "Change password for the Gadu-Gadu account"
+msgstr "Endre passord for %s:"
+
+#: src/protocols/gg/gg.c:501
+#, fuzzy
+msgid "Password was changed successfully!"
+msgstr "Passordet er endret"
+
+#: src/protocols/gg/gg.c:535
+#, fuzzy
+msgid "Token Error"
+msgstr "Ukjent feil"
+
+#: src/protocols/gg/gg.c:536
+#, fuzzy
+msgid "Unable to fetch the token.\n"
+msgstr "Klarte ikke hente ned romliste."
+
+#: src/protocols/gg/gg.c:551
+#, fuzzy
+msgid "Current password"
+msgstr "Feil passord."
+
+#: src/protocols/gg/gg.c:555 src/protocols/gg/gg.c:1475
+#: src/protocols/jabber/jabber.c:632 src/protocols/jabber/jabber.c:1150
+msgid "Password"
+msgstr "Passord"
+
+#: src/protocols/gg/gg.c:559 src/protocols/gg/gg.c:1479
+#, fuzzy
+msgid "Password (retype)"
+msgstr "Passord sendt"
+
+#: src/protocols/gg/gg.c:563 src/protocols/gg/gg.c:1483
+#, fuzzy
+msgid "Enter current token"
+msgstr "%s er ikke pålogget."
+
+#. original size: 60x24
+#: src/protocols/gg/gg.c:568 src/protocols/gg/gg.c:1488
+#, fuzzy
+msgid "Current token"
+msgstr "Pålogget på"
+
+#
+#: src/protocols/gg/gg.c:574
+#, fuzzy
+msgid "Please, enter your current password and your new password for UIN: "
+msgstr "Skriv inn ditt nåværende passord og ditt nye passord."
+
+#: src/protocols/gg/gg.c:578 src/protocols/gg/gg.c:579
+#, fuzzy
+msgid "Change Gadu-Gadu Password"
+msgstr "Kunne ikke bytte Gadu-Gadu-passord"
+
+#: src/protocols/gg/gg.c:649
+#, fuzzy, c-format
+msgid "Select a chat for buddy: %s"
+msgstr "Fjern samtalen fra kontaktlisten din"
+
+#: src/protocols/gg/gg.c:651 src/protocols/gg/gg.c:652
+#, fuzzy
+msgid "Add to chat..."
+msgstr "Legg til samtalegruppe"
+
+#: src/protocols/gg/gg.c:812
 msgid "Unable to read socket"
 msgstr "Kunne ikke lese socket"
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/gg/gg.c:674 src/protocols/icq/gaim_icq.c:343
-#: src/protocols/napster/napster.c:486 src/protocols/napster/napster.c:517
-#: src/protocols/toc/toc.c:170 src/protocols/yahoo/yahoo.c:2335
-#: src/protocols/yahoo/yahoo.c:2364 src/protocols/yahoo/yahoo.c:2427
-#: src/protocols/yahoo/yahoo_filexfer.c:68
-#: src/protocols/yahoo/yahoo_filexfer.c:111 src/protocols/yahoo/ycht.c:482
-msgid "Unable to connect."
-msgstr "Kunne ikke koble til."
-
-#: src/protocols/gg/gg.c:690
-msgid "Reading data"
-msgstr "Leser data"
-
-#: src/protocols/gg/gg.c:693
-msgid "Balancer handshake"
-msgstr "Finner ledig tjener"
-
-#: src/protocols/gg/gg.c:696
-msgid "Reading server key"
-msgstr "Leser tjenernøkkel"
-
-#: src/protocols/gg/gg.c:699
-msgid "Exchanging key hash"
-msgstr "Utveksler nøkkel-hash"
-
-#: src/protocols/gg/gg.c:709
-msgid "Critical error in GG library\n"
-msgstr "Kritisk feil i GG-biblioteket\n"
-
-#: src/protocols/gg/gg.c:727 src/protocols/gg/gg.c:818
-#: src/protocols/toc/toc.c:146
-#, c-format
-msgid "Connect to %s failed"
-msgstr "Tilkobling til %s feilet"
-
-#: src/protocols/gg/gg.c:775
-msgid "Unable to ping server"
-msgstr "Kunne ikke pinge tjener"
-
-#: src/protocols/gg/gg.c:787
-msgid "Send as message"
-msgstr "Send som beskjed"
-
-#: src/protocols/gg/gg.c:792
-msgid "Looking up GG server"
-msgstr "Søker etter GG-tjener"
-
-#: src/protocols/gg/gg.c:795
-msgid "Invalid Gadu-Gadu UIN specified"
-msgstr "Ugyldig Gadu-Gadu UIN oppgitt"
-
-#: src/protocols/gg/gg.c:841
-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:919
-msgid "Couldn't get search results"
-msgstr "Kunne ikke laste ned søkeresultater"
-
-#: src/protocols/gg/gg.c:924
-msgid "Gadu-Gadu Search Engine"
-msgstr "Gadu-Gadu søkemotor"
-
-#: src/protocols/gg/gg.c:950
-msgid "Active"
-msgstr "Aktiv"
-
-#: src/protocols/gg/gg.c:955 src/protocols/oscar/oscar.c:5190
-msgid "UIN"
-msgstr "UIN"
-
-#. First Name
-#: src/protocols/gg/gg.c:959 src/protocols/jabber/jabber.c:624
-#: src/protocols/oscar/oscar.c:5201 src/protocols/silc/ops.c:808
-#: src/protocols/trepia/trepia.c:268
-msgid "First Name"
-msgstr "Fornavn"
-
-#. Last Name
-#: src/protocols/gg/gg.c:964 src/protocols/jabber/jabber.c:629
-#: src/protocols/oscar/oscar.c:5202 src/protocols/trepia/trepia.c:275
-msgid "Last Name"
-msgstr "Etternavn"
-
-#: src/protocols/gg/gg.c:968 src/protocols/gg/gg.c:1712
-#: src/protocols/irc/msgs.c:219 src/protocols/oscar/oscar.c:5191
-#: src/protocols/silc/ops.c:1204
-msgid "Nick"
-msgstr "Kallenavn"
-
-#: src/protocols/gg/gg.c:975 src/protocols/gg/gg.c:978
-msgid "Birth Year"
-msgstr "Fødselsår"
-
-#: src/protocols/gg/gg.c:984 src/protocols/gg/gg.c:986
-#: src/protocols/gg/gg.c:988
-msgid "Sex"
-msgstr "Kjønn"
-
-#. City
-#: src/protocols/gg/gg.c:992 src/protocols/jabber/jabber.c:639
-#: src/protocols/oscar/oscar.c:5245 src/protocols/oscar/oscar.c:5253
-#: src/protocols/trepia/trepia.c:332 src/protocols/trepia/trepia.c:411
-msgid "City"
-msgstr "By"
-
-#: src/protocols/gg/gg.c:1035
-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:1043
-msgid "Couldn't Import Buddy List from Server"
-msgstr "Kunne ikke importere kontaktliste fra tjeneren"
-
-#: src/protocols/gg/gg.c:1105
-msgid "Buddy List successfully transferred to Gadu-Gadu server"
-msgstr "Kontaktlisten ble overført til Gadu-Gadu-tjeneren"
-
-#: src/protocols/gg/gg.c:1113
-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:1121
-msgid "Buddy List successfully deleted from Gadu-Gadu server"
-msgstr "Kontaktlisten ble slettet fra Gadu-Gadu-tjeneren"
+#: src/protocols/gg/gg.c:959
+msgid "Gadu-Gadu Public Directory"
+msgstr ""
+
+#: src/protocols/gg/gg.c:960
+#, fuzzy
+msgid "Search results"
+msgstr "Søkeresultater"
+
+#. zephyr has several exposures
+#. NONE (where you are hidden, and zephyrs to you are in practice silently dropped -- yes this is wrong)
+#. OPSTAFF "hidden"
+#. REALM-VISIBLE visible to people in local realm
+#. REALM-ANNOUNCED REALM-VISIBLE+ plus your logins/logouts are announced to <login,username,*>
+#. NET-VISIBLE REALM-ANNOUNCED, plus visible to people in foreign realm
+#. NET-ANNOUNCED NET-VISIBLE, plus logins/logouts are announced	 to <login,username,*>
+#.
+#. Online will set the user to the exposure they have in their options (defaulting to REALM-VISIBLE),
+#. Hidden, will set the user's exposure to OPSTAFF
+#.
+#. Away won't change their exposure but will set an auto away message (for IMs only)
+#.
+#: src/protocols/gg/gg.c:1087 src/protocols/jabber/buddy.c:1089
+#: src/protocols/napster/napster.c:578 src/protocols/oscar/oscar.c:713
+#: src/protocols/yahoo/yahoo.c:2635 src/protocols/zephyr/zephyr.c:2252
+msgid "Online"
+msgstr "Pålogget"
+
+#. type = gaim_status_type_new_with_attrs(GAIM_STATUS_UNAVAILABLE, "not-available", "Not Available",
+#. TRUE, TRUE, FALSE, "message", _("Message"),
+#. gaim_value_new(GAIM_TYPE_STRING), NULL);
+#. types = g_list_append(types, type);
+#: src/protocols/gg/gg.c:1106 src/protocols/msn/msn.c:585
+#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2828
+#: src/protocols/novell/novell.c:2962 src/protocols/novell/novell.c:3044
+#: src/protocols/silc/buddy.c:1421 src/protocols/silc/silc.c:54
+#: src/protocols/yahoo/yahoo.c:2613 src/protocols/yahoo/yahoo.c:3209
+msgid "Busy"
+msgstr "Opptatt"
+
+#: src/protocols/gg/gg.c:1111 src/protocols/msn/msn.c:554
+msgid "Blocked"
+msgstr "Blokkert"
 
 #: src/protocols/gg/gg.c:1129
-msgid "Couldn't delete Buddy List from Gadu-Gadu server"
-msgstr "Kunne ikke slette kontaktlisten fra Gadu-Gadu-tjeneren"
-
-#: src/protocols/gg/gg.c:1138
-msgid "Password changed successfully"
-msgstr "Passordet er endret"
-
-#: src/protocols/gg/gg.c:1145
-msgid "Password couldn't be changed"
-msgstr "Passordet kunne ikke endres"
-
-#: src/protocols/gg/gg.c:1264
-msgid "Error communicating with Gadu-Gadu server"
-msgstr "Feil i kommunikasjonen med Gadu-Gadu-tjeneren"
-
-#: src/protocols/gg/gg.c:1265
-msgid ""
-"Gaim was unable to complete your request due to a problem communicating with "
-"the Gadu-Gadu HTTP server.  Please try again later."
-msgstr ""
-"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:1294
-msgid "Unable to import Gadu-Gadu buddy list"
-msgstr "Kunne ikke importere Gadu-Gadu-kontaktliste"
-
-#: src/protocols/gg/gg.c:1295
-msgid ""
-"Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
-"again later."
-msgstr ""
-"Gaim kunne ikke koble til kontaktliste-tjeneren for Gadu-Gadu. Vennligst "
-"forsøk igjen senere."
-
-#: src/protocols/gg/gg.c:1368
-msgid "Couldn't export buddy list"
-msgstr "Kunne ikke eksportere kontaktliste"
-
-#: src/protocols/gg/gg.c:1369 src/protocols/gg/gg.c:1392
-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:1391
-msgid "Unable to delete Gadu-Gadu buddy list"
-msgstr "Kunne ikke slette kontaktliste for Gadu-Gadu"
-
-#: src/protocols/gg/gg.c:1442
-msgid "Unable to access directory"
-msgstr "Fikk ikke tilgang til katalogen"
-
-#: src/protocols/gg/gg.c:1443
-msgid ""
-"Gaim was unable to search the Directory because it was unable to connect to "
-"the directory server.  Please try again later."
-msgstr ""
-"Gaim kunne ikke søke i katalogen fordi den ikke fikk kontakt med "
-"katalogtjeneren. Vennligst prøv igjen senere."
-
-#: src/protocols/gg/gg.c:1477
-msgid "Unable to change Gadu-Gadu password"
-msgstr "Kunne ikke bytte Gadu-Gadu-passord"
-
-#: src/protocols/gg/gg.c:1478
-msgid ""
-"Gaim was unable to change your password due to an error connecting to the "
-"Gadu-Gadu server.  Please try again later."
-msgstr ""
-"Gaim fikk ikke kontakt med Gadu-Gadu-tjeneren og kunne ikke endre passordet "
-"ditt. Vennligst forsøk igjen senere."
-
-#: src/protocols/gg/gg.c:1494
-msgid "Directory Search"
-msgstr "Katalogsøk"
-
-#. if (js->protocol_options & CHANGE_PASSWORD) {
-#: src/protocols/gg/gg.c:1499 src/protocols/jabber/jabber.c:1100
-#: src/protocols/toc/toc.c:1564
-msgid "Change Password"
+#, fuzzy
+msgid "Add to chat"
+msgstr "Legg til samtale"
+
+#: src/protocols/gg/gg.c:1133
+#, fuzzy
+msgid "Unblock"
+msgstr "Blokker"
+
+#: src/protocols/gg/gg.c:1149
+#, fuzzy
+msgid "Chat _name:"
+msgstr "Etternavn:"
+
+#: src/protocols/gg/gg.c:1182
+#, fuzzy
+msgid "Connection failed."
+msgstr "Tilkopling feilet"
+
+#: src/protocols/gg/gg.c:1356
+#, fuzzy
+msgid "Chat error"
+msgstr "Lesefeil"
+
+#: src/protocols/gg/gg.c:1357
+#, fuzzy
+msgid "This chat name is already in use"
+msgstr "Filen eksisterer allerede."
+
+#: src/protocols/gg/gg.c:1434
+#, fuzzy
+msgid "Not connected to the server."
+msgstr "Du har blitt koblet fra tjeneren."
+
+#: src/protocols/gg/gg.c:1455
+msgid "Token Error: Unable to fetch the token.\n"
+msgstr ""
+
+#: src/protocols/gg/gg.c:1471
+#, fuzzy
+msgid "e-Mail"
+msgstr "E-post"
+
+#: src/protocols/gg/gg.c:1494 src/protocols/gg/gg.c:1495
+#, fuzzy
+msgid "Register New Gadu-Gadu Account"
+msgstr "Registrere ny jabber-konto"
+
+#: src/protocols/gg/gg.c:1496
+msgid "Please, fill in the following fields"
+msgstr ""
+
+#: src/protocols/gg/gg.c:1514
+#, fuzzy
+msgid "Change password"
 msgstr "Bytt passord"
 
-#: src/protocols/gg/gg.c:1503
-msgid "Import Buddy List from Server"
-msgstr "Importer kontaktliste fra tjener"
-
-#: src/protocols/gg/gg.c:1507
-msgid "Export Buddy List to Server"
+#: src/protocols/gg/gg.c:1519
+#, fuzzy
+msgid "Upload buddylist to Server"
 msgstr "Eksporter kontaktliste til tjener"
 
-#: src/protocols/gg/gg.c:1511
-msgid "Delete Buddy List from Server"
+#: src/protocols/gg/gg.c:1522
+#, fuzzy
+msgid "Download buddylist from Server"
+msgstr "Slett kontaktliste fra tjener"
+
+#: src/protocols/gg/gg.c:1525
+#, fuzzy
+msgid "Delete buddylist from Server"
 msgstr "Slett kontaktliste fra tjener"
 
-#: src/protocols/gg/gg.c:1544
-msgid "Unable to access user profile."
-msgstr "Fikk ikke tilgang til brukerprofilen."
-
-#: src/protocols/gg/gg.c:1545
-msgid ""
-"Gaim was unable to access this user's profile due to an error connecting to "
-"the directory server.  Please try again later."
-msgstr ""
-"Gaim kunne ikke lese brukerprofilen på grunn av tilkoblingsproblemer mot "
-"katalogtjeneren. Vennligst forsøk igjen senere."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: src/protocols/gg/gg.c:1691 src/protocols/gg/gg.c:1693
+#: src/protocols/gg/gg.c:1528
+msgid "Save buddylist to file"
+msgstr ""
+
+#: src/protocols/gg/gg.c:1531
+#, fuzzy
+msgid "Load buddylist from file"
+msgstr "Importer kontaktliste fra tjener"
+
+#. magic
+#. major_version
+#. minor_version
+#. plugin type
+#. ui_requirement
+#. flags
+#. dependencies
+#. priority
+#. id
+#. name
+#. version
+#: src/protocols/gg/gg.c:1616
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu protokolltillegg"
 
-#: src/protocols/icq/gaim_icq.c:223
-msgid "Gaim encountered an error communicating with the ICQ server."
-msgstr "Det oppstod en feil i kommunikasjonen med ICQ-tjeneren."
-
-#: src/protocols/icq/gaim_icq.c:293
-#, c-format
-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:296 src/protocols/jabber/presence.c:300
-#: src/protocols/msn/userlist.c:103 src/protocols/oscar/oscar.c:3886
-#: src/protocols/oscar/oscar.c:6438
-msgid "Authorize"
-msgstr "Godkjenn"
-
-#: src/protocols/icq/gaim_icq.c:296 src/protocols/jabber/presence.c:301
-#: src/protocols/msn/userlist.c:104 src/protocols/oscar/oscar.c:3888
-#: src/protocols/oscar/oscar.c:6439
-msgid "Deny"
-msgstr "Nekt"
-
-#: src/protocols/icq/gaim_icq.c:309
-msgid "Send message through server"
-msgstr "Send beskjed gjennom tjener"
-
-#: src/protocols/icq/gaim_icq.c:351
-msgid "Connecting..."
-msgstr "Kobler til..."
-
-#: src/protocols/icq/gaim_icq.c:497
-msgid "Nick:"
-msgstr "Kallenavn:"
-
-#: src/protocols/icq/gaim_icq.c:498
-msgid "Gaim User"
-msgstr "Gaim-bruker"
-
-#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1311
+#. summary
+#: src/protocols/gg/gg.c:1617
+msgid "Polish popular IM"
+msgstr ""
+
+#: src/protocols/gg/gg.c:1664
+#, fuzzy
+msgid "Gadu-Gadu User"
+msgstr "Gadu-Gadu søkemotor"
+
+#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1313
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Ukjent kommando: %s"
 
-#: src/protocols/irc/cmds.c:464 src/protocols/jabber/chat.c:576
-#: src/protocols/silc/silc.c:1019
+#: src/protocols/irc/cmds.c:463 src/protocols/jabber/chat.c:592
+#: src/protocols/silc/silc.c:1021
 #, c-format
 msgid "current topic is: %s"
 msgstr "gjeldende tema er: %s"
 
-#: src/protocols/irc/cmds.c:468 src/protocols/jabber/chat.c:580
-#: src/protocols/silc/silc.c:1023
+#: src/protocols/irc/cmds.c:467 src/protocols/jabber/chat.c:596
+#: src/protocols/silc/silc.c:1025
 msgid "No topic is set"
 msgstr "Intet tema for kanalen"
 
-#: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:176
-#: src/protocols/yahoo/yahoo_filexfer.c:185
-#: src/protocols/yahoo/yahoo_filexfer.c:194
-msgid "File Transfer Aborted"
-msgstr "Filoverføring avbrutt"
+#: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:173
+#: src/protocols/yahoo/yahoo_filexfer.c:182
+#: src/protocols/yahoo/yahoo_filexfer.c:191
+#, fuzzy
+msgid "File Transfer Failed"
+msgstr "Filoverføring avbrutt."
 
 #: src/protocols/irc/dcc_send.c:273
 msgid "Gaim could not open a listening port."
 msgstr "Gaim kunne ikke åpne en inngående port"
 
-#: src/protocols/irc/irc.c:75
+#: src/protocols/irc/irc.c:79
 msgid "Error displaying MOTD"
 msgstr "Feil under visning av MOTD"
 
-#: src/protocols/irc/irc.c:75
+#: src/protocols/irc/irc.c:79
 msgid "No MOTD available"
 msgstr "MOTD er ikke tilgjengelig"
 
-#: src/protocols/irc/irc.c:76
+#: src/protocols/irc/irc.c:80
 msgid "There is no MOTD associated with this connection."
 msgstr "Det er ingen MOTD assosiert med denne tilkoblingen."
 
-#: src/protocols/irc/irc.c:79
+#: src/protocols/irc/irc.c:83
 #, c-format
 msgid "MOTD for %s"
 msgstr "MOTD for %s"
 
-#: src/protocols/irc/irc.c:93 src/protocols/irc/irc.c:405
+#: src/protocols/irc/irc.c:103 src/protocols/irc/irc.c:522
+#: src/protocols/irc/irc.c:544
 msgid "Server has disconnected"
 msgstr "Tjeneren har koplet fra"
 
-#: src/protocols/irc/irc.c:158
+#: src/protocols/irc/irc.c:188
 msgid "View MOTD"
 msgstr "Vis MOTD"
 
-#: src/protocols/irc/irc.c:180 src/protocols/silc/chat.c:32
+#: src/protocols/irc/irc.c:200 src/protocols/silc/chat.c:32
 msgid "_Channel:"
 msgstr "_Kanal:"
 
-#: src/protocols/irc/irc.c:185 src/protocols/jabber/chat.c:56
+#: src/protocols/irc/irc.c:206 src/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "_Passord"
 
-#: src/protocols/irc/irc.c:217
+#: src/protocols/irc/irc.c:238
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC-kallenavn kan ikke inneholde mellomrom"
 
-#. connect to the server
-#: src/protocols/irc/irc.c:237 src/protocols/jabber/jabber.c:798
-#: src/protocols/msn/session.c:364 src/protocols/napster/napster.c:510
-#: src/protocols/novell/novell.c:2152 src/protocols/oscar/oscar.c:1759
-#: src/protocols/trepia/trepia.c:1065 src/protocols/yahoo/yahoo.c:2558
-#: src/protocols/zephyr/zephyr.c:1452
-msgid "Connecting"
-msgstr "Kobler til"
-
-#: src/protocols/irc/irc.c:244
+#: src/protocols/irc/irc.c:266 src/protocols/jabber/jabber.c:433
+#: src/protocols/jabber/jabber.c:770
+msgid "SSL support unavailable"
+msgstr "SSL-støtte utilgjengelig"
+
+#: src/protocols/irc/irc.c:277
 msgid "Couldn't create socket"
 msgstr "Kunne ikke opprette socket"
 
-#: src/protocols/irc/irc.c:259 src/protocols/jabber/jabber.c:304
-#: src/protocols/oscar/oscar.c:1690 src/protocols/oscar/oscar.c:1755
+#: src/protocols/irc/irc.c:348 src/protocols/jabber/jabber.c:306
+#: src/protocols/oscar/oscar.c:1744 src/protocols/oscar/oscar.c:1820
 msgid "Couldn't connect to host"
 msgstr "Kunne ikke koble til"
 
-#: src/protocols/irc/irc.c:402 src/protocols/trepia/trepia.c:927
+#: src/protocols/irc/irc.c:373 src/protocols/jabber/jabber.c:333
+msgid "Connection Failed"
+msgstr "Mistet tilkoplingen"
+
+#: src/protocols/irc/irc.c:376 src/protocols/jabber/jabber.c:336
+msgid "SSL Handshake Failed"
+msgstr "SSL-utveksling feilet"
+
+#: src/protocols/irc/irc.c:519 src/protocols/irc/irc.c:541
 msgid "Read error"
 msgstr "Lesefeil"
 
-#: src/protocols/irc/irc.c:557 src/protocols/silc/chat.c:1373
-#: src/protocols/yahoo/yahoochat.c:1444
+#: src/protocols/irc/irc.c:690 src/protocols/silc/chat.c:1388
+#: src/protocols/yahoo/yahoochat.c:1376
 msgid "Users"
 msgstr "Brukere"
 
-#: src/protocols/irc/irc.c:560 src/protocols/silc/chat.c:1376
-#: src/protocols/silc/ops.c:1166 src/protocols/yahoo/yahoochat.c:1453
+#: src/protocols/irc/irc.c:693 src/protocols/silc/chat.c:1391
+#: src/protocols/silc/ops.c:1166 src/protocols/yahoo/yahoochat.c:1385
 msgid "Topic"
 msgstr "Tema:"
 
-#: src/protocols/irc/irc.c:597
+#: src/protocols/irc/irc.c:730
 msgid "IRC"
 msgstr ""
 
-#: src/protocols/irc/irc.c:601
+#: src/protocols/irc/irc.c:734
 #, fuzzy
 msgid "Quit message"
 msgstr "(1 beskjed)"
@@ -5380,173 +5141,177 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:688
+#: src/protocols/irc/irc.c:820
 msgid "IRC Protocol Plugin"
 msgstr "IRC-protokolltillegg"
 
 #. *  summary
-#: src/protocols/irc/irc.c:689
+#: src/protocols/irc/irc.c:821
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "IRC-protokolltillegg"
 
-#: src/protocols/irc/irc.c:708 src/protocols/irc/msgs.c:239
-#: src/protocols/jabber/jabber.c:1617 src/protocols/napster/napster.c:672
-#: src/protocols/silc/ops.c:1026 src/protocols/silc/ops.c:1129
+#: src/protocols/irc/irc.c:840 src/protocols/irc/msgs.c:233
+#: src/protocols/jabber/jabber.c:1708 src/protocols/napster/napster.c:707
+#: src/protocols/silc/ops.c:1028 src/protocols/silc/ops.c:1130
 msgid "Server"
 msgstr "Tjener"
 
-#: src/protocols/irc/irc.c:711 src/protocols/jabber/jabber.c:1638
-#: src/protocols/msn/msn.c:1934 src/protocols/napster/napster.c:677
-#: src/protocols/silc/silc.c:1596 src/protocols/trepia/trepia.c:1301
+#: src/protocols/irc/irc.c:843 src/protocols/msn/msn.c:1968
+#: src/protocols/napster/napster.c:712 src/protocols/silc/silc.c:1597
 msgid "Port"
 msgstr "Port"
 
-#: src/protocols/irc/irc.c:714
+#: src/protocols/irc/irc.c:846
 msgid "Encodings"
 msgstr "Tegnkodinger:"
 
-#: src/protocols/irc/irc.c:717 src/protocols/irc/msgs.c:233
-#: src/protocols/jabber/jabber.c:599 src/protocols/silc/buddy.c:1454
-#: src/protocols/silc/ops.c:973 src/protocols/silc/ops.c:975
-#: src/protocols/silc/ops.c:1123 src/protocols/silc/ops.c:1125
+#: src/protocols/irc/irc.c:849 src/protocols/irc/msgs.c:227
+#: src/protocols/jabber/jabber.c:628 src/protocols/silc/buddy.c:1483
+#: src/protocols/silc/ops.c:975 src/protocols/silc/ops.c:977
+#: src/protocols/silc/ops.c:1124 src/protocols/silc/ops.c:1126
 msgid "Username"
 msgstr "Brukernavn"
 
-#: src/protocols/irc/irc.c:720
+#: src/protocols/irc/irc.c:852
 msgid "Real name"
 msgstr "Virkelig navn"
 
-#: src/protocols/irc/msgs.c:107
+#: src/protocols/irc/irc.c:855
+#, fuzzy
+msgid "Use SSL"
+msgstr "SSL"
+
+#: src/protocols/irc/msgs.c:105
 msgid "Bad mode"
 msgstr "Ugyldig mode"
 
-#: src/protocols/irc/msgs.c:120
+#: src/protocols/irc/msgs.c:116
 #, c-format
 msgid "You are banned from %s."
 msgstr "Du har blitt bannlyst fra %s."
 
-#: src/protocols/irc/msgs.c:121
+#: src/protocols/irc/msgs.c:117
 msgid "Banned"
 msgstr "Bannlyst"
 
-#: src/protocols/irc/msgs.c:139
+#: src/protocols/irc/msgs.c:134
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "Kan ikke bannlyse %s: Bannlysninslista er full."
 
-#: src/protocols/irc/msgs.c:219 src/protocols/irc/msgs.c:239
-#: src/protocols/irc/msgs.c:252
+#: src/protocols/irc/msgs.c:213 src/protocols/irc/msgs.c:233
+#: src/protocols/irc/msgs.c:246
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: src/protocols/irc/msgs.c:222
+#: src/protocols/irc/msgs.c:213 src/protocols/oscar/oscar.c:5944
+#: src/protocols/silc/ops.c:1198
+msgid "Nick"
+msgstr "Kallenavn"
+
+#: src/protocols/irc/msgs.c:216
 msgid " <i>(ircop)</i>"
 msgstr " <i>(irc-operatør)</i>"
 
-#: src/protocols/irc/msgs.c:223
+#: src/protocols/irc/msgs.c:217
 msgid " <i>(identified)</i>"
 msgstr " <i>(registrert)</i>"
 
-#: src/protocols/irc/msgs.c:227 src/protocols/irc/msgs.c:233
-#: src/protocols/irc/msgs.c:234 src/protocols/irc/msgs.c:245
-#: src/protocols/msn/msn.c:1327 src/protocols/yahoo/yahoo_profile.c:664
+#: src/protocols/irc/msgs.c:221 src/protocols/irc/msgs.c:227
+#: src/protocols/irc/msgs.c:228 src/protocols/irc/msgs.c:239
+#: src/protocols/yahoo/yahoo_profile.c:660
 #, c-format
 msgid "<b>%s:</b> %s<br>"
 msgstr "<b>%s:</b> %s<br>"
 
-#: src/protocols/irc/msgs.c:234 src/protocols/silc/ops.c:967
-#: src/protocols/silc/ops.c:1117 src/protocols/yahoo/yahoo_profile.c:1012
+#: src/protocols/irc/msgs.c:228 src/protocols/silc/ops.c:969
+#: src/protocols/silc/ops.c:1118 src/protocols/yahoo/yahoo_profile.c:1005
 msgid "Realname"
 msgstr "Virkelig navn"
 
-#: src/protocols/irc/msgs.c:245 src/protocols/silc/ops.c:1039
+#: src/protocols/irc/msgs.c:239 src/protocols/silc/ops.c:1041
 msgid "Currently on"
 msgstr "Pålogget på"
 
-#: src/protocols/irc/msgs.c:250
+#: src/protocols/irc/msgs.c:244
 #, c-format
 msgid "<b>Idle for:</b> %s<br>"
 msgstr "<b>Inaktiv i:</b> %s<br>"
 
-#: src/protocols/irc/msgs.c:252
+#: src/protocols/irc/msgs.c:246
 msgid "Online since"
 msgstr "Pålogget siden"
 
-#: src/protocols/irc/msgs.c:255
+#: src/protocols/irc/msgs.c:249
 msgid "<br><b>Defining adjective:</b> Glorious<br>"
 msgstr "<br><b>Beskrivelse:</b> Strålende<br>"
 
-#: src/protocols/irc/msgs.c:262
-#, c-format
-msgid "Buddy Information for %s"
-msgstr "Kontaktinformasjon for %s"
-
-#: src/protocols/irc/msgs.c:325
+#: src/protocols/irc/msgs.c:317
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s har endret kanaltema til: %s"
 
-#: src/protocols/irc/msgs.c:330
+#: src/protocols/irc/msgs.c:322
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "Kanaltema for %s er %s"
 
-#: src/protocols/irc/msgs.c:348
+#: src/protocols/irc/msgs.c:339
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Ukjent beskjed '%s'"
 
-#: src/protocols/irc/msgs.c:349
+#: src/protocols/irc/msgs.c:340
 msgid "Unknown message"
 msgstr "Ukjent beskjed"
 
-#: src/protocols/irc/msgs.c:349
+#: src/protocols/irc/msgs.c:340
 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:373
+#: src/protocols/irc/msgs.c:363
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Brukere på %s: %s"
 
 #
-#: src/protocols/irc/msgs.c:473
+#: src/protocols/irc/msgs.c:482
 #, fuzzy
 msgid "Time Response"
 msgstr "Tid"
 
-#: src/protocols/irc/msgs.c:474
+#: src/protocols/irc/msgs.c:483
 msgid "The IRC server's local time is:"
 msgstr "IRC-tjenerens lokaltid er:"
 
-#: src/protocols/irc/msgs.c:488
+#: src/protocols/irc/msgs.c:494
 msgid "No such channel"
 msgstr "Kanalen eksisterer ikke"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:501
+#: src/protocols/irc/msgs.c:505
 msgid "no such channel"
 msgstr "kanalen eksisterer ikke"
 
-#: src/protocols/irc/msgs.c:504
+#: src/protocols/irc/msgs.c:508
 msgid "User is not logged in"
 msgstr "Brukeren er ikke pålogget"
 
-#: src/protocols/irc/msgs.c:510
+#: src/protocols/irc/msgs.c:513
 msgid "No such nick or channel"
 msgstr "Dette kallenavnet/kanalnavnet finnes ikke"
 
-#: src/protocols/irc/msgs.c:531
+#: src/protocols/irc/msgs.c:533
 msgid "Could not send"
 msgstr "Kunne ikke sende"
 
-#: src/protocols/irc/msgs.c:587
+#: src/protocols/irc/msgs.c:589
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Kanalen %s krever at du er invitert først."
 
-#: src/protocols/irc/msgs.c:588
+#: src/protocols/irc/msgs.c:590
 msgid "Invitation only"
 msgstr "Bare inviterte"
 
@@ -5565,16 +5330,7 @@
 msgid "mode (%s %s) by %s"
 msgstr "mode (%s %s) av %s"
 
-#: src/protocols/irc/msgs.c:808
-#, c-format
-msgid "Invalid nickname '%s'"
-msgstr "Ugyldig brukernavn '%s'"
-
-#: src/protocols/irc/msgs.c:809
-msgid "Invalid nickname"
-msgstr "Ugyldig brukernavn"
-
-#: src/protocols/irc/msgs.c:811 src/protocols/irc/msgs.c:816
+#: src/protocols/irc/msgs.c:805
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -5582,47 +5338,52 @@
 "Ditt valgte kontonavn ble avvist av tjeneren. Sannsynligvis inneholder det "
 "ugyldige tegn."
 
-#: src/protocols/irc/msgs.c:858
+#: src/protocols/irc/msgs.c:844
 msgid "Cannot change nick"
 msgstr "Kan ikke endre kallenavn"
 
-#: src/protocols/irc/msgs.c:858
+#: src/protocols/irc/msgs.c:844
 msgid "Could not change nick"
 msgstr "Kunne ikke endre kallenavn"
 
-#: src/protocols/irc/msgs.c:880
+#: src/protocols/irc/msgs.c:865
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Du har forlatt kanalen%s%s"
 
-#: src/protocols/irc/msgs.c:922
+#: src/protocols/irc/msgs.c:907
 msgid "Error: invalid PONG from server"
 msgstr "Feil: ugyldig PONG fra tjener"
 
-#: src/protocols/irc/msgs.c:924
+#: src/protocols/irc/msgs.c:909
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING-svar -- lag: %lu sekunder"
 
-#: src/protocols/irc/msgs.c:999
+#: src/protocols/irc/msgs.c:984
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Kan ikke bli med i %s:"
 
-#: src/protocols/irc/msgs.c:1001 src/protocols/silc/ops.c:912
+#: src/protocols/irc/msgs.c:985 src/protocols/silc/ops.c:914
 msgid "Cannot join channel"
 msgstr "Kan ikke bli med i kanal"
 
-#: src/protocols/irc/msgs.c:1038
+#: src/protocols/irc/msgs.c:1019
+#, fuzzy
+msgid "Nick or channel is temporarily unavailable."
+msgstr "Tjenesten er midlertidig utilgjengelig."
+
+#: src/protocols/irc/msgs.c:1031
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops fra %s"
 
-#: src/protocols/irc/parse.c:113
+#: src/protocols/irc/parse.c:114
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr ""
 
-#: src/protocols/irc/parse.c:114
+#: src/protocols/irc/parse.c:115
 #, fuzzy
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
@@ -5631,166 +5392,166 @@
 "fraværende [melding]:  Sett en melding som skal vises når du er fraværende, "
 "eller ikke sett noen for å returnere."
 
-#: src/protocols/irc/parse.c:115
+#: src/protocols/irc/parse.c:116
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
 msgstr ""
 
-#: src/protocols/irc/parse.c:116
+#: src/protocols/irc/parse.c:117
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
 "must be a channel operator to do this."
 msgstr ""
 
-#: src/protocols/irc/parse.c:117
+#: src/protocols/irc/parse.c:118
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
 msgstr ""
 
-#: src/protocols/irc/parse.c:118
+#: src/protocols/irc/parse.c:119
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 msgstr ""
 
-#: src/protocols/irc/parse.c:119
-msgid ""
-"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
-"channels, optionally providing a channel key for each if needed."
-msgstr ""
-
 #: src/protocols/irc/parse.c:120
 msgid ""
-"kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
-"channel operator to do this."
+"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
+"channels, optionally providing a channel key for each if needed."
 msgstr ""
 
 #: src/protocols/irc/parse.c:121
 msgid ""
-"list:  Display a list of chat rooms on the network. <i>Warning, some servers "
-"may disconnect you upon doing this.</i>"
+"kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
+"channel operator to do this."
 msgstr ""
 
 #: src/protocols/irc/parse.c:122
-msgid "me &lt;action to perform&gt;:  Perform an action."
+msgid ""
+"list:  Display a list of chat rooms on the network. <i>Warning, some servers "
+"may disconnect you upon doing this.</i>"
 msgstr ""
 
 #: src/protocols/irc/parse.c:123
+msgid "me &lt;action to perform&gt;:  Perform an action."
+msgstr ""
+
+#: src/protocols/irc/parse.c:124
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
 msgstr ""
 
-#: src/protocols/irc/parse.c:124
-msgid ""
-"msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
-"opposed to a channel)."
-msgstr ""
-
 #: src/protocols/irc/parse.c:125
+msgid ""
+"msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
+"opposed to a channel)."
+msgstr ""
+
+#: src/protocols/irc/parse.c:126
 msgid "names [channel]:  List the users currently in a channel."
 msgstr ""
 
-#: src/protocols/irc/parse.c:126 src/protocols/jabber/jabber.c:1448
+#: src/protocols/irc/parse.c:127 src/protocols/jabber/jabber.c:1555
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr ""
 
-#: src/protocols/irc/parse.c:127
-msgid ""
-"op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
-"must be a channel operator to do this."
-msgstr ""
-
 #: src/protocols/irc/parse.c:128
 msgid ""
-"operwall &lt;message&gt;:  If you don't know what this is, you probably "
-"can't use it."
+"op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
+"must be a channel operator to do this."
 msgstr ""
 
 #: src/protocols/irc/parse.c:129
 msgid ""
+"operwall &lt;message&gt;:  If you don't know what this is, you probably "
+"can't use it."
+msgstr ""
+
+#: src/protocols/irc/parse.c:130
+msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
 msgstr ""
 
-#: src/protocols/irc/parse.c:130
+#: src/protocols/irc/parse.c:131
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
 msgstr ""
 
-#: src/protocols/irc/parse.c:131
+#: src/protocols/irc/parse.c:132
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 msgstr ""
 
-#: src/protocols/irc/parse.c:132
+#: src/protocols/irc/parse.c:133
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr ""
 
-#: src/protocols/irc/parse.c:133
-msgid "quote [...]:  Send a raw command to the server."
-msgstr ""
-
 #: src/protocols/irc/parse.c:134
+msgid "quote [...]:  Send a raw command to the server."
+msgstr ""
+
+#: src/protocols/irc/parse.c:135
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
 msgstr ""
 
-#: src/protocols/irc/parse.c:135
+#: src/protocols/irc/parse.c:136
 msgid "time: Displays the current local time at the IRC server."
 msgstr ""
 
-#: src/protocols/irc/parse.c:136
-msgid "topic [new topic]:  View or change the channel topic."
-msgstr ""
-
 #: src/protocols/irc/parse.c:137
-msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
+msgid "topic [new topic]:  View or change the channel topic."
 msgstr ""
 
 #: src/protocols/irc/parse.c:138
+msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
+msgstr ""
+
+#: src/protocols/irc/parse.c:139
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
 msgstr ""
 
-#: src/protocols/irc/parse.c:139
+#: src/protocols/irc/parse.c:140
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
 msgstr ""
 
-#: src/protocols/irc/parse.c:140
+#: src/protocols/irc/parse.c:141
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr ""
 
-#: src/protocols/irc/parse.c:421
+#: src/protocols/irc/parse.c:422
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Svartid fra %s: %lu sekunder"
 
-#: src/protocols/irc/parse.c:422
+#: src/protocols/irc/parse.c:423
 msgid "PONG"
 msgstr "PONG"
 
-#: src/protocols/irc/parse.c:422
+#: src/protocols/irc/parse.c:423
 msgid "CTCP PING reply"
 msgstr "CTCP PING-svar"
 
-#: src/protocols/irc/parse.c:525 src/protocols/irc/parse.c:529
-#: src/protocols/oscar/oscar.c:1587 src/protocols/toc/toc.c:188
-#: src/protocols/toc/toc.c:596 src/protocols/toc/toc.c:612
-#: src/protocols/toc/toc.c:689
+#: src/protocols/irc/parse.c:526 src/protocols/irc/parse.c:530
+#: src/protocols/oscar/oscar.c:1653 src/protocols/toc/toc.c:190
+#: src/protocols/toc/toc.c:688 src/protocols/toc/toc.c:704
+#: src/protocols/toc/toc.c:780
 msgid "Disconnected."
 msgstr "Frakoblet."
 
-#: src/protocols/jabber/auth.c:52
+#: src/protocols/jabber/auth.c:51
 msgid ""
 "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
 "account properties"
@@ -5798,24 +5559,30 @@
 "Tjeneren krever TSL/SSL for innlogging. Velg \"Bruk TLS hvis tilgjengelig \" "
 "i kontoalternativer."
 
-#: src/protocols/jabber/auth.c:54
+#: src/protocols/jabber/auth.c:53
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr ""
 "Tjeneren krever TLS/SSL for å logge inn, men støtte for dette ble ikke "
 "funnet."
 
-#: src/protocols/jabber/auth.c:115
+#: src/protocols/jabber/auth.c:114
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 "Tjeneren forlanger identitetsbekreftelse i ren tekst over en ukryptert "
 "forbindelse"
 
-#: src/protocols/jabber/auth.c:164 src/protocols/jabber/auth.c:165
-#: src/protocols/jabber/auth.c:242 src/protocols/jabber/auth.c:243
+#: src/protocols/jabber/auth.c:133 src/protocols/jabber/auth.c:207
+#: src/protocols/jabber/auth.c:375 src/protocols/jabber/auth.c:473
+#: src/protocols/jabber/auth.c:485 src/protocols/jabber/jabber.c:110
+msgid "Invalid response from server."
+msgstr "Ugyldig svar fra tjener."
+
+#: src/protocols/jabber/auth.c:163 src/protocols/jabber/auth.c:164
+#: src/protocols/jabber/auth.c:244 src/protocols/jabber/auth.c:245
 msgid "Plaintext Authentication"
 msgstr "Identitetsbekreftelse i ren tekst"
 
-#: src/protocols/jabber/auth.c:166 src/protocols/jabber/auth.c:244
+#: src/protocols/jabber/auth.c:165 src/protocols/jabber/auth.c:246
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
@@ -5823,105 +5590,90 @@
 "Denne tjeneren forlanger autentifikasjon i ren tekst over en ukryptert "
 "forbindelse. Tillat dette og fortsett identitetsbekreftelse?"
 
-#: src/protocols/jabber/auth.c:174 src/protocols/jabber/auth.c:252
+#: src/protocols/jabber/auth.c:173 src/protocols/jabber/auth.c:254
 msgid "Server does not use any supported authentication method"
 msgstr "Tjeneren bruker ikke noen av de støttede autentiseringsmetodene"
 
-#: src/protocols/jabber/auth.c:390
+#: src/protocols/jabber/auth.c:396
 msgid "Invalid challenge from server"
 msgstr "Ugyldig utfordring fra tjener."
 
-#: src/protocols/jabber/buddy.c:246 src/protocols/jabber/buddy.c:613
-#: src/protocols/silc/ops.c:804
+#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:667
+#: src/protocols/silc/ops.c:806
 msgid "Full Name"
 msgstr "Fullt navn"
 
-#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:626
-#: src/protocols/silc/ops.c:816
+#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:680
+#: src/protocols/silc/ops.c:818
 msgid "Family Name"
 msgstr "Etternavn"
 
-#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:630
+#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:684
 msgid "Given Name"
 msgstr "Fornavn"
 
-#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:644
-#: src/protocols/jabber/jabber.c:619 src/protocols/msn/msn.c:1317
-#: src/protocols/silc/buddy.c:1451 src/protocols/silc/ops.c:820
-#: src/protocols/silc/ops.c:963 src/protocols/silc/ops.c:1113
-#: src/protocols/yahoo/yahoo_profile.c:1007
-msgid "Nickname"
-msgstr "Kallenavn"
-
-#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/jabber.c:659
+#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/jabber.c:688
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:672
+#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:726
 msgid "Street Address"
 msgstr "Gateadresse"
 
-#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:668
+#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:722
 msgid "Extended Address"
 msgstr "Ekstra adresse"
 
-#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:676
+#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:730
 msgid "Locality"
 msgstr "Sted"
 
-#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:680
+#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:734
 msgid "Region"
 msgstr "Region"
 
-#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:684
-#: src/protocols/jabber/jabber.c:649
+#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:738
+#: src/protocols/jabber/jabber.c:678
 msgid "Postal Code"
 msgstr "Postnummer"
 
-#. Country
-#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:689
-#: src/protocols/trepia/trepia.c:340 src/protocols/trepia/trepia.c:417
+#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:743
 msgid "Country"
 msgstr "Land"
 
-#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:700
-#: src/protocols/jabber/buddy.c:707
+#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:754
+#: src/protocols/jabber/buddy.c:761
 msgid "Telephone"
 msgstr "Telefonnummer"
 
-#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:718
-#: src/protocols/jabber/buddy.c:726 src/protocols/silc/silc.c:656
-#: src/protocols/silc/util.c:511 src/protocols/yahoo/yahoo_profile.c:1002
+#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:772
+#: src/protocols/jabber/buddy.c:780 src/protocols/silc/silc.c:661
+#: src/protocols/silc/util.c:511 src/protocols/yahoo/yahoo_profile.c:995
 msgid "Email"
 msgstr "E-post"
 
-#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:741
+#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:795
 msgid "Organization Name"
 msgstr "Organisasjonsnavn"
 
-#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:745
+#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:799
 msgid "Organization Unit"
 msgstr "Organisasjonsenhet"
 
-#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:751
-#: src/protocols/novell/novell.c:1451
-msgid "Title"
-msgstr "Tittel"
-
-#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:754
+#: src/protocols/jabber/buddy.c:265 src/protocols/jabber/buddy.c:808
 msgid "Role"
 msgstr "Rolle"
 
-#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:647
-#: src/protocols/oscar/oscar.c:5226
+#: src/protocols/jabber/buddy.c:266 src/protocols/jabber/buddy.c:701
+#: src/protocols/oscar/oscar.c:5979
 msgid "Birthday"
 msgstr "Fødselsdag"
 
-#: src/protocols/jabber/buddy.c:509 src/protocols/jabber/buddy.c:510
+#: src/protocols/jabber/buddy.c:567 src/protocols/jabber/buddy.c:568
 msgid "Edit Jabber vCard"
 msgstr "Rediger vCard for Jabber"
 
-#: src/protocols/jabber/buddy.c:511
+#: src/protocols/jabber/buddy.c:569
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -5929,604 +5681,645 @@
 "Alle feltene nedenfor er valgfrie. Du trenger bare å skrive den "
 "informasjonen du ønsker"
 
-#: src/protocols/jabber/buddy.c:556
+#: src/protocols/jabber/buddy.c:616
 msgid "Jabber ID"
 msgstr "Jabber-feil"
 
-#: src/protocols/jabber/buddy.c:566 src/protocols/jabber/buddy.c:573
-#: src/protocols/jabber/buddy.c:586 src/protocols/jabber/jabber.c:971
-#: src/protocols/msn/msn.c:489 src/protocols/novell/novell.c:2819
-#: src/protocols/novell/novell.c:2823 src/protocols/oscar/oscar.c:730
-#: src/protocols/oscar/oscar.c:736 src/protocols/oscar/oscar.c:738
-#: src/protocols/yahoo/yahoo.c:2820
-msgid "Status"
-msgstr "Status"
-
-#: src/protocols/jabber/buddy.c:634 src/protocols/silc/ops.c:812
+#: src/protocols/jabber/buddy.c:642 src/protocols/jabber/jabber.c:1711
+msgid "Resource"
+msgstr "Ressurs"
+
+#: src/protocols/jabber/buddy.c:688 src/protocols/silc/ops.c:814
 msgid "Middle Name"
 msgstr "Mellomnavn"
 
-#: src/protocols/jabber/buddy.c:652 src/protocols/jabber/jabber.c:634
-#: src/protocols/oscar/oscar.c:5244 src/protocols/oscar/oscar.c:5252
-#: src/protocols/silc/ops.c:848
+#: src/protocols/jabber/buddy.c:706 src/protocols/jabber/jabber.c:663
+#: src/protocols/oscar/oscar.c:5997 src/protocols/oscar/oscar.c:6005
+#: src/protocols/silc/ops.c:850
 msgid "Address"
 msgstr "Adresse"
 
-#: src/protocols/jabber/buddy.c:664
+#: src/protocols/jabber/buddy.c:718
 msgid "P.O. Box"
 msgstr "Postboks"
 
-#: src/protocols/jabber/buddy.c:770
+#: src/protocols/jabber/buddy.c:832
 msgid "Photo"
 msgstr "Bilde"
 
-#: src/protocols/jabber/buddy.c:770
+#: src/protocols/jabber/buddy.c:832
 msgid "Logo"
 msgstr "Logo"
 
-#: src/protocols/jabber/buddy.c:786
-msgid "Jabber Profile"
-msgstr "Jabber-profil"
-
-#: src/protocols/jabber/buddy.c:941
+#: src/protocols/jabber/buddy.c:1035
 msgid "Un-hide From"
 msgstr "Fjern fraværsmarkering for"
 
-#: src/protocols/jabber/buddy.c:944
+#: src/protocols/jabber/buddy.c:1038
 msgid "Temporarily Hide From"
 msgstr "Midlertidig borte for"
 
 #. && NOT ME
-#: src/protocols/jabber/buddy.c:951
+#: src/protocols/jabber/buddy.c:1045
 msgid "Cancel Presence Notification"
 msgstr "Avbryt varsling av tilstedeværelse"
 
-#: src/protocols/jabber/buddy.c:957
+#: src/protocols/jabber/buddy.c:1051
 msgid "(Re-)Request authorization"
 msgstr "Spør på nytt om godkjenning"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: src/protocols/jabber/buddy.c:965
+#: src/protocols/jabber/buddy.c:1059
 msgid "Unsubscribe"
 msgstr "Fjern abonnement"
 
-#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:6509
-#: src/protocols/yahoo/yahoochat.c:1040
+#: src/protocols/jabber/buddy.c:1085 src/protocols/jabber/chat.c:677
+#: src/protocols/jabber/chat.c:688 src/protocols/jabber/jabber.c:1018
+#: src/protocols/silc/ops.c:1235
+msgid "Error"
+msgstr "Feil"
+
+#: src/protocols/jabber/buddy.c:1091 src/protocols/jabber/jabber.c:1047
+msgid "Chatty"
+msgstr "Pratsom"
+
+#: src/protocols/jabber/buddy.c:1095 src/protocols/jabber/jabber.c:1063
+#: src/status.c:159
+msgid "Extended Away"
+msgstr "Utvidet borte"
+
+#: src/protocols/jabber/buddy.c:1097 src/protocols/jabber/jabber.c:1071
+#: src/protocols/oscar/oscar.c:701 src/protocols/oscar/oscar.c:7785
+msgid "Do Not Disturb"
+msgstr "Ikke forstyrr"
+
+#: src/protocols/jabber/buddy.c:1235
+msgid "The following are the results of your search"
+msgstr ""
+
+#: src/protocols/jabber/buddy.c:1327
+msgid "Fill in one or more fields to search for any matching Jabber users."
+msgstr ""
+
+#: src/protocols/jabber/buddy.c:1331 src/protocols/jabber/jabber.c:653
+#: src/protocols/oscar/oscar.c:5954 src/protocols/silc/ops.c:810
+msgid "First Name"
+msgstr "Fornavn"
+
+#: src/protocols/jabber/buddy.c:1336 src/protocols/jabber/jabber.c:658
+#: src/protocols/oscar/oscar.c:5955
+msgid "Last Name"
+msgstr "Etternavn"
+
+#: src/protocols/jabber/buddy.c:1346
+msgid "E-Mail Address"
+msgstr "E-postadresse"
+
+#: src/protocols/jabber/buddy.c:1355 src/protocols/jabber/buddy.c:1356
+#, fuzzy
+msgid "Search for Jabber users"
+msgstr "Kontaktsøk etter e-postadresse"
+
+#: src/protocols/jabber/buddy.c:1370
+#, fuzzy
+msgid "Invalid Directory"
+msgstr "Ugyldig feil"
+
+#: src/protocols/jabber/buddy.c:1387
+#, fuzzy
+msgid "Enter a User Directory"
+msgstr "Kan ikke sende en katalog."
+
+#: src/protocols/jabber/buddy.c:1388
+#, fuzzy
+msgid "Select a user directory to search"
+msgstr "Velg en konferanseserver å spørre"
+
+#
+#: src/protocols/jabber/buddy.c:1391
+#, fuzzy
+msgid "Search Directory"
+msgstr "_Søk etter:"
+
+#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:7312
+#: src/protocols/yahoo/yahoochat.c:979
 msgid "_Room:"
 msgstr "_Rom:"
 
-#: src/protocols/jabber/chat.c:46
+#: src/protocols/jabber/chat.c:47
 msgid "_Server:"
 msgstr "_Tjener:"
 
-#: src/protocols/jabber/chat.c:51
+#: src/protocols/jabber/chat.c:53
 msgid "_Handle:"
 msgstr "_Navn:"
 
-#: src/protocols/jabber/chat.c:212
+#: src/protocols/jabber/chat.c:223
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s er ikke et gyldig romnavn"
 
-#: src/protocols/jabber/chat.c:213
+#: src/protocols/jabber/chat.c:224
 msgid "Invalid Room Name"
 msgstr "Ugyldig romnavn"
 
-#: src/protocols/jabber/chat.c:218
+#: src/protocols/jabber/chat.c:229
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s er ikke et gyldig tjenernavn"
 
-#: src/protocols/jabber/chat.c:219 src/protocols/jabber/chat.c:220
+#: src/protocols/jabber/chat.c:230 src/protocols/jabber/chat.c:231
 msgid "Invalid Server Name"
 msgstr "Ugyldig tjenernavn"
 
-#: src/protocols/jabber/chat.c:224
+#: src/protocols/jabber/chat.c:235
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s er ikke en gyldig rom-identifikator"
 
-#: src/protocols/jabber/chat.c:225 src/protocols/jabber/chat.c:226
+#: src/protocols/jabber/chat.c:236 src/protocols/jabber/chat.c:237
 msgid "Invalid Room Handle"
 msgstr "Ugyldig romidentifikator"
 
-#: src/protocols/jabber/chat.c:379
+#: src/protocols/jabber/chat.c:395
 msgid "Configuration error"
 msgstr "Feil i oppsett"
 
-#: src/protocols/jabber/chat.c:388 src/protocols/jabber/chat.c:533
+#: src/protocols/jabber/chat.c:404 src/protocols/jabber/chat.c:549
 msgid "Unable to configure"
 msgstr "Klarte ikke å konfigurere"
 
 #
-#: src/protocols/jabber/chat.c:404
+#: src/protocols/jabber/chat.c:420
 msgid "Room Configuration Error"
 msgstr "Oppsettsfeil ved rom"
 
-#: src/protocols/jabber/chat.c:405
+#: src/protocols/jabber/chat.c:421
 msgid "This room is not capable of being configured"
 msgstr "Dette rommet er ikke i stand til å bli konfigurert"
 
 #
-#: src/protocols/jabber/chat.c:455 src/protocols/jabber/chat.c:524
+#: src/protocols/jabber/chat.c:471 src/protocols/jabber/chat.c:540
 msgid "Registration error"
 msgstr "Registreringsfeil"
 
-#: src/protocols/jabber/chat.c:607
+#: src/protocols/jabber/chat.c:628
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "Bytte av kallenavn ikke støttet i ikke-MUC gruppesamtalerom"
 
-#
-#: src/protocols/jabber/chat.c:651 src/protocols/jabber/chat.c:662
-msgid "Roomlist Error"
-msgstr "Feil ved liste over rom"
-
-#: src/protocols/jabber/chat.c:652 src/protocols/jabber/chat.c:663
-msgid "Error retreiving roomlist"
+#: src/protocols/jabber/chat.c:678 src/protocols/jabber/chat.c:689
+#: src/protocols/silc/ops.c:1235
+#, fuzzy
+msgid "Error retrieving room list"
 msgstr "Klarte ikke hente romliste"
 
-#: src/protocols/jabber/chat.c:711
+#: src/protocols/jabber/chat.c:737
 #, fuzzy
 msgid "Invalid Server"
 msgstr "Ugyldig tjenernavn"
 
-#: src/protocols/jabber/chat.c:749
+#: src/protocols/jabber/chat.c:775
 #, fuzzy
 msgid "Enter a Conference Server"
 msgstr "Kople til en konferansetjener"
 
-#: src/protocols/jabber/chat.c:750
+#: src/protocols/jabber/chat.c:776
 msgid "Select a conference server to query"
 msgstr "Velg en konferanseserver å spørre"
 
-#: src/protocols/jabber/chat.c:753
+#: src/protocols/jabber/chat.c:779
 msgid "Find Rooms"
 msgstr "Finn samtalerom"
 
-#: src/protocols/jabber/jabber.c:77
+#: src/protocols/jabber/jabber.c:79
 msgid "Error initializing session"
 msgstr "Feil under oppretting av sesjon"
 
-#: src/protocols/jabber/jabber.c:213 src/protocols/trepia/trepia.c:248
-#: src/protocols/trepia/trepia.c:699 src/protocols/trepia/trepia.c:988
-#: src/protocols/trepia/trepia.c:1032 src/protocols/trepia/trepia.c:1131
-#: src/protocols/trepia/trepia.c:1177
+#: src/protocols/jabber/jabber.c:215
 msgid "Write error"
 msgstr "Feil ved skriving"
 
-#: src/protocols/jabber/jabber.c:251 src/protocols/jabber/jabber.c:271
+#: src/protocols/jabber/jabber.c:253 src/protocols/jabber/jabber.c:273
 msgid "Read Error"
 msgstr "Lesefeil"
 
-#: src/protocols/jabber/jabber.c:331
-msgid "Connection Failed"
-msgstr "Mistet tilkoplingen"
-
-#: src/protocols/jabber/jabber.c:334
-msgid "SSL Handshake Failed"
-msgstr "SSL-utveksling feilet"
-
-#: src/protocols/jabber/jabber.c:378 src/protocols/jabber/jabber.c:711
+#: src/protocols/jabber/jabber.c:359 src/protocols/jabber/jabber.c:780
+msgid "Unable to create socket"
+msgstr "Kunne ikke opprette socket"
+
+#: src/protocols/jabber/jabber.c:403 src/protocols/jabber/jabber.c:740
 msgid "Invalid Jabber ID"
 msgstr "Ugyldig jabber-ID"
 
-#: src/protocols/jabber/jabber.c:409 src/protocols/jabber/jabber.c:741
-msgid "SSL support unavailable"
-msgstr "SSL-støtte utilgjengelig"
-
-#: src/protocols/jabber/jabber.c:419 src/protocols/jabber/jabber.c:751
-#: src/protocols/trepia/trepia.c:1071
-msgid "Unable to create socket"
-msgstr "Kunne ikke opprette socket"
-
-#: src/protocols/jabber/jabber.c:444
+#: src/protocols/jabber/jabber.c:473
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registrering av %s@%s vellykket"
 
-#: src/protocols/jabber/jabber.c:446 src/protocols/jabber/jabber.c:447
+#: src/protocols/jabber/jabber.c:475 src/protocols/jabber/jabber.c:476
 msgid "Registration Successful"
 msgstr "Registreringen var vellykket!"
 
-#: src/protocols/jabber/jabber.c:453 src/protocols/jabber/jabber.c:1219
+#: src/protocols/jabber/jabber.c:482 src/protocols/jabber/jabber.c:1299
 msgid "Unknown Error"
 msgstr "Ukjent feil"
 
-#: src/protocols/jabber/jabber.c:455 src/protocols/jabber/jabber.c:456
+#: src/protocols/jabber/jabber.c:484 src/protocols/jabber/jabber.c:485
 msgid "Registration Failed"
 msgstr "Registrering feilet"
 
-#: src/protocols/jabber/jabber.c:567 src/protocols/jabber/jabber.c:568
+#: src/protocols/jabber/jabber.c:596 src/protocols/jabber/jabber.c:597
 msgid "Already Registered"
 msgstr "Du er allerede registrert"
 
-#: src/protocols/jabber/jabber.c:603 src/protocols/jabber/jabber.c:1074
-msgid "Password"
-msgstr "Passord"
-
-#: src/protocols/jabber/jabber.c:614
+#: src/protocols/jabber/jabber.c:643
 msgid "E-Mail"
 msgstr "E-post"
 
-#. State
-#: src/protocols/jabber/jabber.c:644 src/protocols/oscar/oscar.c:5246
-#: src/protocols/oscar/oscar.c:5254 src/protocols/trepia/trepia.c:336
-#: src/protocols/trepia/trepia.c:414
+#: src/protocols/jabber/jabber.c:673 src/protocols/oscar/oscar.c:5999
+#: src/protocols/oscar/oscar.c:6007
 msgid "State"
 msgstr "Fylke/stat"
 
-#: src/protocols/jabber/jabber.c:654 src/protocols/silc/ops.c:853
-#: src/protocols/silc/silc.c:658 src/protocols/silc/util.c:513
+#: src/protocols/jabber/jabber.c:683 src/protocols/silc/ops.c:855
+#: src/protocols/silc/silc.c:663 src/protocols/silc/util.c:513
 msgid "Phone"
 msgstr "Telefon"
 
-#: src/protocols/jabber/jabber.c:664
+#: src/protocols/jabber/jabber.c:693
 msgid "Date"
 msgstr "Dato"
 
-#: src/protocols/jabber/jabber.c:672
+#: src/protocols/jabber/jabber.c:701
 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:675 src/protocols/jabber/jabber.c:676
+#: src/protocols/jabber/jabber.c:704 src/protocols/jabber/jabber.c:705
 msgid "Register New Jabber Account"
 msgstr "Registrere ny jabber-konto"
 
-#: src/protocols/jabber/jabber.c:759
-msgid "Logged out"
-msgstr "Logget ut"
-
-#: src/protocols/jabber/jabber.c:802
+#: src/protocols/jabber/jabber.c:842
 msgid "Initializing Stream"
 msgstr "Nullstiller datastrøm"
 
-#: src/protocols/jabber/jabber.c:808 src/protocols/msn/session.c:370
+#: src/protocols/jabber/jabber.c:848 src/protocols/msn/session.c:368
 msgid "Authenticating"
 msgstr "Autentiserer"
 
-#: src/protocols/jabber/jabber.c:817
+#: src/protocols/jabber/jabber.c:857
 msgid "Re-initializing Stream"
 msgstr "Nullstiller datastrøm på nytt"
 
-#: src/protocols/jabber/jabber.c:897 src/protocols/jabber/jabber.c:1197
-#: src/protocols/jabber/jabber.c:1238 src/protocols/jabber/jabber.c:1271
-#: src/protocols/oscar/oscar.c:736 src/protocols/oscar/oscar.c:6793
+#: src/protocols/jabber/jabber.c:928 src/protocols/jabber/jabber.c:1277
+#: src/protocols/jabber/jabber.c:1318 src/protocols/jabber/jabber.c:1351
+#: src/protocols/oscar/oscar.c:767 src/protocols/oscar/oscar.c:7583
 msgid "Not Authorized"
 msgstr "Ikke godkjent"
 
-#: src/protocols/jabber/jabber.c:938
+#: src/protocols/jabber/jabber.c:971
 msgid "Both"
 msgstr "Begge"
 
-#: src/protocols/jabber/jabber.c:940
+#: src/protocols/jabber/jabber.c:973
 #, fuzzy
 msgid "From (To pending)"
 msgstr "Fra (Til avventende)"
 
 # Gammel tekst "Jeg er fra"
-#: src/protocols/jabber/jabber.c:942
+#: src/protocols/jabber/jabber.c:975
 msgid "From"
 msgstr "Fra"
 
-#: src/protocols/jabber/jabber.c:945
+#: src/protocols/jabber/jabber.c:978
 msgid "To"
 msgstr "Til"
 
-#: src/protocols/jabber/jabber.c:947
+#: src/protocols/jabber/jabber.c:980
 #, fuzzy
 msgid "None (To pending)"
 msgstr "Ingen (til avventende)"
 
-#: src/protocols/jabber/jabber.c:951
+#: src/protocols/jabber/jabber.c:984
 msgid "Subscription"
 msgstr "Abonnement"
 
-#: src/protocols/jabber/jabber.c:984
-msgid "Error"
-msgstr "Feil"
-
-#: src/protocols/jabber/jabber.c:997 src/protocols/jabber/jutil.c:35
-#: src/protocols/jabber/presence.c:72 src/protocols/jabber/presence.c:130
-msgid "Chatty"
-msgstr "Pratsom"
-
-#: src/protocols/jabber/jabber.c:999 src/protocols/jabber/jutil.c:38
-#: src/protocols/jabber/presence.c:74 src/protocols/jabber/presence.c:135
-msgid "Extended Away"
-msgstr "Utvidet borte"
-
-#: src/protocols/jabber/jabber.c:1000 src/protocols/jabber/jutil.c:41
-#: src/protocols/jabber/presence.c:76 src/protocols/jabber/presence.c:137
-#: src/protocols/oscar/oscar.c:678 src/protocols/oscar/oscar.c:5791
-#: src/protocols/oscar/oscar.c:6986
-msgid "Do Not Disturb"
-msgstr "Ikke forstyrr"
-
-#: src/protocols/jabber/jabber.c:1017
+#: src/protocols/jabber/jabber.c:1039 src/protocols/jabber/jabber.c:1047
+#: src/protocols/jabber/jabber.c:1055 src/protocols/jabber/jabber.c:1063
+#: src/protocols/jabber/jabber.c:1071
+#, fuzzy
+msgid "Priority"
+msgstr "Port"
+
+#: src/protocols/jabber/jabber.c:1093
 msgid "Password Changed"
 msgstr "Passordet er endret"
 
-#: src/protocols/jabber/jabber.c:1018
+#: src/protocols/jabber/jabber.c:1094
 msgid "Your password has been changed."
 msgstr "Passordet ditt har blitt endret."
 
-#: src/protocols/jabber/jabber.c:1022 src/protocols/jabber/jabber.c:1023
+#: src/protocols/jabber/jabber.c:1098 src/protocols/jabber/jabber.c:1099
 msgid "Error changing password"
 msgstr "Feil under endring av passord."
 
-#: src/protocols/jabber/jabber.c:1079
+#: src/protocols/jabber/jabber.c:1155
 msgid "Password (again)"
 msgstr "Passord (igjen)"
 
-#: src/protocols/jabber/jabber.c:1084 src/protocols/jabber/jabber.c:1085
+#: src/protocols/jabber/jabber.c:1160 src/protocols/jabber/jabber.c:1161
 msgid "Change Jabber Password"
 msgstr "Bytt jabber-passord"
 
-#: src/protocols/jabber/jabber.c:1085
+#: src/protocols/jabber/jabber.c:1161
 msgid "Please enter your new password"
 msgstr "Skriv inn ditt nye passord"
 
-#: src/protocols/jabber/jabber.c:1095 src/protocols/toc/toc.c:1554
+#: src/protocols/jabber/jabber.c:1171 src/protocols/toc/toc.c:1684
 msgid "Set User Info"
 msgstr "Sett brukerinfo"
 
-#: src/protocols/jabber/jabber.c:1177
+#. if (js->protocol_options & CHANGE_PASSWORD) {
+#: src/protocols/jabber/jabber.c:1176 src/protocols/toc/toc.c:1694
+msgid "Change Password"
+msgstr "Bytt passord"
+
+#
+#. }
+#: src/protocols/jabber/jabber.c:1181
+#, fuzzy
+msgid "Search for users"
+msgstr "_Søk etter:"
+
+#: src/protocols/jabber/jabber.c:1257
 msgid "Bad Request"
 msgstr "Ugyldig forespørsel"
 
-#: src/protocols/jabber/jabber.c:1179
+#: src/protocols/jabber/jabber.c:1259
 msgid "Conflict"
 msgstr "Konflikt"
 
-#: src/protocols/jabber/jabber.c:1181
+#: src/protocols/jabber/jabber.c:1261
 msgid "Feature Not Implemented"
 msgstr "Funksjonen er ikke implementert"
 
-#: src/protocols/jabber/jabber.c:1183
+#: src/protocols/jabber/jabber.c:1263
 msgid "Forbidden"
 msgstr "Forbudt"
 
-#: src/protocols/jabber/jabber.c:1185
+#: src/protocols/jabber/jabber.c:1265
 msgid "Gone"
 msgstr "Borte"
 
-#: src/protocols/jabber/jabber.c:1187 src/protocols/jabber/jabber.c:1261
+#: src/protocols/jabber/jabber.c:1267 src/protocols/jabber/jabber.c:1341
 msgid "Internal Server Error"
 msgstr "Intern tjenerfeil"
 
-#: src/protocols/jabber/jabber.c:1189
+#: src/protocols/jabber/jabber.c:1269
 msgid "Item Not Found"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1191
+#: src/protocols/jabber/jabber.c:1271
 msgid "Malformed Jabber ID"
 msgstr "Ugyldig jabber-ID"
 
-#: src/protocols/jabber/jabber.c:1193
+#: src/protocols/jabber/jabber.c:1273
 msgid "Not Acceptable"
 msgstr "Ikke akseptabel"
 
-#: src/protocols/jabber/jabber.c:1195
+#: src/protocols/jabber/jabber.c:1275
 msgid "Not Allowed"
 msgstr "Ikke tillatt"
 
-#: src/protocols/jabber/jabber.c:1199
+#: src/protocols/jabber/jabber.c:1279
 msgid "Payment Required"
 msgstr "Betaling kreves"
 
-#: src/protocols/jabber/jabber.c:1201
+#: src/protocols/jabber/jabber.c:1281
 msgid "Recipient Unavailable"
 msgstr "Mottager utilgjengelig"
 
-#: src/protocols/jabber/jabber.c:1205
+#: src/protocols/jabber/jabber.c:1285
 msgid "Registration Required"
 msgstr "Registrering kreves"
 
-#: src/protocols/jabber/jabber.c:1207
+#: src/protocols/jabber/jabber.c:1287
 msgid "Remote Server Not Found"
 msgstr "Klarte ikke finne tjener"
 
-#: src/protocols/jabber/jabber.c:1209
+#: src/protocols/jabber/jabber.c:1289
 msgid "Remote Server Timeout"
 msgstr "Tidsavbrudd for tjeneren"
 
-#: src/protocols/jabber/jabber.c:1211
+#: src/protocols/jabber/jabber.c:1291
 msgid "Server Overloaded"
 msgstr "Tjeneren er ikke tilgjengelig (overbelastet)"
 
-#: src/protocols/jabber/jabber.c:1213
+#: src/protocols/jabber/jabber.c:1293
 msgid "Service Unavailable"
 msgstr "Tjenesten er ikke tilgjengelig"
 
-#: src/protocols/jabber/jabber.c:1215
+#: src/protocols/jabber/jabber.c:1295
 msgid "Subscription Required"
 msgstr "Abonnement kreves"
 
-#: src/protocols/jabber/jabber.c:1217
+#: src/protocols/jabber/jabber.c:1297
 msgid "Unexpected Request"
 msgstr "Uventet forespørsel"
 
-#: src/protocols/jabber/jabber.c:1224
+#: src/protocols/jabber/jabber.c:1304
 msgid "Authorization Aborted"
 msgstr "Godkjenning avbrutt"
 
-#: src/protocols/jabber/jabber.c:1226
+#: src/protocols/jabber/jabber.c:1306
 #, fuzzy
 msgid "Incorrect encoding in authorization"
 msgstr "Feil koding i godkjenning"
 
-#: src/protocols/jabber/jabber.c:1229
+#: src/protocols/jabber/jabber.c:1309
 msgid "Invalid authzid"
 msgstr "Ugyldig authzid"
 
-#: src/protocols/jabber/jabber.c:1232
+#: src/protocols/jabber/jabber.c:1312
 msgid "Invalid Authorization Mechanism"
 msgstr "Ugyldig godkjennings mekanisme"
 
-#: src/protocols/jabber/jabber.c:1235
+#: src/protocols/jabber/jabber.c:1315
 msgid "Authorization mechanism too weak"
 msgstr "Godkjenningsmekanisme for svak"
 
-#: src/protocols/jabber/jabber.c:1240
+#: src/protocols/jabber/jabber.c:1320
 msgid "Temporary Authentication Failure"
 msgstr "Midlertidig autentiseringsfeil"
 
-#: src/protocols/jabber/jabber.c:1242
+#: src/protocols/jabber/jabber.c:1322
 msgid "Authentication Failure"
 msgstr "Autentiseringsfeil"
 
-#: src/protocols/jabber/jabber.c:1246
+#: src/protocols/jabber/jabber.c:1326
 msgid "Bad Format"
 msgstr "Ugyldig format"
 
-#: src/protocols/jabber/jabber.c:1248
+#: src/protocols/jabber/jabber.c:1328
 msgid "Bad Namespace Prefix"
 msgstr "Ugyldig navneromprefiks"
 
-#: src/protocols/jabber/jabber.c:1251
+#: src/protocols/jabber/jabber.c:1331
 msgid "Resource Conflict"
 msgstr "Ressurskonflikt"
 
-#: src/protocols/jabber/jabber.c:1253 src/protocols/silc/ops.c:1519
+#: src/protocols/jabber/jabber.c:1333 src/protocols/silc/ops.c:1514
 msgid "Connection Timeout"
 msgstr "Tilkoblingen lyktes ikke innenfor tidsgrensen"
 
-#: src/protocols/jabber/jabber.c:1255
+#: src/protocols/jabber/jabber.c:1335
 msgid "Host Gone"
 msgstr "Maskin borte"
 
-#: src/protocols/jabber/jabber.c:1257
+#: src/protocols/jabber/jabber.c:1337
 msgid "Host Unknown"
 msgstr "Maskin ukjent"
 
-#: src/protocols/jabber/jabber.c:1259
+#: src/protocols/jabber/jabber.c:1339
 msgid "Improper Addressing"
 msgstr "Uriktig adressering"
 
-#: src/protocols/jabber/jabber.c:1263
+#: src/protocols/jabber/jabber.c:1343
 msgid "Invalid ID"
 msgstr "Ugyldig ID"
 
-#: src/protocols/jabber/jabber.c:1265
+#: src/protocols/jabber/jabber.c:1345
 msgid "Invalid Namespace"
 msgstr "Ugyldig navnerom"
 
-#: src/protocols/jabber/jabber.c:1267
+#: src/protocols/jabber/jabber.c:1347
 msgid "Invalid XML"
 msgstr "Ugyldig XML"
 
-#: src/protocols/jabber/jabber.c:1269
+#: src/protocols/jabber/jabber.c:1349
 msgid "Non-matching Hosts"
 msgstr "Maskiner som ikke matcher"
 
-#: src/protocols/jabber/jabber.c:1273
+#: src/protocols/jabber/jabber.c:1353
 msgid "Policy Violation"
 msgstr "Brudd på policy"
 
-#: src/protocols/jabber/jabber.c:1275
+#: src/protocols/jabber/jabber.c:1355
 msgid "Remote Connection Failed"
 msgstr "Kunne ikke koble til"
 
-#: src/protocols/jabber/jabber.c:1277
+#: src/protocols/jabber/jabber.c:1357
 msgid "Resource Constraint"
 msgstr "Ressursbegrensning"
 
-#: src/protocols/jabber/jabber.c:1279
+#: src/protocols/jabber/jabber.c:1359
 msgid "Restricted XML"
 msgstr "Begrenset XML"
 
-#: src/protocols/jabber/jabber.c:1281
+#: src/protocols/jabber/jabber.c:1361
 msgid "See Other Host"
 msgstr "Se annen maskin"
 
-#: src/protocols/jabber/jabber.c:1283
+#: src/protocols/jabber/jabber.c:1363
 msgid "System Shutdown"
 msgstr "Systemet avslutter"
 
-#: src/protocols/jabber/jabber.c:1285
+#: src/protocols/jabber/jabber.c:1365
 msgid "Undefined Condition"
 msgstr "Udefinert hendelse"
 
-#: src/protocols/jabber/jabber.c:1287
+#: src/protocols/jabber/jabber.c:1367
 msgid "Unsupported Encoding"
 msgstr "Tegnkodingen er ikke støttet"
 
-#: src/protocols/jabber/jabber.c:1289
+#: src/protocols/jabber/jabber.c:1369
 msgid "Unsupported Stanza Type"
 msgstr "Stanzatypen er ikke støttet"
 
-#: src/protocols/jabber/jabber.c:1291
+#: src/protocols/jabber/jabber.c:1371
 msgid "Unsupported Version"
 msgstr "Denne versjonen er ikke støttet"
 
-#: src/protocols/jabber/jabber.c:1293
+#: src/protocols/jabber/jabber.c:1373
 msgid "XML Not Well Formed"
 msgstr "XML ikke velformet"
 
-#: src/protocols/jabber/jabber.c:1295
+#: src/protocols/jabber/jabber.c:1375
 msgid "Stream Error"
 msgstr "Feil i datastrøm"
 
-#: src/protocols/jabber/jabber.c:1362
+#: src/protocols/jabber/jabber.c:1442
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Klarte ikke forby brukeren %s"
 
-#: src/protocols/jabber/jabber.c:1414
+#: src/protocols/jabber/jabber.c:1464
+#, fuzzy, c-format
+msgid "Unknown affiliation: \"%s\""
+msgstr "Ukjent kommando: %s"
+
+#: src/protocols/jabber/jabber.c:1469
+#, fuzzy, c-format
+msgid "Unable to affiliate user %s as \"%s\""
+msgstr "Kunne ikke invitere bruker (%s)."
+
+#: src/protocols/jabber/jabber.c:1521
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Klarte ikke sparke brukeren %s"
 
-#: src/protocols/jabber/jabber.c:1440
+#: src/protocols/jabber/jabber.c:1547
 msgid "config:  Configure a chat room."
 msgstr "config:  Endre innstillingene for et samtalerom"
 
-#: src/protocols/jabber/jabber.c:1444
+#: src/protocols/jabber/jabber.c:1551
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Endre innstillingene for et samtalerom"
 
-#: src/protocols/jabber/jabber.c:1453
+#: src/protocols/jabber/jabber.c:1560
 msgid "part [room]:  Leave the room."
 msgstr "part [rom]:  Forlat rommet"
 
-#: src/protocols/jabber/jabber.c:1458
+#: src/protocols/jabber/jabber.c:1565
 msgid "register:  Register with a chat room."
 msgstr "register:  Registrer med et gruppesamtalerom."
 
-#: src/protocols/jabber/jabber.c:1464
+#: src/protocols/jabber/jabber.c:1571
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [nytt emne]:  Vis eller endre emnet"
 
-#: src/protocols/jabber/jabber.c:1470
+#: src/protocols/jabber/jabber.c:1577
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;bruker&gt; [rom]:  Forby en bruker fra rommet"
 
-#: src/protocols/jabber/jabber.c:1476
-msgid "invite &lt;user&gt; [room]:  Invite a user to the room."
+#: src/protocols/jabber/jabber.c:1583
+msgid ""
+"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
+"affiliation with the room."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1589
+#, fuzzy
+msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;bruker&gt; [rom]:  Inviter en bruker til rommet"
 
-#: src/protocols/jabber/jabber.c:1482
+#: src/protocols/jabber/jabber.c:1595
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr ""
 "join: &lt;rom&gt; [vert]:  Bli med i en gruppesamtale på denne serveren"
 
-#: src/protocols/jabber/jabber.c:1488
+#: src/protocols/jabber/jabber.c:1601
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;bruker&gt; [rom]:  Spark en bruker ut av rommet"
 
-#: src/protocols/jabber/jabber.c:1493
+#: src/protocols/jabber/jabber.c:1606
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 "msg &lt;bruker&gt; &lt;melding&gt;:  Send en privatmelding til en annen "
 "bruker"
 
-#: src/protocols/jabber/jabber.c:1508
-msgid "Hide Operating System"
-msgstr "Skjul operativsystem"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -6537,42 +6330,48 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1595 src/protocols/jabber/jabber.c:1597
+#: src/protocols/jabber/jabber.c:1686 src/protocols/jabber/jabber.c:1688
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber-protokolltillegg"
 
-#: src/protocols/jabber/jabber.c:1620
-msgid "Resource"
-msgstr "Ressurs"
-
-#: src/protocols/jabber/jabber.c:1623
+#: src/protocols/jabber/jabber.c:1714
 msgid "Use TLS if available"
 msgstr "Bruk TLS hvis tilgjengelig"
 
-#: src/protocols/jabber/jabber.c:1628
-msgid "Force old SSL"
+#: src/protocols/jabber/jabber.c:1719
+msgid "Require TLS"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1722
+#, fuzzy
+msgid "Force old (port 5223) SSL"
 msgstr "Tving bruk av gammel SSL"
 
-#: src/protocols/jabber/jabber.c:1633
+#: src/protocols/jabber/jabber.c:1727
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Tillat identitetsbekreftelse i ren tekst over ukrypterte forbindelser"
 
+#: src/protocols/jabber/jabber.c:1732
+#, fuzzy
+msgid "Connect port"
+msgstr "Koble til"
+
 #. Account options
-#: src/protocols/jabber/jabber.c:1642 src/protocols/silc/silc.c:1592
+#: src/protocols/jabber/jabber.c:1736 src/protocols/silc/silc.c:1593
 msgid "Connect server"
 msgstr "Koble til tjener"
 
-#: src/protocols/jabber/message.c:111
+#: src/protocols/jabber/message.c:114
 #, c-format
 msgid "Message from %s"
 msgstr "Melding fra %s"
 
-#: src/protocols/jabber/message.c:175
+#: src/protocols/jabber/message.c:178
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s har endret kanaltema til: %s"
 
-#: src/protocols/jabber/message.c:177
+#: src/protocols/jabber/message.c:180
 #, c-format
 msgid "The topic is: %s"
 msgstr "Kanaltemaet er: %s"
@@ -6595,20 +6394,32 @@
 msgid "XML Parse error"
 msgstr "XML-parsefeil"
 
-#: src/protocols/jabber/presence.c:290
+#: src/protocols/jabber/presence.c:284
 msgid "Unknown Error in presence"
 msgstr "Ukjent feil i tilstedeværelse"
 
-#: src/protocols/jabber/presence.c:293
-#, 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:348 src/protocols/jabber/presence.c:349
+#: src/protocols/jabber/presence.c:289 src/protocols/msn/userlist.c:93
+#, c-format
+msgid "The user %s wants to add %s to his or her buddy list."
+msgstr "Brukeren %s ønsker å legge til %s i kontaktlisten sin."
+
+#: src/protocols/jabber/presence.c:297 src/protocols/msn/userlist.c:100
+#: src/protocols/oscar/oscar.c:4608 src/protocols/oscar/oscar.c:7242
+#: src/protocols/yahoo/yahoo.c:893
+msgid "Authorize"
+msgstr "Godkjenn"
+
+#: src/protocols/jabber/presence.c:298 src/protocols/msn/userlist.c:101
+#: src/protocols/oscar/oscar.c:4610 src/protocols/oscar/oscar.c:7243
+#: src/protocols/yahoo/yahoo.c:895
+msgid "Deny"
+msgstr "Nekt"
+
+#: src/protocols/jabber/presence.c:345 src/protocols/jabber/presence.c:346
 msgid "Create New Room"
 msgstr "Skap nytt samtalerom"
 
-#: src/protocols/jabber/presence.c:350
+#: src/protocols/jabber/presence.c:347
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -6616,31 +6427,31 @@
 "Du er i ferd med å lage et nytt rom. Ønsker du å endre innstillingene, eller "
 "bruke standardinnstillingene?"
 
-#: src/protocols/jabber/presence.c:352
+#: src/protocols/jabber/presence.c:349
 msgid "Configure Room"
 msgstr "Konfigurer rom"
 
-#: src/protocols/jabber/presence.c:354
+#: src/protocols/jabber/presence.c:351
 #, fuzzy
 msgid "Accept Defaults"
 msgstr "Aksepter standardinstillinger"
 
-#: src/protocols/jabber/presence.c:384
+#: src/protocols/jabber/presence.c:388
 #, c-format
 msgid "Error in chat %s"
 msgstr "Feil i gruppesamtale %s"
 
-#: src/protocols/jabber/presence.c:387
+#: src/protocols/jabber/presence.c:391
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Klarte ikke bli med i gruppesamtale %s"
 
-#: src/protocols/jabber/si.c:594
+#: src/protocols/jabber/si.c:591
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr "Klarte ikke sende fil til %s - brukeren støtter ikke filoverføringer"
 
-#: src/protocols/jabber/si.c:595 src/protocols/jabber/si.c:596
+#: src/protocols/jabber/si.c:592 src/protocols/jabber/si.c:593
 msgid "File Send Failed"
 msgstr "Filsending feilet"
 
@@ -6711,7 +6522,7 @@
 msgid "Not on list"
 msgstr "Ikke på listen"
 
-#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:680
+#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:690
 msgid "User is offline"
 msgstr "Brukeren er avlogget"
 
@@ -6763,7 +6574,7 @@
 msgid "Too many hits to a FND"
 msgstr "For mange treff på en FND"
 
-#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:192
+#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:206
 msgid "Not logged in"
 msgstr "Ikke pålogget"
 
@@ -6856,8 +6667,8 @@
 msgid "Server too busy"
 msgstr "Tjeneren er for opptatt"
 
-#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2272
-#: src/protocols/silc/ops.c:1508 src/protocols/toc/toc.c:630
+#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2764
+#: src/protocols/silc/ops.c:1503 src/protocols/toc/toc.c:722
 msgid "Authentication failed"
 msgstr "Autentisering feilet"
 
@@ -6891,59 +6702,68 @@
 msgid "MSN Error: %s\n"
 msgstr "MSN Feil: %s\n"
 
-#: src/protocols/msn/msn.c:114
+#: src/protocols/msn/msn.c:113
+msgid "You have just sent a Nudge!"
+msgstr ""
+
+#: src/protocols/msn/msn.c:138
 msgid "Your new MSN friendly name is too long."
 msgstr "Det nye MSN-kallenavnet er for langt."
 
-#: src/protocols/msn/msn.c:222
+#: src/protocols/msn/msn.c:246
 msgid "Set your friendly name."
 msgstr "Sett kallenavn."
 
-#: src/protocols/msn/msn.c:223
+#: src/protocols/msn/msn.c:247
 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:239
+#: src/protocols/msn/msn.c:263
 msgid "Set your home phone number."
 msgstr "Sett telefonnummer (hjemme)."
 
-#: src/protocols/msn/msn.c:254
+#: src/protocols/msn/msn.c:278
 msgid "Set your work phone number."
 msgstr "Sett telefonnummer (arbeid)."
 
-#: src/protocols/msn/msn.c:269
+#: src/protocols/msn/msn.c:293
 msgid "Set your mobile phone number."
 msgstr "Sett mobiltelefonnummer"
 
-#: src/protocols/msn/msn.c:282
+#: src/protocols/msn/msn.c:306
 msgid "Allow MSN Mobile pages?"
 msgstr "Tillat tekstmeldinger via MSN"
 
-#: src/protocols/msn/msn.c:283
+#: src/protocols/msn/msn.c:307
 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:287
+#: src/protocols/msn/msn.c:311
 msgid "Allow"
 msgstr "Tillat"
 
-#: src/protocols/msn/msn.c:288
+#: src/protocols/msn/msn.c:312
 msgid "Disallow"
 msgstr "Forby"
 
-#: src/protocols/msn/msn.c:311
+#: src/protocols/msn/msn.c:328
+msgid "This Hotmail account may not be active."
+msgstr ""
+
+#: src/protocols/msn/msn.c:354
 msgid "Send a mobile message."
 msgstr "Send tekstmelding"
 
-#: src/protocols/msn/msn.c:313
+#: src/protocols/msn/msn.c:356
 msgid "Page"
 msgstr "Send"
 
-#: src/protocols/msn/msn.c:489 src/protocols/msn/msn.c:497
-#: src/protocols/msn/msn.c:500 src/protocols/yahoo/yahoo.c:2820
+#: src/protocols/msn/msn.c:544 src/protocols/msn/msn.c:551
+#: src/protocols/msn/msn.c:554 src/protocols/yahoo/yahoo.c:2783
+#: src/protocols/yahoo/yahoo.c:2789
 #, c-format
 msgid ""
 "\n"
@@ -6952,85 +6772,74 @@
 "\n"
 "<b>%s:</b> %s"
 
-#: src/protocols/msn/msn.c:497
+#: src/protocols/msn/msn.c:546 src/protocols/msn/state.c:32
+#: src/protocols/novell/novell.c:2831 src/protocols/oscar/oscar.c:5070
+#: src/protocols/yahoo/yahoo.c:2631 src/protocols/yahoo/yahoo_profile.c:660
+msgid "Idle"
+msgstr "Inaktiv"
+
+#: src/protocols/msn/msn.c:551
 #, fuzzy
 msgid "Has you"
 msgstr "Har deg"
 
-#: src/protocols/msn/msn.c:500
-msgid "Blocked"
-msgstr "Blokkert"
-
-#: src/protocols/msn/msn.c:514 src/protocols/msn/msn.c:801
-#: src/protocols/msn/state.c:34
-msgid "Away From Computer"
-msgstr "Borte"
-
-#: src/protocols/msn/msn.c:515 src/protocols/msn/msn.c:803
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2677
-#: src/protocols/yahoo/yahoo.c:3044 src/protocols/yahoo/yahoo.c:3160
+#: src/protocols/msn/msn.c:581 src/protocols/msn/state.c:33
+#: src/protocols/yahoo/yahoo.c:2611 src/protocols/yahoo/yahoo.c:3206
 msgid "Be Right Back"
 msgstr "Straks tilbake"
 
-#: src/protocols/msn/msn.c:516 src/protocols/msn/msn.c:805
-#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2803
-#: src/protocols/novell/novell.c:2918 src/protocols/novell/novell.c:2972
-#: src/protocols/silc/buddy.c:1392 src/protocols/silc/silc.c:48
-#: src/protocols/silc/silc.c:83 src/protocols/yahoo/yahoo.c:2679
-#: src/protocols/yahoo/yahoo.c:3046 src/protocols/yahoo/yahoo.c:3161
-msgid "Busy"
-msgstr "Opptatt"
-
-#: src/protocols/msn/msn.c:517 src/protocols/msn/msn.c:807
-#: src/protocols/msn/state.c:35 src/protocols/yahoo/yahoo.c:2687
-#: src/protocols/yahoo/yahoo.c:3054 src/protocols/yahoo/yahoo.c:3165
+#: src/protocols/msn/msn.c:589 src/protocols/msn/state.c:35
+#: src/protocols/yahoo/yahoo.c:2621 src/protocols/yahoo/yahoo.c:3221
 msgid "On The Phone"
 msgstr "I telefonen"
 
-#: src/protocols/msn/msn.c:518 src/protocols/msn/msn.c:809
-#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2691
-#: src/protocols/yahoo/yahoo.c:3058 src/protocols/yahoo/yahoo.c:3167
+#: src/protocols/msn/msn.c:593 src/protocols/msn/state.c:36
+#: src/protocols/yahoo/yahoo.c:2625 src/protocols/yahoo/yahoo.c:3227
 msgid "Out To Lunch"
 msgstr "Ute til lunsj"
 
-#: src/protocols/msn/msn.c:519 src/protocols/msn/msn.c:811
-#: src/protocols/zephyr/zephyr.c:2111 src/protocols/zephyr/zephyr.c:2143
+#: src/protocols/msn/msn.c:597 src/protocols/zephyr/zephyr.c:2255
+#: src/status.c:157
 msgid "Hidden"
 msgstr "Usynlig"
 
-#: src/protocols/msn/msn.c:530
+#: src/protocols/msn/msn.c:613
 msgid "Set Friendly Name"
 msgstr "Sett kallenavn"
 
-#: src/protocols/msn/msn.c:535
+#: src/protocols/msn/msn.c:618
 msgid "Set Home Phone Number"
 msgstr "Sett telefonnummer (hjemme)"
 
-#: src/protocols/msn/msn.c:539
+#: src/protocols/msn/msn.c:622
 msgid "Set Work Phone Number"
 msgstr "Sett telefonnummer (arbeid)"
 
-#: src/protocols/msn/msn.c:543
+#: src/protocols/msn/msn.c:626
 msgid "Set Mobile Phone Number"
 msgstr "Sett mobiltelefonnummer"
 
-#: src/protocols/msn/msn.c:549
+#: src/protocols/msn/msn.c:632
 msgid "Enable/Disable Mobile Devices"
 msgstr "Bruk/ikke bruk mobile enheter"
 
-#: src/protocols/msn/msn.c:554
+#: src/protocols/msn/msn.c:637
 msgid "Allow/Disallow Mobile Pages"
 msgstr "Tillate/forby tekstmeldinger"
 
-#: src/protocols/msn/msn.c:577
+#: src/protocols/msn/msn.c:647
+msgid "Open Hotmail Inbox"
+msgstr ""
+
+#: src/protocols/msn/msn.c:671
 msgid "Send to Mobile"
 msgstr "Send til mobil"
 
-#: src/protocols/msn/msn.c:586 src/protocols/novell/novell.c:3369
+#: src/protocols/msn/msn.c:680 src/protocols/novell/novell.c:3442
 msgid "Initiate _Chat"
 msgstr "Start gruppesamtale"
 
-#: src/protocols/msn/msn.c:623
+#: src/protocols/msn/msn.c:717
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
@@ -7038,95 +6847,89 @@
 "SSL-støtte kreves for MSN, vennligst installer et støttet SSL-bibliotek. Se "
 "http://gaim.sf.net/faq-ssl.php for mer informasjon."
 
-#: src/protocols/msn/msn.c:651
+#: src/protocols/msn/msn.c:745
 msgid "Failed to connect to server."
 msgstr "Klarte ikke koble til tjener."
 
-#: src/protocols/msn/msn.c:1309 src/protocols/yahoo/yahoo_profile.c:659
-#: src/protocols/zephyr/zephyr.c:711 src/protocols/zephyr/zephyr.c:1120
+#: src/protocols/msn/msn.c:1387 src/protocols/yahoo/yahoo_profile.c:654
+#: src/protocols/zephyr/zephyr.c:721 src/protocols/zephyr/zephyr.c:1135
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>Alias:</b> %s<br>"
 
 #. put a link to the actual profile URL
-#: src/protocols/msn/msn.c:1317 src/protocols/msn/msn.c:1675
-#: src/protocols/yahoo/yahoo_profile.c:1174 src/util.c:796
+#: src/protocols/msn/msn.c:1394 src/protocols/msn/msn.c:1740
+#: src/protocols/yahoo/yahoo_profile.c:1167 src/util.c:801
 #, c-format
 msgid "<b>%s:</b> "
 msgstr "<b>%s:</b> "
 
-#: src/protocols/msn/msn.c:1405
+#: src/protocols/msn/msn.c:1471
 msgid "MSN Profile"
 msgstr "MSN-profil"
 
-#: src/protocols/msn/msn.c:1410 src/protocols/msn/msn.c:1662
-#: src/protocols/yahoo/yahoo_profile.c:763
+#: src/protocols/msn/msn.c:1476 src/protocols/msn/msn.c:1727
+#: src/protocols/yahoo/yahoo_profile.c:760
 msgid "Error retrieving profile"
 msgstr "Klarte ikke hente profil"
 
-#. Age
-#: src/protocols/msn/msn.c:1481 src/protocols/oscar/oscar.c:5231
-#: src/protocols/trepia/trepia.c:286 src/protocols/trepia/trepia.c:405
-#: src/protocols/yahoo/yahoo_profile.c:1022
+#: src/protocols/msn/msn.c:1546 src/protocols/oscar/oscar.c:5984
+#: src/protocols/yahoo/yahoo_profile.c:1015
 msgid "Age"
 msgstr "Alder"
 
-#. Gender
-#: src/protocols/msn/msn.c:1488 src/protocols/oscar/oscar.c:5217
-#: src/protocols/trepia/trepia.c:280 src/protocols/trepia/trepia.c:407
-#: src/protocols/yahoo/yahoo_profile.c:1032
+#: src/protocols/msn/msn.c:1553 src/protocols/oscar/oscar.c:5971
+#: src/protocols/yahoo/yahoo_profile.c:1025
 msgid "Gender"
 msgstr "Kjønn"
 
-#: src/protocols/msn/msn.c:1497 src/protocols/yahoo/yahoo_profile.c:1027
+#: src/protocols/msn/msn.c:1562 src/protocols/yahoo/yahoo_profile.c:1020
 msgid "Marital Status"
 msgstr "Sivilstatus"
 
-#: src/protocols/msn/msn.c:1504 src/protocols/novell/novell.c:1445
-#: src/protocols/yahoo/yahoo_profile.c:1017
+#: src/protocols/msn/msn.c:1569 src/protocols/novell/novell.c:1454
+#: src/protocols/yahoo/yahoo_profile.c:1010
 msgid "Location"
 msgstr "Sted"
 
-#: src/protocols/msn/msn.c:1512 src/protocols/yahoo/yahoo_profile.c:1037
+#: src/protocols/msn/msn.c:1577 src/protocols/yahoo/yahoo_profile.c:1030
 msgid "Occupation"
 msgstr "Yrke"
 
-#: src/protocols/msn/msn.c:1529 src/protocols/msn/msn.c:1535
-#: src/protocols/msn/msn.c:1542 src/protocols/msn/msn.c:1550
-#: src/protocols/msn/msn.c:1557
+#: src/protocols/msn/msn.c:1594 src/protocols/msn/msn.c:1600
+#: src/protocols/msn/msn.c:1607 src/protocols/msn/msn.c:1615
+#: src/protocols/msn/msn.c:1622
 msgid "A Little About Me"
 msgstr "Noen ord om meg"
 
-#: src/protocols/msn/msn.c:1566 src/protocols/msn/msn.c:1572
-#: src/protocols/msn/msn.c:1579 src/protocols/msn/msn.c:1586
+#: src/protocols/msn/msn.c:1631 src/protocols/msn/msn.c:1637
+#: src/protocols/msn/msn.c:1644 src/protocols/msn/msn.c:1651
 msgid "Favorite Things"
 msgstr "Favoritt-ting"
 
-#: src/protocols/msn/msn.c:1595 src/protocols/msn/msn.c:1601
-#: src/protocols/msn/msn.c:1608
+#: src/protocols/msn/msn.c:1660 src/protocols/msn/msn.c:1666
+#: src/protocols/msn/msn.c:1673
 msgid "Hobbies and Interests"
 msgstr "Hobbyer og interesser"
 
-#: src/protocols/msn/msn.c:1617 src/protocols/msn/msn.c:1623
-#: src/protocols/yahoo/yahoo_profile.c:1079
+#: src/protocols/msn/msn.c:1682 src/protocols/msn/msn.c:1688
+#: src/protocols/yahoo/yahoo_profile.c:1072
 msgid "Favorite Quote"
 msgstr "Yndlingssitat"
 
-#: src/protocols/msn/msn.c:1631
+#: src/protocols/msn/msn.c:1696
 msgid "Last Updated"
 msgstr "Sist oppdatert"
 
-#. Homepage
-#: src/protocols/msn/msn.c:1642 src/protocols/silc/ops.c:844
-#: src/protocols/trepia/trepia.c:290 src/protocols/trepia/trepia.c:420
+#: src/protocols/msn/msn.c:1707 src/protocols/silc/ops.c:846
 msgid "Homepage"
 msgstr "Hjemmeside"
 
-#: src/protocols/msn/msn.c:1664
+#: src/protocols/msn/msn.c:1729
 msgid "The user has not created a public profile."
 msgstr "Brukeren har ikke opprettet en offentlig profil"
 
-#: src/protocols/msn/msn.c:1665
+#: src/protocols/msn/msn.c:1730
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
@@ -7135,7 +6938,7 @@
 "MSN klarte ikke å finne brukerens profil. Dette betyr enten at brukeren ikke "
 "eksisterer, eller at brukeren ikke har opprettet en offentlig profil"
 
-#: src/protocols/msn/msn.c:1669
+#: src/protocols/msn/msn.c:1734
 msgid ""
 "Gaim could not find any information in the user's profile. The user most "
 "likely does not exist."
@@ -7143,18 +6946,10 @@
 "Gaim klarte ikke finne noen informasjon i brukerens profil. Antakelig "
 "eksisterer brukeren ikke."
 
-#: src/protocols/msn/msn.c:1675 src/protocols/yahoo/yahoo_profile.c:1174
+#: src/protocols/msn/msn.c:1740 src/protocols/yahoo/yahoo_profile.c:1167
 msgid "Profile URL"
 msgstr "Profil URL"
 
-#: src/protocols/msn/msn.c:1816
-msgid "Display conversation closed notices"
-msgstr "Vis advasler om at samtalen har blitt lukket"
-
-#: src/protocols/msn/msn.c:1821
-msgid "Display timeout notices"
-msgstr "Vis advarsler om tidsavbrudd"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7165,20 +6960,24 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1908 src/protocols/msn/msn.c:1910
+#: src/protocols/msn/msn.c:1942 src/protocols/msn/msn.c:1944
 msgid "MSN Protocol Plugin"
 msgstr "MSN-protokolltillegg"
 
-#: src/protocols/msn/msn.c:1929 src/protocols/trepia/trepia.c:1296
+#: src/protocols/msn/msn.c:1963
 msgid "Login server"
 msgstr "Påloggingstjener"
 
-#: src/protocols/msn/msn.c:1938
+#: src/protocols/msn/msn.c:1972
 msgid "Use HTTP Method"
 msgstr "Bruk HTTP-metode"
 
+#: src/protocols/msn/msn.c:1980
+msgid "nudge: nudge a contact to get their attention"
+msgstr ""
+
 #: src/protocols/msn/nexus.c:103 src/protocols/msn/servconn.c:127
-#: src/protocols/yahoo/yahoochat.c:1394
+#: src/protocols/yahoo/yahoochat.c:1326
 msgid "Unable to connect"
 msgstr "Kunne ikke koble til"
 
@@ -7187,8 +6986,8 @@
 msgid "%s is not a valid group."
 msgstr "%s er ikke et gyldig navn på en gruppe."
 
-#: src/protocols/msn/notification.c:184 src/protocols/msn/notification.c:523
-#: src/protocols/msn/session.c:349
+#: src/protocols/msn/notification.c:184 src/protocols/msn/notification.c:528
+#: src/protocols/msn/session.c:347
 msgid "Unknown error."
 msgstr "Ukjent feil."
 
@@ -7197,41 +6996,41 @@
 msgid "%s on %s (%s)"
 msgstr "%s på %s (%s)"
 
-#: src/protocols/msn/notification.c:493
+#: src/protocols/msn/notification.c:498
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "Klarte ikke legge til bruker på %s (%s)"
 
-#: src/protocols/msn/notification.c:497
+#: src/protocols/msn/notification.c:502
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "Klarte ikke blokkere brukeren på %s (%s)"
 
-#: src/protocols/msn/notification.c:501
+#: src/protocols/msn/notification.c:506
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "Klarte ikke tillate bruker på %s (%s)"
 
-#: src/protocols/msn/notification.c:509
+#: src/protocols/msn/notification.c:514
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr ""
 "%s kunne ikke bli lagt til kontaktlista, fordi din kontaktliste er full."
 
-#: src/protocols/msn/notification.c:518
+#: src/protocols/msn/notification.c:523
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s er ikke et gyldig passport-konto"
 
-#: src/protocols/msn/notification.c:805
+#: src/protocols/msn/notification.c:811
 msgid "Unable to rename group"
 msgstr "Kunne ikke endre navn på gruppe"
 
-#: src/protocols/msn/notification.c:860
+#: src/protocols/msn/notification.c:866
 msgid "Unable to delete group"
 msgstr "Kunne ikke slette gruppe"
 
-#: src/protocols/msn/notification.c:1287
+#: src/protocols/msn/notification.c:1299
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -7266,8 +7065,8 @@
 msgid "Reading error"
 msgstr "Feil ved lesing"
 
-#: src/protocols/msn/servconn.c:133 src/protocols/msn/session.c:341
-#: src/protocols/oscar/oscar.c:4209
+#: src/protocols/msn/servconn.c:133 src/protocols/msn/session.c:339
+#: src/protocols/oscar/oscar.c:4931
 msgid "Unknown error"
 msgstr "Ukjent feil"
 
@@ -7280,163 +7079,181 @@
 "Tilkoplingsfeil fra %s tjener (%s):\n"
 "%s"
 
-#: src/protocols/msn/session.c:319
+#: src/protocols/msn/session.c:317
 msgid "Our protocol is not supported by the server."
 msgstr "Vår protokoll er ikke støttet av tjeneren"
 
-#: src/protocols/msn/session.c:323
+#: src/protocols/msn/session.c:321
 msgid "Error parsing HTTP."
 msgstr "Feil under tolkning av HTTP."
 
-#: src/protocols/msn/session.c:327
+#. MSG_SERVER_GHOST
+#. Looks like someone logged in as us! =-O
+#: src/protocols/msn/session.c:325 src/protocols/napster/napster.c:450
+#: src/protocols/oscar/oscar.c:5635 src/protocols/yahoo/yahoo.c:194
 msgid "You have signed on from another location."
 msgstr "Du ble logget av fordi du har logget på et annet sted."
 
-#: src/protocols/msn/session.c:330
+#: src/protocols/msn/session.c:328
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "MSN-tjenerene er midlertidig utilgjengelig.Vennligst prøv igjen senere."
 
-#: src/protocols/msn/session.c:335
+#: src/protocols/msn/session.c:333
 msgid "The MSN servers are going down temporarily."
 msgstr "MSN-tjenerne vil bli utilgjengelig en liten stund."
 
-#: src/protocols/msn/session.c:339
+#: src/protocols/msn/session.c:337
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Klarte ikke autentisere: %s"
 
-#: src/protocols/msn/session.c:344
+#: src/protocols/msn/session.c:342
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 "Din MSN-kontaktliste er midlertidig utilgjengelig. Vennligst prøv igjen "
 "senere."
 
-#: src/protocols/msn/session.c:365 src/protocols/msn/session.c:367
+#: src/protocols/msn/session.c:363 src/protocols/msn/session.c:365
 msgid "Handshaking"
 msgstr ""
 
-#: src/protocols/msn/session.c:366
+#: src/protocols/msn/session.c:364
 msgid "Transferring"
 msgstr "Overfører"
 
-#: src/protocols/msn/session.c:368
+#: src/protocols/msn/session.c:366
 msgid "Starting authentication"
 msgstr "Starter godkjenning"
 
-#: src/protocols/msn/session.c:369
+#: src/protocols/msn/session.c:367
 msgid "Getting cookie"
 msgstr "Henter informasjonskapsel"
 
-#: src/protocols/msn/session.c:371
+#: src/protocols/msn/session.c:369
 msgid "Sending cookie"
 msgstr "Sender informasjonskapsel"
 
-#: src/protocols/msn/session.c:372 src/protocols/trepia/trepia.c:636
+#: src/protocols/msn/session.c:370
 msgid "Retrieving buddy list"
 msgstr "Henter kontaktliste"
 
-#: src/protocols/msn/switchboard.c:401
+#: src/protocols/msn/state.c:34
+msgid "Away From Computer"
+msgstr "Borte"
+
+#: src/protocols/msn/switchboard.c:403
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr "Meldingen ble kanskje ikke sendt, et tidsavbrudd inntraff:"
 
-#: src/protocols/msn/switchboard.c:409
+#: src/protocols/msn/switchboard.c:411
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr ""
 "Meldingen ble ikke sendt, du ikke kan sende meldinger når du er usynlig:"
 
-#: src/protocols/msn/switchboard.c:413
+#: src/protocols/msn/switchboard.c:415
 msgid "Message could not be sent because the user is offline:"
 msgstr "Meldingen kunne ikke bli sendt, brukeren er frakoblet:"
 
-#: src/protocols/msn/switchboard.c:417
+#: src/protocols/msn/switchboard.c:419
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "Meldingen kunne ikke bli sendt på grunn av en tilkoblingfeil:"
 
-#: src/protocols/msn/switchboard.c:421
+#: src/protocols/msn/switchboard.c:423
 msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr ""
 "Meldingen kunne ikke bli sendt, da det skjedde en feil med sentralbordet:"
 
-#: src/protocols/msn/switchboard.c:429
+#: src/protocols/msn/switchboard.c:431
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Meldingen kunne ikke bli sendt på grunn av en ukjent feil:"
 
-#: src/protocols/msn/switchboard.c:678
-msgid "The conversation has become inactive and timed out."
-msgstr "Samtalen har blitt avsluttet pga. inaktivitet."
-
-#: src/protocols/msn/switchboard.c:697
-#, c-format
-msgid "%s has closed the conversation window."
-msgstr "%s har lukket samtalevinduet."
-
-#: src/protocols/msn/userlist.c:87
+#: src/protocols/msn/switchboard.c:952
+#, fuzzy, c-format
+msgid "%s just sent you a Nudge!"
+msgstr "%s ønsker å sende deg en fil."
+
+#: src/protocols/msn/userlist.c:85
 #, 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/userlist.c:96
-#, c-format
-msgid "The user %s wants to add %s to his or her buddy list."
+#: src/protocols/msn/userlist.c:275
+#, fuzzy, c-format
+msgid "%s has added you to his or her contact list."
 msgstr "Brukeren %s ønsker å legge til %s i kontaktlisten sin."
 
-#: src/protocols/msn/userlist.c:627
+#: src/protocols/msn/userlist.c:339
+#, c-format
+msgid "%s has removed you from his or her contact list."
+msgstr ""
+
+#: src/protocols/msn/userlist.c:659
 #, fuzzy, c-format
 msgid "Unable to add \"%s\"."
 msgstr "Kunne ikke lese fil %s."
 
-#: src/protocols/msn/userlist.c:629
+#: src/protocols/msn/userlist.c:661
 #, fuzzy
 msgid "The screen name specified is invalid."
 msgstr "Den inntastede SecurID-nøkkelen er ugyldig."
 
-#: src/protocols/napster/napster.c:241
+#: src/protocols/napster/napster.c:260
 msgid "Unable to read header from server"
 msgstr "Kunne ikke lese meldingshode fra tjener"
 
-#: src/protocols/napster/napster.c:255
+#: src/protocols/napster/napster.c:274
 #, c-format
 msgid "Unable to read message from server: %s.  Command is %hd, length is %hd."
 msgstr ""
 "Kunne ikke lese melding fra tjener: %s. Kommando er %hd, lengde er %hd."
 
-#: src/protocols/napster/napster.c:318
+#: src/protocols/napster/napster.c:290
+#, fuzzy
+msgid "Unknown server error."
+msgstr "Ukjent feil."
+
+#: src/protocols/napster/napster.c:339
 #, 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:329
+#: src/protocols/napster/napster.c:350
 #, 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:337
+#. MSG_SERVER_DISCONNECTING
+#. we have been kicked off =^(
+#: src/protocols/napster/napster.c:357
 msgid "You were disconnected from the server."
 msgstr "Du har blitt koblet fra tjeneren."
 
 #. MSG_CLIENT_WHOIS
-#: src/protocols/napster/napster.c:395
+#: src/protocols/napster/napster.c:414
 #, c-format
 msgid "%s requested your information"
 msgstr "%s hentet informasjon om deg"
 
-#: src/protocols/napster/napster.c:433
-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:439
+#: src/protocols/napster/napster.c:454
 #, c-format
 msgid "%s requested a PING"
 msgstr "%s pinget deg"
 
-#: src/protocols/napster/napster.c:554 src/protocols/toc/toc.c:1268
+#. we didn't successfully connect. tdt->toc_fd is valid here
+#: src/protocols/napster/napster.c:501 src/protocols/napster/napster.c:532
+#: src/protocols/toc/toc.c:172 src/protocols/yahoo/yahoo.c:2209
+#: src/protocols/yahoo/yahoo.c:2236 src/protocols/yahoo/yahoo.c:2299
+#: src/protocols/yahoo/yahoo_filexfer.c:69
+#: src/protocols/yahoo/yahoo_filexfer.c:111 src/protocols/yahoo/ycht.c:481
+msgid "Unable to connect."
+msgstr "Kunne ikke koble til."
+
+#: src/protocols/napster/napster.c:590 src/protocols/toc/toc.c:1367
 msgid "_Group:"
 msgstr "Gruppe:"
 
@@ -7450,7 +7267,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/napster/napster.c:652 src/protocols/napster/napster.c:654
+#: src/protocols/napster/napster.c:687 src/protocols/napster/napster.c:689
 msgid "NAPSTER Protocol Plugin"
 msgstr "Napster-protokolltillegg"
 
@@ -7589,39 +7406,39 @@
 msgid "Login failed (%s)."
 msgstr "Pålogging feilet (%s)"
 
-#: src/protocols/novell/novell.c:230
+#: src/protocols/novell/novell.c:232
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr "Kunne ikke sende beskjed. Klarte ikke hente brukerdetaljer (%s)."
 
-#: src/protocols/novell/novell.c:379
+#: src/protocols/novell/novell.c:381
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "Kunne ikke legge til %s til kontaktlisten din (%s)."
 
 #. TODO: Improve this! message to who or for what conference?
-#: src/protocols/novell/novell.c:405
+#: src/protocols/novell/novell.c:407
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "Kunne ikke sende beskjed (%s)."
 
-#: src/protocols/novell/novell.c:476 src/protocols/novell/novell.c:970
+#: src/protocols/novell/novell.c:478 src/protocols/novell/novell.c:972
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "Kunne ikke invitere bruker (%s)."
 
-#: src/protocols/novell/novell.c:515
+#: src/protocols/novell/novell.c:517
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr ""
 "Klarte ikke sende beskjed til %s. Kunne ikke sette opp konferansen (%s)."
 
-#: src/protocols/novell/novell.c:520
+#: src/protocols/novell/novell.c:522
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "Klarte ikke sende beskjed. Kunne ikke sette opp konferansen (%s)."
 
-#: src/protocols/novell/novell.c:567
+#: src/protocols/novell/novell.c:569
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
@@ -7630,7 +7447,7 @@
 "Klarte ikke flytte brukeren %s til mappe %s i lista på tjenersiden. En feil "
 "oppsto under opprettelse av mappe (%s)."
 
-#: src/protocols/novell/novell.c:615
+#: src/protocols/novell/novell.c:617
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
@@ -7639,68 +7456,68 @@
 "Klarte ikke legge til %s i kontaktlista. En feil oppsto under opprettelse i "
 "lista på tjenersiden (%s)."
 
-#: src/protocols/novell/novell.c:688
+#: src/protocols/novell/novell.c:690
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "Kunne ikke hente detaljer for brukeren %s (%s)."
 
-#: src/protocols/novell/novell.c:734 src/protocols/novell/novell.c:880
+#: src/protocols/novell/novell.c:736 src/protocols/novell/novell.c:882
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "Kunne ikke legge til bruker til privatliste (%s)."
 
-#: src/protocols/novell/novell.c:781
+#: src/protocols/novell/novell.c:783
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "Kunne ikke legge til %s til nektingsliste (%s)."
 
-#: src/protocols/novell/novell.c:834
+#: src/protocols/novell/novell.c:836
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "Kunne ikke legge til %s til tillatelsesliste (%s)."
 
-#: src/protocols/novell/novell.c:902
+#: src/protocols/novell/novell.c:904
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "Kunne ikke fjerne %s fra privatliste (%s)."
 
-#: src/protocols/novell/novell.c:925 src/protocols/novell/novell.c:1620
+#: src/protocols/novell/novell.c:927 src/protocols/novell/novell.c:1628
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "Klarte ikke endre personsvernsinstillinger på tjenersiden (%s)."
 
-#: src/protocols/novell/novell.c:997
+#: src/protocols/novell/novell.c:999
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "Klarte ikke opprette konferanse (%s)."
 
-#: src/protocols/novell/novell.c:1108 src/protocols/novell/novell.c:1659
+#: src/protocols/novell/novell.c:1110 src/protocols/novell/novell.c:1667
 msgid "Error communicating with server. Closing connection."
 msgstr "Feil i kommunikasjon med tjener, stenger forbindelse."
 
-#: src/protocols/novell/novell.c:1443
+#: src/protocols/novell/novell.c:1452
 msgid "Telephone Number"
 msgstr "Telefonnummer"
 
-#: src/protocols/novell/novell.c:1447
+#: src/protocols/novell/novell.c:1456
 msgid "Department"
 msgstr "Avdeling"
 
-#: src/protocols/novell/novell.c:1449
+#: src/protocols/novell/novell.c:1458
 msgid "Personal Title"
 msgstr "Tittel"
 
 # VAR: E-post
-#: src/protocols/novell/novell.c:1453
+#: src/protocols/novell/novell.c:1462
 msgid "Mailstop"
 msgstr ""
 
-#: src/protocols/novell/novell.c:1455 src/protocols/oscar/oscar.c:5204
-#: src/protocols/oscar/oscar.c:5211
+#: src/protocols/novell/novell.c:1464 src/protocols/oscar/oscar.c:5957
+#: src/protocols/oscar/oscar.c:5964
 msgid "Email Address"
 msgstr "E-postadresse"
 
-#: src/protocols/novell/novell.c:1471
+#: src/protocols/novell/novell.c:1480
 msgid "User ID"
 msgstr "Brukerid"
 
@@ -7711,47 +7528,46 @@
 #. tag, value);
 #. }
 #.
-#: src/protocols/novell/novell.c:1485
+#: src/protocols/novell/novell.c:1494
 msgid "Full name"
 msgstr "Fullt navn"
 
-#: src/protocols/novell/novell.c:1506
-#, fuzzy
-msgid "User Properties"
-msgstr "Brukervalg"
-
-#: src/protocols/novell/novell.c:1610
+#: src/protocols/novell/novell.c:1618
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise-konferanse %d"
 
-#: src/protocols/novell/novell.c:1635
+#: src/protocols/novell/novell.c:1643
 msgid "Unable to make SSL connection to server."
 msgstr "Klarte ikke opprette SSL-forbindelse med tjeneren."
 
-#: src/protocols/novell/novell.c:1665
+#: src/protocols/novell/novell.c:1673
 #, c-format
 msgid "Error processing event or response (%s)."
 msgstr "Klarte ikke behandle hendelse eller svar (%s)."
 
-#: src/protocols/novell/novell.c:1699
+#: src/protocols/novell/novell.c:1707
 msgid "Authenticating..."
 msgstr "Autentiserer..."
 
-#: src/protocols/novell/novell.c:1714
+#: src/protocols/novell/novell.c:1719
+msgid "Unable to connect to server."
+msgstr "Kan ikke koble til tjener."
+
+#: src/protocols/novell/novell.c:1722
 msgid "Waiting for response..."
 msgstr "Venter på svar..."
 
-#: src/protocols/novell/novell.c:1849
+#: src/protocols/novell/novell.c:1857
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s har blitt invitert til denne samtalen."
 
-#: src/protocols/novell/novell.c:1876
+#: src/protocols/novell/novell.c:1885
 msgid "Invitation to Conversation"
 msgstr "Invitasjon til samtale"
 
-#: src/protocols/novell/novell.c:1877
+#: src/protocols/novell/novell.c:1886
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -7762,16 +7578,16 @@
 "\n"
 "Sent: %s"
 
-#: src/protocols/novell/novell.c:1879
+#: src/protocols/novell/novell.c:1888
 msgid "Would you like to join the conversation?"
 msgstr "Ønsker du å bli med i samtalen?"
 
-#: src/protocols/novell/novell.c:1985
+#: src/protocols/novell/novell.c:1995
 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:2039
+#: src/protocols/novell/novell.c:2051
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -7781,7 +7597,7 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: src/protocols/novell/novell.c:2137
+#: src/protocols/novell/novell.c:2149
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -7789,25 +7605,17 @@
 "Klarte ikke kople til tjener, skriv inn adressen til tjeneren du ønsker å "
 "kople til."
 
-#: src/protocols/novell/novell.c:2159
+#: src/protocols/novell/novell.c:2171
 msgid "Error. SSL support is not installed."
 msgstr "Feil: SSL-støtte er ikke installert."
 
-#: src/protocols/novell/novell.c:2463
+#: src/protocols/novell/novell.c:2475
 msgid "This conference has been closed. No more messages can be sent."
 msgstr ""
 "Denne konferansen har blitt stengt, ingen flere meldinger kan bli sendt."
 
-#: src/protocols/novell/novell.c:2809 src/protocols/oscar/oscar.c:738
-#: src/protocols/oscar/oscar.c:6795 src/protocols/yahoo/yahoo.c:2699
-msgid "Offline"
-msgstr "Avlogget"
-
-#: src/protocols/novell/novell.c:2820
-msgid "Message"
-msgstr "Beskjed:"
-
-#: src/protocols/novell/novell.c:2919 src/protocols/novell/novell.c:2975
+#: src/protocols/novell/novell.c:2965 src/protocols/novell/novell.c:3047
+#: src/protocols/yahoo/yahoo.c:2835
 msgid "Appear Offline"
 msgstr "Lat som avlogget"
 
@@ -7821,116 +7629,116 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/novell/novell.c:3468 src/protocols/novell/novell.c:3470
+#: src/protocols/novell/novell.c:3540 src/protocols/novell/novell.c:3542
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novel GroupWise Messenger protolltillegg"
 
-#: src/protocols/novell/novell.c:3489
+#: src/protocols/novell/novell.c:3561
 msgid "Server address"
 msgstr "Tjeneradresse"
 
-#: src/protocols/novell/novell.c:3493
+#: src/protocols/novell/novell.c:3565
 msgid "Server port"
 msgstr "Tjenerport"
 
-#: src/protocols/oscar/oscar.c:188
+#: src/protocols/oscar/oscar.c:202
 msgid "Invalid error"
 msgstr "Ugyldig feil"
 
-#: src/protocols/oscar/oscar.c:189
+#: src/protocols/oscar/oscar.c:203
 msgid "Invalid SNAC"
 msgstr "Ugyldig SNAC"
 
-#: src/protocols/oscar/oscar.c:190
+#: src/protocols/oscar/oscar.c:204
 msgid "Rate to host"
 msgstr "Hastighet til maskin"
 
-#: src/protocols/oscar/oscar.c:191
+#: src/protocols/oscar/oscar.c:205
 msgid "Rate to client"
 msgstr "Hastighet til klient"
 
-#: src/protocols/oscar/oscar.c:193
+#: src/protocols/oscar/oscar.c:207
 msgid "Service unavailable"
 msgstr "Tjenesten er ikke tilgjengelig"
 
-#: src/protocols/oscar/oscar.c:194
+#: src/protocols/oscar/oscar.c:208
 msgid "Service not defined"
 msgstr "Tjenesten er ikke definert"
 
-#: src/protocols/oscar/oscar.c:195
+#: src/protocols/oscar/oscar.c:209
 msgid "Obsolete SNAC"
 msgstr "Avlegs SNAC"
 
-#: src/protocols/oscar/oscar.c:196
+#: src/protocols/oscar/oscar.c:210
 msgid "Not supported by host"
 msgstr "Ikke støttet av maskin"
 
-#: src/protocols/oscar/oscar.c:197
+#: src/protocols/oscar/oscar.c:211
 msgid "Not supported by client"
 msgstr "Ikke støttet av klient"
 
-#: src/protocols/oscar/oscar.c:198
+#: src/protocols/oscar/oscar.c:212
 msgid "Refused by client"
 msgstr "Avvist av klient"
 
-#: src/protocols/oscar/oscar.c:199
+#: src/protocols/oscar/oscar.c:213
 msgid "Reply too big"
 msgstr "Svaret er for stort"
 
-#: src/protocols/oscar/oscar.c:200
+#: src/protocols/oscar/oscar.c:214
 msgid "Responses lost"
 msgstr "Svaret gikk tapt"
 
-#: src/protocols/oscar/oscar.c:201
+#: src/protocols/oscar/oscar.c:215
 msgid "Request denied"
 msgstr "Forespørsel avslått"
 
-#: src/protocols/oscar/oscar.c:202
+#: src/protocols/oscar/oscar.c:216
 msgid "Busted SNAC payload"
 msgstr "Innholdet i SNAC er ødelagt"
 
-#: src/protocols/oscar/oscar.c:203
+#: src/protocols/oscar/oscar.c:217
 msgid "Insufficient rights"
 msgstr "Ikke nok rettigheter"
 
-#: src/protocols/oscar/oscar.c:204
+#: src/protocols/oscar/oscar.c:218
 msgid "In local permit/deny"
 msgstr "I lokal tillat/nekt"
 
-#: src/protocols/oscar/oscar.c:205
+#: src/protocols/oscar/oscar.c:219
 msgid "Too evil (sender)"
 msgstr "Altfor ond (sender)"
 
-#: src/protocols/oscar/oscar.c:206
+#: src/protocols/oscar/oscar.c:220
 msgid "Too evil (receiver)"
 msgstr "Altfor ond (mottaker)"
 
-#: src/protocols/oscar/oscar.c:207
+#: src/protocols/oscar/oscar.c:221
 msgid "User temporarily unavailable"
 msgstr "Brukeren er midlertidig utilgjengelig"
 
-#: src/protocols/oscar/oscar.c:208
+#: src/protocols/oscar/oscar.c:222
 msgid "No match"
 msgstr "Ingen treff"
 
-#: src/protocols/oscar/oscar.c:209
+#: src/protocols/oscar/oscar.c:223
 msgid "List overflow"
 msgstr "List-overflyt"
 
-#: src/protocols/oscar/oscar.c:210
+#: src/protocols/oscar/oscar.c:224
 msgid "Request ambiguous"
 msgstr "Tvetydig forespørsel"
 
-#: src/protocols/oscar/oscar.c:211
+#: src/protocols/oscar/oscar.c:225
 msgid "Queue full"
 msgstr "Køen er full"
 
-#: src/protocols/oscar/oscar.c:212
+#: src/protocols/oscar/oscar.c:226
 msgid "Not while on AOL"
 msgstr "Ikke mens du er på AOL"
 
 # Lusete klient :P
-#: src/protocols/oscar/oscar.c:408 src/protocols/oscar/oscar.c:491
+#: src/protocols/oscar/oscar.c:417 src/protocols/oscar/oscar.c:502
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking to "
 "most likely has a buggy client.)"
@@ -7938,159 +7746,160 @@
 "(Det oppsto en feil under mottak av denne meldingen. Kontakten du snakker "
 "til har sannsynligvis en lusete klient.)"
 
-#: src/protocols/oscar/oscar.c:593
+#: src/protocols/oscar/oscar.c:616
 msgid "Voice"
 msgstr "Stemme"
 
-#: src/protocols/oscar/oscar.c:596
+#: src/protocols/oscar/oscar.c:619
 msgid "AIM Direct IM"
 msgstr "AIM direkte samtale"
 
-#: src/protocols/oscar/oscar.c:599 src/protocols/silc/silc.c:654
+#: src/protocols/oscar/oscar.c:622 src/protocols/silc/silc.c:659
 #: src/protocols/silc/util.c:509
 msgid "Chat"
 msgstr "Samtale"
 
-#: src/protocols/oscar/oscar.c:602 src/protocols/oscar/oscar.c:7097
+#: src/protocols/oscar/oscar.c:625 src/protocols/oscar/oscar.c:7892
 msgid "Get File"
 msgstr "Laste ned fil"
 
-#: src/protocols/oscar/oscar.c:609
+#: src/protocols/oscar/oscar.c:632
 msgid "Games"
 msgstr "Spill"
 
-#: src/protocols/oscar/oscar.c:612
+#: src/protocols/oscar/oscar.c:635
 msgid "Add-Ins"
 msgstr "Tillegg"
 
-#: src/protocols/oscar/oscar.c:615
+#: src/protocols/oscar/oscar.c:638
 msgid "Send Buddy List"
 msgstr "Sende kontaktliste"
 
-#: src/protocols/oscar/oscar.c:618
+#: src/protocols/oscar/oscar.c:641
 msgid "ICQ Direct Connect"
 msgstr "ICQ direktekobling"
 
-#: src/protocols/oscar/oscar.c:621
+#: src/protocols/oscar/oscar.c:644
 msgid "AP User"
 msgstr "AP-bruker"
 
-#: src/protocols/oscar/oscar.c:624
+#: src/protocols/oscar/oscar.c:647
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:627
+#: src/protocols/oscar/oscar.c:650
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:630
+#: src/protocols/oscar/oscar.c:653
 msgid "ICQ Server Relay"
 msgstr "ICQ tjenervideresending"
 
-#: src/protocols/oscar/oscar.c:633
+#: src/protocols/oscar/oscar.c:656
 msgid "Old ICQ UTF8"
 msgstr "Gammel ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:636
+#: src/protocols/oscar/oscar.c:659
 msgid "Trillian Encryption"
 msgstr "Trillian-kryptering"
 
-#: src/protocols/oscar/oscar.c:639
+#: src/protocols/oscar/oscar.c:662
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:642
+#: src/protocols/oscar/oscar.c:665
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: src/protocols/oscar/oscar.c:645
+#: src/protocols/oscar/oscar.c:668
 msgid "Security Enabled"
 msgstr "Sikkerhet slått på"
 
-#: src/protocols/oscar/oscar.c:648
+#: src/protocols/oscar/oscar.c:671
 msgid "Video Chat"
 msgstr "Videosamtale"
 
-#: src/protocols/oscar/oscar.c:652
+#: src/protocols/oscar/oscar.c:675
 msgid "iChat AV"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:655
+#: src/protocols/oscar/oscar.c:678
 msgid "Live Video"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:658
+#: src/protocols/oscar/oscar.c:681
 msgid "Camera"
 msgstr "Kamera"
 
-#: src/protocols/oscar/oscar.c:676 src/protocols/oscar/oscar.c:5800
-#: src/protocols/oscar/oscar.c:6989
+#: src/protocols/oscar/oscar.c:699 src/protocols/oscar/oscar.c:7775
 msgid "Free For Chat"
 msgstr "Tilgjengelig for samtale"
 
-#: src/protocols/oscar/oscar.c:680 src/protocols/oscar/oscar.c:5794
-#: src/protocols/oscar/oscar.c:6987
+#: src/protocols/oscar/oscar.c:703 src/protocols/oscar/oscar.c:7790
 msgid "Not Available"
 msgstr "Ikke tilgjengelig"
 
-#: src/protocols/oscar/oscar.c:682 src/protocols/oscar/oscar.c:5797
-#: src/protocols/oscar/oscar.c:6988
+#: src/protocols/oscar/oscar.c:705 src/protocols/oscar/oscar.c:7780
 msgid "Occupied"
 msgstr "Opptatt"
 
-#: src/protocols/oscar/oscar.c:686
+#: src/protocols/oscar/oscar.c:709
 #, fuzzy
 msgid "Web Aware"
 msgstr "Web-oppmerksom"
 
-#: src/protocols/oscar/oscar.c:754
+#: src/protocols/oscar/oscar.c:786 src/protocols/oscar/oscar.c:5056
+msgid "Warning Level"
+msgstr "Advarselsnivåer"
+
+#: src/protocols/oscar/oscar.c:792
 msgid "Capabilities"
 msgstr "Evner"
 
-#: src/protocols/oscar/oscar.c:763
+#: src/protocols/oscar/oscar.c:801
 #, fuzzy
 msgid "Buddy Comment"
 msgstr "Kommentar om kontakt:"
 
-#: src/protocols/oscar/oscar.c:898
+#: src/protocols/oscar/oscar.c:958
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Direkte samtale med %s stengt"
 
-#: src/protocols/oscar/oscar.c:900
+#: src/protocols/oscar/oscar.c:960
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "Direkte samtale med %s mislyktes"
 
-#: src/protocols/oscar/oscar.c:907
+#: src/protocols/oscar/oscar.c:968
 msgid "Direct Connect failed"
 msgstr "Direktekopling feilet"
 
-#: src/protocols/oscar/oscar.c:984 src/protocols/oscar/oscar.c:1115
+#: src/protocols/oscar/oscar.c:1045 src/protocols/oscar/oscar.c:1176
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Opprettet direkte samtale med %s"
 
-#: src/protocols/oscar/oscar.c:1065
+#: src/protocols/oscar/oscar.c:1126
 #, c-format
 msgid "Attempting to connect to %s at %s:%hu for Direct IM."
 msgstr "Forsøker å kople til %s på %s:%hu for direktesamtale."
 
-#: src/protocols/oscar/oscar.c:1485
+#: src/protocols/oscar/oscar.c:1547
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "Spør %s om å kople til oss på %s:%hu for direktesamtale."
 
-#: src/protocols/oscar/oscar.c:1490
+#: src/protocols/oscar/oscar.c:1552
 msgid "Unable to open Direct IM"
 msgstr "Kunne ikke åpne direkte direktesamtale"
 
-#: src/protocols/oscar/oscar.c:1525
+#: src/protocols/oscar/oscar.c:1587
 #, 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:1529
+#: src/protocols/oscar/oscar.c:1591
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -8098,24 +7907,24 @@
 "Dette vil avsløre din IP-adresse til mottakeren, og medføre en (minimal) "
 "sikkerhetsrisiko. Ønsker du å fortsette?"
 
-#: src/protocols/oscar/oscar.c:1533 src/protocols/oscar/oscar.c:3643
+#: src/protocols/oscar/oscar.c:1595 src/protocols/oscar/oscar.c:4367
 msgid "Connect"
 msgstr "Koble til"
 
-#: src/protocols/oscar/oscar.c:1600 src/protocols/toc/toc.c:874
-#, c-format
-msgid "You have been disconnected from chat room %s."
+#: src/protocols/oscar/oscar.c:1661
+#, fuzzy, c-format
+msgid "You have lost your connection to chat room %s."
 msgstr "Du har blitt koblet fra samtalegruppen %s."
 
-#: src/protocols/oscar/oscar.c:1619
+#: src/protocols/oscar/oscar.c:1684
 msgid "Chat is currently unavailable"
 msgstr "Samtalegrupper er for tiden utilgjengelig"
 
-#: src/protocols/oscar/oscar.c:1700
+#: src/protocols/oscar/oscar.c:1754
 msgid "Screen name sent"
 msgstr "Skjermnavn sendt"
 
-#: src/protocols/oscar/oscar.c:1714
+#: src/protocols/oscar/oscar.c:1778
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -8126,51 +7935,73 @@
 "ugyldig. Skjermnavn må enten starte med en bokstav og kun inneholde tall, "
 "bokstaver, og mellomrom, eller bare inneholde tall."
 
-#: src/protocols/oscar/oscar.c:1742
+#: src/protocols/oscar/oscar.c:1807
 msgid "Unable to login to AIM"
 msgstr "Kunne ikke logge på AIM"
 
-#: src/protocols/oscar/oscar.c:1844 src/protocols/oscar/oscar.c:2365
+#: src/protocols/oscar/oscar.c:1911 src/protocols/oscar/oscar.c:2854
 msgid "Could Not Connect"
 msgstr "Kunne ikke koble til"
 
-#: src/protocols/oscar/oscar.c:1852
+#: src/protocols/oscar/oscar.c:1919
 msgid "Connection established, cookie sent"
 msgstr "Tilkoblet, informasjonskapsel sendt"
 
-#: src/protocols/oscar/oscar.c:1963
-#, fuzzy, c-format
-msgid "Transfer of file %s timed out."
-msgstr "Overføring av filen %s er ferdig."
-
-#: src/protocols/oscar/oscar.c:2047 src/protocols/yahoo/yahoo_filexfer.c:177
-#: src/protocols/yahoo/yahoo_filexfer.c:186
-#: src/protocols/yahoo/yahoo_filexfer.c:195
+#. clientip & verifiedip failed, request a redirect
+#. * that is, we want the sender to connect to us
+#. Let the user not to lose hope quite yet
+#: src/protocols/oscar/oscar.c:2071
+#, fuzzy
+msgid "Attempting connection redirect..."
+msgstr "Forsøker å kople til %s på %s:%hu for direktesamtale."
+
+#. proxyip timed out
+#. * Yes, it's a bit odd to ask the user to enable proxied file transfers
+#. * when it's a proxied transfer that timed out. It is possible that a
+#. * stage 1/2 proxied transfer might work when a stage 3 will not.
+#: src/protocols/oscar/oscar.c:2116
+#, c-format
+msgid ""
+"Transfer of file %s timed out.\n"
+" Try enabling proxy servers for file transfers in Tools->Preferences->AIM/"
+"ICQ."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2214 src/protocols/yahoo/yahoo_filexfer.c:174
+#: src/protocols/yahoo/yahoo_filexfer.c:183
+#: src/protocols/yahoo/yahoo_filexfer.c:192
 msgid "Unable to establish file descriptor."
 msgstr "Kunne ikke etablere fildeskriptor."
 
-#: src/protocols/oscar/oscar.c:2052
+#: src/protocols/oscar/oscar.c:2219
 msgid "Unable to create new connection."
 msgstr "Kunne ikke lage ny tilkobling."
 
-#: src/protocols/oscar/oscar.c:2124
-msgid "Unable to establish listener socket."
+#: src/protocols/oscar/oscar.c:2453 src/protocols/oscar/oscar.c:2462
+#: src/protocols/oscar/oscar.c:2476 src/protocols/oscar/oscar.c:2486
+#, fuzzy
+msgid "Unable to log into file transfer proxy."
+msgstr "Kunne ikke skrive fil %s."
+
+#: src/protocols/oscar/oscar.c:2540
+#, fuzzy
+msgid "Unable to establish listener socket or no AOL proxy connection present."
 msgstr "Kunne ikke etablere lytte-socket."
 
-#: src/protocols/oscar/oscar.c:2249 src/protocols/toc/toc.c:541
+#: src/protocols/oscar/oscar.c:2741 src/protocols/toc/toc.c:543
 msgid "Incorrect nickname or password."
 msgstr "Feil kallenavn eller passord."
 
-#: src/protocols/oscar/oscar.c:2254
+#: src/protocols/oscar/oscar.c:2746
 msgid "Your account is currently suspended."
 msgstr "Kontoen din er frosset."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:2258
+#: src/protocols/oscar/oscar.c:2750
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL Instant Messenger-tjenesten er midlertidig utilgjengelig."
 
-#: src/protocols/oscar/oscar.c:2263
+#: src/protocols/oscar/oscar.c:2755
 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."
@@ -8178,34 +8009,34 @@
 "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:2268
+#: src/protocols/oscar/oscar.c:2760
 #, 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:2300
+#: src/protocols/oscar/oscar.c:2791
 msgid "Internal Error"
 msgstr "Intern feil"
 
-#: src/protocols/oscar/oscar.c:2372
+#: src/protocols/oscar/oscar.c:2861
 msgid "Received authorization"
 msgstr "Mottok godkjenning"
 
-#: src/protocols/oscar/oscar.c:2396
+#: src/protocols/oscar/oscar.c:2885
 msgid "The SecurID key entered is invalid."
 msgstr "Den inntastede SecurID-nøkkelen er ugyldig."
 
-#: src/protocols/oscar/oscar.c:2410
+#: src/protocols/oscar/oscar.c:2899
 msgid "Enter SecurID"
 msgstr "Tast inn SecurID"
 
-#: src/protocols/oscar/oscar.c:2411
+#: src/protocols/oscar/oscar.c:2900
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Tast inn det sekssifrede tallet fra displayet."
 
-#: src/protocols/oscar/oscar.c:2451 src/protocols/oscar/oscar.c:2481
-#: src/protocols/oscar/oscar.c:2570
+#: src/protocols/oscar/oscar.c:2940 src/protocols/oscar/oscar.c:2970
+#: src/protocols/oscar/oscar.c:3059
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -8214,24 +8045,24 @@
 "Du kan bli frakoblet ganske snart. Du vil kanskje bruke TOC inntil dette er "
 "ordnet. Sjekk %s for oppdateringer."
 
-#: src/protocols/oscar/oscar.c:2454 src/protocols/oscar/oscar.c:2484
+#: src/protocols/oscar/oscar.c:2943 src/protocols/oscar/oscar.c:2973
 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:2573
+#: src/protocols/oscar/oscar.c:3062
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim klarte ikke å motta en gyldig påloggingshash."
 
-#: src/protocols/oscar/oscar.c:2605
+#: src/protocols/oscar/oscar.c:3093
 msgid "Password sent"
 msgstr "Passord sendt"
 
-#: src/protocols/oscar/oscar.c:3635
+#: src/protocols/oscar/oscar.c:4358
 #, 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:3638
+#: src/protocols/oscar/oscar.c:4361
 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 "
@@ -8241,20 +8072,20 @@
 "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:3676
+#: src/protocols/oscar/oscar.c:4400
 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:3684
+#: src/protocols/oscar/oscar.c:4408
 msgid "Authorization Request Message:"
 msgstr "Beskjed i godkjenningsforespørsel:"
 
-#: src/protocols/oscar/oscar.c:3685
+#: src/protocols/oscar/oscar.c:4409
 msgid "Please authorize me!"
 msgstr "Vennligst godkjenn meg!"
 
-#: src/protocols/oscar/oscar.c:3715
+#: src/protocols/oscar/oscar.c:4439
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -8263,36 +8094,35 @@
 "Brukeren %s krever godkjenning før vedkommende legges til i kontaktlisten. "
 "Vil du sende en godkjenningsforespørsel?"
 
-#: src/protocols/oscar/oscar.c:3720 src/protocols/oscar/oscar.c:3722
+#: src/protocols/oscar/oscar.c:4444 src/protocols/oscar/oscar.c:4446
 msgid "Request Authorization"
 msgstr "Spør om godkjenning"
 
-#: src/protocols/oscar/oscar.c:3770 src/protocols/oscar/oscar.c:3772
-#: src/protocols/oscar/oscar.c:3779 src/protocols/oscar/oscar.c:3876
-#: src/protocols/oscar/oscar.c:3896 src/protocols/oscar/oscar.c:6430
-#: src/protocols/oscar/oscar.c:6476
+#: src/protocols/oscar/oscar.c:4484 src/protocols/oscar/oscar.c:4490
+#: src/protocols/oscar/oscar.c:4594 src/protocols/oscar/oscar.c:4618
+#: src/protocols/oscar/oscar.c:7228 src/protocols/oscar/oscar.c:7280
 msgid "No reason given."
 msgstr "Ingen grunn spesifisert."
 
-#: src/protocols/oscar/oscar.c:3778
+#: src/protocols/oscar/oscar.c:4489
 msgid "Authorization Denied Message:"
 msgstr "Godkjenning nektet, grunn:"
 
-#: src/protocols/oscar/oscar.c:3876
-#, c-format
-msgid ""
-"The user %u wants to add you to their buddy list for the following reason:\n"
+#: src/protocols/oscar/oscar.c:4596
+#, fuzzy, c-format
+msgid ""
+"The user %u wants to add %s to their buddy list for the following reason:\n"
 "%s"
 msgstr ""
 "Brukeren %u ønsker å legge deg til sin kontaktliste og oppgav følgende "
 "grunn:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3884 src/protocols/oscar/oscar.c:6436
+#: src/protocols/oscar/oscar.c:4606 src/protocols/oscar/oscar.c:7240
 msgid "Authorization Request"
 msgstr "Godkjenningsforespørsel"
 
-#: src/protocols/oscar/oscar.c:3896
+#: src/protocols/oscar/oscar.c:4618
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -8303,19 +8133,19 @@
 "med følgende grunn:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3897
+#: src/protocols/oscar/oscar.c:4619
 msgid "ICQ authorization denied."
 msgstr "ICQ-godkjenning avslått."
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:3904
+#: src/protocols/oscar/oscar.c:4626
 #, 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:3912
+#: src/protocols/oscar/oscar.c:4634
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8328,7 +8158,7 @@
 "Fra: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3920
+#: src/protocols/oscar/oscar.c:4642
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8341,7 +8171,7 @@
 "Fra: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3928
+#: src/protocols/oscar/oscar.c:4650
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -8354,34 +8184,34 @@
 "Beskjed:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3949
+#: src/protocols/oscar/oscar.c:4671
 #, 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:3955
+#: src/protocols/oscar/oscar.c:4677
 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:3959
+#: src/protocols/oscar/oscar.c:4681
 msgid "Decline"
 msgstr "Avslå"
 
-#: src/protocols/oscar/oscar.c:4043
+#: src/protocols/oscar/oscar.c:4765
 #, 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:4052
+#: src/protocols/oscar/oscar.c:4774
 #, 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:4061
+#: src/protocols/oscar/oscar.c:4783
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -8394,7 +8224,7 @@
 "Du har gått glipp av %hu beskjeder fra %s fordi hastighetsgrensen har blitt "
 "overskredet."
 
-#: src/protocols/oscar/oscar.c:4070
+#: src/protocols/oscar/oscar.c:4792
 #, 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."
@@ -8403,69 +8233,70 @@
 msgstr[1] ""
 "Du har gått glipp av %hu beskjeder fra %s fordi vedkommende var for ond."
 
-#: src/protocols/oscar/oscar.c:4079
+#: src/protocols/oscar/oscar.c:4801
 #, 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:4088
+#: src/protocols/oscar/oscar.c:4810
 #, 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:4142 src/protocols/oscar/oscar.c:4374
-#, c-format
-msgid "Info for %s"
-msgstr "Info for %s"
-
-#: src/protocols/oscar/oscar.c:4208
+#: src/protocols/oscar/oscar.c:4869
+#, 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:4930
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC-feil: %s\n"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:4244
+#: src/protocols/oscar/oscar.c:4967
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Kunne ikke sende beskjed: %s"
 
-#: src/protocols/oscar/oscar.c:4244 src/protocols/oscar/oscar.c:4249
-#: src/protocols/oscar/oscar.c:4307 src/protocols/oscar/oscar.c:4311
+#: src/protocols/oscar/oscar.c:4967 src/protocols/oscar/oscar.c:4972
+#: src/protocols/oscar/oscar.c:5030 src/protocols/oscar/oscar.c:5034
 msgid "Unknown reason."
 msgstr "Ukjent grunn."
 
-#: src/protocols/oscar/oscar.c:4307
+#: src/protocols/oscar/oscar.c:4970
+#, c-format
+msgid "Unable to send message to %s:"
+msgstr "Kunne ikke sende beskjed til %s."
+
+#: src/protocols/oscar/oscar.c:5030
 #, c-format
 msgid "User information not available: %s"
 msgstr "Brukerinformasjon er ikke tilgjengelig: %s"
 
-#: src/protocols/oscar/oscar.c:4310
+#: src/protocols/oscar/oscar.c:5033
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "Brukerinformasjon for %s er ikke tilgjengelig:"
 
-#: src/protocols/oscar/oscar.c:4332
-msgid "Warning Level"
-msgstr "Advarselsnivåer"
-
-#: src/protocols/oscar/oscar.c:4336
+#: src/protocols/oscar/oscar.c:5060
 msgid "Online Since"
 msgstr "Pålogget siden"
 
-#: src/protocols/oscar/oscar.c:4341 src/protocols/yahoo/yahoo_profile.c:1125
+#: src/protocols/oscar/oscar.c:5065 src/protocols/yahoo/yahoo_profile.c:1118
 msgid "Member Since"
 msgstr "Medlem siden"
 
-#: src/protocols/oscar/oscar.c:4425
+#: src/protocols/oscar/oscar.c:5148
 msgid "Your AIM connection may be lost."
 msgstr "AIM-tilkoblingen kan være brutt."
 
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:4611
+#: src/protocols/oscar/oscar.c:5334
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -8473,11 +8304,11 @@
 "[Klarte ikke vise en melding fra denne brukeren da den inneholdt ugyldige "
 "tegn.]"
 
-#: src/protocols/oscar/oscar.c:4836
+#: src/protocols/oscar/oscar.c:5560
 msgid "Rate limiting error."
 msgstr "Feil ved hastighetsbegrensning."
 
-#: src/protocols/oscar/oscar.c:4837
+#: src/protocols/oscar/oscar.c:5561
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -8485,118 +8316,105 @@
 "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:4900
-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:4902
+#: src/protocols/oscar/oscar.c:5637
 msgid "You have been signed off for an unknown reason."
 msgstr "Du har blitt logget av, årsak ukjent."
 
-#: src/protocols/oscar/oscar.c:4933
+#: src/protocols/oscar/oscar.c:5650 src/protocols/toc/toc.c:971
+#, c-format
+msgid "You have been disconnected from chat room %s."
+msgstr "Du har blitt koblet fra samtalegruppen %s."
+
+#. XXX - Don't call this with ssi
+#: src/protocols/oscar/oscar.c:5675
 msgid "Finalizing connection"
 msgstr "Fullfører tilkobling"
 
-#: src/protocols/oscar/oscar.c:5216 src/protocols/silc/util.c:541
+#: src/protocols/oscar/oscar.c:5943
+msgid "UIN"
+msgstr "UIN"
+
+#: src/protocols/oscar/oscar.c:5969 src/protocols/silc/util.c:541
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-# Gammel "uventet", kansje bedre?
-#: src/protocols/oscar/oscar.c:5217
-#, fuzzy
-msgid "Not specified"
-msgstr "Ikke spesifisert"
-
-#: src/protocols/oscar/oscar.c:5218 src/protocols/trepia/trepia.c:282
-#: src/protocols/trepia/trepia.c:408
+#: src/protocols/oscar/oscar.c:5971
 msgid "Female"
 msgstr "Hunkjønn"
 
-#: src/protocols/oscar/oscar.c:5218 src/protocols/trepia/trepia.c:281
-#: src/protocols/trepia/trepia.c:408
+#: src/protocols/oscar/oscar.c:5971
 msgid "Male"
 msgstr "Hankjønn"
 
-#: src/protocols/oscar/oscar.c:5234
+#: src/protocols/oscar/oscar.c:5987
 msgid "Personal Web Page"
 msgstr "Personlig hjemmeside"
 
-#: src/protocols/oscar/oscar.c:5238
+#: src/protocols/oscar/oscar.c:5991
 msgid "Additional Information"
 msgstr "Tilleggsinformasjon"
 
-#: src/protocols/oscar/oscar.c:5243
+#: src/protocols/oscar/oscar.c:5996
 msgid "Home Address"
 msgstr "Hjemstedsadresse"
 
-#: src/protocols/oscar/oscar.c:5247 src/protocols/oscar/oscar.c:5255
+#: src/protocols/oscar/oscar.c:6000 src/protocols/oscar/oscar.c:6008
 msgid "Zip Code"
 msgstr "Postnummer"
 
-#: src/protocols/oscar/oscar.c:5251
+#: src/protocols/oscar/oscar.c:6004
 msgid "Work Address"
 msgstr "Arbeidsadresse"
 
-#: src/protocols/oscar/oscar.c:5259
+#: src/protocols/oscar/oscar.c:6012
 msgid "Work Information"
 msgstr "Arbeid ekstra info"
 
-#: src/protocols/oscar/oscar.c:5260
+#: src/protocols/oscar/oscar.c:6013
 msgid "Company"
 msgstr "Firma"
 
-#: src/protocols/oscar/oscar.c:5261
+#: src/protocols/oscar/oscar.c:6014
 msgid "Division"
 msgstr "Avdeling"
 
-#: src/protocols/oscar/oscar.c:5262
+#: src/protocols/oscar/oscar.c:6015
 msgid "Position"
 msgstr "Stilling"
 
-#: src/protocols/oscar/oscar.c:5264
+#: src/protocols/oscar/oscar.c:6017
 msgid "Web Page"
 msgstr "Hjemmeside"
 
-#: src/protocols/oscar/oscar.c:5274
-#, c-format
-msgid "ICQ Info for %s"
-msgstr "ICQ-info for %s"
-
-#: src/protocols/oscar/oscar.c:5323
+#: src/protocols/oscar/oscar.c:6074
 msgid "Pop-Up Message"
 msgstr "Varslingsbeskjed"
 
-#: src/protocols/oscar/oscar.c:5344
+#. TODO: Need to use ngettext() here
+#: src/protocols/oscar/oscar.c:6103
 #, 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:5348
-msgid "Search Results"
-msgstr "Søkeresultater"
-
-#: src/protocols/oscar/oscar.c:5365
+#: src/protocols/oscar/oscar.c:6132
 #, c-format
 msgid "No results found for email address %s"
 msgstr "Ingen resultater funnet for e-postadresse %s"
 
-#: src/protocols/oscar/oscar.c:5386
+#: src/protocols/oscar/oscar.c:6153
 #, 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:5388
+#: src/protocols/oscar/oscar.c:6155
 msgid "Account Confirmation Requested"
 msgstr "Kontobekreftelse forespurt"
 
-#: src/protocols/oscar/oscar.c:5419
+#: src/protocols/oscar/oscar.c:6186
 msgid "Error Changing Account Info"
 msgstr "Feil ved endring av kontoinformasjon"
 
-#: src/protocols/oscar/oscar.c:5422
+#: src/protocols/oscar/oscar.c:6189
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8605,16 +8423,14 @@
 "Feil 0x%04x: Kunne ikke formatere skjermnavnet fordi det forespurte "
 "skjermnavnet er forskjellig fra det opprinnelige."
 
-#: src/protocols/oscar/oscar.c:5425
-#, c-format
-msgid ""
-"Error 0x%04x: Unable to format screen name because the requested screen name "
-"ends in a space."
+#: src/protocols/oscar/oscar.c:6192
+#, fuzzy, c-format
+msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr ""
 "Feil 0x%04x: Kunne ikke formatere skjermnavnet fordi det forespurte "
-"skjermnavnet slutter med et mellomrom."
-
-#: src/protocols/oscar/oscar.c:5428
+"skjermnavnet er for langt."
+
+#: src/protocols/oscar/oscar.c:6195
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8623,7 +8439,7 @@
 "Feil 0x%04x: Kunne ikke formatere skjermnavnet fordi det forespurte "
 "skjermnavnet er for langt."
 
-#: src/protocols/oscar/oscar.c:5431
+#: src/protocols/oscar/oscar.c:6198
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -8632,7 +8448,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:5434
+#: src/protocols/oscar/oscar.c:6201
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -8641,7 +8457,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:5437
+#: src/protocols/oscar/oscar.c:6204
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -8650,12 +8466,12 @@
 "Feil 0x%04x: Kunne ikke endre e-postadressen fordi den gitte adressen er "
 "ugyldig."
 
-#: src/protocols/oscar/oscar.c:5440
+#: src/protocols/oscar/oscar.c:6207
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Feil 0x%04x: Ukjent feil."
 
-#: src/protocols/oscar/oscar.c:5450
+#: src/protocols/oscar/oscar.c:6217
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -8664,27 +8480,27 @@
 "Skjermnavnet ditt er formatert slik:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5451 src/protocols/oscar/oscar.c:5458
+#: src/protocols/oscar/oscar.c:6218 src/protocols/oscar/oscar.c:6225
 msgid "Account Info"
 msgstr "Kontoinformasjon"
 
-#: src/protocols/oscar/oscar.c:5456
+#: src/protocols/oscar/oscar.c:6223
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "E-postadressen for %s er %s"
 
-#: src/protocols/oscar/oscar.c:5521
+#: src/protocols/oscar/oscar.c:6290
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "Ditt direktemeldingsbilde ble ikke sendt. Du må være direkte tilkoplet for å "
 "sende direktemeldingsbilder"
 
-#: src/protocols/oscar/oscar.c:5649
+#: src/protocols/oscar/oscar.c:6474
 msgid "Unable to set AIM profile."
 msgstr "Kunne ikke sette AIM-profil."
 
-#: src/protocols/oscar/oscar.c:5650
+#: src/protocols/oscar/oscar.c:6475
 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 "
@@ -8694,7 +8510,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:5677
+#: src/protocols/oscar/oscar.c:6489
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -8709,29 +8525,11 @@
 "Maksimum profillengde på %d bytes har blitt overskredet. Gaim har avkortet "
 "den før den ble lagret."
 
-#: src/protocols/oscar/oscar.c:5682
+#: src/protocols/oscar/oscar.c:6494
 msgid "Profile too long."
 msgstr "Profilen er for stor."
 
-#: src/protocols/oscar/oscar.c:5698 src/protocols/oscar/oscar.c:6994
-msgid "Visible"
-msgstr "Synlig"
-
-#: src/protocols/oscar/oscar.c:5716
-msgid "Unable to set AIM away message."
-msgstr "Kunne ikke sette fraværsbeskjed for AIM."
-
-#: src/protocols/oscar/oscar.c:5717
-msgid ""
-"You have probably requested to set your away message before the login "
-"procedure completed.  You remain in a \"present\" state; try setting it "
-"again when you are fully connected."
-msgstr ""
-"Du har antakeligvis prøvd å sette en fraværsbeskjed før "
-"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:5757
+#: src/protocols/oscar/oscar.c:6517 src/protocols/oscar/oscar.c:6590
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -8746,11 +8544,25 @@
 "Maksimumslengden på %d bytes for fraværsbeskjeder har blitt overskredet. "
 "Gaim har avkortet den."
 
-#: src/protocols/oscar/oscar.c:5762
+#: src/protocols/oscar/oscar.c:6522 src/protocols/oscar/oscar.c:6595
 msgid "Away message too long."
 msgstr "Fraværsbeskjeden er for lang."
 
-#: src/protocols/oscar/oscar.c:5839
+#: src/protocols/oscar/oscar.c:6554
+msgid "Unable to set AIM away message."
+msgstr "Kunne ikke sette fraværsbeskjed for AIM."
+
+#: src/protocols/oscar/oscar.c:6555
+msgid ""
+"You have probably requested to set your away message before the login "
+"procedure completed.  You remain in a \"present\" state; try setting it "
+"again when you are fully connected."
+msgstr ""
+"Du har antakeligvis prøvd å sette en fraværsbeskjed før "
+"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:6685
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -8761,16 +8573,16 @@
 "må enten starte med en bokstav og inneholde kun bokstaver, tall, og "
 "mellomrom, eller bare inneholde nummer."
 
-#: src/protocols/oscar/oscar.c:5841 src/protocols/oscar/oscar.c:6296
-#: src/protocols/oscar/oscar.c:6310
+#: src/protocols/oscar/oscar.c:6687 src/protocols/oscar/oscar.c:7086
+#: src/protocols/oscar/oscar.c:7100
 msgid "Unable To Add"
 msgstr "Kunne ikke legge til"
 
-#: src/protocols/oscar/oscar.c:6008
+#: src/protocols/oscar/oscar.c:6792
 msgid "Unable To Retrieve Buddy List"
 msgstr "Kunne ikke hente kontaktliste"
 
-#: src/protocols/oscar/oscar.c:6009
+#: src/protocols/oscar/oscar.c:6793
 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 "
@@ -8779,13 +8591,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:6191 src/protocols/oscar/oscar.c:6192
-#: src/protocols/oscar/oscar.c:6197 src/protocols/oscar/oscar.c:6354
-#: src/protocols/oscar/oscar.c:6355 src/protocols/oscar/oscar.c:6360
+#: src/protocols/oscar/oscar.c:6977 src/protocols/oscar/oscar.c:6978
+#: src/protocols/oscar/oscar.c:6983 src/protocols/oscar/oscar.c:7144
+#: src/protocols/oscar/oscar.c:7145 src/protocols/oscar/oscar.c:7150
 msgid "Orphans"
 msgstr "Ugrupperte"
 
-#: src/protocols/oscar/oscar.c:6294
+#: src/protocols/oscar/oscar.c:7084
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8794,11 +8606,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:6294 src/protocols/oscar/oscar.c:6308
+#: src/protocols/oscar/oscar.c:7084 src/protocols/oscar/oscar.c:7098
 msgid "(no name)"
 msgstr "(uten navn)"
 
-#: src/protocols/oscar/oscar.c:6308
+#: src/protocols/oscar/oscar.c:7098
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -8809,7 +8621,7 @@
 "til dette er at du har nådd maksimalgrensen for antall kontakter i "
 "kontaktlisten din."
 
-#: src/protocols/oscar/oscar.c:6391
+#: src/protocols/oscar/oscar.c:7181
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -8818,33 +8630,33 @@
 "Brukeren %s har gitt deg tillatelse til å legge deg til i kontaktlisten sin. "
 "Ønsker du å legge til vedkommende?"
 
-#: src/protocols/oscar/oscar.c:6397
+#: src/protocols/oscar/oscar.c:7187
 msgid "Authorization Given"
 msgstr "Godkjent"
 
-#: src/protocols/oscar/oscar.c:6430
-#, c-format
-msgid ""
-"The user %s wants to add you to their buddy list for the following reason:\n"
+#: src/protocols/oscar/oscar.c:7231
+#, fuzzy, c-format
+msgid ""
+"The user %s wants to add %s to their buddy list for the following reason:\n"
 "%s"
 msgstr ""
 "Brukeren %s ønsker å legge deg til i kontaktlisten sin med følgende grunn:\n"
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:6472
+#: src/protocols/oscar/oscar.c:7276
 #, 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:6473
+#: src/protocols/oscar/oscar.c:7277
 msgid "Authorization Granted"
 msgstr "Godkjent"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:6476
+#: src/protocols/oscar/oscar.c:7280
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -8855,79 +8667,99 @@
 "med følgende grun:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:6477
+#: src/protocols/oscar/oscar.c:7281
 msgid "Authorization Denied"
 msgstr "Ikke godkjent"
 
-#: src/protocols/oscar/oscar.c:6514 src/protocols/toc/toc.c:1273
+#: src/protocols/oscar/oscar.c:7318 src/protocols/toc/toc.c:1372
 msgid "_Exchange:"
 msgstr "_Utveksling:"
 
-#: src/protocols/oscar/oscar.c:6552
+#: src/protocols/oscar/oscar.c:7354
 msgid "Invalid chat name specified."
 msgstr "Ugyldig gruppesamtalenavn oppgitt."
 
-#: src/protocols/oscar/oscar.c:6641
+#: src/protocols/oscar/oscar.c:7424
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "Ditt direktemeldingsbilde ble ikke sendt. Du kan ikke sende "
 "direktemeldingsbilder i AIM-samtalegrupper."
 
-#: src/protocols/oscar/oscar.c:6767
+#: src/protocols/oscar/oscar.c:7559
 msgid "Away Message"
 msgstr "Fraværsbeskjed"
 
-#: src/protocols/oscar/oscar.c:7053
+#: src/protocols/oscar/oscar.c:7848
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Kontaktkommentar for %s"
 
-#: src/protocols/oscar/oscar.c:7054
+#: src/protocols/oscar/oscar.c:7849
 msgid "Buddy Comment:"
 msgstr "Kontaktkommentar:"
 
-#: src/protocols/oscar/oscar.c:7073
+#: src/protocols/oscar/oscar.c:7868
 msgid "Edit Buddy Comment"
 msgstr "Rediger kontaktkommentar"
 
-#: src/protocols/oscar/oscar.c:7079
+#: src/protocols/oscar/oscar.c:7874
 msgid "Get Status Msg"
 msgstr "Hent statusbeskjed"
 
-#: src/protocols/oscar/oscar.c:7091
+#: src/protocols/oscar/oscar.c:7886
 msgid "Direct IM"
 msgstr "Direkte samtale"
 
-#: src/protocols/oscar/oscar.c:7108
+#: src/protocols/oscar/oscar.c:7903
 msgid "Re-request Authorization"
 msgstr "Spør på nytt om godkjenning"
 
-#: src/protocols/oscar/oscar.c:7138
+#: src/protocols/oscar/oscar.c:7963
+#, fuzzy
+msgid "Require authorization"
+msgstr "Spør om godkjenning"
+
+#: src/protocols/oscar/oscar.c:7966
+#, fuzzy
+msgid "Hide IP address"
+msgstr "IP-adresse"
+
+#: src/protocols/oscar/oscar.c:7969
+#, fuzzy
+msgid "Web aware"
+msgstr "Web-oppmerksom"
+
+#: src/protocols/oscar/oscar.c:7974
+#, fuzzy
+msgid "ICQ Privacy Options"
+msgstr "Proxyinnstillinger"
+
+#: src/protocols/oscar/oscar.c:7991
 msgid "The new formatting is invalid."
 msgstr "Den nye formateringen er ugyldig."
 
-#: src/protocols/oscar/oscar.c:7139
+#: src/protocols/oscar/oscar.c:7992
 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:7146
+#: src/protocols/oscar/oscar.c:7999
 msgid "New screen name formatting:"
 msgstr "Ny skjermnavn-formatering:"
 
-#: src/protocols/oscar/oscar.c:7198
+#: src/protocols/oscar/oscar.c:8051
 msgid "Change Address To:"
 msgstr "Endre adresse til:"
 
-#: src/protocols/oscar/oscar.c:7243
+#: src/protocols/oscar/oscar.c:8096
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>du venter ikke på godkjenning</i>"
 
-#: src/protocols/oscar/oscar.c:7246
+#: src/protocols/oscar/oscar.c:8099
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Du venter på godkjenning fra disse kontaktene"
 
-#: src/protocols/oscar/oscar.c:7247
+#: src/protocols/oscar/oscar.c:8100
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -8935,78 +8767,87 @@
 "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:7264
+#: src/protocols/oscar/oscar.c:8117
 msgid "Find Buddy by E-mail"
 msgstr "Finn kontakt etter e-post"
 
-#: src/protocols/oscar/oscar.c:7265
+#: src/protocols/oscar/oscar.c:8118
 msgid "Search for a buddy by e-mail address"
 msgstr "Kontaktsøk etter e-postadresse"
 
-#: src/protocols/oscar/oscar.c:7266
+#: src/protocols/oscar/oscar.c:8119
 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:7283
-msgid "Available Message:"
-msgstr "Tilstedebeskjed:"
-
-#: src/protocols/oscar/oscar.c:7284
-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:7365 src/protocols/silc/silc.c:812
+#: src/protocols/oscar/oscar.c:8206 src/protocols/silc/silc.c:817
 msgid "Set User Info..."
 msgstr "Sett brukerinfo..."
 
-#: src/protocols/oscar/oscar.c:7370
+#: src/protocols/oscar/oscar.c:8212
 msgid "Set User Info (URL)..."
 msgstr "Sett brukerinfo (URL)..."
 
-#: src/protocols/oscar/oscar.c:7376
-msgid "Set Available Message..."
-msgstr "Sett tilstedebeskjed..."
-
-#: src/protocols/oscar/oscar.c:7381 src/protocols/silc/silc.c:808
+#: src/protocols/oscar/oscar.c:8217 src/protocols/silc/silc.c:813
 msgid "Change Password..."
 msgstr "Bytt passord..."
 
-#: src/protocols/oscar/oscar.c:7386
+#: src/protocols/oscar/oscar.c:8223
 msgid "Change Password (URL)"
 msgstr "Endre passord (URL)"
 
-#: src/protocols/oscar/oscar.c:7390
+#: src/protocols/oscar/oscar.c:8227
 msgid "Configure IM Forwarding (URL)"
 msgstr "Konfigurer beskjedvideresending (URL)"
 
-#: src/protocols/oscar/oscar.c:7399
+#. ICQ actions
+#: src/protocols/oscar/oscar.c:8237
+#, fuzzy
+msgid "Show privacy options..."
+msgstr "Vis flere valg"
+
+#. AIM actions
+#: src/protocols/oscar/oscar.c:8244
 msgid "Format Screen Name..."
 msgstr "Formatere skjermnavn..."
 
-#: src/protocols/oscar/oscar.c:7403
+#: src/protocols/oscar/oscar.c:8248
 msgid "Confirm Account"
 msgstr "Bekrefte konto"
 
-#: src/protocols/oscar/oscar.c:7407
+#: src/protocols/oscar/oscar.c:8252
 msgid "Display Currently Registered Address"
 msgstr "Vis nåværende registrert adresse"
 
-#: src/protocols/oscar/oscar.c:7411
+#: src/protocols/oscar/oscar.c:8256
 msgid "Change Currently Registered Address..."
 msgstr "Endre nåværende registrert adresse"
 
-#: src/protocols/oscar/oscar.c:7418
+#: src/protocols/oscar/oscar.c:8263
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Vis kontakter som venter på godkjenning"
 
-#: src/protocols/oscar/oscar.c:7424
+#: src/protocols/oscar/oscar.c:8269
 msgid "Search for Buddy by Email..."
 msgstr "Vennesøk etter e-postadresse"
 
-#: src/protocols/oscar/oscar.c:7429
+#: src/protocols/oscar/oscar.c:8274
 msgid "Search for Buddy by Information"
 msgstr "Vennesøk etter informasjon"
 
+#: src/protocols/oscar/oscar.c:8344
+#, fuzzy
+msgid "Use recent buddies group"
+msgstr "Brukeren er ikke i gruppen"
+
+#: src/protocols/oscar/oscar.c:8347
+#, fuzzy
+msgid "Show how long you have been idle"
+msgstr "Lar deg manuelt sette hvor lenge du har vært borte."
+
+#: src/protocols/oscar/oscar.c:8356
+msgid "Use AIM/ICQ proxy server (Slower/More Secure/Usually Works)"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -9017,33 +8858,33 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:7550 src/protocols/oscar/oscar.c:7552
+#: src/protocols/oscar/oscar.c:8470 src/protocols/oscar/oscar.c:8472
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ-protokolltillegg"
 
-#: src/protocols/oscar/oscar.c:7571
+#: src/protocols/oscar/oscar.c:8491
 msgid "Auth host"
 msgstr "Autentiseringsadresse:"
 
-#: src/protocols/oscar/oscar.c:7574
+#: src/protocols/oscar/oscar.c:8494
 msgid "Auth port"
 msgstr "Autentiseringsport:"
 
-#: src/protocols/oscar/oscar.c:7577 src/protocols/zephyr/zephyr.c:2760
+#: src/protocols/oscar/oscar.c:8497 src/protocols/zephyr/zephyr.c:2892
 msgid "Encoding"
 msgstr "Tegnkoding:"
 
-#: src/protocols/silc/buddy.c:51 src/protocols/silc/buddy.c:414
-#: src/protocols/silc/buddy.c:539 src/protocols/silc/buddy.c:706
+#: src/protocols/silc/buddy.c:51 src/protocols/silc/buddy.c:419
+#: src/protocols/silc/buddy.c:544 src/protocols/silc/buddy.c:711
 #: src/protocols/silc/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "Brukeren %s er ikke tilgjengelig i nettverket."
 
-#: src/protocols/silc/buddy.c:52 src/protocols/silc/buddy.c:109
-#: src/protocols/silc/buddy.c:114 src/protocols/silc/buddy.c:118
-#: src/protocols/silc/buddy.c:123 src/protocols/silc/buddy.c:128
-#: src/protocols/silc/buddy.c:133 src/protocols/silc/buddy.c:251
+#: src/protocols/silc/buddy.c:52 src/protocols/silc/buddy.c:114
+#: src/protocols/silc/buddy.c:119 src/protocols/silc/buddy.c:123
+#: src/protocols/silc/buddy.c:128 src/protocols/silc/buddy.c:133
+#: src/protocols/silc/buddy.c:138 src/protocols/silc/buddy.c:256
 msgid "Key Agreement"
 msgstr "Nøkkelavtale"
 
@@ -9051,36 +8892,36 @@
 msgid "Cannot perform the key agreement"
 msgstr "Klarer ikke gjennomføre nøkkelavtale"
 
-#: src/protocols/silc/buddy.c:110
+#: src/protocols/silc/buddy.c:115
 msgid "Error occurred during key agreement"
 msgstr "Feil oppsto under nøkkelavtale"
 
-#: src/protocols/silc/buddy.c:114
+#: src/protocols/silc/buddy.c:119
 msgid "Key Agreement failed"
 msgstr "Nøkkelavtale feilet"
 
-#: src/protocols/silc/buddy.c:119
+#: src/protocols/silc/buddy.c:124
 msgid "Timeout during key agreement"
 msgstr "Tidsavbrudd under nøkkelavtale"
 
-#: src/protocols/silc/buddy.c:124
+#: src/protocols/silc/buddy.c:129
 msgid "Key agreement was aborted"
 msgstr "Nøkkelavtale avbrutt"
 
-#: src/protocols/silc/buddy.c:129
+#: src/protocols/silc/buddy.c:134
 msgid "Key agreement is already started"
 msgstr "Nøkkelavtale allerede startet"
 
-#: src/protocols/silc/buddy.c:134
+#: src/protocols/silc/buddy.c:139
 msgid "Key agreement cannot be started with yourself"
 msgstr "Nøkkelavtale kan ikke startes med degselv"
 
-#: src/protocols/silc/buddy.c:252 src/protocols/silc/buddy.c:382
-#: src/protocols/silc/buddy.c:507
+#: src/protocols/silc/buddy.c:257 src/protocols/silc/buddy.c:387
+#: src/protocols/silc/buddy.c:512
 msgid "The remote user is not present in the network any more"
 msgstr "Fjerntliggende bruker kan ikke nås over nettverket lenger"
 
-#: src/protocols/silc/buddy.c:288
+#: src/protocols/silc/buddy.c:293
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
@@ -9088,7 +8929,7 @@
 msgstr ""
 "Nøkkelavtaleforespørsel motatt fra %s. Ønsker du å gjennomføre nøkkelavtalen?"
 
-#: src/protocols/silc/buddy.c:292
+#: src/protocols/silc/buddy.c:297
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -9099,59 +8940,59 @@
 "Fjerntliggende vert: %s\n"
 "Fjerntliggende port: %d"
 
-#: src/protocols/silc/buddy.c:305
+#: src/protocols/silc/buddy.c:310
 msgid "Key Agreement Request"
 msgstr "Nøkkelavtaleforespørsel"
 
-#: src/protocols/silc/buddy.c:381 src/protocols/silc/buddy.c:416
-#: src/protocols/silc/buddy.c:458
+#: src/protocols/silc/buddy.c:386 src/protocols/silc/buddy.c:421
+#: src/protocols/silc/buddy.c:463
 msgid "IM With Password"
 msgstr "Direktemelding med passord"
 
-#: src/protocols/silc/buddy.c:417
+#: src/protocols/silc/buddy.c:422
 msgid "Cannot set IM key"
 msgstr "Klarer ikke sette direktemeldingsnøkkel"
 
-#: src/protocols/silc/buddy.c:459
+#: src/protocols/silc/buddy.c:464
 msgid "Set IM Password"
 msgstr "Sett direktemeldingspassord"
 
-#: src/protocols/silc/buddy.c:506 src/protocols/silc/buddy.c:541
-#: src/protocols/silc/ops.c:1284 src/protocols/silc/ops.c:1295
+#: src/protocols/silc/buddy.c:511 src/protocols/silc/buddy.c:546
+#: src/protocols/silc/ops.c:1278 src/protocols/silc/ops.c:1289
 msgid "Get Public Key"
 msgstr "Hent offentlig nøkkel"
 
-#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1285
-#: src/protocols/silc/ops.c:1296
+#: src/protocols/silc/buddy.c:547 src/protocols/silc/ops.c:1279
+#: src/protocols/silc/ops.c:1290
 msgid "Cannot fetch the public key"
 msgstr "Kan ikke hente den offentlige nøkkelen"
 
-#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1553
+#: src/protocols/silc/buddy.c:634 src/protocols/silc/buddy.c:1583
 msgid "Show Public Key"
 msgstr "Vis offentlig nøkkel"
 
-#: src/protocols/silc/buddy.c:630 src/protocols/silc/buddy.c:989
-#: src/protocols/silc/chat.c:234
+#: src/protocols/silc/buddy.c:635 src/protocols/silc/buddy.c:994
+#: src/protocols/silc/chat.c:235
 msgid "Could not load public key"
 msgstr "Kunne ikke laste den offentlige nøkkelen"
 
-#: src/protocols/silc/buddy.c:707 src/protocols/silc/ops.c:871
-#: src/protocols/silc/ops.c:943 src/protocols/silc/ops.c:1078
-#: src/protocols/silc/ops.c:1079 src/protocols/silc/ops.c:1098
+#: src/protocols/silc/buddy.c:712 src/protocols/silc/ops.c:873
+#: src/protocols/silc/ops.c:945 src/protocols/silc/ops.c:1080
+#: src/protocols/silc/ops.c:1081 src/protocols/silc/ops.c:1099
 msgid "User Information"
 msgstr "Brukerinformasjon"
 
-#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:944
-#: src/protocols/silc/ops.c:1099
+#: src/protocols/silc/buddy.c:713 src/protocols/silc/ops.c:946
+#: src/protocols/silc/ops.c:1100
 msgid "Cannot get user information"
 msgstr "Kan ikke hente brukerinformasjon"
 
-#: src/protocols/silc/buddy.c:729
+#: src/protocols/silc/buddy.c:734
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "Ikke tillit til kontakten %s"
 
-#: src/protocols/silc/buddy.c:732
+#: src/protocols/silc/buddy.c:737
 msgid ""
 "You cannot receive buddy notifications until you import his/her public key.  "
 "You can use the Get Public Key command to get the public key."
@@ -9161,16 +9002,16 @@
 "offentlige nøkkelen."
 
 #. Open file selector to select the public key.
-#: src/protocols/silc/buddy.c:1023
+#: src/protocols/silc/buddy.c:1028
 msgid "Open..."
 msgstr "Åpne..."
 
-#: src/protocols/silc/buddy.c:1032
+#: src/protocols/silc/buddy.c:1037
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "Kontakten %s er ikke tilgjengelig på nettverket"
 
-#: src/protocols/silc/buddy.c:1035
+#: src/protocols/silc/buddy.c:1040
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
@@ -9178,15 +9019,15 @@
 "For å legge til kontakten må du importere hans/hennes offentlige nøkkel. "
 "Trykk Import for å importere en offentlig nøkkel."
 
-#: src/protocols/silc/buddy.c:1038
+#: src/protocols/silc/buddy.c:1043
 msgid "Import..."
 msgstr "Importer..."
 
-#: src/protocols/silc/buddy.c:1125
+#: src/protocols/silc/buddy.c:1130
 msgid "Select correct user"
 msgstr "Velg korrekt bruker"
 
-#: src/protocols/silc/buddy.c:1127
+#: src/protocols/silc/buddy.c:1132
 msgid ""
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
@@ -9194,7 +9035,7 @@
 "Mer enn en bruker ble funnet med den samme offentlige nøkkelen. Velg den "
 "korrekte brukeren fra lista for å legge til kontaktlista."
 
-#: src/protocols/silc/buddy.c:1129
+#: src/protocols/silc/buddy.c:1134
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
@@ -9202,230 +9043,227 @@
 "Men enn en bruker ble funnet med det samme navnet. Velg den korrekte "
 "brukeren fra lista for å legge til kontaktlista."
 
-#: src/protocols/silc/buddy.c:1386
+#: src/protocols/silc/buddy.c:1415
 #, fuzzy
 msgid "Detached"
 msgstr "Løsnet"
 
-#: src/protocols/silc/buddy.c:1390 src/protocols/silc/silc.c:49
-#: src/protocols/silc/silc.c:85
+#: src/protocols/silc/buddy.c:1419 src/protocols/silc/silc.c:56
 msgid "Indisposed"
 msgstr "Indisponert"
 
-#: src/protocols/silc/buddy.c:1394 src/protocols/silc/silc.c:50
-#: src/protocols/silc/silc.c:87
+#: src/protocols/silc/buddy.c:1423 src/protocols/silc/silc.c:58
 msgid "Wake Me Up"
 msgstr "Vekk meg"
 
-#: src/protocols/silc/buddy.c:1396 src/protocols/silc/silc.c:46
-#: src/protocols/silc/silc.c:79
+#: src/protocols/silc/buddy.c:1425 src/protocols/silc/silc.c:50
 msgid "Hyper Active"
 msgstr "Hyperaktiv"
 
-#: src/protocols/silc/buddy.c:1398
+#: src/protocols/silc/buddy.c:1427
 msgid "Robot"
 msgstr "Robot"
 
-#: src/protocols/silc/buddy.c:1405 src/protocols/silc/silc.c:629
+#: src/protocols/silc/buddy.c:1434 src/protocols/silc/silc.c:634
 #: src/protocols/silc/util.c:472
 msgid "Happy"
 msgstr "Glad"
 
-#: src/protocols/silc/buddy.c:1407 src/protocols/silc/silc.c:631
+#: src/protocols/silc/buddy.c:1436 src/protocols/silc/silc.c:636
 #: src/protocols/silc/util.c:474
 msgid "Sad"
 msgstr "Trist"
 
-#: src/protocols/silc/buddy.c:1409 src/protocols/silc/silc.c:633
+#: src/protocols/silc/buddy.c:1438 src/protocols/silc/silc.c:638
 #: src/protocols/silc/util.c:476
 msgid "Angry"
 msgstr "Sint"
 
-#: src/protocols/silc/buddy.c:1411 src/protocols/silc/silc.c:635
+#: src/protocols/silc/buddy.c:1440 src/protocols/silc/silc.c:640
 #: src/protocols/silc/util.c:478
 msgid "Jealous"
 msgstr "Misunnelig"
 
-#: src/protocols/silc/buddy.c:1413 src/protocols/silc/silc.c:637
+#: src/protocols/silc/buddy.c:1442 src/protocols/silc/silc.c:642
 #: src/protocols/silc/util.c:480
 msgid "Ashamed"
 msgstr "Skamfull"
 
-#: src/protocols/silc/buddy.c:1415 src/protocols/silc/silc.c:639
+#: src/protocols/silc/buddy.c:1444 src/protocols/silc/silc.c:644
 #: src/protocols/silc/util.c:482
 msgid "Invincible"
 msgstr "Uovervinnelig"
 
-#: src/protocols/silc/buddy.c:1417 src/protocols/silc/silc.c:641
+#: src/protocols/silc/buddy.c:1446 src/protocols/silc/silc.c:646
 #: src/protocols/silc/util.c:484
 msgid "In Love"
 msgstr "Forelsket"
 
-#: src/protocols/silc/buddy.c:1419 src/protocols/silc/silc.c:643
+#: src/protocols/silc/buddy.c:1448 src/protocols/silc/silc.c:648
 #: src/protocols/silc/util.c:486
 msgid "Sleepy"
 msgstr "Trøtt"
 
-#: src/protocols/silc/buddy.c:1421 src/protocols/silc/silc.c:645
+#: src/protocols/silc/buddy.c:1450 src/protocols/silc/silc.c:650
 #: src/protocols/silc/util.c:488
 msgid "Bored"
 msgstr "Kjeder seg"
 
-#: src/protocols/silc/buddy.c:1423 src/protocols/silc/silc.c:647
+#: src/protocols/silc/buddy.c:1452 src/protocols/silc/silc.c:652
 #: src/protocols/silc/util.c:490
 msgid "Excited"
 msgstr "Oppglødd"
 
-#: src/protocols/silc/buddy.c:1425 src/protocols/silc/silc.c:649
+#: src/protocols/silc/buddy.c:1454 src/protocols/silc/silc.c:654
 #: src/protocols/silc/util.c:492
 msgid "Anxious"
 msgstr "Bekymret"
 
-#: src/protocols/silc/buddy.c:1457 src/protocols/silc/ops.c:980
+#: src/protocols/silc/buddy.c:1486 src/protocols/silc/ops.c:982
 msgid "User Modes"
 msgstr "Brukertilstander"
 
-#: src/protocols/silc/buddy.c:1466 src/protocols/silc/ops.c:989
+#: src/protocols/silc/buddy.c:1495 src/protocols/silc/ops.c:991
 msgid "Mood"
 msgstr "Sinnsstemning"
 
-#: src/protocols/silc/buddy.c:1470 src/protocols/silc/ops.c:995
+#: src/protocols/silc/buddy.c:1499 src/protocols/silc/ops.c:997
 msgid "Status Text"
 msgstr "Statustekst"
 
 #
-#: src/protocols/silc/buddy.c:1475 src/protocols/silc/ops.c:1001
+#: src/protocols/silc/buddy.c:1504 src/protocols/silc/ops.c:1003
 msgid "Preferred Contact"
 msgstr "Foretrukket kontakt"
 
-#: src/protocols/silc/buddy.c:1480 src/protocols/silc/ops.c:1006
+#: src/protocols/silc/buddy.c:1509 src/protocols/silc/ops.c:1008
 msgid "Preferred Language"
 msgstr "Foretrukket språk"
 
-#: src/protocols/silc/buddy.c:1485 src/protocols/silc/ops.c:1011
+#: src/protocols/silc/buddy.c:1514 src/protocols/silc/ops.c:1013
 #, fuzzy
 msgid "Device"
 msgstr "Dings"
 
 #
-#: src/protocols/silc/buddy.c:1490 src/protocols/silc/ops.c:1016
-#: src/protocols/silc/silc.c:697 src/protocols/silc/silc.c:699
+#: src/protocols/silc/buddy.c:1519 src/protocols/silc/ops.c:1018
+#: src/protocols/silc/silc.c:702 src/protocols/silc/silc.c:704
 msgid "Timezone"
 msgstr "Tidssone"
 
-#: src/protocols/silc/buddy.c:1495 src/protocols/silc/ops.c:1021
+#: src/protocols/silc/buddy.c:1524 src/protocols/silc/ops.c:1023
 msgid "Geolocation"
 msgstr "Sted"
 
-#: src/protocols/silc/buddy.c:1538
+#: src/protocols/silc/buddy.c:1567
 msgid "Reset IM Key"
 msgstr "Nullstill direktemeldingsnøkkel"
 
-#: src/protocols/silc/buddy.c:1543
+#: src/protocols/silc/buddy.c:1572
 #, fuzzy
 msgid "IM with Key Exchange"
 msgstr "Snakk via direktemelding med nøkkelsentral"
 
-#: src/protocols/silc/buddy.c:1547
+#: src/protocols/silc/buddy.c:1576
 #, fuzzy
 msgid "IM with Password"
 msgstr "Passordbeskyttet direktemelding"
 
-#: src/protocols/silc/buddy.c:1558
+#: src/protocols/silc/buddy.c:1588
 msgid "Get Public Key..."
 msgstr "Hent offentlig nøkkel"
 
 # Litt voldelig?
-#: src/protocols/silc/buddy.c:1564 src/protocols/silc/ops.c:1417
+#: src/protocols/silc/buddy.c:1595 src/protocols/silc/ops.c:1409
 #, fuzzy
 msgid "Kill User"
 msgstr "Drep bruker"
 
-#: src/protocols/silc/chat.c:37
+#: src/protocols/silc/chat.c:38
 msgid "_Passphrase:"
 msgstr "_Nøkkelsetning:"
 
-#: src/protocols/silc/chat.c:78
+#: src/protocols/silc/chat.c:79
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "Kanalen %s eksisterer ikke på nettverket"
 
-#: src/protocols/silc/chat.c:79 src/protocols/silc/chat.c:171
+#: src/protocols/silc/chat.c:80 src/protocols/silc/chat.c:172
 msgid "Channel Information"
 msgstr "Kanalinformasjon"
 
-#: src/protocols/silc/chat.c:80
+#: src/protocols/silc/chat.c:81
 msgid "Cannot get channel information"
 msgstr "Kunne ikke hente kanalinformasjon"
 
-#: src/protocols/silc/chat.c:117
+#: src/protocols/silc/chat.c:118
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>Kanalnavn:</b> %s"
 
-#: src/protocols/silc/chat.c:120
+#: src/protocols/silc/chat.c:121
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>Brukerantall:</b> %d"
 
-#: src/protocols/silc/chat.c:127
+#: src/protocols/silc/chat.c:128
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>Kanalstifter:</b> %s"
 
 # Kan også bety "kanalnøkkel" ->fuzzy
-#: src/protocols/silc/chat.c:136
+#: src/protocols/silc/chat.c:137
 #, fuzzy, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>Kanalkryptering:</b> %s"
 
-#: src/protocols/silc/chat.c:139
+#: src/protocols/silc/chat.c:140
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>Kanal HMAC:</b> %s"
 
-#: src/protocols/silc/chat.c:144
+#: src/protocols/silc/chat.c:145
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>Kanaltema:</b><br> %s"
 
 # Urk... moduser?
-#: src/protocols/silc/chat.c:149
+#: src/protocols/silc/chat.c:150
 #, fuzzy
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Kanalmoduser:</b> "
 
-#: src/protocols/silc/chat.c:162
+#: src/protocols/silc/chat.c:163
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>Stifters nøkkelavtrykk:</b><br>%s"
 
 # må jeg forklare hvorfor fuzzy?
-#: src/protocols/silc/chat.c:163
+#: src/protocols/silc/chat.c:164
 #, fuzzy, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>Stifters nøkkelbabbleavtrykk:</b><br>%s"
 
-#: src/protocols/silc/chat.c:233
+#: src/protocols/silc/chat.c:234
 msgid "Add Channel Public Key"
 msgstr "Legg til kanalens offentlige nøkkel"
 
 #. Add new public key
-#: src/protocols/silc/chat.c:288
+#: src/protocols/silc/chat.c:289
 msgid "Open Public Key..."
 msgstr "Åpne offentlig nøkkel..."
 
-#: src/protocols/silc/chat.c:397
+#: src/protocols/silc/chat.c:398
 msgid "Channel Passphrase"
 msgstr "Kanalens nøkkelsetning"
 
 # Laaaaaangt!
-#: src/protocols/silc/chat.c:404
+#: src/protocols/silc/chat.c:405
 #, fuzzy
 msgid "Channel Public Keys List"
 msgstr "Liste over offentlige nøkler tilknyttet kanalen"
 
-#: src/protocols/silc/chat.c:409
+#: src/protocols/silc/chat.c:410
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -9439,125 +9277,125 @@
 "Dersom digitale signaturer er valgt, så kan kun brukere hvis offentlige "
 "nøkkler er listet bli med."
 
-#: src/protocols/silc/chat.c:418 src/protocols/silc/chat.c:419
-#: src/protocols/silc/chat.c:456 src/protocols/silc/chat.c:457
-#: src/protocols/silc/chat.c:886
+#: src/protocols/silc/chat.c:419 src/protocols/silc/chat.c:420
+#: src/protocols/silc/chat.c:457 src/protocols/silc/chat.c:458
+#: src/protocols/silc/chat.c:891
 msgid "Channel Authentication"
 msgstr "Kanalautentifikasjon"
 
-#: src/protocols/silc/chat.c:420 src/protocols/silc/chat.c:458
+#: src/protocols/silc/chat.c:421 src/protocols/silc/chat.c:459
 msgid "Add / Remove"
 msgstr "Legg til / Fjern"
 
-#: src/protocols/silc/chat.c:575
+#: src/protocols/silc/chat.c:576
 msgid "Group Name"
 msgstr "Gruppenavn"
 
-#: src/protocols/silc/chat.c:579 src/protocols/silc/ops.c:1697
+#: src/protocols/silc/chat.c:580 src/protocols/silc/ops.c:1694
 msgid "Passphrase"
 msgstr "Nøkkelsetning"
 
-#: src/protocols/silc/chat.c:590
+#: src/protocols/silc/chat.c:591
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "Tast inn %s-kanalens private gruppenavn og nøkkelsetning."
 
-#: src/protocols/silc/chat.c:592
+#: src/protocols/silc/chat.c:593
 #, fuzzy
 msgid "Add Channel Private Group"
 msgstr "Legg til privat kanalgruppe"
 
-#: src/protocols/silc/chat.c:719
+#: src/protocols/silc/chat.c:720
 msgid "User Limit"
 msgstr "Brukergrense"
 
-#: src/protocols/silc/chat.c:720
+#: src/protocols/silc/chat.c:721
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
 "Velg brukergrense til kanalen. Velg null for å nullstille brukergrense."
 
-#: src/protocols/silc/chat.c:862
+#: src/protocols/silc/chat.c:863
 msgid "Get Info"
 msgstr "Hent informasjon"
 
-#: src/protocols/silc/chat.c:869
+#: src/protocols/silc/chat.c:871
 msgid "Invite List"
 msgstr "Inviteringsliste"
 
-#: src/protocols/silc/chat.c:873
+#: src/protocols/silc/chat.c:876
 msgid "Ban List"
 msgstr "Forbudsliste"
 
-#: src/protocols/silc/chat.c:880
+#: src/protocols/silc/chat.c:884
 msgid "Add Private Group"
 msgstr "Legg til privat gruppe"
 
-#: src/protocols/silc/chat.c:891
+#: src/protocols/silc/chat.c:897
 msgid "Reset Permanent"
 msgstr "Permanent nullstilling"
 
-#: src/protocols/silc/chat.c:895
+#: src/protocols/silc/chat.c:902
 msgid "Set Permanent"
 msgstr "Permanent valg"
 
-#: src/protocols/silc/chat.c:902
+#: src/protocols/silc/chat.c:910
 msgid "Set User Limit"
 msgstr "Sett brukergrense"
 
-#: src/protocols/silc/chat.c:907
+#: src/protocols/silc/chat.c:916
 msgid "Reset Topic Restriction"
 msgstr "Nullstill temabegrensning"
 
-#: src/protocols/silc/chat.c:911
-msgid "Set Topic Restriction"
-msgstr "Velg temabegrensning"
-
-#: src/protocols/silc/chat.c:917
-msgid "Reset Private Channel"
-msgstr "Nullstill privat kanal"
-
 #: src/protocols/silc/chat.c:921
+msgid "Set Topic Restriction"
+msgstr "Velg temabegrensning"
+
+#: src/protocols/silc/chat.c:928
+msgid "Reset Private Channel"
+msgstr "Nullstill privat kanal"
+
+#: src/protocols/silc/chat.c:933
 msgid "Set Private Channel"
 msgstr "Velg privat kanal"
 
-#: src/protocols/silc/chat.c:927
+#: src/protocols/silc/chat.c:940
 msgid "Reset Secret Channel"
 msgstr "Nullstill hemmelig kanal"
 
-#: src/protocols/silc/chat.c:931
+#: src/protocols/silc/chat.c:945
 msgid "Set Secret Channel"
 msgstr "Velg hemmelig kanal"
 
-#: src/protocols/silc/chat.c:993
+#: src/protocols/silc/chat.c:1008
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "Du er kanalstifter på <l>%s<l>"
 
-#: src/protocols/silc/chat.c:997
+#: src/protocols/silc/chat.c:1012
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "Kanalstifter på <l>%s</l> er <l>%s</l>"
 
-#: src/protocols/silc/chat.c:1056
+#: src/protocols/silc/chat.c:1071
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr "Du må bli med i %s-kanalen før du kan bli med i den private gruppa"
 
-#: src/protocols/silc/chat.c:1058
+#: src/protocols/silc/chat.c:1073
 msgid "Join Private Group"
 msgstr "Bli med i privat gruppe"
 
-#: src/protocols/silc/chat.c:1059
+#: src/protocols/silc/chat.c:1074
 msgid "Cannot join private group"
 msgstr "Kan ikke bli med i privat gruppe"
 
-#: src/protocols/silc/chat.c:1252 src/protocols/silc/silc.c:911
+#: src/protocols/silc/chat.c:1267 src/protocols/silc/silc.c:917
 #, fuzzy
 msgid "Cannot call command"
 msgstr "Kan ikke kalle kommandoen"
 
-#: src/protocols/silc/chat.c:1253 src/protocols/silc/silc.c:912
+#: src/protocols/silc/chat.c:1268 src/protocols/silc/silc.c:918
 msgid "Unknown command"
 msgstr "Ukjent kommando:"
 
@@ -9584,7 +9422,8 @@
 msgstr "Nøkkelavtale feilet"
 
 #: src/protocols/silc/ft.c:102
-msgid "File transfer sessions does not exist"
+#, fuzzy
+msgid "File transfer session does not exist"
 msgstr "Filoverføringsøkt eksisterer ikke"
 
 #: src/protocols/silc/ft.c:206
@@ -9607,105 +9446,105 @@
 msgid "Cannot send file"
 msgstr "Kan ikke sende fil"
 
-#: src/protocols/silc/ops.c:339 src/protocols/silc/ops.c:348
-#: src/protocols/silc/ops.c:357
+#: src/protocols/silc/ops.c:341 src/protocols/silc/ops.c:350
+#: src/protocols/silc/ops.c:359
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s har endrer temaet i <I>%s</I> til: %s"
 
-#: src/protocols/silc/ops.c:423
+#: src/protocols/silc/ops.c:425
 #, fuzzy, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> valgte kanalen <I>%s's</I> modus til: %s"
 
-#: src/protocols/silc/ops.c:427
+#: src/protocols/silc/ops.c:429
 #, fuzzy, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> fjernet alle kanalen <I>%s's</I> modus"
 
-#: src/protocols/silc/ops.c:460
+#: src/protocols/silc/ops.c:462
 #, fuzzy, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> satt <I>%s's</I> modus til: %s"
 
-#: src/protocols/silc/ops.c:468
+#: src/protocols/silc/ops.c:470
 #, fuzzy, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> fjernet alle <I>%s's</I> modus"
 
-#: src/protocols/silc/ops.c:497
+#: src/protocols/silc/ops.c:499
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "Du har blitt sparket av <I>%s</I> av <I>%s</I> (%s)"
 
-#: src/protocols/silc/ops.c:527 src/protocols/silc/ops.c:532
-#: src/protocols/silc/ops.c:537
+#: src/protocols/silc/ops.c:529 src/protocols/silc/ops.c:534
+#: src/protocols/silc/ops.c:539
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "Du har blitt drept av %s (%s)"
 
-#: src/protocols/silc/ops.c:558 src/protocols/silc/ops.c:563
-#: src/protocols/silc/ops.c:568
+#: src/protocols/silc/ops.c:560 src/protocols/silc/ops.c:565
+#: src/protocols/silc/ops.c:570
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "Dreåt av %s (%s)"
 
-#: src/protocols/silc/ops.c:614
+#: src/protocols/silc/ops.c:616
 #, fuzzy
 msgid "Server signoff"
 msgstr "Logge av tjener"
 
-#: src/protocols/silc/ops.c:801
+#: src/protocols/silc/ops.c:803
 msgid "Personal Information"
 msgstr "Personlig informasjon"
 
-#: src/protocols/silc/ops.c:824
+#: src/protocols/silc/ops.c:826
 msgid "Birth Day"
 msgstr "Fødselsdag"
 
-#: src/protocols/silc/ops.c:828
+#: src/protocols/silc/ops.c:830
 msgid "Job Title"
 msgstr "Tittel"
 
-#: src/protocols/silc/ops.c:832
+#: src/protocols/silc/ops.c:834
 msgid "Job Role"
 msgstr "Rolle"
 
-#: src/protocols/silc/ops.c:836
+#: src/protocols/silc/ops.c:838
 msgid "Organization"
 msgstr "Organisasjon"
 
-#: src/protocols/silc/ops.c:840
+#: src/protocols/silc/ops.c:842
 msgid "Unit"
 msgstr "Enhet"
 
-#: src/protocols/silc/ops.c:859
+#: src/protocols/silc/ops.c:861
 msgid "EMail"
 msgstr "E-post"
 
-#: src/protocols/silc/ops.c:864
+#: src/protocols/silc/ops.c:866
 msgid "Note"
 msgstr "Merknad"
 
-#: src/protocols/silc/ops.c:912
+#: src/protocols/silc/ops.c:914
 msgid "Join Chat"
 msgstr "Bli med i samtalegruppe"
 
-#: src/protocols/silc/ops.c:1068 src/protocols/silc/ops.c:1139
+#: src/protocols/silc/ops.c:1070 src/protocols/silc/ops.c:1140
 msgid "Public Key Fingerprint"
 msgstr "Offentlig nøkkelavtrykk"
 
 # Veldig, veldig fuzzy....
-#: src/protocols/silc/ops.c:1069 src/protocols/silc/ops.c:1140
+#: src/protocols/silc/ops.c:1071 src/protocols/silc/ops.c:1141
 #, fuzzy
 msgid "Public Key Babbleprint"
 msgstr "Offentlig nøkkelbabbelavtrykk"
 
-#: src/protocols/silc/ops.c:1082
+#: src/protocols/silc/ops.c:1084
 msgid "More..."
 msgstr "Mer..."
 
-#: src/protocols/silc/ops.c:1155 src/protocols/silc/silc.c:800
+#: src/protocols/silc/ops.c:1155 src/protocols/silc/silc.c:805
 #, fuzzy
 msgid "Detach From Server"
 msgstr "Løsne fra tjener"
@@ -9719,43 +9558,43 @@
 msgid "Cannot set topic"
 msgstr "Kan ikke velge tema"
 
-#: src/protocols/silc/ops.c:1204
+#: src/protocols/silc/ops.c:1198
 msgid "Failed to change nickname"
 msgstr "Misslykkets i å endre kallenavn"
 
-#: src/protocols/silc/ops.c:1241 src/protocols/silc/ops.c:1252
+#: src/protocols/silc/ops.c:1246
 msgid "Roomlist"
 msgstr "Romliste"
 
-#: src/protocols/silc/ops.c:1241 src/protocols/silc/ops.c:1252
+#: src/protocols/silc/ops.c:1246
 msgid "Cannot get room list"
 msgstr "Kunne ikke hente romliste"
 
-#: src/protocols/silc/ops.c:1297
+#: src/protocols/silc/ops.c:1291
 msgid "No public key was received"
 msgstr "Ingen offentlig nøkkel ble mottatt"
 
-#: src/protocols/silc/ops.c:1310 src/protocols/silc/ops.c:1324
+#: src/protocols/silc/ops.c:1304 src/protocols/silc/ops.c:1317
 msgid "Server Information"
 msgstr "Tjenerinformasjon"
 
-#: src/protocols/silc/ops.c:1311
+#: src/protocols/silc/ops.c:1305
 msgid "Cannot get server information"
 msgstr "Kan ikke hente tjenerinformasjon"
 
-#: src/protocols/silc/ops.c:1342 src/protocols/silc/ops.c:1351
+#: src/protocols/silc/ops.c:1334 src/protocols/silc/ops.c:1343
 msgid "Server Statistics"
 msgstr "Tjenerstatistikk"
 
-#: src/protocols/silc/ops.c:1343
+#: src/protocols/silc/ops.c:1335
 msgid "Cannot get server statistics"
 msgstr "Kan ikke hente tjenerstatistikk"
 
-#: src/protocols/silc/ops.c:1352
+#: src/protocols/silc/ops.c:1344
 msgid "No server statistics available"
 msgstr "Ingen tjenerstatistikk tilgjengelig"
 
-#: src/protocols/silc/ops.c:1374
+#: src/protocols/silc/ops.c:1366
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -9790,37 +9629,37 @@
 "Totalt antall tjeneroperatører: %d\n"
 "Totalt antall ruteroperatører: %d\n"
 
-#: src/protocols/silc/ops.c:1397
+#: src/protocols/silc/ops.c:1389
 msgid "Network Statistics"
 msgstr "Nettverksstatistikk"
 
-#: src/protocols/silc/ops.c:1405 src/protocols/silc/ops.c:1410
+#: src/protocols/silc/ops.c:1397 src/protocols/silc/ops.c:1402
 msgid "Ping"
 msgstr "Ping"
 
-#: src/protocols/silc/ops.c:1405
+#: src/protocols/silc/ops.c:1397
 msgid "Ping failed"
 msgstr "Ping mislyktes"
 
+#: src/protocols/silc/ops.c:1402
+msgid "Ping reply received from server"
+msgstr "Svar på ping motatt fra tjener"
+
 #: src/protocols/silc/ops.c:1410
-msgid "Ping reply received from server"
-msgstr "Svar på ping motatt fra tjener"
-
-#: src/protocols/silc/ops.c:1418
 #, fuzzy
 msgid "Could not kill user"
 msgstr "Kunne ikke drepe bruker"
 
-#: src/protocols/silc/ops.c:1499
+#: src/protocols/silc/ops.c:1494
 msgid "Error during connecting to SILC Server"
 msgstr "Feil under tilkopling til SILC-tjener"
 
-#: src/protocols/silc/ops.c:1504
+#: src/protocols/silc/ops.c:1499
 msgid "Key Exchange failed"
 msgstr "Nøkkelutveksling feilet"
 
 # Er det virkelig "kople til på nytt"?
-#: src/protocols/silc/ops.c:1513
+#: src/protocols/silc/ops.c:1508
 #, fuzzy
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
@@ -9828,69 +9667,69 @@
 "Fortsettelse av løsnet økt misslyktes. Trykk Kople til på nytt for å lage en "
 "ny forbindelse"
 
-#: src/protocols/silc/ops.c:1548
+#: src/protocols/silc/ops.c:1543
 msgid "Disconnected by server"
 msgstr "Frakoplet av tjener"
 
-#: src/protocols/silc/ops.c:1608 src/protocols/silc/ops.c:1655
-#: src/protocols/silc/silc.c:178
+#: src/protocols/silc/ops.c:1605 src/protocols/silc/ops.c:1652
+#: src/protocols/silc/silc.c:194
 msgid "Resuming session"
 msgstr "Fortsetter økt"
 
-#: src/protocols/silc/ops.c:1610
+#: src/protocols/silc/ops.c:1607
 msgid "Authenticating connection"
 msgstr "Autentiserer forbindelse"
 
-#: src/protocols/silc/ops.c:1657
+#: src/protocols/silc/ops.c:1654
 msgid "Verifying server public key"
 msgstr "Bekrefter offentlig tjenernøkkel"
 
-#: src/protocols/silc/ops.c:1698
+#: src/protocols/silc/ops.c:1695
 msgid "Passphrase required"
 msgstr "Nøkkelsetning kreves"
 
-#: src/protocols/silc/ops.c:1727
+#: src/protocols/silc/ops.c:1724
 #, fuzzy
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Feil versjon, vennligst oppgrader din klient"
 
-#: src/protocols/silc/ops.c:1730
+#: src/protocols/silc/ops.c:1727
 msgid "Failure: Remote does not trust/support your public key"
 msgstr ""
 "Fjernliggende part støtter eller stoler ikke på ikke din offentlige nøkkel"
 
-#: src/protocols/silc/ops.c:1733
+#: src/protocols/silc/ops.c:1730
 #, fuzzy
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Fjerntliggende part støtter ikke foreslått KE-gruppe"
 
-#: src/protocols/silc/ops.c:1736
+#: src/protocols/silc/ops.c:1733
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Fjerntliggende part støtter ikke foreslått krypteringsmetode"
 
-#: src/protocols/silc/ops.c:1739
+#: src/protocols/silc/ops.c:1736
 #, fuzzy
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Fjerntliggende part støtter ikke foreslått PKCS"
 
-#: src/protocols/silc/ops.c:1742
+#: src/protocols/silc/ops.c:1739
 #, fuzzy
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Fjerntliggende part støtter ikke foreslått nøkkelfunksjon"
 
-#: src/protocols/silc/ops.c:1745
+#: src/protocols/silc/ops.c:1742
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Fjerntliggende part støtter ikke foreslått HMAC"
 
-#: src/protocols/silc/ops.c:1747
+#: src/protocols/silc/ops.c:1744
 msgid "Failure: Incorrect signature"
 msgstr "Ugyldig signatur"
 
-#: src/protocols/silc/ops.c:1749
+#: src/protocols/silc/ops.c:1746
 msgid "Failure: Invalid cookie"
 msgstr "Ugyldig informasjonskapsel"
 
-#: src/protocols/silc/ops.c:1760
+#: src/protocols/silc/ops.c:1757
 msgid "Failure: Authentication failed"
 msgstr "Autentisering feilet"
 
@@ -9929,37 +9768,37 @@
 msgid "Unsupported public key type"
 msgstr "Ustøttet offentlig nøkkeltype"
 
-#: src/protocols/silc/silc.c:138
+#: src/protocols/silc/silc.c:154
 msgid "Connection failed"
 msgstr "Tilkopling feilet"
 
-#: src/protocols/silc/silc.c:170
+#: src/protocols/silc/silc.c:186
 msgid "Cannot initialize SILC Client connection"
 msgstr "Kan ikke klargjøre SILC klientforbindelse"
 
-#: src/protocols/silc/silc.c:181
+#: src/protocols/silc/silc.c:197
 msgid "Performing key exchange"
 msgstr "Gjennomfører nøkkelutveksling"
 
-#: src/protocols/silc/silc.c:254
+#: src/protocols/silc/silc.c:270
 msgid "Out of memory"
 msgstr "Tom for minne"
 
 #. Progress
-#: src/protocols/silc/silc.c:293
+#: src/protocols/silc/silc.c:309
 msgid "Connecting to SILC Server"
 msgstr "Kobler til SILC-tjener"
 
-#: src/protocols/silc/silc.c:625
+#: src/protocols/silc/silc.c:630
 msgid "Your Current Mood"
 msgstr "Dit nåværende humør"
 
-#: src/protocols/silc/silc.c:627
+#: src/protocols/silc/silc.c:632
 msgid "Normal"
 msgstr "Normal"
 
 # mer eller mindre direkte oversatt. UGLY!!
-#: src/protocols/silc/silc.c:652
+#: src/protocols/silc/silc.c:657
 #, fuzzy
 msgid ""
 "\n"
@@ -9968,46 +9807,46 @@
 "\n"
 "Dine foretrukkne kontaktmetoder"
 
-#: src/protocols/silc/silc.c:660 src/protocols/silc/util.c:517
+#: src/protocols/silc/silc.c:665 src/protocols/silc/util.c:517
 msgid "SMS"
 msgstr "SMS"
 
-#: src/protocols/silc/silc.c:662 src/protocols/silc/util.c:519
+#: src/protocols/silc/silc.c:667 src/protocols/silc/util.c:519
 msgid "MMS"
 msgstr "MMS"
 
-#: src/protocols/silc/silc.c:664 src/protocols/silc/util.c:521
+#: src/protocols/silc/silc.c:669 src/protocols/silc/util.c:521
 msgid "Video Conferencing"
 msgstr "Videokonferanse"
 
-#: src/protocols/silc/silc.c:669
+#: src/protocols/silc/silc.c:674
 msgid "Your Current Status"
 msgstr "Din nåværende status"
 
-#: src/protocols/silc/silc.c:676
+#: src/protocols/silc/silc.c:681
 #, fuzzy
 msgid "Online Services"
 msgstr "Tjenester på nett"
 
-#: src/protocols/silc/silc.c:679
+#: src/protocols/silc/silc.c:684
 msgid "Let others see what services you are using"
 msgstr "La andre se hvilke tjenester du bruker"
 
-#: src/protocols/silc/silc.c:685
+#: src/protocols/silc/silc.c:690
 msgid "Let others see what computer you are using"
 msgstr "La andre se hvilken datamaskin du bruker"
 
 # VCard?!? WFT?
-#: src/protocols/silc/silc.c:692
+#: src/protocols/silc/silc.c:697
 #, fuzzy
 msgid "Your VCard File"
 msgstr "Din VCard-fil"
 
-#: src/protocols/silc/silc.c:705 src/protocols/silc/silc.c:706
+#: src/protocols/silc/silc.c:710 src/protocols/silc/silc.c:711
 msgid "User Online Status Attributes"
 msgstr ""
 
-#: src/protocols/silc/silc.c:707
+#: src/protocols/silc/silc.c:712
 msgid ""
 "You can let other users see your online status information and your personal "
 "information. Please fill the information you would like other users to see "
@@ -10017,214 +9856,210 @@
 "personlige informasjon. Fyll inn informasjonen du ønsker at andre skal se om "
 "deg."
 
-#: src/protocols/silc/silc.c:747 src/protocols/silc/silc.c:753
-#: src/protocols/silc/silc.c:1160
+#: src/protocols/silc/silc.c:752 src/protocols/silc/silc.c:758
+#: src/protocols/silc/silc.c:1162
 #, fuzzy
 msgid "Message of the Day"
 msgstr "Dagens melding"
 
-#: src/protocols/silc/silc.c:747
+#: src/protocols/silc/silc.c:752
 #, fuzzy
 msgid "No Message of the Day available"
 msgstr "Ingen dagens melding er tilgjengelig"
 
-#: src/protocols/silc/silc.c:748 src/protocols/silc/silc.c:1155
+#: src/protocols/silc/silc.c:753 src/protocols/silc/silc.c:1157
 #, fuzzy
 msgid "There is no Message of the Day associated with this connection"
 msgstr "Det er ingen dagens melding assosiert med denne tilkoblingen."
 
-#: src/protocols/silc/silc.c:795
+#: src/protocols/silc/silc.c:800
 #, fuzzy
 msgid "Online Status"
 msgstr "Påloggningsstatus"
 
-#: src/protocols/silc/silc.c:804
+#: src/protocols/silc/silc.c:809
 msgid "View Message of the Day"
 msgstr "Vis dagens melding"
 
-#: src/protocols/silc/silc.c:876
+#: src/protocols/silc/silc.c:882
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "Brukeren <l>%s<l> er ikke tilstedeværende på nettverket"
 
-#: src/protocols/silc/silc.c:985
-msgid "Failed to leave channel"
-msgstr "Kunne ikke forlate kanalen"
-
-#: src/protocols/silc/silc.c:1031
+#: src/protocols/silc/silc.c:1033
 msgid "Topic too long"
 msgstr "Temaet er for langt"
 
-#: src/protocols/silc/silc.c:1112
+#: src/protocols/silc/silc.c:1114
 msgid "You must specify a nick"
 msgstr "Du må angi et kallenavn"
 
-#: src/protocols/silc/silc.c:1214
+#: src/protocols/silc/silc.c:1216
 #, c-format
 msgid "channel %s not found"
 msgstr "Kanalen %s ble ikke funnet"
 
-#: src/protocols/silc/silc.c:1219
+#: src/protocols/silc/silc.c:1221
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "Kanalmodus for %s: %s"
 
-#: src/protocols/silc/silc.c:1221
+#: src/protocols/silc/silc.c:1223
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "Ingen kanalmodus er valgt på %s"
 
-#: src/protocols/silc/silc.c:1234
+#: src/protocols/silc/silc.c:1236
 #, fuzzy, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "Klarte ikke velge cmodes for %s"
 
-#: src/protocols/silc/silc.c:1264
+#: src/protocols/silc/silc.c:1266
 #, c-format
 msgid "Unknown command: %s, (may be a Gaim bug)"
 msgstr "Ukjent kommando: %s, er kansje en lus i Gaim."
 
-#: src/protocols/silc/silc.c:1327
+#: src/protocols/silc/silc.c:1329
 msgid "part [channel]:  Leave the chat"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1331
+#: src/protocols/silc/silc.c:1333
 msgid "leave [channel]:  Leave the chat"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1335
+#: src/protocols/silc/silc.c:1337
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1340
+#: src/protocols/silc/silc.c:1342
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1344
+#: src/protocols/silc/silc.c:1346
 msgid "list:  List channels on this network"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1348
+#: src/protocols/silc/silc.c:1350
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1352 src/protocols/zephyr/zephyr.c:2478
+#: src/protocols/silc/silc.c:1354 src/protocols/zephyr/zephyr.c:2597
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1356
+#: src/protocols/silc/silc.c:1358
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1360
+#: src/protocols/silc/silc.c:1362
 msgid "motd:  View the server's Message Of The Day"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1364
+#: src/protocols/silc/silc.c:1366
 msgid "detach:  Detach this session"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1368
+#: src/protocols/silc/silc.c:1370
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1372
+#: src/protocols/silc/silc.c:1374
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1378
+#: src/protocols/silc/silc.c:1380
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1382
+#: src/protocols/silc/silc.c:1384
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1386
+#: src/protocols/silc/silc.c:1388
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1390
+#: src/protocols/silc/silc.c:1392
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1394
+#: src/protocols/silc/silc.c:1396
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1398
+#: src/protocols/silc/silc.c:1400
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1402
+#: src/protocols/silc/silc.c:1404
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1406
+#: src/protocols/silc/silc.c:1408
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1410
+#: src/protocols/silc/silc.c:1412
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1414
+#: src/protocols/silc/silc.c:1416
 msgid "info [server]:  View server administrative details"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1418
+#: src/protocols/silc/silc.c:1420
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1422
+#: src/protocols/silc/silc.c:1424
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1426
+#: src/protocols/silc/silc.c:1428
 msgid "stats:  View server and network statistics"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1430
+#: src/protocols/silc/silc.c:1432
 msgid "ping:  Send PING to the connected server"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1435
+#: src/protocols/silc/silc.c:1437
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1439
+#: src/protocols/silc/silc.c:1441
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1451
+#: src/protocols/silc/silc.c:1453
 msgid "Instant Messages"
 msgstr "Direktemeldinger"
 
-#: src/protocols/silc/silc.c:1456
+#: src/protocols/silc/silc.c:1458
 msgid "Digitally sign all IM messages"
 msgstr "Signer alle direktemeldinger digitalt"
 
-#: src/protocols/silc/silc.c:1461
+#: src/protocols/silc/silc.c:1463
 msgid "Verify all IM message signatures"
 msgstr "Bekreft alle direktemeldingssignaturer"
 
-#: src/protocols/silc/silc.c:1464
+#: src/protocols/silc/silc.c:1466
 msgid "Channel Messages"
 msgstr "Kanalmeldinger"
 
-#: src/protocols/silc/silc.c:1469
+#: src/protocols/silc/silc.c:1471
 msgid "Digitally sign all channel messages"
 msgstr "Signer alle kanalmeldinger digitalt"
 
-#: src/protocols/silc/silc.c:1474
+#: src/protocols/silc/silc.c:1476
 msgid "Verify all channel message signatures"
 msgstr "Bekreft alle kanalmeldingssignaturer"
 
@@ -10237,44 +10072,44 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/silc/silc.c:1563
+#: src/protocols/silc/silc.c:1564
 msgid "SILC Protocol Plugin"
 msgstr "SILC-protokolltillegg"
 
 #. *  description
-#: src/protocols/silc/silc.c:1565
+#: src/protocols/silc/silc.c:1566
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1599
+#: src/protocols/silc/silc.c:1600
 #, fuzzy
 msgid "Public Key file"
 msgstr "Offentlig nøkkel fil"
 
-#: src/protocols/silc/silc.c:1603
+#: src/protocols/silc/silc.c:1604
 #, fuzzy
 msgid "Private Key file"
 msgstr "Privatnøkkel fil"
 
-#: src/protocols/silc/silc.c:1606
+#: src/protocols/silc/silc.c:1607
 #, fuzzy
 msgid "Public key authentication"
 msgstr "Offentlig nøkkel autentifikasjon"
 
-#: src/protocols/silc/silc.c:1610
+#: src/protocols/silc/silc.c:1611
 #, fuzzy
 msgid "Reject watching by other users"
 msgstr "Avvis overvåkning fra andre brukere"
 
-#: src/protocols/silc/silc.c:1613
+#: src/protocols/silc/silc.c:1614
 msgid "Block invites"
 msgstr "Blokker invitasjoner"
 
-#: src/protocols/silc/silc.c:1616
+#: src/protocols/silc/silc.c:1617
 msgid "Block IMs without Key Exchange"
 msgstr "Blokker direktemeldinger uten nøkkelutveksling"
 
-#: src/protocols/silc/silc.c:1619
+#: src/protocols/silc/silc.c:1620
 #, fuzzy
 msgid "Reject online status attribute requests"
 msgstr "Avvis spørsmål om tilkoplingsstatus"
@@ -10364,115 +10199,120 @@
 msgid "Terminal"
 msgstr "Terminal"
 
-#: src/protocols/toc/toc.c:137
+#: src/protocols/toc/toc.c:139
 #, c-format
 msgid "Looking up %s"
 msgstr "Slår opp %s"
 
-#: src/protocols/toc/toc.c:198
+#: src/protocols/toc/toc.c:148
+#, c-format
+msgid "Connect to %s failed"
+msgstr "Tilkobling til %s feilet"
+
+#: src/protocols/toc/toc.c:200
 #, c-format
 msgid "Signon: %s"
 msgstr "Pålogget: %s"
 
-#: src/protocols/toc/toc.c:480
+#: src/protocols/toc/toc.c:482
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Kunne ikke skrive fil %s."
 
-#: src/protocols/toc/toc.c:483
+#: src/protocols/toc/toc.c:485
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Kunne ikke lese fil %s."
 
-#: src/protocols/toc/toc.c:486
+#: src/protocols/toc/toc.c:488
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Beskjeden er for lang, siste %s bytes kom ikke med."
 
-#: src/protocols/toc/toc.c:489
+#: src/protocols/toc/toc.c:491
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s er ikke pålogget."
 
-#: src/protocols/toc/toc.c:492
+#: src/protocols/toc/toc.c:494
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Advarsel %s er ikke tillatt."
 
-#: src/protocols/toc/toc.c:495
+#: src/protocols/toc/toc.c:497
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "En beskjed ble forkastet. Du overskrider tjenerens fartsgrense."
 
-#: src/protocols/toc/toc.c:498
+#: src/protocols/toc/toc.c:500
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "Snakkerom i %s er ikke tilgjengelig."
 
-#: src/protocols/toc/toc.c:501
+#: src/protocols/toc/toc.c:503
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Du sender beskjeder for raskt til %s."
 
-#: src/protocols/toc/toc.c:504
+#: src/protocols/toc/toc.c:506
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "Du gikk glipp av en beskjed fra %s fordi den var for stor."
 
-#: src/protocols/toc/toc.c:507
+#: src/protocols/toc/toc.c:509
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "Du gikk glipp av en beskjed fra %s fordi den ble sendt for raskt."
 
-#: src/protocols/toc/toc.c:510
+#: src/protocols/toc/toc.c:512
 msgid "Failure."
 msgstr "Feil."
 
-#: src/protocols/toc/toc.c:513
+#: src/protocols/toc/toc.c:515
 msgid "Too many matches."
 msgstr "For mange treff."
 
-#: src/protocols/toc/toc.c:516
+#: src/protocols/toc/toc.c:518
 msgid "Need more qualifiers."
 msgstr "Trenger flere parametre."
 
-#: src/protocols/toc/toc.c:519
+#: src/protocols/toc/toc.c:521
 msgid "Dir service temporarily unavailable."
 msgstr "Katalogtjenesten er midlertidig utilgjengelig."
 
-#: src/protocols/toc/toc.c:522
+#: src/protocols/toc/toc.c:524
 msgid "Email lookup restricted."
 msgstr "E-postoppslag er begrenset."
 
-#: src/protocols/toc/toc.c:525
+#: src/protocols/toc/toc.c:527
 msgid "Keyword ignored."
 msgstr "Nøkkelord ignorert."
 
-#: src/protocols/toc/toc.c:528
+#: src/protocols/toc/toc.c:530
 msgid "No keywords."
 msgstr "Ingen nøkkelord."
 
-#: src/protocols/toc/toc.c:531
+#: src/protocols/toc/toc.c:533
 msgid "User has no directory information."
 msgstr "Brukeren har ingen kataloginformasjon."
 
-#: src/protocols/toc/toc.c:535
+#: src/protocols/toc/toc.c:537
 msgid "Country not supported."
 msgstr "Land ikke støttet."
 
-#: src/protocols/toc/toc.c:538
+#: src/protocols/toc/toc.c:540
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Ukjent feil: %s."
 
-#: src/protocols/toc/toc.c:544
+#: src/protocols/toc/toc.c:546
 msgid "The service is temporarily unavailable."
 msgstr "Tjenesten er midlertidig utilgjengelig."
 
-#: src/protocols/toc/toc.c:547
+#: src/protocols/toc/toc.c:549
 msgid "Your warning level is currently too high to log in."
 msgstr "Advarselsnivået ditt er satt for høyt for å logge inn."
 
-#: src/protocols/toc/toc.c:550
+#: src/protocols/toc/toc.c:552
 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."
@@ -10480,37 +10320,42 @@
 "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/toc/toc.c:552
+#: src/protocols/toc/toc.c:554
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "En ukjent påloggingsfeil har inntruffet: %s."
 
-#: src/protocols/toc/toc.c:555
+#: src/protocols/toc/toc.c:557
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "En ukjent feil, %d, har inntruffet. Info: %s"
 
-#: src/protocols/toc/toc.c:576
+#: src/protocols/toc/toc.c:584
+#, fuzzy
+msgid "Invalid Groupname"
+msgstr "Ugyldig gruppe"
+
+#: src/protocols/toc/toc.c:668
 msgid "Connection Closed"
 msgstr "Tilkoblingen lukket"
 
-#: src/protocols/toc/toc.c:616
+#: src/protocols/toc/toc.c:708
 msgid "Waiting for reply..."
 msgstr "Venter på svar..."
 
-#: src/protocols/toc/toc.c:695
+#: src/protocols/toc/toc.c:786
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC har kommet tilbake fra pausen. Du kan nå sende beskjeder igjen."
 
-#: src/protocols/toc/toc.c:892
+#: src/protocols/toc/toc.c:989
 msgid "Password Change Successful"
 msgstr "Passordet er endret."
 
-#: src/protocols/toc/toc.c:896
+#: src/protocols/toc/toc.c:993
 msgid "TOC has sent a PAUSE command."
 msgstr "TOC har sendt en PAUSE-kommando."
 
-#: src/protocols/toc/toc.c:897
+#: src/protocols/toc/toc.c:994
 msgid ""
 "When this happens, TOC ignores any messages sent to it, and may kick you off "
 "if you send a message. Gaim will prevent anything from going through. This "
@@ -10520,44 +10365,44 @@
 "kanskje kaste deg ut hvis du prøver å sende. Gaim vil derfor stoppe alle "
 "utsendelser. Dette er bare midlertidig, vennligst vent."
 
-#: src/protocols/toc/toc.c:1423
+#: src/protocols/toc/toc.c:1549
 msgid "Get Dir Info"
 msgstr "Hent kataloginfo"
 
-#: src/protocols/toc/toc.c:1559
+#: src/protocols/toc/toc.c:1689
 msgid "Set Dir Info"
 msgstr "Lagre kataloginfo"
 
-#: src/protocols/toc/toc.c:1681
+#: src/protocols/toc/toc.c:1811
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "Kunne ikke åpne %s for skriving!"
 
-#: src/protocols/toc/toc.c:1717
+#: src/protocols/toc/toc.c:1847
 msgid "File transfer failed; other side probably canceled."
 msgstr "Filoverføringen mislyktes - sannsynligvis avbrutt på den andre siden."
 
-#: src/protocols/toc/toc.c:1762 src/protocols/toc/toc.c:1802
-#: src/protocols/toc/toc.c:1926 src/protocols/toc/toc.c:2014
+#: src/protocols/toc/toc.c:1892 src/protocols/toc/toc.c:1932
+#: src/protocols/toc/toc.c:2056 src/protocols/toc/toc.c:2144
 msgid "Could not connect for transfer."
 msgstr "Kunne ikke koble til for dataoverføring."
 
-#: src/protocols/toc/toc.c:1959
+#: src/protocols/toc/toc.c:2089
 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:2059
+#: src/protocols/toc/toc.c:2189
 msgid "Gaim - Save As..."
 msgstr "Gaim - Lagre som..."
 
-#: src/protocols/toc/toc.c:2093
+#: src/protocols/toc/toc.c:2223
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] "%s forespør %s om å ta imot %d fil: %s (%.2f %s)%s%s"
 msgstr[1] "%s forespør %s om å ta imot %d filer: %s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:2100
+#: src/protocols/toc/toc.c:2230
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s venter på at du skal sende dem en fil"
@@ -10572,128 +10417,52 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/toc/toc.c:2187 src/protocols/toc/toc.c:2189
+#: src/protocols/toc/toc.c:2316 src/protocols/toc/toc.c:2318
 msgid "TOC Protocol Plugin"
 msgstr "TOC-protokolltillegg"
 
-#: src/protocols/toc/toc.c:2208
+#: src/protocols/toc/toc.c:2337
 msgid "TOC host"
 msgstr "TOC-adresse:"
 
-#: src/protocols/toc/toc.c:2212
+#: src/protocols/toc/toc.c:2341
 msgid "TOC port"
 msgstr "TOC-port:"
 
-#. Basic Profile group.
-#: src/protocols/trepia/trepia.c:264
-msgid "Basic Profile"
-msgstr "Grunnleggende profil"
-
-#. E-Mail Address
-#: src/protocols/trepia/trepia.c:295
-msgid "E-Mail Address"
-msgstr "E-postadresse"
-
-#: src/protocols/trepia/trepia.c:301
-msgid "Profile Information"
-msgstr "Profilinformasjon"
-
-#. Instant Messagers
-#: src/protocols/trepia/trepia.c:307
-msgid "Instant Messagers"
-msgstr ""
-
-#. AIM
-#: src/protocols/trepia/trepia.c:311
-msgid "AIM"
-msgstr "AIM"
-
-#. ICQ
-#: src/protocols/trepia/trepia.c:315
-msgid "ICQ UIN"
-msgstr "ICQ UIN"
-
-#. MSN
-#: src/protocols/trepia/trepia.c:319
-msgid "MSN"
-msgstr "MSN"
-
-#. Yahoo
-#: src/protocols/trepia/trepia.c:323
-msgid "Yahoo"
-msgstr "Yahoo"
-
-#. I'm From
-#: src/protocols/trepia/trepia.c:328
-msgid "I'm From"
-msgstr "Jeg er fra"
-
-#. Call the dialog.
-#: src/protocols/trepia/trepia.c:345
-msgid "Set your Trepia profile data."
-msgstr "Skriv inn data i din Trepia-profil."
-
-#: src/protocols/trepia/trepia.c:425
-msgid "Profile"
-msgstr "Profil"
-
-#: src/protocols/trepia/trepia.c:439
-msgid "Set Profile"
-msgstr "Sett profil"
-
-#: src/protocols/trepia/trepia.c:476
-msgid "Visit Homepage"
-msgstr "Besøk hjemmeside"
-
-#: src/protocols/trepia/trepia.c:822 src/protocols/trepia/trepia.c:825
-msgid "Local Users"
-msgstr "Lokale brukere"
-
-#: src/protocols/trepia/trepia.c:1028
-msgid "Logging in"
-msgstr "Logger på"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: src/protocols/trepia/trepia.c:1275 src/protocols/trepia/trepia.c:1277
-msgid "Trepia Protocol Plugin"
-msgstr "Trepia-protokolltillegg"
-
-#: src/protocols/yahoo/yahoo.c:419
-msgid ""
-"You have been logged off as you have logged in on a different machine or "
-"device."
-msgstr "Du har blitt logget av, da du har logget inn et annet sted"
-
-#: src/protocols/yahoo/yahoo.c:912
+#: src/protocols/yahoo/yahoo.c:706
 msgid "Your Yahoo! message did not get sent."
 msgstr "Din Yahoo!-beskjed ble ikke sendt."
 
-#: src/protocols/yahoo/yahoo.c:936 src/protocols/yahoo/yahoo.c:3437
+#: src/protocols/yahoo/yahoo.c:750 src/protocols/yahoo/yahoo.c:3481
 msgid "Buzz!!"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:981
+#: src/protocols/yahoo/yahoo.c:795
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Yahoo! systemmelding for %s:"
 
-#: src/protocols/yahoo/yahoo.c:1048
+#. TODO: this is almost exactly the same as what MSN does,
+#. * this should probably be moved to the core.
+#.
+#: src/protocols/yahoo/yahoo.c:885
+#, fuzzy, c-format
+msgid "The user %s wants to add %s to his or her buddy list%s%s."
+msgstr "Brukeren %s ønsker å legge til %s i kontaktlisten sin."
+
+#: src/protocols/yahoo/yahoo.c:891
+#, fuzzy
+msgid "Message (optional) :"
+msgstr "Beskjedvarsling"
+
+#: src/protocols/yahoo/yahoo.c:933
 #, 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:1051
+#: src/protocols/yahoo/yahoo.c:936
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -10702,11 +10471,11 @@
 "%s har (tilbakevirkende) avslått din forespørsel om å bli lagt til i "
 "kontaktlisten med følgende grunn: %s."
 
-#: src/protocols/yahoo/yahoo.c:1054
+#: src/protocols/yahoo/yahoo.c:939
 msgid "Add buddy rejected"
 msgstr "Legge til kontakt avslått"
 
-#: src/protocols/yahoo/yahoo.c:1815
+#: src/protocols/yahoo/yahoo.c:1681
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10717,11 +10486,11 @@
 "versjonen av Gaim vil antakeligvis ikke være i stand til å logge på Yahoo. "
 "Sjekk %s for oppdateringer."
 
-#: src/protocols/yahoo/yahoo.c:1818
+#: src/protocols/yahoo/yahoo.c:1684
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo!-autentisering feilet"
 
-#: src/protocols/yahoo/yahoo.c:1890
+#: src/protocols/yahoo/yahoo.c:1757
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -10730,19 +10499,19 @@
 "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:1893
+#: src/protocols/yahoo/yahoo.c:1760
 msgid "Ignore buddy?"
 msgstr "Ignorere kontakt?"
 
-#: src/protocols/yahoo/yahoo.c:1927
+#: src/protocols/yahoo/yahoo.c:1794
 msgid "Invalid username."
 msgstr "Ugyldig brukernavn,"
 
-#: src/protocols/yahoo/yahoo.c:1938
+#: src/protocols/yahoo/yahoo.c:1805
 msgid "Normal authentication failed!"
 msgstr "Normal autentisering feilet"
 
-#: src/protocols/yahoo/yahoo.c:1939
+#: src/protocols/yahoo/yahoo.c:1806
 msgid ""
 "The normal authentication method has failed. This means either your password "
 "is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
@@ -10755,106 +10524,129 @@
 "autentifikasjon, noe som vil føre til redusert funksjonalitet og færre "
 "muligheter"
 
-#: src/protocols/yahoo/yahoo.c:1947
+#: src/protocols/yahoo/yahoo.c:1814
 msgid "Incorrect password."
 msgstr "Feil passord."
 
-#: src/protocols/yahoo/yahoo.c:1950
+#: src/protocols/yahoo/yahoo.c:1817
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "Din konto har blitt låst, vennligst logg inn på Yahoo! nettsiden"
 
-#: src/protocols/yahoo/yahoo.c:1953
+#: src/protocols/yahoo/yahoo.c:1820
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Ukjent feilkode %d.\n"
 "Om du logger inn på Yahoo! sin nettside, kan dette  kansje løse problemet"
 
-#: src/protocols/yahoo/yahoo.c:2007
+#: src/protocols/yahoo/yahoo.c:1874
 #, 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:2010
+#: src/protocols/yahoo/yahoo.c:1877
 msgid "Could not add buddy to server list"
 msgstr "Kunne ikke legge kontakt til tjenerens kontaktliste"
 
-#: src/protocols/yahoo/yahoo.c:2247 src/protocols/yahoo/yahoo.c:2395
-#: src/protocols/yahoo/ycht.c:414
+#: src/protocols/yahoo/yahoo.c:2121 src/protocols/yahoo/yahoo.c:2267
+#: src/protocols/yahoo/ycht.c:413
 msgid "Unable to read"
 msgstr "Kunne ikke lese"
 
-#: src/protocols/yahoo/yahoo.c:2417 src/protocols/yahoo/yahoo.c:2527
-#: src/protocols/yahoo/yahoo.c:2577 src/protocols/yahoo/yahoo.c:2587
-#: src/protocols/yahoo/yahoochat.c:1461 src/protocols/yahoo/yahoochat.c:1528
-#: src/protocols/yahoo/ycht.c:518
+#: src/protocols/yahoo/yahoo.c:2289 src/protocols/yahoo/yahoo.c:2417
+#: src/protocols/yahoo/yahoo.c:2502 src/protocols/yahoo/yahoo.c:2512
+#: src/protocols/yahoo/yahoochat.c:1393 src/protocols/yahoo/yahoochat.c:1460
+#: src/protocols/yahoo/ycht.c:517
 msgid "Connection problem"
 msgstr "Problem ved tilkobling"
 
-#: src/protocols/yahoo/yahoo.c:2681 src/protocols/yahoo/yahoo.c:3048
-#: src/protocols/yahoo/yahoo.c:3162
+#: src/protocols/yahoo/yahoo.c:2615 src/protocols/yahoo/yahoo.c:3212
 msgid "Not At Home"
 msgstr "Ikke hjemme"
 
-#: src/protocols/yahoo/yahoo.c:2683 src/protocols/yahoo/yahoo.c:3050
-#: src/protocols/yahoo/yahoo.c:3163
+#: src/protocols/yahoo/yahoo.c:2617 src/protocols/yahoo/yahoo.c:3215
 msgid "Not At Desk"
 msgstr "Ikke ved skrivebordet"
 
-#: src/protocols/yahoo/yahoo.c:2685 src/protocols/yahoo/yahoo.c:3052
-#: src/protocols/yahoo/yahoo.c:3164
+#: src/protocols/yahoo/yahoo.c:2619 src/protocols/yahoo/yahoo.c:3218
 msgid "Not In Office"
 msgstr "Ikke på kontoret"
 
-#: src/protocols/yahoo/yahoo.c:2689 src/protocols/yahoo/yahoo.c:3056
-#: src/protocols/yahoo/yahoo.c:3166
+#: src/protocols/yahoo/yahoo.c:2623 src/protocols/yahoo/yahoo.c:3224
 msgid "On Vacation"
 msgstr "På ferie"
 
-#: src/protocols/yahoo/yahoo.c:2693 src/protocols/yahoo/yahoo.c:3060
-#: src/protocols/yahoo/yahoo.c:3168
+#: src/protocols/yahoo/yahoo.c:2627 src/protocols/yahoo/yahoo.c:3230
 msgid "Stepped Out"
 msgstr "Ute"
 
-#: src/protocols/yahoo/yahoo.c:2774 src/protocols/yahoo/yahoo.c:2800
+#: src/protocols/yahoo/yahoo.c:2719 src/protocols/yahoo/yahoo.c:2746
 msgid "Not on server list"
 msgstr "Ikke på tjenerlisten"
 
-#: src/protocols/yahoo/yahoo.c:2879
+#: src/protocols/yahoo/yahoo.c:2769 src/protocols/yahoo/yahoo.c:2829
+#, fuzzy
+msgid "Appear Online"
+msgstr "Lat som avlogget"
+
+#: src/protocols/yahoo/yahoo.c:2772 src/protocols/yahoo/yahoo.c:2851
+#, fuzzy
+msgid "Appear Permanently Offline"
+msgstr "Lat som avlogget"
+
+#: src/protocols/yahoo/yahoo.c:2790
+#, fuzzy
+msgid "Stealth"
+msgstr "Fylke/stat"
+
+#: src/protocols/yahoo/yahoo.c:2845
+#, fuzzy
+msgid "Don't Appear Permanently Offline"
+msgstr "Lat som avlogget"
+
+#: src/protocols/yahoo/yahoo.c:2884
 msgid "Join in Chat"
 msgstr "Bli med i samtalegruppe"
 
-#: src/protocols/yahoo/yahoo.c:2884
+#: src/protocols/yahoo/yahoo.c:2889
 msgid "Initiate Conference"
 msgstr "Start konferanse"
 
-#: src/protocols/yahoo/yahoo.c:2936
+#: src/protocols/yahoo/yahoo.c:2914
+msgid "Stealth Settings"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:2945
 msgid "Active which ID?"
 msgstr "Aktiver hvilken ID?"
 
-#: src/protocols/yahoo/yahoo.c:2945
+#: src/protocols/yahoo/yahoo.c:2954
 msgid "Join who in chat?"
 msgstr "Bli med hvem i samtalegruppe?"
 
-#: src/protocols/yahoo/yahoo.c:2955
+#: src/protocols/yahoo/yahoo.c:2964
 msgid "Activate ID..."
 msgstr "Aktiver ID..."
 
-#: src/protocols/yahoo/yahoo.c:2959
+#: src/protocols/yahoo/yahoo.c:2968
 msgid "Join user in chat..."
 msgstr "Bli med bruker i samtalegruppe..."
 
-#: src/protocols/yahoo/yahoo.c:3479
+#: src/protocols/yahoo/yahoo.c:3523
 #, fuzzy
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr ""
 "join: &lt;rom&gt; [vert]:  Bli med i en gruppesamtale på denne serveren"
 
-#: src/protocols/yahoo/yahoo.c:3483
+#: src/protocols/yahoo/yahoo.c:3527
 msgid "buzz: Buzz a contact to get their attention"
 msgstr ""
 
+#: src/protocols/yahoo/yahoo.c:3532
+msgid "doodle: Request user to start a Doodle session"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -10865,121 +10657,71 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/yahoo/yahoo.c:3562 src/protocols/yahoo/yahoo.c:3564
+#: src/protocols/yahoo/yahoo.c:3621 src/protocols/yahoo/yahoo.c:3623
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo-protokolltillegg"
 
-#: src/protocols/yahoo/yahoo.c:3583
+#: src/protocols/yahoo/yahoo.c:3640
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: src/protocols/yahoo/yahoo.c:3586
+#: src/protocols/yahoo/yahoo.c:3643
 msgid "Pager host"
 msgstr "Personsøker-adresse:"
 
-#: src/protocols/yahoo/yahoo.c:3589
+#: src/protocols/yahoo/yahoo.c:3646
 msgid "Japan Pager host"
 msgstr "Japansk personsøker-adresse:"
 
-#: src/protocols/yahoo/yahoo.c:3592
+#: src/protocols/yahoo/yahoo.c:3649
 msgid "Pager port"
 msgstr "Personsøker-port:"
 
-#: src/protocols/yahoo/yahoo.c:3595
+#: src/protocols/yahoo/yahoo.c:3652
 msgid "File transfer host"
 msgstr "Filoverføringsvert"
 
-#: src/protocols/yahoo/yahoo.c:3598
+#: src/protocols/yahoo/yahoo.c:3655
 msgid "Japan File transfer host"
 msgstr "Japansk filoverføringsvert"
 
-#: src/protocols/yahoo/yahoo.c:3601
+#: src/protocols/yahoo/yahoo.c:3658
 msgid "File transfer port"
 msgstr "Filoverføringsport"
 
-#: src/protocols/yahoo/yahoo.c:3604
+#: src/protocols/yahoo/yahoo.c:3661
 #, fuzzy
 msgid "Chat Room Locale"
 msgstr "Samtaleromslisteadresse"
 
-#: src/protocols/yahoo/yahoo.c:3607
+#: src/protocols/yahoo/yahoo.c:3664
 msgid "Chat Room List Url"
 msgstr "Samtaleromslisteadresse"
 
-#: src/protocols/yahoo/yahoo.c:3610
+#: src/protocols/yahoo/yahoo.c:3667
 #, fuzzy
 msgid "YCHT Host"
 msgstr "YCHT-vert"
 
-#: src/protocols/yahoo/yahoo.c:3613
+#: src/protocols/yahoo/yahoo.c:3670
 #, fuzzy
 msgid "YCHT Port"
 msgstr "YCHT-Port"
 
-#: src/protocols/yahoo/yahoochat.c:206
-#, 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:208
-msgid "Invitation Rejected"
-msgstr "Invitasjonen avslått"
-
-#: src/protocols/yahoo/yahoochat.c:363
-msgid "Failed to join chat"
-msgstr "Kunne ikke bli med i samtalegruppen"
-
-#: src/protocols/yahoo/yahoochat.c:363
-msgid "Maybe the room is full?"
-msgstr "Kanskje rommet er fullt?"
-
-#: src/protocols/yahoo/yahoochat.c:441
-#, c-format
-msgid "You are now chatting in %s."
-msgstr "Du snakker nå i %s."
-
-#: src/protocols/yahoo/yahoochat.c:616
-msgid "Failed to join buddy in chat"
-msgstr "Kunne ikke bli med kontakt i samtale"
-
-#: src/protocols/yahoo/yahoochat.c:617
-msgid "Maybe they're not in a chat?"
-msgstr "Kanskje de ikke er i samtale?"
-
-#: src/protocols/yahoo/yahoochat.c:1394
-msgid "Fetching the room list failed."
-msgstr "Klarte ikke hente ned romlisten."
-
-#: src/protocols/yahoo/yahoochat.c:1447
-msgid "Voices"
-msgstr "Stemmer"
-
-#: src/protocols/yahoo/yahoochat.c:1450
-msgid "Webcams"
-msgstr "Webkameraer"
-
-#: src/protocols/yahoo/yahoochat.c:1461 src/protocols/yahoo/yahoochat.c:1528
-msgid "Unable to fetch room list."
-msgstr "Klarte ikke hente ned romliste."
-
-#: src/protocols/yahoo/yahoochat.c:1521
-msgid "User Rooms"
-msgstr "Brukerrom"
-
-#: src/protocols/yahoo/yahoo_profile.c:675
+#: src/protocols/yahoo/yahoo_profile.c:672
 #, c-format
 msgid "<b>IP Address:</b> %s<br>"
 msgstr "<b>IP-adresse:</b> %s <br>"
 
-#: src/protocols/yahoo/yahoo_profile.c:751
+#: src/protocols/yahoo/yahoo_profile.c:748
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japan-profil"
 
-#: src/protocols/yahoo/yahoo_profile.c:752
+#: src/protocols/yahoo/yahoo_profile.c:749
 msgid "Yahoo! Profile"
 msgstr "Yahoo!-profil"
 
-#: src/protocols/yahoo/yahoo_profile.c:796
+#: src/protocols/yahoo/yahoo_profile.c:793
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
@@ -10987,55 +10729,55 @@
 "Beklager, profiler som er markert med vokseninnhold er for tiden ikke "
 "støttet."
 
-#: src/protocols/yahoo/yahoo_profile.c:798
+#: src/protocols/yahoo/yahoo_profile.c:795
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser"
 msgstr ""
 "Hvis du ønsker å vise denne profilen, må du åpne denne lenken i en nettleser"
 
-#: src/protocols/yahoo/yahoo_profile.c:976
+#: src/protocols/yahoo/yahoo_profile.c:971
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
 
-#: src/protocols/yahoo/yahoo_profile.c:1050
-#: src/protocols/yahoo/yahoo_profile.c:1054
-#: src/protocols/yahoo/yahoo_profile.c:1058
+#: src/protocols/yahoo/yahoo_profile.c:1043
+#: src/protocols/yahoo/yahoo_profile.c:1047
+#: src/protocols/yahoo/yahoo_profile.c:1051
 msgid "Hobbies"
 msgstr "Hobbyer"
 
-#: src/protocols/yahoo/yahoo_profile.c:1068
-#: src/protocols/yahoo/yahoo_profile.c:1072
+#: src/protocols/yahoo/yahoo_profile.c:1061
+#: src/protocols/yahoo/yahoo_profile.c:1065
 msgid "Latest News"
 msgstr "Siste nytt"
 
-#: src/protocols/yahoo/yahoo_profile.c:1093
+#: src/protocols/yahoo/yahoo_profile.c:1086
 msgid "Home Page"
 msgstr "Hjemmeside"
 
-#: src/protocols/yahoo/yahoo_profile.c:1108
+#: src/protocols/yahoo/yahoo_profile.c:1101
 msgid "Cool Link 1"
 msgstr "Kul lenke 1"
 
-#: src/protocols/yahoo/yahoo_profile.c:1113
+#: src/protocols/yahoo/yahoo_profile.c:1106
 msgid "Cool Link 2"
 msgstr "Kul lenke 2"
 
-#: src/protocols/yahoo/yahoo_profile.c:1117
+#: src/protocols/yahoo/yahoo_profile.c:1110
 msgid "Cool Link 3"
 msgstr "Kul lenke 3"
 
-#: src/protocols/yahoo/yahoo_profile.c:1130
+#: src/protocols/yahoo/yahoo_profile.c:1123
 #, fuzzy
 msgid "Last Update"
 msgstr "Sist oppdatert"
 
-#: src/protocols/yahoo/yahoo_profile.c:1136
+#: src/protocols/yahoo/yahoo_profile.c:1129
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "Brukerinformasjon for %s er ikke tilgjengelig"
 
-#: src/protocols/yahoo/yahoo_profile.c:1142
+#: src/protocols/yahoo/yahoo_profile.c:1135
 msgid ""
 "Sorry, this profile seems to be in a language that is not supported at this "
 "time."
@@ -11043,7 +10785,7 @@
 "Beklager, men denne profilen ser ut til å være i et språk som for øyeblikket "
 "ikke er støttet."
 
-#: src/protocols/yahoo/yahoo_profile.c:1158
+#: src/protocols/yahoo/yahoo_profile.c:1151
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
@@ -11051,7 +10793,7 @@
 "Kunne ikke hente ned brukerens profil. Dette er mest sannsynlig et "
 "midlertidig server-problem. Vennligst prøv igjen senere."
 
-#: src/protocols/yahoo/yahoo_profile.c:1161
+#: src/protocols/yahoo/yahoo_profile.c:1154
 msgid ""
 "Could not retrieve the user's profile. This most likely means that the user "
 "does not exist; however, Yahoo! sometimes does fail to find a user's "
@@ -11062,15 +10804,65 @@
 "brukers profil. Om du vet at brukeren eksisterer, vennligst prøv igjen "
 "senere."
 
-#: src/protocols/yahoo/yahoo_profile.c:1169
+#: src/protocols/yahoo/yahoo_profile.c:1162
 msgid "The user's profile is empty."
 msgstr "Brukerens profil er tom."
 
-#: src/protocols/yahoo/ycht.c:401
+#: src/protocols/yahoo/yahoochat.c:202
+#, 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:204
+msgid "Invitation Rejected"
+msgstr "Invitasjonen avslått"
+
+#: src/protocols/yahoo/yahoochat.c:358
+msgid "Failed to join chat"
+msgstr "Kunne ikke bli med i samtalegruppen"
+
+#: src/protocols/yahoo/yahoochat.c:358
+msgid "Maybe the room is full?"
+msgstr "Kanskje rommet er fullt?"
+
+#: src/protocols/yahoo/yahoochat.c:435
+#, c-format
+msgid "You are now chatting in %s."
+msgstr "Du snakker nå i %s."
+
+#: src/protocols/yahoo/yahoochat.c:608
+msgid "Failed to join buddy in chat"
+msgstr "Kunne ikke bli med kontakt i samtale"
+
+#: src/protocols/yahoo/yahoochat.c:609
+msgid "Maybe they're not in a chat?"
+msgstr "Kanskje de ikke er i samtale?"
+
+#: src/protocols/yahoo/yahoochat.c:1326
+msgid "Fetching the room list failed."
+msgstr "Klarte ikke hente ned romlisten."
+
+#: src/protocols/yahoo/yahoochat.c:1379
+msgid "Voices"
+msgstr "Stemmer"
+
+#: src/protocols/yahoo/yahoochat.c:1382
+msgid "Webcams"
+msgstr "Webkameraer"
+
+#: src/protocols/yahoo/yahoochat.c:1393 src/protocols/yahoo/yahoochat.c:1460
+msgid "Unable to fetch room list."
+msgstr "Klarte ikke hente ned romliste."
+
+#: src/protocols/yahoo/yahoochat.c:1453
+msgid "User Rooms"
+msgstr "Brukerrom"
+
+#: src/protocols/yahoo/ycht.c:400
 msgid "Connection problem with the YCHT server."
 msgstr "Problem ved tilkobling til YHCT-tjener."
 
-#: src/protocols/zephyr/zephyr.c:328
+#: src/protocols/zephyr/zephyr.c:331
 #, fuzzy
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
@@ -11079,98 +10871,102 @@
 "(Det oppstod en feil under konverteringen av denne beskjeden.\t Sjekk "
 "'encoding'-innstillingen i kontooppsettet)"
 
-#: src/protocols/zephyr/zephyr.c:676
-#, c-format
-msgid "Unable send to chat %s,%s,%s"
+#: src/protocols/zephyr/zephyr.c:686
+#, fuzzy, c-format
+msgid "Unable to send to chat %s,%s,%s"
 msgstr "Klarte ikke sende til samtalegruppe %s,%s,%s"
 
-#: src/protocols/zephyr/zephyr.c:709 src/protocols/zephyr/zephyr.c:1118
+#: src/protocols/zephyr/zephyr.c:719 src/protocols/zephyr/zephyr.c:1133
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>Bruker:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:713 src/protocols/zephyr/zephyr.c:1123
+#: src/protocols/zephyr/zephyr.c:723 src/protocols/zephyr/zephyr.c:1138
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>Gjemt eller ikke logget inn"
 
-#: src/protocols/zephyr/zephyr.c:718 src/protocols/zephyr/zephyr.c:1125
+#: src/protocols/zephyr/zephyr.c:728 src/protocols/zephyr/zephyr.c:1140
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>På %s siden %s"
 
-#: src/protocols/zephyr/zephyr.c:1408 src/protocols/zephyr/zephyr.c:1409
+#: src/protocols/zephyr/zephyr.c:1471 src/protocols/zephyr/zephyr.c:1472
 msgid "Anyone"
 msgstr "Alle"
 
-#: src/protocols/zephyr/zephyr.c:2155
+#: src/protocols/zephyr/zephyr.c:2273
 msgid "_Class:"
 msgstr "_Klasse:"
 
-#: src/protocols/zephyr/zephyr.c:2161
+#: src/protocols/zephyr/zephyr.c:2279
 msgid "_Instance:"
 msgstr "_Instans:"
 
-#: src/protocols/zephyr/zephyr.c:2167
+#: src/protocols/zephyr/zephyr.c:2285
 msgid "_Recipient:"
 msgstr "_Mottaker:"
 
-#: src/protocols/zephyr/zephyr.c:2178
+#: src/protocols/zephyr/zephyr.c:2296
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "Forsøk på å abonnere på %s, %s, %s lyktes ikke"
 
-#: src/protocols/zephyr/zephyr.c:2483
+#: src/protocols/zephyr/zephyr.c:2602
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:2488
+#: src/protocols/zephyr/zephyr.c:2607
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:2493
+#: src/protocols/zephyr/zephyr.c:2612
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:2498
+#: src/protocols/zephyr/zephyr.c:2617
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:2504
+#: src/protocols/zephyr/zephyr.c:2622
+msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:2628
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:2509
+#: src/protocols/zephyr/zephyr.c:2633
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:2515
+#: src/protocols/zephyr/zephyr.c:2639
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:2521
+#: src/protocols/zephyr/zephyr.c:2645
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:2527
+#: src/protocols/zephyr/zephyr.c:2651
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:2532
+#: src/protocols/zephyr/zephyr.c:2656
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:2638
+#: src/protocols/zephyr/zephyr.c:2762
 msgid "Resubscribe"
 msgstr "Abboner på nytt"
 
-#: src/protocols/zephyr/zephyr.c:2641
+#: src/protocols/zephyr/zephyr.c:2765
 msgid "Retrieve subscriptions from server"
 msgstr "Hent abonnementer fra tjener"
 
@@ -11184,210 +10980,1234 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/zephyr/zephyr.c:2724 src/protocols/zephyr/zephyr.c:2726
+#: src/protocols/zephyr/zephyr.c:2847 src/protocols/zephyr/zephyr.c:2849
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr-protokolltillegg"
 
-#: src/protocols/zephyr/zephyr.c:2751
+#: src/protocols/zephyr/zephyr.c:2874
 msgid "Export to .anyone"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:2754
+#: src/protocols/zephyr/zephyr.c:2877
 msgid "Export to .zephyr.subs"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:2757
+#: src/protocols/zephyr/zephyr.c:2880
+msgid "Import from .anyone"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:2883
+msgid "Import from .zephyr.subs"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:2886
+#, fuzzy
+msgid "Realm"
+msgstr "Virkelig navn"
+
+#: src/protocols/zephyr/zephyr.c:2889
 msgid "Exposure"
 msgstr ""
 
 #. XXX: why in the hell are we calling gaim_connection_error() here?
 #. Forbidden
-#: src/proxy.c:958
+#: src/proxy.c:1036
 #, c-format
 msgid "Access denied: proxy server forbids port %d tunnelling."
 msgstr "Tilgang nektet: Mellomtjener nekter å formidle tunell for port %d"
 
-#: src/proxy.c:962
+#: src/proxy.c:1040
 #, c-format
 msgid "Proxy connection error %d"
 msgstr "Tilkoplingsfeil til mellomtjener %d"
 
-#: src/proxy.c:1790
+#: src/proxy.c:1874
 msgid "Invalid proxy settings"
 msgstr "Ugyldige proxyinnstilinger"
 
-#: src/proxy.c:1790
+#: src/proxy.c:1874
 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."
 
-#. * Custom away message.
-#: src/prpl.h:187
-msgid "Custom"
-msgstr "Egendefinert"
-
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:1255
+#: src/request.h:1341
 msgid "Accept"
 msgstr "Godta"
 
-#: src/server.c:64
-msgid "Please enter your password"
-msgstr "Skriv inn passord"
-
-#: src/server.c:533
+#: src/server.c:243
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s heter nå %s\n"
 
-#: src/server.c:978
+#: src/server.c:625
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "(%d beskjeder)"
 msgstr[1] "(%d beskjeder)"
 
-#: src/server.c:992
+#: src/server.c:639
 msgid "(1 message)"
 msgstr "(1 beskjed)"
 
-#: src/server.c:1215 src/server.c:1224
-#, c-format
-msgid "%s logged in."
-msgstr "%s logget inn."
-
-#: src/server.c:1236
-#, c-format
-msgid "%s signed on"
-msgstr "%s har logget på"
-
-#: src/server.c:1251
+#: src/server.c:860
+#, fuzzy, c-format
+msgid ""
+"%s has invited %s to the chat room %s:\n"
+"%s"
+msgstr "Brukeren '%s' inviterer %s til samtalerom: '%s\n"
+
+#: src/server.c:865
+#, c-format
+msgid "%s has invited %s to the chat room %s\n"
+msgstr "Brukeren '%s' inviterer %s til samtalerom: '%s\n"
+
+#: src/server.c:869
+msgid "Accept chat invitation?"
+msgstr "Aksepter samtaleinvitasjon?"
+
+#: src/status.c:153
+#, fuzzy
+msgid "Unset"
+msgstr "Enhet"
+
+#: src/status.c:156
+msgid "Unavailable"
+msgstr "Ikke tilgjengelig"
+
+#: src/status.c:621
 #, c-format
 msgid "%s came back"
 msgstr "%s kom tilbake"
 
-#: src/server.c:1253
+#: src/status.c:626
 #, c-format
 msgid "%s went away"
 msgstr "%s forsvant"
 
-#: src/server.c:1267
+#: src/status.c:1308
 #, c-format
 msgid "%s became idle"
 msgstr "%s har blitt inaktiv"
 
-#: src/server.c:1278
+#: src/status.c:1323
 #, c-format
 msgid "%s became unidle"
 msgstr "%s har blitt aktiv"
 
-#: src/server.c:1288 src/server.c:1295
-#, c-format
-msgid "%s logged out."
-msgstr "%s logget ut."
-
-#: src/server.c:1308
-#, c-format
-msgid "%s signed off"
-msgstr "%s logget av"
-
-#: src/server.c:1370
-#, c-format
-msgid ""
-"%s has just been warned by %s.\n"
-"Your new warning level is %d%%"
-msgstr ""
-"%s har blitt advart av %s.\n"
-"Ditt nye advarselsnivå er %d%%"
-
-#: src/server.c:1373
-msgid "an anonymous person"
-msgstr "en anonym person"
-
-#: src/server.c:1487
-#, c-format
-msgid ""
-"%s has invited %s to the chat room %s:\n"
-"<b>%s</b>"
-msgstr ""
-"Brukeren '%s' inviterer %s til samtalerom: '%s'\n"
-"<b>%s</b>"
-
-#: src/server.c:1493
-#, c-format
-msgid "%s has invited %s to the chat room %s\n"
-msgstr "Brukeren '%s' inviterer %s til samtalerom: '%s\n"
-
-#: src/server.c:1502
-msgid "Accept chat invitation?"
-msgstr "Aksepter samtaleinvitasjon?"
-
-#. for people like myself who are too lazy to add an away msg :)
-#. I don't know who "myself" is in this context.  The exclamation point
-#. * makes it slightly less boring ;)
-#: src/status.c:36
-msgid "Sorry, I ran out for a bit!"
-msgstr "Borte litt, tilbake om en stund!"
-
-#: src/stock.c:87
-msgid "_Alias"
-msgstr "_Alias"
-
-#: src/stock.c:89
-msgid "_Invite"
-msgstr "_Inviter"
-
-#: src/stock.c:90
-msgid "_Modify"
-msgstr "_Endre"
-
-#: src/stock.c:91
-msgid "_Open Mail"
-msgstr "Åpne _e-post"
-
-#: src/stock.c:93
-msgid "_Warn"
-msgstr "Advar"
-
-#: src/util.c:2396
+#: src/status.c:1697
+#, fuzzy
+msgid "Default auto-away"
+msgstr "Automatisk fraværsmarkering"
+
+#: src/util.c:2121
+#, fuzzy, c-format
+msgid "Error Reading %s"
+msgstr ""
+"Klarte ikke lese %s:\n"
+"%s\n"
+
+#: src/util.c:2122
+#, fuzzy, c-format
+msgid ""
+"An error was encountered reading your %s.  They have not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+"Det oppstod en feil under innlasting av kontaktlisten din. Den har ikke "
+"blitt lastet, og den gamle filen ble flyttet til blist.xml~."
+
+#: src/util.c:2559
 msgid "Calculating..."
 msgstr "Beregner..."
 
-#: src/util.c:2399
+#: src/util.c:2562
 msgid "Unknown."
 msgstr "Ukjent."
 
-#: src/util.c:2429
+#: src/util.c:2592
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "sekund"
 msgstr[1] "sekunder"
 
-#: src/util.c:2443
+#: src/util.c:2606
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dag"
 msgstr[1] "dager"
 
-#: src/util.c:2451
+#: src/util.c:2614
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "time"
 msgstr[1] "timer"
 
-#: src/util.c:2459
+#: src/util.c:2622
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minutt"
 msgstr[1] "minutter"
 
-#: src/util.c:2879
+#: src/util.c:3045
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Feil ved tilkobling.\n"
 
+#~ msgid "Restore Away State On Reconnect"
+#~ msgstr ""
+#~ "Fortsett som fraværende etter at forbindelsen har blitt gjennoprettet"
+
+#~ msgid "Mail Server"
+#~ msgstr "E-posttjener"
+
+#~ msgid "%s (%d new/%d total)"
+#~ msgstr "%s (%d nye/%d totalt)"
+
+#~ msgid "Check Mail"
+#~ msgstr "Sjekk e-post"
+
+#~ msgid "Check email every X seconds.\n"
+#~ msgstr "Sjekk e-post hvert Xte sekund.\n"
+
+#~ msgid "Auto-login"
+#~ msgstr "Automatisk pålogging"
+
+#~ msgid "New..."
+#~ msgstr "Ny..."
+
+#~ msgid "Back"
+#~ msgstr "Tilbake"
+
+#~ msgid "Signoff"
+#~ msgstr "Logge av"
+
+#~ msgid "Tray Icon Configuration"
+#~ msgstr "Innstillinger for trayikon"
+
+#~ msgid "_Hide new messages until tray icon is clicked"
+#~ msgstr "Skjul nye beskjeder inntil trayikon klikkes"
+
+#, fuzzy
+#~ msgid "Orientation"
+#~ msgstr "Organisasjon"
+
+#~ msgid "Not connected to AIM"
+#~ msgstr "Ikke tilkoblet til AIM"
+
+#~ msgid "No screenname given."
+#~ msgstr "Skjermnavn ikke oppgitt."
+
+#~ msgid "No roomname given."
+#~ msgstr "Romnavn ikke oppgitt."
+
+#~ msgid "Invalid AIM URI"
+#~ msgstr "Ugyldig AIM URI"
+
+#~ msgid ""
+#~ "Failed to assign %s to a socket:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Klarte ikke tilordne %s til en socket:\n"
+#~ "%s"
+
+#~ msgid "Unable to open socket"
+#~ msgstr "Klartie ikke åpne socket"
+
+#~ msgid "Remote Control"
+#~ msgstr "Styre Gaim fra kontrollfil"
+
+#~ msgid "Provides remote control for gaim applications."
+#~ msgstr "Muliggjør fjernstyring for Gaim-applikasjoner."
+
+#~ msgid ""
+#~ "Gives Gaim the ability to be remote-controlled through third-party "
+#~ "applications or through the gaim-remote tool."
+#~ msgstr ""
+#~ "Lar Gaim bli kontrollert fra tredjeparts-applikasjoner eller gjennom "
+#~ "verktøyet gaim-remote."
+
+#~ msgid "GTK Signals Test"
+#~ msgstr "GTK-signaltest"
+
+#
+#~ msgid "Test to see that all ui signals are working properly."
+#~ msgstr "Test for å se om alle brukergrensesnitts-signaler fungerer korrekt."
+
+#~ 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 den forrige "
+#~ "samtalen i den pågående."
+
+#~ msgid "_Apply"
+#~ msgstr "Bruk"
+
+#~ msgid "Docked _Buddy List is always on top"
+#~ msgstr "Dockable kontaktliste er alltid øverst"
+
+#~ msgid "Away!"
+#~ msgstr "Borte"
+
+#~ msgid "Edit This Message"
+#~ msgstr "Rediger denne meldingen"
+
+#~ msgid "I'm Back!"
+#~ msgstr "Tilbake!"
+
+#~ msgid "Are you sure you want to remove the away message \"%s\"?"
+#~ msgstr "Er du sikker på at du vil slette \"%s\"?"
+
+#~ msgid "Remove Away Message"
+#~ msgstr "Fjern fraværsbeskjed"
+
+#~ msgid "Set All Away"
+#~ msgstr "Marker som borte på alle"
+
+#~ msgid "You cannot save an away message with a blank title"
+#~ msgstr "Du kan ikke lagre en fraværsbeskjed uten tittel"
+
+#~ 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."
+
+#~ msgid "You cannot create an empty away message"
+#~ msgstr "Du kan ikke lage en tom fraværsbeskjed"
+
+#~ msgid "New away message"
+#~ msgstr "Ny fraværsbeskjed"
+
+#~ msgid "Away title: "
+#~ msgstr "Tittel: "
+
+#~ msgid "_Save"
+#~ msgstr "Lagre"
+
+#~ msgid "Sa_ve & Use"
+#~ msgstr "Lagre & bruk"
+
+#~ msgid "Buddy List Error"
+#~ msgstr "Feil i kontaktliste"
+
+#~ msgid "Size of the expander arrow"
+#~ msgstr "Størrelse på utvider-pil"
+
+#~ msgid ""
+#~ "Usage: %s command [OPTIONS] [URI]\n"
+#~ "\n"
+#~ "    COMMANDS:\n"
+#~ "       uri                      Handle AIM: URI\n"
+#~ "       away                     Popup the away dialog with the default "
+#~ "message\n"
+#~ "       back                     Remove the away dialog\n"
+#~ "       quit                     Close running copy of Gaim\n"
+#~ "\n"
+#~ "    OPTIONS:\n"
+#~ "       -h, --help [command]     Show help for command\n"
+#~ msgstr ""
+#~ "Bruksmåte: %s kommando [FLAGG] [URI]\n"
+#~ "\n"
+#~ "    KOMMANDOER:\n"
+#~ "       uri                      Håndtere AIM-URI\n"
+#~ "       away                      Sprett opp fraværsdialogen med "
+#~ "standardmeldingen\n"
+#~ "       back                     Fjern standardmeldingen\n"
+#~ "       quit                     Lukk Gaim-program som kjører\n"
+#~ "\n"
+#~ "    FLAGG:\n"
+#~ "       -h, --help [kommando]    Vis hjelp for kommando\n"
+
+#~ msgid ""
+#~ "Gaim not running (on session 0)\n"
+#~ "Is the \"Remote Control\" plugin loaded?\n"
+#~ msgstr ""
+#~ "Gaim kjører ikke (på sesjon 0)\n"
+#~ "Er fjernstyringstillegget lastet?\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Using AIM: URIs:\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 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 screen "
+#~ "name,\n"
+#~ "with no message:\n"
+#~ "\tgaim-remote uri 'aim:goim?screenname=Penguin'\n"
+#~ "\n"
+#~ "Joining a chat:\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"
+#~ "...prompts you to add 'Penguin' to your buddy list.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Bruke AIM: URIer:\n"
+#~ "Å sende en direktebeskjed til en kontakts skjermnavn:\n"
+#~ "\tgaim-remote uri 'aim:goim?screenname=Penguin&message=hello+world'\n"
+#~ "'Penguin' er skjermnavnet vi ønsker å sende direktebeskjed til, og "
+#~ "'hello\n"
+#~ "world' er beskjeden. Tegnet '+' må brukes som erstatning for mellomrom.\n"
+#~ "Merk at hvordan kommandoen over bruker anførselstegn - hvis du starter\n"
+#~ "kommandoen fra et shell, må du passe på å 'escape' tegnet &, ellers vil "
+#~ "resten\n"
+#~ "av linja ignoreres. Hvis du bare ønsker å åpne et samtalevindu til en "
+#~ "kontakt\n"
+#~ "uten å sende noen beskjed først, kan du gjøre slik:\n"
+#~ "\tgaim-remote uri aim:goim?screenname=Penguin\n"
+#~ "\n"
+#~ "For å bli med i en samtale:\n"
+#~ "\tgaim-remote uri aim:gochat?roomname=PenguinLounge\n"
+#~ "...starter en samtale i PenguinLounge-samtalerommet.\n"
+#~ "\n"
+#~ "For å legge til en kontakt i kontaktlisten:\n"
+#~ "\tgaim-remote uri aim:addbuddy?screenname=Penguin\n"
+#~ "...vil spørre deg om å legge til Penguin i kontaktlisten.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Close running copy of Gaim\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Lukk eksisterende Gaim-program\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Mark all accounts as \"away\" with the default message.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Merk alle kontoer som \"fraværende\" med standardmeldingen.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Set all accounts as not away.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Sett alle kontoers status til ikke fraværende.\n"
+
+#~ msgid "Show fewer options"
+#~ msgstr "Vis færre valg"
+
+#~ msgid "Information"
+#~ msgstr "Informasjon"
+
+#~ msgid "/Buddies/_Signoff"
+#~ msgstr "/Kontakter/L_ogge av"
+
+#~ msgid "/Tools/_Away"
+#~ msgstr "/Verktøy/_Borte"
+
+#~ msgid "/Tools/Pl_ugin Actions"
+#~ msgstr "/Verktøy/Handlinger for tillegg"
+
+#~ msgid "Rename Group"
+#~ msgstr "Endre gruppenavn"
+
+#~ msgid "New group name"
+#~ msgstr "Nytt gruppenavn:"
+
+#~ msgid "Please enter a new name for the selected group."
+#~ msgstr "Vennligst skriv inn nytt navn for gruppen."
+
+#~ msgid "%d%%"
+#~ msgstr "%d%%"
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>Account:</b>"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>Konto:</b>"
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>Warned:</b>"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>Advart:</b>"
+
+#~ msgid "Warned (%d%%) "
+#~ msgstr "Advart (%d%%) "
+
+#~ msgid "/Tools/Away"
+#~ msgstr "/Verktøy/Borte"
+
+#~ msgid "Send a message to the selected buddy"
+#~ msgstr "Send beskjed til den valgte kontakten"
+
+#~ msgid "Get information on the selected buddy"
+#~ msgstr "Hent informasjon om den valgte kontakten"
+
+#~ msgid "_Chat"
+#~ msgstr "_Gruppesamtale"
+
+#~ msgid "Join a chat room"
+#~ msgstr "Bli med i samtalegruppe"
+
+#~ msgid "_Away"
+#~ msgstr "_Borte"
+
+#~ msgid "Set an away message"
+#~ msgstr "Sett en fraværsbeskjed"
+
+#~ msgid "Done."
+#~ msgstr "Ferdig."
+
+#~ msgid "Signon: "
+#~ msgstr "Pålogging: "
+
+#~ msgid "Signon"
+#~ msgstr "Pålogging"
+
+#~ msgid "Cancel All"
+#~ msgstr "A_vbryt alle"
+
+#
+#~ msgid "_Reconnect"
+#~ msgstr "Kople til på nytt"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
+#~ "\n"
+#~ "%s\n"
+#~ "%s"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">%s har blitt koplet fra.</span>\n"
+#~ "\n"
+#~ "%s\n"
+#~ "%s"
+
+#~ msgid "Reason Unknown."
+#~ msgstr "Ukjent årsak."
+
+#
+#~ msgid "Reconnect _All"
+#~ msgstr "Kople til _alle på nytt"
+
+#
+#~ msgid "Time"
+#~ msgstr "Tid"
+
+#~ msgid "Get Away Msg"
+#~ msgstr "Hent fraværsbeskjed"
+
+#~ msgid "/Conversation/_Warn..."
+#~ msgstr "/Samtale/A_dvar..."
+
+#~ msgid "/Conversation/A_lias..."
+#~ msgstr "/Samtale/_Alias..."
+
+#~ msgid "/Options/Show T_imestamps"
+#~ msgstr "/Brukervalg/Vis t_idsstempler"
+
+#~ msgid "/Conversation/Warn..."
+#~ msgstr "/Samtale/Advar..."
+
+#~ msgid "Warn"
+#~ msgstr "Advar"
+
+#~ msgid "Warn the user"
+#~ msgstr "Advar brukeren"
+
+#~ msgid "Block the user"
+#~ msgstr "Blokker brukeren"
+
+#~ msgid "Send a file to the user"
+#~ msgstr "Send en fil til brukeren"
+
+#~ msgid "Add the user to your buddy list"
+#~ msgstr "Legg til brukeren i kontaktlisten din"
+
+#~ msgid "Remove the user from your buddy list"
+#~ msgstr "Fjern brukeren fra kontaktlisten din"
+
+#~ msgid "Send"
+#~ msgstr "Send"
+
+#~ msgid "Invite"
+#~ msgstr "Inviter"
+
+#~ msgid "Invite a user"
+#~ msgstr "Inviter en bruker"
+
+#~ msgid "Add the chat to your buddy list"
+#~ msgstr "Legg til samtalen i kontaktlisten din"
+
+#~ msgid "<main>/Conversation/Close"
+#~ msgstr "<main>/Samtale/Lukk"
+
+#~ msgid "former lead developer"
+#~ msgstr "tidligere hovedutvikler"
+
+#~ msgid "former maintainer"
+#~ msgstr "tidligere ansvarlig"
+
+#, fuzzy
+#~ msgid "Azerbaijani"
+#~ msgstr "Serbisk"
+
+#
+#~ msgid "Estonian"
+#~ msgstr "Estisk"
+
+#~ msgid "Burmese"
+#~ msgstr "Burmesisk"
+
+#, fuzzy
+#~ msgid "Norwegian (Nynorsk)"
+#~ msgstr "Norsk"
+
+#
+#~ msgid "Albanian"
+#~ msgstr "Albansk"
+
+#~ msgid "Turkish"
+#~ msgstr "Tyrkisk"
+
+#~ msgid "Ukrainian"
+#~ msgstr "Ukrainsk"
+
+#
+#~ msgid "Chinese"
+#~ msgstr "Kinesisk"
+
+#~ msgid "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
+#~ msgstr "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
+
+#~ msgid "_Screen name"
+#~ msgstr "_Skjermnavn"
+
+#~ msgid "Warn User"
+#~ msgstr "Advar bruker"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
+#~ "\n"
+#~ "This will increase %s's warning level and he or she will be subject to "
+#~ "harsher rate limiting.\n"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Advar %s?</span>\n"
+#~ "\n"
+#~ "Dette vil øke advarselsnivået til %s og vedkommende vil måtte tåle "
+#~ "strengere hastighetsbegrensning.\n"
+
+#~ msgid "Warn _anonymously?"
+#~ msgstr "Advar anonymt"
+
+#~ msgid "<b>Anonymous warnings are less severe.</b>"
+#~ msgstr "<b>Anonyme advarsler er mindre betydningsfulle.</b>"
+
+#~ msgid "Show transfer details"
+#~ msgstr "Vis overføringsdetaljer"
+
+#~ msgid "D_isplay remote nicknames if no alias is set"
+#~ msgstr "Vis kallenavn for personer hvis de ikke har noe alias"
+
+#~ msgid "Display"
+#~ msgstr "Vis"
+
+#~ msgid "Show _timestamp on messages"
+#~ msgstr "Vis tidsstempel på beskjeder"
+
+#~ msgid "Ignore c_olors"
+#~ msgstr "Ignorer farger"
+
+#~ msgid "Ignore font _faces"
+#~ msgstr "Ignorer skrifttyper"
+
+#~ msgid "Ignore font si_zes"
+#~ msgstr "Ignorer skriftstørrelser"
+
+#~ msgid "Default Formatting"
+#~ msgstr "Standardformatering"
+
+#~ msgid "_Send default formatting with outgoing messages"
+#~ msgstr "_Send standardformatering med utgående meldinger"
+
+#~ msgid "Send Message"
+#~ msgstr "Send beskjed"
+
+#~ msgid "Enter _sends message"
+#~ msgstr "Enter _sender beskjeden"
+
+#~ msgid "C_ontrol-Enter sends message"
+#~ msgstr "CTRL-Enter sender beskjeden"
+
+#~ msgid "Window Closing"
+#~ msgstr "Lukke vindu"
+
+#~ msgid "_Escape closes window"
+#~ msgstr "_ESC lukker vinduet"
+
+#~ msgid "Insertions"
+#~ msgstr "Innsettinger"
+
+#~ msgid "Control-{B/I/U} changes _formatting"
+#~ msgstr "CTRL-{b/i/u/s} endrer _formatering"
+
+#~ msgid "Control-(number) _inserts smileys"
+#~ msgstr "CTRL-(tall) setter _inn smilefjes"
+
+#~ msgid "Show _buttons as:"
+#~ msgstr "Vis knapper som:"
+
+#~ msgid "Pictures"
+#~ msgstr "Bilder"
+
+#~ msgid "Text"
+#~ msgstr "Tekst"
+
+#~ msgid "Pictures and text"
+#~ msgstr "Bilder og tekst"
+
+#~ msgid "_Raise window on events"
+#~ msgstr "Flytt vinduet øverst ved hendelser"
+
+#~ msgid "Show _warning levels"
+#~ msgstr "Vis advarselsnivåer"
+
+#~ msgid "_Automatically expand contacts"
+#~ msgstr "_Automatisk ekspander kontakter"
+
+#~ msgid "Enable \"_slash\" commands"
+#~ msgstr "Skru på \"_skråstreks\"-kommandoer"
+
+#~ msgid "Show _aliases in tabs/titles"
+#~ msgstr "Vis aliasnavn i titteltekster"
+
+#~ msgid "_Raise IM window on events"
+#~ msgstr "Flytt direktemeldingsvindu øverst ved hendelser"
+
+#~ msgid "Raise chat _window on events"
+#~ msgstr "Flytt gruppesamtalevinduet øverst ved hendelser"
+
+#~ msgid "Use _multi-colored screen names in chats"
+#~ msgstr "Bruk _flerfargede brukernavn i samtalegrupper"
+
+#~ msgid "Tab p_lacement:"
+#~ msgstr "_Faneplassering:"
+
+#~ msgid "New conversation _placement:"
+#~ msgstr "Ny samtale_plassering"
+
+#~ msgid "Message Logs"
+#~ msgstr "Beskjedlogging"
+
+#~ msgid "System Logs"
+#~ msgstr "Systemlogging"
+
+#~ msgid "_Enable system log"
+#~ msgstr "Skru på _systemlogg:"
+
+#~ msgid "Log when buddies _sign on/sign off"
+#~ msgstr "Skriv til logg når kontakter logger av/på"
+
+#~ msgid "Log when buddies become _idle/un-idle"
+#~ msgstr "Skriv til logg når kontakter blir aktiv/inaktiv"
+
+#~ msgid "Log when buddies go away/come _back"
+#~ msgstr "Skriv til logg når kontakter blir borte/kommer tilbake"
+
+#~ msgid "Log your _own signons/idleness/awayness"
+#~ msgstr "Skriv egne pålogginger/inaktivitet/bortemarkeringer til logg"
+
+#~ msgid "Idle _time reporting:"
+#~ msgstr "Rapportering av inaktiv _tid:"
+
+#~ msgid "Gaim usage"
+#~ msgstr "Gaim-bruk"
+
+#~ msgid "X usage"
+#~ msgstr "X-bruk"
+
+#~ msgid "Windows usage"
+#~ msgstr "Windows-bruk"
+
+#~ msgid ""
+#~ "<span size=\"larger\">%s %s</span>\n"
+#~ "\n"
+#~ "<span weight=\"bold\">Written by:</span>\t%s\n"
+#~ "<span weight=\"bold\">Web site:</span>\t\t%s\n"
+#~ "<span weight=\"bold\">File name:</span>\t%s"
+#~ msgstr ""
+#~ "<span size=\"larger\">%s %s</span>\n"
+#~ "\n"
+#~ "<span weight=\"bold\">Skrevet av:</span>\t%s\n"
+#~ "<span weight=\"bold\">Webside:</span>\t\t%s\n"
+#~ "<span weight=\"bold\">Filnavn:</span>\t%s"
+
+#~ msgid ""
+#~ "<span size=\"larger\">%s %s</span>\n"
+#~ "\n"
+#~ "<span weight=\"bold\">Written by:</span>  %s\n"
+#~ "<span weight=\"bold\">URL:</span>  %s\n"
+#~ "<span weight=\"bold\">File name:</span>  %s"
+#~ msgstr ""
+#~ "<span size=\"larger\">%s %s</span>\n"
+#~ "\n"
+#~ "<span weight=\"bold\">Skrevet av:</span>  %s\n"
+#~ "<span weight=\"bold\">URL:</span>  %s\n"
+#~ "<span weight=\"bold\">Filnavn:</span>  %s"
+
+#~ msgid "Load"
+#~ msgstr "Last"
+
+#~ msgid "Summary"
+#~ msgstr "Oppsummering"
+
+#~ msgid "Details"
+#~ msgstr "Detaljer"
+
+#~ msgid "_Edit"
+#~ msgstr "Rediger"
+
+#~ msgid "Interface"
+#~ msgstr "Grensesnitt"
+
+#~ msgid "Message Text"
+#~ msgstr "Beskjeder"
+
+#~ msgid "Shortcuts"
+#~ msgstr "Hurtigtaster"
+
+#~ msgid "Away Messages"
+#~ msgstr "Fraværsbeskjeder"
+
+#~ msgid "Plugins"
+#~ msgstr "Tillegg"
+
+#~ msgid "HTML"
+#~ msgstr "HTML"
+
+#~ msgid "Plain text"
+#~ msgstr "Ren tekst"
+
+#~ msgid "Please create an account."
+#~ msgstr "Vennligst lag en konto."
+
+#~ msgid "Login"
+#~ msgstr "Innlogging"
+
+#~ msgid "<b>_Account:</b>"
+#~ msgstr "<b>_Konto:</b>"
+
+#~ msgid "<b>_Password:</b>"
+#~ msgstr "<b>_Passord:</b>"
+
+#~ msgid "A_ccounts"
+#~ msgstr "Kontoer"
+
+#, fuzzy
+#~ msgid "P_references"
+#~ msgstr "Innstillinger"
+
+#~ msgid "_Sign on"
+#~ msgstr "Logg _på"
+
+#~ msgid ""
+#~ "Gaim %s\n"
+#~ "Usage: %s [OPTION]...\n"
+#~ "\n"
+#~ "  -a, --acct          display account editor window\n"
+#~ "  -w, --away[=MESG]   make away on signon (optional argument MESG "
+#~ "specifies\n"
+#~ "                      name of away message to use)\n"
+#~ "  -l, --login[=NAME]  automatically login (optional argument NAME "
+#~ "specifies\n"
+#~ "                      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"
+#~ "  -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"
+#~ msgstr ""
+#~ "Gaim %s\n"
+#~ "Bruksmåte: %s [BRUKERVALG]...\n"
+#~ "\n"
+#~ "  -a, --acct          vis redigeringsvindu for kontoer\n"
+#~ "  -w, --away[=MESG]   marker som borte ved pålogging (valgfri MESG er "
+#~ "navnet\n"
+#~ "                      på bortebeskjeden du vil bruke)\n"
+#~ "  -l, --login[=NAME]  logg inn automatisk (valgfri NAME er navnet på\n"
+#~ "                      konto(er) du vil bruke, atskilt av komma)\n"
+#~ "  -n, --loginwin      ikke logg inn automatisk, men vis påloggingsvindu\n"
+#~ "  -u, --user=NAME     bruk kontoen NAME\n"
+#~ "  -f, --file=FILE     bruk filen FILE som konfigurasjonsfil\n"
+#~ "  -d, --debug         skriv avlusningsinfo til stdout\n"
+#~ "  -v, --version       vis versjonsinformasjon og avslutt\n"
+#~ "  -h, --help          vis denne hjelpeteksten og avslutt\n"
+
+#~ msgid "Unable to load preferences"
+#~ msgstr "Kunne ikke åpne innstillinger"
+
+#~ msgid ""
+#~ "Gaim was not able to load your preferences because they are stored in an "
+#~ "old format that is no longer used.  Please reconfigure your settings "
+#~ "using the Preferences window."
+#~ msgstr ""
+#~ "Gaim kunne ikke åpne dine instillinger, da de er lagret i et gammelt "
+#~ "format som ikke lenger er i bruk.  Vennligst rekonfigurer dine  "
+#~ "instillinger ved hjelp av innstillingsvinduet"
+
+#~ msgid "Slightly less boring default"
+#~ msgstr "kjedelig standardsvar"
+
+#~ msgid "Available for friends only"
+#~ msgstr "Tilgjengelig bare for venner"
+
+#~ msgid "Away for friends only"
+#~ msgstr "Borte bare for venner"
+
+#~ msgid "Invisible for friends only"
+#~ msgstr "Usynlig bare for venner"
+
+#~ msgid "Unable to resolve hostname."
+#~ msgstr "Kan ikke finne datamaskinnavnet."
+
+#~ msgid "Error while reading from socket."
+#~ msgstr "Feil under lesing fra socket."
+
+#~ msgid "Error while writing to socket."
+#~ msgstr "Feil under skriving til socket."
+
+#~ msgid "Authentication failed."
+#~ msgstr "Autentisering feilet."
+
+#~ msgid "Unknown Error Code."
+#~ msgstr "Ukjent feilkode."
+
+#~ msgid "Status: %s"
+#~ msgstr "Status: %s"
+
+#~ msgid "Could not connect"
+#~ msgstr "Kunne ikke koble til"
+
+#~ msgid "Reading data"
+#~ msgstr "Leser data"
+
+#~ msgid "Balancer handshake"
+#~ msgstr "Finner ledig tjener"
+
+#~ msgid "Reading server key"
+#~ msgstr "Leser tjenernøkkel"
+
+#~ msgid "Exchanging key hash"
+#~ msgstr "Utveksler nøkkel-hash"
+
+#~ msgid "Critical error in GG library\n"
+#~ msgstr "Kritisk feil i GG-biblioteket\n"
+
+#~ msgid "Unable to ping server"
+#~ msgstr "Kunne ikke pinge tjener"
+
+#~ msgid "Send as message"
+#~ msgstr "Send som beskjed"
+
+#~ msgid "Looking up GG server"
+#~ msgstr "Søker etter GG-tjener"
+
+#~ msgid "Invalid Gadu-Gadu UIN specified"
+#~ msgstr "Ugyldig Gadu-Gadu UIN oppgitt"
+
+#~ 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."
+
+#~ msgid "Couldn't get search results"
+#~ msgstr "Kunne ikke laste ned søkeresultater"
+
+#~ msgid "Active"
+#~ msgstr "Aktiv"
+
+#~ msgid "Birth Year"
+#~ msgstr "Fødselsår"
+
+#~ msgid "Sex"
+#~ msgstr "Kjønn"
+
+#~ msgid "There is no Buddy List stored on the Gadu-Gadu server."
+#~ msgstr "Det er ingen kontaktliste på Gadu-Gadu-tjeneren."
+
+#~ msgid "Couldn't Import Buddy List from Server"
+#~ msgstr "Kunne ikke importere kontaktliste fra tjeneren"
+
+#~ msgid "Buddy List successfully transferred to Gadu-Gadu server"
+#~ msgstr "Kontaktlisten ble overført til Gadu-Gadu-tjeneren"
+
+#~ msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
+#~ msgstr "Kunne ikke overføre kontaktlisten til Gadu-Gadu-tjeneren"
+
+#~ msgid "Buddy List successfully deleted from Gadu-Gadu server"
+#~ msgstr "Kontaktlisten ble slettet fra Gadu-Gadu-tjeneren"
+
+#~ msgid "Couldn't delete Buddy List from Gadu-Gadu server"
+#~ msgstr "Kunne ikke slette kontaktlisten fra Gadu-Gadu-tjeneren"
+
+#~ msgid "Password couldn't be changed"
+#~ msgstr "Passordet kunne ikke endres"
+
+#~ msgid "Error communicating with Gadu-Gadu server"
+#~ msgstr "Feil i kommunikasjonen med Gadu-Gadu-tjeneren"
+
+#~ msgid ""
+#~ "Gaim was unable to complete your request due to a problem communicating "
+#~ "with the Gadu-Gadu HTTP server.  Please try again later."
+#~ msgstr ""
+#~ "Gaim kunne ikke fullføre oppgaven på grunn av kommunikasjonsproblemer med "
+#~ "Gadu-Gadu-HTTP-tjeneren. Vennligst forsøk igjen senere."
+
+#~ msgid "Unable to import Gadu-Gadu buddy list"
+#~ msgstr "Kunne ikke importere Gadu-Gadu-kontaktliste"
+
+#~ msgid ""
+#~ "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please "
+#~ "try again later."
+#~ msgstr ""
+#~ "Gaim kunne ikke koble til kontaktliste-tjeneren for Gadu-Gadu. Vennligst "
+#~ "forsøk igjen senere."
+
+#~ msgid "Couldn't export buddy list"
+#~ msgstr "Kunne ikke eksportere kontaktliste"
+
+#~ 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."
+
+#~ msgid "Unable to delete Gadu-Gadu buddy list"
+#~ msgstr "Kunne ikke slette kontaktliste for Gadu-Gadu"
+
+#~ msgid "Unable to access directory"
+#~ msgstr "Fikk ikke tilgang til katalogen"
+
+#~ msgid ""
+#~ "Gaim was unable to search the Directory because it was unable to connect "
+#~ "to the directory server.  Please try again later."
+#~ msgstr ""
+#~ "Gaim kunne ikke søke i katalogen fordi den ikke fikk kontakt med "
+#~ "katalogtjeneren. Vennligst prøv igjen senere."
+
+#~ msgid ""
+#~ "Gaim was unable to change your password due to an error connecting to the "
+#~ "Gadu-Gadu server.  Please try again later."
+#~ msgstr ""
+#~ "Gaim fikk ikke kontakt med Gadu-Gadu-tjeneren og kunne ikke endre "
+#~ "passordet ditt. Vennligst forsøk igjen senere."
+
+#~ msgid "Directory Search"
+#~ msgstr "Katalogsøk"
+
+#~ msgid "Unable to access user profile."
+#~ msgstr "Fikk ikke tilgang til brukerprofilen."
+
+#~ msgid ""
+#~ "Gaim was unable to access this user's profile due to an error connecting "
+#~ "to the directory server.  Please try again later."
+#~ msgstr ""
+#~ "Gaim kunne ikke lese brukerprofilen på grunn av tilkoblingsproblemer mot "
+#~ "katalogtjeneren. Vennligst forsøk igjen senere."
+
+#~ msgid "Gaim encountered an error communicating with the ICQ server."
+#~ msgstr "Det oppstod en feil i kommunikasjonen med ICQ-tjeneren."
+
+#~ 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."
+
+#~ msgid "Send message through server"
+#~ msgstr "Send beskjed gjennom tjener"
+
+#~ msgid "Connecting..."
+#~ msgstr "Kobler til..."
+
+#~ msgid "Nick:"
+#~ msgstr "Kallenavn:"
+
+#~ msgid "Gaim User"
+#~ msgstr "Gaim-bruker"
+
+#~ msgid "File Transfer Aborted"
+#~ msgstr "Filoverføring avbrutt"
+
+#~ msgid "Buddy Information for %s"
+#~ msgstr "Kontaktinformasjon for %s"
+
+#~ msgid "Invalid nickname '%s'"
+#~ msgstr "Ugyldig brukernavn '%s'"
+
+#~ msgid "Invalid nickname"
+#~ msgstr "Ugyldig brukernavn"
+
+#~ msgid "Jabber Profile"
+#~ msgstr "Jabber-profil"
+
+#
+#~ msgid "Roomlist Error"
+#~ msgstr "Feil ved liste over rom"
+
+#~ msgid "Logged out"
+#~ msgstr "Logget ut"
+
+#~ msgid "Hide Operating System"
+#~ msgstr "Skjul operativsystem"
+
+#~ msgid "The user %s wants to add you to their buddy list."
+#~ msgstr "Brukeren %s vil legge deg til i sin kontaktliste."
+
+#~ msgid "Display conversation closed notices"
+#~ msgstr "Vis advasler om at samtalen har blitt lukket"
+
+#~ msgid "Display timeout notices"
+#~ msgstr "Vis advarsler om tidsavbrudd"
+
+#~ msgid "The conversation has become inactive and timed out."
+#~ msgstr "Samtalen har blitt avsluttet pga. inaktivitet."
+
+#~ 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."
+
+#, fuzzy
+#~ msgid "User Properties"
+#~ msgstr "Brukervalg"
+
+#, fuzzy
+#~ msgid "Transfer of file %s timed out."
+#~ msgstr "Overføring av filen %s er ferdig."
+
+#~ 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."
+
+# Gammel "uventet", kansje bedre?
+#, fuzzy
+#~ msgid "Not specified"
+#~ msgstr "Ikke spesifisert"
+
+#~ msgid "ICQ Info for %s"
+#~ msgstr "ICQ-info for %s"
+
+#~ msgid ""
+#~ "Error 0x%04x: Unable to format screen name because the requested screen "
+#~ "name ends in a space."
+#~ msgstr ""
+#~ "Feil 0x%04x: Kunne ikke formatere skjermnavnet fordi det forespurte "
+#~ "skjermnavnet slutter med et mellomrom."
+
+#~ msgid "Visible"
+#~ msgstr "Synlig"
+
+#~ msgid "Available Message:"
+#~ msgstr "Tilstedebeskjed:"
+
+#~ 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!"
+
+#~ msgid "Set Available Message..."
+#~ msgstr "Sett tilstedebeskjed..."
+
+#~ msgid "Failed to leave channel"
+#~ msgstr "Kunne ikke forlate kanalen"
+
+#~ msgid "Basic Profile"
+#~ msgstr "Grunnleggende profil"
+
+#~ msgid "Profile Information"
+#~ msgstr "Profilinformasjon"
+
+#~ msgid "AIM"
+#~ msgstr "AIM"
+
+#~ msgid "ICQ UIN"
+#~ msgstr "ICQ UIN"
+
+#~ msgid "MSN"
+#~ msgstr "MSN"
+
+#~ msgid "Yahoo"
+#~ msgstr "Yahoo"
+
+#~ msgid "I'm From"
+#~ msgstr "Jeg er fra"
+
+#~ msgid "Set your Trepia profile data."
+#~ msgstr "Skriv inn data i din Trepia-profil."
+
+#~ msgid "Profile"
+#~ msgstr "Profil"
+
+#~ msgid "Set Profile"
+#~ msgstr "Sett profil"
+
+#~ msgid "Visit Homepage"
+#~ msgstr "Besøk hjemmeside"
+
+#~ msgid "Local Users"
+#~ msgstr "Lokale brukere"
+
+#~ msgid "Logging in"
+#~ msgstr "Logger på"
+
+#~ msgid "Trepia Protocol Plugin"
+#~ msgstr "Trepia-protokolltillegg"
+
+#~ msgid ""
+#~ "You have been logged off as you have logged in on a different machine or "
+#~ "device."
+#~ msgstr "Du har blitt logget av, da du har logget inn et annet sted"
+
+#~ msgid "Please enter your password"
+#~ msgstr "Skriv inn passord"
+
+#~ msgid "%s logged in."
+#~ msgstr "%s logget inn."
+
+#~ msgid "%s signed on"
+#~ msgstr "%s har logget på"
+
+#~ msgid "%s logged out."
+#~ msgstr "%s logget ut."
+
+#~ msgid "%s signed off"
+#~ msgstr "%s logget av"
+
+#~ msgid ""
+#~ "%s has just been warned by %s.\n"
+#~ "Your new warning level is %d%%"
+#~ msgstr ""
+#~ "%s har blitt advart av %s.\n"
+#~ "Ditt nye advarselsnivå er %d%%"
+
+#~ msgid "an anonymous person"
+#~ msgstr "en anonym person"
+
+#~ msgid ""
+#~ "%s has invited %s to the chat room %s:\n"
+#~ "<b>%s</b>"
+#~ msgstr ""
+#~ "Brukeren '%s' inviterer %s til samtalerom: '%s'\n"
+#~ "<b>%s</b>"
+
+#~ msgid "Sorry, I ran out for a bit!"
+#~ msgstr "Borte litt, tilbake om en stund!"
+
 #~ msgid ""
 #~ "Unable to guess the image type based on the file extension supplied.  "
 #~ "Defaulting to PNG."