im.pidgin.pidgin: f0b1524ec805a0ab10b64ca842f451e66eedf386

nosnilmot at pidgin.im nosnilmot at pidgin.im
Thu Feb 28 10:54:49 EST 2008


-----------------------------------------------------------------
Revision: f0b1524ec805a0ab10b64ca842f451e66eedf386
Ancestor: 3c7369ff42416b4382df936a1a06665f5093ac60
Author: nosnilmot at pidgin.im
Date: 2008-02-28T15:38:12
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/f0b1524ec805a0ab10b64ca842f451e66eedf386

Modified files:
        po/ChangeLog po/nn.po

ChangeLog: 

Norwegian Nynorsk translation updated (Yngve Spjeld Landro)
Closes #4415

-------------- next part --------------
============================================================
--- po/ChangeLog	beb19c967a0942da397fbeed3dc581f02fc28b0b
+++ po/ChangeLog	0252cb1cc91add2f1d17ed5190cdaaf8ef0f631b
@@ -1,11 +1,12 @@ version 2.4.0
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
 version 2.4.0
+	* Norwegian Bokmål translation updated (Hallvard Glad, Espen Stefansen)
+	* Norwegian Nynorsk translation updated (Yngve Spjeld Landro)
 	* Polish translation updated (Emil Nowak)
 	* Sinhala translation added (Danishka Navin)
 	* Slovenian transalation updated (Martin Srebotnjak)
 	* Spanish translation updated (Javier Fernández-Sanguino)
-	* Norwegian Bokmål translation updated (Hallvard Glad, Espen Stefansen)
 
 version 2.3.1
 	* German translation updated (Jochen Kemnade, Björn Voigt)
============================================================
--- po/nn.po	a9793d2d5850cf9bb38851e1fd218be2af31fd59
+++ po/nn.po	4a334d45d9e7a8b37b54efe9d0aff0d1aa5a74c1
@@ -1,18 +1,22 @@ msgstr ""
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-28 15:32-0500\n"
-"PO-Revision-Date: 2007-09-06 23:00+0100\n"
-"Last-Translator: Y S Landro <nynorsk at strilen.net>\n"
+"POT-Creation-Date: 2008-02-24 03:21-0500\n"
+"PO-Revision-Date: 2008-02-26 01:11+0100\n"
+"Last-Translator: YS Landro <nynorsk at strilen.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../finch/finch.c:64 ../finch/finch.c:301 ../finch/finch.c:330
-#: ../finch/finch.c:418
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../finch/finch.c:64
+#: ../finch/finch.c:300
+#: ../finch/finch.c:329
+#: ../finch/finch.c:417
 msgid "Finch"
 msgstr "Finch"
 
@@ -42,29 +46,32 @@ msgstr ""
 "  -n, --nologin       loggar ikkje på automatisk\n"
 "  -v, --version       vis noverande versjon og avslutt\n"
 
-#: ../finch/finch.c:328 ../pidgin/gtkmain.c:711
+#: ../finch/finch.c:327
+#: ../pidgin/gtkmain.c:743
 #, c-format
-msgid ""
-"%s encountered errors migrating your settings from %s to %s. Please "
-"investigate and complete the migration by hand. Please report this error at "
-"http://developer.pidgin.im"
-msgstr ""
-"%s opplevde feil under migreringa av innstillingane dine frå %s til %s. "
-"Undersøk nærare og sluttfør migreringa for hand. Rapporter denne feilen til "
-"http://developer.pidgin.im"
+msgid "%s encountered errors migrating your settings from %s to %s. Please investigate and complete the migration by hand. Please report this error at http://developer.pidgin.im"
+msgstr "%s opplevde feil under migreringa av innstillingane dine frå %s til %s. Undersøk nærare og sluttfør migreringa for hand. Rapporter denne feilen til http://developer.pidgin.im"
 
-#: ../finch/gntaccount.c:124 ../finch/gntaccount.c:484 ../finch/gntblist.c:300
-#: ../finch/gntblist.c:433 ../finch/gntblist.c:446 ../finch/gntplugin.c:186
-#: ../finch/gntplugin.c:234 ../finch/gntstatus.c:301 ../finch/gntstatus.c:310
-#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
+#: ../finch/gntaccount.c:124
+#: ../finch/gntaccount.c:484
+#: ../finch/gntblist.c:574
+#: ../finch/gntblist.c:710
+#: ../finch/gntblist.c:723
+#: ../finch/gntplugin.c:196
+#: ../finch/gntplugin.c:244
+#: ../finch/gntstatus.c:301
+#: ../finch/gntstatus.c:310
+#: ../finch/plugins/gntclipboard.c:115
+#: ../finch/plugins/gntclipboard.c:121
 #: ../finch/plugins/gntclipboard.c:128
-#: ../libpurple/protocols/jabber/buddy.c:2029
+#: ../libpurple/protocols/jabber/buddy.c:2036
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1515
+#: ../libpurple/protocols/jabber/jabber.c:1584
 #: ../libpurple/protocols/qq/group_join.c:328
-#: ../libpurple/protocols/qq/im.c:576 ../libpurple/protocols/silc/ops.c:57
-#: ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/qq/im.c:576
+#: ../libpurple/protocols/silc/ops.c:57
+#: ../libpurple/protocols/silc/ops.c:1460
 #: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error"
 msgstr "Feil"
@@ -93,8 +100,10 @@ msgstr "(Du har truleg gløymt å kjøra
 msgid "(You probably forgot to 'make install'.)"
 msgstr "(Du har truleg gløymt å kjøra 'make install')"
 
-#: ../finch/gntaccount.c:496 ../finch/gntconn.c:136
-#: ../pidgin/gtkaccount.c:1473 ../pidgin/gtkblist.c:4040
+#: ../finch/gntaccount.c:496
+#: ../finch/gntconn.c:138
+#: ../pidgin/gtkaccount.c:1447
+#: ../pidgin/gtkblist.c:4542
 msgid "Modify Account"
 msgstr "Endra konto"
 
@@ -102,7 +111,8 @@ msgstr "Ny konto"
 msgid "New Account"
 msgstr "Ny konto"
 
-#: ../finch/gntaccount.c:521 ../pidgin/gtkft.c:696
+#: ../finch/gntaccount.c:521
+#: ../pidgin/gtkft.c:696
 msgid "Protocol:"
 msgstr "Protokoll:"
 
@@ -121,99 +131,150 @@ msgstr "Alias:"
 
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:575 ../finch/gntaccount.c:638
-#: ../finch/gntaccount.c:889 ../finch/gntblist.c:344 ../finch/gntblist.c:421
-#: ../finch/gntblist.c:456 ../finch/gntblist.c:803 ../finch/gntblist.c:1005
-#: ../finch/gntblist.c:1101 ../finch/gntblist.c:2222 ../finch/gntcertmgr.c:91
-#: ../finch/gntplugin.c:379 ../finch/gntpounce.c:459 ../finch/gntpounce.c:667
-#: ../finch/gntprefs.c:265 ../finch/gntsound.c:1058 ../finch/gntstatus.c:145
-#: ../finch/gntstatus.c:485 ../finch/gntstatus.c:610
-#: ../libpurple/account.c:1013 ../libpurple/account.c:1263
-#: ../libpurple/account.c:1298 ../libpurple/conversation.c:1215
-#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:507
-#: ../libpurple/protocols/gg/gg.c:666 ../libpurple/protocols/gg/gg.c:803
-#: ../libpurple/protocols/gg/gg.c:884
-#: ../libpurple/protocols/jabber/buddy.c:728
-#: ../libpurple/protocols/jabber/buddy.c:2413
-#: ../libpurple/protocols/jabber/buddy.c:2449
+#: ../finch/gntaccount.c:575
+#: ../finch/gntaccount.c:639
+#: ../finch/gntaccount.c:890
+#: ../finch/gntblist.c:620
+#: ../finch/gntblist.c:698
+#: ../finch/gntblist.c:733
+#: ../finch/gntblist.c:1077
+#: ../finch/gntblist.c:1303
+#: ../finch/gntblist.c:1437
+#: ../finch/gntblist.c:2602
+#: ../finch/gntblist.c:2651
+#: ../finch/gntblist.c:2715
+#: ../finch/gntcertmgr.c:90
+#: ../finch/gntplugin.c:532
+#: ../finch/gntpounce.c:471
+#: ../finch/gntpounce.c:679
+#: ../finch/gntprefs.c:265
+#: ../finch/gntsound.c:1059
+#: ../finch/gntstatus.c:145
+#: ../finch/gntstatus.c:485
+#: ../finch/gntstatus.c:610
+#: ../finch/plugins/gnthistory.c:178
+#: ../libpurple/account.c:1116
+#: ../libpurple/account.c:1419
+#: ../libpurple/account.c:1454
+#: ../libpurple/conversation.c:1219
+#: ../libpurple/plugins/buddynote.c:51
+#: ../libpurple/protocols/gg/gg.c:508
+#: ../libpurple/protocols/gg/gg.c:667
+#: ../libpurple/protocols/gg/gg.c:804
+#: ../libpurple/protocols/gg/gg.c:886
+#: ../libpurple/protocols/jabber/buddy.c:730
+#: ../libpurple/protocols/jabber/buddy.c:2430
+#: ../libpurple/protocols/jabber/buddy.c:2466
 #: ../libpurple/protocols/jabber/chat.c:786
-#: ../libpurple/protocols/jabber/jabber.c:1008
-#: ../libpurple/protocols/jabber/jabber.c:1017
-#: ../libpurple/protocols/jabber/jabber.c:1737
-#: ../libpurple/protocols/jabber/si.c:874
-#: ../libpurple/protocols/jabber/usermood.c:184
+#: ../libpurple/protocols/jabber/jabber.c:1053
+#: ../libpurple/protocols/jabber/jabber.c:1062
+#: ../libpurple/protocols/jabber/jabber.c:1777
+#: ../libpurple/protocols/jabber/si.c:1109
+#: ../libpurple/protocols/jabber/usermood.c:202
 #: ../libpurple/protocols/jabber/usernick.c:78
 #: ../libpurple/protocols/jabber/xdata.c:400
-#: ../libpurple/protocols/msn/msn.c:287 ../libpurple/protocols/msn/msn.c:304
-#: ../libpurple/protocols/msn/msn.c:321 ../libpurple/protocols/msn/msn.c:338
+#: ../libpurple/protocols/msn/msn.c:287
+#: ../libpurple/protocols/msn/msn.c:304
+#: ../libpurple/protocols/msn/msn.c:321
+#: ../libpurple/protocols/msn/msn.c:338
 #: ../libpurple/protocols/msn/msn.c:359
-#: ../libpurple/protocols/oscar/oscar.c:6094
-#: ../libpurple/protocols/oscar/peer.c:1046
-#: ../libpurple/protocols/qq/buddy_info.c:484
+#: ../libpurple/protocols/msnp9/msn.c:284
+#: ../libpurple/protocols/msnp9/msn.c:301
+#: ../libpurple/protocols/msnp9/msn.c:318
+#: ../libpurple/protocols/msnp9/msn.c:335
+#: ../libpurple/protocols/msnp9/msn.c:356
+#: ../libpurple/protocols/myspace/user.c:582
+#: ../libpurple/protocols/myspace/user.c:676
+#: ../libpurple/protocols/oscar/oscar.c:6197
+#: ../libpurple/protocols/oscar/peer.c:1048
+#: ../libpurple/protocols/qq/buddy_info.c:525
 #: ../libpurple/protocols/qq/buddy_opt.c:214
 #: ../libpurple/protocols/qq/buddy_opt.c:411
 #: ../libpurple/protocols/qq/group.c:124
 #: ../libpurple/protocols/qq/group_join.c:140
 #: ../libpurple/protocols/qq/group_join.c:365
-#: ../libpurple/protocols/qq/group_opt.c:144
-#: ../libpurple/protocols/qq/group_opt.c:399
-#: ../libpurple/protocols/qq/sys_msg.c:113
-#: ../libpurple/protocols/qq/sys_msg.c:172
-#: ../libpurple/protocols/qq/sys_msg.c:266
-#: ../libpurple/protocols/sametime/sametime.c:3388
-#: ../libpurple/protocols/sametime/sametime.c:3474
-#: ../libpurple/protocols/sametime/sametime.c:3645
-#: ../libpurple/protocols/sametime/sametime.c:5397
-#: ../libpurple/protocols/sametime/sametime.c:5487
-#: ../libpurple/protocols/sametime/sametime.c:5612
+#: ../libpurple/protocols/qq/group_opt.c:120
+#: ../libpurple/protocols/qq/group_opt.c:375
+#: ../libpurple/protocols/qq/sys_msg.c:115
+#: ../libpurple/protocols/qq/sys_msg.c:175
+#: ../libpurple/protocols/qq/sys_msg.c:269
+#: ../libpurple/protocols/sametime/sametime.c:3438
+#: ../libpurple/protocols/sametime/sametime.c:3524
+#: ../libpurple/protocols/sametime/sametime.c:3698
+#: ../libpurple/protocols/sametime/sametime.c:5451
+#: ../libpurple/protocols/sametime/sametime.c:5541
+#: ../libpurple/protocols/sametime/sametime.c:5666
 #: ../libpurple/protocols/silc/buddy.c:455
-#: ../libpurple/protocols/silc/buddy.c:1076
-#: ../libpurple/protocols/silc/buddy.c:1191
-#: ../libpurple/protocols/silc/chat.c:616
-#: ../libpurple/protocols/silc/chat.c:746
-#: ../libpurple/protocols/silc/ops.c:1816
-#: ../libpurple/protocols/silc/silc.c:823
-#: ../libpurple/protocols/silc/silc.c:1031
+#: ../libpurple/protocols/silc/buddy.c:1079
+#: ../libpurple/protocols/silc/buddy.c:1194
+#: ../libpurple/protocols/silc/chat.c:620
+#: ../libpurple/protocols/silc/chat.c:750
+#: ../libpurple/protocols/silc/ops.c:1820
+#: ../libpurple/protocols/silc/silc.c:966
+#: ../libpurple/protocols/silc/silc.c:1174
 #: ../libpurple/protocols/silc10/buddy.c:468
-#: ../libpurple/protocols/silc10/buddy.c:1084
-#: ../libpurple/protocols/silc10/buddy.c:1189
+#: ../libpurple/protocols/silc10/buddy.c:1087
+#: ../libpurple/protocols/silc10/buddy.c:1192
 #: ../libpurple/protocols/silc10/chat.c:600
 #: ../libpurple/protocols/silc10/chat.c:730
-#: ../libpurple/protocols/silc10/ops.c:1904
-#: ../libpurple/protocols/silc10/silc.c:736
-#: ../libpurple/protocols/silc10/silc.c:942
-#: ../libpurple/protocols/yahoo/yahoo.c:1032
-#: ../libpurple/protocols/yahoo/yahoo.c:3498
-#: ../libpurple/protocols/yahoo/yahoo.c:3509 ../pidgin/gtkaccount.c:1908
-#: ../pidgin/gtkaccount.c:2495 ../pidgin/gtkblist.c:5967
-#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:773
-#: ../pidgin/gtkdialogs.c:912 ../pidgin/gtkdialogs.c:1004
-#: ../pidgin/gtkdialogs.c:1024 ../pidgin/gtkdialogs.c:1048
-#: ../pidgin/gtkdialogs.c:1070 ../pidgin/gtkdialogs.c:1118
-#: ../pidgin/gtkdialogs.c:1159 ../pidgin/gtkdialogs.c:1215
-#: ../pidgin/gtkdialogs.c:1254 ../pidgin/gtkdialogs.c:1281
-#: ../pidgin/gtkimhtmltoolbar.c:435 ../pidgin/gtklog.c:328
-#: ../pidgin/gtkplugin.c:289 ../pidgin/gtkpounce.c:1101
-#: ../pidgin/gtkprivacy.c:563 ../pidgin/gtkprivacy.c:579
-#: ../pidgin/gtkprivacy.c:604 ../pidgin/gtkprivacy.c:618
-#: ../pidgin/gtkrequest.c:271 ../pidgin/gtksavedstatuses.c:345
-#: ../pidgin/gtkstatusbox.c:1574
+#: ../libpurple/protocols/silc10/ops.c:1910
+#: ../libpurple/protocols/silc10/silc.c:742
+#: ../libpurple/protocols/silc10/silc.c:948
+#: ../libpurple/protocols/yahoo/yahoo.c:993
+#: ../libpurple/protocols/yahoo/yahoo.c:3535
+#: ../libpurple/protocols/yahoo/yahoo.c:3546
+#: ../pidgin/gtkaccount.c:1841
+#: ../pidgin/gtkaccount.c:2402
+#: ../pidgin/gtkblist.c:6768
+#: ../pidgin/gtkcertmgr.c:197
+#: ../pidgin/gtkdialogs.c:765
+#: ../pidgin/gtkdialogs.c:904
+#: ../pidgin/gtkdialogs.c:996
+#: ../pidgin/gtkdialogs.c:1016
+#: ../pidgin/gtkdialogs.c:1040
+#: ../pidgin/gtkdialogs.c:1062
+#: ../pidgin/gtkdialogs.c:1110
+#: ../pidgin/gtkdialogs.c:1151
+#: ../pidgin/gtkdialogs.c:1207
+#: ../pidgin/gtkdialogs.c:1246
+#: ../pidgin/gtkdialogs.c:1273
+#: ../pidgin/gtkimhtmltoolbar.c:438
+#: ../pidgin/gtklog.c:327
+#: ../pidgin/gtkplugin.c:290
+#: ../pidgin/gtkpounce.c:1113
+#: ../pidgin/gtkprivacy.c:509
+#: ../pidgin/gtkprivacy.c:525
+#: ../pidgin/gtkprivacy.c:550
+#: ../pidgin/gtkprivacy.c:564
+#: ../pidgin/gtkrequest.c:273
+#: ../pidgin/gtksavedstatuses.c:345
+#: ../pidgin/gtkstatusbox.c:1610
 msgid "Cancel"
 msgstr "Avbryt"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:579 ../finch/gntcertmgr.c:311
-#: ../finch/gntplugin.c:379 ../finch/gntpounce.c:465 ../finch/gntprefs.c:265
-#: ../finch/gntsound.c:1055 ../finch/gntstatus.c:488 ../finch/gntstatus.c:598
-#: ../libpurple/account.c:1297 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:727 ../pidgin/gtkdebug.c:749
-#: ../pidgin/gtkrequest.c:277
+#: ../finch/gntaccount.c:579
+#: ../finch/gntcertmgr.c:310
+#: ../finch/gntdebug.c:297
+#: ../finch/gntplugin.c:532
+#: ../finch/gntpounce.c:477
+#: ../finch/gntprefs.c:265
+#: ../finch/gntsound.c:1056
+#: ../finch/gntstatus.c:488
+#: ../finch/gntstatus.c:598
+#: ../libpurple/account.c:1453
+#: ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/protocols/jabber/buddy.c:729
+#: ../pidgin/gtkdebug.c:746
+#: ../pidgin/gtkrequest.c:279
 msgid "Save"
 msgstr "Lagra"
 
-#: ../finch/gntaccount.c:632 ../pidgin/gtkaccount.c:1900
-#: ../pidgin/gtksavedstatuses.c:333 ../pidgin/gtkstatusbox.c:1568
+#: ../finch/gntaccount.c:632
+#: ../pidgin/gtkaccount.c:1832
+#: ../pidgin/gtksavedstatuses.c:333
+#: ../pidgin/gtkstatusbox.c:1604
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Er du sikker på at du ønskjer å sletta %s?"
@@ -223,528 +284,732 @@ msgstr "Slett konto"
 msgstr "Slett konto"
 
 #. Delete button
-#: ../finch/gntaccount.c:637 ../finch/gntaccount.c:707
-#: ../finch/gntcertmgr.c:319 ../finch/gntpounce.c:666 ../finch/gntpounce.c:729
-#: ../finch/gntstatus.c:144 ../finch/gntstatus.c:210
-#: ../pidgin/gtkaccount.c:1907 ../pidgin/gtklog.c:327
-#: ../pidgin/gtkpounce.c:1100 ../pidgin/gtkrequest.c:274
-#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1573
+#: ../finch/gntaccount.c:638
+#: ../finch/gntaccount.c:708
+#: ../finch/gntcertmgr.c:318
+#: ../finch/gntpounce.c:678
+#: ../finch/gntpounce.c:741
+#: ../finch/gntstatus.c:144
+#: ../finch/gntstatus.c:210
+#: ../pidgin/gtkaccount.c:1840
+#: ../pidgin/gtklog.c:326
+#: ../pidgin/gtkpounce.c:1112
+#: ../pidgin/gtkrequest.c:276
+#: ../pidgin/gtksavedstatuses.c:344
+#: ../pidgin/gtkstatusbox.c:1609
 msgid "Delete"
 msgstr "Slett"
 
-#: ../finch/gntaccount.c:669 ../finch/gntblist.c:2119 ../finch/gntui.c:82
-#: ../pidgin/gtkaccount.c:2325 ../pidgin/gtkdocklet.c:522
+#: ../finch/gntaccount.c:670
+#: ../finch/gntblist.c:2469
+#: ../finch/gntui.c:94
+#: ../pidgin/gtkaccount.c:2261
+#: ../pidgin/gtkdocklet.c:716
 msgid "Accounts"
 msgstr "Kontoar"
 
-#: ../finch/gntaccount.c:675
+#: ../finch/gntaccount.c:676
 msgid "You can enable/disable accounts from the following list."
 msgstr "Du kan ta i bruk/slå av kontoar frå lista."
 
 #. Add button
-#: ../finch/gntaccount.c:698 ../finch/gntaccount.c:888 ../finch/gntblist.c:343
-#: ../finch/gntblist.c:421 ../finch/gntblist.c:456 ../finch/gntcertmgr.c:306
-#: ../finch/gntnotify.c:380 ../finch/gntpounce.c:713 ../finch/gntstatus.c:199
-#: ../libpurple/protocols/gg/gg.c:883 ../libpurple/protocols/qq/sys_msg.c:114
-#: ../libpurple/protocols/qq/sys_msg.c:173
-#: ../libpurple/protocols/qq/sys_msg.c:267
-#: ../libpurple/protocols/sametime/sametime.c:5486
-#: ../libpurple/protocols/silc/chat.c:615
-#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2494
-#: ../pidgin/gtkblist.c:5966 ../pidgin/gtkconv.c:1659
-#: ../pidgin/gtkrequest.c:275
+#: ../finch/gntaccount.c:699
+#: ../finch/gntaccount.c:889
+#: ../finch/gntblist.c:619
+#: ../finch/gntblist.c:698
+#: ../finch/gntblist.c:733
+#: ../finch/gntblist.c:2819
+#: ../finch/gntcertmgr.c:305
+#: ../finch/gntnotify.c:385
+#: ../finch/gntpounce.c:725
+#: ../finch/gntroomlist.c:274
+#: ../finch/gntstatus.c:199
+#: ../libpurple/protocols/gg/gg.c:885
+#: ../libpurple/protocols/qq/sys_msg.c:116
+#: ../libpurple/protocols/qq/sys_msg.c:176
+#: ../libpurple/protocols/qq/sys_msg.c:270
+#: ../libpurple/protocols/sametime/sametime.c:5540
+#: ../libpurple/protocols/silc/chat.c:619
+#: ../libpurple/protocols/silc10/chat.c:599
+#: ../pidgin/gtkaccount.c:2401
+#: ../pidgin/gtkblist.c:6767
+#: ../pidgin/gtkconv.c:1702
+#: ../pidgin/gtkrequest.c:277
 msgid "Add"
 msgstr "Legg til"
 
 #. Modify button
-#: ../finch/gntaccount.c:703 ../finch/gntpounce.c:721
+#: ../finch/gntaccount.c:704
+#: ../finch/gntpounce.c:733
 msgid "Modify"
 msgstr "Endre"
 
-#: ../finch/gntaccount.c:811 ../pidgin/gtkaccount.c:2441
+#: ../finch/gntaccount.c:812
+#: ../pidgin/gtkaccount.c:2348
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s har gjort %s til sin venn%s%s"
 
-#: ../finch/gntaccount.c:884 ../pidgin/gtkaccount.c:2493
+#: ../finch/gntaccount.c:885
+#: ../pidgin/gtkaccount.c:2400
 msgid "Add buddy to your list?"
 msgstr "Legg til venn i lista?"
 
-#: ../finch/gntaccount.c:944 ../pidgin/gtkaccount.c:2551
+#: ../finch/gntaccount.c:945
+#: ../pidgin/gtkaccount.c:2458
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "%s%s%s%s ønskjer å leggja %s til vennelista si %s%s"
 
-#: ../finch/gntaccount.c:969 ../finch/gntaccount.c:972
-#: ../finch/gntaccount.c:999 ../pidgin/gtkaccount.c:2574
-#: ../pidgin/gtkaccount.c:2580
+#: ../finch/gntaccount.c:970
+#: ../finch/gntaccount.c:973
+#: ../finch/gntaccount.c:1000
+#: ../pidgin/gtkaccount.c:2481
+#: ../pidgin/gtkaccount.c:2488
 msgid "Authorize buddy?"
 msgstr "Godkjenna venn?"
 
-#: ../finch/gntaccount.c:976 ../finch/gntaccount.c:1003
-#: ../pidgin/gtkaccount.c:2575 ../pidgin/gtkaccount.c:2581
+#: ../finch/gntaccount.c:977
+#: ../finch/gntaccount.c:1004
+#: ../pidgin/gtkaccount.c:2482
+#: ../pidgin/gtkaccount.c:2489
 msgid "Authorize"
 msgstr "Godkjenn"
 
-#: ../finch/gntaccount.c:977 ../finch/gntaccount.c:1004
-#: ../pidgin/gtkaccount.c:2576 ../pidgin/gtkaccount.c:2582
+#: ../finch/gntaccount.c:978
+#: ../finch/gntaccount.c:1005
+#: ../pidgin/gtkaccount.c:2483
+#: ../pidgin/gtkaccount.c:2490
 msgid "Deny"
 msgstr "Avslå"
 
-#: ../finch/gntblist.c:289
+#: ../finch/gntblist.c:265
+#, c-format
+msgid ""
+"Online: %d\n"
+"Total: %d"
+msgstr ""
+"Tilkopla: %d\n"
+"Totalt: %d"
+
+#: ../finch/gntblist.c:274
+#, c-format
+msgid "Account: %s (%s)"
+msgstr "Konto: %s (%s)"
+
+#: ../finch/gntblist.c:286
+#, c-format
+msgid ""
+"\n"
+"Last Seen: %s ago"
+msgstr ""
+"\n"
+"Sist sett: %s ago"
+
+#: ../finch/gntblist.c:306
+#: ../pidgin/gtkprefs.c:327
+#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
+msgid "Default"
+msgstr "Standard"
+
+#: ../finch/gntblist.c:563
 msgid "You must provide a screename for the buddy."
 msgstr "Du må gje vennen eit brukarnamn."
 
-#: ../finch/gntblist.c:291
+#: ../finch/gntblist.c:565
 msgid "You must provide a group."
 msgstr "Du må oppgje ei gruppe."
 
-#: ../finch/gntblist.c:293
+#: ../finch/gntblist.c:567
 msgid "You must select an account."
 msgstr "Du må velja ein konto."
 
-#: ../finch/gntblist.c:295
+#: ../finch/gntblist.c:569
 msgid "The selected account is not online."
 msgstr "Den valde kontoen er ikkje tilkopla."
 
-#: ../finch/gntblist.c:300
+#: ../finch/gntblist.c:574
 msgid "Error adding buddy"
 msgstr "Klarte ikkje å leggja til venn"
 
-#: ../finch/gntblist.c:325 ../libpurple/protocols/oscar/oscar.c:2888
-#: ../pidgin/gtkaccount.c:1981 ../pidgin/gtksavedstatuses.c:980
+#: ../finch/gntblist.c:601
+#: ../libpurple/protocols/oscar/oscar.c:2949
+#: ../pidgin/gtkaccount.c:1914
+#: ../pidgin/gtksavedstatuses.c:971
 msgid "Screen Name"
 msgstr "Brukarnamn"
 
-#: ../finch/gntblist.c:328 ../finch/gntblist.c:410 ../finch/gntblist.c:1250
-#: ../libpurple/protocols/msn/msn.c:1395
-#: ../libpurple/protocols/silc/chat.c:606
-#: ../libpurple/protocols/silc10/chat.c:590
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:704
-#: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1023
-#: ../pidgin/gtkdialogs.c:1047 ../pidgin/gtkdialogs.c:1069
-#: ../pidgin/gtkrequest.c:278
-msgid "Alias"
-msgstr "Alias"
+#: ../finch/gntblist.c:604
+msgid "Alias (optional)"
+msgstr "Alias (valfritt)"
 
-#: ../finch/gntblist.c:331 ../finch/gntblist.c:413
-msgid "Group"
-msgstr "Gruppe"
+#: ../finch/gntblist.c:607
+msgid "Add in group"
+msgstr "Legg til i gruppe"
 
-#: ../finch/gntblist.c:335 ../finch/gntblist.c:401 ../finch/gntblist.c:1305
-#: ../finch/gntnotify.c:174 ../finch/gntstatus.c:576
-#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:3008 ../pidgin/gtknotify.c:506
-#: ../pidgin/gtkpounce.c:1268 ../pidgin/plugins/gevolution/gevolution.c:445
+#: ../finch/gntblist.c:611
+#: ../finch/gntblist.c:678
+#: ../finch/gntblist.c:1648
+#: ../finch/gntblist.c:2583
+#: ../finch/gntblist.c:2637
+#: ../finch/gntblist.c:2702
+#: ../finch/gntnotify.c:174
+#: ../finch/gntstatus.c:576
+#: ../libpurple/plugins/idle.c:153
+#: ../libpurple/plugins/idle.c:190
+#: ../pidgin/gtkblist.c:3201
+#: ../pidgin/gtknotify.c:517
+#: ../pidgin/gtkpounce.c:1281
+#: ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr "Konto"
 
-#: ../finch/gntblist.c:341 ../finch/gntblist.c:852
+#: ../finch/gntblist.c:617
+#: ../finch/gntblist.c:1126
 #: ../libpurple/protocols/silc/buddy.c:725
-#: ../libpurple/protocols/silc/buddy.c:1027
-#: ../libpurple/protocols/silc/buddy.c:1072
-#: ../libpurple/protocols/silc/buddy.c:1182
+#: ../libpurple/protocols/silc/buddy.c:1030
+#: ../libpurple/protocols/silc/buddy.c:1075
+#: ../libpurple/protocols/silc/buddy.c:1185
 #: ../libpurple/protocols/silc10/buddy.c:737
-#: ../libpurple/protocols/silc10/buddy.c:1033
-#: ../libpurple/protocols/silc10/buddy.c:1080
-#: ../libpurple/protocols/silc10/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3343 ../pidgin/gtkblist.c:5483
+#: ../libpurple/protocols/silc10/buddy.c:1036
+#: ../libpurple/protocols/silc10/buddy.c:1083
+#: ../libpurple/protocols/silc10/buddy.c:1183
+#: ../libpurple/protocols/yahoo/yahoo.c:3380
+#: ../pidgin/gtkblist.c:6298
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "Legg til venn"
 
-#: ../finch/gntblist.c:341
+#: ../finch/gntblist.c:617
 msgid "Please enter buddy information."
 msgstr "Skriv inn venneinformasjonen."
 
-#: ../finch/gntblist.c:370 ../libpurple/blist.c:1209
+#: ../finch/gntblist.c:647
+#: ../libpurple/blist.c:1237
 msgid "Chats"
 msgstr "Prat"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:407 ../libpurple/protocols/jabber/jabber.c:924
-#: ../libpurple/protocols/jabber/jabber.c:927
-#: ../libpurple/protocols/msn/msn.c:1584 ../libpurple/protocols/msn/msn.c:1649
-#: ../libpurple/protocols/msn/msn.c:1676
-#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:582
-#: ../pidgin/gtkroomlist.c:618
+#: ../finch/gntblist.c:684
+#: ../finch/gntblist.c:2578
+#: ../finch/gntblist.c:2632
+#: ../finch/gntroomlist.c:298
+#: ../libpurple/protocols/jabber/jabber.c:981
+#: ../libpurple/protocols/jabber/jabber.c:984
+#: ../libpurple/protocols/msn/msn.c:1740
+#: ../libpurple/protocols/msn/msn.c:1805
+#: ../libpurple/protocols/msn/msn.c:1832
+#: ../libpurple/protocols/msnp9/msn.c:1596
+#: ../libpurple/protocols/msnp9/msn.c:1661
+#: ../libpurple/protocols/msnp9/msn.c:1688
+#: ../libpurple/protocols/qq/buddy_info.c:44
+#: ../pidgin/gtkplugin.c:652
+#: ../pidgin/gtkroomlist.c:749
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
 msgstr "Namn"
 
-#: ../finch/gntblist.c:416 ../finch/gntblist.c:819
+#: ../finch/gntblist.c:687
+#: ../finch/gntblist.c:1589
+#: ../libpurple/protocols/msn/msn.c:1559
+#: ../libpurple/protocols/msnp9/msn.c:1413
+#: ../libpurple/protocols/silc/chat.c:610
+#: ../libpurple/protocols/silc10/chat.c:590
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:704
+#: ../libpurple/protocols/zephyr/zephyr.c:792
+#: ../libpurple/protocols/zephyr/zephyr.c:1167
+#: ../pidgin/gtkdialogs.c:1015
+#: ../pidgin/gtkdialogs.c:1039
+#: ../pidgin/gtkdialogs.c:1061
+#: ../pidgin/gtkrequest.c:280
+msgid "Alias"
+msgstr "Alias"
+
+#: ../finch/gntblist.c:690
+#: ../finch/gntblist.c:2835
+msgid "Group"
+msgstr "Gruppe"
+
+#: ../finch/gntblist.c:693
+#: ../finch/gntblist.c:1093
 msgid "Auto-join"
 msgstr "Automatisk tilkopling"
 
-#: ../finch/gntblist.c:419 ../finch/gntblist.c:854 ../pidgin/gtkblist.c:5859
+#: ../finch/gntblist.c:696
+#: ../finch/gntblist.c:1128
+#: ../pidgin/gtkblist.c:6681
 msgid "Add Chat"
 msgstr "Legg til praterom"
 
-#: ../finch/gntblist.c:420
+#: ../finch/gntblist.c:697
 msgid "You can edit more information from the context menu later."
 msgstr "Du kan endra meir informasjon frå lokalmenyen seinare."
 
-#: ../finch/gntblist.c:433 ../finch/gntblist.c:446
+#: ../finch/gntblist.c:710
+#: ../finch/gntblist.c:723
 msgid "Error adding group"
 msgstr "Klarte ikkje å leggja til gruppe"
 
-#: ../finch/gntblist.c:434
+#: ../finch/gntblist.c:711
 msgid "You must give a name for the group to add."
 msgstr "Gruppa du ønskjer å leggja til må ha eit namn."
 
-#: ../finch/gntblist.c:447
+#: ../finch/gntblist.c:724
 msgid "A group with the name already exists."
 msgstr "Det finst allereie ei gruppe med det namnet."
 
-#: ../finch/gntblist.c:454 ../finch/gntblist.c:856
-#: ../libpurple/protocols/sametime/sametime.c:5396
-#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5963
+#: ../finch/gntblist.c:731
+#: ../finch/gntblist.c:1130
+#: ../libpurple/protocols/sametime/sametime.c:5450
+#: ../libpurple/protocols/sametime/sametime.c:5538
+#: ../pidgin/gtkblist.c:6764
 msgid "Add Group"
 msgstr "Legg til gruppe"
 
-#: ../finch/gntblist.c:454
+#: ../finch/gntblist.c:731
 msgid "Enter the name of the group"
 msgstr "Skriv inn namnet på gruppa"
 
-#: ../finch/gntblist.c:802
+#: ../finch/gntblist.c:1076
 msgid "Edit Chat"
 msgstr "Endra praterom"
 
-#: ../finch/gntblist.c:802
+#: ../finch/gntblist.c:1076
 msgid "Please Update the necessary fields."
 msgstr "Oppdater dei nødvendige felta."
 
-#: ../finch/gntblist.c:803 ../finch/gntstatus.c:205
+#: ../finch/gntblist.c:1077
+#: ../finch/gntstatus.c:205
 msgid "Edit"
 msgstr "Endre"
 
-#: ../finch/gntblist.c:828
+#: ../finch/gntblist.c:1102
 msgid "Edit Settings"
 msgstr "Endra innstillingar"
 
-#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
+#: ../finch/gntblist.c:1138
+#: ../pidgin/gtkutils.c:980
 msgid "Information"
 msgstr "Informasjon"
 
-#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
+#: ../finch/gntblist.c:1138
+#: ../pidgin/gtkutils.c:980
 msgid "Retrieving..."
 msgstr "Hentar…"
 
-#: ../finch/gntblist.c:904 ../finch/gntconv.c:507
-#: ../libpurple/protocols/silc/chat.c:899
+#: ../finch/gntblist.c:1192
+#: ../finch/gntconv.c:591
+#: ../libpurple/protocols/silc/chat.c:903
 #: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr "Hent info"
 
-#: ../finch/gntblist.c:908
+#: ../finch/gntblist.c:1196
 msgid "Add Buddy Pounce"
 msgstr "Legg til vennevarsling"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:915 ../finch/gntconv.c:519
-#: ../libpurple/protocols/jabber/si.c:874
-#: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:587
-#: ../pidgin/gtkconv.c:1607
+#: ../finch/gntblist.c:1203
+#: ../finch/gntconv.c:603
+#: ../libpurple/protocols/jabber/si.c:1109
+#: ../libpurple/protocols/oscar/oscar.c:653
+#: ../libpurple/protocols/qq/qq.c:588
+#: ../pidgin/gtkconv.c:1650
 msgid "Send File"
 msgstr "Send fil"
 
-#: ../finch/gntblist.c:919
+#: ../finch/gntblist.c:1210
+#: ../libpurple/protocols/gg/gg.c:1629
+#: ../libpurple/protocols/msn/msn.c:660
+#: ../libpurple/protocols/msnp9/msn.c:562
+msgid "Blocked"
+msgstr "Blokkert"
+
+#: ../finch/gntblist.c:1216
+#: ../finch/gntblist.c:1605
 msgid "View Log"
 msgstr "Vis l_ogg"
 
-#: ../finch/gntblist.c:1000
+#: ../finch/gntblist.c:1298
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "Skriv inn det nye namnet til %s"
 
-#: ../finch/gntblist.c:1002 ../finch/gntblist.c:1250
+#: ../finch/gntblist.c:1300
+#: ../finch/gntblist.c:1589
 msgid "Rename"
 msgstr "Gje nytt namn"
 
-#: ../finch/gntblist.c:1002
+#: ../finch/gntblist.c:1300
 msgid "Set Alias"
-msgstr "Skriv alias:"
+msgstr "Vel alias"
 
-#: ../finch/gntblist.c:1003
+#: ../finch/gntblist.c:1301
 msgid "Enter empty string to reset the name."
 msgstr "Legg inn ein tom tekststreng for å nullstilla namnet."
 
-#: ../finch/gntblist.c:1079
+#: ../finch/gntblist.c:1415
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr "Å sletta denne kontakten vil òg sletta alle vennane til kontakten"
 
-#: ../finch/gntblist.c:1087
+#: ../finch/gntblist.c:1423
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr "Å sletta denne gruppa vil òg sletta alle vennane i gruppa"
 
-#: ../finch/gntblist.c:1092
+#: ../finch/gntblist.c:1428
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "Er du sikker på at du ønskjer å sletta %s?"
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1095
+#: ../finch/gntblist.c:1431
 msgid "Confirm Remove"
 msgstr "Stadfest fjerninga"
 
-#: ../finch/gntblist.c:1100 ../finch/gntblist.c:1252 ../finch/gntft.c:227
-#: ../pidgin/gtkconv.c:1656 ../pidgin/gtkrequest.c:276
-#: ../pidgin/gtkstatusbox.c:264
+#: ../finch/gntblist.c:1436
+#: ../finch/gntblist.c:1591
+#: ../finch/gntft.c:243
+#: ../pidgin/gtkconv.c:1699
+#: ../pidgin/gtkrequest.c:278
+#: ../pidgin/gtkstatusbox.c:267
 msgid "Remove"
 msgstr "_Fjern"
 
 #. Buddy List
-#: ../finch/gntblist.c:1226 ../finch/gntblist.c:2307 ../finch/gntprefs.c:258
-#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2688 ../pidgin/gtkblist.c:4284
+#: ../finch/gntblist.c:1565
+#: ../finch/gntblist.c:2876
+#: ../finch/gntprefs.c:258
+#: ../finch/gntui.c:95
+#: ../pidgin/gtkblist.c:5037
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "Venneliste"
 
-#: ../finch/gntblist.c:1257
+#: ../finch/gntblist.c:1596
 msgid "Place tagged"
 msgstr "Merka stad"
 
-#: ../finch/gntblist.c:1262
+#: ../finch/gntblist.c:1601
 msgid "Toggle Tag"
 msgstr "Slå merke av/på"
 
 #. General
-#: ../finch/gntblist.c:1298 ../libpurple/protocols/gg/gg.c:637
-#: ../libpurple/protocols/gg/gg.c:1050 ../libpurple/protocols/gg/gg.c:1123
-#: ../libpurple/protocols/gg/gg.c:2207
+#: ../finch/gntblist.c:1641
+#: ../libpurple/protocols/gg/gg.c:638
+#: ../libpurple/protocols/gg/gg.c:1052
+#: ../libpurple/protocols/gg/gg.c:1125
+#: ../libpurple/protocols/gg/gg.c:2228
 #: ../libpurple/protocols/jabber/buddy.c:286
-#: ../libpurple/protocols/jabber/buddy.c:1247
-#: ../libpurple/protocols/jabber/buddy.c:2214
-#: ../libpurple/protocols/jabber/buddy.c:2396
-#: ../libpurple/protocols/jabber/jabber.c:937
-#: ../libpurple/protocols/jabber/jabber.c:1544
-#: ../libpurple/protocols/jabber/jabber.c:1567
-#: ../libpurple/protocols/jabber/jabber.c:1590
-#: ../libpurple/protocols/jabber/jabber.c:1613
-#: ../libpurple/protocols/jabber/jabber.c:1636
-#: ../libpurple/protocols/msn/msn.c:1403 ../libpurple/protocols/msn/msn.c:1587
+#: ../libpurple/protocols/jabber/buddy.c:1251
+#: ../libpurple/protocols/jabber/buddy.c:2221
+#: ../libpurple/protocols/jabber/buddy.c:2413
+#: ../libpurple/protocols/jabber/jabber.c:992
+#: ../libpurple/protocols/jabber/jabber.c:1604
+#: ../libpurple/protocols/jabber/jabber.c:1618
+#: ../libpurple/protocols/jabber/jabber.c:1632
+#: ../libpurple/protocols/jabber/jabber.c:1646
+#: ../libpurple/protocols/jabber/jabber.c:1660
+#: ../libpurple/protocols/msn/msn.c:1567
+#: ../libpurple/protocols/msn/msn.c:1743
+#: ../libpurple/protocols/msnp9/msn.c:1421
+#: ../libpurple/protocols/msnp9/msn.c:1599
 #: ../libpurple/protocols/qq/buddy_info.c:43
-#: ../libpurple/protocols/silc/buddy.c:1535
+#: ../libpurple/protocols/silc/buddy.c:1538
 #: ../libpurple/protocols/silc/ops.c:1002
 #: ../libpurple/protocols/silc/ops.c:1186
-#: ../libpurple/protocols/silc/ops.c:1322
-#: ../libpurple/protocols/silc10/buddy.c:1535
+#: ../libpurple/protocols/silc/ops.c:1324
+#: ../libpurple/protocols/silc10/buddy.c:1538
 #: ../libpurple/protocols/silc10/ops.c:1036
 #: ../libpurple/protocols/silc10/ops.c:1179
 #: ../libpurple/protocols/silc10/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3032
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066
+#: ../pidgin/gtkblist.c:3225
 msgid "Nickname"
 msgstr "Kallenamn"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1320 ../finch/gntprefs.c:261
-#: ../libpurple/protocols/bonjour/bonjour.c:340
-#: ../libpurple/protocols/jabber/buddy.c:787
-#: ../libpurple/protocols/jabber/buddy.c:951
-#: ../libpurple/protocols/msn/msn.c:544 ../libpurple/protocols/msn/state.c:32
-#: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2912
-#: ../libpurple/protocols/yahoo/yahoo.c:3097
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3060
-#: ../pidgin/gtkblist.c:3460 ../pidgin/gtkprefs.c:1925
+#: ../finch/gntblist.c:1663
+#: ../finch/gntprefs.c:261
+#: ../libpurple/protocols/bonjour/bonjour.c:376
+#: ../libpurple/protocols/jabber/buddy.c:789
+#: ../libpurple/protocols/jabber/buddy.c:953
+#: ../libpurple/protocols/msn/msn.c:607
+#: ../libpurple/protocols/msn/msn.c:625
+#: ../libpurple/protocols/msn/msn.c:633
+#: ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/msnp9/msn.c:541
+#: ../libpurple/protocols/msnp9/state.c:32
+#: ../libpurple/protocols/novell/novell.c:2843
+#: ../libpurple/protocols/oscar/oscar.c:2973
+#: ../libpurple/protocols/yahoo/yahoo.c:3134
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:710
+#: ../pidgin/gtkblist.c:3253
+#: ../pidgin/gtkblist.c:3703
+#: ../pidgin/gtkprefs.c:1946
 msgid "Idle"
 msgstr "Uverksam"
 
-#: ../finch/gntblist.c:1334
+#: ../finch/gntblist.c:1677
 msgid "On Mobile"
 msgstr "PÃ¥ mobil"
 
-#: ../finch/gntblist.c:1415
-#, c-format
-msgid ""
-"Online: %d\n"
-"Total: %d"
-msgstr ""
-"Tilkopla: %d\n"
-"Totalt: %d"
-
-#: ../finch/gntblist.c:1424
-#, c-format
-msgid "Account: %s (%s)"
-msgstr "Konto: %s (%s)"
-
-#: ../finch/gntblist.c:1436
-#, c-format
-msgid ""
-"\n"
-"Last Seen: %s ago"
-msgstr ""
-"\n"
-"Sist sett: %s ago"
-
-#: ../finch/gntblist.c:1702 ../pidgin/gtkdocklet.c:470
-#: ../pidgin/gtkstatusbox.c:1072
+#: ../finch/gntblist.c:1976
+#: ../pidgin/gtkdocklet.c:582
 msgid "New..."
 msgstr "Ny…"
 
-#: ../finch/gntblist.c:1709 ../pidgin/gtkdocklet.c:471
-#: ../pidgin/gtkstatusbox.c:1073
+#: ../finch/gntblist.c:1983
+#: ../pidgin/gtkdocklet.c:583
 msgid "Saved..."
 msgstr "Lagra…"
 
-#: ../finch/gntblist.c:2087 ../finch/gntplugin.c:255 ../finch/gntui.c:88
-#: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:531
+#: ../finch/gntblist.c:2437
+#: ../finch/gntplugin.c:352
+#: ../finch/gntui.c:100
+#: ../pidgin/gtkdocklet.c:717
+#: ../pidgin/gtkplugin.c:601
 msgid "Plugins"
 msgstr "Tilleggsprogram"
 
-#: ../finch/gntblist.c:2203 ../pidgin/gtkdialogs.c:754
-#: ../pidgin/gtkdialogs.c:893 ../pidgin/gtkdialogs.c:974
-msgid "_Name"
-msgstr "_Namn"
+#: ../finch/gntblist.c:2591
+#: ../finch/gntblist.c:2596
+msgid "Block/Unblock"
+msgstr "Blokker/avblokker"
 
-#: ../finch/gntblist.c:2208 ../pidgin/gtkdialogs.c:759
-#: ../pidgin/gtkdialogs.c:898 ../pidgin/gtkdialogs.c:979
-msgid "_Account"
-msgstr "_Konto"
+#: ../finch/gntblist.c:2592
+#: ../libpurple/protocols/gg/gg.c:1665
+msgid "Block"
+msgstr "Blokker"
 
-#: ../finch/gntblist.c:2216 ../pidgin/gtkdialogs.c:767
-msgid "New Instant Message"
-msgstr "Ny lynmelding"
+#: ../finch/gntblist.c:2593
+#: ../libpurple/protocols/gg/gg.c:1661
+msgid "Unblock"
+msgstr "Avblokker"
 
-#: ../finch/gntblist.c:2218 ../pidgin/gtkdialogs.c:769
-msgid ""
-"Please enter the screen name or alias of the person you would like to IM."
-msgstr ""
-"Skriv inn brukarnamnet eller kallenamnet til brukaren du ønskjer å prata med."
+#: ../finch/gntblist.c:2598
+msgid "Please enter the screen name or alias of the person you would like to Block/Unblock."
+msgstr "Skriv inn brukarnamnet eller kallenamnet til personen du ønskjer å blokkera/avblokkera."
 
 #. Not multiline
 #. Not masked?
 #. No hints?
-#: ../finch/gntblist.c:2221 ../finch/gntcertmgr.c:90 ../finch/gntconn.c:135
-#: ../finch/gntnotify.c:80 ../libpurple/account.c:1012
-#: ../libpurple/account.c:1262 ../libpurple/protocols/gg/gg.c:506
-#: ../libpurple/protocols/gg/gg.c:665 ../libpurple/protocols/gg/gg.c:802
-#: ../libpurple/protocols/jabber/jabber.c:1736
+#: ../finch/gntblist.c:2601
+#: ../finch/gntblist.c:2650
+#: ../finch/gntcertmgr.c:89
+#: ../finch/gntconn.c:137
+#: ../finch/gntnotify.c:80
+#: ../finch/plugins/gnthistory.c:177
+#: ../libpurple/account.c:1115
+#: ../libpurple/account.c:1418
+#: ../libpurple/protocols/gg/gg.c:507
+#: ../libpurple/protocols/gg/gg.c:666
+#: ../libpurple/protocols/gg/gg.c:803
+#: ../libpurple/protocols/jabber/jabber.c:1776
 #: ../libpurple/protocols/jabber/xdata.c:399
-#: ../libpurple/protocols/msn/msn.c:286 ../libpurple/protocols/msn/msn.c:303
-#: ../libpurple/protocols/msn/msn.c:320 ../libpurple/protocols/msn/msn.c:337
-#: ../libpurple/protocols/oscar/oscar.c:6093
+#: ../libpurple/protocols/msn/msn.c:286
+#: ../libpurple/protocols/msn/msn.c:303
+#: ../libpurple/protocols/msn/msn.c:320
+#: ../libpurple/protocols/msn/msn.c:337
+#: ../libpurple/protocols/msnp9/msn.c:283
+#: ../libpurple/protocols/msnp9/msn.c:300
+#: ../libpurple/protocols/msnp9/msn.c:317
+#: ../libpurple/protocols/msnp9/msn.c:334
+#: ../libpurple/protocols/myspace/user.c:581
+#: ../libpurple/protocols/myspace/user.c:675
+#: ../libpurple/protocols/oscar/oscar.c:6196
 #: ../libpurple/protocols/silc/buddy.c:454
-#: ../libpurple/protocols/silc/buddy.c:1190
-#: ../libpurple/protocols/silc/chat.c:447
-#: ../libpurple/protocols/silc/chat.c:482
-#: ../libpurple/protocols/silc/chat.c:745
-#: ../libpurple/protocols/silc/ops.c:1291
-#: ../libpurple/protocols/silc/ops.c:1815
-#: ../libpurple/protocols/silc/silc.c:822
+#: ../libpurple/protocols/silc/buddy.c:1193
+#: ../libpurple/protocols/silc/chat.c:449
+#: ../libpurple/protocols/silc/chat.c:486
+#: ../libpurple/protocols/silc/chat.c:749
+#: ../libpurple/protocols/silc/ops.c:1293
+#: ../libpurple/protocols/silc/ops.c:1819
+#: ../libpurple/protocols/silc/silc.c:965
 #: ../libpurple/protocols/silc10/buddy.c:467
-#: ../libpurple/protocols/silc10/buddy.c:1188
+#: ../libpurple/protocols/silc10/buddy.c:1191
 #: ../libpurple/protocols/silc10/chat.c:425
 #: ../libpurple/protocols/silc10/chat.c:464
 #: ../libpurple/protocols/silc10/chat.c:729
 #: ../libpurple/protocols/silc10/ops.c:1297
-#: ../libpurple/protocols/silc10/ops.c:1903
-#: ../libpurple/protocols/silc10/silc.c:735
-#: ../libpurple/protocols/yahoo/yahoo.c:1031
-#: ../libpurple/protocols/yahoo/yahoo.c:3497
-#: ../libpurple/protocols/yahoo/yahoo.c:3508 ../pidgin/gtkblist.c:4039
-#: ../pidgin/gtkcertmgr.c:195 ../pidgin/gtkdialogs.c:772
-#: ../pidgin/gtkdialogs.c:911 ../pidgin/gtkdialogs.c:1003
-#: ../pidgin/gtkrequest.c:270
+#: ../libpurple/protocols/silc10/ops.c:1909
+#: ../libpurple/protocols/silc10/silc.c:741
+#: ../libpurple/protocols/yahoo/yahoo.c:992
+#: ../libpurple/protocols/yahoo/yahoo.c:3534
+#: ../libpurple/protocols/yahoo/yahoo.c:3545
+#: ../pidgin/gtkcertmgr.c:195
+#: ../pidgin/gtkdialogs.c:764
+#: ../pidgin/gtkdialogs.c:903
+#: ../pidgin/gtkdialogs.c:995
+#: ../pidgin/gtkrequest.c:272
 msgid "OK"
 msgstr "OK"
 
+#: ../finch/gntblist.c:2645
+#: ../pidgin/gtkdialogs.c:759
+msgid "New Instant Message"
+msgstr "Ny lynmelding"
+
+#: ../finch/gntblist.c:2647
+#: ../pidgin/gtkdialogs.c:761
+msgid "Please enter the screen name or alias of the person you would like to IM."
+msgstr "Skriv inn brukarnamnet eller kallenamnet til brukaren du ønskjer å prata med."
+
+#: ../finch/gntblist.c:2698
+msgid "Channel"
+msgstr "Kanal"
+
+#: ../finch/gntblist.c:2710
+#: ../pidgin/gtkblist.c:951
+msgid "Join a Chat"
+msgstr "GÃ¥ inn i eit praterom"
+
+#: ../finch/gntblist.c:2712
+msgid "Please enter the name of the chat you want to join."
+msgstr "Skriv inn namnet på praterommet du vil bli med i."
+
+#: ../finch/gntblist.c:2714
+#: ../finch/gntnotify.c:394
+msgid "Join"
+msgstr "Bli med"
+
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2241 ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:790
+#: ../finch/gntblist.c:2759
+#: ../finch/gntpounce.c:459
+#: ../pidgin/gtkpounce.c:802
 msgid "Options"
 msgstr "Val"
 
-#: ../finch/gntblist.c:2247
+#: ../finch/gntblist.c:2765
 msgid "Send IM..."
 msgstr "Send lynmelding…"
 
-#: ../finch/gntblist.c:2251
-#, fuzzy
-msgid "Show empty groups"
-msgstr "Vis tomme grupper"
+#: ../finch/gntblist.c:2770
+msgid "Block/Unblock..."
+msgstr "Blokker/avblokker…"
 
-#: ../finch/gntblist.c:2257
-#, fuzzy
-msgid "Show offline buddies"
-msgstr "Vis fråkopla vennar"
+#: ../finch/gntblist.c:2775
+msgid "Join Chat..."
+msgstr "Bli med i praterom…"
 
-#: ../finch/gntblist.c:2263
-msgid "Sort by status"
-msgstr "Sorter etter tilstand"
+#: ../finch/gntblist.c:2780
+msgid "Show"
+msgstr "Vis"
 
-#: ../finch/gntblist.c:2267
-msgid "Sort alphabetically"
-msgstr "Sorter alfabetisk "
+#: ../finch/gntblist.c:2785
+msgid "Empty groups"
+msgstr "Tomme grupper"
 
-#: ../finch/gntblist.c:2271
-msgid "Sort by log size"
-msgstr "Sorter etter loggstorleiken"
+#: ../finch/gntblist.c:2792
+msgid "Offline buddies"
+msgstr "Fråkopla vennar"
 
-#: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:188
-#, fuzzy
+#: ../finch/gntblist.c:2799
+msgid "Sort"
+msgstr "Sorter"
+
+#: ../finch/gntblist.c:2804
+msgid "By Status"
+msgstr "Etter status"
+
+#: ../finch/gntblist.c:2809
+#: ../pidgin/gtkblist.c:4194
+msgid "Alphabetically"
+msgstr "Alfabetisk "
+
+#: ../finch/gntblist.c:2814
+msgid "By Log Size"
+msgstr "Etter loggstorleiken"
+
+#: ../finch/gntblist.c:2825
+msgid "Buddy"
+msgstr "Venn"
+
+#: ../finch/gntblist.c:2830
+#: ../libpurple/protocols/oscar/oscar.c:647
+#: ../libpurple/protocols/silc/silc.c:911
+#: ../libpurple/protocols/silc/util.c:559
+#: ../libpurple/protocols/silc10/silc.c:685
+#: ../libpurple/protocols/silc10/util.c:549
+msgid "Chat"
+msgstr "Prat"
+
+#: ../finch/gntblist.c:2840
+#: ../finch/plugins/grouping.c:255
+msgid "Grouping"
+msgstr "Gruppering"
+
+#: ../finch/gntcertmgr.c:85
+#: ../pidgin/gtkcertmgr.c:188
 msgid "Certificate Import"
-msgstr "Sertifikat"
+msgstr "Sertifikatimport"
 
-#: ../finch/gntcertmgr.c:87 ../pidgin/gtkcertmgr.c:189
+#: ../finch/gntcertmgr.c:86
+#: ../pidgin/gtkcertmgr.c:189
 msgid "Specify a hostname"
-msgstr ""
+msgstr "Før opp eit vertsnamn"
 
-#: ../finch/gntcertmgr.c:88 ../pidgin/gtkcertmgr.c:190
+#: ../finch/gntcertmgr.c:87
+#: ../pidgin/gtkcertmgr.c:190
 msgid "Type the host name this certificate is for."
-msgstr ""
+msgstr "SKriv inn vertsnamnet dette sertifikatet er for."
 
-#: ../finch/gntcertmgr.c:97 ../pidgin/gtkcertmgr.c:210
+#: ../finch/gntcertmgr.c:96
+#: ../pidgin/gtkcertmgr.c:210
 #, c-format
 msgid ""
 "File %s could not be imported.\n"
 "Make sure that the file is readable and in PEM format.\n"
 msgstr ""
+"Klarte ikkje å importera fila %s.\n"
+"Sjå til at fila kan lesast og at ho er i PEM-format.\n"
 
-#: ../finch/gntcertmgr.c:99 ../pidgin/gtkcertmgr.c:212
-#, fuzzy
+#: ../finch/gntcertmgr.c:98
+#: ../pidgin/gtkcertmgr.c:212
 msgid "Certificate Import Error"
-msgstr "Sertifikat"
+msgstr "Sertifikatimportfeil"
 
-#: ../finch/gntcertmgr.c:100 ../pidgin/gtkcertmgr.c:213
-#, fuzzy
+#: ../finch/gntcertmgr.c:99
+#: ../pidgin/gtkcertmgr.c:213
 msgid "X.509 certificate import failed"
-msgstr "X.509-sertifikat"
+msgstr "X.509-sertifikatimporten feila"
 
-#: ../finch/gntcertmgr.c:110 ../pidgin/gtkcertmgr.c:224
-#, fuzzy
+#: ../finch/gntcertmgr.c:109
+#: ../pidgin/gtkcertmgr.c:224
 msgid "Select a PEM certificate"
-msgstr "Vel ei fil"
+msgstr "Vel eit PEM-sertifikat"
 
-#: ../finch/gntcertmgr.c:127 ../pidgin/gtkcertmgr.c:245
+#: ../finch/gntcertmgr.c:126
+#: ../pidgin/gtkcertmgr.c:245
 #, c-format
 msgid ""
 "Export to file %s failed.\n"
 "Check that you have write permission to the target path\n"
 msgstr ""
+"Klarte ikkje å eksportera fila %s.\n"
+"Sjå til at du har skriverettar til målbana.\n"
 
-#: ../finch/gntcertmgr.c:129 ../pidgin/gtkcertmgr.c:247
-#, fuzzy
+#: ../finch/gntcertmgr.c:128
+#: ../pidgin/gtkcertmgr.c:247
 msgid "Certificate Export Error"
-msgstr "Sertifikat"
+msgstr "Sertifikateksportfeil"
 
-#: ../finch/gntcertmgr.c:130 ../pidgin/gtkcertmgr.c:248
-#, fuzzy
+#: ../finch/gntcertmgr.c:129
+#: ../pidgin/gtkcertmgr.c:248
 msgid "X.509 certificate export failed"
-msgstr "X.509-sertifikat"
+msgstr "X.509-sertifikateksporten feila"
 
-#: ../finch/gntcertmgr.c:159 ../pidgin/gtkcertmgr.c:299
-#, fuzzy
+#: ../finch/gntcertmgr.c:158
+#: ../pidgin/gtkcertmgr.c:298
 msgid "PEM X.509 Certificate Export"
-msgstr "X.509-sertifikat"
+msgstr "PEM X.509-sertifikateksport"
 
-#: ../finch/gntcertmgr.c:188
-#, fuzzy, c-format
+#: ../finch/gntcertmgr.c:187
+#, c-format
 msgid "Certificate for %s"
-msgstr "Sertifikat"
+msgstr "Sertifikat for %s"
 
-#: ../finch/gntcertmgr.c:195
+#: ../finch/gntcertmgr.c:194
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -752,114 +1017,140 @@ msgstr ""
 "SHA1 fingerprint:\n"
 "%s"
 msgstr ""
+"Namn: %s\n"
+"\n"
+"SHA1-fingeravtrykk:\n"
+"%s"
 
-#: ../finch/gntcertmgr.c:198
-#, fuzzy
+#: ../finch/gntcertmgr.c:197
 msgid "SSL Host Certificate"
-msgstr "Sertifikat"
+msgstr "SSL vertssertifikat"
 
-#: ../finch/gntcertmgr.c:233 ../pidgin/gtkcertmgr.c:372
+#: ../finch/gntcertmgr.c:232
+#: ../pidgin/gtkcertmgr.c:371
 #, c-format
 msgid "Really delete certificate for %s?"
-msgstr ""
+msgstr "Verkeleg sletta sertifikatet for %s?"
 
-#: ../finch/gntcertmgr.c:236 ../pidgin/gtkcertmgr.c:374
+#: ../finch/gntcertmgr.c:235
+#: ../pidgin/gtkcertmgr.c:373
 msgid "Confirm certificate delete"
-msgstr ""
+msgstr "Stadfest sertifikatslettinga"
 
-#: ../finch/gntcertmgr.c:293 ../pidgin/gtkcertmgr.c:602
-#, fuzzy
+#: ../finch/gntcertmgr.c:292
+#: ../pidgin/gtkcertmgr.c:613
 msgid "Certificate Manager"
-msgstr "Sertifikat"
+msgstr "Sertifikatstyrar"
 
 #. Creating the user splits
-#: ../finch/gntcertmgr.c:298 ../libpurple/protocols/bonjour/bonjour.c:652
-#: ../libpurple/protocols/silc/silc.c:1007
-#: ../libpurple/protocols/silc10/silc.c:918
+#: ../finch/gntcertmgr.c:297
+#: ../libpurple/protocols/bonjour/bonjour.c:694
+#: ../libpurple/protocols/silc/silc.c:1150
+#: ../libpurple/protocols/silc10/silc.c:924
+#: ../pidgin/gtkcertmgr.c:446
 msgid "Hostname"
 msgstr "Vertsnamn"
 
-#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:383 ../pidgin/gtkconv.c:1635
-#: ../pidgin/gtkdebug.c:835
+#: ../finch/gntcertmgr.c:314
+#: ../finch/gntnotify.c:388
+#: ../pidgin/gtkconv.c:1678
+#: ../pidgin/gtkdebug.c:832
 msgid "Info"
 msgstr "Informasjon"
 
 #. Close button
-#: ../finch/gntcertmgr.c:324 ../finch/gntft.c:237 ../finch/gntnotify.c:182
-#: ../finch/gntplugin.c:210 ../finch/gntplugin.c:310 ../finch/gntpounce.c:738
-#: ../finch/gntstatus.c:216 ../libpurple/protocols/msn/msn.c:403
-#: ../libpurple/protocols/silc/util.c:382
-#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2468
-#: ../pidgin/gtkrequest.c:273
+#: ../finch/gntcertmgr.c:323
+#: ../finch/gntft.c:253
+#: ../finch/gntnotify.c:182
+#: ../finch/gntplugin.c:220
+#: ../finch/gntplugin.c:413
+#: ../finch/gntpounce.c:750
+#: ../finch/gntroomlist.c:275
+#: ../finch/gntstatus.c:216
+#: ../libpurple/protocols/msn/msn.c:403
+#: ../libpurple/protocols/msnp9/msn.c:400
+#: ../libpurple/protocols/silc/util.c:388
+#: ../libpurple/protocols/silc10/util.c:377
+#: ../pidgin/gtkaccount.c:2375
+#: ../pidgin/gtkrequest.c:275
 msgid "Close"
 msgstr "Lukk"
 
-#: ../finch/gntconn.c:124
+#: ../finch/gntconn.c:126
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:127
+#: ../finch/gntconn.c:129
 #, c-format
 msgid "%s disconnected."
 msgstr "%s fråkopla."
 
-#: ../finch/gntconn.c:128
+#: ../finch/gntconn.c:130
 #, c-format
 msgid ""
 "%s\n"
 "\n"
-"Finch will not attempt to reconnect the account until you correct the error "
-"and re-enable the account."
+"Finch will not attempt to reconnect the account until you correct the error and re-enable the account."
 msgstr ""
 "%s\n"
 "\n"
-"Finch vil ikkje prøva å kople til kontoen på nytt før feilen er retta og "
-"kontoen er teken i bruk att."
+"Finch vil ikkje prøva å kople til kontoen på nytt før feilen er retta og kontoen er teken i bruk att."
 
-#: ../finch/gntconn.c:137 ../pidgin/gtkblist.c:4041
+#: ../finch/gntconn.c:139
 msgid "Re-enable Account"
 msgstr "Ta kontoen i bruk att "
 
-#: ../finch/gntconv.c:139
+#: ../finch/gntconn.c:156
+msgid "The account has disconnected and you are no longer in this chat. You will be automatically rejoined in the chat when the account reconnects."
+msgstr "Kontoen har kopla frå og du er ikkje lenger med i denne praten. Du vil automatisk bli med igjen når kontoen koplar seg til att."
+
+#: ../finch/gntconv.c:159
 msgid "No such command."
 msgstr "Kommandoen finst ikkje."
 
-#: ../finch/gntconv.c:143 ../pidgin/gtkconv.c:489
+#: ../finch/gntconv.c:163
+#: ../pidgin/gtkconv.c:492
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr "Syntaksfeil:  du skreiv ikkje rett tal argument til kommandoen"
 
-#: ../finch/gntconv.c:148 ../pidgin/gtkconv.c:495
+#: ../finch/gntconv.c:168
+#: ../pidgin/gtkconv.c:498
 msgid "Your command failed for an unknown reason."
 msgstr "Kommandoen din feila av ukjend årsak."
 
-#: ../finch/gntconv.c:153 ../pidgin/gtkconv.c:502
+#: ../finch/gntconv.c:173
+#: ../pidgin/gtkconv.c:505
 msgid "That command only works in chats, not IMs."
 msgstr "Den kommandoen verkar berre i praterom, ikkje i lynmeldingar."
 
-#: ../finch/gntconv.c:156 ../pidgin/gtkconv.c:505
+#: ../finch/gntconv.c:176
+#: ../pidgin/gtkconv.c:508
 msgid "That command only works in IMs, not chats."
 msgstr "Den kommandoen verkar berre i lynmeldingar, ikkje i praterom."
 
-#: ../finch/gntconv.c:160 ../pidgin/gtkconv.c:510
+#: ../finch/gntconv.c:180
+#: ../pidgin/gtkconv.c:513
 msgid "That command doesn't work on this protocol."
 msgstr "Den kommandoen verkar ikkje i denne protokollen."
 
-#: ../finch/gntconv.c:168
+#: ../finch/gntconv.c:188
 msgid "Message was not sent, because you are not signed on."
 msgstr "Meldinga blei ikkje sendt sia du ikkje er pålogga."
 
-#: ../finch/gntconv.c:251
+#: ../finch/gntconv.c:268
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:274
+#: ../finch/gntconv.c:291
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:279 ../finch/gntconv.c:773
+#: ../finch/gntconv.c:296
+#: ../finch/gntconv.c:880
+#: ../pidgin/gtkconv.c:3479
 #, c-format
 msgid ""
 "\n"
@@ -868,67 +1159,74 @@ msgstr ""
 "\n"
 "%s skriv…"
 
-#: ../finch/gntconv.c:298
+#: ../finch/gntconv.c:315
 msgid "You have left this chat."
 msgstr "Du har forlate dette praterommet."
 
-#: ../finch/gntconv.c:387 ../pidgin/gtkconv.c:1362
+#: ../finch/gntconv.c:433
+#: ../pidgin/gtkconv.c:1384
 msgid "Logging started. Future messages in this conversation will be logged."
-msgstr ""
-"Logginga er starta. Framtidige meldingar i denne samtala vil bli logga."
+msgstr "Logginga er starta. Framtidige meldingar i denne samtala vil bli logga."
 
-#: ../finch/gntconv.c:393 ../pidgin/gtkconv.c:1370
-msgid ""
-"Logging stopped. Future messages in this conversation will not be logged."
-msgstr ""
-"Logginga er stoppa. Framtidige meldingar i denne samtala vil ikkje bli logga."
+#: ../finch/gntconv.c:437
+#: ../pidgin/gtkconv.c:1392
+msgid "Logging stopped. Future messages in this conversation will not be logged."
+msgstr "Logginga er stoppa. Framtidige meldingar i denne samtala vil ikkje bli logga."
 
-#: ../finch/gntconv.c:442
+#: ../finch/gntconv.c:523
 msgid "Send To"
 msgstr "Send til"
 
-#: ../finch/gntconv.c:486
+#: ../finch/gntconv.c:568
 msgid "Conversation"
 msgstr "Prat"
 
-#: ../finch/gntconv.c:492
+#: ../finch/gntconv.c:574
 msgid "Clear Scrollback"
 msgstr "Tøm skjerm"
 
-#: ../finch/gntconv.c:496 ../finch/gntprefs.c:191
+#: ../finch/gntconv.c:578
+#: ../finch/gntprefs.c:191
 msgid "Show Timestamps"
 msgstr "Vis tidsstempel"
 
-#: ../finch/gntconv.c:512
+#: ../finch/gntconv.c:596
 msgid "Add Buddy Pounce..."
 msgstr "Legg til vennevarsling…"
 
-#: ../finch/gntconv.c:527
+#: ../finch/gntconv.c:611
+msgid "View Log..."
+msgstr "Sjå på loggen…"
+
+#: ../finch/gntconv.c:615
 msgid "Enable Logging"
 msgstr "Bruk logging"
 
-#: ../finch/gntconv.c:533
+#: ../finch/gntconv.c:621
 msgid "Enable Sounds"
 msgstr "Bruk lydar"
 
-#: ../finch/gntconv.c:739
+#: ../finch/gntconv.c:833
 msgid "<AUTO-REPLY> "
 msgstr "<AUTO-REPLY> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:861
+#: ../finch/gntconv.c:968
 msgid "List of users:\n"
 msgstr "Brukarliste:\n"
 
-#: ../finch/gntconv.c:1023 ../pidgin/gtkconv.c:331
+#: ../finch/gntconv.c:1130
+#: ../pidgin/gtkconv.c:337
 msgid "Supported debug options are:  version"
 msgstr "Støtta feilsøkingsval er:  versjon"
 
-#: ../finch/gntconv.c:1059 ../pidgin/gtkconv.c:381
+#: ../finch/gntconv.c:1166
+#: ../pidgin/gtkconv.c:389
 msgid "No such command (in this context)."
 msgstr "Kommandoen finst ikkje (i denne samanhengen)."
 
-#: ../finch/gntconv.c:1062 ../pidgin/gtkconv.c:384
+#: ../finch/gntconv.c:1169
+#: ../pidgin/gtkconv.c:392
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -936,65 +1234,70 @@ msgstr ""
 "Bruk \"/help &lt;kommando&gt;\" for å få hjelp med ein kommando.\n"
 "Dei følgjande kommandoane er tilgjengelege i denne samanhengen:\n"
 
-#: ../finch/gntconv.c:1120 ../pidgin/gtkconv.c:7560
-msgid ""
-"say &lt;message&gt;:  Send a message normally as if you weren't using a "
-"command."
-msgstr ""
-"say &lt;message&gt;: Sender ei melding på normal måte, som om du ikkje nytta "
-"ein kommando."
+#: ../finch/gntconv.c:1242
+#: ../pidgin/gtkconv.c:7778
+msgid "say &lt;message&gt;:  Send a message normally as if you weren't using a command."
+msgstr "say &lt;message&gt;: Sender ei melding på normal måte, som om du ikkje nytta ein kommando."
 
-#: ../finch/gntconv.c:1123 ../pidgin/gtkconv.c:7563
+#: ../finch/gntconv.c:1245
+#: ../pidgin/gtkconv.c:7781
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
-msgstr ""
-"me &lt;action&gt;: Sender ei IRC-type-hending til ein venn eller eit "
-"praterom."
+msgstr "me &lt;action&gt;: Sender ei IRC-type-hending til ein venn eller eit praterom."
 
-#: ../finch/gntconv.c:1126 ../pidgin/gtkconv.c:7566
-msgid ""
-"debug &lt;option&gt;:  Send various debug information to the current "
-"conversation."
-msgstr ""
-"debug &lt;option&gt;: Send forskjellig feilsøkingsinformasjon til samtala du "
-"er i."
+#: ../finch/gntconv.c:1248
+#: ../pidgin/gtkconv.c:7784
+msgid "debug &lt;option&gt;:  Send various debug information to the current conversation."
+msgstr "debug &lt;val&gt;: Send forskjellig feilsøkingsinformasjon til samtala du er i."
 
-#: ../finch/gntconv.c:1129 ../pidgin/gtkconv.c:7569
+#: ../finch/gntconv.c:1251
+#: ../pidgin/gtkconv.c:7787
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Tømmer skjermen."
 
-#: ../finch/gntconv.c:1132 ../pidgin/gtkconv.c:7575
+#: ../finch/gntconv.c:1254
+#: ../pidgin/gtkconv.c:7793
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;command&gt;: Hjelp til ein spesifikk kommando."
 
-#: ../finch/gntconv.c:1135
+#: ../finch/gntconv.c:1257
 msgid "users:  Show the list of users in the chat."
 msgstr "users: viser lista over brukarar i praterommet."
 
-#: ../finch/gntconv.c:1140
+#: ../finch/gntconv.c:1262
 msgid "plugins: Show the plugins window."
 msgstr "plugins: viser programtilleggsvindauget."
 
-#: ../finch/gntconv.c:1143
+#: ../finch/gntconv.c:1265
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: viser vennelista."
 
-#: ../finch/gntconv.c:1146
+#: ../finch/gntconv.c:1268
 msgid "accounts: Show the accounts window."
 msgstr "accounts: viser kontovindauget."
 
-#: ../finch/gntconv.c:1149
+#: ../finch/gntconv.c:1271
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: viser feilsøkingsvindauget."
 
-#: ../finch/gntconv.c:1152
+#: ../finch/gntconv.c:1274
 msgid "prefs: Show the preference window."
 msgstr "prefs: viser innstillingsvindauget."
 
-#: ../finch/gntconv.c:1155
+#: ../finch/gntconv.c:1277
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: viser lagra status-vindauget."
 
-#: ../finch/gntdebug.c:235 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:695
+#: ../finch/gntdebug.c:231
+#: ../pidgin/gtkconv.c:948
+#: ../pidgin/gtkconv.c:2656
+#: ../pidgin/gtkdebug.c:219
+#: ../pidgin/gtkft.c:543
+msgid "Unable to open file."
+msgstr "Klarte ikkje å opna fila."
+
+#: ../finch/gntdebug.c:271
+#: ../finch/gntui.c:98
+#: ../pidgin/gtkdebug.c:689
 msgid "Debug Window"
 msgstr "Feilsøkingsvindauge"
 
@@ -1002,186 +1305,287 @@ msgstr "Feilsøkingsvindauge"
 #. * it's necessary to make the width of the debug window resizable ... like I said,
 #. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
 #.
-#: ../finch/gntdebug.c:256 ../pidgin/gtkdebug.c:754
+#: ../finch/gntdebug.c:292
+#: ../pidgin/gtkdebug.c:751
 msgid "Clear"
 msgstr "Tøm"
 
-#: ../finch/gntdebug.c:262
-msgid "Filter: "
+#: ../finch/gntdebug.c:303
+msgid "Filter:"
 msgstr "Filter: "
 
-#: ../finch/gntdebug.c:266 ../pidgin/gtkdebug.c:763
+#: ../finch/gntdebug.c:309
+#: ../pidgin/gtkdebug.c:760
 msgid "Pause"
 msgstr "Pause"
 
-#: ../finch/gntft.c:118 ../pidgin/gtkft.c:229
+#: ../finch/gntft.c:120
+#: ../pidgin/gtkft.c:229
 #, c-format
 msgid "File Transfers - %d%% of %d files"
 msgstr "Filoverføringar - %d%% av %d filer"
 
 #. Create the window.
-#: ../finch/gntft.c:123 ../finch/gntft.c:196 ../finch/gntui.c:87
-#: ../pidgin/gtkft.c:234 ../pidgin/gtkft.c:762
+#: ../finch/gntft.c:125
+#: ../finch/gntft.c:212
+#: ../finch/gntui.c:99
+#: ../pidgin/gtkft.c:234
+#: ../pidgin/gtkft.c:761
 msgid "File Transfers"
 msgstr "Filoverføringar"
 
-#: ../finch/gntft.c:201 ../pidgin/gtkft.c:645
+#: ../finch/gntft.c:217
+#: ../pidgin/gtkft.c:645
 msgid "Progress"
 msgstr "Framdrift"
 
-#: ../finch/gntft.c:201 ../pidgin/gtkft.c:652
+#: ../finch/gntft.c:217
+#: ../pidgin/gtkft.c:652
 msgid "Filename"
 msgstr "Filnamn"
 
-#: ../finch/gntft.c:201 ../pidgin/gtkft.c:659
+#: ../finch/gntft.c:217
+#: ../pidgin/gtkft.c:659
 msgid "Size"
 msgstr "Storleik"
 
-#: ../finch/gntft.c:201
+#: ../finch/gntft.c:217
 msgid "Speed"
 msgstr "Fart"
 
-#: ../finch/gntft.c:201 ../pidgin/gtkft.c:666
+#: ../finch/gntft.c:217
+#: ../pidgin/gtkft.c:666
 msgid "Remaining"
 msgstr "Attverande"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:201 ../finch/gntstatus.c:547 ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:344
-#: ../libpurple/protocols/gg/gg.c:1039 ../libpurple/protocols/gg/gg.c:1576
+#: ../finch/gntft.c:217
+#: ../finch/gntstatus.c:547
+#: ../finch/gntstatus.c:576
+#: ../libpurple/protocols/bonjour/bonjour.c:380
+#: ../libpurple/protocols/gg/gg.c:1041
 #: ../libpurple/protocols/gg/gg.c:1584
-#: ../libpurple/protocols/jabber/buddy.c:778
-#: ../libpurple/protocols/jabber/buddy.c:782
-#: ../libpurple/protocols/jabber/buddy.c:941
-#: ../libpurple/protocols/jabber/jabber.c:1500
-#: ../libpurple/protocols/msn/msn.c:543
-#: ../libpurple/protocols/novell/novell.c:2835
-#: ../libpurple/protocols/oscar/oscar.c:821
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:2700
-#: ../libpurple/protocols/oscar/oscar.c:3780
-#: ../libpurple/protocols/sametime/sametime.c:3263
-#: ../libpurple/protocols/sametime/sametime.c:4150
-#: ../libpurple/protocols/yahoo/yahoo.c:3248 ../pidgin/gtkblist.c:3104
-#: ../pidgin/gtkblist.c:3118 ../pidgin/gtkblist.c:3120
-#: ../pidgin/gtksavedstatuses.c:999 ../pidgin/gtksavedstatuses.c:1144
+#: ../libpurple/protocols/gg/gg.c:1592
+#: ../libpurple/protocols/jabber/buddy.c:780
+#: ../libpurple/protocols/jabber/buddy.c:784
+#: ../libpurple/protocols/jabber/buddy.c:943
+#: ../libpurple/protocols/jabber/jabber.c:1569
+#: ../libpurple/protocols/msn/msn.c:617
+#: ../libpurple/protocols/msn/msn.c:627
+#: ../libpurple/protocols/msn/msn.c:632
+#: ../libpurple/protocols/msn/msn.c:635
+#: ../libpurple/protocols/msnp9/msn.c:540
+#: ../libpurple/protocols/novell/novell.c:2853
+#: ../libpurple/protocols/oscar/oscar.c:820
+#: ../libpurple/protocols/oscar/oscar.c:825
+#: ../libpurple/protocols/oscar/oscar.c:827
+#: ../libpurple/protocols/oscar/oscar.c:2761
+#: ../libpurple/protocols/oscar/oscar.c:3813
+#: ../libpurple/protocols/sametime/sametime.c:3313
+#: ../libpurple/protocols/sametime/sametime.c:4204
+#: ../libpurple/protocols/yahoo/yahoo.c:3285
+#: ../pidgin/gtkblist.c:3297
+#: ../pidgin/gtkblist.c:3311
+#: ../pidgin/gtkblist.c:3313
+#: ../pidgin/gtksavedstatuses.c:990
+#: ../pidgin/gtksavedstatuses.c:1134
 msgid "Status"
 msgstr "Status"
 
-#: ../finch/gntft.c:211
+#: ../finch/gntft.c:227
 msgid "Close this window when all transfers finish"
 msgstr "Lukk dette vindauget når alle overføringane er ferdige"
 
-#: ../finch/gntft.c:218
+#: ../finch/gntft.c:234
 msgid "Clear finished transfers"
 msgstr "Tøm ferdige overføringar"
 
-#: ../finch/gntft.c:232
+#: ../finch/gntft.c:248
+#: ../finch/gntroomlist.c:272
 msgid "Stop"
 msgstr "Stopp"
 
-#: ../finch/gntft.c:305 ../pidgin/gtkft.c:169 ../pidgin/gtkft.c:973
+#: ../finch/gntft.c:321
+#: ../pidgin/gtkft.c:169
+#: ../pidgin/gtkft.c:934
 msgid "Waiting for transfer to begin"
 msgstr "Ventar på at overføringa skal begynna"
 
-#: ../finch/gntft.c:372 ../pidgin/gtkft.c:166 ../pidgin/gtkft.c:1054
+#: ../finch/gntft.c:388
+#: ../pidgin/gtkft.c:163
+#: ../pidgin/gtkft.c:1015
 msgid "Canceled"
 msgstr "Avbroten"
 
-#: ../finch/gntft.c:374 ../pidgin/gtkft.c:1056
+#: ../finch/gntft.c:390
+#: ../pidgin/gtkft.c:1017
 msgid "Failed"
 msgstr "Feila"
 
-#: ../finch/gntft.c:420 ../pidgin/gtkft.c:134
+#: ../finch/gntft.c:434
+#: ../pidgin/gtkft.c:134
 #, c-format
 msgid "%.2f KiB/s"
 msgstr "%.2f KiB/s"
 
-#: ../finch/gntft.c:431
+#: ../finch/gntft.c:445
 #, c-format
 msgid "The file was saved as %s."
 msgstr "Fila blei lagra som %s."
 
-#: ../finch/gntft.c:432 ../finch/gntft.c:433 ../pidgin/gtkft.c:163
-#: ../pidgin/gtkft.c:1116
+#: ../finch/gntft.c:446
+#: ../finch/gntft.c:447
+#: ../pidgin/gtkft.c:160
+#: ../pidgin/gtkft.c:1077
 msgid "Finished"
 msgstr "Ferdig"
 
-#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:347
+#: ../finch/gntft.c:452
+#: ../libpurple/protocols/msn/session.c:404
+#: ../libpurple/protocols/msnp9/session.c:356
 msgid "Transferring"
 msgstr "Overfører"
 
+#: ../finch/gntlog.c:183
+#, c-format
+msgid "Conversation in %s on %s"
+msgstr "Samtalen i %s på %s"
+
+#: ../finch/gntlog.c:186
+#, c-format
+msgid "Conversation with %s on %s"
+msgstr "Samtalen med %s på %s"
+
+#: ../finch/gntlog.c:231
+#: ../pidgin/gtklog.c:503
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: ../finch/gntlog.c:271
+#: ../pidgin/gtklog.c:550
+msgid "System events will only be logged if the \"Log all status changes to system log\" preference is enabled."
+msgstr "Systemhendingar vil berre bli logga om innstillinga \"Logg alle statusendringar til systemloggen\" er teken i bruk."
+
+#: ../finch/gntlog.c:275
+#: ../pidgin/gtklog.c:554
+msgid "Instant messages will only be logged if the \"Log all instant messages\" preference is enabled."
+msgstr "Lynmeldingar vil berre bli logga om innstillinga \"Logg alle lynmeldingar\" er teken i bruk."
+
+#: ../finch/gntlog.c:278
+#: ../pidgin/gtklog.c:557
+msgid "Chats will only be logged if the \"Log all chats\" preference is enabled."
+msgstr "Samtaler vil berre bli logga om innstillinga \"Logg alle samtaler\" er teken i bruk."
+
+#: ../finch/gntlog.c:284
+#: ../pidgin/gtklog.c:566
+msgid "No logs were found"
+msgstr "Fann ingen loggar"
+
+#: ../finch/gntlog.c:330
+#: ../pidgin/gtklog.c:646
+msgid "Total log size:"
+msgstr "Total loggstorleik:"
+
+#. Search box *********
+#: ../finch/gntlog.c:338
+msgid "Scroll/Search: "
+msgstr "Rull/søk:"
+
+#: ../finch/gntlog.c:382
+#: ../pidgin/gtklog.c:716
+#, c-format
+msgid "Conversations in %s"
+msgstr "Samtaler i %s"
+
+#: ../finch/gntlog.c:390
+#: ../finch/gntlog.c:447
+#: ../pidgin/gtklog.c:724
+#: ../pidgin/gtklog.c:799
+#, c-format
+msgid "Conversations with %s"
+msgstr "Samtaler med %s"
+
+#: ../finch/gntlog.c:472
+#: ../pidgin/gtklog.c:824
+msgid "System Log"
+msgstr "Systemlogg"
+
 #: ../finch/gntnotify.c:165
 msgid "Emails"
 msgstr "E-postmeldingar"
 
-#: ../finch/gntnotify.c:171 ../finch/gntnotify.c:225
+#: ../finch/gntnotify.c:171
+#: ../finch/gntnotify.c:226
 msgid "You have mail!"
 msgstr "Du har fått e-post."
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:513
+#: ../finch/gntnotify.c:174
+#: ../pidgin/gtknotify.c:524
 msgid "Sender"
 msgstr "Sendar"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:520
+#: ../finch/gntnotify.c:174
+#: ../pidgin/gtknotify.c:531
 msgid "Subject"
 msgstr "Emne"
 
-#: ../finch/gntnotify.c:201
+#: ../finch/gntnotify.c:202
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] "%s (%s) har %d ny melding."
 msgstr[1] "%s (%s) har %d nye meldingar."
 
-#: ../finch/gntnotify.c:225 ../pidgin/gtknotify.c:341
+#: ../finch/gntnotify.c:226
+#: ../pidgin/gtknotify.c:346
 msgid "New Mail"
 msgstr "Ny e-postmelding"
 
-#: ../finch/gntnotify.c:290 ../pidgin/gtknotify.c:940
+#: ../finch/gntnotify.c:291
+#: ../pidgin/gtknotify.c:959
 #, c-format
 msgid "Info for %s"
 msgstr "Info om %s"
 
-#: ../finch/gntnotify.c:291 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:941
+#: ../finch/gntnotify.c:292
+#: ../libpurple/protocols/toc/toc.c:476
+#: ../pidgin/gtknotify.c:960
 msgid "Buddy Information"
 msgstr "Venneinformasjon"
 
-#: ../finch/gntnotify.c:377 ../libpurple/protocols/qq/group_join.c:367
+#: ../finch/gntnotify.c:382
+#: ../libpurple/protocols/qq/group_join.c:367
 msgid "Continue"
 msgstr "Hald fram"
 
-#: ../finch/gntnotify.c:386 ../pidgin/gtkconv.c:1596
+#: ../finch/gntnotify.c:391
+#: ../pidgin/gtkconv.c:1639
 msgid "IM"
 msgstr "Lynmeldingar"
 
-#: ../finch/gntnotify.c:389
-msgid "Join"
-msgstr "Bli med"
-
-#: ../finch/gntnotify.c:392 ../libpurple/protocols/sametime/sametime.c:3473
+#: ../finch/gntnotify.c:397
+#: ../libpurple/protocols/sametime/sametime.c:3523
 msgid "Invite"
 msgstr "Inviter"
 
-#: ../finch/gntnotify.c:395
+#: ../finch/gntnotify.c:400
 msgid "(none)"
 msgstr "(ingen)"
 
-#: ../finch/gntplugin.c:75 ../finch/gntplugin.c:84
+#: ../finch/gntplugin.c:84
+#: ../finch/gntplugin.c:93
 msgid "ERROR"
 msgstr "FEIL"
 
-#: ../finch/gntplugin.c:75
+#: ../finch/gntplugin.c:84
 msgid "loading plugin failed"
 msgstr "klarte ikkje å lasta programtillegget"
 
-#: ../finch/gntplugin.c:84
+#: ../finch/gntplugin.c:93
 msgid "unloading plugin failed"
 msgstr "klarte ikkje å lasta ut programtillegget"
 
-#: ../finch/gntplugin.c:129
+#: ../finch/gntplugin.c:139
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -1198,19 +1602,40 @@ msgstr ""
 "Nettstad: %s\n"
 "Filnamn: %s\n"
 
-#: ../finch/gntplugin.c:187
+#: ../finch/gntplugin.c:197
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "Programtillegget må vera lasta inn før du kan gjera endringar."
 
-#: ../finch/gntplugin.c:235
+#: ../finch/gntplugin.c:245
 msgid "No configuration options for this plugin."
 msgstr "Det er ingen innstillingar til dette programtillegget."
 
-#: ../finch/gntplugin.c:260
+#: ../finch/gntplugin.c:266
+msgid "Error loading plugin"
+msgstr "Klarte ikkje å lasta programtillegget"
+
+#: ../finch/gntplugin.c:267
+msgid "The selected file is not a valid plugin."
+msgstr "Den valde fila er ikkje eit gyldig programtillegg."
+
+#: ../finch/gntplugin.c:268
+msgid "Please open the debug window and try again to see the exact error message."
+msgstr "Opna feilsøkingsvindauget og prøv igjen for å sjå den nøyaktige feilmeldinga."
+
+# For mykje tekst?
+#: ../finch/gntplugin.c:331
+msgid "Select plugin to install"
+msgstr "Vel kva for programtillegg som skal installerast"
+
+#: ../finch/gntplugin.c:357
 msgid "You can (un)load plugins from the following list."
 msgstr "Du kan lasta inn/ta vekk programtillegg frå lista."
 
-#: ../finch/gntplugin.c:315
+#: ../finch/gntplugin.c:408
+msgid "Install Plugin..."
+msgstr "Installer programtillegg…"
+
+#: ../finch/gntplugin.c:418
 msgid "Configure Plugin"
 msgstr "Endra programtillegg"
 
@@ -1219,187 +1644,211 @@ msgstr "Endra programtillegg"
 #. (that should have been "effect," right?)
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
-#: ../finch/gntplugin.c:371 ../finch/gntplugin.c:378 ../finch/gntprefs.c:264
-#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2067
+#: ../finch/gntplugin.c:524
+#: ../finch/gntplugin.c:531
+#: ../finch/gntprefs.c:264
+#: ../finch/gntui.c:103
+#: ../pidgin/gtkdocklet.c:718
+#: ../pidgin/gtkprefs.c:2070
 msgid "Preferences"
 msgstr "Innstillingar "
 
-#: ../finch/gntpounce.c:183 ../pidgin/gtkpounce.c:256
+#: ../finch/gntpounce.c:193
+#: ../pidgin/gtkpounce.c:256
 msgid "Please enter a buddy to pounce."
 msgstr "Skriv inn ein venn å varsla om."
 
-#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:517
+#: ../finch/gntpounce.c:338
+#: ../pidgin/gtkpounce.c:524
 msgid "New Buddy Pounce"
 msgstr "Nytt vennevarsel"
 
-#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:517
+#: ../finch/gntpounce.c:338
+#: ../pidgin/gtkpounce.c:524
 msgid "Edit Buddy Pounce"
 msgstr "Endra vennevarsel"
 
-#: ../finch/gntpounce.c:333
+#: ../finch/gntpounce.c:343
 msgid "Pounce Who"
 msgstr "Varsling for"
 
 #. Account:
-#: ../finch/gntpounce.c:336 ../finch/gntstatus.c:456
+#: ../finch/gntpounce.c:346
+#: ../finch/gntstatus.c:456
 msgid "Account:"
 msgstr "Konto:"
 
-#: ../finch/gntpounce.c:358
+#: ../finch/gntpounce.c:368
 msgid "Buddy name:"
 msgstr "Vennenamn:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:374 ../pidgin/gtkpounce.c:585
+#: ../finch/gntpounce.c:386
+#: ../pidgin/gtkpounce.c:592
 msgid "Pounce When Buddy..."
 msgstr "Varsla når venn…"
 
-#: ../finch/gntpounce.c:376
+#: ../finch/gntpounce.c:388
 msgid "Signs on"
 msgstr "Loggar på"
 
-#: ../finch/gntpounce.c:377
+#: ../finch/gntpounce.c:389
 msgid "Signs off"
 msgstr "Loggar av"
 
-#: ../finch/gntpounce.c:378
+#: ../finch/gntpounce.c:390
 msgid "Goes away"
 msgstr "GÃ¥r vekk"
 
-#: ../finch/gntpounce.c:379
+#: ../finch/gntpounce.c:391
 msgid "Returns from away"
 msgstr "Kjem attende"
 
-#: ../finch/gntpounce.c:380
+#: ../finch/gntpounce.c:392
 msgid "Becomes idle"
 msgstr "Blir uverksam"
 
-#: ../finch/gntpounce.c:381
+#: ../finch/gntpounce.c:393
 msgid "Is no longer idle"
 msgstr "Er ikkje uverksam lenger"
 
-#: ../finch/gntpounce.c:382
+#: ../finch/gntpounce.c:394
 msgid "Starts typing"
 msgstr "Begynner å skriva"
 
-#: ../finch/gntpounce.c:383
+#: ../finch/gntpounce.c:395
 msgid "Pauses while typing"
 msgstr "Pause under skrivinga"
 
-#: ../finch/gntpounce.c:384
+#: ../finch/gntpounce.c:396
 msgid "Stops typing"
 msgstr "Stoppar å skriva"
 
-#: ../finch/gntpounce.c:385
+#: ../finch/gntpounce.c:397
 msgid "Sends a message"
 msgstr "Sender ei melding"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:414 ../pidgin/gtkpounce.c:646
+#: ../finch/gntpounce.c:426
+#: ../pidgin/gtkpounce.c:653
 msgid "Action"
 msgstr "Handling"
 
-#: ../finch/gntpounce.c:416
+#: ../finch/gntpounce.c:428
 msgid "Open an IM window"
 msgstr "Opna eit lynmeldingsvindauge"
 
-#: ../finch/gntpounce.c:417
+#: ../finch/gntpounce.c:429
 msgid "Pop up a notification"
 msgstr "Sprett opp eit varsel"
 
-#: ../finch/gntpounce.c:418
+#: ../finch/gntpounce.c:430
 msgid "Send a message"
 msgstr "Send ei melding"
 
-#: ../finch/gntpounce.c:419
+#: ../finch/gntpounce.c:431
 msgid "Execute a command"
 msgstr "Utføra ein kommando"
 
-#: ../finch/gntpounce.c:420
+#: ../finch/gntpounce.c:432
 msgid "Play a sound"
 msgstr "Spel ein lyd"
 
-#: ../finch/gntpounce.c:448
-msgid "Pounce only when my status is not available"
-msgstr "Vennevarsling berre når tilstanden min ikkje er tilgjengeleg"
+#: ../finch/gntpounce.c:460
+msgid "Pounce only when my status is not Available"
+msgstr "Vennevarsling berre når eg ikkje er tilgjengeleg"
 
-#: ../finch/gntpounce.c:450 ../pidgin/gtkpounce.c:1281
+#: ../finch/gntpounce.c:462
+#: ../pidgin/gtkpounce.c:1294
 msgid "Recurring"
 msgstr "Gjentakande"
 
-#: ../finch/gntpounce.c:618
+#: ../finch/gntpounce.c:630
 msgid "Cannot create pounce"
 msgstr "Klarer ikkje å oppretta vennevarsel"
 
-#: ../finch/gntpounce.c:619
+#: ../finch/gntpounce.c:631
 msgid "You do not have any accounts."
 msgstr "Du har ingen konto."
 
-#: ../finch/gntpounce.c:620
+#: ../finch/gntpounce.c:632
 msgid "You must create an account first before you can create a pounce."
 msgstr "Du må først oppretta ein konto før du kan laga eit vennevarsel."
 
-#: ../finch/gntpounce.c:662 ../pidgin/gtkpounce.c:1096
+#: ../finch/gntpounce.c:674
+#: ../pidgin/gtkpounce.c:1108
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "Er du sikker på at du ønskjer å sletta varselet i %s  for %s??"
 
-#: ../finch/gntpounce.c:696 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1325
+#: ../finch/gntpounce.c:708
+#: ../finch/gntui.c:96
+#: ../pidgin/gtkpounce.c:1337
 msgid "Buddy Pounces"
 msgstr "Vennevarsel"
 
-#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1452
+#: ../finch/gntpounce.c:817
+#: ../pidgin/gtkpounce.c:1436
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s har begynt å skriva til deg (%s)"
 
-#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1454
+#: ../finch/gntpounce.c:818
+#: ../pidgin/gtkpounce.c:1438
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s har stoppa å skriva til deg (%s)"
 
-#: ../finch/gntpounce.c:814 ../pidgin/gtkpounce.c:1456
+#: ../finch/gntpounce.c:819
+#: ../pidgin/gtkpounce.c:1440
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s har logga på (%s)"
 
-#: ../finch/gntpounce.c:816 ../pidgin/gtkpounce.c:1458
+#: ../finch/gntpounce.c:820
+#: ../pidgin/gtkpounce.c:1442
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s er ikkje uverksam lenger (%s)"
 
-#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1460
+#: ../finch/gntpounce.c:821
+#: ../pidgin/gtkpounce.c:1444
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s er ikkje lenger vekke (%s)"
 
-#: ../finch/gntpounce.c:820 ../pidgin/gtkpounce.c:1462
+#: ../finch/gntpounce.c:822
+#: ../pidgin/gtkpounce.c:1446
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s har stoppa å skriva til deg (%s)"
 
-#: ../finch/gntpounce.c:822 ../pidgin/gtkpounce.c:1464
+#: ../finch/gntpounce.c:823
+#: ../pidgin/gtkpounce.c:1448
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s har logga av (%s)"
 
-#: ../finch/gntpounce.c:824 ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:824
+#: ../pidgin/gtkpounce.c:1450
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s er blitt uverksam (%s)"
 
-#: ../finch/gntpounce.c:826 ../pidgin/gtkpounce.c:1468
+#: ../finch/gntpounce.c:825
+#: ../pidgin/gtkpounce.c:1452
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s har gått vekk . (%s)"
 
-#: ../finch/gntpounce.c:828 ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:826
+#: ../pidgin/gtkpounce.c:1454
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s har sendt deg ei melding. (%s)"
 
-#: ../finch/gntpounce.c:829 ../pidgin/gtkpounce.c:1471
-#, c-format
+#: ../finch/gntpounce.c:845
+#: ../pidgin/gtkpounce.c:1455
 msgid "Unknown pounce event. Please report this!"
 msgstr "Ukjend varselhending. Rapportér feilen."
 
@@ -1407,12 +1856,16 @@ msgstr "Basert på tastaturbruk"
 msgid "Based on keyboard use"
 msgstr "Basert på tastaturbruk"
 
-#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:1930
+#: ../finch/gntprefs.c:94
+#: ../pidgin/gtkprefs.c:1951
 msgid "From last sent message"
 msgstr "Frå sist sendte melding"
 
-#: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:907
-#: ../pidgin/gtkprefs.c:1929 ../pidgin/gtkprefs.c:1943
+#: ../finch/gntprefs.c:96
+#: ../pidgin/gtkprefs.c:848
+#: ../pidgin/gtkprefs.c:856
+#: ../pidgin/gtkprefs.c:1950
+#: ../pidgin/gtkprefs.c:1964
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "Aldri"
@@ -1430,14 +1883,17 @@ msgstr "Varsla vennar når du skriv"
 msgstr "Varsla vennar når du skriv"
 
 #: ../finch/gntprefs.c:198
+#: ../finch/plugins/gnthistory.c:153
 msgid "Log format"
 msgstr "Loggformat"
 
 #: ../finch/gntprefs.c:199
+#: ../finch/plugins/gnthistory.c:143
 msgid "Log IMs"
 msgstr "Logg lynmeldingar"
 
 #: ../finch/gntprefs.c:200
+#: ../finch/plugins/gnthistory.c:144
 msgid "Log chats"
 msgstr "Loggfør alle praterom"
 
@@ -1462,119 +1918,163 @@ msgstr "Endra tilstand til"
 msgstr "Endra tilstand til"
 
 #. Conversations
-#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:993 ../pidgin/gtkprefs.c:2033
+#: ../finch/gntprefs.c:259
+#: ../pidgin/gtkprefs.c:942
+#: ../pidgin/gtkprefs.c:2037
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "Samtaler"
 
-#: ../finch/gntprefs.c:260 ../pidgin/gtkprefs.c:1467 ../pidgin/gtkprefs.c:2044
+#: ../finch/gntprefs.c:260
+#: ../finch/plugins/gnthistory.c:151
+#: ../pidgin/gtkprefs.c:1507
+#: ../pidgin/gtkprefs.c:2048
 msgid "Logging"
 msgstr "Loggføring"
 
-#: ../finch/gntrequest.c:583
+#: ../finch/gntrequest.c:621
 msgid "Not implemented yet."
 msgstr "Enno ikkje teken i bruk."
 
-#: ../finch/gntrequest.c:659 ../pidgin/gtkrequest.c:1555
-#: ../pidgin/gtkrequest.c:1601
+#: ../finch/gntrequest.c:726
+#: ../pidgin/gtkrequest.c:1552
+#: ../pidgin/gtkrequest.c:1598
 msgid "Save File..."
 msgstr "Lagra fil…"
 
-#: ../finch/gntrequest.c:659 ../pidgin/gtkrequest.c:1556
-#: ../pidgin/gtkrequest.c:1602
+#: ../finch/gntrequest.c:726
+#: ../pidgin/gtkrequest.c:1553
+#: ../pidgin/gtkrequest.c:1599
 msgid "Open File..."
 msgstr "Opna fil…"
 
-#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:64
+#: ../finch/gntrequest.c:743
+msgid "Choose Location..."
+msgstr "Vel stad…"
+
+#: ../finch/gntroomlist.c:208
+msgid "Hit 'Enter' to find more rooms of this category."
+msgstr "Trykk på returtasten for å finna fleire rom av same type."
+
+#: ../finch/gntroomlist.c:273
+msgid "Get"
+msgstr "Hent"
+
+#. Create the window.
+#: ../finch/gntroomlist.c:285
+#: ../finch/gntui.c:101
+#: ../pidgin/gtkroomlist.c:530
+msgid "Room List"
+msgstr "Romliste"
+
+#: ../finch/gntsound.c:96
+#: ../pidgin/gtksound.c:62
 msgid "Buddy logs in"
 msgstr "Venn loggar inn"
 
-#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:65
+#: ../finch/gntsound.c:97
+#: ../pidgin/gtksound.c:63
 msgid "Buddy logs out"
 msgstr "Venn loggar ut"
 
-#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:66
+#: ../finch/gntsound.c:98
+#: ../pidgin/gtksound.c:64
 msgid "Message received"
 msgstr "Melding motteken"
 
-#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:67
+#: ../finch/gntsound.c:99
+#: ../pidgin/gtksound.c:65
 msgid "Message received begins conversation"
 msgstr "Motteken melding startar samtala"
 
-#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:68
+#: ../finch/gntsound.c:100
+#: ../pidgin/gtksound.c:66
 msgid "Message sent"
 msgstr "Melding sendt"
 
-#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:69
+#: ../finch/gntsound.c:101
+#: ../pidgin/gtksound.c:67
 msgid "Person enters chat"
 msgstr "Person kjem inn i rommet"
 
-#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:70
+#: ../finch/gntsound.c:102
+#: ../pidgin/gtksound.c:68
 msgid "Person leaves chat"
 msgstr "Person forlèt rommet"
 
-#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:71
+#: ../finch/gntsound.c:103
+#: ../pidgin/gtksound.c:69
 msgid "You talk in chat"
 msgstr "Du pratar i rommet"
 
-#: ../finch/gntsound.c:105 ../pidgin/gtksound.c:72
+#: ../finch/gntsound.c:104
+#: ../pidgin/gtksound.c:70
 msgid "Others talk in chat"
 msgstr "Andre pratar i rommet"
 
-#: ../finch/gntsound.c:107 ../pidgin/gtksound.c:75
+#: ../finch/gntsound.c:106
+#: ../pidgin/gtksound.c:73
 msgid "Someone says your screen name in chat"
 msgstr "Nokon seier brukarnamnet ditt i praterommet"
 
-#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:311
+#: ../finch/gntsound.c:362
+#: ../pidgin/gtksound.c:306
 msgid "GStreamer Failure"
 msgstr "GStreamer-svikt"
 
-#: ../finch/gntsound.c:362 ../pidgin/gtksound.c:312
+#: ../finch/gntsound.c:363
+#: ../pidgin/gtksound.c:307
 msgid "GStreamer failed to initialize."
 msgstr "GStreamer klarte ikkje å starta."
 
-#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1587
-#: ../pidgin/gtkprefs.c:1676 ../pidgin/gtkprefs.c:1872
+#: ../finch/gntsound.c:717
+#: ../finch/gntsound.c:803
+#: ../pidgin/gtkprefs.c:1631
+#: ../pidgin/gtkprefs.c:1720
+#: ../pidgin/gtkprefs.c:1893
 msgid "(default)"
 msgstr "(standard)"
 
-#: ../finch/gntsound.c:729
+#: ../finch/gntsound.c:730
 msgid "Select Sound File ..."
 msgstr "Vel lydfil…"
 
-#: ../finch/gntsound.c:904
+#: ../finch/gntsound.c:905
 msgid "Sound Preferences"
 msgstr "Lydinnstillingar "
 
-#: ../finch/gntsound.c:915
+#: ../finch/gntsound.c:916
 msgid "Profiles"
 msgstr "Profilar"
 
-#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1717
+#: ../finch/gntsound.c:955
+#: ../pidgin/gtkprefs.c:1758
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: ../finch/gntsound.c:957
+#: ../finch/gntsound.c:958
 msgid "Console Beep"
 msgstr "Konsollyd"
 
-#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1721
+#: ../finch/gntsound.c:959
+#: ../pidgin/gtkprefs.c:1762
 msgid "Command"
 msgstr "Kommando"
 
-#: ../finch/gntsound.c:959
+#: ../finch/gntsound.c:960
 msgid "No Sound"
 msgstr "Ingen lyd"
 
-#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1712
+#: ../finch/gntsound.c:962
+#: ../pidgin/gtkprefs.c:1753
 msgid "Sound Method"
 msgstr "Lydmetode"
 
-#: ../finch/gntsound.c:966
+#: ../finch/gntsound.c:967
 msgid "Method: "
 msgstr "Metode:"
 
-#: ../finch/gntsound.c:973
+#: ../finch/gntsound.c:974
 #, c-format
 msgid ""
 "Sound Command\n"
@@ -1584,55 +2084,66 @@ msgstr ""
 "(%s for filnamn)"
 
 #. Sound options
-#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1756
+#: ../finch/gntsound.c:982
+#: ../pidgin/gtkprefs.c:1784
 msgid "Sound Options"
 msgstr "Lydinnstillingar"
 
-#: ../finch/gntsound.c:982
+#: ../finch/gntsound.c:983
 msgid "Sounds when conversation has focus"
 msgstr "Lydar når samtalevindauget har fokus"
 
-#: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:909
-#: ../pidgin/gtkprefs.c:1763 ../pidgin/plugins/timestamp_format.c:42
+#: ../finch/gntsound.c:991
+#: ../pidgin/gtkprefs.c:846
+#: ../pidgin/gtkprefs.c:858
+#: ../pidgin/gtkprefs.c:1791
+#: ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:334
 msgid "Always"
 msgstr "Alltid"
 
-#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1761
+#: ../finch/gntsound.c:992
+#: ../pidgin/gtkprefs.c:1789
 msgid "Only when available"
 msgstr "Berre når tilgjengeleg"
 
-#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1762
+#: ../finch/gntsound.c:993
+#: ../pidgin/gtkprefs.c:1790
 msgid "Only when not available"
 msgstr "Berre når ikkje tilgjengeleg"
 
-#: ../finch/gntsound.c:999
+#: ../finch/gntsound.c:1000
 msgid "Volume(0-100):"
 msgstr "Volum (0-100):"
 
 #. Sound events
-#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1798
+#: ../finch/gntsound.c:1019
+#: ../pidgin/gtkprefs.c:1819
 msgid "Sound Events"
 msgstr "Lydhendingar"
 
-#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1857
+#: ../finch/gntsound.c:1021
+#: ../pidgin/gtkprefs.c:1878
 msgid "Event"
 msgstr "Hending"
 
-#: ../finch/gntsound.c:1020
+#: ../finch/gntsound.c:1021
 msgid "File"
 msgstr "Fil"
 
-#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1876
+#: ../finch/gntsound.c:1040
+#: ../pidgin/gtkprefs.c:1897
 msgid "Test"
 msgstr "Test"
 
-#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1880
+#: ../finch/gntsound.c:1043
+#: ../pidgin/gtkprefs.c:1901
 msgid "Reset"
 msgstr "Nullstill"
 
-#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1884
+#: ../finch/gntsound.c:1046
+#: ../pidgin/gtkprefs.c:1905
 msgid "Choose..."
 msgstr "Vel…"
 
@@ -1645,19 +2156,24 @@ msgstr "Slett tilstand"
 msgid "Delete Status"
 msgstr "Slett tilstand"
 
-#: ../finch/gntstatus.c:176 ../pidgin/gtksavedstatuses.c:597
+#: ../finch/gntstatus.c:176
+#: ../pidgin/gtksavedstatuses.c:597
 msgid "Saved Statuses"
 msgstr "Lagra tilstandar"
 
-#: ../finch/gntstatus.c:183 ../finch/gntstatus.c:539
+#: ../finch/gntstatus.c:183
+#: ../finch/gntstatus.c:539
 #: ../libpurple/protocols/jabber/buddy.c:298
-#: ../libpurple/protocols/jabber/buddy.c:1359
-#: ../libpurple/protocols/novell/novell.c:1484
+#: ../libpurple/protocols/jabber/buddy.c:1363
+#: ../libpurple/protocols/msn/msn.c:733
+#: ../libpurple/protocols/myspace/myspace.c:171
+#: ../libpurple/protocols/novell/novell.c:1493
 #: ../pidgin/gtksavedstatuses.c:500
 msgid "Title"
 msgstr "Tittel"
 
-#: ../finch/gntstatus.c:183 ../pidgin/gtksavedstatuses.c:515
+#: ../finch/gntstatus.c:183
+#: ../pidgin/gtksavedstatuses.c:515
 msgid "Type"
 msgstr "Type"
 
@@ -1669,47 +2185,61 @@ msgstr "Type"
 #. user_settable
 #. not independent
 #. Attributes - each status can have a message.
-#: ../finch/gntstatus.c:183 ../finch/gntstatus.c:564 ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:256
-#: ../libpurple/protocols/bonjour/bonjour.c:263
-#: ../libpurple/protocols/bonjour/bonjour.c:346
-#: ../libpurple/protocols/gg/gg.c:1077 ../libpurple/protocols/gg/gg.c:1579
-#: ../libpurple/protocols/gg/gg.c:1597 ../libpurple/protocols/gg/gg.c:1607
-#: ../libpurple/protocols/gg/gg.c:1613 ../libpurple/protocols/gg/gg.c:1622
-#: ../libpurple/protocols/gg/gg.c:1627 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1532
-#: ../libpurple/protocols/jabber/jabber.c:1555
-#: ../libpurple/protocols/jabber/jabber.c:1578
+#: ../finch/gntstatus.c:183
+#: ../finch/gntstatus.c:564
+#: ../finch/gntstatus.c:576
+#: ../libpurple/protocols/bonjour/bonjour.c:292
+#: ../libpurple/protocols/bonjour/bonjour.c:299
+#: ../libpurple/protocols/bonjour/bonjour.c:382
+#: ../libpurple/protocols/gg/gg.c:1079
+#: ../libpurple/protocols/gg/gg.c:1587
+#: ../libpurple/protocols/gg/gg.c:1605
+#: ../libpurple/protocols/gg/gg.c:1615
+#: ../libpurple/protocols/gg/gg.c:1621
+#: ../libpurple/protocols/gg/gg.c:1630
+#: ../libpurple/protocols/gg/gg.c:1635
+#: ../libpurple/protocols/irc/irc.c:245
 #: ../libpurple/protocols/jabber/jabber.c:1601
-#: ../libpurple/protocols/jabber/jabber.c:1624
-#: ../libpurple/protocols/jabber/jabber.c:1649
+#: ../libpurple/protocols/jabber/jabber.c:1615
+#: ../libpurple/protocols/jabber/jabber.c:1629
+#: ../libpurple/protocols/jabber/jabber.c:1643
+#: ../libpurple/protocols/jabber/jabber.c:1657
+#: ../libpurple/protocols/jabber/jabber.c:1673
+#: ../libpurple/protocols/msn/msn.c:685
+#: ../libpurple/protocols/msn/msn.c:691
+#: ../libpurple/protocols/msn/msn.c:697
+#: ../libpurple/protocols/msn/msn.c:703
+#: ../libpurple/protocols/msn/msn.c:708
+#: ../libpurple/protocols/msn/msn.c:713
 #: ../libpurple/protocols/myspace/myspace.c:148
-#: ../libpurple/protocols/novell/novell.c:2838
-#: ../libpurple/protocols/novell/novell.c:2941
-#: ../libpurple/protocols/novell/novell.c:2947
-#: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/oscar/oscar.c:5554
-#: ../libpurple/protocols/oscar/oscar.c:5772
-#: ../libpurple/protocols/oscar/oscar.c:5786
-#: ../libpurple/protocols/oscar/oscar.c:5802
-#: ../libpurple/protocols/oscar/oscar.c:5809
-#: ../libpurple/protocols/oscar/oscar.c:5816
-#: ../libpurple/protocols/sametime/sametime.c:3286
-#: ../libpurple/protocols/sametime/sametime.c:3292
-#: ../libpurple/protocols/sametime/sametime.c:3298
-#: ../libpurple/protocols/sametime/sametime.c:3377
-#: ../libpurple/protocols/silc/buddy.c:1551
-#: ../libpurple/protocols/silc10/buddy.c:1551
-#: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3751
-#: ../libpurple/protocols/yahoo/yahoo.c:3757
-#: ../libpurple/protocols/zephyr/zephyr.c:2337
-#: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1010
+#: ../libpurple/protocols/novell/novell.c:2856
+#: ../libpurple/protocols/novell/novell.c:2959
+#: ../libpurple/protocols/novell/novell.c:2965
+#: ../libpurple/protocols/novell/novell.c:2971
+#: ../libpurple/protocols/oscar/oscar.c:5657
+#: ../libpurple/protocols/oscar/oscar.c:5875
+#: ../libpurple/protocols/oscar/oscar.c:5889
+#: ../libpurple/protocols/oscar/oscar.c:5905
+#: ../libpurple/protocols/oscar/oscar.c:5912
+#: ../libpurple/protocols/oscar/oscar.c:5919
+#: ../libpurple/protocols/sametime/sametime.c:3336
+#: ../libpurple/protocols/sametime/sametime.c:3342
+#: ../libpurple/protocols/sametime/sametime.c:3348
+#: ../libpurple/protocols/sametime/sametime.c:3427
+#: ../libpurple/protocols/silc/buddy.c:1554
+#: ../libpurple/protocols/silc10/buddy.c:1554
+#: ../libpurple/protocols/simple/simple.c:247
+#: ../libpurple/protocols/yahoo/yahoo.c:3788
+#: ../libpurple/protocols/yahoo/yahoo.c:3794
+#: ../libpurple/protocols/zephyr/zephyr.c:2349
+#: ../pidgin/gtksavedstatuses.c:526
+#: ../pidgin/gtksavedstatuses.c:1001
 msgid "Message"
 msgstr "Melding"
 
 #. Use
-#: ../finch/gntstatus.c:194 ../finch/gntstatus.c:593
+#: ../finch/gntstatus.c:194
+#: ../finch/gntstatus.c:593
 msgid "Use"
 msgstr "Bruk"
 
@@ -1733,7 +2263,8 @@ msgstr "Substatus"
 msgid "Substatus"
 msgstr "Substatus"
 
-#: ../finch/gntstatus.c:464 ../pidgin/gtkft.c:699
+#: ../finch/gntstatus.c:464
+#: ../pidgin/gtkft.c:699
 msgid "Status:"
 msgstr "Status:"
 
@@ -1754,19 +2285,21 @@ msgstr "Lagra og bruk"
 msgid "Save & Use"
 msgstr "Lagra og bruk"
 
-#: ../finch/gntui.c:85
+#: ../finch/gntui.c:97
 msgid "Certificates"
 msgstr "Sertifikat"
 
-#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2035
+#: ../finch/gntui.c:102
+#: ../pidgin/gtkprefs.c:2039
 msgid "Sounds"
 msgstr "Lydar"
 
-#: ../finch/gntui.c:91
+#: ../finch/gntui.c:104
 msgid "Statuses"
 msgstr "Tilstandar"
 
-#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
+#: ../finch/plugins/gntclipboard.c:115
+#: ../finch/plugins/gntclipboard.c:121
 #: ../finch/plugins/gntclipboard.c:128
 msgid "Error loading the plugin."
 msgstr "Det oppstod feil under innlasting av programtillegget."
@@ -1781,9 +2314,7 @@ msgid "This plugin cannot be loaded beca
 
 #: ../finch/plugins/gntclipboard.c:129
 msgid "This plugin cannot be loaded because it was not built with X11 support."
-msgstr ""
-"Programtillegget kan ikkje lastast inn sia det ikkje blei laga med støtte "
-"for X11."
+msgstr "Programtillegget kan ikkje lastast inn sia det ikkje blei laga med støtte for X11."
 
 #: ../finch/plugins/gntclipboard.c:158
 msgid "GntClipboard"
@@ -1794,12 +2325,8 @@ msgstr "Utklippstavleprogramtillegg"
 msgstr "Utklippstavleprogramtillegg"
 
 #: ../finch/plugins/gntclipboard.c:161
-msgid ""
-"When the gnt clipboard contents change, the contents are made available to "
-"X, if possible."
-msgstr ""
-"Når innhaldet på gnt-utklippstavla endrar seg, vil det bli tilgjengeleg for "
-"X (om mogleg)."
+msgid "When the gnt clipboard contents change, the contents are made available to X, if possible."
+msgstr "Når innhaldet på gnt-utklippstavla endrar seg, vil det bli tilgjengeleg for X (om mogleg)."
 
 #: ../finch/plugins/gntgf.c:231
 #, c-format
@@ -1858,47 +2385,97 @@ msgstr "GntGf"
 msgid "GntGf"
 msgstr "GntGf"
 
-#: ../finch/plugins/gntgf.c:379 ../finch/plugins/gntgf.c:380
+#: ../finch/plugins/gntgf.c:379
+#: ../finch/plugins/gntgf.c:380
 msgid "Toaster plugin"
 msgstr "Programtillegg for sprettoppvindauge"
 
-#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:120
+#: ../finch/plugins/gnthistory.c:114
+#: ../pidgin/plugins/history.c:125
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<b>Samtale med %s på %s:</b><br>"
 
-#: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:147
+#: ../finch/plugins/gnthistory.c:172
+#: ../pidgin/plugins/history.c:153
 msgid "History Plugin Requires Logging"
 msgstr "Historikktillegget krev loggføring"
 
-#: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:148
+#: ../finch/plugins/gnthistory.c:173
+#: ../pidgin/plugins/history.c:154
 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)."
+"Enabling logs for instant messages and/or chats will activate history for the same conversation type(s)."
 msgstr ""
 "Ein kan slå på loggføring frå Verktøy -> Innstillingar -> Loggføring.\n"
 "\n"
-"Å ta i bruk loggføring for lynmeldingar og/eller prating slår på historikk "
-"for liknande samtaletype (-ar)."
+"Å ta i bruk loggføring for lynmeldingar og/eller prating slår på historikk for liknande samtaletype (-ar)."
 
-#: ../finch/plugins/gnthistory.c:179
+#: ../finch/plugins/gnthistory.c:217
 msgid "GntHistory"
 msgstr "Historikk"
 
-#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:190
+#: ../finch/plugins/gnthistory.c:219
+#: ../pidgin/plugins/history.c:197
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Viser nyleg logga samtaler i nye samtaler."
 
-#: ../finch/plugins/gnthistory.c:182 ../pidgin/plugins/history.c:191
-msgid ""
-"When a new conversation is opened this plugin will insert the last "
-"conversation into the current conversation."
-msgstr ""
-"NÃ¥r ei ny samtale blir opna, vil dette tillegget setja inn den siste samtala "
-"i den noverande."
+#: ../finch/plugins/gnthistory.c:220
+#: ../pidgin/plugins/history.c:198
+msgid "When a new conversation is opened this plugin will insert the last conversation into the current conversation."
+msgstr "NÃ¥r ei ny samtale blir opna, vil dette tillegget setja inn den siste samtala i den noverande."
 
+#: ../finch/plugins/grouping.c:42
+#: ../libpurple/protocols/oscar/oscar.c:738
+msgid "Online"
+msgstr "Tilkopla"
+
+#: ../finch/plugins/grouping.c:44
+#: ../finch/plugins/grouping.c:145
+#: ../libpurple/protocols/gg/gg.c:1010
+#: ../libpurple/protocols/jabber/buddy.c:2038
+#: ../libpurple/protocols/novell/novell.c:2846
+#: ../libpurple/protocols/oscar/oscar.c:827
+#: ../libpurple/protocols/oscar/oscar.c:5707
+#: ../libpurple/protocols/qq/qq.c:171
+#: ../libpurple/protocols/qq/qq.c:178
+#: ../libpurple/protocols/qq/qq.c:293
+#: ../libpurple/protocols/yahoo/yahoo.c:3136
+#: ../libpurple/status.c:154
+#: ../pidgin/gtkblist.c:3297
+#: ../pidgin/gtkblist.c:3679
+#: ../pidgin/gtkdocklet.c:561
+#: ../pidgin/gtkstatusbox.c:1085
+msgid "Offline"
+msgstr "Fråkopla"
+
+#: ../finch/plugins/grouping.c:117
+#: ../pidgin/gtkblist.c:3336
+msgid "Online Buddies"
+msgstr "Tilkopla vennar"
+
+#: ../finch/plugins/grouping.c:117
+msgid "Offline Buddies"
+msgstr "Fråkopla vennar"
+
+#: ../finch/plugins/grouping.c:127
+msgid "Online/Offline"
+msgstr "Fråkopla/tilkopla"
+
+#: ../finch/plugins/grouping.c:168
+msgid "Meebo"
+msgstr "Meebo"
+
+#: ../finch/plugins/grouping.c:217
+msgid "No Grouping"
+msgstr "Inga gruppering"
+
+#: ../finch/plugins/grouping.c:257
+#: ../finch/plugins/grouping.c:258
+msgid "Provides alternate buddylist grouping options."
+msgstr "Gjev andre grupperingsval for kontaktlista."
+
 #: ../finch/plugins/lastlog.c:69
 msgid "Lastlog"
 msgstr "Lastlog"
@@ -1912,93 +2489,103 @@ msgstr "GntLastlog"
 msgid "GntLastlog"
 msgstr "GntLastlog"
 
-#: ../finch/plugins/lastlog.c:124 ../finch/plugins/lastlog.c:125
+#: ../finch/plugins/lastlog.c:124
+#: ../finch/plugins/lastlog.c:125
 msgid "Lastlog plugin."
 msgstr "Lastlog-programtillegg."
 
-#: ../libpurple/account.c:791
+#: ../libpurple/account.c:886
 msgid "accounts"
 msgstr "kontoar"
 
-#: ../libpurple/account.c:958 ../libpurple/protocols/jabber/auth.c:195
+#: ../libpurple/account.c:1061
+#: ../libpurple/protocols/jabber/auth.c:199
 msgid "Password is required to sign on."
 msgstr "Passord er påkravd for å logga på."
 
-#: ../libpurple/account.c:992
+#: ../libpurple/account.c:1095
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Skriv inn passordet til %s (%s)"
 
-#: ../libpurple/account.c:999
+#: ../libpurple/account.c:1102
 msgid "Enter Password"
 msgstr "Skriv inn passord"
 
-#: ../libpurple/account.c:1004
+#: ../libpurple/account.c:1107
 msgid "Save password"
 msgstr "Lagra passord"
 
-#: ../libpurple/account.c:1039 ../libpurple/connection.c:105
-#: ../libpurple/connection.c:178
+#: ../libpurple/account.c:1142
+#: ../libpurple/connection.c:118
+#: ../libpurple/connection.c:191
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Manglar protokolltillegg til %s"
 
-#: ../libpurple/account.c:1041 ../libpurple/connection.c:108
-#: ../pidgin/gtkblist.c:4036
+#: ../libpurple/account.c:1144
+#: ../libpurple/connection.c:121
 msgid "Connection Error"
 msgstr "Tilkoplingsfeil"
 
-#: ../libpurple/account.c:1199 ../libpurple/protocols/gg/gg.c:707
-#: ../libpurple/protocols/jabber/jabber.c:1687
+#: ../libpurple/account.c:1355
+#: ../libpurple/protocols/gg/gg.c:708
+#: ../libpurple/protocols/jabber/jabber.c:1729
 msgid "New passwords do not match."
 msgstr "Dei nye passorda samsvarer ikkje."
 
-#: ../libpurple/account.c:1208
+#: ../libpurple/account.c:1364
 msgid "Fill out all fields completely."
 msgstr "Fyll ut alle felta."
 
-#: ../libpurple/account.c:1231
+#: ../libpurple/account.c:1387
 msgid "Original password"
 msgstr "Opphavleg passord"
 
-#: ../libpurple/account.c:1238
+#: ../libpurple/account.c:1394
 msgid "New password"
 msgstr "Nytt passord"
 
-#: ../libpurple/account.c:1245
+#: ../libpurple/account.c:1401
 msgid "New password (again)"
 msgstr "Nytt passord (igjen)"
 
-#: ../libpurple/account.c:1251
+#: ../libpurple/account.c:1407
 #, c-format
 msgid "Change password for %s"
 msgstr "Endra passordet til %s"
 
-#: ../libpurple/account.c:1259
+#: ../libpurple/account.c:1415
 msgid "Please enter your current password and your new password."
 msgstr "Skriv inn det noverande og det nye passordet."
 
-#: ../libpurple/account.c:1290
+#: ../libpurple/account.c:1446
 #, c-format
 msgid "Change user information for %s"
 msgstr "Endra brukarinformasjonen til %s"
 
-#: ../libpurple/account.c:1293 ../libpurple/protocols/toc/toc.c:1670
+#: ../libpurple/account.c:1449
+#: ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "Skriv inn brukarinformasjon"
 
-#: ../libpurple/account.c:1764 ../libpurple/protocols/gg/gg.c:1017
-#: ../libpurple/protocols/jabber/buddy.c:782
-#: ../libpurple/protocols/jabber/buddy.c:2027
-#: ../libpurple/protocols/jabber/buddy.c:2044
-#: ../libpurple/protocols/novell/novell.c:2831
-#: ../libpurple/protocols/qq/qq.c:232 ../pidgin/gtkft.c:160
+#: ../libpurple/account.c:1920
+#: ../libpurple/protocols/gg/gg.c:1019
+#: ../libpurple/protocols/jabber/buddy.c:784
+#: ../libpurple/protocols/jabber/buddy.c:2034
+#: ../libpurple/protocols/jabber/buddy.c:2051
+#: ../libpurple/protocols/novell/novell.c:2849
+#: ../libpurple/protocols/qq/qq.c:233
+#: ../pidgin/gtkft.c:166
 msgid "Unknown"
 msgstr "Ukjend"
 
-#: ../libpurple/blist.c:521 ../libpurple/blist.c:1320
-#: ../libpurple/blist.c:1552 ../libpurple/protocols/jabber/roster.c:69
-#: ../libpurple/protocols/myspace/myspace.c:3244 ../pidgin/gtkblist.c:5373
+#: ../libpurple/blist.c:521
+#: ../libpurple/blist.c:1348
+#: ../libpurple/blist.c:1558
+#: ../libpurple/protocols/jabber/roster.c:69
+#: ../libpurple/protocols/myspace/myspace.c:3433
+#: ../pidgin/gtkblist.c:6188
 #: ../pidgin/plugins/gevolution/gevo-util.c:67
 #: ../pidgin/plugins/gevolution/gevolution.c:96
 msgid "Buddies"
@@ -2008,138 +2595,127 @@ msgstr "venneliste"
 msgid "buddy list"
 msgstr "venneliste"
 
-#: ../libpurple/certificate.c:545
+#: ../libpurple/certificate.c:558
 msgid "(DOES NOT MATCH)"
-msgstr ""
+msgstr "(SAMSVARER IKKJE)"
 
 #. Make messages
-#: ../libpurple/certificate.c:549
+#: ../libpurple/certificate.c:562
 #, c-format
 msgid "%s has presented the following certificate for just-this-once use:"
-msgstr ""
+msgstr "%s har presentert dette sertifikatet for eingangsbruk berre no:"
 
-#: ../libpurple/certificate.c:550
+#: ../libpurple/certificate.c:563
 #, c-format
 msgid ""
 "Common name: %s %s\n"
 "Fingerprint (SHA1): %s"
 msgstr ""
+"Namn: %s %s\n"
+"Fingeravtrykk (SHA1): %s"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:555
+#: ../libpurple/certificate.c:568
 msgid "Single-use Certificate Verification"
-msgstr ""
+msgstr "Eingangs sertifikatverifisering"
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:872
-#, fuzzy
+#: ../libpurple/certificate.c:894
 msgid "Certificate Authorities"
-msgstr "Sertifikat"
+msgstr "Sertifikatautoritetar"
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:1040
+#: ../libpurple/certificate.c:1062
 msgid "SSL Peers Cache"
-msgstr ""
+msgstr "Mellomlager SSL-tenarar"
 
 #. Make messages
-#: ../libpurple/certificate.c:1171
-#, fuzzy, c-format
+#: ../libpurple/certificate.c:1193
+#, c-format
 msgid "Accept certificate for %s?"
-msgstr "Tek du i mot invitasjonen?"
+msgstr "Godtek du sertifikatet til %s?"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1177
+#: ../libpurple/certificate.c:1199
 msgid "SSL Certificate Verification"
-msgstr ""
+msgstr "SSL-sertifikatverifisering"
 
 #. Number of actions
-#: ../libpurple/certificate.c:1186
-#, fuzzy
+#: ../libpurple/certificate.c:1208
 msgid "Accept"
-msgstr "_Godta"
+msgstr "Godta"
 
-#: ../libpurple/certificate.c:1187 ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/certificate.c:1209
+#: ../libpurple/protocols/qq/buddy_opt.c:214
 #: ../libpurple/protocols/qq/group_im.c:144
-#: ../libpurple/protocols/qq/group_opt.c:127
-#: ../libpurple/protocols/qq/sys_msg.c:90
-#: ../libpurple/protocols/qq/sys_msg.c:246
+#: ../libpurple/protocols/qq/group_opt.c:103
+#: ../libpurple/protocols/qq/sys_msg.c:91
+#: ../libpurple/protocols/qq/sys_msg.c:249
 msgid "Reject"
 msgstr "Avvis"
 
-#: ../libpurple/certificate.c:1188
-#, fuzzy
+#: ../libpurple/certificate.c:1210
 msgid "_View Certificate..."
-msgstr "Sertifikat"
+msgstr "Vis sertifikat…"
 
 #. Prompt the user to authenticate the certificate
-#. TODO: Provide the user with more guidance about why he is
-#. being prompted
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1288
+#: ../libpurple/certificate.c:1311
 #, c-format
-msgid ""
-"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
-"could mean that you are not connecting to the service you believe you are."
-msgstr ""
+msgid "The certificate presented by \"%s\" is self-signed. It cannot be automatically checked."
+msgstr "Sertifikatet som \"%s\" presenterte, er sjølvsignert. Det kan ikkje kontrollerast automatisk."
 
-#. Prompt the user to authenticate the certificate
-#. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1313
+#: ../libpurple/certificate.c:1329
 #, c-format
-msgid ""
-"The certificate presented by \"%s\" is self-signed. It cannot be "
-"automatically checked."
-msgstr ""
-
-#: ../libpurple/certificate.c:1331
-#, c-format
 msgid "The certificate chain presented for %s is not valid."
-msgstr ""
+msgstr "Den presenterte sertifikatkjeden til %s er ikkje gyldig."
 
 #. TODO: Make this error either block the ensuing SSL
 #. connection error until the user dismisses this one, or
 #. stifle it.
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
-#: ../libpurple/certificate.c:1339 ../libpurple/certificate.c:1416
-#, fuzzy
+#: ../libpurple/certificate.c:1337
+#: ../libpurple/certificate.c:1407
 msgid "SSL Certificate Error"
-msgstr "Sertifikat"
+msgstr "SSL sertifikatfeil"
 
-#: ../libpurple/certificate.c:1340
-#, fuzzy
+#: ../libpurple/certificate.c:1338
 msgid "Invalid certificate chain"
-msgstr "Ugyldig tittel"
+msgstr "Ugyldig sertifikatkjede"
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1360
-msgid ""
-"You have no database of root certificates, so this certificate cannot be "
-"validated."
-msgstr ""
+#: ../libpurple/certificate.c:1359
+msgid "You have no database of root certificates, so this certificate cannot be validated."
+msgstr "Du har ingen database over rotsertifikat. Dermed kan ikkje dette sertifikatet validerast."
 
 #. vrq will be completed by user_auth
 #: ../libpurple/certificate.c:1382
-msgid ""
-"The root certificate this one claims to be issued by is unknown to Pidgin."
-msgstr ""
+msgid "The root certificate this one claims to be issued by is unknown to Pidgin."
+msgstr "Pidgin kjenner ikkje til utferdaren av rotsertifikatet til dette."
 
-#: ../libpurple/certificate.c:1408
+#: ../libpurple/certificate.c:1399
 #, c-format
-msgid ""
-"The certificate chain presented by %s does not have a valid digital "
-"signature from the Certificate Authority from which it claims to have a "
-"signature."
-msgstr ""
+msgid "The certificate chain presented by %s does not have a valid digital signature from the Certificate Authority from which it claims to have a signature."
+msgstr "Sertifikatkjeden presentert av %s har ingen gyldig digital signatur frå sertifikatautoriteten han viser til. "
 
-#: ../libpurple/certificate.c:1417
+#: ../libpurple/certificate.c:1408
 msgid "Invalid certificate authority signature"
-msgstr ""
+msgstr "Ugyldig sertifikatautoritetssignatur"
 
+#. Prompt the user to authenticate the certificate
+#. TODO: Provide the user with more guidance about why he is
+#. being prompted
+#. vrq will be completed by user_auth
+#: ../libpurple/certificate.c:1434
+#, c-format
+msgid "The certificate presented by \"%s\" claims to be from \"%s\" instead.  This could mean that you are not connecting to the service you believe you are."
+msgstr "Sertifikatet som \"%s\" presenterte seier at det er frå \"%s\" i staden for. Dette kan bety at du ikkje koplar deg til den tenesta du trur du gjer."
+
 #. Make messages
-#: ../libpurple/certificate.c:1881
+#: ../libpurple/certificate.c:1896
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -2149,36 +2725,44 @@ msgstr ""
 "Activation date: %s\n"
 "Expiration date: %s\n"
 msgstr ""
+"Namn: %s\n"
+"\n"
+"Fingeravtrykk (SHA1): %s\n"
+"\n"
+"Teken i bruk: %s\n"
+"Utgår: %s\n"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1890
-#, fuzzy
+#: ../libpurple/certificate.c:1905
 msgid "Certificate Information"
-msgstr "Tenarinformasjon"
+msgstr "Sertifikatinformasjon"
 
-#: ../libpurple/connection.c:107
+#: ../libpurple/connection.c:120
 msgid "Registration Error"
 msgstr "Registreringsfeil"
 
-#: ../libpurple/connection.c:180
-#, fuzzy
+#: ../libpurple/connection.c:193
 msgid "Unregistration Error"
-msgstr "Registreringsfeil"
+msgstr "Avregistreringsfeil"
 
-#: ../libpurple/connection.c:350
+#: ../libpurple/connection.c:347
 #, c-format
 msgid "+++ %s signed on"
 msgstr "+++ %s logga på"
 
-#: ../libpurple/connection.c:380
+#: ../libpurple/connection.c:377
 #, c-format
 msgid "+++ %s signed off"
 msgstr "+++ %s logga av"
 
-#: ../libpurple/connection.c:497 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:2337
+#: ../libpurple/connection.c:530
+#: ../libpurple/plugin.c:277
+#: ../libpurple/protocols/jabber/buddy.c:2354
 #: ../libpurple/protocols/msn/servconn.c:141
-#: ../libpurple/protocols/msn/session.c:322
+#: ../libpurple/protocols/msn/session.c:377
+#: ../libpurple/protocols/msnp9/servconn.c:139
+#: ../libpurple/protocols/msnp9/session.c:329
+#: ../libpurple/protocols/oscar/family_chatnav.c:63
 msgid "Unknown error"
 msgstr "Ukjend feil"
 
@@ -2186,7 +2770,8 @@ msgstr "Klarte ikkje å senda meldinga: 
 msgid "Unable to send message: The message is too large."
 msgstr "Klarte ikkje å senda meldinga: ho er for stor."
 
-#: ../libpurple/conversation.c:173 ../libpurple/conversation.c:186
+#: ../libpurple/conversation.c:173
+#: ../libpurple/conversation.c:186
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "Klarte ikkje å senda melding til %s."
@@ -2195,45 +2780,46 @@ msgstr "Meldinga er for stor."
 msgid "The message is too large."
 msgstr "Meldinga er for stor."
 
-#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:255
-#: ../libpurple/protocols/bonjour/jabber.c:298
+#: ../libpurple/conversation.c:183
+#: ../libpurple/protocols/bonjour/jabber.c:272
+#: ../libpurple/protocols/bonjour/jabber.c:315
 msgid "Unable to send message."
 msgstr "Klarte ikkje å senda meldinga."
 
-#: ../libpurple/conversation.c:1211
+#: ../libpurple/conversation.c:1215
 msgid "Send Message"
 msgstr "Send melding"
 
-#: ../libpurple/conversation.c:1214
+#: ../libpurple/conversation.c:1218
 msgid "_Send Message"
 msgstr "_Send melding"
 
-#: ../libpurple/conversation.c:1620
+#: ../libpurple/conversation.c:1624
 #, c-format
 msgid "%s entered the room."
 msgstr "%s er komen inn i rommet."
 
-#: ../libpurple/conversation.c:1623
+#: ../libpurple/conversation.c:1627
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] er komen inn i rommet."
 
-#: ../libpurple/conversation.c:1733
+#: ../libpurple/conversation.c:1737
 #, c-format
 msgid "You are now known as %s"
 msgstr "No heiter du %s"
 
-#: ../libpurple/conversation.c:1753
+#: ../libpurple/conversation.c:1757
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s har endra namn til %s"
 
-#: ../libpurple/conversation.c:1828
+#: ../libpurple/conversation.c:1832
 #, c-format
 msgid "%s left the room."
 msgstr "%s har gått ut av rommet."
 
-#: ../libpurple/conversation.c:1831
+#: ../libpurple/conversation.c:1835
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s har gått ut av rommet (%s)."
@@ -2253,39 +2839,41 @@ msgstr "Klarte ikkje å henta tenarnamn:
 msgid "Failed to get serv name: %s"
 msgstr "Klarte ikkje å henta tenarnamn: %s"
 
-#: ../libpurple/dbus-server.h:85
+#: ../libpurple/dbus-server.h:84
 msgid "Purple's D-BUS server is not running for the reason listed below"
-msgstr ""
-"Purple sin D-BUS-tenar kjører ikkje på grunn av årsaka som er nemnd nedanfor "
+msgstr "Purple sin D-BUS-tenar kjører ikkje på grunn av årsaka som er nemnd nedanfor "
 
-#: ../libpurple/desktopitem.c:287 ../libpurple/desktopitem.c:878
+#: ../libpurple/desktopitem.c:287
+#: ../libpurple/desktopitem.c:878
 msgid "No name"
 msgstr "Ikkje noko namn"
 
-#: ../libpurple/dnsquery.c:511
+#: ../libpurple/dnsquery.c:532
 msgid "Unable to create new resolver process\n"
 msgstr "Klarte ikkje å laga ny oppslagsprosess\n"
 
-#: ../libpurple/dnsquery.c:516
+#: ../libpurple/dnsquery.c:537
 msgid "Unable to send request to resolver process\n"
 msgstr "Klarte ikkje å senda førespurnad til oppslagsprosessen\n"
 
-#: ../libpurple/dnsquery.c:549 ../libpurple/dnsquery.c:697
+#: ../libpurple/dnsquery.c:570
+#: ../libpurple/dnsquery.c:719
 #, c-format
 msgid ""
 "Error resolving %s:\n"
 "%s"
 msgstr ""
-"Oppslagsfeil for %s:\n"
+"Oppslagsfeil mot %s:\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:552 ../libpurple/dnsquery.c:711
-#: ../libpurple/dnsquery.c:831
+#: ../libpurple/dnsquery.c:573
+#: ../libpurple/dnsquery.c:733
+#: ../libpurple/dnsquery.c:851
 #, c-format
 msgid "Error resolving %s: %d"
-msgstr "Oppslagsfeil for %s: %d"
+msgstr "Oppslagsfeil mot %s: %d"
 
-#: ../libpurple/dnsquery.c:574
+#: ../libpurple/dnsquery.c:595
 #, c-format
 msgid ""
 "Error reading from resolver process:\n"
@@ -2294,21 +2882,20 @@ msgstr ""
 "Feil under lesing av oppslagsprosessen:\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:578
-#, c-format
+#: ../libpurple/dnsquery.c:599
 msgid "EOF while reading from resolver process"
 msgstr "EOF under lesing frå oppslagsprosessen"
 
-#: ../libpurple/dnsquery.c:761
+#: ../libpurple/dnsquery.c:783
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr "Klarte ikkje å laga tråd: %s"
 
-#: ../libpurple/dnsquery.c:762
+#: ../libpurple/dnsquery.c:784
 msgid "Unknown reason"
 msgstr "Ukjend årsak"
 
-#: ../libpurple/ft.c:209
+#: ../libpurple/ft.c:210
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -2317,7 +2904,7 @@ msgstr ""
 "Klarte ikkje å lesa %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:213
+#: ../libpurple/ft.c:214
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -2326,7 +2913,7 @@ msgstr ""
 "Klarte ikkje å skriva %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:217
+#: ../libpurple/ft.c:218
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -2335,39 +2922,39 @@ msgstr ""
 "Fekk ikkje tilgang til %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:253
+#: ../libpurple/ft.c:254
 msgid "Directory is not writable."
 msgstr "Ein kan ikkje skriva til atalogen."
 
-#: ../libpurple/ft.c:268
+#: ../libpurple/ft.c:269
 msgid "Cannot send a file of 0 bytes."
 msgstr "Ein kan ikkje senda ei fil på 0 bytar."
 
-#: ../libpurple/ft.c:278
+#: ../libpurple/ft.c:279
 msgid "Cannot send a directory."
 msgstr "Ein kan ikkje senda ein katalog."
 
-#: ../libpurple/ft.c:287
+#: ../libpurple/ft.c:288
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s er ikkje ei vanleg fil. Nektar å skriva over ho.\n"
 
-#: ../libpurple/ft.c:347
+#: ../libpurple/ft.c:348
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s ønskjer å senda deg %s (%s)"
 
-#: ../libpurple/ft.c:354
+#: ../libpurple/ft.c:355
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s ønskjer å senda deg ei fil"
 
-#: ../libpurple/ft.c:397
+#: ../libpurple/ft.c:398
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Godtek du overføringsførespurnaden frå %s?"
 
-#: ../libpurple/ft.c:401
+#: ../libpurple/ft.c:402
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -2378,62 +2965,60 @@ msgstr ""
 "Vert: %s\n"
 "Port: %d"
 
-#: ../libpurple/ft.c:436
+#: ../libpurple/ft.c:437
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s tilbyr seg å senda fila %s"
 
-#: ../libpurple/ft.c:488
+#: ../libpurple/ft.c:490
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s er ikkje eit lovleg filnamn.\n"
 
-#: ../libpurple/ft.c:509
+#: ../libpurple/ft.c:511
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "Tilbyr å senda %s til %s"
 
-#: ../libpurple/ft.c:521
+#: ../libpurple/ft.c:523
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "Startar overføring av %s frå %s"
 
-#: ../libpurple/ft.c:682
+#: ../libpurple/ft.c:700
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "Overføringa av fila %s er ferdig"
 
-#: ../libpurple/ft.c:685
-#, c-format
+#: ../libpurple/ft.c:703
 msgid "File transfer complete"
 msgstr "Filoverføringa er ferdig"
 
-#: ../libpurple/ft.c:1103
+#: ../libpurple/ft.c:1138
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Du avbraut overføringa av %s"
 
-#: ../libpurple/ft.c:1108
-#, c-format
+#: ../libpurple/ft.c:1143
 msgid "File transfer cancelled"
 msgstr "Filoverføringa blei avbroten"
 
-#: ../libpurple/ft.c:1166
+#: ../libpurple/ft.c:1201
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s avbraut overføringa av %s"
 
-#: ../libpurple/ft.c:1171
+#: ../libpurple/ft.c:1206
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s avbraut filoverføringa"
 
-#: ../libpurple/ft.c:1228
+#: ../libpurple/ft.c:1263
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "Filoverføringa til %s feila."
 
-#: ../libpurple/ft.c:1230
+#: ../libpurple/ft.c:1265
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "Filoverføringa frå %s feila."
@@ -2507,76 +3092,40 @@ msgstr "Handteraren av \"ymsgr\"-adresse
 msgstr "Handteraren av \"ymsgr\"-adresser"
 
 #: ../libpurple/gconf/purple.schemas.in.h:18
-msgid ""
-"True if the command specified in the \"command\" key should handle \"aim\" "
-"URLs."
-msgstr ""
-"Sann dersom kommandoen spesifisert i \"kommando\"-nøkkelen skal handtera "
-"\"aim\"-adresser."
+msgid "True if the command specified in the \"command\" key should handle \"aim\" URLs."
+msgstr "Sann dersom kommandoen spesifisert i \"kommando\"-nøkkelen skal handtera \"aim\"-adresser."
 
 #: ../libpurple/gconf/purple.schemas.in.h:19
-msgid ""
-"True if the command specified in the \"command\" key should handle \"gg\" "
-"URLs."
-msgstr ""
-"Sann dersom kommandoen spesifisert i \"kommando\"-nøkkelen skal handtera \"gg"
-"\"-adresser."
+msgid "True if the command specified in the \"command\" key should handle \"gg\" URLs."
+msgstr "Sann dersom kommandoen spesifisert i \"kommando\"-nøkkelen skal handtera \"gg\"-adresser."
 
 #: ../libpurple/gconf/purple.schemas.in.h:20
-msgid ""
-"True if the command specified in the \"command\" key should handle \"icq\" "
-"URLs."
-msgstr ""
-"Sann dersom kommandoen spesifisert i \"kommando\"-nøkkelen skal handtera "
-"\"icq\"-adresser."
+msgid "True if the command specified in the \"command\" key should handle \"icq\" URLs."
+msgstr "Sann dersom kommandoen spesifisert i \"kommando\"-nøkkelen skal handtera \"icq\"-adresser."
 
 #: ../libpurple/gconf/purple.schemas.in.h:21
-msgid ""
-"True if the command specified in the \"command\" key should handle \"irc\" "
-"URLs."
-msgstr ""
-"Sann dersom kommandoen spesifisert i \"kommando\"-nøkkelen skal handtera "
-"\"irc\"-adresser."
+msgid "True if the command specified in the \"command\" key should handle \"irc\" URLs."
+msgstr "Sann dersom kommandoen spesifisert i \"kommando\"-nøkkelen skal handtera \"irc\"-adresser."
 
 #: ../libpurple/gconf/purple.schemas.in.h:22
-msgid ""
-"True if the command specified in the \"command\" key should handle \"msnim\" "
-"URLs."
-msgstr ""
-"Sann dersom kommandoen spesifisert i \"kommando\"-nøkkelen skal handtera "
-"\"msnim\"-adresser."
+msgid "True if the command specified in the \"command\" key should handle \"msnim\" URLs."
+msgstr "Sann dersom kommandoen spesifisert i \"kommando\"-nøkkelen skal handtera \"msnim\"-adresser."
 
 #: ../libpurple/gconf/purple.schemas.in.h:23
-msgid ""
-"True if the command specified in the \"command\" key should handle \"sip\" "
-"URLs."
-msgstr ""
-"Sann dersom kommandoen spesifisert i \"kommando\"-nøkkelen skal handtera "
-"\"sip\"-adresser."
+msgid "True if the command specified in the \"command\" key should handle \"sip\" URLs."
+msgstr "Sann dersom kommandoen spesifisert i \"kommando\"-nøkkelen skal handtera \"sip\"-adresser."
 
 #: ../libpurple/gconf/purple.schemas.in.h:24
-msgid ""
-"True if the command specified in the \"command\" key should handle \"xmpp\" "
-"URLs."
-msgstr ""
-"Sann dersom kommandoen spesifisert i \"kommando\"-nøkkelen skal handtera "
-"\"xmpp\"-adresser."
+msgid "True if the command specified in the \"command\" key should handle \"xmpp\" URLs."
+msgstr "Sann dersom kommandoen spesifisert i \"kommando\"-nøkkelen skal handtera \"xmpp\"-adresser."
 
 #: ../libpurple/gconf/purple.schemas.in.h:25
-msgid ""
-"True if the command specified in the \"command\" key should handle \"ymsgr\" "
-"URLs."
-msgstr ""
-"Sann dersom kommandoen spesifisert i \"kommando\"-nøkkelen skal handtera "
-"\"ymsgr\"-adresser."
+msgid "True if the command specified in the \"command\" key should handle \"ymsgr\" URLs."
+msgstr "Sann dersom kommandoen spesifisert i \"kommando\"-nøkkelen skal handtera \"ymsgr\"-adresser."
 
 #: ../libpurple/gconf/purple.schemas.in.h:26
-msgid ""
-"True if the command used to handle this type of URL should be run in a "
-"terminal."
-msgstr ""
-"Sann dersom kommandoen som skal handtera denne adressetypen bør kjørast i "
-"ein terminal."
+msgid "True if the command used to handle this type of URL should be run in a terminal."
+msgstr "Sann dersom kommandoen som skal handtera denne adressetypen bør kjørast i ein terminal."
 
 #: ../libpurple/gconf/purple.schemas.in.h:27
 msgid "Whether the specified command should handle \"aim\" URLs"
@@ -2614,118 +3163,105 @@ msgstr "<b><font color=\"red\">Loggaren 
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">Loggaren har ingen lesefunksjon</font></b>"
 
-#: ../libpurple/log.c:598
+#: ../libpurple/log.c:597
 msgid "HTML"
 msgstr "HTML"
 
-#: ../libpurple/log.c:612
+#: ../libpurple/log.c:611
 msgid "Plain text"
 msgstr "Rein tekst"
 
-#: ../libpurple/log.c:626
+#: ../libpurple/log.c:625
 msgid "Old flat format"
 msgstr "Gammalt flatformat"
 
-#: ../libpurple/log.c:839
+#: ../libpurple/log.c:838
 msgid "Logging of this conversation failed."
 msgstr "Klarte ikkje å loggføra denne samtala."
 
-#: ../libpurple/log.c:1282
+#: ../libpurple/log.c:1281
 msgid "XML"
 msgstr "XML"
 
-#: ../libpurple/log.c:1366
+#: ../libpurple/log.c:1365
 #, c-format
-msgid ""
-"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
-"REPLY&gt;:</b></font> %s<br/>\n"
-msgstr ""
-"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
-"REPLY&gt;:</b></font> %s<br/>\n"
+msgid "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
+msgstr "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1368
+#: ../libpurple/log.c:1367
 #, c-format
-msgid ""
-"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
-"REPLY&gt;:</b></font> %s<br/>\n"
-msgstr ""
-"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
-"REPLY&gt;:</b></font> %s<br/>\n"
+msgid "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
+msgstr "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1426 ../libpurple/log.c:1559
+#: ../libpurple/log.c:1425
+#: ../libpurple/log.c:1558
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>Klarte ikkje å finna loggfilbana.</b></font>"
 
-#: ../libpurple/log.c:1438 ../libpurple/log.c:1568
+#: ../libpurple/log.c:1437
+#: ../libpurple/log.c:1567
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>Klarte ikkje å lesa fila: %s</b></font>"
 
-#: ../libpurple/log.c:1500
+#: ../libpurple/log.c:1499
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
-#: ../libpurple/plugin.c:365
+#: ../libpurple/plugin.c:360
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Du nyttar %s, men dette tillegget krev %s."
 
-#: ../libpurple/plugin.c:380
-#, c-format
+#: ../libpurple/plugin.c:375
 msgid "This plugin has not defined an ID."
 msgstr "Dette tillegget har ikkje definert ein ID."
 
-#: ../libpurple/plugin.c:448
+#: ../libpurple/plugin.c:443
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
 msgstr "Samsvarsfeil %d i det magiske nummeret til tillegget (treng %d)"
 
-#: ../libpurple/plugin.c:465
+#: ../libpurple/plugin.c:460
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr "Samsvarsfeil %d i ABI-versjonen.%d.x (treng %d.%d.x)"
 
-#: ../libpurple/plugin.c:482
+#: ../libpurple/plugin.c:477
 msgid "Plugin does not implement all required functions"
 msgstr "Programtillegget nyttar ikkje alle nødvendige funksjonar"
 
-#: ../libpurple/plugin.c:547
+#: ../libpurple/plugin.c:542
 #, c-format
-msgid ""
-"The required plugin %s was not found. Please install this plugin and try "
-"again."
-msgstr ""
-"Fann ikkje det påkravde programtillegget %s. Forsøk å installera dette "
-"tillegget og prøv igjen."
+msgid "The required plugin %s was not found. Please install this plugin and try again."
+msgstr "Fann ikkje det påkravde programtillegget %s. Forsøk å installera dette tillegget og prøv igjen."
 
-#: ../libpurple/plugin.c:552
+#: ../libpurple/plugin.c:547
 msgid "Unable to load the plugin"
 msgstr "Klarte ikkje å lasta programtillegget."
 
-#: ../libpurple/plugin.c:574
+#: ../libpurple/plugin.c:569
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "Klarte ikkje å lasta det påkravde programtillegget %s."
 
-#: ../libpurple/plugin.c:578
+#: ../libpurple/plugin.c:573
 msgid "Unable to load your plugin."
 msgstr "Klarte ikkje å lasta programtillegget ditt."
 
-#: ../libpurple/plugin.c:677
+# Krøkkete formulert.
+#: ../libpurple/plugin.c:663
 #, c-format
-msgid "The dependent plugin %s failed to unload."
-msgstr "Klarte ikkje å lasta ut det bundne programtillegget %s."
+msgid "%s requires %s, but it failed to unload."
+msgstr "%s krev %s, men det kunne ikkja lastast ut."
 
-#: ../libpurple/plugin.c:681
-msgid "There were errors unloading the plugin."
-msgstr "Det oppstod feil under utlasting av programtillegget."
-
 #: ../libpurple/plugins/autoaccept.c:23
 msgid "Autoaccept"
 msgstr "Godta automatisk"
 
-#: ../libpurple/plugins/autoaccept.c:25 ../libpurple/plugins/autoaccept.c:26
+#: ../libpurple/plugins/autoaccept.c:25
+#: ../libpurple/plugins/autoaccept.c:26
 msgid "Auto-accept file transfer requests from selected users."
 msgstr "Godta automatisk filoverføringsførespurnader frå utvalde brukarar."
 
@@ -2738,50 +3274,54 @@ msgstr "Automatisk godtaking er ferdig"
 msgid "Autoaccept complete"
 msgstr "Automatisk godtaking er ferdig"
 
-#: ../libpurple/plugins/autoaccept.c:160
+#: ../libpurple/plugins/autoaccept.c:171
 #, c-format
 msgid "When a file-transfer request arrives from %s"
 msgstr "Når ein filoverføringsførespurnad kjem frå %s"
 
-#: ../libpurple/plugins/autoaccept.c:162
+#: ../libpurple/plugins/autoaccept.c:173
 msgid "Set Autoaccept Setting"
 msgstr "Innstilling for automatisk godtaking"
 
-#: ../libpurple/plugins/autoaccept.c:164
+#: ../libpurple/plugins/autoaccept.c:175
 msgid "_Save"
 msgstr "La_gra"
 
-#: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
-#: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
-#: ../libpurple/protocols/oscar/oscar.c:1453
-#: ../libpurple/protocols/oscar/oscar.c:2233
-#: ../libpurple/protocols/oscar/oscar.c:2282
-#: ../libpurple/protocols/oscar/oscar.c:5886
-#: ../libpurple/protocols/oscar/oscar.c:5941
-#: ../libpurple/protocols/oscar/oscar.c:6167
-#: ../libpurple/protocols/oscar/oscar.c:6237 ../libpurple/request.h:1388
-#: ../libpurple/request.h:1398
+#: ../libpurple/plugins/autoaccept.c:176
+#: ../libpurple/plugins/idle.c:170
+#: ../libpurple/plugins/idle.c:204
+#: ../libpurple/plugins/idle.c:230
+#: ../libpurple/protocols/oscar/oscar.c:1492
+#: ../libpurple/protocols/oscar/oscar.c:2294
+#: ../libpurple/protocols/oscar/oscar.c:2343
+#: ../libpurple/protocols/oscar/oscar.c:5989
+#: ../libpurple/protocols/oscar/oscar.c:6044
+#: ../libpurple/protocols/oscar/oscar.c:6270
+#: ../libpurple/protocols/oscar/oscar.c:6340
+#: ../libpurple/request.h:1458
+#: ../libpurple/request.h:1468
+#: ../pidgin/gtkblist.c:552
 msgid "_Cancel"
 msgstr "_Avbryt"
 
-#: ../libpurple/plugins/autoaccept.c:168
+#: ../libpurple/plugins/autoaccept.c:179
 msgid "Ask"
 msgstr "Spør"
 
-#: ../libpurple/plugins/autoaccept.c:169
+#: ../libpurple/plugins/autoaccept.c:180
 msgid "Auto Accept"
 msgstr "Automatisk godta"
 
-#: ../libpurple/plugins/autoaccept.c:170
+#: ../libpurple/plugins/autoaccept.c:181
 msgid "Auto Reject"
 msgstr "Automatisk avvis"
 
-#: ../libpurple/plugins/autoaccept.c:185
+#: ../libpurple/plugins/autoaccept.c:196
 msgid "Autoaccept File Transfers..."
 msgstr "Godta automatisk filoverføringar…"
 
 #. XXX: Is there a better way than this? There really should be.
-#: ../libpurple/plugins/autoaccept.c:215
+#: ../libpurple/plugins/autoaccept.c:226
 msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
@@ -2789,21 +3329,23 @@ msgstr ""
 "Fillagringsbane\n"
 "(før opp heile filbana)"
 
-#: ../libpurple/plugins/autoaccept.c:220
+#: ../libpurple/plugins/autoaccept.c:231
 msgid "Automatically reject from users not in buddy list"
 msgstr "Automatisk avvising frå brukarar utanfor vennelista"
 
-#: ../libpurple/plugins/autoaccept.c:224
+#: ../libpurple/plugins/autoaccept.c:235
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
 msgstr ""
-"La eit varslingsvindauge spretta opp når ei auto-godkjend filoverføring er "
-"ferdig\n"
+"La eit varslingsvindauge spretta opp når ei auto-godkjend filoverføring er ferdig\n"
 "(berre når det ikkje foregår ei samtale med sendaren)"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1660
-#: ../libpurple/protocols/msn/msn.c:1690
+#: ../libpurple/plugins/buddynote.c:46
+#: ../libpurple/protocols/msn/msn.c:1816
+#: ../libpurple/protocols/msn/msn.c:1846
+#: ../libpurple/protocols/msnp9/msn.c:1672
+#: ../libpurple/protocols/msnp9/msn.c:1702
 msgid "Notes"
 msgstr "Notat"
 
@@ -2823,18 +3365,21 @@ msgstr "Endra notat…"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/buddynote.c:90 ../pidgin/plugins/gtkbuddynote.c:74
+#: ../libpurple/plugins/buddynote.c:90
+#: ../pidgin/plugins/gtkbuddynote.c:74
 msgid "Buddy Notes"
 msgstr "Vennenotat"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/buddynote.c:92 ../pidgin/plugins/gtkbuddynote.c:76
+#: ../libpurple/plugins/buddynote.c:92
+#: ../pidgin/plugins/gtkbuddynote.c:76
 msgid "Store notes on particular buddies."
 msgstr "Lagra notat på utvalde vennar."
 
 #. *< summary
-#: ../libpurple/plugins/buddynote.c:93 ../pidgin/plugins/gtkbuddynote.c:77
+#: ../libpurple/plugins/buddynote.c:93
+#: ../pidgin/plugins/gtkbuddynote.c:77
 msgid "Adds the option to store notes for buddies on your buddy list."
 msgstr "Legg til høve til å lagra notat for dei på vennelista."
 
@@ -2852,7 +3397,8 @@ msgstr "Krypteringsprøve"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ciphertest.c:267 ../libpurple/plugins/ciphertest.c:269
+#: ../libpurple/plugins/ciphertest.c:267
+#: ../libpurple/plugins/ciphertest.c:269
 msgid "Tests the ciphers that ship with libpurple."
 msgstr "Prøver krypteringa libpurple kjem med."
 
@@ -2889,34 +3435,41 @@ msgstr "Filkontroll"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/filectl.c:251 ../libpurple/plugins/filectl.c:253
+#: ../libpurple/plugins/filectl.c:251
+#: ../libpurple/plugins/filectl.c:253
 msgid "Allows control by entering commands in a file."
 msgstr "Tillèt kontroll gjennom å skriva kommandoar i ei fil."
 
-#: ../libpurple/plugins/idle.c:158 ../libpurple/plugins/idle.c:218
+#: ../libpurple/plugins/idle.c:158
+#: ../libpurple/plugins/idle.c:218
 msgid "Minutes"
 msgstr "Minutt"
 
 #. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.
 #. If that doesn't translate well into your language, drop the 's before translating.
-#: ../libpurple/plugins/idle.c:165 ../libpurple/plugins/idle.c:199
-#: ../libpurple/plugins/idle.c:225 ../libpurple/plugins/idle.c:318
+#: ../libpurple/plugins/idle.c:165
+#: ../libpurple/plugins/idle.c:199
+#: ../libpurple/plugins/idle.c:225
+#: ../libpurple/plugins/idle.c:318
 msgid "I'dle Mak'er"
 msgstr "Uverksamgjerar"
 
-#: ../libpurple/plugins/idle.c:166 ../libpurple/plugins/idle.c:258
+#: ../libpurple/plugins/idle.c:166
+#: ../libpurple/plugins/idle.c:258
 msgid "Set Account Idle Time"
 msgstr "Skriv inn kor lenge uverksam"
 
-#: ../libpurple/plugins/idle.c:169 ../libpurple/plugins/idle.c:229
+#: ../libpurple/plugins/idle.c:169
+#: ../libpurple/plugins/idle.c:229
 msgid "_Set"
-msgstr "_Skriv inn"
+msgstr "_Vel"
 
 #: ../libpurple/plugins/idle.c:184
 msgid "None of your accounts are idle."
 msgstr "Ingen av kontoane dine er uverksame."
 
-#: ../libpurple/plugins/idle.c:200 ../libpurple/plugins/idle.c:262
+#: ../libpurple/plugins/idle.c:200
+#: ../libpurple/plugins/idle.c:262
 msgid "Unset Account Idle Time"
 msgstr "Nullstill kor lenge uverksam"
 
@@ -2924,7 +3477,8 @@ msgstr "_Nullstill"
 msgid "_Unset"
 msgstr "_Nullstill"
 
-#: ../libpurple/plugins/idle.c:226 ../libpurple/plugins/idle.c:266
+#: ../libpurple/plugins/idle.c:226
+#: ../libpurple/plugins/idle.c:266
 msgid "Set Idle Time for All Accounts"
 msgstr "Før opp uverksamtid for alle kontoar"
 
@@ -2932,7 +3486,8 @@ msgstr "Nullstill uverksamtid for alle u
 msgid "Unset Idle Time for All Idled Accounts"
 msgstr "Nullstill uverksamtid for alle uverksame kontoar"
 
-#: ../libpurple/plugins/idle.c:320 ../libpurple/plugins/idle.c:321
+#: ../libpurple/plugins/idle.c:320
+#: ../libpurple/plugins/idle.c:321
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr "Lèt deg manuelt endra kor lenge du har vore uverksam"
 
@@ -2955,12 +3510,8 @@ msgstr "Testar IPC-støtta i tillegget (
 
 #. *  description
 #: ../libpurple/plugins/ipc-test-client.c:92
-msgid ""
-"Test plugin IPC support, as a client. This locates the server plugin and "
-"calls the commands registered."
-msgstr ""
-"Testar IPC-støtta i tillegget (som klient). Denne testen finn tenartillegget "
-"og kallar dei registrerte kommandoane."
+msgid "Test plugin IPC support, as a client. This locates the server plugin and calls the commands registered."
+msgstr "Testar IPC-støtta i tillegget (som klient). Denne testen finn tenartillegget og kallar dei registrerte kommandoane."
 
 #. *< type
 #. *< ui_requirement
@@ -2982,8 +3533,7 @@ msgid "Test plugin IPC support, as a ser
 #. *  description
 #: ../libpurple/plugins/ipc-test-server.c:79
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
-msgstr ""
-"Test IPC-støtta i tillegget (som tenar). Dette registrerer IPC-kommandoane."
+msgstr "Test IPC-støtta i tillegget (som tenar). Dette registrerer IPC-kommandoane."
 
 #: ../libpurple/plugins/joinpart.c:229
 msgid "Join/Part Hiding Configuration"
@@ -3016,121 +3566,123 @@ msgstr "Skjuler unødvendige bli med/gå
 
 #. *  description
 #: ../libpurple/plugins/joinpart.c:275
-msgid ""
-"This plugin hides join/part messages in large rooms, except for those users "
-"actively taking part in a conversation."
-msgstr ""
-"Dette tillegget skjuler bli med/gå ut-meldingar i store rom, med unntak for "
-"brukarar som tek aktv del i ei samtale."
+msgid "This plugin hides join/part messages in large rooms, except for those users actively taking part in a conversation."
+msgstr "Dette tillegget skjuler bli med/gå ut-meldingar i store rom, med unntak for brukarar som tek aktv del i ei samtale."
 
 #. This is used in the place of a timezone abbreviation if the
 #. * offset is way off.  The user should never really see it, but
 #. * it's here just in case.  The parens are to make it clear it's
 #. * not a real timezone.
-#: ../libpurple/plugins/log_reader.c:493
+#: ../libpurple/plugins/log_reader.c:499
 msgid "(UTC)"
 msgstr "(UTC)"
 
-#: ../libpurple/plugins/log_reader.c:1577
+#: ../libpurple/plugins/log_reader.c:1554
 msgid "User is offline."
 msgstr "Brukaren er fråkopla."
 
-#: ../libpurple/plugins/log_reader.c:1583
+#: ../libpurple/plugins/log_reader.c:1560
 msgid "Auto-response sent:"
 msgstr "Automatisk svar sendt:"
 
-#: ../libpurple/plugins/log_reader.c:1593
-#: ../libpurple/plugins/log_reader.c:1596
+#: ../libpurple/plugins/log_reader.c:1570
+#: ../libpurple/plugins/log_reader.c:1573
 #: ../libpurple/plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
 msgstr "%s har logga av."
 
-#: ../libpurple/plugins/log_reader.c:1610
+#: ../libpurple/plugins/log_reader.c:1587
 msgid "One or more messages may have been undeliverable."
 msgstr "Det kan henda at ei eller fleire meldingar ikkje blei leverte."
 
-#: ../libpurple/plugins/log_reader.c:1620
+#: ../libpurple/plugins/log_reader.c:1597
 msgid "You were disconnected from the server."
 msgstr "Du blei fråkopla tenaren."
 
-#: ../libpurple/plugins/log_reader.c:1628
-msgid ""
-"You are currently disconnected. Messages will not be received unless you are "
-"logged in."
+#: ../libpurple/plugins/log_reader.c:1605
+msgid "You are currently disconnected. Messages will not be received unless you are logged in."
 msgstr "Du er fråkopla. Du kan ikkje få nye meldingar før du loggar på."
 
-#: ../libpurple/plugins/log_reader.c:1643
+#: ../libpurple/plugins/log_reader.c:1620
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr "Meldinga kunne ikkje sendast sia ho var for stor."
 
-#: ../libpurple/plugins/log_reader.c:1648
+#: ../libpurple/plugins/log_reader.c:1625
 msgid "Message could not be sent."
 msgstr "Meldinga kunne ikkje sendast."
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2349
-#: ../libpurple/plugins/log_reader.c:2472
+#: ../libpurple/plugins/log_reader.c:2699
+#: ../libpurple/plugins/log_reader.c:2835
 msgid "Adium"
 msgstr "Adium"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2362
-#: ../libpurple/plugins/log_reader.c:2477
+#: ../libpurple/plugins/log_reader.c:2712
+#: ../libpurple/plugins/log_reader.c:2840
 msgid "Fire"
 msgstr "Fire"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2374
-#: ../libpurple/plugins/log_reader.c:2481
+#: ../libpurple/plugins/log_reader.c:2724
+#: ../libpurple/plugins/log_reader.c:2844
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2388
-#: ../libpurple/plugins/log_reader.c:2486
+#: ../libpurple/plugins/log_reader.c:2738
+#: ../libpurple/plugins/log_reader.c:2849
 msgid "QIP"
 msgstr "QIP"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2400
-#: ../libpurple/plugins/log_reader.c:2490
+#: ../libpurple/plugins/log_reader.c:2750
+#: ../libpurple/plugins/log_reader.c:2853
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2412
-#: ../libpurple/plugins/log_reader.c:2494
+#: ../libpurple/plugins/log_reader.c:2762
+#: ../libpurple/plugins/log_reader.c:2857
 msgid "Trillian"
 msgstr "Trillian"
 
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../libpurple/plugins/log_reader.c:2774
+#: ../libpurple/plugins/log_reader.c:2861
+msgid "aMSN"
+msgstr "aMSN"
+
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2454
+#: ../libpurple/plugins/log_reader.c:2817
 msgid "General Log Reading Configuration"
 msgstr "Generelle innstillingar for logglesing"
 
-#: ../libpurple/plugins/log_reader.c:2458
+#: ../libpurple/plugins/log_reader.c:2821
 msgid "Fast size calculations"
 msgstr "Raske storleiksutrekningar"
 
-#: ../libpurple/plugins/log_reader.c:2462
+#: ../libpurple/plugins/log_reader.c:2825
 msgid "Use name heuristics"
 msgstr "Bruk namneheuristikk"
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2468
+#: ../libpurple/plugins/log_reader.c:2831
 msgid "Log Directory"
 msgstr "Loggkatalog"
 
@@ -3140,31 +3692,27 @@ msgstr "Loggkatalog"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2523
+#: ../libpurple/plugins/log_reader.c:2890
 msgid "Log Reader"
 msgstr "Logglesar"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2527
+#: ../libpurple/plugins/log_reader.c:2894
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Tek med loggar frå andre lynmeldingsklientar i loggvisaren."
 
 #. * description
-#: ../libpurple/plugins/log_reader.c:2531
+#: ../libpurple/plugins/log_reader.c:2898
 msgid ""
-"When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"When viewing logs, this plugin will include logs from other IM clients. Currently, this includes Adium, MSN Messenger, and Trillian.\n"
 "\n"
-"WARNING: This plugin is still alpha code and may crash frequently.  Use it "
-"at your own risk!"
+"WARNING: This plugin is still alpha code and may crash frequently.  Use it at your own risk!"
 msgstr ""
-"Når ein les loggar, vil dette programtillegget ta med loggar frå andre "
-"klientar. For tida gjeld dette Adium, MSN Messenger og Trillian.\n"
+"Når ein les loggar, vil dette programtillegget ta med loggar frå andre klientar. For tida gjeld dette Adium, MSN Messenger og Trillian.\n"
 "\n"
-"ÅTVARING: Dette tillegget er framleis ein alfa-versjon og vil kanskje kræsja "
-"ofte. Bruk det på eigen risiko!"
+"ÅTVARING: Dette tillegget er framleis ein alfa-versjon og vil kanskje kræsja ofte. Bruk det på eigen risiko!"
 
 #: ../libpurple/plugins/mono/loader/mono.c:217
 msgid "Mono Plugin Loader"
@@ -3175,6 +3723,14 @@ msgstr "Lastar .Net-programtillegg saman
 msgid "Loads .NET plugins with Mono."
 msgstr "Lastar .Net-programtillegg saman med Mono."
 
+#: ../libpurple/plugins/newline.c:57
+msgid "Add new line in IMs"
+msgstr "Leg til ne linje i lynmeldnga"
+
+#: ../libpurple/plugins/newline.c:61
+msgid "Add new line in Chats"
+msgstr "Legg til ny linje i samtaler"
+
 #. *< magic
 #. *< major version
 #. *< minor version
@@ -3184,49 +3740,38 @@ msgstr "Lastar .Net-programtillegg saman
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/newline.c:68
+#: ../libpurple/plugins/newline.c:104
 msgid "New Line"
 msgstr "Ny linje"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/newline.c:70
+#: ../libpurple/plugins/newline.c:106
 msgid "Prepends a newline to displayed message."
 msgstr "Legg til ei ny linje føre den viste meldinga."
 
 #. *< summary
-#: ../libpurple/plugins/newline.c:71
-msgid ""
-"Prepends a newline to messages so that the rest of the message appears below "
-"the screen name in the conversation window."
-msgstr ""
-"Legg til ei ny linje føre meldingar slik at resten av meldinga blir vist "
-"under brukarnamnet i pratevindauget."
+#: ../libpurple/plugins/newline.c:107
+msgid "Prepends a newline to messages so that the rest of the message appears below the screen name in the conversation window."
+msgstr "Legg til ei ny linje føre meldingar slik at resten av meldinga blir vist under brukarnamnet i pratevindauget."
 
 #: ../libpurple/plugins/offlinemsg.c:23
 msgid "Offline Message Emulation"
 msgstr "Emulering av fråkopla meldingar"
 
-#: ../libpurple/plugins/offlinemsg.c:25 ../libpurple/plugins/offlinemsg.c:26
+#: ../libpurple/plugins/offlinemsg.c:25
+#: ../libpurple/plugins/offlinemsg.c:26
 msgid "Save messages sent to an offline user as pounce."
 msgstr "Lagra meldingar som er sende til ein fråkopla brukar som varsel."
 
 #: ../libpurple/plugins/offlinemsg.c:95
-msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
-"pounce from the `Buddy Pounce' dialog."
-msgstr ""
-"Resten av meldingane vil bli lagra som eit varsel. Du kan endra/sletta "
-"varselet frå vennevarsel-vindauget."
+msgid "The rest of the messages will be saved as pounce. You can edit/delete the pounce from the `Buddy Pounce' dialog."
+msgstr "Resten av meldingane vil bli lagra som eit varsel. Du kan endra/sletta varselet frå vennevarsel-vindauget."
 
 #: ../libpurple/plugins/offlinemsg.c:156
 #, c-format
-msgid ""
-"\"%s\" is currently offline. Do you want to save the rest of the messages in "
-"a pounce and automatically send them when \"%s\" logs back in?"
-msgstr ""
-"\"%s\" er for tida fråkopla. Vil du lagra resten av meldingane som eit "
-"varsel og automatisk senda det når \"%s\" loggar på att?"
+msgid "\"%s\" is currently offline. Do you want to save the rest of the messages in a pounce and automatically send them when \"%s\" logs back in?"
+msgstr "\"%s\" er for tida fråkopla. Vil du lagra resten av meldingane som eit varsel og automatisk senda det når \"%s\" loggar på att?"
 
 #: ../libpurple/plugins/offlinemsg.c:160
 msgid "Offline Message"
@@ -3237,26 +3782,36 @@ msgstr "Du kan endra/sletta varselet frÃ
 msgstr "Du kan endra/sletta varselet frå vennevarsel-vindauget"
 
 #: ../libpurple/plugins/offlinemsg.c:165
-#: ../libpurple/protocols/msn/dialog.c:133
-#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
-#: ../libpurple/protocols/novell/novell.c:1917
+#: ../libpurple/protocols/msn/dialog.c:141
+#: ../libpurple/protocols/msn/msn.c:661
+#: ../libpurple/protocols/msnp9/dialog.c:133
+#: ../libpurple/protocols/msnp9/msn.c:547
+#: ../libpurple/protocols/msnp9/msn.c:563
+#: ../libpurple/protocols/novell/novell.c:1929
 #: ../libpurple/protocols/silc/buddy.c:317
-#: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304
+#: ../libpurple/protocols/silc/pk.c:113
+#: ../libpurple/protocols/silc/wb.c:308
 #: ../libpurple/protocols/silc10/buddy.c:314
 #: ../libpurple/protocols/silc10/pk.c:119
-#: ../libpurple/protocols/silc10/wb.c:304 ../pidgin/gtkrequest.c:268
+#: ../libpurple/protocols/silc10/wb.c:307
+#: ../pidgin/gtkrequest.c:270
 msgid "Yes"
 msgstr "Ja"
 
 #: ../libpurple/plugins/offlinemsg.c:166
-#: ../libpurple/protocols/msn/dialog.c:134
-#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
-#: ../libpurple/protocols/novell/novell.c:1918
+#: ../libpurple/protocols/msn/dialog.c:142
+#: ../libpurple/protocols/msn/msn.c:661
+#: ../libpurple/protocols/msnp9/dialog.c:134
+#: ../libpurple/protocols/msnp9/msn.c:547
+#: ../libpurple/protocols/msnp9/msn.c:563
+#: ../libpurple/protocols/novell/novell.c:1930
 #: ../libpurple/protocols/silc/buddy.c:318
-#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305
+#: ../libpurple/protocols/silc/pk.c:114
+#: ../libpurple/protocols/silc/wb.c:309
 #: ../libpurple/protocols/silc10/buddy.c:315
 #: ../libpurple/protocols/silc10/pk.c:120
-#: ../libpurple/protocols/silc10/wb.c:305 ../pidgin/gtkrequest.c:269
+#: ../libpurple/protocols/silc10/wb.c:308
+#: ../pidgin/gtkrequest.c:271
 msgid "No"
 msgstr "Nei"
 
@@ -3281,7 +3836,8 @@ msgstr "Perl-tilleggslastar"
 #. *< name
 #. *< version
 #. *< summary
-#: ../libpurple/plugins/perl/perl.c:603 ../libpurple/plugins/perl/perl.c:604
+#: ../libpurple/plugins/perl/perl.c:603
+#: ../libpurple/plugins/perl/perl.c:604
 msgid "Provides support for loading perl plugins."
 msgstr "Gjev støtte til bruk av Perl-tillegg."
 
@@ -3294,12 +3850,8 @@ msgstr "Klarsynmodus for innkomande samt
 msgstr "Klarsynmodus for innkomande samtale"
 
 #: ../libpurple/plugins/psychic.c:22
-msgid ""
-"Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
-msgstr ""
-"Gjer at pratevindauge kjem fram når andre brukarar begynner å senda "
-"meldingar til deg. Dette verkar for AIM, ICQ, XMPP, Sametime og Yahoo!"
+msgid "Causes conversation windows to appear as other users begin to message you.  This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
+msgstr "Gjer at pratevindauge kjem fram når andre brukarar begynner å senda meldingar til deg. Dette verkar for AIM, ICQ, XMPP, Sametime og Yahoo!"
 
 #: ../libpurple/plugins/psychic.c:72
 msgid "You feel a disturbance in the force..."
@@ -3327,7 +3879,7 @@ msgstr "Hev synske samtaler"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/signals-test.c:711
+#: ../libpurple/plugins/signals-test.c:753
 msgid "Signals Test"
 msgstr "Signaltest"
 
@@ -3335,8 +3887,8 @@ msgstr "Signaltest"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/signals-test.c:714
-#: ../libpurple/plugins/signals-test.c:716
+#: ../libpurple/plugins/signals-test.c:756
+#: ../libpurple/plugins/signals-test.c:758
 msgid "Test to see that all signals are working properly."
 msgstr "Testar om alle signala verkar slik dei skal."
 
@@ -3354,13 +3906,14 @@ msgstr "Enkelt programtillegg"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/simple.c:40 ../libpurple/plugins/simple.c:42
+#: ../libpurple/plugins/simple.c:40
+#: ../libpurple/plugins/simple.c:42
 msgid "Tests to see that most things are working."
 msgstr "Testar om dei fleste tinga verkar som dei skal."
 
 #. Scheme name
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:902
-#: ../libpurple/plugins/ssl/ssl-nss.c:725
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:910
+#: ../libpurple/plugins/ssl/ssl-nss.c:731
 msgid "X.509 Certificates"
 msgstr "X.509-sertifikat"
 
@@ -3370,7 +3923,7 @@ msgstr "X.509-sertifikat"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:986
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:994
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -3378,8 +3931,8 @@ msgstr "GNUTLS"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:989
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:991
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:997
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:999
 msgid "Provides SSL support through GNUTLS."
 msgstr "Tilbyr SSL-støtte gjennom GNUTLS."
 
@@ -3389,7 +3942,7 @@ msgstr "Tilbyr SSL-støtte gjennom GNUTL
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:810
+#: ../libpurple/plugins/ssl/ssl-nss.c:816
 msgid "NSS"
 msgstr "NSS"
 
@@ -3397,8 +3950,8 @@ msgstr "NSS"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:813
-#: ../libpurple/plugins/ssl/ssl-nss.c:815
+#: ../libpurple/plugins/ssl/ssl-nss.c:819
+#: ../libpurple/plugins/ssl/ssl-nss.c:821
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Tilbyr SSL-støtte gjennom Mozilla NSS."
 
@@ -3416,7 +3969,8 @@ msgstr "SSL "
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl.c:97 ../libpurple/plugins/ssl/ssl.c:99
+#: ../libpurple/plugins/ssl/ssl.c:97
+#: ../libpurple/plugins/ssl/ssl.c:99
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "Tilbyr felles grensesnitt mot SSL støttebiblioteka."
 
@@ -3477,76 +4031,71 @@ msgstr "Vennetilstandsvarsel"
 #. *  description
 #: ../libpurple/plugins/statenotify.c:151
 #: ../libpurple/plugins/statenotify.c:154
-msgid ""
-"Notifies in a conversation window when a buddy goes or returns from away or "
-"idle."
-msgstr ""
-"Varslar i samtalevindauget når ein venn går vekk/blir uverksam eller kjem "
-"tilbake."
+msgid "Notifies in a conversation window when a buddy goes or returns from away or idle."
+msgstr "Varslar i samtalevindauget når ein venn går vekk/blir uverksam eller kjem tilbake."
 
-#: ../libpurple/plugins/tcl/tcl.c:421
+#: ../libpurple/plugins/tcl/tcl.c:423
 msgid "Tcl Plugin Loader"
 msgstr "Tcl-tilleggslastar"
 
-#: ../libpurple/plugins/tcl/tcl.c:423 ../libpurple/plugins/tcl/tcl.c:424
+#: ../libpurple/plugins/tcl/tcl.c:425
+#: ../libpurple/plugins/tcl/tcl.c:426
 msgid "Provides support for loading Tcl plugins"
 msgstr "Tilbyr støtte for lasting av Tcl-tillegg"
 
-#: ../libpurple/plugins/tcl/tcl.c:507
-msgid ""
-"Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
-"install ActiveTCL from http://www.activestate.com\n"
-msgstr ""
-"Klarer ikkje å sjå at ActiveTCL er installert. Om du ønskjer å nytta TCL-"
-"tillegg må du installera ActiveTCL frå http://www.activestate.com\n"
+#: ../libpurple/plugins/tcl/tcl.c:509
+msgid "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, install ActiveTCL from http://www.activestate.com\n"
+msgstr "Klarer ikkje å sjå at ActiveTCL er installert. Om du ønskjer å nytta TCL-tillegg må du installera ActiveTCL frå http://www.activestate.com\n"
 
-#. Send a message about the connection error
-#: ../libpurple/protocols/bonjour/bonjour.c:112
+#: ../libpurple/protocols/bonjour/bonjour.c:101
+msgid "The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-LocalMessaging for more information."
+msgstr "Fann ikkje verktøysamlinga til Apple Bonjour for Windows. Du finn fleire opplysningar om du følgjer denne lenkja:http://developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-LocalMessaging"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:120
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "Klarer ikkje å lytta etter innkomande meldingstilkoplingar\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:137
-msgid ""
-"Unable to establish connection with the local mDNS server.  Is it running?"
+#: ../libpurple/protocols/bonjour/bonjour.c:147
+msgid "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr "Klarer ikkje å kopla til den lokale mDNS-tenaren. Kjører han?"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:351
-#: ../libpurple/protocols/bonjour/bonjour.c:656
-#: ../libpurple/protocols/gg/gg.c:632
-#: ../libpurple/protocols/jabber/jabber.c:942
+#: ../libpurple/protocols/bonjour/bonjour.c:392
+#: ../libpurple/protocols/bonjour/bonjour.c:698
+#: ../libpurple/protocols/gg/gg.c:633
+#: ../libpurple/protocols/jabber/jabber.c:996
 msgid "First name"
 msgstr "Fornamn"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:353
-#: ../libpurple/protocols/bonjour/bonjour.c:659
-#: ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/jabber/jabber.c:947
+#: ../libpurple/protocols/bonjour/bonjour.c:394
+#: ../libpurple/protocols/bonjour/bonjour.c:701
+#: ../libpurple/protocols/gg/gg.c:628
+#: ../libpurple/protocols/jabber/jabber.c:1000
 msgid "Last name"
 msgstr "Etternamn"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:357
+#: ../libpurple/protocols/bonjour/bonjour.c:398
 #: ../libpurple/protocols/jabber/buddy.c:295
-#: ../libpurple/protocols/jabber/buddy.c:1325
-#: ../libpurple/protocols/jabber/buddy.c:1335
-#: ../libpurple/protocols/jabber/buddy.c:2216
+#: ../libpurple/protocols/jabber/buddy.c:1329
+#: ../libpurple/protocols/jabber/buddy.c:1339
+#: ../libpurple/protocols/jabber/buddy.c:2223
 #: ../libpurple/protocols/silc/ops.c:1041
-#: ../libpurple/protocols/silc/util.c:555
+#: ../libpurple/protocols/silc/util.c:561
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
 msgid "E-Mail"
 msgstr "E-post"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:360
-#: ../libpurple/protocols/bonjour/bonjour.c:665
+#: ../libpurple/protocols/bonjour/bonjour.c:401
+#: ../libpurple/protocols/bonjour/bonjour.c:707
 msgid "AIM Account"
 msgstr "AIM-konto"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:363
-#: ../libpurple/protocols/bonjour/bonjour.c:668
+#: ../libpurple/protocols/bonjour/bonjour.c:404
+#: ../libpurple/protocols/bonjour/bonjour.c:710
 msgid "XMPP Account"
-msgstr "XMPP-konto"
+msgstr "_XMPP-konto"
 
 #. *< type
 #. *< ui_requirement
@@ -3558,22 +4107,22 @@ msgstr "XMPP-konto"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:467
-#: ../libpurple/protocols/bonjour/bonjour.c:469
+#: ../libpurple/protocols/bonjour/bonjour.c:508
+#: ../libpurple/protocols/bonjour/bonjour.c:510
 msgid "Bonjour Protocol Plugin"
 msgstr "Bonjour protokolktillegg"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:610
+#: ../libpurple/protocols/bonjour/bonjour.c:651
 msgid "Purple Person"
 msgstr "Purple-person"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:662
-#: ../libpurple/protocols/gg/gg.c:477
-#: ../libpurple/protocols/jabber/jabber.c:932
-#: ../libpurple/protocols/silc/silc.c:770
-#: ../libpurple/protocols/silc/silc.c:1011
-#: ../libpurple/protocols/silc10/silc.c:681
-#: ../libpurple/protocols/silc10/silc.c:922
+#: ../libpurple/protocols/bonjour/bonjour.c:704
+#: ../libpurple/protocols/gg/gg.c:478
+#: ../libpurple/protocols/jabber/jabber.c:988
+#: ../libpurple/protocols/silc/silc.c:913
+#: ../libpurple/protocols/silc/silc.c:1154
+#: ../libpurple/protocols/silc10/silc.c:687
+#: ../libpurple/protocols/silc10/silc.c:928
 msgid "E-mail"
 msgstr "E-post"
 
@@ -3581,87 +4130,98 @@ msgstr "Bonjour"
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:380
+#: ../libpurple/protocols/bonjour/jabber.c:407
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s har lukka samtala."
 
-#: ../libpurple/protocols/bonjour/jabber.c:437
-#: ../libpurple/protocols/bonjour/jabber.c:660
-#: ../libpurple/protocols/bonjour/jabber.c:678
+#: ../libpurple/protocols/bonjour/jabber.c:457
+#: ../libpurple/protocols/bonjour/jabber.c:522
+#: ../libpurple/protocols/bonjour/jabber.c:567
+#: ../libpurple/protocols/bonjour/jabber.c:744
+#: ../libpurple/protocols/bonjour/jabber.c:762
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Klarte ikkje å senda meldinga. Samtala kunne ikkje startast."
 
-#: ../libpurple/protocols/bonjour/jabber.c:583
+#: ../libpurple/protocols/bonjour/jabber.c:661
 msgid "Cannot open socket"
 msgstr "Klarte ikkje å opna endepunkt"
 
-#: ../libpurple/protocols/bonjour/jabber.c:591
+#: ../libpurple/protocols/bonjour/jabber.c:671
 msgid "Error setting socket options"
 msgstr "Klarte ikkje å lagra endepunktsval"
 
-#: ../libpurple/protocols/bonjour/jabber.c:615
+#: ../libpurple/protocols/bonjour/jabber.c:697
 msgid "Could not bind socket to port"
 msgstr "Klarte ikkje å binda endepunktet til port"
 
-#: ../libpurple/protocols/bonjour/jabber.c:623
+#: ../libpurple/protocols/bonjour/jabber.c:707
 msgid "Could not listen on socket"
 msgstr "Klarte ikkje å lytta til endepunktet"
 
-#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1829
+#: ../libpurple/protocols/bonjour/mdns_win32.c:110
+msgid "Error communicating with local mDNSResponder."
+msgstr "Feil i sambandet med lokal mDNSResponder."
+
+#: ../libpurple/protocols/gg/gg.c:76
+#: ../libpurple/proxy.c:1851
 msgid "Invalid proxy settings"
 msgstr "Ugyldige mellomlagerinnstillingar"
 
-#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1829
-msgid ""
-"Either the host name or port number specified for your given proxy type is "
-"invalid."
-msgstr ""
-"Vertsnamnet eller portnummeret til det spesifiserte mellomlageret er ugyldig."
+#: ../libpurple/protocols/gg/gg.c:77
+#: ../libpurple/proxy.c:1851
+msgid "Either the host name or port number specified for your given proxy type is invalid."
+msgstr "Vertsnamnet eller portnummeret til det spesifiserte mellomlageret er ugyldig."
 
-#: ../libpurple/protocols/gg/gg.c:115 ../libpurple/protocols/gg/gg.c:137
+#: ../libpurple/protocols/gg/gg.c:115
+#: ../libpurple/protocols/gg/gg.c:137
 #: ../libpurple/protocols/gg/gg.c:180
 msgid "Token Error"
 msgstr "Markørfeil"
 
-#: ../libpurple/protocols/gg/gg.c:116 ../libpurple/protocols/gg/gg.c:138
+#: ../libpurple/protocols/gg/gg.c:116
+#: ../libpurple/protocols/gg/gg.c:138
 #: ../libpurple/protocols/gg/gg.c:181
 msgid "Unable to fetch the token.\n"
 msgstr "Klarte ikkje å henta markøren.\n"
 
-#: ../libpurple/protocols/gg/gg.c:269 ../libpurple/protocols/gg/gg.c:288
+#: ../libpurple/protocols/gg/gg.c:267
+#: ../libpurple/protocols/gg/gg.c:274
+#: ../libpurple/protocols/gg/gg.c:280
 msgid "Save Buddylist..."
 msgstr "Lagra vennelista…"
 
-#: ../libpurple/protocols/gg/gg.c:270
+#: ../libpurple/protocols/gg/gg.c:268
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr "Vennelista di er tom. Ingenting blei skrive til fila."
 
-#: ../libpurple/protocols/gg/gg.c:276 ../libpurple/protocols/gg/gg.c:278
-msgid "Couldn't open file"
-msgstr "Klarte ikkje å opna fila"
-
-#: ../libpurple/protocols/gg/gg.c:289
+#: ../libpurple/protocols/gg/gg.c:275
 msgid "Buddylist saved successfully!"
 msgstr "Vennelista er lagra."
 
-#: ../libpurple/protocols/gg/gg.c:307 ../libpurple/protocols/gg/gg.c:308
+#: ../libpurple/protocols/gg/gg.c:278
+#, c-format
+msgid "Couldn't write buddy list for %s to %s"
+msgstr "Klarte ikkje å skriva vennelista for %s til %s"
+
+#: ../libpurple/protocols/gg/gg.c:303
+#: ../libpurple/protocols/gg/gg.c:304
 msgid "Couldn't load buddylist"
 msgstr "Klarte ikkje å henta fram vennelista"
 
-#: ../libpurple/protocols/gg/gg.c:324
+#: ../libpurple/protocols/gg/gg.c:320
 msgid "Load Buddylist..."
 msgstr "Hent vennelista…"
 
-#: ../libpurple/protocols/gg/gg.c:325
+#: ../libpurple/protocols/gg/gg.c:321
 msgid "Buddylist loaded successfully!"
 msgstr "Vennelista er henta inn."
 
-#: ../libpurple/protocols/gg/gg.c:336
+#: ../libpurple/protocols/gg/gg.c:332
 msgid "Save buddylist..."
 msgstr "Lagra venneliste…"
 
-#: ../libpurple/protocols/gg/gg.c:384
+#: ../libpurple/protocols/gg/gg.c:382
 msgid "Fill in the registration fields."
 msgstr "Fyll ut registreringsfelta."
 
@@ -3669,305 +4229,309 @@ msgstr "Passorda samsvarer ikkje."
 msgid "Passwords do not match."
 msgstr "Passorda samsvarer ikkje."
 
-#: ../libpurple/protocols/gg/gg.c:398
+#: ../libpurple/protocols/gg/gg.c:399
 msgid "Unable to register new account. Error occurred.\n"
 msgstr "Klarer ikkje å registrera ny konto. Det oppstod ein feil.\n"
 
-#: ../libpurple/protocols/gg/gg.c:411
+#: ../libpurple/protocols/gg/gg.c:412
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Ein ny Gadu-gadu-konto er registrert"
 
-#: ../libpurple/protocols/gg/gg.c:412
+#: ../libpurple/protocols/gg/gg.c:413
 msgid "Registration completed successfully!"
 msgstr "Registreringa er ferdig."
 
-#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
-#: ../libpurple/protocols/jabber/jabber.c:913
-#: ../libpurple/protocols/jabber/jabber.c:916
-#: ../libpurple/protocols/jabber/jabber.c:1722
+#: ../libpurple/protocols/gg/gg.c:483
+#: ../libpurple/protocols/gg/gg.c:776
+#: ../libpurple/protocols/jabber/jabber.c:971
+#: ../libpurple/protocols/jabber/jabber.c:974
+#: ../libpurple/protocols/jabber/jabber.c:1762
 msgid "Password"
 msgstr "Passord"
 
-#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
+#: ../libpurple/protocols/gg/gg.c:488
+#: ../libpurple/protocols/gg/gg.c:781
 msgid "Password (retype)"
 msgstr "Passord (éin gong til)"
 
-#: ../libpurple/protocols/gg/gg.c:492 ../libpurple/protocols/gg/gg.c:785
+#: ../libpurple/protocols/gg/gg.c:493
+#: ../libpurple/protocols/gg/gg.c:786
 msgid "Enter current token"
 msgstr "Skriv inn noverande markør"
 
-#: ../libpurple/protocols/gg/gg.c:498 ../libpurple/protocols/gg/gg.c:791
+#: ../libpurple/protocols/gg/gg.c:499
+#: ../libpurple/protocols/gg/gg.c:792
 msgid "Current token"
 msgstr "Noverande markør"
 
-#: ../libpurple/protocols/gg/gg.c:502 ../libpurple/protocols/gg/gg.c:503
+#: ../libpurple/protocols/gg/gg.c:503
+#: ../libpurple/protocols/gg/gg.c:504
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registrera ny Gadu-Gadu-konto"
 
-#: ../libpurple/protocols/gg/gg.c:504
+#: ../libpurple/protocols/gg/gg.c:505
 msgid "Please, fill in the following fields"
 msgstr "Fyll ut følgjande felt"
 
-#: ../libpurple/protocols/gg/gg.c:642 ../libpurple/protocols/gg/gg.c:1054
-#: ../libpurple/protocols/gg/gg.c:1126
-#: ../libpurple/protocols/jabber/jabber.c:957
-#: ../libpurple/protocols/oscar/oscar.c:3789
-#: ../libpurple/protocols/oscar/oscar.c:3802
+#: ../libpurple/protocols/gg/gg.c:643
+#: ../libpurple/protocols/gg/gg.c:1056
+#: ../libpurple/protocols/gg/gg.c:1128
+#: ../libpurple/protocols/jabber/jabber.c:1008
+#: ../libpurple/protocols/oscar/oscar.c:3822
+#: ../libpurple/protocols/oscar/oscar.c:3835
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "By"
 
-#: ../libpurple/protocols/gg/gg.c:647
+#: ../libpurple/protocols/gg/gg.c:648
 msgid "Year of birth"
 msgstr "Fødselsår"
 
-#: ../libpurple/protocols/gg/gg.c:650 ../libpurple/protocols/msn/msn.c:1589
-#: ../libpurple/protocols/myspace/user.c:115
-#: ../libpurple/protocols/oscar/oscar.c:3732
+#: ../libpurple/protocols/gg/gg.c:651
+#: ../libpurple/protocols/msn/msn.c:1745
+#: ../libpurple/protocols/msnp9/msn.c:1601
+#: ../libpurple/protocols/myspace/user.c:129
+#: ../libpurple/protocols/oscar/oscar.c:3765
 #: ../libpurple/protocols/qq/buddy_info.c:46
-#: ../libpurple/protocols/qq/qq.c:226 ../libpurple/protocols/qq/qq.c:229
-#: ../libpurple/protocols/qq/qq.c:232 ../libpurple/protocols/qq/qq.c:236
+#: ../libpurple/protocols/qq/qq.c:227
+#: ../libpurple/protocols/qq/qq.c:230
+#: ../libpurple/protocols/qq/qq.c:233
+#: ../libpurple/protocols/qq/qq.c:237
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1091
 msgid "Gender"
 msgstr "Kjønn"
 
-#: ../libpurple/protocols/gg/gg.c:651
+#: ../libpurple/protocols/gg/gg.c:652
 msgid "Male or female"
 msgstr "Mann eller kvinne"
 
-#: ../libpurple/protocols/gg/gg.c:652
-#: ../libpurple/protocols/oscar/oscar.c:3732
+#: ../libpurple/protocols/gg/gg.c:653
+#: ../libpurple/protocols/oscar/oscar.c:3765
 #: ../libpurple/protocols/qq/buddy_info.c:83
-#: ../libpurple/protocols/qq/qq.c:226
+#: ../libpurple/protocols/qq/qq.c:227
 msgid "Male"
 msgstr "Mann"
 
-#: ../libpurple/protocols/gg/gg.c:653
-#: ../libpurple/protocols/oscar/oscar.c:3732
+#: ../libpurple/protocols/gg/gg.c:654
+#: ../libpurple/protocols/oscar/oscar.c:3765
 #: ../libpurple/protocols/qq/buddy_info.c:84
-#: ../libpurple/protocols/qq/qq.c:229
+#: ../libpurple/protocols/qq/qq.c:230
 msgid "Female"
 msgstr "Kvinne"
 
-#: ../libpurple/protocols/gg/gg.c:657
+#: ../libpurple/protocols/gg/gg.c:658
 msgid "Only online"
 msgstr "Berre tilkopla"
 
-#: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:662
+#: ../libpurple/protocols/gg/gg.c:662
+#: ../libpurple/protocols/gg/gg.c:663
 msgid "Find buddies"
 msgstr "Finn vennar"
 
-#: ../libpurple/protocols/gg/gg.c:663
+#: ../libpurple/protocols/gg/gg.c:664
 msgid "Please, enter your search criteria below"
 msgstr "Skriv søkjekriteria nedanfor"
 
-#: ../libpurple/protocols/gg/gg.c:701
+#: ../libpurple/protocols/gg/gg.c:702
 msgid "Fill in the fields."
 msgstr "Fyll ut felta."
 
-#: ../libpurple/protocols/gg/gg.c:713
+#: ../libpurple/protocols/gg/gg.c:714
 msgid "Your current password is different from the one that you specified."
 msgstr "Det noverande passordet ditt er forskjellig frå det du oppgav."
 
-#: ../libpurple/protocols/gg/gg.c:727
+#: ../libpurple/protocols/gg/gg.c:728
 msgid "Unable to change password. Error occurred.\n"
 msgstr "Klarte ikkje å endra passordet. Ein feil oppstod.\n"
 
-#: ../libpurple/protocols/gg/gg.c:736
+#: ../libpurple/protocols/gg/gg.c:737
 msgid "Change password for the Gadu-Gadu account"
 msgstr "Endra passordet til Gadu-Gadu-kontoen"
 
-#: ../libpurple/protocols/gg/gg.c:737
+#: ../libpurple/protocols/gg/gg.c:738
 msgid "Password was changed successfully!"
 msgstr "Passordet blei endra."
 
-#: ../libpurple/protocols/gg/gg.c:770
+#: ../libpurple/protocols/gg/gg.c:771
 msgid "Current password"
 msgstr "Noverande passord"
 
-#: ../libpurple/protocols/gg/gg.c:795
+#: ../libpurple/protocols/gg/gg.c:796
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Skriv inn det noverande og det nye passordet til UIN:"
 
-#: ../libpurple/protocols/gg/gg.c:799 ../libpurple/protocols/gg/gg.c:800
+#: ../libpurple/protocols/gg/gg.c:800
+#: ../libpurple/protocols/gg/gg.c:801
 msgid "Change Gadu-Gadu Password"
 msgstr "Endra Gadu-Gadu-passord"
 
-#: ../libpurple/protocols/gg/gg.c:876
+#: ../libpurple/protocols/gg/gg.c:878
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "Vel eit praterom for vennen: %s"
 
-#: ../libpurple/protocols/gg/gg.c:879 ../libpurple/protocols/gg/gg.c:880
+#: ../libpurple/protocols/gg/gg.c:881
+#: ../libpurple/protocols/gg/gg.c:882
 msgid "Add to chat..."
 msgstr "Legg til praterom…"
 
-#: ../libpurple/protocols/gg/gg.c:1008
-#: ../libpurple/protocols/jabber/buddy.c:2031
-#: ../libpurple/protocols/novell/novell.c:2828
-#: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:5604
-#: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
-#: ../libpurple/protocols/qq/qq.c:292
-#: ../libpurple/protocols/yahoo/yahoo.c:3099 ../libpurple/status.c:154
-#: ../pidgin/gtkblist.c:3104 ../pidgin/gtkblist.c:3436
-#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1061
-msgid "Offline"
-msgstr "Fråkopla"
-
-#: ../libpurple/protocols/gg/gg.c:1011
-#: ../libpurple/protocols/jabber/buddy.c:2033
-#: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
-#: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
-#: ../libpurple/protocols/novell/novell.c:2816
-#: ../libpurple/protocols/qq/qq.c:280
-#: ../libpurple/protocols/yahoo/yahoo.c:3101 ../libpurple/status.c:155
-#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1057
+#: ../libpurple/protocols/gg/gg.c:1013
+#: ../libpurple/protocols/jabber/buddy.c:2040
+#: ../libpurple/protocols/msn/state.c:29
+#: ../libpurple/protocols/msn/state.c:30
+#: ../libpurple/protocols/msn/state.c:37
+#: ../libpurple/protocols/msn/state.c:38
+#: ../libpurple/protocols/msnp9/state.c:29
+#: ../libpurple/protocols/msnp9/state.c:30
+#: ../libpurple/protocols/msnp9/state.c:37
+#: ../libpurple/protocols/msnp9/state.c:38
+#: ../libpurple/protocols/novell/novell.c:2834
+#: ../libpurple/protocols/qq/qq.c:281
+#: ../libpurple/protocols/yahoo/yahoo.c:3138
+#: ../libpurple/status.c:155
+#: ../pidgin/gtkdocklet.c:545
+#: ../pidgin/gtkstatusbox.c:1081
 msgid "Available"
 msgstr "Tilgjengeleg"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#: ../libpurple/protocols/gg/gg.c:1014 ../libpurple/protocols/irc/irc.c:528
-#: ../libpurple/protocols/irc/msgs.c:310
-#: ../libpurple/protocols/jabber/buddy.c:2037
-#: ../libpurple/protocols/novell/novell.c:2819
-#: ../libpurple/protocols/oscar/oscar.c:733
-#: ../libpurple/protocols/oscar/oscar.c:4547
-#: ../libpurple/protocols/oscar/oscar.c:5632
-#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/qq/qq.c:284
-#: ../libpurple/protocols/silc/buddy.c:1476
-#: ../libpurple/protocols/silc10/buddy.c:1476
-#: ../libpurple/protocols/yahoo/yahoo.c:3653
-#: ../libpurple/protocols/yahoo/yahoo.c:3727 ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1939
-#: ../pidgin/gtkstatusbox.c:1058
-#, c-format
+#: ../libpurple/protocols/gg/gg.c:1016
+#: ../libpurple/protocols/irc/irc.c:544
+#: ../libpurple/protocols/irc/msgs.c:312
+#: ../libpurple/protocols/jabber/buddy.c:2044
+#: ../libpurple/protocols/novell/novell.c:2837
+#: ../libpurple/protocols/oscar/oscar.c:732
+#: ../libpurple/protocols/oscar/oscar.c:5735
+#: ../libpurple/protocols/qq/qq.c:181
+#: ../libpurple/protocols/qq/qq.c:285
+#: ../libpurple/protocols/silc/buddy.c:1479
+#: ../libpurple/protocols/silc10/buddy.c:1479
+#: ../libpurple/protocols/yahoo/yahoo.c:3690
+#: ../libpurple/protocols/yahoo/yahoo.c:3764
+#: ../libpurple/status.c:158
+#: ../pidgin/gtkdocklet.c:549
+#: ../pidgin/gtkprefs.c:1960
+#: ../pidgin/gtkstatusbox.c:1082
 msgid "Away"
 msgstr "Vekke"
 
-#: ../libpurple/protocols/gg/gg.c:1043 ../libpurple/protocols/gg/gg.c:1117
-#: ../libpurple/protocols/oscar/oscar.c:2699
-#: ../libpurple/protocols/oscar/oscar.c:3699
+#: ../libpurple/protocols/gg/gg.c:1045
+#: ../libpurple/protocols/gg/gg.c:1119
+#: ../libpurple/protocols/oscar/oscar.c:2760
+#: ../libpurple/protocols/oscar/oscar.c:3732
 msgid "UIN"
 msgstr "UIN"
 
-#: ../libpurple/protocols/gg/gg.c:1046 ../libpurple/protocols/gg/gg.c:1120
-#: ../libpurple/protocols/jabber/buddy.c:2210
-#: ../libpurple/protocols/jabber/buddy.c:2386
-#: ../libpurple/protocols/oscar/oscar.c:3710
+#: ../libpurple/protocols/gg/gg.c:1048
+#: ../libpurple/protocols/gg/gg.c:1122
+#: ../libpurple/protocols/jabber/buddy.c:2217
+#: ../libpurple/protocols/jabber/buddy.c:2403
+#: ../libpurple/protocols/oscar/oscar.c:3743
 #: ../libpurple/protocols/silc/ops.c:990
 #: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "Førenamn"
 
-#: ../libpurple/protocols/gg/gg.c:1059 ../libpurple/protocols/gg/gg.c:1129
+#: ../libpurple/protocols/gg/gg.c:1061
+#: ../libpurple/protocols/gg/gg.c:1131
 msgid "Birth Year"
 msgstr "Fødselsår"
 
-#: ../libpurple/protocols/gg/gg.c:1111 ../libpurple/protocols/gg/gg.c:1180
-#: ../libpurple/protocols/oscar/oscar.c:3911
+#: ../libpurple/protocols/gg/gg.c:1113
+#: ../libpurple/protocols/gg/gg.c:1182
+#: ../libpurple/protocols/oscar/oscar.c:3944
 msgid "Unable to display the search results."
 msgstr "Klarer ikkje å visa søkjeresultata."
 
-#: ../libpurple/protocols/gg/gg.c:1171
+#: ../libpurple/protocols/gg/gg.c:1173
 msgid "Gadu-Gadu Public Directory"
 msgstr "Gadu-Gadu offentleg katalog"
 
-#: ../libpurple/protocols/gg/gg.c:1172
+#: ../libpurple/protocols/gg/gg.c:1174
 msgid "Search results"
 msgstr "Søkjeresultat"
 
-#: ../libpurple/protocols/gg/gg.c:1215
+#: ../libpurple/protocols/gg/gg.c:1217
 msgid "No matching users found"
 msgstr "Fann ingen brukarar"
 
-#: ../libpurple/protocols/gg/gg.c:1216
+#: ../libpurple/protocols/gg/gg.c:1218
 msgid "There are no users matching your search criteria."
 msgstr "Det er ingen brukarar som høver til søkjekriteria dine."
 
-#: ../libpurple/protocols/gg/gg.c:1310 ../libpurple/protocols/gg/gg.c:1463
+#: ../libpurple/protocols/gg/gg.c:1314
+#: ../libpurple/protocols/gg/gg.c:1469
 msgid "Unable to read socket"
 msgstr "Klarte ikkje å lesa endepunkt"
 
-#: ../libpurple/protocols/gg/gg.c:1395
+#: ../libpurple/protocols/gg/gg.c:1399
 msgid "Buddy list downloaded"
 msgstr "Lasta ned venneliste"
 
-#: ../libpurple/protocols/gg/gg.c:1396
+#: ../libpurple/protocols/gg/gg.c:1400
 msgid "Your buddy list was downloaded from the server."
 msgstr "Vennelista di blei henta frå tenaren."
 
-#: ../libpurple/protocols/gg/gg.c:1403
+#: ../libpurple/protocols/gg/gg.c:1407
 msgid "Buddy list uploaded"
 msgstr "Vennelista blei lasta opp"
 
-#: ../libpurple/protocols/gg/gg.c:1404
+#: ../libpurple/protocols/gg/gg.c:1408
 msgid "Your buddy list was stored on the server."
 msgstr "Vennelista di blei lagra på tenaren."
 
-#: ../libpurple/protocols/gg/gg.c:1509 ../libpurple/protocols/gg/gg.c:1715
+#: ../libpurple/protocols/gg/gg.c:1517
+#: ../libpurple/protocols/gg/gg.c:1725
 msgid "Connection failed."
 msgstr "Tilkoplinga feila."
 
-#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/msn/msn.c:559
-msgid "Blocked"
-msgstr "Blokkert"
-
-#: ../libpurple/protocols/gg/gg.c:1644
+#: ../libpurple/protocols/gg/gg.c:1652
 msgid "Add to chat"
 msgstr "Legg til praterom"
 
-#: ../libpurple/protocols/gg/gg.c:1653
-msgid "Unblock"
-msgstr "Avblokker"
-
-#: ../libpurple/protocols/gg/gg.c:1657
-msgid "Block"
-msgstr "Blokker"
-
-#: ../libpurple/protocols/gg/gg.c:1674
+#: ../libpurple/protocols/gg/gg.c:1682
 msgid "Chat _name:"
 msgstr "Prate_namn:"
 
-#: ../libpurple/protocols/gg/gg.c:1914
+#: ../libpurple/protocols/gg/gg.c:1933
 msgid "Chat error"
 msgstr "Prateromsfeil"
 
-#: ../libpurple/protocols/gg/gg.c:1915
+#: ../libpurple/protocols/gg/gg.c:1934
 msgid "This chat name is already in use"
 msgstr "Prateromsnamnet er allereie i bruk"
 
-#: ../libpurple/protocols/gg/gg.c:1998
+#: ../libpurple/protocols/gg/gg.c:2019
 msgid "Not connected to the server."
 msgstr "Ikkje tilkopla tenaren."
 
-#: ../libpurple/protocols/gg/gg.c:2021
+#: ../libpurple/protocols/gg/gg.c:2042
 msgid "Find buddies..."
 msgstr "Søk etter vennar…"
 
-#: ../libpurple/protocols/gg/gg.c:2027
+#: ../libpurple/protocols/gg/gg.c:2048
 msgid "Change password..."
 msgstr "Endra passord…"
 
-#: ../libpurple/protocols/gg/gg.c:2033
+#: ../libpurple/protocols/gg/gg.c:2054
 msgid "Upload buddylist to Server"
 msgstr "Last opp vennelista til tenaren"
 
-#: ../libpurple/protocols/gg/gg.c:2037
+#: ../libpurple/protocols/gg/gg.c:2058
 msgid "Download buddylist from Server"
 msgstr "Last ned vennelista frå tenaren"
 
-#: ../libpurple/protocols/gg/gg.c:2041
+#: ../libpurple/protocols/gg/gg.c:2062
 msgid "Delete buddylist from Server"
 msgstr "Slett vennelista frå tenaren"
 
-#: ../libpurple/protocols/gg/gg.c:2045
+#: ../libpurple/protocols/gg/gg.c:2066
 msgid "Save buddylist to file..."
 msgstr "Lagra vennelista til fil…"
 
-#: ../libpurple/protocols/gg/gg.c:2049
+#: ../libpurple/protocols/gg/gg.c:2070
 msgid "Load buddylist from file..."
 msgstr "Hent vennelista frå fil…"
 
@@ -3982,51 +4546,54 @@ msgstr "Hent vennelista frå fil…"
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2153
+#: ../libpurple/protocols/gg/gg.c:2174
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu protokolltillegg"
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2154
+#: ../libpurple/protocols/gg/gg.c:2175
 msgid "Polish popular IM"
 msgstr "Populær polsk lynmeldingsteneste"
 
-#: ../libpurple/protocols/gg/gg.c:2208
+#: ../libpurple/protocols/gg/gg.c:2229
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu-brukar"
 
 #: ../libpurple/protocols/irc/cmds.c:43
-#: ../libpurple/protocols/silc/silc.c:1637
-#: ../libpurple/protocols/silc10/silc.c:1566
+#: ../libpurple/protocols/silc/silc.c:1780
+#: ../libpurple/protocols/silc10/silc.c:1572
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Ukjend kommando: %s"
 
-#: ../libpurple/protocols/irc/cmds.c:503
+#: ../libpurple/protocols/irc/cmds.c:511
 #: ../libpurple/protocols/jabber/chat.c:591
-#: ../libpurple/protocols/silc/silc.c:1345
-#: ../libpurple/protocols/silc10/silc.c:1274
+#: ../libpurple/protocols/silc/silc.c:1488
+#: ../libpurple/protocols/silc10/silc.c:1280
 #, c-format
 msgid "current topic is: %s"
 msgstr "gjeldande emne er: %s"
 
-#: ../libpurple/protocols/irc/cmds.c:507
+#: ../libpurple/protocols/irc/cmds.c:515
 #: ../libpurple/protocols/jabber/chat.c:595
-#: ../libpurple/protocols/silc/silc.c:1349
-#: ../libpurple/protocols/silc10/silc.c:1278
+#: ../libpurple/protocols/silc/silc.c:1492
+#: ../libpurple/protocols/silc10/silc.c:1284
 msgid "No topic is set"
-msgstr "Emne er ikkje definert"
+msgstr "Emne er ikkje vald"
 
-#: ../libpurple/protocols/irc/dcc_send.c:296
-#: ../libpurple/protocols/irc/dcc_send.c:337
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:269
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:278
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:287
+#: ../libpurple/protocols/irc/dcc_send.c:298
+#: ../libpurple/protocols/irc/dcc_send.c:339
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:318
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:327
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:336
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1109
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1513
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1564
 msgid "File Transfer Failed"
 msgstr "Filoverføringa feila"
 
-#: ../libpurple/protocols/irc/dcc_send.c:297
-#: ../libpurple/protocols/irc/dcc_send.c:338
+#: ../libpurple/protocols/irc/dcc_send.c:299
+#: ../libpurple/protocols/irc/dcc_send.c:340
 msgid "Could not open a listening port."
 msgstr "Klarte ikkje å opna ein lytteport."
 
@@ -4047,86 +4614,90 @@ msgstr "\"Dagens melding\" frå %s"
 msgid "MOTD for %s"
 msgstr "\"Dagens melding\" frå %s"
 
-#: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
-#: ../libpurple/protocols/irc/irc.c:612 ../libpurple/protocols/irc/irc.c:637
-#: ../libpurple/protocols/myspace/myspace.c:2356
+#: ../libpurple/protocols/irc/irc.c:129
+#: ../libpurple/protocols/irc/irc.c:169
+#: ../libpurple/protocols/irc/irc.c:633
+#: ../libpurple/protocols/irc/irc.c:662
+#: ../libpurple/protocols/myspace/myspace.c:2530
 msgid "Server has disconnected"
 msgstr "Tenaren har kopla frå"
 
-#: ../libpurple/protocols/irc/irc.c:249
+#: ../libpurple/protocols/irc/irc.c:260
 msgid "View MOTD"
 msgstr "Vis \"Dagens melding\""
 
-#: ../libpurple/protocols/irc/irc.c:261 ../libpurple/protocols/silc/chat.c:33
+#: ../libpurple/protocols/irc/irc.c:272
+#: ../libpurple/protocols/silc/chat.c:33
 #: ../libpurple/protocols/silc10/chat.c:33
 msgid "_Channel:"
 msgstr "_Kanal:"
 
-#: ../libpurple/protocols/irc/irc.c:267
-#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:524
+#: ../libpurple/protocols/irc/irc.c:278
+#: ../libpurple/protocols/jabber/chat.c:59
+#: ../pidgin/gtkaccount.c:496
 msgid "_Password:"
 msgstr "_Passord:"
 
-#: ../libpurple/protocols/irc/irc.c:298
+#: ../libpurple/protocols/irc/irc.c:311
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC-kallenamn kan ikkje innehalda mellomrom"
 
 #. 1. connect to server
 #. connect to the server
-#: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1280
-#: ../libpurple/protocols/msn/session.c:345
-#: ../libpurple/protocols/myspace/myspace.c:301
-#: ../libpurple/protocols/novell/novell.c:2182
-#: ../libpurple/protocols/oscar/oscar.c:1287
+#: ../libpurple/protocols/irc/irc.c:332
+#: ../libpurple/protocols/jabber/jabber.c:1336
+#: ../libpurple/protocols/msn/session.c:402
+#: ../libpurple/protocols/msnp9/session.c:354
+#: ../libpurple/protocols/myspace/myspace.c:295
+#: ../libpurple/protocols/novell/novell.c:2199
+#: ../libpurple/protocols/oscar/oscar.c:1331
 #: ../libpurple/protocols/qq/qq.c:136
-#: ../libpurple/protocols/sametime/sametime.c:3723
-#: ../libpurple/protocols/simple/simple.c:1716
-#: ../libpurple/protocols/yahoo/yahoo.c:2939
-#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:662
+#: ../libpurple/protocols/sametime/sametime.c:3776
+#: ../libpurple/protocols/simple/simple.c:1915
+#: ../libpurple/protocols/yahoo/yahoo.c:2966
+#: ../libpurple/protocols/zephyr/zephyr.c:1585
+#: ../pidgin/gtkstatusbox.c:681
 msgid "Connecting"
 msgstr "Koplar til"
 
-#: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:610
-#: ../libpurple/protocols/jabber/jabber.c:1095
+#: ../libpurple/protocols/irc/irc.c:342
+#: ../libpurple/protocols/jabber/jabber.c:664
+#: ../libpurple/protocols/jabber/jabber.c:1145
 msgid "SSL support unavailable"
 msgstr "SSL-støtte er ikkje tilgjengeleg"
 
-#. TODO: try other ports if in auto mode, then save
-#. * working port and try that first next time.
-#: ../libpurple/protocols/irc/irc.c:338
-#: ../libpurple/protocols/myspace/myspace.c:317
-#: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1631
+#: ../libpurple/protocols/irc/irc.c:355
+#: ../libpurple/protocols/myspace/myspace.c:313
+#: ../libpurple/protocols/simple/simple.c:469
+#: ../libpurple/protocols/simple/simple.c:1825
 msgid "Couldn't create socket"
 msgstr "Klarte ikkje å laga endepunkt"
 
-#: ../libpurple/protocols/irc/irc.c:421
-#: ../libpurple/protocols/myspace/myspace.c:2469
-#: ../libpurple/protocols/oscar/oscar.c:1283
+#: ../libpurple/protocols/irc/irc.c:437
+#: ../libpurple/protocols/oscar/oscar.c:1327
 msgid "Couldn't connect to host"
 msgstr "Klarte ikkje å kopla til verten"
 
-#: ../libpurple/protocols/irc/irc.c:609 ../libpurple/protocols/irc/irc.c:634
-#: ../libpurple/protocols/myspace/myspace.c:2352
+#: ../libpurple/protocols/irc/irc.c:628
+#: ../libpurple/protocols/irc/irc.c:657
+#: ../libpurple/protocols/myspace/myspace.c:2524
 msgid "Read error"
 msgstr "Lesefeil"
 
-#: ../libpurple/protocols/irc/irc.c:773
-#: ../libpurple/protocols/silc/chat.c:1412
+#: ../libpurple/protocols/irc/irc.c:798
+#: ../libpurple/protocols/silc/chat.c:1398
 #: ../libpurple/protocols/silc10/chat.c:1426
-#: ../libpurple/protocols/yahoo/yahoochat.c:1497
+#: ../libpurple/protocols/yahoo/yahoochat.c:1508
 msgid "Users"
 msgstr "Brukarar"
 
-#: ../libpurple/protocols/irc/irc.c:776
-#: ../libpurple/protocols/sametime/sametime.c:3374
-#: ../libpurple/protocols/silc/chat.c:1415
-#: ../libpurple/protocols/silc/ops.c:1389
+#: ../libpurple/protocols/irc/irc.c:801
+#: ../libpurple/protocols/sametime/sametime.c:3424
+#: ../libpurple/protocols/silc/chat.c:1401
+#: ../libpurple/protocols/silc/ops.c:1393
 #: ../libpurple/protocols/silc10/chat.c:1429
 #: ../libpurple/protocols/silc10/ops.c:1382
-#: ../libpurple/protocols/yahoo/yahoochat.c:1506
+#: ../libpurple/protocols/yahoo/yahoochat.c:1517
 msgid "Topic"
 msgstr "Emne"
 
@@ -4138,66 +4709,72 @@ msgstr "Emne"
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:914
+#: ../libpurple/protocols/irc/irc.c:939
 msgid "IRC Protocol Plugin"
 msgstr "IRC-protokolltillegg"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:915
+#: ../libpurple/protocols/irc/irc.c:940
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "IRC-protokolltillegget som syg mindre"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:940 ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2185
-#: ../libpurple/protocols/oscar/oscar.c:6671
-#: ../libpurple/protocols/qq/qq.c:755
-#: ../libpurple/protocols/sametime/sametime.c:5727
+#: ../libpurple/protocols/irc/irc.c:965
+#: ../libpurple/protocols/irc/msgs.c:325
+#: ../libpurple/protocols/msn/msn.c:2343
+#: ../libpurple/protocols/msnp9/msn.c:2197
+#: ../libpurple/protocols/oscar/oscar.c:6747
+#: ../libpurple/protocols/qq/qq.c:756
+#: ../libpurple/protocols/sametime/sametime.c:5781
 #: ../libpurple/protocols/silc/ops.c:1249
-#: ../libpurple/protocols/silc/ops.c:1341
+#: ../libpurple/protocols/silc/ops.c:1343
 #: ../libpurple/protocols/silc10/ops.c:1244
 #: ../libpurple/protocols/silc10/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1896
+#: ../libpurple/protocols/simple/simple.c:2099
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Tenar"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2190
-#: ../libpurple/protocols/oscar/oscar.c:6674
-#: ../libpurple/protocols/qq/qq.c:758
-#: ../libpurple/protocols/sametime/sametime.c:5732
-#: ../libpurple/protocols/silc/silc.c:1918
-#: ../libpurple/protocols/silc10/silc.c:1861
+#: ../libpurple/protocols/irc/irc.c:968
+#: ../libpurple/protocols/msn/msn.c:2348
+#: ../libpurple/protocols/msnp9/msn.c:2202
+#: ../libpurple/protocols/oscar/oscar.c:6750
+#: ../libpurple/protocols/qq/qq.c:759
+#: ../libpurple/protocols/sametime/sametime.c:5786
+#: ../libpurple/protocols/silc/silc.c:2061
+#: ../libpurple/protocols/silc10/silc.c:1867
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Port"
 
-#: ../libpurple/protocols/irc/irc.c:946
+#: ../libpurple/protocols/irc/irc.c:971
 msgid "Encodings"
 msgstr "Teiknkodingar"
 
-#: ../libpurple/protocols/irc/irc.c:949 ../libpurple/protocols/irc/msgs.c:316
-#: ../libpurple/protocols/jabber/jabber.c:904
-#: ../libpurple/protocols/jabber/jabber.c:907
-#: ../libpurple/protocols/silc/buddy.c:1539
+#: ../libpurple/protocols/irc/irc.c:974
+#: ../libpurple/protocols/irc/msgs.c:318
+#: ../libpurple/protocols/jabber/jabber.c:964
+#: ../libpurple/protocols/jabber/jabber.c:966
+#: ../libpurple/protocols/silc/buddy.c:1542
 #: ../libpurple/protocols/silc/ops.c:1197
 #: ../libpurple/protocols/silc/ops.c:1200
-#: ../libpurple/protocols/silc/ops.c:1334
-#: ../libpurple/protocols/silc/ops.c:1337
-#: ../libpurple/protocols/silc/silc.c:1005
-#: ../libpurple/protocols/silc10/buddy.c:1539
+#: ../libpurple/protocols/silc/ops.c:1336
+#: ../libpurple/protocols/silc/ops.c:1339
+#: ../libpurple/protocols/silc/silc.c:1148
+#: ../libpurple/protocols/silc10/buddy.c:1542
 #: ../libpurple/protocols/silc10/ops.c:1191
 #: ../libpurple/protocols/silc10/ops.c:1194
 #: ../libpurple/protocols/silc10/ops.c:1340
 #: ../libpurple/protocols/silc10/ops.c:1343
-#: ../libpurple/protocols/silc10/silc.c:916
+#: ../libpurple/protocols/silc10/silc.c:922
 msgid "Username"
 msgstr "Brukarnamn"
 
-#: ../libpurple/protocols/irc/irc.c:952 ../libpurple/protocols/irc/msgs.c:317
-#: ../libpurple/protocols/silc/silc.c:1009
-#: ../libpurple/protocols/silc10/silc.c:920
+#: ../libpurple/protocols/irc/irc.c:977
+#: ../libpurple/protocols/irc/msgs.c:319
+#: ../libpurple/protocols/silc/silc.c:1152
+#: ../libpurple/protocols/silc10/silc.c:926
 msgid "Real name"
 msgstr "Eigentleg namn"
 
@@ -4205,211 +4782,205 @@ msgstr "Eigentleg namn"
 #. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libpurple/protocols/irc/irc.c:960
+#: ../libpurple/protocols/irc/irc.c:985
 msgid "Use SSL"
 msgstr "Bruk SSL"
 
-#: ../libpurple/protocols/irc/msgs.c:187
+#: ../libpurple/protocols/irc/msgs.c:189
 msgid "Bad mode"
 msgstr "Ugyldig tilstand"
 
-#: ../libpurple/protocols/irc/msgs.c:198
+#: ../libpurple/protocols/irc/msgs.c:200
 #, c-format
 msgid "You are banned from %s."
 msgstr "Du er utestengt frå %s."
 
-#: ../libpurple/protocols/irc/msgs.c:199
+#: ../libpurple/protocols/irc/msgs.c:201
 msgid "Banned"
 msgstr "Utestengt"
 
-#: ../libpurple/protocols/irc/msgs.c:216
+#: ../libpurple/protocols/irc/msgs.c:218
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "Kan ikkje utestengja %s:  utestengingslista er full"
 
-#: ../libpurple/protocols/irc/msgs.c:301
+#: ../libpurple/protocols/irc/msgs.c:303
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:302
+#: ../libpurple/protocols/irc/msgs.c:304
 msgid " <i>(identified)</i>"
 msgstr " <i>(identifisert)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3700
-#: ../libpurple/protocols/silc/ops.c:1418
+#: ../libpurple/protocols/irc/msgs.c:305
+#: ../libpurple/protocols/oscar/oscar.c:3733
+#: ../libpurple/protocols/silc/ops.c:1422
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
 msgstr "Kallenamn"
 
-#: ../libpurple/protocols/irc/msgs.c:329
+#: ../libpurple/protocols/irc/msgs.c:331
 #: ../libpurple/protocols/silc/ops.c:1268
 #: ../libpurple/protocols/silc10/ops.c:1272
 msgid "Currently on"
 msgstr "Er no på"
 
-#: ../libpurple/protocols/irc/msgs.c:334
+#: ../libpurple/protocols/irc/msgs.c:336
 msgid "Idle for"
 msgstr "Uverksam i "
 
-#: ../libpurple/protocols/irc/msgs.c:337
+#: ../libpurple/protocols/irc/msgs.c:339
 msgid "Online since"
 msgstr "Tilkopla sia"
 
-#: ../libpurple/protocols/irc/msgs.c:341
+#: ../libpurple/protocols/irc/msgs.c:343
 msgid "<b>Defining adjective:</b>"
 msgstr "<b>Definerer adjektiv:</b>"
 
-#: ../libpurple/protocols/irc/msgs.c:341
+#: ../libpurple/protocols/irc/msgs.c:343
 msgid "Glorious"
 msgstr "Strålande"
 
-#: ../libpurple/protocols/irc/msgs.c:420
+#: ../libpurple/protocols/irc/msgs.c:422
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s har endra emnet til: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:422
+#: ../libpurple/protocols/irc/msgs.c:424
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s har nullstilt emnet."
 
-#: ../libpurple/protocols/irc/msgs.c:430
+#: ../libpurple/protocols/irc/msgs.c:432
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "Emnet i %s er: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:448
+#: ../libpurple/protocols/irc/msgs.c:450
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Ukjend melding '%s'"
 
-#: ../libpurple/protocols/irc/msgs.c:449
+#: ../libpurple/protocols/irc/msgs.c:451
 msgid "Unknown message"
 msgstr "Ukjend melding"
 
-#: ../libpurple/protocols/irc/msgs.c:449
+#: ../libpurple/protocols/irc/msgs.c:451
 msgid "The IRC server received a message it did not understand."
 msgstr "IRC-tenaren fekk ei melding han ikkje forstod."
 
-#: ../libpurple/protocols/irc/msgs.c:470
+#: ../libpurple/protocols/irc/msgs.c:472
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Brukarar på %s: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:575
+#: ../libpurple/protocols/irc/msgs.c:577
 msgid "Time Response"
 msgstr "Tidsrespons"
 
-#: ../libpurple/protocols/irc/msgs.c:576
+#: ../libpurple/protocols/irc/msgs.c:578
 msgid "The IRC server's local time is:"
 msgstr "Lokal tid på IRC-tenaren er:"
 
-#: ../libpurple/protocols/irc/msgs.c:587
+#: ../libpurple/protocols/irc/msgs.c:589
 msgid "No such channel"
 msgstr "Kanalen finst ikkje"
 
 #. does this happen?
-#: ../libpurple/protocols/irc/msgs.c:598
+#: ../libpurple/protocols/irc/msgs.c:600
 msgid "no such channel"
 msgstr "kanalen finst ikkje"
 
-#: ../libpurple/protocols/irc/msgs.c:601
+#: ../libpurple/protocols/irc/msgs.c:603
 msgid "User is not logged in"
 msgstr "Brukaren er ikkje innlogga"
 
-#: ../libpurple/protocols/irc/msgs.c:606
+#: ../libpurple/protocols/irc/msgs.c:608
 msgid "No such nick or channel"
 msgstr "Finst ikkje slikt kallenamn eller kanal"
 
-#: ../libpurple/protocols/irc/msgs.c:626
+#: ../libpurple/protocols/irc/msgs.c:628
 msgid "Could not send"
 msgstr "Klarte ikkje å senda"
 
-#: ../libpurple/protocols/irc/msgs.c:682
+#: ../libpurple/protocols/irc/msgs.c:684
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Du må vera invitert for å bli med  i %s."
 
-#: ../libpurple/protocols/irc/msgs.c:683
+#: ../libpurple/protocols/irc/msgs.c:685
 msgid "Invitation only"
 msgstr "Berre for inviterte"
 
-#: ../libpurple/protocols/irc/msgs.c:795
+#: ../libpurple/protocols/irc/msgs.c:801
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Du er blitt sparka ut av %s: (%s)"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:800 ../libpurple/protocols/silc/ops.c:699
+#: ../libpurple/protocols/irc/msgs.c:806
+#: ../libpurple/protocols/silc/ops.c:699
 #: ../libpurple/protocols/silc10/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Sparka ut av %s (%s)"
 
-#: ../libpurple/protocols/irc/msgs.c:823
+#: ../libpurple/protocols/irc/msgs.c:829
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "modus (%s %s) av %s"
 
-#: ../libpurple/protocols/irc/msgs.c:908 ../libpurple/protocols/irc/msgs.c:909
+#: ../libpurple/protocols/irc/msgs.c:914
+#: ../libpurple/protocols/irc/msgs.c:915
 msgid "Invalid nickname"
 msgstr "Ugyldig kallenamn"
 
-#: ../libpurple/protocols/irc/msgs.c:910
-msgid ""
-"Your selected nickname was rejected by the server.  It probably contains "
-"invalid characters."
-msgstr ""
-"Kallenamnet du valde blei avvist av tenaren. Det inneheld sannsynlegvis "
-"ugyldige teikn."
+#: ../libpurple/protocols/irc/msgs.c:916
+msgid "Your selected nickname was rejected by the server.  It probably contains invalid characters."
+msgstr "Kallenamnet du valde blei avvist av tenaren. Det inneheld sannsynlegvis ugyldige teikn."
 
-#: ../libpurple/protocols/irc/msgs.c:915
-msgid ""
-"Your selected account name was rejected by the server.  It probably contains "
-"invalid characters."
-msgstr ""
-"Tenaren avviste kontonamnet du valde. Det kan vera at det inneheld ugyldige "
-"teikn."
+#: ../libpurple/protocols/irc/msgs.c:921
+msgid "Your selected account name was rejected by the server.  It probably contains invalid characters."
+msgstr "Tenaren avviste kontonamnet du valde. Det kan vera at det inneheld ugyldige teikn."
 
-#: ../libpurple/protocols/irc/msgs.c:954
+#: ../libpurple/protocols/irc/msgs.c:960
 msgid "Cannot change nick"
 msgstr "Kan ikkje endra kallenamn"
 
-#: ../libpurple/protocols/irc/msgs.c:954
+#: ../libpurple/protocols/irc/msgs.c:960
 msgid "Could not change nick"
 msgstr "Klarte ikkje å endra kallenamnet"
 
-#: ../libpurple/protocols/irc/msgs.c:975
+#: ../libpurple/protocols/irc/msgs.c:981
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Du har forlate kanalen %s%s"
 
-#: ../libpurple/protocols/irc/msgs.c:1017
+#: ../libpurple/protocols/irc/msgs.c:1023
 msgid "Error: invalid PONG from server"
 msgstr "Feil: ugyldig svar (PONG) frå tenaren"
 
-#: ../libpurple/protocols/irc/msgs.c:1019
+#: ../libpurple/protocols/irc/msgs.c:1025
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING-svar -- Forseinking: %lu sekund"
 
-#: ../libpurple/protocols/irc/msgs.c:1110
+#: ../libpurple/protocols/irc/msgs.c:1116
 #, c-format
 msgid "Cannot join %s: Registration is required."
 msgstr "Kan ikkje bli med i %s: Registrering er påkravd."
 
-#: ../libpurple/protocols/irc/msgs.c:1111
+#: ../libpurple/protocols/irc/msgs.c:1117
 #: ../libpurple/protocols/silc/ops.c:1093
 #: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Klarer ikkje å opna kanal"
 
-#: ../libpurple/protocols/irc/msgs.c:1145
+#: ../libpurple/protocols/irc/msgs.c:1151
 msgid "Nick or channel is temporarily unavailable."
 msgstr "Kallenamn eller kanal er mellombels utilgjengeleg."
 
-#: ../libpurple/protocols/irc/msgs.c:1157
+#: ../libpurple/protocols/irc/msgs.c:1163
 #, c-format
 msgid "Wallops from %s"
 msgstr "Banking frå %s"
@@ -4419,74 +4990,40 @@ msgstr "action &lt;handling å utføra&g
 msgstr "action &lt;handling å utføra&gt;:  utfører ei handling."
 
 #: ../libpurple/protocols/irc/parse.c:123
-msgid ""
-"away [message]:  Set an away message, or use no message to return from being "
-"away."
-msgstr ""
-"away [melding]:  Legg inn ei fråværsmelding, eller bruk inga melding for å "
-"visa at du er komen attende."
+msgid "away [message]:  Set an away message, or use no message to return from being away."
+msgstr "away [melding]:  Legg inn ei fråværsmelding, eller bruk inga melding for å visa at du er komen attende."
 
 #: ../libpurple/protocols/irc/parse.c:124
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv: send ein kommando til kanaltenartenesta"
 
 #: ../libpurple/protocols/irc/parse.c:125
-msgid ""
-"deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
-"someone. You must be a channel operator to do this."
-msgstr ""
-"deop &lt;kallenamn1&gt; [kallenamn2] …:  Tek vekk kanaloperatørstatusen frå "
-"personen. Du må sjølv vera kanaloperatør for å kunna gjera dette."
+msgid "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from someone. You must be a channel operator to do this."
+msgstr "deop &lt;kallenamn1&gt; [kallenamn2] …:  Tek vekk kanaloperatørstatusen frå personen. Du må sjølv vera kanaloperatør for å kunna gjera dette."
 
 #: ../libpurple/protocols/irc/parse.c:126
-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 ""
-"devoice &lt;kallenamn1&gt; [kallenamn2] …:  Tek vekk kanalrøysta frå "
-"personen. Dette hindrar dei å tala dersom kanalen er moderert (+m). Du må "
-"vera kanaloperatør for å kunna gjera dette."
+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 "devoice &lt;kallenamn1&gt; [kallenamn2] …:  Tek vekk kanalrøysta frå personen. Dette hindrar dei å tala dersom kanalen er moderert (+m). Du må vera kanaloperatør for å kunna gjera dette."
 
 #: ../libpurple/protocols/irc/parse.c:127
-msgid ""
-"invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
-"channel, or the current channel."
-msgstr ""
-"invite &lt;kallenamn&gt; [rom]:  Inviter nokon til noverande kanal eller den "
-"kanalen du spesifiserer."
+msgid "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified channel, or the current channel."
+msgstr "invite &lt;kallenamn&gt; [rom]:  Inviter nokon til noverande kanal eller den kanalen du spesifiserer."
 
 #: ../libpurple/protocols/irc/parse.c:128
-msgid ""
-"j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
-"channels, optionally providing a channel key for each if needed."
-msgstr ""
-"j &lt;rom1&gt;[,rom2][,…] [nøkkel1[,nøkkel2][,…]]:  Skriv inn éin eller "
-"fleire kanalar. Ta med kanalnøkkelen til kvar enkelt om det er nødvendig."
+msgid "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more channels, optionally providing a channel key for each if needed."
+msgstr "j &lt;rom1&gt;[,rom2][,…] [nøkkel1[,nøkkel2][,…]]:  Skriv inn éin eller fleire kanalar. Ta med kanalnøkkelen til kvar enkelt om det er nødvendig."
 
 #: ../libpurple/protocols/irc/parse.c:129
-msgid ""
-"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
-"channels, optionally providing a channel key for each if needed."
-msgstr ""
-"join &lt;rom1&gt;[,rom2][,…] [nøkkel1[,nøkkel2][,…]]:  Skriv inn éin eller "
-"fleire kanalar. Ta med kanalnøkkelen til kvar enkelt om det er nødvendig."
+msgid "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more channels, optionally providing a channel key for each if needed."
+msgstr "join &lt;rom1&gt;[,rom2][,…] [nøkkel1[,nøkkel2][,…]]:  Skriv inn éin eller fleire kanalar. Ta med kanalnøkkelen til kvar enkelt om det er nødvendig."
 
 #: ../libpurple/protocols/irc/parse.c:130
-msgid ""
-"kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
-"channel operator to do this."
-msgstr ""
-"kick &lt;kallenamn&gt; [melding]:  Fjern personen frå kanalen. Du må vera "
-"kanaloperatør for å kunna gjera dette."
+msgid "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a channel operator to do this."
+msgstr "kick &lt;kallenamn&gt; [melding]:  Fjern personen frå kanalen. Du må vera kanaloperatør for å kunna gjera dette."
 
 #: ../libpurple/protocols/irc/parse.c:131
-msgid ""
-"list:  Display a list of chat rooms on the network. <i>Warning, some servers "
-"may disconnect you upon doing this.</i>"
-msgstr ""
-"list:  Vis ei liste over praterom i nettverket. <i> Ã…tvaring: somme tenarar "
-"kan koma til å kopla deg frå om du gjer dette.</i>"
+msgid "list:  Display a list of chat rooms on the network. <i>Warning, some servers may disconnect you upon doing this.</i>"
+msgstr "list:  Vis ei liste over praterom i nettverket. <i> Åtvaring: somme tenarar kan koma til å kopla deg frå om du gjer dette.</i>"
 
 #: ../libpurple/protocols/irc/parse.c:132
 msgid "me &lt;action to perform&gt;:  Perform an action."
@@ -4497,27 +5034,19 @@ msgstr "memoserv: send ein kommando til 
 msgstr "memoserv: send ein kommando til memotenartenesta"
 
 #: ../libpurple/protocols/irc/parse.c:134
-msgid ""
-"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
-"or user mode."
-msgstr ""
-"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;kallenamn|kanal&gt;:  Bruk eller fjern "
-"ein kanal eller brukarmodus."
+msgid "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel or user mode."
+msgstr "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;kallenamn|kanal&gt;:  Bruk eller fjern ein kanal eller brukartilstand."
 
 #: ../libpurple/protocols/irc/parse.c:135
-msgid ""
-"msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
-"opposed to a channel)."
-msgstr ""
-"msg &lt;kallenamn&gt; &lt;melding&gt;:  Send ei privat melding til ein "
-"brukar (i motsetnad til å senda til ein heil kanal)."
+msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as opposed to a channel)."
+msgstr "msg &lt;kallenamn&gt; &lt;melding&gt;:  Send ei privat melding til ein brukar (i motsetnad til å senda til ein heil kanal)."
 
 #: ../libpurple/protocols/irc/parse.c:136
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [kanal]:  listar brukarane i kanalen."
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:2261
+#: ../libpurple/protocols/jabber/jabber.c:2348
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;nytt kallenamn&gt;:  endra kallenamnet ditt."
 
@@ -4526,794 +5055,717 @@ msgstr "nickserv: send ein kommando til 
 msgstr "nickserv: send ein kommando til kallenamntenesta"
 
 #: ../libpurple/protocols/irc/parse.c:139
-msgid ""
-"op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
-"must be a channel operator to do this."
-msgstr ""
-"op &lt;kallenamn1&gt; [kallenamn2] ...:  Gjev kanaloperatørstatus til nokon. "
-"Du må sjølv vera kanaloperatør for å gjera dette."
+msgid "notice &lt;target&lt;:  Send a notice to a user or channel."
+msgstr "notice &lt;mål&lt;:  send eit notat til ein brukarar eller kanal."
 
 #: ../libpurple/protocols/irc/parse.c:140
-msgid ""
-"operwall &lt;message&gt;:  If you don't know what this is, you probably "
-"can't use it."
-msgstr ""
-"operwall &lt;melding&gt;:  Om du ikkje veit kva dette er, kan du truleg "
-"ikkje nytta kommandoen heller."
+msgid "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You must be a channel operator to do this."
+msgstr "op &lt;kallenamn1&gt; [kallenamn2] ...:  Gjev kanaloperatørstatus til nokon. Du må sjølv vera kanaloperatør for å gjera dette."
 
 #: ../libpurple/protocols/irc/parse.c:141
-msgid "operserv: Send a command to operserv"
-msgstr "operserv: send ein kommando til operatørtenartenesta"
+msgid "operwall &lt;message&gt;:  If you don't know what this is, you probably can't use it."
+msgstr "operwall &lt;melding&gt;:  Om du ikkje veit kva dette er, kan du truleg ikkje nytta kommandoen heller."
 
 #: ../libpurple/protocols/irc/parse.c:142
-msgid ""
-"part [room] [message]:  Leave the current channel, or a specified channel, "
-"with an optional message."
-msgstr ""
-"part [rom] [melding]:  forlèt noverande kanal, eller ein spesifisert kanal, "
-"med ei melding om ønskjeleg."
+msgid "operserv: Send a command to operserv"
+msgstr "operserv: send ein kommando til operatørtenartenesta"
 
 #: ../libpurple/protocols/irc/parse.c:143
-msgid ""
-"ping [nick]:  Asks how much lag a user (or the server if no user specified) "
-"has."
-msgstr ""
-"ping [kallenamn]:  spør kva tidsforseinking ein brukar har (eller ein tenar "
-"om ein ikkje spesifiserer brukaren)."
+msgid "part [room] [message]:  Leave the current channel, or a specified channel, with an optional message."
+msgstr "part [rom] [melding]:  forlèt noverande kanal, eller ein spesifisert kanal, med ei melding om ønskjeleg."
 
 #: ../libpurple/protocols/irc/parse.c:144
-msgid ""
-"query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
-"opposed to a channel)."
-msgstr ""
-"query &lt;kallenamn&gt; &lt;melding&gt;:  send ei privat melding til ein "
-"brukar (i motsetnad til ein kanal)."
+msgid "ping [nick]:  Asks how much lag a user (or the server if no user specified) has."
+msgstr "ping [kallenamn]:  spør kva tidsforseinking ein brukar har (eller ein tenar om ein ikkje spesifiserer brukaren)."
 
 #: ../libpurple/protocols/irc/parse.c:145
+msgid "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as opposed to a channel)."
+msgstr "query &lt;kallenamn&gt; &lt;melding&gt;:  send ei privat melding til ein brukar (i motsetnad til ein kanal)."
+
+#: ../libpurple/protocols/irc/parse.c:146
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr "quit [melding]:  kopla frå tenaren (med ei valfri melding)."
 
-#: ../libpurple/protocols/irc/parse.c:146
+#: ../libpurple/protocols/irc/parse.c:147
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote […]:  send ein rein kommando til tenaren."
 
-#: ../libpurple/protocols/irc/parse.c:147
-msgid ""
-"remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
-"channel operator to do this."
-msgstr ""
-"remove &lt;kallenamn&gt; [melding]:  fjern nokon frå eit rom. Du må vera "
-"kanaloperatør for å gjera dette."
+#: ../libpurple/protocols/irc/parse.c:148
+msgid "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a channel operator to do this."
+msgstr "remove &lt;kallenamn&gt; [melding]:  fjern nokon frå eit rom. Du må vera kanaloperatør for å gjera dette."
 
-#: ../libpurple/protocols/irc/parse.c:148
+#: ../libpurple/protocols/irc/parse.c:149
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: viser gjeldande lokal tid på IRC-tenaren."
 
-#: ../libpurple/protocols/irc/parse.c:149
+#: ../libpurple/protocols/irc/parse.c:150
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [nytt emne]:  sjå eller endra kanalemnet."
 
-#: ../libpurple/protocols/irc/parse.c:150
+#: ../libpurple/protocols/irc/parse.c:151
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
-msgstr ""
-"umode &lt;+|-&gt;&lt;A-Za-z&gt;:  ta i bruk eller fjern ein brukartilstand."
+msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  ta i bruk eller fjern ein brukartilstand."
 
-#: ../libpurple/protocols/irc/parse.c:151
+#: ../libpurple/protocols/irc/parse.c:152
 msgid "version [nick]: send CTCP VERSION request to a user"
 msgstr "version [kallenamn]: send CTCP VERSION-førespurnad til ein brukar"
 
-#: ../libpurple/protocols/irc/parse.c:152
-msgid ""
-"voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
-"must be a channel operator to do this."
-msgstr ""
-"voice &lt;kallenamn1&gt; [kallenamn2] ...:  Gjev nokon kanalrøyststatus. Du "
-"må vera kanaloperatør for å kunna gjera dette."
-
 #: ../libpurple/protocols/irc/parse.c:153
-msgid ""
-"wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
-"use it."
-msgstr ""
-"wallops &lt;melding&gt;:  Om du ikkje veit kva dette er, kan du truleg "
-"heller ikkje nytta kommandoen."
+msgid "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You must be a channel operator to do this."
+msgstr "voice &lt;kallenamn1&gt; [kallenamn2] ...:  Gjev nokon kanalrøyststatus. Du må vera kanaloperatør for å kunna gjera dette."
 
 #: ../libpurple/protocols/irc/parse.c:154
+msgid "wallops &lt;message&gt;:  If you don't know what this is, you probably can't use it."
+msgstr "wallops &lt;melding&gt;:  Om du ikkje veit kva dette er, kan du truleg heller ikkje nytta kommandoen."
+
+#: ../libpurple/protocols/irc/parse.c:155
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [tenar] &lt;kallenamn&gt;:  hent informasjon om ein brukar."
 
-#: ../libpurple/protocols/irc/parse.c:155
+#: ../libpurple/protocols/irc/parse.c:156
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
-msgstr ""
-"whowas &lt;kallenamn&gt;: hent informasjon om ein brukar som har logga av."
+msgstr "whowas &lt;kallenamn&gt;: hent informasjon om ein brukar som har logga av."
 
-#: ../libpurple/protocols/irc/parse.c:465
+#: ../libpurple/protocols/irc/parse.c:521
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Svartid frå %s: %lu sekund"
 
-#: ../libpurple/protocols/irc/parse.c:466
+#: ../libpurple/protocols/irc/parse.c:522
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libpurple/protocols/irc/parse.c:466
+#: ../libpurple/protocols/irc/parse.c:522
 msgid "CTCP PING reply"
 msgstr "CTCP PING-svar"
 
-#: ../libpurple/protocols/irc/parse.c:577
-#: ../libpurple/protocols/irc/parse.c:581 ../libpurple/protocols/toc/toc.c:191
-#: ../libpurple/protocols/toc/toc.c:694 ../libpurple/protocols/toc/toc.c:710
+#: ../libpurple/protocols/irc/parse.c:634
+#: ../libpurple/protocols/irc/parse.c:641
+#: ../libpurple/protocols/toc/toc.c:191
+#: ../libpurple/protocols/toc/toc.c:694
+#: ../libpurple/protocols/toc/toc.c:710
 #: ../libpurple/protocols/toc/toc.c:786
 msgid "Disconnected."
 msgstr "Fråkopla."
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:137
-#: ../libpurple/protocols/jabber/jabber.c:671
-#: ../libpurple/protocols/jabber/jabber.c:701
-#: ../libpurple/protocols/jabber/jabber.c:1887
+#: ../libpurple/protocols/jabber/adhoccommands.c:143
+#: ../libpurple/protocols/jabber/jabber.c:725
+#: ../libpurple/protocols/jabber/jabber.c:755
+#: ../libpurple/protocols/jabber/jabber.c:1932
 msgid "Unknown Error"
 msgstr "Ukjend feil"
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:139
-#: ../libpurple/protocols/jabber/adhoccommands.c:140
-#, fuzzy
+#: ../libpurple/protocols/jabber/adhoccommands.c:145
+#: ../libpurple/protocols/jabber/adhoccommands.c:146
 msgid "Ad-Hoc Command Failed"
-msgstr "'blocklist'-kommandoen feila"
+msgstr "Ad hoc-kommandoen feila"
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:173
-#, fuzzy
+#: ../libpurple/protocols/jabber/adhoccommands.c:182
 msgid "execute"
-msgstr "Uventa"
+msgstr "utfør"
 
-#: ../libpurple/protocols/jabber/auth.c:53
+#: ../libpurple/protocols/jabber/auth.c:55
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr "Tenaren krev TLS/SSL for pålogging. Fann inga TLS/SSL-støtte."
 
-#: ../libpurple/protocols/jabber/auth.c:116
+#: ../libpurple/protocols/jabber/auth.c:120
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "Tenaren krev autentisering i klartekst over eit ukryptert samband"
 
-#: ../libpurple/protocols/jabber/auth.c:319
-#: ../libpurple/protocols/jabber/auth.c:508
+#: ../libpurple/protocols/jabber/auth.c:323
+#: ../libpurple/protocols/jabber/auth.c:526
 #, c-format
-msgid ""
-"%s requires plaintext authentication over an unencrypted connection.  Allow "
-"this and continue authentication?"
-msgstr ""
-"%s krev autentisering i klartekst over eit ukryptert samband. Vil du tillata "
-"dette og halda fram med autentiseringa?"
+msgid "%s requires plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"
+msgstr "%s krev autentisering i klartekst over eit ukryptert samband. Vil du tillata dette og halda fram med autentiseringa?"
 
-#: ../libpurple/protocols/jabber/auth.c:321
-#: ../libpurple/protocols/jabber/auth.c:322
-#: ../libpurple/protocols/jabber/auth.c:510
-#: ../libpurple/protocols/jabber/auth.c:511
-#: ../libpurple/protocols/jabber/auth.c:598
-#: ../libpurple/protocols/jabber/auth.c:599
+#: ../libpurple/protocols/jabber/auth.c:325
+#: ../libpurple/protocols/jabber/auth.c:326
+#: ../libpurple/protocols/jabber/auth.c:528
+#: ../libpurple/protocols/jabber/auth.c:529
+#: ../libpurple/protocols/jabber/auth.c:720
+#: ../libpurple/protocols/jabber/auth.c:721
 msgid "Plaintext Authentication"
 msgstr "Autentisering i klartekst"
 
-#: ../libpurple/protocols/jabber/auth.c:334
-#: ../libpurple/protocols/jabber/auth.c:523
-#: ../libpurple/protocols/jabber/auth.c:610
+#: ../libpurple/protocols/jabber/auth.c:480
+#: ../libpurple/protocols/jabber/auth.c:653
+#: ../libpurple/protocols/jabber/auth.c:901
+#: ../libpurple/protocols/jabber/auth.c:1050
+#: ../libpurple/protocols/jabber/auth.c:1077
+#: ../libpurple/protocols/jabber/auth.c:1101
+#: ../libpurple/protocols/jabber/jabber.c:127
+msgid "Invalid response from server."
+msgstr "Ugyldig svar frå tenaren."
+
+#: ../libpurple/protocols/jabber/auth.c:542
+#: ../libpurple/protocols/jabber/auth.c:733
 msgid "Server does not use any supported authentication method"
 msgstr "Tenaren nyttar ikkje ein autentiseringsmetode som er støtta "
 
-#. This should never happen!
-#: ../libpurple/protocols/jabber/auth.c:462
-#: ../libpurple/protocols/jabber/auth.c:561
-#: ../libpurple/protocols/jabber/auth.c:776
-#: ../libpurple/protocols/jabber/auth.c:917
-#: ../libpurple/protocols/jabber/auth.c:942
-#: ../libpurple/protocols/jabber/auth.c:961
-#: ../libpurple/protocols/jabber/jabber.c:123
-msgid "Invalid response from server."
-msgstr "Ugyldig svar frå tenaren."
+#: ../libpurple/protocols/jabber/auth.c:722
+msgid "This server requires plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"
+msgstr "Tenaren krev autentisering i klartekst over eit ukryptert samband. Vil du tillata dette og halda fram med autentiseringa?"
 
-#: ../libpurple/protocols/jabber/auth.c:600
-msgid ""
-"This server requires plaintext authentication over an unencrypted "
-"connection.  Allow this and continue authentication?"
-msgstr ""
-"Tenaren krev autentisering i klartekst over eit ukryptert samband. Vil du "
-"tillata dette og halda fram med autentiseringa?"
-
-#: ../libpurple/protocols/jabber/auth.c:797
-#: ../libpurple/protocols/jabber/auth.c:820
+#: ../libpurple/protocols/jabber/auth.c:924
+#: ../libpurple/protocols/jabber/auth.c:949
 msgid "Invalid challenge from server"
 msgstr "Ugyldig utfordring frå tenaren"
 
-#: ../libpurple/protocols/jabber/auth.c:892
+#: ../libpurple/protocols/jabber/auth.c:1023
 msgid "SASL error"
 msgstr "SASL-feil"
 
 #: ../libpurple/protocols/jabber/buddy.c:283
-#: ../libpurple/protocols/jabber/buddy.c:1219
-#: ../libpurple/protocols/sametime/sametime.c:4128
+#: ../libpurple/protocols/jabber/buddy.c:1223
+#: ../libpurple/protocols/sametime/sametime.c:4182
 #: ../libpurple/protocols/silc/ops.c:986
 #: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
 msgstr "Fullt namn"
 
 #: ../libpurple/protocols/jabber/buddy.c:284
-#: ../libpurple/protocols/jabber/buddy.c:1231
+#: ../libpurple/protocols/jabber/buddy.c:1235
 #: ../libpurple/protocols/silc/ops.c:998
 #: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "Etternamn"
 
 #: ../libpurple/protocols/jabber/buddy.c:285
-#: ../libpurple/protocols/jabber/buddy.c:1234
+#: ../libpurple/protocols/jabber/buddy.c:1238
 msgid "Given Name"
 msgstr "Førenamn"
 
 #: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/jabber.c:977
+#: ../libpurple/protocols/jabber/jabber.c:1024
 msgid "URL"
 msgstr "Nettadresse"
 
 #: ../libpurple/protocols/jabber/buddy.c:288
-#: ../libpurple/protocols/jabber/buddy.c:1282
+#: ../libpurple/protocols/jabber/buddy.c:1286
 msgid "Street Address"
 msgstr "Gateadresse"
 
 #: ../libpurple/protocols/jabber/buddy.c:289
-#: ../libpurple/protocols/jabber/buddy.c:1279
+#: ../libpurple/protocols/jabber/buddy.c:1283
 msgid "Extended Address"
 msgstr "Tilleggsadressefelt"
 
 #: ../libpurple/protocols/jabber/buddy.c:290
-#: ../libpurple/protocols/jabber/buddy.c:1285
+#: ../libpurple/protocols/jabber/buddy.c:1289
 msgid "Locality"
 msgstr "Stad"
 
 #: ../libpurple/protocols/jabber/buddy.c:291
-#: ../libpurple/protocols/jabber/buddy.c:1288
+#: ../libpurple/protocols/jabber/buddy.c:1292
 msgid "Region"
 msgstr "Fylke/region"
 
 #: ../libpurple/protocols/jabber/buddy.c:292
-#: ../libpurple/protocols/jabber/buddy.c:1291
+#: ../libpurple/protocols/jabber/buddy.c:1295
 msgid "Postal Code"
 msgstr "Postnummer"
 
 #: ../libpurple/protocols/jabber/buddy.c:293
-#: ../libpurple/protocols/jabber/buddy.c:1295
-#: ../libpurple/protocols/silc/silc.c:1015
-#: ../libpurple/protocols/silc10/silc.c:926
+#: ../libpurple/protocols/jabber/buddy.c:1299
+#: ../libpurple/protocols/silc/silc.c:1158
+#: ../libpurple/protocols/silc10/silc.c:932
 msgid "Country"
 msgstr "Land"
 
 #: ../libpurple/protocols/jabber/buddy.c:294
-#: ../libpurple/protocols/jabber/buddy.c:1306
-#: ../libpurple/protocols/jabber/buddy.c:1313
+#: ../libpurple/protocols/jabber/buddy.c:1310
+#: ../libpurple/protocols/jabber/buddy.c:1317
 msgid "Telephone"
 msgstr "Telefon"
 
 #: ../libpurple/protocols/jabber/buddy.c:296
-#: ../libpurple/protocols/jabber/buddy.c:1350
+#: ../libpurple/protocols/jabber/buddy.c:1354
 msgid "Organization Name"
 msgstr "Organisasjonsnamn"
 
 #: ../libpurple/protocols/jabber/buddy.c:297
-#: ../libpurple/protocols/jabber/buddy.c:1353
+#: ../libpurple/protocols/jabber/buddy.c:1357
 msgid "Organization Unit"
 msgstr "Organisasjonseining"
 
 #: ../libpurple/protocols/jabber/buddy.c:299
-#: ../libpurple/protocols/jabber/buddy.c:1362
+#: ../libpurple/protocols/jabber/buddy.c:1366
 msgid "Role"
 msgstr "Stilling"
 
 #: ../libpurple/protocols/jabber/buddy.c:300
-#: ../libpurple/protocols/jabber/buddy.c:1250
-#: ../libpurple/protocols/msn/msn.c:1658
-#: ../libpurple/protocols/oscar/oscar.c:3749
+#: ../libpurple/protocols/jabber/buddy.c:1254
+#: ../libpurple/protocols/msn/msn.c:1814
+#: ../libpurple/protocols/msnp9/msn.c:1670
+#: ../libpurple/protocols/oscar/oscar.c:3782
 msgid "Birthday"
 msgstr "Fødselsdag"
 
 #: ../libpurple/protocols/jabber/buddy.c:301
-#: ../libpurple/protocols/jabber/buddy.c:1365
+#: ../libpurple/protocols/jabber/buddy.c:1369
 #: ../libpurple/protocols/jabber/chat.c:775
-#: ../libpurple/protocols/jabber/usermood.c:175 ../pidgin/gtkblist.c:3116
-#: ../pidgin/gtkprefs.c:739
+#: ../libpurple/protocols/jabber/usermood.c:193
+#: ../pidgin/gtkblist.c:3309
+#: ../pidgin/gtkprefs.c:688
 msgid "Description"
 msgstr "Skildring"
 
-#: ../libpurple/protocols/jabber/buddy.c:722
-#: ../libpurple/protocols/jabber/buddy.c:723
+#: ../libpurple/protocols/jabber/buddy.c:724
+#: ../libpurple/protocols/jabber/buddy.c:725
 msgid "Edit XMPP vCard"
 msgstr "Endra XMPP-vCard"
 
-#: ../libpurple/protocols/jabber/buddy.c:724
-msgid ""
-"All items below are optional. Enter only the information with which you feel "
-"comfortable."
-msgstr ""
-"Alle punkta under er valfrie. Ikkje fyll ut noko informasjon du ikkje er "
-"komfortabel med å gje frå deg."
+#: ../libpurple/protocols/jabber/buddy.c:726
+msgid "All items below are optional. Enter only the information with which you feel comfortable."
+msgstr "Alle punkta under er valfrie. Ikkje fyll ut noko informasjon du ikkje er komfortabel med å gje frå deg."
 
-#: ../libpurple/protocols/jabber/buddy.c:795
-#: ../libpurple/protocols/jabber/buddy.c:960
+#: ../libpurple/protocols/jabber/buddy.c:797
+#: ../libpurple/protocols/jabber/buddy.c:962
 msgid "Client"
 msgstr "Klient"
 
-#: ../libpurple/protocols/jabber/buddy.c:799
-#: ../libpurple/protocols/jabber/buddy.c:964
+#: ../libpurple/protocols/jabber/buddy.c:801
+#: ../libpurple/protocols/jabber/buddy.c:966
 msgid "Operating System"
 msgstr "Operativsystem"
 
-#: ../libpurple/protocols/jabber/buddy.c:815
-#: ../libpurple/protocols/jabber/buddy.c:975
-msgid "Last Activity"
-msgstr ""
-
 #: ../libpurple/protocols/jabber/buddy.c:817
 #: ../libpurple/protocols/jabber/buddy.c:977
-#, fuzzy
-msgid "Service Discovery Info"
-msgstr "lagra kataloginformasjon"
+msgid "Last Activity"
+msgstr "Siste aktivitet"
 
 #: ../libpurple/protocols/jabber/buddy.c:819
 #: ../libpurple/protocols/jabber/buddy.c:979
-msgid "Service Discovery Items"
-msgstr ""
+msgid "Service Discovery Info"
+msgstr "Tenesteoppdagingsinfo"
 
 #: ../libpurple/protocols/jabber/buddy.c:821
 #: ../libpurple/protocols/jabber/buddy.c:981
-#, fuzzy
-msgid "Extended Stanza Addressing"
-msgstr "Tilleggsadressefelt"
+msgid "Service Discovery Items"
+msgstr "Tenesteoppdagingselement"
 
 #: ../libpurple/protocols/jabber/buddy.c:823
 #: ../libpurple/protocols/jabber/buddy.c:983
-#, fuzzy
-msgid "Multi-User Chat"
-msgstr "Kallenamn praterom"
+msgid "Extended Stanza Addressing"
+msgstr "Utvida blokkadressering"
 
 #: ../libpurple/protocols/jabber/buddy.c:825
 #: ../libpurple/protocols/jabber/buddy.c:985
-#, fuzzy
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "Brukaren har ingen katalogopplysningar."
+msgid "Multi-User Chat"
+msgstr "Fleirbrukarprat"
 
 #: ../libpurple/protocols/jabber/buddy.c:827
 #: ../libpurple/protocols/jabber/buddy.c:987
-msgid "In-Band Bytestreams"
-msgstr ""
+msgid "Multi-User Chat Extended Presence Information"
+msgstr "Utvida nærvereopplysningar fleirbrukarsamtale"
 
 #: ../libpurple/protocols/jabber/buddy.c:829
 #: ../libpurple/protocols/jabber/buddy.c:989
-#, fuzzy
-msgid "Ad-Hoc Commands"
-msgstr "Kommando"
+msgid "In-Band Bytestreams"
+msgstr "aasASas"
 
 #: ../libpurple/protocols/jabber/buddy.c:831
 #: ../libpurple/protocols/jabber/buddy.c:991
-msgid "PubSub Service"
-msgstr ""
+msgid "Ad-Hoc Commands"
+msgstr "Ad hoc-kommandoar"
 
 #: ../libpurple/protocols/jabber/buddy.c:833
 #: ../libpurple/protocols/jabber/buddy.c:993
-msgid "SOCKS5 Bytestreams"
-msgstr ""
+msgid "PubSub Service"
+msgstr "PubSub-teneste"
 
 #: ../libpurple/protocols/jabber/buddy.c:835
 #: ../libpurple/protocols/jabber/buddy.c:995
-msgid "Out of Band Data"
-msgstr ""
+msgid "SOCKS5 Bytestreams"
+msgstr "SOCKS5 bytesamband"
 
 #: ../libpurple/protocols/jabber/buddy.c:837
 #: ../libpurple/protocols/jabber/buddy.c:997
-#, fuzzy
-msgid "XHTML-IM"
-msgstr "HTML"
+msgid "Out of Band Data"
+msgstr "Eksterne data"
 
 #: ../libpurple/protocols/jabber/buddy.c:839
 #: ../libpurple/protocols/jabber/buddy.c:999
-#, fuzzy
-msgid "In-Band Registration"
-msgstr "Registreringsfeil"
+msgid "XHTML-IM"
+msgstr "XHTML-IM"
 
+# må setjast om seinare
 #: ../libpurple/protocols/jabber/buddy.c:841
 #: ../libpurple/protocols/jabber/buddy.c:1001
-#, fuzzy
-msgid "User Location"
-msgstr "Stad"
+msgid "In-Band Registration"
+msgstr "Samtidsegistrering"
 
 #: ../libpurple/protocols/jabber/buddy.c:843
 #: ../libpurple/protocols/jabber/buddy.c:1003
-#, fuzzy
-msgid "User Avatar"
-msgstr "Brukarsøk"
+msgid "User Location"
+msgstr "Brukarstad"
 
 #: ../libpurple/protocols/jabber/buddy.c:845
 #: ../libpurple/protocols/jabber/buddy.c:1005
-#, fuzzy
-msgid "Chat State Notifications"
-msgstr "Vennetilstandsvarsel"
+msgid "User Avatar"
+msgstr "Brukaravatar"
 
 #: ../libpurple/protocols/jabber/buddy.c:847
 #: ../libpurple/protocols/jabber/buddy.c:1007
-#, fuzzy
-msgid "Software Version"
-msgstr "Versjonen er ikkje støtta"
+msgid "Chat State Notifications"
+msgstr "Pratetilstandsvarsel"
 
 #: ../libpurple/protocols/jabber/buddy.c:849
 #: ../libpurple/protocols/jabber/buddy.c:1009
-#, fuzzy
-msgid "Stream Initiation"
-msgstr "Orientering"
+msgid "Software Version"
+msgstr "Programvareversjon"
 
 #: ../libpurple/protocols/jabber/buddy.c:851
 #: ../libpurple/protocols/jabber/buddy.c:1011
-#: ../libpurple/protocols/sametime/sametime.c:3235
-msgid "File Transfer"
-msgstr "Filoverføring"
+msgid "Stream Initiation"
+msgstr "Straumoppstart"
 
 #: ../libpurple/protocols/jabber/buddy.c:853
 #: ../libpurple/protocols/jabber/buddy.c:1013
-#, fuzzy
-msgid "User Mood"
-msgstr "Brukartilstandar"
+#: ../libpurple/protocols/sametime/sametime.c:3285
+msgid "File Transfer"
+msgstr "Filoverføring"
 
 #: ../libpurple/protocols/jabber/buddy.c:855
 #: ../libpurple/protocols/jabber/buddy.c:1015
-#, fuzzy
-msgid "User Activity"
-msgstr "Brukargrense"
+msgid "User Mood"
+msgstr "Brukarsinnsstemning"
 
 #: ../libpurple/protocols/jabber/buddy.c:857
 #: ../libpurple/protocols/jabber/buddy.c:1017
-#, fuzzy
-msgid "Entity Capabilities"
-msgstr "Evner"
+msgid "User Activity"
+msgstr "Brukaraktivitet"
 
 #: ../libpurple/protocols/jabber/buddy.c:859
 #: ../libpurple/protocols/jabber/buddy.c:1019
-msgid "Encrypted Session Negotiations"
-msgstr ""
+msgid "Entity Capabilities"
+msgstr "Entitetseigenskapar"
 
 #: ../libpurple/protocols/jabber/buddy.c:861
 #: ../libpurple/protocols/jabber/buddy.c:1021
-#, fuzzy
-msgid "User Tune"
-msgstr "Brukarnamn"
+msgid "Encrypted Session Negotiations"
+msgstr "Krypterte øktforhandlingar"
 
 #: ../libpurple/protocols/jabber/buddy.c:863
 #: ../libpurple/protocols/jabber/buddy.c:1023
-#, fuzzy
-msgid "Roster Item Exchange"
-msgstr "Lynmelding med nøkkelutveksling"
+msgid "User Tune"
+msgstr "Brukarlåt"
 
 #: ../libpurple/protocols/jabber/buddy.c:865
 #: ../libpurple/protocols/jabber/buddy.c:1025
-#, fuzzy
-msgid "Reachability Address"
-msgstr "E-postadresse"
+msgid "Roster Item Exchange"
+msgstr "Listeelement-utveksling"
 
+# Gjer betre
 #: ../libpurple/protocols/jabber/buddy.c:867
 #: ../libpurple/protocols/jabber/buddy.c:1027
-#, fuzzy
-msgid "User Profile"
-msgstr "Profil"
+msgid "Reachability Address"
+msgstr "Adresse ein kan nåast på"
 
 #: ../libpurple/protocols/jabber/buddy.c:869
 #: ../libpurple/protocols/jabber/buddy.c:1029
-#, fuzzy
-msgid "Jingle"
-msgstr "Bli med"
+msgid "User Profile"
+msgstr "Brukarprofil"
 
 #: ../libpurple/protocols/jabber/buddy.c:871
 #: ../libpurple/protocols/jabber/buddy.c:1031
-msgid "Jingle Audio"
-msgstr ""
+msgid "Jingle"
+msgstr "Jingle"
 
 #: ../libpurple/protocols/jabber/buddy.c:873
 #: ../libpurple/protocols/jabber/buddy.c:1033
-#, fuzzy
-msgid "User Nickname"
-msgstr "Brukarnamn"
+msgid "Jingle Audio"
+msgstr "Jingle-lyd"
 
 #: ../libpurple/protocols/jabber/buddy.c:875
 #: ../libpurple/protocols/jabber/buddy.c:1035
-msgid "Jingle ICE UDP"
-msgstr ""
+msgid "User Nickname"
+msgstr "Brukarkallenamn"
 
 #: ../libpurple/protocols/jabber/buddy.c:877
 #: ../libpurple/protocols/jabber/buddy.c:1037
-msgid "Jingle ICE TCP"
-msgstr ""
+msgid "Jingle ICE UDP"
+msgstr "Jingle ICE UDP"
 
 #: ../libpurple/protocols/jabber/buddy.c:879
 #: ../libpurple/protocols/jabber/buddy.c:1039
-msgid "Jingle Raw UDP"
-msgstr ""
+msgid "Jingle ICE TCP"
+msgstr "Jingle ICE TCP"
 
 #: ../libpurple/protocols/jabber/buddy.c:881
 #: ../libpurple/protocols/jabber/buddy.c:1041
-#, fuzzy
-msgid "Jingle Video"
-msgstr "Sanntidsvideo"
+msgid "Jingle Raw UDP"
+msgstr "Jingle rein UDP"
 
 #: ../libpurple/protocols/jabber/buddy.c:883
 #: ../libpurple/protocols/jabber/buddy.c:1043
-msgid "Jingle DTMF"
-msgstr ""
+msgid "Jingle Video"
+msgstr "Jingle Video"
 
 #: ../libpurple/protocols/jabber/buddy.c:885
 #: ../libpurple/protocols/jabber/buddy.c:1045
-#, fuzzy
-msgid "Message Receipts"
-msgstr "Melding motteken"
+msgid "Jingle DTMF"
+msgstr "Jingle DTMF"
 
 #: ../libpurple/protocols/jabber/buddy.c:887
 #: ../libpurple/protocols/jabber/buddy.c:1047
-#, fuzzy
-msgid "Public Key Publishing"
-msgstr "Offentleg nøkkel skribleriavtrykk"
+msgid "Message Receipts"
+msgstr "Meldingskvitteringar"
 
 #: ../libpurple/protocols/jabber/buddy.c:889
 #: ../libpurple/protocols/jabber/buddy.c:1049
-#, fuzzy
-msgid "User Chatting"
-msgstr "Brukarval"
+msgid "Public Key Publishing"
+msgstr "Offentleg nøkkel-publisering"
 
 #: ../libpurple/protocols/jabber/buddy.c:891
 #: ../libpurple/protocols/jabber/buddy.c:1051
-#, fuzzy
-msgid "User Browsing"
-msgstr "Brukartilstandar"
+msgid "User Chatting"
+msgstr "Brukar pratar"
 
 #: ../libpurple/protocols/jabber/buddy.c:893
 #: ../libpurple/protocols/jabber/buddy.c:1053
-#, fuzzy
-msgid "User Gaming"
-msgstr "Brukarnamn"
+msgid "User Browsing"
+msgstr "Brukar er på Internett"
 
 #: ../libpurple/protocols/jabber/buddy.c:895
 #: ../libpurple/protocols/jabber/buddy.c:1055
-#, fuzzy
-msgid "User Viewing"
-msgstr "Brukargrense"
+msgid "User Gaming"
+msgstr "Brukar speler"
 
 #: ../libpurple/protocols/jabber/buddy.c:897
 #: ../libpurple/protocols/jabber/buddy.c:1057
-#: ../libpurple/protocols/silc/ops.c:1596
-#: ../libpurple/protocols/silc/ops.c:1601
+msgid "User Viewing"
+msgstr "Brukar ser på"
+
+#: ../libpurple/protocols/jabber/buddy.c:899
+#: ../libpurple/protocols/jabber/buddy.c:1059
+#: ../libpurple/protocols/silc/ops.c:1600
+#: ../libpurple/protocols/silc/ops.c:1605
 #: ../libpurple/protocols/silc10/ops.c:1612
 #: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping"
 msgstr "Ping"
 
-#: ../libpurple/protocols/jabber/buddy.c:899
-#: ../libpurple/protocols/jabber/buddy.c:1059
-#, fuzzy
-msgid "Stanza Encryption"
-msgstr "Trillian-kryptiering"
-
 #: ../libpurple/protocols/jabber/buddy.c:901
 #: ../libpurple/protocols/jabber/buddy.c:1061
-msgid "Entity Time"
-msgstr ""
+msgid "Stanza Encryption"
+msgstr "Blokkryptering"
 
 #: ../libpurple/protocols/jabber/buddy.c:903
 #: ../libpurple/protocols/jabber/buddy.c:1063
-msgid "Delayed Delivery"
-msgstr ""
+msgid "Entity Time"
+msgstr "Entitetstid"
 
 #: ../libpurple/protocols/jabber/buddy.c:905
 #: ../libpurple/protocols/jabber/buddy.c:1065
-msgid "Collaborative Data Objects"
-msgstr ""
+msgid "Delayed Delivery"
+msgstr "Forseinka levering"
 
 #: ../libpurple/protocols/jabber/buddy.c:907
 #: ../libpurple/protocols/jabber/buddy.c:1067
-msgid "File Repository and Sharing"
-msgstr ""
+msgid "Collaborative Data Objects"
+msgstr "Samarbeidsdataobjekt"
 
 #: ../libpurple/protocols/jabber/buddy.c:909
 #: ../libpurple/protocols/jabber/buddy.c:1069
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
+msgid "File Repository and Sharing"
+msgstr "Fillager og -deling"
 
 #: ../libpurple/protocols/jabber/buddy.c:911
 #: ../libpurple/protocols/jabber/buddy.c:1071
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
+msgid "STUN Service Discovery for Jingle"
+msgstr "STUN-tenesteoppdaging for Jingle"
 
 #: ../libpurple/protocols/jabber/buddy.c:913
 #: ../libpurple/protocols/jabber/buddy.c:1073
+msgid "Simplified Encrypted Session Negotiation"
+msgstr "Forenkla  Encrypted Session Negotiation"
+
+#: ../libpurple/protocols/jabber/buddy.c:915
+#: ../libpurple/protocols/jabber/buddy.c:1075
 msgid "Hop Check"
-msgstr ""
+msgstr "Hoppkontroll"
 
-#: ../libpurple/protocols/jabber/buddy.c:921
-#: ../libpurple/protocols/jabber/buddy.c:1081
-#: ../libpurple/protocols/oscar/oscar.c:2906
+#: ../libpurple/protocols/jabber/buddy.c:923
+#: ../libpurple/protocols/jabber/buddy.c:1083
+#: ../libpurple/protocols/oscar/oscar.c:2967
 msgid "Capabilities"
 msgstr "Evner"
 
-#: ../libpurple/protocols/jabber/buddy.c:933
-#: ../libpurple/protocols/jabber/libxmpp.c:206
-#: ../libpurple/protocols/jabber/si.c:859
+#: ../libpurple/protocols/jabber/buddy.c:935
+#: ../libpurple/protocols/jabber/libxmpp.c:209
+#: ../libpurple/protocols/jabber/si.c:1094
 msgid "Resource"
 msgstr "Ressurs"
 
-#: ../libpurple/protocols/jabber/buddy.c:935
-#: ../libpurple/protocols/jabber/jabber.c:1531
-#: ../libpurple/protocols/jabber/jabber.c:1554
-#: ../libpurple/protocols/jabber/jabber.c:1577
+#: ../libpurple/protocols/jabber/buddy.c:937
 #: ../libpurple/protocols/jabber/jabber.c:1600
-#: ../libpurple/protocols/jabber/jabber.c:1623
+#: ../libpurple/protocols/jabber/jabber.c:1614
+#: ../libpurple/protocols/jabber/jabber.c:1628
+#: ../libpurple/protocols/jabber/jabber.c:1642
+#: ../libpurple/protocols/jabber/jabber.c:1656
 msgid "Priority"
 msgstr "Prioritet"
 
-#: ../libpurple/protocols/jabber/buddy.c:1237
+#: ../libpurple/protocols/jabber/buddy.c:1241
 #: ../libpurple/protocols/silc/ops.c:994
 #: ../libpurple/protocols/silc10/ops.c:1028
 msgid "Middle Name"
 msgstr "Mellomnamn"
 
-#: ../libpurple/protocols/jabber/buddy.c:1270
-#: ../libpurple/protocols/jabber/jabber.c:952
-#: ../libpurple/protocols/oscar/oscar.c:3788
-#: ../libpurple/protocols/oscar/oscar.c:3801
+#: ../libpurple/protocols/jabber/buddy.c:1274
+#: ../libpurple/protocols/jabber/jabber.c:1004
+#: ../libpurple/protocols/oscar/oscar.c:3821
+#: ../libpurple/protocols/oscar/oscar.c:3834
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1030
 #: ../libpurple/protocols/silc10/ops.c:1064
 msgid "Address"
 msgstr "Adresse"
 
-#: ../libpurple/protocols/jabber/buddy.c:1276
+#: ../libpurple/protocols/jabber/buddy.c:1280
 msgid "P.O. Box"
 msgstr "Postboks"
 
-#: ../libpurple/protocols/jabber/buddy.c:1386
+#: ../libpurple/protocols/jabber/buddy.c:1390
 msgid "Photo"
 msgstr "Bilete"
 
-#: ../libpurple/protocols/jabber/buddy.c:1386
+#: ../libpurple/protocols/jabber/buddy.c:1390
 msgid "Logo"
 msgstr "Logo"
 
-#: ../libpurple/protocols/jabber/buddy.c:1942
+#: ../libpurple/protocols/jabber/buddy.c:1949
 msgid "Un-hide From"
 msgstr "Ikkje vekke frå"
 
-#: ../libpurple/protocols/jabber/buddy.c:1946
+#: ../libpurple/protocols/jabber/buddy.c:1953
 msgid "Temporarily Hide From"
 msgstr "Mellombels vekke frå"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1954
+#: ../libpurple/protocols/jabber/buddy.c:1961
 msgid "Cancel Presence Notification"
 msgstr "Avbryt nærværsvarsling"
 
-#: ../libpurple/protocols/jabber/buddy.c:1961
+#: ../libpurple/protocols/jabber/buddy.c:1968
 msgid "(Re-)Request authorization"
 msgstr "Send autoriseringsførespurnaden (ein gong til)"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1970
+#: ../libpurple/protocols/jabber/buddy.c:1977
 msgid "Unsubscribe"
 msgstr "Avbryt tinging"
 
-#: ../libpurple/protocols/jabber/buddy.c:1985
-#, fuzzy
+#: ../libpurple/protocols/jabber/buddy.c:1992
 msgid "Log In"
-msgstr "PÃ¥logga"
+msgstr "Logg på"
 
-#: ../libpurple/protocols/jabber/buddy.c:1989
-#, fuzzy
+#: ../libpurple/protocols/jabber/buddy.c:1996
 msgid "Log Out"
-msgstr "Loggfør alle praterom"
+msgstr "Logg av"
 
-#: ../libpurple/protocols/jabber/buddy.c:2035
-#: ../libpurple/protocols/jabber/jabber.c:1553
+#: ../libpurple/protocols/jabber/buddy.c:2042
+#: ../libpurple/protocols/jabber/jabber.c:1613
 msgid "Chatty"
 msgstr "Snakkesaleg"
 
-#: ../libpurple/protocols/jabber/buddy.c:2039
+#: ../libpurple/protocols/jabber/buddy.c:2046
 msgid "Extended Away"
 msgstr "Utvida vekke"
 
-#: ../libpurple/protocols/jabber/buddy.c:2041
-#: ../libpurple/protocols/jabber/jabber.c:1622
-#: ../libpurple/protocols/oscar/oscar.c:727
-#: ../libpurple/protocols/oscar/oscar.c:5808
-#: ../libpurple/protocols/sametime/sametime.c:3297
-#, c-format
+#: ../libpurple/protocols/jabber/buddy.c:2048
+#: ../libpurple/protocols/jabber/jabber.c:1655
+#: ../libpurple/protocols/oscar/oscar.c:726
+#: ../libpurple/protocols/oscar/oscar.c:5911
+#: ../libpurple/protocols/sametime/sametime.c:3347
 msgid "Do Not Disturb"
 msgstr "Ikkje forstyrr meg"
 
-#: ../libpurple/protocols/jabber/buddy.c:2208
+#: ../libpurple/protocols/jabber/buddy.c:2215
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:2212
-#: ../libpurple/protocols/jabber/buddy.c:2391
-#: ../libpurple/protocols/oscar/oscar.c:3711
+#: ../libpurple/protocols/jabber/buddy.c:2219
+#: ../libpurple/protocols/jabber/buddy.c:2408
+#: ../libpurple/protocols/oscar/oscar.c:3744
 msgid "Last Name"
 msgstr "Etternamn"
 
-#: ../libpurple/protocols/jabber/buddy.c:2244
+#: ../libpurple/protocols/jabber/buddy.c:2251
 msgid "The following are the results of your search"
 msgstr "Her er resultatet frå søket ditt"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:2319
-msgid ""
-"Find a contact by entering the search criteria in the given fields. Note: "
-"Each field supports wild card searches (%)"
-msgstr ""
-"Finn ein kontakt ved å skriva inn søkjekriteria i dei gjevne felta. Merk: "
-"ein kan nytta jokerteikn (%)"
+#: ../libpurple/protocols/jabber/buddy.c:2336
+msgid "Find a contact by entering the search criteria in the given fields. Note: Each field supports wild card searches (%)"
+msgstr "Finn ein kontakt ved å skriva inn søkjekriteria i dei gjevne felta. Merk: ein kan nytta jokerteikn (%)"
 
-#: ../libpurple/protocols/jabber/buddy.c:2339
+#: ../libpurple/protocols/jabber/buddy.c:2356
 msgid "Directory Query Failed"
 msgstr "Katalogsøk feila"
 
-#: ../libpurple/protocols/jabber/buddy.c:2340
+#: ../libpurple/protocols/jabber/buddy.c:2357
 msgid "Could not query the directory server."
 msgstr "Klarte ikkje å spørja katalogtenaren."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:2374
+#: ../libpurple/protocols/jabber/buddy.c:2391
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Tenarinstruksjonar: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:2381
+#: ../libpurple/protocols/jabber/buddy.c:2398
 msgid "Fill in one or more fields to search for any matching XMPP users."
-msgstr ""
-"Fyll ut eitt eller fleire felt for å søkja etter samsvarande XMPP-brukarar."
+msgstr "Fyll ut eitt eller fleire felt for å søkja etter samsvarande XMPP-brukarar."
 
-#: ../libpurple/protocols/jabber/buddy.c:2401
-#: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3714
-#: ../libpurple/protocols/oscar/oscar.c:3723
+#: ../libpurple/protocols/jabber/buddy.c:2418
+#: ../libpurple/protocols/novell/novell.c:1497
+#: ../libpurple/protocols/oscar/oscar.c:3747
+#: ../libpurple/protocols/oscar/oscar.c:3756
 msgid "E-Mail Address"
 msgstr "E-postadresse"
 
-#: ../libpurple/protocols/jabber/buddy.c:2410
-#: ../libpurple/protocols/jabber/buddy.c:2411
+#: ../libpurple/protocols/jabber/buddy.c:2427
+#: ../libpurple/protocols/jabber/buddy.c:2428
 msgid "Search for XMPP users"
 msgstr "Søk etter XMPP-brukarar"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:2412
+#: ../libpurple/protocols/jabber/buddy.c:2429
 #: ../libpurple/protocols/qq/group.c:123
 #: ../libpurple/protocols/qq/group_im.c:147
-#: ../libpurple/protocols/qq/sys_msg.c:174
-#: ../libpurple/protocols/qq/sys_msg.c:250
-#: ../libpurple/protocols/qq/sys_msg.c:268
-#: ../libpurple/protocols/sametime/sametime.c:5611
+#: ../libpurple/protocols/qq/sys_msg.c:177
+#: ../libpurple/protocols/qq/sys_msg.c:253
+#: ../libpurple/protocols/qq/sys_msg.c:271
+#: ../libpurple/protocols/sametime/sametime.c:5665
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
 msgstr "Søk"
 
-#: ../libpurple/protocols/jabber/buddy.c:2427
+#: ../libpurple/protocols/jabber/buddy.c:2444
 msgid "Invalid Directory"
 msgstr "Ugyldig katalog"
 
-#: ../libpurple/protocols/jabber/buddy.c:2444
+#: ../libpurple/protocols/jabber/buddy.c:2461
 msgid "Enter a User Directory"
 msgstr "Før opp ein brukarkatalog"
 
-#: ../libpurple/protocols/jabber/buddy.c:2445
+#: ../libpurple/protocols/jabber/buddy.c:2462
 msgid "Select a user directory to search"
 msgstr "Vel ein brukarkatalog å søkja i"
 
-#: ../libpurple/protocols/jabber/buddy.c:2448
+#: ../libpurple/protocols/jabber/buddy.c:2465
 msgid "Search Directory"
 msgstr "Søk katalog"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5294
-#: ../libpurple/protocols/yahoo/yahoochat.c:1048
+#: ../libpurple/protocols/oscar/oscar.c:5391
+#: ../libpurple/protocols/yahoo/yahoochat.c:1057
 msgid "_Room:"
 msgstr "_Rom:"
 
@@ -5382,7 +5834,7 @@ msgstr "Ein kan ikkje endra kallenamn i 
 
 #: ../libpurple/protocols/jabber/chat.c:678
 #: ../libpurple/protocols/jabber/chat.c:689
-#: ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/silc/ops.c:1460
 #: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "Klarte ikkje å henta romlista"
@@ -5403,29 +5855,29 @@ msgstr "Finn rom"
 msgid "Find Rooms"
 msgstr "Finn rom"
 
-#: ../libpurple/protocols/jabber/jabber.c:92
-msgid "Error initializing session"
-msgstr "Feil i opprettinga av økta"
-
-#: ../libpurple/protocols/jabber/jabber.c:145
+#: ../libpurple/protocols/jabber/jabber.c:151
 msgid "You require encryption, but it is not available on this server."
-msgstr ""
+msgstr "Du krev kryptering som ikkje er tilgjengeleg på denne tenaren."
 
-#: ../libpurple/protocols/jabber/jabber.c:259
-#: ../libpurple/protocols/jabber/jabber.c:312
-#: ../libpurple/protocols/jabber/jabber.c:340
+#: ../libpurple/protocols/jabber/jabber.c:269
+#: ../libpurple/protocols/jabber/jabber.c:324
+#: ../libpurple/protocols/jabber/jabber.c:354
 msgid "Write error"
 msgstr "Skrivefeil"
 
-#: ../libpurple/protocols/jabber/jabber.c:408
-#: ../libpurple/protocols/jabber/jabber.c:445
+#: ../libpurple/protocols/jabber/jabber.c:401
+msgid "Ping timeout"
+msgstr "Tidsavbrot ping"
+
+#: ../libpurple/protocols/jabber/jabber.c:448
+#: ../libpurple/protocols/jabber/jabber.c:488
 msgid "Read Error"
 msgstr "Lesefeil"
 
-#: ../libpurple/protocols/jabber/jabber.c:482
-#: ../libpurple/protocols/oscar/flap_connection.c:394
-#: ../libpurple/protocols/yahoo/yahoo.c:2558
-#: ../libpurple/protocols/yahoo/yahoo.c:2590
+#: ../libpurple/protocols/jabber/jabber.c:525
+#: ../libpurple/protocols/oscar/flap_connection.c:398
+#: ../libpurple/protocols/yahoo/yahoo.c:2576
+#: ../libpurple/protocols/yahoo/yahoo.c:2608
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -5434,664 +5886,628 @@ msgstr ""
 "Klarte ikkje å laga eit samband til tenaren:\n"
 "%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:529
+#: ../libpurple/protocols/jabber/jabber.c:575
 msgid "Unable to create socket"
 msgstr "Klarte ikkje å laga endepunkt"
 
-#: ../libpurple/protocols/jabber/jabber.c:575
-#: ../libpurple/protocols/jabber/jabber.c:1063
+#: ../libpurple/protocols/jabber/jabber.c:625
+#: ../libpurple/protocols/jabber/jabber.c:1110
 msgid "Invalid XMPP ID"
 msgstr "Ugyldig XMPP-id"
 
-#: ../libpurple/protocols/jabber/jabber.c:580
+#: ../libpurple/protocols/jabber/jabber.c:632
 msgid "Invalid XMPP ID. Domain must be set."
-msgstr "Ulovleg XMPP-id. Domenet må vera skrive inn."
+msgstr "Ulovleg XMPP-id. Domene må vera vald."
 
-#: ../libpurple/protocols/jabber/jabber.c:656
+#: ../libpurple/protocols/jabber/jabber.c:710
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registreringa av %s@%s blei gjennomført"
 
-#: ../libpurple/protocols/jabber/jabber.c:662
-#, fuzzy, c-format
+#: ../libpurple/protocols/jabber/jabber.c:716
+#, c-format
 msgid "Registration to %s successful"
-msgstr "Registreringa av %s@%s blei gjennomført"
+msgstr "Vellykka registrering til %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:664
-#: ../libpurple/protocols/jabber/jabber.c:665
+#: ../libpurple/protocols/jabber/jabber.c:718
+#: ../libpurple/protocols/jabber/jabber.c:719
 msgid "Registration Successful"
 msgstr "Registreringa blei gjennomført"
 
-#: ../libpurple/protocols/jabber/jabber.c:673
-#: ../libpurple/protocols/jabber/jabber.c:674
+#: ../libpurple/protocols/jabber/jabber.c:727
+#: ../libpurple/protocols/jabber/jabber.c:728
 msgid "Registration Failed"
 msgstr "Registreringa feila"
 
-#: ../libpurple/protocols/jabber/jabber.c:692
-#, fuzzy, c-format
+#: ../libpurple/protocols/jabber/jabber.c:746
+#, c-format
 msgid "Registration from %s successfully removed"
-msgstr "Registreringa av %s@%s blei gjennomført"
+msgstr "Vellykka av avregistrering frå %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:694
-#: ../libpurple/protocols/jabber/jabber.c:695
-#, fuzzy
+#: ../libpurple/protocols/jabber/jabber.c:748
+#: ../libpurple/protocols/jabber/jabber.c:749
 msgid "Unregistration Successful"
-msgstr "Registreringa blei gjennomført"
+msgstr "Vellykka avregistrering"
 
-#: ../libpurple/protocols/jabber/jabber.c:703
-#: ../libpurple/protocols/jabber/jabber.c:704
-#, fuzzy
+#: ../libpurple/protocols/jabber/jabber.c:757
+#: ../libpurple/protocols/jabber/jabber.c:758
 msgid "Unregistration Failed"
-msgstr "Registreringa feila"
+msgstr "Avregistreringa feila"
 
-#: ../libpurple/protocols/jabber/jabber.c:864
-#: ../libpurple/protocols/jabber/jabber.c:865
+#: ../libpurple/protocols/jabber/jabber.c:924
+#: ../libpurple/protocols/jabber/jabber.c:925
 msgid "Already Registered"
 msgstr "Allereie registrert"
 
-#: ../libpurple/protocols/jabber/jabber.c:962
-#: ../libpurple/protocols/oscar/oscar.c:3790
-#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/jabber/jabber.c:1012
+#: ../libpurple/protocols/oscar/oscar.c:3823
+#: ../libpurple/protocols/oscar/oscar.c:3836
 msgid "State"
 msgstr "Fylke/Region/Stat"
 
-#: ../libpurple/protocols/jabber/jabber.c:967
+#: ../libpurple/protocols/jabber/jabber.c:1016
 msgid "Postal code"
 msgstr "Postnummer"
 
-#: ../libpurple/protocols/jabber/jabber.c:972
+#: ../libpurple/protocols/jabber/jabber.c:1020
 #: ../libpurple/protocols/silc/ops.c:1035
-#: ../libpurple/protocols/silc/silc.c:772
-#: ../libpurple/protocols/silc/util.c:557
+#: ../libpurple/protocols/silc/silc.c:915
+#: ../libpurple/protocols/silc/util.c:563
 #: ../libpurple/protocols/silc10/ops.c:1069
-#: ../libpurple/protocols/silc10/silc.c:683
+#: ../libpurple/protocols/silc10/silc.c:689
 #: ../libpurple/protocols/silc10/util.c:553
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../libpurple/protocols/jabber/jabber.c:982
+#: ../libpurple/protocols/jabber/jabber.c:1028
 msgid "Date"
 msgstr "Dato"
 
-#: ../libpurple/protocols/jabber/jabber.c:987
-#, fuzzy
+#: ../libpurple/protocols/jabber/jabber.c:1032
 msgid "Unregister"
-msgstr "Registrer"
+msgstr "Avregistrer"
 
-#: ../libpurple/protocols/jabber/jabber.c:994
-#, fuzzy
-msgid ""
-"Please fill out the information below to change your account registration."
-msgstr "Fyll ut informasjonen under for å registrera den nye kontoen din."
+#: ../libpurple/protocols/jabber/jabber.c:1039
+msgid "Please fill out the information below to change your account registration."
+msgstr "Fyll ut informasjonen under for å endra kontoregistreringa di."
 
-#: ../libpurple/protocols/jabber/jabber.c:997
+#: ../libpurple/protocols/jabber/jabber.c:1042
 msgid "Please fill out the information below to register your new account."
 msgstr "Fyll ut informasjonen under for å registrera den nye kontoen din."
 
-#: ../libpurple/protocols/jabber/jabber.c:1005
-#: ../libpurple/protocols/jabber/jabber.c:1006
+#: ../libpurple/protocols/jabber/jabber.c:1050
+#: ../libpurple/protocols/jabber/jabber.c:1051
 msgid "Register New XMPP Account"
 msgstr "Registrer ein ny XMPP-konto"
 
-#: ../libpurple/protocols/jabber/jabber.c:1007
-#: ../libpurple/protocols/jabber/jabber.c:1016
+#: ../libpurple/protocols/jabber/jabber.c:1052
+#: ../libpurple/protocols/jabber/jabber.c:1061
 msgid "Register"
 msgstr "Registrer"
 
-#: ../libpurple/protocols/jabber/jabber.c:1012
-#, fuzzy, c-format
+#: ../libpurple/protocols/jabber/jabber.c:1057
+#, c-format
 msgid "Change Account Registration at %s"
-msgstr "Endra brukarinformasjonen til %s"
+msgstr "Endra kontoregistreringa hos %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1013
-#, fuzzy, c-format
+#: ../libpurple/protocols/jabber/jabber.c:1058
+#, c-format
 msgid "Register New Account at %s"
-msgstr "Registrer ein ny XMPP-konto"
+msgstr "Registrer ny konto hos %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1016
-#, fuzzy
+#: ../libpurple/protocols/jabber/jabber.c:1061
 msgid "Change Registration"
-msgstr "Endra tilstand til"
+msgstr "Endra registreringa"
 
-#: ../libpurple/protocols/jabber/jabber.c:1120
-#: ../libpurple/protocols/jabber/jabber.c:1121
-#, fuzzy
+#: ../libpurple/protocols/jabber/jabber.c:1170
+#: ../libpurple/protocols/jabber/jabber.c:1171
 msgid "Error unregistering account"
-msgstr "Feil ved endring av kontoinformasjon"
+msgstr "Feil ved avregistreringa av kontoen"
 
-#: ../libpurple/protocols/jabber/jabber.c:1126
-#: ../libpurple/protocols/jabber/jabber.c:1127
-#, fuzzy
+#: ../libpurple/protocols/jabber/jabber.c:1176
+#: ../libpurple/protocols/jabber/jabber.c:1177
 msgid "Account successfully unregistered"
-msgstr "Du har oppretta ein Qun"
+msgstr "Vellykka kontoregistrering"
 
-#: ../libpurple/protocols/jabber/jabber.c:1284
+#: ../libpurple/protocols/jabber/jabber.c:1340
 msgid "Initializing Stream"
 msgstr "Begynner datastraum"
 
-#: ../libpurple/protocols/jabber/jabber.c:1289
-#, fuzzy
+#: ../libpurple/protocols/jabber/jabber.c:1345
 msgid "Initializing SSL/TLS"
-msgstr "Begynner datastraum"
+msgstr "Startar SSL/TLS"
 
-#: ../libpurple/protocols/jabber/jabber.c:1293
-#: ../libpurple/protocols/msn/session.c:351
+#: ../libpurple/protocols/jabber/jabber.c:1349
+#: ../libpurple/protocols/msn/session.c:408
+#: ../libpurple/protocols/msnp9/session.c:360
 msgid "Authenticating"
 msgstr "Autentiserer"
 
-#: ../libpurple/protocols/jabber/jabber.c:1302
+#: ../libpurple/protocols/jabber/jabber.c:1358
 msgid "Re-initializing Stream"
 msgstr "Tek opp att datastraumen"
 
-#: ../libpurple/protocols/jabber/jabber.c:1396
-#: ../libpurple/protocols/jabber/jabber.c:1865
-#: ../libpurple/protocols/jabber/jabber.c:1909
-#: ../libpurple/protocols/jabber/jabber.c:1945
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:5602
+#: ../libpurple/protocols/jabber/jabber.c:1452
+#: ../libpurple/protocols/jabber/jabber.c:1910
+#: ../libpurple/protocols/jabber/jabber.c:1953
+#: ../libpurple/protocols/jabber/jabber.c:1991
+#: ../libpurple/protocols/oscar/oscar.c:825
+#: ../libpurple/protocols/oscar/oscar.c:5705
 msgid "Not Authorized"
 msgstr "Ikkje autorisert"
 
-#: ../libpurple/protocols/jabber/jabber.c:1442
+#: ../libpurple/protocols/jabber/jabber.c:1500
 msgid "Both"
 msgstr "Begge"
 
-#: ../libpurple/protocols/jabber/jabber.c:1444
+#: ../libpurple/protocols/jabber/jabber.c:1502
 msgid "From (To pending)"
 msgstr "Frå (til ventar)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1446
+#: ../libpurple/protocols/jabber/jabber.c:1504
 msgid "From"
 msgstr "Frå"
 
-#: ../libpurple/protocols/jabber/jabber.c:1449
+#: ../libpurple/protocols/jabber/jabber.c:1507
 msgid "To"
 msgstr "Til"
 
-#: ../libpurple/protocols/jabber/jabber.c:1451
+#: ../libpurple/protocols/jabber/jabber.c:1509
 msgid "None (To pending)"
 msgstr "Ingen (til ventar)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1453
+#: ../libpurple/protocols/jabber/jabber.c:1511
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "Ingen"
 
-#: ../libpurple/protocols/jabber/jabber.c:1456
+#: ../libpurple/protocols/jabber/jabber.c:1514
 msgid "Subscription"
 msgstr "Abonnement"
 
-#: ../libpurple/protocols/jabber/jabber.c:1466
-#: ../libpurple/protocols/jabber/jabber.c:1469
-#: ../libpurple/protocols/jabber/jabber.c:1533
-#: ../libpurple/protocols/jabber/jabber.c:1556
-#: ../libpurple/protocols/jabber/jabber.c:1579
+#: ../libpurple/protocols/jabber/jabber.c:1524
+#: ../libpurple/protocols/jabber/jabber.c:1527
 #: ../libpurple/protocols/jabber/jabber.c:1602
-#: ../libpurple/protocols/jabber/jabber.c:1625
-#: ../libpurple/protocols/jabber/usermood.c:166
-#: ../libpurple/protocols/silc/buddy.c:1557
+#: ../libpurple/protocols/jabber/jabber.c:1616
+#: ../libpurple/protocols/jabber/jabber.c:1630
+#: ../libpurple/protocols/jabber/jabber.c:1644
+#: ../libpurple/protocols/jabber/jabber.c:1658
+#: ../libpurple/protocols/jabber/usermood.c:184
+#: ../libpurple/protocols/silc/buddy.c:1560
 #: ../libpurple/protocols/silc/ops.c:1212
-#: ../libpurple/protocols/silc10/buddy.c:1557
+#: ../libpurple/protocols/silc10/buddy.c:1560
 #: ../libpurple/protocols/silc10/ops.c:1207
 msgid "Mood"
 msgstr "Sinnsstemning"
 
-#: ../libpurple/protocols/jabber/jabber.c:1534
-#: ../libpurple/protocols/jabber/jabber.c:1557
-#: ../libpurple/protocols/jabber/jabber.c:1580
+#: ../libpurple/protocols/jabber/jabber.c:1536
+#: ../libpurple/protocols/msn/msn.c:642
+msgid "Now Listening"
+msgstr "Lyttar"
+
 #: ../libpurple/protocols/jabber/jabber.c:1603
-#: ../libpurple/protocols/jabber/jabber.c:1626
-#, fuzzy
+#: ../libpurple/protocols/jabber/jabber.c:1617
+#: ../libpurple/protocols/jabber/jabber.c:1631
+#: ../libpurple/protocols/jabber/jabber.c:1645
+#: ../libpurple/protocols/jabber/jabber.c:1659
 msgid "Mood Text"
-msgstr "Blodtype"
+msgstr "Sinnsstemningstekst"
 
-#: ../libpurple/protocols/jabber/jabber.c:1535
-#: ../libpurple/protocols/jabber/jabber.c:1558
-#: ../libpurple/protocols/jabber/jabber.c:1581
-#: ../libpurple/protocols/jabber/jabber.c:1604
-#: ../libpurple/protocols/jabber/jabber.c:1627
-#, fuzzy
+#: ../libpurple/protocols/jabber/jabber.c:1605
+#: ../libpurple/protocols/jabber/jabber.c:1619
+#: ../libpurple/protocols/jabber/jabber.c:1633
+#: ../libpurple/protocols/jabber/jabber.c:1647
+#: ../libpurple/protocols/jabber/jabber.c:1661
+msgid "Allow Buzz"
+msgstr "Tillat alarm"
+
+#: ../libpurple/protocols/jabber/jabber.c:1679
 msgid "Tune Artist"
-msgstr "Kunstnarar"
+msgstr "LÃ¥tartist"
 
-#: ../libpurple/protocols/jabber/jabber.c:1536
-#: ../libpurple/protocols/jabber/jabber.c:1559
-#: ../libpurple/protocols/jabber/jabber.c:1582
-#: ../libpurple/protocols/jabber/jabber.c:1605
-#: ../libpurple/protocols/jabber/jabber.c:1628
-#, fuzzy
+#: ../libpurple/protocols/jabber/jabber.c:1680
 msgid "Tune Title"
-msgstr "Tittel"
+msgstr "LÃ¥ttittel"
 
-#: ../libpurple/protocols/jabber/jabber.c:1537
-#: ../libpurple/protocols/jabber/jabber.c:1560
-#: ../libpurple/protocols/jabber/jabber.c:1583
-#: ../libpurple/protocols/jabber/jabber.c:1606
-#: ../libpurple/protocols/jabber/jabber.c:1629
+#: ../libpurple/protocols/jabber/jabber.c:1681
 msgid "Tune Album"
-msgstr ""
+msgstr "LÃ¥talbum"
 
-#: ../libpurple/protocols/jabber/jabber.c:1538
-#: ../libpurple/protocols/jabber/jabber.c:1561
-#: ../libpurple/protocols/jabber/jabber.c:1584
-#: ../libpurple/protocols/jabber/jabber.c:1607
-#: ../libpurple/protocols/jabber/jabber.c:1630
+#: ../libpurple/protocols/jabber/jabber.c:1682
 msgid "Tune Genre"
-msgstr ""
+msgstr "LÃ¥tsjanger"
 
-#: ../libpurple/protocols/jabber/jabber.c:1539
-#: ../libpurple/protocols/jabber/jabber.c:1562
-#: ../libpurple/protocols/jabber/jabber.c:1585
-#: ../libpurple/protocols/jabber/jabber.c:1608
-#: ../libpurple/protocols/jabber/jabber.c:1631
-#, fuzzy
+#: ../libpurple/protocols/jabber/jabber.c:1683
 msgid "Tune Comment"
-msgstr "Vennenotat"
+msgstr "LÃ¥tmerknad"
 
-#: ../libpurple/protocols/jabber/jabber.c:1540
-#: ../libpurple/protocols/jabber/jabber.c:1563
-#: ../libpurple/protocols/jabber/jabber.c:1586
-#: ../libpurple/protocols/jabber/jabber.c:1609
-#: ../libpurple/protocols/jabber/jabber.c:1632
+#: ../libpurple/protocols/jabber/jabber.c:1684
 msgid "Tune Track"
-msgstr ""
+msgstr "LÃ¥tspor"
 
-#: ../libpurple/protocols/jabber/jabber.c:1541
-#: ../libpurple/protocols/jabber/jabber.c:1564
-#: ../libpurple/protocols/jabber/jabber.c:1587
-#: ../libpurple/protocols/jabber/jabber.c:1610
-#: ../libpurple/protocols/jabber/jabber.c:1633
+#: ../libpurple/protocols/jabber/jabber.c:1685
 msgid "Tune Time"
-msgstr ""
+msgstr "LÃ¥ttid"
 
-#: ../libpurple/protocols/jabber/jabber.c:1542
-#: ../libpurple/protocols/jabber/jabber.c:1565
-#: ../libpurple/protocols/jabber/jabber.c:1588
-#: ../libpurple/protocols/jabber/jabber.c:1611
-#: ../libpurple/protocols/jabber/jabber.c:1634
+#: ../libpurple/protocols/jabber/jabber.c:1686
 msgid "Tune Year"
-msgstr ""
+msgstr "Låtår"
 
-#: ../libpurple/protocols/jabber/jabber.c:1543
-#: ../libpurple/protocols/jabber/jabber.c:1566
-#: ../libpurple/protocols/jabber/jabber.c:1589
-#: ../libpurple/protocols/jabber/jabber.c:1612
-#: ../libpurple/protocols/jabber/jabber.c:1635
+#: ../libpurple/protocols/jabber/jabber.c:1687
 msgid "Tune URL"
-msgstr ""
+msgstr "LÃ¥tadresse"
 
-#: ../libpurple/protocols/jabber/jabber.c:1545
-#: ../libpurple/protocols/jabber/jabber.c:1568
-#: ../libpurple/protocols/jabber/jabber.c:1591
-#: ../libpurple/protocols/jabber/jabber.c:1614
-#: ../libpurple/protocols/jabber/jabber.c:1637
-#, fuzzy
-msgid "Allow Buzz"
-msgstr "Tillat"
-
-#: ../libpurple/protocols/jabber/jabber.c:1665
+#: ../libpurple/protocols/jabber/jabber.c:1703
 msgid "Password Changed"
 msgstr "Passordet er endra"
 
-#: ../libpurple/protocols/jabber/jabber.c:1666
+#: ../libpurple/protocols/jabber/jabber.c:1704
 msgid "Your password has been changed."
 msgstr "Passordet ditt er blitt endra"
 
-#: ../libpurple/protocols/jabber/jabber.c:1670
-#: ../libpurple/protocols/jabber/jabber.c:1671
+#: ../libpurple/protocols/jabber/jabber.c:1710
+#: ../libpurple/protocols/jabber/jabber.c:1711
 msgid "Error changing password"
 msgstr "Feil under  endringa av passordet"
 
-#: ../libpurple/protocols/jabber/jabber.c:1728
+#: ../libpurple/protocols/jabber/jabber.c:1768
 msgid "Password (again)"
 msgstr "Passord (om att)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1734
-#: ../libpurple/protocols/jabber/jabber.c:1735
+#: ../libpurple/protocols/jabber/jabber.c:1774
+#: ../libpurple/protocols/jabber/jabber.c:1775
 msgid "Change XMPP Password"
 msgstr "Endra XMPP-passord"
 
-#: ../libpurple/protocols/jabber/jabber.c:1735
+#: ../libpurple/protocols/jabber/jabber.c:1775
 msgid "Please enter your new password"
 msgstr "Skriv inn det nye passordet ditt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1749
-#: ../libpurple/protocols/oscar/oscar.c:6388
-#: ../libpurple/protocols/silc/silc.c:1093
-#: ../libpurple/protocols/silc10/silc.c:1004
+#: ../libpurple/protocols/jabber/jabber.c:1789
+#: ../libpurple/protocols/oscar/oscar.c:6491
+#: ../libpurple/protocols/silc/silc.c:1236
+#: ../libpurple/protocols/silc10/silc.c:1010
 msgid "Set User Info..."
 msgstr "Skriv inn brukarinfo…"
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1754
-#: ../libpurple/protocols/oscar/oscar.c:6399
-#: ../libpurple/protocols/silc/silc.c:1089
-#: ../libpurple/protocols/silc10/silc.c:1000
+#: ../libpurple/protocols/jabber/jabber.c:1794
+#: ../libpurple/protocols/oscar/oscar.c:6502
+#: ../libpurple/protocols/silc/silc.c:1232
+#: ../libpurple/protocols/silc10/silc.c:1006
 msgid "Change Password..."
 msgstr "Endra passord…"
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1759
+#: ../libpurple/protocols/jabber/jabber.c:1799
 msgid "Search for Users..."
 msgstr "Søk etter brukarar…"
 
-#: ../libpurple/protocols/jabber/jabber.c:1845
+#: ../libpurple/protocols/jabber/jabber.c:1890
 msgid "Bad Request"
 msgstr "Ugyldig førespurnad"
 
-#: ../libpurple/protocols/jabber/jabber.c:1847
+#: ../libpurple/protocols/jabber/jabber.c:1892
 msgid "Conflict"
 msgstr "Konflikt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1849
+#: ../libpurple/protocols/jabber/jabber.c:1894
 msgid "Feature Not Implemented"
 msgstr "Funksjonen er ikkje teken i bruk"
 
-#: ../libpurple/protocols/jabber/jabber.c:1851
+#: ../libpurple/protocols/jabber/jabber.c:1896
 msgid "Forbidden"
 msgstr "Forbode"
 
-#: ../libpurple/protocols/jabber/jabber.c:1853
+#: ../libpurple/protocols/jabber/jabber.c:1898
 msgid "Gone"
 msgstr "Vekke"
 
-#: ../libpurple/protocols/jabber/jabber.c:1855
-#: ../libpurple/protocols/jabber/jabber.c:1935
+#: ../libpurple/protocols/jabber/jabber.c:1900
+#: ../libpurple/protocols/jabber/jabber.c:1981
 msgid "Internal Server Error"
 msgstr "Intern tenarfeil"
 
-#: ../libpurple/protocols/jabber/jabber.c:1857
+#: ../libpurple/protocols/jabber/jabber.c:1902
 msgid "Item Not Found"
 msgstr "Elementet blei ikkje funne"
 
-#: ../libpurple/protocols/jabber/jabber.c:1859
+#: ../libpurple/protocols/jabber/jabber.c:1904
 msgid "Malformed XMPP ID"
 msgstr "Misforma XMPP-id"
 
-#: ../libpurple/protocols/jabber/jabber.c:1861
+#: ../libpurple/protocols/jabber/jabber.c:1906
 msgid "Not Acceptable"
 msgstr "Avvist"
 
-#: ../libpurple/protocols/jabber/jabber.c:1863
+#: ../libpurple/protocols/jabber/jabber.c:1908
 msgid "Not Allowed"
 msgstr "Ikkje tillate"
 
-#: ../libpurple/protocols/jabber/jabber.c:1867
+#: ../libpurple/protocols/jabber/jabber.c:1912
 msgid "Payment Required"
 msgstr "Betaling påkravd"
 
-#: ../libpurple/protocols/jabber/jabber.c:1869
+#: ../libpurple/protocols/jabber/jabber.c:1914
 msgid "Recipient Unavailable"
 msgstr "Mottakaren er ikkje tilgjengeleg"
 
-#: ../libpurple/protocols/jabber/jabber.c:1873
+#: ../libpurple/protocols/jabber/jabber.c:1918
 msgid "Registration Required"
 msgstr "Registrering påkravd"
 
-#: ../libpurple/protocols/jabber/jabber.c:1875
+#: ../libpurple/protocols/jabber/jabber.c:1920
 msgid "Remote Server Not Found"
 msgstr "Fann ikkje fjerntenaren"
 
-#: ../libpurple/protocols/jabber/jabber.c:1877
+#: ../libpurple/protocols/jabber/jabber.c:1922
 msgid "Remote Server Timeout"
 msgstr "Tidsavbrot på fjerntenaren"
 
-#: ../libpurple/protocols/jabber/jabber.c:1879
+#: ../libpurple/protocols/jabber/jabber.c:1924
 msgid "Server Overloaded"
 msgstr "Tenaren er overlasta"
 
-#: ../libpurple/protocols/jabber/jabber.c:1881
+#: ../libpurple/protocols/jabber/jabber.c:1926
 msgid "Service Unavailable"
 msgstr "Tenesten er utilgjengeleg"
 
-#: ../libpurple/protocols/jabber/jabber.c:1883
+#: ../libpurple/protocols/jabber/jabber.c:1928
 msgid "Subscription Required"
 msgstr "Abonnement påkravd"
 
-#: ../libpurple/protocols/jabber/jabber.c:1885
+#: ../libpurple/protocols/jabber/jabber.c:1930
 msgid "Unexpected Request"
 msgstr "Uventa førespurnad"
 
-#: ../libpurple/protocols/jabber/jabber.c:1892
+#: ../libpurple/protocols/jabber/jabber.c:1938
 msgid "Authorization Aborted"
 msgstr "Autoriseringa blei avbroten"
 
-#: ../libpurple/protocols/jabber/jabber.c:1894
+#: ../libpurple/protocols/jabber/jabber.c:1940
 msgid "Incorrect encoding in authorization"
 msgstr "Feil koding i autoriseringa"
 
-#: ../libpurple/protocols/jabber/jabber.c:1897
+#: ../libpurple/protocols/jabber/jabber.c:1942
 msgid "Invalid authzid"
 msgstr "Ugyldig authzid"
 
-#: ../libpurple/protocols/jabber/jabber.c:1900
+#: ../libpurple/protocols/jabber/jabber.c:1944
 msgid "Invalid Authorization Mechanism"
 msgstr "Ugyldig autoriseringsmekanisme"
 
-#: ../libpurple/protocols/jabber/jabber.c:1903
+#: ../libpurple/protocols/jabber/jabber.c:1947
 msgid "Authorization mechanism too weak"
 msgstr "Autoriseringsmekanismen er for svak"
 
-#: ../libpurple/protocols/jabber/jabber.c:1911
+#: ../libpurple/protocols/jabber/jabber.c:1955
 msgid "Temporary Authentication Failure"
 msgstr "Mellombels autentiseringssvikt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1914
+#: ../libpurple/protocols/jabber/jabber.c:1958
 msgid "Authentication Failure"
 msgstr "Autentiseringssvikt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1920
+#: ../libpurple/protocols/jabber/jabber.c:1966
 msgid "Bad Format"
 msgstr "Feil format"
 
-#: ../libpurple/protocols/jabber/jabber.c:1922
+#: ../libpurple/protocols/jabber/jabber.c:1968
 msgid "Bad Namespace Prefix"
 msgstr "Feil namneromsprefiks"
 
-#: ../libpurple/protocols/jabber/jabber.c:1925
+#: ../libpurple/protocols/jabber/jabber.c:1971
 msgid "Resource Conflict"
 msgstr "Ressurskonflikt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1927
-#: ../libpurple/protocols/silc/silc.c:244
-#: ../libpurple/protocols/silc10/ops.c:1720
+#: ../libpurple/protocols/jabber/jabber.c:1973
+#: ../libpurple/protocols/silc/silc.c:350
+#: ../libpurple/protocols/silc10/ops.c:1725
 msgid "Connection Timeout"
 msgstr "Tidsavbrot på tilkoplinga"
 
-#: ../libpurple/protocols/jabber/jabber.c:1929
+#: ../libpurple/protocols/jabber/jabber.c:1975
 msgid "Host Gone"
 msgstr "Verten forsvann"
 
-#: ../libpurple/protocols/jabber/jabber.c:1931
+#: ../libpurple/protocols/jabber/jabber.c:1977
 msgid "Host Unknown"
 msgstr "Ukjend vert"
 
-#: ../libpurple/protocols/jabber/jabber.c:1933
+#: ../libpurple/protocols/jabber/jabber.c:1979
 msgid "Improper Addressing"
 msgstr "Ikkje skikkeleg adressering"
 
-#: ../libpurple/protocols/jabber/jabber.c:1937
+#: ../libpurple/protocols/jabber/jabber.c:1983
 msgid "Invalid ID"
 msgstr "Ugyldig ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:1939
+#: ../libpurple/protocols/jabber/jabber.c:1985
 msgid "Invalid Namespace"
 msgstr "Ugyldig namnerom"
 
-#: ../libpurple/protocols/jabber/jabber.c:1941
+#: ../libpurple/protocols/jabber/jabber.c:1987
 msgid "Invalid XML"
 msgstr "Ugyldig XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1943
+#: ../libpurple/protocols/jabber/jabber.c:1989
 msgid "Non-matching Hosts"
 msgstr "Ikke-samsvarande vertar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1947
+#: ../libpurple/protocols/jabber/jabber.c:1993
 msgid "Policy Violation"
 msgstr "Framgangsmåtebrot"
 
-#: ../libpurple/protocols/jabber/jabber.c:1949
+#: ../libpurple/protocols/jabber/jabber.c:1995
 msgid "Remote Connection Failed"
 msgstr "Feil i fjerntilkoplinga"
 
-#: ../libpurple/protocols/jabber/jabber.c:1951
+#: ../libpurple/protocols/jabber/jabber.c:1997
 msgid "Resource Constraint"
 msgstr "Ressursavgrensing"
 
-#: ../libpurple/protocols/jabber/jabber.c:1953
+#: ../libpurple/protocols/jabber/jabber.c:1999
 msgid "Restricted XML"
 msgstr "Avgrensa XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1955
+#: ../libpurple/protocols/jabber/jabber.c:2001
 msgid "See Other Host"
 msgstr "Sjå annan vert"
 
-#: ../libpurple/protocols/jabber/jabber.c:1957
+#: ../libpurple/protocols/jabber/jabber.c:2003
 msgid "System Shutdown"
 msgstr "Systemet avsluttar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1959
+#: ../libpurple/protocols/jabber/jabber.c:2005
 msgid "Undefined Condition"
 msgstr "Uavklara tilstand"
 
-#: ../libpurple/protocols/jabber/jabber.c:1961
+#: ../libpurple/protocols/jabber/jabber.c:2007
 msgid "Unsupported Encoding"
 msgstr "Teiknkodinga er ikkje støtta"
 
-#: ../libpurple/protocols/jabber/jabber.c:1963
+#: ../libpurple/protocols/jabber/jabber.c:2009
 msgid "Unsupported Stanza Type"
-msgstr "Stanzatypen er ikkje støtta"
+msgstr "Blokktypen er ikkje støtta"
 
-#: ../libpurple/protocols/jabber/jabber.c:1965
+#: ../libpurple/protocols/jabber/jabber.c:2011
 msgid "Unsupported Version"
 msgstr "Versjonen er ikkje støtta"
 
-#: ../libpurple/protocols/jabber/jabber.c:1967
+#: ../libpurple/protocols/jabber/jabber.c:2013
 msgid "XML Not Well Formed"
 msgstr "XML-koden er ikkje velforma"
 
-#: ../libpurple/protocols/jabber/jabber.c:1969
+#: ../libpurple/protocols/jabber/jabber.c:2015
 msgid "Stream Error"
 msgstr "Feil i datastraumen"
 
-#: ../libpurple/protocols/jabber/jabber.c:2052
+#: ../libpurple/protocols/jabber/jabber.c:2100
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Klarte ikkje å utestengja brukaren (%s)"
 
-#: ../libpurple/protocols/jabber/jabber.c:2072
+#: ../libpurple/protocols/jabber/jabber.c:2120
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Ukjend tilknyting: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:2077
+#: ../libpurple/protocols/jabber/jabber.c:2125
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Klarte ikkje å knyta til brukar %s som \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:2096
+#: ../libpurple/protocols/jabber/jabber.c:2144
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Ukjend rolle: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:2101
+#: ../libpurple/protocols/jabber/jabber.c:2149
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
-msgstr "Klarte ikkje å utføra rolla \"%s\" for brukaren: %s"
+msgstr "Klarte ikkje å velja rolle \"%s\" for brukaren: %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2154
+#: ../libpurple/protocols/jabber/jabber.c:2202
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Klarte ikkje å sparka ut brukaren %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2185
-#, fuzzy, c-format
+#: ../libpurple/protocols/jabber/jabber.c:2233
+#, c-format
 msgid "Unable to ping user %s"
-msgstr "Klarte ikkje å utestengja brukaren (%s)"
+msgstr "Klarer ikkje å pinga brukaren %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2207
-#: ../libpurple/protocols/jabber/jabber.c:2217
+#: ../libpurple/protocols/jabber/jabber.c:2251
+#: ../libpurple/protocols/jabber/jabber.c:2262
 #, c-format
 msgid "Unable to buzz, because there is nothing known about user %s."
-msgstr ""
+msgstr "Klarer ikkje å alarmera sia det ikkje er noko kjent om brukaren %s."
 
-#: ../libpurple/protocols/jabber/jabber.c:2213
+#: ../libpurple/protocols/jabber/jabber.c:2257
 #, c-format
 msgid "Unable to buzz, because user %s might be offline."
-msgstr ""
+msgstr "Klarer ikkje å alarmera sia brukaren %s kan vera fråkopla."
 
-#: ../libpurple/protocols/jabber/jabber.c:2239
-#, fuzzy, c-format
+#: ../libpurple/protocols/jabber/jabber.c:2288
+#, c-format
 msgid "Unable to buzz, because the user %s does not support it."
-msgstr ""
-"Klarte ikkje å senda fila til %s fordi brukaren ikkje støttar filoverføringar"
+msgstr "Klarer ikkje å alarmera fordi brukaren %s støttar ikkje dette."
 
-#: ../libpurple/protocols/jabber/jabber.c:2253
+#. Yahoo only supports one attention command: the 'buzz'.
+#. This is index number YAHOO_BUZZ.
+#: ../libpurple/protocols/jabber/jabber.c:2308
+#: ../libpurple/protocols/yahoo/yahoo.c:4138
+msgid "Buzz"
+msgstr "Alarm"
+
+#: ../libpurple/protocols/jabber/jabber.c:2309
+#: ../libpurple/protocols/jabber/message.c:308
+#: ../libpurple/protocols/yahoo/yahoo.c:4139
+#, c-format
+msgid "%s has buzzed you!"
+msgstr "%s har alarmert deg!"
+
+#: ../libpurple/protocols/jabber/jabber.c:2309
+#: ../libpurple/protocols/yahoo/yahoo.c:4139
+#, c-format
+msgid "Buzzing %s..."
+msgstr "Alarmerer %s…"
+
+#: ../libpurple/protocols/jabber/jabber.c:2340
 msgid "config:  Configure a chat room."
 msgstr "config:  Endra prateromsinnstillingane."
 
-#: ../libpurple/protocols/jabber/jabber.c:2257
+#: ../libpurple/protocols/jabber/jabber.c:2344
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Endra prateromsinnstillingane."
 
-#: ../libpurple/protocols/jabber/jabber.c:2266
+#: ../libpurple/protocols/jabber/jabber.c:2353
 msgid "part [room]:  Leave the room."
 msgstr "part [rom]:  Forlata praterommet."
 
-#: ../libpurple/protocols/jabber/jabber.c:2271
+#: ../libpurple/protocols/jabber/jabber.c:2358
 msgid "register:  Register with a chat room."
 msgstr "register:  Registrera seg i eit praterom."
 
-#: ../libpurple/protocols/jabber/jabber.c:2277
+#: ../libpurple/protocols/jabber/jabber.c:2364
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [nytt emne]:  Visa eller endra emnet."
 
-#: ../libpurple/protocols/jabber/jabber.c:2283
+#: ../libpurple/protocols/jabber/jabber.c:2370
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;brukar&gt; [rom]:  Utesteng brukaren frå rommet."
 
-#: ../libpurple/protocols/jabber/jabber.c:2289
-msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
-msgstr ""
-"affiliate &lt;brukar&gt; &lt;owner|admin|member|outcast|none&gt;: vel kva "
-"tilknyting brukaren har til rommet."
+#: ../libpurple/protocols/jabber/jabber.c:2376
+msgid "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's affiliation with the room."
+msgstr "affiliate &lt;brukar&gt; &lt;owner|admin|member|outcast|none&gt;: vel kva tilknyting brukaren har til rommet."
 
-#: ../libpurple/protocols/jabber/jabber.c:2295
-msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
-msgstr ""
-"role &lt;brukar&gt; &lt;moderator|participant|visitor|none&gt;: vel kva "
-"rolle brukaren har i rommet."
+#: ../libpurple/protocols/jabber/jabber.c:2382
+msgid "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's role in the room."
+msgstr "role &lt;brukar&gt; &lt;moderator|participant|visitor|none&gt;: vel kva rolle brukaren har i rommet."
 
-#: ../libpurple/protocols/jabber/jabber.c:2301
+#: ../libpurple/protocols/jabber/jabber.c:2388
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;brukar&gt; [melding]:  Invitér ein brukar til rommet."
 
-#: ../libpurple/protocols/jabber/jabber.c:2307
+#: ../libpurple/protocols/jabber/jabber.c:2394
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;rom&gt; [tenar]:  Gå inn i eit praterom på denne tenaren."
 
-#: ../libpurple/protocols/jabber/jabber.c:2313
+#: ../libpurple/protocols/jabber/jabber.c:2400
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;brukar&gt; [rom]:  Spark ein brukar frå rommet."
 
-#: ../libpurple/protocols/jabber/jabber.c:2318
-msgid ""
-"msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
-msgstr ""
-"msg &lt;brukar&gt; &lt;melding&gt;:  Send ei privat melding til ein annan "
-"brukar."
+#: ../libpurple/protocols/jabber/jabber.c:2405
+msgid "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
+msgstr "msg &lt;brukar&gt; &lt;melding&gt;:  Send ei privat melding til ein annan brukar."
 
-#: ../libpurple/protocols/jabber/jabber.c:2324
+#: ../libpurple/protocols/jabber/jabber.c:2411
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
-msgstr ""
+msgstr "ping &lt;jid&gt;:\tPing ein brukar/komponent/tenar."
 
-#: ../libpurple/protocols/jabber/jabber.c:2329
-#: ../libpurple/protocols/yahoo/yahoo.c:4145
+#: ../libpurple/protocols/jabber/jabber.c:2416
+#: ../libpurple/protocols/yahoo/yahoo.c:4162
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: send ein alarm til ein brukar for å merksemda hans"
 
@@ -6111,894 +6527,1003 @@ msgstr "XMPP-protokolltillegg"
 msgstr "XMPP-protokolltillegg"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:202 ../pidgin/gtkaccount.c:506
+#: ../libpurple/protocols/jabber/libxmpp.c:205
+#: ../pidgin/gtkaccount.c:478
 msgid "Domain"
 msgstr "Domene"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:210
+#: ../libpurple/protocols/jabber/libxmpp.c:213
 msgid "Require SSL/TLS"
-msgstr ""
+msgstr "Krev SSL/TLS"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:214
+#: ../libpurple/protocols/jabber/libxmpp.c:217
 msgid "Force old (port 5223) SSL"
 msgstr "Overstyr med gammal SSL (port 5223)"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:219
+#: ../libpurple/protocols/jabber/libxmpp.c:222
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Tillat _autentisering i klartekst over ukrypterte samband"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:224
-#: ../libpurple/protocols/myspace/myspace.c:3277
-#: ../libpurple/protocols/simple/simple.c:1902
+#: ../libpurple/protocols/jabber/libxmpp.c:227
+#: ../libpurple/protocols/myspace/myspace.c:3466
+#: ../libpurple/protocols/simple/simple.c:2105
 msgid "Connect port"
 msgstr "Tilkoplingsport"
 
 #. TODO: default to automatically try different ports. Make the user be
 #. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
-#: ../libpurple/protocols/jabber/libxmpp.c:228
-#: ../libpurple/protocols/myspace/myspace.c:3274
-#: ../libpurple/protocols/silc/silc.c:1914
-#: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837
+#: ../libpurple/protocols/jabber/libxmpp.c:231
+#: ../libpurple/protocols/myspace/myspace.c:3463
+#: ../libpurple/protocols/silc/silc.c:2057
+#: ../libpurple/protocols/silc10/silc.c:1863
+#: ../pidgin/gtkaccount.c:809
 msgid "Connect server"
 msgstr "Tilkoplingstenar"
 
+#: ../libpurple/protocols/jabber/libxmpp.c:236
+msgid "File transfer proxies"
+msgstr "Mellomlager filoverføringar"
+
 #: ../libpurple/protocols/jabber/message.c:106
 #, c-format
 msgid "%s has left the conversation."
 msgstr "%s har forlate praten."
 
-#: ../libpurple/protocols/jabber/message.c:161
+#: ../libpurple/protocols/jabber/message.c:162
 #, c-format
 msgid "Message from %s"
 msgstr "Melding frå %s"
 
-#: ../libpurple/protocols/jabber/message.c:225
+#: ../libpurple/protocols/jabber/message.c:226
 #, c-format
 msgid "%s has set the topic to: %s"
-msgstr "%s har endra emnet til: %s"
+msgstr "%s har vald emnet til å vera: %s"
 
-#: ../libpurple/protocols/jabber/message.c:227
+#: ../libpurple/protocols/jabber/message.c:228
 #, c-format
 msgid "The topic is: %s"
 msgstr "Emnet er: %s"
 
-#: ../libpurple/protocols/jabber/message.c:275
+#: ../libpurple/protocols/jabber/message.c:276
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Meldinga til %s kom ikkje fram: %s"
 
-#: ../libpurple/protocols/jabber/message.c:278
+#: ../libpurple/protocols/jabber/message.c:279
 msgid "XMPP Message Error"
 msgstr "Jabber meldingsfeil"
 
-#: ../libpurple/protocols/jabber/message.c:307
-#: ../libpurple/protocols/yahoo/yahoo.c:4120
-#, fuzzy, c-format
-msgid "%s has buzzed you!"
-msgstr "%s har logga på."
-
-#: ../libpurple/protocols/jabber/message.c:407
+#: ../libpurple/protocols/jabber/message.c:408
 #, c-format
 msgid " (Code %s)"
 msgstr " (Kode %s)"
 
-#: ../libpurple/protocols/jabber/parser.c:196
+#: ../libpurple/protocols/jabber/parser.c:198
 msgid "XML Parse error"
 msgstr "Feil i XML-tolkinga"
 
-#: ../libpurple/protocols/jabber/presence.c:427
+#: ../libpurple/protocols/jabber/presence.c:441
 msgid "Unknown Error in presence"
 msgstr "Ukjend feil til stades"
 
-#: ../libpurple/protocols/jabber/presence.c:508
-#: ../libpurple/protocols/jabber/presence.c:509
+#: ../libpurple/protocols/jabber/presence.c:522
+#: ../libpurple/protocols/jabber/presence.c:523
 msgid "Create New Room"
 msgstr "Lag eit nytt rom"
 
-#: ../libpurple/protocols/jabber/presence.c:510
-msgid ""
-"You are creating a new room.  Would you like to configure it, or accept the "
-"default settings?"
-msgstr ""
-"Du er i ferd med å laga eit nytt praterom. Ønskjer du å endra innstillingane "
-"til det, eller vil nytta standardinnstillingane?"
+#: ../libpurple/protocols/jabber/presence.c:524
+msgid "You are creating a new room.  Would you like to configure it, or accept the default settings?"
+msgstr "Du er i ferd med å laga eit nytt praterom. Ønskjer du å endra innstillingane til det, eller vil nytta standardinnstillingane?"
 
-#: ../libpurple/protocols/jabber/presence.c:516
+#: ../libpurple/protocols/jabber/presence.c:530
 msgid "_Configure Room"
 msgstr "Endra rom_innstillingane"
 
-#: ../libpurple/protocols/jabber/presence.c:517
+#: ../libpurple/protocols/jabber/presence.c:531
 msgid "_Accept Defaults"
 msgstr "_Godta standardinnstillingane"
 
-#: ../libpurple/protocols/jabber/presence.c:559
+#: ../libpurple/protocols/jabber/presence.c:573
 #, c-format
 msgid "Error in chat %s"
 msgstr "Feil i praterommet %s"
 
-#: ../libpurple/protocols/jabber/presence.c:563
+#: ../libpurple/protocols/jabber/presence.c:577
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Klarte ikkje å kopla til praterommet %s"
 
-#: ../libpurple/protocols/jabber/si.c:775
+#: ../libpurple/protocols/jabber/si.c:1009
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
-msgstr ""
-"Klarte ikkje å senda fila til %s fordi brukaren ikkje støttar filoverføringar"
+msgstr "Klarte ikkje å senda fila til %s fordi brukaren ikkje støttar filoverføringar"
 
-#: ../libpurple/protocols/jabber/si.c:776
-#: ../libpurple/protocols/jabber/si.c:777
-#: ../libpurple/protocols/jabber/si.c:845
+#: ../libpurple/protocols/jabber/si.c:1010
+#: ../libpurple/protocols/jabber/si.c:1011
+#: ../libpurple/protocols/jabber/si.c:1080
 msgid "File Send Failed"
 msgstr "Filoverføringsfeil"
 
-#: ../libpurple/protocols/jabber/si.c:838
+#: ../libpurple/protocols/jabber/si.c:1073
 #, c-format
 msgid "Unable to send file to %s, invalid JID"
 msgstr "Klarte ikkje å senda fila til %s: ugyldig JID"
 
-#: ../libpurple/protocols/jabber/si.c:840
+#: ../libpurple/protocols/jabber/si.c:1075
 #, c-format
 msgid "Unable to send file to %s, user is not online"
 msgstr "Klarte ikkje å senda fila til %s: brukaren er ikkje tilkopla"
 
-#: ../libpurple/protocols/jabber/si.c:842
+#: ../libpurple/protocols/jabber/si.c:1077
 #, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
 msgstr "Klarte ikkje å senda fila til %s. Abonnerer ikkje på brukarnærvær"
 
-#: ../libpurple/protocols/jabber/si.c:857
+#: ../libpurple/protocols/jabber/si.c:1092
 #, c-format
-msgid "Please select which resource of %s you would like to send a file to"
+msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "Vel kva for ressurs av %s du ønskjer å senda fila til"
 
-#: ../libpurple/protocols/jabber/si.c:873
+#: ../libpurple/protocols/jabber/si.c:1108
 msgid "Select a Resource"
 msgstr "Vel ein ressurs"
 
-#: ../libpurple/protocols/jabber/usermood.c:179
-#: ../libpurple/protocols/jabber/usermood.c:180
-#, fuzzy
+#: ../libpurple/protocols/jabber/usermood.c:197
+#: ../libpurple/protocols/jabber/usermood.c:198
 msgid "Edit User Mood"
-msgstr "Brukartilstandar"
+msgstr "Endra brukarsinnsstemning"
 
-#: ../libpurple/protocols/jabber/usermood.c:181
+#: ../libpurple/protocols/jabber/usermood.c:199
 msgid "Please select your mood from the list."
-msgstr ""
+msgstr "Vel sinnsstemninga di frå lista."
 
-#: ../libpurple/protocols/jabber/usermood.c:183
+#: ../libpurple/protocols/jabber/usermood.c:201
 #: ../libpurple/protocols/jabber/usernick.c:78
-#, fuzzy
 msgid "Set"
-msgstr "_Skriv inn"
+msgstr "Vel"
 
-#: ../libpurple/protocols/jabber/usermood.c:191
-#, fuzzy
+#: ../libpurple/protocols/jabber/usermood.c:209
 msgid "Set Mood..."
-msgstr "Send lynmelding…"
+msgstr "Vel sinnsstemning…"
 
 #: ../libpurple/protocols/jabber/usernick.c:76
-#, fuzzy
 msgid "Set User Nickname"
-msgstr "Vel brukargrense"
+msgstr "Vel brukarnamn"
 
 #: ../libpurple/protocols/jabber/usernick.c:76
-#, fuzzy
 msgid "Please specify a new nickname for you."
-msgstr "Skriv inn det nye namnet til %s"
+msgstr "Skriv inn det nye kallenamnet ditt."
 
 #: ../libpurple/protocols/jabber/usernick.c:77
-msgid ""
-"This information is visible to all contacts on your contact list, so choose "
-"something appropriate."
-msgstr ""
+msgid "This information is visible to all contacts on your contact list, so choose something appropriate."
+msgstr "Alle på kontaktlista di vil kunna sjå desse opplysningane, så vel noko høveleg."
 
-#: ../libpurple/protocols/jabber/usernick.c:99
-#, fuzzy
+#: ../libpurple/protocols/jabber/usernick.c:100
 msgid "Set Nickname..."
-msgstr "Kallenamn"
+msgstr "Vel kallenamn…"
 
 #: ../libpurple/protocols/jabber/xdata.c:378
-#, fuzzy
 msgid "Actions"
-msgstr "Handling"
+msgstr "Handlingar"
 
 #: ../libpurple/protocols/jabber/xdata.c:380
-#, fuzzy
 msgid "Select an action"
-msgstr "Vel ei fil"
+msgstr "Vel ei handling"
 
-#: ../libpurple/protocols/msn/dialog.c:110
+#: ../libpurple/protocols/msn/contact.c:712
+msgid "Unable to retrieve MSN Address Book"
+msgstr "Klarer ikkje å hente MSN-adresseboka"
+
+#: ../libpurple/protocols/msn/dialog.c:118
+#: ../libpurple/protocols/msnp9/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "Problem med synkroniseringa av vennelista i %s (%s)"
 
-#: ../libpurple/protocols/msn/dialog.c:116
+#: ../libpurple/protocols/msn/dialog.c:124
+#: ../libpurple/protocols/msnp9/dialog.c:116
 #, c-format
-msgid ""
-"%s on the local list is inside the group \"%s\" but not on the server list. "
-"Do you want this buddy to be added?"
-msgstr ""
-"%s på den lokale lista er med i gruppa \"%s\", men ikkje på tenarlista. "
-"Ønskjer du å leggja ho/han til?"
+msgid "%s on the local list is inside the group \"%s\" but not on the server list. Do you want this buddy to be added?"
+msgstr "%s på den lokale lista er med i gruppa \"%s\", men ikkje på tenarlista. Ønskjer du å leggja ho/han til?"
 
-#: ../libpurple/protocols/msn/dialog.c:124
+#: ../libpurple/protocols/msn/dialog.c:132
+#: ../libpurple/protocols/msnp9/dialog.c:124
 #, c-format
-msgid ""
-"%s is on the local list but not on the server list. Do you want this buddy "
-"to be added?"
-msgstr ""
-"%s er i den lokale lista, men ikkje på tenarlista. Ønskjer du å leggja ho/"
-"han til?"
+msgid "%s is on the local list but not on the server list. Do you want this buddy to be added?"
+msgstr "%s er i den lokale lista, men ikkje på tenarlista. Ønskjer du å leggja ho/han til?"
 
 #: ../libpurple/protocols/msn/error.c:36
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:36
 msgid "Unable to parse message"
 msgstr "Klarte ikkje å tyda meldinga"
 
 #: ../libpurple/protocols/msn/error.c:41
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:41
 msgid "Syntax Error (probably a client bug)"
 msgstr "Syntaksfeil (truleg feil i klienten)"
 
 #: ../libpurple/protocols/msn/error.c:46
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:46
 msgid "Invalid e-mail address"
 msgstr "Ugyldig e-postadresse"
 
 #: ../libpurple/protocols/msn/error.c:49
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:49
 msgid "User does not exist"
 msgstr "Brukaren finst ikkje"
 
 #: ../libpurple/protocols/msn/error.c:53
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:53
 msgid "Fully qualified domain name missing"
 msgstr "Manglar fullstendig domenenamn"
 
 #: ../libpurple/protocols/msn/error.c:56
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:56
 msgid "Already logged in"
 msgstr "Allereie logga inn"
 
 #: ../libpurple/protocols/msn/error.c:59
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:59
 msgid "Invalid screen name"
 msgstr "Ugyldig brukarnamn"
 
 #: ../libpurple/protocols/msn/error.c:62
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:62
 msgid "Invalid friendly name"
 msgstr "Ugyldig visingsnamn"
 
 #: ../libpurple/protocols/msn/error.c:65
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:65
 msgid "List full"
 msgstr "Lista er full"
 
 #: ../libpurple/protocols/msn/error.c:68
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:68
 msgid "Already there"
 msgstr "Allereie der"
 
 #: ../libpurple/protocols/msn/error.c:72
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:72
 msgid "Not on list"
 msgstr "Ikkje på lista"
 
 #: ../libpurple/protocols/msn/error.c:75
-#: ../libpurple/protocols/zephyr/zephyr.c:756
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:75
+#: ../libpurple/protocols/zephyr/zephyr.c:760
 msgid "User is offline"
 msgstr "Brukaren er fråkopla"
 
 #: ../libpurple/protocols/msn/error.c:78
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:78
 msgid "Already in the mode"
 msgstr "Allereie i den tilstanden"
 
 #: ../libpurple/protocols/msn/error.c:82
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:82
 msgid "Already in opposite list"
 msgstr "Allereie i motsett liste"
 
 #: ../libpurple/protocols/msn/error.c:86
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:86
 msgid "Too many groups"
 msgstr "For mange grupper"
 
 #: ../libpurple/protocols/msn/error.c:89
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:89
 msgid "Invalid group"
 msgstr "Ugyldig gruppe"
 
 #: ../libpurple/protocols/msn/error.c:92
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:92
 msgid "User not in group"
 msgstr "Brukaren er ikkje med i gruppa"
 
 #: ../libpurple/protocols/msn/error.c:95
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:95
 msgid "Group name too long"
 msgstr "Gruppenamnet er for langt"
 
 #: ../libpurple/protocols/msn/error.c:98
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:98
 msgid "Cannot remove group zero"
 msgstr "Kan ikkje fjerna gruppe null"
 
 #: ../libpurple/protocols/msn/error.c:103
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:103
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Prøvde å leggja ein kontakt til ei gruppe som ikkje finst"
 
 #: ../libpurple/protocols/msn/error.c:107
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:107
 msgid "Switchboard failed"
 msgstr "Sentralbordet feila"
 
 #: ../libpurple/protocols/msn/error.c:111
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:111
 msgid "Notify transfer failed"
 msgstr "Varselsoverføringa feila"
 
 #: ../libpurple/protocols/msn/error.c:116
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:116
 msgid "Required fields missing"
 msgstr "Manglar påkravde felt"
 
 #: ../libpurple/protocols/msn/error.c:120
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:120
 msgid "Too many hits to a FND"
 msgstr "Alt for mange treff på ein FND"
 
 #: ../libpurple/protocols/msn/error.c:124
-#: ../libpurple/protocols/oscar/oscar.c:120
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:124
+#: ../libpurple/protocols/oscar/oscar.c:121
 msgid "Not logged in"
 msgstr "Ikkje innlogga"
 
 #: ../libpurple/protocols/msn/error.c:128
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:128
 msgid "Service temporarily unavailable"
 msgstr "Tenesta er mellombels utilgjengeleg"
 
 #: ../libpurple/protocols/msn/error.c:131
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:131
 msgid "Database server error"
 msgstr "Databasetenarfeil"
 
 #: ../libpurple/protocols/msn/error.c:135
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:135
 msgid "Command disabled"
 msgstr "Kommandoen er ikkje i bruk"
 
 #: ../libpurple/protocols/msn/error.c:139
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:139
 msgid "File operation error"
 msgstr "Filhandteringsfeil"
 
 #: ../libpurple/protocols/msn/error.c:143
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:143
 msgid "Memory allocation error"
 msgstr "Minnetildelingsfeil"
 
 #: ../libpurple/protocols/msn/error.c:147
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:147
 msgid "Wrong CHL value sent to server"
 msgstr "Feil CHL-verdi sende til tenaren"
 
 #: ../libpurple/protocols/msn/error.c:152
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:152
 msgid "Server busy"
 msgstr "Tenaren er oppteken"
 
 #: ../libpurple/protocols/msn/error.c:155
 #: ../libpurple/protocols/msn/error.c:170
 #: ../libpurple/protocols/msn/error.c:230
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:155
+#: ../libpurple/protocols/msnp9/error.c:170
+#: ../libpurple/protocols/msnp9/error.c:230
 msgid "Server unavailable"
 msgstr "Tenaren er utilgjengeleg"
 
 #: ../libpurple/protocols/msn/error.c:158
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:158
 msgid "Peer notification server down"
 msgstr "Varslingstenaren er nede"
 
 #: ../libpurple/protocols/msn/error.c:162
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:162
 msgid "Database connect error"
 msgstr "Tilkoplinga til databasen feila"
 
 #: ../libpurple/protocols/msn/error.c:167
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:167
 msgid "Server is going down (abandon ship)"
 msgstr "Tenaren er på veg ned (forlat skipet)"
 
 #: ../libpurple/protocols/msn/error.c:174
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:174
 msgid "Error creating connection"
 msgstr "Tilkoplingsfeil"
 
 #: ../libpurple/protocols/msn/error.c:179
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:179
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR-parametrane er anten ukjende eller ikkje tilletne"
 
 #: ../libpurple/protocols/msn/error.c:183
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:183
 msgid "Unable to write"
 msgstr "Klarte ikkje å skriva"
 
 #: ../libpurple/protocols/msn/error.c:186
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:186
 msgid "Session overload"
 msgstr "Øktoverbelastning"
 
 #: ../libpurple/protocols/msn/error.c:190
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:190
 msgid "User is too active"
 msgstr "Brukaren er for aktiv"
 
 #: ../libpurple/protocols/msn/error.c:193
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:193
 msgid "Too many sessions"
 msgstr "For mange økter"
 
 #: ../libpurple/protocols/msn/error.c:196
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:196
 msgid "Passport not verified"
 msgstr "Passport-kontoen er ikkje stadfesta"
 
 #: ../libpurple/protocols/msn/error.c:199
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:199
 msgid "Bad friend file"
 msgstr "Ugyldig vennefil"
 
 #: ../libpurple/protocols/msn/error.c:203
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:203
 msgid "Not expected"
 msgstr "Uventa"
 
 #: ../libpurple/protocols/msn/error.c:209
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:209
 msgid "Friendly name changes too rapidly"
 msgstr "Endrar visingsnamnet for ofte"
 
 #: ../libpurple/protocols/msn/error.c:218
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:218
 msgid "Server too busy"
 msgstr "Tenaren er for oppteken"
 
 #: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1380
-#: ../libpurple/protocols/silc/silc.c:233
-#: ../libpurple/protocols/silc10/ops.c:1709
-#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1380
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:222
+#: ../libpurple/protocols/oscar/oscar.c:1418
+#: ../libpurple/protocols/silc/silc.c:338
+#: ../libpurple/protocols/silc10/ops.c:1713
+#: ../libpurple/protocols/toc/toc.c:728
+#: ../libpurple/proxy.c:1399
 msgid "Authentication failed"
 msgstr "Autentiseringa feila"
 
 #: ../libpurple/protocols/msn/error.c:225
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:225
 msgid "Not allowed when offline"
 msgstr "Ikkje tillate når du er fråkopla"
 
 #: ../libpurple/protocols/msn/error.c:233
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:233
 msgid "Not accepting new users"
 msgstr "Tek ikkje i mot nye brukarar"
 
 #: ../libpurple/protocols/msn/error.c:237
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:237
 msgid "Kids Passport without parental consent"
 msgstr "Passport for barn utan foreldregodkjennig"
 
 #: ../libpurple/protocols/msn/error.c:241
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:241
 msgid "Passport account not yet verified"
 msgstr "Passport-kontoen er enno ikkje stadfesta"
 
 #: ../libpurple/protocols/msn/error.c:244
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:244
 msgid "Bad ticket"
 msgstr "Ugyldig autentiseringsmelding"
 
 #: ../libpurple/protocols/msn/error.c:249
+#: ../libpurple/protocols/msnp9/error.c:249
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "Feilkoden %d er ukjend"
 
 #: ../libpurple/protocols/msn/error.c:263
+#: ../libpurple/protocols/msnp9/error.c:263
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "MSN-feil: %s\n"
 
-#: ../libpurple/protocols/msn/msn.c:130
-#, fuzzy
+#: ../libpurple/protocols/msn/msn.c:128
+#: ../libpurple/protocols/msnp9/msn.c:129
 msgid "Nudge"
-msgstr "dytt"
+msgstr "Dytt"
 
-#: ../libpurple/protocols/msn/msn.c:131
-#, fuzzy, c-format
+#: ../libpurple/protocols/msn/msn.c:129
+#: ../libpurple/protocols/msnp9/msn.c:130
+#, c-format
 msgid "%s has nudged you!"
-msgstr "%s har logga på."
+msgstr "%s har gjeve deg ein dytt!"
 
-#: ../libpurple/protocols/msn/msn.c:132
-#, fuzzy, c-format
+#: ../libpurple/protocols/msn/msn.c:129
+#: ../libpurple/protocols/msnp9/msn.c:130
+#, c-format
 msgid "Nudging %s..."
-msgstr "Dyttar"
+msgstr "Dyttar %s…"
 
-#: ../libpurple/protocols/msn/msn.c:174
+#: ../libpurple/protocols/msn/msn.c:170
+#: ../libpurple/protocols/msnp9/msn.c:171
 msgid "Your new MSN friendly name is too long."
 msgstr "Det nye MSN-visingsnamnet ditt er for langt."
 
 #: ../libpurple/protocols/msn/msn.c:282
+#: ../libpurple/protocols/msnp9/msn.c:279
 msgid "Set your friendly name."
-msgstr "Skriv inn visingsnamnet ditt."
+msgstr "Vel visingsnamn."
 
 #: ../libpurple/protocols/msn/msn.c:283
+#: ../libpurple/protocols/msnp9/msn.c:280
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Dette er namnet som vil synast hos andre MSN-vennar."
 
 #: ../libpurple/protocols/msn/msn.c:301
+#: ../libpurple/protocols/msnp9/msn.c:298
 msgid "Set your home phone number."
 msgstr "Skriv inn heimetelefonnummeret ditt."
 
 #: ../libpurple/protocols/msn/msn.c:318
+#: ../libpurple/protocols/msnp9/msn.c:315
 msgid "Set your work phone number."
 msgstr "Skriv inn arbeidstelefonnummeret ditt."
 
 #: ../libpurple/protocols/msn/msn.c:335
+#: ../libpurple/protocols/msnp9/msn.c:332
 msgid "Set your mobile phone number."
 msgstr "Skriv inn mobiltelefonnummeret ditt."
 
 #: ../libpurple/protocols/msn/msn.c:350
+#: ../libpurple/protocols/msnp9/msn.c:347
 msgid "Allow MSN Mobile pages?"
 msgstr "Tillèt du MSN Mobile-sider?"
 
 #: ../libpurple/protocols/msn/msn.c:351
-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 ""
-"Vil du tillata eller nekta personar i vennelista di å senda deg MSN Mobile-"
-"sider til mobiltelefonen din eller annan mobileining?"
+#: ../libpurple/protocols/msnp9/msn.c:348
+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 "Vil du tillata eller nekta personar i vennelista di å senda deg MSN Mobile-sider til mobiltelefonen din eller annan mobileining?"
 
 #: ../libpurple/protocols/msn/msn.c:357
+#: ../libpurple/protocols/msnp9/msn.c:354
 msgid "Allow"
 msgstr "Tillat"
 
 #: ../libpurple/protocols/msn/msn.c:358
+#: ../libpurple/protocols/msnp9/msn.c:355
 msgid "Disallow"
 msgstr "Nekt"
 
 #: ../libpurple/protocols/msn/msn.c:374
+#: ../libpurple/protocols/msnp9/msn.c:371
 msgid "This Hotmail account may not be active."
 msgstr "Denne Hotmail-kontoen er kanskje ikkje i bruk."
 
 #: ../libpurple/protocols/msn/msn.c:400
+#: ../libpurple/protocols/msnp9/msn.c:397
 msgid "Send a mobile message."
 msgstr "Send ei mobilmelding."
 
 #: ../libpurple/protocols/msn/msn.c:402
+#: ../libpurple/protocols/msnp9/msn.c:399
 msgid "Page"
 msgstr "Side"
 
-#: ../libpurple/protocols/msn/msn.c:549
-msgid "Has you"
-msgstr "Har deg"
+#: ../libpurple/protocols/msn/msn.c:665
+#: ../libpurple/protocols/msnp9/msn.c:567
+msgid "Home Phone Number"
+msgstr "Telefon heime"
 
-#: ../libpurple/protocols/msn/msn.c:579 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:3077
-#: ../libpurple/protocols/yahoo/yahoo.c:3761
+#: ../libpurple/protocols/msn/msn.c:669
+#: ../libpurple/protocols/msnp9/msn.c:571
+msgid "Work Phone Number"
+msgstr "Telefon arbeid"
+
+#: ../libpurple/protocols/msn/msn.c:673
+#: ../libpurple/protocols/msnp9/msn.c:575
+msgid "Mobile Phone Number"
+msgstr "Mobiltelefon"
+
+#: ../libpurple/protocols/msn/msn.c:696
+#: ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/msnp9/msn.c:594
+#: ../libpurple/protocols/msnp9/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:3114
+#: ../libpurple/protocols/yahoo/yahoo.c:3798
 msgid "Be Right Back"
 msgstr "Kjem straks tilbake"
 
-#: ../libpurple/protocols/msn/msn.c:583 ../libpurple/protocols/msn/state.c:31
-#: ../libpurple/protocols/novell/novell.c:2822
-#: ../libpurple/protocols/novell/novell.c:2952
-#: ../libpurple/protocols/silc/buddy.c:1480
+#: ../libpurple/protocols/msn/msn.c:702
+#: ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/msnp9/msn.c:598
+#: ../libpurple/protocols/msnp9/state.c:31
+#: ../libpurple/protocols/novell/novell.c:2840
+#: ../libpurple/protocols/novell/novell.c:2970
+#: ../libpurple/protocols/silc/buddy.c:1483
 #: ../libpurple/protocols/silc/silc.c:56
-#: ../libpurple/protocols/silc10/buddy.c:1480
+#: ../libpurple/protocols/silc10/buddy.c:1483
 #: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:3079
-#: ../libpurple/protocols/yahoo/yahoo.c:3764
+#: ../libpurple/protocols/yahoo/yahoo.c:3116
+#: ../libpurple/protocols/yahoo/yahoo.c:3801
 msgid "Busy"
 msgstr "Oppteken"
 
-#: ../libpurple/protocols/msn/msn.c:587
-#: ../libpurple/protocols/yahoo/yahoo.c:3087
-#: ../libpurple/protocols/yahoo/yahoo.c:3776
+#: ../libpurple/protocols/msn/msn.c:707
+#: ../libpurple/protocols/msnp9/msn.c:602
+#: ../libpurple/protocols/yahoo/yahoo.c:3124
+#: ../libpurple/protocols/yahoo/yahoo.c:3813
 msgid "On the Phone"
 msgstr "Taler i  telefonen"
 
-#: ../libpurple/protocols/msn/msn.c:591
-#: ../libpurple/protocols/yahoo/yahoo.c:3091
-#: ../libpurple/protocols/yahoo/yahoo.c:3782
+#: ../libpurple/protocols/msn/msn.c:712
+#: ../libpurple/protocols/msnp9/msn.c:606
+#: ../libpurple/protocols/yahoo/yahoo.c:3128
+#: ../libpurple/protocols/yahoo/yahoo.c:3819
 msgid "Out to Lunch"
 msgstr "Er ute til lunsj"
 
-#: ../libpurple/protocols/msn/msn.c:619
+#. primitive
+#. ID
+#. name - use default
+#. savable
+#. should be user_settable some day
+#. independent
+#: ../libpurple/protocols/msn/msn.c:731
+#: ../libpurple/protocols/myspace/myspace.c:170
+msgid "Artist"
+msgstr "Kunstnar"
+
+#: ../libpurple/protocols/msn/msn.c:732
+msgid "Album"
+msgstr "Album"
+
+#: ../libpurple/protocols/msn/msn.c:750
+#: ../libpurple/protocols/msnp9/msn.c:634
 msgid "Set Friendly Name..."
-msgstr "Skriv inn visingsnamn…"
+msgstr "Vel visingsnamn…"
 
-#: ../libpurple/protocols/msn/msn.c:624
+#: ../libpurple/protocols/msn/msn.c:755
+#: ../libpurple/protocols/msnp9/msn.c:639
 msgid "Set Home Phone Number..."
 msgstr "Skriv inn heimetelefonnummer…"
 
-#: ../libpurple/protocols/msn/msn.c:628
+#: ../libpurple/protocols/msn/msn.c:759
+#: ../libpurple/protocols/msnp9/msn.c:643
 msgid "Set Work Phone Number..."
 msgstr "Skriv inn jobbtelefonnummer…"
 
-#: ../libpurple/protocols/msn/msn.c:632
+#: ../libpurple/protocols/msn/msn.c:763
+#: ../libpurple/protocols/msnp9/msn.c:647
 msgid "Set Mobile Phone Number..."
 msgstr "Skriv inn mobiltelefonnummer…"
 
-#: ../libpurple/protocols/msn/msn.c:638
+#: ../libpurple/protocols/msn/msn.c:769
+#: ../libpurple/protocols/msnp9/msn.c:653
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Ta i bruk/ta vekk mobile einingar…"
 
-#: ../libpurple/protocols/msn/msn.c:643
+#: ../libpurple/protocols/msn/msn.c:774
+#: ../libpurple/protocols/msnp9/msn.c:658
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Tillat/avslå mobilsider…"
 
-#: ../libpurple/protocols/msn/msn.c:654
+#: ../libpurple/protocols/msn/msn.c:785
+#: ../libpurple/protocols/msnp9/msn.c:669
 msgid "Open Hotmail Inbox"
 msgstr "Opna Hotmail-innkorga"
 
-#: ../libpurple/protocols/msn/msn.c:678
+#: ../libpurple/protocols/msn/msn.c:809
+#: ../libpurple/protocols/msnp9/msn.c:693
 msgid "Send to Mobile"
 msgstr "Send til mobil"
 
-#: ../libpurple/protocols/msn/msn.c:688
-#: ../libpurple/protocols/novell/novell.c:3408
+#: ../libpurple/protocols/msn/msn.c:819
+#: ../libpurple/protocols/msnp9/msn.c:703
+#: ../libpurple/protocols/novell/novell.c:3426
 msgid "Initiate _Chat"
 msgstr "Start ein _prat"
 
-#: ../libpurple/protocols/msn/msn.c:726
+#: ../libpurple/protocols/msn/msn.c:857
+#: ../libpurple/protocols/msnp9/msn.c:742
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSN krev bruk av SSL. Last ned eit støtta SSL-bibliotek. "
 
-#: ../libpurple/protocols/msn/msn.c:754
+#: ../libpurple/protocols/msn/msn.c:887
+#: ../libpurple/protocols/msnp9/msn.c:772
 msgid "Failed to connect to server."
 msgstr "Klarte ikkje å kopla til tenaren."
 
-#: ../libpurple/protocols/msn/msn.c:1510 ../libpurple/protocols/msn/msn.c:1858
+#: ../libpurple/protocols/msn/msn.c:1671
+#: ../libpurple/protocols/msn/msn.c:2014
+#: ../libpurple/protocols/msnp9/msn.c:1527
+#: ../libpurple/protocols/msnp9/msn.c:1870
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "Klarte ikkje å henta profilen"
 
-#: ../libpurple/protocols/msn/msn.c:1581 ../pidgin/plugins/convcolors.c:309
-#: ../pidgin/plugins/pidginrc.c:366
+#: ../libpurple/protocols/msn/msn.c:1737
+#: ../libpurple/protocols/msnp9/msn.c:1593
+#: ../pidgin/plugins/convcolors.c:371
+#: ../pidgin/plugins/pidginrc.c:372
 msgid "General"
 msgstr "Generelt"
 
-#: ../libpurple/protocols/msn/msn.c:1588
-#: ../libpurple/protocols/myspace/user.c:110
-#: ../libpurple/protocols/oscar/oscar.c:3755
+#: ../libpurple/protocols/msn/msn.c:1744
+#: ../libpurple/protocols/msnp9/msn.c:1600
+#: ../libpurple/protocols/myspace/user.c:125
+#: ../libpurple/protocols/oscar/oscar.c:3788
 #: ../libpurple/protocols/qq/buddy_info.c:45
-#: ../libpurple/protocols/qq/qq.c:221
+#: ../libpurple/protocols/qq/qq.c:222
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
 msgid "Age"
 msgstr "Alder"
 
-#: ../libpurple/protocols/msn/msn.c:1590
+#: ../libpurple/protocols/msn/msn.c:1746
+#: ../libpurple/protocols/msnp9/msn.c:1602
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
 msgid "Occupation"
 msgstr "Yrke"
 
-#: ../libpurple/protocols/msn/msn.c:1591
-#: ../libpurple/protocols/myspace/user.c:119
-#: ../libpurple/protocols/novell/novell.c:1478
+#: ../libpurple/protocols/msn/msn.c:1747
+#: ../libpurple/protocols/msnp9/msn.c:1603
+#: ../libpurple/protocols/myspace/user.c:133
+#: ../libpurple/protocols/novell/novell.c:1487
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
-#: ../libpurple/protocols/zephyr/zephyr.c:798
-#: ../libpurple/protocols/zephyr/zephyr.c:1215
+#: ../libpurple/protocols/zephyr/zephyr.c:802
+#: ../libpurple/protocols/zephyr/zephyr.c:1175
 msgid "Location"
 msgstr "Stad"
 
-#: ../libpurple/protocols/msn/msn.c:1596 ../libpurple/protocols/msn/msn.c:1788
-#: ../libpurple/protocols/msn/msn.c:1794 ../libpurple/protocols/msn/msn.c:1801
+#: ../libpurple/protocols/msn/msn.c:1752
+#: ../libpurple/protocols/msn/msn.c:1944
+#: ../libpurple/protocols/msn/msn.c:1950
+#: ../libpurple/protocols/msn/msn.c:1957
+#: ../libpurple/protocols/msnp9/msn.c:1608
+#: ../libpurple/protocols/msnp9/msn.c:1800
+#: ../libpurple/protocols/msnp9/msn.c:1806
+#: ../libpurple/protocols/msnp9/msn.c:1813
 msgid "Hobbies and Interests"
 msgstr "Fritidssysler og interesser"
 
-#: ../libpurple/protocols/msn/msn.c:1602 ../libpurple/protocols/msn/msn.c:1722
-#: ../libpurple/protocols/msn/msn.c:1728 ../libpurple/protocols/msn/msn.c:1735
-#: ../libpurple/protocols/msn/msn.c:1743 ../libpurple/protocols/msn/msn.c:1750
+#: ../libpurple/protocols/msn/msn.c:1758
+#: ../libpurple/protocols/msn/msn.c:1878
+#: ../libpurple/protocols/msn/msn.c:1884
+#: ../libpurple/protocols/msn/msn.c:1891
+#: ../libpurple/protocols/msn/msn.c:1899
+#: ../libpurple/protocols/msn/msn.c:1906
+#: ../libpurple/protocols/msnp9/msn.c:1614
+#: ../libpurple/protocols/msnp9/msn.c:1734
+#: ../libpurple/protocols/msnp9/msn.c:1740
+#: ../libpurple/protocols/msnp9/msn.c:1747
+#: ../libpurple/protocols/msnp9/msn.c:1755
+#: ../libpurple/protocols/msnp9/msn.c:1762
 msgid "A Little About Me"
 msgstr "Litt om meg sjølv"
 
-#: ../libpurple/protocols/msn/msn.c:1619
+#: ../libpurple/protocols/msn/msn.c:1775
+#: ../libpurple/protocols/msnp9/msn.c:1631
 msgid "Social"
 msgstr "Sosial"
 
-#: ../libpurple/protocols/msn/msn.c:1621
+#: ../libpurple/protocols/msn/msn.c:1777
+#: ../libpurple/protocols/msnp9/msn.c:1633
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
 msgid "Marital Status"
 msgstr "Sivilstand"
 
-#: ../libpurple/protocols/msn/msn.c:1622
+#: ../libpurple/protocols/msn/msn.c:1778
+#: ../libpurple/protocols/msnp9/msn.c:1634
 msgid "Interests"
 msgstr "Interesser"
 
-#: ../libpurple/protocols/msn/msn.c:1623
+#: ../libpurple/protocols/msn/msn.c:1779
+#: ../libpurple/protocols/msnp9/msn.c:1635
 msgid "Pets"
 msgstr "Kjæledyr"
 
-#: ../libpurple/protocols/msn/msn.c:1624
+#: ../libpurple/protocols/msn/msn.c:1780
+#: ../libpurple/protocols/msnp9/msn.c:1636
 msgid "Hometown"
 msgstr "Heimstad/by"
 
-#: ../libpurple/protocols/msn/msn.c:1625
+#: ../libpurple/protocols/msn/msn.c:1781
+#: ../libpurple/protocols/msnp9/msn.c:1637
 msgid "Places Lived"
 msgstr "Tidlegare bustader"
 
-#: ../libpurple/protocols/msn/msn.c:1626
+#: ../libpurple/protocols/msn/msn.c:1782
+#: ../libpurple/protocols/msnp9/msn.c:1638
 msgid "Fashion"
 msgstr "Mote"
 
-#: ../libpurple/protocols/msn/msn.c:1627
+#: ../libpurple/protocols/msn/msn.c:1783
+#: ../libpurple/protocols/msnp9/msn.c:1639
 msgid "Humor"
 msgstr "Humor"
 
-#: ../libpurple/protocols/msn/msn.c:1628
+#: ../libpurple/protocols/msn/msn.c:1784
+#: ../libpurple/protocols/msnp9/msn.c:1640
 msgid "Music"
 msgstr "Musikk"
 
-#: ../libpurple/protocols/msn/msn.c:1629 ../libpurple/protocols/msn/msn.c:1810
-#: ../libpurple/protocols/msn/msn.c:1816
+#: ../libpurple/protocols/msn/msn.c:1785
+#: ../libpurple/protocols/msn/msn.c:1966
+#: ../libpurple/protocols/msn/msn.c:1972
+#: ../libpurple/protocols/msnp9/msn.c:1641
+#: ../libpurple/protocols/msnp9/msn.c:1822
+#: ../libpurple/protocols/msnp9/msn.c:1828
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Favorite Quote"
 msgstr "Favorittsitat"
 
-#: ../libpurple/protocols/msn/msn.c:1646
+#: ../libpurple/protocols/msn/msn.c:1802
+#: ../libpurple/protocols/msnp9/msn.c:1658
 msgid "Contact Info"
 msgstr "Kontaktinfo"
 
-#: ../libpurple/protocols/msn/msn.c:1647
+#: ../libpurple/protocols/msn/msn.c:1803
+#: ../libpurple/protocols/msnp9/msn.c:1659
 msgid "Personal"
 msgstr "Personleg"
 
-#: ../libpurple/protocols/msn/msn.c:1650
+#: ../libpurple/protocols/msn/msn.c:1806
+#: ../libpurple/protocols/msnp9/msn.c:1662
 msgid "Significant Other"
 msgstr "Annan viktig"
 
-#: ../libpurple/protocols/msn/msn.c:1651
+#: ../libpurple/protocols/msn/msn.c:1807
+#: ../libpurple/protocols/msnp9/msn.c:1663
 msgid "Home Phone"
 msgstr "Heimetelefon"
 
-#: ../libpurple/protocols/msn/msn.c:1652
+#: ../libpurple/protocols/msn/msn.c:1808
+#: ../libpurple/protocols/msnp9/msn.c:1664
 msgid "Home Phone 2"
 msgstr "Heimetelefon 2"
 
-#: ../libpurple/protocols/msn/msn.c:1653
-#: ../libpurple/protocols/oscar/oscar.c:3793
+#: ../libpurple/protocols/msn/msn.c:1809
+#: ../libpurple/protocols/msnp9/msn.c:1665
+#: ../libpurple/protocols/oscar/oscar.c:3826
 msgid "Home Address"
 msgstr "Heimeadresse"
 
-#: ../libpurple/protocols/msn/msn.c:1654
+#: ../libpurple/protocols/msn/msn.c:1810
+#: ../libpurple/protocols/msnp9/msn.c:1666
 msgid "Personal Mobile"
 msgstr "Personleg mobil"
 
-#: ../libpurple/protocols/msn/msn.c:1655
+#: ../libpurple/protocols/msn/msn.c:1811
+#: ../libpurple/protocols/msnp9/msn.c:1667
 msgid "Home Fax"
 msgstr "Heimefaks"
 
-#: ../libpurple/protocols/msn/msn.c:1656
+#: ../libpurple/protocols/msn/msn.c:1812
+#: ../libpurple/protocols/msnp9/msn.c:1668
 msgid "Personal E-Mail"
 msgstr "Personleg e-postadresse"
 
-#: ../libpurple/protocols/msn/msn.c:1657
+#: ../libpurple/protocols/msn/msn.c:1813
+#: ../libpurple/protocols/msnp9/msn.c:1669
 msgid "Personal IM"
 msgstr "Personleg pratenett"
 
-#: ../libpurple/protocols/msn/msn.c:1659
+#: ../libpurple/protocols/msn/msn.c:1815
+#: ../libpurple/protocols/msnp9/msn.c:1671
 msgid "Anniversary"
 msgstr "Jubileum"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1675
+#: ../libpurple/protocols/msn/msn.c:1831
+#: ../libpurple/protocols/msnp9/msn.c:1687
 msgid "Work"
 msgstr "Arbeid"
 
-#: ../libpurple/protocols/msn/msn.c:1677
+#: ../libpurple/protocols/msn/msn.c:1833
+#: ../libpurple/protocols/msnp9/msn.c:1689
 #: ../libpurple/protocols/silc/ops.c:1010
 #: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "Jobbtittel"
 
-#: ../libpurple/protocols/msn/msn.c:1678
-#: ../libpurple/protocols/oscar/oscar.c:3814
+#: ../libpurple/protocols/msn/msn.c:1834
+#: ../libpurple/protocols/msnp9/msn.c:1690
+#: ../libpurple/protocols/oscar/oscar.c:3847
 msgid "Company"
 msgstr "Firma"
 
-#: ../libpurple/protocols/msn/msn.c:1679
-#: ../libpurple/protocols/novell/novell.c:1480
+#: ../libpurple/protocols/msn/msn.c:1835
+#: ../libpurple/protocols/msnp9/msn.c:1691
+#: ../libpurple/protocols/novell/novell.c:1489
 msgid "Department"
 msgstr "Avdeling"
 
-#: ../libpurple/protocols/msn/msn.c:1680
+#: ../libpurple/protocols/msn/msn.c:1836
+#: ../libpurple/protocols/msnp9/msn.c:1692
 msgid "Profession"
 msgstr "Yrke"
 
-#: ../libpurple/protocols/msn/msn.c:1681
+#: ../libpurple/protocols/msn/msn.c:1837
+#: ../libpurple/protocols/msnp9/msn.c:1693
 msgid "Work Phone"
 msgstr "Arbeidstelefon"
 
-#: ../libpurple/protocols/msn/msn.c:1682
+#: ../libpurple/protocols/msn/msn.c:1838
+#: ../libpurple/protocols/msnp9/msn.c:1694
 msgid "Work Phone 2"
 msgstr "Arbeidstelefon 2"
 
-#: ../libpurple/protocols/msn/msn.c:1683
-#: ../libpurple/protocols/oscar/oscar.c:3806
+#: ../libpurple/protocols/msn/msn.c:1839
+#: ../libpurple/protocols/msnp9/msn.c:1695
+#: ../libpurple/protocols/oscar/oscar.c:3839
 msgid "Work Address"
 msgstr "Arbeidsadresse"
 
-#: ../libpurple/protocols/msn/msn.c:1684
+#: ../libpurple/protocols/msn/msn.c:1840
+#: ../libpurple/protocols/msnp9/msn.c:1696
 msgid "Work Mobile"
 msgstr "Jobbmobil"
 
-#: ../libpurple/protocols/msn/msn.c:1685
+#: ../libpurple/protocols/msn/msn.c:1841
+#: ../libpurple/protocols/msnp9/msn.c:1697
 msgid "Work Pager"
 msgstr "Personsøkar arbeid"
 
-#: ../libpurple/protocols/msn/msn.c:1686
+#: ../libpurple/protocols/msn/msn.c:1842
+#: ../libpurple/protocols/msnp9/msn.c:1698
 msgid "Work Fax"
 msgstr "Telefaks arbeid"
 
-#: ../libpurple/protocols/msn/msn.c:1687
+#: ../libpurple/protocols/msn/msn.c:1843
+#: ../libpurple/protocols/msnp9/msn.c:1699
 msgid "Work E-Mail"
 msgstr "E-postadresse jobb"
 
-#: ../libpurple/protocols/msn/msn.c:1688
+#: ../libpurple/protocols/msn/msn.c:1844
+#: ../libpurple/protocols/msnp9/msn.c:1700
 msgid "Work IM"
 msgstr "Pratenett arbeid"
 
-#: ../libpurple/protocols/msn/msn.c:1689
+#: ../libpurple/protocols/msn/msn.c:1845
+#: ../libpurple/protocols/msnp9/msn.c:1701
 msgid "Start Date"
 msgstr "Startdato"
 
-#: ../libpurple/protocols/msn/msn.c:1759 ../libpurple/protocols/msn/msn.c:1765
-#: ../libpurple/protocols/msn/msn.c:1772 ../libpurple/protocols/msn/msn.c:1779
+#: ../libpurple/protocols/msn/msn.c:1915
+#: ../libpurple/protocols/msn/msn.c:1921
+#: ../libpurple/protocols/msn/msn.c:1928
+#: ../libpurple/protocols/msn/msn.c:1935
+#: ../libpurple/protocols/msnp9/msn.c:1771
+#: ../libpurple/protocols/msnp9/msn.c:1777
+#: ../libpurple/protocols/msnp9/msn.c:1784
+#: ../libpurple/protocols/msnp9/msn.c:1791
 msgid "Favorite Things"
 msgstr "Favorittsakene mine"
 
-#: ../libpurple/protocols/msn/msn.c:1824
+#: ../libpurple/protocols/msn/msn.c:1980
+#: ../libpurple/protocols/msnp9/msn.c:1836
 msgid "Last Updated"
 msgstr "Sist oppdatert"
 
-#: ../libpurple/protocols/msn/msn.c:1835
+#: ../libpurple/protocols/msn/msn.c:1991
+#: ../libpurple/protocols/msnp9/msn.c:1847
 #: ../libpurple/protocols/qq/buddy_info.c:60
 #: ../libpurple/protocols/silc/ops.c:1026
 #: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "Heimeside"
 
-#: ../libpurple/protocols/msn/msn.c:1859
+#: ../libpurple/protocols/msn/msn.c:2015
+#: ../libpurple/protocols/msnp9/msn.c:1871
 msgid "The user has not created a public profile."
 msgstr "Brukaren har ikkje laga ein offentleg profil."
 
-#: ../libpurple/protocols/msn/msn.c:1860
-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 "
-"public profile."
-msgstr ""
-"MSN rapporterte at det ikkje var mogeleg å finna brukarprofilen. Det vil "
-"seia at brukaren anten ikkje finst, eller at ho/han ikkje har laga ein "
-"offentleg profil enno."
+#: ../libpurple/protocols/msn/msn.c:2016
+#: ../libpurple/protocols/msnp9/msn.c:1872
+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 public profile."
+msgstr "MSN rapporterte at det ikkje var mogeleg å finna brukarprofilen. Det vil seia at brukaren anten ikkje finst, eller at ho/han ikkje har laga ein offentleg profil enno."
 
-#: ../libpurple/protocols/msn/msn.c:1864
-msgid ""
-"Could not find any information in the user's profile. The user most likely "
-"does not exist."
-msgstr ""
-"Fann ingen informasjon i brukarprofilen. Brukaren finst mest truleg ikkje."
+#: ../libpurple/protocols/msn/msn.c:2020
+#: ../libpurple/protocols/msnp9/msn.c:1876
+msgid "Could not find any information in the user's profile. The user most likely does not exist."
+msgstr "Fann ingen informasjon i brukarprofilen. Brukaren finst mest truleg ikkje."
 
-#: ../libpurple/protocols/msn/msn.c:1872
+#: ../libpurple/protocols/msn/msn.c:2028
+#: ../libpurple/protocols/msnp9/msn.c:1884
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
 msgid "Profile URL"
 msgstr "Profiladresse"
@@ -7013,136 +7538,179 @@ msgstr "Profiladresse"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2158 ../libpurple/protocols/msn/msn.c:2160
-msgid "MSN Protocol Plugin"
-msgstr "MSN-protokolltillegg"
+#: ../libpurple/protocols/msn/msn.c:2315
+#: ../libpurple/protocols/msn/msn.c:2317
+msgid "Windows Live Messenger Protocol Plugin"
+msgstr "Windows Live Messenger-protokolltillegg"
 
-#: ../libpurple/protocols/msn/msn.c:2194
+#: ../libpurple/protocols/msn/msn.c:2352
+#: ../libpurple/protocols/msnp9/msn.c:2206
 msgid "Use HTTP Method"
 msgstr "Bruk HTTP-metode"
 
-#: ../libpurple/protocols/msn/msn.c:2199
-#, fuzzy
+#: ../libpurple/protocols/msn/msn.c:2357
+#: ../libpurple/protocols/msnp9/msn.c:2211
 msgid "HTTP Method Server"
-msgstr "IPC-testtenar"
+msgstr "HTTP-metode-tenar"
 
-#: ../libpurple/protocols/msn/msn.c:2204
+#: ../libpurple/protocols/msn/msn.c:2362
+#: ../libpurple/protocols/msnp9/msn.c:2216
 msgid "Show custom smileys"
 msgstr "Vis eigne smilefjes"
 
-#: ../libpurple/protocols/msn/msn.c:2212
+#: ../libpurple/protocols/msn/msn.c:2370
+#: ../libpurple/protocols/msnp9/msn.c:2224
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: dytta til ein brukar for å få merksemda hans/hennar"
 
-#: ../libpurple/protocols/msn/nexus.c:146
-#: ../libpurple/protocols/msn/servconn.c:135
-#: ../libpurple/protocols/qq/qq_proxy.c:242
-#: ../libpurple/protocols/qq/qq_proxy.c:321
-#: ../libpurple/protocols/qq/qq_proxy.c:366
-#: ../libpurple/protocols/qq/qq_proxy.c:399
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:63
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:163
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:187
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:200
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:229
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:243
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:268
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:302
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:332
-#: ../libpurple/protocols/yahoo/yahoochat.c:1416
-#: ../libpurple/protocols/yahoo/yahoochat.c:1442
-msgid "Unable to connect"
-msgstr "Klarte ikkje å kopla til"
+#: ../libpurple/protocols/msn/nexus.c:70
+msgid "Windows Live ID authentication:Unable to connect"
+msgstr "Windows Live ID-autentisering: klarer ikkje å kopla til"
 
-#: ../libpurple/protocols/msn/notification.c:178
+#. we must have failed!
+#: ../libpurple/protocols/msn/nexus.c:126
+msgid "Windows Live ID authentication: cannot find authenticate token in server response"
+msgstr "Windows Live ID-autentisering: finn ikkje autentiseringsmarkøren i svaret frå tenaren"
+
+#: ../libpurple/protocols/msn/nexus.c:172
+msgid "Windows Live ID authentication Failed"
+msgstr "Windows Live ID-autentiseringa feila"
+
+#: ../libpurple/protocols/msn/notification.c:185
+#: ../libpurple/protocols/msnp9/notification.c:178
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s er ikkje ei gyldig gruppe."
 
-#: ../libpurple/protocols/msn/notification.c:184
-#: ../libpurple/protocols/msn/notification.c:532
-#: ../libpurple/protocols/msn/session.c:330
+#: ../libpurple/protocols/msn/notification.c:191
+#: ../libpurple/protocols/msn/notification.c:931
+#: ../libpurple/protocols/msn/session.c:387
+#: ../libpurple/protocols/msnp9/notification.c:184
+#: ../libpurple/protocols/msnp9/notification.c:534
+#: ../libpurple/protocols/msnp9/session.c:339
 msgid "Unknown error."
 msgstr "Ukjend feil."
 
-#: ../libpurple/protocols/msn/notification.c:187
+#: ../libpurple/protocols/msn/notification.c:194
+#: ../libpurple/protocols/msnp9/notification.c:187
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s på %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:498
+#: ../libpurple/protocols/msn/notification.c:509
 #, c-format
+msgid "%s just sent you a Nudge!"
+msgstr "%s har nettopp sendt deg ein dytt!"
+
+#: ../libpurple/protocols/msn/notification.c:836
+#, c-format
+msgid "Unknown error (%d)"
+msgstr "ukjend feil (%d)"
+
+#: ../libpurple/protocols/msn/notification.c:837
+#: ../libpurple/protocols/sametime/sametime.c:4479
+msgid "Unable to add user"
+msgstr "Klarte ikkje å leggja til brukar"
+
+#: ../libpurple/protocols/msn/notification.c:897
+#: ../libpurple/protocols/msnp9/notification.c:500
+#, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "Klarte ikkje å leggja til brukaren på %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:502
+#: ../libpurple/protocols/msn/notification.c:901
+#: ../libpurple/protocols/msnp9/notification.c:504
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "Klarte ikkje å blokkera brukaren på %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:506
+#: ../libpurple/protocols/msn/notification.c:905
+#: ../libpurple/protocols/msnp9/notification.c:508
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "Klarte ikkje å tillata brukaren på %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:514
+#: ../libpurple/protocols/msn/notification.c:913
+#: ../libpurple/protocols/msnp9/notification.c:516
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr "Klarte ikkje å leggja til %s fordi vennelista di er full."
 
-#: ../libpurple/protocols/msn/notification.c:523
+#: ../libpurple/protocols/msn/notification.c:922
+#: ../libpurple/protocols/msnp9/notification.c:525
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s er ikkje ein gyldig Passport-konto."
 
-#: ../libpurple/protocols/msn/notification.c:528
+#: ../libpurple/protocols/msn/notification.c:927
+#: ../libpurple/protocols/msnp9/notification.c:530
 msgid "Service Temporarily Unavailable."
 msgstr "Tenesta er mellombels utilgjengeleg."
 
-#: ../libpurple/protocols/msn/notification.c:851
+#: ../libpurple/protocols/msn/notification.c:1276
+#: ../libpurple/protocols/msnp9/notification.c:898
 msgid "Unable to rename group"
 msgstr "Klarte ikkje å endra namnet til gruppa"
 
-#: ../libpurple/protocols/msn/notification.c:906
+#: ../libpurple/protocols/msn/notification.c:1331
+#: ../libpurple/protocols/msnp9/notification.c:953
 msgid "Unable to delete group"
 msgstr "Klarer ikkje å sletta gruppa"
 
-#: ../libpurple/protocols/msn/notification.c:1325
+#: ../libpurple/protocols/msn/notification.c:1945
+#: ../libpurple/protocols/msnp9/notification.c:1372
 #, c-format
 msgid ""
-"The MSN server will shut down for maintenance in %d minute. You will "
-"automatically be signed out at that time.  Please finish any conversations "
-"in progress.\n"
+"The MSN server will shut down for maintenance in %d minute. You will automatically be signed out at that time.  Please finish any conversations in progress.\n"
 "\n"
-"After the maintenance has been completed, you will be able to successfully "
-"sign in."
+"After the maintenance has been completed, you will be able to successfully sign in."
 msgid_plural ""
-"The MSN server will shut down for maintenance in %d minutes. You will "
-"automatically be signed out at that time.  Please finish any conversations "
-"in progress.\n"
+"The MSN server will shut down for maintenance in %d minutes. You will automatically be signed out at that time.  Please finish any conversations in progress.\n"
 "\n"
-"After the maintenance has been completed, you will be able to successfully "
-"sign in."
+"After the maintenance has been completed, you will be able to successfully sign in."
 msgstr[0] ""
-"MSN-tenaren vil stengjast ned grunna vedlikehald om %d minutt. Du blir då "
-"automatisk logga av. Du bør lukka alle pågåande samtaler.\n"
+"MSN-tenaren vil stengjast ned grunna vedlikehald om %d minutt. Du blir då automatisk logga av. Du bør lukka alle pågåande samtaler.\n"
 "\n"
 "Du vil kunna logga på att straks vedlikehaldsarbeidet er ferdig."
 msgstr[1] ""
-"MSN-tenaren vil stengjast ned grunna vedlikehald om %d minutt. Du blir då "
-"automatisk logga av. Du bør lukka alle pågåande samtaler.\n"
+"MSN-tenaren vil stengjast ned grunna vedlikehald om %d minutt. Du blir då automatisk logga av. Du bør lukka alle pågåande samtaler.\n"
 "\n"
 "Du vil kunna logga på att straks vedlikehaldsarbeidet er ferdig."
 
+#: ../libpurple/protocols/msn/servconn.c:135
+#: ../libpurple/protocols/msnp9/nexus.c:146
+#: ../libpurple/protocols/msnp9/servconn.c:133
+#: ../libpurple/protocols/qq/qq_proxy.c:242
+#: ../libpurple/protocols/qq/qq_proxy.c:324
+#: ../libpurple/protocols/qq/qq_proxy.c:369
+#: ../libpurple/protocols/qq/qq_proxy.c:402
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:64
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:167
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:191
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:204
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:233
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:247
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:272
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:307
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:338
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1564
+#: ../libpurple/protocols/yahoo/yahoochat.c:1425
+#: ../libpurple/protocols/yahoo/yahoochat.c:1451
+msgid "Unable to connect"
+msgstr "Klarte ikkje å kopla til"
+
 #: ../libpurple/protocols/msn/servconn.c:137
+#: ../libpurple/protocols/msnp9/servconn.c:135
 msgid "Writing error"
 msgstr "Skrivefeil"
 
 #: ../libpurple/protocols/msn/servconn.c:139
+#: ../libpurple/protocols/msnp9/servconn.c:137
 msgid "Reading error"
 msgstr "Lesefeil"
 
 #: ../libpurple/protocols/msn/servconn.c:146
+#: ../libpurple/protocols/msnp9/servconn.c:144
 #, c-format
 msgid ""
 "Connection error from %s server:\n"
@@ -7151,129 +7719,171 @@ msgstr ""
 "Tilkoplingsfeil frå %s-tenaren:\n"
 "%s"
 
-#: ../libpurple/protocols/msn/session.c:299
+#: ../libpurple/protocols/msn/session.c:349
+#: ../libpurple/protocols/msnp9/session.c:301
 msgid "Our protocol is not supported by the server."
 msgstr "Protokollen vår er ikkje støtta av tenaren."
 
-#: ../libpurple/protocols/msn/session.c:303
+#: ../libpurple/protocols/msn/session.c:354
+#: ../libpurple/protocols/msnp9/session.c:306
 msgid "Error parsing HTTP."
 msgstr "Feil i HTTP-tolkinga."
 
-#: ../libpurple/protocols/msn/session.c:307
-#: ../libpurple/protocols/oscar/flap_connection.c:384
-#: ../libpurple/protocols/yahoo/yahoo.c:205
+#: ../libpurple/protocols/msn/session.c:358
+#: ../libpurple/protocols/msnp9/session.c:310
+#: ../libpurple/protocols/oscar/flap_connection.c:387
+#: ../libpurple/protocols/yahoo/yahoo.c:155
 msgid "You have signed on from another location."
 msgstr "Du har logga på frå ein annan stad."
 
-#: ../libpurple/protocols/msn/session.c:310
+#: ../libpurple/protocols/msn/session.c:364
+#: ../libpurple/protocols/msnp9/session.c:316
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
-msgstr ""
-"MSN-tenarane er mellombels utilgjengelege. Vent ei stund og prøv igjen."
+msgstr "MSN-tenarane er mellombels utilgjengelege. Vent ei stund og prøv igjen."
 
-#: ../libpurple/protocols/msn/session.c:315
+#: ../libpurple/protocols/msn/session.c:370
+#: ../libpurple/protocols/msnp9/session.c:322
 msgid "The MSN servers are going down temporarily."
 msgstr "MSN-tenarane vil vera mellombels nede."
 
-#: ../libpurple/protocols/msn/session.c:320
+#: ../libpurple/protocols/msn/session.c:375
+#: ../libpurple/protocols/msnp9/session.c:327
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Klarte ikkje å autentisera: %s"
 
-#: ../libpurple/protocols/msn/session.c:325
-msgid ""
-"Your MSN buddy list is temporarily unavailable. Please wait and try again."
-msgstr ""
-"MSN-vennelista di er mellombels utilgjengeleg. Vent ei stund og prøv igjen."
+#: ../libpurple/protocols/msn/session.c:381
+#: ../libpurple/protocols/msnp9/session.c:333
+msgid "Your MSN buddy list is temporarily unavailable. Please wait and try again."
+msgstr "MSN-vennelista di er mellombels utilgjengeleg. Vent ei stund og prøv igjen."
 
-#: ../libpurple/protocols/msn/session.c:346
-#: ../libpurple/protocols/msn/session.c:348
+#: ../libpurple/protocols/msn/session.c:403
+#: ../libpurple/protocols/msn/session.c:405
+#: ../libpurple/protocols/msnp9/session.c:355
+#: ../libpurple/protocols/msnp9/session.c:357
 msgid "Handshaking"
 msgstr "Protokollsjekk"
 
-#: ../libpurple/protocols/msn/session.c:349
+#: ../libpurple/protocols/msn/session.c:406
+#: ../libpurple/protocols/msnp9/session.c:358
 msgid "Starting authentication"
 msgstr "Startar autentisering"
 
-#: ../libpurple/protocols/msn/session.c:350
+#: ../libpurple/protocols/msn/session.c:407
+#: ../libpurple/protocols/msnp9/session.c:359
 msgid "Getting cookie"
 msgstr "Hentar informasjonskapsel"
 
-#: ../libpurple/protocols/msn/session.c:352
+#: ../libpurple/protocols/msn/session.c:409
+#: ../libpurple/protocols/msnp9/session.c:361
 msgid "Sending cookie"
 msgstr "Sender informasjonskapsel"
 
-#: ../libpurple/protocols/msn/session.c:353
+#: ../libpurple/protocols/msn/session.c:410
+#: ../libpurple/protocols/msnp9/session.c:362
 msgid "Retrieving buddy list"
 msgstr "Hentar vennelista"
 
 #: ../libpurple/protocols/msn/state.c:34
+#: ../libpurple/protocols/msnp9/state.c:34
 msgid "Away From Computer"
 msgstr "Vekke frå datamaskina"
 
 #: ../libpurple/protocols/msn/state.c:35
+#: ../libpurple/protocols/msnp9/state.c:35
 msgid "On The Phone"
 msgstr "I telefonen"
 
 #: ../libpurple/protocols/msn/state.c:36
+#: ../libpurple/protocols/msnp9/state.c:36
 msgid "Out To Lunch"
 msgstr "Etepause"
 
-#: ../libpurple/protocols/msn/switchboard.c:400
+#: ../libpurple/protocols/msn/switchboard.c:406
+#: ../libpurple/protocols/msnp9/switchboard.c:408
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr "Meldinga blei kanskje ikkje sendt grunna tidsavbrot:"
 
-#: ../libpurple/protocols/msn/switchboard.c:408
+#: ../libpurple/protocols/msn/switchboard.c:414
+#: ../libpurple/protocols/msnp9/switchboard.c:416
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr "Meldinga kunne ikkje sendast sia du er merka som usynleg:"
 
-#: ../libpurple/protocols/msn/switchboard.c:412
+#: ../libpurple/protocols/msn/switchboard.c:418
+#: ../libpurple/protocols/msnp9/switchboard.c:420
 msgid "Message could not be sent because the user is offline:"
 msgstr "Klarte ikkje å senda meldinga fordi brukaren er fråkopla:"
 
-#: ../libpurple/protocols/msn/switchboard.c:416
+#: ../libpurple/protocols/msn/switchboard.c:422
+#: ../libpurple/protocols/msnp9/switchboard.c:424
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "Klarte ikkje å senda meldinga grunna tilkoplingsfeil:"
 
-#: ../libpurple/protocols/msn/switchboard.c:420
+#: ../libpurple/protocols/msn/switchboard.c:426
+#: ../libpurple/protocols/msnp9/switchboard.c:428
 msgid "Message could not be sent because we are sending too quickly:"
 msgstr "Meldinga blei ikkje sendt sia vi sender for raskt:"
 
-#: ../libpurple/protocols/msn/switchboard.c:424
-msgid ""
-"Message could not be sent because we were unable to establish a session with "
-"the server. This is likely a server problem, try again in a few minutes:"
-msgstr ""
-"Vi klarte ikkje å laga eit samband til tenaren. Meldinga di blei derfor "
-"ikkje sendt. Det er truleg eit problem med tenaren. Prøv igjen om ei stund:"
+#: ../libpurple/protocols/msn/switchboard.c:430
+#: ../libpurple/protocols/msnp9/switchboard.c:432
+msgid "Message could not be sent because we were unable to establish a session with the server. This is likely a server problem, try again in a few minutes:"
+msgstr "Vi klarte ikkje å laga eit samband til tenaren. Meldinga di blei derfor ikkje sendt. Det er truleg eit problem med tenaren. Prøv igjen om ei stund:"
 
-#: ../libpurple/protocols/msn/switchboard.c:431
-msgid ""
-"Message could not be sent because an error with the switchboard occurred:"
+#: ../libpurple/protocols/msn/switchboard.c:437
+#: ../libpurple/protocols/msnp9/switchboard.c:439
+msgid "Message could not be sent because an error with the switchboard occurred:"
 msgstr "Klarte ikkje å senda meldinga grunna feil på sentralbordet:"
 
-#: ../libpurple/protocols/msn/switchboard.c:439
+#: ../libpurple/protocols/msn/switchboard.c:445
+#: ../libpurple/protocols/msnp9/switchboard.c:447
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Det kan vera at meldinga ikkje blei sendt sia ein ukjend feil oppstod:"
 
-#: ../libpurple/protocols/msn/userlist.c:252
+#: ../libpurple/protocols/msn/userlist.c:243
+#: ../libpurple/protocols/msnp9/userlist.c:262
 #, c-format
 msgid "%s has added you to his or her buddy list."
 msgstr "%s har lagt deg til i vennelista si."
 
-#: ../libpurple/protocols/msn/userlist.c:321
+#: ../libpurple/protocols/msn/userlist.c:312
+#: ../libpurple/protocols/msnp9/userlist.c:331
 #, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s har fjerna deg frå vennelista si."
 
-#: ../libpurple/protocols/msn/userlist.c:643
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#: ../libpurple/protocols/msn/userlist.c:693
+#: ../libpurple/protocols/msnp9/userlist.c:653
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "Klarte ikkje å leggja til \"%s\"."
 
-#: ../libpurple/protocols/msn/userlist.c:645
+#: ../libpurple/protocols/msn/userlist.c:696
+#: ../libpurple/protocols/msnp9/userlist.c:655
 msgid "The screen name specified is invalid."
 msgstr "Det oppgjevne brukarnamnet er ikkje gyldig."
 
+#: ../libpurple/protocols/msnp9/msn.c:546
+msgid "Has you"
+msgstr "Har deg"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/protocols/msnp9/msn.c:2170
+#: ../libpurple/protocols/msnp9/msn.c:2172
+msgid "MSN Protocol Plugin"
+msgstr "MSN-protokolltillegg"
+
 #: ../libpurple/protocols/myspace/myspace.c:111
 msgid "Missing Cipher"
 msgstr "Manglande kryptering"
@@ -7283,397 +7893,430 @@ msgstr "Fann ikkje RC4-krypteringa"
 msgstr "Fann ikkje RC4-krypteringa"
 
 #: ../libpurple/protocols/myspace/myspace.c:113
-msgid ""
-"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
-"not be loaded."
-msgstr ""
-"Oppgrader til ein libpurple med RC4-støtte (>= 2.0.1). MySpaceIM-tillegget "
-"vil ikkje lastast."
+msgid "Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will not be loaded."
+msgstr "Oppgrader til ein libpurple med RC4-støtte (>= 2.0.1). MySpaceIM-tillegget vil ikkje lastast."
 
-#: ../libpurple/protocols/myspace/myspace.c:286
-#, c-format
-msgid ""
-"Sorry, passwords over %d characters in length (yours is %d) are not "
-"supported by MySpace."
-msgstr ""
-"MySpace støttar ikkje passord med fleire enn %d teikn. Passordet ditt er på %"
-"d teikn."
-
-#. Notify an error message also, because this is important!
-#: ../libpurple/protocols/myspace/myspace.c:292
-#: ../libpurple/protocols/myspace/myspace.c:1801
-msgid "MySpaceIM Error"
-msgstr "MySpaceIM-feil"
-
-#: ../libpurple/protocols/myspace/myspace.c:349
+#: ../libpurple/protocols/myspace/myspace.c:345
 msgid "Reading challenge"
 msgstr "Les utfordringa"
 
-#: ../libpurple/protocols/myspace/myspace.c:355
+#: ../libpurple/protocols/myspace/myspace.c:353
 msgid "Unexpected challenge length from server"
 msgstr "Uventa lengd på utfordringa frå tenaren"
 
-#: ../libpurple/protocols/myspace/myspace.c:359
+#: ../libpurple/protocols/myspace/myspace.c:357
 msgid "Logging in"
 msgstr "Loggar på"
 
-#: ../libpurple/protocols/myspace/myspace.c:1286
+#: ../libpurple/protocols/myspace/myspace.c:1322
 #, c-format
 msgid "Connection to server lost (no data received within %d seconds)"
 msgstr "Mista sambandet til tenaren (ingen data er mottekne på %d sekund)"
 
 #. Can't write _()'d strings in array initializers. Workaround.
-#: ../libpurple/protocols/myspace/myspace.c:1328
+#: ../libpurple/protocols/myspace/myspace.c:1365
 msgid "New mail messages"
 msgstr "Nye e-postmeldingar"
 
-#: ../libpurple/protocols/myspace/myspace.c:1329
+#: ../libpurple/protocols/myspace/myspace.c:1366
 msgid "New blog comments"
 msgstr "Ny blogg-kommentarar"
 
-#: ../libpurple/protocols/myspace/myspace.c:1330
+#: ../libpurple/protocols/myspace/myspace.c:1367
 msgid "New profile comments"
 msgstr "Ny profilkommentarar"
 
-#: ../libpurple/protocols/myspace/myspace.c:1331
+#: ../libpurple/protocols/myspace/myspace.c:1368
 msgid "New friend requests!"
 msgstr "Nye venneførespurnader"
 
-#: ../libpurple/protocols/myspace/myspace.c:1332
+#: ../libpurple/protocols/myspace/myspace.c:1369
 msgid "New picture comments"
 msgstr "Nytt bilete-kommentarar"
 
-#: ../libpurple/protocols/myspace/myspace.c:1360
+#: ../libpurple/protocols/myspace/myspace.c:1399
 msgid "MySpace"
 msgstr "MySpace"
 
+#: ../libpurple/protocols/myspace/myspace.c:1585
+msgid "MySpaceIM - No Username Set"
+msgstr "MySpaceIM - ikkje noko brukarnamn er lagra"
+
+#: ../libpurple/protocols/myspace/myspace.c:1586
+msgid "You appear to have no MySpace username."
+msgstr "Det ser ikkje ut til at du har eit MySpace-brukarnamn."
+
+#: ../libpurple/protocols/myspace/myspace.c:1587
+msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+msgstr "Vil du lagra det no? (NB: DU KAN IKKJE ENDRA DETTE!)"
+
 #. The session is now set up, ready to be connected. This emits the
 #. * signedOn signal, so clients can now do anything with msimprpl, and
 #. * we're ready for it (session key, userid, username all setup).
-#: ../libpurple/protocols/myspace/myspace.c:1543
-#: ../libpurple/protocols/sametime/sametime.c:1544
+#: ../libpurple/protocols/myspace/myspace.c:1611
+#: ../libpurple/protocols/sametime/sametime.c:1546
 msgid "Connected"
 msgstr "Tilkopla"
 
-#: ../libpurple/protocols/myspace/myspace.c:1554
-#: ../libpurple/protocols/myspace/myspace.c:1556
-msgid "No username set"
-msgstr "Ikkje noko brukarnamn er skriven inn"
-
-#: ../libpurple/protocols/myspace/myspace.c:1555
-msgid ""
-"Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
-"username and choose a username and try to login again."
-msgstr ""
-"GÃ¥ til http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
-"og vel eit brukarnamn. Prøv deretter å logga på igjen."
-
-#: ../libpurple/protocols/myspace/myspace.c:1782
+#: ../libpurple/protocols/myspace/myspace.c:1846
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Protokollfeil, kode %d: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:1972
-#: ../libpurple/protocols/myspace/myspace.c:2006
+#: ../libpurple/protocols/myspace/myspace.c:1868
+#, c-format
+msgid "%s Your password is %d characters, greater than the expected maximum length of %d for MySpaceIM. Please shorten your password at http://profileedit.myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try again."
+msgstr "%s Passordet ditt er på %d teikn. MySpaceIM godtek berre %d teikn. Gjer passordet ditt kortare på nettsida http://profileedit.myspace.com/index.cfm?fuseaction=accountSettings.changePassword og prøv på nytt."
+
+#: ../libpurple/protocols/myspace/myspace.c:1891
+msgid "MySpaceIM Error"
+msgstr "MySpaceIM-feil"
+
+#: ../libpurple/protocols/myspace/myspace.c:2069
+#: ../libpurple/protocols/myspace/myspace.c:2103
 msgid "Failed to add buddy"
 msgstr "Klarte ikkje å leggja til venn"
 
-#: ../libpurple/protocols/myspace/myspace.c:1972
+#: ../libpurple/protocols/myspace/myspace.c:2069
 msgid "'addbuddy' command failed."
 msgstr "'addbuddy'-kommandoen feila."
 
-#: ../libpurple/protocols/myspace/myspace.c:2006
-#: ../libpurple/protocols/myspace/myspace.c:2247
+#: ../libpurple/protocols/myspace/myspace.c:2103
+#: ../libpurple/protocols/myspace/myspace.c:2348
 msgid "persist command failed"
 msgstr "'persist'-kommandoen feila"
 
-#: ../libpurple/protocols/myspace/myspace.c:2115
+#: ../libpurple/protocols/myspace/myspace.c:2208
 #, c-format
 msgid "No such user: %s"
 msgstr "Brukaren %s finst ikkje"
 
-#: ../libpurple/protocols/myspace/myspace.c:2116
+#: ../libpurple/protocols/myspace/myspace.c:2210
 msgid "User lookup"
 msgstr "Slår opp brukaren"
 
-#: ../libpurple/protocols/myspace/myspace.c:2228
-#: ../libpurple/protocols/myspace/myspace.c:2247
-#: ../libpurple/protocols/myspace/myspace.c:2269
+#: ../libpurple/protocols/myspace/myspace.c:2329
+#: ../libpurple/protocols/myspace/myspace.c:2348
+#: ../libpurple/protocols/myspace/myspace.c:2370
 msgid "Failed to remove buddy"
 msgstr "Klarte ikkje å fjerna vennen"
 
-#: ../libpurple/protocols/myspace/myspace.c:2228
+#: ../libpurple/protocols/myspace/myspace.c:2329
 msgid "'delbuddy' command failed"
 msgstr "'delbuddy'-kommandoen feila"
 
-#: ../libpurple/protocols/myspace/myspace.c:2269
+#: ../libpurple/protocols/myspace/myspace.c:2370
 msgid "blocklist command failed"
 msgstr "'blocklist'-kommandoen feila"
 
-#: ../libpurple/protocols/myspace/myspace.c:2315
+#: ../libpurple/protocols/myspace/myspace.c:2484
 msgid "Invalid input condition"
 msgstr "Ugyldig inndatavilkår"
 
-#. TODO: g_realloc like msn, yahoo, irc, jabber?
-#: ../libpurple/protocols/myspace/myspace.c:2333
-#: ../libpurple/protocols/myspace/myspace.c:2364
-msgid "Read buffer full"
-msgstr "Leselageret er fullt"
+#: ../libpurple/protocols/myspace/myspace.c:2539
+msgid "Read buffer full (2)"
+msgstr "Fullt lesemellomlager (2)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2402
+#: ../libpurple/protocols/myspace/myspace.c:2582
 msgid "Unparseable message"
 msgstr "Meldinga kan ikkje tolkast"
 
-#: ../libpurple/protocols/myspace/myspace.c:2471
+#: ../libpurple/protocols/myspace/myspace.c:2653
 #, c-format
 msgid "Couldn't connect to host: %s (%d)"
 msgstr "Klarte ikkje å kopla til verten: %s (%d)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2642
+#: ../libpurple/protocols/myspace/myspace.c:2831
 msgid "IM Friends"
 msgstr "Lynmeldingsvennar"
 
-#: ../libpurple/protocols/myspace/myspace.c:2741
+#: ../libpurple/protocols/myspace/myspace.c:2931
 #, c-format
-msgid ""
-"%d buddies were added or updated from the server (including buddies already "
-"on the server-side list)"
-msgstr ""
-"%d vennar blei lagde til eller oppdaterte frå tenaren (inkludert vennar som "
-"allereie var på tenarsidelista)"
+msgid "%d buddies were added or updated from the server (including buddies already on the server-side list)"
+msgstr "%d vennar blei lagde til eller oppdaterte frå tenaren (inkludert vennar som allereie var på tenarsidelista)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2742
+#: ../libpurple/protocols/myspace/myspace.c:2932
 msgid "Add contacts from server"
 msgstr "Legg til kontaktar frå tenaren"
 
-#: ../libpurple/protocols/myspace/myspace.c:2794
-#: ../libpurple/protocols/myspace/myspace.c:2859
+#: ../libpurple/protocols/myspace/myspace.c:2984
+#: ../libpurple/protocols/myspace/myspace.c:3048
 msgid "Add friends from MySpace.com"
 msgstr "Legg til vennar frå MySpace.com"
 
-#: ../libpurple/protocols/myspace/myspace.c:2795
+#: ../libpurple/protocols/myspace/myspace.c:2985
 msgid "Importing friends failed"
 msgstr "klarte ikkje å importera vennane"
 
 #. TODO: find out how
-#: ../libpurple/protocols/myspace/myspace.c:2851
+#: ../libpurple/protocols/myspace/myspace.c:3041
 msgid "Find people..."
 msgstr "Søk etter personar…"
 
-#: ../libpurple/protocols/myspace/myspace.c:2854
+#: ../libpurple/protocols/myspace/myspace.c:3044
 msgid "Change IM name..."
 msgstr "Endra lynmeldingsnamn…"
 
-#: ../libpurple/protocols/myspace/myspace.c:3156
+#: ../libpurple/protocols/myspace/myspace.c:3345
 msgid "myim URL handler"
 msgstr "myim adressehandterar"
 
-#: ../libpurple/protocols/myspace/myspace.c:3157
+#: ../libpurple/protocols/myspace/myspace.c:3346
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
 msgstr "Fann ingen passande MySpaceIM-konto til å opna denne myim-adressa."
 
-#: ../libpurple/protocols/myspace/myspace.c:3158
+#: ../libpurple/protocols/myspace/myspace.c:3347
 msgid "Enable the proper MySpaceIM account and try again."
 msgstr "Ta i bruk den rette MySpaceIM-kontoen og prøv igjen."
 
-#: ../libpurple/protocols/myspace/myspace.c:3281
+#: ../libpurple/protocols/myspace/myspace.c:3470
 msgid "Show display name in status text"
 msgstr "Vis visingsnamnet i statusteksten"
 
-#: ../libpurple/protocols/myspace/myspace.c:3284
+#: ../libpurple/protocols/myspace/myspace.c:3473
 msgid "Show headline in status text"
 msgstr "Vis overskrift i statusteksten"
 
-#: ../libpurple/protocols/myspace/myspace.c:3289
+#: ../libpurple/protocols/myspace/myspace.c:3478
 msgid "Send emoticons"
 msgstr "Send emotikon"
 
-#: ../libpurple/protocols/myspace/myspace.c:3294
+#: ../libpurple/protocols/myspace/myspace.c:3483
 msgid "Screen resolution (dots per inch)"
 msgstr "Skjermoppløysing (punkt per tomme)"
 
-#: ../libpurple/protocols/myspace/myspace.c:3297
+#: ../libpurple/protocols/myspace/myspace.c:3486
 msgid "Base font size (points)"
 msgstr "Grunnskriftstorleik (punkt)"
 
-#: ../libpurple/protocols/myspace/user.c:95
-#: ../libpurple/protocols/zephyr/zephyr.c:786
-#: ../libpurple/protocols/zephyr/zephyr.c:1204
+#: ../libpurple/protocols/myspace/user.c:105
+#: ../libpurple/protocols/zephyr/zephyr.c:790
+#: ../libpurple/protocols/zephyr/zephyr.c:1164
 msgid "User"
 msgstr "Brukar"
 
-#. TODO: link to username, if available
-#: ../libpurple/protocols/myspace/user.c:102
-#: ../libpurple/protocols/oscar/oscar.c:2964
+#: ../libpurple/protocols/myspace/user.c:115
+#: ../libpurple/protocols/oscar/oscar.c:3025
 msgid "Profile"
 msgstr "Profil"
 
-#: ../libpurple/protocols/myspace/user.c:124
-#, fuzzy
+#: ../libpurple/protocols/myspace/user.c:138
 msgid "Headline"
-msgstr "_Handtak:"
+msgstr "Overskrift"
 
-#: ../libpurple/protocols/myspace/user.c:129
-#, fuzzy
+#: ../libpurple/protocols/myspace/user.c:153
 msgid "Song"
-msgstr "Lydar"
+msgstr "Song"
 
-#: ../libpurple/protocols/myspace/user.c:134
-#, fuzzy
+#: ../libpurple/protocols/myspace/user.c:162
 msgid "Total Friends"
-msgstr "Lynmeldingsvennar"
+msgstr "Tal på vennar totalt"
 
-#: ../libpurple/protocols/myspace/user.c:145
-#: ../libpurple/protocols/myspace/user.c:148
-#: ../libpurple/protocols/myspace/user.c:151
-#, fuzzy
+#: ../libpurple/protocols/myspace/user.c:180
 msgid "Client Version"
-msgstr "Lukk samtala"
+msgstr "Klientversjon"
 
+#. Protocol won't log in now without a username set.. Disconnect
+#: ../libpurple/protocols/myspace/user.c:570
+msgid "No username set"
+msgstr "Ikkje noko brukarnamn er vald"
+
+#: ../libpurple/protocols/myspace/user.c:577
+#: ../libpurple/protocols/myspace/user.c:671
+msgid "MySpaceIM - Please Set a Username"
+msgstr "MySpaceIM - skriv inn eit brukarnamn"
+
+#: ../libpurple/protocols/myspace/user.c:578
+msgid "Please enter a username to check its availability:"
+msgstr "Før opp eit brukarnamn for å sjå om det er tilgjengeleg:"
+
+#: ../libpurple/protocols/myspace/user.c:658
+msgid "MySpaceIM - Username Available"
+msgstr "MySpaceIM - brukarnamnet er tilgjengeleg"
+
+#: ../libpurple/protocols/myspace/user.c:659
+msgid "This username is available. Would you like to set it?"
+msgstr "Brukarnamnet er tilgjengeleg. Vil du lagra det no?"
+
+#: ../libpurple/protocols/myspace/user.c:660
+msgid "ONCE SET, THIS CANNOT BE CHANGED!"
+msgstr "NÃ…R DET ER LAGRA, KAN DET IKKJE ENDRAST!"
+
+#: ../libpurple/protocols/myspace/user.c:672
+msgid "This username is unavailable."
+msgstr "Brukarnamnet er ikkje tilgjengeleg. "
+
+#: ../libpurple/protocols/myspace/user.c:673
+msgid "Please try another username:"
+msgstr "Prøv eit anna brukarnamn:"
+
 #. TODO: icons for each zap
-#: ../libpurple/protocols/myspace/zap.c:44
-#: ../libpurple/protocols/myspace/zap.c:177
+#. Lots of comments for translators:
+#. Zap means "to strike suddenly and forcefully as if with a
+#. * projectile or weapon."  This term often has an electrical
+#. * connotation, for example, "he was zapped by electricity when
+#. * he put a fork in the toaster."
+#: ../libpurple/protocols/myspace/zap.c:48
+#: ../libpurple/protocols/myspace/zap.c:221
 msgid "Zap"
-msgstr ""
+msgstr "Støyt"
 
-#: ../libpurple/protocols/myspace/zap.c:44
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:48
+#, c-format
 msgid "%s has zapped you!"
-msgstr "%s har logga på."
+msgstr "%s har gjeve deg ein støyt."
 
-#: ../libpurple/protocols/myspace/zap.c:44
+#: ../libpurple/protocols/myspace/zap.c:49
 #, c-format
 msgid "Zapping %s..."
-msgstr ""
+msgstr "Gjev %s ein støyt…"
 
-#: ../libpurple/protocols/myspace/zap.c:45
+#. Whack means "to hit or strike someone with a sharp blow"
+#: ../libpurple/protocols/myspace/zap.c:52
 msgid "Whack"
-msgstr ""
+msgstr "Kilevink"
 
-#: ../libpurple/protocols/myspace/zap.c:45
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:53
+#, c-format
 msgid "%s has whacked you!"
-msgstr "Brukaren har blokkert deg"
+msgstr "%s har gjeve deg ein kiilevink!"
 
-#: ../libpurple/protocols/myspace/zap.c:45
+#: ../libpurple/protocols/myspace/zap.c:53
 #, c-format
 msgid "Whacking %s..."
-msgstr ""
+msgstr "Gjev %s ein kilevink…"
 
-#: ../libpurple/protocols/myspace/zap.c:46
-#, fuzzy
+#. Torch means "to set on fire."  Don't worry, this doesn't
+#. * make a whole lot of sense in English, either.  Feel free
+#. * to translate it literally.
+#: ../libpurple/protocols/myspace/zap.c:58
 msgid "Torch"
-msgstr "Emne"
+msgstr "Set lys på"
 
-#: ../libpurple/protocols/myspace/zap.c:46
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:59
+#, c-format
 msgid "%s has torched you!"
-msgstr "Brukaren har blokkert deg"
+msgstr "%s har sett lys på deg!"
 
-#: ../libpurple/protocols/myspace/zap.c:46
+#: ../libpurple/protocols/myspace/zap.c:59
 #, c-format
 msgid "Torching %s..."
-msgstr ""
+msgstr "Set lys på %s…"
 
-#: ../libpurple/protocols/myspace/zap.c:47
+#. Smooch means "to kiss someone, often enthusiastically"
+#: ../libpurple/protocols/myspace/zap.c:62
 msgid "Smooch"
-msgstr ""
+msgstr "VÃ¥tkyss"
 
-#: ../libpurple/protocols/myspace/zap.c:47
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:63
+#, c-format
 msgid "%s has smooched you!"
-msgstr "%s har logga på."
+msgstr "%s har våtkyssa deg!"
 
-#: ../libpurple/protocols/myspace/zap.c:47
+#: ../libpurple/protocols/myspace/zap.c:63
 #, c-format
 msgid "Smooching %s..."
-msgstr ""
+msgstr "Våtkysser %s…"
 
-#: ../libpurple/protocols/myspace/zap.c:48
+#. A hug is a display of affection; wrapping your arms around someone
+#: ../libpurple/protocols/myspace/zap.c:66
 msgid "Hug"
-msgstr ""
+msgstr "Omfamning"
 
-#: ../libpurple/protocols/myspace/zap.c:48
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:66
+#, c-format
 msgid "%s has hugged you!"
-msgstr "%s har logga på."
+msgstr "%s har omfamna deg!"
 
-#: ../libpurple/protocols/myspace/zap.c:48
+#: ../libpurple/protocols/myspace/zap.c:67
 #, c-format
 msgid "Hugging %s..."
-msgstr ""
+msgstr "Omfamnar %s…"
 
-#: ../libpurple/protocols/myspace/zap.c:49
-#, fuzzy
+#. Slap means "to hit someone with an open/flat hand"
+#: ../libpurple/protocols/myspace/zap.c:70
 msgid "Slap"
-msgstr "Søvnig"
+msgstr "Klask"
 
-#: ../libpurple/protocols/myspace/zap.c:49
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:71
+#, c-format
 msgid "%s has slapped you!"
-msgstr "%s har logga på."
+msgstr "%s har klaska til deg!"
 
-#: ../libpurple/protocols/myspace/zap.c:49
+#: ../libpurple/protocols/myspace/zap.c:71
 #, c-format
 msgid "Slapping %s..."
-msgstr ""
+msgstr "Klaskar til %s…"
 
-#: ../libpurple/protocols/myspace/zap.c:50
-#, fuzzy
+#. Goose means "to pinch someone on their butt"
+#: ../libpurple/protocols/myspace/zap.c:74
 msgid "Goose"
-msgstr "Vekke"
+msgstr "Klypa"
 
-#: ../libpurple/protocols/myspace/zap.c:50
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:75
+#, c-format
 msgid "%s has goosed you!"
-msgstr "%s har gått vekk."
+msgstr "%s har klypt deg!"
 
-#: ../libpurple/protocols/myspace/zap.c:50
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:75
+#, c-format
 msgid "Goosing %s..."
-msgstr "Slår opp %s"
+msgstr "Klyper %s…"
 
-#: ../libpurple/protocols/myspace/zap.c:51
+#. A high-five is when two people's hands slap each other
+#. * in the air above their heads.  It is done to celebrate
+#. * something, often a victory, or to congratulate someone.
+#: ../libpurple/protocols/myspace/zap.c:80
 msgid "High-five"
-msgstr ""
+msgstr "Gratulasjon"
 
-#: ../libpurple/protocols/myspace/zap.c:51
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:81
+#, c-format
 msgid "%s has high-fived you!"
-msgstr "%s har logga på."
+msgstr "%s har gratulert deg!"
 
-#: ../libpurple/protocols/myspace/zap.c:51
+#: ../libpurple/protocols/myspace/zap.c:81
 #, c-format
 msgid "High-fiving %s..."
-msgstr ""
+msgstr "Gratulerer %s…"
 
-#: ../libpurple/protocols/myspace/zap.c:52
+#. We're not entirely sure what the MySpace people mean by
+#. * this... but we think it's the equivalent of "prank."  Or, for
+#. * someone to perform a mischievous trick or practical joke.
+#: ../libpurple/protocols/myspace/zap.c:86
 msgid "Punk"
-msgstr ""
+msgstr "Lura"
 
-#: ../libpurple/protocols/myspace/zap.c:52
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:87
+#, c-format
 msgid "%s has punk'd you!"
-msgstr "%s har logga på."
+msgstr "%s har lurt deg!"
 
-#: ../libpurple/protocols/myspace/zap.c:52
+#: ../libpurple/protocols/myspace/zap.c:87
 #, c-format
 msgid "Punking %s..."
-msgstr ""
+msgstr "Lurer %s…"
 
-#: ../libpurple/protocols/myspace/zap.c:53
+#. Raspberry is a slang term for the vibrating sound made
+#. * when you stick your tongue out of your mouth with your
+#. * lips closed and blow.  It is typically done when
+#. * gloating or bragging.  Nowadays it's a pretty silly
+#. * gesture, so it does not carry a harsh negative
+#. * connotation.  It is generally used in a playful tone
+#. * with friends.
+#: ../libpurple/protocols/myspace/zap.c:96
 msgid "Raspberry"
-msgstr ""
+msgstr "Rekkja tunge"
 
-#: ../libpurple/protocols/myspace/zap.c:53
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:97
+#, c-format
 msgid "%s has raspberried you!"
-msgstr "%s har logga på."
+msgstr "%s har rekt deg tunga!"
 
-#: ../libpurple/protocols/myspace/zap.c:53
+#: ../libpurple/protocols/myspace/zap.c:97
 #, c-format
 msgid "Raspberrying %s..."
-msgstr ""
+msgstr "Rekkjer %s tunga…"
 
 #
 #: ../libpurple/protocols/novell/nmuser.c:1864
@@ -7757,9 +8400,7 @@ msgstr "Fann ikkje verten til brukarnamn
 msgstr "Fann ikkje verten til brukarnamnet du skreiv inn"
 
 #: ../libpurple/protocols/novell/nmuser.c:1928
-msgid ""
-"Your account has been disabled because too many incorrect passwords were "
-"entered"
+msgid "Your account has been disabled because too many incorrect passwords were entered"
 msgstr "Kontoen din er sperra grunna for mange feilpåloggingsforsøk"
 
 #: ../libpurple/protocols/novell/nmuser.c:1931
@@ -7787,9 +8428,7 @@ msgstr "Brukaren har blokkert deg"
 msgstr "Brukaren har blokkert deg"
 
 #: ../libpurple/protocols/novell/nmuser.c:1950
-msgid ""
-"This evaluation version does not allow more than ten users to log in at one "
-"time"
+msgid "This evaluation version does not allow more than ten users to log in at one time"
 msgstr "Prøveversjonen tillèt ikkje meir enn ti samstundes pålogga brukarar"
 
 #: ../libpurple/protocols/novell/nmuser.c:1953
@@ -7806,112 +8445,104 @@ msgstr "PÃ¥logginga feila (%s)."
 msgid "Login failed (%s)."
 msgstr "PÃ¥logginga feila (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:247
+#: ../libpurple/protocols/novell/novell.c:255
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr "Klarer ikkje å senda meldinga. Fekk ikkje brukardetaljar (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:396
+#: ../libpurple/protocols/novell/novell.c:404
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
-msgstr "Klarer ikkje å leggja %s til vennelsita di (%s)."
+msgstr "Klarer ikkje å leggja %s til vennelista di (%s)."
 
 #. TODO: Improve this! message to who or for what conference?
-#: ../libpurple/protocols/novell/novell.c:422
+#: ../libpurple/protocols/novell/novell.c:430
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "Klarer ikkje å senda melding (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:493
-#: ../libpurple/protocols/novell/novell.c:985
+#: ../libpurple/protocols/novell/novell.c:501
+#: ../libpurple/protocols/novell/novell.c:993
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "Klarer ikkje å invitera brukaren (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:532
+#: ../libpurple/protocols/novell/novell.c:540
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr "Klarer ikkje å senda melding til %s. Kan ikkje laga konferansen (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:537
+#: ../libpurple/protocols/novell/novell.c:545
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "Klarer ikkje å senda melding. Kan ikkje laga konferansen (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:584
+#: ../libpurple/protocols/novell/novell.c:592
 #, c-format
-msgid ""
-"Unable to move user %s to folder %s in the server side list. Error while "
-"creating folder (%s)."
-msgstr ""
-"Klarer ikkje å flytta brukar %s til mappa %s  på tenarsidelista. Feil under "
-"laginga av mappe (%s)."
+msgid "Unable to move user %s to folder %s in the server side list. Error while creating folder (%s)."
+msgstr "Klarer ikkje å flytta brukar %s til mappa %s  på tenarsidelista. Feil under laginga av mappe (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:632
+#: ../libpurple/protocols/novell/novell.c:640
 #, c-format
-msgid ""
-"Unable to add %s to your buddy list. Error creating folder in server side "
-"list (%s)."
-msgstr ""
-"Klarer ikkje å leggja %s til vennelista di. Får ikkje laga mappe på "
-"tenarsidelista (%s)."
+msgid "Unable to add %s to your buddy list. Error creating folder in server side list (%s)."
+msgstr "Klarer ikkje å leggja %s til vennelista di. Får ikkje laga mappe på tenarsidelista (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:705
+#: ../libpurple/protocols/novell/novell.c:713
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "FÃ¥r ikkje henta detaljar for brukar %s (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:751
-#: ../libpurple/protocols/novell/novell.c:897
+#: ../libpurple/protocols/novell/novell.c:759
+#: ../libpurple/protocols/novell/novell.c:905
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "Klarer ikkje å leggja brukar til personvernlista (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:798
+#: ../libpurple/protocols/novell/novell.c:806
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "Klarer ikkje å leggja til %s  på blokkeringslista (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:851
+#: ../libpurple/protocols/novell/novell.c:859
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "Klarer ikkje å leggja til %s på tilgangslista (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:919
+#: ../libpurple/protocols/novell/novell.c:927
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "Umogleg å fjerna %s frå personvernlista (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:942
-#: ../libpurple/protocols/novell/novell.c:1647
+#: ../libpurple/protocols/novell/novell.c:950
+#: ../libpurple/protocols/novell/novell.c:1656
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "Umogleg å endra personverninnstillingar (%s) på tenarsida."
 
-#: ../libpurple/protocols/novell/novell.c:1012
+#: ../libpurple/protocols/novell/novell.c:1020
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "Umogleg å laga konferanse (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:1121
-#: ../libpurple/protocols/novell/novell.c:1692
+#: ../libpurple/protocols/novell/novell.c:1131
+#: ../libpurple/protocols/novell/novell.c:1702
 msgid "Error communicating with server. Closing connection."
 msgstr "Feil i tilkoplinga mot tenar. Lukkar sambandet."
 
-#: ../libpurple/protocols/novell/novell.c:1476
+#: ../libpurple/protocols/novell/novell.c:1485
 msgid "Telephone Number"
 msgstr "Telefonnummer"
 
-#: ../libpurple/protocols/novell/novell.c:1482
+#: ../libpurple/protocols/novell/novell.c:1491
 msgid "Personal Title"
 msgstr "Privat tittel"
 
-#: ../libpurple/protocols/novell/novell.c:1486
+#: ../libpurple/protocols/novell/novell.c:1495
 msgid "Mailstop"
 msgstr "E-postkontor"
 
-#: ../libpurple/protocols/novell/novell.c:1502
-#: ../libpurple/protocols/sametime/sametime.c:4122
+#: ../libpurple/protocols/novell/novell.c:1511
+#: ../libpurple/protocols/sametime/sametime.c:4176
 msgid "User ID"
 msgstr "Brukar-ID"
 
@@ -7921,41 +8552,37 @@ msgstr "Brukar-ID"
 #. purple_notify_user_info_add_pair(user_info, tag, value);
 #. }
 #.
-#: ../libpurple/protocols/novell/novell.c:1515
+#: ../libpurple/protocols/novell/novell.c:1524
 msgid "Full name"
 msgstr "Fullt namn"
 
-#: ../libpurple/protocols/novell/novell.c:1637
+#: ../libpurple/protocols/novell/novell.c:1646
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise-konferanse %d"
 
-#: ../libpurple/protocols/novell/novell.c:1668
-msgid "Unable to make SSL connection to server."
-msgstr "Klarer ikkje å laga eit SSL-samband med tenaren."
-
-#: ../libpurple/protocols/novell/novell.c:1720
+#: ../libpurple/protocols/novell/novell.c:1729
 msgid "Authenticating..."
 msgstr "Autentiserer…"
 
-#: ../libpurple/protocols/novell/novell.c:1732
+#: ../libpurple/protocols/novell/novell.c:1743
 msgid "Unable to connect to server."
 msgstr "Klarer ikkje å kopla til tenaren."
 
-#: ../libpurple/protocols/novell/novell.c:1735
+#: ../libpurple/protocols/novell/novell.c:1746
 msgid "Waiting for response..."
 msgstr "Venatr på svar…"
 
-#: ../libpurple/protocols/novell/novell.c:1870
+#: ../libpurple/protocols/novell/novell.c:1881
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s er blitt invitert til denne praten."
 
-#: ../libpurple/protocols/novell/novell.c:1898
+#: ../libpurple/protocols/novell/novell.c:1909
 msgid "Invitation to Conversation"
 msgstr "Prateinvitasjon"
 
-#: ../libpurple/protocols/novell/novell.c:1899
+#: ../libpurple/protocols/novell/novell.c:1910
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -7966,39 +8593,28 @@ msgstr ""
 "\n"
 "Sendt: %s"
 
-#: ../libpurple/protocols/novell/novell.c:1901
+#: ../libpurple/protocols/novell/novell.c:1912
 msgid "Would you like to join the conversation?"
 msgstr "Vil du bli med i praten?"
 
-#. we don't want to reconnect in this case
-#: ../libpurple/protocols/novell/novell.c:2012
+#: ../libpurple/protocols/novell/novell.c:2028
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "Du er blitt logga ut fordi du logga deg på frå ei anna maskin."
 
-#: ../libpurple/protocols/novell/novell.c:2069
+#: ../libpurple/protocols/novell/novell.c:2085
 #, c-format
-msgid ""
-"%s appears to be offline and did not receive the message that you just sent."
+msgid "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s verkar vera fråkopla. Brukaren fekk ikkje meldinga du nett sendte."
 
-#. TODO: Would be nice to prompt if not set!
-#. *  purple_request_fields(gc, _("Server Address"),...);
-#.
-#. ...but for now just error out with a nice message.
-#: ../libpurple/protocols/novell/novell.c:2167
-msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
-msgstr ""
-"Klarer ikkje å kopla til tenaren. Skriv inn adressa til tenaren du vil kopla "
-"deg til."
+#: ../libpurple/protocols/novell/novell.c:2185
+msgid "Unable to connect to server. Please enter the address of the server you wish to connect to."
+msgstr "Klarer ikkje å kopla til tenaren. Skriv inn adressa til tenaren du vil kopla deg til."
 
-#: ../libpurple/protocols/novell/novell.c:2195
+#: ../libpurple/protocols/novell/novell.c:2214
 msgid "Error. SSL support is not installed."
 msgstr "Feil. SSL-støtte er ikkje installert."
 
-#: ../libpurple/protocols/novell/novell.c:2504
-#, c-format
+#: ../libpurple/protocols/novell/novell.c:2522
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Denne konferanse er blitt lukka. Kan ikkje senda fleire meldingar."
 
@@ -8012,33 +8628,47 @@ msgstr "Denne konferanse er blitt lukka.
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/novell/novell.c:3518
-#: ../libpurple/protocols/novell/novell.c:3520
+#: ../libpurple/protocols/novell/novell.c:3536
+#: ../libpurple/protocols/novell/novell.c:3538
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger-protokolltillegg"
 
-#: ../libpurple/protocols/novell/novell.c:3545
+#: ../libpurple/protocols/novell/novell.c:3563
 msgid "Server address"
 msgstr "Tenaradresse"
 
-#: ../libpurple/protocols/novell/novell.c:3549
+#: ../libpurple/protocols/novell/novell.c:3567
 msgid "Server port"
 msgstr "Tenarport"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:387
-#: ../libpurple/protocols/yahoo/yahoo.c:2469
-#: ../libpurple/protocols/yahoo/yahoo.c:2636
-#: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:581
-#: ../libpurple/proxy.c:1116 ../libpurple/proxy.c:1225
-#: ../libpurple/proxy.c:1325 ../libpurple/proxy.c:1453
+#: ../libpurple/protocols/oscar/family_chatnav.c:62
+msgid "Could not join chat room"
+msgstr "Klarte ikkje å bli med i praterommet"
+
+#: ../libpurple/protocols/oscar/family_chatnav.c:63
+msgid "Invalid chat room name"
+msgstr "Ugyldig prateromsnamn"
+
+#: ../libpurple/protocols/oscar/flap_connection.c:391
+#: ../libpurple/protocols/yahoo/yahoo.c:2487
+#: ../libpurple/protocols/yahoo/yahoo.c:2655
+#: ../libpurple/protocols/yahoo/ycht.c:482
+#: ../libpurple/proxy.c:584
+#: ../libpurple/proxy.c:1135
+#: ../libpurple/proxy.c:1244
+#: ../libpurple/proxy.c:1344
+#: ../libpurple/proxy.c:1472
 msgid "Server closed the connection."
 msgstr "Tenaren lukka tilkoplinga."
 
-#: ../libpurple/protocols/oscar/flap_connection.c:389
-#: ../libpurple/protocols/yahoo/yahoo.c:2463
-#: ../libpurple/protocols/yahoo/yahoo.c:2630 ../libpurple/proxy.c:593
-#: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1237
-#: ../libpurple/proxy.c:1337 ../libpurple/proxy.c:1465
+#: ../libpurple/protocols/oscar/flap_connection.c:393
+#: ../libpurple/protocols/yahoo/yahoo.c:2480
+#: ../libpurple/protocols/yahoo/yahoo.c:2648
+#: ../libpurple/proxy.c:596
+#: ../libpurple/proxy.c:1147
+#: ../libpurple/proxy.c:1256
+#: ../libpurple/proxy.c:1356
+#: ../libpurple/proxy.c:1484
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -8047,10 +8677,12 @@ msgstr ""
 "Mista sambandet med tenaren:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:392
-#: ../libpurple/proxy.c:1145 ../libpurple/proxy.c:1250
-#: ../libpurple/proxy.c:1349 ../libpurple/proxy.c:1421
-#: ../libpurple/proxy.c:1478
+#: ../libpurple/protocols/oscar/flap_connection.c:396
+#: ../libpurple/proxy.c:1164
+#: ../libpurple/proxy.c:1269
+#: ../libpurple/proxy.c:1368
+#: ../libpurple/proxy.c:1440
+#: ../libpurple/proxy.c:1497
 msgid "Received invalid data on connection with server."
 msgstr "Det kom ugyldige data frå sambandet med tenaren."
 
@@ -8085,305 +8717,286 @@ msgstr "ICQ-protokolltillegg"
 msgstr "ICQ-protokolltillegg"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4410
-#: ../libpurple/protocols/zephyr/zephyr.c:2997
+#: ../libpurple/protocols/yahoo/yahoo.c:4427
+#: ../libpurple/protocols/zephyr/zephyr.c:2979
 msgid "Encoding"
 msgstr "Teiknkoding"
 
-#: ../libpurple/protocols/oscar/odc.c:40
+#: ../libpurple/protocols/oscar/odc.c:42
 msgid "The remote user has closed the connection."
 msgstr "Fjernbrukaren har lukka sambandet."
 
-#: ../libpurple/protocols/oscar/odc.c:42
+#: ../libpurple/protocols/oscar/odc.c:44
 msgid "The remote user has declined your request."
 msgstr "Fjernbrukaren har avvist førespurnaden din."
 
-#: ../libpurple/protocols/oscar/odc.c:44
+#: ../libpurple/protocols/oscar/odc.c:46
 #, c-format
 msgid "Lost connection with the remote user:<br>%s"
 msgstr "Mista sambandet til fjernbrukaren:<br>%s"
 
-#: ../libpurple/protocols/oscar/odc.c:47
+#: ../libpurple/protocols/oscar/odc.c:49
 msgid "Received invalid data on connection with remote user."
 msgstr "Det kom ugyldige data ved tilkoplinga til fjerntenaren."
 
-#: ../libpurple/protocols/oscar/odc.c:49
+#: ../libpurple/protocols/oscar/odc.c:51
 msgid "Could not establish a connection with the remote user."
 msgstr "Klarer ikkje å laga til eit samband med fjernbrukaren."
 
-#: ../libpurple/protocols/oscar/odc.c:560
+#: ../libpurple/protocols/oscar/odc.c:562
 msgid "Direct IM established"
 msgstr "Oppretta direkte lynmeldingssamband"
 
+#: ../libpurple/protocols/oscar/odc.c:600
+#, c-format
+msgid "%s tried to send you a %s file, but we only allow files up to %s over Direct IM.  Try using file transfer instead.\n"
+msgstr "%s prøvde å senda deg ei %s-fil, men vi tillèt berre filer inntil %s over direktelynmeldingar. Prøv heller å bruka filoverføring.\n"
+
 #: ../libpurple/protocols/oscar/oft.c:656
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "Fila %s er %s, noko som er større enn høgste storleik av %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:116
+#: ../libpurple/protocols/oscar/oscar.c:117
 msgid "Invalid error"
 msgstr "Ugyldig feil"
 
-#: ../libpurple/protocols/oscar/oscar.c:117
+#: ../libpurple/protocols/oscar/oscar.c:118
 msgid "Invalid SNAC"
 msgstr "Ugyldig SNAC"
 
-#: ../libpurple/protocols/oscar/oscar.c:118
+#: ../libpurple/protocols/oscar/oscar.c:119
 msgid "Rate to host"
 msgstr "Fart mot vert"
 
-#: ../libpurple/protocols/oscar/oscar.c:119
+#: ../libpurple/protocols/oscar/oscar.c:120
 msgid "Rate to client"
 msgstr "Fart mot klient"
 
-#: ../libpurple/protocols/oscar/oscar.c:121
+#: ../libpurple/protocols/oscar/oscar.c:122
 msgid "Service unavailable"
 msgstr "Tenesta er utilgjengeleg"
 
-#: ../libpurple/protocols/oscar/oscar.c:122
+#: ../libpurple/protocols/oscar/oscar.c:123
 msgid "Service not defined"
 msgstr "Tenesta er ikkje definert"
 
-#: ../libpurple/protocols/oscar/oscar.c:123
+#: ../libpurple/protocols/oscar/oscar.c:124
 msgid "Obsolete SNAC"
 msgstr "Forelda SNAC"
 
-#: ../libpurple/protocols/oscar/oscar.c:124
+#: ../libpurple/protocols/oscar/oscar.c:125
 msgid "Not supported by host"
 msgstr "Ikkje støtta av verten"
 
-#: ../libpurple/protocols/oscar/oscar.c:125
+#: ../libpurple/protocols/oscar/oscar.c:126
 msgid "Not supported by client"
 msgstr "Ikkje støtta av klienten"
 
-#: ../libpurple/protocols/oscar/oscar.c:126
+#: ../libpurple/protocols/oscar/oscar.c:127
 msgid "Refused by client"
 msgstr "Avvist av klienten"
 
-#: ../libpurple/protocols/oscar/oscar.c:127
+#: ../libpurple/protocols/oscar/oscar.c:128
 msgid "Reply too big"
 msgstr "Svaret er for stort"
 
-#: ../libpurple/protocols/oscar/oscar.c:128
+#: ../libpurple/protocols/oscar/oscar.c:129
 msgid "Responses lost"
 msgstr "Tapte svar"
 
-#: ../libpurple/protocols/oscar/oscar.c:129
+#: ../libpurple/protocols/oscar/oscar.c:130
 msgid "Request denied"
 msgstr "Førsepurnad avvist"
 
-#: ../libpurple/protocols/oscar/oscar.c:130
+#: ../libpurple/protocols/oscar/oscar.c:131
 msgid "Busted SNAC payload"
 msgstr "Ødelagt SNAC-pakkeinnhald"
 
-#: ../libpurple/protocols/oscar/oscar.c:131
+#: ../libpurple/protocols/oscar/oscar.c:132
 msgid "Insufficient rights"
 msgstr "Ikkje nok rettar"
 
-#: ../libpurple/protocols/oscar/oscar.c:132
+#: ../libpurple/protocols/oscar/oscar.c:133
 msgid "In local permit/deny"
 msgstr "I lokal tilgangs-/forbodsliste"
 
-#: ../libpurple/protocols/oscar/oscar.c:133
+#: ../libpurple/protocols/oscar/oscar.c:134
 msgid "Too evil (sender)"
 msgstr "For vond (sendar)"
 
-#: ../libpurple/protocols/oscar/oscar.c:134
+#: ../libpurple/protocols/oscar/oscar.c:135
 msgid "Too evil (receiver)"
 msgstr "For vond (mottakar)"
 
-#: ../libpurple/protocols/oscar/oscar.c:135
+#: ../libpurple/protocols/oscar/oscar.c:136
 msgid "User temporarily unavailable"
 msgstr "Brukaren er mellombels utilgjengeleg"
 
-#: ../libpurple/protocols/oscar/oscar.c:136
+#: ../libpurple/protocols/oscar/oscar.c:137
 msgid "No match"
 msgstr "Ikkje noko samsvar"
 
-#: ../libpurple/protocols/oscar/oscar.c:137
+#: ../libpurple/protocols/oscar/oscar.c:138
 msgid "List overflow"
 msgstr "Lista er full"
 
-#: ../libpurple/protocols/oscar/oscar.c:138
+#: ../libpurple/protocols/oscar/oscar.c:139
 msgid "Request ambiguous"
 msgstr "Uklar førespurnad"
 
-#: ../libpurple/protocols/oscar/oscar.c:139
+#: ../libpurple/protocols/oscar/oscar.c:140
 msgid "Queue full"
 msgstr "Køen er full"
 
-#: ../libpurple/protocols/oscar/oscar.c:140
+#: ../libpurple/protocols/oscar/oscar.c:141
 msgid "Not while on AOL"
 msgstr "Ikkje når pålogga AOL"
 
-#: ../libpurple/protocols/oscar/oscar.c:348
-msgid ""
-"(There was an error receiving this message.  The buddy you are speaking with "
-"is probably using a different encoding than expected.  If you know what "
-"encoding he is using, you can specify it in the advanced account options for "
-"your AIM/ICQ account.)"
-msgstr ""
-"(Det oppstod ein feil under mottaket av meldinga. Truleg nyttar vennen du "
-"pratar med ei anna teiknkoding enn rekna med. Om du veit kva teiknkoding han "
-"nyttar, kan du oppgje det i dei avanserte kontovala for AIM/ICQ-kontoen din.)"
+#: ../libpurple/protocols/oscar/oscar.c:347
+msgid "(There was an error receiving this message.  The buddy you are speaking with is probably using a different encoding than expected.  If you know what encoding he is using, you can specify it in the advanced account options for your AIM/ICQ account.)"
+msgstr "(Det oppstod ein feil under mottaket av meldinga. Truleg nyttar vennen du pratar med ei anna teiknkoding enn rekna med. Om du veit kva teiknkoding han nyttar, kan du oppgje det i dei avanserte kontovala for AIM/ICQ-kontoen din.)"
 
-#: ../libpurple/protocols/oscar/oscar.c:457
+#: ../libpurple/protocols/oscar/oscar.c:456
 #, c-format
-msgid ""
-"(There was an error receiving this message.  Either you and %s have "
-"different encodings selected, or %s has a buggy client.)"
-msgstr ""
-"(Det oppstod ein feil under mottaket av meldinga. Anten har du og %s vald "
-"ulike teiknkodingar, eller så nyttar %s ein klient med feil i.)"
+msgid "(There was an error receiving this message.  Either you and %s have different encodings selected, or %s has a buggy client.)"
+msgstr "(Det oppstod ein feil under mottaket av meldinga. Anten har du og %s vald ulike teiknkodingar, eller så nyttar %s ein klient med feil i.)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2387
-#: ../pidgin/gtkutils.c:2417
+#: ../libpurple/protocols/oscar/oscar.c:638
+#: ../pidgin/gtkutils.c:2444
+#: ../pidgin/gtkutils.c:2474
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:332
 msgid "Buddy Icon"
 msgstr "Venneikon"
 
-#: ../libpurple/protocols/oscar/oscar.c:642
+#: ../libpurple/protocols/oscar/oscar.c:641
 msgid "Voice"
 msgstr "Stemme"
 
-#: ../libpurple/protocols/oscar/oscar.c:645
+#: ../libpurple/protocols/oscar/oscar.c:644
 msgid "AIM Direct IM"
 msgstr "AIM direktelynmelding"
 
-#: ../libpurple/protocols/oscar/oscar.c:648
-#: ../libpurple/protocols/silc/silc.c:768
-#: ../libpurple/protocols/silc/util.c:553
-#: ../libpurple/protocols/silc10/silc.c:679
-#: ../libpurple/protocols/silc10/util.c:549
-msgid "Chat"
-msgstr "Prat"
-
-#: ../libpurple/protocols/oscar/oscar.c:651
-#: ../libpurple/protocols/oscar/oscar.c:6010
+#: ../libpurple/protocols/oscar/oscar.c:650
+#: ../libpurple/protocols/oscar/oscar.c:6113
 msgid "Get File"
 msgstr "Hent fil"
 
-#: ../libpurple/protocols/oscar/oscar.c:658
+#: ../libpurple/protocols/oscar/oscar.c:657
 msgid "Games"
 msgstr "Spel"
 
-#: ../libpurple/protocols/oscar/oscar.c:661
+#: ../libpurple/protocols/oscar/oscar.c:660
 msgid "Add-Ins"
 msgstr "Tillegg"
 
-#: ../libpurple/protocols/oscar/oscar.c:664
+#: ../libpurple/protocols/oscar/oscar.c:663
 msgid "Send Buddy List"
 msgstr "Send vennelista"
 
-#: ../libpurple/protocols/oscar/oscar.c:667
+#: ../libpurple/protocols/oscar/oscar.c:666
 msgid "ICQ Direct Connect"
 msgstr "ICQ direktetilkopling"
 
-#: ../libpurple/protocols/oscar/oscar.c:670
+#: ../libpurple/protocols/oscar/oscar.c:669
 msgid "AP User"
 msgstr "AP-brukar"
 
-#: ../libpurple/protocols/oscar/oscar.c:673
+#: ../libpurple/protocols/oscar/oscar.c:672
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: ../libpurple/protocols/oscar/oscar.c:676
+#: ../libpurple/protocols/oscar/oscar.c:675
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: ../libpurple/protocols/oscar/oscar.c:679
+#: ../libpurple/protocols/oscar/oscar.c:678
 msgid "ICQ Server Relay"
 msgstr "ICQ tenarvidaresending"
 
-#: ../libpurple/protocols/oscar/oscar.c:682
+#: ../libpurple/protocols/oscar/oscar.c:681
 msgid "Old ICQ UTF8"
 msgstr "Gammal ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:685
+#: ../libpurple/protocols/oscar/oscar.c:684
 msgid "Trillian Encryption"
 msgstr "Trillian-kryptiering"
 
-#: ../libpurple/protocols/oscar/oscar.c:688
+#: ../libpurple/protocols/oscar/oscar.c:687
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:691
+#: ../libpurple/protocols/oscar/oscar.c:690
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../libpurple/protocols/oscar/oscar.c:694
+#: ../libpurple/protocols/oscar/oscar.c:693
 msgid "Security Enabled"
 msgstr "Tryggleik er slått på"
 
-#: ../libpurple/protocols/oscar/oscar.c:697
+#: ../libpurple/protocols/oscar/oscar.c:696
 msgid "Video Chat"
 msgstr "Videoprat"
 
-#: ../libpurple/protocols/oscar/oscar.c:701
+#: ../libpurple/protocols/oscar/oscar.c:700
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../libpurple/protocols/oscar/oscar.c:704
+#: ../libpurple/protocols/oscar/oscar.c:703
 msgid "Live Video"
 msgstr "Sanntidsvideo"
 
-#: ../libpurple/protocols/oscar/oscar.c:707
+#: ../libpurple/protocols/oscar/oscar.c:706
 msgid "Camera"
 msgstr "Kamera"
 
-#: ../libpurple/protocols/oscar/oscar.c:725
-#: ../libpurple/protocols/oscar/oscar.c:5780
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:724
+#: ../libpurple/protocols/oscar/oscar.c:5883
 msgid "Free For Chat"
 msgstr "Ledig for prat"
 
-#: ../libpurple/protocols/oscar/oscar.c:729
-#: ../libpurple/protocols/oscar/oscar.c:5815
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:728
+#: ../libpurple/protocols/oscar/oscar.c:5918
 msgid "Not Available"
 msgstr "Ikkje tilgjengeleg"
 
-#: ../libpurple/protocols/oscar/oscar.c:731
-#: ../libpurple/protocols/oscar/oscar.c:5801
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:730
+#: ../libpurple/protocols/oscar/oscar.c:5904
 msgid "Occupied"
 msgstr "Oppteken"
 
-#: ../libpurple/protocols/oscar/oscar.c:735
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:734
 msgid "Web Aware"
 msgstr "Nettmedviten"
 
-#: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:183
-#: ../libpurple/protocols/qq/qq.c:288
-#: ../libpurple/protocols/yahoo/yahoo.c:3095 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1060
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:736
+#: ../libpurple/protocols/qq/qq.c:184
+#: ../libpurple/protocols/qq/qq.c:289
+#: ../libpurple/protocols/yahoo/yahoo.c:3132
+#: ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:557
+#: ../pidgin/gtkstatusbox.c:1084
 msgid "Invisible"
 msgstr "Usynleg"
 
-#: ../libpurple/protocols/oscar/oscar.c:739
-#, c-format
-msgid "Online"
-msgstr "Tilkopla"
-
-#: ../libpurple/protocols/oscar/oscar.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3707
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1126
+#: ../libpurple/protocols/oscar/oscar.c:837
+#: ../libpurple/protocols/oscar/oscar.c:3740
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:721
+#: ../pidgin/gtkprefs.c:1100
 msgid "IP Address"
 msgstr "IP-adresse"
 
-#: ../libpurple/protocols/oscar/oscar.c:845
-#: ../libpurple/protocols/oscar/oscar.c:2891
+#: ../libpurple/protocols/oscar/oscar.c:844
+#: ../libpurple/protocols/oscar/oscar.c:2952
 msgid "Warning Level"
 msgstr "Åtvaringsnivå"
 
-#: ../libpurple/protocols/oscar/oscar.c:855
+#: ../libpurple/protocols/oscar/oscar.c:854
 msgid "Buddy Comment"
 msgstr "Vennenotat"
 
-#: ../libpurple/protocols/oscar/oscar.c:995
+#: ../libpurple/protocols/oscar/oscar.c:994
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -8392,7 +9005,7 @@ msgstr ""
 "Klarte ikkje å kopla opp mot autentiseringstenaren:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1003
+#: ../libpurple/protocols/oscar/oscar.c:1002
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -8401,175 +9014,164 @@ msgstr ""
 "Klarte ikkje å kopla til BOS-tenaren:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1043
+#: ../libpurple/protocols/oscar/oscar.c:1042
 msgid "Screen name sent"
 msgstr "Brukarnamn er sendt"
 
-#: ../libpurple/protocols/oscar/oscar.c:1048
+#: ../libpurple/protocols/oscar/oscar.c:1047
 msgid "Connection established, cookie sent"
 msgstr "Oppretta samband, sendt informasjonskapsel"
 
 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1077
+#: ../libpurple/protocols/oscar/oscar.c:1076
 msgid "Finalizing connection"
 msgstr "Fullfører tilkoplinga"
 
-#: ../libpurple/protocols/oscar/oscar.c:1260
+#: ../libpurple/protocols/oscar/oscar.c:1302
 #, c-format
-msgid ""
-"Unable to login: Could not sign on as %s because the screen name is "
-"invalid.  Screen names must be a valid email address, or start with a letter "
-"and contain only letters, numbers and spaces, or contain only numbers."
-msgstr ""
-"Får ikkje til å logga på: klarer ikkje å logga på som %s fordi brukarnamnet "
-"er ugyldig. Brukarnamn må vera ei gyldig e-postadresse, eller begynna med "
-"ein bokstav og berre innehalda bokstavar. tal og mellomrom, eller berre "
-"innehalda tal."
+msgid "Unable to login: Could not sign on as %s because the screen name is invalid.  Screen names must be a valid email address, or start with a letter and contain only letters, numbers and spaces, or contain only numbers."
+msgstr "Får ikkje til å logga på: klarer ikkje å logga på som %s fordi brukarnamnet er ugyldig. Brukarnamn må vera ei gyldig e-postadresse, eller begynna med ein bokstav og berre innehalda bokstavar. tal og mellomrom, eller berre innehalda tal."
 
-#: ../libpurple/protocols/oscar/oscar.c:1345
-#: ../libpurple/protocols/yahoo/yahoo.c:2105
+#. Unregistered screen name
+#: ../libpurple/protocols/oscar/oscar.c:1388
+#: ../libpurple/protocols/yahoo/yahoo.c:2109
 msgid "Invalid screen name."
 msgstr "Ugyldig brukarnamn."
 
-#: ../libpurple/protocols/oscar/oscar.c:1352
-#: ../libpurple/protocols/qq/login_logout.c:483
-#: ../libpurple/protocols/simple/simple.c:1045
-#: ../libpurple/protocols/yahoo/yahoo.c:2126
+#: ../libpurple/protocols/oscar/oscar.c:1394
+#: ../libpurple/protocols/qq/login_logout.c:485
+#: ../libpurple/protocols/simple/simple.c:1112
+#: ../libpurple/protocols/yahoo/yahoo.c:2131
 msgid "Incorrect password."
 msgstr "Feil passord."
 
-#: ../libpurple/protocols/oscar/oscar.c:1357
+#. Suspended account
+#: ../libpurple/protocols/oscar/oscar.c:1398
 msgid "Your account is currently suspended."
 msgstr "Kontoen din er for tida sperra for bruk."
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1361
+#: ../libpurple/protocols/oscar/oscar.c:1402
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL si lynmeldingsteneste er mellombels utilgjengeleg."
 
-#: ../libpurple/protocols/oscar/oscar.c:1366
-#: ../libpurple/protocols/oscar/oscar.c:1377
-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."
-msgstr ""
-"Du har kopla til og blitt fråkopla for ofte. Vent i ti minutt og prøv igjen. "
-"Held du fram med å prøva, vil du måtta venta endå lenger."
+#. screen name connecting too frequently
+#. IP address connecting too frequently
+#: ../libpurple/protocols/oscar/oscar.c:1406
+#: ../libpurple/protocols/oscar/oscar.c:1415
+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."
+msgstr "Du har kopla til og blitt fråkopla for ofte. Vent i ti minutt og prøv igjen. Held du fram med å prøva, vil du måtta venta endå lenger."
 
-#: ../libpurple/protocols/oscar/oscar.c:1371
+#. client too old
+#: ../libpurple/protocols/oscar/oscar.c:1410
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "Klientversjonen du bruker er for gammal. Oppgrader på %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1410
+#: ../libpurple/protocols/oscar/oscar.c:1448
 msgid "Could Not Connect"
 msgstr "Klarte ikkje å kopla til"
 
-#: ../libpurple/protocols/oscar/oscar.c:1414
+#: ../libpurple/protocols/oscar/oscar.c:1452
 msgid "Received authorization"
 msgstr "Motteken melding"
 
-#: ../libpurple/protocols/oscar/oscar.c:1436
+#: ../libpurple/protocols/oscar/oscar.c:1475
 msgid "The SecurID key entered is invalid."
 msgstr "Den innskrivne SecurID-nøkkelen er ugyldig."
 
-#: ../libpurple/protocols/oscar/oscar.c:1449
+#: ../libpurple/protocols/oscar/oscar.c:1488
 msgid "Enter SecurID"
 msgstr "Skriv inn SecurID"
 
-#: ../libpurple/protocols/oscar/oscar.c:1450
+#: ../libpurple/protocols/oscar/oscar.c:1489
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Før opp dei seks tala frå den digitale teiknruta."
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1452
-#: ../libpurple/protocols/oscar/oscar.c:2232
-#: ../libpurple/protocols/oscar/oscar.c:2281
-#: ../libpurple/protocols/oscar/oscar.c:5885
-#: ../libpurple/protocols/oscar/oscar.c:6166 ../libpurple/request.h:1388
+#: ../libpurple/protocols/oscar/oscar.c:1491
+#: ../libpurple/protocols/oscar/oscar.c:2293
+#: ../libpurple/protocols/oscar/oscar.c:2342
+#: ../libpurple/protocols/oscar/oscar.c:5988
+#: ../libpurple/protocols/oscar/oscar.c:6269
+#: ../libpurple/request.h:1458
 msgid "_OK"
 msgstr "_OK"
 
-#: ../libpurple/protocols/oscar/oscar.c:1491
-#: ../libpurple/protocols/oscar/oscar.c:1534
+#: ../libpurple/protocols/oscar/oscar.c:1530
 #, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-"Du kan bli frå kopla snart. Du vil kanskje nytta TOC fram til dette blir "
-"ordna. Sjå på %s etter oppdateringar."
+msgid "You may be disconnected shortly.  You may want to use TOC until this is fixed.  Check %s for updates."
+msgstr "Du kan bli frå kopla snart. Du vil kanskje nytta TOC fram til dette blir ordna. Sjå på %s etter oppdateringar."
 
-#: ../libpurple/protocols/oscar/oscar.c:1494
-#: ../libpurple/protocols/oscar/oscar.c:1537
+#: ../libpurple/protocols/oscar/oscar.c:1533
+#: ../libpurple/protocols/oscar/oscar.c:1577
 msgid "Unable to get a valid AIM login hash."
 msgstr "Klarer ikkje å henta ein gyldig AIM påloggingsnøkkel."
 
-#: ../libpurple/protocols/oscar/oscar.c:1622
+#: ../libpurple/protocols/oscar/oscar.c:1574
+#: ../libpurple/protocols/oscar/oscar.c:1673
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "Du kan bli fråkopla snart. Sjå etter oppdateringar på %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:1625
+#: ../libpurple/protocols/oscar/oscar.c:1676
 msgid "Unable to get a valid login hash."
 msgstr "Klarer ikkje å henta ein gyldig påloggingsnøkkel."
 
-#: ../libpurple/protocols/oscar/oscar.c:1655
+#: ../libpurple/protocols/oscar/oscar.c:1706
 msgid "Password sent"
 msgstr "Passordet er sendt"
 
-#: ../libpurple/protocols/oscar/oscar.c:1711
+#: ../libpurple/protocols/oscar/oscar.c:1762
 msgid "Unable to initialize connection"
 msgstr "Klarte ikkje å setja i gang sambandet"
 
-#: ../libpurple/protocols/oscar/oscar.c:2202
+#: ../libpurple/protocols/oscar/oscar.c:2251
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Om du godtek meg, kan eg leggja deg til i vennelista mi."
 
-#: ../libpurple/protocols/oscar/oscar.c:2230
+#: ../libpurple/protocols/oscar/oscar.c:2291
 msgid "Authorization Request Message:"
 msgstr "Godtakingførespurnad:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2231
+#: ../libpurple/protocols/oscar/oscar.c:2292
 msgid "Please authorize me!"
 msgstr "Gjer vel og godta meg."
 
-#: ../libpurple/protocols/oscar/oscar.c:2272
-#: ../libpurple/protocols/oscar/oscar.c:2280
-#: ../libpurple/protocols/oscar/oscar.c:2407
-#: ../libpurple/protocols/oscar/oscar.c:5263
-#: ../libpurple/protocols/yahoo/yahoo.c:1030
+#: ../libpurple/protocols/oscar/oscar.c:2333
+#: ../libpurple/protocols/oscar/oscar.c:2341
+#: ../libpurple/protocols/oscar/oscar.c:2468
+#: ../libpurple/protocols/oscar/oscar.c:5360
+#: ../libpurple/protocols/yahoo/yahoo.c:991
 msgid "No reason given."
 msgstr "Ingen årsak oppgjeven."
 
-#: ../libpurple/protocols/oscar/oscar.c:2279
+#: ../libpurple/protocols/oscar/oscar.c:2340
 msgid "Authorization Denied Message:"
 msgstr "Avvist godtaking:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2407
+#: ../libpurple/protocols/oscar/oscar.c:2468
 #, c-format
 msgid ""
-"The user %u has denied your request to add them to your buddy list for the "
-"following reason:\n"
+"The user %u has denied your request to add them to your buddy list for the following reason:\n"
 "%s"
 msgstr ""
-"Brukaren %u har avvist førespurnaden din om å leggja dei til vennelista di. "
-"Ã…rsak:\n"
+"Brukaren %u har avvist førespurnaden din om å leggja dei til vennelista di. Årsak:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2408
+#: ../libpurple/protocols/oscar/oscar.c:2469
 msgid "ICQ authorization denied."
 msgstr "ICQ-godtaking avvist."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2415
+#: ../libpurple/protocols/oscar/oscar.c:2476
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "Brukaren %u har gjeve deg løyve til å leggja dei til i vennelista di."
 
-#: ../libpurple/protocols/oscar/oscar.c:2423
+#: ../libpurple/protocols/oscar/oscar.c:2484
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8582,7 +9184,7 @@ msgstr ""
 "Frå:%s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2431
+#: ../libpurple/protocols/oscar/oscar.c:2492
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8595,7 +9197,7 @@ msgstr ""
 "Frå:%s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2439
+#: ../libpurple/protocols/oscar/oscar.c:2500
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -8608,61 +9210,60 @@ msgstr ""
 "Meldinga er:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2460
+#: ../libpurple/protocols/oscar/oscar.c:2521
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ-brukaren %u har sendt deg ein venn: %s [%s]"
 
-#: ../libpurple/protocols/oscar/oscar.c:2466
+#: ../libpurple/protocols/oscar/oscar.c:2527
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Vil du leggja til denne vennen i vennelista di?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2471 ../pidgin/gtkroomlist.c:309
+#: ../libpurple/protocols/oscar/oscar.c:2532
+#: ../pidgin/gtkroomlist.c:320
 msgid "_Add"
 msgstr "L_egg til"
 
-#: ../libpurple/protocols/oscar/oscar.c:2472
+#: ../libpurple/protocols/oscar/oscar.c:2533
 msgid "_Decline"
 msgstr "_Avvis"
 
-#: ../libpurple/protocols/oscar/oscar.c:2596
+#: ../libpurple/protocols/oscar/oscar.c:2657
 #, 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 fekk ikkje %hu melding frå %s sia ho var ugyldig."
 msgstr[1] "Du fekk ikkje %hu meldingar frå %s sia dei var ugyldige."
 
-#: ../libpurple/protocols/oscar/oscar.c:2605
+#: ../libpurple/protocols/oscar/oscar.c:2666
 #, 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 fekk ikkje %hu melding frå %s fordi ho var for stor."
 msgstr[1] "Du fekk ikkje %hu meldingar frå %s fordi dei var for store."
 
-#: ../libpurple/protocols/oscar/oscar.c:2614
+#: ../libpurple/protocols/oscar/oscar.c:2675
 #, c-format
-msgid ""
-"You missed %hu message from %s because the rate limit has been exceeded."
-msgid_plural ""
-"You missed %hu messages from %s because the rate limit has been exceeded."
+msgid "You missed %hu message from %s because the rate limit has been exceeded."
+msgid_plural "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] "Du fekk ikkje %hu melding frå %s sia mengdegrensa er overskriden."
 msgstr[1] "Du fekk ikkje %hu meldingar frå %s sia mengdegrensa er overskriden."
 
-#: ../libpurple/protocols/oscar/oscar.c:2623
+#: ../libpurple/protocols/oscar/oscar.c:2684
 #, 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."
 msgstr[0] "Du fekk ikkje %hu melding frå %s sia han/ho er for vond."
 msgstr[1] "Du fekk ikkje %hu meldingar frå %s sia han/ho er for vond."
 
-#: ../libpurple/protocols/oscar/oscar.c:2632
+#: ../libpurple/protocols/oscar/oscar.c:2693
 #, 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 fekk ikkje %hu melding frå %s sia du er for vond."
 msgstr[1] "Du fekk ikkje %hu meldingar frå %s sia du er for vond."
 
-#: ../libpurple/protocols/oscar/oscar.c:2641
+#: ../libpurple/protocols/oscar/oscar.c:2702
 #, 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."
@@ -8670,575 +9271,473 @@ msgstr[1] "Du fekk ikkje %hu meldingar f
 msgstr[1] "Du fekk ikkje %hu meldingar frå %s av uviss årsak."
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2796
+#: ../libpurple/protocols/oscar/oscar.c:2857
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Klarer ikkje å senda melding: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2796
-#: ../libpurple/protocols/oscar/oscar.c:2801
-#: ../libpurple/protocols/oscar/oscar.c:2865
+#: ../libpurple/protocols/oscar/oscar.c:2857
+#: ../libpurple/protocols/oscar/oscar.c:2862
+#: ../libpurple/protocols/oscar/oscar.c:2926
 msgid "Unknown reason."
 msgstr "Ukjend årsak."
 
-#: ../libpurple/protocols/oscar/oscar.c:2799
-#: ../libpurple/protocols/sametime/sametime.c:2409
+#: ../libpurple/protocols/oscar/oscar.c:2860
+#: ../libpurple/protocols/sametime/sametime.c:2459
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Klarte ikkje å senda til %s:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2865
+#: ../libpurple/protocols/oscar/oscar.c:2926
 #, c-format
 msgid "User information not available: %s"
 msgstr "Brukarinformasjon er ikkje tilgjengeleg: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2896
+#: ../libpurple/protocols/oscar/oscar.c:2957
 msgid "Online Since"
 msgstr "Tilkopla sia"
 
-#: ../libpurple/protocols/oscar/oscar.c:2901
+#: ../libpurple/protocols/oscar/oscar.c:2962
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
 msgstr "Medlem sia"
 
-#: ../libpurple/protocols/oscar/oscar.c:2936
+#: ../libpurple/protocols/oscar/oscar.c:2997
 msgid "Available Message"
 msgstr "Tilgjengeleg melding"
 
-#: ../libpurple/protocols/oscar/oscar.c:3044
+#: ../libpurple/protocols/oscar/oscar.c:3101
 msgid "Your AIM connection may be lost."
 msgstr "AIM-sambandet kan vera tapt."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3232
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
-msgstr ""
-"Klarer ikkje visa ei melding frå denne brukaren: ho inneheldt ulovlege "
-"teikn.]"
+#: ../libpurple/protocols/oscar/oscar.c:3289
+msgid "[Unable to display a message from this user because it contained invalid characters.]"
+msgstr "Klarer ikkje visa ei melding frå denne brukaren: ho inneheldt ulovlege teikn.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3396
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again."
-msgstr ""
-"Klarte ikkje å utføra den siste handlinga sia du er over mengdegrensa. Vent "
-"i 10 minutt og prøv igjen."
+#: ../libpurple/protocols/oscar/oscar.c:3453
+msgid "The last action you attempted could not be performed because you are over the rate limit. Please wait 10 seconds and try again."
+msgstr "Klarte ikkje å utføra den siste handlinga sia du er over mengdegrensa. Vent i 10 minutt og prøv igjen."
 
-#: ../libpurple/protocols/oscar/oscar.c:3479
+#: ../libpurple/protocols/oscar/oscar.c:3538
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Du er blitt fråkopla praterommet %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3729
-#: ../libpurple/protocols/silc/util.c:585
+#: ../libpurple/protocols/oscar/oscar.c:3762
+#: ../libpurple/protocols/silc/util.c:591
 #: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: ../libpurple/protocols/oscar/oscar.c:3759
+#: ../libpurple/protocols/oscar/oscar.c:3792
 msgid "Personal Web Page"
 msgstr "Personelg nettside"
 
-#: ../libpurple/protocols/oscar/oscar.c:3783
+#: ../libpurple/protocols/oscar/oscar.c:3816
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Tilleggsinformasjon"
 
-#: ../libpurple/protocols/oscar/oscar.c:3791
-#: ../libpurple/protocols/oscar/oscar.c:3804
+#: ../libpurple/protocols/oscar/oscar.c:3824
+#: ../libpurple/protocols/oscar/oscar.c:3837
 msgid "Zip Code"
 msgstr "Postnummer"
 
-#: ../libpurple/protocols/oscar/oscar.c:3815
+#: ../libpurple/protocols/oscar/oscar.c:3848
 msgid "Division"
 msgstr "Avdeling"
 
-#: ../libpurple/protocols/oscar/oscar.c:3816
+#: ../libpurple/protocols/oscar/oscar.c:3849
 msgid "Position"
 msgstr "Stilling"
 
-#: ../libpurple/protocols/oscar/oscar.c:3818
+#: ../libpurple/protocols/oscar/oscar.c:3851
 msgid "Web Page"
 msgstr "Nettside"
 
-#: ../libpurple/protocols/oscar/oscar.c:3821
+#: ../libpurple/protocols/oscar/oscar.c:3854
 msgid "Work Information"
 msgstr "Arbeidsinformasjon"
 
-#: ../libpurple/protocols/oscar/oscar.c:3877
+#: ../libpurple/protocols/oscar/oscar.c:3910
 msgid "Pop-Up Message"
 msgstr "Sprettoppmelding"
 
-#: ../libpurple/protocols/oscar/oscar.c:3917
+#: ../libpurple/protocols/oscar/oscar.c:3950
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "Dette brukarnamnet er knytt til %s"
 msgstr[1] "Desse brukarnamna er knytte til %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3922
+#: ../libpurple/protocols/oscar/oscar.c:3955
 msgid "Screen name"
 msgstr "Brukarnamn"
 
-#: ../libpurple/protocols/oscar/oscar.c:3948
+#: ../libpurple/protocols/oscar/oscar.c:3981
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "Ingen resultat funnen for e-postadressa %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3969
+#: ../libpurple/protocols/oscar/oscar.c:4002
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Du vil få ei e-postmelding der du blir spurt om å stadfesta %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3971
+#: ../libpurple/protocols/oscar/oscar.c:4004
 msgid "Account Confirmation Requested"
 msgstr "Bede om kontostadfesting"
 
-#: ../libpurple/protocols/oscar/oscar.c:4002
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:4035
 msgid "Error Changing Account Info"
 msgstr "Feil ved endring av kontoinformasjon"
 
-#: ../libpurple/protocols/oscar/oscar.c:4005
+#: ../libpurple/protocols/oscar/oscar.c:4038
 #, c-format
-msgid ""
-"Error 0x%04x: Unable to format screen name because the requested screen name "
-"differs from the original."
-msgstr ""
-"Feil 0x%04x: kan ikkje formatera brukarnamnet sia det førespurde namnet "
-"ikkje samsvarer med originalen."
+msgid "Error 0x%04x: Unable to format screen name because the requested screen name differs from the original."
+msgstr "Feil 0x%04x: kan ikkje formatera brukarnamnet sia det førespurde namnet ikkje samsvarer med originalen."
 
-#: ../libpurple/protocols/oscar/oscar.c:4008
+#: ../libpurple/protocols/oscar/oscar.c:4041
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr "Feil 0x%04x: kan ikkje formatera brukarnamnet sia det er ugyldig."
 
-#: ../libpurple/protocols/oscar/oscar.c:4011
+#: ../libpurple/protocols/oscar/oscar.c:4044
 #, c-format
-msgid ""
-"Error 0x%04x: Unable to format screen name because the requested screen name "
-"is too long."
-msgstr ""
-"Feil 0x%04x: kan ikkje formatera brukarnamnet sia det førespurde namnet er "
-"for langt."
+msgid "Error 0x%04x: Unable to format screen name because the requested screen name is too long."
+msgstr "Feil 0x%04x: kan ikkje formatera brukarnamnet sia det førespurde namnet er for langt."
 
-#: ../libpurple/protocols/oscar/oscar.c:4014
+#: ../libpurple/protocols/oscar/oscar.c:4047
 #, c-format
-msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
-"request pending for this screen name."
-msgstr ""
-"Feil 0x%04x: kan ikkje endra e-postadressa sia det allereie finst ein "
-"førespurnad for dette brukarnamnet."
+msgid "Error 0x%04x: Unable to change e-mail address because there is already a request pending for this screen name."
+msgstr "Feil 0x%04x: kan ikkje endra e-postadressa sia det allereie finst ein førespurnad for dette brukarnamnet."
 
-#: ../libpurple/protocols/oscar/oscar.c:4017
+#: ../libpurple/protocols/oscar/oscar.c:4050
 #, c-format
-msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
-"too many screen names associated with it."
-msgstr ""
-"Feil 0x%04x: kan ikkje endra e-postadressa sia den oppgjevne adressa har for "
-"mange brukarnamn knytte til seg."
+msgid "Error 0x%04x: Unable to change e-mail address because the given address has too many screen names associated with it."
+msgstr "Feil 0x%04x: kan ikkje endra e-postadressa sia den oppgjevne adressa har for mange brukarnamn knytte til seg."
 
-#: ../libpurple/protocols/oscar/oscar.c:4020
+#: ../libpurple/protocols/oscar/oscar.c:4053
 #, c-format
-msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
-"invalid."
-msgstr ""
-"Feil 0x%04x: kan ikkje endra e-postadressa sia den oppgjevne adressa er "
-"ugyldig."
+msgid "Error 0x%04x: Unable to change e-mail address because the given address is invalid."
+msgstr "Feil 0x%04x: kan ikkje endra e-postadressa sia den oppgjevne adressa er ugyldig."
 
-#: ../libpurple/protocols/oscar/oscar.c:4023
+#: ../libpurple/protocols/oscar/oscar.c:4056
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Error 0x%04x: ukjent feil."
 
-#: ../libpurple/protocols/oscar/oscar.c:4033
+#: ../libpurple/protocols/oscar/oscar.c:4066
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "E-postadressa til %s er %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4035
+#: ../libpurple/protocols/oscar/oscar.c:4068
 msgid "Account Info"
 msgstr "Konto-info"
 
-#: ../libpurple/protocols/oscar/oscar.c:4218
-msgid ""
-"Your IM Image was not sent. You must be Direct Connected to send IM Images."
-msgstr ""
-"Lynmeldingsbiletet blei ikkje sendt. Du må vera direkte tilkopla for å kunna "
-"senda lynmeldingsbilete."
+#: ../libpurple/protocols/oscar/oscar.c:4251
+msgid "Your IM Image was not sent. You must be Direct Connected to send IM Images."
+msgstr "Lynmeldingsbiletet blei ikkje sendt. Du må vera direkte tilkopla for å kunna senda lynmeldingsbilete."
 
-#: ../libpurple/protocols/oscar/oscar.c:4489
+#: ../libpurple/protocols/oscar/oscar.c:4520
 msgid "Unable to set AIM profile."
-msgstr "Klarer ikkje å lagra AIM-profilen."
+msgstr "Klarer ikkje å velja AIM-profil."
 
-#: ../libpurple/protocols/oscar/oscar.c:4490
-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 "
-"fully connected."
-msgstr ""
-"Du har truleg bede om å få lagra profilen din før pålogginga var ferdig. "
-"Profilen din er ikkje lagra - prøv igjen når du er heilt tilkopla."
+#: ../libpurple/protocols/oscar/oscar.c:4521
+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 fully connected."
+msgstr "Du har truleg bede om å få lagra profilen din før pålogginga var ferdig. Profilen din er ikkje lagra - prøv igjen når du er heilt tilkopla."
 
-#: ../libpurple/protocols/oscar/oscar.c:4504
+#: ../libpurple/protocols/oscar/oscar.c:4535
 #, c-format
-msgid ""
-"The maximum profile length of %d byte has been exceeded.  It has been "
-"truncated for you."
-msgid_plural ""
-"The maximum profile length of %d bytes has been exceeded.  It has been "
-"truncated for you."
-msgstr[0] ""
-"Den høgste profilstorleiken på %d bytar er overskriden. Han er blitt "
-"forkorta."
-msgstr[1] ""
-"The maximum profile length of %d bytes has been exceeded.  It has been "
-"truncated for you."
+msgid "The maximum profile length of %d byte has been exceeded.  It has been truncated for you."
+msgid_plural "The maximum profile length of %d bytes has been exceeded.  It has been truncated for you."
+msgstr[0] "Den høgste profilstorleiken på %d bytar er overskriden. Han er blitt forkorta."
+msgstr[1] "The maximum profile length of %d bytes has been exceeded.  It has been truncated for you."
 
-#: ../libpurple/protocols/oscar/oscar.c:4509
+#: ../libpurple/protocols/oscar/oscar.c:4540
 msgid "Profile too long."
 msgstr "Profilen er for lang."
 
-#: ../libpurple/protocols/oscar/oscar.c:4554
+#: ../libpurple/protocols/oscar/oscar.c:4584
 #, c-format
-msgid ""
-"The maximum away message length of %d byte has been exceeded.  It has been "
-"truncated for you."
-msgid_plural ""
-"The maximum away message length of %d bytes has been exceeded.  It has been "
-"truncated for you."
-msgstr[0] ""
-"Du har overskride maksimum lengd (%d bytar) på fråværsmeldinga. Meldinga er "
-"blitt forkorta."
-msgstr[1] ""
-"Du har overskride maksimum lengd (%d bytar) på fråværsmeldinga. Meldinga er "
-"blitt forkorta."
+msgid "The maximum away message length of %d byte has been exceeded.  It has been truncated for you."
+msgid_plural "The maximum away message length of %d bytes has been exceeded.  It has been truncated for you."
+msgstr[0] "Du har overskride maksimum lengd (%d bytar) på fråværsmeldinga. Meldinga er blitt forkorta."
+msgstr[1] "Du har overskride maksimum lengd (%d bytar) på fråværsmeldinga. Meldinga er blitt forkorta."
 
-#: ../libpurple/protocols/oscar/oscar.c:4559
+#: ../libpurple/protocols/oscar/oscar.c:4589
 msgid "Away message too long."
 msgstr "Fråværsmeldinga er for lang."
 
-#: ../libpurple/protocols/oscar/oscar.c:4628
+#: ../libpurple/protocols/oscar/oscar.c:4662
 #, c-format
-msgid ""
-"Could not add the buddy %s because the screen name is invalid.  Screen names "
-"must be a valid email address, or start with a letter and contain only "
-"letters, numbers and spaces, or contain only numbers."
-msgstr ""
-"Klarte ikkje å leggja til vennen %s fordi brukarnamnet ikkje er gyldig. "
-"Brukarnamn må vera ei gyldig e-postadresse, eller begynna med ein bokstav og "
-"berre innehalda bokstavar. tal og mellomrom, eller berre innehalda tal."
+msgid "Could not add the buddy %s because the screen name is invalid.  Screen names must be a valid email address, or start with a letter and contain only letters, numbers and spaces, or contain only numbers."
+msgstr "Klarte ikkje å leggja til vennen %s fordi brukarnamnet ikkje er gyldig. Brukarnamn må vera ei gyldig e-postadresse, eller begynna med ein bokstav og berre innehalda bokstavar. tal og mellomrom, eller berre innehalda tal."
 
-#: ../libpurple/protocols/oscar/oscar.c:4630
-#: ../libpurple/protocols/oscar/oscar.c:5060
-#: ../libpurple/protocols/oscar/oscar.c:5075
+#: ../libpurple/protocols/oscar/oscar.c:4664
+#: ../libpurple/protocols/oscar/oscar.c:5129
+#: ../libpurple/protocols/oscar/oscar.c:5144
 msgid "Unable To Add"
 msgstr "Klarer ikkje å leggja til"
 
-#: ../libpurple/protocols/oscar/oscar.c:4739
+#: ../libpurple/protocols/oscar/oscar.c:4783
 msgid "Unable To Retrieve Buddy List"
 msgstr "Klarer ikkje å henta vennelista"
 
-#: ../libpurple/protocols/oscar/oscar.c:4740
-msgid ""
-"The AIM servers were temporarily unable to send your buddy list.  Your buddy "
-"list is not lost, and will probably become available in a few hours."
-msgstr ""
-"AIM-tenarane er mellombels ute av stand til å senda vennelista di. Lista er "
-"ikkje tapt - ho vil truleg vera tilgjengeleg igjen om nokre timar."
+#: ../libpurple/protocols/oscar/oscar.c:4784
+msgid "The AIM servers were temporarily unable to send your buddy list.  Your buddy list is not lost, and will probably become available in a few minutes."
+msgstr "AIM-tenarane var mellombels ute av stand til å senda vennelista di. Lista er ikkje tapt - ho vil truleg vera tilgjengeleg igjen om nokre minutt."
 
-#: ../libpurple/protocols/oscar/oscar.c:4922
-#: ../libpurple/protocols/oscar/oscar.c:4924
-#: ../libpurple/protocols/oscar/oscar.c:5140
-#: ../libpurple/protocols/oscar/oscar.c:5141
-#: ../libpurple/protocols/oscar/oscar.c:5146
+#: ../libpurple/protocols/oscar/oscar.c:4979
+#: ../libpurple/protocols/oscar/oscar.c:4981
+#: ../libpurple/protocols/oscar/oscar.c:5211
+#: ../libpurple/protocols/oscar/oscar.c:5212
+#: ../libpurple/protocols/oscar/oscar.c:5217
 msgid "Orphans"
 msgstr "Foreldrelause"
 
-#: ../libpurple/protocols/oscar/oscar.c:5058
+#: ../libpurple/protocols/oscar/oscar.c:5127
 #, c-format
-msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
-"list.  Please remove one and try again."
-msgstr ""
-"Kan ikkje leggja til vennen %s sia vennelista er full. Slett ein venn frå "
-"lista og prøv igjen."
+msgid "Could not add the buddy %s because you have too many buddies in your buddy list.  Please remove one and try again."
+msgstr "Kan ikkje leggja til vennen %s sia vennelista er full. Slett ein venn frå lista og prøv igjen."
 
-#: ../libpurple/protocols/oscar/oscar.c:5058
-#: ../libpurple/protocols/oscar/oscar.c:5073
+#: ../libpurple/protocols/oscar/oscar.c:5127
+#: ../libpurple/protocols/oscar/oscar.c:5142
 msgid "(no name)"
 msgstr "(ikkje noko namn)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5072
+#: ../libpurple/protocols/oscar/oscar.c:5141
 #, c-format
 msgid "Could not add the buddy %s for an unknown reason."
 msgstr "Klarte ikkje av ukjend årsak å leggja til vennen %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:5178
+#: ../libpurple/protocols/oscar/oscar.c:5275
 #, c-format
-msgid ""
-"The user %s has given you permission to add you to their buddy list.  Do you "
-"want to add them?"
-msgstr ""
-"The user %s has given you permission to add you to their buddy list.  Do you "
-"want to add them?"
+msgid "The user %s has given you permission to add you to their buddy list.  Do you want to add them?"
+msgstr "The user %s has given you permission to add you to their buddy list.  Do you want to add them?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5186
+#: ../libpurple/protocols/oscar/oscar.c:5283
 msgid "Authorization Given"
 msgstr "Godkjent"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5259
+#: ../libpurple/protocols/oscar/oscar.c:5356
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "Brukaren %s har gjeve deg løyve til å leggja dei til vennelista di."
 
-#: ../libpurple/protocols/oscar/oscar.c:5260
+#: ../libpurple/protocols/oscar/oscar.c:5357
 msgid "Authorization Granted"
 msgstr "Godkjent"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5263
+#: ../libpurple/protocols/oscar/oscar.c:5360
 #, c-format
 msgid ""
-"The user %s has denied your request to add them to your buddy list for the "
-"following reason:\n"
+"The user %s has denied your request to add them to your buddy list for the following reason:\n"
 "%s"
 msgstr ""
-"Brukaren %s har avslått førespurnaden din om å få leggja dei til vennelista "
-"di. Ã…rsaka er: \n"
+"Brukaren %s har avslått førespurnaden din om å få leggja dei til vennelista di. Årsaka er: \n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5264
+#: ../libpurple/protocols/oscar/oscar.c:5361
 msgid "Authorization Denied"
 msgstr "Godkjenning avvist"
 
-#: ../libpurple/protocols/oscar/oscar.c:5300
+#: ../libpurple/protocols/oscar/oscar.c:5397
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Exchange:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5340
-msgid "Invalid chat name specified."
-msgstr "Det oppgjevne pratenamnet er ugyldig."
-
-#: ../libpurple/protocols/oscar/oscar.c:5409
+#: ../libpurple/protocols/oscar/oscar.c:5510
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
-msgstr ""
-"Biletet blei ikkje sendt. Du kan ikkje senda lynmeldingsbilete i AIM-"
-"praterom."
+msgstr "Biletet blei ikkje sendt. Du kan ikkje senda lynmeldingsbilete i AIM-praterom."
 
-#: ../libpurple/protocols/oscar/oscar.c:5569
-#: ../libpurple/protocols/oscar/oscar.c:5574
+#: ../libpurple/protocols/oscar/oscar.c:5672
+#: ../libpurple/protocols/oscar/oscar.c:5677
 msgid "Away Message"
 msgstr "Fråværsmelding"
 
-#: ../libpurple/protocols/oscar/oscar.c:5574
+#: ../libpurple/protocols/oscar/oscar.c:5677
 msgid "<i>(retrieving)</i>"
 msgstr " <i>(hentar)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5774
+#: ../libpurple/protocols/oscar/oscar.c:5877
 msgid "iTunes Music Store Link"
 msgstr "Lenkje til iTunes Music Store"
 
-#: ../libpurple/protocols/oscar/oscar.c:5882
+#: ../libpurple/protocols/oscar/oscar.c:5985
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Vennenotat for %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5883
+#: ../libpurple/protocols/oscar/oscar.c:5986
 msgid "Buddy Comment:"
 msgstr "Vennemerknad:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5930
+#: ../libpurple/protocols/oscar/oscar.c:6033
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Du har valt å opna eit direkte lynmeldingssamband med %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:5934
-msgid ""
-"Because this reveals your IP address, it may be considered a security risk.  "
-"Do you wish to continue?"
-msgstr ""
-"Handlinga kan medføra ein tryggleiksrisikio fordi ho avslører IP-adressa di. "
-"Vil du fortsetja?"
+#: ../libpurple/protocols/oscar/oscar.c:6037
+msgid "Because this reveals your IP address, it may be considered a security risk.  Do you wish to continue?"
+msgstr "Handlinga kan medføra ein tryggleiksrisikio fordi ho avslører IP-adressa di. Vil du fortsetja?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5940
-#: ../libpurple/protocols/oscar/peer.c:1045
+#: ../libpurple/protocols/oscar/oscar.c:6043
+#: ../libpurple/protocols/oscar/peer.c:1047
 msgid "C_onnect"
 msgstr "_Koplar til"
 
-#: ../libpurple/protocols/oscar/oscar.c:5975
+#: ../libpurple/protocols/oscar/oscar.c:6078
 msgid "Get AIM Info"
 msgstr "Hent _AIM-informasjon"
 
-#: ../libpurple/protocols/oscar/oscar.c:5981
+#: ../libpurple/protocols/oscar/oscar.c:6084
 msgid "Edit Buddy Comment"
 msgstr "Endra vennemerknad"
 
-#: ../libpurple/protocols/oscar/oscar.c:5989
+#: ../libpurple/protocols/oscar/oscar.c:6092
 msgid "Get Status Msg"
 msgstr "Hent statusmelding"
 
-#: ../libpurple/protocols/oscar/oscar.c:6002
+#: ../libpurple/protocols/oscar/oscar.c:6105
 msgid "Direct IM"
 msgstr "Direktelynmelding"
 
-#: ../libpurple/protocols/oscar/oscar.c:6024
+#: ../libpurple/protocols/oscar/oscar.c:6127
 msgid "Re-request Authorization"
 msgstr "Spør om ny godkjenning"
 
-#: ../libpurple/protocols/oscar/oscar.c:6083
+#: ../libpurple/protocols/oscar/oscar.c:6186
 msgid "Require authorization"
 msgstr "Krev autorisasjon"
 
-#: ../libpurple/protocols/oscar/oscar.c:6086
+#: ../libpurple/protocols/oscar/oscar.c:6189
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Nettnærvær (å slå på dette gjer at du kjem til å få søppelpost!)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6091
+#: ../libpurple/protocols/oscar/oscar.c:6194
 msgid "ICQ Privacy Options"
 msgstr "ICQ personvernval"
 
-#: ../libpurple/protocols/oscar/oscar.c:6110
+#: ../libpurple/protocols/oscar/oscar.c:6213
 msgid "The new formatting is invalid."
 msgstr "Den nye formateringa er ugyldig."
 
-#: ../libpurple/protocols/oscar/oscar.c:6111
+#: ../libpurple/protocols/oscar/oscar.c:6214
 msgid "Screen name formatting can change only capitalization and whitespace."
-msgstr ""
-"Formatering av brukarnamnet vil berre endra store/små bokstavar og "
-"blankteikn."
+msgstr "Formatering av brukarnamnet vil berre endra store/små bokstavar og blankteikn."
 
-#: ../libpurple/protocols/oscar/oscar.c:6164
+#: ../libpurple/protocols/oscar/oscar.c:6267
 msgid "Change Address To:"
 msgstr "Endra adressa til:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6210
+#: ../libpurple/protocols/oscar/oscar.c:6313
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>du ventar ikkje på godkjenning</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6213
+#: ../libpurple/protocols/oscar/oscar.c:6316
 msgid "You are awaiting authorization from the following buddies"
 msgstr "De ventar på godkjenning frå desse vennane"
 
-#: ../libpurple/protocols/oscar/oscar.c:6214
-msgid ""
-"You can re-request authorization from these buddies by right-clicking on "
-"them and selecting \"Re-request Authorization.\""
-msgstr ""
-"Du kan be om godkjenning frå desse vennane igjen ved å høgreklikka dei og "
-"velja \"Spør om ny godkjenning.\""
+#: ../libpurple/protocols/oscar/oscar.c:6317
+msgid "You can re-request authorization from these buddies by right-clicking on them and selecting \"Re-request Authorization.\""
+msgstr "Du kan be om godkjenning frå desse vennane igjen ved å høgreklikka dei og velja \"Spør om ny godkjenning.\""
 
-#: ../libpurple/protocols/oscar/oscar.c:6231
+#: ../libpurple/protocols/oscar/oscar.c:6334
 msgid "Find Buddy by E-Mail"
 msgstr "Finn venn utfrå e-postadessa"
 
-#: ../libpurple/protocols/oscar/oscar.c:6232
+#: ../libpurple/protocols/oscar/oscar.c:6335
 msgid "Search for a buddy by e-mail address"
 msgstr "Bruk e-postadressa til å søkja etter ein venn"
 
-#: ../libpurple/protocols/oscar/oscar.c:6233
+#: ../libpurple/protocols/oscar/oscar.c:6336
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Skriv inn e-postadressa til vennen du leiter etter."
 
-#: ../libpurple/protocols/oscar/oscar.c:6236
+#: ../libpurple/protocols/oscar/oscar.c:6339
 msgid "_Search"
 msgstr "_Søk"
 
-#: ../libpurple/protocols/oscar/oscar.c:6394
+#: ../libpurple/protocols/oscar/oscar.c:6497
 msgid "Set User Info (URL)..."
 msgstr "Skriv inn brukarinfo (URL)…"
 
-#: ../libpurple/protocols/oscar/oscar.c:6405
+#: ../libpurple/protocols/oscar/oscar.c:6508
 msgid "Change Password (URL)"
 msgstr "Endra passord (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6409
+#: ../libpurple/protocols/oscar/oscar.c:6512
 msgid "Configure IM Forwarding (URL)"
 msgstr "Innstillingar for vidaresending (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6419
+#: ../libpurple/protocols/oscar/oscar.c:6522
 msgid "Set Privacy Options..."
 msgstr "Personvernval…"
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6426
+#: ../libpurple/protocols/oscar/oscar.c:6529
 msgid "Confirm Account"
 msgstr "Stadfest konto"
 
-#: ../libpurple/protocols/oscar/oscar.c:6430
+#: ../libpurple/protocols/oscar/oscar.c:6533
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Vis noverande registrerte e-postadresse"
 
-#: ../libpurple/protocols/oscar/oscar.c:6434
+#: ../libpurple/protocols/oscar/oscar.c:6537
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Endra noverande registrerte e-postadresse…"
 
-#: ../libpurple/protocols/oscar/oscar.c:6441
+#: ../libpurple/protocols/oscar/oscar.c:6544
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Vis vennar som ventar på godkjenning"
 
-#: ../libpurple/protocols/oscar/oscar.c:6447
+#: ../libpurple/protocols/oscar/oscar.c:6550
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Bruk e-postadressa til å søkja etter ein venn…"
 
-#: ../libpurple/protocols/oscar/oscar.c:6452
+#: ../libpurple/protocols/oscar/oscar.c:6555
 msgid "Search for Buddy by Information"
 msgstr "Søk etter venn utfrå opplysningar"
 
-#: ../libpurple/protocols/oscar/oscar.c:6520
-msgid "Use recent buddies group"
-msgstr "Bruk seinaste vennegruppe"
-
-#: ../libpurple/protocols/oscar/oscar.c:6523
-msgid "Show how long you have been idle"
-msgstr "Vis kor lenge du har vore uverksam"
-
-#: ../libpurple/protocols/oscar/oscar.c:6678
+#: ../libpurple/protocols/oscar/oscar.c:6754
 msgid ""
-"Always use ICQ proxy server for file transfers\n"
-"(slower, but does not reveal your IP address)"
+"Always use AIM/ICQ proxy server for\n"
+"file transfers and direct IM (slower,\n"
+"but does not reveal your IP address)"
 msgstr ""
-"Bruk alltid ICQ-mellomtenar ved filoverføringar\n"
+"Bruk alltid AIM-/ICQ-mellomtenar ved\n"
+"filoverføringar og direktelynmeldingar\n"
 "(er seinare, men viser ikkje IP-adressa di)"
 
-#: ../libpurple/protocols/oscar/peer.c:697
+#: ../libpurple/protocols/oscar/peer.c:699
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "Ber %s om å kopla seg til oss på %s:%hu for direkteprat."
 
-#: ../libpurple/protocols/oscar/peer.c:782
+#: ../libpurple/protocols/oscar/peer.c:784
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr "Prøver å kopla til %s:%hu."
 
-#: ../libpurple/protocols/oscar/peer.c:856
-#, c-format
+#: ../libpurple/protocols/oscar/peer.c:858
 msgid "Attempting to connect via proxy server."
 msgstr "Prøver å kopla til via mellomtenar."
 
-#: ../libpurple/protocols/oscar/peer.c:1033
+#: ../libpurple/protocols/oscar/peer.c:1035
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s har nettopp spurt om å kopla direkte til %s"
 
-#: ../libpurple/protocols/oscar/peer.c:1037
-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 "
-"considered a privacy risk."
-msgstr ""
-"Dette krev ei direktetilkopling mellom dei to datamaskinene og er nødvendig "
-"for lynmeldingsbilete. Fordi IP-adressa vil bli avslørt, blir dette sett på "
-"som ein tryggleiksrisiko."
+#: ../libpurple/protocols/oscar/peer.c:1039
+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 considered a privacy risk."
+msgstr "Dette krev ei direktetilkopling mellom dei to datamaskinene og er nødvendig for lynmeldingsbilete. Fordi IP-adressa vil bli avslørt, blir dette sett på som ein tryggleiksrisiko."
 
 #: ../libpurple/protocols/qq/buddy_info.c:39
 msgid "Primary Information"
@@ -9392,33 +9891,31 @@ msgstr "Anna"
 msgid "Other"
 msgstr "Anna"
 
-#: ../libpurple/protocols/qq/buddy_info.c:481
-#: ../libpurple/protocols/qq/buddy_info.c:482
+#: ../libpurple/protocols/qq/buddy_info.c:522
+#: ../libpurple/protocols/qq/buddy_info.c:523
 msgid "Modify my information"
 msgstr "Endra personlege opplysningar"
 
-#: ../libpurple/protocols/qq/buddy_info.c:483
+#: ../libpurple/protocols/qq/buddy_info.c:524
 msgid "Update my information"
 msgstr "Oppdatera personlege opplysningar"
 
-#: ../libpurple/protocols/qq/buddy_info.c:507
+#: ../libpurple/protocols/qq/buddy_info.c:548
 msgid "Your information has been updated"
 msgstr "Personlege opplysningar er oppdaterte"
 
-#: ../libpurple/protocols/qq/buddy_info.c:560
+#: ../libpurple/protocols/qq/buddy_info.c:601
 #, c-format
-msgid ""
-"Setting custom faces is not currently supported. Please choose an image from "
-"%s."
+msgid "Setting custom faces is not currently supported. Please choose an image from %s."
 msgstr "Det er ikkje mogleg å nytta eigedefinerte fjes. Vel eit bilete frå %s."
 
-#: ../libpurple/protocols/qq/buddy_info.c:577
-#: ../libpurple/protocols/qq/buddy_info.c:590
+#: ../libpurple/protocols/qq/buddy_info.c:618
+#: ../libpurple/protocols/qq/buddy_info.c:631
 msgid "Invalid QQ Face"
 msgstr "Ugyldig QQ-andlet"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:208
-#: ../libpurple/protocols/qq/group_opt.c:136
+#: ../libpurple/protocols/qq/group_opt.c:112
 #, c-format
 msgid "You rejected %d's request"
 msgstr "Du avviste førespurnaden frå %d"
@@ -9433,7 +9930,7 @@ msgstr "Avvis førespurnad"
 
 #. title
 #: ../libpurple/protocols/qq/buddy_opt.c:213
-#: ../libpurple/protocols/qq/group_opt.c:141
+#: ../libpurple/protocols/qq/group_opt.c:117
 msgid "Sorry, you are not my type..."
 msgstr "Seier meg lei for det, men du er ikkje min tyoe…"
 
@@ -9472,7 +9969,7 @@ msgstr "Vil du vera venn med meg?"
 #. hint
 #: ../libpurple/protocols/qq/buddy_opt.c:408
 #: ../libpurple/protocols/qq/group_join.c:138
-#: ../libpurple/protocols/qq/group_opt.c:143
+#: ../libpurple/protocols/qq/group_opt.c:119
 msgid "Send"
 msgstr "Send"
 
@@ -9528,7 +10025,7 @@ msgstr "Brukaren %d bad om å bli med i 
 
 #: ../libpurple/protocols/qq/group_im.c:127
 #: ../libpurple/protocols/qq/group_im.c:181
-#: ../libpurple/protocols/qq/sys_msg.c:193
+#: ../libpurple/protocols/qq/sys_msg.c:196
 #, c-format
 msgid "Reason: %s"
 msgstr "Ã…rsak: %s"
@@ -9540,16 +10037,16 @@ msgstr "Ã…rsak: %s"
 #: ../libpurple/protocols/qq/group_im.c:292
 #: ../libpurple/protocols/qq/group_join.c:233
 #: ../libpurple/protocols/qq/group_join.c:359
-#: ../libpurple/protocols/qq/group_opt.c:235
-#: ../libpurple/protocols/qq/group_opt.c:305
-#: ../libpurple/protocols/qq/group_opt.c:391
+#: ../libpurple/protocols/qq/group_opt.c:211
+#: ../libpurple/protocols/qq/group_opt.c:281
+#: ../libpurple/protocols/qq/group_opt.c:367
 msgid "QQ Qun Operation"
 msgstr "QQ Qun-handling"
 
 #: ../libpurple/protocols/qq/group_im.c:141
-#: ../libpurple/protocols/qq/group_opt.c:128
-#: ../libpurple/protocols/qq/sys_msg.c:91
-#: ../libpurple/protocols/qq/sys_msg.c:248
+#: ../libpurple/protocols/qq/group_opt.c:104
+#: ../libpurple/protocols/qq/sys_msg.c:92
+#: ../libpurple/protocols/qq/sys_msg.c:251
 msgid "Approve"
 msgstr "Godkjenn"
 
@@ -9561,8 +10058,7 @@ msgid "Your request to join group %d has
 #: ../libpurple/protocols/qq/group_im.c:221
 #, c-format
 msgid "Your request to join group %d has been approved by admin %d"
-msgstr ""
-"Førespurnaden din om å bli med i gruppa %d er blitt godteken av admin %d"
+msgstr "Førespurnaden din om å bli med i gruppa %d er blitt godteken av admin %d"
 
 #: ../libpurple/protocols/qq/group_im.c:257
 #, c-format
@@ -9640,32 +10136,32 @@ msgstr "Gruppehandlingsfeil"
 msgstr "Gruppehandlingsfeil"
 
 #. we want to see window
-#: ../libpurple/protocols/qq/group_opt.c:124
+#: ../libpurple/protocols/qq/group_opt.c:99
 #: ../libpurple/protocols/qq/sys_msg.c:87
 msgid "Do you want to approve the request?"
 msgstr "Godtek du førespurnaden?"
 
-#: ../libpurple/protocols/qq/group_opt.c:137
+#: ../libpurple/protocols/qq/group_opt.c:113
 msgid "Enter your reason:"
 msgstr "Før opp grunngjevinga di:"
 
-#: ../libpurple/protocols/qq/group_opt.c:235
+#: ../libpurple/protocols/qq/group_opt.c:211
 msgid "You have successfully modified Qun member"
 msgstr "Du har endra Qun-medlemmet"
 
-#: ../libpurple/protocols/qq/group_opt.c:305
+#: ../libpurple/protocols/qq/group_opt.c:281
 msgid "You have successfully modified Qun information"
 msgstr "Du har endra Qun-opplysningane"
 
-#: ../libpurple/protocols/qq/group_opt.c:392
+#: ../libpurple/protocols/qq/group_opt.c:368
 msgid "You have successfully created a Qun"
 msgstr "Du har oppretta ein Qun"
 
-#: ../libpurple/protocols/qq/group_opt.c:394
+#: ../libpurple/protocols/qq/group_opt.c:370
 msgid "Would you like to set up the Qun details now?"
 msgstr "Vil du endra Qun-innstillingane no?"
 
-#: ../libpurple/protocols/qq/group_opt.c:398
+#: ../libpurple/protocols/qq/group_opt.c:374
 msgid "Setup"
 msgstr "Innstillingar"
 
@@ -9677,7 +10173,7 @@ msgstr "Klarte ikkje å senda lynmelding
 msgid "Failed to send IM."
 msgstr "Klarte ikkje å senda lynmeldinga."
 
-#: ../libpurple/protocols/qq/keep_alive.c:87
+#: ../libpurple/protocols/qq/keep_alive.c:88
 msgid "Keep alive error"
 msgstr "Oppetidsfeil"
 
@@ -9685,100 +10181,107 @@ msgstr "Feil ved førespurnad om pålogg
 msgid "Error requesting login token"
 msgstr "Feil ved førespurnad om påloggingsmarkør"
 
-#: ../libpurple/protocols/qq/login_logout.c:486
-msgid "Unable to login, check debug log"
-msgstr "Får ikkje logga på - sjekk feilsøkingsloggen."
+#: ../libpurple/protocols/qq/login_logout.c:490
+msgid "Unable to login. Check debug log."
+msgstr "Får ikkje logga på - sjå i feilsøkingsloggen."
 
+#: ../libpurple/protocols/qq/login_logout.c:493
+msgid "Unable to login"
+msgstr "Får ikkje logga på"
+
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:109
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:189
-#: ../libpurple/protocols/yahoo/ycht.c:549
+#: ../libpurple/protocols/qq/qq.c:140
+#: ../libpurple/protocols/toc/toc.c:173
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:158
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:238
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1194
+#: ../libpurple/protocols/yahoo/ycht.c:550
 msgid "Unable to connect."
 msgstr "Klarte ikkje å kopla til."
 
-#: ../libpurple/protocols/qq/qq.c:186
+#: ../libpurple/protocols/qq/qq.c:187
 #, c-format
 msgid "Unknown-%d"
 msgstr "Ukjend-%d"
 
-#: ../libpurple/protocols/qq/qq.c:211
+#: ../libpurple/protocols/qq/qq.c:212
 msgid "TCP Address"
 msgstr "TCP-adresse"
 
-#: ../libpurple/protocols/qq/qq.c:213
+#: ../libpurple/protocols/qq/qq.c:214
 msgid "UDP Address"
 msgstr "UDP-adresse"
 
-#: ../libpurple/protocols/qq/qq.c:242
+#: ../libpurple/protocols/qq/qq.c:243
 msgid "Level"
 msgstr "Nivå"
 
-#: ../libpurple/protocols/qq/qq.c:373
+#: ../libpurple/protocols/qq/qq.c:374
 msgid "Invalid name"
 msgstr "Ugyldig brukarnamn"
 
-#: ../libpurple/protocols/qq/qq.c:439
+#: ../libpurple/protocols/qq/qq.c:440
 #, c-format
 msgid "<b>Current Online</b>: %d<br>\n"
 msgstr "<b>Tilkopla no</b>: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:440
+#: ../libpurple/protocols/qq/qq.c:441
 #, c-format
 msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr "<b>Siste oppfrisking</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:444
+#: ../libpurple/protocols/qq/qq.c:445
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>Tilkoplingstilstand</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:445
+#: ../libpurple/protocols/qq/qq.c:446
 #, c-format
 msgid "<b>Server IP</b>: %s: %d<br>\n"
 msgstr "<b>Tenar-IP-adresse</b>: %s: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:446
+#: ../libpurple/protocols/qq/qq.c:447
 #, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
 msgstr "<b>Mi offentlege IP-adresse</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:451
+#: ../libpurple/protocols/qq/qq.c:452
 #, c-format
 msgid "<b>Login Time</b>: %s<br>\n"
 msgstr "<b>PÃ¥loggingstid</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:452
+#: ../libpurple/protocols/qq/qq.c:453
 #, c-format
 msgid "<b>Last Login IP</b>: %s<br>\n"
 msgstr "<b>Siste påloggings-IP-adresse</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:453
+#: ../libpurple/protocols/qq/qq.c:454
 #, c-format
 msgid "<b>Last Login Time</b>: %s\n"
 msgstr "<b>Siste påloggingstidspunkt</b>: %s\n"
 
-#: ../libpurple/protocols/qq/qq.c:457
+#: ../libpurple/protocols/qq/qq.c:458
 msgid "Login Information"
 msgstr "PÃ¥loggingsinformasjon "
 
-#: ../libpurple/protocols/qq/qq.c:533
+#: ../libpurple/protocols/qq/qq.c:534
 msgid "Set My Information"
-msgstr "Lagra opplysningane mine"
+msgstr "Opplysningane mine"
 
-#: ../libpurple/protocols/qq/qq.c:536 ../libpurple/protocols/toc/toc.c:1680
+#: ../libpurple/protocols/qq/qq.c:537
+#: ../libpurple/protocols/toc/toc.c:1680
 msgid "Change Password"
 msgstr "Endra passord"
 
-#: ../libpurple/protocols/qq/qq.c:539
+#: ../libpurple/protocols/qq/qq.c:540
 msgid "Show Login Information"
 msgstr "Vis påloggingsinformasjon "
 
-#: ../libpurple/protocols/qq/qq.c:560
+#: ../libpurple/protocols/qq/qq.c:561
 msgid "Leave this QQ Qun"
 msgstr "Forlat denne QQ Qun-en"
 
-#: ../libpurple/protocols/qq/qq.c:584
+#: ../libpurple/protocols/qq/qq.c:585
 msgid "Block this buddy"
 msgstr "Blokker denne vennen"
 
@@ -9792,19 +10295,20 @@ msgstr "Blokker denne vennen"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/qq/qq.c:725 ../libpurple/protocols/qq/qq.c:727
+#: ../libpurple/protocols/qq/qq.c:726
+#: ../libpurple/protocols/qq/qq.c:728
 msgid "QQ Protocol\tPlugin"
 msgstr "QQ-protokoll\tTillegg"
 
-#: ../libpurple/protocols/qq/qq.c:752
+#: ../libpurple/protocols/qq/qq.c:753
 msgid "Connect using TCP"
 msgstr "Kopla til ved hjelp av TCP"
 
-#: ../libpurple/protocols/qq/recv_core.c:309
+#: ../libpurple/protocols/qq/recv_core.c:310
 msgid "Socket error"
 msgstr "Endepunktsfeil"
 
-#: ../libpurple/protocols/qq/recv_core.c:319
+#: ../libpurple/protocols/qq/recv_core.c:321
 msgid "Unable to read from socket"
 msgstr "Klarte ikkje å lesa frå endepunktet"
 
@@ -9823,327 +10327,300 @@ msgstr "%d avbraut overføringa av %s"
 msgid "%d canceled the transfer of %s"
 msgstr "%d avbraut overføringa av %s"
 
-#: ../libpurple/protocols/qq/sendqueue.c:123
+#: ../libpurple/protocols/qq/sendqueue.c:124
 msgid "Connection lost"
 msgstr "Tapt tilkopling"
 
-#. cancel login progress
-#: ../libpurple/protocols/qq/sendqueue.c:131
+#: ../libpurple/protocols/qq/sendqueue.c:133
 msgid "Login failed, no reply"
 msgstr "Klarte ikkje å logga på: ikkje noko svar"
 
-#: ../libpurple/protocols/qq/sys_msg.c:110
+#: ../libpurple/protocols/qq/sys_msg.c:111
 msgid "Do you want to add this buddy?"
 msgstr "Vil du leggja til denne vennen?"
 
 #. only need to get value
-#: ../libpurple/protocols/qq/sys_msg.c:166
+#: ../libpurple/protocols/qq/sys_msg.c:168
 #, c-format
 msgid "You have been added by %s"
 msgstr "%s har lagt deg til"
 
-#: ../libpurple/protocols/qq/sys_msg.c:169
-#: ../libpurple/protocols/qq/sys_msg.c:263
+#: ../libpurple/protocols/qq/sys_msg.c:171
+#: ../libpurple/protocols/qq/sys_msg.c:266
 msgid "Would you like to add him?"
 msgstr "Vil du leggja han til?"
 
-#: ../libpurple/protocols/qq/sys_msg.c:176
+#: ../libpurple/protocols/qq/sys_msg.c:179
 #, c-format
 msgid "%s has added you [%s] to his or her buddy list"
 msgstr "%s har lagt deg [%s] til i vennelista si"
 
-#: ../libpurple/protocols/qq/sys_msg.c:192
+#: ../libpurple/protocols/qq/sys_msg.c:195
 #, c-format
 msgid "User %s rejected your request"
 msgstr "Brukaren %s avviste førespurnaden din"
 
-#: ../libpurple/protocols/qq/sys_msg.c:212
+#: ../libpurple/protocols/qq/sys_msg.c:215
 #, c-format
 msgid "User %s approved your request"
 msgstr "Brukaren %s godtok førespurnaden din"
 
 #. TODO: this should go through purple_account_request_authorization()
-#: ../libpurple/protocols/qq/sys_msg.c:238
+#: ../libpurple/protocols/qq/sys_msg.c:241
 #, c-format
 msgid "%s wants to add you [%s] as a friend"
 msgstr "%s ønskjer å leggja deg [%s] til som venn"
 
-#: ../libpurple/protocols/qq/sys_msg.c:239
+#: ../libpurple/protocols/qq/sys_msg.c:242
 #, c-format
 msgid "Message: %s"
 msgstr "Melding: %s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:261
+#: ../libpurple/protocols/qq/sys_msg.c:264
 #, c-format
 msgid "%s is not in your buddy list"
 msgstr "%s er ikkje på vennelista di"
 
-#: ../libpurple/protocols/sametime/sametime.c:417
+#: ../libpurple/protocols/sametime/sametime.c:419
 msgid "Connection closed (writing)"
 msgstr "Tilkoplinga er lukka (skrivande)"
 
-#: ../libpurple/protocols/sametime/sametime.c:1290
+#: ../libpurple/protocols/sametime/sametime.c:1292
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Gruppetittel</b> %s<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:1291
+#: ../libpurple/protocols/sametime/sametime.c:1293
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
 msgstr "<b>Notes gruppe-ID:</b> %s<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:1293
+#: ../libpurple/protocols/sametime/sametime.c:1295
 #, c-format
 msgid "Info for Group %s"
 msgstr "Informasjon om gruppa %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1295
+#: ../libpurple/protocols/sametime/sametime.c:1297
 msgid "Notes Address Book Information"
 msgstr "Notes adressebokopplysningar"
 
-#: ../libpurple/protocols/sametime/sametime.c:1327
+#: ../libpurple/protocols/sametime/sametime.c:1329
 msgid "Invite Group to Conference..."
 msgstr "Inviter gruppe til konferanse…"
 
-#: ../libpurple/protocols/sametime/sametime.c:1337
+#: ../libpurple/protocols/sametime/sametime.c:1339
 msgid "Get Notes Address Book Info"
 msgstr "Hent Notes adressebokopplysningar"
 
-#: ../libpurple/protocols/sametime/sametime.c:1504
+#: ../libpurple/protocols/sametime/sametime.c:1506
 msgid "Sending Handshake"
-msgstr "Sender tilkoplingsførespurnad"
+msgstr "Sender protokollsjekk"
 
-#: ../libpurple/protocols/sametime/sametime.c:1509
+#: ../libpurple/protocols/sametime/sametime.c:1511
 msgid "Waiting for Handshake Acknowledgement"
-msgstr "Ventar på godtaking av tilkoplingsførespurnaden"
+msgstr "Ventar på godtaking av protokollsjekken"
 
-#: ../libpurple/protocols/sametime/sametime.c:1514
+#: ../libpurple/protocols/sametime/sametime.c:1516
 msgid "Handshake Acknowledged, Sending Login"
-msgstr "Tilkoplingsførespurnaden godteken, sender pålogging"
+msgstr "Protokollsjekken er godteken, sender pålogging"
 
-#: ../libpurple/protocols/sametime/sametime.c:1519
+#: ../libpurple/protocols/sametime/sametime.c:1521
 msgid "Waiting for Login Acknowledgement"
 msgstr "Ventar på påloggingsgodkjenning"
 
-#: ../libpurple/protocols/sametime/sametime.c:1524
+#: ../libpurple/protocols/sametime/sametime.c:1526
 msgid "Login Redirected"
 msgstr "PÃ¥logginga omdirigert"
 
-#: ../libpurple/protocols/sametime/sametime.c:1530
+#: ../libpurple/protocols/sametime/sametime.c:1532
 msgid "Forcing Login"
 msgstr "Tvingar pålogging"
 
-#: ../libpurple/protocols/sametime/sametime.c:1534
+#: ../libpurple/protocols/sametime/sametime.c:1536
 msgid "Login Acknowledged"
 msgstr "PÃ¥logginga er godteken"
 
-#: ../libpurple/protocols/sametime/sametime.c:1539
+#: ../libpurple/protocols/sametime/sametime.c:1541
 msgid "Starting Services"
 msgstr "Startar tenester"
 
-#: ../libpurple/protocols/sametime/sametime.c:1645
+#: ../libpurple/protocols/sametime/sametime.c:1678
 #, c-format
-msgid ""
-"A Sametime administrator has issued the following announcement on server %s"
+msgid "A Sametime administrator has issued the following announcement on server %s"
 msgstr "Ein Sametime-administrator har sendt ut denne meldinga på tenaren %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1650
+#: ../libpurple/protocols/sametime/sametime.c:1683
 msgid "Sametime Administrator Announcement"
 msgstr "Sametime-administratormelding"
 
-#: ../libpurple/protocols/sametime/sametime.c:1702
+#: ../libpurple/protocols/sametime/sametime.c:1736
 msgid "Connection reset"
 msgstr "Tilkoplinga tilbakestilt"
 
-#: ../libpurple/protocols/sametime/sametime.c:1709
+#: ../libpurple/protocols/sametime/sametime.c:1748
 #, c-format
 msgid "Error reading from socket: %s"
 msgstr "Feil under lesing frå endepunkt: %s"
 
 #. this is a regular connect, error out
-#: ../libpurple/protocols/sametime/sametime.c:1732
-#: ../libpurple/protocols/sametime/sametime.c:3726
+#: ../libpurple/protocols/sametime/sametime.c:1773
+#: ../libpurple/protocols/sametime/sametime.c:3780
 msgid "Unable to connect to host"
 msgstr "Klarer ikkje å kopla til tenaren"
 
-#: ../libpurple/protocols/sametime/sametime.c:1770
+#: ../libpurple/protocols/sametime/sametime.c:1814
 #, c-format
 msgid "Announcement from %s"
 msgstr "Melding frå %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1944
+#: ../libpurple/protocols/sametime/sametime.c:1988
 msgid "Conference Closed"
 msgstr "Konferansen er lukka"
 
-#: ../libpurple/protocols/sametime/sametime.c:2403
+#: ../libpurple/protocols/sametime/sametime.c:2453
 msgid "Unable to send message: "
 msgstr "Klarer ikkje å senda meldinga:"
 
-#: ../libpurple/protocols/sametime/sametime.c:2959
+#: ../libpurple/protocols/sametime/sametime.c:3009
 msgid "Place Closed"
 msgstr "Staden er lukka"
 
-#: ../libpurple/protocols/sametime/sametime.c:3229
+#: ../libpurple/protocols/sametime/sametime.c:3279
 msgid "Microphone"
 msgstr "Mikrofon"
 
-#: ../libpurple/protocols/sametime/sametime.c:3230
+#: ../libpurple/protocols/sametime/sametime.c:3280
 msgid "Speakers"
 msgstr "Høgtalarar"
 
-#: ../libpurple/protocols/sametime/sametime.c:3231
+#: ../libpurple/protocols/sametime/sametime.c:3281
 msgid "Video Camera"
 msgstr "Videokamera"
 
-#: ../libpurple/protocols/sametime/sametime.c:3269
-#: ../libpurple/protocols/sametime/sametime.c:4145
+#: ../libpurple/protocols/sametime/sametime.c:3319
+#: ../libpurple/protocols/sametime/sametime.c:4199
 msgid "Supports"
 msgstr "Støttar"
 
-#: ../libpurple/protocols/sametime/sametime.c:3274
-#: ../libpurple/protocols/sametime/sametime.c:4119
+#: ../libpurple/protocols/sametime/sametime.c:3324
+#: ../libpurple/protocols/sametime/sametime.c:4173
 msgid "External User"
 msgstr "Ekstern brukar"
 
-#: ../libpurple/protocols/sametime/sametime.c:3380
+#: ../libpurple/protocols/sametime/sametime.c:3430
 msgid "Create conference with user"
 msgstr "Lag konferanse med brukar"
 
-#: ../libpurple/protocols/sametime/sametime.c:3381
+#: ../libpurple/protocols/sametime/sametime.c:3431
 #, c-format
-msgid ""
-"Please enter a topic for the new conference, and an invitation message to be "
-"sent to %s"
-msgstr ""
-"Før opp eit emne for den nye konferansen og invitasjonsmeldinga som skal "
-"sendast til %s"
+msgid "Please enter a topic for the new conference, and an invitation message to be sent to %s"
+msgstr "Før opp eit emne for den nye konferansen og invitasjonsmeldinga som skal sendast til %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:3385
+#: ../libpurple/protocols/sametime/sametime.c:3435
 msgid "New Conference"
 msgstr "Ny konferanse"
 
-#: ../libpurple/protocols/sametime/sametime.c:3387
+#: ../libpurple/protocols/sametime/sametime.c:3437
 msgid "Create"
 msgstr "Lag"
 
-#: ../libpurple/protocols/sametime/sametime.c:3452
+#: ../libpurple/protocols/sametime/sametime.c:3502
 msgid "Available Conferences"
 msgstr "Tilgjengelege konferansar"
 
-#: ../libpurple/protocols/sametime/sametime.c:3458
+#: ../libpurple/protocols/sametime/sametime.c:3508
 msgid "Create New Conference..."
 msgstr "Lag ny konferanse…"
 
-#: ../libpurple/protocols/sametime/sametime.c:3465
+#: ../libpurple/protocols/sametime/sametime.c:3515
 msgid "Invite user to a conference"
 msgstr "Inviter ein brukar til ein konferanse"
 
-#: ../libpurple/protocols/sametime/sametime.c:3466
+#: ../libpurple/protocols/sametime/sametime.c:3516
 #, c-format
-msgid ""
-"Select a conference from the list below to send an invite to user %s. Select "
-"\"Create New Conference\" if you'd like to create a new conference to invite "
-"this user to."
-msgstr ""
-"Vel kva for konferanse frå lista nedanfor du ønskjer å invitera brukaren %s "
-"til å bli med i. Vel \"Lag ny konferanse\" om du konferansen ikkje finst frå "
-"før av."
+msgid "Select a conference from the list below to send an invite to user %s. Select \"Create New Conference\" if you'd like to create a new conference to invite this user to."
+msgstr "Vel kva for konferanse frå lista nedanfor du ønskjer å invitera brukaren %s til å bli med i. Vel \"Lag ny konferanse\" om du konferansen ikkje finst frå før av."
 
-#: ../libpurple/protocols/sametime/sametime.c:3471
+#: ../libpurple/protocols/sametime/sametime.c:3521
 msgid "Invite to Conference"
 msgstr "Inviter til konferanse"
 
-#: ../libpurple/protocols/sametime/sametime.c:3562
+#: ../libpurple/protocols/sametime/sametime.c:3612
 msgid "Invite to Conference..."
 msgstr "Inviter til konferanse…"
 
-#: ../libpurple/protocols/sametime/sametime.c:3567
+#: ../libpurple/protocols/sametime/sametime.c:3617
 msgid "Send TEST Announcement"
 msgstr "Send TEST-melding"
 
-#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4354
+#: ../libpurple/protocols/sametime/sametime.c:3636
+#: ../pidgin/gtkconv.c:4431
 msgid "Topic:"
 msgstr "Emne:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3614
+#: ../libpurple/protocols/sametime/sametime.c:3664
 msgid "No Sametime Community Server specified"
 msgstr "Ingen Sametime felleskapstenar spesifisert"
 
-#: ../libpurple/protocols/sametime/sametime.c:3636
+#: ../libpurple/protocols/sametime/sametime.c:3689
 #, c-format
-msgid ""
-"No host or IP address has been configured for the Meanwhile account %s. "
-"Please enter one below to continue logging in."
-msgstr ""
-"Meanwhile-kontoen %s har ingen vert eller IP-adresse knytt til seg. Før opp "
-"ein av desse verdiane for å logga på."
+msgid "No host or IP address has been configured for the Meanwhile account %s. Please enter one below to continue logging in."
+msgstr "Meanwhile-kontoen %s har ingen vert eller IP-adresse knytt til seg. Før opp ein av desse verdiane for å logga på."
 
-#: ../libpurple/protocols/sametime/sametime.c:3641
+#: ../libpurple/protocols/sametime/sametime.c:3694
 msgid "Meanwhile Connection Setup"
 msgstr "Meanwhile tilkoplingsinnstillingar"
 
-#: ../libpurple/protocols/sametime/sametime.c:3642
+#: ../libpurple/protocols/sametime/sametime.c:3695
 msgid "No Sametime Community Server Specified"
 msgstr "Ingen Sametime felleskapstenar spesifisert"
 
-#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4041
+#: ../libpurple/protocols/sametime/sametime.c:3697
 msgid "Connect"
 msgstr "Kopla til"
 
-#: ../libpurple/protocols/sametime/sametime.c:4135
+#: ../libpurple/protocols/sametime/sametime.c:4189
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "Ukjend (0x%04x)<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:4137
+#: ../libpurple/protocols/sametime/sametime.c:4191
 msgid "Last Known Client"
 msgstr "Sist kjende klient"
 
-#: ../libpurple/protocols/sametime/sametime.c:4301
-#: ../libpurple/protocols/sametime/sametime.c:5506
+#: ../libpurple/protocols/sametime/sametime.c:4355
+#: ../libpurple/protocols/sametime/sametime.c:5560
 msgid "User Name"
 msgstr "Brukarnamn"
 
-#: ../libpurple/protocols/sametime/sametime.c:4304
-#: ../libpurple/protocols/sametime/sametime.c:5509
+#: ../libpurple/protocols/sametime/sametime.c:4358
+#: ../libpurple/protocols/sametime/sametime.c:5563
 msgid "Sametime ID"
 msgstr "Sametime-ID"
 
-#: ../libpurple/protocols/sametime/sametime.c:4328
+#: ../libpurple/protocols/sametime/sametime.c:4382
 msgid "An ambiguous user ID was entered"
 msgstr "Brukar-ID-en var ikkje eintydig"
 
-#: ../libpurple/protocols/sametime/sametime.c:4329
+#: ../libpurple/protocols/sametime/sametime.c:4383
 #, c-format
-msgid ""
-"The identifier '%s' may possibly refer to any of the following users. Please "
-"select the correct user from the list below to add them to your buddy list."
-msgstr ""
-"Identifikatoren '%s' kan visa til kven som helst av desse brukarane. Vel den "
-"rette brukaren frå lista nedanfor for å leggja han til i vennelista di."
+msgid "The identifier '%s' may possibly refer to any of the following users. Please select the correct user from the list below to add them to your buddy list."
+msgstr "Identifikatoren '%s' kan visa til kven som helst av desse brukarane. Vel den rette brukaren frå lista nedanfor for å leggja han til i vennelista di."
 
-#: ../libpurple/protocols/sametime/sametime.c:4334
+#: ../libpurple/protocols/sametime/sametime.c:4388
 msgid "Select User"
 msgstr "Vel brukar"
 
-#: ../libpurple/protocols/sametime/sametime.c:4418
+#: ../libpurple/protocols/sametime/sametime.c:4472
 msgid "Unable to add user: user not found"
 msgstr "Klarte ikkje å leggja til brukar: fann ikkje brukaren"
 
-#: ../libpurple/protocols/sametime/sametime.c:4420
+#: ../libpurple/protocols/sametime/sametime.c:4474
 #, c-format
-msgid ""
-"The identifier '%s' did not match any users in your Sametime community. This "
-"entry has been removed from your buddy list."
-msgstr ""
-"Identifikatoren '%s' samsvarte ikkje med nokon brukar i Sametime-"
-"fellesskapet ditt. Oppføringa er fjerna frå vennelista di."
+msgid "The identifier '%s' did not match any users in your Sametime community. This entry has been removed from your buddy list."
+msgstr "Identifikatoren '%s' samsvarte ikkje med nokon brukar i Sametime-fellesskapet ditt. Oppføringa er fjerna frå vennelista di."
 
-#: ../libpurple/protocols/sametime/sametime.c:4425
-msgid "Unable to add user"
-msgstr "Klarte ikkje å leggja til brukar"
-
-#: ../libpurple/protocols/sametime/sametime.c:5011
+#: ../libpurple/protocols/sametime/sametime.c:5065
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -10152,175 +10629,150 @@ msgstr ""
 "Fillesefeil %s: \n"
 "%s\n"
 
-#: ../libpurple/protocols/sametime/sametime.c:5146
+#: ../libpurple/protocols/sametime/sametime.c:5200
 msgid "Remotely Stored Buddy List"
 msgstr "Fjernlagra venneliste"
 
-#: ../libpurple/protocols/sametime/sametime.c:5151
+#: ../libpurple/protocols/sametime/sametime.c:5205
 msgid "Buddy List Storage Mode"
 msgstr "Lagringstilstand venneliste"
 
-#: ../libpurple/protocols/sametime/sametime.c:5154
+#: ../libpurple/protocols/sametime/sametime.c:5208
 msgid "Local Buddy List Only"
 msgstr "Berre lokal venneliste"
 
-#: ../libpurple/protocols/sametime/sametime.c:5156
+#: ../libpurple/protocols/sametime/sametime.c:5210
 msgid "Merge List from Server"
 msgstr "Slå saman med liste frå tenar"
 
-#: ../libpurple/protocols/sametime/sametime.c:5158
+#: ../libpurple/protocols/sametime/sametime.c:5212
 msgid "Merge and Save List to Server"
 msgstr "Slå saman og lagra lista på tenar"
 
-#: ../libpurple/protocols/sametime/sametime.c:5160
+#: ../libpurple/protocols/sametime/sametime.c:5214
 msgid "Synchronize List with Server"
 msgstr "Synkronisera lista med tenaren"
 
-#: ../libpurple/protocols/sametime/sametime.c:5215
+#: ../libpurple/protocols/sametime/sametime.c:5269
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "Importer Sametime-liste for kontoen %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5255
+#: ../libpurple/protocols/sametime/sametime.c:5309
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "Eksporter Sametime-liste for kontoen %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5309
+#: ../libpurple/protocols/sametime/sametime.c:5363
 msgid "Unable to add group: group exists"
 msgstr "Klarte ikkje å leggja til gruppe: gruppa finst allereie"
 
-#: ../libpurple/protocols/sametime/sametime.c:5310
+#: ../libpurple/protocols/sametime/sametime.c:5364
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "Ei gruppe med namnet '%s' finst allereie i vennelista di."
 
-#: ../libpurple/protocols/sametime/sametime.c:5313
-#: ../libpurple/protocols/sametime/sametime.c:5443
+#: ../libpurple/protocols/sametime/sametime.c:5367
+#: ../libpurple/protocols/sametime/sametime.c:5497
 msgid "Unable to add group"
 msgstr "Klarte ikkje å leggja til gruppe"
 
-#: ../libpurple/protocols/sametime/sametime.c:5372
+#: ../libpurple/protocols/sametime/sametime.c:5426
 msgid "Possible Matches"
 msgstr "Moglege treff"
 
-#: ../libpurple/protocols/sametime/sametime.c:5388
+#: ../libpurple/protocols/sametime/sametime.c:5442
 msgid "Notes Address Book group results"
 msgstr "Grupperesultat Notes adressebok"
 
-#: ../libpurple/protocols/sametime/sametime.c:5389
+#: ../libpurple/protocols/sametime/sametime.c:5443
 #, c-format
-msgid ""
-"The identifier '%s' may possibly refer to any of the following Notes Address "
-"Book groups. Please select the correct group from the list below to add it "
-"to your buddy list."
-msgstr ""
-"Identifikatoren '%s' kan visa til kven som helst av dei følgjande Notes "
-"adressebokgruppene. Vel den rette gruppa frå lista nedanfor for å leggja ho "
-"til i vennelista di."
+msgid "The identifier '%s' may possibly refer to any of the following Notes Address Book groups. Please select the correct group from the list below to add it to your buddy list."
+msgstr "Identifikatoren '%s' kan visa til kven som helst av dei følgjande Notes adressebokgruppene. Vel den rette gruppa frå lista nedanfor for å leggja ho til i vennelista di."
 
-#: ../libpurple/protocols/sametime/sametime.c:5394
+#: ../libpurple/protocols/sametime/sametime.c:5448
 msgid "Select Notes Address Book"
 msgstr "Vel Notes adressebok"
 
-#: ../libpurple/protocols/sametime/sametime.c:5437
+#: ../libpurple/protocols/sametime/sametime.c:5491
 msgid "Unable to add group: group not found"
 msgstr "Klarte ikkje å leggja til gruppa: gruppa finst ikkje"
 
-#: ../libpurple/protocols/sametime/sametime.c:5439
+#: ../libpurple/protocols/sametime/sametime.c:5493
 #, c-format
-msgid ""
-"The identifier '%s' did not match any Notes Address Book groups in your "
-"Sametime community."
-msgstr ""
-"Identifikatoren '%s' samsvarte ikkje med noka Notes adressebokgruppe i "
-"Sametime-fellesskapet ditt."
+msgid "The identifier '%s' did not match any Notes Address Book groups in your Sametime community."
+msgstr "Identifikatoren '%s' samsvarte ikkje med noka Notes adressebokgruppe i Sametime-fellesskapet ditt."
 
-#: ../libpurple/protocols/sametime/sametime.c:5480
+#: ../libpurple/protocols/sametime/sametime.c:5534
 msgid "Notes Address Book Group"
 msgstr "Notes adressebokgruppe"
 
-#: ../libpurple/protocols/sametime/sametime.c:5481
-msgid ""
-"Enter the name of a Notes Address Book group in the field below to add the "
-"group and its members to your buddy list."
-msgstr ""
-"Før opp namnet til ei Notes adressebokgruppe i feltet nedanfor for å leggja "
-"til gruppa og medlemmene hennar i vennelista di."
+#: ../libpurple/protocols/sametime/sametime.c:5535
+msgid "Enter the name of a Notes Address Book group in the field below to add the group and its members to your buddy list."
+msgstr "Før opp namnet til ei Notes adressebokgruppe i feltet nedanfor for å leggja til gruppa og medlemmene hennar i vennelista di."
 
-#: ../libpurple/protocols/sametime/sametime.c:5530
+#: ../libpurple/protocols/sametime/sametime.c:5584
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Søkjeresultat for '%s'"
 
-#: ../libpurple/protocols/sametime/sametime.c:5531
+#: ../libpurple/protocols/sametime/sametime.c:5585
 #, c-format
-msgid ""
-"The identifier '%s' may possibly refer to any of the following users. You "
-"may add these users to your buddy list or send them messages with the action "
-"buttons below."
-msgstr ""
-"Identifikatoren '%s' kan visa til kven som helst av desse brukarane. Du kan "
-"leggja desse brukarane til i vennelista di, eller senda dei meldingar ved "
-"hjelp av knappane nedanfor."
+msgid "The identifier '%s' may possibly refer to any of the following users. You may add these users to your buddy list or send them messages with the action buttons below."
+msgstr "Identifikatoren '%s' kan visa til kven som helst av desse brukarane. Du kan leggja desse brukarane til i vennelista di, eller senda dei meldingar ved hjelp av knappane nedanfor."
 
-#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:756
+#: ../libpurple/protocols/sametime/sametime.c:5592
+#: ../pidgin/gtknotify.c:770
 msgid "Search Results"
 msgstr "Søkjeresultat"
 
-#: ../libpurple/protocols/sametime/sametime.c:5563
+#: ../libpurple/protocols/sametime/sametime.c:5617
 msgid "No matches"
 msgstr "Ingen treff"
 
-#: ../libpurple/protocols/sametime/sametime.c:5564
+#: ../libpurple/protocols/sametime/sametime.c:5618
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
-msgstr ""
-"Identifikatoren '%s' samsvarte ikkje med nokon brukar i Sametime-"
-"fellesskapet ditt."
+msgstr "Identifikatoren '%s' samsvarte ikkje med nokon brukar i Sametime-fellesskapet ditt."
 
-#: ../libpurple/protocols/sametime/sametime.c:5568
+#: ../libpurple/protocols/sametime/sametime.c:5622
 msgid "No Matches"
 msgstr "Ingen treff"
 
-#: ../libpurple/protocols/sametime/sametime.c:5605
+#: ../libpurple/protocols/sametime/sametime.c:5659
 msgid "Search for a user"
 msgstr "Søk etter ein brukar"
 
-#: ../libpurple/protocols/sametime/sametime.c:5606
-msgid ""
-"Enter a name or partial ID in the field below to search for matching users "
-"in your Sametime community."
-msgstr ""
-"Skriv inn eit namn eller ei delvis ID-oppføring i feltet nedanfor for å "
-"søkja etter samsvarande brukarar i Sametime-fellesskapet ditt."
+#: ../libpurple/protocols/sametime/sametime.c:5660
+msgid "Enter a name or partial ID in the field below to search for matching users in your Sametime community."
+msgstr "Skriv inn eit namn eller ei delvis ID-oppføring i feltet nedanfor for å søkja etter samsvarande brukarar i Sametime-fellesskapet ditt."
 
-#: ../libpurple/protocols/sametime/sametime.c:5609
+#: ../libpurple/protocols/sametime/sametime.c:5663
 msgid "User Search"
 msgstr "Brukarsøk"
 
-#: ../libpurple/protocols/sametime/sametime.c:5622
+#: ../libpurple/protocols/sametime/sametime.c:5676
 msgid "Import Sametime List..."
 msgstr "Importer Sametime-liste…"
 
-#: ../libpurple/protocols/sametime/sametime.c:5626
+#: ../libpurple/protocols/sametime/sametime.c:5680
 msgid "Export Sametime List..."
 msgstr "Eksporter Sametime-liste…"
 
-#: ../libpurple/protocols/sametime/sametime.c:5630
+#: ../libpurple/protocols/sametime/sametime.c:5684
 msgid "Add Notes Address Book Group..."
 msgstr "Legg til Notes adressebokgruppe…"
 
-#: ../libpurple/protocols/sametime/sametime.c:5634
+#: ../libpurple/protocols/sametime/sametime.c:5688
 msgid "User Search..."
 msgstr "Brukarsøk…"
 
-#: ../libpurple/protocols/sametime/sametime.c:5740
+#: ../libpurple/protocols/sametime/sametime.c:5794
 msgid "Force login (ignore server redirects)"
 msgstr "Tvungen pålogging (sjå vekk frå tenarvidaresending)"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5750
+#: ../libpurple/protocols/sametime/sametime.c:5804
 msgid "Hide client identity"
 msgstr "Skjul klientidentitet"
 
@@ -10405,11 +10857,8 @@ msgstr "Fjernbrukaren er ikkje til stade
 #: ../libpurple/protocols/silc/buddy.c:298
 #: ../libpurple/protocols/silc10/buddy.c:295
 #, c-format
-msgid ""
-"Key agreement request received from %s. Would you like to perform the key "
-"agreement?"
-msgstr ""
-"Ein nøkkelgodkjenningsførespurnad er motteken frå %s. Vil du utføra han?"
+msgid "Key agreement request received from %s. Would you like to perform the key agreement?"
+msgstr "Ein nøkkelgodkjenningsførespurnad er motteken frå %s. Vil du utføra han?"
 
 #: ../libpurple/protocols/silc/buddy.c:302
 #: ../libpurple/protocols/silc10/buddy.c:299
@@ -10450,8 +10899,8 @@ msgstr "Lagra lynmeldingspassordet"
 #: ../libpurple/protocols/silc/buddy.c:496
 #: ../libpurple/protocols/silc/buddy.c:507
 #: ../libpurple/protocols/silc/buddy.c:540
-#: ../libpurple/protocols/silc/ops.c:1499
-#: ../libpurple/protocols/silc/ops.c:1510
+#: ../libpurple/protocols/silc/ops.c:1503
+#: ../libpurple/protocols/silc/ops.c:1514
 #: ../libpurple/protocols/silc10/buddy.c:513
 #: ../libpurple/protocols/silc10/buddy.c:548
 #: ../libpurple/protocols/silc10/ops.c:1494
@@ -10460,8 +10909,8 @@ msgstr "Henta offentleg nøkkel"
 msgstr "Henta offentleg nøkkel"
 
 #: ../libpurple/protocols/silc/buddy.c:541
-#: ../libpurple/protocols/silc/ops.c:1500
-#: ../libpurple/protocols/silc/ops.c:1511
+#: ../libpurple/protocols/silc/ops.c:1504
+#: ../libpurple/protocols/silc/ops.c:1515
 #: ../libpurple/protocols/silc10/buddy.c:549
 #: ../libpurple/protocols/silc10/ops.c:1495
 #: ../libpurple/protocols/silc10/ops.c:1506
@@ -10469,17 +10918,17 @@ msgstr "Klarer ikkje å henta den offent
 msgstr "Klarer ikkje å henta den offentlege nøkkelen"
 
 #: ../libpurple/protocols/silc/buddy.c:622
-#: ../libpurple/protocols/silc/buddy.c:1655
+#: ../libpurple/protocols/silc/buddy.c:1658
 #: ../libpurple/protocols/silc10/buddy.c:635
-#: ../libpurple/protocols/silc10/buddy.c:1654
+#: ../libpurple/protocols/silc10/buddy.c:1657
 msgid "Show Public Key"
 msgstr "Vis den offentlege nøkkelen"
 
 #: ../libpurple/protocols/silc/buddy.c:623
-#: ../libpurple/protocols/silc/buddy.c:1027
-#: ../libpurple/protocols/silc/chat.c:237
+#: ../libpurple/protocols/silc/buddy.c:1030
+#: ../libpurple/protocols/silc/chat.c:239
 #: ../libpurple/protocols/silc10/buddy.c:636
-#: ../libpurple/protocols/silc10/buddy.c:1033
+#: ../libpurple/protocols/silc10/buddy.c:1036
 #: ../libpurple/protocols/silc10/chat.c:237
 msgid "Could not load public key"
 msgstr "Klarer ikkje å lasta den offentlege nøkkelen"
@@ -10487,9 +10936,9 @@ msgstr "Klarer ikkje å lasta den offent
 #: ../libpurple/protocols/silc/buddy.c:701
 #: ../libpurple/protocols/silc/ops.c:1053
 #: ../libpurple/protocols/silc/ops.c:1168
-#: ../libpurple/protocols/silc/ops.c:1288
-#: ../libpurple/protocols/silc/ops.c:1289
-#: ../libpurple/protocols/silc/ops.c:1307
+#: ../libpurple/protocols/silc/ops.c:1290
+#: ../libpurple/protocols/silc/ops.c:1291
+#: ../libpurple/protocols/silc/ops.c:1309
 #: ../libpurple/protocols/silc10/buddy.c:713
 #: ../libpurple/protocols/silc10/ops.c:1087
 #: ../libpurple/protocols/silc10/ops.c:1159
@@ -10501,7 +10950,7 @@ msgstr "Brukarinformasjon"
 
 #: ../libpurple/protocols/silc/buddy.c:702
 #: ../libpurple/protocols/silc/ops.c:1169
-#: ../libpurple/protocols/silc/ops.c:1308
+#: ../libpurple/protocols/silc/ops.c:1310
 #: ../libpurple/protocols/silc10/buddy.c:714
 #: ../libpurple/protocols/silc10/ops.c:1160
 #: ../libpurple/protocols/silc10/ops.c:1314
@@ -10516,265 +10965,248 @@ msgstr "Vennen %s er ikkje tiltrudd"
 
 #: ../libpurple/protocols/silc/buddy.c:726
 #: ../libpurple/protocols/silc10/buddy.c:738
-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."
-msgstr ""
-"Du kan ikkje ta i mot vennevarsel før du har importert den offentlege "
-"nøkkelen deira. Bruk kommandoen \"Hent den offentlege nøkkelen\" for å gjera "
-"dette."
+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."
+msgstr "Du kan ikkje ta i mot vennevarsel før du har importert den offentlege nøkkelen deira. Bruk kommandoen \"Hent den offentlege nøkkelen\" for å gjera dette."
 
 #. Open file selector to select the public key.
-#: ../libpurple/protocols/silc/buddy.c:1059
-#: ../libpurple/protocols/silc10/buddy.c:1067
+#: ../libpurple/protocols/silc/buddy.c:1062
+#: ../libpurple/protocols/silc10/buddy.c:1070
 msgid "Open..."
 msgstr "Opna…"
 
-#: ../libpurple/protocols/silc/buddy.c:1070
-#: ../libpurple/protocols/silc10/buddy.c:1078
+#: ../libpurple/protocols/silc/buddy.c:1073
+#: ../libpurple/protocols/silc10/buddy.c:1081
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "Vennen %s er ikkje tilstades i nettverket"
 
-#: ../libpurple/protocols/silc/buddy.c:1073
-#: ../libpurple/protocols/silc10/buddy.c:1081
-msgid ""
-"To add the buddy you must import his/her public key. Press Import to import "
-"a public key."
-msgstr ""
-"Du må importera vennen sin offentlege nøkkel før du kan leggja han/ho til. "
-"Trykk \"Importer\" for å importera ein offentleg nøkkel."
+#: ../libpurple/protocols/silc/buddy.c:1076
+#: ../libpurple/protocols/silc10/buddy.c:1084
+msgid "To add the buddy you must import his/her public key. Press Import to import a public key."
+msgstr "Du må importera vennen sin offentlege nøkkel før du kan leggja han/ho til. Trykk \"Importer\" for å importera ein offentleg nøkkel."
 
-#: ../libpurple/protocols/silc/buddy.c:1077
-#: ../libpurple/protocols/silc10/buddy.c:1085
+#: ../libpurple/protocols/silc/buddy.c:1080
+#: ../libpurple/protocols/silc10/buddy.c:1088
 msgid "_Import..."
 msgstr "_Importer…"
 
-#: ../libpurple/protocols/silc/buddy.c:1183
-#: ../libpurple/protocols/silc10/buddy.c:1181
+#: ../libpurple/protocols/silc/buddy.c:1186
+#: ../libpurple/protocols/silc10/buddy.c:1184
 msgid "Select correct user"
 msgstr "Vel rett brukar"
 
-#: ../libpurple/protocols/silc/buddy.c:1185
-#: ../libpurple/protocols/silc10/buddy.c:1183
-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."
-msgstr ""
-"Meir ein éin brukar blei funnen med den same offentlege nøkkelen. Vel den "
-"rette brukaren frå lista for å leggja han/ho til i vennelista di."
+#: ../libpurple/protocols/silc/buddy.c:1188
+#: ../libpurple/protocols/silc10/buddy.c:1186
+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."
+msgstr "Meir ein éin brukar blei funnen med den same offentlege nøkkelen. Vel den rette brukaren frå lista for å leggja han/ho til i vennelista di."
 
-#: ../libpurple/protocols/silc/buddy.c:1187
-#: ../libpurple/protocols/silc10/buddy.c:1185
-msgid ""
-"More than one user was found with the same name. Select the correct user "
-"from the list to add to the buddy list."
-msgstr ""
-"Meir ein éin brukar blei funnen med det same namnet. Vel den rette brukaren "
-"frå lista for å leggja han/ho til i vennelista di."
+#: ../libpurple/protocols/silc/buddy.c:1190
+#: ../libpurple/protocols/silc10/buddy.c:1188
+msgid "More than one user was found with the same name. Select the correct user from the list to add to the buddy list."
+msgstr "Meir ein éin brukar blei funnen med det same namnet. Vel den rette brukaren frå lista for å leggja han/ho til i vennelista di."
 
-#: ../libpurple/protocols/silc/buddy.c:1474
-#: ../libpurple/protocols/silc10/buddy.c:1474
+#: ../libpurple/protocols/silc/buddy.c:1477
+#: ../libpurple/protocols/silc10/buddy.c:1477
 msgid "Detached"
 msgstr "Fråkopla"
 
-#: ../libpurple/protocols/silc/buddy.c:1478
+#: ../libpurple/protocols/silc/buddy.c:1481
 #: ../libpurple/protocols/silc/silc.c:58
-#: ../libpurple/protocols/silc10/buddy.c:1478
+#: ../libpurple/protocols/silc10/buddy.c:1481
 #: ../libpurple/protocols/silc10/silc.c:49
 msgid "Indisposed"
 msgstr "Uvel"
 
-#: ../libpurple/protocols/silc/buddy.c:1482
+#: ../libpurple/protocols/silc/buddy.c:1485
 #: ../libpurple/protocols/silc/silc.c:60
-#: ../libpurple/protocols/silc10/buddy.c:1482
+#: ../libpurple/protocols/silc10/buddy.c:1485
 #: ../libpurple/protocols/silc10/silc.c:51
 msgid "Wake Me Up"
 msgstr "Vekk meg"
 
-#: ../libpurple/protocols/silc/buddy.c:1484
+#: ../libpurple/protocols/silc/buddy.c:1487
 #: ../libpurple/protocols/silc/silc.c:52
-#: ../libpurple/protocols/silc10/buddy.c:1484
+#: ../libpurple/protocols/silc10/buddy.c:1487
 #: ../libpurple/protocols/silc10/silc.c:43
 msgid "Hyper Active"
 msgstr "Hyperaktiv"
 
-#: ../libpurple/protocols/silc/buddy.c:1486
-#: ../libpurple/protocols/silc10/buddy.c:1486
+#: ../libpurple/protocols/silc/buddy.c:1489
+#: ../libpurple/protocols/silc10/buddy.c:1489
 msgid "Robot"
 msgstr "Robot"
 
-#: ../libpurple/protocols/silc/buddy.c:1493
-#: ../libpurple/protocols/silc/silc.c:743
-#: ../libpurple/protocols/silc/util.c:516
-#: ../libpurple/protocols/silc10/buddy.c:1493
-#: ../libpurple/protocols/silc10/silc.c:654
+#: ../libpurple/protocols/silc/buddy.c:1496
+#: ../libpurple/protocols/silc/silc.c:886
+#: ../libpurple/protocols/silc/util.c:522
+#: ../libpurple/protocols/silc10/buddy.c:1496
+#: ../libpurple/protocols/silc10/silc.c:660
 #: ../libpurple/protocols/silc10/util.c:512
 msgid "Happy"
 msgstr "Glad"
 
-#: ../libpurple/protocols/silc/buddy.c:1495
-#: ../libpurple/protocols/silc/silc.c:745
-#: ../libpurple/protocols/silc/util.c:518
-#: ../libpurple/protocols/silc10/buddy.c:1495
-#: ../libpurple/protocols/silc10/silc.c:656
+#: ../libpurple/protocols/silc/buddy.c:1498
+#: ../libpurple/protocols/silc/silc.c:888
+#: ../libpurple/protocols/silc/util.c:524
+#: ../libpurple/protocols/silc10/buddy.c:1498
+#: ../libpurple/protocols/silc10/silc.c:662
 #: ../libpurple/protocols/silc10/util.c:514
 msgid "Sad"
 msgstr "Trist"
 
-#: ../libpurple/protocols/silc/buddy.c:1497
-#: ../libpurple/protocols/silc/silc.c:747
-#: ../libpurple/protocols/silc/util.c:520
-#: ../libpurple/protocols/silc10/buddy.c:1497
-#: ../libpurple/protocols/silc10/silc.c:658
+#: ../libpurple/protocols/silc/buddy.c:1500
+#: ../libpurple/protocols/silc/silc.c:890
+#: ../libpurple/protocols/silc/util.c:526
+#: ../libpurple/protocols/silc10/buddy.c:1500
+#: ../libpurple/protocols/silc10/silc.c:664
 #: ../libpurple/protocols/silc10/util.c:516
 msgid "Angry"
 msgstr "Sint"
 
-#: ../libpurple/protocols/silc/buddy.c:1499
-#: ../libpurple/protocols/silc/silc.c:749
-#: ../libpurple/protocols/silc/util.c:522
-#: ../libpurple/protocols/silc10/buddy.c:1499
-#: ../libpurple/protocols/silc10/silc.c:660
+#: ../libpurple/protocols/silc/buddy.c:1502
+#: ../libpurple/protocols/silc/silc.c:892
+#: ../libpurple/protocols/silc/util.c:528
+#: ../libpurple/protocols/silc10/buddy.c:1502
+#: ../libpurple/protocols/silc10/silc.c:666
 #: ../libpurple/protocols/silc10/util.c:518
 msgid "Jealous"
 msgstr "Misunneleg"
 
-#: ../libpurple/protocols/silc/buddy.c:1501
-#: ../libpurple/protocols/silc/silc.c:751
-#: ../libpurple/protocols/silc/util.c:524
-#: ../libpurple/protocols/silc10/buddy.c:1501
-#: ../libpurple/protocols/silc10/silc.c:662
+#: ../libpurple/protocols/silc/buddy.c:1504
+#: ../libpurple/protocols/silc/silc.c:894
+#: ../libpurple/protocols/silc/util.c:530
+#: ../libpurple/protocols/silc10/buddy.c:1504
+#: ../libpurple/protocols/silc10/silc.c:668
 #: ../libpurple/protocols/silc10/util.c:520
 msgid "Ashamed"
 msgstr "Skamfull"
 
-#: ../libpurple/protocols/silc/buddy.c:1503
-#: ../libpurple/protocols/silc/silc.c:753
-#: ../libpurple/protocols/silc/util.c:526
-#: ../libpurple/protocols/silc10/buddy.c:1503
-#: ../libpurple/protocols/silc10/silc.c:664
+#: ../libpurple/protocols/silc/buddy.c:1506
+#: ../libpurple/protocols/silc/silc.c:896
+#: ../libpurple/protocols/silc/util.c:532
+#: ../libpurple/protocols/silc10/buddy.c:1506
+#: ../libpurple/protocols/silc10/silc.c:670
 #: ../libpurple/protocols/silc10/util.c:522
 msgid "Invincible"
 msgstr "Uovervinneleg"
 
-#: ../libpurple/protocols/silc/buddy.c:1505
-#: ../libpurple/protocols/silc/util.c:528
-#: ../libpurple/protocols/silc10/buddy.c:1505
+#: ../libpurple/protocols/silc/buddy.c:1508
+#: ../libpurple/protocols/silc/util.c:534
+#: ../libpurple/protocols/silc10/buddy.c:1508
 #: ../libpurple/protocols/silc10/util.c:524
 msgid "In Love"
 msgstr "Forelska"
 
-#: ../libpurple/protocols/silc/buddy.c:1507
-#: ../libpurple/protocols/silc/silc.c:757
-#: ../libpurple/protocols/silc/util.c:530
-#: ../libpurple/protocols/silc10/buddy.c:1507
-#: ../libpurple/protocols/silc10/silc.c:668
+#: ../libpurple/protocols/silc/buddy.c:1510
+#: ../libpurple/protocols/silc/silc.c:900
+#: ../libpurple/protocols/silc/util.c:536
+#: ../libpurple/protocols/silc10/buddy.c:1510
+#: ../libpurple/protocols/silc10/silc.c:674
 #: ../libpurple/protocols/silc10/util.c:526
 msgid "Sleepy"
 msgstr "Søvnig"
 
-#: ../libpurple/protocols/silc/buddy.c:1509
-#: ../libpurple/protocols/silc/silc.c:759
-#: ../libpurple/protocols/silc/util.c:532
-#: ../libpurple/protocols/silc10/buddy.c:1509
-#: ../libpurple/protocols/silc10/silc.c:670
+#: ../libpurple/protocols/silc/buddy.c:1512
+#: ../libpurple/protocols/silc/silc.c:902
+#: ../libpurple/protocols/silc/util.c:538
+#: ../libpurple/protocols/silc10/buddy.c:1512
+#: ../libpurple/protocols/silc10/silc.c:676
 #: ../libpurple/protocols/silc10/util.c:528
 msgid "Bored"
 msgstr "Keier meg"
 
-#: ../libpurple/protocols/silc/buddy.c:1511
-#: ../libpurple/protocols/silc/silc.c:761
-#: ../libpurple/protocols/silc/util.c:534
-#: ../libpurple/protocols/silc10/buddy.c:1511
-#: ../libpurple/protocols/silc10/silc.c:672
+#: ../libpurple/protocols/silc/buddy.c:1514
+#: ../libpurple/protocols/silc/silc.c:904
+#: ../libpurple/protocols/silc/util.c:540
+#: ../libpurple/protocols/silc10/buddy.c:1514
+#: ../libpurple/protocols/silc10/silc.c:678
 #: ../libpurple/protocols/silc10/util.c:530
 msgid "Excited"
 msgstr "Oppglødd"
 
-#: ../libpurple/protocols/silc/buddy.c:1513
-#: ../libpurple/protocols/silc/silc.c:763
-#: ../libpurple/protocols/silc/util.c:536
-#: ../libpurple/protocols/silc10/buddy.c:1513
-#: ../libpurple/protocols/silc10/silc.c:674
+#: ../libpurple/protocols/silc/buddy.c:1516
+#: ../libpurple/protocols/silc/silc.c:906
+#: ../libpurple/protocols/silc/util.c:542
+#: ../libpurple/protocols/silc10/buddy.c:1516
+#: ../libpurple/protocols/silc10/silc.c:680
 #: ../libpurple/protocols/silc10/util.c:532
 msgid "Anxious"
 msgstr "Ivrig"
 
-#: ../libpurple/protocols/silc/buddy.c:1545
+#: ../libpurple/protocols/silc/buddy.c:1548
 #: ../libpurple/protocols/silc/ops.c:1207
-#: ../libpurple/protocols/silc10/buddy.c:1545
+#: ../libpurple/protocols/silc10/buddy.c:1548
 #: ../libpurple/protocols/silc10/ops.c:1202
 msgid "User Modes"
 msgstr "Brukartilstandar"
 
-#: ../libpurple/protocols/silc/buddy.c:1562
+#: ../libpurple/protocols/silc/buddy.c:1565
 #: ../libpurple/protocols/silc/ops.c:1224
-#: ../libpurple/protocols/silc10/buddy.c:1562
+#: ../libpurple/protocols/silc10/buddy.c:1565
 #: ../libpurple/protocols/silc10/ops.c:1219
 msgid "Preferred Contact"
 msgstr "Føretrekt kontakt"
 
-#: ../libpurple/protocols/silc/buddy.c:1567
+#: ../libpurple/protocols/silc/buddy.c:1570
 #: ../libpurple/protocols/silc/ops.c:1229
-#: ../libpurple/protocols/silc10/buddy.c:1567
+#: ../libpurple/protocols/silc10/buddy.c:1570
 #: ../libpurple/protocols/silc10/ops.c:1224
 msgid "Preferred Language"
 msgstr "Føretrekt språk"
 
-#: ../libpurple/protocols/silc/buddy.c:1572
+#: ../libpurple/protocols/silc/buddy.c:1575
 #: ../libpurple/protocols/silc/ops.c:1234
-#: ../libpurple/protocols/silc10/buddy.c:1572
+#: ../libpurple/protocols/silc10/buddy.c:1575
 #: ../libpurple/protocols/silc10/ops.c:1229
 msgid "Device"
 msgstr "Eining"
 
-#: ../libpurple/protocols/silc/buddy.c:1577
+#: ../libpurple/protocols/silc/buddy.c:1580
 #: ../libpurple/protocols/silc/ops.c:1239
-#: ../libpurple/protocols/silc10/buddy.c:1577
+#: ../libpurple/protocols/silc10/buddy.c:1580
 #: ../libpurple/protocols/silc10/ops.c:1234
-#: ../libpurple/protocols/silc10/silc.c:722
-#: ../libpurple/protocols/silc10/silc.c:724
+#: ../libpurple/protocols/silc10/silc.c:728
+#: ../libpurple/protocols/silc10/silc.c:730
 msgid "Timezone"
 msgstr "Tidssone"
 
-#: ../libpurple/protocols/silc/buddy.c:1582
+#: ../libpurple/protocols/silc/buddy.c:1585
 #: ../libpurple/protocols/silc/ops.c:1244
-#: ../libpurple/protocols/silc10/buddy.c:1582
+#: ../libpurple/protocols/silc10/buddy.c:1585
 #: ../libpurple/protocols/silc10/ops.c:1239
 msgid "Geolocation"
 msgstr "Geografisk plassering"
 
-#: ../libpurple/protocols/silc/buddy.c:1638
-#: ../libpurple/protocols/silc10/buddy.c:1636
+#: ../libpurple/protocols/silc/buddy.c:1641
+#: ../libpurple/protocols/silc10/buddy.c:1639
 msgid "Reset IM Key"
 msgstr "Nullstill lynmeldingsnøkkel"
 
-#: ../libpurple/protocols/silc/buddy.c:1643
-#: ../libpurple/protocols/silc10/buddy.c:1642
+#: ../libpurple/protocols/silc/buddy.c:1646
+#: ../libpurple/protocols/silc10/buddy.c:1645
 msgid "IM with Key Exchange"
 msgstr "Lynmelding med nøkkelutveksling"
 
-#: ../libpurple/protocols/silc/buddy.c:1648
-#: ../libpurple/protocols/silc10/buddy.c:1647
+#: ../libpurple/protocols/silc/buddy.c:1651
+#: ../libpurple/protocols/silc10/buddy.c:1650
 msgid "IM with Password"
 msgstr "Lynmelding med passord"
 
-#: ../libpurple/protocols/silc/buddy.c:1661
-#: ../libpurple/protocols/silc10/buddy.c:1660
+#: ../libpurple/protocols/silc/buddy.c:1664
+#: ../libpurple/protocols/silc10/buddy.c:1663
 msgid "Get Public Key..."
 msgstr "Hent offentleg nøkkel…"
 
-#: ../libpurple/protocols/silc/buddy.c:1668
-#: ../libpurple/protocols/silc/ops.c:1608
-#: ../libpurple/protocols/silc10/buddy.c:1667
+#: ../libpurple/protocols/silc/buddy.c:1671
+#: ../libpurple/protocols/silc/ops.c:1612
+#: ../libpurple/protocols/silc10/buddy.c:1670
 #: ../libpurple/protocols/silc10/ops.c:1624
 msgid "Kill User"
 msgstr "Kverk brukar"
 
-#: ../libpurple/protocols/silc/buddy.c:1678
-#: ../libpurple/protocols/silc/chat.c:993
-#: ../libpurple/protocols/silc10/buddy.c:1677
+#: ../libpurple/protocols/silc/buddy.c:1681
+#: ../libpurple/protocols/silc/chat.c:997
+#: ../libpurple/protocols/silc10/buddy.c:1680
 #: ../libpurple/protocols/silc10/chat.c:977
 msgid "Draw On Whiteboard"
 msgstr "Teikna på tavle"
@@ -10791,7 +11223,7 @@ msgstr "Kanalen %s finst ikkje i nettver
 msgstr "Kanalen %s finst ikkje i nettverket"
 
 #: ../libpurple/protocols/silc/chat.c:81
-#: ../libpurple/protocols/silc/chat.c:175
+#: ../libpurple/protocols/silc/chat.c:177
 #: ../libpurple/protocols/silc10/chat.c:81
 #: ../libpurple/protocols/silc10/chat.c:174
 msgid "Channel Information"
@@ -10841,64 +11273,52 @@ msgstr "<br><b>Kanalemne:</b><br>%s"
 
 #: ../libpurple/protocols/silc/chat.c:153
 #: ../libpurple/protocols/silc10/chat.c:152
-#, c-format
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Kanaltilstandar:</b> "
 
-#: ../libpurple/protocols/silc/chat.c:166
+#: ../libpurple/protocols/silc/chat.c:167
 #: ../libpurple/protocols/silc10/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>Stiftaren sitt nøkkelfingeravtrykk:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:167
+#: ../libpurple/protocols/silc/chat.c:168
 #: ../libpurple/protocols/silc10/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>Stiftaren sitt nøkkelskribleriavtrykk:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:236
+#: ../libpurple/protocols/silc/chat.c:238
 #: ../libpurple/protocols/silc10/chat.c:236
 msgid "Add Channel Public Key"
 msgstr "Legg til kanalen sin offentlege nøkkel"
 
 #. Add new public key
-#: ../libpurple/protocols/silc/chat.c:304
+#: ../libpurple/protocols/silc/chat.c:306
 #: ../libpurple/protocols/silc10/chat.c:291
 msgid "Open Public Key..."
 msgstr "Opna offentleg nøkkel…"
 
-#: ../libpurple/protocols/silc/chat.c:423
+#: ../libpurple/protocols/silc/chat.c:425
 #: ../libpurple/protocols/silc10/chat.c:401
 msgid "Channel Passphrase"
 msgstr "Kanaltilgangsfrase"
 
-#: ../libpurple/protocols/silc/chat.c:430
+#: ../libpurple/protocols/silc/chat.c:432
 #: ../libpurple/protocols/silc10/chat.c:408
 msgid "Channel Public Keys List"
 msgstr "Liste over kanalen sine offentleg nøklar"
 
-#: ../libpurple/protocols/silc/chat.c:435
+#: ../libpurple/protocols/silc/chat.c:437
 #: ../libpurple/protocols/silc10/chat.c:413
-#, c-format
-msgid ""
-"Channel authentication is used to secure the channel from unauthorized "
-"access. The authentication may be based on passphrase and digital "
-"signatures. If passphrase is set, it is required to be able to join. If "
-"channel public keys are set then only users whose public keys are listed are "
-"able to join."
-msgstr ""
-"Kanalautentisering blir nytta til å tryggja kanalen mot uautorisert tilgang. "
-"Autentiseringa kan vera basert på tilgangsfraser og digitale signaturar. Om "
-"ein tilgangskode er lagra, må denne nyttast for å kunne bli med. Dersom ein "
-"nyttar offentlege nøklar for kanalen, kan berre dei brukarane som er lista "
-"opp med offentlege nøklar bli med."
+msgid "Channel authentication is used to secure the channel from unauthorized access. The authentication may be based on passphrase and digital signatures. If passphrase is set, it is required to be able to join. If channel public keys are set then only users whose public keys are listed are able to join."
+msgstr "Kanalautentisering blir nytta til å tryggja kanalen mot uautorisert tilgang. Autentiseringa kan vera basert på tilgangsfraser og digitale signaturar. Om ein tilgangskode er vald, må denne nyttast for å kunna bli med. Dersom ein nyttar offentlege nøklar for kanalen, kan berre dei brukarane som er lista opp med offentlege nøklar bli med."
 
-#: ../libpurple/protocols/silc/chat.c:444
-#: ../libpurple/protocols/silc/chat.c:445
-#: ../libpurple/protocols/silc/chat.c:479
-#: ../libpurple/protocols/silc/chat.c:480
-#: ../libpurple/protocols/silc/chat.c:927
+#: ../libpurple/protocols/silc/chat.c:446
+#: ../libpurple/protocols/silc/chat.c:447
+#: ../libpurple/protocols/silc/chat.c:483
+#: ../libpurple/protocols/silc/chat.c:484
+#: ../libpurple/protocols/silc/chat.c:931
 #: ../libpurple/protocols/silc10/chat.c:422
 #: ../libpurple/protocols/silc10/chat.c:423
 #: ../libpurple/protocols/silc10/chat.c:461
@@ -10907,154 +11327,159 @@ msgstr "Kanalautentisering"
 msgid "Channel Authentication"
 msgstr "Kanalautentisering"
 
-#: ../libpurple/protocols/silc/chat.c:446
-#: ../libpurple/protocols/silc/chat.c:481
+#: ../libpurple/protocols/silc/chat.c:448
+#: ../libpurple/protocols/silc/chat.c:485
 #: ../libpurple/protocols/silc10/chat.c:424
 #: ../libpurple/protocols/silc10/chat.c:463
 msgid "Add / Remove"
 msgstr "Legg til/fjern"
 
-#: ../libpurple/protocols/silc/chat.c:597
+#: ../libpurple/protocols/silc/chat.c:601
 #: ../libpurple/protocols/silc10/chat.c:581
 msgid "Group Name"
 msgstr "Gruppenamn"
 
-#: ../libpurple/protocols/silc/chat.c:601
-#: ../libpurple/protocols/silc/ops.c:1813
-#: ../libpurple/protocols/silc/silc.c:1020
+#: ../libpurple/protocols/silc/chat.c:605
+#: ../libpurple/protocols/silc/ops.c:1817
+#: ../libpurple/protocols/silc/silc.c:1163
 #: ../libpurple/protocols/silc10/chat.c:585
-#: ../libpurple/protocols/silc10/ops.c:1901
-#: ../libpurple/protocols/silc10/silc.c:931
+#: ../libpurple/protocols/silc10/ops.c:1907
+#: ../libpurple/protocols/silc10/silc.c:937
 msgid "Passphrase"
 msgstr "Tilgangsfrase"
 
-#: ../libpurple/protocols/silc/chat.c:612
+#: ../libpurple/protocols/silc/chat.c:616
 #: ../libpurple/protocols/silc10/chat.c:596
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "Før opp %s-kanalen sitt private gruppenamn og tilgangsfrase."
 
-#: ../libpurple/protocols/silc/chat.c:614
+#: ../libpurple/protocols/silc/chat.c:618
 #: ../libpurple/protocols/silc10/chat.c:598
 msgid "Add Channel Private Group"
 msgstr "Legg til privat kanalgruppe"
 
-#: ../libpurple/protocols/silc/chat.c:742
+#: ../libpurple/protocols/silc/chat.c:746
 #: ../libpurple/protocols/silc10/chat.c:726
 msgid "User Limit"
 msgstr "Brukargrense"
 
-#: ../libpurple/protocols/silc/chat.c:743
+#: ../libpurple/protocols/silc/chat.c:747
 #: ../libpurple/protocols/silc10/chat.c:727
 msgid "Set user limit on channel. Set to zero to reset user limit."
-msgstr ""
-"Still inn brukargrense for kanalen. Før opp null for å nullstilla grensa."
+msgstr "Vel brukargrense for kanalen. Før opp null for å nullstilla grensa."
 
-#: ../libpurple/protocols/silc/chat.c:907
+#: ../libpurple/protocols/silc/chat.c:911
 #: ../libpurple/protocols/silc10/chat.c:891
 msgid "Invite List"
 msgstr "Invitasjonsliste"
 
-#: ../libpurple/protocols/silc/chat.c:912
+#: ../libpurple/protocols/silc/chat.c:916
 #: ../libpurple/protocols/silc10/chat.c:896
 msgid "Ban List"
 msgstr "Utestengjingsliste"
 
-#: ../libpurple/protocols/silc/chat.c:920
+#: ../libpurple/protocols/silc/chat.c:924
 #: ../libpurple/protocols/silc10/chat.c:904
 msgid "Add Private Group"
 msgstr "Legg til privat gruppe"
 
-#: ../libpurple/protocols/silc/chat.c:933
+#: ../libpurple/protocols/silc/chat.c:937
 #: ../libpurple/protocols/silc10/chat.c:917
 msgid "Reset Permanent"
 msgstr "Nullstill permanent"
 
-#: ../libpurple/protocols/silc/chat.c:938
+#: ../libpurple/protocols/silc/chat.c:942
 #: ../libpurple/protocols/silc10/chat.c:922
 msgid "Set Permanent"
 msgstr "Lagra permanent"
 
-#: ../libpurple/protocols/silc/chat.c:946
+#: ../libpurple/protocols/silc/chat.c:950
 #: ../libpurple/protocols/silc10/chat.c:930
 msgid "Set User Limit"
 msgstr "Vel brukargrense"
 
-#: ../libpurple/protocols/silc/chat.c:952
+#: ../libpurple/protocols/silc/chat.c:956
 #: ../libpurple/protocols/silc10/chat.c:936
 msgid "Reset Topic Restriction"
 msgstr "Fjern emneinnskrenking"
 
-#: ../libpurple/protocols/silc/chat.c:957
+#: ../libpurple/protocols/silc/chat.c:961
 #: ../libpurple/protocols/silc10/chat.c:941
 msgid "Set Topic Restriction"
 msgstr "Vel emneinnskrenking"
 
-#: ../libpurple/protocols/silc/chat.c:964
+#: ../libpurple/protocols/silc/chat.c:968
 #: ../libpurple/protocols/silc10/chat.c:948
 msgid "Reset Private Channel"
 msgstr "Nullstill privat kanal"
 
-#: ../libpurple/protocols/silc/chat.c:969
+#: ../libpurple/protocols/silc/chat.c:973
 #: ../libpurple/protocols/silc10/chat.c:953
 msgid "Set Private Channel"
 msgstr "Vel privat kanal"
 
-#: ../libpurple/protocols/silc/chat.c:976
+#: ../libpurple/protocols/silc/chat.c:980
 #: ../libpurple/protocols/silc10/chat.c:960
 msgid "Reset Secret Channel"
 msgstr "Nullstill hemmeleg kanal"
 
-#: ../libpurple/protocols/silc/chat.c:981
+#: ../libpurple/protocols/silc/chat.c:985
 #: ../libpurple/protocols/silc10/chat.c:965
 msgid "Set Secret Channel"
 msgstr "Vel hemmeleg kanal"
 
-#: ../libpurple/protocols/silc/chat.c:1045
+#: ../libpurple/protocols/silc/chat.c:1046
 #: ../libpurple/protocols/silc10/chat.c:1102
 #, c-format
-msgid ""
-"You have to join the %s channel before you are able to join the private group"
+msgid "You have to join the %s channel before you are able to join the private group"
 msgstr "Du må vera med i %s-kanalen før du kan bli med i den private gruppa"
 
-#: ../libpurple/protocols/silc/chat.c:1047
+#: ../libpurple/protocols/silc/chat.c:1048
 #: ../libpurple/protocols/silc10/chat.c:1104
 msgid "Join Private Group"
 msgstr "Bli med i privatgruppe"
 
-#: ../libpurple/protocols/silc/chat.c:1048
+#: ../libpurple/protocols/silc/chat.c:1049
 #: ../libpurple/protocols/silc10/chat.c:1105
 msgid "Cannot join private group"
 msgstr "Klarer ikkje å bli med i privatgruppa"
 
-#: ../libpurple/protocols/silc/chat.c:1260
-#: ../libpurple/protocols/silc/silc.c:1217
+#: ../libpurple/protocols/silc/chat.c:1245
+#: ../libpurple/protocols/silc/silc.c:1360
 #: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1137
+#: ../libpurple/protocols/silc10/silc.c:1143
 msgid "Call Command"
 msgstr "Utfør kommando"
 
-#: ../libpurple/protocols/silc/chat.c:1260
-#: ../libpurple/protocols/silc/silc.c:1218
+#: ../libpurple/protocols/silc/chat.c:1245
+#: ../libpurple/protocols/silc/silc.c:1361
 #: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1137
+#: ../libpurple/protocols/silc10/silc.c:1143
 msgid "Cannot call command"
 msgstr "Klarer ikkje å utføra kommandoen"
 
-#: ../libpurple/protocols/silc/chat.c:1261
-#: ../libpurple/protocols/silc/silc.c:1219
+#: ../libpurple/protocols/silc/chat.c:1246
+#: ../libpurple/protocols/silc/silc.c:1362
 #: ../libpurple/protocols/silc10/chat.c:1300
-#: ../libpurple/protocols/silc10/silc.c:1138
+#: ../libpurple/protocols/silc10/silc.c:1144
 msgid "Unknown command"
 msgstr "Ukjend kommando"
 
-#: ../libpurple/protocols/silc/ft.c:85 ../libpurple/protocols/silc/ft.c:101
-#: ../libpurple/protocols/silc/ft.c:104 ../libpurple/protocols/silc/ft.c:108
-#: ../libpurple/protocols/silc/ft.c:112 ../libpurple/protocols/silc/ft.c:116
-#: ../libpurple/protocols/silc/ft.c:120 ../libpurple/protocols/silc/ft.c:272
-#: ../libpurple/protocols/silc/ft.c:277 ../libpurple/protocols/silc/ft.c:282
-#: ../libpurple/protocols/silc/ft.c:288 ../libpurple/protocols/silc/ft.c:425
-#: ../libpurple/protocols/silc10/ft.c:89 ../libpurple/protocols/silc10/ft.c:92
+#: ../libpurple/protocols/silc/ft.c:85
+#: ../libpurple/protocols/silc/ft.c:101
+#: ../libpurple/protocols/silc/ft.c:104
+#: ../libpurple/protocols/silc/ft.c:108
+#: ../libpurple/protocols/silc/ft.c:112
+#: ../libpurple/protocols/silc/ft.c:116
+#: ../libpurple/protocols/silc/ft.c:120
+#: ../libpurple/protocols/silc/ft.c:272
+#: ../libpurple/protocols/silc/ft.c:277
+#: ../libpurple/protocols/silc/ft.c:282
+#: ../libpurple/protocols/silc/ft.c:288
+#: ../libpurple/protocols/silc/ft.c:425
+#: ../libpurple/protocols/silc10/ft.c:89
+#: ../libpurple/protocols/silc10/ft.c:92
 #: ../libpurple/protocols/silc10/ft.c:96
 #: ../libpurple/protocols/silc10/ft.c:100
 #: ../libpurple/protocols/silc10/ft.c:104
@@ -11066,11 +11491,16 @@ msgstr "Sikker filoverføring"
 msgid "Secure File Transfer"
 msgstr "Sikker filoverføring"
 
-#: ../libpurple/protocols/silc/ft.c:86 ../libpurple/protocols/silc/ft.c:102
-#: ../libpurple/protocols/silc/ft.c:105 ../libpurple/protocols/silc/ft.c:109
-#: ../libpurple/protocols/silc/ft.c:113 ../libpurple/protocols/silc/ft.c:117
-#: ../libpurple/protocols/silc/ft.c:121 ../libpurple/protocols/silc10/ft.c:90
-#: ../libpurple/protocols/silc10/ft.c:93 ../libpurple/protocols/silc10/ft.c:97
+#: ../libpurple/protocols/silc/ft.c:86
+#: ../libpurple/protocols/silc/ft.c:102
+#: ../libpurple/protocols/silc/ft.c:105
+#: ../libpurple/protocols/silc/ft.c:109
+#: ../libpurple/protocols/silc/ft.c:113
+#: ../libpurple/protocols/silc/ft.c:117
+#: ../libpurple/protocols/silc/ft.c:121
+#: ../libpurple/protocols/silc10/ft.c:90
+#: ../libpurple/protocols/silc10/ft.c:93
+#: ../libpurple/protocols/silc10/ft.c:97
 #: ../libpurple/protocols/silc10/ft.c:101
 #: ../libpurple/protocols/silc10/ft.c:105
 msgid "Error during file transfer"
@@ -11080,11 +11510,13 @@ msgstr "Fjernnode fråkopla"
 msgid "Remote disconnected"
 msgstr "Fjernnode fråkopla"
 
-#: ../libpurple/protocols/silc/ft.c:106 ../libpurple/protocols/silc10/ft.c:94
+#: ../libpurple/protocols/silc/ft.c:106
+#: ../libpurple/protocols/silc10/ft.c:94
 msgid "Permission denied"
 msgstr "Tilgang avvist"
 
-#: ../libpurple/protocols/silc/ft.c:110 ../libpurple/protocols/silc10/ft.c:98
+#: ../libpurple/protocols/silc/ft.c:110
+#: ../libpurple/protocols/silc10/ft.c:98
 msgid "Key agreement failed"
 msgstr "Nøkkelgodkjenninga feila"
 
@@ -11096,27 +11528,33 @@ msgstr "Klarte ikkje å oppretta samband
 msgid "Creating connection failed"
 msgstr "Klarte ikkje å oppretta samband"
 
-#: ../libpurple/protocols/silc/ft.c:122 ../libpurple/protocols/silc10/ft.c:102
+#: ../libpurple/protocols/silc/ft.c:122
+#: ../libpurple/protocols/silc10/ft.c:102
 msgid "File transfer session does not exist"
 msgstr "Filoverføringsøkta finst ikkje"
 
-#: ../libpurple/protocols/silc/ft.c:273 ../libpurple/protocols/silc10/ft.c:206
+#: ../libpurple/protocols/silc/ft.c:273
+#: ../libpurple/protocols/silc10/ft.c:206
 msgid "No file transfer session active"
 msgstr "Inga aktiv filoverføringsøkt"
 
-#: ../libpurple/protocols/silc/ft.c:278 ../libpurple/protocols/silc10/ft.c:211
+#: ../libpurple/protocols/silc/ft.c:278
+#: ../libpurple/protocols/silc10/ft.c:211
 msgid "File transfer already started"
 msgstr "Filoverføringa er allereie starta"
 
-#: ../libpurple/protocols/silc/ft.c:283 ../libpurple/protocols/silc10/ft.c:216
+#: ../libpurple/protocols/silc/ft.c:283
+#: ../libpurple/protocols/silc10/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr "Klarte ikkje å utføra nøkkelgodkjenning for filoverføringa"
 
-#: ../libpurple/protocols/silc/ft.c:289 ../libpurple/protocols/silc10/ft.c:222
+#: ../libpurple/protocols/silc/ft.c:289
+#: ../libpurple/protocols/silc10/ft.c:222
 msgid "Could not start the file transfer"
 msgstr "Klarte ikkje å starta filoverføringa"
 
-#: ../libpurple/protocols/silc/ft.c:426 ../libpurple/protocols/silc10/ft.c:341
+#: ../libpurple/protocols/silc/ft.c:426
+#: ../libpurple/protocols/silc10/ft.c:341
 msgid "Cannot send file"
 msgstr "Klarer ikkje å senda fila"
 
@@ -11124,7 +11562,8 @@ msgstr "Det oppstod ein feil"
 msgid "Error occurred"
 msgstr "Det oppstod ein feil"
 
-#: ../libpurple/protocols/silc/ops.c:533 ../libpurple/protocols/silc/ops.c:542
+#: ../libpurple/protocols/silc/ops.c:533
+#: ../libpurple/protocols/silc/ops.c:542
 #: ../libpurple/protocols/silc/ops.c:551
 #: ../libpurple/protocols/silc10/ops.c:554
 #: ../libpurple/protocols/silc10/ops.c:563
@@ -11149,7 +11588,7 @@ msgid "<I>%s</I> set <I>%s's</I> modes t
 #: ../libpurple/protocols/silc10/ops.c:675
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
-msgstr "<I>%s</I> endra <I>%s</I> sine tilstandar til: %s"
+msgstr "<I>%s</I> sette <I>%s</I> sine tilstandar til: %s"
 
 #: ../libpurple/protocols/silc/ops.c:662
 #: ../libpurple/protocols/silc10/ops.c:683
@@ -11163,7 +11602,8 @@ msgstr "Du er blitt sparka ut frå <I>%s
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "Du er blitt sparka ut frå <I>%s</I> av <I>%s</I> (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:718 ../libpurple/protocols/silc/ops.c:723
+#: ../libpurple/protocols/silc/ops.c:718
+#: ../libpurple/protocols/silc/ops.c:723
 #: ../libpurple/protocols/silc/ops.c:728
 #: ../libpurple/protocols/silc10/ops.c:742
 #: ../libpurple/protocols/silc10/ops.c:747
@@ -11172,7 +11612,8 @@ msgstr "Du er blitt kverka av %s (%s)"
 msgid "You have been killed by %s (%s)"
 msgstr "Du er blitt kverka av %s (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:749 ../libpurple/protocols/silc/ops.c:754
+#: ../libpurple/protocols/silc/ops.c:749
+#: ../libpurple/protocols/silc/ops.c:754
 #: ../libpurple/protocols/silc/ops.c:759
 #: ../libpurple/protocols/silc10/ops.c:773
 #: ../libpurple/protocols/silc10/ops.c:778
@@ -11202,9 +11643,9 @@ msgstr "Arbeidsrolle"
 msgstr "Arbeidsrolle"
 
 #: ../libpurple/protocols/silc/ops.c:1018
-#: ../libpurple/protocols/silc/silc.c:1013
+#: ../libpurple/protocols/silc/silc.c:1156
 #: ../libpurple/protocols/silc10/ops.c:1052
-#: ../libpurple/protocols/silc10/silc.c:924
+#: ../libpurple/protocols/silc10/silc.c:930
 msgid "Organization"
 msgstr "Organisasjon"
 
@@ -11236,7 +11677,7 @@ msgstr "Kanalstiftaren på <I>%s</I> er 
 msgstr "Kanalstiftaren på <I>%s</I> er <I>%s</I>"
 
 #: ../libpurple/protocols/silc/ops.c:1190
-#: ../libpurple/protocols/silc/ops.c:1326
+#: ../libpurple/protocols/silc/ops.c:1328
 #: ../libpurple/protocols/silc10/ops.c:1183
 #: ../libpurple/protocols/silc10/ops.c:1332
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1071
@@ -11248,90 +11689,90 @@ msgstr "Statustekst"
 msgid "Status Text"
 msgstr "Statustekst"
 
-#: ../libpurple/protocols/silc/ops.c:1279
-#: ../libpurple/protocols/silc/ops.c:1351
+#: ../libpurple/protocols/silc/ops.c:1280
+#: ../libpurple/protocols/silc/ops.c:1354
 #: ../libpurple/protocols/silc10/ops.c:1285
 #: ../libpurple/protocols/silc10/ops.c:1357
 msgid "Public Key Fingerprint"
 msgstr "Fingeravtrykk offentleg nøkkel"
 
-#: ../libpurple/protocols/silc/ops.c:1280
-#: ../libpurple/protocols/silc/ops.c:1352
+#: ../libpurple/protocols/silc/ops.c:1281
+#: ../libpurple/protocols/silc/ops.c:1355
 #: ../libpurple/protocols/silc10/ops.c:1286
 #: ../libpurple/protocols/silc10/ops.c:1358
 msgid "Public Key Babbleprint"
 msgstr "Offentleg nøkkel skribleriavtrykk"
 
-#: ../libpurple/protocols/silc/ops.c:1292
+#: ../libpurple/protocols/silc/ops.c:1294
 #: ../libpurple/protocols/silc10/ops.c:1298
 msgid "_More..."
 msgstr "_Meir…"
 
-#: ../libpurple/protocols/silc/ops.c:1369
-#: ../libpurple/protocols/silc/silc.c:1077
+#: ../libpurple/protocols/silc/ops.c:1373
+#: ../libpurple/protocols/silc/silc.c:1220
 #: ../libpurple/protocols/silc10/ops.c:1371
-#: ../libpurple/protocols/silc10/silc.c:988
+#: ../libpurple/protocols/silc10/silc.c:994
 msgid "Detach From Server"
 msgstr "Kopla frå tenar"
 
-#: ../libpurple/protocols/silc/ops.c:1369
+#: ../libpurple/protocols/silc/ops.c:1373
 #: ../libpurple/protocols/silc10/ops.c:1371
 msgid "Cannot detach"
 msgstr "Klarer ikkje å kopla frå"
 
-#: ../libpurple/protocols/silc/ops.c:1389
+#: ../libpurple/protocols/silc/ops.c:1393
 #: ../libpurple/protocols/silc10/ops.c:1382
 msgid "Cannot set topic"
 msgstr "Klarer ikkje å lagra emnet"
 
-#: ../libpurple/protocols/silc/ops.c:1418
+#: ../libpurple/protocols/silc/ops.c:1422
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Failed to change nickname"
 msgstr "Klarte ikkje å endra kallenamnet"
 
-#: ../libpurple/protocols/silc/ops.c:1467
+#: ../libpurple/protocols/silc/ops.c:1471
 #: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Roomlist"
 msgstr "Romliste"
 
-#: ../libpurple/protocols/silc/ops.c:1467
+#: ../libpurple/protocols/silc/ops.c:1471
 #: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Cannot get room list"
 msgstr "Klarer ikkje å henta romlista"
 
-#: ../libpurple/protocols/silc/ops.c:1468
+#: ../libpurple/protocols/silc/ops.c:1472
 msgid "Network is empty"
 msgstr "Nettverket er tomt"
 
-#: ../libpurple/protocols/silc/ops.c:1512
+#: ../libpurple/protocols/silc/ops.c:1516
 #: ../libpurple/protocols/silc10/ops.c:1507
 msgid "No public key was received"
 msgstr "Fekk ingen offentleg nøkkel"
 
-#: ../libpurple/protocols/silc/ops.c:1524
-#: ../libpurple/protocols/silc/ops.c:1537
+#: ../libpurple/protocols/silc/ops.c:1528
+#: ../libpurple/protocols/silc/ops.c:1541
 #: ../libpurple/protocols/silc10/ops.c:1519
 #: ../libpurple/protocols/silc10/ops.c:1532
 msgid "Server Information"
 msgstr "Tenarinformasjon"
 
-#: ../libpurple/protocols/silc/ops.c:1525
+#: ../libpurple/protocols/silc/ops.c:1529
 #: ../libpurple/protocols/silc10/ops.c:1520
 msgid "Cannot get server information"
 msgstr "Klarer ikkje å henta tenarinformasjonen"
 
-#: ../libpurple/protocols/silc/ops.c:1548
+#: ../libpurple/protocols/silc/ops.c:1552
 #: ../libpurple/protocols/silc10/ops.c:1549
 #: ../libpurple/protocols/silc10/ops.c:1558
 msgid "Server Statistics"
 msgstr "Tenarstatistikk"
 
-#: ../libpurple/protocols/silc/ops.c:1549
+#: ../libpurple/protocols/silc/ops.c:1553
 #: ../libpurple/protocols/silc10/ops.c:1550
 msgid "Cannot get server statistics"
 msgstr "Klarer ikkje å henta tenarstatistikken"
 
-#: ../libpurple/protocols/silc/ops.c:1556
+#: ../libpurple/protocols/silc/ops.c:1560
 #: ../libpurple/protocols/silc10/ops.c:1581
 #, c-format
 msgid ""
@@ -11367,73 +11808,72 @@ msgstr ""
 "Tenaroperatørar totalt: %d\n"
 "Rutaroperatørar totalt: %d\n"
 
-#: ../libpurple/protocols/silc/ops.c:1588
+#: ../libpurple/protocols/silc/ops.c:1592
 #: ../libpurple/protocols/silc10/ops.c:1604
 msgid "Network Statistics"
 msgstr "Nettverkstatistikk"
 
-#: ../libpurple/protocols/silc/ops.c:1596
+#: ../libpurple/protocols/silc/ops.c:1600
 #: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr "Ping feila"
 
-#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc/ops.c:1605
 #: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping reply received from server"
 msgstr "Motteke ping-svar frå tenaren"
 
-#: ../libpurple/protocols/silc/ops.c:1609
+#: ../libpurple/protocols/silc/ops.c:1613
 #: ../libpurple/protocols/silc10/ops.c:1625
 msgid "Could not kill user"
 msgstr "Klarte ikkje å kverka brukaren"
 
-#: ../libpurple/protocols/silc/ops.c:1648
+#: ../libpurple/protocols/silc/ops.c:1652
 msgid "WATCH"
 msgstr "OVERVAK"
 
-#: ../libpurple/protocols/silc/ops.c:1648
+#: ../libpurple/protocols/silc/ops.c:1652
 msgid "Cannot watch user"
 msgstr "Klarer ikkje å overvaka brukaren"
 
-#: ../libpurple/protocols/silc/ops.c:1724
-#: ../libpurple/protocols/silc/ops.c:1775
-#: ../libpurple/protocols/silc/silc.c:277
-#: ../libpurple/protocols/silc10/ops.c:1811
-#: ../libpurple/protocols/silc10/ops.c:1858
-#: ../libpurple/protocols/silc10/silc.c:190
+#: ../libpurple/protocols/silc/ops.c:1728
+#: ../libpurple/protocols/silc/ops.c:1779
+#: ../libpurple/protocols/silc/silc.c:385
+#: ../libpurple/protocols/silc10/ops.c:1817
+#: ../libpurple/protocols/silc10/ops.c:1864
+#: ../libpurple/protocols/silc10/silc.c:193
 msgid "Resuming session"
 msgstr "Tek opp att økta"
 
-#: ../libpurple/protocols/silc/ops.c:1726
-#: ../libpurple/protocols/silc10/ops.c:1813
+#: ../libpurple/protocols/silc/ops.c:1730
+#: ../libpurple/protocols/silc10/ops.c:1819
 msgid "Authenticating connection"
 msgstr "Godkjenner sambandet"
 
-#: ../libpurple/protocols/silc/ops.c:1777
-#: ../libpurple/protocols/silc10/ops.c:1860
+#: ../libpurple/protocols/silc/ops.c:1781
+#: ../libpurple/protocols/silc10/ops.c:1866
 msgid "Verifying server public key"
 msgstr "Stadfestar tenaren sin offentlege nøkkel"
 
-#: ../libpurple/protocols/silc/ops.c:1814
-#: ../libpurple/protocols/silc10/ops.c:1902
+#: ../libpurple/protocols/silc/ops.c:1818
+#: ../libpurple/protocols/silc10/ops.c:1908
 msgid "Passphrase required"
 msgstr "Tilgangsfrase er påkravd"
 
-#: ../libpurple/protocols/silc/pk.c:98 ../libpurple/protocols/silc10/pk.c:104
+#: ../libpurple/protocols/silc/pk.c:98
+#: ../libpurple/protocols/silc10/pk.c:104
 #, c-format
-msgid ""
-"Received %s's public key. Your local copy does not match this key. Would you "
-"still like to accept this public key?"
-msgstr ""
-"Har motteke den offentlege nøkkelen til %s. Den lokale kopien din samsvarer "
-"ikkje. Vil du likevel godta den offentlege nøkkelen?"
+msgid "Received %s's public key. Your local copy does not match this key. Would you still like to accept this public key?"
+msgstr "Har motteke den offentlege nøkkelen til %s. Den lokale kopien din samsvarer ikkje. Vil du likevel godta den offentlege nøkkelen?"
 
-#: ../libpurple/protocols/silc/pk.c:103 ../libpurple/protocols/silc10/pk.c:109
+#: ../libpurple/protocols/silc/pk.c:103
+#: ../libpurple/protocols/silc10/pk.c:109
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr "Har motteke den offentlege nøkkelen til %s. Godtek du han?"
 
-#: ../libpurple/protocols/silc/pk.c:107 ../libpurple/protocols/silc10/pk.c:113
+#: ../libpurple/protocols/silc/pk.c:107
+#: ../libpurple/protocols/silc10/pk.c:113
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -11446,102 +11886,103 @@ msgstr ""
 "%s\n"
 "%s\n"
 
-#: ../libpurple/protocols/silc/pk.c:110 ../libpurple/protocols/silc/pk.c:139
+#: ../libpurple/protocols/silc/pk.c:110
+#: ../libpurple/protocols/silc/pk.c:139
 #: ../libpurple/protocols/silc10/pk.c:116
 #: ../libpurple/protocols/silc10/pk.c:142
 msgid "Verify Public Key"
 msgstr "Stadfest offentleg nøkkel"
 
-#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc10/pk.c:121
+#: ../libpurple/protocols/silc/pk.c:115
+#: ../libpurple/protocols/silc10/pk.c:121
 msgid "_View..."
 msgstr "_Vis…"
 
-#: ../libpurple/protocols/silc/pk.c:140 ../libpurple/protocols/silc10/pk.c:143
+#: ../libpurple/protocols/silc/pk.c:140
+#: ../libpurple/protocols/silc10/pk.c:143
 msgid "Unsupported public key type"
 msgstr "Denne offentlege nøkkel-typen er ikkje støtta"
 
-#: ../libpurple/protocols/silc/silc.c:217
-#: ../libpurple/protocols/silc10/ops.c:1749
+#: ../libpurple/protocols/silc/silc.c:319
+#: ../libpurple/protocols/silc10/ops.c:1755
 msgid "Disconnected by server"
 msgstr "Fråkopla av tenaren"
 
-#: ../libpurple/protocols/silc/silc.c:224
-#: ../libpurple/protocols/silc10/ops.c:1700
+#: ../libpurple/protocols/silc/silc.c:327
+#: ../libpurple/protocols/silc10/ops.c:1701
 msgid "Error during connecting to SILC Server"
 msgstr "Feil under tilkopling mot SILC-tenaren"
 
-#: ../libpurple/protocols/silc/silc.c:229
-#: ../libpurple/protocols/silc10/ops.c:1705
+#: ../libpurple/protocols/silc/silc.c:333
+#: ../libpurple/protocols/silc10/ops.c:1707
 msgid "Key Exchange failed"
 msgstr "Nøkkelutvekslinga feila"
 
-#: ../libpurple/protocols/silc/silc.c:238
-#: ../libpurple/protocols/silc10/ops.c:1714
-msgid ""
-"Resuming detached session failed. Press Reconnect to create new connection."
-msgstr ""
-"Klarte ikkje å ta opp att den fråkopla økta. Trykk Kopla til att for å laga "
-"ei ny tilkopling."
+#: ../libpurple/protocols/silc/silc.c:343
+#: ../libpurple/protocols/silc10/ops.c:1718
+msgid "Resuming detached session failed. Press Reconnect to create new connection."
+msgstr "Klarte ikkje å ta opp att den fråkopla økta. Trykk Kopla til att for å laga ei ny tilkopling."
 
-#: ../libpurple/protocols/silc/silc.c:265
-#: ../libpurple/protocols/silc/silc.c:311
-#: ../libpurple/protocols/silc10/silc.c:161
+#: ../libpurple/protocols/silc/silc.c:373
+#: ../libpurple/protocols/silc/silc.c:420
+#: ../libpurple/protocols/silc10/silc.c:163
 msgid "Connection failed"
 msgstr "Tilkoplinga feila"
 
-#: ../libpurple/protocols/silc/silc.c:280
-#: ../libpurple/protocols/silc10/silc.c:193
+#: ../libpurple/protocols/silc/silc.c:388
+#: ../libpurple/protocols/silc10/silc.c:196
 msgid "Performing key exchange"
 msgstr "Utfører nøkkelutveksling"
 
 #. Progress
-#: ../libpurple/protocols/silc/silc.c:343
-#: ../libpurple/protocols/silc10/silc.c:325
+#: ../libpurple/protocols/silc/silc.c:445
+#: ../libpurple/protocols/silc10/silc.c:329
 msgid "Connecting to SILC Server"
 msgstr "Koplar til SILC-tenar"
 
-#: ../libpurple/protocols/silc/silc.c:352
-#, c-format
+#: ../libpurple/protocols/silc/silc.c:455
+#: ../libpurple/protocols/silc10/silc.c:340
 msgid "Could not load SILC key pair"
 msgstr "Klarte ikkje å lasta SILC nøkkelpar"
 
-#: ../libpurple/protocols/silc/silc.c:366
-#: ../libpurple/protocols/silc10/silc.c:355
+#: ../libpurple/protocols/silc/silc.c:469
+#: ../libpurple/protocols/silc10/silc.c:361
 msgid "Unable to create connection"
 msgstr "Klarte ikkje å oppretta samband"
 
-#: ../libpurple/protocols/silc/silc.c:395
-#: ../libpurple/protocols/silc10/silc.c:267
+#: ../libpurple/protocols/silc/silc.c:499
+#: ../libpurple/protocols/silc10/silc.c:271
 msgid "Out of memory"
 msgstr "Ikkje nok minne"
 
-#: ../libpurple/protocols/silc/silc.c:438
-#: ../libpurple/protocols/silc10/silc.c:313
+#: ../libpurple/protocols/silc/silc.c:550
+#: ../libpurple/protocols/silc10/silc.c:317
 msgid "Cannot initialize SILC protocol"
 msgstr "Klarer ikkje å kjøra SILC-protokollen"
 
-#: ../libpurple/protocols/silc/silc.c:445
+#: ../libpurple/protocols/silc/silc.c:559
+#: ../libpurple/protocols/silc10/silc.c:324
 msgid "Error loading SILC key pair"
 msgstr "Feil under lasting av SILC nøkkelpar"
 
-#: ../libpurple/protocols/silc/silc.c:739
-#: ../libpurple/protocols/silc10/silc.c:650
+#: ../libpurple/protocols/silc/silc.c:882
+#: ../libpurple/protocols/silc10/silc.c:656
 msgid "Your Current Mood"
-msgstr "Stemninga di no"
+msgstr "Sinnsstemninga di no"
 
-#: ../libpurple/protocols/silc/silc.c:741
-#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1641
-#, c-format
+#: ../libpurple/protocols/silc/silc.c:884
+#: ../libpurple/protocols/silc10/silc.c:658
+#: ../pidgin/gtkprefs.c:1685
 msgid "Normal"
 msgstr "Normal"
 
-#: ../libpurple/protocols/silc/silc.c:755
-#: ../libpurple/protocols/silc10/silc.c:666
+#: ../libpurple/protocols/silc/silc.c:898
+#: ../libpurple/protocols/silc10/silc.c:672
 msgid "In love"
 msgstr "Forelska"
 
-#: ../libpurple/protocols/silc/silc.c:766
-#: ../libpurple/protocols/silc10/silc.c:677
+#: ../libpurple/protocols/silc/silc.c:909
+#: ../libpurple/protocols/silc10/silc.c:683
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -11549,366 +11990,334 @@ msgstr ""
 "\n"
 "Dei føretrekte kontaktmåtane dine"
 
-#: ../libpurple/protocols/silc/silc.c:774
-#: ../libpurple/protocols/silc/util.c:561
-#: ../libpurple/protocols/silc10/silc.c:685
+#: ../libpurple/protocols/silc/silc.c:917
+#: ../libpurple/protocols/silc/util.c:567
+#: ../libpurple/protocols/silc10/silc.c:691
 #: ../libpurple/protocols/silc10/util.c:557
 msgid "SMS"
 msgstr "SMS"
 
-#: ../libpurple/protocols/silc/silc.c:776
-#: ../libpurple/protocols/silc/util.c:563
-#: ../libpurple/protocols/silc10/silc.c:687
+#: ../libpurple/protocols/silc/silc.c:919
+#: ../libpurple/protocols/silc/util.c:569
+#: ../libpurple/protocols/silc10/silc.c:693
 #: ../libpurple/protocols/silc10/util.c:559
 msgid "MMS"
 msgstr "MMS"
 
-#: ../libpurple/protocols/silc/silc.c:778
-#: ../libpurple/protocols/silc10/silc.c:689
+#: ../libpurple/protocols/silc/silc.c:921
+#: ../libpurple/protocols/silc10/silc.c:695
 msgid "Video conferencing"
 msgstr "Videokonferering"
 
-#: ../libpurple/protocols/silc/silc.c:783
-#: ../libpurple/protocols/silc10/silc.c:694
+#: ../libpurple/protocols/silc/silc.c:926
+#: ../libpurple/protocols/silc10/silc.c:700
 msgid "Your Current Status"
 msgstr "Den noverande statusen din"
 
-#: ../libpurple/protocols/silc/silc.c:790
-#: ../libpurple/protocols/silc10/silc.c:701
+#: ../libpurple/protocols/silc/silc.c:933
+#: ../libpurple/protocols/silc10/silc.c:707
 msgid "Online Services"
 msgstr "Nettenester"
 
-#: ../libpurple/protocols/silc/silc.c:793
-#: ../libpurple/protocols/silc10/silc.c:704
+#: ../libpurple/protocols/silc/silc.c:936
+#: ../libpurple/protocols/silc10/silc.c:710
 msgid "Let others see what services you are using"
 msgstr "La andre få sjå kva tenester du nyttar"
 
-#: ../libpurple/protocols/silc/silc.c:799
-#: ../libpurple/protocols/silc10/silc.c:710
+#: ../libpurple/protocols/silc/silc.c:942
+#: ../libpurple/protocols/silc10/silc.c:716
 msgid "Let others see what computer you are using"
 msgstr "La andre få sjå kva datamaskin du nyttar"
 
-#: ../libpurple/protocols/silc/silc.c:806
-#: ../libpurple/protocols/silc10/silc.c:717
+#: ../libpurple/protocols/silc/silc.c:949
+#: ../libpurple/protocols/silc10/silc.c:723
 msgid "Your VCard File"
 msgstr "VCard-fila di"
 
-#: ../libpurple/protocols/silc/silc.c:812
+#: ../libpurple/protocols/silc/silc.c:955
 msgid "Timezone (UTC)"
 msgstr "Tidssone (UTC)"
 
-#: ../libpurple/protocols/silc/silc.c:816
-#: ../libpurple/protocols/silc/silc.c:817
-#: ../libpurple/protocols/silc10/silc.c:729
-#: ../libpurple/protocols/silc10/silc.c:730
+#: ../libpurple/protocols/silc/silc.c:959
+#: ../libpurple/protocols/silc/silc.c:960
+#: ../libpurple/protocols/silc10/silc.c:735
+#: ../libpurple/protocols/silc10/silc.c:736
 msgid "User Online Status Attributes"
 msgstr "Brukaren sine tilkoplingsstatusattributt"
 
-#: ../libpurple/protocols/silc/silc.c:818
-#: ../libpurple/protocols/silc10/silc.c:731
-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 "
-"about yourself."
-msgstr ""
-"Du kan la andre brukarar få sjå nettilkoplingsinformasjonen og dei "
-"personlege opplysningane dine. Før opp dei  opplysningane du vil at andre "
-"skal få tilgang til."
+#: ../libpurple/protocols/silc/silc.c:961
+#: ../libpurple/protocols/silc10/silc.c:737
+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 about yourself."
+msgstr "Du kan la andre brukarar få sjå nettilkoplingsinformasjonen og dei personlege opplysningane dine. Før opp dei  opplysningane du vil at andre skal få tilgang til."
 
-#: ../libpurple/protocols/silc/silc.c:859
-#: ../libpurple/protocols/silc/silc.c:865
-#: ../libpurple/protocols/silc/silc.c:1486
-#: ../libpurple/protocols/silc10/silc.c:772
+#: ../libpurple/protocols/silc/silc.c:1002
+#: ../libpurple/protocols/silc/silc.c:1008
+#: ../libpurple/protocols/silc/silc.c:1629
 #: ../libpurple/protocols/silc10/silc.c:778
-#: ../libpurple/protocols/silc10/silc.c:1415
+#: ../libpurple/protocols/silc10/silc.c:784
+#: ../libpurple/protocols/silc10/silc.c:1421
 msgid "Message of the Day"
 msgstr "Dagens melding"
 
-#: ../libpurple/protocols/silc/silc.c:859
-#: ../libpurple/protocols/silc10/silc.c:772
+#: ../libpurple/protocols/silc/silc.c:1002
+#: ../libpurple/protocols/silc10/silc.c:778
 msgid "No Message of the Day available"
 msgstr "Inga \"Dagens melding\" er tilgjengeleg"
 
-#: ../libpurple/protocols/silc/silc.c:860
-#: ../libpurple/protocols/silc/silc.c:1481
-#: ../libpurple/protocols/silc10/silc.c:773
-#: ../libpurple/protocols/silc10/silc.c:1410
+#: ../libpurple/protocols/silc/silc.c:1003
+#: ../libpurple/protocols/silc/silc.c:1624
+#: ../libpurple/protocols/silc10/silc.c:779
+#: ../libpurple/protocols/silc10/silc.c:1416
 msgid "There is no Message of the Day associated with this connection"
 msgstr "Det er inga \"Dagens melding\" knytt til dette sambandet"
 
-#: ../libpurple/protocols/silc/silc.c:911
-#: ../libpurple/protocols/silc/silc.c:957
-#: ../libpurple/protocols/silc/silc.c:1028
-#: ../libpurple/protocols/silc/silc.c:1029
-#: ../libpurple/protocols/silc10/silc.c:824
-#: ../libpurple/protocols/silc10/silc.c:868
-#: ../libpurple/protocols/silc10/silc.c:939
-#: ../libpurple/protocols/silc10/silc.c:940
+#: ../libpurple/protocols/silc/silc.c:1054
+#: ../libpurple/protocols/silc/silc.c:1100
+#: ../libpurple/protocols/silc/silc.c:1171
+#: ../libpurple/protocols/silc/silc.c:1172
+#: ../libpurple/protocols/silc10/silc.c:830
+#: ../libpurple/protocols/silc10/silc.c:874
+#: ../libpurple/protocols/silc10/silc.c:945
+#: ../libpurple/protocols/silc10/silc.c:946
 msgid "Create New SILC Key Pair"
 msgstr "Lag nytt SILC nøkkelpar"
 
-#: ../libpurple/protocols/silc/silc.c:911
-#: ../libpurple/protocols/silc10/silc.c:824
+#: ../libpurple/protocols/silc/silc.c:1054
+#: ../libpurple/protocols/silc10/silc.c:830
 msgid "Passphrases do not match"
 msgstr "Tilgangsfrasene samsvarer ikkje"
 
-#: ../libpurple/protocols/silc/silc.c:957
-#: ../libpurple/protocols/silc10/silc.c:868
+#: ../libpurple/protocols/silc/silc.c:1100
+#: ../libpurple/protocols/silc10/silc.c:874
 msgid "Key Pair Generation failed"
 msgstr "Nøkkelparlaginga feila"
 
-#: ../libpurple/protocols/silc/silc.c:996
-#: ../libpurple/protocols/silc10/silc.c:907
+#: ../libpurple/protocols/silc/silc.c:1139
+#: ../libpurple/protocols/silc10/silc.c:913
 msgid "Key length"
 msgstr "Nøkkelengd"
 
-#: ../libpurple/protocols/silc/silc.c:998
-#: ../libpurple/protocols/silc10/silc.c:909
+#: ../libpurple/protocols/silc/silc.c:1141
+#: ../libpurple/protocols/silc10/silc.c:915
 msgid "Public key file"
 msgstr "Offentleg nøkkelfil"
 
-#: ../libpurple/protocols/silc/silc.c:1000
-#: ../libpurple/protocols/silc10/silc.c:911
+#: ../libpurple/protocols/silc/silc.c:1143
+#: ../libpurple/protocols/silc10/silc.c:917
 msgid "Private key file"
 msgstr "Privatnøkkelfil"
 
-#: ../libpurple/protocols/silc/silc.c:1023
-#: ../libpurple/protocols/silc10/silc.c:934
+#: ../libpurple/protocols/silc/silc.c:1166
+#: ../libpurple/protocols/silc10/silc.c:940
 msgid "Passphrase (retype)"
 msgstr "Tilgangsfrase (éin gong til)"
 
-#: ../libpurple/protocols/silc/silc.c:1030
-#: ../libpurple/protocols/silc10/silc.c:941
+#: ../libpurple/protocols/silc/silc.c:1173
+#: ../libpurple/protocols/silc10/silc.c:947
 msgid "Generate Key Pair"
 msgstr "Lag nøkkelpar"
 
-#: ../libpurple/protocols/silc/silc.c:1073
-#: ../libpurple/protocols/silc10/silc.c:984
+#: ../libpurple/protocols/silc/silc.c:1216
+#: ../libpurple/protocols/silc10/silc.c:990
 msgid "Online Status"
 msgstr "Tilkoplingsstatus"
 
-#: ../libpurple/protocols/silc/silc.c:1081
-#: ../libpurple/protocols/silc10/silc.c:992
+#: ../libpurple/protocols/silc/silc.c:1224
+#: ../libpurple/protocols/silc10/silc.c:998
 msgid "View Message of the Day"
 msgstr "Sjå \"Dagens melding\""
 
-#: ../libpurple/protocols/silc/silc.c:1085
-#: ../libpurple/protocols/silc10/silc.c:996
+#: ../libpurple/protocols/silc/silc.c:1228
+#: ../libpurple/protocols/silc10/silc.c:1002
 msgid "Create SILC Key Pair..."
 msgstr "Lag SILC nøkkelpar…"
 
-#: ../libpurple/protocols/silc/silc.c:1177
-#: ../libpurple/protocols/silc10/silc.c:1095
+#: ../libpurple/protocols/silc/silc.c:1320
+#: ../libpurple/protocols/silc10/silc.c:1101
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "Brukaren <I>%s</I> er ikkje til stades i nettverket"
 
-#: ../libpurple/protocols/silc/silc.c:1357
-#: ../libpurple/protocols/silc10/silc.c:1286
+#: ../libpurple/protocols/silc/silc.c:1500
+#: ../libpurple/protocols/silc10/silc.c:1292
 msgid "Topic too long"
 msgstr "Emnet er for langt"
 
-#: ../libpurple/protocols/silc/silc.c:1438
-#: ../libpurple/protocols/silc10/silc.c:1367
+#: ../libpurple/protocols/silc/silc.c:1581
+#: ../libpurple/protocols/silc10/silc.c:1373
 msgid "You must specify a nick"
 msgstr "Du må skriva eit kallenamn"
 
-#: ../libpurple/protocols/silc/silc.c:1540
-#: ../libpurple/protocols/silc10/silc.c:1469
+#: ../libpurple/protocols/silc/silc.c:1683
+#: ../libpurple/protocols/silc10/silc.c:1475
 #, c-format
 msgid "channel %s not found"
 msgstr "kanalen %s ikkje funnen"
 
-#: ../libpurple/protocols/silc/silc.c:1545
-#: ../libpurple/protocols/silc10/silc.c:1474
+#: ../libpurple/protocols/silc/silc.c:1688
+#: ../libpurple/protocols/silc10/silc.c:1480
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "kanaltilstandar for %s: %s"
 
-#: ../libpurple/protocols/silc/silc.c:1547
-#: ../libpurple/protocols/silc10/silc.c:1476
+#: ../libpurple/protocols/silc/silc.c:1690
+#: ../libpurple/protocols/silc10/silc.c:1482
 #, c-format
 msgid "no channel modes are set on %s"
-msgstr "ingen kanaltilstandar er lagra for %s"
+msgstr "ingen kanaltilstandar er valde for %s"
 
-#: ../libpurple/protocols/silc/silc.c:1560
-#: ../libpurple/protocols/silc10/silc.c:1489
+#: ../libpurple/protocols/silc/silc.c:1703
+#: ../libpurple/protocols/silc10/silc.c:1495
 #, c-format
 msgid "Failed to set cmodes for %s"
-msgstr "Klarte ikkje å lagra cmodes for %s"
+msgstr "Klarte ikkje å velja cmodes for %s"
 
-#: ../libpurple/protocols/silc/silc.c:1590
-#: ../libpurple/protocols/silc10/silc.c:1519
+#: ../libpurple/protocols/silc/silc.c:1733
+#: ../libpurple/protocols/silc10/silc.c:1525
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
 msgstr "Ukjend kommando: %s (kan vera ein klientfeil)"
 
-#: ../libpurple/protocols/silc/silc.c:1653
-#: ../libpurple/protocols/silc10/silc.c:1582
+#: ../libpurple/protocols/silc/silc.c:1796
+#: ../libpurple/protocols/silc10/silc.c:1588
 msgid "part [channel]:  Leave the chat"
 msgstr "part [kanal]:  forlat praten"
 
-#: ../libpurple/protocols/silc/silc.c:1657
-#: ../libpurple/protocols/silc10/silc.c:1586
+#: ../libpurple/protocols/silc/silc.c:1800
+#: ../libpurple/protocols/silc10/silc.c:1592
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [kanal]:  forlat praten"
 
-#: ../libpurple/protocols/silc/silc.c:1661
-#: ../libpurple/protocols/silc10/silc.c:1590
+#: ../libpurple/protocols/silc/silc.c:1804
+#: ../libpurple/protocols/silc10/silc.c:1596
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;nytt emne&gt;]:  sjå på eller endra emnet"
 
-#: ../libpurple/protocols/silc/silc.c:1666
-#: ../libpurple/protocols/silc10/silc.c:1595
+#: ../libpurple/protocols/silc/silc.c:1809
+#: ../libpurple/protocols/silc10/silc.c:1601
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
-msgstr ""
-"join &lt;kanal&gt; [&lt;passord&gt;]:  bli med i eit praterom i dette "
-"nettverket"
+msgstr "join &lt;kanal&gt; [&lt;passord&gt;]:  bli med i eit praterom i dette nettverket"
 
-#: ../libpurple/protocols/silc/silc.c:1670
-#: ../libpurple/protocols/silc10/silc.c:1599
+#: ../libpurple/protocols/silc/silc.c:1813
+#: ../libpurple/protocols/silc10/silc.c:1605
 msgid "list:  List channels on this network"
 msgstr "list: listar kanalar i dette nettverket"
 
-#: ../libpurple/protocols/silc/silc.c:1674
-#: ../libpurple/protocols/silc10/silc.c:1603
+#: ../libpurple/protocols/silc/silc.c:1817
+#: ../libpurple/protocols/silc10/silc.c:1609
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;kallenamn&gt;: sjå på kallenamnet sine opplysningar"
 
-#: ../libpurple/protocols/silc/silc.c:1678
-#: ../libpurple/protocols/silc10/silc.c:1607
-#: ../libpurple/protocols/zephyr/zephyr.c:2685
+#: ../libpurple/protocols/silc/silc.c:1821
+#: ../libpurple/protocols/silc10/silc.c:1613
+#: ../libpurple/protocols/zephyr/zephyr.c:2697
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
-msgstr ""
-"msg &lt;kallenamn&gt; &lt;melding&gt;:  send ei privat melding til ein brukar"
+msgstr "msg &lt;kallenamn&gt; &lt;melding&gt;:  send ei privat melding til ein brukar"
 
-#: ../libpurple/protocols/silc/silc.c:1682
-#: ../libpurple/protocols/silc10/silc.c:1611
+#: ../libpurple/protocols/silc/silc.c:1825
+#: ../libpurple/protocols/silc10/silc.c:1617
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
-msgstr ""
-"query &lt;kallenamn&gt; [&lt;melding&gt;]:  send ei privat melding til ein "
-"brukar"
+msgstr "query &lt;kallenamn&gt; [&lt;melding&gt;]:  send ei privat melding til ein brukar"
 
-#: ../libpurple/protocols/silc/silc.c:1686
-#: ../libpurple/protocols/silc10/silc.c:1615
+#: ../libpurple/protocols/silc/silc.c:1829
+#: ../libpurple/protocols/silc10/silc.c:1621
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  sjå på tenaren si \"Dagens melding\""
 
-#: ../libpurple/protocols/silc/silc.c:1690
-#: ../libpurple/protocols/silc10/silc.c:1619
+#: ../libpurple/protocols/silc/silc.c:1833
+#: ../libpurple/protocols/silc10/silc.c:1625
 msgid "detach:  Detach this session"
 msgstr "detach:  kopla frå denne økta"
 
-#: ../libpurple/protocols/silc/silc.c:1694
-#: ../libpurple/protocols/silc10/silc.c:1623
+#: ../libpurple/protocols/silc/silc.c:1837
+#: ../libpurple/protocols/silc10/silc.c:1629
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [melding]:  kopla frå tenaren, eventuelt med ei sjølvvald melding"
 
-#: ../libpurple/protocols/silc/silc.c:1698
-#: ../libpurple/protocols/silc10/silc.c:1627
+#: ../libpurple/protocols/silc/silc.c:1841
+#: ../libpurple/protocols/silc10/silc.c:1633
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;kommando&gt;:  utfør kva SILC-klientkommando som helst"
 
-#: ../libpurple/protocols/silc/silc.c:1704
-#: ../libpurple/protocols/silc10/silc.c:1633
+#: ../libpurple/protocols/silc/silc.c:1847
+#: ../libpurple/protocols/silc10/silc.c:1639
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;kallenamn&gt; [-pubkey|&lt;Ã¥rsak&gt;]:  kverk kallenamnet"
 
-#: ../libpurple/protocols/silc/silc.c:1708
-#: ../libpurple/protocols/silc10/silc.c:1637
+#: ../libpurple/protocols/silc/silc.c:1851
+#: ../libpurple/protocols/silc10/silc.c:1643
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;nytt kallenamn&gt;:  endra kallenamnet ditt"
 
-#: ../libpurple/protocols/silc/silc.c:1712
-#: ../libpurple/protocols/silc10/silc.c:1641
+#: ../libpurple/protocols/silc/silc.c:1855
+#: ../libpurple/protocols/silc10/silc.c:1647
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;kallenamn&gt;:  sjå på opplysningar om kallenamnet"
 
-#: ../libpurple/protocols/silc/silc.c:1716
-#: ../libpurple/protocols/silc10/silc.c:1645
-msgid ""
-"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
-"channel modes"
-msgstr ""
-"cmode &lt;kanal&gt; [+|-&lt;tilstandar&gt;] [argument]:  endra eller visa "
-"kanaltilstandane"
+#: ../libpurple/protocols/silc/silc.c:1859
+#: ../libpurple/protocols/silc10/silc.c:1651
+msgid "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display channel modes"
+msgstr "cmode &lt;kanal&gt; [+|-&lt;tilstandar&gt;] [argument]:  endra eller visa kanaltilstandane"
 
-#: ../libpurple/protocols/silc/silc.c:1720
-#: ../libpurple/protocols/silc10/silc.c:1649
-msgid ""
-"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
-"on channel"
-msgstr ""
-"cumode &lt;kanal&gt; +|-&lt;tilstandar&gt; &lt;kallenamn&gt;:  endra "
-"kallenamnet sine tilstandar på kanalen"
+#: ../libpurple/protocols/silc/silc.c:1863
+#: ../libpurple/protocols/silc10/silc.c:1655
+msgid "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes on channel"
+msgstr "cumode &lt;kanal&gt; +|-&lt;tilstandar&gt; &lt;kallenamn&gt;:  endra kallenamnet sine tilstandar på kanalen"
 
-#: ../libpurple/protocols/silc/silc.c:1724
-#: ../libpurple/protocols/silc10/silc.c:1653
+#: ../libpurple/protocols/silc/silc.c:1867
+#: ../libpurple/protocols/silc10/silc.c:1659
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
-msgstr "umode &lt;brukartilstandar&gt;:  Endrar tilstandane dine på nettverket"
+msgstr "umode &lt;brukartilstandar&gt;:  vel tilstandane dine på nettverket"
 
-#: ../libpurple/protocols/silc/silc.c:1728
-#: ../libpurple/protocols/silc10/silc.c:1657
+#: ../libpurple/protocols/silc/silc.c:1871
+#: ../libpurple/protocols/silc10/silc.c:1663
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;kallenamn&gt; [-pubkey]:  få tenaroperatørrettar"
 
-#: ../libpurple/protocols/silc/silc.c:1732
-#: ../libpurple/protocols/silc10/silc.c:1661
-msgid ""
-"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
-"channel invite list"
-msgstr ""
-"invite &lt;kanal&gt; [-|+]&lt;kanalnamn&gt;:  inviter kallenamn eller legg "
-"til/fjern frå kanalinvitasjonslista"
+#: ../libpurple/protocols/silc/silc.c:1875
+#: ../libpurple/protocols/silc10/silc.c:1667
+msgid "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from channel invite list"
+msgstr "invite &lt;kanal&gt; [-|+]&lt;kanalnamn&gt;:  inviter kallenamn eller legg til/fjern frå kanalinvitasjonslista"
 
-#: ../libpurple/protocols/silc/silc.c:1736
-#: ../libpurple/protocols/silc10/silc.c:1665
+#: ../libpurple/protocols/silc/silc.c:1879
+#: ../libpurple/protocols/silc10/silc.c:1671
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
-msgstr ""
-"kick &lt;kanal&gt; &lt;kallenamn&gt; [merknad]:  spark klienten ut frå "
-"kanalen"
+msgstr "kick &lt;kanal&gt; &lt;kallenamn&gt; [merknad]:  spark klienten ut frå kanalen"
 
-#: ../libpurple/protocols/silc/silc.c:1740
-#: ../libpurple/protocols/silc10/silc.c:1669
+#: ../libpurple/protocols/silc/silc.c:1883
+#: ../libpurple/protocols/silc10/silc.c:1675
 msgid "info [server]:  View server administrative details"
 msgstr "info [tenar]:  sjå på tenaradministrasjonsdetaljar"
 
-#: ../libpurple/protocols/silc/silc.c:1744
-#: ../libpurple/protocols/silc10/silc.c:1673
+#: ../libpurple/protocols/silc/silc.c:1887
+#: ../libpurple/protocols/silc10/silc.c:1679
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
-msgstr ""
-"ban [&lt;kanal&gt; +|-&lt;kanalnamn&gt;]:  nekt klienten tilgang til kanalen"
+msgstr "ban [&lt;kanal&gt; +|-&lt;kanalnamn&gt;]:  nekt klienten tilgang til kanalen"
 
-#: ../libpurple/protocols/silc/silc.c:1748
-#: ../libpurple/protocols/silc10/silc.c:1677
+#: ../libpurple/protocols/silc/silc.c:1891
+#: ../libpurple/protocols/silc10/silc.c:1683
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
-msgstr ""
-"getkey &lt;kallenamn|tenar&gt;:  hent klienten eller tenaren sin offentlege "
-"nøkkel"
+msgstr "getkey &lt;kallenamn|tenar&gt;:  hent klienten eller tenaren sin offentlege nøkkel"
 
-#: ../libpurple/protocols/silc/silc.c:1752
-#: ../libpurple/protocols/silc10/silc.c:1681
+#: ../libpurple/protocols/silc/silc.c:1895
+#: ../libpurple/protocols/silc10/silc.c:1687
 msgid "stats:  View server and network statistics"
 msgstr "stats:  sjå på tenar- og nettverkstatistikkane"
 
-#: ../libpurple/protocols/silc/silc.c:1756
-#: ../libpurple/protocols/silc10/silc.c:1685
+#: ../libpurple/protocols/silc/silc.c:1899
+#: ../libpurple/protocols/silc10/silc.c:1691
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  Send PING til den tilkopla tenaren"
 
-#: ../libpurple/protocols/silc/silc.c:1761
-#: ../libpurple/protocols/silc10/silc.c:1690
+#: ../libpurple/protocols/silc/silc.c:1904
+#: ../libpurple/protocols/silc10/silc.c:1696
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;kanal&gt;: list brukarane i kanalen"
 
-#: ../libpurple/protocols/silc/silc.c:1765
-#: ../libpurple/protocols/silc10/silc.c:1694
-msgid ""
-"names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
-"specific users in channel(s)"
-msgstr ""
-"names [-count|-ops|-halfops|-voices|-normal] &lt;kanal(-ar)&gt;: list "
-"utvalde brukarar i kanalen (-ane)"
+#: ../libpurple/protocols/silc/silc.c:1908
+#: ../libpurple/protocols/silc10/silc.c:1700
+msgid "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List specific users in channel(s)"
+msgstr "names [-count|-ops|-halfops|-voices|-normal] &lt;kanal(-ar)&gt;: list utvalde brukarar i kanalen (-ane)"
 
 #. *< type
 #. *< ui_requirement
@@ -11919,140 +12328,141 @@ msgstr ""
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:1876
-#: ../libpurple/protocols/silc10/silc.c:1819
+#: ../libpurple/protocols/silc/silc.c:2019
+#: ../libpurple/protocols/silc10/silc.c:1825
 msgid "SILC Protocol Plugin"
 msgstr "SILC protokolltillegg"
 
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:1878
-#: ../libpurple/protocols/silc10/silc.c:1821
+#: ../libpurple/protocols/silc/silc.c:2021
+#: ../libpurple/protocols/silc10/silc.c:1827
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Secure Internet Live Conferencing-protokollen (SILC) "
 
-#: ../libpurple/protocols/silc/silc.c:1910
-#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2036
+#: ../libpurple/protocols/silc/silc.c:2053
+#: ../libpurple/protocols/silc10/silc.c:1859
+#: ../pidgin/gtkprefs.c:2040
 msgid "Network"
 msgstr "Nettverk"
 
-#: ../libpurple/protocols/silc/silc.c:1921
-#: ../libpurple/protocols/silc10/silc.c:1864
+#: ../libpurple/protocols/silc/silc.c:2064
+#: ../libpurple/protocols/silc10/silc.c:1870
 msgid "Public Key file"
 msgstr "Offentleg nøkkel-fil"
 
-#: ../libpurple/protocols/silc/silc.c:1925
-#: ../libpurple/protocols/silc10/silc.c:1868
+#: ../libpurple/protocols/silc/silc.c:2068
+#: ../libpurple/protocols/silc10/silc.c:1874
 msgid "Private Key file"
 msgstr "Privatn_økkel-fil"
 
-#: ../libpurple/protocols/silc/silc.c:1935
-#: ../libpurple/protocols/silc10/silc.c:1878
+#: ../libpurple/protocols/silc/silc.c:2078
+#: ../libpurple/protocols/silc10/silc.c:1884
 msgid "Cipher"
 msgstr "Kr_yptering"
 
-#: ../libpurple/protocols/silc/silc.c:1945
-#: ../libpurple/protocols/silc10/silc.c:1888
+#: ../libpurple/protocols/silc/silc.c:2088
+#: ../libpurple/protocols/silc10/silc.c:1894
 msgid "HMAC"
 msgstr "HMA_C"
 
-#: ../libpurple/protocols/silc/silc.c:1948
+#: ../libpurple/protocols/silc/silc.c:2091
 msgid "Use Perfect Forward Secrecy"
 msgstr "Bruk Perfect Forward Secrecy"
 
-#: ../libpurple/protocols/silc/silc.c:1952
-#: ../libpurple/protocols/silc10/silc.c:1891
+#: ../libpurple/protocols/silc/silc.c:2095
+#: ../libpurple/protocols/silc10/silc.c:1897
 msgid "Public key authentication"
 msgstr "O_ffentleg nøkkel-autentisering"
 
-#: ../libpurple/protocols/silc/silc.c:1955
-#: ../libpurple/protocols/silc10/silc.c:1894
+#: ../libpurple/protocols/silc/silc.c:2098
+#: ../libpurple/protocols/silc10/silc.c:1900
 msgid "Block IMs without Key Exchange"
 msgstr "Blokker lynmeldingar utan nøkkelutveksling"
 
-#: ../libpurple/protocols/silc/silc.c:1958
-#: ../libpurple/protocols/silc10/silc.c:1897
+#: ../libpurple/protocols/silc/silc.c:2101
+#: ../libpurple/protocols/silc10/silc.c:1903
 msgid "Block messages to whiteboard"
 msgstr "Blokker meldinga til tavle"
 
-#: ../libpurple/protocols/silc/silc.c:1961
-#: ../libpurple/protocols/silc10/silc.c:1900
+#: ../libpurple/protocols/silc/silc.c:2104
+#: ../libpurple/protocols/silc10/silc.c:1906
 msgid "Automatically open whiteboard"
 msgstr "Opna tavla automatisk"
 
-#: ../libpurple/protocols/silc/silc.c:1964
-#: ../libpurple/protocols/silc10/silc.c:1903
+#: ../libpurple/protocols/silc/silc.c:2107
+#: ../libpurple/protocols/silc10/silc.c:1909
 msgid "Digitally sign and verify all messages"
 msgstr "Skriv under digitalt og stadfest alle meldingar"
 
 #: ../libpurple/protocols/silc/util.c:207
-#: ../libpurple/protocols/silc/util.c:249
+#: ../libpurple/protocols/silc/util.c:250
 #: ../libpurple/protocols/silc10/util.c:207
 #: ../libpurple/protocols/silc10/util.c:247
 msgid "Creating SILC key pair..."
 msgstr "Lagar SILC nøkkelpar…"
 
-#: ../libpurple/protocols/silc/util.c:215
-#: ../libpurple/protocols/silc/util.c:257
+#: ../libpurple/protocols/silc/util.c:216
+#: ../libpurple/protocols/silc/util.c:259
 msgid "Cannot create SILC key pair\n"
 msgstr "Klarer ikkje å laga SILC nøkkelpar\n"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: ../libpurple/protocols/silc/util.c:358
+#: ../libpurple/protocols/silc/util.c:364
 #: ../libpurple/protocols/silc10/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "Verkeleg namn: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:360
+#: ../libpurple/protocols/silc/util.c:366
 #: ../libpurple/protocols/silc10/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "Brukarnamn: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:362
+#: ../libpurple/protocols/silc/util.c:368
 #: ../libpurple/protocols/silc10/util.c:359
 #, c-format
 msgid "E-Mail: \t\t%s\n"
 msgstr "E-post: \t\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:364
+#: ../libpurple/protocols/silc/util.c:370
 #: ../libpurple/protocols/silc10/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "Vertsamn: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:366
+#: ../libpurple/protocols/silc/util.c:372
 #: ../libpurple/protocols/silc10/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "Organisasjon: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:368
+#: ../libpurple/protocols/silc/util.c:374
 #: ../libpurple/protocols/silc10/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "Land: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:369
+#: ../libpurple/protocols/silc/util.c:375
 #: ../libpurple/protocols/silc10/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "Algoritme: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:370
+#: ../libpurple/protocols/silc/util.c:376
 #: ../libpurple/protocols/silc10/util.c:367
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "Nøkkellengd: \t%d bits\n"
 
-#: ../libpurple/protocols/silc/util.c:372
+#: ../libpurple/protocols/silc/util.c:378
 #, c-format
 msgid "Version: \t%s\n"
 msgstr "Versjon: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:374
+#: ../libpurple/protocols/silc/util.c:380
 #: ../libpurple/protocols/silc10/util.c:369
 #, c-format
 msgid ""
@@ -12064,7 +12474,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../libpurple/protocols/silc/util.c:375
+#: ../libpurple/protocols/silc/util.c:381
 #: ../libpurple/protocols/silc10/util.c:370
 #, c-format
 msgid ""
@@ -12074,51 +12484,52 @@ msgstr ""
 "Offentleg nøkkel skribleriavtrykk:\n"
 "%s"
 
-#: ../libpurple/protocols/silc/util.c:379
-#: ../libpurple/protocols/silc/util.c:380
+#: ../libpurple/protocols/silc/util.c:385
+#: ../libpurple/protocols/silc/util.c:386
 #: ../libpurple/protocols/silc10/util.c:374
 #: ../libpurple/protocols/silc10/util.c:375
 msgid "Public Key Information"
 msgstr "Offentleg nøkkel-opplysningar"
 
-#: ../libpurple/protocols/silc/util.c:559
+#: ../libpurple/protocols/silc/util.c:565
 #: ../libpurple/protocols/silc10/util.c:555
 msgid "Paging"
 msgstr "Søking"
 
-#: ../libpurple/protocols/silc/util.c:565
+#: ../libpurple/protocols/silc/util.c:571
 #: ../libpurple/protocols/silc10/util.c:561
 msgid "Video Conferencing"
 msgstr "Videokonferering"
 
-#: ../libpurple/protocols/silc/util.c:583
+#: ../libpurple/protocols/silc/util.c:589
 #: ../libpurple/protocols/silc10/util.c:579
 msgid "Computer"
 msgstr "Datamaskin"
 
-#: ../libpurple/protocols/silc/util.c:587
+#: ../libpurple/protocols/silc/util.c:593
 #: ../libpurple/protocols/silc10/util.c:583
 msgid "PDA"
 msgstr "PDA"
 
-#: ../libpurple/protocols/silc/util.c:589
+#: ../libpurple/protocols/silc/util.c:595
 #: ../libpurple/protocols/silc10/util.c:585
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../libpurple/protocols/silc/wb.c:284 ../libpurple/protocols/silc10/wb.c:284
+#: ../libpurple/protocols/silc/wb.c:288
+#: ../libpurple/protocols/silc10/wb.c:287
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
 msgstr "%s sendte ei melding til tavla. Vil du opna ho?"
 
-#: ../libpurple/protocols/silc/wb.c:288 ../libpurple/protocols/silc10/wb.c:288
+#: ../libpurple/protocols/silc/wb.c:292
+#: ../libpurple/protocols/silc10/wb.c:291
 #, c-format
-msgid ""
-"%s sent message to whiteboard on %s channel. Would you like to open the "
-"whiteboard?"
+msgid "%s sent message to whiteboard on %s channel. Would you like to open the whiteboard?"
 msgstr "%s sendte ei melding til tavla i kanalen %s. Vil du opna tavla?"
 
-#: ../libpurple/protocols/silc/wb.c:302 ../libpurple/protocols/silc10/wb.c:302
+#: ../libpurple/protocols/silc/wb.c:306
+#: ../libpurple/protocols/silc10/wb.c:305
 msgid "Whiteboard"
 msgstr "Tavle"
 
@@ -12126,112 +12537,88 @@ msgstr "Ingen tilgjengelege tenarstatist
 msgid "No server statistics available"
 msgstr "Ingen tilgjengelege tenarstatistikkar"
 
-#: ../libpurple/protocols/silc10/ops.c:1931
-#, c-format
+#: ../libpurple/protocols/silc10/ops.c:1937
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Feil: versjonsfeil - oppgrader klienten din"
 
-#: ../libpurple/protocols/silc10/ops.c:1934
-#, c-format
+#: ../libpurple/protocols/silc10/ops.c:1940
 msgid "Failure: Remote does not trust/support your public key"
-msgstr ""
-"Feil: den andre sida stoler ikkje på/støttar ikkje den offentlege nøkkelen "
-"din"
+msgstr "Feil: den andre sida stoler ikkje på/støttar ikkje den offentlege nøkkelen din"
 
-#: ../libpurple/protocols/silc10/ops.c:1937
-#, c-format
+#: ../libpurple/protocols/silc10/ops.c:1943
 msgid "Failure: Remote does not support proposed KE group"
-msgstr ""
-"Feil: den andre sida støttar ikkje den føreslegne nøkkelutvekslingsgruppa"
+msgstr "Feil: den andre sida støttar ikkje den føreslegne nøkkelutvekslingsgruppa"
 
-#: ../libpurple/protocols/silc10/ops.c:1940
-#, c-format
+#: ../libpurple/protocols/silc10/ops.c:1946
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Feil: den andre sida støttar ikkje den føreslegne krypteringsmetoden"
 
-#: ../libpurple/protocols/silc10/ops.c:1943
-#, c-format
+#: ../libpurple/protocols/silc10/ops.c:1949
 msgid "Failure: Remote does not support proposed PKCS"
-msgstr ""
-"Feil: den andre sida støttar ikkje den føreslegne krypteringsstandarden for "
-"den offentlege nøkkelen (PKCS)"
+msgstr "Feil: den andre sida støttar ikkje den føreslegne krypteringsstandarden for den offentlege nøkkelen (PKCS)"
 
-#: ../libpurple/protocols/silc10/ops.c:1946
-#, c-format
+#: ../libpurple/protocols/silc10/ops.c:1952
 msgid "Failure: Remote does not support proposed hash function"
-msgstr ""
-"Feil: den andre sida støttar ikkje den føreslegne nøkkelfunksjonen (hash)"
+msgstr "Feil: den andre sida støttar ikkje den føreslegne nøkkelfunksjonen (hash)"
 
-#: ../libpurple/protocols/silc10/ops.c:1949
-#, c-format
+#: ../libpurple/protocols/silc10/ops.c:1955
 msgid "Failure: Remote does not support proposed HMAC"
-msgstr ""
-"Feil: den andre sida støttar ikkje den føreslegne meldingsstadfestingskoden "
-"(HMAC)"
+msgstr "Feil: den andre sida støttar ikkje den føreslegne meldingsstadfestingskoden (HMAC)"
 
-#: ../libpurple/protocols/silc10/ops.c:1951
-#, c-format
+#: ../libpurple/protocols/silc10/ops.c:1957
 msgid "Failure: Incorrect signature"
 msgstr "Feil: ugyldig signatur"
 
-#: ../libpurple/protocols/silc10/ops.c:1953
-#, c-format
+#: ../libpurple/protocols/silc10/ops.c:1959
 msgid "Failure: Invalid cookie"
 msgstr "Feil: ugyldig informasjonskapsel"
 
-#: ../libpurple/protocols/silc10/ops.c:1964
-#, c-format
+#: ../libpurple/protocols/silc10/ops.c:1970
 msgid "Failure: Authentication failed"
 msgstr "Feil: autentiseringa feila"
 
-#: ../libpurple/protocols/silc10/silc.c:182
+#: ../libpurple/protocols/silc10/silc.c:185
 msgid "Cannot initialize SILC Client connection"
 msgstr "Klarer ikkje å oppretta eit SILC klientsamband"
 
-#: ../libpurple/protocols/silc10/silc.c:290
+#: ../libpurple/protocols/silc10/silc.c:294
 msgid "John Noname"
 msgstr "Utan namn"
 
-#: ../libpurple/protocols/silc10/silc.c:320
-msgid "Cannot find/access ~/.silc directory"
-msgstr "Finn ikkje/får ikkje tilgang til ~/.silc-katalogen"
-
-#: ../libpurple/protocols/silc10/silc.c:334
+#: ../libpurple/protocols/silc10/silc.c:338
 #, c-format
 msgid "Could not load SILC key pair: %s"
 msgstr "Klarte ikkje å lasta SILC nøkkelparet: %s"
 
-#. TODO: do we really want to disconnect on a failure to write?
-#: ../libpurple/protocols/simple/simple.c:416
+#: ../libpurple/protocols/simple/simple.c:419
 msgid "Could not write"
 msgstr "Klarte ikkje å lagra"
 
-#: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1529
+#: ../libpurple/protocols/simple/simple.c:443
+#: ../libpurple/protocols/simple/simple.c:1713
 msgid "Could not connect"
 msgstr "Klarte ikkje å kopla til"
 
-#: ../libpurple/protocols/simple/simple.c:1059
-#, fuzzy
+#: ../libpurple/protocols/simple/simple.c:1127
 msgid "Unknown server response."
-msgstr "Ukjend årsak."
+msgstr "Ukjent tenarsvar."
 
-#: ../libpurple/protocols/simple/simple.c:1563
-#: ../libpurple/protocols/simple/simple.c:1605
-#: ../libpurple/protocols/simple/simple.c:1618
-#: ../libpurple/protocols/simple/simple.c:1669
+#: ../libpurple/protocols/simple/simple.c:1749
+#: ../libpurple/protocols/simple/simple.c:1795
+#: ../libpurple/protocols/simple/simple.c:1810
+#: ../libpurple/protocols/simple/simple.c:1865
 msgid "Could not create listen socket"
 msgstr "Klarte ikkje å laga lytte-endepunkt"
 
-#: ../libpurple/protocols/simple/simple.c:1586
+#: ../libpurple/protocols/simple/simple.c:1774
 msgid "Couldn't resolve host"
 msgstr "Vertsoppslaget feila"
 
-#: ../libpurple/protocols/simple/simple.c:1677
+#: ../libpurple/protocols/simple/simple.c:1875
 msgid "Could not resolve hostname"
 msgstr "Vertsnamnoppslaget feila"
 
-#: ../libpurple/protocols/simple/simple.c:1694
+#: ../libpurple/protocols/simple/simple.c:1893
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "IRC-brukarnamn kan ikkje innehalda mellomrom eller @-teikn"
 
@@ -12243,36 +12630,36 @@ msgstr "IRC-brukarnamn kan ikkje innehal
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1870
+#: ../libpurple/protocols/simple/simple.c:2073
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE-protokolltillegg"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1871
+#: ../libpurple/protocols/simple/simple.c:2074
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE-protokolltillegget"
 
-#: ../libpurple/protocols/simple/simple.c:1899
+#: ../libpurple/protocols/simple/simple.c:2102
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Offentleggjer tilstand (merk: kven som helst kan sjå deg)"
 
-#: ../libpurple/protocols/simple/simple.c:1905
+#: ../libpurple/protocols/simple/simple.c:2108
 msgid "Use UDP"
 msgstr "Bruk UDP"
 
-#: ../libpurple/protocols/simple/simple.c:1907
+#: ../libpurple/protocols/simple/simple.c:2110
 msgid "Use proxy"
 msgstr "Bruk mellomlager"
 
-#: ../libpurple/protocols/simple/simple.c:1909
+#: ../libpurple/protocols/simple/simple.c:2112
 msgid "Proxy"
 msgstr "Mellomlager"
 
-#: ../libpurple/protocols/simple/simple.c:1911
+#: ../libpurple/protocols/simple/simple.c:2114
 msgid "Auth User"
 msgstr "Autentiser brukar"
 
-#: ../libpurple/protocols/simple/simple.c:1913
+#: ../libpurple/protocols/simple/simple.c:2116
 msgid "Auth Domain"
 msgstr "Autentiseringsdomene"
 
@@ -12317,7 +12704,6 @@ msgstr "Det er ikkje tillate å åtvara 
 msgstr "Det er ikkje tillate å åtvara mot %s."
 
 #: ../libpurple/protocols/toc/toc.c:503
-#, c-format
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "Ei melding er blitt vraka - du går ut over tenaren si fartsgrense."
 
@@ -12342,47 +12728,38 @@ msgstr "%s sendte deg ei melding som ikk
 msgstr "%s sendte deg ei melding som ikkje kom fram: ho var sendt for fort."
 
 #: ../libpurple/protocols/toc/toc.c:518
-#, c-format
 msgid "Failure."
 msgstr "Svikt."
 
 #: ../libpurple/protocols/toc/toc.c:521
-#, c-format
 msgid "Too many matches."
 msgstr "For mange treff."
 
 #: ../libpurple/protocols/toc/toc.c:524
-#, c-format
 msgid "Need more qualifiers."
 msgstr "Treng fleire parametrar."
 
 #: ../libpurple/protocols/toc/toc.c:527
-#, c-format
 msgid "Dir service temporarily unavailable."
 msgstr "Katalogtenesta er mellombels utilgjengeleg."
 
 #: ../libpurple/protocols/toc/toc.c:530
-#, c-format
 msgid "E-mail lookup restricted."
 msgstr "E-postoppslag er avgrensa."
 
 #: ../libpurple/protocols/toc/toc.c:533
-#, c-format
 msgid "Keyword ignored."
 msgstr "Nøkkelord er ignorert."
 
 #: ../libpurple/protocols/toc/toc.c:536
-#, c-format
 msgid "No keywords."
 msgstr "Ingen nøkkelord."
 
 #: ../libpurple/protocols/toc/toc.c:539
-#, c-format
 msgid "User has no directory information."
 msgstr "Brukaren har ingen katalogopplysningar."
 
 #: ../libpurple/protocols/toc/toc.c:543
-#, c-format
 msgid "Country not supported."
 msgstr "Land er ikkje støtta."
 
@@ -12392,28 +12769,20 @@ msgstr "Ukjent svikt: %s."
 msgstr "Ukjent svikt: %s."
 
 #: ../libpurple/protocols/toc/toc.c:549
-#, c-format
 msgid "Incorrect screen name or password."
 msgstr "Ugyldig brukarnamn eller passord."
 
 #: ../libpurple/protocols/toc/toc.c:552
-#, c-format
 msgid "The service is temporarily unavailable."
 msgstr "Tenesta er mellombels utilgjengeleg."
 
 #: ../libpurple/protocols/toc/toc.c:555
-#, c-format
 msgid "Your warning level is currently too high to log in."
 msgstr "Åtvaringsnivået ditt er for tida for høgt til at du kan logga på."
 
 #: ../libpurple/protocols/toc/toc.c:558
-#, c-format
-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."
-msgstr ""
-"Du har kopla til og frå for ofte i løpet av kort tid. Vent i ti minutt og "
-"prøv igjen. Held du fram med å prøva, vil du måtta venta endå lenger."
+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."
+msgstr "Du har kopla til og frå for ofte i løpet av kort tid. Vent i ti minutt og prøv igjen. Held du fram med å prøva, vil du måtta venta endå lenger."
 
 #: ../libpurple/protocols/toc/toc.c:560
 #, c-format
@@ -12445,8 +12814,9 @@ msgstr "Passordet er endra"
 msgid "Password Change Successful"
 msgstr "Passordet er endra"
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5582
-#: ../pidgin/gtkblist.c:5932
+#: ../libpurple/protocols/toc/toc.c:1366
+#: ../pidgin/gtkblist.c:6399
+#: ../pidgin/gtkblist.c:6736
 msgid "_Group:"
 msgstr "_Gruppe:"
 
@@ -12456,7 +12826,7 @@ msgid "Set Dir Info"
 
 #: ../libpurple/protocols/toc/toc.c:1675
 msgid "Set Dir Info"
-msgstr "lagra kataloginformasjon"
+msgstr "Vel kataloginformasjon"
 
 #: ../libpurple/protocols/toc/toc.c:1797
 #, c-format
@@ -12467,8 +12837,10 @@ msgstr "Filoverføringa feila. Truleg av
 msgid "File transfer failed; other side probably canceled."
 msgstr "Filoverføringa feila. Truleg avbroten av den andre parten."
 
-#: ../libpurple/protocols/toc/toc.c:1878 ../libpurple/protocols/toc/toc.c:1918
-#: ../libpurple/protocols/toc/toc.c:2042 ../libpurple/protocols/toc/toc.c:2130
+#: ../libpurple/protocols/toc/toc.c:1878
+#: ../libpurple/protocols/toc/toc.c:1918
+#: ../libpurple/protocols/toc/toc.c:2042
+#: ../libpurple/protocols/toc/toc.c:2130
 msgid "Could not connect for transfer."
 msgstr "Fekk ikkje kopla til for overføring."
 
@@ -12502,119 +12874,99 @@ msgstr "%s spør deg om å senda dei ei 
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/toc/toc.c:2306 ../libpurple/protocols/toc/toc.c:2308
+#: ../libpurple/protocols/toc/toc.c:2306
+#: ../libpurple/protocols/toc/toc.c:2308
 msgid "TOC Protocol Plugin"
 msgstr "TOC-protokolltillegg"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:782
+#: ../libpurple/protocols/yahoo/yahoo.c:745
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-"%s har sendt deg ein nettkamerainvitasjon. Denne funksjonen er enno ikkje "
-"støtta."
+msgstr "%s har sendt deg ein nettkamerainvitasjon. Denne funksjonen er enno ikkje støtta."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:838
+#: ../libpurple/protocols/yahoo/yahoo.c:803
 msgid "Your Yahoo! message did not get sent."
 msgstr "Yahoo!-meldinga di blei ikkje sendt."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:960
+#: ../libpurple/protocols/yahoo/yahoo.c:916
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Yahoo! systemmelding for %s:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1029
+#: ../libpurple/protocols/yahoo/yahoo.c:990
 msgid "Authorization denied message:"
 msgstr "Melding om avvist autentisering:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1047
+#: ../libpurple/protocols/yahoo/yahoo.c:1008
 #, c-format
-msgid ""
-"%s has (retroactively) denied your request to add them to your list for the "
-"following reason: %s."
-msgstr ""
-"%s har (i ettertid) avslått førespurnaden din om å få leggja dei til i lista "
-"di grunna: %s."
+msgid "%s has (retroactively) denied your request to add them to your list for the following reason: %s."
+msgstr "%s har (i ettertid) avslått førespurnaden din om å få leggja dei til i lista di grunna: %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1050
+#: ../libpurple/protocols/yahoo/yahoo.c:1011
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
-msgstr ""
-"%s har (i ettertid) avslått førespurnaden din om å få leggja dei til i lista "
-"di."
+msgstr "%s har (i ettertid) avslått førespurnaden din om å få leggja dei til i lista di."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1052
+#: ../libpurple/protocols/yahoo/yahoo.c:1013
 msgid "Add buddy rejected"
 msgstr "Er blitt nekta å leggja til venn"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1994
+#: ../libpurple/protocols/yahoo/yahoo.c:1997
 #, c-format
-msgid ""
-"The Yahoo server has requested the use of an unrecognized authentication "
-"method.  You will probably not be able to successfully sign on to Yahoo.  "
-"Check %s for updates."
-msgstr ""
-"Yahoo-tenaren har spurt om å få bruka ein ukjent autentiseringsmetode. Du "
-"vil truleg ikkje vera i stand til å logga deg på Yahoo. Sjå hos %s etter "
-"oppdateringar."
+msgid "The Yahoo server has requested the use of an unrecognized authentication method.  You will probably not be able to successfully sign on to Yahoo.  Check %s for updates."
+msgstr "Yahoo-tenaren har spurt om å få bruka ein ukjent autentiseringsmetode. Du vil truleg ikkje vera i stand til å logga deg på Yahoo. Sjå hos %s etter oppdateringar."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1997
+#: ../libpurple/protocols/yahoo/yahoo.c:2000
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo!-autentiseringa feila"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2063
+#: ../libpurple/protocols/yahoo/yahoo.c:2066
 #, c-format
-msgid ""
-"You have tried to ignore %s, but the user is on your buddy list.  Clicking "
-"\"Yes\" will remove and ignore the buddy."
-msgstr ""
-"Du har prøvd å ignorera %s, men brukaren finst i vennelista di. Ved å klikka "
-"\"Ja\" vil vennen blir fjerna og ignorert."
+msgid "You have tried to ignore %s, but the user is on your buddy list.  Clicking \"Yes\" will remove and ignore the buddy."
+msgstr "Du har prøvd å ignorera %s, men brukaren finst i vennelista di. Ved å klikka \"Ja\" vil vennen blir fjerna og ignorert."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2066
+#: ../libpurple/protocols/yahoo/yahoo.c:2069
 msgid "Ignore buddy?"
 msgstr "Ignorera vennen?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2129
+#: ../libpurple/protocols/yahoo/yahoo.c:2134
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "Kontoen din er låst. Bruk Yahoo! sin nettstad for å logga deg på."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2132
+#: ../libpurple/protocols/yahoo/yahoo.c:2137
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
-msgstr ""
-"Ukjent feilnummer %d. Di kan kanskje løysa problemet ved å nytta Yahoo! sin "
-"nettstad for å logga deg på."
+msgstr "Ukjent feilnummer %d. Du kan kanskje løysa problemet ved å nytta Yahoo! sin nettstad for å logga deg på."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2186
+#: ../libpurple/protocols/yahoo/yahoo.c:2190
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
-msgstr ""
-"Klarte ikkje å leggja til vennen %s i gruppa %s i tenarlista til kontoen %s."
+msgstr "Klarte ikkje å leggja til vennen %s i gruppa %s i tenarlista til kontoen %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2189
+#: ../libpurple/protocols/yahoo/yahoo.c:2193
 msgid "Could not add buddy to server list"
 msgstr "Klarte ikkje å leggja til vennen i tenarlista"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2308
+#: ../libpurple/protocols/yahoo/yahoo.c:2315
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Hørleg %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2651
+#: ../libpurple/protocols/yahoo/yahoo.c:2671
 msgid "Received unexpected HTTP response from server."
 msgstr "Fekk uventa HTTP-svar frå tenar."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2675
-#: ../libpurple/protocols/yahoo/yahoo.c:2861
-#: ../libpurple/protocols/yahoo/yahoo.c:2964
-#: ../libpurple/protocols/yahoo/yahoo.c:2974
-#: ../libpurple/protocols/yahoo/yahoochat.c:1514
-#: ../libpurple/protocols/yahoo/yahoochat.c:1584
-#: ../libpurple/protocols/yahoo/ycht.c:585
+#: ../libpurple/protocols/yahoo/yahoo.c:2700
+#: ../libpurple/protocols/yahoo/yahoo.c:2888
+#: ../libpurple/protocols/yahoo/yahoo.c:2993
+#: ../libpurple/protocols/yahoo/yahoo.c:3004
+#: ../libpurple/protocols/yahoo/yahoochat.c:1525
+#: ../libpurple/protocols/yahoo/yahoochat.c:1595
+#: ../libpurple/protocols/yahoo/ycht.c:586
 msgid "Connection problem"
 msgstr "Tilkoplingsproblem"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2701
+#: ../libpurple/protocols/yahoo/yahoo.c:2726
 #, c-format
 msgid ""
 "Lost connection with %s:\n"
@@ -12623,7 +12975,7 @@ msgstr ""
 "Mista sambandet med %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2726
+#: ../libpurple/protocols/yahoo/yahoo.c:2751
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
@@ -12632,114 +12984,103 @@ msgstr ""
 "Klaret ikkje å få til samband med %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3081
-#: ../libpurple/protocols/yahoo/yahoo.c:3767
+#: ../libpurple/protocols/yahoo/yahoo.c:3118
+#: ../libpurple/protocols/yahoo/yahoo.c:3804
 msgid "Not at Home"
 msgstr "Ikkje heime"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3083
-#: ../libpurple/protocols/yahoo/yahoo.c:3770
+#: ../libpurple/protocols/yahoo/yahoo.c:3120
+#: ../libpurple/protocols/yahoo/yahoo.c:3807
 msgid "Not at Desk"
 msgstr "Ikkje ved pulten"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3085
-#: ../libpurple/protocols/yahoo/yahoo.c:3773
+#: ../libpurple/protocols/yahoo/yahoo.c:3122
+#: ../libpurple/protocols/yahoo/yahoo.c:3810
 msgid "Not in Office"
 msgstr "Ikkje på kontoret"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3089
-#: ../libpurple/protocols/yahoo/yahoo.c:3779
+#: ../libpurple/protocols/yahoo/yahoo.c:3126
+#: ../libpurple/protocols/yahoo/yahoo.c:3816
 msgid "On Vacation"
 msgstr "PÃ¥ ferie"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3093
-#: ../libpurple/protocols/yahoo/yahoo.c:3785
+#: ../libpurple/protocols/yahoo/yahoo.c:3130
+#: ../libpurple/protocols/yahoo/yahoo.c:3822
 msgid "Stepped Out"
 msgstr "Ute eit bel"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3186
-#: ../libpurple/protocols/yahoo/yahoo.c:3216
+#: ../libpurple/protocols/yahoo/yahoo.c:3223
+#: ../libpurple/protocols/yahoo/yahoo.c:3253
 msgid "Not on server list"
 msgstr "Ikkje på tenarlista"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3233
-#: ../libpurple/protocols/yahoo/yahoo.c:3291
+#: ../libpurple/protocols/yahoo/yahoo.c:3270
+#: ../libpurple/protocols/yahoo/yahoo.c:3328
 msgid "Appear Online"
 msgstr "Framstå som tilkopla"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3236
-#: ../libpurple/protocols/yahoo/yahoo.c:3312
+#: ../libpurple/protocols/yahoo/yahoo.c:3273
+#: ../libpurple/protocols/yahoo/yahoo.c:3349
 msgid "Appear Permanently Offline"
 msgstr "Verkar alltid vera fråkopla"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3254
+#: ../libpurple/protocols/yahoo/yahoo.c:3291
 msgid "Presence"
 msgstr "Nærvær"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3297
+#: ../libpurple/protocols/yahoo/yahoo.c:3334
 msgid "Appear Offline"
 msgstr "Verkar vera fråkopla"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3306
+#: ../libpurple/protocols/yahoo/yahoo.c:3343
 msgid "Don't Appear Permanently Offline"
 msgstr "Ikkje verka vera alltid fråkopla"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3354
+#: ../libpurple/protocols/yahoo/yahoo.c:3391
 msgid "Join in Chat"
 msgstr "Bli med i praterom"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3360
+#: ../libpurple/protocols/yahoo/yahoo.c:3397
 msgid "Initiate Conference"
 msgstr "Lag konferanse"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3388
+#: ../libpurple/protocols/yahoo/yahoo.c:3425
 msgid "Presence Settings"
 msgstr "Nærværsinnstillingar"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3394
+#: ../libpurple/protocols/yahoo/yahoo.c:3431
 msgid "Start Doodling"
 msgstr "Laga krusedullar"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3495
+#: ../libpurple/protocols/yahoo/yahoo.c:3532
 msgid "Activate which ID?"
 msgstr "Kva ID skal takast i bruk?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3506
-#, fuzzy
+#: ../libpurple/protocols/yahoo/yahoo.c:3543
 msgid "Join whom in chat?"
-msgstr "Kven skal bli med i praterommet?"
+msgstr "Bli med kven i praterommet?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3518
+#: ../libpurple/protocols/yahoo/yahoo.c:3555
 msgid "Activate ID..."
 msgstr "Ta i bruk ID…"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3522
+#: ../libpurple/protocols/yahoo/yahoo.c:3559
 msgid "Join User in Chat..."
 msgstr "Bli med brukaren i praterommet…"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3527
+#: ../libpurple/protocols/yahoo/yahoo.c:3564
 msgid "Open Inbox"
 msgstr "Opna innkorga"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4119
-#, fuzzy
-msgid "Buzz"
-msgstr "alarm"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4121
-#, fuzzy, c-format
-msgid "Buzzing %s..."
-msgstr "Alarmerer"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4136
+#: ../libpurple/protocols/yahoo/yahoo.c:4153
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join &lt;rom&gt;: bli med i eit praterom på Yahoo-nettverket"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4141
+#: ../libpurple/protocols/yahoo/yahoo.c:4158
 msgid "list: List rooms on the Yahoo network"
 msgstr "list: list romma på Yahoo-nettverket"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4149
+#: ../libpurple/protocols/yahoo/yahoo.c:4166
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: spør ein brukar om å starta ei teikneøkt"
 
@@ -12753,56 +13094,56 @@ msgstr "doodle: spør ein brukar om å s
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4358
-#: ../libpurple/protocols/yahoo/yahoo.c:4360
+#: ../libpurple/protocols/yahoo/yahoo.c:4375
+#: ../libpurple/protocols/yahoo/yahoo.c:4377
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo-protokolltillegg"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4383
+#: ../libpurple/protocols/yahoo/yahoo.c:4400
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4386
+#: ../libpurple/protocols/yahoo/yahoo.c:4403
 msgid "Pager server"
 msgstr "Søkjetenestetenar"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4389
+#: ../libpurple/protocols/yahoo/yahoo.c:4406
 msgid "Japan Pager server"
 msgstr "Søkjetenestetenar (_Japan)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4392
+#: ../libpurple/protocols/yahoo/yahoo.c:4409
 msgid "Pager port"
 msgstr "S_økjeport"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4395
+#: ../libpurple/protocols/yahoo/yahoo.c:4412
 msgid "File transfer server"
 msgstr "Filoverføringstenar"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4398
+#: ../libpurple/protocols/yahoo/yahoo.c:4415
 msgid "Japan file transfer server"
 msgstr "Filoverføringstenar (Japa_n)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4401
+#: ../libpurple/protocols/yahoo/yahoo.c:4418
 msgid "File transfer port"
 msgstr "Filoverførings_port"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4404
+#: ../libpurple/protocols/yahoo/yahoo.c:4421
 msgid "Chat room locale"
 msgstr "Pratero_mslokalitet"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4407
+#: ../libpurple/protocols/yahoo/yahoo.c:4424
 msgid "Ignore conference and chatroom invitations"
 msgstr "_Ignorer konferanse- og prateromsinvitasjonar"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4415
+#: ../libpurple/protocols/yahoo/yahoo.c:4432
 msgid "Chat room list URL"
 msgstr "Prateromslisteadresse"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4418
+#: ../libpurple/protocols/yahoo/yahoo.c:4435
 msgid "Yahoo Chat server"
 msgstr "Yahoo pratetenar"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4421
+#: ../libpurple/protocols/yahoo/yahoo.c:4438
 msgid "Yahoo Chat port"
 msgstr "Yahoo prateport"
 
@@ -12813,13 +13154,19 @@ msgstr "Sendt teikneførespurnad."
 msgid "Sent Doodle request."
 msgstr "Sendt teikneførespurnad."
 
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:270
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:279
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:288
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:319
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:328
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:337
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1110
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1514
 msgid "Unable to establish file descriptor."
 msgstr "Klarer ikkje å laga filskildring."
 
-#. TODO: what to do here - do we really have to disconnect?
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1409
+#, c-format
+msgid "%s is trying to send you a group of %d files.\n"
+msgstr "%s prøver å senda deg ei gruppe med %d-filer.\n"
+
 #: ../libpurple/protocols/yahoo/yahoo_packet.c:307
 msgid "Write Error"
 msgstr "Skrivefeil"
@@ -12833,18 +13180,12 @@ msgstr "Yahoo!-profil"
 msgstr "Yahoo!-profil"
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:838
-msgid ""
-"Sorry, profiles marked as containing adult content are not supported at this "
-"time."
+msgid "Sorry, profiles marked as containing adult content are not supported at this time."
 msgstr "Profilar som er merka med at dei har vakse innhald er ikkje støtta no."
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:840
-msgid ""
-"If you wish to view this profile, you will need to visit this link in your "
-"web browser:"
-msgstr ""
-"Om du ønskjer å sjå på denne profilen må du besøkja denne lenkja i "
-"nettlesaren din: "
+msgid "If you wish to view this profile, you will need to visit this link in your web browser:"
+msgstr "Om du ønskjer å sjå på denne profilen må du besøkja denne lenkja i nettlesaren din: "
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1034
 msgid "Yahoo! ID"
@@ -12887,112 +13228,93 @@ msgstr "Brukaropplysningar om %s er ikkj
 msgstr "Brukaropplysningar om %s er ikkje tilgjengelege"
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1205
-msgid ""
-"Sorry, this profile seems to be in a language or format that is not "
-"supported at this time."
-msgstr ""
-"Denne profilen verkar vera i eit språk eller format som ikkje er støtta no."
+msgid "Sorry, this profile seems to be in a language or format that is not supported at this time."
+msgstr "Denne profilen verkar vera i eit språk eller format som ikkje er støtta no."
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1221
-msgid ""
-"Could not retrieve the user's profile. This most likely is a temporary "
-"server-side problem. Please try again later."
-msgstr ""
-"Klarte ikkje å henta brukaren sin profil. Dette er truleg eit mellombels "
-"problem på tenarsida. Prøv igjen seinare."
+msgid "Could not retrieve the user's profile. This most likely is a temporary server-side problem. Please try again later."
+msgstr "Klarte ikkje å henta brukaren sin profil. Dette er truleg eit mellombels problem på tenarsida. Prøv igjen seinare."
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1224
-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 "
-"profile. If you know that the user exists, please try again later."
-msgstr ""
-"Klarte ikkje å henta brukaren sin profil. Dette betyr truleg at brukaren "
-"ikkje finst. Mer likevel merksam på at Yahoo! ikkje alltid klarer å finna  "
-"profilen til ein brukar. Om du veit at brukaren verkeleg finst, prøv igjen "
-"seinare."
+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 profile. If you know that the user exists, please try again later."
+msgstr "Klarte ikkje å henta brukaren sin profil. Dette betyr truleg at brukaren ikkje finst. Mer likevel merksam på at Yahoo! ikkje alltid klarer å finna  profilen til ein brukar. Om du veit at brukaren verkeleg finst, prøv igjen seinare."
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1231
 msgid "The user's profile is empty."
 msgstr "Brukarprofilen er tom."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:217
+#: ../libpurple/protocols/yahoo/yahoochat.c:222
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr ""
-"%s har avvist konferanseinvitasjonen din til rommet \"%s\" grunna \"%s\"."
+msgstr "%s har avvist konferanseinvitasjonen din til rommet \"%s\" grunna \"%s\"."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:219
+#: ../libpurple/protocols/yahoo/yahoochat.c:224
 msgid "Invitation Rejected"
 msgstr "Invitasjonen avvist"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:438
+#: ../libpurple/protocols/yahoo/yahoochat.c:443
 msgid "Failed to join chat"
 msgstr "Klarte ikkje å bli med i praterommet"
 
 #. -6
-#: ../libpurple/protocols/yahoo/yahoochat.c:441
+#: ../libpurple/protocols/yahoo/yahoochat.c:446
 msgid "Unknown room"
 msgstr "Ukjent rom"
 
 #. -15
-#: ../libpurple/protocols/yahoo/yahoochat.c:444
+#: ../libpurple/protocols/yahoo/yahoochat.c:449
 msgid "Maybe the room is full"
 msgstr "Kanskje er rommet fullt"
 
 #. -35
-#: ../libpurple/protocols/yahoo/yahoochat.c:447
+#: ../libpurple/protocols/yahoo/yahoochat.c:452
 msgid "Not available"
 msgstr "Ikkje tilgjengeleg"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:451
-msgid ""
-"Unknown error. You may need to logout and wait five minutes before being "
-"able to rejoin a chatroom"
-msgstr ""
-"Ukjent feil. Du treng kanskje å logga ut og venta i fem minutt før du prøver "
-"Ã¥ bli med i rommet igjen."
+#: ../libpurple/protocols/yahoo/yahoochat.c:456
+msgid "Unknown error. You may need to logout and wait five minutes before being able to rejoin a chatroom"
+msgstr "Ukjent feil. Du treng kanskje å logga ut og venta i fem minutt før du prøver å bli med i rommet igjen."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:534
+#: ../libpurple/protocols/yahoo/yahoochat.c:539
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "Du pratar no i %s."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:719
+#: ../libpurple/protocols/yahoo/yahoochat.c:728
 msgid "Failed to join buddy in chat"
 msgstr "Klarte ikkje å bli med vennen i praterommet"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:720
+#: ../libpurple/protocols/yahoo/yahoochat.c:729
 msgid "Maybe they're not in a chat?"
 msgstr "Kanskje er dei ikkje i eit praterom?"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1416
-#: ../libpurple/protocols/yahoo/yahoochat.c:1442
+#: ../libpurple/protocols/yahoo/yahoochat.c:1425
+#: ../libpurple/protocols/yahoo/yahoochat.c:1451
 msgid "Fetching the room list failed."
 msgstr "Klarte ikkje å henta romlista."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1500
+#: ../libpurple/protocols/yahoo/yahoochat.c:1511
 msgid "Voices"
 msgstr "Stemmer"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1503
+#: ../libpurple/protocols/yahoo/yahoochat.c:1514
 msgid "Webcams"
 msgstr "Nettkamera"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1514
-#: ../libpurple/protocols/yahoo/yahoochat.c:1584
+#: ../libpurple/protocols/yahoo/yahoochat.c:1525
+#: ../libpurple/protocols/yahoo/yahoochat.c:1595
 msgid "Unable to fetch room list."
 msgstr "Klarer ikkje å henta romlista."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1577
+#: ../libpurple/protocols/yahoo/yahoochat.c:1588
 msgid "User Rooms"
 msgstr "Brukarrom"
 
-#: ../libpurple/protocols/yahoo/ycht.c:456
+#: ../libpurple/protocols/yahoo/ycht.c:457
 msgid "Connection problem with the YCHT server."
 msgstr "Tilkoplingsproblem med YCHT-tenaren."
 
-#: ../libpurple/protocols/yahoo/ycht.c:475
+#: ../libpurple/protocols/yahoo/ycht.c:476
 #, c-format
 msgid ""
 "Lost connection with server\n"
@@ -13001,119 +13323,97 @@ msgstr ""
 "Mista sambandet med tenar\n"
 "%s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:354
-msgid ""
-"(There was an error converting this message.\t Check the 'Encoding' option "
-"in the Account Editor)"
-msgstr ""
-"(Ein feil oppstod under konverteringa av denne meldinga.\t Kontroller "
-"'Teiknkoding'-valet i kontobehandlararen)"
+#: ../libpurple/protocols/zephyr/zephyr.c:358
+msgid "(There was an error converting this message.\t Check the 'Encoding' option in the Account Editor)"
+msgstr "(Ein feil oppstod under konverteringa av denne meldinga.\t Kontroller 'Teiknkoding'-valet i kontobehandlararen)"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:752
+#: ../libpurple/protocols/zephyr/zephyr.c:756
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "Klarte ikkje å senda til praterom %s,%s,%s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:791
-#: ../libpurple/protocols/zephyr/zephyr.c:1210
+#: ../libpurple/protocols/zephyr/zephyr.c:795
+#: ../libpurple/protocols/zephyr/zephyr.c:1170
 msgid "Hidden or not logged-in"
 msgstr "Skjult eller ikkje pålogga"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:797
-#: ../libpurple/protocols/zephyr/zephyr.c:1212
+#: ../libpurple/protocols/zephyr/zephyr.c:801
+#: ../libpurple/protocols/zephyr/zephyr.c:1172
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>PÃ¥ %s sia %s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:1546
-#: ../libpurple/protocols/zephyr/zephyr.c:1547
+#: ../libpurple/protocols/zephyr/zephyr.c:1510
+#: ../libpurple/protocols/zephyr/zephyr.c:1511
 msgid "Anyone"
 msgstr "Kven som helst"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2354
+#: ../libpurple/protocols/zephyr/zephyr.c:2366
 msgid "_Class:"
 msgstr "_Klasse:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2360
+#: ../libpurple/protocols/zephyr/zephyr.c:2372
 msgid "_Instance:"
 msgstr "_Instans:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2366
+#: ../libpurple/protocols/zephyr/zephyr.c:2378
 msgid "_Recipient:"
 msgstr "_Mottakar:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2377
+#: ../libpurple/protocols/zephyr/zephyr.c:2389
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "Klarte ikkje å abonnera på %s,%s,%s "
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2690
+#: ../libpurple/protocols/zephyr/zephyr.c:2702
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;kallenamn&gt;: finn brukar"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2695
+#: ../libpurple/protocols/zephyr/zephyr.c:2707
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;kallenamn&gt;: finn brukar"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2700
+#: ../libpurple/protocols/zephyr/zephyr.c:2712
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
-msgstr ""
-"instance &lt;instans&gt;: vel instansen som skal nyttast for denne klassen"
+msgstr "instance &lt;instans&gt;: vel instansen som skal nyttast for denne klassen"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2705
+#: ../libpurple/protocols/zephyr/zephyr.c:2717
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;instans&gt;: vel instansen som skal nyttast for denne klassen"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2710
+#: ../libpurple/protocols/zephyr/zephyr.c:2722
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
-msgstr ""
-"topic &lt;instans&gt;: vel instansen som skal nyttast for denne klassen"
+msgstr "topic &lt;instans&gt;: vel instansen som skal nyttast for denne klassen"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2716
+#: ../libpurple/protocols/zephyr/zephyr.c:2728
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
-msgstr ""
-"sub &lt;klasse&gt; &lt;instans&gt; &lt;mottakar&gt;: bli med i nytt praterom"
+msgstr "sub &lt;klasse&gt; &lt;instans&gt; &lt;mottakar&gt;: bli med i nytt praterom"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2721
-msgid ""
-"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
-msgstr ""
-"zi &lt;instans&gt;: send ei melding til &lt;melding,<i>instans</i>,*&gt;"
+#: ../libpurple/protocols/zephyr/zephyr.c:2733
+msgid "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
+msgstr "zi &lt;instans&gt;: send ei melding til &lt;melding,<i>instans</i>,*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2727
-msgid ""
-"zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
-"<i>instance</i>,*&gt;"
-msgstr ""
-"zci &lt;klasse&gt; &lt;instans&gt;: send ei melding til &lt;<i>klasse</i>,"
-"<i>instans</i>,*&gt;"
+#: ../libpurple/protocols/zephyr/zephyr.c:2739
+msgid "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,<i>instance</i>,*&gt;"
+msgstr "zci &lt;klasse&gt; &lt;instans&gt;: send ei melding til &lt;<i>klasse</i>,<i>instans</i>,*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2733
-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 ""
-"zcir &lt;klasse&gt; &lt;instans&gt; &lt;mottakar&gt;: send ei melding til "
-"&lt;<i>klasse</i>,<i>instans</i>,<i>mottakar</i>&gt;"
+#: ../libpurple/protocols/zephyr/zephyr.c:2745
+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 "zcir &lt;klasse&gt; &lt;instans&gt; &lt;mottakar&gt;: send ei melding til &lt;<i>klasse</i>,<i>instans</i>,<i>mottakar</i>&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2739
-msgid ""
-"zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
-"<i>instance</i>,<i>recipient</i>&gt;"
-msgstr ""
-"zir &lt;instans&gt; &lt;mottakar&gt;: send ei melding til &lt;MELDING,"
-"<i>instans</i>,<i>mottakar</i>&gt;"
+#: ../libpurple/protocols/zephyr/zephyr.c:2751
+msgid "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,<i>instance</i>,<i>recipient</i>&gt;"
+msgstr "zir &lt;instans&gt; &lt;mottakar&gt;: send ei melding til &lt;MELDING,<i>instans</i>,<i>mottakar</i>&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2744
+#: ../libpurple/protocols/zephyr/zephyr.c:2756
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
-msgstr ""
-"zc &lt;klasse&gt;: send ei melding til &lt;<i>class</i>,PERSONLEG,*&gt;"
+msgstr "zc &lt;klasse&gt;: send ei melding til &lt;<i>class</i>,PERSONLEG,*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2850
+#: ../libpurple/protocols/zephyr/zephyr.c:2832
 msgid "Resubscribe"
 msgstr "Abonner på nytt"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2853
+#: ../libpurple/protocols/zephyr/zephyr.c:2835
 msgid "Retrieve subscriptions from server"
 msgstr "Hent abonnement frå tenar"
 
@@ -13127,45 +13427,47 @@ msgstr "Hent abonnement frå tenar"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/zephyr/zephyr.c:2946
-#: ../libpurple/protocols/zephyr/zephyr.c:2948
+#: ../libpurple/protocols/zephyr/zephyr.c:2928
+#: ../libpurple/protocols/zephyr/zephyr.c:2930
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr protokolltillegg"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2973
+#: ../libpurple/protocols/zephyr/zephyr.c:2955
 msgid "Use tzc"
 msgstr "Bruk tzc"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2976
+#: ../libpurple/protocols/zephyr/zephyr.c:2958
 msgid "tzc command"
 msgstr "tzc-kommando"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2979
+#: ../libpurple/protocols/zephyr/zephyr.c:2961
 msgid "Export to .anyone"
 msgstr "Eksporter til .anyone"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2982
+#: ../libpurple/protocols/zephyr/zephyr.c:2964
 msgid "Export to .zephyr.subs"
 msgstr "Eksporter til .zephyr.subs"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2985
+#: ../libpurple/protocols/zephyr/zephyr.c:2967
 msgid "Import from .anyone"
 msgstr "Importer frå .anyone"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2988
+#: ../libpurple/protocols/zephyr/zephyr.c:2970
 msgid "Import from .zephyr.subs"
 msgstr "Importer frå .zephyr.subs"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2991
+#: ../libpurple/protocols/zephyr/zephyr.c:2973
 msgid "Realm"
 msgstr "Domene"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2994
+#: ../libpurple/protocols/zephyr/zephyr.c:2976
 msgid "Exposure"
 msgstr "Framvising"
 
-#: ../libpurple/proxy.c:459 ../libpurple/proxy.c:894 ../libpurple/proxy.c:1049
-#: ../libpurple/proxy.c:1617
+#: ../libpurple/proxy.c:461
+#: ../libpurple/proxy.c:908
+#: ../libpurple/proxy.c:1067
+#: ../libpurple/proxy.c:1638
 #, c-format
 msgid ""
 "Unable to create socket:\n"
@@ -13174,46 +13476,48 @@ msgstr ""
 "Klarte ikkje å laga endepunkt:\n"
 "%s"
 
-#: ../libpurple/proxy.c:659
+#: ../libpurple/proxy.c:662
 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s\n"
 msgstr "Klarer ikkje å tolka svaret frå HTTP-mellomtenaren: %s\n"
 
-#: ../libpurple/proxy.c:698 ../libpurple/proxy.c:744 ../libpurple/proxy.c:780
-#: ../libpurple/proxy.c:792
+#: ../libpurple/proxy.c:702
+#: ../libpurple/proxy.c:751
+#: ../libpurple/proxy.c:789
+#: ../libpurple/proxy.c:801
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Feil i ambandet mot HTTP-mellomtenaren: %d"
 
-#: ../libpurple/proxy.c:788
+#: ../libpurple/proxy.c:797
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling."
 msgstr "Tilgang avvist: HTTP-mellomtenaren tillèt ikkje tunnel over port %d."
 
-#: ../libpurple/proxy.c:1012
+#: ../libpurple/proxy.c:1028
 #, c-format
 msgid "Error resolving %s"
 msgstr "Klarte ikkje å slå opp %s"
 
-#: ../libpurple/proxy.c:1714
+#: ../libpurple/proxy.c:1736
 msgid "Could not resolve host name"
 msgstr "Klarte ikkje å slå opp vertsnamnet"
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
-#: ../libpurple/request.h:1378
+#: ../libpurple/request.h:1448
 msgid "_Yes"
 msgstr "_Ja"
 
-#: ../libpurple/request.h:1378
+#: ../libpurple/request.h:1448
 msgid "_No"
 msgstr "_Nei"
 
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
-#: ../libpurple/request.h:1398
+#: ../libpurple/request.h:1468
 msgid "_Accept"
 msgstr "_Godta"
 
@@ -13224,26 +13528,26 @@ msgstr "Eg er ikkje her nett no"
 msgid "I'm not here right now"
 msgstr "Eg er ikkje her nett no"
 
-#: ../libpurple/savedstatuses.c:535
+#: ../libpurple/savedstatuses.c:537
 msgid "saved statuses"
 msgstr "lagra tilstandar"
 
-#: ../libpurple/server.c:234
+#: ../libpurple/server.c:265
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s er no kjend som %s. \n"
 
-#: ../libpurple/server.c:302
+#: ../libpurple/server.c:333
 #, c-format
 msgid "Requesting %s's attention..."
-msgstr ""
+msgstr "Ber om merksemda til %s…"
 
-#: ../libpurple/server.c:347
+#: ../libpurple/server.c:378
 #, c-format
 msgid "%s has requested your attention!"
-msgstr ""
+msgstr "%s har bede om merksemda di!"
 
-#: ../libpurple/server.c:796
+#: ../libpurple/server.c:875
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -13252,39 +13556,38 @@ msgstr ""
 "%s har invitert %s til praterommet %s:\n"
 "%s"
 
-#: ../libpurple/server.c:801
+#: ../libpurple/server.c:880
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s har invitert %s til praterommet %s\n"
 
-#: ../libpurple/server.c:805
+#: ../libpurple/server.c:884
 msgid "Accept chat invitation?"
 msgstr "Tek du i mot invitasjonen?"
 
 #: ../libpurple/sslconn.c:164
-#, fuzzy
 msgid "SSL Connection Failed"
-msgstr "Tilkoplinga feila"
+msgstr "SSL_sambandet feila"
 
 #: ../libpurple/sslconn.c:166
-#, fuzzy
 msgid "SSL Handshake Failed"
-msgstr "Filoverføringa feila"
+msgstr "SSL-protokollsjekken feila"
 
 #: ../libpurple/sslconn.c:168
 msgid "SSL peer presented an invalid certificate"
-msgstr ""
+msgstr "SSL-tenaren snte eitugldig sertifikat"
 
 #: ../libpurple/sslconn.c:171
-#, fuzzy
 msgid "Unknown SSL error"
-msgstr "Ukjend feil"
+msgstr "Ukjend SSL-feil"
 
 #: ../libpurple/status.c:153
 msgid "Unset"
 msgstr "Ta vekk"
 
-#: ../libpurple/status.c:156 ../pidgin/gtkstatusbox.c:1059
+#: ../libpurple/status.c:156
+#: ../pidgin/gtkdocklet.c:553
+#: ../pidgin/gtkstatusbox.c:1083
 msgid "Do not disturb"
 msgstr "Ikkje forstyrr meg"
 
@@ -13296,144 +13599,175 @@ msgstr "Mobil"
 msgid "Mobile"
 msgstr "Mobil"
 
-#: ../libpurple/status.c:609
+#: ../libpurple/status.c:161
+msgid "Listening to music"
+msgstr "Lyttar til musikk"
+
+#: ../libpurple/status.c:610
 #, c-format
-msgid "%s changed status from %s to %s"
-msgstr "%s endra status frå %s til %s"
+msgid "%s (%s) changed status from %s to %s"
+msgstr "%s (%s) endra tilstand frå %s til %s"
 
-#: ../libpurple/status.c:619
+#: ../libpurple/status.c:621
 #, c-format
-msgid "%s is now %s"
-msgstr "%s er no %s"
+msgid "%s (%s) is now %s"
+msgstr "%s (%s) er no %s"
 
-#: ../libpurple/status.c:624
+#: ../libpurple/status.c:627
 #, c-format
-msgid "%s is no longer %s"
-msgstr "%s er ikkje lenger %s"
+msgid "%s (%s) is no longer %s"
+msgstr "%s (%s) er ikkje lenger %s"
 
-#: ../libpurple/status.c:1234
+#: ../libpurple/status.c:1242
 #, c-format
 msgid "%s became idle"
 msgstr "%s blei uverksam"
 
-#: ../libpurple/status.c:1251
+#: ../libpurple/status.c:1262
 #, c-format
 msgid "%s became unidle"
 msgstr "%s blei aktiv igjen"
 
-#: ../libpurple/status.c:1314
+#: ../libpurple/status.c:1328
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s blei uverksam"
 
-#: ../libpurple/status.c:1316
+#: ../libpurple/status.c:1330
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "%s vart verksam igjen"
 
-#: ../libpurple/util.c:718
+#: ../libpurple/util.c:721
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2722
+#: ../libpurple/util.c:2804
 #, c-format
 msgid "Error Reading %s"
 msgstr "Klarte ikkje å lesa %s"
 
-#: ../libpurple/util.c:2723
+#: ../libpurple/util.c:2805
 #, 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 ""
-"Ein feil oppstod under lesinga av %s. Dei er ikkje blitt lasta, og den gamle "
-"fila har fått namnet %s~."
+msgid "An error was encountered reading your %s.  They have not been loaded, and the old file has been renamed to %s~."
+msgstr "Ein feil oppstod under lesinga av %s. Dei er ikkje blitt lasta, og den gamle fila har fått namnet %s~."
 
-#: ../libpurple/util.c:3223
+#: ../libpurple/util.c:3304
 msgid "Calculating..."
 msgstr "Reknar…"
 
-#: ../libpurple/util.c:3226
+#: ../libpurple/util.c:3307
 msgid "Unknown."
 msgstr "Ukjend."
 
-#: ../libpurple/util.c:3252
+#: ../libpurple/util.c:3333
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d sekund"
 msgstr[1] "%d sekund"
 
-#: ../libpurple/util.c:3264
+#: ../libpurple/util.c:3345
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dag"
 msgstr[1] "%d dagar"
 
-#: ../libpurple/util.c:3272
+#: ../libpurple/util.c:3353
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d time"
 msgstr[1] "%s, %d timar"
 
-#: ../libpurple/util.c:3278
+#: ../libpurple/util.c:3359
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d time"
 msgstr[1] "%d timar"
 
-#: ../libpurple/util.c:3286
+#: ../libpurple/util.c:3367
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minute"
 msgstr[1] "%s, %d minutt"
 
-#: ../libpurple/util.c:3292
+#: ../libpurple/util.c:3373
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minutt"
 msgstr[1] "%d minutt"
 
-#: ../libpurple/util.c:3552
+#: ../libpurple/util.c:3633
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr "Klarte ikkje å opna %s: vidaresendt for mange gonger"
 
-#: ../libpurple/util.c:3589 ../libpurple/util.c:3885
+#: ../libpurple/util.c:3670
+#: ../libpurple/util.c:3966
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Klarte ikkje å kopla til %s"
 
-#: ../libpurple/util.c:3712
+#: ../libpurple/util.c:3793
 #, c-format
-msgid ""
-"Unable to allocate enough memory to hold the contents from %s.  The web "
-"server may be trying something malicious."
-msgstr ""
-"Klarer ikkje å tildela nok minne til å halda på innhaldet frå %s. Nettenaren "
-"prøver kanskje å gjera noko vondskapsfullt."
+msgid "Unable to allocate enough memory to hold the contents from %s.  The web server may be trying something malicious."
+msgstr "Klarer ikkje å tildela nok minne til å halda på innhaldet frå %s. Nettenaren prøver kanskje å gjera noko vondskapsfullt."
 
-#: ../libpurple/util.c:3747
+#: ../libpurple/util.c:3828
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Klarte ikkje å lesa frå %s: %s"
 
-#: ../libpurple/util.c:3778
+#: ../libpurple/util.c:3859
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Klarte ikkje å skriva frå %s: %s"
 
-#: ../libpurple/util.c:3803
+#: ../libpurple/util.c:3884
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Klarte ikkje å kopla til %s: %s"
 
+#: ../libpurple/util.c:4686
+#, c-format
+msgid " - %s"
+msgstr " - %s"
+
+#: ../libpurple/util.c:4692
+#, c-format
+msgid " (%s)"
+msgstr "(%s)"
+
+#. 10053
+#: ../libpurple/win32/libc_interface.c:322
+#, c-format
+msgid "Connection interrupted by other software on your computer."
+msgstr "Sambandet avbrote av annan programvare på datamaskina di."
+
+#. 10054
+#: ../libpurple/win32/libc_interface.c:324
+#, c-format
+msgid "Remote host closed connection."
+msgstr "Fjerntenaren kopla ned sambandet."
+
+#. 10060
+#: ../libpurple/win32/libc_interface.c:326
+#, c-format
+msgid "Connection timed out."
+msgstr "Tidsavbrot på sambandet."
+
+#. 10061
+#: ../libpurple/win32/libc_interface.c:328
+#, c-format
+msgid "Connection refused."
+msgstr "Tilkoplinga blei avvist."
+
 #: ../pidgin.desktop.in.h:1
 msgid "Internet Messenger"
 msgstr "Lynmeldingsklient"
@@ -13446,80 +13780,81 @@ msgstr "Send lynmeldingar over fleire pr
 msgid "Send instant messages over multiple protocols"
 msgstr "Send lynmeldingar over fleire protokollar"
 
-#: ../pidgin/eggtrayicon.c:129
+#: ../pidgin/eggtrayicon.c:128
 msgid "Orientation"
 msgstr "Orientering"
 
-#: ../pidgin/eggtrayicon.c:130
+#: ../pidgin/eggtrayicon.c:129
 msgid "The orientation of the tray."
 msgstr "Panelorienteringa."
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:407
+#: ../pidgin/gtkaccount.c:379
 msgid "Login Options"
 msgstr "Innloggingsval"
 
-#: ../pidgin/gtkaccount.c:428
+#: ../pidgin/gtkaccount.c:400
 msgid "Pro_tocol:"
 msgstr "Proto_koll:"
 
-#: ../pidgin/gtkaccount.c:439
+#: ../pidgin/gtkaccount.c:411
 msgid "Screen _name:"
 msgstr "Brukar_namn:"
 
-#: ../pidgin/gtkaccount.c:529
+#: ../pidgin/gtkaccount.c:501
 msgid "_Local alias:"
 msgstr "L_okalt alias:"
 
-#: ../pidgin/gtkaccount.c:533
+#: ../pidgin/gtkaccount.c:505
 msgid "Remember pass_word"
 msgstr "_Hugs passordet"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:591
+#: ../pidgin/gtkaccount.c:563
 msgid "User Options"
 msgstr "Brukarval"
 
-#: ../pidgin/gtkaccount.c:604
+#: ../pidgin/gtkaccount.c:576
 msgid "New _mail notifications"
 msgstr "Varsling av ny _e-post"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:609
+#: ../pidgin/gtkaccount.c:581
 msgid "Use this buddy _icon for this account:"
 msgstr "Bruk dette venne-_ikonet for denne kontoen:"
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:731
+#: ../pidgin/gtkaccount.c:703
 #, c-format
 msgid "%s Options"
 msgstr "%s-val"
 
-#: ../pidgin/gtkaccount.c:936
+#: ../pidgin/gtkaccount.c:908
 msgid "Use GNOME Proxy Settings"
 msgstr "Bruk GNOME mellomlagerinnstillingar"
 
-#: ../pidgin/gtkaccount.c:937
+#: ../pidgin/gtkaccount.c:909
 msgid "Use Global Proxy Settings"
 msgstr "Bruk globale mellomtenarinnstillingar"
 
-#: ../pidgin/gtkaccount.c:943
+#: ../pidgin/gtkaccount.c:915
 msgid "No Proxy"
 msgstr "Ingen mellomtenar"
 
-#: ../pidgin/gtkaccount.c:949
+#: ../pidgin/gtkaccount.c:921
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:955
+#: ../pidgin/gtkaccount.c:927
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:961
+#: ../pidgin/gtkaccount.c:933
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1211
+#: ../pidgin/gtkaccount.c:939
+#: ../pidgin/gtkprefs.c:1230
 msgid "Use Environmental Settings"
 msgstr "Bruk miljøinnstillingar"
 
@@ -13528,803 +13863,860 @@ msgstr "Bruk miljøinnstillingar"
 #. A) your network is really slow and you have nothing better to do than
 #. look at butterflies.
 #. B)You are looking really closely at something that shouldn't matter.
-#: ../pidgin/gtkaccount.c:1006
+#: ../pidgin/gtkaccount.c:978
 msgid "If you look real closely"
 msgstr "Om du verkeleg ser godt etter"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:1009
+#: ../pidgin/gtkaccount.c:981
 msgid "you can see the butterflies mating"
 msgstr "kan du sjå sommarfuglane kurtisera"
 
-#: ../pidgin/gtkaccount.c:1030
+#: ../pidgin/gtkaccount.c:1002
 msgid "Proxy Options"
 msgstr "Mellomtenarval"
 
-#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1205
+#: ../pidgin/gtkaccount.c:1016
+#: ../pidgin/gtkprefs.c:1224
 msgid "Proxy _type:"
 msgstr "_Mellomtenartype:"
 
-#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1226
+#: ../pidgin/gtkaccount.c:1025
+#: ../pidgin/gtkprefs.c:1245
 msgid "_Host:"
 msgstr "_Vert:"
 
-#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1244
+#: ../pidgin/gtkaccount.c:1029
+#: ../pidgin/gtkprefs.c:1263
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../pidgin/gtkaccount.c:1065
+#: ../pidgin/gtkaccount.c:1037
 msgid "_Username:"
 msgstr "Brukar_namn:"
 
-#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1281
+#: ../pidgin/gtkaccount.c:1044
+#: ../pidgin/gtkprefs.c:1300
 msgid "Pa_ssword:"
 msgstr "P_assord:"
 
-#: ../pidgin/gtkaccount.c:1195
+#: ../pidgin/gtkaccount.c:1169
 msgid "Unable to save new account"
 msgstr "Klarte ikkje å lagra den nye kontoen"
 
-#: ../pidgin/gtkaccount.c:1196
+#: ../pidgin/gtkaccount.c:1170
 msgid "An account already exists with the specified criteria."
 msgstr "Det finst allereie ein konto med dei kriteria."
 
-#: ../pidgin/gtkaccount.c:1473
+#: ../pidgin/gtkaccount.c:1447
 msgid "Add Account"
 msgstr "Legg til konto"
 
-#: ../pidgin/gtkaccount.c:1492
+#: ../pidgin/gtkaccount.c:1464
 msgid "_Basic"
 msgstr "_Grunnleggjande"
 
-#: ../pidgin/gtkaccount.c:1499
+#: ../pidgin/gtkaccount.c:1471
 msgid "Create this new account on the server"
 msgstr "Opprett denne nye kontoen på tenaren"
 
-#: ../pidgin/gtkaccount.c:1515
+#: ../pidgin/gtkaccount.c:1485
 msgid "_Advanced"
 msgstr "A_vansert"
 
-#: ../pidgin/gtkaccount.c:1973 ../pidgin/gtkplugin.c:569
+#: ../pidgin/gtkaccount.c:1906
+#: ../pidgin/gtkplugin.c:639
+#: ../pidgin/plugins/convcolors.c:327
 msgid "Enabled"
 msgstr "I bruk"
 
-#: ../pidgin/gtkaccount.c:2001
+#: ../pidgin/gtkaccount.c:1934
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: ../pidgin/gtkaccount.c:2201
+#: ../pidgin/gtkaccount.c:2137
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
 "\n"
-"You have no IM accounts configured. To start connecting with %s press the "
-"<b>Add</b> button below and configure your first account. If you want %s to "
-"connect to multiple IM accounts, press <b>Add</b> again to configure them "
-"all.\n"
+"You have no IM accounts configured. To start connecting with %s press the <b>Add</b> button below and configure your first account. If you want %s to connect to multiple IM accounts, press <b>Add</b> again to configure them all.\n"
 "\n"
-"You can come back to this window to add, edit, or remove accounts from "
-"<b>Accounts->Add/Edit</b> in the Buddy List window"
+"You can come back to this window to add, edit, or remove accounts from <b>Accounts->Add/Edit</b> in the Buddy List window"
 msgstr ""
 "<span size='larger' weight='bold'>Velkomen til %s!</span>\n"
 "\n"
-"Du har ingen lynmeldingskontoar. For å kopla deg til %s trykkjer du på "
-"<b>Legg til</b>-knappen nedanfor og lagrar innstillingane for den første "
-"kontoen din. Om du ønskjer at %s skal kopla seg mot fleire "
-"lynmeldingskontoar, trykkjer du på <b>Legg til</b> nok ein gong og repeterer "
-"prosedyra.\n"
+"Du har ingen lynmeldingskontoar. For å kopla deg til %s trykkjer du på <b>Legg til</b>-knappen nedanfor og lagrar innstillingane for den første kontoen din. Om du ønskjer at %s skal kopla seg mot fleire lynmeldingskontoar, trykkjer du på <b>Legg til</b> nok ein gong og repeterer prosedyra.\n"
 "\n"
-"Du kan koma attende til dette vindauget for å leggja til, endra eller fjerna "
-"kontoar frå <b>Kontoar->Legg til/endra</b> i vennelistevindauget"
+"Du kan koma attende til dette vindauget for å leggja til, endra eller fjerna kontoar frå <b>Kontoar->Legg til/endra</b> i vennelistevindauget"
 
-#: ../pidgin/gtkblist.c:767
-msgid "Join a Chat"
-msgstr "GÃ¥ inn i eit praterom"
+#: ../pidgin/gtkblist.c:549
+#, c-format
+msgid "You have %d contact named %s. Would you like to merge them?"
+msgid_plural "You currently have %d contacts named %s. Would you like to merge them?"
+msgstr[0] "Du har %d kontakt med namnet %s. Vil du slå dei saman?"
+msgstr[1] "Du har no %d kontaktar med namnet %s. Vil du slå dei saman?"
 
-#: ../pidgin/gtkblist.c:788
-msgid ""
-"Please enter the appropriate information about the chat you would like to "
-"join.\n"
-msgstr ""
-"Skriv inn nødvendig informasjon om praterommet du ønskjer å gå inn i.\n"
+#: ../pidgin/gtkblist.c:550
+msgid "Merging these contacts will cause them to share a single entry on the buddy list and use a single conversation window. You can separate them again by choosing 'Expand' from the contact's context menu"
+msgstr "Å slå saman desse kontaktane vil gjera at dei deler den same oppføringa i vennelista og at dei nyttar eitt samtalevindauge. Du kan skilja dei igjen ved å velja 'Utvid' frå vennen sin sprettoppmeny."
 
-#. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:799 ../pidgin/gtkblist.c:5530
-#: ../pidgin/gtkblist.c:5893 ../pidgin/gtkpounce.c:539
-#: ../pidgin/gtkroomlist.c:396
+#: ../pidgin/gtkblist.c:552
+msgid "_Merge"
+msgstr "_Slå saman:"
+
+#: ../pidgin/gtkblist.c:953
+#: ../pidgin/gtkblist.c:6683
+msgid "Room _List"
+msgstr "Rom_liste"
+
+#: ../pidgin/gtkblist.c:973
+msgid "Please enter the appropriate information about the chat you would like to join.\n"
+msgstr "Skriv inn nødvendig informasjon om praterommet du ønskjer å gå inn i.\n"
+
+#: ../pidgin/gtkblist.c:985
+#: ../pidgin/gtkblist.c:6718
+#: ../pidgin/gtkpounce.c:546
+#: ../pidgin/gtkroomlist.c:547
 msgid "_Account:"
 msgstr "_Konto:"
 
-#: ../pidgin/gtkblist.c:1088 ../pidgin/gtkprivacy.c:603
-#: ../pidgin/gtkprivacy.c:617
+#: ../pidgin/gtkblist.c:1263
+#: ../pidgin/gtkprivacy.c:549
+#: ../pidgin/gtkprivacy.c:563
 msgid "_Block"
 msgstr "_Blokker"
 
-#: ../pidgin/gtkblist.c:1088
+#: ../pidgin/gtkblist.c:1263
 msgid "Un_block"
 msgstr "A_vblokker"
 
-#: ../pidgin/gtkblist.c:1139
+#: ../pidgin/gtkblist.c:1306
+msgid "Move to"
+msgstr "Flytt til"
+
+#: ../pidgin/gtkblist.c:1346
 msgid "Get _Info"
 msgstr "Hent _info"
 
-#: ../pidgin/gtkblist.c:1142 ../pidgin/pidginstock.c:90
+#: ../pidgin/gtkblist.c:1349
+#: ../pidgin/pidginstock.c:90
 msgid "I_M"
 msgstr "_Lynmelding"
 
-#: ../pidgin/gtkblist.c:1148
-#, fuzzy
-msgid "_Send File"
-msgstr "Send fil"
+#: ../pidgin/gtkblist.c:1355
+msgid "_Send File..."
+msgstr "_Send fil…"
 
-#: ../pidgin/gtkblist.c:1155
-msgid "Add Buddy _Pounce"
-msgstr "Legg til venne_varsling"
+#: ../pidgin/gtkblist.c:1362
+msgid "Add Buddy _Pounce..."
+msgstr "Legg til _vennevarsling…"
 
-#: ../pidgin/gtkblist.c:1160 ../pidgin/gtkblist.c:1164
-#: ../pidgin/gtkblist.c:1269 ../pidgin/gtkblist.c:1292
+#: ../pidgin/gtkblist.c:1367
+#: ../pidgin/gtkblist.c:1371
+#: ../pidgin/gtkblist.c:1486
+#: ../pidgin/gtkblist.c:1509
 msgid "View _Log"
 msgstr "Vis l_ogg"
 
-#: ../pidgin/gtkblist.c:1177 ../pidgin/gtkblist.c:1186
-#: ../pidgin/gtkblist.c:1277 ../pidgin/gtkblist.c:1298
+#: ../pidgin/gtkblist.c:1377
+msgid "Hide when offline"
+msgstr "Skjul  når du er fråkopla"
+
+#: ../pidgin/gtkblist.c:1377
+msgid "Show when offline"
+msgstr "Vis når du er fråkopla"
+
+#: ../pidgin/gtkblist.c:1391
+#: ../pidgin/gtkblist.c:1400
+#: ../pidgin/gtkblist.c:1494
+#: ../pidgin/gtkblist.c:1515
 msgid "_Alias..."
 msgstr "A_lias…"
 
-#: ../pidgin/gtkblist.c:1180 ../pidgin/gtkblist.c:1188
-#: ../pidgin/gtkblist.c:1279 ../pidgin/gtkblist.c:1300
+#: ../pidgin/gtkblist.c:1394
+#: ../pidgin/gtkblist.c:1402
+#: ../pidgin/gtkblist.c:1496
+#: ../pidgin/gtkblist.c:1517
 msgid "_Remove"
 msgstr "_Fjern"
 
-#: ../pidgin/gtkblist.c:1238
-msgid "Add a _Buddy"
-msgstr "Legg til ein _venn"
+#: ../pidgin/gtkblist.c:1452
+msgid "Add _Buddy..."
+msgstr "Legg til _venn…"
 
-#: ../pidgin/gtkblist.c:1241
-msgid "Add a C_hat"
-msgstr "Legg til eit samtale_rom"
+#: ../pidgin/gtkblist.c:1455
+msgid "Add C_hat..."
+msgstr "Legg til prate_rom…"
 
-#: ../pidgin/gtkblist.c:1244
+#: ../pidgin/gtkblist.c:1458
 msgid "_Delete Group"
 msgstr "_Slett gruppe"
 
-#: ../pidgin/gtkblist.c:1246
+#: ../pidgin/gtkblist.c:1460
 msgid "_Rename"
 msgstr "_Gje nytt namn"
 
 #. join button
-#: ../pidgin/gtkblist.c:1265 ../pidgin/gtkroomlist.c:307
-#: ../pidgin/gtkroomlist.c:460 ../pidgin/pidginstock.c:88
+#: ../pidgin/gtkblist.c:1480
+#: ../pidgin/gtkroomlist.c:318
+#: ../pidgin/gtkroomlist.c:594
+#: ../pidgin/pidginstock.c:88
 msgid "_Join"
 msgstr "_Bli med"
 
-#: ../pidgin/gtkblist.c:1267
+#: ../pidgin/gtkblist.c:1482
 msgid "Auto-Join"
 msgstr "Automatisk pålogging"
 
-#: ../pidgin/gtkblist.c:1305 ../pidgin/gtkblist.c:1329
+#: ../pidgin/gtkblist.c:1484
+msgid "Persistent"
+msgstr "Varig"
+
+#: ../pidgin/gtkblist.c:1522
+#: ../pidgin/gtkblist.c:1545
 msgid "_Collapse"
 msgstr "_Slå saman"
 
-#: ../pidgin/gtkblist.c:1334
+#: ../pidgin/gtkblist.c:1550
 msgid "_Expand"
 msgstr "_Utvid"
 
-#: ../pidgin/gtkblist.c:1585 ../pidgin/gtkblist.c:1597
-#: ../pidgin/gtkblist.c:4603 ../pidgin/gtkblist.c:4616
+#: ../pidgin/gtkblist.c:1801
+#: ../pidgin/gtkblist.c:1813
+#: ../pidgin/gtkblist.c:5364
+#: ../pidgin/gtkblist.c:5377
 msgid "/Tools/Mute Sounds"
 msgstr "/Verktøy/Demp lydar"
 
-#: ../pidgin/gtkblist.c:2057 ../pidgin/gtkconv.c:4840
-#: ../pidgin/gtkpounce.c:430
-msgid ""
-"You are not currently signed on with an account that can add that buddy."
+#: ../pidgin/gtkblist.c:2273
+#: ../pidgin/gtkconv.c:4818
+#: ../pidgin/gtkpounce.c:437
+msgid "You are not currently signed on with an account that can add that buddy."
 msgstr "Du kan ikkje leggja til vennen med den kontoen du nyttar no."
 
+#. I don't believe this can happen currently, I think
+#. * everything that calls this function checks for one of the
+#. * above node types first.
+#: ../pidgin/gtkblist.c:2618
+msgid "Unknown node type"
+msgstr "Ukjend nodetype"
+
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2869
+#: ../pidgin/gtkblist.c:3054
 msgid "/_Buddies"
 msgstr "/_Vennar"
 
-#: ../pidgin/gtkblist.c:2870
+#: ../pidgin/gtkblist.c:3055
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Vennar/_Ny lynmelding…"
 
-#: ../pidgin/gtkblist.c:2871
+#: ../pidgin/gtkblist.c:3056
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Vennar/Gå inn i eit prater_om…"
 
-#: ../pidgin/gtkblist.c:2872
+#: ../pidgin/gtkblist.c:3057
 msgid "/Buddies/Get User _Info..."
 msgstr "/Vennar/Hent brukar_info…"
 
-#: ../pidgin/gtkblist.c:2873
+#: ../pidgin/gtkblist.c:3058
 msgid "/Buddies/View User _Log..."
 msgstr "/Vennar/Vis brukar_logg…"
 
-#: ../pidgin/gtkblist.c:2875
-msgid "/Buddies/Show"
-msgstr "/Vennar/Vis"
+#: ../pidgin/gtkblist.c:3060
+msgid "/Buddies/Sh_ow"
+msgstr "/Vennar/Vi_s"
 
-#: ../pidgin/gtkblist.c:2876
+#: ../pidgin/gtkblist.c:3061
 msgid "/Buddies/Show/_Offline Buddies"
 msgstr "/Vennar/Vis/_Fråkopla vennar"
 
-#: ../pidgin/gtkblist.c:2877
+#: ../pidgin/gtkblist.c:3062
 msgid "/Buddies/Show/_Empty Groups"
 msgstr "/Vennar/Vis/_Tomme grupper"
 
-#: ../pidgin/gtkblist.c:2878
+#: ../pidgin/gtkblist.c:3063
 msgid "/Buddies/Show/Buddy _Details"
 msgstr "/Vennar/Vis/Venne_detaljar"
 
-#: ../pidgin/gtkblist.c:2879
+#: ../pidgin/gtkblist.c:3064
 msgid "/Buddies/Show/Idle _Times"
 msgstr "/Vennar/Vis/Fr_Ã¥koplingstid"
 
-#: ../pidgin/gtkblist.c:2880
+#: ../pidgin/gtkblist.c:3065
 msgid "/Buddies/Show/_Protocol Icons"
 msgstr "/Vennar/Vis/_Protokollikon"
 
-#: ../pidgin/gtkblist.c:2881
+#: ../pidgin/gtkblist.c:3066
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Vennar/Sort_er vennane"
 
-#: ../pidgin/gtkblist.c:2883
+#: ../pidgin/gtkblist.c:3068
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Vennar/Legg til _venn…"
 
-#: ../pidgin/gtkblist.c:2884
+#: ../pidgin/gtkblist.c:3069
 msgid "/Buddies/Add C_hat..."
 msgstr "/Vennar/Legg til _praterom…"
 
-#: ../pidgin/gtkblist.c:2885
+#: ../pidgin/gtkblist.c:3070
 msgid "/Buddies/Add _Group..."
 msgstr "/Vennar/Legg til _gruppe…"
 
-#: ../pidgin/gtkblist.c:2887
+#: ../pidgin/gtkblist.c:3072
 msgid "/Buddies/_Quit"
 msgstr "/Vennar/Avsl_utt"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2890
+#: ../pidgin/gtkblist.c:3075
 msgid "/_Accounts"
 msgstr "/K_ontoar"
 
-#: ../pidgin/gtkblist.c:2891 ../pidgin/gtkblist.c:6589
-msgid "/Accounts/Add\\/Edit"
-msgstr "/Kontoar/Legg til\\/endra"
+#: ../pidgin/gtkblist.c:3076
+#: ../pidgin/gtkblist.c:7403
+msgid "/Accounts/Manage"
+msgstr "/Kontoar/Behandla"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2894
+#: ../pidgin/gtkblist.c:3079
 msgid "/_Tools"
 msgstr "/V_erktøy"
 
-#: ../pidgin/gtkblist.c:2895
+#: ../pidgin/gtkblist.c:3080
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Verktøy/Venne_varsling"
 
-#: ../pidgin/gtkblist.c:2896
+#: ../pidgin/gtkblist.c:3081
 msgid "/Tools/_Certificates"
 msgstr "/Verktøy/_Sertifikat"
 
-#: ../pidgin/gtkblist.c:2897
+#: ../pidgin/gtkblist.c:3082
 msgid "/Tools/Plu_gins"
 msgstr "/Verktøy/Program_tillegg"
 
-#: ../pidgin/gtkblist.c:2898
+#: ../pidgin/gtkblist.c:3083
 msgid "/Tools/Pr_eferences"
 msgstr "/Verktøy/_Innstillingar"
 
-#: ../pidgin/gtkblist.c:2899
+#: ../pidgin/gtkblist.c:3084
 msgid "/Tools/Pr_ivacy"
 msgstr "/Verktøy/_Personvern"
 
-#: ../pidgin/gtkblist.c:2901
+#: ../pidgin/gtkblist.c:3086
 msgid "/Tools/_File Transfers"
 msgstr "/Verktøy/_Filoverføringar"
 
-#: ../pidgin/gtkblist.c:2902
+#: ../pidgin/gtkblist.c:3087
 msgid "/Tools/R_oom List"
 msgstr "/Verktøy/_Romliste"
 
-#: ../pidgin/gtkblist.c:2903
+#: ../pidgin/gtkblist.c:3088
 msgid "/Tools/System _Log"
 msgstr "/Verktøy/System_logg"
 
-#: ../pidgin/gtkblist.c:2905
+#: ../pidgin/gtkblist.c:3090
 msgid "/Tools/Mute _Sounds"
 msgstr "/Verktøy/_Demp lydar"
 
 #. Help
-#: ../pidgin/gtkblist.c:2907
+#: ../pidgin/gtkblist.c:3092
 msgid "/_Help"
 msgstr "/_Hjelp"
 
-#: ../pidgin/gtkblist.c:2908
+#: ../pidgin/gtkblist.c:3093
 msgid "/Help/Online _Help"
 msgstr "/Hjelp/_Hjelp på nettet"
 
-#: ../pidgin/gtkblist.c:2909
+#: ../pidgin/gtkblist.c:3094
 msgid "/Help/_Debug Window"
 msgstr "/Hjelp/_Feilsøkingsvindauge"
 
-#: ../pidgin/gtkblist.c:2911 ../pidgin/gtkblist.c:2913
+#: ../pidgin/gtkblist.c:3096
+#: ../pidgin/gtkblist.c:3098
 msgid "/Help/_About"
 msgstr "/Hjelp/_Om"
 
-#: ../pidgin/gtkblist.c:2942
+#: ../pidgin/gtkblist.c:3128
 #, c-format
+msgid "<b>Account:</b> %s"
+msgstr "<b>Konto:</b> %s"
+
+#: ../pidgin/gtkblist.c:3136
+#, c-format
 msgid ""
 "\n"
-"<b>Account:</b> %s"
+"<b>Topic:</b> %s"
 msgstr ""
 "\n"
-"<b>Konto:</b> %s"
+"<b>Emne:</b> %s"
 
-#: ../pidgin/gtkblist.c:3020
+#: ../pidgin/gtkblist.c:3136
+msgid "(no topic set)"
+msgstr "(emne er ikkje vald)"
+
+#: ../pidgin/gtkblist.c:3213
 msgid "Buddy Alias"
 msgstr "Venne-alias"
 
-#: ../pidgin/gtkblist.c:3049
+#: ../pidgin/gtkblist.c:3242
 msgid "Logged In"
 msgstr "PÃ¥logga"
 
-#: ../pidgin/gtkblist.c:3095
+#: ../pidgin/gtkblist.c:3288
 msgid "Last Seen"
 msgstr "Sist sett"
 
-#: ../pidgin/gtkblist.c:3116
+#: ../pidgin/gtkblist.c:3309
 msgid "Spooky"
 msgstr "Skummelt"
 
-#: ../pidgin/gtkblist.c:3118
+#: ../pidgin/gtkblist.c:3311
 msgid "Awesome"
 msgstr "Storarta"
 
-#: ../pidgin/gtkblist.c:3120
+#: ../pidgin/gtkblist.c:3313
 msgid "Rockin'"
 msgstr "Glimrande"
 
-#: ../pidgin/gtkblist.c:3453
+#: ../pidgin/gtkblist.c:3329
+msgid "Total Buddies"
+msgstr "Vennar totalt"
+
+#: ../pidgin/gtkblist.c:3696
 #, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr "UVerksam %dd  %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3455
+#: ../pidgin/gtkblist.c:3698
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "UVerksam %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3457
+#: ../pidgin/gtkblist.c:3700
 #, c-format
 msgid "Idle %dm"
 msgstr "Uverksam %dm"
 
-#: ../pidgin/gtkblist.c:3602
+#: ../pidgin/gtkblist.c:3854
 msgid "/Buddies/New Instant Message..."
-msgstr "/Vennar/_Ny lynmelding…"
+msgstr "/Vennar/Ny lynmelding…"
 
-#: ../pidgin/gtkblist.c:3603 ../pidgin/gtkblist.c:3636
+#: ../pidgin/gtkblist.c:3855
+#: ../pidgin/gtkblist.c:3888
 msgid "/Buddies/Join a Chat..."
-msgstr "/Vennar/Gå inn i eit prater_om…"
+msgstr "/Vennar/Bli med  i eit praterom…"
 
-#: ../pidgin/gtkblist.c:3604
+#: ../pidgin/gtkblist.c:3856
 msgid "/Buddies/Get User Info..."
-msgstr "/Vennar/Hent brukar_informasjon…"
+msgstr "/Vennar/Hent brukarinformasjon…"
 
-#: ../pidgin/gtkblist.c:3605
+#: ../pidgin/gtkblist.c:3857
 msgid "/Buddies/Add Buddy..."
 msgstr "/Vennar/Legg til venn…"
 
-#: ../pidgin/gtkblist.c:3606 ../pidgin/gtkblist.c:3639
+#: ../pidgin/gtkblist.c:3858
+#: ../pidgin/gtkblist.c:3891
 msgid "/Buddies/Add Chat..."
-msgstr "/Vennar/Legg til _praterom…"
+msgstr "/Vennar/Legg til praterom…"
 
-#: ../pidgin/gtkblist.c:3607
+#: ../pidgin/gtkblist.c:3859
 msgid "/Buddies/Add Group..."
 msgstr "/Vennar/Legg til gruppe…"
 
-#: ../pidgin/gtkblist.c:3642
+#: ../pidgin/gtkblist.c:3894
 msgid "/Tools/Privacy"
 msgstr "/Verktøy/Personvern"
 
-#: ../pidgin/gtkblist.c:3645
+#: ../pidgin/gtkblist.c:3897
 msgid "/Tools/Room List"
 msgstr "/Verktøy/Romliste"
 
 #
-#: ../pidgin/gtkblist.c:3742 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:4029
+#: ../pidgin/gtkdocklet.c:155
+#: ../pidgin/gtkdocklet.c:160
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "%d unread message from %s\n"
 msgstr[1] "%d ulesne meldingar frå %s\n"
 
-#: ../pidgin/gtkblist.c:3822
+#: ../pidgin/gtkblist.c:4192
 msgid "Manually"
 msgstr "Manuelt"
 
-#: ../pidgin/gtkblist.c:3824
-msgid "Alphabetically"
-msgstr "Alfabetisk "
-
-#: ../pidgin/gtkblist.c:3825
+#: ../pidgin/gtkblist.c:4195
 msgid "By status"
 msgstr "Etter status"
 
-#: ../pidgin/gtkblist.c:3826
+#: ../pidgin/gtkblist.c:4196
 msgid "By log size"
 msgstr "Etter loggstorleiken"
 
-#: ../pidgin/gtkblist.c:4031 ../pidgin/gtkconn.c:179
+#: ../pidgin/gtkblist.c:4533
 #, c-format
 msgid "%s disconnected"
 msgstr "%s fråkopla"
 
-#: ../pidgin/gtkblist.c:4067
+#: ../pidgin/gtkblist.c:4535
 #, c-format
-msgid "<span color=\"red\">%s disconnected: %s</span>"
-msgstr "<span color=\"red\">%s fråkopla: %s</span>"
+msgid "%s disabled"
+msgstr "%s er slått av"
 
-#: ../pidgin/gtkblist.c:4219
+#: ../pidgin/gtkblist.c:4539
+msgid "Reconnect"
+msgstr "Kopla til att"
+
+#: ../pidgin/gtkblist.c:4539
+#: ../pidgin/gtkblist.c:4658
+msgid "Re-enable"
+msgstr "Slå på  att "
+
+#: ../pidgin/gtkblist.c:4656
+msgid "Welcome back!"
+msgstr "Velkomen tilbake!"
+
+#: ../pidgin/gtkblist.c:4692
+#, c-format
+msgid "%d account was disabled because you signed on from another location:"
+msgid_plural "%d accounts were disabled because you signed on from another location:"
+msgstr[0] "%d konto blei slått av sia du logga på frå ein annan stad:"
+msgstr[1] "%d kontoar blei slått av sia du logga på frå ein annan stad:"
+
+#: ../pidgin/gtkblist.c:4971
 msgid "<b>Username:</b>"
 msgstr "<b>Brukarnamn:</b>"
 
-#: ../pidgin/gtkblist.c:4226
+#: ../pidgin/gtkblist.c:4978
 msgid "<b>Password:</b>"
 msgstr "<b>Passord:</b>"
 
-#: ../pidgin/gtkblist.c:4237
+#: ../pidgin/gtkblist.c:4989
 msgid "_Login"
 msgstr "_Innlogging"
 
-#: ../pidgin/gtkblist.c:4320
+#: ../pidgin/gtkblist.c:5073
 msgid "/Accounts"
 msgstr "/Kontoar"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4334
-#, fuzzy, c-format
+#: ../pidgin/gtkblist.c:5087
+#, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
 "\n"
-"You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
-"b> window at <b>Accounts->Add/Edit</b>. Once you enable accounts, you'll be "
-"able to sign on, set your status, and talk to your friends."
+"You have no accounts enabled. Enable your IM accounts from the <b>Accounts</b> window at <b>Accounts->Manage</b>. Once you enable accounts, you'll be able to sign on, set your status, and talk to your friends."
 msgstr ""
 "<span weight='bold' size='larger'>Velkomen til %s!</span>\n"
 "\n"
-"Ingen av kontoane dine er i bruk. Ta lynmeldingskontoane dine i bruk frå "
-"<b>Konto</b>-vindauget: <b>Kontoar->Legg til/endra</b>. NÃ¥r kontoane er "
-"tekne i bruk, vil du vera i stand til å logga på, endra tilstand og tala med "
-"vennane dine."
+"Ingen av kontoane dine er i bruk. Ta lynmeldingskontoane dine i bruk frå <b>konto</b>-vindauget: <b>Kontoar->Legg til/endra</b>. Når kontoane er tekne i bruk, vil du vera i stand til å logga på, velja tilstand, og tala med vennane dine."
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4597
+#: ../pidgin/gtkblist.c:5358
 msgid "/Buddies/Show/Offline Buddies"
 msgstr "/Vennar/Vis/Fråkopla vennar"
 
-#: ../pidgin/gtkblist.c:4600
+#: ../pidgin/gtkblist.c:5361
 msgid "/Buddies/Show/Empty Groups"
 msgstr "/Vennar/Vis/Tomme grupper"
 
-#: ../pidgin/gtkblist.c:4606
+#: ../pidgin/gtkblist.c:5367
 msgid "/Buddies/Show/Buddy Details"
 msgstr "/Vennar/Vis/Vennedetaljar"
 
-#: ../pidgin/gtkblist.c:4609
+#: ../pidgin/gtkblist.c:5370
 msgid "/Buddies/Show/Idle Times"
 msgstr "/Vennar/Vis/Uverksam tid"
 
-#: ../pidgin/gtkblist.c:4612
+#: ../pidgin/gtkblist.c:5373
 msgid "/Buddies/Show/Protocol Icons"
 msgstr "/Vennar/Vis/Protokollikon"
 
-#: ../pidgin/gtkblist.c:5507
-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. "
-"The alias will be displayed in place of the screen name whenever possible.\n"
-msgstr ""
-"Skriv inn brukarnamnet til personen du ønskjer å leggja til i vennelista. Om "
-"du ønskjer det, kan du skriva inn eit alias eller eit kallenamn på vennen. "
-"Kallenamnet/aliaset blir då nytta i staden for brukarnamnet der det er "
-"mogleg.\n"
+#: ../pidgin/gtkblist.c:6324
+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. The alias will be displayed in place of the screen name whenever possible.\n"
+msgstr "Skriv inn brukarnamnet til personen du ønskjer å leggja til i vennelista. Om du ønskjer det, kan du skriva inn eit alias eller eit kallenamn på vennen. Kallenamnet/aliaset blir då nytta i staden for brukarnamnet der det er mogleg.\n"
 
+#. Set up stuff for the account box
+#: ../pidgin/gtkblist.c:6347
+msgid "A_ccount:"
+msgstr "_Konto:"
+
 #. End of account box
-#: ../pidgin/gtkblist.c:5542
+#: ../pidgin/gtkblist.c:6359
 msgid "_Screen name:"
 msgstr "Brukar_namn:"
 
-#: ../pidgin/gtkblist.c:5564 ../pidgin/gtkblist.c:5914
+#: ../pidgin/gtkblist.c:6381
+#: ../pidgin/gtkblist.c:6731
 msgid "A_lias:"
 msgstr "Al_ias:"
 
-#: ../pidgin/gtkblist.c:5826
+#: ../pidgin/gtkblist.c:6648
 msgid "This protocol does not support chat rooms."
 msgstr "Protokollen støttar ikkje praterom."
 
-#: ../pidgin/gtkblist.c:5842
-msgid ""
-"You are not currently signed on with any protocols that have the ability to "
-"chat."
+#: ../pidgin/gtkblist.c:6664
+msgid "You are not currently signed on with any protocols that have the ability to chat."
 msgstr "Ingen av dei aktive kontoane kan nyttast til prat."
 
-#: ../pidgin/gtkblist.c:5883
-msgid ""
-"Please enter an alias, and the appropriate information about the chat you "
-"would like to add to your buddy list.\n"
-msgstr ""
-"Skriv inn eit kallenamn og høveleg informasjon om praterommet du ønskjer å "
-"leggja til i vennelista.\n"
+#: ../pidgin/gtkblist.c:6708
+msgid "Please enter an alias, and the appropriate information about the chat you would like to add to your buddy list.\n"
+msgstr "Skriv inn eit kallenamn og høveleg informasjon om praterommet du ønskjer å leggja til i vennelista.\n"
 
-#: ../pidgin/gtkblist.c:5964
+#: ../pidgin/gtkblist.c:6738
+msgid "Auto_join when account becomes online."
+msgstr "Bli automatisk _med når kontoen koplar seg til att."
+
+#: ../pidgin/gtkblist.c:6739
+msgid "_Hide chat when the window is closed."
+msgstr "L_ukk praten når vindauget blir lukka."
+
+#: ../pidgin/gtkblist.c:6765
 msgid "Please enter the name of the group to be added."
 msgstr "Skriv inn namnet på gruppa du ønskjer å leggja til."
 
-#: ../pidgin/gtkblist.c:6609
+#: ../pidgin/gtkblist.c:7423
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Kontoar/"
 
-#: ../pidgin/gtkblist.c:6633
+#: ../pidgin/gtkblist.c:7447
 msgid "_Edit Account"
 msgstr "_Endra konto"
 
-#: ../pidgin/gtkblist.c:6646 ../pidgin/gtkconv.c:3073
+#: ../pidgin/gtkblist.c:7460
+#: ../pidgin/gtkconv.c:3137
 msgid "No actions available"
 msgstr "Ingen tilgjengelege handlingar"
 
-#: ../pidgin/gtkblist.c:6654
+#: ../pidgin/gtkblist.c:7468
 msgid "_Disable"
 msgstr "_Slå av"
 
-#: ../pidgin/gtkblist.c:6666
+#: ../pidgin/gtkblist.c:7480
 msgid "Enable Account"
 msgstr "Ta konto i bruk"
 
-#: ../pidgin/gtkblist.c:6672
+#: ../pidgin/gtkblist.c:7486
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/Kontoar/Ta i bruk konto"
 
-#: ../pidgin/gtkblist.c:6721
+#: ../pidgin/gtkblist.c:7535
 msgid "/Tools"
 msgstr "/V_erktøy"
 
-#: ../pidgin/gtkblist.c:6791
+#: ../pidgin/gtkblist.c:7605
 msgid "/Buddies/Sort Buddies"
 msgstr "/Vennar/Sorter vennar"
 
 #. Widget creation function
-#: ../pidgin/gtkcertmgr.c:530
-#, fuzzy
+#: ../pidgin/gtkcertmgr.c:541
 msgid "SSL Servers"
-msgstr "Tenar"
+msgstr "SSL-tenarar"
 
-#: ../pidgin/gtkconn.c:180
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"%s will not attempt to reconnect the account until you correct the error and "
-"re-enable the account."
-msgstr ""
-"%s\n"
-"\n"
-"%s vil ikkje prøva å kopla kontoen til att før du rettar feilen og slår på "
-"kontoen."
-
-#: ../pidgin/gtkconv.c:482
+#: ../pidgin/gtkconv.c:485
 msgid "Unknown command."
 msgstr "Ukjend kommando."
 
-#: ../pidgin/gtkconv.c:754 ../pidgin/gtkconv.c:780
+#: ../pidgin/gtkconv.c:755
+#: ../pidgin/gtkconv.c:781
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "Den vennen nyttar ikkje same protokoll som dette praterommet."
 
-#: ../pidgin/gtkconv.c:774
-msgid ""
-"You are not currently signed on with an account that can invite that buddy."
-msgstr ""
-"Du kan ikkje nytta nokon av dei aktive kontoane til å invitera denne vennen."
+#: ../pidgin/gtkconv.c:775
+msgid "You are not currently signed on with an account that can invite that buddy."
+msgstr "Du kan ikkje nytta nokon av dei aktive kontoane til å invitera denne vennen."
 
-#: ../pidgin/gtkconv.c:827
+#: ../pidgin/gtkconv.c:828
 msgid "Invite Buddy Into Chat Room"
 msgstr "Inviter venn til praterommet"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:857
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"Skriv inn namnet på brukaren du ønskjer å invitera. Du kan ta med ei valfri "
-"velkomstmelding."
+#: ../pidgin/gtkconv.c:858
+msgid "Please enter the name of the user you wish to invite, along with an optional invite message."
+msgstr "Skriv inn namnet på brukaren du ønskjer å invitera. Du kan ta med ei valfri velkomstmelding."
 
-#: ../pidgin/gtkconv.c:878
+#: ../pidgin/gtkconv.c:879
 msgid "_Buddy:"
 msgstr "_Venn:"
 
-#: ../pidgin/gtkconv.c:889 ../pidgin/gtksavedstatuses.c:1194
-#: ../pidgin/gtksavedstatuses.c:1528
+#: ../pidgin/gtkconv.c:890
+#: ../pidgin/gtksavedstatuses.c:1166
+#: ../pidgin/gtksavedstatuses.c:1484
 msgid "_Message:"
 msgstr "_Melding:"
 
-#: ../pidgin/gtkconv.c:947 ../pidgin/gtkconv.c:2598 ../pidgin/gtkdebug.c:219
-#: ../pidgin/gtkft.c:543
-msgid "Unable to open file."
-msgstr "Klarte ikkje å opna fila."
-
-#: ../pidgin/gtkconv.c:953
+#: ../pidgin/gtkconv.c:954
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Samtale med %s</h1>\n"
 
-#: ../pidgin/gtkconv.c:991
+#: ../pidgin/gtkconv.c:992
 msgid "Save Conversation"
 msgstr "Lagra samtale"
 
-#: ../pidgin/gtkconv.c:1140 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:743
+#: ../pidgin/gtkconv.c:1138
+#: ../pidgin/gtkdebug.c:167
+#: ../pidgin/gtkdebug.c:740
 msgid "Find"
 msgstr "Finn"
 
-#: ../pidgin/gtkconv.c:1166 ../pidgin/gtkdebug.c:195
+#: ../pidgin/gtkconv.c:1164
+#: ../pidgin/gtkdebug.c:195
 msgid "_Search for:"
 msgstr "S_øk etter:"
 
-#: ../pidgin/gtkconv.c:1622
+#: ../pidgin/gtkconv.c:1665
 msgid "Un-Ignore"
 msgstr "Avblokker"
 
-#: ../pidgin/gtkconv.c:1625
+#: ../pidgin/gtkconv.c:1668
 msgid "Ignore"
 msgstr "Blokker"
 
-#: ../pidgin/gtkconv.c:1645
+#: ../pidgin/gtkconv.c:1688
 msgid "Get Away Message"
 msgstr "Hent fråværsmelding"
 
-#: ../pidgin/gtkconv.c:1668
+#: ../pidgin/gtkconv.c:1711
 msgid "Last said"
 msgstr "Sist sagt"
 
-#: ../pidgin/gtkconv.c:2606
+#: ../pidgin/gtkconv.c:2664
 msgid "Unable to save icon file to disk."
 msgstr "Klarte ikkje å lagra ikonet."
 
-#: ../pidgin/gtkconv.c:2657
+#: ../pidgin/gtkconv.c:2715
 msgid "Save Icon"
 msgstr "Lagra ikon"
 
-#: ../pidgin/gtkconv.c:2709
+#: ../pidgin/gtkconv.c:2767
 msgid "Animate"
 msgstr "Animer"
 
-#: ../pidgin/gtkconv.c:2714
+#: ../pidgin/gtkconv.c:2772
 msgid "Hide Icon"
 msgstr "Skjul ikon"
 
-#: ../pidgin/gtkconv.c:2717
+#: ../pidgin/gtkconv.c:2775
 msgid "Save Icon As..."
 msgstr "Lagra ikon som…"
 
-#: ../pidgin/gtkconv.c:2721
+#: ../pidgin/gtkconv.c:2779
 msgid "Set Custom Icon..."
 msgstr "Bruk eige ikon…"
 
-#: ../pidgin/gtkconv.c:2734
+#: ../pidgin/gtkconv.c:2792
 msgid "Remove Custom Icon"
 msgstr "Fjern eige ikon"
 
-#: ../pidgin/gtkconv.c:2861
+#: ../pidgin/gtkconv.c:2922
 msgid "Show All"
 msgstr "Vis alt"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2880
+#: ../pidgin/gtkconv.c:2941
 msgid "/_Conversation"
 msgstr "/_Samtale"
 
-#: ../pidgin/gtkconv.c:2882
+#: ../pidgin/gtkconv.c:2943
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Samtale/_Ny lynmelding…"
 
-#: ../pidgin/gtkconv.c:2887
+#: ../pidgin/gtkconv.c:2948
 msgid "/Conversation/_Find..."
 msgstr "/Samtale/_Finn…"
 
-#: ../pidgin/gtkconv.c:2889
+#: ../pidgin/gtkconv.c:2950
 msgid "/Conversation/View _Log"
 msgstr "/Samtale/Vis l_ogg"
 
-#: ../pidgin/gtkconv.c:2890
+#: ../pidgin/gtkconv.c:2951
 msgid "/Conversation/_Save As..."
 msgstr "/Samtale/Lagra _som…"
 
-#: ../pidgin/gtkconv.c:2892
+#: ../pidgin/gtkconv.c:2953
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Samtale/T_øm skjermen"
 
-#: ../pidgin/gtkconv.c:2896
+#: ../pidgin/gtkconv.c:2957
 msgid "/Conversation/Se_nd File..."
 msgstr "/Samtale/S_end fil…"
 
-#: ../pidgin/gtkconv.c:2897
+#: ../pidgin/gtkconv.c:2958
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Samtale/Legg til _vennevarsling…"
 
-#: ../pidgin/gtkconv.c:2899
+#: ../pidgin/gtkconv.c:2960
 msgid "/Conversation/_Get Info"
 msgstr "/Samtale/Hent info_rmasjon"
 
-#: ../pidgin/gtkconv.c:2901
+#: ../pidgin/gtkconv.c:2962
 msgid "/Conversation/In_vite..."
 msgstr "/Samtale/_Inviter…"
 
-#: ../pidgin/gtkconv.c:2903
+#: ../pidgin/gtkconv.c:2964
 msgid "/Conversation/M_ore"
 msgstr "/Samtale/_Meir"
 
-#: ../pidgin/gtkconv.c:2907
+#: ../pidgin/gtkconv.c:2968
 msgid "/Conversation/Al_ias..."
 msgstr "/Samtale/_Kallenamn…"
 
-#: ../pidgin/gtkconv.c:2909
+#: ../pidgin/gtkconv.c:2970
 msgid "/Conversation/_Block..."
 msgstr "/Samtale/_Blokker…"
 
-#: ../pidgin/gtkconv.c:2911
+#: ../pidgin/gtkconv.c:2972
 msgid "/Conversation/_Unblock..."
 msgstr "/Samtale/_Avblokker…"
 
-#: ../pidgin/gtkconv.c:2913
+#: ../pidgin/gtkconv.c:2974
 msgid "/Conversation/_Add..."
 msgstr "/Samtale/Legg _til…"
 
-#: ../pidgin/gtkconv.c:2915
+#: ../pidgin/gtkconv.c:2976
 msgid "/Conversation/_Remove..."
 msgstr "/Samtale/F_jern…"
 
-#: ../pidgin/gtkconv.c:2920
+#: ../pidgin/gtkconv.c:2981
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Samtale/Set inn _lenkje…"
 
-#: ../pidgin/gtkconv.c:2922
+#: ../pidgin/gtkconv.c:2983
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Samtale/Set inn _bilete…"
 
-#: ../pidgin/gtkconv.c:2928
+#: ../pidgin/gtkconv.c:2989
 msgid "/Conversation/_Close"
 msgstr "/Samtale/L_ukk"
 
 #. Options
-#: ../pidgin/gtkconv.c:2932
+#: ../pidgin/gtkconv.c:2993
 msgid "/_Options"
 msgstr "/_Val"
 
-#: ../pidgin/gtkconv.c:2933
+#: ../pidgin/gtkconv.c:2994
 msgid "/Options/Enable _Logging"
 msgstr "/Val/Bruk l_ogging"
 
-#: ../pidgin/gtkconv.c:2934
+#: ../pidgin/gtkconv.c:2995
 msgid "/Options/Enable _Sounds"
 msgstr "/Val/Bruk _lydar"
 
-#: ../pidgin/gtkconv.c:2936
+#: ../pidgin/gtkconv.c:2997
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Val/Vis _formateringsverktøya"
 
-#: ../pidgin/gtkconv.c:2937
+#: ../pidgin/gtkconv.c:2998
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Val/Vis _tidsstempel"
 
-#: ../pidgin/gtkconv.c:3061
+#: ../pidgin/gtkconv.c:3125
 msgid "/Conversation/More"
 msgstr "/Samtale/Meir"
 
-#: ../pidgin/gtkconv.c:3117
+#: ../pidgin/gtkconv.c:3181
 msgid "/Options"
 msgstr "/Val"
 
@@ -14333,172 +14725,183 @@ msgstr "/Val"
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:3152 ../pidgin/gtkconv.c:3184
+#: ../pidgin/gtkconv.c:3216
+#: ../pidgin/gtkconv.c:3248
 msgid "/Conversation"
 msgstr "/Samtale"
 
-#: ../pidgin/gtkconv.c:3192
+#: ../pidgin/gtkconv.c:3256
 msgid "/Conversation/View Log"
 msgstr "/Samtale/Vis logg"
 
-#: ../pidgin/gtkconv.c:3198
+#: ../pidgin/gtkconv.c:3262
 msgid "/Conversation/Send File..."
 msgstr "/Samtale/Send fil…"
 
-#: ../pidgin/gtkconv.c:3202
+#: ../pidgin/gtkconv.c:3266
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Samtale/Legg til vennevarsling…"
 
-#: ../pidgin/gtkconv.c:3208
+#: ../pidgin/gtkconv.c:3272
 msgid "/Conversation/Get Info"
 msgstr "/Samtale/Hent info"
 
-#: ../pidgin/gtkconv.c:3212
+#: ../pidgin/gtkconv.c:3276
 msgid "/Conversation/Invite..."
 msgstr "/Samtale/Inviter…"
 
-#: ../pidgin/gtkconv.c:3218
+#: ../pidgin/gtkconv.c:3282
 msgid "/Conversation/Alias..."
 msgstr "/Samtale/Kallenamn…"
 
-#: ../pidgin/gtkconv.c:3222
+#: ../pidgin/gtkconv.c:3286
 msgid "/Conversation/Block..."
 msgstr "/Samtale/Blokker…"
 
-#: ../pidgin/gtkconv.c:3226
+#: ../pidgin/gtkconv.c:3290
 msgid "/Conversation/Unblock..."
 msgstr "/Samtale/Avblokker…"
 
-#: ../pidgin/gtkconv.c:3230
+#: ../pidgin/gtkconv.c:3294
 msgid "/Conversation/Add..."
 msgstr "/Samtale/Legg til…"
 
-#: ../pidgin/gtkconv.c:3234
+#: ../pidgin/gtkconv.c:3298
 msgid "/Conversation/Remove..."
 msgstr "/Samtale/Fjern…"
 
-#: ../pidgin/gtkconv.c:3240
+#: ../pidgin/gtkconv.c:3304
 msgid "/Conversation/Insert Link..."
 msgstr "/Samtale/Set inn lenkje…"
 
-#: ../pidgin/gtkconv.c:3244
+#: ../pidgin/gtkconv.c:3308
 msgid "/Conversation/Insert Image..."
 msgstr "/Samtale/Set inn _bilete…"
 
-#: ../pidgin/gtkconv.c:3250
+#: ../pidgin/gtkconv.c:3314
 msgid "/Options/Enable Logging"
 msgstr "/Val/Skru på logging"
 
-#: ../pidgin/gtkconv.c:3253
+#: ../pidgin/gtkconv.c:3317
 msgid "/Options/Enable Sounds"
 msgstr "/Vis/Skru på lyd"
 
-#: ../pidgin/gtkconv.c:3266
+#: ../pidgin/gtkconv.c:3330
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Val/Vis formateringsverktøya"
 
-#: ../pidgin/gtkconv.c:3269
+#: ../pidgin/gtkconv.c:3333
 msgid "/Options/Show Timestamps"
 msgstr "/Val/Vis tidsstempel"
 
-#: ../pidgin/gtkconv.c:3346 ../pidgin/gtkconv.c:3388
+#: ../pidgin/gtkconv.c:3411
 msgid "User is typing..."
 msgstr "Brukaren skriv…"
 
-#: ../pidgin/gtkconv.c:3391
-msgid "User has typed something and stopped"
-msgstr "Brukaren har skrive noko og stoppa"
+#: ../pidgin/gtkconv.c:3481
+#, c-format
+msgid ""
+"\n"
+"%s has stopped typing"
+msgstr ""
+"\n"
+"%s har stoppa å skriva"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3574 ../pidgin/gtkconv.c:8022
-msgid "_Send To"
-msgstr "Sen_d som"
+#: ../pidgin/gtkconv.c:3647
+#: ../pidgin/gtkconv.c:8318
+msgid "S_end To"
+msgstr "S_end til"
 
-#: ../pidgin/gtkconv.c:4286
+#: ../pidgin/gtkconv.c:4359
 msgid "_Send"
 msgstr "_Send"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4390
+#: ../pidgin/gtkconv.c:4497
 msgid "0 people in room"
 msgstr "0 personar i rommet"
 
-#: ../pidgin/gtkconv.c:5759 ../pidgin/gtkconv.c:5880
+#: ../pidgin/gtkconv.c:5796
+#: ../pidgin/gtkconv.c:5917
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d person i rommet"
 msgstr[1] "%d personar i rommet"
 
-#: ../pidgin/gtkconv.c:6486 ../pidgin/gtkstatusbox.c:660
+#: ../pidgin/gtkconv.c:6544
+#: ../pidgin/gtkstatusbox.c:679
 msgid "Typing"
 msgstr "Skriv"
 
-#: ../pidgin/gtkconv.c:6490
+#: ../pidgin/gtkconv.c:6548
 msgid "Stopped Typing"
 msgstr "Stoppa å skriva"
 
-#: ../pidgin/gtkconv.c:6493
+#: ../pidgin/gtkconv.c:6551
 msgid "Nick Said"
 msgstr "Kallenamnet sa"
 
-#: ../pidgin/gtkconv.c:6496 ../pidgin/gtkdocklet.c:492
+#: ../pidgin/gtkconv.c:6554
+#: ../pidgin/gtkdocklet.c:686
 msgid "Unread Messages"
 msgstr "Ulesne meldingar"
 
-#: ../pidgin/gtkconv.c:6499
+#: ../pidgin/gtkconv.c:6560
 msgid "New Event"
 msgstr "Ny hending"
 
-#: ../pidgin/gtkconv.c:7572
+#: ../pidgin/gtkconv.c:7790
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "clear: Tømmer skjermen."
 
-#: ../pidgin/gtkconv.c:7736
+#: ../pidgin/gtkconv.c:7994
 msgid "Confirm close"
 msgstr "Stadfest lukking"
 
-#: ../pidgin/gtkconv.c:7768
+#: ../pidgin/gtkconv.c:8026
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "Du har ulesne meldingar. Vil du verkeleg lukka vindauget?"
 
-#: ../pidgin/gtkconv.c:8355
+#: ../pidgin/gtkconv.c:8659
 msgid "Close other tabs"
 msgstr "Lukk andre faner"
 
-#: ../pidgin/gtkconv.c:8361
+#: ../pidgin/gtkconv.c:8665
 msgid "Close all tabs"
 msgstr "Lukk alle fanene"
 
-#: ../pidgin/gtkconv.c:8369
+#: ../pidgin/gtkconv.c:8673
 msgid "Detach this tab"
 msgstr "Kopla frå denne fana"
 
-#: ../pidgin/gtkconv.c:8375
+#: ../pidgin/gtkconv.c:8679
 msgid "Close this tab"
 msgstr "Lukk denne fana"
 
-#: ../pidgin/gtkconv.c:8875
+#: ../pidgin/gtkconv.c:9193
 msgid "Close conversation"
 msgstr "Lukk samtala"
 
-#: ../pidgin/gtkconv.c:9477
+#: ../pidgin/gtkconv.c:9797
 msgid "Last created window"
 msgstr "Siste opna vindauge"
 
-#: ../pidgin/gtkconv.c:9479
+#: ../pidgin/gtkconv.c:9799
 msgid "Separate IM and Chat windows"
 msgstr "Skilde lynmeldings- og samtalevindauge"
 
-#: ../pidgin/gtkconv.c:9481 ../pidgin/gtkprefs.c:1415
+#: ../pidgin/gtkconv.c:9801
+#: ../pidgin/gtkprefs.c:1466
 msgid "New window"
 msgstr "Nytt vindauge"
 
-#: ../pidgin/gtkconv.c:9483
+#: ../pidgin/gtkconv.c:9803
 msgid "By group"
 msgstr "Etter gruppe"
 
-#: ../pidgin/gtkconv.c:9485
+#: ../pidgin/gtkconv.c:9805
 msgid "By account"
 msgstr "Etter konto"
 
@@ -14526,617 +14929,648 @@ msgstr "_BÃ¥de ikon og tekst"
 msgid "_Both Icon & Text"
 msgstr "_BÃ¥de ikon og tekst"
 
-#: ../pidgin/gtkdebug.c:775
+#: ../pidgin/gtkdebug.c:772
 msgid "Filter"
 msgstr "Filter"
 
-#: ../pidgin/gtkdebug.c:794
+#: ../pidgin/gtkdebug.c:791
 msgid "Right click for more options."
 msgstr "Høgreklikk viser fleire val."
 
-#: ../pidgin/gtkdebug.c:824
+#: ../pidgin/gtkdebug.c:821
 msgid "Level "
 msgstr "Nivå"
 
-#: ../pidgin/gtkdebug.c:825 ../pidgin/gtkdebug.c:831
+#: ../pidgin/gtkdebug.c:822
+#: ../pidgin/gtkdebug.c:828
 msgid "Select the debug filter level."
 msgstr "Vel filternivå for feilretting."
 
-#: ../pidgin/gtkdebug.c:833
+#: ../pidgin/gtkdebug.c:830
 msgid "All"
 msgstr "Alt"
 
-#: ../pidgin/gtkdebug.c:834
+#: ../pidgin/gtkdebug.c:831
 msgid "Misc"
 msgstr "Anna"
 
-#: ../pidgin/gtkdebug.c:836
+#: ../pidgin/gtkdebug.c:833
 msgid "Warning"
 msgstr "Ã…tvaring"
 
-#: ../pidgin/gtkdebug.c:837
+#: ../pidgin/gtkdebug.c:834
 msgid "Error "
 msgstr "Feil"
 
-#: ../pidgin/gtkdebug.c:838
+#: ../pidgin/gtkdebug.c:835
 msgid "Fatal Error"
 msgstr "Alvorleg feil"
 
-#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:117
+#: ../pidgin/gtkdialogs.c:72
+#: ../pidgin/gtkdialogs.c:118
 msgid "lead developer"
 msgstr "sjefsutviklar"
 
-#: ../pidgin/gtkdialogs.c:73 ../pidgin/gtkdialogs.c:74
-#: ../pidgin/gtkdialogs.c:75 ../pidgin/gtkdialogs.c:76
-#: ../pidgin/gtkdialogs.c:77 ../pidgin/gtkdialogs.c:78
-#: ../pidgin/gtkdialogs.c:79 ../pidgin/gtkdialogs.c:80
-#: ../pidgin/gtkdialogs.c:81 ../pidgin/gtkdialogs.c:82
-#: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:84
-#: ../pidgin/gtkdialogs.c:85 ../pidgin/gtkdialogs.c:86
-#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:91
+#: ../pidgin/gtkdialogs.c:73
+#: ../pidgin/gtkdialogs.c:74
+#: ../pidgin/gtkdialogs.c:75
+#: ../pidgin/gtkdialogs.c:76
+#: ../pidgin/gtkdialogs.c:77
+#: ../pidgin/gtkdialogs.c:78
+#: ../pidgin/gtkdialogs.c:79
+#: ../pidgin/gtkdialogs.c:80
+#: ../pidgin/gtkdialogs.c:81
+#: ../pidgin/gtkdialogs.c:82
+#: ../pidgin/gtkdialogs.c:83
+#: ../pidgin/gtkdialogs.c:84
+#: ../pidgin/gtkdialogs.c:85
+#: ../pidgin/gtkdialogs.c:86
+#: ../pidgin/gtkdialogs.c:87
+#: ../pidgin/gtkdialogs.c:90
 #: ../pidgin/gtkdialogs.c:92
+#: ../pidgin/gtkdialogs.c:93
+#: ../pidgin/gtkdialogs.c:94
 msgid "developer"
 msgstr "utviklar"
 
-#: ../pidgin/gtkdialogs.c:87
+#: ../pidgin/gtkdialogs.c:88
 msgid "support"
 msgstr "brukarstøtte"
 
-#: ../pidgin/gtkdialogs.c:88
+#: ../pidgin/gtkdialogs.c:89
 msgid "support/QA"
 msgstr "brukarstøtte/KS"
 
-#: ../pidgin/gtkdialogs.c:90 ../pidgin/gtkdialogs.c:112
+#: ../pidgin/gtkdialogs.c:91
+#: ../pidgin/gtkdialogs.c:113
 msgid "developer & webmaster"
 msgstr "utviklar og nettansvarleg"
 
-#: ../pidgin/gtkdialogs.c:99
+#: ../pidgin/gtkdialogs.c:100
 msgid "Senior Contributor/QA"
 msgstr "Senior bidragsytar/KS"
 
-#: ../pidgin/gtkdialogs.c:108
+#: ../pidgin/gtkdialogs.c:109
 msgid "win32 port"
 msgstr "win32-port"
 
-#: ../pidgin/gtkdialogs.c:109 ../pidgin/gtkdialogs.c:110
+#: ../pidgin/gtkdialogs.c:110
+#: ../pidgin/gtkdialogs.c:111
 msgid "maintainer"
 msgstr "ansvarleg"
 
-#: ../pidgin/gtkdialogs.c:111
+#: ../pidgin/gtkdialogs.c:112
 msgid "libfaim maintainer"
 msgstr "libfaim-ansvarleg"
 
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../pidgin/gtkdialogs.c:114
+#: ../pidgin/gtkdialogs.c:115
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hackar og fast sjåfør [sofatryne]"
 
-#: ../pidgin/gtkdialogs.c:115
+#: ../pidgin/gtkdialogs.c:116
 msgid "XMPP developer"
 msgstr "XMPP-utviklar"
 
-#: ../pidgin/gtkdialogs.c:116
+#: ../pidgin/gtkdialogs.c:117
 msgid "original author"
 msgstr "opprinneleg laga av"
 
-#: ../pidgin/gtkdialogs.c:133
+#: ../pidgin/gtkdialogs.c:134
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
-#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:135
+#: ../pidgin/gtkdialogs.c:229
 msgid "Arabic"
 msgstr "Arabisk"
 
-#: ../pidgin/gtkdialogs.c:135
+#: ../pidgin/gtkdialogs.c:136
 msgid "Belarusian Latin"
-msgstr ""
+msgstr "Kviterussisk latinsk"
 
-#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
-#: ../pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:137
+#: ../pidgin/gtkdialogs.c:138
+#: ../pidgin/gtkdialogs.c:230
 msgid "Bulgarian"
 msgstr "Bulgarsk"
 
-#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
-#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:141
+#: ../pidgin/gtkdialogs.c:139
+#: ../pidgin/gtkdialogs.c:140
+#: ../pidgin/gtkdialogs.c:141
+#: ../pidgin/gtkdialogs.c:142
 msgid "Bengali"
 msgstr "Bengali"
 
-#: ../pidgin/gtkdialogs.c:142
+#: ../pidgin/gtkdialogs.c:143
 msgid "Bosnian"
 msgstr "Bosnisk"
 
-#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:228
-#: ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:144
+#: ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:232
 msgid "Catalan"
 msgstr "Katalansk"
 
 # Valensiansk er *ikkje* katalansk, men eit eige språk i den katalanske språkfamilen. Molt important!
-#: ../pidgin/gtkdialogs.c:144 ../pidgin/gtkdialogs.c:145
+#: ../pidgin/gtkdialogs.c:145
+#: ../pidgin/gtkdialogs.c:146
 msgid "Valencian-Catalan"
 msgstr "Valensiansk"
 
-#: ../pidgin/gtkdialogs.c:146 ../pidgin/gtkdialogs.c:230
+#: ../pidgin/gtkdialogs.c:147
+#: ../pidgin/gtkdialogs.c:233
 msgid "Czech"
 msgstr "Tsjekkisk"
 
-#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:148
+#: ../pidgin/gtkdialogs.c:148
+#: ../pidgin/gtkdialogs.c:149
 msgid "Danish"
 msgstr "Dansk"
 
-#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:150
-#: ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:150
+#: ../pidgin/gtkdialogs.c:151
+#: ../pidgin/gtkdialogs.c:234
 msgid "German"
 msgstr "Tysk"
 
-#: ../pidgin/gtkdialogs.c:151 ../pidgin/gtkdialogs.c:152
+#: ../pidgin/gtkdialogs.c:152
 #: ../pidgin/gtkdialogs.c:153
+#: ../pidgin/gtkdialogs.c:154
 msgid "Dzongkha"
 msgstr "Dzongkha"
 
-#: ../pidgin/gtkdialogs.c:154 ../pidgin/gtkdialogs.c:155
+#: ../pidgin/gtkdialogs.c:155
+#: ../pidgin/gtkdialogs.c:156
 msgid "Greek"
 msgstr "Gresk"
 
-#: ../pidgin/gtkdialogs.c:156
+#: ../pidgin/gtkdialogs.c:157
 msgid "Australian English"
 msgstr "Australsk-engelsk"
 
-#: ../pidgin/gtkdialogs.c:157
+#: ../pidgin/gtkdialogs.c:158
 msgid "Canadian English"
 msgstr "Kanadisk-engelsk"
 
-#: ../pidgin/gtkdialogs.c:158
+#: ../pidgin/gtkdialogs.c:159
 msgid "British English"
 msgstr "Britisk-engelsk"
 
-#: ../pidgin/gtkdialogs.c:159
+#: ../pidgin/gtkdialogs.c:160
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:232
-#: ../pidgin/gtkdialogs.c:233 ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:161
 #: ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:236
+#: ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:238
 msgid "Spanish"
 msgstr "Spansk"
 
-#: ../pidgin/gtkdialogs.c:161
+#: ../pidgin/gtkdialogs.c:162
 msgid "Estonian"
 msgstr "Estisk"
 
-#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:163
+#: ../pidgin/gtkdialogs.c:163
+#: ../pidgin/gtkdialogs.c:164
 msgid "Euskera(Basque)"
 msgstr "Baskisk"
 
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:165
+#: ../pidgin/gtkdialogs.c:165
 #: ../pidgin/gtkdialogs.c:166
+#: ../pidgin/gtkdialogs.c:167
 msgid "Persian"
 msgstr "Persisk"
 
-#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:236
-#: ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:168
+#: ../pidgin/gtkdialogs.c:239
+#: ../pidgin/gtkdialogs.c:240
 msgid "Finnish"
 msgstr "Finsk"
 
-#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:238
-#: ../pidgin/gtkdialogs.c:239 ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:169
 #: ../pidgin/gtkdialogs.c:241
+#: ../pidgin/gtkdialogs.c:242
+#: ../pidgin/gtkdialogs.c:243
+#: ../pidgin/gtkdialogs.c:244
 msgid "French"
 msgstr "Fransk"
 
-#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
-#: ../pidgin/gtkdialogs.c:242
+#: ../pidgin/gtkdialogs.c:170
+#: ../pidgin/gtkdialogs.c:171
+#: ../pidgin/gtkdialogs.c:245
 msgid "Galician"
 msgstr "Galisisk"
 
-#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:172
+#: ../pidgin/gtkdialogs.c:172
+#: ../pidgin/gtkdialogs.c:173
 msgid "Gujarati"
 msgstr "Gujarati"
 
-#: ../pidgin/gtkdialogs.c:172
+#: ../pidgin/gtkdialogs.c:173
 msgid "Gujarati Language Team"
 msgstr "Gujarati-språkgruppa"
 
-#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:243
+#: ../pidgin/gtkdialogs.c:174
+#: ../pidgin/gtkdialogs.c:246
 msgid "Hebrew"
 msgstr "Hebraisk"
 
-#: ../pidgin/gtkdialogs.c:174
+#: ../pidgin/gtkdialogs.c:175
 msgid "Hindi"
 msgstr "Hindi"
 
-#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:176
+#: ../pidgin/gtkdialogs.c:247
 msgid "Hungarian"
 msgstr "Ungarsk"
 
-#: ../pidgin/gtkdialogs.c:176
+#: ../pidgin/gtkdialogs.c:177
 msgid "Indonesian"
 msgstr "Indonesisk"
 
-#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:245
+#: ../pidgin/gtkdialogs.c:178
+#: ../pidgin/gtkdialogs.c:248
 msgid "Italian"
 msgstr "Italiensk"
 
-#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:246
-#: ../pidgin/gtkdialogs.c:247 ../pidgin/gtkdialogs.c:248
+#: ../pidgin/gtkdialogs.c:179
+#: ../pidgin/gtkdialogs.c:249
+#: ../pidgin/gtkdialogs.c:250
+#: ../pidgin/gtkdialogs.c:251
 msgid "Japanese"
 msgstr "Japansk"
 
-#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:249
+#: ../pidgin/gtkdialogs.c:180
+#: ../pidgin/gtkdialogs.c:252
 msgid "Georgian"
 msgstr "Georgisk"
 
-#: ../pidgin/gtkdialogs.c:179
+#: ../pidgin/gtkdialogs.c:180
 msgid "Ubuntu Georgian Translators"
 msgstr "Ubuntu georgisk-omsetjarar"
 
-#: ../pidgin/gtkdialogs.c:180
+#: ../pidgin/gtkdialogs.c:181
 msgid "Kannada"
 msgstr "Kannada"
 
-#: ../pidgin/gtkdialogs.c:180
+#: ../pidgin/gtkdialogs.c:181
 msgid "Kannada Translation team"
 msgstr "Kannada-språkgruppa"
 
-#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:250
-#: ../pidgin/gtkdialogs.c:251
+#: ../pidgin/gtkdialogs.c:182
+#: ../pidgin/gtkdialogs.c:253
+#: ../pidgin/gtkdialogs.c:254
 msgid "Korean"
 msgstr "Koreansk"
 
-#: ../pidgin/gtkdialogs.c:182 ../pidgin/gtkdialogs.c:183
+#: ../pidgin/gtkdialogs.c:183
 #: ../pidgin/gtkdialogs.c:184
+#: ../pidgin/gtkdialogs.c:185
 msgid "Kurdish"
 msgstr "Kurdisk"
 
-#: ../pidgin/gtkdialogs.c:185
-#, fuzzy
+#: ../pidgin/gtkdialogs.c:186
 msgid "Lao"
-msgstr "Løva"
+msgstr "Lao"
 
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:252
-#: ../pidgin/gtkdialogs.c:253
+#: ../pidgin/gtkdialogs.c:187
+#: ../pidgin/gtkdialogs.c:255
+#: ../pidgin/gtkdialogs.c:256
 msgid "Lithuanian"
 msgstr "Litauisk"
 
-#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:188
-#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:254
+#: ../pidgin/gtkdialogs.c:188
+#: ../pidgin/gtkdialogs.c:189
+#: ../pidgin/gtkdialogs.c:190
+#: ../pidgin/gtkdialogs.c:257
 msgid "Macedonian"
 msgstr "Makedonsk"
 
-#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:255
-#: ../pidgin/gtkdialogs.c:256
+#: ../pidgin/gtkdialogs.c:191
+#: ../pidgin/gtkdialogs.c:258
+#: ../pidgin/gtkdialogs.c:259
 msgid "Bokmål Norwegian"
 msgstr "Norsk bokmål"
 
-#: ../pidgin/gtkdialogs.c:191
+#: ../pidgin/gtkdialogs.c:192
 msgid "Nepali"
 msgstr "Nepali"
 
-#: ../pidgin/gtkdialogs.c:192
+#: ../pidgin/gtkdialogs.c:193
 msgid "Dutch, Flemish"
 msgstr "Nederlandsk, flamsk"
 
-#: ../pidgin/gtkdialogs.c:193
+#: ../pidgin/gtkdialogs.c:194
 msgid "Norwegian Nynorsk"
 msgstr "Norsk (nynorsk)"
 
-#: ../pidgin/gtkdialogs.c:194 ../pidgin/gtkdialogs.c:195
-#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:257
+#: ../pidgin/gtkdialogs.c:195
+msgid "Punjabi"
+msgstr "Panjabi"
+
+#: ../pidgin/gtkdialogs.c:196
+#: ../pidgin/gtkdialogs.c:197
+#: ../pidgin/gtkdialogs.c:198
+#: ../pidgin/gtkdialogs.c:260
 msgid "Polish"
 msgstr "Polsk"
 
-#: ../pidgin/gtkdialogs.c:197
+#: ../pidgin/gtkdialogs.c:199
 msgid "Portuguese"
 msgstr "Portugisisk"
 
-#: ../pidgin/gtkdialogs.c:198
+#: ../pidgin/gtkdialogs.c:200
 msgid "Portuguese-Brazil"
 msgstr "Brasiliansk-portugisisk"
 
-#: ../pidgin/gtkdialogs.c:199
+#: ../pidgin/gtkdialogs.c:201
 msgid "Pashto"
 msgstr "Pashto"
 
-#: ../pidgin/gtkdialogs.c:200
+#: ../pidgin/gtkdialogs.c:202
 msgid "Romanian"
 msgstr "Rumensk"
 
-#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:258
-#: ../pidgin/gtkdialogs.c:259
+#: ../pidgin/gtkdialogs.c:203
+#: ../pidgin/gtkdialogs.c:261
+#: ../pidgin/gtkdialogs.c:262
 msgid "Russian"
 msgstr "Russisk"
 
-#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:203
-#: ../pidgin/gtkdialogs.c:260 ../pidgin/gtkdialogs.c:261
-#: ../pidgin/gtkdialogs.c:262
+#: ../pidgin/gtkdialogs.c:204
+#: ../pidgin/gtkdialogs.c:205
+#: ../pidgin/gtkdialogs.c:263
+#: ../pidgin/gtkdialogs.c:264
+#: ../pidgin/gtkdialogs.c:265
 msgid "Slovak"
 msgstr "Slovakisk"
 
-#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:263
+#: ../pidgin/gtkdialogs.c:206
+#: ../pidgin/gtkdialogs.c:266
 msgid "Slovenian"
 msgstr "Slovensk"
 
-#: ../pidgin/gtkdialogs.c:205
+#: ../pidgin/gtkdialogs.c:207
 msgid "Albanian"
 msgstr "Albansk"
 
-#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:207
-#: ../pidgin/gtkdialogs.c:264 ../pidgin/gtkdialogs.c:265
+#: ../pidgin/gtkdialogs.c:208
+#: ../pidgin/gtkdialogs.c:209
+#: ../pidgin/gtkdialogs.c:267
+#: ../pidgin/gtkdialogs.c:268
 msgid "Serbian"
 msgstr "Serbisk"
 
-#: ../pidgin/gtkdialogs.c:208 ../pidgin/gtkdialogs.c:266
-#: ../pidgin/gtkdialogs.c:267
+#: ../pidgin/gtkdialogs.c:210
+#: ../pidgin/gtkdialogs.c:269
+#: ../pidgin/gtkdialogs.c:270
 msgid "Swedish"
 msgstr "Svensk"
 
-#: ../pidgin/gtkdialogs.c:209
+#: ../pidgin/gtkdialogs.c:211
 msgid "Tamil"
 msgstr "Tamil"
 
-#: ../pidgin/gtkdialogs.c:210
+#: ../pidgin/gtkdialogs.c:212
 msgid "Telugu"
 msgstr "Telugu"
 
-#: ../pidgin/gtkdialogs.c:211
+#: ../pidgin/gtkdialogs.c:213
 msgid "Thai"
 msgstr "Thai"
 
-#: ../pidgin/gtkdialogs.c:212 ../pidgin/gtkdialogs.c:268
+#: ../pidgin/gtkdialogs.c:214
+#: ../pidgin/gtkdialogs.c:271
 msgid "Turkish"
 msgstr "Tyrkisk"
 
-#: ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:215
+msgid "Urdu"
+msgstr "Urdu"
+
+#: ../pidgin/gtkdialogs.c:216
 msgid "Vietnamese"
 msgstr "Vietnamesisk"
 
-#: ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:216
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T. M. Thanh og Gnome-Vi-laget"
 
-#: ../pidgin/gtkdialogs.c:214 ../pidgin/gtkdialogs.c:269
+#: ../pidgin/gtkdialogs.c:217
+#: ../pidgin/gtkdialogs.c:272
 msgid "Simplified Chinese"
 msgstr "Forenkla kinesisk"
 
-#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:216
-#: ../pidgin/gtkdialogs.c:217
+#: ../pidgin/gtkdialogs.c:218
+#: ../pidgin/gtkdialogs.c:219
+#: ../pidgin/gtkdialogs.c:220
 msgid "Hong Kong Chinese"
 msgstr "Hong Kong-kinesisk"
 
-#: ../pidgin/gtkdialogs.c:218 ../pidgin/gtkdialogs.c:219
-#: ../pidgin/gtkdialogs.c:270
+#: ../pidgin/gtkdialogs.c:221
+#: ../pidgin/gtkdialogs.c:222
+#: ../pidgin/gtkdialogs.c:273
 msgid "Traditional Chinese"
 msgstr "Tradisjonell kinesisk"
 
-#: ../pidgin/gtkdialogs.c:225
+#: ../pidgin/gtkdialogs.c:228
 msgid "Amharic"
 msgstr "Amharisk"
 
-#: ../pidgin/gtkdialogs.c:357
+#: ../pidgin/gtkdialogs.c:358
 #, c-format
 msgid "About %s"
 msgstr "Om %s"
 
-#: ../pidgin/gtkdialogs.c:400
+#: ../pidgin/gtkdialogs.c:394
 #, c-format
-msgid ""
-"%s is a graphical modular messaging client based on libpurple which is "
-"capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
-"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, and "
-"QQ all at once.  It is written using GTK+.<BR><BR>You may modify and "
-"redistribute the program under the terms of the GPL (version 2 or later).  A "
-"copy of the GPL is contained in the 'COPYING' file distributed with %s.  %s "
-"is copyrighted by its contributors.  See the 'COPYRIGHT' file for the "
-"complete list of contributors.  We provide no warranty for this program."
-"<BR><BR>"
-msgstr ""
-"%s er ein grafisk, modulær meldingsklient basert på libpurple som er i stand "
-"til å kopla seg opp mot AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
-"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu og QQ - alle på "
-"éin gong. Han er skriven ved å nytta GTK+.<BR><BR>Du kan endra og "
-"vidareformidla programmet i samsvar med vilkåra i GPL (versjon 2 eller "
-"seinare). Ein kopi av GPL ligg i fila 'COPYING' som kjem saman med %s.  "
-"Opphavsretten til %s ligg hos bidragsytarane. Sjå i fila 'COPYRIGHT' for ei "
-"fullstendig liste over bidragsytarar. Programmet kjem utan nokon som helst "
-"form for garanti.<BR><BR>"
+msgid "%s is a graphical modular messaging client based on libpurple which is capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, and QQ all at once.  It is written using GTK+.<BR><BR>You may modify and redistribute the program under the terms of the GPL (version 2 or later).  A copy of the GPL is contained in the 'COPYING' file distributed with %s.  %s is copyrighted by its contributors.  See the 'COPYRIGHT' file for the complete list of contributors.  We provide no warranty for this program.<BR><BR>"
+msgstr "%s er ein grafisk, modulær meldingsklient basert på libpurple som er i stand til å kopla seg opp mot AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu og QQ - alle på éin gong. Han er skriven ved å nytta GTK+.<BR><BR>Du kan endra og vidareformidla programmet i samsvar med vilkåra i GPL (versjon 2 eller seinare). Ein kopi av GPL ligg i fila 'COPYING' som kjem saman med %s.  Opphavsretten til %s ligg hos bidragsytarane. Sjå i fila 'COPYRIGHT' for ei fullstendig liste over bidragsytarar. Programmet kjem utan nokon som helst form for garanti.<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:418
-#, c-format
+#: ../pidgin/gtkdialogs.c:412
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin på irc.freenode.net<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:423
+#: ../pidgin/gtkdialogs.c:417
 msgid "Current Developers"
 msgstr "Noverande utviklarar"
 
-#: ../pidgin/gtkdialogs.c:438
+#: ../pidgin/gtkdialogs.c:432
 msgid "Crazy Patch Writers"
 msgstr "Rettarar"
 
-#: ../pidgin/gtkdialogs.c:453
+#: ../pidgin/gtkdialogs.c:447
 msgid "Retired Developers"
 msgstr "Tidlegare utviklarar"
 
-#: ../pidgin/gtkdialogs.c:468
+#: ../pidgin/gtkdialogs.c:462
 msgid "Retired Crazy Patch Writers"
 msgstr "Pensjonerte, pasjonerte lappeskrivarar"
 
-#: ../pidgin/gtkdialogs.c:483
+#: ../pidgin/gtkdialogs.c:477
 msgid "Artists"
 msgstr "Kunstnarar"
 
-#: ../pidgin/gtkdialogs.c:498
+#: ../pidgin/gtkdialogs.c:492
 msgid "Current Translators"
 msgstr "Noverande omsetjarar"
 
-#: ../pidgin/gtkdialogs.c:518
+#: ../pidgin/gtkdialogs.c:512
 msgid "Past Translators"
 msgstr "Tidlegare omsetjarar"
 
-#: ../pidgin/gtkdialogs.c:536
+#: ../pidgin/gtkdialogs.c:530
 msgid "Debugging Information"
 msgstr "Feilsøkingsinformasjon "
 
-#: ../pidgin/gtkdialogs.c:906
+#: ../pidgin/gtkdialogs.c:746
+#: ../pidgin/gtkdialogs.c:885
+#: ../pidgin/gtkdialogs.c:966
+msgid "_Name"
+msgstr "_Namn"
+
+#: ../pidgin/gtkdialogs.c:751
+#: ../pidgin/gtkdialogs.c:890
+#: ../pidgin/gtkdialogs.c:971
+msgid "_Account"
+msgstr "_Konto"
+
+#: ../pidgin/gtkdialogs.c:898
 msgid "Get User Info"
 msgstr "Hent brukarinfo"
 
-#: ../pidgin/gtkdialogs.c:908
-msgid ""
-"Please enter the screen name or alias of the person whose info you would "
-"like to view."
-msgstr ""
-"Skriv inn brukar- eller kallenamnet til personen du ønskjer informasjon om."
+#: ../pidgin/gtkdialogs.c:900
+msgid "Please enter the screen name or alias of the person whose info you would like to view."
+msgstr "Skriv inn brukar- eller kallenamnet til personen du ønskjer informasjon om."
 
-#: ../pidgin/gtkdialogs.c:998
+#: ../pidgin/gtkdialogs.c:990
 msgid "View User Log"
 msgstr "Les brukarlogg"
 
-#: ../pidgin/gtkdialogs.c:1000
-msgid ""
-"Please enter the screen name or alias of the person whose log you would like "
-"to view."
-msgstr ""
-"Skriv inn brukar- eller kallenamnet til personen du ønskjer å lesa loggen "
-"til."
+#: ../pidgin/gtkdialogs.c:992
+msgid "Please enter the screen name or alias of the person whose log you would like to view."
+msgstr "Skriv inn brukar- eller kallenamnet til personen du ønskjer å lesa loggen til."
 
-#: ../pidgin/gtkdialogs.c:1020
+#: ../pidgin/gtkdialogs.c:1012
 msgid "Alias Contact"
 msgstr "Kontaktalias"
 
-#: ../pidgin/gtkdialogs.c:1021
+#: ../pidgin/gtkdialogs.c:1013
 msgid "Enter an alias for this contact."
 msgstr "Før opp eit kallenamn (alias) for denne kontakten."
 
-#: ../pidgin/gtkdialogs.c:1043
+#: ../pidgin/gtkdialogs.c:1035
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Før opp eit kallenamn (alias) for %s."
 
-#: ../pidgin/gtkdialogs.c:1045
+#: ../pidgin/gtkdialogs.c:1037
 msgid "Alias Buddy"
 msgstr "Vennealias"
 
-#: ../pidgin/gtkdialogs.c:1066
+#: ../pidgin/gtkdialogs.c:1058
 msgid "Alias Chat"
 msgstr "Kallenamn praterom"
 
-#: ../pidgin/gtkdialogs.c:1067
+#: ../pidgin/gtkdialogs.c:1059
 msgid "Enter an alias for this chat."
 msgstr "Før opp eit kallenamn for dette praterommet."
 
-#: ../pidgin/gtkdialogs.c:1106
+#: ../pidgin/gtkdialogs.c:1098
 #, 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[0] ""
-"Du er i ferd med å fjerna kontakten som inneheld %s og %d annan venn frå "
-"vennelista di. Ønskjer du å halda fram?"
-msgstr[1] ""
-"Du er i ferd med å fjerna kontakten som inneheld %s og %d andre vennar frå "
-"vennelista di. Ønskjer du å halda fram?"
+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[0] "Du er i ferd med å fjerna kontakten som inneheld %s og %d annan venn frå vennelista di. Ønskjer du å halda fram?"
+msgstr[1] "Du er i ferd med å fjerna kontakten som inneheld %s og %d andre vennar frå vennelista di. Ønskjer du å halda fram?"
 
-#: ../pidgin/gtkdialogs.c:1114
+#: ../pidgin/gtkdialogs.c:1106
 msgid "Remove Contact"
 msgstr "Fjern kontakt"
 
-#: ../pidgin/gtkdialogs.c:1117
+#: ../pidgin/gtkdialogs.c:1109
 msgid "_Remove Contact"
 msgstr "_Fjern kontakt"
 
-#: ../pidgin/gtkdialogs.c:1148
+#: ../pidgin/gtkdialogs.c:1140
 #, c-format
-msgid ""
-"You are about to merge the group called %s into the group called %s. Do you "
-"want to continue?"
-msgstr ""
-"Du er i ferd med å slå gruppa med namnet %s saman med gruppa %s. Vil du "
-"halda fram?"
+msgid "You are about to merge the group called %s into the group called %s. Do you want to continue?"
+msgstr "Du er i ferd med å slå gruppa med namnet %s saman med gruppa %s. Vil du halda fram?"
 
-#: ../pidgin/gtkdialogs.c:1155
+#: ../pidgin/gtkdialogs.c:1147
 msgid "Merge Groups"
 msgstr "Slå saman grupper"
 
-#: ../pidgin/gtkdialogs.c:1158
+#: ../pidgin/gtkdialogs.c:1150
 msgid "_Merge Groups"
 msgstr "_Slå saman grupper"
 
-#: ../pidgin/gtkdialogs.c:1208
+#: ../pidgin/gtkdialogs.c:1200
 #, c-format
-msgid ""
-"You are about to remove the group %s and all its members from your buddy "
-"list.  Do you want to continue?"
-msgstr ""
-"Er du sikker på at du ønskjer å fjerna gruppa %s og alle medlemmene i ho frå "
-"vennelista di?"
+msgid "You are about to remove the group %s and all its members from your buddy list.  Do you want to continue?"
+msgstr "Er du sikker på at du ønskjer å fjerna gruppa %s og alle medlemmene i ho frå vennelista di?"
 
-#: ../pidgin/gtkdialogs.c:1211
+#: ../pidgin/gtkdialogs.c:1203
 msgid "Remove Group"
 msgstr "Fjern gruppa"
 
-#: ../pidgin/gtkdialogs.c:1214
+#: ../pidgin/gtkdialogs.c:1206
 msgid "_Remove Group"
 msgstr "_Fjern gruppe"
 
-#: ../pidgin/gtkdialogs.c:1247
+#: ../pidgin/gtkdialogs.c:1239
 #, c-format
-msgid ""
-"You are about to remove %s from your buddy list.  Do you want to continue?"
+msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Er du sikker på at du ønskjer å fjerna %s frå vennelista di?"
 
-#: ../pidgin/gtkdialogs.c:1250
+#: ../pidgin/gtkdialogs.c:1242
 msgid "Remove Buddy"
 msgstr "Fjern venn"
 
-#: ../pidgin/gtkdialogs.c:1253
+#: ../pidgin/gtkdialogs.c:1245
 msgid "_Remove Buddy"
 msgstr "_Fjern venn"
 
-#: ../pidgin/gtkdialogs.c:1274
+#: ../pidgin/gtkdialogs.c:1266
 #, c-format
-msgid ""
-"You are about to remove the chat %s from your buddy list.  Do you want to "
-"continue?"
-msgstr ""
-"Er du sikker på at du ønskjer å fjerna praterommet %s frå vennelista di?"
+msgid "You are about to remove the chat %s from your buddy list.  Do you want to continue?"
+msgstr "Er du sikker på at du ønskjer å fjerna praterommet %s frå vennelista di?"
 
-#: ../pidgin/gtkdialogs.c:1277
+#: ../pidgin/gtkdialogs.c:1269
 msgid "Remove Chat"
 msgstr "Fjern praterom"
 
-#: ../pidgin/gtkdialogs.c:1280
+#: ../pidgin/gtkdialogs.c:1272
 msgid "_Remove Chat"
 msgstr "_Fjern praterom"
 
-#: ../pidgin/gtkdocklet.c:150
+#: ../pidgin/gtkdocklet.c:152
 msgid "Right-click for more unread messages...\n"
 msgstr "Høgreklikk for fleire ulesne meldingar…\n"
 
-#: ../pidgin/gtkdocklet.c:435
+#: ../pidgin/gtkdocklet.c:533
 msgid "Change Status"
 msgstr "Endra tilstand"
 
-#: ../pidgin/gtkdocklet.c:487
+#: ../pidgin/gtkdocklet.c:681
 msgid "Show Buddy List"
 msgstr "Vis vennelista"
 
-#: ../pidgin/gtkdocklet.c:513
+#: ../pidgin/gtkdocklet.c:707
 msgid "New Message..."
 msgstr "Ny melding…"
 
-#: ../pidgin/gtkdocklet.c:528
+#: ../pidgin/gtkdocklet.c:722
 msgid "Mute Sounds"
 msgstr "Demp lydar"
 
-#: ../pidgin/gtkdocklet.c:535
-#, fuzzy
-msgid "Blink on new message"
+#: ../pidgin/gtkdocklet.c:729
+msgid "Blink on New Message"
 msgstr "Blink ved ny melding"
 
-#: ../pidgin/gtkdocklet.c:542
+#: ../pidgin/gtkdocklet.c:739
 msgid "Quit"
 msgstr "Avslutt"
 
@@ -15203,26 +15637,27 @@ msgstr "Tid igjen:"
 msgid "Time Remaining:"
 msgstr "Tid igjen:"
 
-#: ../pidgin/gtkft.c:784
+#: ../pidgin/gtkft.c:781
 msgid "Close this window when all transfers _finish"
 msgstr "Lukk dette _vindauget når alle overføringar er ferdige"
 
-#: ../pidgin/gtkft.c:794
+#: ../pidgin/gtkft.c:791
 msgid "C_lear finished transfers"
 msgstr "_Fjern ferdige overføringar"
 
 #. "Download Details" arrow
-#: ../pidgin/gtkft.c:803
+#: ../pidgin/gtkft.c:800
 msgid "File transfer _details"
 msgstr "Filoverføringsdetaljar"
 
 #. Pause button
-#: ../pidgin/gtkft.c:833 ../pidgin/pidginstock.c:95
+#: ../pidgin/gtkft.c:818
+#: ../pidgin/pidginstock.c:95
 msgid "_Pause"
 msgstr "_Pause"
 
 #. Resume button
-#: ../pidgin/gtkft.c:843
+#: ../pidgin/gtkft.c:823
 msgid "_Resume"
 msgstr "_Hald fram"
 
@@ -15230,39 +15665,75 @@ msgstr "_Lim inn som rein tekst"
 msgid "Paste as Plain _Text"
 msgstr "_Lim inn som rein tekst"
 
-#: ../pidgin/gtkimhtml.c:833 ../pidgin/gtkimhtmltoolbar.c:1194
+#: ../pidgin/gtkimhtml.c:833
+#: ../pidgin/gtkimhtmltoolbar.c:1197
 msgid "_Reset formatting"
 msgstr "_Ta vekk formatering"
 
-#: ../pidgin/gtkimhtml.c:1373
+#: ../pidgin/gtkimhtml.c:1391
 msgid "Hyperlink color"
 msgstr "Lenkjefarge"
 
-#: ../pidgin/gtkimhtml.c:1374
+#: ../pidgin/gtkimhtml.c:1392
 msgid "Color to draw hyperlinks."
 msgstr "Farge til å teikna lenkje."
 
-#: ../pidgin/gtkimhtml.c:1377
+#: ../pidgin/gtkimhtml.c:1395
 msgid "Hyperlink prelight color"
 msgstr "Lenkjefarge"
 
-#: ../pidgin/gtkimhtml.c:1378
+#: ../pidgin/gtkimhtml.c:1396
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Lenkjefarge når musa peikar på lenkja."
 
-#: ../pidgin/gtkimhtml.c:1598
+#: ../pidgin/gtkimhtml.c:1399
+#: ../pidgin/plugins/pidginrc.c:52
+msgid "Sent Message Name Color"
+msgstr "Sendt melding"
+
+#: ../pidgin/gtkimhtml.c:1400
+msgid "Color to draw the name of a message you sent."
+msgstr "Farge for å teikna namnet til ei melding du har sendt."
+
+#: ../pidgin/gtkimhtml.c:1403
+#: ../pidgin/plugins/pidginrc.c:53
+msgid "Received Message Name Color"
+msgstr "Motteken melding"
+
+#: ../pidgin/gtkimhtml.c:1404
+msgid "Color to draw the name of a message you received."
+msgstr "Farge for å teikna namnet til ei melding du har motteke."
+
+#: ../pidgin/gtkimhtml.c:1407
+msgid "\"Attention\" Name Color"
+msgstr "\"Merksemd\" "
+
+#: ../pidgin/gtkimhtml.c:1408
+msgid "Color to draw the name of a message you received containing your name."
+msgstr "Farge for å teikna namnet til ei melding du mottok som innheld namnet ditt."
+
+#: ../pidgin/gtkimhtml.c:1411
+#: ../pidgin/plugins/pidginrc.c:55
+msgid "Action Message Name Color"
+msgstr "Handlingsmelding"
+
+#: ../pidgin/gtkimhtml.c:1412
+msgid "Color to draw the name of an action message."
+msgstr "Farge for å teikna namnet til ei handlingsmelding."
+
+#: ../pidgin/gtkimhtml.c:1632
 msgid "_Copy E-Mail Address"
 msgstr "_Kopier e-postadresse"
 
-#: ../pidgin/gtkimhtml.c:1610
+#: ../pidgin/gtkimhtml.c:1644
 msgid "_Open Link in Browser"
 msgstr "_Opna lenkja i nettlesar"
 
-#: ../pidgin/gtkimhtml.c:1620
+#: ../pidgin/gtkimhtml.c:1654
 msgid "_Copy Link Location"
 msgstr "_Kopier lenkje"
 
-#: ../pidgin/gtkimhtml.c:3369
+#: ../pidgin/gtkimhtml.c:3421
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -15272,7 +15743,7 @@ msgstr ""
 "\n"
 "Nyttar standardtypen PNG."
 
-#: ../pidgin/gtkimhtml.c:3372
+#: ../pidgin/gtkimhtml.c:3424
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -15282,7 +15753,7 @@ msgstr ""
 "\n"
 "Nyttar standardtypen PNG."
 
-#: ../pidgin/gtkimhtml.c:3401
+#: ../pidgin/gtkimhtml.c:3453
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -15293,7 +15764,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3404
+#: ../pidgin/gtkimhtml.c:3456
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -15304,218 +15775,225 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3482 ../pidgin/gtkimhtml.c:3494
+#: ../pidgin/gtkimhtml.c:3537
+#: ../pidgin/gtkimhtml.c:3549
 msgid "Save Image"
 msgstr "Lagra bilete"
 
-#: ../pidgin/gtkimhtml.c:3522
-#, c-format
+#: ../pidgin/gtkimhtml.c:3577
 msgid "_Save Image..."
 msgstr "_Lagra bilete…"
 
-#: ../pidgin/gtkimhtmltoolbar.c:163
+#: ../pidgin/gtkimhtmltoolbar.c:164
 msgid "Select Font"
 msgstr "Vel skrifttype"
 
-#: ../pidgin/gtkimhtmltoolbar.c:242
+#: ../pidgin/gtkimhtmltoolbar.c:244
 msgid "Select Text Color"
 msgstr "Vel tekstfarge"
 
-#: ../pidgin/gtkimhtmltoolbar.c:321
+#: ../pidgin/gtkimhtmltoolbar.c:324
 msgid "Select Background Color"
 msgstr "Vel bakgrunnsfarge"
 
-#: ../pidgin/gtkimhtmltoolbar.c:410
+#: ../pidgin/gtkimhtmltoolbar.c:413
 msgid "_URL"
 msgstr "_Nettadresse"
 
-#: ../pidgin/gtkimhtmltoolbar.c:418
+#: ../pidgin/gtkimhtmltoolbar.c:421
 msgid "_Description"
 msgstr "Skil_dring"
 
-#: ../pidgin/gtkimhtmltoolbar.c:421
-msgid ""
-"Please enter the URL and description of the link that you want to insert. "
-"The description is optional."
-msgstr ""
-"Skriv inn nettadressa og ei skildring av lenkja du ønskjer å leggja til. Det "
-"er valfritt å skriva inn ei skildring."
+#: ../pidgin/gtkimhtmltoolbar.c:424
+msgid "Please enter the URL and description of the link that you want to insert. The description is optional."
+msgstr "Skriv inn nettadressa og ei skildring av lenkja du ønskjer å leggja til. Det er valfritt å skriva inn ei skildring."
 
-#: ../pidgin/gtkimhtmltoolbar.c:425
+#: ../pidgin/gtkimhtmltoolbar.c:428
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Skriv inn nettadressa du ønskjer å leggja til."
 
-#: ../pidgin/gtkimhtmltoolbar.c:430 ../pidgin/gtkimhtmltoolbar.c:1102
+#: ../pidgin/gtkimhtmltoolbar.c:433
+#: ../pidgin/gtkimhtmltoolbar.c:1104
 msgid "Insert Link"
 msgstr "Legg til lenkje"
 
-#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtkimhtmltoolbar.c:1262
+#: ../pidgin/gtkimhtmltoolbar.c:437
+#: ../pidgin/gtkimhtmltoolbar.c:1265
 msgid "_Insert"
 msgstr "_Set inn"
 
-#: ../pidgin/gtkimhtmltoolbar.c:514
+#: ../pidgin/gtkimhtmltoolbar.c:518
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Klarte ikkje å lagra bilete: %s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:540 ../pidgin/gtkimhtmltoolbar.c:550
+#: ../pidgin/gtkimhtmltoolbar.c:544
+#: ../pidgin/gtkimhtmltoolbar.c:554
 msgid "Insert Image"
 msgstr "Legg til bilete"
 
-#: ../pidgin/gtkimhtmltoolbar.c:761
+#: ../pidgin/gtkimhtmltoolbar.c:712
+msgid "Smile!"
+msgstr "Smil!"
+
+#: ../pidgin/gtkimhtmltoolbar.c:764
 msgid "This theme has no available smileys."
 msgstr "Temaet har ingen tilgjengelege smilefjes."
 
-#. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:778
-msgid "Smile!"
-msgstr "Smil!"
-
-#: ../pidgin/gtkimhtmltoolbar.c:846 ../pidgin/gtkimhtmltoolbar.c:1219
+#: ../pidgin/gtkimhtmltoolbar.c:848
+#: ../pidgin/gtkimhtmltoolbar.c:1222
 msgid "_Font"
 msgstr "Skriftt_ype"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1054
+#: ../pidgin/gtkimhtmltoolbar.c:1056
 msgid "Group Items"
 msgstr "Grupper element"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1054
+#: ../pidgin/gtkimhtmltoolbar.c:1056
 msgid "Ungroup Items"
 msgstr "Avgrupper element"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1088 ../pidgin/plugins/convcolors.c:287
+#: ../pidgin/gtkimhtmltoolbar.c:1090
+#: ../pidgin/plugins/convcolors.c:342
 msgid "Bold"
 msgstr "Feit"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1089 ../pidgin/plugins/convcolors.c:294
+#: ../pidgin/gtkimhtmltoolbar.c:1091
+#: ../pidgin/plugins/convcolors.c:351
 msgid "Italic"
 msgstr "Kursiv"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1090 ../pidgin/plugins/convcolors.c:301
+#: ../pidgin/gtkimhtmltoolbar.c:1092
+#: ../pidgin/plugins/convcolors.c:360
 msgid "Underline"
 msgstr "Understreka"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1091
+#: ../pidgin/gtkimhtmltoolbar.c:1093
 msgid "Strikethrough"
 msgstr "Gjennomstreking"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1093
+#: ../pidgin/gtkimhtmltoolbar.c:1095
 msgid "Increase Font Size"
 msgstr "Auk skriftstorleiken"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1094
+#: ../pidgin/gtkimhtmltoolbar.c:1096
 msgid "Decrease Font Size"
 msgstr "Minsk skriftstorleiken"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1096
+#: ../pidgin/gtkimhtmltoolbar.c:1098
 msgid "Font Face"
 msgstr "Skrifttype"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1097
+#: ../pidgin/gtkimhtmltoolbar.c:1099
 msgid "Background Color"
 msgstr "Bakgrunnsfarge"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1098
+#: ../pidgin/gtkimhtmltoolbar.c:1100
 msgid "Foreground Color"
 msgstr "Forgrunnsfarge"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1100
+#: ../pidgin/gtkimhtmltoolbar.c:1102
 msgid "Reset Formatting"
 msgstr "Nullstill formateringa"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1103
+#: ../pidgin/gtkimhtmltoolbar.c:1105
 msgid "Insert IM Image"
 msgstr "Legg til lynmeldingsbilete"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1104
+#: ../pidgin/gtkimhtmltoolbar.c:1106
 msgid "Insert Smiley"
 msgstr "Legg til smilefjes"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1179
+#: ../pidgin/gtkimhtmltoolbar.c:1182
 msgid "<b>_Bold</b>"
 msgstr "<b>_Feit</b>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1180
+#: ../pidgin/gtkimhtmltoolbar.c:1183
 msgid "<i>_Italic</i>"
 msgstr "<i>_Kursiv</i>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1181
+#: ../pidgin/gtkimhtmltoolbar.c:1184
 msgid "<u>_Underline</u>"
 msgstr "<u>_Understrek</u>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1182
+#: ../pidgin/gtkimhtmltoolbar.c:1185
 msgid "<span strikethrough='true'>Strikethrough</span>"
 msgstr "<span strikethrough='true'>Gjennomstreking</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1183
+#: ../pidgin/gtkimhtmltoolbar.c:1186
 msgid "<span size='larger'>_Larger</span>"
 msgstr "<span size='larger'>_Større</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1185
+#: ../pidgin/gtkimhtmltoolbar.c:1188
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1187
+#: ../pidgin/gtkimhtmltoolbar.c:1190
 msgid "<span size='smaller'>_Smaller</span>"
 msgstr "<span size='smaller'>_Mindre</span>"
 
 #. If we want to show the formatting for the following items, we would
 #. * need to update them when formatting changes. The above items don't need
 #. * no updating nor nothin'
-#: ../pidgin/gtkimhtmltoolbar.c:1191
+#: ../pidgin/gtkimhtmltoolbar.c:1194
 msgid "_Font face"
 msgstr "Skriftt_ype"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1192
+#: ../pidgin/gtkimhtmltoolbar.c:1195
 msgid "Foreground _color"
 msgstr "_Forgrunnsfarge"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1193
+#: ../pidgin/gtkimhtmltoolbar.c:1196
 msgid "Bac_kground color"
 msgstr "_Bakgrunnsfarge"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1270
-msgid "_Smiley"
-msgstr "_Smilefjes"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1276
+#: ../pidgin/gtkimhtmltoolbar.c:1273
 msgid "_Image"
 msgstr "_Bilete"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1282
+#: ../pidgin/gtkimhtmltoolbar.c:1279
 msgid "_Link"
 msgstr "_Lenkje"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1288
+#: ../pidgin/gtkimhtmltoolbar.c:1285
 msgid "_Horizontal rule"
 msgstr "_Horisontal strek"
 
-#: ../pidgin/gtklog.c:293
+#: ../pidgin/gtkimhtmltoolbar.c:1307
+msgid "_Smile!"
+msgstr "_Smil!"
+
+#: ../pidgin/gtklog.c:245
+msgid "Log Deletion Failed"
+msgstr "Klarte ikkje å sletta loggen"
+
+#: ../pidgin/gtklog.c:246
+msgid "Check permissions and try again."
+msgstr "Sjå over rettane og prøv igjen."
+
+#: ../pidgin/gtklog.c:292
 #, c-format
-msgid ""
-"Are you sure you want to permanently delete the log of the conversation with "
-"%s which started at %s?"
-msgstr ""
-"Er du sikker på at du vil permanent sletta loggen over praten med %s som "
-"starta %s?"
+msgid "Are you sure you want to permanently delete the log of the conversation with %s which started at %s?"
+msgstr "Er du sikker på at du vil permanent sletta loggen over praten med %s som starta %s?"
 
-#: ../pidgin/gtklog.c:304
+#: ../pidgin/gtklog.c:303
 #, c-format
-msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
-msgstr ""
-"Er du sikker på at du vil permanent sletta loggen over pratinga i %s som "
-"starta %s?"
+msgid "Are you sure you want to permanently delete the log of the conversation in %s which started at %s?"
+msgstr "Er du sikker på at du vil permanent sletta loggen over pratinga i %s som starta %s?"
 
-#: ../pidgin/gtklog.c:309
+#: ../pidgin/gtklog.c:308
 #, c-format
-msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
-msgstr ""
-"Er du sikker på at du for alltid vil sletta systemloggen som starta på %s?"
+msgid "Are you sure you want to permanently delete the system log which started at %s?"
+msgstr "Er du sikker på at du for alltid vil sletta systemloggen som starta på %s?"
 
+#: ../pidgin/gtklog.c:323
+msgid "Delete Log?"
+msgstr "Sletta loggen?"
+
+#: ../pidgin/gtklog.c:334
+msgid "Delete Log..."
+msgstr "Sletta loggen…"
+
 #: ../pidgin/gtklog.c:453
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
@@ -15526,67 +16004,46 @@ msgstr "<span size='larger' weight='bold
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>Samtale med %s på %s</span>"
 
-#: ../pidgin/gtklog.c:503
-msgid "%B %Y"
-msgstr "%B %Y"
-
-#: ../pidgin/gtklog.c:550
-msgid ""
-"System events will only be logged if the \"Log all status changes to system "
-"log\" preference is enabled."
-msgstr ""
-"Systemhendingar vil berre bli logga om innstillinga \"Logg alle "
-"statusendringar til systemloggen\" er teken i bruk."
-
-#: ../pidgin/gtklog.c:554
-msgid ""
-"Instant messages will only be logged if the \"Log all instant messages\" "
-"preference is enabled."
-msgstr ""
-"Lynmeldingar vil berre bli logga om innstillinga \"Logg alle lynmeldingar\" "
-"er teken i bruk."
-
-#: ../pidgin/gtklog.c:557
-msgid ""
-"Chats will only be logged if the \"Log all chats\" preference is enabled."
-msgstr ""
-"Samtaler vil berre bli logga om innstillinga \"Logg alle samtaler\" er teken "
-"i bruk."
-
-#: ../pidgin/gtklog.c:561
-msgid "No logs were found"
-msgstr "Fann ingen loggar"
-
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
-#: ../pidgin/gtklog.c:576
+#: ../pidgin/gtklog.c:581
 msgid "_Browse logs folder"
 msgstr "_Bla i loggmappa"
 
-#: ../pidgin/gtklog.c:640
-msgid "Total log size:"
-msgstr "Total loggstorleik:"
-
-#: ../pidgin/gtklog.c:709
+#: ../pidgin/gtkmain.c:398
 #, c-format
-msgid "Conversations in %s"
-msgstr "Samtaler i %s"
+msgid "%s %s. Try `%s -h' for more information.\n"
+msgstr "%s %s. Prøv `%s -h' for meir informasjon.\n"
 
-#: ../pidgin/gtklog.c:717 ../pidgin/gtklog.c:779
+#: ../pidgin/gtkmain.c:401
 #, c-format
-msgid "Conversations with %s"
-msgstr "Samtaler med %s"
+msgid ""
+"%s %s\n"
+"Usage: %s [OPTION]...\n"
+"\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"
+"  -m, --multiple      do not ensure single instance\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"
+"  --display=DISPLAY   X display to use\n"
+"  -v, --version       display the current version and exit\n"
+msgstr ""
+"%s %s\n"
+"Bruk: %s [VAL]…\n"
+"\n"
+"  -c, --config=DIR    bruk DIR for innstillingsfilene\n"
+"  -d, --debug         skriv ut feilsøkingsmeldingar til standard utkanal\n"
+"  -h, --help          vis denne hjelpa og avslutt\n"
+"  -m, --multiple      avgrens ikkje til berre éin instans\n"
+"  -n, --nologin       logg ikkje automatisk på\n"
+"  -l, --login[=NAMN] automatisk pålogging (valfritt argument NAMN spesifiserer\n"
+"                      konto(ar) å bruka, skilde med komma)\n"
+"  -v, --version       vis noverande versjon og avslutt\n"
 
-#: ../pidgin/gtklog.c:804
-msgid "System Log"
-msgstr "Systemlogg"
-
-#: ../pidgin/gtkmain.c:386
+#: ../pidgin/gtkmain.c:413
 #, c-format
-msgid "%s %s. Try `%s -h' for more information.\n"
-msgstr "%s %s. Prøv `%s -h' for meir informasjon.\n"
-
-#: ../pidgin/gtkmain.c:388
-#, fuzzy, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
@@ -15601,22 +16058,21 @@ msgstr ""
 "  -v, --version       display the current version and exit\n"
 msgstr ""
 "%s %s\n"
-"Usage: %s [VAL]…\n"
+"Bruk: %s [VAL]…\n"
 "\n"
 "  -c, --config=DIR    bruk DIR for innstillingsfilene\n"
 "  -d, --debug         skriv ut feilsøkingsmeldingar til standard utkanal\n"
 "  -h, --help          vis denne hjelpa og avslutt\n"
 "  -m, --multiple      avgrens ikkje til berre éin instans\n"
 "  -n, --nologin       logg ikkje automatisk på\n"
-"  -l, --login[=NAMN] automatisk pålogging (valfritt argument NAMN "
-"spesifiserer\n"
+"  -l, --login[=NAMN] automatisk pålogging (valfritt argument NAMN spesifiserer\n"
 "                      konto(ar) å bruka, skilde med komma)\n"
 "  -v, --version       vis noverande versjon og avslutt\n"
 
-#: ../pidgin/gtkmain.c:512
-#, fuzzy, c-format
+#: ../pidgin/gtkmain.c:540
+#, c-format
 msgid ""
-"%s has segfaulted and attempted to dump a core file.\n"
+"%s %s has segfaulted and attempted to dump a core file.\n"
 "This is a bug in the software and has happened through\n"
 "no fault of your own.\n"
 "\n"
@@ -15634,12 +16090,12 @@ msgstr ""
 "on other protocols is at\n"
 "%swiki/DeveloperPages\n"
 msgstr ""
-"%s hadde ein minnetildelingsfeil (segfault) og prøvde å lagra ein minnefil.\n"
+"%s %s feila i minnetildelinga (segfault) og prøvde å lagra ei minnefil.\n"
 "Dette skjedde grunna ein feil i programvara og \n"
 "utan at du kan lastast for det.\n"
 "\n"
-"Om du klarer å framprovosera feilen, hadde det vore kjekt om du\n"
-"gjorde utviklarane merksame på feilen ved å melda han til:\n"
+"Om du klarer å reprodusera feilen på nytt, kan du senda feilmeldinga\n"
+"til utviklarane ved å melda han til:\n"
 "%ssimpleticket/\n"
 "\n"
 "Sjå til at du fortel om kva du gjorde då feilen oppstod,\n"
@@ -15649,71 +16105,81 @@ msgstr ""
 "\n"
 "Om du treng vidare hjelp, send ei lynmelding til anten SeanEgn eller \n"
 "LSchiere (via AIM).  Kontaktopplysningane til Sean og Luke \n"
-"om andre protokollar finst på \n"
+"for andre protokollar finst på \n"
 "%swiki/DeveloperPages\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../pidgin/gtkmain.c:699 ../pidgin/pidgin.h:51
+#: ../pidgin/gtkmain.c:731
+#: ../pidgin/pidgin.h:51
 msgid "Pidgin"
 msgstr "Pidgin"
 
-#: ../pidgin/gtknotify.c:349
+#: ../pidgin/gtknotify.c:354
 msgid "Open All Messages"
 msgstr "Opna alle meldingar"
 
-#: ../pidgin/gtknotify.c:402
+#: ../pidgin/gtknotify.c:408
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Du har fått e-postmeldingar</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Du har fått e-postmeldingar</span>"
 
-#: ../pidgin/gtknotify.c:540
+#: ../pidgin/gtknotify.c:551
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s har %d ny melding."
 msgstr[1] "%s har %d nye meldingar."
 
-#: ../pidgin/gtknotify.c:564
-#, fuzzy, c-format
-msgid "<b>You have %d new e-mail.</b>"
-msgid_plural "<b>You have %d new e-mails.</b>"
-msgstr[0] "<b>Du har %d ny e-postmelding.</b>"
-msgstr[1] "<b>Du har %d nye e-postmeldingar.</b>"
+#: ../pidgin/gtknotify.c:575
+#, c-format
+msgid "<b>%d new e-mail.</b>"
+msgid_plural "<b>%d new e-mails.</b>"
+msgstr[0] "<b>%d ny e-postmelding.</b>"
+msgstr[1] "<b>%d nye e-postmeldingar.</b>"
 
-#: ../pidgin/gtknotify.c:989
+#: ../pidgin/gtknotify.c:1008
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "Nettlesarkommandoen \"%s\" er ugyldig."
 
-#: ../pidgin/gtknotify.c:991 ../pidgin/gtknotify.c:1003
-#: ../pidgin/gtknotify.c:1016 ../pidgin/gtknotify.c:1144
+#: ../pidgin/gtknotify.c:1010
+#: ../pidgin/gtknotify.c:1022
+#: ../pidgin/gtknotify.c:1035
+#: ../pidgin/gtknotify.c:1172
 msgid "Unable to open URL"
 msgstr "Klarte ikkje å opna adressa"
 
-#: ../pidgin/gtknotify.c:1001 ../pidgin/gtknotify.c:1014
+#: ../pidgin/gtknotify.c:1020
+#: ../pidgin/gtknotify.c:1033
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Klarte ikkje å starta \"%s\": %s"
 
-#: ../pidgin/gtknotify.c:1145
-msgid ""
-"The 'Manual' browser command has been chosen, but no command has been set."
+#: ../pidgin/gtknotify.c:1173
+msgid "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "'Manuell' nettlesarkommando er vald, men ingen kommando er brukt."
 
-#: ../pidgin/gtkplugin.c:265
+#: ../pidgin/gtkplugin.c:266
 msgid "The following plugins will be unloaded."
 msgstr "Dei følgjande programtillegga vil bli lasta ut."
 
-#: ../pidgin/gtkplugin.c:284
+#: ../pidgin/gtkplugin.c:285
 msgid "Multiple plugins will be unloaded."
 msgstr "Fleire programtillegg vil bli lasta ut."
 
-#: ../pidgin/gtkplugin.c:288
+#: ../pidgin/gtkplugin.c:289
 msgid "Unload Plugins"
 msgstr "Last ut programtillegg"
 
-#: ../pidgin/gtkplugin.c:400
+#: ../pidgin/gtkplugin.c:309
+msgid "Could not unload plugin"
+msgstr "Klarte ikkje å lasta ut programtillegget"
+
+#: ../pidgin/gtkplugin.c:310
+msgid "The plugin could not be unloaded now, but will be disabled at the next startup."
+msgstr "Klarte ikkje å lasta vekk programtillegget no, men det vil vera slått av ved neste oppstart."
+
+#: ../pidgin/gtkplugin.c:418
 #, c-format
 msgid ""
 "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
@@ -15724,7 +16190,7 @@ msgstr ""
 "<span weight=\"bold\">Nettstad:</span>\t\t%s\n"
 "<span weight=\"bold\">Filnamn:</span>\t\t%s"
 
-#: ../pidgin/gtkplugin.c:410
+#: ../pidgin/gtkplugin.c:428
 #, c-format
 msgid ""
 "%s\n"
@@ -15735,11 +16201,11 @@ msgstr ""
 "<span foreground=\"#ff0000\" weight=\"bold\">Feil: %s\n"
 "Sjå på nettsida til programtillegga om det finst oppdateringar.</span>"
 
-#: ../pidgin/gtkplugin.c:536
+#: ../pidgin/gtkplugin.c:606
 msgid "Configure Pl_ugin"
 msgstr "Endra _programtillegget"
 
-#: ../pidgin/gtkplugin.c:599
+#: ../pidgin/gtkplugin.c:673
 msgid "<b>Plugin Details</b>"
 msgstr "<b>Programtilleggsdetaljar</b>"
 
@@ -15748,365 +16214,401 @@ msgstr "Vel ei fil"
 msgstr "Vel ei fil"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:532
+#: ../pidgin/gtkpounce.c:539
 msgid "Pounce on Whom"
 msgstr "Varsling for"
 
-#: ../pidgin/gtkpounce.c:559
+#: ../pidgin/gtkpounce.c:566
 msgid "_Buddy name:"
 msgstr "_Vennenamn:"
 
-#: ../pidgin/gtkpounce.c:593
+#: ../pidgin/gtkpounce.c:600
 msgid "Si_gns on"
 msgstr "Lo_ggar på"
 
-#: ../pidgin/gtkpounce.c:595
+#: ../pidgin/gtkpounce.c:602
 msgid "Signs o_ff"
 msgstr "L_oggar av"
 
-#: ../pidgin/gtkpounce.c:597
+#: ../pidgin/gtkpounce.c:604
 msgid "Goes a_way"
 msgstr "GÃ¥r _vekk"
 
-#: ../pidgin/gtkpounce.c:599
+#: ../pidgin/gtkpounce.c:606
 msgid "Ret_urns from away"
 msgstr "_Kjem attende etter å ha vore vekke"
 
-#: ../pidgin/gtkpounce.c:601
+#: ../pidgin/gtkpounce.c:608
 msgid "Becomes _idle"
 msgstr "Blir _uverksam"
 
-#: ../pidgin/gtkpounce.c:603
+#: ../pidgin/gtkpounce.c:610
 msgid "Is no longer i_dle"
 msgstr "Er ikkje uverksam lenger"
 
-#: ../pidgin/gtkpounce.c:605
+#: ../pidgin/gtkpounce.c:612
 msgid "Starts _typing"
 msgstr "Begynner å skriva"
 
-#: ../pidgin/gtkpounce.c:607
+#: ../pidgin/gtkpounce.c:614
 msgid "P_auses while typing"
 msgstr "Tek ein _pause under skrivinga"
 
-#: ../pidgin/gtkpounce.c:609
+#: ../pidgin/gtkpounce.c:616
 msgid "Stops t_yping"
 msgstr "Stansar skrivinga"
 
-#: ../pidgin/gtkpounce.c:611
+#: ../pidgin/gtkpounce.c:618
 msgid "Sends a _message"
 msgstr "Sender ei _melding"
 
-#: ../pidgin/gtkpounce.c:654
+#: ../pidgin/gtkpounce.c:661
 msgid "Ope_n an IM window"
 msgstr "Opna eit lynmeldingsvindauge"
 
-#: ../pidgin/gtkpounce.c:656
+#: ../pidgin/gtkpounce.c:663
 msgid "_Pop up a notification"
 msgstr "Sprett opp eit _varsel"
 
-#: ../pidgin/gtkpounce.c:658
+#: ../pidgin/gtkpounce.c:665
 msgid "Send a _message"
 msgstr "Send ei _melding"
 
-#: ../pidgin/gtkpounce.c:660
+#: ../pidgin/gtkpounce.c:667
 msgid "E_xecute a command"
 msgstr "Køyr ein _kommando"
 
-#: ../pidgin/gtkpounce.c:662
+#: ../pidgin/gtkpounce.c:669
 msgid "P_lay a sound"
 msgstr "Spel ein _lyd"
 
-#: ../pidgin/gtkpounce.c:668
+#: ../pidgin/gtkpounce.c:675
 msgid "Brows_e..."
 msgstr "_Bla gjennom…"
 
-#: ../pidgin/gtkpounce.c:670
+#: ../pidgin/gtkpounce.c:677
 msgid "Br_owse..."
 msgstr "_Bla gjennom…"
 
-#: ../pidgin/gtkpounce.c:671
+#: ../pidgin/gtkpounce.c:678
 msgid "Pre_view"
 msgstr "Førehands_vis"
 
-#: ../pidgin/gtkpounce.c:798
+#: ../pidgin/gtkpounce.c:810
 msgid "P_ounce only when my status is not Available"
 msgstr "Vennevarsling berre når eg ikkje er tilgjengeleg"
 
-#: ../pidgin/gtkpounce.c:803
+#: ../pidgin/gtkpounce.c:815
 msgid "_Recurring"
 msgstr "_Gjentakande"
 
-#: ../pidgin/gtkpounce.c:1246
+#: ../pidgin/gtkpounce.c:1259
 msgid "Pounce Target"
 msgstr "Varslingsmål"
 
-#: ../pidgin/gtkprefs.c:386
-#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
-msgid "Default"
-msgstr "Standard"
-
-#: ../pidgin/gtkprefs.c:517
+#: ../pidgin/gtkprefs.c:458
 msgid "Smiley theme failed to unpack."
 msgstr "Feil under utpakkinga av smilefjestemaet."
 
-#: ../pidgin/gtkprefs.c:644
+#: ../pidgin/gtkprefs.c:593
 msgid "Install Theme"
 msgstr "Installer tema"
 
-#: ../pidgin/gtkprefs.c:697
-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."
-msgstr ""
-"Vel smilefjestema frå lista nedanfor. Du kan installera nye tema ved å dra "
-"og sleppa dei ned i temalista."
+#: ../pidgin/gtkprefs.c:646
+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."
+msgstr "Vel smilefjestema frå lista nedanfor. Du kan installera nye tema ved å dra og sleppa dei ned i temalista."
 
-#: ../pidgin/gtkprefs.c:732
+#: ../pidgin/gtkprefs.c:681
 msgid "Icon"
 msgstr "Ikon"
 
-#: ../pidgin/gtkprefs.c:894
+#: ../pidgin/gtkprefs.c:843
 msgid "System Tray Icon"
 msgstr "Systempanelikon"
 
-#: ../pidgin/gtkprefs.c:895
+#: ../pidgin/gtkprefs.c:844
 msgid "_Show system tray icon:"
 msgstr "Vis systempanel_ikon:"
 
-#: ../pidgin/gtkprefs.c:899
+#: ../pidgin/gtkprefs.c:847
 msgid "On unread messages"
 msgstr "Ved ulesne meldingar"
 
-#: ../pidgin/gtkprefs.c:904
+#: ../pidgin/gtkprefs.c:853
 msgid "Conversation Window Hiding"
 msgstr "Skjul samtalevindauget"
 
-#: ../pidgin/gtkprefs.c:905
+#: ../pidgin/gtkprefs.c:854
 msgid "_Hide new IM conversations:"
 msgstr "_Skjul  nye lynmeldingssamtaler:"
 
-#: ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1944
+#: ../pidgin/gtkprefs.c:857
+#: ../pidgin/gtkprefs.c:1965
 msgid "When away"
 msgstr "NÃ¥r vekke"
 
 #. All the tab options!
-#: ../pidgin/gtkprefs.c:916
+#: ../pidgin/gtkprefs.c:865
 msgid "Tabs"
 msgstr "Faner"
 
-#: ../pidgin/gtkprefs.c:918
+#: ../pidgin/gtkprefs.c:867
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Vis lynmeldingar og prat i _faner"
 
-#: ../pidgin/gtkprefs.c:932
+#: ../pidgin/gtkprefs.c:881
 msgid "Show close b_utton on tabs"
 msgstr "Vis l_ukkeknappar på faner"
 
-#: ../pidgin/gtkprefs.c:935
+#: ../pidgin/gtkprefs.c:884
 msgid "_Placement:"
 msgstr "_Plassering:"
 
-#: ../pidgin/gtkprefs.c:937
+#: ../pidgin/gtkprefs.c:886
 msgid "Top"
 msgstr "Øvst"
 
-#: ../pidgin/gtkprefs.c:938
+#: ../pidgin/gtkprefs.c:887
 msgid "Bottom"
 msgstr "Nedst"
 
-#: ../pidgin/gtkprefs.c:939
+#: ../pidgin/gtkprefs.c:888
 msgid "Left"
 msgstr "Venstre"
 
-#: ../pidgin/gtkprefs.c:940
+#: ../pidgin/gtkprefs.c:889
 msgid "Right"
 msgstr "Høgre"
 
-#: ../pidgin/gtkprefs.c:942
+#: ../pidgin/gtkprefs.c:891
 msgid "Left Vertical"
 msgstr "Vertikalt til venstre"
 
-#: ../pidgin/gtkprefs.c:943
+#: ../pidgin/gtkprefs.c:892
 msgid "Right Vertical"
 msgstr "Vertikalt til høgre"
 
-#: ../pidgin/gtkprefs.c:950
+#: ../pidgin/gtkprefs.c:899
 msgid "N_ew conversations:"
 msgstr "_Nye samtaler:"
 
-#: ../pidgin/gtkprefs.c:995
+#: ../pidgin/gtkprefs.c:944
 msgid "Show _formatting on incoming messages"
 msgstr "Vis _formatering i innkomne meldingar"
 
-#: ../pidgin/gtkprefs.c:998
+#: ../pidgin/gtkprefs.c:946
+msgid "Close IMs immediately when the tab is closed"
+msgstr "Lukk lynmeldingane med ein gong fana blir lukka"
+
+#: ../pidgin/gtkprefs.c:949
 msgid "Show _detailed information"
 msgstr "Vis _detaljar"
 
-#: ../pidgin/gtkprefs.c:1000
+#: ../pidgin/gtkprefs.c:951
 msgid "Enable buddy ic_on animation"
 msgstr "Bruk _animerte venneikon"
 
-#: ../pidgin/gtkprefs.c:1007
+#: ../pidgin/gtkprefs.c:958
 msgid "_Notify buddies that you are typing to them"
 msgstr "_Varslar vennar at du skriv til dei"
 
-#: ../pidgin/gtkprefs.c:1010
+#: ../pidgin/gtkprefs.c:961
 msgid "Highlight _misspelled words"
 msgstr "_Merk feilstava ord"
 
-#: ../pidgin/gtkprefs.c:1014
+#: ../pidgin/gtkprefs.c:965
 msgid "Use smooth-scrolling"
 msgstr "Bruk jamn rulling"
 
-#: ../pidgin/gtkprefs.c:1017
+#: ../pidgin/gtkprefs.c:968
 msgid "F_lash window when IMs are received"
 msgstr "La vindauget _blinka når nye lynmmeldingar kjem"
 
-#: ../pidgin/gtkprefs.c:1019
+#: ../pidgin/gtkprefs.c:970
 msgid "Minimi_ze new conversation windows"
 msgstr "Mi_nimer nye pratevindauge"
 
-#: ../pidgin/gtkprefs.c:1023
+#: ../pidgin/gtkprefs.c:974
 msgid "Font"
 msgstr "Skrifftype"
 
-#: ../pidgin/gtkprefs.c:1025
+#: ../pidgin/gtkprefs.c:976
 msgid "Use document font from _theme"
 msgstr "Bruk dokumentskrifttype frå _tema"
 
-#: ../pidgin/gtkprefs.c:1027
+#: ../pidgin/gtkprefs.c:978
 msgid "Use font from _theme"
 msgstr "Bruk skrifttype frå _tema"
 
-#: ../pidgin/gtkprefs.c:1029
+#: ../pidgin/gtkprefs.c:984
 msgid "Conversation _font:"
 msgstr "Samtaleskrift:"
 
-#: ../pidgin/gtkprefs.c:1043
+#: ../pidgin/gtkprefs.c:991
 msgid "Default Formatting"
 msgstr "Standardformatering"
 
-#: ../pidgin/gtkprefs.c:1062
-msgid ""
-"This is how your outgoing message text will appear when you use protocols "
-"that support formatting."
-msgstr ""
-"Slik vil dei utgåande meldingane dine sjå ut når du nyttar protokollar som "
-"støttar formatering."
+#: ../pidgin/gtkprefs.c:1010
+msgid "This is how your outgoing message text will appear when you use protocols that support formatting."
+msgstr "Slik vil dei utgåande meldingane dine sjå ut når du nyttar protokollar som støttar formatering."
 
-#: ../pidgin/gtkprefs.c:1128
+#: ../pidgin/gtkprefs.c:1070
+msgid "Cannot start proxy configuration program."
+msgstr "Klarte ikkje å starta innstillingsprogrammet til mellomlageret."
+
+#: ../pidgin/gtkprefs.c:1082
+msgid "Cannot start browser configuration program."
+msgstr "Klarer ikkje å starta nettlesaren sitt innstillingsprogram."
+
+#: ../pidgin/gtkprefs.c:1102
 msgid "ST_UN server:"
 msgstr "ST_UN-tenar:"
 
-#: ../pidgin/gtkprefs.c:1140
+#: ../pidgin/gtkprefs.c:1114
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Døme: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1144
+#: ../pidgin/gtkprefs.c:1118
 msgid "_Autodetect IP address"
 msgstr "Finn IP-adressa _automatisk"
 
-#: ../pidgin/gtkprefs.c:1153
+#: ../pidgin/gtkprefs.c:1127
 msgid "Public _IP:"
 msgstr "Offentleg _IP:"
 
-#: ../pidgin/gtkprefs.c:1182
+#: ../pidgin/gtkprefs.c:1158
 msgid "Ports"
 msgstr "Portar"
 
-#: ../pidgin/gtkprefs.c:1185
+#: ../pidgin/gtkprefs.c:1161
+msgid "_Enable automatic router port forwarding"
+msgstr "Slå på automatisk port_vidaresending"
+
+#: ../pidgin/gtkprefs.c:1164
 msgid "_Manually specify range of ports to listen on"
 msgstr "Før opp _portrekkje det skal lyttast til"
 
-#: ../pidgin/gtkprefs.c:1188
+#: ../pidgin/gtkprefs.c:1167
 msgid "_Start port:"
 msgstr "_Startport:"
 
-#: ../pidgin/gtkprefs.c:1195
+#: ../pidgin/gtkprefs.c:1174
 msgid "_End port:"
 msgstr "Sluttp_ort:"
 
+#: ../pidgin/gtkprefs.c:1182
+msgid "Proxy Server &amp; Browser"
+msgstr "Mellomtenar &amp; nettlesar"
+
+#: ../pidgin/gtkprefs.c:1190
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>Fann ikkje innstillingsprogrammet til mellomlageret.</b>"
+
+#: ../pidgin/gtkprefs.c:1198
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>Fann ikkje innstillingsprogrammet til nettlesaren.</b>"
+
 #: ../pidgin/gtkprefs.c:1203
+msgid ""
+"Proxy & Browser preferences are configured\n"
+"in GNOME Preferences"
+msgstr ""
+"Mellomlager- og nettlesarinnstillingar endrar\n"
+"ein i GNOME-innstillingane"
+
+#: ../pidgin/gtkprefs.c:1210
+msgid "Configure _Proxy"
+msgstr "Innstillingar _mellomtenar"
+
+#: ../pidgin/gtkprefs.c:1215
+msgid "Configure _Browser"
+msgstr "Innstillingar _nettlesar"
+
+#: ../pidgin/gtkprefs.c:1221
 msgid "Proxy Server"
 msgstr "Mellomtenar"
 
-#: ../pidgin/gtkprefs.c:1207
+#: ../pidgin/gtkprefs.c:1226
 msgid "No proxy"
 msgstr "Inga mellomlagring"
 
-#: ../pidgin/gtkprefs.c:1263
+#: ../pidgin/gtkprefs.c:1282
 msgid "_User:"
 msgstr "Br_ukar:"
 
-#: ../pidgin/gtkprefs.c:1328
+#: ../pidgin/gtkprefs.c:1370
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1329
+#: ../pidgin/gtkprefs.c:1371
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1330
+#: ../pidgin/gtkprefs.c:1372
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1331
+#: ../pidgin/gtkprefs.c:1373
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1332
+#: ../pidgin/gtkprefs.c:1374
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1333
+#: ../pidgin/gtkprefs.c:1375
+msgid "Desktop Default"
+msgstr "Skrivebordsstandard"
+
+#: ../pidgin/gtkprefs.c:1376
 msgid "GNOME Default"
 msgstr "GNOME-standard"
 
-#: ../pidgin/gtkprefs.c:1334
+#: ../pidgin/gtkprefs.c:1377
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1335
+#: ../pidgin/gtkprefs.c:1378
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1336
+#: ../pidgin/gtkprefs.c:1379
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1337
+#: ../pidgin/gtkprefs.c:1380
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1346
+#: ../pidgin/gtkprefs.c:1389
 msgid "Manual"
 msgstr "Sjølvvald"
 
-#: ../pidgin/gtkprefs.c:1399
+#: ../pidgin/gtkprefs.c:1450
 msgid "Browser Selection"
 msgstr "Nettlesarval"
 
-#: ../pidgin/gtkprefs.c:1403
+#: ../pidgin/gtkprefs.c:1454
 msgid "_Browser:"
 msgstr "_Nettlesar:"
 
-#: ../pidgin/gtkprefs.c:1411
+#: ../pidgin/gtkprefs.c:1462
 msgid "_Open link in:"
 msgstr "Opna _lenkje i:"
 
-#: ../pidgin/gtkprefs.c:1413
+#: ../pidgin/gtkprefs.c:1464
 msgid "Browser default"
 msgstr "Nettlesarstandard"
 
-#: ../pidgin/gtkprefs.c:1414
+#: ../pidgin/gtkprefs.c:1465
 msgid "Existing window"
 msgstr "Eksisterande vindauge"
 
-#: ../pidgin/gtkprefs.c:1416
+#: ../pidgin/gtkprefs.c:1467
 msgid "New tab"
 msgstr "Ny fane"
 
-#: ../pidgin/gtkprefs.c:1430
+#: ../pidgin/gtkprefs.c:1484
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -16115,69 +16617,63 @@ msgstr ""
 "_Sjølvvald:\n"
 "(%s for adresse)"
 
-#: ../pidgin/gtkprefs.c:1470
+#: ../pidgin/gtkprefs.c:1510
 msgid "Log _format:"
 msgstr "Logg_format:"
 
-#: ../pidgin/gtkprefs.c:1475
+#: ../pidgin/gtkprefs.c:1515
 msgid "Log all _instant messages"
 msgstr "L_oggfør alle lynmeldingar"
 
-#: ../pidgin/gtkprefs.c:1477
+#: ../pidgin/gtkprefs.c:1517
 msgid "Log all c_hats"
 msgstr "Loggfør alle sa_mtaler"
 
-#: ../pidgin/gtkprefs.c:1479
+#: ../pidgin/gtkprefs.c:1519
 msgid "Log all _status changes to system log"
 msgstr "Loggfør alle _statusendringar i systemloggen"
 
-#: ../pidgin/gtkprefs.c:1625
+#: ../pidgin/gtkprefs.c:1669
 msgid "Sound Selection"
 msgstr "Lydval"
 
-#: ../pidgin/gtkprefs.c:1635
-#, c-format
+#: ../pidgin/gtkprefs.c:1679
 msgid "Quietest"
 msgstr "Stillaste"
 
-#: ../pidgin/gtkprefs.c:1637
-#, c-format
+#: ../pidgin/gtkprefs.c:1681
 msgid "Quieter"
 msgstr "Stillare"
 
-#: ../pidgin/gtkprefs.c:1639
-#, c-format
+#: ../pidgin/gtkprefs.c:1683
 msgid "Quiet"
 msgstr "Stille"
 
-#: ../pidgin/gtkprefs.c:1643
-#, c-format
+#: ../pidgin/gtkprefs.c:1687
 msgid "Loud"
 msgstr "Høg"
 
-#: ../pidgin/gtkprefs.c:1645
-#, c-format
+#: ../pidgin/gtkprefs.c:1689
 msgid "Louder"
 msgstr "Høgare"
 
-#: ../pidgin/gtkprefs.c:1647
-#, c-format
+#: ../pidgin/gtkprefs.c:1691
 msgid "Loudest"
 msgstr "Høgast"
 
-#: ../pidgin/gtkprefs.c:1713
+#: ../pidgin/gtkprefs.c:1754
 msgid "_Method:"
 msgstr "_Metode:"
 
-#: ../pidgin/gtkprefs.c:1715
+#: ../pidgin/gtkprefs.c:1756
 msgid "Console beep"
 msgstr "Konsollyd"
 
-#: ../pidgin/gtkprefs.c:1722
+#: ../pidgin/gtkprefs.c:1763
 msgid "No sounds"
 msgstr "Ingen lydar"
 
-#: ../pidgin/gtkprefs.c:1730
+#: ../pidgin/gtkprefs.c:1776
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -16186,201 +16682,204 @@ msgstr ""
 "Lyd_kommando:\n"
 "(%s for filnamn)"
 
-#: ../pidgin/gtkprefs.c:1757
+#: ../pidgin/gtkprefs.c:1785
 msgid "Sounds when conversation has _focus"
 msgstr "Lydar medan samtalevindauget har _fokus"
 
-#: ../pidgin/gtkprefs.c:1759
+#: ../pidgin/gtkprefs.c:1787
 msgid "Enable sounds:"
 msgstr "Bruk lydar:"
 
-#: ../pidgin/gtkprefs.c:1770
+#: ../pidgin/gtkprefs.c:1804
 msgid "Volume:"
 msgstr "Volum:"
 
-#: ../pidgin/gtkprefs.c:1850
+#: ../pidgin/gtkprefs.c:1871
 msgid "Play"
 msgstr "Spel"
 
-#: ../pidgin/gtkprefs.c:1927
+#: ../pidgin/gtkprefs.c:1948
 msgid "_Report idle time:"
 msgstr "Vis kor lenge _uverksam:"
 
-#: ../pidgin/gtkprefs.c:1932
+#: ../pidgin/gtkprefs.c:1953
 msgid "Based on keyboard or mouse use"
 msgstr "Basert på tastatur- eller musebruk"
 
-#: ../pidgin/gtkprefs.c:1941
+#: ../pidgin/gtkprefs.c:1962
 msgid "_Auto-reply:"
 msgstr "_Automatisk svar:"
 
-#: ../pidgin/gtkprefs.c:1945
+#: ../pidgin/gtkprefs.c:1966
 msgid "When both away and idle"
 msgstr "Både når vekke og uverksam"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1951
+#: ../pidgin/gtkprefs.c:1972
 msgid "Auto-away"
 msgstr "Automatisk vekke"
 
-#: ../pidgin/gtkprefs.c:1953
+#: ../pidgin/gtkprefs.c:1974
 msgid "Change status when _idle"
 msgstr "_Endra tilstand når uverksam"
 
-#: ../pidgin/gtkprefs.c:1957
+#: ../pidgin/gtkprefs.c:1978
 msgid "_Minutes before becoming idle:"
 msgstr "_Minutt før ein blir uverksam:"
 
-#: ../pidgin/gtkprefs.c:1965
+#: ../pidgin/gtkprefs.c:1985
 msgid "Change _status to:"
 msgstr "Endra _tilstand til:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1986
+#: ../pidgin/gtkprefs.c:1998
 msgid "Status at Startup"
 msgstr "Tilstand ved oppstart"
 
-#: ../pidgin/gtkprefs.c:1988
+#: ../pidgin/gtkprefs.c:2000
 msgid "Use status from last _exit at startup"
 msgstr "Bruk tilstanden frå _siste avslutning ved oppstart"
 
-#: ../pidgin/gtkprefs.c:1994
+#: ../pidgin/gtkprefs.c:2007
 msgid "Status to a_pply at startup:"
 msgstr "Tilstand å _bruka ved oppstart:"
 
-#: ../pidgin/gtkprefs.c:2032
+#: ../pidgin/gtkprefs.c:2036
 msgid "Interface"
 msgstr "Grensesnitt"
 
-#: ../pidgin/gtkprefs.c:2034
+#: ../pidgin/gtkprefs.c:2038
 msgid "Smiley Themes"
 msgstr "Smilefjestema"
 
-#: ../pidgin/gtkprefs.c:2041
+#: ../pidgin/gtkprefs.c:2045
 msgid "Browser"
 msgstr "Nettlesar"
 
-#: ../pidgin/gtkprefs.c:2045
+#: ../pidgin/gtkprefs.c:2049
 msgid "Status / Idle"
 msgstr "Tilstand/uverksam"
 
-#: ../pidgin/gtkprivacy.c:80
+#: ../pidgin/gtkprivacy.c:81
 msgid "Allow all users to contact me"
 msgstr "Tillat alle å kontakta meg"
 
-#: ../pidgin/gtkprivacy.c:81
+#: ../pidgin/gtkprivacy.c:82
 msgid "Allow only the users on my buddy list"
 msgstr "Tillat berre brukarane i kontaktlista mi"
 
-#: ../pidgin/gtkprivacy.c:82
+#: ../pidgin/gtkprivacy.c:83
 msgid "Allow only the users below"
 msgstr "Tillat berre brukarane nedanfor"
 
-#: ../pidgin/gtkprivacy.c:83
+#: ../pidgin/gtkprivacy.c:84
 msgid "Block all users"
 msgstr "Blokker alle brukarar"
 
-#: ../pidgin/gtkprivacy.c:84
+#: ../pidgin/gtkprivacy.c:85
 msgid "Block only the users below"
 msgstr "Blokker berre brukarane nedanfor"
 
-#: ../pidgin/gtkprivacy.c:370
+#: ../pidgin/gtkprivacy.c:352
 msgid "Privacy"
 msgstr "Personvern"
 
-#: ../pidgin/gtkprivacy.c:382
+#: ../pidgin/gtkprivacy.c:362
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Endringar i personvernet blir tekne i bruk med ein gong."
 
-#. "Set privacy for:" label
-#: ../pidgin/gtkprivacy.c:394
+#: ../pidgin/gtkprivacy.c:371
 msgid "Set privacy for:"
 msgstr "Personvern for:"
 
-#: ../pidgin/gtkprivacy.c:557 ../pidgin/gtkprivacy.c:574
+#. Remove All button
+#: ../pidgin/gtkprivacy.c:417
+msgid "Remove Al_l"
+msgstr "Fjern _alt"
+
+#: ../pidgin/gtkprivacy.c:503
+#: ../pidgin/gtkprivacy.c:520
 msgid "Permit User"
 msgstr "Gje løyve til brukar"
 
-#: ../pidgin/gtkprivacy.c:558
+#: ../pidgin/gtkprivacy.c:504
 msgid "Type a user you permit to contact you."
 msgstr "Skriv inn ein brukar du tillèt å kontakta deg."
 
-#: ../pidgin/gtkprivacy.c:559
+#: ../pidgin/gtkprivacy.c:505
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "Skriv inn namnet til ein brukar du vil tillata å kontakte deg."
 
-#: ../pidgin/gtkprivacy.c:562 ../pidgin/gtkprivacy.c:578
+#: ../pidgin/gtkprivacy.c:508
+#: ../pidgin/gtkprivacy.c:524
 msgid "_Permit"
 msgstr "_Tillat"
 
-#: ../pidgin/gtkprivacy.c:568
+#: ../pidgin/gtkprivacy.c:514
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Gjev du %s løyve til å kontakta deg?"
 
-#: ../pidgin/gtkprivacy.c:570
+#: ../pidgin/gtkprivacy.c:516
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Er du sikker på at du ønskjer å gje %s løyve til å kontakta deg?"
 
-#: ../pidgin/gtkprivacy.c:599 ../pidgin/gtkprivacy.c:613
+#: ../pidgin/gtkprivacy.c:545
+#: ../pidgin/gtkprivacy.c:559
 msgid "Block User"
 msgstr "Blokker brukar"
 
-#: ../pidgin/gtkprivacy.c:600
+#: ../pidgin/gtkprivacy.c:546
 msgid "Type a user to block."
 msgstr "Skriv inn namnet til brukaren du vil blokkera."
 
-#: ../pidgin/gtkprivacy.c:601
+#: ../pidgin/gtkprivacy.c:547
 msgid "Please enter the name of the user you wish to block."
 msgstr "Skriv inn namnet til brukaren du ønskjer å blokkera."
 
-#: ../pidgin/gtkprivacy.c:609
+#: ../pidgin/gtkprivacy.c:555
 #, c-format
 msgid "Block %s?"
 msgstr "Blokkera %s?"
 
-#: ../pidgin/gtkprivacy.c:611
+#: ../pidgin/gtkprivacy.c:557
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Er du sikker på at du vil blokkera %s?"
 
-#: ../pidgin/gtkrequest.c:272
+#: ../pidgin/gtkrequest.c:274
 msgid "Apply"
 msgstr "Bruk"
 
-#: ../pidgin/gtkrequest.c:1507
+#: ../pidgin/gtkrequest.c:1503
 msgid "That file already exists"
 msgstr "Fila finst allereie"
 
-#: ../pidgin/gtkrequest.c:1508
+#: ../pidgin/gtkrequest.c:1504
 msgid "Would you like to overwrite it?"
 msgstr "Vil du skriva over?"
 
-#: ../pidgin/gtkrequest.c:1511
+#: ../pidgin/gtkrequest.c:1507
 msgid "Overwrite"
 msgstr "Skriv over"
 
-#: ../pidgin/gtkrequest.c:1512
+#: ../pidgin/gtkrequest.c:1508
 msgid "Choose New Name"
 msgstr "Vel nytt namn"
 
-#: ../pidgin/gtkrequest.c:1650 ../pidgin/gtkrequest.c:1664
+#: ../pidgin/gtkrequest.c:1649
+#: ../pidgin/gtkrequest.c:1663
 msgid "Select Folder..."
 msgstr "Vel mappe…"
 
-#. Create the window.
-#: ../pidgin/gtkroomlist.c:375
-msgid "Room List"
-msgstr "Romliste"
-
 #. list button
-#: ../pidgin/gtkroomlist.c:443
+#: ../pidgin/gtkroomlist.c:577
 msgid "_Get List"
 msgstr "_Hent liste"
 
 #. add button
-#: ../pidgin/gtkroomlist.c:451
+#: ../pidgin/gtkroomlist.c:585
 msgid "_Add Chat"
 msgstr "Legg til _praterom"
 
@@ -16389,134 +16888,131 @@ msgstr "Vil du verkeleg sletta dei valde
 msgstr "Vil du verkeleg sletta dei valde lagra tilstandane?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:620 ../pidgin/gtksavedstatuses.c:1266
+#: ../pidgin/gtksavedstatuses.c:616
+#: ../pidgin/gtksavedstatuses.c:1229
 msgid "_Use"
 msgstr "_Bruk"
 
-#: ../pidgin/gtksavedstatuses.c:780
+#: ../pidgin/gtksavedstatuses.c:765
 msgid "Title already in use.  You must choose a unique title."
 msgstr "Tittelen er allereie i bruk. Du må velja ein unik tittel."
 
-#: ../pidgin/gtksavedstatuses.c:970
+#: ../pidgin/gtksavedstatuses.c:961
 msgid "Different"
 msgstr "Ulik"
 
-#: ../pidgin/gtksavedstatuses.c:1159
+#: ../pidgin/gtksavedstatuses.c:1153
 msgid "_Title:"
 msgstr "_Tittel:"
 
-#: ../pidgin/gtksavedstatuses.c:1178 ../pidgin/gtksavedstatuses.c:1497
+#: ../pidgin/gtksavedstatuses.c:1161
+#: ../pidgin/gtksavedstatuses.c:1453
 msgid "_Status:"
 msgstr "_Status:"
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1210
+#: ../pidgin/gtksavedstatuses.c:1177
 msgid "Use a _different status for some accounts"
 msgstr "Bruk ein _ulik tilstand for somme kontoar"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1274
+#: ../pidgin/gtksavedstatuses.c:1236
 msgid "Sa_ve & Use"
 msgstr "L_agra og bruk"
 
-#: ../pidgin/gtksavedstatuses.c:1480
+#: ../pidgin/gtksavedstatuses.c:1437
 #, c-format
 msgid "Status for %s"
 msgstr "Status for %s"
 
-#: ../pidgin/gtkstatusbox.c:664
+#: ../pidgin/gtkstatusbox.c:683
 msgid "Waiting for network connection"
 msgstr "Ventar på nettverkssamband"
 
-#: ../pidgin/gtkutils.c:632
+#: ../pidgin/gtkstatusbox.c:1096
+msgid "New status..."
+msgstr "Ny tilstand…"
+
+#: ../pidgin/gtkstatusbox.c:1097
+msgid "Saved statuses..."
+msgstr "Lagra tilstandar…"
+
+#: ../pidgin/gtkutils.c:683
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1399 ../pidgin/gtkutils.c:1422
+#: ../pidgin/gtkutils.c:1450
+#: ../pidgin/gtkutils.c:1473
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "Følgjande feil oppstod ved lastinga av %s: %s"
 
-#: ../pidgin/gtkutils.c:1402 ../pidgin/gtkutils.c:1424
+#: ../pidgin/gtkutils.c:1453
+#: ../pidgin/gtkutils.c:1475
 msgid "Failed to load image"
 msgstr "Klarte ikkje å lagra biletet"
 
-#: ../pidgin/gtkutils.c:1498
+#: ../pidgin/gtkutils.c:1549
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Klarer ikkje å senda mappe %s."
 
-#: ../pidgin/gtkutils.c:1499
+#: ../pidgin/gtkutils.c:1550
 #, c-format
-msgid ""
-"%s cannot transfer a folder. You will need to send the files within "
-"individually."
-msgstr ""
-"%s kan ikkje overføra mapper. Du er nøydd til å senda filene deira enkeltvis."
+msgid "%s cannot transfer a folder. You will need to send the files within individually."
+msgstr "%s kan ikkje overføra mapper. Du er nøydd til å senda filene deira enkeltvis."
 
-#: ../pidgin/gtkutils.c:1531 ../pidgin/gtkutils.c:1543
-#: ../pidgin/gtkutils.c:1550
+#: ../pidgin/gtkutils.c:1584
+#: ../pidgin/gtkutils.c:1596
+#: ../pidgin/gtkutils.c:1603
 msgid "You have dragged an image"
 msgstr "Du har drege eit biete"
 
-#: ../pidgin/gtkutils.c:1532
-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 ""
-"Du kan senda dette biletet som ei filoverføring, veva det inn i denne "
-"meldinga, eller bruka det som eit venneikon for denne brukaren."
+#: ../pidgin/gtkutils.c:1585
+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 "Du kan senda dette biletet som ei filoverføring, veva det inn i denne meldinga, eller bruka det som eit venneikon for denne brukaren."
 
-#: ../pidgin/gtkutils.c:1538 ../pidgin/gtkutils.c:1558
+#: ../pidgin/gtkutils.c:1591
+#: ../pidgin/gtkutils.c:1611
 msgid "Set as buddy icon"
 msgstr "Bruk som venne-ikon"
 
-#: ../pidgin/gtkutils.c:1539 ../pidgin/gtkutils.c:1559
+#: ../pidgin/gtkutils.c:1592
+#: ../pidgin/gtkutils.c:1612
 msgid "Send image file"
 msgstr "Send biletfil"
 
-#: ../pidgin/gtkutils.c:1540 ../pidgin/gtkutils.c:1559
+#: ../pidgin/gtkutils.c:1593
+#: ../pidgin/gtkutils.c:1612
 msgid "Insert in message"
 msgstr "Legg til i meldinga"
 
-#: ../pidgin/gtkutils.c:1544
+#: ../pidgin/gtkutils.c:1597
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Vil du velja det som venneikon for denne brukaren?"
 
-#: ../pidgin/gtkutils.c:1551
-msgid ""
-"You can send this image as a file transfer, or use it as the buddy icon for "
-"this user."
-msgstr ""
-"Du kan senda dette biletet som ei filoverføring, eller bruka det som eit "
-"venneikon for denne brukaren."
+#: ../pidgin/gtkutils.c:1604
+msgid "You can send this image as a file transfer, or use it as the buddy icon for this user."
+msgstr "Du kan senda dette biletet som ei filoverføring, eller bruka det som eit venneikon for denne brukaren."
 
-#: ../pidgin/gtkutils.c:1552
-msgid ""
-"You can insert this image into this message, or use it as the buddy icon for "
-"this user"
-msgstr ""
-"Du kan setja inn dette biletet i denne meldinga, eller bruka det som eit "
-"venneikon for denne brukaren"
+#: ../pidgin/gtkutils.c:1605
+msgid "You can insert this image into this message, or use it as the buddy icon for this user"
+msgstr "Du kan setja inn dette biletet i denne meldinga, eller bruka det som eit venneikon for denne brukaren"
 
 #. 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
-#: ../pidgin/gtkutils.c:1610
+#: ../pidgin/gtkutils.c:1664
 msgid "Cannot send launcher"
 msgstr "Klarer ikkje å senda lastaren"
 
-#: ../pidgin/gtkutils.c:1610
-msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
-msgstr ""
-"Du drog ein arbeidsflatestartar. Truleg ønskte du å senda det oppstartaren "
-"peiker mot i staden for oppstartaren sjølv."
+#: ../pidgin/gtkutils.c:1664
+msgid "You dragged a desktop launcher. Most likely you wanted to send whatever this launcher points to instead of this launcher itself."
+msgstr "Du drog ein arbeidsflatestartar. Truleg ønskte du å senda det oppstartaren peiker mot i staden for oppstartaren sjølv."
 
-#: ../pidgin/gtkutils.c:2345
+#: ../pidgin/gtkutils.c:2402
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -16527,33 +17023,31 @@ msgstr ""
 "<b>Filstorleik:</b> %s\n"
 "<b>Biletstorleik:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2641
+#: ../pidgin/gtkutils.c:2704
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr "Fila '%s' er for stor for %s. Prøv eit mindre bilete.\n"
 
-#: ../pidgin/gtkutils.c:2643
+#: ../pidgin/gtkutils.c:2706
 msgid "Icon Error"
 msgstr "Ikon-feil"
 
-#: ../pidgin/gtkutils.c:2644
+#: ../pidgin/gtkutils.c:2707
 msgid "Could not set icon"
-msgstr "Klarte ikkje å bruka ikonet"
+msgstr "Klarte ikkje å velja ikon"
 
-#: ../pidgin/gtkutils.c:2744
+#: ../pidgin/gtkutils.c:2807
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Klarte ikkje å opna fila '%s': %s"
 
-#: ../pidgin/gtkutils.c:2793
+#: ../pidgin/gtkutils.c:2856
 #, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr ""
-"Klarte ikkje å lasta biletet '%s': grunnen er ikkje kjend, men er truleg "
-"grunna ei øydelagt biletfil"
+msgid "Failed to load image '%s': reason not known, probably a corrupt image file"
+msgstr "Klarte ikkje å lasta biletet '%s': grunnen er ikkje kjend, men er truleg grunna ei øydelagt biletfil"
 
-#: ../pidgin/gtkwhiteboard.c:754 ../pidgin/gtkwhiteboard.c:773
+#: ../pidgin/gtkwhiteboard.c:754
+#: ../pidgin/gtkwhiteboard.c:773
 msgid "Save File"
 msgstr "Lagra fil"
 
@@ -16585,6 +17079,10 @@ msgstr "_Opna e-post"
 msgid "_Open Mail"
 msgstr "_Opna e-post"
 
+#: ../pidgin/pidgintooltip.c:100
+msgid "Pidgin Tooltip"
+msgstr "Pidgin-verktøyhint"
+
 #: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:2
 msgid "Pidgin smileys"
 msgstr "Pidgin-smilefjes"
@@ -16601,35 +17099,34 @@ msgstr "ingen"
 msgid "none"
 msgstr "ingen"
 
-#: ../pidgin/plugins/cap/cap.c:450
-msgid "Display Statistics"
-msgstr "Vis statistikk"
-
-#: ../pidgin/plugins/cap/cap.c:462 ../pidgin/plugins/cap/cap.c:465
+#: ../pidgin/plugins/cap/cap.c:444
+#: ../pidgin/plugins/cap/cap.c:447
 msgid "Response Probability:"
 msgstr "Sannsynleg svar:"
 
-#: ../pidgin/plugins/cap/cap.c:811
+#: ../pidgin/plugins/cap/cap.c:772
 msgid "Statistics Configuration"
 msgstr "Statistikkinnstillingar"
 
 #. msg_difference spinner
-#: ../pidgin/plugins/cap/cap.c:814
+#: ../pidgin/plugins/cap/cap.c:775
 msgid "Maximum response timeout:"
 msgstr "Største tidsavbrot for svar:"
 
-#: ../pidgin/plugins/cap/cap.c:817 ../pidgin/plugins/cap/cap.c:824
-#: ../pidgin/plugins/cap/cap.c:831 ../pidgin/plugins/timestamp.c:150
+#: ../pidgin/plugins/cap/cap.c:778
+#: ../pidgin/plugins/cap/cap.c:785
+#: ../pidgin/plugins/cap/cap.c:792
+#: ../pidgin/plugins/timestamp.c:148
 msgid "minutes"
 msgstr "minutt"
 
 #. last_seen spinner
-#: ../pidgin/plugins/cap/cap.c:821
+#: ../pidgin/plugins/cap/cap.c:782
 msgid "Maximum last-seen difference:"
 msgstr "Største skilnad for sist sett:"
 
 #. threshold spinner
-#: ../pidgin/plugins/cap/cap.c:828
+#: ../pidgin/plugins/cap/cap.c:789
 msgid "Threshold:"
 msgstr "Grense:"
 
@@ -16639,24 +17136,20 @@ msgstr "Grense:"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/cap/cap.c:936
+#: ../pidgin/plugins/cap/cap.c:897
 msgid "Contact Availability Prediction"
 msgstr "Kontakttilgjengespådom"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/cap/cap.c:938
+#: ../pidgin/plugins/cap/cap.c:899
 msgid "Contact Availability Prediction plugin."
 msgstr "Programtillegg for kontakttilgjengespådom."
 
 #. *  summary
-#: ../pidgin/plugins/cap/cap.c:939
-msgid ""
-"The contact availability plugin (cap) is used to display statistical "
-"information about buddies in a users contact list."
-msgstr ""
-"Programtillegget for kontakttilgjengespådom (cap) blir brukt til å syna "
-"statistisk informasjon om vennar i ein brukar si kontaktliste."
+#: ../pidgin/plugins/cap/cap.c:900
+msgid "The contact availability plugin (cap) is used to display statistical information about buddies in a users contact list."
+msgstr "Programtillegget for kontakttilgjengespådom (cap) blir brukt til å syna statistisk informasjon om vennar i ein brukar si kontaktliste."
 
 #: ../pidgin/plugins/contact_priority.c:61
 msgid "Buddy is idle"
@@ -16684,12 +17177,8 @@ msgstr "Verdiar som kan nyttast nÃ¥râ?Â
 msgstr "Verdiar som kan nyttast nårâ?¦"
 
 #: ../pidgin/plugins/contact_priority.c:118
-msgid ""
-"The buddy with the <i>largest score</i> is the buddy who will have priority "
-"in the contact.\n"
-msgstr ""
-"Vennen med den <i>høgste poengstillinga</i> er han som vil ha prioritet i "
-"kontakten.\n"
+msgid "The buddy with the <i>largest score</i> is the buddy who will have priority in the contact.\n"
+msgstr "Vennen med den <i>høgste poengstillinga</i> er han som vil ha prioritet i kontakten.\n"
 
 #: ../pidgin/plugins/contact_priority.c:125
 msgid "Use last buddy when scores are equal"
@@ -16705,70 +17194,66 @@ msgstr "Poengverdiar som kontoen kan nyt
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/contact_priority.c:187
+#: ../pidgin/plugins/contact_priority.c:188
 msgid "Contact Priority"
 msgstr "Kontaktprioritet"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../pidgin/plugins/contact_priority.c:190
-msgid ""
-"Allows for controlling the values associated with different buddy states."
-msgstr ""
-"Lèt deg kontrollera verdiane for dei ulike tilstandane vennane kan vera i."
+#: ../pidgin/plugins/contact_priority.c:191
+msgid "Allows for controlling the values associated with different buddy states."
+msgstr "Lèt deg kontrollera verdiane for dei ulike tilstandane vennane kan vera i."
 
 #. *< description
-#: ../pidgin/plugins/contact_priority.c:192
-msgid ""
-"Allows for changing the point values of idle/away/offline states for buddies "
-"in contact priority computations."
-msgstr ""
-"Lèt deg endra verdiane til vennestatusen (uverksam/vekke/fråkopla) i "
-"utrekninga av kontaktprioritering."
+#: ../pidgin/plugins/contact_priority.c:193
+msgid "Allows for changing the point values of idle/away/offline states for buddies in contact priority computations."
+msgstr "Lèt deg endra verdiane til vennestatusen (uverksam/vekke/fråkopla) i utrekninga av kontaktprioritering."
 
 #: ../pidgin/plugins/convcolors.c:23
 msgid "Conversation Colors"
 msgstr "Samtalefargar"
 
-#: ../pidgin/plugins/convcolors.c:25 ../pidgin/plugins/convcolors.c:26
+#: ../pidgin/plugins/convcolors.c:25
+#: ../pidgin/plugins/convcolors.c:26
 msgid "Customize colors in the conversation window"
 msgstr "Tilpassa fargar i samtalevindauget"
 
-#: ../pidgin/plugins/convcolors.c:82
+#: ../pidgin/plugins/convcolors.c:87
 msgid "Error Messages"
 msgstr "Feilmeldingar"
 
-#: ../pidgin/plugins/convcolors.c:83
+#: ../pidgin/plugins/convcolors.c:88
 msgid "Highlighted Messages"
 msgstr "Framheva meldingar"
 
-#: ../pidgin/plugins/convcolors.c:84
+#: ../pidgin/plugins/convcolors.c:89
 msgid "System Messages"
 msgstr "Systemmeldingar"
 
-#: ../pidgin/plugins/convcolors.c:85
+#: ../pidgin/plugins/convcolors.c:90
 msgid "Sent Messages"
 msgstr "Sende meldingar"
 
-#: ../pidgin/plugins/convcolors.c:86
+#: ../pidgin/plugins/convcolors.c:91
 msgid "Received Messages"
 msgstr "Mottekne meldingar"
 
-#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:251
+#: ../pidgin/plugins/convcolors.c:223
+#: ../pidgin/plugins/pidginrc.c:257
 #, c-format
 msgid "Select Color for %s"
 msgstr "Vel farge for %s"
 
-#: ../pidgin/plugins/convcolors.c:310
+#: ../pidgin/plugins/convcolors.c:372
 msgid "Ignore incoming format"
 msgstr "Ign_orer innkomande format"
 
-#: ../pidgin/plugins/convcolors.c:311
+#: ../pidgin/plugins/convcolors.c:373
 msgid "Apply in Chats"
 msgstr "Bruk i praterom"
 
-#: ../pidgin/plugins/convcolors.c:312
+#: ../pidgin/plugins/convcolors.c:374
 msgid "Apply in IMs"
 msgstr "Bruk i lynmeldingar"
 
@@ -16782,12 +17267,8 @@ msgstr "Samtaleplassering"
 
 #. Translators: "New conversations" should match the text in the preferences dialog and "By conversation count" should be the same text used above
 #: ../pidgin/plugins/extplacement.c:105
-msgid ""
-"Note: The preference for \"New conversations\" must be set to \"By "
-"conversation count\"."
-msgstr ""
-"Merk: Innstillinga for \"Nye samtaler\" vera stilt inn på \"Etter tal på "
-"samtaler\"."
+msgid "Note: The preference for \"New conversations\" must be set to \"By conversation count\"."
+msgstr "Merk: innstillinga for \"Nye samtaler\" vera stilt inn på \"Etter tal på samtaler\"."
 
 #: ../pidgin/plugins/extplacement.c:111
 msgid "Number of conversations per window"
@@ -16816,12 +17297,8 @@ msgstr "Fleire innstillingar for samtale
 #. *< summary
 #. *  description
 #: ../pidgin/plugins/extplacement.c:150
-msgid ""
-"Restrict the number of conversations per windows, optionally separating IMs "
-"and Chats"
-msgstr ""
-"Avgrens talet på samtaler i kvart vindauge og, om du vil, skil "
-"lynmeldingsvindauge og praterom"
+msgid "Restrict the number of conversations per windows, optionally separating IMs and Chats"
+msgstr "Avgrens talet på samtaler i kvart vindauge og, om du vil, skil lynmeldingsvindauge og praterom"
 
 #. Configuration frame
 #: ../pidgin/plugins/gestures/gestures.c:235
@@ -16903,11 +17380,8 @@ msgstr "Vel venn"
 
 #. Add the label.
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:343
-msgid ""
-"Select a person from your address book to add this buddy to, or create a new "
-"person."
-msgstr ""
-"Legg denne vennen til ein person i adresseboka, eller lag ei ny oppføring."
+msgid "Select a person from your address book to add this buddy to, or create a new person."
+msgstr "Legg denne vennen til ein person i adresseboka, eller lag ei ny oppføring."
 
 #. Add the expander
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:431
@@ -17026,7 +17500,7 @@ msgstr ""
 "\n"
 "<b>Vennenotat</b>: %s"
 
-#: ../pidgin/plugins/history.c:188
+#: ../pidgin/plugins/history.c:195
 msgid "History"
 msgstr "Historikk"
 
@@ -17044,7 +17518,8 @@ msgstr "Minimer til ikon når du er vekk
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/iconaway.c:85 ../pidgin/plugins/iconaway.c:87
+#: ../pidgin/plugins/iconaway.c:85
+#: ../pidgin/plugins/iconaway.c:87
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "Minimerer vennelista og alle opne samtaler når du går vekk."
 
@@ -17064,7 +17539,8 @@ msgstr "Markeringslinje"
 msgid "Markerline"
 msgstr "Markeringslinje"
 
-#: ../pidgin/plugins/markerline.c:25 ../pidgin/plugins/markerline.c:26
+#: ../pidgin/plugins/markerline.c:25
+#: ../pidgin/plugins/markerline.c:26
 msgid "Draw a line to indicate new messages in a conversation."
 msgstr "Trekk ei linje for å visa nye meldingar i ei samtale."
 
@@ -17072,21 +17548,19 @@ msgstr "Trekk markeringslinja i "
 msgid "Draw Markerline in "
 msgstr "Trekk markeringslinja i "
 
-#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:682
+#: ../pidgin/plugins/markerline.c:250
+#: ../pidgin/plugins/notify.c:682
 msgid "_IM windows"
 msgstr "_Lynmeldingsvindauge"
 
-#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:689
+#: ../pidgin/plugins/markerline.c:254
+#: ../pidgin/plugins/notify.c:689
 msgid "C_hat windows"
 msgstr "_Samtalevindauge"
 
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:44
-msgid ""
-"A music messaging session has been requested. Please click the MM icon to "
-"accept."
-msgstr ""
-"Det er blitt bede om ei musikkmeldingsøkt. Klikk på MM-ikonet for å godta "
-"dette."
+msgid "A music messaging session has been requested. Please click the MM icon to accept."
+msgstr "Det er blitt bede om ei musikkmeldingsøkt. Klikk på MM-ikonet for å godta dette."
 
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:45
 msgid "Music messaging session confirmed."
@@ -17135,12 +17609,8 @@ msgstr "Musikkmeldingstillegg for samkom
 
 #. *  summary
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:687
-msgid ""
-"The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
-msgstr ""
-"Musikkmeldingstillegget tillèt fleire brukarar å arbeida samstundes på eit "
-"musikkstykke ved å endra eit felles noteark i sanntid."
+msgid "The Music Messaging Plugin allows a number of users to simultaneously work on a piece of music by editting a common score in real-time."
+msgstr "Musikkmeldingstillegget tillèt fleire brukarar å arbeida samstundes på eit musikkstykke ved å endra eit felles noteark i sanntid."
 
 #. ---------- "Notify For" ----------
 #: ../pidgin/plugins/notify.c:678
@@ -17228,7 +17698,8 @@ msgstr "Meldingsvarsling"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/notify.c:910 ../pidgin/plugins/notify.c:912
+#: ../pidgin/plugins/notify.c:910
+#: ../pidgin/plugins/notify.c:912
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "Gjev varsel om uleste meldingar på fleire måtar."
 
@@ -17262,62 +17733,57 @@ msgstr ""
 "- det snur all innkommande tekst til å bli baklengs\n"
 "- det sender ei melding til personar i vennelista di når dei loggar på"
 
-#: ../pidgin/plugins/pidginrc.c:41
+#: ../pidgin/plugins/pidginrc.c:49
 msgid "Cursor Color"
 msgstr "Peikarfarge"
 
-#: ../pidgin/plugins/pidginrc.c:42
+#: ../pidgin/plugins/pidginrc.c:50
 msgid "Secondary Cursor Color"
 msgstr "Sekundær peikarfarge"
 
-#: ../pidgin/plugins/pidginrc.c:43
+#: ../pidgin/plugins/pidginrc.c:51
 msgid "Hyperlink Color"
 msgstr "Lenkjefarge"
 
 #: ../pidgin/plugins/pidginrc.c:54
+msgid "Highlighted Message Name Color"
+msgstr "Framheva melding"
+
+#: ../pidgin/plugins/pidginrc.c:66
 msgid "GtkTreeView Horizontal Separation"
 msgstr "Horisontal deling GtkTreeView"
 
-#: ../pidgin/plugins/pidginrc.c:73
+#: ../pidgin/plugins/pidginrc.c:81
 msgid "Conversation Entry"
 msgstr "Samtale"
 
-#: ../pidgin/plugins/pidginrc.c:74
-msgid "Conversation History"
-msgstr "Samtalehistorikk"
-
-#: ../pidgin/plugins/pidginrc.c:75
-msgid "Log Viewer"
-msgstr "Logglesar"
-
 # Vindauge eller meldingsvindauge?
-#: ../pidgin/plugins/pidginrc.c:76
+#: ../pidgin/plugins/pidginrc.c:82
 msgid "Request Dialog"
 msgstr "Førespurnadsvindauge"
 
-#: ../pidgin/plugins/pidginrc.c:77
+#: ../pidgin/plugins/pidginrc.c:83
 msgid "Notify Dialog"
 msgstr "Varslingsvindauge"
 
-#: ../pidgin/plugins/pidginrc.c:253
+#: ../pidgin/plugins/pidginrc.c:259
 msgid "Select Color"
 msgstr "Vel farge"
 
-#: ../pidgin/plugins/pidginrc.c:300
-#, c-format
+#: ../pidgin/plugins/pidginrc.c:306
 msgid "Select Interface Font"
 msgstr "Vel grensesnittskrift"
 
-#: ../pidgin/plugins/pidginrc.c:303
+#: ../pidgin/plugins/pidginrc.c:309
 #, c-format
 msgid "Select Font for %s"
 msgstr "Vel skrifttype for %s"
 
-#: ../pidgin/plugins/pidginrc.c:371
+#: ../pidgin/plugins/pidginrc.c:377
 msgid "GTK+ Interface Font"
 msgstr "GTK+ grensesnittskrift"
 
-#: ../pidgin/plugins/pidginrc.c:391
+#: ../pidgin/plugins/pidginrc.c:397
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ snarvegstema tekst"
 
@@ -17341,36 +17807,37 @@ msgstr "GTK+ snarvegstema tekst"
 #. widget_bool_widgets[i]);
 #. }
 #.
-#: ../pidgin/plugins/pidginrc.c:428
+#: ../pidgin/plugins/pidginrc.c:434
 msgid "Interface colors"
 msgstr "Grensesnittfargar"
 
-#: ../pidgin/plugins/pidginrc.c:452
+#: ../pidgin/plugins/pidginrc.c:458
 msgid "Widget Sizes"
 msgstr "Grafiske element-storleikar"
 
-#: ../pidgin/plugins/pidginrc.c:473
+#: ../pidgin/plugins/pidginrc.c:479
 msgid "Fonts"
 msgstr "Skrifttypar"
 
-#: ../pidgin/plugins/pidginrc.c:497
+#: ../pidgin/plugins/pidginrc.c:503
 msgid "Gtkrc File Tools"
 msgstr "Filverktøy Gtkrc"
 
-#: ../pidgin/plugins/pidginrc.c:502
+#: ../pidgin/plugins/pidginrc.c:508
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "Skriva innstillingane til %s%sgtkrc-2.0"
 
-#: ../pidgin/plugins/pidginrc.c:511
+#: ../pidgin/plugins/pidginrc.c:517
 msgid "Re-read gtkrc files"
 msgstr "Les gtkrc-filene på nytt"
 
-#: ../pidgin/plugins/pidginrc.c:544
+#: ../pidgin/plugins/pidginrc.c:555
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Pidgin GTK+ temabehandling"
 
-#: ../pidgin/plugins/pidginrc.c:546 ../pidgin/plugins/pidginrc.c:547
+#: ../pidgin/plugins/pidginrc.c:557
+#: ../pidgin/plugins/pidginrc.c:558
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "Gjev tilgang til ofte brukte gtkrc-innstillingar."
 
@@ -17383,29 +17850,21 @@ msgstr "Let deg sende rådata til tekstb
 msgstr "Let deg sende rådata til tekstbaserte protokollar."
 
 #: ../pidgin/plugins/raw.c:178
-msgid ""
-"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
-"'Enter' in the entry box to send. Watch the debug window."
-msgstr ""
-"Gjev deg høve til å senda rå inndata til tekstbaserte protokollar (XMPP, "
-"MSN, IRC, TOC). Bruk returtasten i oppføringsfeltet for å senda. Sjå etter i "
-"feilsøkingsvindauget."
+msgid "Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit 'Enter' in the entry box to send. Watch the debug window."
+msgstr "Gjev deg høve til å senda rå inndata til tekstbaserte protokollar (XMPP, MSN, IRC, TOC). Bruk returtasten i oppføringsfeltet for å senda. Sjå etter i feilsøkingsvindauget."
 
 #: ../pidgin/plugins/relnot.c:71
 #, c-format
-msgid ""
-"You are using %s version %s.  The current version is %s.  You can get it "
-"from <a href=\"%s\">%s</a><hr>"
-msgstr ""
-"Du nyttar %s versjon %s.  Noverande utgåve er %s.  Du kan henta den nye "
-"utgåve frå <a href=\"%s\">%s</a><hr>"
+msgid "You are using %s version %s.  The current version is %s.  You can get it from <a href=\"%s\">%s</a><hr>"
+msgstr "Du nyttar %s versjon %s.  Noverande utgåve er %s.  Du kan henta den nye utgåve frå <a href=\"%s\">%s</a><hr>"
 
 #: ../pidgin/plugins/relnot.c:79
 #, c-format
 msgid "<b>ChangeLog:</b><br>%s"
 msgstr "<b>Endringslogg:</b><br>%s"
 
-#: ../pidgin/plugins/relnot.c:84 ../pidgin/plugins/relnot.c:85
+#: ../pidgin/plugins/relnot.c:84
+#: ../pidgin/plugins/relnot.c:85
 msgid "New Version Available"
 msgstr "Ny versjon er tilgjengeleg"
 
@@ -17428,11 +17887,8 @@ msgstr "Ser jamleg etter nye utgåver."
 
 #. *  description
 #: ../pidgin/plugins/relnot.c:148
-msgid ""
-"Checks periodically for new releases and notifies the user with the "
-"ChangeLog."
-msgstr ""
-"Ser jamleg etter nye utgåver og varslar brukaren gjennom endringsloggen."
+msgid "Checks periodically for new releases and notifies the user with the ChangeLog."
+msgstr "Ser jamleg etter nye utgåver og varslar brukaren gjennom endringsloggen."
 
 #: ../pidgin/plugins/spellchk.c:1962
 msgid "Duplicate Correction"
@@ -17442,61 +17898,61 @@ msgstr "Det oppgjevne ordet finst allere
 msgid "The specified word already exists in the correction list."
 msgstr "Det oppgjevne ordet finst allereie i rettelista."
 
-#: ../pidgin/plugins/spellchk.c:2177
+#: ../pidgin/plugins/spellchk.c:2176
 msgid "Text Replacements"
 msgstr "Teksterstatningar"
 
-#: ../pidgin/plugins/spellchk.c:2200
+#: ../pidgin/plugins/spellchk.c:2199
 msgid "You type"
 msgstr "Du skriv"
 
-#: ../pidgin/plugins/spellchk.c:2214
+#: ../pidgin/plugins/spellchk.c:2213
 msgid "You send"
 msgstr "Du sender"
 
-#: ../pidgin/plugins/spellchk.c:2228
+#: ../pidgin/plugins/spellchk.c:2227
 msgid "Whole words only"
 msgstr "Berre heile ord"
 
-#: ../pidgin/plugins/spellchk.c:2240
+#: ../pidgin/plugins/spellchk.c:2239
 msgid "Case sensitive"
 msgstr "Skil mellom store/små bokstavar"
 
-#: ../pidgin/plugins/spellchk.c:2266
+#: ../pidgin/plugins/spellchk.c:2265
 msgid "Add a new text replacement"
 msgstr "Legg til ei ny teksterstatning"
 
-#: ../pidgin/plugins/spellchk.c:2282
+#: ../pidgin/plugins/spellchk.c:2281
 msgid "You _type:"
 msgstr "Du _skriv:"
 
-#: ../pidgin/plugins/spellchk.c:2299
+#: ../pidgin/plugins/spellchk.c:2285
 msgid "You _send:"
 msgstr "Du s_ender:"
 
 #. Created here so it can be passed to whole_words_button_toggled.
-#: ../pidgin/plugins/spellchk.c:2311
+#: ../pidgin/plugins/spellchk.c:2288
 msgid "_Exact case match (uncheck for automatic case handling)"
-msgstr ""
-"_Nøyaktig treff (slå av for automatisk handtering av store/små bokstavar)"
+msgstr "_Nøyaktig treff (slå av for automatisk handtering av store/små bokstavar)"
 
-#: ../pidgin/plugins/spellchk.c:2313
+#: ../pidgin/plugins/spellchk.c:2290
 msgid "Only replace _whole words"
 msgstr "Byt berre ut _heile ord"
 
-#: ../pidgin/plugins/spellchk.c:2338
+#: ../pidgin/plugins/spellchk.c:2315
 msgid "General Text Replacement Options"
 msgstr "Generelle teksterstatningsval"
 
-#: ../pidgin/plugins/spellchk.c:2339
+#: ../pidgin/plugins/spellchk.c:2316
 msgid "Enable replacement of last word on send"
 msgstr "Slå på byte av siste ord ved sending"
 
-#: ../pidgin/plugins/spellchk.c:2370
+#: ../pidgin/plugins/spellchk.c:2349
 msgid "Text replacement"
 msgstr "Teksterstatning"
 
-#: ../pidgin/plugins/spellchk.c:2372 ../pidgin/plugins/spellchk.c:2373
+#: ../pidgin/plugins/spellchk.c:2351
+#: ../pidgin/plugins/spellchk.c:2352
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Erstattar tekst i utgåande meldingar etter dine reglar."
 
@@ -17506,7 +17962,8 @@ msgstr "Erstattar tekst i utgåande meld
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/ticker/ticker.c:74 ../pidgin/plugins/ticker/ticker.c:354
+#: ../pidgin/plugins/ticker/ticker.c:74
+#: ../pidgin/plugins/ticker/ticker.c:356
 msgid "Buddy Ticker"
 msgstr "Rullande kontaktliste"
 
@@ -17514,11 +17971,12 @@ msgstr "Rullande kontaktliste"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/ticker/ticker.c:357 ../pidgin/plugins/ticker/ticker.c:359
+#: ../pidgin/plugins/ticker/ticker.c:359
+#: ../pidgin/plugins/ticker/ticker.c:361
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "Ein rullande, vassrett versjon av vennelista."
 
-#: ../pidgin/plugins/timestamp.c:137
+#: ../pidgin/plugins/timestamp.c:135
 msgid "Display Timestamps Every"
 msgstr "Vis tidsstempel kvar(t)"
 
@@ -17528,19 +17986,19 @@ msgstr "Vis tidsstempel kvar(t)"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp.c:202
+#: ../pidgin/plugins/timestamp.c:200
 msgid "Timestamp"
 msgstr "Tidsstempel"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp.c:205
+#: ../pidgin/plugins/timestamp.c:203
 msgid "Display iChat-style timestamps"
 msgstr "Vis iChat-liknande tidsstempel"
 
 #. *  description
-#: ../pidgin/plugins/timestamp.c:207
+#: ../pidgin/plugins/timestamp.c:205
 msgid "Display iChat-style timestamps every N minutes."
 msgstr "Vis  iChat-liknande tidsstempel kvart N. minutt."
 
@@ -17549,7 +18007,6 @@ msgstr "Formateringsval for tidsstempel"
 msgstr "Formateringsval for tidsstempel"
 
 #: ../pidgin/plugins/timestamp_format.c:26
-#, c-format
 msgid "_Force 24-hour time format"
 msgstr "_Tving 24h tidsformat"
 
@@ -17561,15 +18018,17 @@ msgstr "_Samtaler:"
 msgid "Co_nversations:"
 msgstr "_Samtaler:"
 
+# var: For forseinka meldingar
 #: ../pidgin/plugins/timestamp_format.c:40
 #: ../pidgin/plugins/timestamp_format.c:49
 msgid "For delayed messages"
-msgstr "For forseinka meldingar"
+msgstr "Forseinka meldingar"
 
+# var: For forseinka meldingar og i praterom
 #: ../pidgin/plugins/timestamp_format.c:41
 #: ../pidgin/plugins/timestamp_format.c:50
 msgid "For delayed messages and in chats"
-msgstr "For forseinka meldingar og i praterom"
+msgstr "Forseinka meldingar og i praterom"
 
 #: ../pidgin/plugins/timestamp_format.c:47
 msgid "_Message Logs:"
@@ -17594,12 +18053,8 @@ msgstr "Tilpassar tidsstemplingsformata 
 
 #. *  description
 #: ../pidgin/plugins/timestamp_format.c:156
-msgid ""
-"This plugin allows the user to customize conversation and logging message "
-"timestamp formats."
-msgstr ""
-"Dette programtillegget tillèt at brukaren tilpassar tidsstempelformata for "
-"samtaler og loggmeldingar."
+msgid "This plugin allows the user to customize conversation and logging message timestamp formats."
+msgstr "Dette programtillegget tillèt at brukaren tilpassar tidsstempelformata for samtaler og loggmeldingar."
 
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:175
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:598
@@ -17662,13 +18117,11 @@ msgid ""
 #. *  description
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:698
 msgid ""
-"This plugin enables variable alpha transparency on conversation windows and "
-"the buddy list.\n"
+"This plugin enables variable alpha transparency on conversation windows and the buddy list.\n"
 "\n"
 "* Note: This plugin requires Win2000 or greater."
 msgstr ""
-"Dette programtillegget gjev variabel alfa-transparens i samtalevindauge og "
-"vennelister.\n"
+"Dette programtillegget gjev variabel alfa-transparens i samtalevindauge og vennelister.\n"
 "\n"
 "*Merk: Tillegget krev Windows 2000 eller seinare utgåver."
 
@@ -17713,13 +18166,10 @@ msgstr "Innstillingar som berre gjeld Pi
 msgstr "Innstillingar som berre gjeld Pidgin under Windows."
 
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:374
-msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
-msgstr ""
-"Tilbyr val som berre gjeld Pidgin under Windows, som til dømes festing av "
-"vennelista."
+msgid "Provides options specific to Pidgin for Windows , such as buddy list docking."
+msgstr "Tilbyr val som berre gjeld Pidgin under Windows, som til dømes festing av vennelista."
 
-#: ../pidgin/plugins/xmppconsole.c:667
+#: ../pidgin/plugins/xmppconsole.c:670
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "<font color='#777777'>Utlogga</font>"
 
@@ -17729,178 +18179,88 @@ msgstr "<font color='#777777'>Utlogga</f
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/xmppconsole.c:746 ../pidgin/plugins/xmppconsole.c:841
-#: ../pidgin/plugins/xmppconsole.c:860
+#: ../pidgin/plugins/xmppconsole.c:749
+#: ../pidgin/plugins/xmppconsole.c:844
+#: ../pidgin/plugins/xmppconsole.c:863
 msgid "XMPP Console"
 msgstr "XMPP-konsoll"
 
-#: ../pidgin/plugins/xmppconsole.c:753
+#: ../pidgin/plugins/xmppconsole.c:756
 msgid "Account: "
 msgstr "Konto:"
 
-#: ../pidgin/plugins/xmppconsole.c:780
+#: ../pidgin/plugins/xmppconsole.c:783
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>Ikkje tilkopla XMPP</font>"
 
-#: ../pidgin/plugins/xmppconsole.c:790
+#: ../pidgin/plugins/xmppconsole.c:793
 msgid "Insert an <iq/> stanza."
 msgstr "Set inn ei <iq/>-blokk."
 
-#: ../pidgin/plugins/xmppconsole.c:799
+#: ../pidgin/plugins/xmppconsole.c:802
 msgid "Insert a <presence/> stanza."
 msgstr "Set inn ei <presence/>-blokk."
 
-#: ../pidgin/plugins/xmppconsole.c:808
+#: ../pidgin/plugins/xmppconsole.c:811
 msgid "Insert a <message/> stanza."
 msgstr "Set inn ei <message/>-blokk."
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/xmppconsole.c:863
+#: ../pidgin/plugins/xmppconsole.c:866
 msgid "Send and receive raw XMPP stanzas."
 msgstr "Senda og ta i mot reine XMPP-blokker."
 
 #. *  description
-#: ../pidgin/plugins/xmppconsole.c:865
+#: ../pidgin/plugins/xmppconsole.c:868
 msgid "This plugin is useful for debbuging XMPP servers or clients."
-msgstr ""
-"Dette programtillegget er nyttig ved feilsøking av XMPP-tenarar og -klientar."
+msgstr "Dette programtillegget er nyttig ved feilsøking av XMPP-tenarar og -klientar."
 
-#, fuzzy
-#~ msgid "Show"
-#~ msgstr "Vis alt"
-
-#, fuzzy
-#~ msgid "Offline buddies"
-#~ msgstr "Vis fråkopla vennar"
-
-#, fuzzy
-#~ msgid "Sort"
-#~ msgstr "Port"
-
-#, fuzzy
-#~ msgid "By Status"
-#~ msgstr "Etter status"
-
-#, fuzzy
-#~ msgid "By Log Size"
-#~ msgstr "Etter loggstorleiken"
-
-#, fuzzy
-#~ msgid "Unable to connect to contact server"
-#~ msgstr "Klarer ikkje å kopla til tenaren."
-
-#, fuzzy
-#~ msgid "Unable to retrieve MSN Address Book"
-#~ msgstr "Vel Notes adressebok"
-
-#, fuzzy
+#~ msgid ""
+#~ "Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
+#~ "username and choose a username and try to login again."
+#~ msgstr ""
+#~ "GÃ¥ til http://editprofile.myspace.com/index.cfm?fuseaction=profile."
+#~ "username og vel eit brukarnamn. Prøv deretter å logga på igjen."
+#~ msgid "/Conversation/Send _Attention..."
+#~ msgstr "/Samtale/Send _varsel…"
+#~ msgid "/Conversation/Send Attention"
+#~ msgstr "/Samtale/Send _varsel"
+#~ msgid ""
+#~ "Sorry, passwords over %d characters in length (yours is %d) are not "
+#~ "supported by MySpace."
+#~ msgstr ""
+#~ "MySpace støttar ikkje passord med fleire enn %d teikn. Passordet ditt er "
+#~ "på %d teikn."
+#~ msgid "Pounce only when my status is not available"
+#~ msgstr "Vennevarsling berre når tilstanden min ikkje er tilgjengeleg"
+#~ msgid "Use recent buddies group"
+#~ msgstr "Bruk seinaste vennegruppe"
+#~ msgid "Show how long you have been idle"
+#~ msgstr "Vis kor lenge du har vore uverksam"
+#~ msgid "Cannot find/access ~/.silc directory"
+#~ msgstr "Finn ikkje/får ikkje tilgang til ~/.silc-katalogen"
 #~ msgid "Current media"
-#~ msgstr "Noverande markør"
-
-#, fuzzy
-#~ msgid "Windows Live Messenger Protocol Plugin"
-#~ msgstr "Novell GroupWise Messenger-protokolltillegg"
-
-#, fuzzy
-#~ msgid "Windows Live ID authentication Failed"
-#~ msgstr "Feil: autentiseringa feila"
-
-#~ msgid "%s just sent you a Nudge!"
-#~ msgstr "%s sende deg nettopp ein dytt (\"nudge\")."
-
-#, fuzzy
-#~ msgid "Unknown error (%d)"
-#~ msgstr "Ukjend feil"
-
-#, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "Klarer ikkje å kopla til tenaren."
-
-#, fuzzy
-#~ msgid "%s (%s) changed status from %s to %s"
+#~ msgstr "Gjeldande media"
+#~ msgid "User has typed something and stopped"
+#~ msgstr "Brukaren har skrive noko og stoppa"
+#~ msgid ""
+#~ "\n"
+#~ "%s has typed something and stopped"
+#~ msgstr ""
+#~ "\n"
+#~ "%s har skrive noko og stoppa"
+#~ msgid "Display Statistics"
+#~ msgstr "Vis statistikk"
+#~ msgid "S_mile!"
+#~ msgstr "S_mil!"
+#~ msgid "%s changed status from %s to %s"
 #~ msgstr "%s endra status frå %s til %s"
-
-#, fuzzy
-#~ msgid "%s (%s) is now %s"
+#~ msgid "%s is now %s"
 #~ msgstr "%s er no %s"
-
-#, fuzzy
-#~ msgid "%s (%s) is no longer %s"
+#~ msgid "%s is no longer %s"
 #~ msgstr "%s er ikkje lenger %s"
+#~ msgid "Invalid chat name specified."
+#~ msgstr "Det oppgjevne pratenamnet er ugyldig."
 
-#, fuzzy
-#~ msgid "_Merge"
-#~ msgstr "_Melding:"
-
-#, fuzzy
-#~ msgid "_Send File..."
-#~ msgstr "_Send fil"
-
-#, fuzzy
-#~ msgid "Add Buddy _Pounce..."
-#~ msgstr "Legg til vennevarsling…"
-
-#, fuzzy
-#~ msgid "Hide when offline"
-#~ msgstr "Ikkje tillate når du er fråkopla"
-
-#, fuzzy
-#~ msgid "Show when offline"
-#~ msgstr "Ikkje tillate når du er fråkopla"
-
-#, fuzzy
-#~ msgid "Add _Buddy..."
-#~ msgstr "Legg til venn"
-
-#, fuzzy
-#~ msgid "Add C_hat..."
-#~ msgstr "Legg til praterom"
-
-#, fuzzy
-#~ msgid "Persistent"
-#~ msgstr "Persisk"
-
-#, fuzzy
-#~ msgid "/Accounts/Manage"
-#~ msgstr "/Kontoar"
-
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "Konto:"
-
-#, fuzzy
-#~ msgid "S_end To"
-#~ msgstr "Send til"
-
-#, fuzzy
-#~ msgid "_Smile!"
-#~ msgstr "Smil!"
-
-#~ msgid "nudged"
-#~ msgstr "dytta"
-
-#~ msgid "You have just sent a Nudge!"
-#~ msgstr "Du har nettopp sendt ein dytt (\"nudge\")"
-
-#~ msgid "%s just sent you a Buzz!"
-#~ msgstr "%s sendte deg nettopp ein alarm"
-
-#~ msgid "You have just sent a Buzz!"
-#~ msgstr "Du har nettopp sendt ein alarm"
-
-#~ msgid "buzzed"
-#~ msgstr "alarmert"
-
-#~ msgid "Attention! %s %s."
-#~ msgstr "OBS! %s %s."
-
-#~ msgid "Attention!"
-#~ msgstr "OBS!"
-
-#~ msgid "Attention! You have been %s."
-#~ msgstr "NB! Du er blitt %s."
-
-#~ msgid "/Conversation/_Hide"
-#~ msgstr "/Samtale/Skj_ul"


More information about the Commits mailing list