changeset 19923:a70a090877cd

fixes #2878 committer: Luke Schierer <lschiere@pidgin.im>
author Yngve Spjeld Landro <nynorsk@strilen.net>
date Tue, 11 Sep 2007 23:17:56 +0000
parents 300aabf3771a
children b8b2abeb71a7
files po/ChangeLog po/nn.po
diffstat 2 files changed, 2376 insertions(+), 1971 deletions(-) [+]
line wrap: on
line diff
--- a/po/ChangeLog	Tue Sep 11 23:16:04 2007 +0000
+++ b/po/ChangeLog	Tue Sep 11 23:17:56 2007 +0000
@@ -7,6 +7,7 @@
 	* Hungarian translation updated (Gabor Kelemen)
 	* Italian translation updated (Claudio Satriano)
 	* Macedonian translation updated (Арангел Ангов)
+	* Norwegian Nynorsk translation updated (Yngve Spjeld Landro)
 	* Slovak translation updated (loptosko)
 
 version 2.1.1
--- a/po/nn.po	Tue Sep 11 23:16:04 2007 +0000
+++ b/po/nn.po	Tue Sep 11 23:17:56 2007 +0000
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2007-08-14 00:28+0100\n"
+"PO-Revision-Date: 2007-09-06 23:00+0100\n"
 "Last-Translator: Y S Landro <nynorsk@strilen.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -15,7 +15,7 @@
 #: ../finch/finch.c:64
 #: ../finch/finch.c:300
 #: ../finch/finch.c:329
-#: ../finch/finch.c:417
+#: ../finch/finch.c:415
 msgid "Finch"
 msgstr "Finch"
 
@@ -52,18 +52,21 @@
 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:123
-#: ../finch/gntaccount.c:478
+#: ../finch/gntaccount.c:483
 #: ../finch/gntblist.c:299
 #: ../finch/gntblist.c:432
 #: ../finch/gntblist.c:445
 #: ../finch/gntplugin.c:185
 #: ../finch/gntplugin.c:233
 #: ../finch/gntstatus.c:300
-#: ../finch/gntstatus.c:308
+#: ../finch/gntstatus.c:309
+#: ../finch/plugins/gntclipboard.c:115
+#: ../finch/plugins/gntclipboard.c:121
+#: ../finch/plugins/gntclipboard.c:128
 #: ../libpurple/protocols/jabber/buddy.c:1464
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1227
+#: ../libpurple/protocols/jabber/jabber.c:1218
 #: ../libpurple/protocols/qq/group_join.c:328
 #: ../libpurple/protocols/qq/im.c:576
 #: ../libpurple/protocols/silc/ops.c:57
@@ -80,74 +83,74 @@
 msgid "Screenname of an account must be non-empty."
 msgstr "Brukarnamnet til ein konto kan ikkje vera tomt."
 
-#: ../finch/gntaccount.c:431
+#: ../finch/gntaccount.c:436
 msgid "New mail notifications"
 msgstr "Varsling om ny e-post"
 
-#: ../finch/gntaccount.c:441
+#: ../finch/gntaccount.c:446
 msgid "Remember password"
 msgstr "Hugs passordet"
 
-#: ../finch/gntaccount.c:479
+#: ../finch/gntaccount.c:484
 msgid "There's no protocol plugins installed."
 msgstr "Ingen protokolltillegg er installerte."
 
-#: ../finch/gntaccount.c:480
+#: ../finch/gntaccount.c:485
 msgid "(You probably forgot to 'make install'.)"
 msgstr "(Du har truleg gløymt å kjøra 'make install')"
 
-#: ../finch/gntaccount.c:490
-#: ../pidgin/gtkaccount.c:1478
-#: ../pidgin/gtkblist.c:4027
+#: ../finch/gntaccount.c:495
+#: ../pidgin/gtkaccount.c:1473
+#: ../pidgin/gtkblist.c:4037
 msgid "Modify Account"
 msgstr "Endra konto"
 
-#: ../finch/gntaccount.c:490
+#: ../finch/gntaccount.c:495
 msgid "New Account"
 msgstr "Ny konto"
 
-#: ../finch/gntaccount.c:515
+#: ../finch/gntaccount.c:520
 #: ../pidgin/gtkft.c:695
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: ../finch/gntaccount.c:523
+#: ../finch/gntaccount.c:528
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:291
 msgid "Screen name:"
 msgstr "Brukarnamn:"
 
-#: ../finch/gntaccount.c:536
+#: ../finch/gntaccount.c:541
 msgid "Password:"
 msgstr "Passord:"
 
-#: ../finch/gntaccount.c:546
+#: ../finch/gntaccount.c:551
 msgid "Alias:"
 msgstr "Alias:"
 
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:569
-#: ../finch/gntaccount.c:632
-#: ../finch/gntaccount.c:878
+#: ../finch/gntaccount.c:574
+#: ../finch/gntaccount.c:637
+#: ../finch/gntaccount.c:883
 #: ../finch/gntblist.c:343
 #: ../finch/gntblist.c:420
 #: ../finch/gntblist.c:455
 #: ../finch/gntblist.c:802
 #: ../finch/gntblist.c:1004
 #: ../finch/gntblist.c:1100
-#: ../finch/gntblist.c:2209
+#: ../finch/gntblist.c:2221
 #: ../finch/gntplugin.c:378
 #: ../finch/gntpounce.c:458
-#: ../finch/gntpounce.c:656
+#: ../finch/gntpounce.c:666
 #: ../finch/gntprefs.c:264
-#: ../finch/gntsound.c:1045
+#: ../finch/gntsound.c:1057
 #: ../finch/gntstatus.c:144
-#: ../finch/gntstatus.c:481
-#: ../finch/gntstatus.c:606
+#: ../finch/gntstatus.c:484
+#: ../finch/gntstatus.c:609
 #: ../libpurple/account.c:984
 #: ../libpurple/account.c:1234
 #: ../libpurple/account.c:1269
-#: ../libpurple/conversation.c:1173
+#: ../libpurple/conversation.c:1219
 #: ../libpurple/plugins/buddynote.c:51
 #: ../libpurple/protocols/gg/gg.c:502
 #: ../libpurple/protocols/gg/gg.c:661
@@ -157,16 +160,16 @@
 #: ../libpurple/protocols/jabber/buddy.c:1826
 #: ../libpurple/protocols/jabber/buddy.c:1862
 #: ../libpurple/protocols/jabber/chat.c:786
-#: ../libpurple/protocols/jabber/jabber.c:882
-#: ../libpurple/protocols/jabber/jabber.c:1384
+#: ../libpurple/protocols/jabber/jabber.c:873
+#: ../libpurple/protocols/jabber/jabber.c:1375
 #: ../libpurple/protocols/jabber/si.c:868
 #: ../libpurple/protocols/jabber/xdata.c:337
-#: ../libpurple/protocols/msn/msn.c:259
-#: ../libpurple/protocols/msn/msn.c:276
-#: ../libpurple/protocols/msn/msn.c:293
-#: ../libpurple/protocols/msn/msn.c:310
-#: ../libpurple/protocols/msn/msn.c:331
-#: ../libpurple/protocols/oscar/oscar.c:6042
+#: ../libpurple/protocols/msn/msn.c:296
+#: ../libpurple/protocols/msn/msn.c:313
+#: ../libpurple/protocols/msn/msn.c:330
+#: ../libpurple/protocols/msn/msn.c:347
+#: ../libpurple/protocols/msn/msn.c:368
+#: ../libpurple/protocols/oscar/oscar.c:6095
 #: ../libpurple/protocols/oscar/peer.c:1023
 #: ../libpurple/protocols/qq/buddy_info.c:484
 #: ../libpurple/protocols/qq/buddy_opt.c:214
@@ -179,12 +182,12 @@
 #: ../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:3389
-#: ../libpurple/protocols/sametime/sametime.c:3475
-#: ../libpurple/protocols/sametime/sametime.c:3646
-#: ../libpurple/protocols/sametime/sametime.c:5398
-#: ../libpurple/protocols/sametime/sametime.c:5488
-#: ../libpurple/protocols/sametime/sametime.c:5613
+#: ../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/silc/buddy.c:455
 #: ../libpurple/protocols/silc/buddy.c:1076
 #: ../libpurple/protocols/silc/buddy.c:1191
@@ -201,46 +204,46 @@
 #: ../libpurple/protocols/silc10/ops.c:1904
 #: ../libpurple/protocols/silc10/silc.c:736
 #: ../libpurple/protocols/silc10/silc.c:942
-#: ../libpurple/protocols/yahoo/yahoo.c:1006
-#: ../libpurple/protocols/yahoo/yahoo.c:3337
-#: ../libpurple/protocols/yahoo/yahoo.c:3348
-#: ../pidgin/gtkaccount.c:1917
-#: ../pidgin/gtkaccount.c:2511
-#: ../pidgin/gtkblist.c:5929
-#: ../pidgin/gtkdialogs.c:747
-#: ../pidgin/gtkdialogs.c:885
-#: ../pidgin/gtkdialogs.c:977
-#: ../pidgin/gtkdialogs.c:997
-#: ../pidgin/gtkdialogs.c:1021
-#: ../pidgin/gtkdialogs.c:1043
-#: ../pidgin/gtkdialogs.c:1091
-#: ../pidgin/gtkdialogs.c:1132
-#: ../pidgin/gtkdialogs.c:1188
-#: ../pidgin/gtkdialogs.c:1227
-#: ../pidgin/gtkdialogs.c:1254
-#: ../pidgin/gtkimhtmltoolbar.c:425
+#: ../libpurple/protocols/yahoo/yahoo.c:1034
+#: ../libpurple/protocols/yahoo/yahoo.c:3500
+#: ../libpurple/protocols/yahoo/yahoo.c:3511
+#: ../pidgin/gtkaccount.c:1908
+#: ../pidgin/gtkaccount.c:2495
+#: ../pidgin/gtkblist.c:5971
+#: ../pidgin/gtkdialogs.c:754
+#: ../pidgin/gtkdialogs.c:893
+#: ../pidgin/gtkdialogs.c:985
+#: ../pidgin/gtkdialogs.c:1005
+#: ../pidgin/gtkdialogs.c:1029
+#: ../pidgin/gtkdialogs.c:1051
+#: ../pidgin/gtkdialogs.c:1099
+#: ../pidgin/gtkdialogs.c:1140
+#: ../pidgin/gtkdialogs.c:1196
+#: ../pidgin/gtkdialogs.c:1235
+#: ../pidgin/gtkdialogs.c:1262
+#: ../pidgin/gtkimhtmltoolbar.c:434
 #: ../pidgin/gtklog.c:327
 #: ../pidgin/gtkplugin.c:288
-#: ../pidgin/gtkpounce.c:1115
+#: ../pidgin/gtkpounce.c:1100
 #: ../pidgin/gtkprivacy.c:562
 #: ../pidgin/gtkprivacy.c:578
 #: ../pidgin/gtkprivacy.c:603
 #: ../pidgin/gtkprivacy.c:617
 #: ../pidgin/gtkrequest.c:270
 #: ../pidgin/gtksavedstatuses.c:344
-#: ../pidgin/gtkstatusbox.c:1572
+#: ../pidgin/gtkstatusbox.c:1573
 msgid "Cancel"
 msgstr "Avbryt"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:573
+#: ../finch/gntaccount.c:578
 #: ../finch/gntplugin.c:378
 #: ../finch/gntpounce.c:464
 #: ../finch/gntprefs.c:264
-#: ../finch/gntsound.c:1042
-#: ../finch/gntstatus.c:484
-#: ../finch/gntstatus.c:594
+#: ../finch/gntsound.c:1054
+#: ../finch/gntstatus.c:487
+#: ../finch/gntstatus.c:597
 #: ../libpurple/account.c:1268
 #: ../libpurple/plugins/buddynote.c:50
 #: ../libpurple/protocols/jabber/buddy.c:587
@@ -249,111 +252,111 @@
 msgid "Save"
 msgstr "Lagra"
 
-#: ../finch/gntaccount.c:626
-#: ../pidgin/gtkaccount.c:1909
+#: ../finch/gntaccount.c:631
+#: ../pidgin/gtkaccount.c:1900
 #: ../pidgin/gtksavedstatuses.c:332
-#: ../pidgin/gtkstatusbox.c:1566
+#: ../pidgin/gtkstatusbox.c:1567
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Er du sikker på at du ønskjer å sletta %s?"
 
-#: ../finch/gntaccount.c:629
+#: ../finch/gntaccount.c:634
 msgid "Delete Account"
 msgstr "Slett konto"
 
 #. Delete button
-#: ../finch/gntaccount.c:631
-#: ../finch/gntaccount.c:701
-#: ../finch/gntpounce.c:655
-#: ../finch/gntpounce.c:718
+#: ../finch/gntaccount.c:636
+#: ../finch/gntaccount.c:706
+#: ../finch/gntpounce.c:665
+#: ../finch/gntpounce.c:728
 #: ../finch/gntstatus.c:143
 #: ../finch/gntstatus.c:209
-#: ../pidgin/gtkaccount.c:1916
+#: ../pidgin/gtkaccount.c:1907
 #: ../pidgin/gtklog.c:326
-#: ../pidgin/gtkpounce.c:1114
+#: ../pidgin/gtkpounce.c:1099
 #: ../pidgin/gtkrequest.c:273
 #: ../pidgin/gtksavedstatuses.c:343
-#: ../pidgin/gtkstatusbox.c:1571
+#: ../pidgin/gtkstatusbox.c:1572
 msgid "Delete"
 msgstr "Slett"
 
-#: ../finch/gntaccount.c:663
-#: ../finch/gntblist.c:2115
-#: ../finch/gntui.c:81
-#: ../pidgin/gtkaccount.c:2334
+#: ../finch/gntaccount.c:668
+#: ../finch/gntblist.c:2118
+#: ../finch/gntui.c:82
+#: ../pidgin/gtkaccount.c:2325
 #: ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "Kontoar"
 
-#: ../finch/gntaccount.c:669
+#: ../finch/gntaccount.c:674
 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:692
-#: ../finch/gntaccount.c:877
+#: ../finch/gntaccount.c:697
+#: ../finch/gntaccount.c:882
 #: ../finch/gntblist.c:342
 #: ../finch/gntblist.c:420
 #: ../finch/gntblist.c:455
 #: ../finch/gntnotify.c:379
-#: ../finch/gntpounce.c:702
+#: ../finch/gntpounce.c:712
 #: ../finch/gntstatus.c:198
 #: ../libpurple/protocols/gg/gg.c:878
 #: ../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:5487
+#: ../libpurple/protocols/sametime/sametime.c:5486
 #: ../libpurple/protocols/silc/chat.c:615
 #: ../libpurple/protocols/silc10/chat.c:599
-#: ../pidgin/gtkaccount.c:2510
-#: ../pidgin/gtkblist.c:5928
-#: ../pidgin/gtkconv.c:1653
+#: ../pidgin/gtkaccount.c:2494
+#: ../pidgin/gtkblist.c:5970
+#: ../pidgin/gtkconv.c:1639
 #: ../pidgin/gtkrequest.c:274
 msgid "Add"
 msgstr "Legg til"
 
 #. Modify button
-#: ../finch/gntaccount.c:697
-#: ../finch/gntpounce.c:710
+#: ../finch/gntaccount.c:702
+#: ../finch/gntpounce.c:720
 msgid "Modify"
 msgstr "Endre"
 
-#: ../finch/gntaccount.c:800
-#: ../pidgin/gtkaccount.c:2457
+#: ../finch/gntaccount.c:805
+#: ../pidgin/gtkaccount.c:2441
 #, 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:873
-#: ../pidgin/gtkaccount.c:2509
+#: ../finch/gntaccount.c:878
+#: ../pidgin/gtkaccount.c:2493
 msgid "Add buddy to your list?"
 msgstr "Legg til venn i lista?"
 
-#: ../finch/gntaccount.c:933
-#: ../pidgin/gtkaccount.c:2567
+#: ../finch/gntaccount.c:938
+#: ../pidgin/gtkaccount.c:2551
 #, 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:958
-#: ../finch/gntaccount.c:961
-#: ../finch/gntaccount.c:988
-#: ../pidgin/gtkaccount.c:2590
-#: ../pidgin/gtkaccount.c:2596
+#: ../finch/gntaccount.c:963
+#: ../finch/gntaccount.c:966
+#: ../finch/gntaccount.c:993
+#: ../pidgin/gtkaccount.c:2574
+#: ../pidgin/gtkaccount.c:2580
 msgid "Authorize buddy?"
 msgstr "Godkjenna venn?"
 
-#: ../finch/gntaccount.c:965
-#: ../finch/gntaccount.c:992
-#: ../pidgin/gtkaccount.c:2591
-#: ../pidgin/gtkaccount.c:2597
+#: ../finch/gntaccount.c:970
+#: ../finch/gntaccount.c:997
+#: ../pidgin/gtkaccount.c:2575
+#: ../pidgin/gtkaccount.c:2581
 msgid "Authorize"
 msgstr "Godkjenn"
 
-#: ../finch/gntaccount.c:966
-#: ../finch/gntaccount.c:993
-#: ../pidgin/gtkaccount.c:2592
-#: ../pidgin/gtkaccount.c:2598
+#: ../finch/gntaccount.c:971
+#: ../finch/gntaccount.c:998
+#: ../pidgin/gtkaccount.c:2576
+#: ../pidgin/gtkaccount.c:2582
 msgid "Deny"
 msgstr "Avslå"
 
@@ -378,8 +381,8 @@
 msgstr "Klarte ikkje å leggja til venn"
 
 #: ../finch/gntblist.c:324
-#: ../libpurple/protocols/oscar/oscar.c:2858
-#: ../pidgin/gtkaccount.c:1990
+#: ../libpurple/protocols/oscar/oscar.c:2898
+#: ../pidgin/gtkaccount.c:1981
 #: ../pidgin/gtksavedstatuses.c:979
 msgid "Screen Name"
 msgstr "Brukarnamn"
@@ -387,15 +390,15 @@
 #: ../finch/gntblist.c:327
 #: ../finch/gntblist.c:409
 #: ../finch/gntblist.c:1249
-#: ../libpurple/protocols/msn/msn.c:1364
+#: ../libpurple/protocols/msn/msn.c:1401
 #: ../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:996
-#: ../pidgin/gtkdialogs.c:1020
-#: ../pidgin/gtkdialogs.c:1042
+#: ../pidgin/gtkdialogs.c:1004
+#: ../pidgin/gtkdialogs.c:1028
+#: ../pidgin/gtkdialogs.c:1050
 #: ../pidgin/gtkrequest.c:277
 msgid "Alias"
 msgstr "Alias"
@@ -407,14 +410,14 @@
 
 #: ../finch/gntblist.c:334
 #: ../finch/gntblist.c:400
-#: ../finch/gntblist.c:1301
+#: ../finch/gntblist.c:1304
 #: ../finch/gntnotify.c:173
-#: ../finch/gntstatus.c:572
+#: ../finch/gntstatus.c:575
 #: ../libpurple/plugins/idle.c:153
 #: ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:2986
-#: ../pidgin/gtknotify.c:483
-#: ../pidgin/gtkpounce.c:1282
+#: ../pidgin/gtkblist.c:3005
+#: ../pidgin/gtknotify.c:488
+#: ../pidgin/gtkpounce.c:1267
 #: ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr "Konto"
@@ -429,8 +432,8 @@
 #: ../libpurple/protocols/silc10/buddy.c:1033
 #: ../libpurple/protocols/silc10/buddy.c:1080
 #: ../libpurple/protocols/silc10/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3182
-#: ../pidgin/gtkblist.c:5435
+#: ../libpurple/protocols/yahoo/yahoo.c:3345
+#: ../pidgin/gtkblist.c:5477
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "Legg til venn"
@@ -446,10 +449,10 @@
 
 #. Extract their Name and put it in
 #: ../finch/gntblist.c:406
-#: ../libpurple/protocols/jabber/jabber.c:813
-#: ../libpurple/protocols/msn/msn.c:1553
-#: ../libpurple/protocols/msn/msn.c:1618
-#: ../libpurple/protocols/msn/msn.c:1645
+#: ../libpurple/protocols/jabber/jabber.c:804
+#: ../libpurple/protocols/msn/msn.c:1590
+#: ../libpurple/protocols/msn/msn.c:1655
+#: ../libpurple/protocols/msn/msn.c:1682
 #: ../libpurple/protocols/qq/buddy_info.c:44
 #: ../pidgin/gtkplugin.c:581
 #: ../pidgin/gtkroomlist.c:617
@@ -465,7 +468,7 @@
 
 #: ../finch/gntblist.c:418
 #: ../finch/gntblist.c:853
-#: ../pidgin/gtkblist.c:5814
+#: ../pidgin/gtkblist.c:5856
 msgid "Add Chat"
 msgstr "Legg til praterom"
 
@@ -488,9 +491,9 @@
 
 #: ../finch/gntblist.c:453
 #: ../finch/gntblist.c:855
-#: ../libpurple/protocols/sametime/sametime.c:5397
-#: ../libpurple/protocols/sametime/sametime.c:5485
-#: ../pidgin/gtkblist.c:5925
+#: ../libpurple/protocols/sametime/sametime.c:5396
+#: ../libpurple/protocols/sametime/sametime.c:5484
+#: ../pidgin/gtkblist.c:5967
 msgid "Add Group"
 msgstr "Legg til gruppe"
 
@@ -526,7 +529,7 @@
 msgstr "Hentar…"
 
 #: ../finch/gntblist.c:903
-#: ../finch/gntconv.c:407
+#: ../finch/gntconv.c:484
 #: ../libpurple/protocols/silc/chat.c:899
 #: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
@@ -538,11 +541,11 @@
 
 #. if (q_bud && is_online(q_bud->status)) {
 #: ../finch/gntblist.c:914
-#: ../finch/gntconv.c:419
+#: ../finch/gntconv.c:496
 #: ../libpurple/protocols/jabber/si.c:868
 #: ../libpurple/protocols/oscar/oscar.c:653
 #: ../libpurple/protocols/qq/qq.c:587
-#: ../pidgin/gtkconv.c:1601
+#: ../pidgin/gtkconv.c:1587
 msgid "Send File"
 msgstr "Send fil"
 
@@ -588,8 +591,8 @@
 
 #: ../finch/gntblist.c:1099
 #: ../finch/gntblist.c:1251
-#: ../finch/gntft.c:224
-#: ../pidgin/gtkconv.c:1650
+#: ../finch/gntft.c:226
+#: ../pidgin/gtkconv.c:1636
 #: ../pidgin/gtkrequest.c:275
 #: ../pidgin/gtkstatusbox.c:263
 msgid "Remove"
@@ -597,11 +600,12 @@
 
 #. Buddy List
 #: ../finch/gntblist.c:1225
-#: ../finch/gntblist.c:2294
+#: ../finch/gntblist.c:2306
 #: ../finch/gntprefs.c:257
-#: ../finch/gntui.c:82
-#: ../pidgin/gtkblist.c:4271
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:330
+#: ../finch/gntui.c:83
+#: ../pidgin/gtkblist.c:2685
+#: ../pidgin/gtkblist.c:4281
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "Venneliste"
 
@@ -614,7 +618,7 @@
 msgstr "Slå merke av/på"
 
 #. General
-#: ../finch/gntblist.c:1296
+#: ../finch/gntblist.c:1297
 #: ../libpurple/protocols/gg/gg.c:632
 #: ../libpurple/protocols/gg/gg.c:1045
 #: ../libpurple/protocols/gg/gg.c:1118
@@ -623,9 +627,9 @@
 #: ../libpurple/protocols/jabber/buddy.c:856
 #: ../libpurple/protocols/jabber/buddy.c:1627
 #: ../libpurple/protocols/jabber/buddy.c:1809
-#: ../libpurple/protocols/jabber/jabber.c:823
-#: ../libpurple/protocols/msn/msn.c:1372
-#: ../libpurple/protocols/msn/msn.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:814
+#: ../libpurple/protocols/msn/msn.c:1409
+#: ../libpurple/protocols/msn/msn.c:1593
 #: ../libpurple/protocols/qq/buddy_info.c:43
 #: ../libpurple/protocols/silc/buddy.c:1535
 #: ../libpurple/protocols/silc/ops.c:1002
@@ -636,33 +640,33 @@
 #: ../libpurple/protocols/silc10/ops.c:1179
 #: ../libpurple/protocols/silc10/ops.c:1328
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1066
-#: ../pidgin/gtkblist.c:3010
+#: ../pidgin/gtkblist.c:3029
 msgid "Nickname"
 msgstr "Kallenamn"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1316
+#: ../finch/gntblist.c:1319
 #: ../finch/gntprefs.c:260
-#: ../libpurple/protocols/bonjour/bonjour.c:333
+#: ../libpurple/protocols/bonjour/bonjour.c:340
 #: ../libpurple/protocols/jabber/buddy.c:647
 #: ../libpurple/protocols/jabber/buddy.c:687
-#: ../libpurple/protocols/msn/msn.c:516
+#: ../libpurple/protocols/msn/msn.c:553
 #: ../libpurple/protocols/msn/state.c:32
 #: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2882
-#: ../libpurple/protocols/yahoo/yahoo.c:2936
+#: ../libpurple/protocols/oscar/oscar.c:2922
+#: ../libpurple/protocols/yahoo/yahoo.c:3099
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:710
-#: ../pidgin/gtkblist.c:3038
-#: ../pidgin/gtkblist.c:3447
-#: ../pidgin/gtkprefs.c:1920
+#: ../pidgin/gtkblist.c:3057
+#: ../pidgin/gtkblist.c:3457
+#: ../pidgin/gtkprefs.c:1922
 msgid "Idle"
 msgstr "Uverksam"
 
-#: ../finch/gntblist.c:1330
+#: ../finch/gntblist.c:1333
 msgid "On Mobile"
 msgstr "På mobil"
 
-#: ../finch/gntblist.c:1411
+#: ../finch/gntblist.c:1414
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -671,12 +675,12 @@
 "Tilkopla: %d\n"
 "Totalt: %d"
 
-#: ../finch/gntblist.c:1420
+#: ../finch/gntblist.c:1423
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "Konto: %s (%s)"
 
-#: ../finch/gntblist.c:1432
+#: ../finch/gntblist.c:1435
 #, c-format
 msgid ""
 "\n"
@@ -685,64 +689,64 @@
 "\n"
 "Sist sett: %s ago"
 
-#: ../finch/gntblist.c:1698
+#: ../finch/gntblist.c:1701
 #: ../pidgin/gtkdocklet.c:470
-#: ../pidgin/gtkstatusbox.c:1070
+#: ../pidgin/gtkstatusbox.c:1071
 msgid "New..."
 msgstr "Ny…"
 
-#: ../finch/gntblist.c:1705
+#: ../finch/gntblist.c:1708
 #: ../pidgin/gtkdocklet.c:471
-#: ../pidgin/gtkstatusbox.c:1071
+#: ../pidgin/gtkstatusbox.c:1072
 msgid "Saved..."
 msgstr "Lagra…"
 
-#: ../finch/gntblist.c:2083
+#: ../finch/gntblist.c:2086
 #: ../finch/gntplugin.c:254
-#: ../finch/gntui.c:86
+#: ../finch/gntui.c:88
 #: ../pidgin/gtkdocklet.c:523
 #: ../pidgin/gtkplugin.c:530
 msgid "Plugins"
 msgstr "Tilleggsprogram"
 
-#: ../finch/gntblist.c:2190
-#: ../pidgin/gtkdialogs.c:728
-#: ../pidgin/gtkdialogs.c:866
-#: ../pidgin/gtkdialogs.c:947
+#: ../finch/gntblist.c:2202
+#: ../pidgin/gtkdialogs.c:735
+#: ../pidgin/gtkdialogs.c:874
+#: ../pidgin/gtkdialogs.c:955
 msgid "_Name"
 msgstr "_Namn"
 
-#: ../finch/gntblist.c:2195
-#: ../pidgin/gtkdialogs.c:733
-#: ../pidgin/gtkdialogs.c:871
-#: ../pidgin/gtkdialogs.c:952
+#: ../finch/gntblist.c:2207
+#: ../pidgin/gtkdialogs.c:740
+#: ../pidgin/gtkdialogs.c:879
+#: ../pidgin/gtkdialogs.c:960
 msgid "_Account"
 msgstr "_Konto"
 
-#: ../finch/gntblist.c:2203
-#: ../pidgin/gtkdialogs.c:741
+#: ../finch/gntblist.c:2215
+#: ../pidgin/gtkdialogs.c:748
 msgid "New Instant Message"
 msgstr "Ny lynmelding"
 
-#: ../finch/gntblist.c:2205
-#: ../pidgin/gtkdialogs.c:743
+#: ../finch/gntblist.c:2217
+#: ../pidgin/gtkdialogs.c:750
 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:2208
+#: ../finch/gntblist.c:2220
 #: ../finch/gntnotify.c:79
 #: ../libpurple/account.c:983
 #: ../libpurple/account.c:1233
 #: ../libpurple/protocols/gg/gg.c:501
 #: ../libpurple/protocols/gg/gg.c:660
 #: ../libpurple/protocols/gg/gg.c:797
-#: ../libpurple/protocols/jabber/jabber.c:1383
+#: ../libpurple/protocols/jabber/jabber.c:1374
 #: ../libpurple/protocols/jabber/xdata.c:336
-#: ../libpurple/protocols/msn/msn.c:258
-#: ../libpurple/protocols/msn/msn.c:275
-#: ../libpurple/protocols/msn/msn.c:292
-#: ../libpurple/protocols/msn/msn.c:309
-#: ../libpurple/protocols/oscar/oscar.c:6041
+#: ../libpurple/protocols/msn/msn.c:295
+#: ../libpurple/protocols/msn/msn.c:312
+#: ../libpurple/protocols/msn/msn.c:329
+#: ../libpurple/protocols/msn/msn.c:346
+#: ../libpurple/protocols/oscar/oscar.c:6094
 #: ../libpurple/protocols/silc/buddy.c:454
 #: ../libpurple/protocols/silc/buddy.c:1190
 #: ../libpurple/protocols/silc/chat.c:447
@@ -759,45 +763,45 @@
 #: ../libpurple/protocols/silc10/ops.c:1297
 #: ../libpurple/protocols/silc10/ops.c:1903
 #: ../libpurple/protocols/silc10/silc.c:735
-#: ../libpurple/protocols/yahoo/yahoo.c:1005
-#: ../libpurple/protocols/yahoo/yahoo.c:3336
-#: ../libpurple/protocols/yahoo/yahoo.c:3347
-#: ../pidgin/gtkblist.c:4026
-#: ../pidgin/gtkdialogs.c:746
-#: ../pidgin/gtkdialogs.c:884
-#: ../pidgin/gtkdialogs.c:976
+#: ../libpurple/protocols/yahoo/yahoo.c:1033
+#: ../libpurple/protocols/yahoo/yahoo.c:3499
+#: ../libpurple/protocols/yahoo/yahoo.c:3510
+#: ../pidgin/gtkblist.c:4036
+#: ../pidgin/gtkdialogs.c:753
+#: ../pidgin/gtkdialogs.c:892
+#: ../pidgin/gtkdialogs.c:984
 #: ../pidgin/gtkrequest.c:269
 msgid "OK"
 msgstr "OK"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2228
+#: ../finch/gntblist.c:2240
 #: ../finch/gntpounce.c:446
-#: ../pidgin/gtkpounce.c:791
+#: ../pidgin/gtkpounce.c:789
 msgid "Options"
 msgstr "Val"
 
-#: ../finch/gntblist.c:2234
+#: ../finch/gntblist.c:2246
 msgid "Send IM..."
 msgstr "Send lynmelding…"
 
-#: ../finch/gntblist.c:2238
+#: ../finch/gntblist.c:2250
 msgid "Show empty groups"
 msgstr "Vis tomme grupper"
 
-#: ../finch/gntblist.c:2244
+#: ../finch/gntblist.c:2256
 msgid "Show offline buddies"
 msgstr "Vis fråkopla vennar"
 
-#: ../finch/gntblist.c:2250
+#: ../finch/gntblist.c:2262
 msgid "Sort by status"
 msgstr "Sorter etter tilstand"
 
-#: ../finch/gntblist.c:2254
+#: ../finch/gntblist.c:2266
 msgid "Sort alphabetically"
 msgstr "Sorter alfabetisk "
 
-#: ../finch/gntblist.c:2258
+#: ../finch/gntblist.c:2270
 msgid "Sort by log size"
 msgstr "Sorter etter loggstorleiken"
 
@@ -822,47 +826,51 @@
 "\n"
 "Finch vil ikkje prøva å kople til kontoen på nytt før feilen er retta og kontoen er teken i bruk att."
 
-#: ../finch/gntconv.c:117
+#: ../finch/gntconv.c:119
 msgid "No such command."
 msgstr "Kommandoen finst ikkje."
 
-#: ../finch/gntconv.c:121
-#: ../pidgin/gtkconv.c:494
+#: ../finch/gntconv.c:123
+#: ../pidgin/gtkconv.c:469
 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:126
-#: ../pidgin/gtkconv.c:500
+#: ../finch/gntconv.c:128
+#: ../pidgin/gtkconv.c:475
 msgid "Your command failed for an unknown reason."
 msgstr "Kommandoen din feila av ukjend årsak."
 
-#: ../finch/gntconv.c:131
-#: ../pidgin/gtkconv.c:507
+#: ../finch/gntconv.c:133
+#: ../pidgin/gtkconv.c:482
 msgid "That command only works in chats, not IMs."
 msgstr "Den kommandoen verkar berre i praterom, ikkje i lynmeldingar."
 
-#: ../finch/gntconv.c:134
-#: ../pidgin/gtkconv.c:510
+#: ../finch/gntconv.c:136
+#: ../pidgin/gtkconv.c:485
 msgid "That command only works in IMs, not chats."
 msgstr "Den kommandoen verkar berre i lynmeldingar, ikkje i praterom."
 
-#: ../finch/gntconv.c:138
-#: ../pidgin/gtkconv.c:515
+#: ../finch/gntconv.c:140
+#: ../pidgin/gtkconv.c:490
 msgid "That command doesn't work on this protocol."
 msgstr "Den kommandoen verkar ikkje i denne protokollen."
 
-#: ../finch/gntconv.c:224
+#: ../finch/gntconv.c:148
+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:231
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:247
+#: ../finch/gntconv.c:254
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:252
-#: ../finch/gntconv.c:647
+#: ../finch/gntconv.c:259
+#: ../finch/gntconv.c:747
 #, c-format
 msgid ""
 "\n"
@@ -871,52 +879,70 @@
 "\n"
 "%s skriv…"
 
-#: ../finch/gntconv.c:271
+#: ../finch/gntconv.c:278
 msgid "You have left this chat."
 msgstr "Du har forlate dette praterommet."
 
-#: ../finch/gntconv.c:342
+#: ../finch/gntconv.c:367
+#: ../pidgin/gtkconv.c:1346
+msgid "Logging started. Future messages in this conversation will be logged."
+msgstr "Logginga er starta. Framtidige meldingar i denne samtala vil bli logga."
+
+#: ../finch/gntconv.c:373
+#: ../pidgin/gtkconv.c:1354
+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:419
 msgid "Send To"
 msgstr "Send til"
 
-#: ../finch/gntconv.c:386
+#: ../finch/gntconv.c:463
 msgid "Conversation"
 msgstr "Prat"
 
-#: ../finch/gntconv.c:392
+#: ../finch/gntconv.c:469
 msgid "Clear Scrollback"
 msgstr "Tøm skjerm"
 
-#: ../finch/gntconv.c:396
+#: ../finch/gntconv.c:473
 #: ../finch/gntprefs.c:190
 msgid "Show Timestamps"
 msgstr "Vis tidsstempel"
 
-#: ../finch/gntconv.c:412
+#: ../finch/gntconv.c:489
 msgid "Add Buddy Pounce..."
 msgstr "Legg til vennevarsling…"
 
-#: ../finch/gntconv.c:613
+#: ../finch/gntconv.c:504
+msgid "Enable Logging"
+msgstr "Bruk logging"
+
+#: ../finch/gntconv.c:510
+msgid "Enable Sounds"
+msgstr "Bruk lydar"
+
+#: ../finch/gntconv.c:713
 msgid "<AUTO-REPLY> "
 msgstr "<AUTO-REPLY> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:735
+#: ../finch/gntconv.c:835
 msgid "List of users:\n"
 msgstr "Brukarliste:\n"
 
-#: ../finch/gntconv.c:880
-#: ../pidgin/gtkconv.c:337
+#: ../finch/gntconv.c:997
+#: ../pidgin/gtkconv.c:311
 msgid "Supported debug options are:  version"
 msgstr "Støtta feilsøkingsval er:  versjon"
 
-#: ../finch/gntconv.c:915
-#: ../pidgin/gtkconv.c:386
+#: ../finch/gntconv.c:1033
+#: ../pidgin/gtkconv.c:361
 msgid "No such command (in this context)."
 msgstr "Kommandoen finst ikkje (i denne samanhengen)."
 
-#: ../finch/gntconv.c:918
-#: ../pidgin/gtkconv.c:389
+#: ../finch/gntconv.c:1036
+#: ../pidgin/gtkconv.c:364
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -924,61 +950,61 @@
 "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:976
-#: ../pidgin/gtkconv.c:7343
+#: ../finch/gntconv.c:1094
+#: ../pidgin/gtkconv.c:7535
 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:979
-#: ../pidgin/gtkconv.c:7346
+#: ../finch/gntconv.c:1097
+#: ../pidgin/gtkconv.c:7538
 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."
 
-#: ../finch/gntconv.c:982
-#: ../pidgin/gtkconv.c:7349
+#: ../finch/gntconv.c:1100
+#: ../pidgin/gtkconv.c:7541
 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:985
-#: ../pidgin/gtkconv.c:7352
+#: ../finch/gntconv.c:1103
+#: ../pidgin/gtkconv.c:7544
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Tømmer skjermen."
 
-#: ../finch/gntconv.c:988
-#: ../pidgin/gtkconv.c:7358
+#: ../finch/gntconv.c:1106
+#: ../pidgin/gtkconv.c:7550
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;command&gt;: Hjelp til ein spesifikk kommando."
 
-#: ../finch/gntconv.c:991
+#: ../finch/gntconv.c:1109
 msgid "users:  Show the list of users in the chat."
 msgstr "users: viser lista over brukarar i praterommet."
 
-#: ../finch/gntconv.c:996
+#: ../finch/gntconv.c:1114
 msgid "plugins: Show the plugins window."
 msgstr "plugins: viser programtilleggsvindauget."
 
-#: ../finch/gntconv.c:999
+#: ../finch/gntconv.c:1117
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: viser vennelista."
 
-#: ../finch/gntconv.c:1002
+#: ../finch/gntconv.c:1120
 msgid "accounts: Show the accounts window."
 msgstr "accounts: viser kontovindauget."
 
-#: ../finch/gntconv.c:1005
+#: ../finch/gntconv.c:1123
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: viser feilsøkingsvindauget."
 
-#: ../finch/gntconv.c:1008
+#: ../finch/gntconv.c:1126
 msgid "prefs: Show the preference window."
 msgstr "prefs: viser innstillingsvindauget."
 
-#: ../finch/gntconv.c:1011
+#: ../finch/gntconv.c:1129
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: viser lagra status-vindauget."
 
 #: ../finch/gntdebug.c:234
-#: ../finch/gntui.c:84
+#: ../finch/gntui.c:86
 #: ../pidgin/gtkdebug.c:694
 msgid "Debug Window"
 msgstr "Feilsøkingsvindauge"
@@ -1010,124 +1036,129 @@
 #. Create the window.
 #: ../finch/gntft.c:122
 #: ../finch/gntft.c:195
-#: ../finch/gntui.c:85
+#: ../finch/gntui.c:87
 #: ../pidgin/gtkft.c:233
 #: ../pidgin/gtkft.c:761
 msgid "File Transfers"
 msgstr "Filoverføringar"
 
-#: ../finch/gntft.c:198
+#: ../finch/gntft.c:200
 #: ../pidgin/gtkft.c:644
 msgid "Progress"
 msgstr "Framdrift"
 
-#: ../finch/gntft.c:198
+#: ../finch/gntft.c:200
 #: ../pidgin/gtkft.c:651
 msgid "Filename"
 msgstr "Filnamn"
 
-#: ../finch/gntft.c:198
+#: ../finch/gntft.c:200
 #: ../pidgin/gtkft.c:658
 msgid "Size"
 msgstr "Storleik"
 
-#: ../finch/gntft.c:198
+#: ../finch/gntft.c:200
 msgid "Speed"
 msgstr "Fart"
 
-#: ../finch/gntft.c:198
+#: ../finch/gntft.c:200
 #: ../pidgin/gtkft.c:665
 msgid "Remaining"
 msgstr "Attverande"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:198
-#: ../finch/gntstatus.c:543
-#: ../finch/gntstatus.c:572
-#: ../libpurple/protocols/bonjour/bonjour.c:337
+#: ../finch/gntft.c:200
+#: ../finch/gntstatus.c:546
+#: ../finch/gntstatus.c:575
+#: ../libpurple/protocols/bonjour/bonjour.c:344
 #: ../libpurple/protocols/gg/gg.c:1034
 #: ../libpurple/protocols/gg/gg.c:1571
 #: ../libpurple/protocols/gg/gg.c:1579
 #: ../libpurple/protocols/jabber/buddy.c:638
 #: ../libpurple/protocols/jabber/buddy.c:642
 #: ../libpurple/protocols/jabber/buddy.c:677
-#: ../libpurple/protocols/jabber/jabber.c:1212
-#: ../libpurple/protocols/msn/msn.c:515
+#: ../libpurple/protocols/jabber/jabber.c:1203
+#: ../libpurple/protocols/msn/msn.c:552
 #: ../libpurple/protocols/novell/novell.c:2835
 #: ../libpurple/protocols/oscar/oscar.c:820
 #: ../libpurple/protocols/oscar/oscar.c:825
 #: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:2670
-#: ../libpurple/protocols/oscar/oscar.c:3748
-#: ../libpurple/protocols/sametime/sametime.c:3264
-#: ../libpurple/protocols/sametime/sametime.c:4151
-#: ../libpurple/protocols/yahoo/yahoo.c:3087
-#: ../pidgin/gtkblist.c:3082
-#: ../pidgin/gtkblist.c:3095
-#: ../pidgin/gtkblist.c:3097
+#: ../libpurple/protocols/oscar/oscar.c:2710
+#: ../libpurple/protocols/oscar/oscar.c:3790
+#: ../libpurple/protocols/sametime/sametime.c:3263
+#: ../libpurple/protocols/sametime/sametime.c:4150
+#: ../libpurple/protocols/yahoo/yahoo.c:3250
+#: ../pidgin/gtkblist.c:3101
+#: ../pidgin/gtkblist.c:3115
+#: ../pidgin/gtkblist.c:3117
 #: ../pidgin/gtksavedstatuses.c:998
 #: ../pidgin/gtksavedstatuses.c:1143
 msgid "Status"
 msgstr "Status"
 
-#: ../finch/gntft.c:208
+#: ../finch/gntft.c:210
 msgid "Close this window when all transfers finish"
 msgstr "Lukk dette vindauget når alle overføringane er ferdige"
 
-#: ../finch/gntft.c:215
+#: ../finch/gntft.c:217
 msgid "Clear finished transfers"
 msgstr "Tøm ferdige overføringar"
 
-#: ../finch/gntft.c:229
+#: ../finch/gntft.c:231
 msgid "Stop"
 msgstr "Stopp"
 
 #. Close button
-#: ../finch/gntft.c:234
+#: ../finch/gntft.c:236
 #: ../finch/gntnotify.c:181
 #: ../finch/gntplugin.c:209
 #: ../finch/gntplugin.c:309
-#: ../finch/gntpounce.c:727
+#: ../finch/gntpounce.c:737
 #: ../finch/gntstatus.c:215
-#: ../libpurple/protocols/msn/msn.c:375
+#: ../libpurple/protocols/msn/msn.c:412
 #: ../libpurple/protocols/silc/util.c:382
 #: ../libpurple/protocols/silc10/util.c:377
-#: ../pidgin/gtkaccount.c:2484
+#: ../pidgin/gtkaccount.c:2468
 #: ../pidgin/gtkrequest.c:272
 msgid "Close"
 msgstr "Lukk"
 
-#: ../finch/gntft.c:302
+#: ../finch/gntft.c:304
 #: ../pidgin/gtkft.c:168
 #: ../pidgin/gtkft.c:972
 msgid "Waiting for transfer to begin"
 msgstr "Ventar på at overføringa skal begynna"
 
-#: ../finch/gntft.c:369
+#: ../finch/gntft.c:371
 #: ../pidgin/gtkft.c:165
 #: ../pidgin/gtkft.c:1053
 msgid "Canceled"
 msgstr "Avbroten"
 
-#: ../finch/gntft.c:371
+#: ../finch/gntft.c:373
 #: ../pidgin/gtkft.c:1055
 msgid "Failed"
 msgstr "Feila"
 
-#: ../finch/gntft.c:417
+#: ../finch/gntft.c:419
 #: ../pidgin/gtkft.c:133
 #, c-format
 msgid "%.2f KiB/s"
 msgstr "%.2f KiB/s"
 
-#: ../finch/gntft.c:428
-#: ../finch/gntft.c:429
+#: ../finch/gntft.c:430
+#, c-format
+msgid "The file was saved as %s."
+msgstr "Fila blei lagra som %s."
+
+#: ../finch/gntft.c:431
+#: ../finch/gntft.c:432
 #: ../pidgin/gtkft.c:162
 #: ../pidgin/gtkft.c:1115
 msgid "Finished"
 msgstr "Ferdig"
 
-#: ../finch/gntft.c:431
+#: ../finch/gntft.c:436
 #: ../libpurple/protocols/msn/session.c:347
 msgid "Transferring"
 msgstr "Overfører"
@@ -1142,12 +1173,12 @@
 msgstr "Du har fått e-post."
 
 #: ../finch/gntnotify.c:173
-#: ../pidgin/gtknotify.c:490
+#: ../pidgin/gtknotify.c:495
 msgid "Sender"
 msgstr "Sendar"
 
 #: ../finch/gntnotify.c:173
-#: ../pidgin/gtknotify.c:497
+#: ../pidgin/gtknotify.c:502
 msgid "Subject"
 msgstr "Emne"
 
@@ -1159,19 +1190,19 @@
 msgstr[1] "%s (%s) har %d nye meldingar."
 
 #: ../finch/gntnotify.c:224
-#: ../pidgin/gtknotify.c:336
+#: ../pidgin/gtknotify.c:340
 msgid "New Mail"
 msgstr "Ny e-postmelding"
 
 #: ../finch/gntnotify.c:289
-#: ../pidgin/gtknotify.c:918
+#: ../pidgin/gtknotify.c:908
 #, c-format
 msgid "Info for %s"
 msgstr "Info om %s"
 
 #: ../finch/gntnotify.c:290
 #: ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:919
+#: ../pidgin/gtknotify.c:909
 msgid "Buddy Information"
 msgstr "Venneinformasjon"
 
@@ -1181,13 +1212,13 @@
 msgstr "Hald fram"
 
 #: ../finch/gntnotify.c:382
-#: ../pidgin/gtkconv.c:1629
+#: ../pidgin/gtkconv.c:1615
 #: ../pidgin/gtkdebug.c:834
 msgid "Info"
 msgstr "Informasjon"
 
 #: ../finch/gntnotify.c:385
-#: ../pidgin/gtkconv.c:1590
+#: ../pidgin/gtkconv.c:1576
 msgid "IM"
 msgstr "Lynmeldingar"
 
@@ -1196,7 +1227,7 @@
 msgstr "Bli med"
 
 #: ../finch/gntnotify.c:391
-#: ../libpurple/protocols/sametime/sametime.c:3474
+#: ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr "Inviter"
 
@@ -1258,9 +1289,9 @@
 #: ../finch/gntplugin.c:370
 #: ../finch/gntplugin.c:377
 #: ../finch/gntprefs.c:263
-#: ../finch/gntui.c:88
+#: ../finch/gntui.c:90
 #: ../pidgin/gtkdocklet.c:524
-#: ../pidgin/gtkprefs.c:2062
+#: ../pidgin/gtkprefs.c:2064
 msgid "Preferences"
 msgstr "Innstillingar "
 
@@ -1269,7 +1300,6 @@
 msgid "Please enter a buddy to pounce."
 msgstr "Skriv inn ein venn å varsla om."
 
-#. Create the window.
 #: ../finch/gntpounce.c:327
 #: ../pidgin/gtkpounce.c:516
 msgid "New Buddy Pounce"
@@ -1286,7 +1316,7 @@
 
 #. Account:
 #: ../finch/gntpounce.c:335
-#: ../finch/gntstatus.c:452
+#: ../finch/gntstatus.c:455
 msgid "Account:"
 msgstr "Konto:"
 
@@ -1296,7 +1326,7 @@
 
 #. Create the "Pounce When Buddy..." frame.
 #: ../finch/gntpounce.c:373
-#: ../pidgin/gtkpounce.c:586
+#: ../pidgin/gtkpounce.c:584
 msgid "Pounce When Buddy..."
 msgstr "Varsla når venn…"
 
@@ -1342,7 +1372,7 @@
 
 #. Create the "Action" frame.
 #: ../finch/gntpounce.c:413
-#: ../pidgin/gtkpounce.c:647
+#: ../pidgin/gtkpounce.c:645
 msgid "Action"
 msgstr "Handling"
 
@@ -1371,84 +1401,96 @@
 msgstr "Vennevarsling berre når tilstanden min ikkje er tilgjengeleg"
 
 #: ../finch/gntpounce.c:449
-#: ../pidgin/gtkpounce.c:1295
+#: ../pidgin/gtkpounce.c:1280
 msgid "Recurring"
 msgstr "Gjentakande"
 
-#: ../finch/gntpounce.c:651
-#: ../pidgin/gtkpounce.c:1110
+#: ../finch/gntpounce.c:617
+msgid "Cannot create pounce"
+msgstr "Klarer ikkje å oppretta vennevarsel"
+
+#: ../finch/gntpounce.c:618
+msgid "You do not have any accounts."
+msgstr "Du har ingen konto."
+
+#: ../finch/gntpounce.c:619
+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:661
+#: ../pidgin/gtkpounce.c:1095
 #, 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:685
-#: ../finch/gntui.c:83
-#: ../pidgin/gtkpounce.c:1339
+#: ../finch/gntpounce.c:695
+#: ../finch/gntui.c:84
+#: ../pidgin/gtkpounce.c:1324
 msgid "Buddy Pounces"
 msgstr "Vennevarsel"
 
-#: ../finch/gntpounce.c:799
-#: ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:809
+#: ../pidgin/gtkpounce.c:1451
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s har begynt å skriva til deg (%s)"
 
-#: ../finch/gntpounce.c:801
-#: ../pidgin/gtkpounce.c:1468
+#: ../finch/gntpounce.c:811
+#: ../pidgin/gtkpounce.c:1453
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s har stoppa å skriva til deg (%s)"
 
-#: ../finch/gntpounce.c:803
-#: ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:813
+#: ../pidgin/gtkpounce.c:1455
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s har logga på (%s)"
 
-#: ../finch/gntpounce.c:805
-#: ../pidgin/gtkpounce.c:1472
+#: ../finch/gntpounce.c:815
+#: ../pidgin/gtkpounce.c:1457
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s er ikkje uverksam lenger (%s)"
 
-#: ../finch/gntpounce.c:807
-#: ../pidgin/gtkpounce.c:1474
+#: ../finch/gntpounce.c:817
+#: ../pidgin/gtkpounce.c:1459
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s er ikkje lenger vekke (%s)"
 
-#: ../finch/gntpounce.c:809
-#: ../pidgin/gtkpounce.c:1476
+#: ../finch/gntpounce.c:819
+#: ../pidgin/gtkpounce.c:1461
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s har stoppa å skriva til deg (%s)"
 
-#: ../finch/gntpounce.c:811
-#: ../pidgin/gtkpounce.c:1478
+#: ../finch/gntpounce.c:821
+#: ../pidgin/gtkpounce.c:1463
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s har logga av (%s)"
 
-#: ../finch/gntpounce.c:813
-#: ../pidgin/gtkpounce.c:1480
+#: ../finch/gntpounce.c:823
+#: ../pidgin/gtkpounce.c:1465
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s er blitt uverksam (%s)"
 
-#: ../finch/gntpounce.c:815
-#: ../pidgin/gtkpounce.c:1482
+#: ../finch/gntpounce.c:825
+#: ../pidgin/gtkpounce.c:1467
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s har gått vekk . (%s)"
 
-#: ../finch/gntpounce.c:817
-#: ../pidgin/gtkpounce.c:1484
+#: ../finch/gntpounce.c:827
+#: ../pidgin/gtkpounce.c:1469
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s har sendt deg ei melding. (%s)"
 
-#: ../finch/gntpounce.c:818
-#: ../pidgin/gtkpounce.c:1485
+#: ../finch/gntpounce.c:828
+#: ../pidgin/gtkpounce.c:1470
 msgid "Unknown pounce event. Please report this!"
 msgstr "Ukjend varselhending. Rapportér feilen."
 
@@ -1457,16 +1499,16 @@
 msgstr "Basert på tastaturbruk"
 
 #: ../finch/gntprefs.c:93
-#: ../pidgin/gtkprefs.c:1925
+#: ../pidgin/gtkprefs.c:1927
 msgid "From last sent message"
 msgstr "Frå sist sendte melding"
 
 #: ../finch/gntprefs.c:95
 #: ../pidgin/gtkprefs.c:897
 #: ../pidgin/gtkprefs.c:906
-#: ../pidgin/gtkprefs.c:1924
-#: ../pidgin/gtkprefs.c:1938
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:337
+#: ../pidgin/gtkprefs.c:1926
+#: ../pidgin/gtkprefs.c:1940
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "Aldri"
 
@@ -1517,14 +1559,14 @@
 #. Conversations
 #: ../finch/gntprefs.c:258
 #: ../pidgin/gtkprefs.c:992
-#: ../pidgin/gtkprefs.c:2028
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:344
+#: ../pidgin/gtkprefs.c:2030
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "Samtaler"
 
 #: ../finch/gntprefs.c:259
-#: ../pidgin/gtkprefs.c:1464
-#: ../pidgin/gtkprefs.c:2039
+#: ../pidgin/gtkprefs.c:1466
+#: ../pidgin/gtkprefs.c:2041
 msgid "Logging"
 msgstr "Loggføring"
 
@@ -1533,125 +1575,125 @@
 msgstr "Enno ikkje teken i bruk."
 
 #: ../finch/gntrequest.c:635
-#: ../pidgin/gtkrequest.c:1552
-#: ../pidgin/gtkrequest.c:1598
+#: ../pidgin/gtkrequest.c:1555
+#: ../pidgin/gtkrequest.c:1601
 msgid "Save File..."
 msgstr "Lagra fil…"
 
 #: ../finch/gntrequest.c:635
-#: ../pidgin/gtkrequest.c:1553
-#: ../pidgin/gtkrequest.c:1599
+#: ../pidgin/gtkrequest.c:1556
+#: ../pidgin/gtkrequest.c:1602
 msgid "Open File..."
 msgstr "Opna fil…"
 
-#: ../finch/gntsound.c:94
+#: ../finch/gntsound.c:96
 #: ../pidgin/gtksound.c:63
 msgid "Buddy logs in"
 msgstr "Venn loggar inn"
 
-#: ../finch/gntsound.c:95
+#: ../finch/gntsound.c:97
 #: ../pidgin/gtksound.c:64
 msgid "Buddy logs out"
 msgstr "Venn loggar ut"
 
-#: ../finch/gntsound.c:96
+#: ../finch/gntsound.c:98
 #: ../pidgin/gtksound.c:65
 msgid "Message received"
 msgstr "Melding motteken"
 
-#: ../finch/gntsound.c:97
+#: ../finch/gntsound.c:99
 #: ../pidgin/gtksound.c:66
 msgid "Message received begins conversation"
 msgstr "Motteken melding startar samtala"
 
-#: ../finch/gntsound.c:98
+#: ../finch/gntsound.c:100
 #: ../pidgin/gtksound.c:67
 msgid "Message sent"
 msgstr "Melding sendt"
 
-#: ../finch/gntsound.c:99
+#: ../finch/gntsound.c:101
 #: ../pidgin/gtksound.c:68
 msgid "Person enters chat"
 msgstr "Person kjem inn i rommet"
 
-#: ../finch/gntsound.c:100
+#: ../finch/gntsound.c:102
 #: ../pidgin/gtksound.c:69
 msgid "Person leaves chat"
 msgstr "Person forlèt rommet"
 
-#: ../finch/gntsound.c:101
+#: ../finch/gntsound.c:103
 #: ../pidgin/gtksound.c:70
 msgid "You talk in chat"
 msgstr "Du pratar i rommet"
 
-#: ../finch/gntsound.c:102
+#: ../finch/gntsound.c:104
 #: ../pidgin/gtksound.c:71
 msgid "Others talk in chat"
 msgstr "Andre pratar i rommet"
 
-#: ../finch/gntsound.c:104
+#: ../finch/gntsound.c:106
 #: ../pidgin/gtksound.c:74
 msgid "Someone says your screen name in chat"
 msgstr "Nokon seier brukarnamnet ditt i praterommet"
 
-#: ../finch/gntsound.c:357
+#: ../finch/gntsound.c:360
 #: ../pidgin/gtksound.c:310
 msgid "GStreamer Failure"
 msgstr "GStreamer-svikt"
 
-#: ../finch/gntsound.c:358
+#: ../finch/gntsound.c:361
 #: ../pidgin/gtksound.c:311
 msgid "GStreamer failed to initialize."
 msgstr "GStreamer klarte ikkje å starta."
 
-#: ../finch/gntsound.c:706
-#: ../finch/gntsound.c:791
-#: ../pidgin/gtkprefs.c:1584
-#: ../pidgin/gtkprefs.c:1673
-#: ../pidgin/gtkprefs.c:1867
+#: ../finch/gntsound.c:715
+#: ../finch/gntsound.c:801
+#: ../pidgin/gtkprefs.c:1586
+#: ../pidgin/gtkprefs.c:1675
+#: ../pidgin/gtkprefs.c:1869
 msgid "(default)"
 msgstr "(standard)"
 
-#: ../finch/gntsound.c:719
+#: ../finch/gntsound.c:728
 msgid "Select Sound File ..."
 msgstr "Vel lydfil…"
 
-#: ../finch/gntsound.c:893
+#: ../finch/gntsound.c:903
 msgid "Sound Preferences"
 msgstr "Lydinnstillingar "
 
-#: ../finch/gntsound.c:904
+#: ../finch/gntsound.c:914
 msgid "Profiles"
 msgstr "Profilar"
 
-#: ../finch/gntsound.c:943
-#: ../pidgin/gtkprefs.c:1712
+#: ../finch/gntsound.c:953
+#: ../pidgin/gtkprefs.c:1714
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: ../finch/gntsound.c:946
+#: ../finch/gntsound.c:956
 msgid "Console Beep"
 msgstr "Konsollyd"
 
-#: ../finch/gntsound.c:947
-#: ../pidgin/gtkprefs.c:1716
+#: ../finch/gntsound.c:957
+#: ../pidgin/gtkprefs.c:1718
 msgid "Command"
 msgstr "Kommando"
 
-#: ../finch/gntsound.c:948
+#: ../finch/gntsound.c:958
 msgid "No Sound"
 msgstr "Ingen lyd"
 
-#: ../finch/gntsound.c:950
-#: ../pidgin/gtkprefs.c:1707
+#: ../finch/gntsound.c:960
+#: ../pidgin/gtkprefs.c:1709
 msgid "Sound Method"
 msgstr "Lydmetode"
 
-#: ../finch/gntsound.c:955
+#: ../finch/gntsound.c:965
 msgid "Method: "
 msgstr "Metode:"
 
-#: ../finch/gntsound.c:962
+#: ../finch/gntsound.c:972
 #, c-format
 msgid ""
 "Sound Command\n"
@@ -1661,66 +1703,66 @@
 "(%s for filnamn)"
 
 #. Sound options
-#: ../finch/gntsound.c:970
-#: ../pidgin/gtkprefs.c:1751
+#: ../finch/gntsound.c:980
+#: ../pidgin/gtkprefs.c:1753
 msgid "Sound Options"
 msgstr "Lydinnstillingar"
 
-#: ../finch/gntsound.c:971
+#: ../finch/gntsound.c:981
 msgid "Sounds when conversation has focus"
 msgstr "Lydar når samtalevindauget har fokus"
 
-#: ../finch/gntsound.c:979
+#: ../finch/gntsound.c:989
 #: ../pidgin/gtkprefs.c:896
 #: ../pidgin/gtkprefs.c:908
-#: ../pidgin/gtkprefs.c:1758
+#: ../pidgin/gtkprefs.c:1760
 #: ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:338
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:334
 msgid "Always"
 msgstr "Alltid"
 
-#: ../finch/gntsound.c:980
-#: ../pidgin/gtkprefs.c:1756
+#: ../finch/gntsound.c:990
+#: ../pidgin/gtkprefs.c:1758
 msgid "Only when available"
 msgstr "Berre når tilgjengeleg"
 
-#: ../finch/gntsound.c:981
-#: ../pidgin/gtkprefs.c:1757
+#: ../finch/gntsound.c:991
+#: ../pidgin/gtkprefs.c:1759
 msgid "Only when not available"
 msgstr "Berre når ikkje tilgjengeleg"
 
-#: ../finch/gntsound.c:988
+#: ../finch/gntsound.c:998
 msgid "Volume(0-100):"
 msgstr "Volum (0-100):"
 
 #. Sound events
-#: ../finch/gntsound.c:1005
-#: ../pidgin/gtkprefs.c:1793
+#: ../finch/gntsound.c:1017
+#: ../pidgin/gtkprefs.c:1795
 msgid "Sound Events"
 msgstr "Lydhendingar"
 
-#: ../finch/gntsound.c:1007
-#: ../pidgin/gtkprefs.c:1852
+#: ../finch/gntsound.c:1019
+#: ../pidgin/gtkprefs.c:1854
 msgid "Event"
 msgstr "Hending"
 
-#: ../finch/gntsound.c:1007
+#: ../finch/gntsound.c:1019
 msgid "File"
 msgstr "Fil"
 
-#: ../finch/gntsound.c:1026
-#: ../pidgin/gtkprefs.c:1871
+#: ../finch/gntsound.c:1038
+#: ../pidgin/gtkprefs.c:1873
 msgid "Test"
 msgstr "Test"
 
-#: ../finch/gntsound.c:1029
-#: ../pidgin/gtkprefs.c:1875
+#: ../finch/gntsound.c:1041
+#: ../pidgin/gtkprefs.c:1877
 msgid "Reset"
 msgstr "Nullstill"
 
-#: ../finch/gntsound.c:1032
-#: ../pidgin/gtkprefs.c:1879
+#: ../finch/gntsound.c:1044
+#: ../pidgin/gtkprefs.c:1881
 msgid "Choose..."
 msgstr "Vel…"
 
@@ -1739,7 +1781,7 @@
 msgstr "Lagra tilstandar"
 
 #: ../finch/gntstatus.c:182
-#: ../finch/gntstatus.c:535
+#: ../finch/gntstatus.c:538
 #: ../libpurple/protocols/jabber/buddy.c:286
 #: ../libpurple/protocols/jabber/buddy.c:973
 #: ../libpurple/protocols/novell/novell.c:1484
@@ -1752,12 +1794,20 @@
 msgid "Type"
 msgstr "Type"
 
+#. Statuses are almost all the same. Define a macro to reduce code repetition.
+#. PurpleStatusPrimitive
+#. id - use default
+#. name - use default
+#. savable
+#. user_settable
+#. not independent
+#. Attributes - each status can have a message.
 #: ../finch/gntstatus.c:182
-#: ../finch/gntstatus.c:560
-#: ../finch/gntstatus.c:572
-#: ../libpurple/protocols/bonjour/bonjour.c:249
+#: ../finch/gntstatus.c:563
+#: ../finch/gntstatus.c:575
 #: ../libpurple/protocols/bonjour/bonjour.c:256
-#: ../libpurple/protocols/bonjour/bonjour.c:339
+#: ../libpurple/protocols/bonjour/bonjour.c:263
+#: ../libpurple/protocols/bonjour/bonjour.c:346
 #: ../libpurple/protocols/gg/gg.c:1072
 #: ../libpurple/protocols/gg/gg.c:1574
 #: ../libpurple/protocols/gg/gg.c:1592
@@ -1766,31 +1816,32 @@
 #: ../libpurple/protocols/gg/gg.c:1617
 #: ../libpurple/protocols/gg/gg.c:1622
 #: ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1244
-#: ../libpurple/protocols/jabber/jabber.c:1254
-#: ../libpurple/protocols/jabber/jabber.c:1264
-#: ../libpurple/protocols/jabber/jabber.c:1274
-#: ../libpurple/protocols/jabber/jabber.c:1284
-#: ../libpurple/protocols/jabber/jabber.c:1296
+#: ../libpurple/protocols/jabber/jabber.c:1235
+#: ../libpurple/protocols/jabber/jabber.c:1245
+#: ../libpurple/protocols/jabber/jabber.c:1255
+#: ../libpurple/protocols/jabber/jabber.c:1265
+#: ../libpurple/protocols/jabber/jabber.c:1275
+#: ../libpurple/protocols/jabber/jabber.c:1287
+#: ../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:5502
-#: ../libpurple/protocols/oscar/oscar.c:5720
-#: ../libpurple/protocols/oscar/oscar.c:5734
-#: ../libpurple/protocols/oscar/oscar.c:5750
-#: ../libpurple/protocols/oscar/oscar.c:5757
-#: ../libpurple/protocols/oscar/oscar.c:5764
-#: ../libpurple/protocols/sametime/sametime.c:3287
-#: ../libpurple/protocols/sametime/sametime.c:3293
-#: ../libpurple/protocols/sametime/sametime.c:3299
-#: ../libpurple/protocols/sametime/sametime.c:3378
+#: ../libpurple/protocols/oscar/oscar.c:5555
+#: ../libpurple/protocols/oscar/oscar.c:5773
+#: ../libpurple/protocols/oscar/oscar.c:5787
+#: ../libpurple/protocols/oscar/oscar.c:5803
+#: ../libpurple/protocols/oscar/oscar.c:5810
+#: ../libpurple/protocols/oscar/oscar.c:5817
+#: ../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:3590
-#: ../libpurple/protocols/yahoo/yahoo.c:3596
+#: ../libpurple/protocols/yahoo/yahoo.c:3753
+#: ../libpurple/protocols/yahoo/yahoo.c:3759
 #: ../libpurple/protocols/zephyr/zephyr.c:2337
 #: ../pidgin/gtksavedstatuses.c:525
 #: ../pidgin/gtksavedstatuses.c:1009
@@ -1799,7 +1850,7 @@
 
 #. Use
 #: ../finch/gntstatus.c:193
-#: ../finch/gntstatus.c:589
+#: ../finch/gntstatus.c:592
 msgid "Use"
 msgstr "Bruk"
 
@@ -1811,58 +1862,80 @@
 msgid "Please enter a non-empty title for the status."
 msgstr "Skriv inn ein tittel for tilstanden."
 
-#: ../finch/gntstatus.c:308
+#: ../finch/gntstatus.c:309
 msgid "Duplicate title"
 msgstr "Duplisert tittel"
 
-#: ../finch/gntstatus.c:309
+#: ../finch/gntstatus.c:310
 msgid "Please enter a different title for the status."
 msgstr "Skriv inn ein annan tittel for tilstanden."
 
-#: ../finch/gntstatus.c:449
+#: ../finch/gntstatus.c:451
 msgid "Substatus"
 msgstr "Substatus"
 
-#: ../finch/gntstatus.c:460
+#: ../finch/gntstatus.c:463
 #: ../pidgin/gtkft.c:698
 msgid "Status:"
 msgstr "Status:"
 
-#: ../finch/gntstatus.c:475
+#: ../finch/gntstatus.c:478
 msgid "Message:"
 msgstr "Melding:"
 
-#: ../finch/gntstatus.c:524
+#: ../finch/gntstatus.c:527
 msgid "Edit Status"
 msgstr "Endra tilstand"
 
-#: ../finch/gntstatus.c:566
+#: ../finch/gntstatus.c:569
 msgid "Use different status for following accounts"
 msgstr "Bruk forskjellig status for følgjande kontoar"
 
 #. Save & Use
-#: ../finch/gntstatus.c:600
+#: ../finch/gntstatus.c:603
 msgid "Save & Use"
 msgstr "Lagra og bruk"
 
-#: ../finch/gntui.c:87
-#: ../pidgin/gtkprefs.c:2030
-msgid "Sounds"
-msgstr "Lydar"
+#: ../finch/gntui.c:85
+msgid "Certificates"
+msgstr "Sertifikat"
 
 #: ../finch/gntui.c:89
+#: ../pidgin/gtkprefs.c:2032
+msgid "Sounds"
+msgstr "Lydar"
+
+#: ../finch/gntui.c:91
 msgid "Statuses"
 msgstr "Tilstandar"
 
-#: ../finch/plugins/gntclipboard.c:149
+#: ../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."
+
+#: ../finch/plugins/gntclipboard.c:116
+msgid "Couldn't find X display"
+msgstr "Klarte ikkje å finna X-skjermen"
+
+#: ../finch/plugins/gntclipboard.c:122
+msgid "Couldn't find window"
+msgstr "Klarte ikkje å finna vindauget"
+
+#: ../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."
+
+#: ../finch/plugins/gntclipboard.c:158
 msgid "GntClipboard"
 msgstr "GntClipboard"
 
-#: ../finch/plugins/gntclipboard.c:151
+#: ../finch/plugins/gntclipboard.c:160
 msgid "Clipboard plugin"
 msgstr "Utklippstavleprogramtillegg"
 
-#: ../finch/plugins/gntclipboard.c:152
+#: ../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)."
 
@@ -2012,13 +2085,13 @@
 
 #: ../libpurple/account.c:1012
 #: ../libpurple/connection.c:107
-#: ../pidgin/gtkblist.c:4023
+#: ../pidgin/gtkblist.c:4033
 msgid "Connection Error"
 msgstr "Tilkoplingsfeil"
 
 #: ../libpurple/account.c:1170
 #: ../libpurple/protocols/gg/gg.c:702
-#: ../libpurple/protocols/jabber/jabber.c:1334
+#: ../libpurple/protocols/jabber/jabber.c:1325
 msgid "New passwords do not match."
 msgstr "Dei nye passorda samsvarer ikkje."
 
@@ -2057,7 +2130,7 @@
 msgid "Set User Info"
 msgstr "Skriv inn brukarinformasjon"
 
-#: ../libpurple/account.c:1744
+#: ../libpurple/account.c:1735
 #: ../libpurple/protocols/gg/gg.c:1012
 #: ../libpurple/protocols/jabber/buddy.c:642
 #: ../libpurple/protocols/jabber/buddy.c:1462
@@ -2069,10 +2142,11 @@
 msgstr "Ukjend"
 
 #: ../libpurple/blist.c:521
-#: ../libpurple/blist.c:1289
-#: ../libpurple/blist.c:1518
-#: ../libpurple/protocols/jabber/roster.c:68
-#: ../pidgin/gtkblist.c:5325
+#: ../libpurple/blist.c:1301
+#: ../libpurple/blist.c:1530
+#: ../libpurple/protocols/jabber/roster.c:69
+#: ../libpurple/protocols/myspace/myspace.c:3243
+#: ../pidgin/gtkblist.c:5367
 #: ../pidgin/plugins/gevolution/gevolution.c:96
 #: ../pidgin/plugins/gevolution/gevo-util.c:64
 msgid "Buddies"
@@ -2104,60 +2178,60 @@
 msgid "Unknown error"
 msgstr "Ukjend feil"
 
-#: ../libpurple/conversation.c:170
+#: ../libpurple/conversation.c:171
 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:174
+#: ../libpurple/conversation.c:187
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "Klarte ikkje å senda melding til %s."
 
-#: ../libpurple/conversation.c:174
+#: ../libpurple/conversation.c:175
 msgid "The message is too large."
 msgstr "Meldinga er for stor."
 
-#: ../libpurple/conversation.c:183
+#: ../libpurple/conversation.c:184
 #: ../libpurple/protocols/bonjour/jabber.c:255
 #: ../libpurple/protocols/bonjour/jabber.c:298
 msgid "Unable to send message."
 msgstr "Klarte ikkje å senda meldinga."
 
-#: ../libpurple/conversation.c:1169
+#: ../libpurple/conversation.c:1215
 msgid "Send Message"
 msgstr "Send melding"
 
-#: ../libpurple/conversation.c:1172
+#: ../libpurple/conversation.c:1218
 msgid "_Send Message"
 msgstr "_Send melding"
 
-#: ../libpurple/conversation.c:1578
+#: ../libpurple/conversation.c:1624
 #, c-format
 msgid "%s entered the room."
 msgstr "%s er komen inn i rommet."
 
-#: ../libpurple/conversation.c:1581
+#: ../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:1691
+#: ../libpurple/conversation.c:1737
 #, c-format
 msgid "You are now known as %s"
 msgstr "No heiter du %s"
 
-#: ../libpurple/conversation.c:1711
+#: ../libpurple/conversation.c:1757
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s har endra namn til %s"
 
-#: ../libpurple/conversation.c:1786
+#: ../libpurple/conversation.c:1832
 #, c-format
 msgid "%s left the room."
 msgstr "%s har gått ut av rommet."
 
-#: ../libpurple/conversation.c:1789
+#: ../libpurple/conversation.c:1835
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s har gått ut av rommet (%s)."
@@ -2635,10 +2709,10 @@
 #: ../libpurple/protocols/oscar/oscar.c:1451
 #: ../libpurple/protocols/oscar/oscar.c:2243
 #: ../libpurple/protocols/oscar/oscar.c:2292
-#: ../libpurple/protocols/oscar/oscar.c:5834
-#: ../libpurple/protocols/oscar/oscar.c:5889
-#: ../libpurple/protocols/oscar/oscar.c:6115
-#: ../libpurple/protocols/oscar/oscar.c:6185
+#: ../libpurple/protocols/oscar/oscar.c:5887
+#: ../libpurple/protocols/oscar/oscar.c:5942
+#: ../libpurple/protocols/oscar/oscar.c:6168
+#: ../libpurple/protocols/oscar/oscar.c:6238
 #: ../libpurple/request.h:1387
 #: ../libpurple/request.h:1397
 msgid "_Cancel"
@@ -2682,8 +2756,8 @@
 "(berre når det ikkje foregår ei samtale med sendaren)"
 
 #: ../libpurple/plugins/buddynote.c:46
-#: ../libpurple/protocols/msn/msn.c:1629
-#: ../libpurple/protocols/msn/msn.c:1659
+#: ../libpurple/protocols/msn/msn.c:1666
+#: ../libpurple/protocols/msn/msn.c:1696
 msgid "Notes"
 msgstr "Notat"
 
@@ -3090,23 +3164,23 @@
 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:152
+#: ../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?"
 
-#: ../libpurple/plugins/offlinemsg.c:156
+#: ../libpurple/plugins/offlinemsg.c:160
 msgid "Offline Message"
 msgstr "Fråkopla melding"
 
-#: ../libpurple/plugins/offlinemsg.c:157
+#: ../libpurple/plugins/offlinemsg.c:161
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
 msgstr "Du kan endra/sletta varselet frå vennevarsel-vindauget"
 
-#: ../libpurple/plugins/offlinemsg.c:161
+#: ../libpurple/plugins/offlinemsg.c:165
 #: ../libpurple/protocols/msn/dialog.c:133
-#: ../libpurple/protocols/msn/msn.c:522
-#: ../libpurple/protocols/msn/msn.c:532
+#: ../libpurple/protocols/msn/msn.c:559
+#: ../libpurple/protocols/msn/msn.c:569
 #: ../libpurple/protocols/novell/novell.c:1917
 #: ../libpurple/protocols/silc/buddy.c:317
 #: ../libpurple/protocols/silc/pk.c:113
@@ -3118,10 +3192,10 @@
 msgid "Yes"
 msgstr "Ja"
 
-#: ../libpurple/plugins/offlinemsg.c:162
+#: ../libpurple/plugins/offlinemsg.c:166
 #: ../libpurple/protocols/msn/dialog.c:134
-#: ../libpurple/protocols/msn/msn.c:522
-#: ../libpurple/protocols/msn/msn.c:532
+#: ../libpurple/protocols/msn/msn.c:559
+#: ../libpurple/protocols/msn/msn.c:569
 #: ../libpurple/protocols/novell/novell.c:1918
 #: ../libpurple/protocols/silc/buddy.c:318
 #: ../libpurple/protocols/silc/pk.c:114
@@ -3133,11 +3207,11 @@
 msgid "No"
 msgstr "Nei"
 
-#: ../libpurple/plugins/offlinemsg.c:189
+#: ../libpurple/plugins/offlinemsg.c:193
 msgid "Save offline messages in pounce"
 msgstr "Lagra fråkopla meldingar som eit varsel"
 
-#: ../libpurple/plugins/offlinemsg.c:193
+#: ../libpurple/plugins/offlinemsg.c:197
 msgid "Do not ask. Always save in pounce."
 msgstr "Spør ikkje. Lagra alltid som eit varsel."
 
@@ -3248,13 +3322,19 @@
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "Tilbyr felles grensesnitt mot SSL støttebiblioteka."
 
+#. Scheme name
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:903
+#: ../libpurple/plugins/ssl/ssl-nss.c:633
+msgid "X.509 Certificates"
+msgstr "X.509-sertifikat"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:275
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:987
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -3262,8 +3342,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:278
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:280
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:990
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:992
 msgid "Provides SSL support through GNUTLS."
 msgstr "Tilbyr SSL-støtte gjennom GNUTLS."
 
@@ -3273,7 +3353,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:423
+#: ../libpurple/plugins/ssl/ssl-nss.c:718
 msgid "NSS"
 msgstr "NSS"
 
@@ -3281,8 +3361,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:426
-#: ../libpurple/plugins/ssl/ssl-nss.c:428
+#: ../libpurple/plugins/ssl/ssl-nss.c:721
+#: ../libpurple/plugins/ssl/ssl-nss.c:723
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Tilbyr SSL-støtte gjennom Mozilla NSS."
 
@@ -3369,21 +3449,21 @@
 msgstr "Klarer ikkje å kopla til den lokale mDNS-tenaren. Kjører han?"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:344
-#: ../libpurple/protocols/bonjour/bonjour.c:614
+#: ../libpurple/protocols/bonjour/bonjour.c:351
+#: ../libpurple/protocols/bonjour/bonjour.c:656
 #: ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/jabber/jabber.c:828
+#: ../libpurple/protocols/jabber/jabber.c:819
 msgid "First name"
 msgstr "Fornamn"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:346
-#: ../libpurple/protocols/bonjour/bonjour.c:617
+#: ../libpurple/protocols/bonjour/bonjour.c:353
+#: ../libpurple/protocols/bonjour/bonjour.c:659
 #: ../libpurple/protocols/gg/gg.c:622
-#: ../libpurple/protocols/jabber/jabber.c:833
+#: ../libpurple/protocols/jabber/jabber.c:824
 msgid "Last name"
 msgstr "Etternamn"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:350
+#: ../libpurple/protocols/bonjour/bonjour.c:357
 #: ../libpurple/protocols/jabber/buddy.c:283
 #: ../libpurple/protocols/jabber/buddy.c:940
 #: ../libpurple/protocols/jabber/buddy.c:948
@@ -3396,13 +3476,13 @@
 msgid "E-Mail"
 msgstr "E-post"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:353
-#: ../libpurple/protocols/bonjour/bonjour.c:623
+#: ../libpurple/protocols/bonjour/bonjour.c:360
+#: ../libpurple/protocols/bonjour/bonjour.c:665
 msgid "AIM Account"
 msgstr "AIM-konto"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:356
-#: ../libpurple/protocols/bonjour/bonjour.c:626
+#: ../libpurple/protocols/bonjour/bonjour.c:363
+#: ../libpurple/protocols/bonjour/bonjour.c:668
 msgid "XMPP Account"
 msgstr "XMPP-konto"
 
@@ -3416,27 +3496,25 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:460
-#: ../libpurple/protocols/bonjour/bonjour.c:462
+#: ../libpurple/protocols/bonjour/bonjour.c:467
+#: ../libpurple/protocols/bonjour/bonjour.c:469
 msgid "Bonjour Protocol Plugin"
 msgstr "Bonjour protokolktillegg"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:505
-#: ../libpurple/protocols/bonjour/bonjour.c:512
-#: ../libpurple/protocols/bonjour/bonjour.c:561
+#: ../libpurple/protocols/bonjour/bonjour.c:610
 msgid "Purple Person"
 msgstr "Purple-person"
 
 #. Creating the user splits
-#: ../libpurple/protocols/bonjour/bonjour.c:610
+#: ../libpurple/protocols/bonjour/bonjour.c:652
 #: ../libpurple/protocols/silc/silc.c:1007
 #: ../libpurple/protocols/silc10/silc.c:918
 msgid "Hostname"
 msgstr "Vertsnamn"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:620
+#: ../libpurple/protocols/bonjour/bonjour.c:662
 #: ../libpurple/protocols/gg/gg.c:472
-#: ../libpurple/protocols/jabber/jabber.c:818
+#: ../libpurple/protocols/jabber/jabber.c:809
 #: ../libpurple/protocols/silc/silc.c:770
 #: ../libpurple/protocols/silc/silc.c:1011
 #: ../libpurple/protocols/silc10/silc.c:681
@@ -3448,30 +3526,30 @@
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:381
+#: ../libpurple/protocols/bonjour/jabber.c:380
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s har lukka samtala."
 
-#: ../libpurple/protocols/bonjour/jabber.c:433
-#: ../libpurple/protocols/bonjour/jabber.c:656
-#: ../libpurple/protocols/bonjour/jabber.c:674
+#: ../libpurple/protocols/bonjour/jabber.c:437
+#: ../libpurple/protocols/bonjour/jabber.c:660
+#: ../libpurple/protocols/bonjour/jabber.c:678
 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:579
+#: ../libpurple/protocols/bonjour/jabber.c:583
 msgid "Cannot open socket"
 msgstr "Klarte ikkje å opna endepunkt"
 
-#: ../libpurple/protocols/bonjour/jabber.c:587
+#: ../libpurple/protocols/bonjour/jabber.c:591
 msgid "Error setting socket options"
 msgstr "Klarte ikkje å lagra endepunktsval"
 
-#: ../libpurple/protocols/bonjour/jabber.c:611
+#: ../libpurple/protocols/bonjour/jabber.c:615
 msgid "Could not bind socket to port"
 msgstr "Klarte ikkje å binda endepunktet til port"
 
-#: ../libpurple/protocols/bonjour/jabber.c:619
+#: ../libpurple/protocols/bonjour/jabber.c:623
 msgid "Could not listen on socket"
 msgstr "Klarte ikkje å lytta til endepunktet"
 
@@ -3554,8 +3632,8 @@
 
 #: ../libpurple/protocols/gg/gg.c:477
 #: ../libpurple/protocols/gg/gg.c:770
-#: ../libpurple/protocols/jabber/jabber.c:807
-#: ../libpurple/protocols/jabber/jabber.c:1369
+#: ../libpurple/protocols/jabber/jabber.c:798
+#: ../libpurple/protocols/jabber/jabber.c:1360
 msgid "Password"
 msgstr "Passord"
 
@@ -3586,9 +3664,9 @@
 #: ../libpurple/protocols/gg/gg.c:637
 #: ../libpurple/protocols/gg/gg.c:1049
 #: ../libpurple/protocols/gg/gg.c:1121
-#: ../libpurple/protocols/jabber/jabber.c:843
-#: ../libpurple/protocols/oscar/oscar.c:3757
-#: ../libpurple/protocols/oscar/oscar.c:3770
+#: ../libpurple/protocols/jabber/jabber.c:834
+#: ../libpurple/protocols/oscar/oscar.c:3799
+#: ../libpurple/protocols/oscar/oscar.c:3812
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "By"
@@ -3598,8 +3676,8 @@
 msgstr "Fødselsår"
 
 #: ../libpurple/protocols/gg/gg.c:645
-#: ../libpurple/protocols/msn/msn.c:1558
-#: ../libpurple/protocols/oscar/oscar.c:3700
+#: ../libpurple/protocols/msn/msn.c:1595
+#: ../libpurple/protocols/oscar/oscar.c:3742
 #: ../libpurple/protocols/qq/buddy_info.c:46
 #: ../libpurple/protocols/qq/qq.c:226
 #: ../libpurple/protocols/qq/qq.c:229
@@ -3614,14 +3692,14 @@
 msgstr "Mann eller kvinne"
 
 #: ../libpurple/protocols/gg/gg.c:647
-#: ../libpurple/protocols/oscar/oscar.c:3700
+#: ../libpurple/protocols/oscar/oscar.c:3742
 #: ../libpurple/protocols/qq/buddy_info.c:83
 #: ../libpurple/protocols/qq/qq.c:226
 msgid "Male"
 msgstr "Mann"
 
 #: ../libpurple/protocols/gg/gg.c:648
-#: ../libpurple/protocols/oscar/oscar.c:3700
+#: ../libpurple/protocols/oscar/oscar.c:3742
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:229
 msgid "Female"
@@ -3687,16 +3765,16 @@
 #: ../libpurple/protocols/jabber/buddy.c:1466
 #: ../libpurple/protocols/novell/novell.c:2828
 #: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:5552
+#: ../libpurple/protocols/oscar/oscar.c:5605
 #: ../libpurple/protocols/qq/qq.c:170
 #: ../libpurple/protocols/qq/qq.c:177
 #: ../libpurple/protocols/qq/qq.c:292
-#: ../libpurple/protocols/yahoo/yahoo.c:2938
+#: ../libpurple/protocols/yahoo/yahoo.c:3101
 #: ../libpurple/status.c:153
-#: ../pidgin/gtkblist.c:3082
-#: ../pidgin/gtkblist.c:3423
+#: ../pidgin/gtkblist.c:3101
+#: ../pidgin/gtkblist.c:3433
 #: ../pidgin/gtkdocklet.c:450
-#: ../pidgin/gtkstatusbox.c:1059
+#: ../pidgin/gtkstatusbox.c:1060
 msgid "Offline"
 msgstr "Fråkopla"
 
@@ -3708,10 +3786,10 @@
 #: ../libpurple/protocols/msn/state.c:38
 #: ../libpurple/protocols/novell/novell.c:2816
 #: ../libpurple/protocols/qq/qq.c:280
-#: ../libpurple/protocols/yahoo/yahoo.c:2940
+#: ../libpurple/protocols/yahoo/yahoo.c:3103
 #: ../libpurple/status.c:154
 #: ../pidgin/gtkdocklet.c:438
-#: ../pidgin/gtkstatusbox.c:1055
+#: ../pidgin/gtkstatusbox.c:1056
 msgid "Available"
 msgstr "Tilgjengeleg"
 
@@ -3719,30 +3797,30 @@
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
 #: ../libpurple/protocols/gg/gg.c:1009
-#: ../libpurple/protocols/irc/irc.c:530
+#: ../libpurple/protocols/irc/irc.c:528
 #: ../libpurple/protocols/irc/msgs.c:310
 #: ../libpurple/protocols/jabber/buddy.c:1472
 #: ../libpurple/protocols/novell/novell.c:2819
 #: ../libpurple/protocols/oscar/oscar.c:732
-#: ../libpurple/protocols/oscar/oscar.c:4504
-#: ../libpurple/protocols/oscar/oscar.c:5580
+#: ../libpurple/protocols/oscar/oscar.c:4557
+#: ../libpurple/protocols/oscar/oscar.c:5633
 #: ../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:3492
-#: ../libpurple/protocols/yahoo/yahoo.c:3566
+#: ../libpurple/protocols/yahoo/yahoo.c:3655
+#: ../libpurple/protocols/yahoo/yahoo.c:3729
 #: ../libpurple/status.c:157
 #: ../pidgin/gtkdocklet.c:442
-#: ../pidgin/gtkprefs.c:1934
-#: ../pidgin/gtkstatusbox.c:1056
+#: ../pidgin/gtkprefs.c:1936
+#: ../pidgin/gtkstatusbox.c:1057
 msgid "Away"
 msgstr "Vekke"
 
 #: ../libpurple/protocols/gg/gg.c:1038
 #: ../libpurple/protocols/gg/gg.c:1112
-#: ../libpurple/protocols/oscar/oscar.c:2669
-#: ../libpurple/protocols/oscar/oscar.c:3667
+#: ../libpurple/protocols/oscar/oscar.c:2709
+#: ../libpurple/protocols/oscar/oscar.c:3709
 msgid "UIN"
 msgstr "UIN"
 
@@ -3750,7 +3828,7 @@
 #: ../libpurple/protocols/gg/gg.c:1115
 #: ../libpurple/protocols/jabber/buddy.c:1623
 #: ../libpurple/protocols/jabber/buddy.c:1799
-#: ../libpurple/protocols/oscar/oscar.c:3678
+#: ../libpurple/protocols/oscar/oscar.c:3720
 #: ../libpurple/protocols/silc/ops.c:990
 #: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
@@ -3763,7 +3841,7 @@
 
 #: ../libpurple/protocols/gg/gg.c:1106
 #: ../libpurple/protocols/gg/gg.c:1175
-#: ../libpurple/protocols/oscar/oscar.c:3879
+#: ../libpurple/protocols/oscar/oscar.c:3921
 msgid "Unable to display the search results."
 msgstr "Klarer ikkje å visa søkjeresultata."
 
@@ -3810,7 +3888,7 @@
 msgstr "Tilkoplinga feila."
 
 #: ../libpurple/protocols/gg/gg.c:1616
-#: ../libpurple/protocols/msn/msn.c:531
+#: ../libpurple/protocols/msn/msn.c:568
 msgid "Blocked"
 msgstr "Blokkert"
 
@@ -3948,8 +4026,9 @@
 
 #: ../libpurple/protocols/irc/irc.c:127
 #: ../libpurple/protocols/irc/irc.c:165
-#: ../libpurple/protocols/irc/irc.c:614
-#: ../libpurple/protocols/irc/irc.c:639
+#: ../libpurple/protocols/irc/irc.c:612
+#: ../libpurple/protocols/irc/irc.c:637
+#: ../libpurple/protocols/myspace/myspace.c:2350
 msgid "Server has disconnected"
 msgstr "Tenaren har kopla frå"
 
@@ -3965,7 +4044,7 @@
 
 #: ../libpurple/protocols/irc/irc.c:267
 #: ../libpurple/protocols/jabber/chat.c:59
-#: ../pidgin/gtkaccount.c:526
+#: ../pidgin/gtkaccount.c:524
 msgid "_Password:"
 msgstr "_Passord:"
 
@@ -3973,67 +4052,64 @@
 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:1046
+#: ../libpurple/protocols/jabber/jabber.c:1037
 #: ../libpurple/protocols/msn/session.c:345
+#: ../libpurple/protocols/myspace/myspace.c:301
 #: ../libpurple/protocols/novell/novell.c:2182
 #: ../libpurple/protocols/oscar/oscar.c:1285
 #: ../libpurple/protocols/qq/qq.c:136
-#: ../libpurple/protocols/sametime/sametime.c:3724
+#: ../libpurple/protocols/sametime/sametime.c:3723
 #: ../libpurple/protocols/simple/simple.c:1676
-#: ../libpurple/protocols/yahoo/yahoo.c:2783
+#: ../libpurple/protocols/yahoo/yahoo.c:2941
 #: ../libpurple/protocols/zephyr/zephyr.c:1621
 #: ../pidgin/gtkstatusbox.c:661
 msgid "Connecting"
 msgstr "Koplar til"
 
 #: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:603
-#: ../libpurple/protocols/jabber/jabber.c:950
+#: ../libpurple/protocols/jabber/jabber.c:594
+#: ../libpurple/protocols/jabber/jabber.c:941
 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:1591
 msgid "Couldn't create socket"
 msgstr "Klarte ikkje å laga endepunkt"
 
-#: ../libpurple/protocols/irc/irc.c:416
+#: ../libpurple/protocols/irc/irc.c:421
+#: ../libpurple/protocols/myspace/myspace.c:2463
 #: ../libpurple/protocols/oscar/oscar.c:1281
 msgid "Couldn't connect to host"
 msgstr "Klarte ikkje å kopla til verten"
 
-#: ../libpurple/protocols/irc/irc.c:438
-#: ../libpurple/protocols/jabber/jabber.c:499
-msgid "Connection Failed"
-msgstr "Tilkoplinga feila"
-
-#: ../libpurple/protocols/irc/irc.c:441
-#: ../libpurple/protocols/jabber/jabber.c:502
-msgid "SSL Handshake Failed"
-msgstr "SSL-utvekslinga feila"
-
-#: ../libpurple/protocols/irc/irc.c:611
-#: ../libpurple/protocols/irc/irc.c:636
+#: ../libpurple/protocols/irc/irc.c:609
+#: ../libpurple/protocols/irc/irc.c:634
+#: ../libpurple/protocols/myspace/myspace.c:2346
 msgid "Read error"
 msgstr "Lesefeil"
 
-#: ../libpurple/protocols/irc/irc.c:775
+#: ../libpurple/protocols/irc/irc.c:773
 #: ../libpurple/protocols/silc/chat.c:1412
 #: ../libpurple/protocols/silc10/chat.c:1426
-#: ../libpurple/protocols/yahoo/yahoochat.c:1401
+#: ../libpurple/protocols/yahoo/yahoochat.c:1497
 msgid "Users"
 msgstr "Brukarar"
 
-#: ../libpurple/protocols/irc/irc.c:778
-#: ../libpurple/protocols/sametime/sametime.c:3375
+#: ../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/silc10/chat.c:1429
 #: ../libpurple/protocols/silc10/ops.c:1382
-#: ../libpurple/protocols/yahoo/yahoochat.c:1410
+#: ../libpurple/protocols/yahoo/yahoochat.c:1506
 msgid "Topic"
 msgstr "Emne"
 
@@ -4045,22 +4121,22 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:916
+#: ../libpurple/protocols/irc/irc.c:914
 msgid "IRC Protocol Plugin"
 msgstr "IRC-protokolltillegg"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:917
+#: ../libpurple/protocols/irc/irc.c:915
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "IRC-protokolltillegget som syg mindre"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:942
+#: ../libpurple/protocols/irc/irc.c:940
 #: ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2154
-#: ../libpurple/protocols/oscar/oscar.c:6619
+#: ../libpurple/protocols/msn/msn.c:2196
+#: ../libpurple/protocols/oscar/oscar.c:6672
 #: ../libpurple/protocols/qq/qq.c:755
-#: ../libpurple/protocols/sametime/sametime.c:5728
+#: ../libpurple/protocols/sametime/sametime.c:5727
 #: ../libpurple/protocols/silc/ops.c:1249
 #: ../libpurple/protocols/silc/ops.c:1341
 #: ../libpurple/protocols/silc10/ops.c:1244
@@ -4071,24 +4147,24 @@
 msgstr "Tenar"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:945
-#: ../libpurple/protocols/msn/msn.c:2159
-#: ../libpurple/protocols/oscar/oscar.c:6622
+#: ../libpurple/protocols/irc/irc.c:943
+#: ../libpurple/protocols/msn/msn.c:2201
+#: ../libpurple/protocols/oscar/oscar.c:6675
 #: ../libpurple/protocols/qq/qq.c:758
-#: ../libpurple/protocols/sametime/sametime.c:5733
+#: ../libpurple/protocols/sametime/sametime.c:5732
 #: ../libpurple/protocols/silc/silc.c:1918
 #: ../libpurple/protocols/silc10/silc.c:1861
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Port"
 
-#: ../libpurple/protocols/irc/irc.c:948
+#: ../libpurple/protocols/irc/irc.c:946
 msgid "Encodings"
 msgstr "Teiknkodingar"
 
-#: ../libpurple/protocols/irc/irc.c:951
+#: ../libpurple/protocols/irc/irc.c:949
 #: ../libpurple/protocols/irc/msgs.c:316
-#: ../libpurple/protocols/jabber/jabber.c:803
+#: ../libpurple/protocols/jabber/jabber.c:794
 #: ../libpurple/protocols/silc/buddy.c:1539
 #: ../libpurple/protocols/silc/ops.c:1197
 #: ../libpurple/protocols/silc/ops.c:1200
@@ -4104,7 +4180,7 @@
 msgid "Username"
 msgstr "Brukarnamn"
 
-#: ../libpurple/protocols/irc/irc.c:954
+#: ../libpurple/protocols/irc/irc.c:952
 #: ../libpurple/protocols/irc/msgs.c:317
 #: ../libpurple/protocols/silc/silc.c:1009
 #: ../libpurple/protocols/silc10/silc.c:920
@@ -4115,7 +4191,7 @@
 #. 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:962
+#: ../libpurple/protocols/irc/irc.c:960
 msgid "Use SSL"
 msgstr "Bruk SSL"
 
@@ -4146,7 +4222,7 @@
 msgstr " <i>(identifisert)</i>"
 
 #: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3668
+#: ../libpurple/protocols/oscar/oscar.c:3710
 #: ../libpurple/protocols/silc/ops.c:1418
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
@@ -4379,7 +4455,7 @@
 msgstr "names [kanal]:  listar brukarane i kanalen."
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:1830
+#: ../libpurple/protocols/jabber/jabber.c:1821
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;nytt kallenamn&gt;:  endra kallenamnet ditt."
 
@@ -4532,7 +4608,7 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:271
 #: ../libpurple/protocols/jabber/buddy.c:825
-#: ../libpurple/protocols/sametime/sametime.c:4129
+#: ../libpurple/protocols/sametime/sametime.c:4128
 #: ../libpurple/protocols/silc/ops.c:986
 #: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
@@ -4551,7 +4627,7 @@
 msgstr "Førenamn"
 
 #: ../libpurple/protocols/jabber/buddy.c:275
-#: ../libpurple/protocols/jabber/jabber.c:863
+#: ../libpurple/protocols/jabber/jabber.c:854
 msgid "URL"
 msgstr "Nettadresse"
 
@@ -4610,15 +4686,15 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:288
 #: ../libpurple/protocols/jabber/buddy.c:859
-#: ../libpurple/protocols/msn/msn.c:1627
-#: ../libpurple/protocols/oscar/oscar.c:3717
+#: ../libpurple/protocols/msn/msn.c:1664
+#: ../libpurple/protocols/oscar/oscar.c:3759
 msgid "Birthday"
 msgstr "Fødselsdag"
 
 #: ../libpurple/protocols/jabber/buddy.c:289
 #: ../libpurple/protocols/jabber/buddy.c:979
 #: ../libpurple/protocols/jabber/chat.c:775
-#: ../pidgin/gtkblist.c:3093
+#: ../pidgin/gtkblist.c:3113
 #: ../pidgin/gtkprefs.c:738
 msgid "Description"
 msgstr "Skildring"
@@ -4649,11 +4725,11 @@
 msgstr "Ressurs"
 
 #: ../libpurple/protocols/jabber/buddy.c:671
-#: ../libpurple/protocols/jabber/jabber.c:1243
-#: ../libpurple/protocols/jabber/jabber.c:1253
-#: ../libpurple/protocols/jabber/jabber.c:1263
-#: ../libpurple/protocols/jabber/jabber.c:1273
-#: ../libpurple/protocols/jabber/jabber.c:1283
+#: ../libpurple/protocols/jabber/jabber.c:1234
+#: ../libpurple/protocols/jabber/jabber.c:1244
+#: ../libpurple/protocols/jabber/jabber.c:1254
+#: ../libpurple/protocols/jabber/jabber.c:1264
+#: ../libpurple/protocols/jabber/jabber.c:1274
 msgid "Priority"
 msgstr "Prioritet"
 
@@ -4664,9 +4740,9 @@
 msgstr "Mellomnamn"
 
 #: ../libpurple/protocols/jabber/buddy.c:879
-#: ../libpurple/protocols/jabber/jabber.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3756
-#: ../libpurple/protocols/oscar/oscar.c:3769
+#: ../libpurple/protocols/jabber/jabber.c:829
+#: ../libpurple/protocols/oscar/oscar.c:3798
+#: ../libpurple/protocols/oscar/oscar.c:3811
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1030
 #: ../libpurple/protocols/silc10/ops.c:1064
@@ -4710,7 +4786,7 @@
 msgstr "Avbryt tinging"
 
 #: ../libpurple/protocols/jabber/buddy.c:1470
-#: ../libpurple/protocols/jabber/jabber.c:1252
+#: ../libpurple/protocols/jabber/jabber.c:1243
 msgid "Chatty"
 msgstr "Snakkesaleg"
 
@@ -4719,10 +4795,10 @@
 msgstr "Utvida vekke"
 
 #: ../libpurple/protocols/jabber/buddy.c:1476
-#: ../libpurple/protocols/jabber/jabber.c:1282
+#: ../libpurple/protocols/jabber/jabber.c:1273
 #: ../libpurple/protocols/oscar/oscar.c:726
-#: ../libpurple/protocols/oscar/oscar.c:5756
-#: ../libpurple/protocols/sametime/sametime.c:3298
+#: ../libpurple/protocols/oscar/oscar.c:5809
+#: ../libpurple/protocols/sametime/sametime.c:3297
 msgid "Do Not Disturb"
 msgstr "Ikkje forstyrr meg"
 
@@ -4732,7 +4808,7 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:1625
 #: ../libpurple/protocols/jabber/buddy.c:1804
-#: ../libpurple/protocols/oscar/oscar.c:3679
+#: ../libpurple/protocols/oscar/oscar.c:3721
 msgid "Last Name"
 msgstr "Etternamn"
 
@@ -4766,8 +4842,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:1814
 #: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3682
-#: ../libpurple/protocols/oscar/oscar.c:3691
+#: ../libpurple/protocols/oscar/oscar.c:3724
+#: ../libpurple/protocols/oscar/oscar.c:3733
 msgid "E-Mail Address"
 msgstr "E-postadresse"
 
@@ -4783,7 +4859,7 @@
 #: ../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:5612
+#: ../libpurple/protocols/sametime/sametime.c:5611
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
@@ -4806,8 +4882,8 @@
 msgstr "Søk katalog"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5242
-#: ../libpurple/protocols/yahoo/yahoochat.c:962
+#: ../libpurple/protocols/oscar/oscar.c:5295
+#: ../libpurple/protocols/yahoo/yahoochat.c:1048
 msgid "_Room:"
 msgstr "_Rom:"
 
@@ -4914,8 +4990,8 @@
 
 #: ../libpurple/protocols/jabber/jabber.c:467
 #: ../libpurple/protocols/oscar/flap_connection.c:394
-#: ../libpurple/protocols/yahoo/yahoo.c:2402
-#: ../libpurple/protocols/yahoo/yahoo.c:2434
+#: ../libpurple/protocols/yahoo/yahoo.c:2560
+#: ../libpurple/protocols/yahoo/yahoo.c:2592
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -4924,55 +5000,55 @@
 "Klarte ikkje å laga eit samband til tenaren:\n"
 "%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:523
+#: ../libpurple/protocols/jabber/jabber.c:514
 msgid "Unable to create socket"
 msgstr "Klarte ikkje å laga endepunkt"
 
-#: ../libpurple/protocols/jabber/jabber.c:568
-#: ../libpurple/protocols/jabber/jabber.c:918
+#: ../libpurple/protocols/jabber/jabber.c:559
+#: ../libpurple/protocols/jabber/jabber.c:909
 msgid "Invalid XMPP ID"
 msgstr "Ugyldig XMPP-id"
 
-#: ../libpurple/protocols/jabber/jabber.c:573
+#: ../libpurple/protocols/jabber/jabber.c:564
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Ulovleg XMPP-id. Domenet må vera skrive inn."
 
-#: ../libpurple/protocols/jabber/jabber.c:644
+#: ../libpurple/protocols/jabber/jabber.c:635
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registreringa av %s@%s blei gjennomført"
 
+#: ../libpurple/protocols/jabber/jabber.c:637
+#: ../libpurple/protocols/jabber/jabber.c:638
+msgid "Registration Successful"
+msgstr "Registreringa blei gjennomført"
+
+#: ../libpurple/protocols/jabber/jabber.c:644
+#: ../libpurple/protocols/jabber/jabber.c:1515
+msgid "Unknown Error"
+msgstr "Ukjend feil"
+
 #: ../libpurple/protocols/jabber/jabber.c:646
 #: ../libpurple/protocols/jabber/jabber.c:647
-msgid "Registration Successful"
-msgstr "Registreringa blei gjennomført"
-
-#: ../libpurple/protocols/jabber/jabber.c:653
-#: ../libpurple/protocols/jabber/jabber.c:1524
-msgid "Unknown Error"
-msgstr "Ukjend feil"
-
-#: ../libpurple/protocols/jabber/jabber.c:655
-#: ../libpurple/protocols/jabber/jabber.c:656
 msgid "Registration Failed"
 msgstr "Registreringa feila"
 
-#: ../libpurple/protocols/jabber/jabber.c:771
-#: ../libpurple/protocols/jabber/jabber.c:772
+#: ../libpurple/protocols/jabber/jabber.c:762
+#: ../libpurple/protocols/jabber/jabber.c:763
 msgid "Already Registered"
 msgstr "Allereie registrert"
 
-#: ../libpurple/protocols/jabber/jabber.c:848
-#: ../libpurple/protocols/oscar/oscar.c:3758
-#: ../libpurple/protocols/oscar/oscar.c:3771
+#: ../libpurple/protocols/jabber/jabber.c:839
+#: ../libpurple/protocols/oscar/oscar.c:3800
+#: ../libpurple/protocols/oscar/oscar.c:3813
 msgid "State"
 msgstr "Fylke/Region/Stat"
 
-#: ../libpurple/protocols/jabber/jabber.c:853
+#: ../libpurple/protocols/jabber/jabber.c:844
 msgid "Postal code"
 msgstr "Postnummer"
 
-#: ../libpurple/protocols/jabber/jabber.c:858
+#: ../libpurple/protocols/jabber/jabber.c:849
 #: ../libpurple/protocols/silc/ops.c:1035
 #: ../libpurple/protocols/silc/silc.c:772
 #: ../libpurple/protocols/silc/util.c:557
@@ -4982,397 +5058,395 @@
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../libpurple/protocols/jabber/jabber.c:868
+#: ../libpurple/protocols/jabber/jabber.c:859
 msgid "Date"
 msgstr "Dato"
 
-#: ../libpurple/protocols/jabber/jabber.c:876
+#: ../libpurple/protocols/jabber/jabber.c:867
 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:879
-#: ../libpurple/protocols/jabber/jabber.c:880
+#: ../libpurple/protocols/jabber/jabber.c:870
+#: ../libpurple/protocols/jabber/jabber.c:871
 msgid "Register New XMPP Account"
 msgstr "Registrer ein ny XMPP-konto"
 
-#. Register button
-#: ../libpurple/protocols/jabber/jabber.c:881
-#: ../pidgin/gtkaccount.c:1523
+#: ../libpurple/protocols/jabber/jabber.c:872
 msgid "Register"
 msgstr "Registrer"
 
-#: ../libpurple/protocols/jabber/jabber.c:1050
+#: ../libpurple/protocols/jabber/jabber.c:1041
 msgid "Initializing Stream"
 msgstr "Begynner datastraum"
 
-#: ../libpurple/protocols/jabber/jabber.c:1055
+#: ../libpurple/protocols/jabber/jabber.c:1046
 #: ../libpurple/protocols/msn/session.c:351
 msgid "Authenticating"
 msgstr "Autentiserer"
 
-#: ../libpurple/protocols/jabber/jabber.c:1064
+#: ../libpurple/protocols/jabber/jabber.c:1055
 msgid "Re-initializing Stream"
 msgstr "Tek opp att datastraumen"
 
-#: ../libpurple/protocols/jabber/jabber.c:1126
-#: ../libpurple/protocols/jabber/jabber.c:1502
-#: ../libpurple/protocols/jabber/jabber.c:1543
-#: ../libpurple/protocols/jabber/jabber.c:1579
+#: ../libpurple/protocols/jabber/jabber.c:1117
+#: ../libpurple/protocols/jabber/jabber.c:1493
+#: ../libpurple/protocols/jabber/jabber.c:1534
+#: ../libpurple/protocols/jabber/jabber.c:1570
 #: ../libpurple/protocols/oscar/oscar.c:825
-#: ../libpurple/protocols/oscar/oscar.c:5550
+#: ../libpurple/protocols/oscar/oscar.c:5603
 msgid "Not Authorized"
 msgstr "Ikkje autorisert"
 
-#: ../libpurple/protocols/jabber/jabber.c:1168
+#: ../libpurple/protocols/jabber/jabber.c:1159
 msgid "Both"
 msgstr "Begge"
 
-#: ../libpurple/protocols/jabber/jabber.c:1170
+#: ../libpurple/protocols/jabber/jabber.c:1161
 msgid "From (To pending)"
 msgstr "Frå (til ventar)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1172
+#: ../libpurple/protocols/jabber/jabber.c:1163
 msgid "From"
 msgstr "Frå"
 
-#: ../libpurple/protocols/jabber/jabber.c:1175
+#: ../libpurple/protocols/jabber/jabber.c:1166
 msgid "To"
 msgstr "Til"
 
-#: ../libpurple/protocols/jabber/jabber.c:1177
+#: ../libpurple/protocols/jabber/jabber.c:1168
 msgid "None (To pending)"
 msgstr "Ingen (til ventar)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1179
+#: ../libpurple/protocols/jabber/jabber.c:1170
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "Ingen"
 
-#: ../libpurple/protocols/jabber/jabber.c:1182
+#: ../libpurple/protocols/jabber/jabber.c:1173
 msgid "Subscription"
 msgstr "Abonnement"
 
-#: ../libpurple/protocols/jabber/jabber.c:1312
+#: ../libpurple/protocols/jabber/jabber.c:1303
 msgid "Password Changed"
 msgstr "Passordet er endra"
 
-#: ../libpurple/protocols/jabber/jabber.c:1313
+#: ../libpurple/protocols/jabber/jabber.c:1304
 msgid "Your password has been changed."
 msgstr "Passordet ditt er blitt endra"
 
-#: ../libpurple/protocols/jabber/jabber.c:1317
-#: ../libpurple/protocols/jabber/jabber.c:1318
+#: ../libpurple/protocols/jabber/jabber.c:1308
+#: ../libpurple/protocols/jabber/jabber.c:1309
 msgid "Error changing password"
 msgstr "Feil under  endringa av passordet"
 
-#: ../libpurple/protocols/jabber/jabber.c:1375
+#: ../libpurple/protocols/jabber/jabber.c:1366
 msgid "Password (again)"
 msgstr "Passord (om att)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1381
-#: ../libpurple/protocols/jabber/jabber.c:1382
+#: ../libpurple/protocols/jabber/jabber.c:1372
+#: ../libpurple/protocols/jabber/jabber.c:1373
 msgid "Change XMPP Password"
 msgstr "Endra XMPP-passord"
 
-#: ../libpurple/protocols/jabber/jabber.c:1382
+#: ../libpurple/protocols/jabber/jabber.c:1373
 msgid "Please enter your new password"
 msgstr "Skriv inn det nye passordet ditt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1394
-#: ../libpurple/protocols/oscar/oscar.c:6336
+#: ../libpurple/protocols/jabber/jabber.c:1385
+#: ../libpurple/protocols/oscar/oscar.c:6389
 #: ../libpurple/protocols/silc/silc.c:1093
 #: ../libpurple/protocols/silc10/silc.c:1004
 msgid "Set User Info..."
 msgstr "Skriv inn brukarinfo…"
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1399
-#: ../libpurple/protocols/oscar/oscar.c:6347
+#: ../libpurple/protocols/jabber/jabber.c:1390
+#: ../libpurple/protocols/oscar/oscar.c:6400
 #: ../libpurple/protocols/silc/silc.c:1089
 #: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
 msgstr "Endra passord…"
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1404
+#: ../libpurple/protocols/jabber/jabber.c:1395
 msgid "Search for Users..."
 msgstr "Søk etter brukarar…"
 
-#: ../libpurple/protocols/jabber/jabber.c:1482
+#: ../libpurple/protocols/jabber/jabber.c:1473
 msgid "Bad Request"
 msgstr "Ugyldig førespurnad"
 
-#: ../libpurple/protocols/jabber/jabber.c:1484
+#: ../libpurple/protocols/jabber/jabber.c:1475
 msgid "Conflict"
 msgstr "Konflikt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1486
+#: ../libpurple/protocols/jabber/jabber.c:1477
 msgid "Feature Not Implemented"
 msgstr "Funksjonen er ikkje teken i bruk"
 
-#: ../libpurple/protocols/jabber/jabber.c:1488
+#: ../libpurple/protocols/jabber/jabber.c:1479
 msgid "Forbidden"
 msgstr "Forbode"
 
-#: ../libpurple/protocols/jabber/jabber.c:1490
+#: ../libpurple/protocols/jabber/jabber.c:1481
 msgid "Gone"
 msgstr "Vekke"
 
-#: ../libpurple/protocols/jabber/jabber.c:1492
-#: ../libpurple/protocols/jabber/jabber.c:1569
+#: ../libpurple/protocols/jabber/jabber.c:1483
+#: ../libpurple/protocols/jabber/jabber.c:1560
 msgid "Internal Server Error"
 msgstr "Intern tenarfeil"
 
-#: ../libpurple/protocols/jabber/jabber.c:1494
+#: ../libpurple/protocols/jabber/jabber.c:1485
 msgid "Item Not Found"
 msgstr "Elementet blei ikkje funne"
 
-#: ../libpurple/protocols/jabber/jabber.c:1496
+#: ../libpurple/protocols/jabber/jabber.c:1487
 msgid "Malformed XMPP ID"
 msgstr "Misforma XMPP-id"
 
-#: ../libpurple/protocols/jabber/jabber.c:1498
+#: ../libpurple/protocols/jabber/jabber.c:1489
 msgid "Not Acceptable"
 msgstr "Avvist"
 
-#: ../libpurple/protocols/jabber/jabber.c:1500
+#: ../libpurple/protocols/jabber/jabber.c:1491
 msgid "Not Allowed"
 msgstr "Ikkje tillate"
 
-#: ../libpurple/protocols/jabber/jabber.c:1504
+#: ../libpurple/protocols/jabber/jabber.c:1495
 msgid "Payment Required"
 msgstr "Betaling påkravd"
 
-#: ../libpurple/protocols/jabber/jabber.c:1506
+#: ../libpurple/protocols/jabber/jabber.c:1497
 msgid "Recipient Unavailable"
 msgstr "Mottakaren er ikkje tilgjengeleg"
 
-#: ../libpurple/protocols/jabber/jabber.c:1510
+#: ../libpurple/protocols/jabber/jabber.c:1501
 msgid "Registration Required"
 msgstr "Registrering påkravd"
 
-#: ../libpurple/protocols/jabber/jabber.c:1512
+#: ../libpurple/protocols/jabber/jabber.c:1503
 msgid "Remote Server Not Found"
 msgstr "Fann ikkje fjerntenaren"
 
-#: ../libpurple/protocols/jabber/jabber.c:1514
+#: ../libpurple/protocols/jabber/jabber.c:1505
 msgid "Remote Server Timeout"
 msgstr "Tidsavbrot på fjerntenaren"
 
-#: ../libpurple/protocols/jabber/jabber.c:1516
+#: ../libpurple/protocols/jabber/jabber.c:1507
 msgid "Server Overloaded"
 msgstr "Tenaren er overlasta"
 
-#: ../libpurple/protocols/jabber/jabber.c:1518
+#: ../libpurple/protocols/jabber/jabber.c:1509
 msgid "Service Unavailable"
 msgstr "Tenesten er utilgjengeleg"
 
-#: ../libpurple/protocols/jabber/jabber.c:1520
+#: ../libpurple/protocols/jabber/jabber.c:1511
 msgid "Subscription Required"
 msgstr "Abonnement påkravd"
 
-#: ../libpurple/protocols/jabber/jabber.c:1522
+#: ../libpurple/protocols/jabber/jabber.c:1513
 msgid "Unexpected Request"
 msgstr "Uventa førespurnad"
 
-#: ../libpurple/protocols/jabber/jabber.c:1529
+#: ../libpurple/protocols/jabber/jabber.c:1520
 msgid "Authorization Aborted"
 msgstr "Autoriseringa blei avbroten"
 
-#: ../libpurple/protocols/jabber/jabber.c:1531
+#: ../libpurple/protocols/jabber/jabber.c:1522
 msgid "Incorrect encoding in authorization"
 msgstr "Feil koding i autoriseringa"
 
-#: ../libpurple/protocols/jabber/jabber.c:1534
+#: ../libpurple/protocols/jabber/jabber.c:1525
 msgid "Invalid authzid"
 msgstr "Ugyldig authzid"
 
-#: ../libpurple/protocols/jabber/jabber.c:1537
+#: ../libpurple/protocols/jabber/jabber.c:1528
 msgid "Invalid Authorization Mechanism"
 msgstr "Ugyldig autoriseringsmekanisme"
 
-#: ../libpurple/protocols/jabber/jabber.c:1540
+#: ../libpurple/protocols/jabber/jabber.c:1531
 msgid "Authorization mechanism too weak"
 msgstr "Autoriseringsmekanismen er for svak"
 
-#: ../libpurple/protocols/jabber/jabber.c:1545
+#: ../libpurple/protocols/jabber/jabber.c:1536
 msgid "Temporary Authentication Failure"
 msgstr "Mellombels autentiseringssvikt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1548
+#: ../libpurple/protocols/jabber/jabber.c:1539
 msgid "Authentication Failure"
 msgstr "Autentiseringssvikt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1545
 msgid "Bad Format"
 msgstr "Feil format"
 
-#: ../libpurple/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1547
 msgid "Bad Namespace Prefix"
 msgstr "Feil namneromsprefiks"
 
-#: ../libpurple/protocols/jabber/jabber.c:1559
+#: ../libpurple/protocols/jabber/jabber.c:1550
 msgid "Resource Conflict"
 msgstr "Ressurskonflikt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1561
+#: ../libpurple/protocols/jabber/jabber.c:1552
 #: ../libpurple/protocols/silc/silc.c:244
 #: ../libpurple/protocols/silc10/ops.c:1720
 msgid "Connection Timeout"
 msgstr "Tidsavbrot på tilkoplinga"
 
-#: ../libpurple/protocols/jabber/jabber.c:1563
+#: ../libpurple/protocols/jabber/jabber.c:1554
 msgid "Host Gone"
 msgstr "Verten forsvann"
 
-#: ../libpurple/protocols/jabber/jabber.c:1565
+#: ../libpurple/protocols/jabber/jabber.c:1556
 msgid "Host Unknown"
 msgstr "Ukjend vert"
 
-#: ../libpurple/protocols/jabber/jabber.c:1567
+#: ../libpurple/protocols/jabber/jabber.c:1558
 msgid "Improper Addressing"
 msgstr "Ikkje skikkeleg adressering"
 
-#: ../libpurple/protocols/jabber/jabber.c:1571
+#: ../libpurple/protocols/jabber/jabber.c:1562
 msgid "Invalid ID"
 msgstr "Ugyldig ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:1573
+#: ../libpurple/protocols/jabber/jabber.c:1564
 msgid "Invalid Namespace"
 msgstr "Ugyldig namnerom"
 
-#: ../libpurple/protocols/jabber/jabber.c:1575
+#: ../libpurple/protocols/jabber/jabber.c:1566
 msgid "Invalid XML"
 msgstr "Ugyldig XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1577
+#: ../libpurple/protocols/jabber/jabber.c:1568
 msgid "Non-matching Hosts"
 msgstr "Ikke-samsvarande vertar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1581
+#: ../libpurple/protocols/jabber/jabber.c:1572
 msgid "Policy Violation"
 msgstr "Framgangsmåtebrot"
 
-#: ../libpurple/protocols/jabber/jabber.c:1583
+#: ../libpurple/protocols/jabber/jabber.c:1574
 msgid "Remote Connection Failed"
 msgstr "Feil i fjerntilkoplinga"
 
-#: ../libpurple/protocols/jabber/jabber.c:1585
+#: ../libpurple/protocols/jabber/jabber.c:1576
 msgid "Resource Constraint"
 msgstr "Ressursavgrensing"
 
-#: ../libpurple/protocols/jabber/jabber.c:1587
+#: ../libpurple/protocols/jabber/jabber.c:1578
 msgid "Restricted XML"
 msgstr "Avgrensa XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1589
+#: ../libpurple/protocols/jabber/jabber.c:1580
 msgid "See Other Host"
 msgstr "Sjå annan vert"
 
-#: ../libpurple/protocols/jabber/jabber.c:1591
+#: ../libpurple/protocols/jabber/jabber.c:1582
 msgid "System Shutdown"
 msgstr "Systemet avsluttar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1593
+#: ../libpurple/protocols/jabber/jabber.c:1584
 msgid "Undefined Condition"
 msgstr "Uavklara tilstand"
 
-#: ../libpurple/protocols/jabber/jabber.c:1595
+#: ../libpurple/protocols/jabber/jabber.c:1586
 msgid "Unsupported Encoding"
 msgstr "Teiknkodinga er ikkje støtta"
 
-#: ../libpurple/protocols/jabber/jabber.c:1597
+#: ../libpurple/protocols/jabber/jabber.c:1588
 msgid "Unsupported Stanza Type"
 msgstr "Stanzatypen er ikkje støtta"
 
-#: ../libpurple/protocols/jabber/jabber.c:1599
+#: ../libpurple/protocols/jabber/jabber.c:1590
 msgid "Unsupported Version"
 msgstr "Versjonen er ikkje støtta"
 
-#: ../libpurple/protocols/jabber/jabber.c:1601
+#: ../libpurple/protocols/jabber/jabber.c:1592
 msgid "XML Not Well Formed"
 msgstr "XML-koden er ikkje velforma"
 
-#: ../libpurple/protocols/jabber/jabber.c:1603
+#: ../libpurple/protocols/jabber/jabber.c:1594
 msgid "Stream Error"
 msgstr "Feil i datastraumen"
 
-#: ../libpurple/protocols/jabber/jabber.c:1686
+#: ../libpurple/protocols/jabber/jabber.c:1677
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Klarte ikkje å utestengja brukaren (%s)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1706
+#: ../libpurple/protocols/jabber/jabber.c:1697
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Ukjend tilknyting: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1711
+#: ../libpurple/protocols/jabber/jabber.c:1702
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Klarte ikkje å knyta til brukar %s som \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1730
+#: ../libpurple/protocols/jabber/jabber.c:1721
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Ukjend rolle: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1735
+#: ../libpurple/protocols/jabber/jabber.c:1726
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "Klarte ikkje å utføra rolla \"%s\" for brukaren: %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1788
+#: ../libpurple/protocols/jabber/jabber.c:1779
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Klarte ikkje å sparka ut brukaren %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1822
+#: ../libpurple/protocols/jabber/jabber.c:1813
 msgid "config:  Configure a chat room."
 msgstr "config:  Endra prateromsinnstillingane."
 
+#: ../libpurple/protocols/jabber/jabber.c:1817
+msgid "configure:  Configure a chat room."
+msgstr "configure:  Endra prateromsinnstillingane."
+
 #: ../libpurple/protocols/jabber/jabber.c:1826
-msgid "configure:  Configure a chat room."
-msgstr "configure:  Endra prateromsinnstillingane."
-
-#: ../libpurple/protocols/jabber/jabber.c:1835
 msgid "part [room]:  Leave the room."
 msgstr "part [rom]:  Forlata praterommet."
 
-#: ../libpurple/protocols/jabber/jabber.c:1840
+#: ../libpurple/protocols/jabber/jabber.c:1831
 msgid "register:  Register with a chat room."
 msgstr "register:  Registrera seg i eit praterom."
 
-#: ../libpurple/protocols/jabber/jabber.c:1846
+#: ../libpurple/protocols/jabber/jabber.c:1837
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [nytt emne]:  Visa eller endra emnet."
 
-#: ../libpurple/protocols/jabber/jabber.c:1852
+#: ../libpurple/protocols/jabber/jabber.c:1843
 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:1858
+#: ../libpurple/protocols/jabber/jabber.c:1849
 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:1864
+#: ../libpurple/protocols/jabber/jabber.c:1855
 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:1870
+#: ../libpurple/protocols/jabber/jabber.c:1861
 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:1876
+#: ../libpurple/protocols/jabber/jabber.c:1867
 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:1882
+#: ../libpurple/protocols/jabber/jabber.c:1873
 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:1887
+#: ../libpurple/protocols/jabber/jabber.c:1878
 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."
 
@@ -5393,7 +5467,7 @@
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
 #: ../libpurple/protocols/jabber/libxmpp.c:198
-#: ../pidgin/gtkaccount.c:508
+#: ../pidgin/gtkaccount.c:506
 msgid "Domain"
 msgstr "Domene"
 
@@ -5406,12 +5480,16 @@
 msgstr "Tillat _autentisering i klartekst over ukrypterte samband"
 
 #: ../libpurple/protocols/jabber/libxmpp.c:216
+#: ../libpurple/protocols/myspace/myspace.c:3276
 #: ../libpurple/protocols/simple/simple.c:1861
 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:220
+#: ../libpurple/protocols/myspace/myspace.c:3273
 #: ../libpurple/protocols/silc/silc.c:1914
 #: ../libpurple/protocols/silc10/silc.c:1857
 #: ../pidgin/gtkaccount.c:837
@@ -5768,74 +5846,86 @@
 msgid "MSN Error: %s\n"
 msgstr "MSN-feil: %s\n"
 
-#: ../libpurple/protocols/msn/msn.c:121
+#: ../libpurple/protocols/msn/msn.c:131
+msgid "nudge"
+msgstr "dytt"
+
+#: ../libpurple/protocols/msn/msn.c:132
+msgid "nudged"
+msgstr "dytta"
+
+#: ../libpurple/protocols/msn/msn.c:133
+msgid "Nudging"
+msgstr "Dyttar"
+
+#: ../libpurple/protocols/msn/msn.c:157
 msgid "You have just sent a Nudge!"
 msgstr "Du har nettopp sendt ein dytt (\"nudge\")"
 
-#: ../libpurple/protocols/msn/msn.c:146
+#: ../libpurple/protocols/msn/msn.c:183
 msgid "Your new MSN friendly name is too long."
 msgstr "Det nye MSN-visingsnamnet ditt er for langt."
 
-#: ../libpurple/protocols/msn/msn.c:254
+#: ../libpurple/protocols/msn/msn.c:291
 msgid "Set your friendly name."
 msgstr "Skriv inn visingsnamnet ditt."
 
-#: ../libpurple/protocols/msn/msn.c:255
+#: ../libpurple/protocols/msn/msn.c:292
 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:273
+#: ../libpurple/protocols/msn/msn.c:310
 msgid "Set your home phone number."
 msgstr "Skriv inn heimetelefonnummeret ditt."
 
-#: ../libpurple/protocols/msn/msn.c:290
+#: ../libpurple/protocols/msn/msn.c:327
 msgid "Set your work phone number."
 msgstr "Skriv inn arbeidstelefonnummeret ditt."
 
-#: ../libpurple/protocols/msn/msn.c:307
+#: ../libpurple/protocols/msn/msn.c:344
 msgid "Set your mobile phone number."
 msgstr "Skriv inn mobiltelefonnummeret ditt."
 
-#: ../libpurple/protocols/msn/msn.c:322
+#: ../libpurple/protocols/msn/msn.c:359
 msgid "Allow MSN Mobile pages?"
 msgstr "Tillèt du MSN Mobile-sider?"
 
-#: ../libpurple/protocols/msn/msn.c:323
+#: ../libpurple/protocols/msn/msn.c:360
 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:329
+#: ../libpurple/protocols/msn/msn.c:366
 msgid "Allow"
 msgstr "Tillat"
 
-#: ../libpurple/protocols/msn/msn.c:330
+#: ../libpurple/protocols/msn/msn.c:367
 msgid "Disallow"
 msgstr "Nekt"
 
-#: ../libpurple/protocols/msn/msn.c:346
+#: ../libpurple/protocols/msn/msn.c:383
 msgid "This Hotmail account may not be active."
 msgstr "Denne Hotmail-kontoen er kanskje ikkje i bruk."
 
-#: ../libpurple/protocols/msn/msn.c:372
+#: ../libpurple/protocols/msn/msn.c:409
 msgid "Send a mobile message."
 msgstr "Send ei mobilmelding."
 
-#: ../libpurple/protocols/msn/msn.c:374
+#: ../libpurple/protocols/msn/msn.c:411
 msgid "Page"
 msgstr "Side"
 
-#: ../libpurple/protocols/msn/msn.c:521
+#: ../libpurple/protocols/msn/msn.c:558
 msgid "Has you"
 msgstr "Har deg"
 
-#: ../libpurple/protocols/msn/msn.c:551
+#: ../libpurple/protocols/msn/msn.c:588
 #: ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:2916
-#: ../libpurple/protocols/yahoo/yahoo.c:3600
+#: ../libpurple/protocols/yahoo/yahoo.c:3079
+#: ../libpurple/protocols/yahoo/yahoo.c:3763
 msgid "Be Right Back"
 msgstr "Kjem straks tilbake"
 
-#: ../libpurple/protocols/msn/msn.c:555
+#: ../libpurple/protocols/msn/msn.c:592
 #: ../libpurple/protocols/msn/state.c:31
 #: ../libpurple/protocols/novell/novell.c:2822
 #: ../libpurple/protocols/novell/novell.c:2952
@@ -5843,95 +5933,95 @@
 #: ../libpurple/protocols/silc/silc.c:56
 #: ../libpurple/protocols/silc10/buddy.c:1480
 #: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:2918
-#: ../libpurple/protocols/yahoo/yahoo.c:3603
+#: ../libpurple/protocols/yahoo/yahoo.c:3081
+#: ../libpurple/protocols/yahoo/yahoo.c:3766
 msgid "Busy"
 msgstr "Oppteken"
 
-#: ../libpurple/protocols/msn/msn.c:559
-#: ../libpurple/protocols/yahoo/yahoo.c:2926
-#: ../libpurple/protocols/yahoo/yahoo.c:3615
+#: ../libpurple/protocols/msn/msn.c:596
+#: ../libpurple/protocols/yahoo/yahoo.c:3089
+#: ../libpurple/protocols/yahoo/yahoo.c:3778
 msgid "On the Phone"
 msgstr "Taler i  telefonen"
 
-#: ../libpurple/protocols/msn/msn.c:563
-#: ../libpurple/protocols/yahoo/yahoo.c:2930
-#: ../libpurple/protocols/yahoo/yahoo.c:3621
+#: ../libpurple/protocols/msn/msn.c:600
+#: ../libpurple/protocols/yahoo/yahoo.c:3093
+#: ../libpurple/protocols/yahoo/yahoo.c:3784
 msgid "Out to Lunch"
 msgstr "Er ute til lunsj"
 
-#: ../libpurple/protocols/msn/msn.c:591
+#: ../libpurple/protocols/msn/msn.c:628
 msgid "Set Friendly Name..."
 msgstr "Skriv inn visingsnamn…"
 
-#: ../libpurple/protocols/msn/msn.c:596
+#: ../libpurple/protocols/msn/msn.c:633
 msgid "Set Home Phone Number..."
 msgstr "Skriv inn heimetelefonnummer…"
 
-#: ../libpurple/protocols/msn/msn.c:600
+#: ../libpurple/protocols/msn/msn.c:637
 msgid "Set Work Phone Number..."
 msgstr "Skriv inn jobbtelefonnummer…"
 
-#: ../libpurple/protocols/msn/msn.c:604
+#: ../libpurple/protocols/msn/msn.c:641
 msgid "Set Mobile Phone Number..."
 msgstr "Skriv inn mobiltelefonnummer…"
 
-#: ../libpurple/protocols/msn/msn.c:610
+#: ../libpurple/protocols/msn/msn.c:647
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Ta i bruk/ta vekk mobile einingar…"
 
-#: ../libpurple/protocols/msn/msn.c:615
+#: ../libpurple/protocols/msn/msn.c:652
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Tillat/avslå mobilsider…"
 
-#: ../libpurple/protocols/msn/msn.c:626
+#: ../libpurple/protocols/msn/msn.c:663
 msgid "Open Hotmail Inbox"
 msgstr "Opna Hotmail-innkorga"
 
-#: ../libpurple/protocols/msn/msn.c:650
+#: ../libpurple/protocols/msn/msn.c:687
 msgid "Send to Mobile"
 msgstr "Send til mobil"
 
-#: ../libpurple/protocols/msn/msn.c:660
+#: ../libpurple/protocols/msn/msn.c:697
 #: ../libpurple/protocols/novell/novell.c:3408
 msgid "Initiate _Chat"
 msgstr "Start ein _prat"
 
-#: ../libpurple/protocols/msn/msn.c:698
+#: ../libpurple/protocols/msn/msn.c:735
 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:723
+#: ../libpurple/protocols/msn/msn.c:760
 msgid "Failed to connect to server."
 msgstr "Klarte ikkje å kopla til tenaren."
 
-#: ../libpurple/protocols/msn/msn.c:1479
-#: ../libpurple/protocols/msn/msn.c:1827
+#: ../libpurple/protocols/msn/msn.c:1516
+#: ../libpurple/protocols/msn/msn.c:1864
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "Klarte ikkje å henta profilen"
 
-#: ../libpurple/protocols/msn/msn.c:1550
+#: ../libpurple/protocols/msn/msn.c:1587
 #: ../pidgin/plugins/convcolors.c:309
 #: ../pidgin/plugins/pidginrc.c:366
 msgid "General"
 msgstr "Generelt"
 
-#: ../libpurple/protocols/msn/msn.c:1557
-#: ../libpurple/protocols/oscar/oscar.c:3723
+#: ../libpurple/protocols/msn/msn.c:1594
+#: ../libpurple/protocols/oscar/oscar.c:3765
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:221
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
 msgid "Age"
 msgstr "Alder"
 
-#: ../libpurple/protocols/msn/msn.c:1559
+#: ../libpurple/protocols/msn/msn.c:1596
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
 msgid "Occupation"
 msgstr "Yrke"
 
-#: ../libpurple/protocols/msn/msn.c:1560
+#: ../libpurple/protocols/msn/msn.c:1597
 #: ../libpurple/protocols/novell/novell.c:1478
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
 #: ../libpurple/protocols/zephyr/zephyr.c:798
@@ -5939,204 +6029,204 @@
 msgid "Location"
 msgstr "Stad"
 
-#: ../libpurple/protocols/msn/msn.c:1565
-#: ../libpurple/protocols/msn/msn.c:1757
-#: ../libpurple/protocols/msn/msn.c:1763
-#: ../libpurple/protocols/msn/msn.c:1770
+#: ../libpurple/protocols/msn/msn.c:1602
+#: ../libpurple/protocols/msn/msn.c:1794
+#: ../libpurple/protocols/msn/msn.c:1800
+#: ../libpurple/protocols/msn/msn.c:1807
 msgid "Hobbies and Interests"
 msgstr "Fritidssysler og interesser"
 
-#: ../libpurple/protocols/msn/msn.c:1571
-#: ../libpurple/protocols/msn/msn.c:1691
-#: ../libpurple/protocols/msn/msn.c:1697
-#: ../libpurple/protocols/msn/msn.c:1704
-#: ../libpurple/protocols/msn/msn.c:1712
-#: ../libpurple/protocols/msn/msn.c:1719
+#: ../libpurple/protocols/msn/msn.c:1608
+#: ../libpurple/protocols/msn/msn.c:1728
+#: ../libpurple/protocols/msn/msn.c:1734
+#: ../libpurple/protocols/msn/msn.c:1741
+#: ../libpurple/protocols/msn/msn.c:1749
+#: ../libpurple/protocols/msn/msn.c:1756
 msgid "A Little About Me"
 msgstr "Litt om meg sjølv"
 
-#: ../libpurple/protocols/msn/msn.c:1588
+#: ../libpurple/protocols/msn/msn.c:1625
 msgid "Social"
 msgstr "Sosial"
 
-#: ../libpurple/protocols/msn/msn.c:1590
+#: ../libpurple/protocols/msn/msn.c:1627
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
 msgid "Marital Status"
 msgstr "Sivilstand"
 
-#: ../libpurple/protocols/msn/msn.c:1591
+#: ../libpurple/protocols/msn/msn.c:1628
 msgid "Interests"
 msgstr "Interesser"
 
-#: ../libpurple/protocols/msn/msn.c:1592
+#: ../libpurple/protocols/msn/msn.c:1629
 msgid "Pets"
 msgstr "Kjæledyr"
 
-#: ../libpurple/protocols/msn/msn.c:1593
+#: ../libpurple/protocols/msn/msn.c:1630
 msgid "Hometown"
 msgstr "Heimstad/by"
 
-#: ../libpurple/protocols/msn/msn.c:1594
+#: ../libpurple/protocols/msn/msn.c:1631
 msgid "Places Lived"
 msgstr "Tidlegare bustader"
 
-#: ../libpurple/protocols/msn/msn.c:1595
+#: ../libpurple/protocols/msn/msn.c:1632
 msgid "Fashion"
 msgstr "Mote"
 
-#: ../libpurple/protocols/msn/msn.c:1596
+#: ../libpurple/protocols/msn/msn.c:1633
 msgid "Humor"
 msgstr "Humor"
 
-#: ../libpurple/protocols/msn/msn.c:1597
+#: ../libpurple/protocols/msn/msn.c:1634
 msgid "Music"
 msgstr "Musikk"
 
-#: ../libpurple/protocols/msn/msn.c:1598
-#: ../libpurple/protocols/msn/msn.c:1779
-#: ../libpurple/protocols/msn/msn.c:1785
+#: ../libpurple/protocols/msn/msn.c:1635
+#: ../libpurple/protocols/msn/msn.c:1816
+#: ../libpurple/protocols/msn/msn.c:1822
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Favorite Quote"
 msgstr "Favorittsitat"
 
-#: ../libpurple/protocols/msn/msn.c:1615
+#: ../libpurple/protocols/msn/msn.c:1652
 msgid "Contact Info"
 msgstr "Kontaktinfo"
 
-#: ../libpurple/protocols/msn/msn.c:1616
+#: ../libpurple/protocols/msn/msn.c:1653
 msgid "Personal"
 msgstr "Personleg"
 
-#: ../libpurple/protocols/msn/msn.c:1619
+#: ../libpurple/protocols/msn/msn.c:1656
 msgid "Significant Other"
 msgstr "Annan viktig"
 
-#: ../libpurple/protocols/msn/msn.c:1620
+#: ../libpurple/protocols/msn/msn.c:1657
 msgid "Home Phone"
 msgstr "Heimetelefon"
 
-#: ../libpurple/protocols/msn/msn.c:1621
+#: ../libpurple/protocols/msn/msn.c:1658
 msgid "Home Phone 2"
 msgstr "Heimetelefon 2"
 
-#: ../libpurple/protocols/msn/msn.c:1622
-#: ../libpurple/protocols/oscar/oscar.c:3761
+#: ../libpurple/protocols/msn/msn.c:1659
+#: ../libpurple/protocols/oscar/oscar.c:3803
 msgid "Home Address"
 msgstr "Heimeadresse"
 
-#: ../libpurple/protocols/msn/msn.c:1623
+#: ../libpurple/protocols/msn/msn.c:1660
 msgid "Personal Mobile"
 msgstr "Personleg mobil"
 
-#: ../libpurple/protocols/msn/msn.c:1624
+#: ../libpurple/protocols/msn/msn.c:1661
 msgid "Home Fax"
 msgstr "Heimefaks"
 
-#: ../libpurple/protocols/msn/msn.c:1625
+#: ../libpurple/protocols/msn/msn.c:1662
 msgid "Personal E-Mail"
 msgstr "Personleg e-postadresse"
 
-#: ../libpurple/protocols/msn/msn.c:1626
+#: ../libpurple/protocols/msn/msn.c:1663
 msgid "Personal IM"
 msgstr "Personleg pratenett"
 
-#: ../libpurple/protocols/msn/msn.c:1628
+#: ../libpurple/protocols/msn/msn.c:1665
 msgid "Anniversary"
 msgstr "Jubileum"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1644
+#: ../libpurple/protocols/msn/msn.c:1681
 msgid "Work"
 msgstr "Arbeid"
 
-#: ../libpurple/protocols/msn/msn.c:1646
+#: ../libpurple/protocols/msn/msn.c:1683
 #: ../libpurple/protocols/silc/ops.c:1010
 #: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "Jobbtittel"
 
-#: ../libpurple/protocols/msn/msn.c:1647
-#: ../libpurple/protocols/oscar/oscar.c:3782
+#: ../libpurple/protocols/msn/msn.c:1684
+#: ../libpurple/protocols/oscar/oscar.c:3824
 msgid "Company"
 msgstr "Firma"
 
-#: ../libpurple/protocols/msn/msn.c:1648
+#: ../libpurple/protocols/msn/msn.c:1685
 #: ../libpurple/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "Avdeling"
 
-#: ../libpurple/protocols/msn/msn.c:1649
+#: ../libpurple/protocols/msn/msn.c:1686
 msgid "Profession"
 msgstr "Yrke"
 
-#: ../libpurple/protocols/msn/msn.c:1650
+#: ../libpurple/protocols/msn/msn.c:1687
 msgid "Work Phone"
 msgstr "Arbeidstelefon"
 
-#: ../libpurple/protocols/msn/msn.c:1651
+#: ../libpurple/protocols/msn/msn.c:1688
 msgid "Work Phone 2"
 msgstr "Arbeidstelefon 2"
 
-#: ../libpurple/protocols/msn/msn.c:1652
-#: ../libpurple/protocols/oscar/oscar.c:3774
+#: ../libpurple/protocols/msn/msn.c:1689
+#: ../libpurple/protocols/oscar/oscar.c:3816
 msgid "Work Address"
 msgstr "Arbeidsadresse"
 
-#: ../libpurple/protocols/msn/msn.c:1653
+#: ../libpurple/protocols/msn/msn.c:1690
 msgid "Work Mobile"
 msgstr "Jobbmobil"
 
-#: ../libpurple/protocols/msn/msn.c:1654
+#: ../libpurple/protocols/msn/msn.c:1691
 msgid "Work Pager"
 msgstr "Personsøkar arbeid"
 
-#: ../libpurple/protocols/msn/msn.c:1655
+#: ../libpurple/protocols/msn/msn.c:1692
 msgid "Work Fax"
 msgstr "Telefaks arbeid"
 
-#: ../libpurple/protocols/msn/msn.c:1656
+#: ../libpurple/protocols/msn/msn.c:1693
 msgid "Work E-Mail"
 msgstr "E-postadresse jobb"
 
-#: ../libpurple/protocols/msn/msn.c:1657
+#: ../libpurple/protocols/msn/msn.c:1694
 msgid "Work IM"
 msgstr "Pratenett arbeid"
 
-#: ../libpurple/protocols/msn/msn.c:1658
+#: ../libpurple/protocols/msn/msn.c:1695
 msgid "Start Date"
 msgstr "Startdato"
 
-#: ../libpurple/protocols/msn/msn.c:1728
-#: ../libpurple/protocols/msn/msn.c:1734
-#: ../libpurple/protocols/msn/msn.c:1741
-#: ../libpurple/protocols/msn/msn.c:1748
+#: ../libpurple/protocols/msn/msn.c:1765
+#: ../libpurple/protocols/msn/msn.c:1771
+#: ../libpurple/protocols/msn/msn.c:1778
+#: ../libpurple/protocols/msn/msn.c:1785
 msgid "Favorite Things"
 msgstr "Favorittsakene mine"
 
-#: ../libpurple/protocols/msn/msn.c:1793
+#: ../libpurple/protocols/msn/msn.c:1830
 msgid "Last Updated"
 msgstr "Sist oppdatert"
 
-#: ../libpurple/protocols/msn/msn.c:1804
+#: ../libpurple/protocols/msn/msn.c:1841
 #: ../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:1828
+#: ../libpurple/protocols/msn/msn.c:1865
 msgid "The user has not created a public profile."
 msgstr "Brukaren har ikkje laga ein offentleg profil."
 
-#: ../libpurple/protocols/msn/msn.c:1829
+#: ../libpurple/protocols/msn/msn.c:1866
 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:1833
+#: ../libpurple/protocols/msn/msn.c:1870
 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:1841
+#: ../libpurple/protocols/msn/msn.c:1878
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
 msgid "Profile URL"
 msgstr "Profiladresse"
@@ -6151,20 +6241,20 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2127
-#: ../libpurple/protocols/msn/msn.c:2129
+#: ../libpurple/protocols/msn/msn.c:2169
+#: ../libpurple/protocols/msn/msn.c:2171
 msgid "MSN Protocol Plugin"
 msgstr "MSN-protokolltillegg"
 
-#: ../libpurple/protocols/msn/msn.c:2163
+#: ../libpurple/protocols/msn/msn.c:2205
 msgid "Use HTTP Method"
 msgstr "Bruk HTTP-metode"
 
-#: ../libpurple/protocols/msn/msn.c:2168
+#: ../libpurple/protocols/msn/msn.c:2210
 msgid "Show custom smileys"
 msgstr "Vis eigne smilefjes"
 
-#: ../libpurple/protocols/msn/msn.c:2176
+#: ../libpurple/protocols/msn/msn.c:2218
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: dytta til ein brukar for å få merksemda hans/hennar"
 
@@ -6183,8 +6273,8 @@
 #: ../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:1320
-#: ../libpurple/protocols/yahoo/yahoochat.c:1346
+#: ../libpurple/protocols/yahoo/yahoochat.c:1416
+#: ../libpurple/protocols/yahoo/yahoochat.c:1442
 msgid "Unable to connect"
 msgstr "Klarte ikkje å kopla til"
 
@@ -6373,7 +6463,7 @@
 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/switchboard.c:963
+#: ../libpurple/protocols/msn/switchboard.c:969
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s sende deg nettopp ein dytt (\"nudge\")."
@@ -6397,6 +6487,212 @@
 msgid "The screen name specified is invalid."
 msgstr "Det oppgjevne brukarnamnet er ikkje gyldig."
 
+#: ../libpurple/protocols/myspace/myspace.c:111
+msgid "Missing Cipher"
+msgstr "Manglande kryptering"
+
+#: ../libpurple/protocols/myspace/myspace.c:112
+msgid "The RC4 cipher could not be found"
+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."
+
+#: ../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:1795
+msgid "MySpaceIM Error"
+msgstr "MySpaceIM-feil"
+
+#: ../libpurple/protocols/myspace/myspace.c:348
+msgid "Reading challenge"
+msgstr "Les utfordringa"
+
+#: ../libpurple/protocols/myspace/myspace.c:354
+msgid "Unexpected challenge length from server"
+msgstr "Uventa lengd på utfordringa frå tenaren"
+
+#: ../libpurple/protocols/myspace/myspace.c:358
+msgid "Logging in"
+msgstr "Loggar på"
+
+#: ../libpurple/protocols/myspace/myspace.c:1276
+#, 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:1319
+msgid "New mail messages"
+msgstr "Nye e-postmeldingar"
+
+#: ../libpurple/protocols/myspace/myspace.c:1320
+msgid "New blog comments"
+msgstr "Ny blogg-kommentarar"
+
+#: ../libpurple/protocols/myspace/myspace.c:1321
+msgid "New profile comments"
+msgstr "Ny profilkommentarar"
+
+#: ../libpurple/protocols/myspace/myspace.c:1322
+msgid "New friend requests!"
+msgstr "Nye venneførespurnader"
+
+#: ../libpurple/protocols/myspace/myspace.c:1323
+msgid "New picture comments"
+msgstr "Nytt bilete-kommentarar"
+
+#: ../libpurple/protocols/myspace/myspace.c:1353
+msgid "MySpace"
+msgstr "MySpace"
+
+#. 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:1537
+#: ../libpurple/protocols/sametime/sametime.c:1544
+msgid "Connected"
+msgstr "Tilkopla"
+
+#: ../libpurple/protocols/myspace/myspace.c:1548
+#: ../libpurple/protocols/myspace/myspace.c:1550
+msgid "No username set"
+msgstr "Ikkje noko brukarnamn er skriven inn"
+
+#: ../libpurple/protocols/myspace/myspace.c:1549
+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:1776
+#, c-format
+msgid "Protocol error, code %d: %s"
+msgstr "Protokollfeil, kode %d: %s"
+
+#: ../libpurple/protocols/myspace/myspace.c:1966
+#: ../libpurple/protocols/myspace/myspace.c:2000
+msgid "Failed to add buddy"
+msgstr "Klarte ikkje å leggja til venn"
+
+#: ../libpurple/protocols/myspace/myspace.c:1966
+msgid "'addbuddy' command failed."
+msgstr "'addbuddy'-kommandoen feila."
+
+#: ../libpurple/protocols/myspace/myspace.c:2000
+#: ../libpurple/protocols/myspace/myspace.c:2241
+msgid "persist command failed"
+msgstr "'persist'-kommandoen feila"
+
+#: ../libpurple/protocols/myspace/myspace.c:2109
+#, c-format
+msgid "No such user: %s"
+msgstr "Brukaren %s finst ikkje"
+
+#: ../libpurple/protocols/myspace/myspace.c:2110
+msgid "User lookup"
+msgstr "Slår opp brukaren"
+
+#: ../libpurple/protocols/myspace/myspace.c:2222
+#: ../libpurple/protocols/myspace/myspace.c:2241
+#: ../libpurple/protocols/myspace/myspace.c:2263
+msgid "Failed to remove buddy"
+msgstr "Klarte ikkje å fjerna vennen"
+
+#: ../libpurple/protocols/myspace/myspace.c:2222
+msgid "'delbuddy' command failed"
+msgstr "'delbuddy'-kommandoen feila"
+
+#: ../libpurple/protocols/myspace/myspace.c:2263
+msgid "blocklist command failed"
+msgstr "'blocklist'-kommandoen feila"
+
+#: ../libpurple/protocols/myspace/myspace.c:2309
+msgid "Invalid input condition"
+msgstr "Ugyldig inndatavilkår"
+
+#. TODO: g_realloc like msn, yahoo, irc, jabber?
+#: ../libpurple/protocols/myspace/myspace.c:2327
+#: ../libpurple/protocols/myspace/myspace.c:2358
+msgid "Read buffer full"
+msgstr "Leselageret er fullt"
+
+#: ../libpurple/protocols/myspace/myspace.c:2396
+msgid "Unparseable message"
+msgstr "Meldinga kan ikkje tolkast"
+
+#: ../libpurple/protocols/myspace/myspace.c:2465
+#, c-format
+msgid "Couldn't connect to host: %s (%d)"
+msgstr "Klarte ikkje å kopla til verten: %s (%d)"
+
+#: ../libpurple/protocols/myspace/myspace.c:2636
+msgid "IM Friends"
+msgstr "Lynmeldingsvennar"
+
+#: ../libpurple/protocols/myspace/myspace.c:2735
+#, 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)"
+
+#: ../libpurple/protocols/myspace/myspace.c:2736
+msgid "Add contacts from server"
+msgstr "Legg til kontaktar frå tenaren"
+
+#: ../libpurple/protocols/myspace/myspace.c:2788
+#: ../libpurple/protocols/myspace/myspace.c:2853
+msgid "Add friends from MySpace.com"
+msgstr "Legg til vennar frå MySpace.com"
+
+#: ../libpurple/protocols/myspace/myspace.c:2789
+msgid "Importing friends failed"
+msgstr "klarte ikkje å importera vennane"
+
+#. TODO: find out how
+#: ../libpurple/protocols/myspace/myspace.c:2845
+msgid "Find people..."
+msgstr "Søk etter personar…"
+
+#: ../libpurple/protocols/myspace/myspace.c:2848
+msgid "Change IM name..."
+msgstr "Endra lynmeldingsnamn…"
+
+#: ../libpurple/protocols/myspace/myspace.c:3155
+msgid "myim URL handler"
+msgstr "myim adressehandterar"
+
+#: ../libpurple/protocols/myspace/myspace.c:3156
+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:3157
+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:3280
+msgid "Show display name in status text"
+msgstr "Vis visingsnamnet i statusteksten"
+
+#: ../libpurple/protocols/myspace/myspace.c:3283
+msgid "Show headline in status text"
+msgstr "Vis overskrift i statusteksten"
+
+#: ../libpurple/protocols/myspace/myspace.c:3288
+msgid "Send emoticons"
+msgstr "Send emotikon"
+
+#: ../libpurple/protocols/myspace/myspace.c:3293
+msgid "Screen resolution (dots per inch)"
+msgstr "Skjermoppløysing (punkt per tomme)"
+
+#: ../libpurple/protocols/myspace/myspace.c:3296
+msgid "Base font size (points)"
+msgstr "Grunnskriftstorleik (punkt)"
+
 #
 #: ../libpurple/protocols/novell/nmuser.c:1864
 msgid "Required parameters not passed in"
@@ -6621,7 +6917,7 @@
 msgstr "E-postkontor"
 
 #: ../libpurple/protocols/novell/novell.c:1502
-#: ../libpurple/protocols/sametime/sametime.c:4123
+#: ../libpurple/protocols/sametime/sametime.c:4122
 msgid "User ID"
 msgstr "Brukar-ID"
 
@@ -6730,8 +7026,8 @@
 msgstr "Tenarport"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:387
-#: ../libpurple/protocols/yahoo/yahoo.c:2313
-#: ../libpurple/protocols/yahoo/yahoo.c:2480
+#: ../libpurple/protocols/yahoo/yahoo.c:2471
+#: ../libpurple/protocols/yahoo/yahoo.c:2638
 #: ../libpurple/protocols/yahoo/ycht.c:481
 #: ../libpurple/proxy.c:580
 #: ../libpurple/proxy.c:1099
@@ -6742,8 +7038,8 @@
 msgstr "Tenaren lukka tilkoplinga."
 
 #: ../libpurple/protocols/oscar/flap_connection.c:389
-#: ../libpurple/protocols/yahoo/yahoo.c:2307
-#: ../libpurple/protocols/yahoo/yahoo.c:2474
+#: ../libpurple/protocols/yahoo/yahoo.c:2465
+#: ../libpurple/protocols/yahoo/yahoo.c:2632
 #: ../libpurple/proxy.c:592
 #: ../libpurple/proxy.c:1111
 #: ../libpurple/proxy.c:1220
@@ -6797,7 +7093,7 @@
 msgstr "ICQ-protokolltillegg"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4213
+#: ../libpurple/protocols/yahoo/yahoo.c:4428
 #: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "Teiknkoding"
@@ -6939,8 +7235,8 @@
 
 #. Label
 #: ../libpurple/protocols/oscar/oscar.c:638
-#: ../pidgin/gtkutils.c:2376
-#: ../pidgin/gtkutils.c:2406
+#: ../pidgin/gtkutils.c:2386
+#: ../pidgin/gtkutils.c:2416
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:334
 msgid "Buddy Icon"
 msgstr "Venneikon"
@@ -6962,7 +7258,7 @@
 msgstr "Prat"
 
 #: ../libpurple/protocols/oscar/oscar.c:650
-#: ../libpurple/protocols/oscar/oscar.c:5958
+#: ../libpurple/protocols/oscar/oscar.c:6011
 msgid "Get File"
 msgstr "Hent fil"
 
@@ -7035,17 +7331,17 @@
 msgstr "Kamera"
 
 #: ../libpurple/protocols/oscar/oscar.c:724
-#: ../libpurple/protocols/oscar/oscar.c:5728
+#: ../libpurple/protocols/oscar/oscar.c:5781
 msgid "Free For Chat"
 msgstr "Ledig for prat"
 
 #: ../libpurple/protocols/oscar/oscar.c:728
-#: ../libpurple/protocols/oscar/oscar.c:5763
+#: ../libpurple/protocols/oscar/oscar.c:5816
 msgid "Not Available"
 msgstr "Ikkje tilgjengeleg"
 
 #: ../libpurple/protocols/oscar/oscar.c:730
-#: ../libpurple/protocols/oscar/oscar.c:5749
+#: ../libpurple/protocols/oscar/oscar.c:5802
 msgid "Occupied"
 msgstr "Oppteken"
 
@@ -7056,10 +7352,10 @@
 #: ../libpurple/protocols/oscar/oscar.c:736
 #: ../libpurple/protocols/qq/qq.c:183
 #: ../libpurple/protocols/qq/qq.c:288
-#: ../libpurple/protocols/yahoo/yahoo.c:2934
+#: ../libpurple/protocols/yahoo/yahoo.c:3097
 #: ../libpurple/status.c:156
 #: ../pidgin/gtkdocklet.c:446
-#: ../pidgin/gtkstatusbox.c:1058
+#: ../pidgin/gtkstatusbox.c:1059
 msgid "Invisible"
 msgstr "Usynleg"
 
@@ -7068,14 +7364,14 @@
 msgstr "Tilkopla"
 
 #: ../libpurple/protocols/oscar/oscar.c:837
-#: ../libpurple/protocols/oscar/oscar.c:3675
+#: ../libpurple/protocols/oscar/oscar.c:3717
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:721
-#: ../pidgin/gtkprefs.c:1123
+#: ../pidgin/gtkprefs.c:1125
 msgid "IP Address"
 msgstr "IP-adresse"
 
 #: ../libpurple/protocols/oscar/oscar.c:844
-#: ../libpurple/protocols/oscar/oscar.c:2861
+#: ../libpurple/protocols/oscar/oscar.c:2901
 msgid "Warning Level"
 msgstr "Åtvaringsnivå"
 
@@ -7120,14 +7416,14 @@
 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:1343
-#: ../libpurple/protocols/yahoo/yahoo.c:1952
+#: ../libpurple/protocols/yahoo/yahoo.c:2107
 msgid "Invalid screen name."
 msgstr "Ugyldig brukarnamn."
 
 #: ../libpurple/protocols/oscar/oscar.c:1350
 #: ../libpurple/protocols/qq/login_logout.c:483
 #: ../libpurple/protocols/simple/simple.c:1039
-#: ../libpurple/protocols/yahoo/yahoo.c:1973
+#: ../libpurple/protocols/yahoo/yahoo.c:2128
 msgid "Incorrect password."
 msgstr "Feil passord."
 
@@ -7176,8 +7472,8 @@
 #: ../libpurple/protocols/oscar/oscar.c:1450
 #: ../libpurple/protocols/oscar/oscar.c:2242
 #: ../libpurple/protocols/oscar/oscar.c:2291
-#: ../libpurple/protocols/oscar/oscar.c:5833
-#: ../libpurple/protocols/oscar/oscar.c:6114
+#: ../libpurple/protocols/oscar/oscar.c:5886
+#: ../libpurple/protocols/oscar/oscar.c:6167
 #: ../libpurple/request.h:1387
 msgid "_OK"
 msgstr "_OK"
@@ -7225,8 +7521,8 @@
 #: ../libpurple/protocols/oscar/oscar.c:2282
 #: ../libpurple/protocols/oscar/oscar.c:2290
 #: ../libpurple/protocols/oscar/oscar.c:2417
-#: ../libpurple/protocols/oscar/oscar.c:5211
-#: ../libpurple/protocols/yahoo/yahoo.c:1004
+#: ../libpurple/protocols/oscar/oscar.c:5264
+#: ../libpurple/protocols/yahoo/yahoo.c:1032
 msgid "No reason given."
 msgstr "Ingen årsak oppgjeven."
 
@@ -7310,42 +7606,42 @@
 msgid "_Decline"
 msgstr "_Avvis"
 
-#: ../libpurple/protocols/oscar/oscar.c:2566
+#: ../libpurple/protocols/oscar/oscar.c:2606
 #, 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:2575
+#: ../libpurple/protocols/oscar/oscar.c:2615
 #, 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:2584
+#: ../libpurple/protocols/oscar/oscar.c:2624
 #, 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."
 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:2593
+#: ../libpurple/protocols/oscar/oscar.c:2633
 #, 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:2602
+#: ../libpurple/protocols/oscar/oscar.c:2642
 #, 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:2611
+#: ../libpurple/protocols/oscar/oscar.c:2651
 #, 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."
@@ -7353,278 +7649,278 @@
 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:2766
+#: ../libpurple/protocols/oscar/oscar.c:2806
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Klarer ikkje å senda melding: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2766
-#: ../libpurple/protocols/oscar/oscar.c:2771
-#: ../libpurple/protocols/oscar/oscar.c:2835
+#: ../libpurple/protocols/oscar/oscar.c:2806
+#: ../libpurple/protocols/oscar/oscar.c:2811
+#: ../libpurple/protocols/oscar/oscar.c:2875
 msgid "Unknown reason."
 msgstr "Ukjend årsak."
 
-#: ../libpurple/protocols/oscar/oscar.c:2769
+#: ../libpurple/protocols/oscar/oscar.c:2809
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Klarte ikkje å senda til %s:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2835
+#: ../libpurple/protocols/oscar/oscar.c:2875
 #, c-format
 msgid "User information not available: %s"
 msgstr "Brukarinformasjon er ikkje tilgjengeleg: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2866
+#: ../libpurple/protocols/oscar/oscar.c:2906
 msgid "Online Since"
 msgstr "Tilkopla sia"
 
-#: ../libpurple/protocols/oscar/oscar.c:2871
+#: ../libpurple/protocols/oscar/oscar.c:2911
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
 msgstr "Medlem sia"
 
-#: ../libpurple/protocols/oscar/oscar.c:2876
+#: ../libpurple/protocols/oscar/oscar.c:2916
 msgid "Capabilities"
 msgstr "Evner"
 
-#: ../libpurple/protocols/oscar/oscar.c:2906
+#: ../libpurple/protocols/oscar/oscar.c:2946
 msgid "Available Message"
 msgstr "Tilgjengeleg melding"
 
-#: ../libpurple/protocols/oscar/oscar.c:2934
+#: ../libpurple/protocols/oscar/oscar.c:2974
 msgid "Profile"
 msgstr "Profil"
 
-#: ../libpurple/protocols/oscar/oscar.c:3014
+#: ../libpurple/protocols/oscar/oscar.c:3054
 msgid "Your AIM connection may be lost."
 msgstr "AIM-sambandet kan vera tapt."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3202
+#: ../libpurple/protocols/oscar/oscar.c:3242
 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:3366
+#: ../libpurple/protocols/oscar/oscar.c:3406
 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:3449
+#: ../libpurple/protocols/oscar/oscar.c:3489
 #: ../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:3697
+#: ../libpurple/protocols/oscar/oscar.c:3739
 #: ../libpurple/protocols/silc/util.c:585
 #: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: ../libpurple/protocols/oscar/oscar.c:3727
+#: ../libpurple/protocols/oscar/oscar.c:3769
 msgid "Personal Web Page"
 msgstr "Personelg nettside"
 
-#: ../libpurple/protocols/oscar/oscar.c:3751
+#: ../libpurple/protocols/oscar/oscar.c:3793
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Tilleggsinformasjon"
 
-#: ../libpurple/protocols/oscar/oscar.c:3759
-#: ../libpurple/protocols/oscar/oscar.c:3772
+#: ../libpurple/protocols/oscar/oscar.c:3801
+#: ../libpurple/protocols/oscar/oscar.c:3814
 msgid "Zip Code"
 msgstr "Postnummer"
 
-#: ../libpurple/protocols/oscar/oscar.c:3783
+#: ../libpurple/protocols/oscar/oscar.c:3825
 msgid "Division"
 msgstr "Avdeling"
 
-#: ../libpurple/protocols/oscar/oscar.c:3784
+#: ../libpurple/protocols/oscar/oscar.c:3826
 msgid "Position"
 msgstr "Stilling"
 
-#: ../libpurple/protocols/oscar/oscar.c:3786
+#: ../libpurple/protocols/oscar/oscar.c:3828
 msgid "Web Page"
 msgstr "Nettside"
 
-#: ../libpurple/protocols/oscar/oscar.c:3789
+#: ../libpurple/protocols/oscar/oscar.c:3831
 msgid "Work Information"
 msgstr "Arbeidsinformasjon"
 
-#: ../libpurple/protocols/oscar/oscar.c:3845
+#: ../libpurple/protocols/oscar/oscar.c:3887
 msgid "Pop-Up Message"
 msgstr "Sprettoppmelding"
 
-#: ../libpurple/protocols/oscar/oscar.c:3885
+#: ../libpurple/protocols/oscar/oscar.c:3927
 #, 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:3890
+#: ../libpurple/protocols/oscar/oscar.c:3932
 msgid "Screen name"
 msgstr "Brukarnamn"
 
-#: ../libpurple/protocols/oscar/oscar.c:3916
+#: ../libpurple/protocols/oscar/oscar.c:3958
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "Ingen resultat funnen for e-postadressa %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3937
+#: ../libpurple/protocols/oscar/oscar.c:3979
 #, 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:3939
+#: ../libpurple/protocols/oscar/oscar.c:3981
 msgid "Account Confirmation Requested"
 msgstr "Bede om kontostadfesting"
 
-#: ../libpurple/protocols/oscar/oscar.c:3970
+#: ../libpurple/protocols/oscar/oscar.c:4012
 msgid "Error Changing Account Info"
 msgstr "Feil ved endring av kontoinformasjon"
 
-#: ../libpurple/protocols/oscar/oscar.c:3973
+#: ../libpurple/protocols/oscar/oscar.c:4015
 #, 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."
 
-#: ../libpurple/protocols/oscar/oscar.c:3976
+#: ../libpurple/protocols/oscar/oscar.c:4018
 #, 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:3979
+#: ../libpurple/protocols/oscar/oscar.c:4021
 #, 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."
 
-#: ../libpurple/protocols/oscar/oscar.c:3982
+#: ../libpurple/protocols/oscar/oscar.c:4024
 #, 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."
 
-#: ../libpurple/protocols/oscar/oscar.c:3985
+#: ../libpurple/protocols/oscar/oscar.c:4027
 #, 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."
 
-#: ../libpurple/protocols/oscar/oscar.c:3988
+#: ../libpurple/protocols/oscar/oscar.c:4030
 #, 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."
 
-#: ../libpurple/protocols/oscar/oscar.c:3991
+#: ../libpurple/protocols/oscar/oscar.c:4033
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Error 0x%04x: ukjent feil."
 
-#: ../libpurple/protocols/oscar/oscar.c:4001
+#: ../libpurple/protocols/oscar/oscar.c:4043
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "E-postadressa til %s er %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4003
+#: ../libpurple/protocols/oscar/oscar.c:4045
 msgid "Account Info"
 msgstr "Konto-info"
 
-#: ../libpurple/protocols/oscar/oscar.c:4175
+#: ../libpurple/protocols/oscar/oscar.c:4228
 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:4446
+#: ../libpurple/protocols/oscar/oscar.c:4499
 msgid "Unable to set AIM profile."
 msgstr "Klarer ikkje å lagra AIM-profilen."
 
-#: ../libpurple/protocols/oscar/oscar.c:4447
+#: ../libpurple/protocols/oscar/oscar.c:4500
 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:4461
+#: ../libpurple/protocols/oscar/oscar.c:4514
 #, 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."
 
-#: ../libpurple/protocols/oscar/oscar.c:4466
+#: ../libpurple/protocols/oscar/oscar.c:4519
 msgid "Profile too long."
 msgstr "Profilen er for lang."
 
-#: ../libpurple/protocols/oscar/oscar.c:4511
+#: ../libpurple/protocols/oscar/oscar.c:4564
 #, 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."
 
-#: ../libpurple/protocols/oscar/oscar.c:4516
+#: ../libpurple/protocols/oscar/oscar.c:4569
 msgid "Away message too long."
 msgstr "Fråværsmeldinga er for lang."
 
-#: ../libpurple/protocols/oscar/oscar.c:4585
+#: ../libpurple/protocols/oscar/oscar.c:4638
 #, 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."
 
-#: ../libpurple/protocols/oscar/oscar.c:4587
-#: ../libpurple/protocols/oscar/oscar.c:5020
-#: ../libpurple/protocols/oscar/oscar.c:5035
+#: ../libpurple/protocols/oscar/oscar.c:4640
+#: ../libpurple/protocols/oscar/oscar.c:5073
+#: ../libpurple/protocols/oscar/oscar.c:5088
 msgid "Unable To Add"
 msgstr "Klarer ikkje å leggja til"
 
-#: ../libpurple/protocols/oscar/oscar.c:4696
+#: ../libpurple/protocols/oscar/oscar.c:4749
 msgid "Unable To Retrieve Buddy List"
 msgstr "Klarer ikkje å henta vennelista"
 
-#: ../libpurple/protocols/oscar/oscar.c:4697
+#: ../libpurple/protocols/oscar/oscar.c:4750
 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:4879
-#: ../libpurple/protocols/oscar/oscar.c:4881
-#: ../libpurple/protocols/oscar/oscar.c:5089
-#: ../libpurple/protocols/oscar/oscar.c:5090
-#: ../libpurple/protocols/oscar/oscar.c:5095
+#: ../libpurple/protocols/oscar/oscar.c:4932
+#: ../libpurple/protocols/oscar/oscar.c:4934
+#: ../libpurple/protocols/oscar/oscar.c:5142
+#: ../libpurple/protocols/oscar/oscar.c:5143
+#: ../libpurple/protocols/oscar/oscar.c:5148
 msgid "Orphans"
 msgstr "Foreldrelause"
 
-#: ../libpurple/protocols/oscar/oscar.c:5018
+#: ../libpurple/protocols/oscar/oscar.c:5071
 #, 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."
 
-#: ../libpurple/protocols/oscar/oscar.c:5018
-#: ../libpurple/protocols/oscar/oscar.c:5033
+#: ../libpurple/protocols/oscar/oscar.c:5071
+#: ../libpurple/protocols/oscar/oscar.c:5086
 msgid "(no name)"
 msgstr "(ikkje noko namn)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5032
+#: ../libpurple/protocols/oscar/oscar.c:5085
 #, 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:5126
+#: ../libpurple/protocols/oscar/oscar.c:5179
 #, 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?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5134
+#: ../libpurple/protocols/oscar/oscar.c:5187
 msgid "Authorization Given"
 msgstr "Godkjent"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5207
+#: ../libpurple/protocols/oscar/oscar.c:5260
 #, 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:5208
+#: ../libpurple/protocols/oscar/oscar.c:5261
 msgid "Authorization Granted"
 msgstr "Godkjent"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5211
+#: ../libpurple/protocols/oscar/oscar.c:5264
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the following reason:\n"
@@ -7633,182 +7929,182 @@
 "Brukaren %s har avslått førespurnaden din om å få leggja dei til vennelista di. Årsaka er: \n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5212
+#: ../libpurple/protocols/oscar/oscar.c:5265
 msgid "Authorization Denied"
 msgstr "Godkjenning avvist"
 
-#: ../libpurple/protocols/oscar/oscar.c:5248
+#: ../libpurple/protocols/oscar/oscar.c:5301
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Exchange:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5288
+#: ../libpurple/protocols/oscar/oscar.c:5341
 msgid "Invalid chat name specified."
 msgstr "Det oppgjevne pratenamnet er ugyldig."
 
-#: ../libpurple/protocols/oscar/oscar.c:5357
+#: ../libpurple/protocols/oscar/oscar.c:5410
 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."
 
-#: ../libpurple/protocols/oscar/oscar.c:5517
-#: ../libpurple/protocols/oscar/oscar.c:5522
+#: ../libpurple/protocols/oscar/oscar.c:5570
+#: ../libpurple/protocols/oscar/oscar.c:5575
 msgid "Away Message"
 msgstr "Fråværsmelding"
 
-#: ../libpurple/protocols/oscar/oscar.c:5522
+#: ../libpurple/protocols/oscar/oscar.c:5575
 msgid "<i>(retrieving)</i>"
 msgstr " <i>(hentar)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5722
+#: ../libpurple/protocols/oscar/oscar.c:5775
 msgid "iTunes Music Store Link"
 msgstr "Lenkje til iTunes Music Store"
 
-#: ../libpurple/protocols/oscar/oscar.c:5830
+#: ../libpurple/protocols/oscar/oscar.c:5883
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Vennenotat for %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5831
+#: ../libpurple/protocols/oscar/oscar.c:5884
 msgid "Buddy Comment:"
 msgstr "Vennemerknad:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5878
+#: ../libpurple/protocols/oscar/oscar.c:5931
 #, 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:5882
+#: ../libpurple/protocols/oscar/oscar.c:5935
 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:5888
+#: ../libpurple/protocols/oscar/oscar.c:5941
 #: ../libpurple/protocols/oscar/peer.c:1022
 msgid "C_onnect"
 msgstr "_Koplar til"
 
-#: ../libpurple/protocols/oscar/oscar.c:5923
+#: ../libpurple/protocols/oscar/oscar.c:5976
 msgid "Get AIM Info"
 msgstr "Hent _AIM-informasjon"
 
-#: ../libpurple/protocols/oscar/oscar.c:5929
+#: ../libpurple/protocols/oscar/oscar.c:5982
 msgid "Edit Buddy Comment"
 msgstr "Endra vennemerknad"
 
-#: ../libpurple/protocols/oscar/oscar.c:5937
+#: ../libpurple/protocols/oscar/oscar.c:5990
 msgid "Get Status Msg"
 msgstr "Hent statusmelding"
 
-#: ../libpurple/protocols/oscar/oscar.c:5950
+#: ../libpurple/protocols/oscar/oscar.c:6003
 msgid "Direct IM"
 msgstr "Direktelynmelding"
 
-#: ../libpurple/protocols/oscar/oscar.c:5972
+#: ../libpurple/protocols/oscar/oscar.c:6025
 msgid "Re-request Authorization"
 msgstr "Spør om ny godkjenning"
 
-#: ../libpurple/protocols/oscar/oscar.c:6031
+#: ../libpurple/protocols/oscar/oscar.c:6084
 msgid "Require authorization"
 msgstr "Krev autorisasjon"
 
-#: ../libpurple/protocols/oscar/oscar.c:6034
+#: ../libpurple/protocols/oscar/oscar.c:6087
 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:6039
+#: ../libpurple/protocols/oscar/oscar.c:6092
 msgid "ICQ Privacy Options"
 msgstr "ICQ personvernval"
 
-#: ../libpurple/protocols/oscar/oscar.c:6058
+#: ../libpurple/protocols/oscar/oscar.c:6111
 msgid "The new formatting is invalid."
 msgstr "Den nye formateringa er ugyldig."
 
-#: ../libpurple/protocols/oscar/oscar.c:6059
-msgid "Screen name formatting can change only capitalization and whitespace."
-msgstr "Formatering av brukarnamnet vil berre endra store/små bokstavar og blankteikn."
-
 #: ../libpurple/protocols/oscar/oscar.c:6112
+msgid "Screen name formatting can change only capitalization and whitespace."
+msgstr "Formatering av brukarnamnet vil berre endra store/små bokstavar og blankteikn."
+
+#: ../libpurple/protocols/oscar/oscar.c:6165
 msgid "Change Address To:"
 msgstr "Endra adressa til:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6158
+#: ../libpurple/protocols/oscar/oscar.c:6211
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>du ventar ikkje på godkjenning</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6161
+#: ../libpurple/protocols/oscar/oscar.c:6214
 msgid "You are awaiting authorization from the following buddies"
 msgstr "De ventar på godkjenning frå desse vennane"
 
-#: ../libpurple/protocols/oscar/oscar.c:6162
+#: ../libpurple/protocols/oscar/oscar.c:6215
 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:6179
+#: ../libpurple/protocols/oscar/oscar.c:6232
 msgid "Find Buddy by E-Mail"
 msgstr "Finn venn utfrå e-postadessa"
 
-#: ../libpurple/protocols/oscar/oscar.c:6180
+#: ../libpurple/protocols/oscar/oscar.c:6233
 msgid "Search for a buddy by e-mail address"
 msgstr "Bruk e-postadressa til å søkja etter ein venn"
 
-#: ../libpurple/protocols/oscar/oscar.c:6181
+#: ../libpurple/protocols/oscar/oscar.c:6234
 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:6184
+#: ../libpurple/protocols/oscar/oscar.c:6237
 msgid "_Search"
 msgstr "_Søk"
 
-#: ../libpurple/protocols/oscar/oscar.c:6342
+#: ../libpurple/protocols/oscar/oscar.c:6395
 msgid "Set User Info (URL)..."
 msgstr "Skriv inn brukarinfo (URL)…"
 
-#: ../libpurple/protocols/oscar/oscar.c:6353
+#: ../libpurple/protocols/oscar/oscar.c:6406
 msgid "Change Password (URL)"
 msgstr "Endra passord (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6357
+#: ../libpurple/protocols/oscar/oscar.c:6410
 msgid "Configure IM Forwarding (URL)"
 msgstr "Innstillingar for vidaresending (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6367
+#: ../libpurple/protocols/oscar/oscar.c:6420
 msgid "Set Privacy Options..."
 msgstr "Personvernval…"
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6374
+#: ../libpurple/protocols/oscar/oscar.c:6427
 msgid "Confirm Account"
 msgstr "Stadfest konto"
 
-#: ../libpurple/protocols/oscar/oscar.c:6378
+#: ../libpurple/protocols/oscar/oscar.c:6431
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Vis noverande registrerte e-postadresse"
 
-#: ../libpurple/protocols/oscar/oscar.c:6382
+#: ../libpurple/protocols/oscar/oscar.c:6435
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Endra noverande registrerte e-postadresse…"
 
-#: ../libpurple/protocols/oscar/oscar.c:6389
+#: ../libpurple/protocols/oscar/oscar.c:6442
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Vis vennar som ventar på godkjenning"
 
-#: ../libpurple/protocols/oscar/oscar.c:6395
+#: ../libpurple/protocols/oscar/oscar.c:6448
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Bruk e-postadressa til å søkja etter ein venn…"
 
-#: ../libpurple/protocols/oscar/oscar.c:6400
+#: ../libpurple/protocols/oscar/oscar.c:6453
 msgid "Search for Buddy by Information"
 msgstr "Søk etter venn utfrå opplysningar"
 
-#: ../libpurple/protocols/oscar/oscar.c:6468
+#: ../libpurple/protocols/oscar/oscar.c:6521
 msgid "Use recent buddies group"
 msgstr "Bruk seinaste vennegruppe"
 
-#: ../libpurple/protocols/oscar/oscar.c:6471
+#: ../libpurple/protocols/oscar/oscar.c:6524
 msgid "Show how long you have been idle"
 msgstr "Vis kor lenge du har vore uverksam"
 
-#: ../libpurple/protocols/oscar/oscar.c:6626
+#: ../libpurple/protocols/oscar/oscar.c:6679
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -8450,7 +8746,8 @@
 msgstr "%s har lagt deg til"
 
 #: ../libpurple/protocols/qq/sys_msg.c:169
-msgid "Would like to add him?"
+#: ../libpurple/protocols/qq/sys_msg.c:263
+msgid "Would you like to add him?"
 msgstr "Vil du leggja han til?"
 
 #: ../libpurple/protocols/qq/sys_msg.c:176
@@ -8484,10 +8781,6 @@
 msgid "%s is not in your buddy list"
 msgstr "%s er ikkje på vennelista di"
 
-#: ../libpurple/protocols/qq/sys_msg.c:263
-msgid "Would you like to add him?"
-msgstr "Vil du leggja han til?"
-
 #: ../libpurple/protocols/sametime/sametime.c:417
 msgid "Connection closed (writing)"
 msgstr "Tilkoplinga er lukka (skrivande)"
@@ -8551,10 +8844,6 @@
 msgid "Starting Services"
 msgstr "Startar tenester"
 
-#: ../libpurple/protocols/sametime/sametime.c:1544
-msgid "Connected"
-msgstr "Tilkopla"
-
 #: ../libpurple/protocols/sametime/sametime.c:1645
 #, c-format
 msgid "A Sametime administrator has issued the following announcement on server %s"
@@ -8575,7 +8864,7 @@
 
 #. this is a regular connect, error out
 #: ../libpurple/protocols/sametime/sametime.c:1732
-#: ../libpurple/protocols/sametime/sametime.c:3727
+#: ../libpurple/protocols/sametime/sametime.c:3726
 msgid "Unable to connect to host"
 msgstr "Klarer ikkje å kopla til tenaren"
 
@@ -8596,151 +8885,151 @@
 msgid "Place Closed"
 msgstr "Staden er lukka"
 
-#: ../libpurple/protocols/sametime/sametime.c:3230
+#: ../libpurple/protocols/sametime/sametime.c:3229
 msgid "Microphone"
 msgstr "Mikrofon"
 
-#: ../libpurple/protocols/sametime/sametime.c:3231
+#: ../libpurple/protocols/sametime/sametime.c:3230
 msgid "Speakers"
 msgstr "Høgtalarar"
 
-#: ../libpurple/protocols/sametime/sametime.c:3232
+#: ../libpurple/protocols/sametime/sametime.c:3231
 msgid "Video Camera"
 msgstr "Videokamera"
 
-#: ../libpurple/protocols/sametime/sametime.c:3236
+#: ../libpurple/protocols/sametime/sametime.c:3235
 msgid "File Transfer"
 msgstr "Filoverføring"
 
-#: ../libpurple/protocols/sametime/sametime.c:3270
-#: ../libpurple/protocols/sametime/sametime.c:4146
+#: ../libpurple/protocols/sametime/sametime.c:3269
+#: ../libpurple/protocols/sametime/sametime.c:4145
 msgid "Supports"
 msgstr "Støttar"
 
-#: ../libpurple/protocols/sametime/sametime.c:3275
-#: ../libpurple/protocols/sametime/sametime.c:4120
+#: ../libpurple/protocols/sametime/sametime.c:3274
+#: ../libpurple/protocols/sametime/sametime.c:4119
 msgid "External User"
 msgstr "Ekstern brukar"
 
-#: ../libpurple/protocols/sametime/sametime.c:3381
+#: ../libpurple/protocols/sametime/sametime.c:3380
 msgid "Create conference with user"
 msgstr "Lag konferanse med brukar"
 
-#: ../libpurple/protocols/sametime/sametime.c:3382
+#: ../libpurple/protocols/sametime/sametime.c:3381
 #, 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"
 
-#: ../libpurple/protocols/sametime/sametime.c:3386
+#: ../libpurple/protocols/sametime/sametime.c:3385
 msgid "New Conference"
 msgstr "Ny konferanse"
 
-#: ../libpurple/protocols/sametime/sametime.c:3388
+#: ../libpurple/protocols/sametime/sametime.c:3387
 msgid "Create"
 msgstr "Lag"
 
-#: ../libpurple/protocols/sametime/sametime.c:3453
+#: ../libpurple/protocols/sametime/sametime.c:3452
 msgid "Available Conferences"
 msgstr "Tilgjengelege konferansar"
 
-#: ../libpurple/protocols/sametime/sametime.c:3459
+#: ../libpurple/protocols/sametime/sametime.c:3458
 msgid "Create New Conference..."
 msgstr "Lag ny konferanse…"
 
+#: ../libpurple/protocols/sametime/sametime.c:3465
+msgid "Invite user to a conference"
+msgstr "Inviter ein brukar til ein konferanse"
+
 #: ../libpurple/protocols/sametime/sametime.c:3466
-msgid "Invite user to a conference"
-msgstr "Inviter ein brukar til ein konferanse"
-
-#: ../libpurple/protocols/sametime/sametime.c:3467
 #, 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."
 
-#: ../libpurple/protocols/sametime/sametime.c:3472
+#: ../libpurple/protocols/sametime/sametime.c:3471
 msgid "Invite to Conference"
 msgstr "Inviter til konferanse"
 
-#: ../libpurple/protocols/sametime/sametime.c:3563
+#: ../libpurple/protocols/sametime/sametime.c:3562
 msgid "Invite to Conference..."
 msgstr "Inviter til konferanse…"
 
-#: ../libpurple/protocols/sametime/sametime.c:3568
+#: ../libpurple/protocols/sametime/sametime.c:3567
 msgid "Send TEST Announcement"
 msgstr "Send TEST-melding"
 
-#: ../libpurple/protocols/sametime/sametime.c:3587
-#: ../pidgin/gtkconv.c:4307
+#: ../libpurple/protocols/sametime/sametime.c:3586
+#: ../pidgin/gtkconv.c:4335
 msgid "Topic:"
 msgstr "Emne:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3615
+#: ../libpurple/protocols/sametime/sametime.c:3614
 msgid "No Sametime Community Server specified"
 msgstr "Ingen Sametime felleskapstenar spesifisert"
 
-#: ../libpurple/protocols/sametime/sametime.c:3637
+#: ../libpurple/protocols/sametime/sametime.c:3636
 #, 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å."
 
-#: ../libpurple/protocols/sametime/sametime.c:3642
+#: ../libpurple/protocols/sametime/sametime.c:3641
 msgid "Meanwhile Connection Setup"
 msgstr "Meanwhile tilkoplingsinnstillingar"
 
-#: ../libpurple/protocols/sametime/sametime.c:3643
+#: ../libpurple/protocols/sametime/sametime.c:3642
 msgid "No Sametime Community Server Specified"
 msgstr "Ingen Sametime felleskapstenar spesifisert"
 
-#: ../libpurple/protocols/sametime/sametime.c:3645
-#: ../pidgin/gtkblist.c:4028
+#: ../libpurple/protocols/sametime/sametime.c:3644
+#: ../pidgin/gtkblist.c:4038
 msgid "Connect"
 msgstr "Kopla til"
 
-#: ../libpurple/protocols/sametime/sametime.c:4136
+#: ../libpurple/protocols/sametime/sametime.c:4135
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "Ukjend (0x%04x)<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:4138
+#: ../libpurple/protocols/sametime/sametime.c:4137
 msgid "Last Known Client"
 msgstr "Sist kjende klient"
 
-#: ../libpurple/protocols/sametime/sametime.c:4302
-#: ../libpurple/protocols/sametime/sametime.c:5507
+#: ../libpurple/protocols/sametime/sametime.c:4301
+#: ../libpurple/protocols/sametime/sametime.c:5506
 msgid "User Name"
 msgstr "Brukarnamn"
 
-#: ../libpurple/protocols/sametime/sametime.c:4305
-#: ../libpurple/protocols/sametime/sametime.c:5510
+#: ../libpurple/protocols/sametime/sametime.c:4304
+#: ../libpurple/protocols/sametime/sametime.c:5509
 msgid "Sametime ID"
 msgstr "Sametime-ID"
 
-#: ../libpurple/protocols/sametime/sametime.c:4329
+#: ../libpurple/protocols/sametime/sametime.c:4328
 msgid "An ambiguous user ID was entered"
 msgstr "Brukar-ID-en var ikkje eintydig"
 
-#: ../libpurple/protocols/sametime/sametime.c:4330
+#: ../libpurple/protocols/sametime/sametime.c:4329
 #, 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."
 
-#: ../libpurple/protocols/sametime/sametime.c:4335
+#: ../libpurple/protocols/sametime/sametime.c:4334
 msgid "Select User"
 msgstr "Vel brukar"
 
-#: ../libpurple/protocols/sametime/sametime.c:4419
+#: ../libpurple/protocols/sametime/sametime.c:4418
 msgid "Unable to add user: user not found"
 msgstr "Klarte ikkje å leggja til brukar: fann ikkje brukaren"
 
-#: ../libpurple/protocols/sametime/sametime.c:4421
+#: ../libpurple/protocols/sametime/sametime.c:4420
 #, 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."
 
-#: ../libpurple/protocols/sametime/sametime.c:4426
+#: ../libpurple/protocols/sametime/sametime.c:4425
 msgid "Unable to add user"
 msgstr "Klarte ikkje å leggja til brukar"
 
-#: ../libpurple/protocols/sametime/sametime.c:5012
+#: ../libpurple/protocols/sametime/sametime.c:5011
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -8749,151 +9038,150 @@
 "Fillesefeil %s: \n"
 "%s\n"
 
-#: ../libpurple/protocols/sametime/sametime.c:5147
+#: ../libpurple/protocols/sametime/sametime.c:5146
 msgid "Remotely Stored Buddy List"
 msgstr "Fjernlagra venneliste"
 
-#: ../libpurple/protocols/sametime/sametime.c:5152
+#: ../libpurple/protocols/sametime/sametime.c:5151
 msgid "Buddy List Storage Mode"
 msgstr "Lagringstilstand venneliste"
 
-#: ../libpurple/protocols/sametime/sametime.c:5155
+#: ../libpurple/protocols/sametime/sametime.c:5154
 msgid "Local Buddy List Only"
 msgstr "Berre lokal venneliste"
 
-#: ../libpurple/protocols/sametime/sametime.c:5157
+#: ../libpurple/protocols/sametime/sametime.c:5156
 msgid "Merge List from Server"
 msgstr "Slå saman med liste frå tenar"
 
-#: ../libpurple/protocols/sametime/sametime.c:5159
+#: ../libpurple/protocols/sametime/sametime.c:5158
 msgid "Merge and Save List to Server"
 msgstr "Slå saman og lagra lista på tenar"
 
-#: ../libpurple/protocols/sametime/sametime.c:5161
+#: ../libpurple/protocols/sametime/sametime.c:5160
 msgid "Synchronize List with Server"
 msgstr "Synkronisera lista med tenaren"
 
-#: ../libpurple/protocols/sametime/sametime.c:5216
+#: ../libpurple/protocols/sametime/sametime.c:5215
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "Importer Sametime-liste for kontoen %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5256
+#: ../libpurple/protocols/sametime/sametime.c:5255
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "Eksporter Sametime-liste for kontoen %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5310
+#: ../libpurple/protocols/sametime/sametime.c:5309
 msgid "Unable to add group: group exists"
 msgstr "Klarte ikkje å leggja til gruppe: gruppa finst allereie"
 
-#: ../libpurple/protocols/sametime/sametime.c:5311
+#: ../libpurple/protocols/sametime/sametime.c:5310
 #, 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:5314
-#: ../libpurple/protocols/sametime/sametime.c:5444
+#: ../libpurple/protocols/sametime/sametime.c:5313
+#: ../libpurple/protocols/sametime/sametime.c:5443
 msgid "Unable to add group"
 msgstr "Klarte ikkje å leggja til gruppe"
 
-#: ../libpurple/protocols/sametime/sametime.c:5373
+#: ../libpurple/protocols/sametime/sametime.c:5372
 msgid "Possible Matches"
 msgstr "Moglege treff"
 
+#: ../libpurple/protocols/sametime/sametime.c:5388
+msgid "Notes Address Book group results"
+msgstr "Grupperesultat Notes adressebok"
+
 #: ../libpurple/protocols/sametime/sametime.c:5389
-msgid "Notes Address Book group results"
-msgstr "Grupperesultat Notes adressebok"
-
-#: ../libpurple/protocols/sametime/sametime.c:5390
 #, 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."
 
-#: ../libpurple/protocols/sametime/sametime.c:5395
+#: ../libpurple/protocols/sametime/sametime.c:5394
 msgid "Select Notes Address Book"
 msgstr "Vel Notes adressebok"
 
-#: ../libpurple/protocols/sametime/sametime.c:5438
+#: ../libpurple/protocols/sametime/sametime.c:5437
 msgid "Unable to add group: group not found"
 msgstr "Klarte ikkje å leggja til gruppa: gruppa finst ikkje"
 
-#: ../libpurple/protocols/sametime/sametime.c:5440
+#: ../libpurple/protocols/sametime/sametime.c:5439
 #, 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."
 
-#: ../libpurple/protocols/sametime/sametime.c:5481
+#: ../libpurple/protocols/sametime/sametime.c:5480
 msgid "Notes Address Book Group"
 msgstr "Notes adressebokgruppe"
 
-#: ../libpurple/protocols/sametime/sametime.c:5482
+#: ../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:5531
+#: ../libpurple/protocols/sametime/sametime.c:5530
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Søkjeresultat for '%s'"
 
-#: ../libpurple/protocols/sametime/sametime.c:5532
+#: ../libpurple/protocols/sametime/sametime.c:5531
 #, 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."
 
-#. Create the window
-#: ../libpurple/protocols/sametime/sametime.c:5539
-#: ../pidgin/gtknotify.c:721
+#: ../libpurple/protocols/sametime/sametime.c:5538
+#: ../pidgin/gtknotify.c:724
 msgid "Search Results"
 msgstr "Søkjeresultat"
 
-#: ../libpurple/protocols/sametime/sametime.c:5564
+#: ../libpurple/protocols/sametime/sametime.c:5563
 msgid "No matches"
 msgstr "Ingen treff"
 
-#: ../libpurple/protocols/sametime/sametime.c:5565
+#: ../libpurple/protocols/sametime/sametime.c:5564
 #, 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."
 
-#: ../libpurple/protocols/sametime/sametime.c:5569
+#: ../libpurple/protocols/sametime/sametime.c:5568
 msgid "No Matches"
 msgstr "Ingen treff"
 
-#: ../libpurple/protocols/sametime/sametime.c:5606
+#: ../libpurple/protocols/sametime/sametime.c:5605
 msgid "Search for a user"
 msgstr "Søk etter ein brukar"
 
-#: ../libpurple/protocols/sametime/sametime.c:5607
+#: ../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:5610
+#: ../libpurple/protocols/sametime/sametime.c:5609
 msgid "User Search"
 msgstr "Brukarsøk"
 
-#: ../libpurple/protocols/sametime/sametime.c:5623
+#: ../libpurple/protocols/sametime/sametime.c:5622
 msgid "Import Sametime List..."
 msgstr "Importer Sametime-liste…"
 
-#: ../libpurple/protocols/sametime/sametime.c:5627
+#: ../libpurple/protocols/sametime/sametime.c:5626
 msgid "Export Sametime List..."
 msgstr "Eksporter Sametime-liste…"
 
-#: ../libpurple/protocols/sametime/sametime.c:5631
+#: ../libpurple/protocols/sametime/sametime.c:5630
 msgid "Add Notes Address Book Group..."
 msgstr "Legg til Notes adressebokgruppe…"
 
-#: ../libpurple/protocols/sametime/sametime.c:5635
+#: ../libpurple/protocols/sametime/sametime.c:5634
 msgid "User Search..."
 msgstr "Brukarsøk…"
 
-#: ../libpurple/protocols/sametime/sametime.c:5741
+#: ../libpurple/protocols/sametime/sametime.c:5740
 msgid "Force login (ignore server redirects)"
 msgstr "Tvungen pålogging (sjå vekk frå tenarvidaresending)"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5751
+#: ../libpurple/protocols/sametime/sametime.c:5750
 msgid "Hide client identity"
 msgstr "Skjul klientidentitet"
 
@@ -10105,7 +10393,7 @@
 
 #: ../libpurple/protocols/silc/silc.c:741
 #: ../libpurple/protocols/silc10/silc.c:652
-#: ../pidgin/gtkprefs.c:1638
+#: ../pidgin/gtkprefs.c:1640
 msgid "Normal"
 msgstr "Normal"
 
@@ -10474,7 +10762,7 @@
 
 #: ../libpurple/protocols/silc/silc.c:1910
 #: ../libpurple/protocols/silc10/silc.c:1853
-#: ../pidgin/gtkprefs.c:2031
+#: ../pidgin/gtkprefs.c:2033
 msgid "Network"
 msgstr "Nettverk"
 
@@ -10949,8 +11237,8 @@
 msgstr "Passordet er endra"
 
 #: ../libpurple/protocols/toc/toc.c:1366
-#: ../pidgin/gtkblist.c:5534
-#: ../pidgin/gtkblist.c:5887
+#: ../pidgin/gtkblist.c:5576
+#: ../pidgin/gtkblist.c:5929
 msgid "_Group:"
 msgstr "_Gruppe:"
 
@@ -11013,94 +11301,99 @@
 msgid "TOC Protocol Plugin"
 msgstr "TOC-protokolltillegg"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:823
+#: ../libpurple/protocols/yahoo/yahoo.c:782
+#, 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."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:838
 msgid "Your Yahoo! message did not get sent."
 msgstr "Yahoo!-meldinga di blei ikkje sendt."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:895
+#: ../libpurple/protocols/yahoo/yahoo.c:915
 #, c-format
 msgid "%s just sent you a Buzz!"
 msgstr "%s sendte deg nettopp ein alarm"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:942
+#: ../libpurple/protocols/yahoo/yahoo.c:962
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Yahoo! systemmelding for %s:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1003
+#: ../libpurple/protocols/yahoo/yahoo.c:1031
 msgid "Authorization denied message:"
 msgstr "Melding om avvist autentisering:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1084
+#: ../libpurple/protocols/yahoo/yahoo.c:1049
+#, 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."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1052
 #, 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."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1087
-#, 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."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1090
+#: ../libpurple/protocols/yahoo/yahoo.c:1054
 msgid "Add buddy rejected"
 msgstr "Er blitt nekta å leggja til venn"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1841
+#: ../libpurple/protocols/yahoo/yahoo.c:1996
 #, 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."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1844
+#: ../libpurple/protocols/yahoo/yahoo.c:1999
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo!-autentiseringa feila"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1910
+#: ../libpurple/protocols/yahoo/yahoo.c:2065
 #, 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."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1913
+#: ../libpurple/protocols/yahoo/yahoo.c:2068
 msgid "Ignore buddy?"
 msgstr "Ignorera vennen?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1976
+#: ../libpurple/protocols/yahoo/yahoo.c:2131
 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:1979
+#: ../libpurple/protocols/yahoo/yahoo.c:2134
 #, 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å."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2033
+#: ../libpurple/protocols/yahoo/yahoo.c:2188
 #, 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."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2036
+#: ../libpurple/protocols/yahoo/yahoo.c:2191
 msgid "Could not add buddy to server list"
 msgstr "Klarte ikkje å leggja til vennen i tenarlista"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2155
+#: ../libpurple/protocols/yahoo/yahoo.c:2310
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Hørleg %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2495
+#: ../libpurple/protocols/yahoo/yahoo.c:2653
 msgid "Received unexpected HTTP response from server."
 msgstr "Fekk uventa HTTP-svar frå tenar."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2519
-#: ../libpurple/protocols/yahoo/yahoo.c:2705
-#: ../libpurple/protocols/yahoo/yahoo.c:2808
-#: ../libpurple/protocols/yahoo/yahoo.c:2818
-#: ../libpurple/protocols/yahoo/yahoochat.c:1418
-#: ../libpurple/protocols/yahoo/yahoochat.c:1488
+#: ../libpurple/protocols/yahoo/yahoo.c:2677
+#: ../libpurple/protocols/yahoo/yahoo.c:2863
+#: ../libpurple/protocols/yahoo/yahoo.c:2966
+#: ../libpurple/protocols/yahoo/yahoo.c:2976
+#: ../libpurple/protocols/yahoo/yahoochat.c:1514
+#: ../libpurple/protocols/yahoo/yahoochat.c:1584
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Tilkoplingsproblem"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2545
+#: ../libpurple/protocols/yahoo/yahoo.c:2703
 #, c-format
 msgid ""
 "Lost connection with %s:\n"
@@ -11109,7 +11402,7 @@
 "Mista sambandet med %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2570
+#: ../libpurple/protocols/yahoo/yahoo.c:2728
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
@@ -11118,111 +11411,123 @@
 "Klaret ikkje å få til samband med %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2920
-#: ../libpurple/protocols/yahoo/yahoo.c:3606
+#: ../libpurple/protocols/yahoo/yahoo.c:3083
+#: ../libpurple/protocols/yahoo/yahoo.c:3769
 msgid "Not at Home"
 msgstr "Ikkje heime"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2922
-#: ../libpurple/protocols/yahoo/yahoo.c:3609
+#: ../libpurple/protocols/yahoo/yahoo.c:3085
+#: ../libpurple/protocols/yahoo/yahoo.c:3772
 msgid "Not at Desk"
 msgstr "Ikkje ved pulten"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2924
-#: ../libpurple/protocols/yahoo/yahoo.c:3612
+#: ../libpurple/protocols/yahoo/yahoo.c:3087
+#: ../libpurple/protocols/yahoo/yahoo.c:3775
 msgid "Not in Office"
 msgstr "Ikkje på kontoret"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2928
-#: ../libpurple/protocols/yahoo/yahoo.c:3618
+#: ../libpurple/protocols/yahoo/yahoo.c:3091
+#: ../libpurple/protocols/yahoo/yahoo.c:3781
 msgid "On Vacation"
 msgstr "På ferie"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2932
-#: ../libpurple/protocols/yahoo/yahoo.c:3624
+#: ../libpurple/protocols/yahoo/yahoo.c:3095
+#: ../libpurple/protocols/yahoo/yahoo.c:3787
 msgid "Stepped Out"
 msgstr "Ute eit bel"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3025
-#: ../libpurple/protocols/yahoo/yahoo.c:3055
+#: ../libpurple/protocols/yahoo/yahoo.c:3188
+#: ../libpurple/protocols/yahoo/yahoo.c:3218
 msgid "Not on server list"
 msgstr "Ikkje på tenarlista"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3072
-#: ../libpurple/protocols/yahoo/yahoo.c:3130
+#: ../libpurple/protocols/yahoo/yahoo.c:3235
+#: ../libpurple/protocols/yahoo/yahoo.c:3293
 msgid "Appear Online"
 msgstr "Framstå som tilkopla"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3075
-#: ../libpurple/protocols/yahoo/yahoo.c:3151
+#: ../libpurple/protocols/yahoo/yahoo.c:3238
+#: ../libpurple/protocols/yahoo/yahoo.c:3314
 msgid "Appear Permanently Offline"
 msgstr "Verkar alltid vera fråkopla"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3093
+#: ../libpurple/protocols/yahoo/yahoo.c:3256
 msgid "Presence"
 msgstr "Nærvær"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3136
+#: ../libpurple/protocols/yahoo/yahoo.c:3299
 msgid "Appear Offline"
 msgstr "Verkar vera fråkopla"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3145
+#: ../libpurple/protocols/yahoo/yahoo.c:3308
 msgid "Don't Appear Permanently Offline"
 msgstr "Ikkje verka vera alltid fråkopla"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3193
+#: ../libpurple/protocols/yahoo/yahoo.c:3356
 msgid "Join in Chat"
 msgstr "Bli med i praterom"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3199
+#: ../libpurple/protocols/yahoo/yahoo.c:3362
 msgid "Initiate Conference"
 msgstr "Lag konferanse"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3227
+#: ../libpurple/protocols/yahoo/yahoo.c:3390
 msgid "Presence Settings"
 msgstr "Nærværsinnstillingar"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3233
+#: ../libpurple/protocols/yahoo/yahoo.c:3396
 msgid "Start Doodling"
 msgstr "Laga krusedullar"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3334
+#: ../libpurple/protocols/yahoo/yahoo.c:3497
 msgid "Activate which ID?"
 msgstr "Kva ID skal takast i bruk?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3345
-msgid "Join whom in chat?"
+#: ../libpurple/protocols/yahoo/yahoo.c:3508
+msgid "Join who in chat?"
 msgstr "Kven skal bli med i praterommet?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3357
+#: ../libpurple/protocols/yahoo/yahoo.c:3520
 msgid "Activate ID..."
 msgstr "Ta i bruk ID…"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3361
+#: ../libpurple/protocols/yahoo/yahoo.c:3524
 msgid "Join User in Chat..."
 msgstr "Bli med brukaren i praterommet…"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3366
+#: ../libpurple/protocols/yahoo/yahoo.c:3529
 msgid "Open Inbox"
 msgstr "Opna innkorga"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3881
+#: ../libpurple/protocols/yahoo/yahoo.c:4054
 msgid "You have just sent a Buzz!"
 msgstr "Du har nettopp sendt ein alarm"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3940
+#: ../libpurple/protocols/yahoo/yahoo.c:4132
+msgid "buzz"
+msgstr "alarm"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4133
+msgid "buzzed"
+msgstr "alarmert"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4134
+msgid "Buzzing"
+msgstr "Alarmerer"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4149
 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:3945
+#: ../libpurple/protocols/yahoo/yahoo.c:4154
 msgid "list: List rooms on the Yahoo network"
 msgstr "list: list romma på Yahoo-nettverket"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3949
+#: ../libpurple/protocols/yahoo/yahoo.c:4158
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: send ein alarm til ein brukar for å merksemda hans"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3953
+#: ../libpurple/protocols/yahoo/yahoo.c:4162
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: spør ein brukar om å starta ei teikneøkt"
 
@@ -11236,123 +11541,123 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4161
-#: ../libpurple/protocols/yahoo/yahoo.c:4163
+#: ../libpurple/protocols/yahoo/yahoo.c:4376
+#: ../libpurple/protocols/yahoo/yahoo.c:4378
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo-protokolltillegg"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4186
+#: ../libpurple/protocols/yahoo/yahoo.c:4401
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4189
+#: ../libpurple/protocols/yahoo/yahoo.c:4404
 msgid "Pager server"
 msgstr "Søkjetenestetenar"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4192
+#: ../libpurple/protocols/yahoo/yahoo.c:4407
 msgid "Japan Pager server"
 msgstr "Søkjetenestetenar (_Japan)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4195
+#: ../libpurple/protocols/yahoo/yahoo.c:4410
 msgid "Pager port"
 msgstr "S_økjeport"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4198
+#: ../libpurple/protocols/yahoo/yahoo.c:4413
 msgid "File transfer server"
 msgstr "Filoverføringstenar"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4201
+#: ../libpurple/protocols/yahoo/yahoo.c:4416
 msgid "Japan file transfer server"
 msgstr "Filoverføringstenar (Japa_n)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4204
+#: ../libpurple/protocols/yahoo/yahoo.c:4419
 msgid "File transfer port"
 msgstr "Filoverførings_port"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4207
+#: ../libpurple/protocols/yahoo/yahoo.c:4422
 msgid "Chat room locale"
 msgstr "Pratero_mslokalitet"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4210
+#: ../libpurple/protocols/yahoo/yahoo.c:4425
 msgid "Ignore conference and chatroom invitations"
 msgstr "_Ignorer konferanse- og prateromsinvitasjonar"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4218
+#: ../libpurple/protocols/yahoo/yahoo.c:4433
 msgid "Chat room list URL"
 msgstr "Prateromslisteadresse"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4221
+#: ../libpurple/protocols/yahoo/yahoo.c:4436
 msgid "Yahoo Chat server"
 msgstr "Yahoo pratetenar"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4224
+#: ../libpurple/protocols/yahoo/yahoo.c:4439
 msgid "Yahoo Chat port"
 msgstr "Yahoo prateport"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:204
+#: ../libpurple/protocols/yahoo/yahoochat.c:217
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr "%s har avvist konferanseinvitasjonen din til rommet \"%s\" grunna \"%s\"."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:206
+#: ../libpurple/protocols/yahoo/yahoochat.c:219
 msgid "Invitation Rejected"
 msgstr "Invitasjonen avvist"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:362
+#: ../libpurple/protocols/yahoo/yahoochat.c:438
 msgid "Failed to join chat"
 msgstr "Klarte ikkje å bli med i praterommet"
 
 #. -6
-#: ../libpurple/protocols/yahoo/yahoochat.c:365
+#: ../libpurple/protocols/yahoo/yahoochat.c:441
 msgid "Unknown room"
 msgstr "Ukjent rom"
 
 #. -15
-#: ../libpurple/protocols/yahoo/yahoochat.c:368
+#: ../libpurple/protocols/yahoo/yahoochat.c:444
 msgid "Maybe the room is full"
 msgstr "Kanskje er rommet fullt"
 
 #. -35
-#: ../libpurple/protocols/yahoo/yahoochat.c:371
+#: ../libpurple/protocols/yahoo/yahoochat.c:447
 msgid "Not available"
 msgstr "Ikkje tilgjengeleg"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:375
+#: ../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:453
+#: ../libpurple/protocols/yahoo/yahoochat.c:534
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "Du pratar no i %s."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:628
+#: ../libpurple/protocols/yahoo/yahoochat.c:719
 msgid "Failed to join buddy in chat"
 msgstr "Klarte ikkje å bli med vennen i praterommet"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:629
+#: ../libpurple/protocols/yahoo/yahoochat.c:720
 msgid "Maybe they're not in a chat?"
 msgstr "Kanskje er dei ikkje i eit praterom?"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1320
-#: ../libpurple/protocols/yahoo/yahoochat.c:1346
+#: ../libpurple/protocols/yahoo/yahoochat.c:1416
+#: ../libpurple/protocols/yahoo/yahoochat.c:1442
 msgid "Fetching the room list failed."
 msgstr "Klarte ikkje å henta romlista."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1404
+#: ../libpurple/protocols/yahoo/yahoochat.c:1500
 msgid "Voices"
 msgstr "Stemmer"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1407
+#: ../libpurple/protocols/yahoo/yahoochat.c:1503
 msgid "Webcams"
 msgstr "Nettkamera"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1418
-#: ../libpurple/protocols/yahoo/yahoochat.c:1488
+#: ../libpurple/protocols/yahoo/yahoochat.c:1514
+#: ../libpurple/protocols/yahoo/yahoochat.c:1584
 msgid "Unable to fetch room list."
 msgstr "Klarer ikkje å henta romlista."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1481
+#: ../libpurple/protocols/yahoo/yahoochat.c:1577
 msgid "User Rooms"
 msgstr "Brukarrom"
 
@@ -11678,7 +11983,22 @@
 msgid "%s is now known as %s.\n"
 msgstr "%s er no kjend som %s. \n"
 
-#: ../libpurple/server.c:680
+#: ../libpurple/server.c:293
+#, c-format
+msgid "Attention! %s %s."
+msgstr "OBS! %s %s."
+
+#: ../libpurple/server.c:295
+#: ../libpurple/server.c:333
+msgid "Attention!"
+msgstr "OBS!"
+
+#: ../libpurple/server.c:331
+#, c-format
+msgid "Attention! You have been %s."
+msgstr "NB! Du er blitt %s."
+
+#: ../libpurple/server.c:782
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -11687,12 +12007,12 @@
 "%s har invitert %s til praterommet %s:\n"
 "%s"
 
-#: ../libpurple/server.c:685
+#: ../libpurple/server.c:787
 #, 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:689
+#: ../libpurple/server.c:791
 msgid "Accept chat invitation?"
 msgstr "Tek du i mot invitasjonen?"
 
@@ -11701,7 +12021,7 @@
 msgstr "Ta vekk"
 
 #: ../libpurple/status.c:155
-#: ../pidgin/gtkstatusbox.c:1057
+#: ../pidgin/gtkstatusbox.c:1058
 msgid "Do not disturb"
 msgstr "Ikkje forstyrr meg"
 
@@ -11753,93 +12073,93 @@
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2692
+#: ../libpurple/util.c:2720
 #, c-format
 msgid "Error Reading %s"
 msgstr "Klarte ikkje å lesa %s"
 
-#: ../libpurple/util.c:2693
+#: ../libpurple/util.c:2721
 #, 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~."
 
-#: ../libpurple/util.c:3193
+#: ../libpurple/util.c:3221
 msgid "Calculating..."
 msgstr "Reknar…"
 
-#: ../libpurple/util.c:3196
+#: ../libpurple/util.c:3224
 msgid "Unknown."
 msgstr "Ukjend."
 
-#: ../libpurple/util.c:3222
+#: ../libpurple/util.c:3250
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d sekund"
 msgstr[1] "%d sekund"
 
-#: ../libpurple/util.c:3234
+#: ../libpurple/util.c:3262
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dag"
 msgstr[1] "%d dagar"
 
-#: ../libpurple/util.c:3242
+#: ../libpurple/util.c:3270
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d time"
 msgstr[1] "%s, %d timar"
 
-#: ../libpurple/util.c:3248
+#: ../libpurple/util.c:3276
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d time"
 msgstr[1] "%d timar"
 
-#: ../libpurple/util.c:3256
+#: ../libpurple/util.c:3284
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minute"
 msgstr[1] "%s, %d minutt"
 
-#: ../libpurple/util.c:3262
+#: ../libpurple/util.c:3290
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minutt"
 msgstr[1] "%d minutt"
 
-#: ../libpurple/util.c:3522
+#: ../libpurple/util.c:3550
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr "Klarte ikkje å opna %s: vidaresendt for mange gonger"
 
-#: ../libpurple/util.c:3559
-#: ../libpurple/util.c:3854
+#: ../libpurple/util.c:3587
+#: ../libpurple/util.c:3882
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Klarte ikkje å kopla til %s"
 
-#: ../libpurple/util.c:3682
+#: ../libpurple/util.c:3710
 #, 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."
 
-#: ../libpurple/util.c:3717
+#: ../libpurple/util.c:3745
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Klarte ikkje å lesa frå %s: %s"
 
-#: ../libpurple/util.c:3748
+#: ../libpurple/util.c:3776
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Klarte ikkje å skriva frå %s: %s"
 
-#: ../libpurple/util.c:3773
+#: ../libpurple/util.c:3801
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Klarte ikkje å kopla til %s: %s"
@@ -11865,37 +12185,37 @@
 msgstr "Panelorienteringa."
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:409
+#: ../pidgin/gtkaccount.c:407
 msgid "Login Options"
 msgstr "Innloggingsval"
 
-#: ../pidgin/gtkaccount.c:430
+#: ../pidgin/gtkaccount.c:428
 msgid "Pro_tocol:"
 msgstr "Proto_koll:"
 
-#: ../pidgin/gtkaccount.c:441
+#: ../pidgin/gtkaccount.c:439
 msgid "Screen _name:"
 msgstr "Brukar_namn:"
 
-#: ../pidgin/gtkaccount.c:531
+#: ../pidgin/gtkaccount.c:529
 msgid "_Local alias:"
 msgstr "L_okalt alias:"
 
-#: ../pidgin/gtkaccount.c:535
+#: ../pidgin/gtkaccount.c:533
 msgid "Remember pass_word"
 msgstr "_Hugs passordet"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:593
+#: ../pidgin/gtkaccount.c:591
 msgid "User Options"
 msgstr "Brukarval"
 
-#: ../pidgin/gtkaccount.c:606
+#: ../pidgin/gtkaccount.c:604
 msgid "New _mail notifications"
 msgstr "Varsling av ny _e-post"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:611
+#: ../pidgin/gtkaccount.c:609
 msgid "Use this buddy _icon for this account:"
 msgstr "Bruk dette venne-_ikonet for denne kontoen:"
 
@@ -11930,7 +12250,7 @@
 msgstr "SOCKS 5"
 
 #: ../pidgin/gtkaccount.c:967
-#: ../pidgin/gtkprefs.c:1208
+#: ../pidgin/gtkprefs.c:1210
 msgid "Use Environmental Settings"
 msgstr "Bruk miljøinnstillingar"
 
@@ -11953,17 +12273,17 @@
 msgstr "Mellomtenarval"
 
 #: ../pidgin/gtkaccount.c:1044
-#: ../pidgin/gtkprefs.c:1202
+#: ../pidgin/gtkprefs.c:1204
 msgid "Proxy _type:"
 msgstr "_Mellomtenartype:"
 
 #: ../pidgin/gtkaccount.c:1053
-#: ../pidgin/gtkprefs.c:1223
+#: ../pidgin/gtkprefs.c:1225
 msgid "_Host:"
 msgstr "_Vert:"
 
 #: ../pidgin/gtkaccount.c:1057
-#: ../pidgin/gtkprefs.c:1241
+#: ../pidgin/gtkprefs.c:1243
 msgid "_Port:"
 msgstr "_Port:"
 
@@ -11972,32 +12292,44 @@
 msgstr "Brukar_namn:"
 
 #: ../pidgin/gtkaccount.c:1072
-#: ../pidgin/gtkprefs.c:1278
+#: ../pidgin/gtkprefs.c:1280
 msgid "Pa_ssword:"
 msgstr "P_assord:"
 
-#: ../pidgin/gtkaccount.c:1478
+#: ../pidgin/gtkaccount.c:1195
+msgid "Unable to save new account"
+msgstr "Klarte ikkje å lagra den nye kontoen"
+
+#: ../pidgin/gtkaccount.c:1196
+msgid "An account already exists with the specified criteria."
+msgstr "Det finst allereie ein konto med dei kriteria."
+
+#: ../pidgin/gtkaccount.c:1473
 msgid "Add Account"
 msgstr "Legg til konto"
 
-#: ../pidgin/gtkaccount.c:1497
+#: ../pidgin/gtkaccount.c:1492
 msgid "_Basic"
 msgstr "_Grunnleggjande"
 
-#: ../pidgin/gtkaccount.c:1508
+#: ../pidgin/gtkaccount.c:1499
+msgid "Create this new account on the server"
+msgstr "Opprett denne nye kontoen på tenaren"
+
+#: ../pidgin/gtkaccount.c:1515
 msgid "_Advanced"
 msgstr "A_vansert"
 
-#: ../pidgin/gtkaccount.c:1982
+#: ../pidgin/gtkaccount.c:1973
 #: ../pidgin/gtkplugin.c:568
 msgid "Enabled"
 msgstr "I bruk"
 
-#: ../pidgin/gtkaccount.c:2010
+#: ../pidgin/gtkaccount.c:2001
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: ../pidgin/gtkaccount.c:2210
+#: ../pidgin/gtkaccount.c:2201
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -12012,244 +12344,256 @@
 "\n"
 "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:760
+#: ../pidgin/gtkblist.c:765
 msgid "Join a Chat"
 msgstr "Gå inn i eit praterom"
 
-#: ../pidgin/gtkblist.c:781
+#: ../pidgin/gtkblist.c:786
 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"
 
 #. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:792
-#: ../pidgin/gtkblist.c:5482
-#: ../pidgin/gtkblist.c:5848
-#: ../pidgin/gtkpounce.c:540
+#: ../pidgin/gtkblist.c:797
+#: ../pidgin/gtkblist.c:5524
+#: ../pidgin/gtkblist.c:5890
+#: ../pidgin/gtkpounce.c:538
 #: ../pidgin/gtkroomlist.c:395
 msgid "_Account:"
 msgstr "_Konto:"
 
-#: ../pidgin/gtkblist.c:1081
+#: ../pidgin/gtkblist.c:1086
 #: ../pidgin/gtkprivacy.c:602
 #: ../pidgin/gtkprivacy.c:616
 msgid "_Block"
 msgstr "_Blokker"
 
-#: ../pidgin/gtkblist.c:1081
+#: ../pidgin/gtkblist.c:1086
 msgid "Un_block"
 msgstr "A_vblokker"
 
-#: ../pidgin/gtkblist.c:1132
+#: ../pidgin/gtkblist.c:1137
 msgid "Get _Info"
 msgstr "Hent _info"
 
-#: ../pidgin/gtkblist.c:1135
-#: ../pidgin/pidginstock.c:84
+#: ../pidgin/gtkblist.c:1140
+#: ../pidgin/pidginstock.c:89
 msgid "I_M"
 msgstr "_Lynmelding"
 
-#: ../pidgin/gtkblist.c:1141
+#: ../pidgin/gtkblist.c:1146
 msgid "_Send File"
 msgstr "_Send fil"
 
-#: ../pidgin/gtkblist.c:1148
+#: ../pidgin/gtkblist.c:1153
 msgid "Add Buddy _Pounce"
 msgstr "Legg til venne_varsling"
 
-#: ../pidgin/gtkblist.c:1153
-#: ../pidgin/gtkblist.c:1157
-#: ../pidgin/gtkblist.c:1262
-#: ../pidgin/gtkblist.c:1285
+#: ../pidgin/gtkblist.c:1158
+#: ../pidgin/gtkblist.c:1162
+#: ../pidgin/gtkblist.c:1267
+#: ../pidgin/gtkblist.c:1290
 msgid "View _Log"
 msgstr "Vis l_ogg"
 
-#: ../pidgin/gtkblist.c:1170
-#: ../pidgin/gtkblist.c:1179
-#: ../pidgin/gtkblist.c:1270
-#: ../pidgin/gtkblist.c:1291
+#: ../pidgin/gtkblist.c:1175
+#: ../pidgin/gtkblist.c:1184
+#: ../pidgin/gtkblist.c:1275
+#: ../pidgin/gtkblist.c:1296
 msgid "_Alias..."
 msgstr "A_lias…"
 
-#: ../pidgin/gtkblist.c:1173
-#: ../pidgin/gtkblist.c:1181
-#: ../pidgin/gtkblist.c:1272
-#: ../pidgin/gtkblist.c:1293
+#: ../pidgin/gtkblist.c:1178
+#: ../pidgin/gtkblist.c:1186
+#: ../pidgin/gtkblist.c:1277
+#: ../pidgin/gtkblist.c:1298
 msgid "_Remove"
 msgstr "_Fjern"
 
-#: ../pidgin/gtkblist.c:1231
+#: ../pidgin/gtkblist.c:1236
 msgid "Add a _Buddy"
 msgstr "Legg til ein _venn"
 
-#: ../pidgin/gtkblist.c:1234
+#: ../pidgin/gtkblist.c:1239
 msgid "Add a C_hat"
 msgstr "Legg til eit samtale_rom"
 
-#: ../pidgin/gtkblist.c:1237
+#: ../pidgin/gtkblist.c:1242
 msgid "_Delete Group"
 msgstr "_Slett gruppe"
 
-#: ../pidgin/gtkblist.c:1239
+#: ../pidgin/gtkblist.c:1244
 msgid "_Rename"
 msgstr "_Gje nytt namn"
 
 #. join button
-#: ../pidgin/gtkblist.c:1258
+#: ../pidgin/gtkblist.c:1263
 #: ../pidgin/gtkroomlist.c:306
 #: ../pidgin/gtkroomlist.c:459
-#: ../pidgin/pidginstock.c:82
+#: ../pidgin/pidginstock.c:87
 msgid "_Join"
 msgstr "_Bli med"
 
-#: ../pidgin/gtkblist.c:1260
+#: ../pidgin/gtkblist.c:1265
 msgid "Auto-Join"
 msgstr "Automatisk pålogging"
 
-#: ../pidgin/gtkblist.c:1298
-#: ../pidgin/gtkblist.c:1322
+#: ../pidgin/gtkblist.c:1303
+#: ../pidgin/gtkblist.c:1327
 msgid "_Collapse"
 msgstr "_Slå saman"
 
-#: ../pidgin/gtkblist.c:1327
+#: ../pidgin/gtkblist.c:1332
 msgid "_Expand"
 msgstr "_Utvid"
 
-#: ../pidgin/gtkblist.c:1572
-#: ../pidgin/gtkblist.c:1584
-#: ../pidgin/gtkblist.c:4576
-#: ../pidgin/gtkblist.c:4586
+#: ../pidgin/gtkblist.c:1583
+#: ../pidgin/gtkblist.c:1595
+#: ../pidgin/gtkblist.c:4600
+#: ../pidgin/gtkblist.c:4613
 msgid "/Tools/Mute Sounds"
 msgstr "/Verktøy/Demp lydar"
 
-#: ../pidgin/gtkblist.c:2044
-#: ../pidgin/gtkconv.c:4707
+#: ../pidgin/gtkblist.c:2055
+#: ../pidgin/gtkconv.c:4823
 #: ../pidgin/gtkpounce.c:429
 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."
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2850
+#: ../pidgin/gtkblist.c:2866
 msgid "/_Buddies"
 msgstr "/_Vennar"
 
-#: ../pidgin/gtkblist.c:2851
+#: ../pidgin/gtkblist.c:2867
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Vennar/_Ny lynmelding…"
 
-#: ../pidgin/gtkblist.c:2852
+#: ../pidgin/gtkblist.c:2868
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Vennar/Gå inn i eit prater_om…"
 
-#: ../pidgin/gtkblist.c:2853
+#: ../pidgin/gtkblist.c:2869
 msgid "/Buddies/Get User _Info..."
 msgstr "/Vennar/Hent brukar_info…"
 
-#: ../pidgin/gtkblist.c:2854
+#: ../pidgin/gtkblist.c:2870
 msgid "/Buddies/View User _Log..."
 msgstr "/Vennar/Vis brukar_logg…"
 
-#: ../pidgin/gtkblist.c:2856
-msgid "/Buddies/Show _Offline Buddies"
-msgstr "/Vennar/Vis _fråkopla vennar"
-
-#: ../pidgin/gtkblist.c:2857
-msgid "/Buddies/Show _Empty Groups"
-msgstr "/Vennar/Vis _tomme grupper"
-
-#: ../pidgin/gtkblist.c:2858
-msgid "/Buddies/Show Buddy _Details"
-msgstr "/Vennar/Vis venne_detaljar"
-
-#: ../pidgin/gtkblist.c:2859
-msgid "/Buddies/Show Idle _Times"
-msgstr "/Vennar/Vis fr_åkoplingstid"
-
-#: ../pidgin/gtkblist.c:2860
+#: ../pidgin/gtkblist.c:2872
+msgid "/Buddies/Show"
+msgstr "/Vennar/Vis"
+
+#: ../pidgin/gtkblist.c:2873
+msgid "/Buddies/Show/_Offline Buddies"
+msgstr "/Vennar/Vis/_Fråkopla vennar"
+
+#: ../pidgin/gtkblist.c:2874
+msgid "/Buddies/Show/_Empty Groups"
+msgstr "/Vennar/Vis/_Tomme grupper"
+
+#: ../pidgin/gtkblist.c:2875
+msgid "/Buddies/Show/Buddy _Details"
+msgstr "/Vennar/Vis/Venne_detaljar"
+
+#: ../pidgin/gtkblist.c:2876
+msgid "/Buddies/Show/Idle _Times"
+msgstr "/Vennar/Vis/Fr_åkoplingstid"
+
+#: ../pidgin/gtkblist.c:2877
+msgid "/Buddies/Show/_Protocol Icons"
+msgstr "/Vennar/Vis/_Protokollikon"
+
+#: ../pidgin/gtkblist.c:2878
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Vennar/Sort_er vennane"
 
-#: ../pidgin/gtkblist.c:2862
+#: ../pidgin/gtkblist.c:2880
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Vennar/Legg til _venn…"
 
-#: ../pidgin/gtkblist.c:2863
+#: ../pidgin/gtkblist.c:2881
 msgid "/Buddies/Add C_hat..."
 msgstr "/Vennar/Legg til _praterom…"
 
-#: ../pidgin/gtkblist.c:2864
+#: ../pidgin/gtkblist.c:2882
 msgid "/Buddies/Add _Group..."
 msgstr "/Vennar/Legg til _gruppe…"
 
-#: ../pidgin/gtkblist.c:2866
+#: ../pidgin/gtkblist.c:2884
 msgid "/Buddies/_Quit"
 msgstr "/Vennar/Avsl_utt"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2869
+#: ../pidgin/gtkblist.c:2887
 msgid "/_Accounts"
 msgstr "/K_ontoar"
 
-#: ../pidgin/gtkblist.c:2870
-#: ../pidgin/gtkblist.c:6546
+#: ../pidgin/gtkblist.c:2888
+#: ../pidgin/gtkblist.c:6589
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Kontoar/Legg til\\/endra"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2873
+#: ../pidgin/gtkblist.c:2891
 msgid "/_Tools"
 msgstr "/V_erktøy"
 
-#: ../pidgin/gtkblist.c:2874
+#: ../pidgin/gtkblist.c:2892
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Verktøy/Venne_varsling"
 
-#: ../pidgin/gtkblist.c:2875
+#: ../pidgin/gtkblist.c:2893
+msgid "/Tools/_Certificates"
+msgstr "/Verktøy/_Sertifikat"
+
+#: ../pidgin/gtkblist.c:2894
 msgid "/Tools/Plu_gins"
 msgstr "/Verktøy/Program_tillegg"
 
-#: ../pidgin/gtkblist.c:2876
+#: ../pidgin/gtkblist.c:2895
 msgid "/Tools/Pr_eferences"
 msgstr "/Verktøy/_Innstillingar"
 
-#: ../pidgin/gtkblist.c:2877
+#: ../pidgin/gtkblist.c:2896
 msgid "/Tools/Pr_ivacy"
 msgstr "/Verktøy/_Personvern"
 
-#: ../pidgin/gtkblist.c:2879
+#: ../pidgin/gtkblist.c:2898
 msgid "/Tools/_File Transfers"
 msgstr "/Verktøy/_Filoverføringar"
 
-#: ../pidgin/gtkblist.c:2880
+#: ../pidgin/gtkblist.c:2899
 msgid "/Tools/R_oom List"
 msgstr "/Verktøy/_Romliste"
 
-#: ../pidgin/gtkblist.c:2881
+#: ../pidgin/gtkblist.c:2900
 msgid "/Tools/System _Log"
 msgstr "/Verktøy/System_logg"
 
-#: ../pidgin/gtkblist.c:2883
+#: ../pidgin/gtkblist.c:2902
 msgid "/Tools/Mute _Sounds"
 msgstr "/Verktøy/_Demp lydar"
 
 #. Help
-#: ../pidgin/gtkblist.c:2885
+#: ../pidgin/gtkblist.c:2904
 msgid "/_Help"
 msgstr "/_Hjelp"
 
-#: ../pidgin/gtkblist.c:2886
+#: ../pidgin/gtkblist.c:2905
 msgid "/Help/Online _Help"
 msgstr "/Hjelp/_Hjelp på nettet"
 
-#: ../pidgin/gtkblist.c:2887
+#: ../pidgin/gtkblist.c:2906
 msgid "/Help/_Debug Window"
 msgstr "/Hjelp/_Feilsøkingsvindauge"
 
-#: ../pidgin/gtkblist.c:2889
-#: ../pidgin/gtkblist.c:2891
+#: ../pidgin/gtkblist.c:2908
+#: ../pidgin/gtkblist.c:2910
 msgid "/Help/_About"
 msgstr "/Hjelp/_Om"
 
-#: ../pidgin/gtkblist.c:2920
+#: ../pidgin/gtkblist.c:2939
 #, c-format
 msgid ""
 "\n"
@@ -12258,81 +12602,81 @@
 "\n"
 "<b>Konto:</b> %s"
 
-#: ../pidgin/gtkblist.c:2998
+#: ../pidgin/gtkblist.c:3017
 msgid "Buddy Alias"
 msgstr "Venne-alias"
 
-#: ../pidgin/gtkblist.c:3027
+#: ../pidgin/gtkblist.c:3046
 msgid "Logged In"
 msgstr "Pålogga"
 
-#: ../pidgin/gtkblist.c:3073
+#: ../pidgin/gtkblist.c:3092
 msgid "Last Seen"
 msgstr "Sist sett"
 
-#: ../pidgin/gtkblist.c:3093
+#: ../pidgin/gtkblist.c:3113
 msgid "Spooky"
 msgstr "Skummelt"
 
-#: ../pidgin/gtkblist.c:3095
+#: ../pidgin/gtkblist.c:3115
 msgid "Awesome"
 msgstr "Storarta"
 
-#: ../pidgin/gtkblist.c:3097
+#: ../pidgin/gtkblist.c:3117
 msgid "Rockin'"
 msgstr "Glimrande"
 
-#: ../pidgin/gtkblist.c:3440
+#: ../pidgin/gtkblist.c:3450
 #, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr "UVerksam %dd  %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3442
+#: ../pidgin/gtkblist.c:3452
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "UVerksam %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3444
+#: ../pidgin/gtkblist.c:3454
 #, c-format
 msgid "Idle %dm"
 msgstr "Uverksam %dm"
 
-#: ../pidgin/gtkblist.c:3589
+#: ../pidgin/gtkblist.c:3599
 msgid "/Buddies/New Instant Message..."
 msgstr "/Vennar/_Ny lynmelding…"
 
-#: ../pidgin/gtkblist.c:3590
-#: ../pidgin/gtkblist.c:3623
+#: ../pidgin/gtkblist.c:3600
+#: ../pidgin/gtkblist.c:3633
 msgid "/Buddies/Join a Chat..."
 msgstr "/Vennar/Gå inn i eit prater_om…"
 
-#: ../pidgin/gtkblist.c:3591
+#: ../pidgin/gtkblist.c:3601
 msgid "/Buddies/Get User Info..."
 msgstr "/Vennar/Hent brukar_informasjon…"
 
-#: ../pidgin/gtkblist.c:3592
+#: ../pidgin/gtkblist.c:3602
 msgid "/Buddies/Add Buddy..."
 msgstr "/Vennar/Legg til venn…"
 
-#: ../pidgin/gtkblist.c:3593
-#: ../pidgin/gtkblist.c:3626
+#: ../pidgin/gtkblist.c:3603
+#: ../pidgin/gtkblist.c:3636
 msgid "/Buddies/Add Chat..."
 msgstr "/Vennar/Legg til _praterom…"
 
-#: ../pidgin/gtkblist.c:3594
+#: ../pidgin/gtkblist.c:3604
 msgid "/Buddies/Add Group..."
 msgstr "/Vennar/Legg til gruppe…"
 
-#: ../pidgin/gtkblist.c:3629
+#: ../pidgin/gtkblist.c:3639
 msgid "/Tools/Privacy"
 msgstr "/Verktøy/Personvern"
 
-#: ../pidgin/gtkblist.c:3632
+#: ../pidgin/gtkblist.c:3642
 msgid "/Tools/Room List"
 msgstr "/Verktøy/Romliste"
 
 #
-#: ../pidgin/gtkblist.c:3729
+#: ../pidgin/gtkblist.c:3739
 #: ../pidgin/gtkdocklet.c:153
 #, c-format
 msgid "%d unread message from %s\n"
@@ -12340,55 +12684,55 @@
 msgstr[0] "%d unread message from %s\n"
 msgstr[1] "%d ulesne meldingar frå %s\n"
 
-#: ../pidgin/gtkblist.c:3809
+#: ../pidgin/gtkblist.c:3819
 msgid "Manually"
 msgstr "Manuelt"
 
-#: ../pidgin/gtkblist.c:3811
+#: ../pidgin/gtkblist.c:3821
 msgid "Alphabetically"
 msgstr "Alfabetisk "
 
-#: ../pidgin/gtkblist.c:3812
+#: ../pidgin/gtkblist.c:3822
 msgid "By status"
 msgstr "Etter status"
 
-#: ../pidgin/gtkblist.c:3813
+#: ../pidgin/gtkblist.c:3823
 msgid "By log size"
 msgstr "Etter loggstorleiken"
 
-#: ../pidgin/gtkblist.c:4018
+#: ../pidgin/gtkblist.c:4028
 #: ../pidgin/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "%s fråkopla"
 
-#: ../pidgin/gtkblist.c:4028
+#: ../pidgin/gtkblist.c:4038
 msgid "Re-enable Account"
 msgstr "Ta kontoen i bruk att "
 
-#: ../pidgin/gtkblist.c:4054
+#: ../pidgin/gtkblist.c:4064
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s fråkopla: %s</span>"
 
-#: ../pidgin/gtkblist.c:4206
+#: ../pidgin/gtkblist.c:4216
 msgid "<b>Username:</b>"
 msgstr "<b>Brukarnamn:</b>"
 
-#: ../pidgin/gtkblist.c:4213
+#: ../pidgin/gtkblist.c:4223
 msgid "<b>Password:</b>"
 msgstr "<b>Passord:</b>"
 
-#: ../pidgin/gtkblist.c:4224
+#: ../pidgin/gtkblist.c:4234
 msgid "_Login"
 msgstr "_Innlogging"
 
-#: ../pidgin/gtkblist.c:4307
+#: ../pidgin/gtkblist.c:4317
 msgid "/Accounts"
 msgstr "/Kontoar"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4321
+#: ../pidgin/gtkblist.c:4331
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -12402,82 +12746,86 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4570
-msgid "/Buddies/Show Offline Buddies"
-msgstr "/Vennar/Vis fråkopla vennar"
-
-#: ../pidgin/gtkblist.c:4573
-msgid "/Buddies/Show Empty Groups"
-msgstr "/vennar/Vis tomme grupper"
-
-#: ../pidgin/gtkblist.c:4579
-msgid "/Buddies/Show Buddy Details"
-msgstr "/Vennar/Vis vennedetaljar"
-
-#: ../pidgin/gtkblist.c:4582
-msgid "/Buddies/Show Idle Times"
-msgstr "/Vennar/Vis uverksam tid"
-
-#: ../pidgin/gtkblist.c:5459
+#: ../pidgin/gtkblist.c:4594
+msgid "/Buddies/Show/Offline Buddies"
+msgstr "/Vennar/Vis/Fråkopla vennar"
+
+#: ../pidgin/gtkblist.c:4597
+msgid "/Buddies/Show/Empty Groups"
+msgstr "/Vennar/Vis/Tomme grupper"
+
+#: ../pidgin/gtkblist.c:4603
+msgid "/Buddies/Show/Buddy Details"
+msgstr "/Vennar/Vis/Vennedetaljar"
+
+#: ../pidgin/gtkblist.c:4606
+msgid "/Buddies/Show/Idle Times"
+msgstr "/Vennar/Vis/Uverksam tid"
+
+#: ../pidgin/gtkblist.c:4609
+msgid "/Buddies/Show/Protocol Icons"
+msgstr "/Vennar/Vis/Protokollikon"
+
+#: ../pidgin/gtkblist.c:5501
 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"
 
 #. End of account box
-#: ../pidgin/gtkblist.c:5494
+#: ../pidgin/gtkblist.c:5536
 msgid "_Screen name:"
 msgstr "Brukar_namn:"
 
-#: ../pidgin/gtkblist.c:5516
-#: ../pidgin/gtkblist.c:5869
+#: ../pidgin/gtkblist.c:5558
+#: ../pidgin/gtkblist.c:5911
 msgid "A_lias:"
 msgstr "Al_ias:"
 
-#: ../pidgin/gtkblist.c:5781
+#: ../pidgin/gtkblist.c:5823
 msgid "This protocol does not support chat rooms."
 msgstr "Protokollen støttar ikkje praterom."
 
-#: ../pidgin/gtkblist.c:5797
+#: ../pidgin/gtkblist.c:5839
 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:5838
+#: ../pidgin/gtkblist.c:5880
 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:5926
+#: ../pidgin/gtkblist.c:5968
 msgid "Please enter the name of the group to be added."
 msgstr "Skriv inn namnet på gruppa du ønskjer å leggja til."
 
-#: ../pidgin/gtkblist.c:6566
+#: ../pidgin/gtkblist.c:6609
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Kontoar/"
 
-#: ../pidgin/gtkblist.c:6590
+#: ../pidgin/gtkblist.c:6633
 msgid "_Edit Account"
 msgstr "_Endra konto"
 
-#: ../pidgin/gtkblist.c:6603
-#: ../pidgin/gtkconv.c:3014
+#: ../pidgin/gtkblist.c:6646
+#: ../pidgin/gtkconv.c:3053
 msgid "No actions available"
 msgstr "Ingen tilgjengelege handlingar"
 
-#: ../pidgin/gtkblist.c:6611
+#: ../pidgin/gtkblist.c:6654
 msgid "_Disable"
 msgstr "_Slå av"
 
-#: ../pidgin/gtkblist.c:6623
+#: ../pidgin/gtkblist.c:6666
 msgid "Enable Account"
 msgstr "Ta konto i bruk"
 
-#: ../pidgin/gtkblist.c:6629
+#: ../pidgin/gtkblist.c:6672
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/Kontoar/Ta i bruk konto"
 
-#: ../pidgin/gtkblist.c:6678
+#: ../pidgin/gtkblist.c:6721
 msgid "/Tools"
 msgstr "/V_erktøy"
 
-#: ../pidgin/gtkblist.c:6748
+#: ../pidgin/gtkblist.c:6791
 msgid "/Buddies/Sort Buddies"
 msgstr "/Vennar/Sorter vennar"
 
@@ -12492,224 +12840,220 @@
 "\n"
 "%s vil ikkje prøva å kopla kontoen til att før du rettar feilen og slår på kontoen."
 
-#: ../pidgin/gtkconv.c:487
+#: ../pidgin/gtkconv.c:462
 msgid "Unknown command."
 msgstr "Ukjend kommando."
 
-#: ../pidgin/gtkconv.c:759
-#: ../pidgin/gtkconv.c:785
+#: ../pidgin/gtkconv.c:734
+#: ../pidgin/gtkconv.c:760
 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:779
+#: ../pidgin/gtkconv.c:754
 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:832
+#: ../pidgin/gtkconv.c:807
 msgid "Invite Buddy Into Chat Room"
 msgstr "Inviter venn til praterommet"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:862
+#: ../pidgin/gtkconv.c:837
 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:883
+#: ../pidgin/gtkconv.c:858
 msgid "_Buddy:"
 msgstr "_Venn:"
 
-#: ../pidgin/gtkconv.c:903
+#: ../pidgin/gtkconv.c:878
 #: ../pidgin/gtksavedstatuses.c:1193
-#: ../pidgin/gtksavedstatuses.c:1525
+#: ../pidgin/gtksavedstatuses.c:1527
 msgid "_Message:"
 msgstr "_Melding:"
 
-#: ../pidgin/gtkconv.c:960
-#: ../pidgin/gtkconv.c:2521
+#: ../pidgin/gtkconv.c:935
+#: ../pidgin/gtkconv.c:2576
 #: ../pidgin/gtkdebug.c:218
 #: ../pidgin/gtkft.c:542
 msgid "Unable to open file."
 msgstr "Klarte ikkje å opna fila."
 
-#: ../pidgin/gtkconv.c:966
+#: ../pidgin/gtkconv.c:941
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Samtale med %s</h1>\n"
 
-#: ../pidgin/gtkconv.c:1002
+#: ../pidgin/gtkconv.c:977
 msgid "Save Conversation"
 msgstr "Lagra samtale"
 
-#: ../pidgin/gtkconv.c:1151
+#: ../pidgin/gtkconv.c:1126
 #: ../pidgin/gtkdebug.c:166
 #: ../pidgin/gtkdebug.c:742
 msgid "Find"
 msgstr "Finn"
 
-#: ../pidgin/gtkconv.c:1177
+#: ../pidgin/gtkconv.c:1152
 #: ../pidgin/gtkdebug.c:194
 msgid "_Search for:"
 msgstr "S_øk etter:"
 
-#: ../pidgin/gtkconv.c:1360
-msgid "Logging started. Future messages in this conversation will be logged."
-msgstr "Logginga er starta. Framtidige meldingar i denne samtala vil bli logga."
-
-#: ../pidgin/gtkconv.c:1368
-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."
-
-#: ../pidgin/gtkconv.c:1616
+#: ../pidgin/gtkconv.c:1602
 msgid "Un-Ignore"
 msgstr "Avblokker"
 
-#: ../pidgin/gtkconv.c:1619
+#: ../pidgin/gtkconv.c:1605
 msgid "Ignore"
 msgstr "Blokker"
 
-#: ../pidgin/gtkconv.c:1639
+#: ../pidgin/gtkconv.c:1625
 msgid "Get Away Message"
 msgstr "Hent fråværsmelding"
 
-#: ../pidgin/gtkconv.c:1662
+#: ../pidgin/gtkconv.c:1648
 msgid "Last said"
 msgstr "Sist sagt"
 
-#: ../pidgin/gtkconv.c:2529
+#: ../pidgin/gtkconv.c:2584
 msgid "Unable to save icon file to disk."
 msgstr "Klarte ikkje å lagra ikonet."
 
-#: ../pidgin/gtkconv.c:2580
+#: ../pidgin/gtkconv.c:2635
 msgid "Save Icon"
 msgstr "Lagra ikon"
 
-#: ../pidgin/gtkconv.c:2632
+#: ../pidgin/gtkconv.c:2687
 msgid "Animate"
 msgstr "Animer"
 
-#: ../pidgin/gtkconv.c:2637
+#: ../pidgin/gtkconv.c:2692
 msgid "Hide Icon"
 msgstr "Skjul ikon"
 
-#: ../pidgin/gtkconv.c:2640
+#: ../pidgin/gtkconv.c:2695
 msgid "Save Icon As..."
 msgstr "Lagra ikon som…"
 
-#: ../pidgin/gtkconv.c:2644
+#: ../pidgin/gtkconv.c:2699
 msgid "Set Custom Icon..."
 msgstr "Bruk eige ikon…"
 
-#: ../pidgin/gtkconv.c:2657
+#: ../pidgin/gtkconv.c:2712
 msgid "Remove Custom Icon"
 msgstr "Fjern eige ikon"
 
+#: ../pidgin/gtkconv.c:2839
+msgid "Show All"
+msgstr "Vis alt"
+
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2799
+#: ../pidgin/gtkconv.c:2858
 msgid "/_Conversation"
 msgstr "/_Samtale"
 
-#: ../pidgin/gtkconv.c:2801
+#: ../pidgin/gtkconv.c:2860
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Samtale/_Ny lynmelding…"
 
-#: ../pidgin/gtkconv.c:2806
+#: ../pidgin/gtkconv.c:2865
 msgid "/Conversation/_Find..."
 msgstr "/Samtale/_Finn…"
 
-#: ../pidgin/gtkconv.c:2808
+#: ../pidgin/gtkconv.c:2867
 msgid "/Conversation/View _Log"
 msgstr "/Samtale/Vis l_ogg"
 
-#: ../pidgin/gtkconv.c:2809
+#: ../pidgin/gtkconv.c:2868
 msgid "/Conversation/_Save As..."
 msgstr "/Samtale/Lagra _som…"
 
-#: ../pidgin/gtkconv.c:2811
+#: ../pidgin/gtkconv.c:2870
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Samtale/T_øm skjermen"
 
-#: ../pidgin/gtkconv.c:2815
+#: ../pidgin/gtkconv.c:2874
 msgid "/Conversation/Se_nd File..."
 msgstr "/Samtale/S_end fil…"
 
-#: ../pidgin/gtkconv.c:2816
+#: ../pidgin/gtkconv.c:2875
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Samtale/Legg til _vennevarsling…"
 
-#: ../pidgin/gtkconv.c:2818
+#: ../pidgin/gtkconv.c:2877
 msgid "/Conversation/_Get Info"
 msgstr "/Samtale/Hent info_rmasjon"
 
-#: ../pidgin/gtkconv.c:2820
+#: ../pidgin/gtkconv.c:2879
 msgid "/Conversation/In_vite..."
 msgstr "/Samtale/_Inviter…"
 
-#: ../pidgin/gtkconv.c:2822
+#: ../pidgin/gtkconv.c:2881
 msgid "/Conversation/M_ore"
 msgstr "/Samtale/_Meir"
 
-#: ../pidgin/gtkconv.c:2826
+#: ../pidgin/gtkconv.c:2885
 msgid "/Conversation/Al_ias..."
 msgstr "/Samtale/_Kallenamn…"
 
-#: ../pidgin/gtkconv.c:2828
+#: ../pidgin/gtkconv.c:2887
 msgid "/Conversation/_Block..."
 msgstr "/Samtale/_Blokker…"
 
-#: ../pidgin/gtkconv.c:2830
+#: ../pidgin/gtkconv.c:2889
 msgid "/Conversation/_Unblock..."
 msgstr "/Samtale/_Avblokker…"
 
-#: ../pidgin/gtkconv.c:2832
+#: ../pidgin/gtkconv.c:2891
 msgid "/Conversation/_Add..."
 msgstr "/Samtale/Legg _til…"
 
-#: ../pidgin/gtkconv.c:2834
+#: ../pidgin/gtkconv.c:2893
 msgid "/Conversation/_Remove..."
 msgstr "/Samtale/F_jern…"
 
-#: ../pidgin/gtkconv.c:2839
+#: ../pidgin/gtkconv.c:2898
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Samtale/Set inn _lenkje…"
 
-#: ../pidgin/gtkconv.c:2841
+#: ../pidgin/gtkconv.c:2900
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Samtale/Set inn _bilete…"
 
-#: ../pidgin/gtkconv.c:2847
+#: ../pidgin/gtkconv.c:2906
+msgid "/Conversation/_Hide"
+msgstr "/Samtale/Skj_ul"
+
+#: ../pidgin/gtkconv.c:2908
 msgid "/Conversation/_Close"
 msgstr "/Samtale/L_ukk"
 
 #. Options
-#: ../pidgin/gtkconv.c:2851
+#: ../pidgin/gtkconv.c:2912
 msgid "/_Options"
 msgstr "/_Val"
 
-#: ../pidgin/gtkconv.c:2852
+#: ../pidgin/gtkconv.c:2913
 msgid "/Options/Enable _Logging"
 msgstr "/Val/Bruk l_ogging"
 
-#: ../pidgin/gtkconv.c:2853
+#: ../pidgin/gtkconv.c:2914
 msgid "/Options/Enable _Sounds"
 msgstr "/Val/Bruk _lydar"
 
-#: ../pidgin/gtkconv.c:2854
-msgid "/Options/Show Buddy _Icon"
-msgstr "/Val/Vis venne_ikon"
-
-#: ../pidgin/gtkconv.c:2856
+#: ../pidgin/gtkconv.c:2916
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Val/Vis _formateringsverktøya"
 
-#: ../pidgin/gtkconv.c:2857
+#: ../pidgin/gtkconv.c:2917
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Val/Vis _tidsstempel"
 
-#: ../pidgin/gtkconv.c:3002
+#: ../pidgin/gtkconv.c:3041
 msgid "/Conversation/More"
 msgstr "/Samtale/Meir"
 
-#: ../pidgin/gtkconv.c:3058
+#: ../pidgin/gtkconv.c:3097
 msgid "/Options"
 msgstr "/Val"
 
@@ -12718,183 +13062,179 @@
 #. 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:3093
-#: ../pidgin/gtkconv.c:3125
+#: ../pidgin/gtkconv.c:3132
+#: ../pidgin/gtkconv.c:3164
 msgid "/Conversation"
 msgstr "/Samtale"
 
-#: ../pidgin/gtkconv.c:3133
+#: ../pidgin/gtkconv.c:3172
 msgid "/Conversation/View Log"
 msgstr "/Samtale/Vis logg"
 
-#: ../pidgin/gtkconv.c:3139
+#: ../pidgin/gtkconv.c:3178
 msgid "/Conversation/Send File..."
 msgstr "/Samtale/Send fil…"
 
-#: ../pidgin/gtkconv.c:3143
+#: ../pidgin/gtkconv.c:3182
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Samtale/Legg til vennevarsling…"
 
-#: ../pidgin/gtkconv.c:3149
+#: ../pidgin/gtkconv.c:3188
 msgid "/Conversation/Get Info"
 msgstr "/Samtale/Hent info"
 
-#: ../pidgin/gtkconv.c:3153
+#: ../pidgin/gtkconv.c:3192
 msgid "/Conversation/Invite..."
 msgstr "/Samtale/Inviter…"
 
-#: ../pidgin/gtkconv.c:3159
+#: ../pidgin/gtkconv.c:3198
 msgid "/Conversation/Alias..."
 msgstr "/Samtale/Kallenamn…"
 
-#: ../pidgin/gtkconv.c:3163
+#: ../pidgin/gtkconv.c:3202
 msgid "/Conversation/Block..."
 msgstr "/Samtale/Blokker…"
 
-#: ../pidgin/gtkconv.c:3167
+#: ../pidgin/gtkconv.c:3206
 msgid "/Conversation/Unblock..."
 msgstr "/Samtale/Avblokker…"
 
-#: ../pidgin/gtkconv.c:3171
+#: ../pidgin/gtkconv.c:3210
 msgid "/Conversation/Add..."
 msgstr "/Samtale/Legg til…"
 
-#: ../pidgin/gtkconv.c:3175
+#: ../pidgin/gtkconv.c:3214
 msgid "/Conversation/Remove..."
 msgstr "/Samtale/Fjern…"
 
-#: ../pidgin/gtkconv.c:3181
+#: ../pidgin/gtkconv.c:3220
 msgid "/Conversation/Insert Link..."
 msgstr "/Samtale/Set inn lenkje…"
 
-#: ../pidgin/gtkconv.c:3185
+#: ../pidgin/gtkconv.c:3224
 msgid "/Conversation/Insert Image..."
 msgstr "/Samtale/Set inn _bilete…"
 
-#: ../pidgin/gtkconv.c:3191
+#: ../pidgin/gtkconv.c:3230
 msgid "/Options/Enable Logging"
 msgstr "/Val/Skru på logging"
 
-#: ../pidgin/gtkconv.c:3194
+#: ../pidgin/gtkconv.c:3233
 msgid "/Options/Enable Sounds"
 msgstr "/Vis/Skru på lyd"
 
-#: ../pidgin/gtkconv.c:3207
+#: ../pidgin/gtkconv.c:3246
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Val/Vis formateringsverktøya"
 
-#: ../pidgin/gtkconv.c:3210
+#: ../pidgin/gtkconv.c:3249
 msgid "/Options/Show Timestamps"
 msgstr "/Val/Vis tidsstempel"
 
-#: ../pidgin/gtkconv.c:3213
-msgid "/Options/Show Buddy Icon"
-msgstr "/Val/Vis venne_ikon"
-
-#: ../pidgin/gtkconv.c:3297
-#: ../pidgin/gtkconv.c:3339
+#: ../pidgin/gtkconv.c:3326
+#: ../pidgin/gtkconv.c:3368
 msgid "User is typing..."
 msgstr "Brukaren skriv…"
 
-#: ../pidgin/gtkconv.c:3342
+#: ../pidgin/gtkconv.c:3371
 msgid "User has typed something and stopped"
 msgstr "Brukaren har skrive noko og stoppa"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3525
-#: ../pidgin/gtkconv.c:7784
+#: ../pidgin/gtkconv.c:3554
+#: ../pidgin/gtkconv.c:7997
 msgid "_Send To"
 msgstr "Sen_d som"
 
-#: ../pidgin/gtkconv.c:4239
+#: ../pidgin/gtkconv.c:4267
 msgid "_Send"
 msgstr "_Send"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4343
+#: ../pidgin/gtkconv.c:4371
 msgid "0 people in room"
 msgstr "0 personar i rommet"
 
-#: ../pidgin/gtkconv.c:5609
-#: ../pidgin/gtkconv.c:5730
+#: ../pidgin/gtkconv.c:5739
+#: ../pidgin/gtkconv.c:5860
 #, 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:6338
+#: ../pidgin/gtkconv.c:6461
 #: ../pidgin/gtkstatusbox.c:659
 msgid "Typing"
 msgstr "Skriv"
 
-#: ../pidgin/gtkconv.c:6342
+#: ../pidgin/gtkconv.c:6465
 msgid "Stopped Typing"
 msgstr "Stoppa å skriva"
 
-#: ../pidgin/gtkconv.c:6345
+#: ../pidgin/gtkconv.c:6468
 msgid "Nick Said"
 msgstr "Kallenamnet sa"
 
-#: ../pidgin/gtkconv.c:6348
+#: ../pidgin/gtkconv.c:6471
 #: ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr "Ulesne meldingar"
 
-#: ../pidgin/gtkconv.c:6351
+#: ../pidgin/gtkconv.c:6474
 msgid "New Event"
 msgstr "Ny hending"
 
-#: ../pidgin/gtkconv.c:7355
+#: ../pidgin/gtkconv.c:7547
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "clear: Tømmer skjermen."
 
-#: ../pidgin/gtkconv.c:7519
+#: ../pidgin/gtkconv.c:7711
 msgid "Confirm close"
 msgstr "Stadfest lukking"
 
-#: ../pidgin/gtkconv.c:7551
+#: ../pidgin/gtkconv.c:7743
 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:8111
+#: ../pidgin/gtkconv.c:8330
 msgid "Close other tabs"
 msgstr "Lukk andre faner"
 
-#: ../pidgin/gtkconv.c:8117
+#: ../pidgin/gtkconv.c:8336
 msgid "Close all tabs"
 msgstr "Lukk alle fanene"
 
-#: ../pidgin/gtkconv.c:8125
+#: ../pidgin/gtkconv.c:8344
 msgid "Detach this tab"
 msgstr "Kopla frå denne fana"
 
-#: ../pidgin/gtkconv.c:8131
+#: ../pidgin/gtkconv.c:8350
 msgid "Close this tab"
 msgstr "Lukk denne fana"
 
-#: ../pidgin/gtkconv.c:8609
+#: ../pidgin/gtkconv.c:8850
 msgid "Close conversation"
 msgstr "Lukk samtala"
 
-#: ../pidgin/gtkconv.c:9209
+#: ../pidgin/gtkconv.c:9449
 msgid "Last created window"
 msgstr "Siste opna vindauge"
 
-#: ../pidgin/gtkconv.c:9211
+#: ../pidgin/gtkconv.c:9451
 msgid "Separate IM and Chat windows"
 msgstr "Skilde lynmeldings- og samtalevindauge"
 
-#: ../pidgin/gtkconv.c:9213
-#: ../pidgin/gtkprefs.c:1412
+#: ../pidgin/gtkconv.c:9453
+#: ../pidgin/gtkprefs.c:1414
 msgid "New window"
 msgstr "Nytt vindauge"
 
-#: ../pidgin/gtkconv.c:9215
+#: ../pidgin/gtkconv.c:9455
 msgid "By group"
 msgstr "Etter gruppe"
 
-#: ../pidgin/gtkconv.c:9217
+#: ../pidgin/gtkconv.c:9457
 msgid "By account"
 msgstr "Etter konto"
 
@@ -12960,7 +13300,7 @@
 msgstr "Alvorleg feil"
 
 #: ../pidgin/gtkdialogs.c:71
-#: ../pidgin/gtkdialogs.c:113
+#: ../pidgin/gtkdialogs.c:117
 msgid "lead developer"
 msgstr "sjefsutviklar"
 
@@ -12979,8 +13319,8 @@
 #: ../pidgin/gtkdialogs.c:84
 #: ../pidgin/gtkdialogs.c:85
 #: ../pidgin/gtkdialogs.c:88
-#: ../pidgin/gtkdialogs.c:89
 #: ../pidgin/gtkdialogs.c:90
+#: ../pidgin/gtkdialogs.c:91
 msgid "developer"
 msgstr "utviklar"
 
@@ -12992,506 +13332,514 @@
 msgid "support/QA"
 msgstr "brukarstøtte/KS"
 
-#: ../pidgin/gtkdialogs.c:104
-msgid "win32 port"
-msgstr "win32-port"
-
-#: ../pidgin/gtkdialogs.c:105
-#: ../pidgin/gtkdialogs.c:106
-msgid "maintainer"
-msgstr "ansvarleg"
-
-#: ../pidgin/gtkdialogs.c:107
-msgid "libfaim maintainer"
-msgstr "libfaim-ansvarleg"
+#: ../pidgin/gtkdialogs.c:89
+#: ../pidgin/gtkdialogs.c:112
+msgid "developer & webmaster"
+msgstr "utviklar og nettansvarleg"
+
+#: ../pidgin/gtkdialogs.c:99
+msgid "Senior Contributor/QA"
+msgstr "Senior bidragsytar/KS"
 
 #: ../pidgin/gtkdialogs.c:108
-msgid "developer & webmaster"
-msgstr "utviklar og nettansvarleg"
+msgid "win32 port"
+msgstr "win32-port"
+
+#: ../pidgin/gtkdialogs.c:109
+#: ../pidgin/gtkdialogs.c:110
+msgid "maintainer"
+msgstr "ansvarleg"
+
+#: ../pidgin/gtkdialogs.c:111
+msgid "libfaim maintainer"
+msgstr "libfaim-ansvarleg"
 
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../pidgin/gtkdialogs.c:110
+#: ../pidgin/gtkdialogs.c:114
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hackar og fast sjåfør [sofatryne]"
 
-#: ../pidgin/gtkdialogs.c:111
+#: ../pidgin/gtkdialogs.c:115
 msgid "XMPP developer"
 msgstr "XMPP-utviklar"
 
-#: ../pidgin/gtkdialogs.c:112
+#: ../pidgin/gtkdialogs.c:116
 msgid "original author"
 msgstr "opprinneleg laga av"
 
-#: ../pidgin/gtkdialogs.c:128
+#: ../pidgin/gtkdialogs.c:132
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
-#: ../pidgin/gtkdialogs.c:129
+#: ../pidgin/gtkdialogs.c:133
 msgid "Arabic"
 msgstr "Arabisk"
 
-#: ../pidgin/gtkdialogs.c:130
-#: ../pidgin/gtkdialogs.c:131
-#: ../pidgin/gtkdialogs.c:218
+#: ../pidgin/gtkdialogs.c:134
+#: ../pidgin/gtkdialogs.c:135
+#: ../pidgin/gtkdialogs.c:222
 msgid "Bulgarian"
 msgstr "Bulgarsk"
 
-#: ../pidgin/gtkdialogs.c:132
-#: ../pidgin/gtkdialogs.c:133
-#: ../pidgin/gtkdialogs.c:134
-#: ../pidgin/gtkdialogs.c:135
+#: ../pidgin/gtkdialogs.c:136
+#: ../pidgin/gtkdialogs.c:137
+#: ../pidgin/gtkdialogs.c:138
+#: ../pidgin/gtkdialogs.c:139
 msgid "Bengali"
 msgstr "Bengali"
 
-#: ../pidgin/gtkdialogs.c:136
+#: ../pidgin/gtkdialogs.c:140
 msgid "Bosnian"
 msgstr "Bosnisk"
 
-#: ../pidgin/gtkdialogs.c:137
-#: ../pidgin/gtkdialogs.c:219
-#: ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:141
+#: ../pidgin/gtkdialogs.c:223
+#: ../pidgin/gtkdialogs.c:224
 msgid "Catalan"
 msgstr "Katalansk"
 
 # Valensiansk er *ikkje* katalansk, men eit eige språk i den katalanske språkfamilen. Molt important!
-#: ../pidgin/gtkdialogs.c:138
-#: ../pidgin/gtkdialogs.c:139
+#: ../pidgin/gtkdialogs.c:142
+#: ../pidgin/gtkdialogs.c:143
 msgid "Valencian-Catalan"
 msgstr "Valensiansk"
 
-#: ../pidgin/gtkdialogs.c:140
-#: ../pidgin/gtkdialogs.c:221
+#: ../pidgin/gtkdialogs.c:144
+#: ../pidgin/gtkdialogs.c:225
 msgid "Czech"
 msgstr "Tsjekkisk"
 
-#: ../pidgin/gtkdialogs.c:141
-#: ../pidgin/gtkdialogs.c:142
-msgid "Danish"
-msgstr "Dansk"
-
-#: ../pidgin/gtkdialogs.c:143
-#: ../pidgin/gtkdialogs.c:144
-#: ../pidgin/gtkdialogs.c:222
-msgid "German"
-msgstr "Tysk"
-
 #: ../pidgin/gtkdialogs.c:145
 #: ../pidgin/gtkdialogs.c:146
+msgid "Danish"
+msgstr "Dansk"
+
 #: ../pidgin/gtkdialogs.c:147
+#: ../pidgin/gtkdialogs.c:148
+#: ../pidgin/gtkdialogs.c:226
+msgid "German"
+msgstr "Tysk"
+
+#: ../pidgin/gtkdialogs.c:149
+#: ../pidgin/gtkdialogs.c:150
+#: ../pidgin/gtkdialogs.c:151
 msgid "Dzongkha"
 msgstr "Dzongkha"
 
-#: ../pidgin/gtkdialogs.c:148
-#: ../pidgin/gtkdialogs.c:149
+#: ../pidgin/gtkdialogs.c:152
+#: ../pidgin/gtkdialogs.c:153
 msgid "Greek"
 msgstr "Gresk"
 
-#: ../pidgin/gtkdialogs.c:150
-msgid "Australian English"
-msgstr "Australsk-engelsk"
-
-#: ../pidgin/gtkdialogs.c:151
-msgid "Canadian English"
-msgstr "Kanadisk-engelsk"
-
-#: ../pidgin/gtkdialogs.c:152
-msgid "British English"
-msgstr "Britisk-engelsk"
-
-#: ../pidgin/gtkdialogs.c:153
-msgid "Esperanto"
-msgstr "Esperanto"
-
 #: ../pidgin/gtkdialogs.c:154
-#: ../pidgin/gtkdialogs.c:223
-#: ../pidgin/gtkdialogs.c:224
-#: ../pidgin/gtkdialogs.c:225
-#: ../pidgin/gtkdialogs.c:226
-msgid "Spanish"
-msgstr "Spansk"
+msgid "Australian English"
+msgstr "Australsk-engelsk"
 
 #: ../pidgin/gtkdialogs.c:155
+msgid "Canadian English"
+msgstr "Kanadisk-engelsk"
+
 #: ../pidgin/gtkdialogs.c:156
-msgid "Euskera(Basque)"
-msgstr "Baskisk"
+msgid "British English"
+msgstr "Britisk-engelsk"
 
 #: ../pidgin/gtkdialogs.c:157
+msgid "Esperanto"
+msgstr "Esperanto"
+
 #: ../pidgin/gtkdialogs.c:158
-#: ../pidgin/gtkdialogs.c:159
-msgid "Persian"
-msgstr "Persisk"
-
-#: ../pidgin/gtkdialogs.c:160
 #: ../pidgin/gtkdialogs.c:227
 #: ../pidgin/gtkdialogs.c:228
-msgid "Finnish"
-msgstr "Finsk"
-
-#: ../pidgin/gtkdialogs.c:161
 #: ../pidgin/gtkdialogs.c:229
 #: ../pidgin/gtkdialogs.c:230
-#: ../pidgin/gtkdialogs.c:231
-#: ../pidgin/gtkdialogs.c:232
-msgid "French"
-msgstr "Fransk"
+msgid "Spanish"
+msgstr "Spansk"
+
+#: ../pidgin/gtkdialogs.c:159
+msgid "Estonian"
+msgstr "Estisk"
+
+#: ../pidgin/gtkdialogs.c:160
+#: ../pidgin/gtkdialogs.c:161
+msgid "Euskera(Basque)"
+msgstr "Baskisk"
 
 #: ../pidgin/gtkdialogs.c:162
 #: ../pidgin/gtkdialogs.c:163
-msgid "Galician"
-msgstr "Galisisk"
-
 #: ../pidgin/gtkdialogs.c:164
-#: ../pidgin/gtkdialogs.c:165
-msgid "Gujarati"
-msgstr "Gujarati"
+msgid "Persian"
+msgstr "Persisk"
 
 #: ../pidgin/gtkdialogs.c:165
-msgid "Gujarati Language Team"
-msgstr "Gujarati-språkgruppa"
+#: ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:232
+msgid "Finnish"
+msgstr "Finsk"
 
 #: ../pidgin/gtkdialogs.c:166
 #: ../pidgin/gtkdialogs.c:233
-msgid "Hebrew"
-msgstr "Hebraisk"
+#: ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:236
+msgid "French"
+msgstr "Fransk"
 
 #: ../pidgin/gtkdialogs.c:167
-msgid "Hindi"
-msgstr "Hindi"
-
 #: ../pidgin/gtkdialogs.c:168
-msgid "Hungarian"
-msgstr "Ungarsk"
+#: ../pidgin/gtkdialogs.c:237
+msgid "Galician"
+msgstr "Galisisk"
 
 #: ../pidgin/gtkdialogs.c:169
-msgid "Indonesian"
-msgstr "Indonesisk"
+#: ../pidgin/gtkdialogs.c:170
+msgid "Gujarati"
+msgstr "Gujarati"
 
 #: ../pidgin/gtkdialogs.c:170
-#: ../pidgin/gtkdialogs.c:234
-msgid "Italian"
-msgstr "Italiensk"
+msgid "Gujarati Language Team"
+msgstr "Gujarati-språkgruppa"
 
 #: ../pidgin/gtkdialogs.c:171
-#: ../pidgin/gtkdialogs.c:235
-#: ../pidgin/gtkdialogs.c:236
-#: ../pidgin/gtkdialogs.c:237
-msgid "Japanese"
-msgstr "Japansk"
-
-#: ../pidgin/gtkdialogs.c:172
 #: ../pidgin/gtkdialogs.c:238
-msgid "Georgian"
-msgstr "Georgisk"
+msgid "Hebrew"
+msgstr "Hebraisk"
 
 #: ../pidgin/gtkdialogs.c:172
+msgid "Hindi"
+msgstr "Hindi"
+
+#: ../pidgin/gtkdialogs.c:173
+msgid "Hungarian"
+msgstr "Ungarsk"
+
+#: ../pidgin/gtkdialogs.c:174
+msgid "Indonesian"
+msgstr "Indonesisk"
+
+#: ../pidgin/gtkdialogs.c:175
+#: ../pidgin/gtkdialogs.c:239
+msgid "Italian"
+msgstr "Italiensk"
+
+#: ../pidgin/gtkdialogs.c:176
+#: ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:241
+#: ../pidgin/gtkdialogs.c:242
+msgid "Japanese"
+msgstr "Japansk"
+
+#: ../pidgin/gtkdialogs.c:177
+#: ../pidgin/gtkdialogs.c:243
+msgid "Georgian"
+msgstr "Georgisk"
+
+#: ../pidgin/gtkdialogs.c:177
 msgid "Ubuntu Georgian Translators"
 msgstr "Ubuntu georgisk-omsetjarar"
 
-#: ../pidgin/gtkdialogs.c:173
+#: ../pidgin/gtkdialogs.c:178
 msgid "Kannada"
 msgstr "Kannada"
 
-#: ../pidgin/gtkdialogs.c:173
+#: ../pidgin/gtkdialogs.c:178
 msgid "Kannada Translation team"
 msgstr "Kannada-språkgruppa"
 
-#: ../pidgin/gtkdialogs.c:174
-#: ../pidgin/gtkdialogs.c:239
-#: ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:179
+#: ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:245
 msgid "Korean"
 msgstr "Koreansk"
 
-#: ../pidgin/gtkdialogs.c:175
-#: ../pidgin/gtkdialogs.c:176
-#: ../pidgin/gtkdialogs.c:177
+#: ../pidgin/gtkdialogs.c:180
+#: ../pidgin/gtkdialogs.c:181
+#: ../pidgin/gtkdialogs.c:182
 msgid "Kurdish"
 msgstr "Kurdisk"
 
-#: ../pidgin/gtkdialogs.c:178
-#: ../pidgin/gtkdialogs.c:241
-#: ../pidgin/gtkdialogs.c:242
+#: ../pidgin/gtkdialogs.c:183
+#: ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:247
 msgid "Lithuanian"
 msgstr "Litauisk"
 
-#: ../pidgin/gtkdialogs.c:179
-#: ../pidgin/gtkdialogs.c:180
-#: ../pidgin/gtkdialogs.c:243
+#: ../pidgin/gtkdialogs.c:184
+#: ../pidgin/gtkdialogs.c:185
+#: ../pidgin/gtkdialogs.c:248
 msgid "Macedonian"
 msgstr "Makedonsk"
 
-#: ../pidgin/gtkdialogs.c:181
+#: ../pidgin/gtkdialogs.c:186
+#: ../pidgin/gtkdialogs.c:249
 msgid "Bokmål Norwegian"
 msgstr "Norsk bokmål"
 
-#: ../pidgin/gtkdialogs.c:182
+#: ../pidgin/gtkdialogs.c:187
 msgid "Nepali"
 msgstr "Nepali"
 
-#: ../pidgin/gtkdialogs.c:183
+#: ../pidgin/gtkdialogs.c:188
 msgid "Dutch, Flemish"
 msgstr "Nederlandsk, flamsk"
 
-#: ../pidgin/gtkdialogs.c:184
-msgid "Norwegian"
-msgstr "Norsk"
-
-#: ../pidgin/gtkdialogs.c:185
+#: ../pidgin/gtkdialogs.c:189
 msgid "Norwegian Nynorsk"
 msgstr "Norsk (nynorsk)"
 
-#: ../pidgin/gtkdialogs.c:186
-#: ../pidgin/gtkdialogs.c:187
-#: ../pidgin/gtkdialogs.c:188
-#: ../pidgin/gtkdialogs.c:244
-msgid "Polish"
-msgstr "Polsk"
-
-#: ../pidgin/gtkdialogs.c:189
-msgid "Portuguese"
-msgstr "Portugisisk"
-
 #: ../pidgin/gtkdialogs.c:190
+#: ../pidgin/gtkdialogs.c:191
+#: ../pidgin/gtkdialogs.c:192
+#: ../pidgin/gtkdialogs.c:250
+msgid "Polish"
+msgstr "Polsk"
+
+#: ../pidgin/gtkdialogs.c:193
+msgid "Portuguese"
+msgstr "Portugisisk"
+
+#: ../pidgin/gtkdialogs.c:194
 msgid "Portuguese-Brazil"
 msgstr "Brasiliansk-portugisisk"
 
-#: ../pidgin/gtkdialogs.c:191
+#: ../pidgin/gtkdialogs.c:195
 msgid "Pashto"
 msgstr "Pashto"
 
-#: ../pidgin/gtkdialogs.c:192
+#: ../pidgin/gtkdialogs.c:196
 msgid "Romanian"
 msgstr "Rumensk"
 
-#: ../pidgin/gtkdialogs.c:193
-#: ../pidgin/gtkdialogs.c:245
-#: ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:197
+#: ../pidgin/gtkdialogs.c:251
+#: ../pidgin/gtkdialogs.c:252
 msgid "Russian"
 msgstr "Russisk"
 
-#: ../pidgin/gtkdialogs.c:194
-#: ../pidgin/gtkdialogs.c:195
-#: ../pidgin/gtkdialogs.c:247
-#: ../pidgin/gtkdialogs.c:248
-#: ../pidgin/gtkdialogs.c:249
-msgid "Slovak"
-msgstr "Slovakisk"
-
-#: ../pidgin/gtkdialogs.c:196
-#: ../pidgin/gtkdialogs.c:250
-msgid "Slovenian"
-msgstr "Slovensk"
-
-#: ../pidgin/gtkdialogs.c:197
-msgid "Albanian"
-msgstr "Albansk"
-
 #: ../pidgin/gtkdialogs.c:198
 #: ../pidgin/gtkdialogs.c:199
-msgid "Serbian"
-msgstr "Serbisk"
+#: ../pidgin/gtkdialogs.c:253
+#: ../pidgin/gtkdialogs.c:254
+#: ../pidgin/gtkdialogs.c:255
+msgid "Slovak"
+msgstr "Slovakisk"
 
 #: ../pidgin/gtkdialogs.c:200
-#: ../pidgin/gtkdialogs.c:251
-msgid "Swedish"
-msgstr "Svensk"
+#: ../pidgin/gtkdialogs.c:256
+msgid "Slovenian"
+msgstr "Slovensk"
 
 #: ../pidgin/gtkdialogs.c:201
-msgid "Tamil"
-msgstr "Tamil"
+msgid "Albanian"
+msgstr "Albansk"
 
 #: ../pidgin/gtkdialogs.c:202
+#: ../pidgin/gtkdialogs.c:203
+msgid "Serbian"
+msgstr "Serbisk"
+
+#: ../pidgin/gtkdialogs.c:204
+#: ../pidgin/gtkdialogs.c:257
+#: ../pidgin/gtkdialogs.c:258
+msgid "Swedish"
+msgstr "Svensk"
+
+#: ../pidgin/gtkdialogs.c:205
+msgid "Tamil"
+msgstr "Tamil"
+
+#: ../pidgin/gtkdialogs.c:206
 msgid "Telugu"
 msgstr "Telugu"
 
-#: ../pidgin/gtkdialogs.c:203
+#: ../pidgin/gtkdialogs.c:207
 msgid "Thai"
 msgstr "Thai"
 
-#: ../pidgin/gtkdialogs.c:204
-#: ../pidgin/gtkdialogs.c:252
+#: ../pidgin/gtkdialogs.c:208
+#: ../pidgin/gtkdialogs.c:259
 msgid "Turkish"
 msgstr "Tyrkisk"
 
-#: ../pidgin/gtkdialogs.c:205
+#: ../pidgin/gtkdialogs.c:209
 msgid "Vietnamese"
 msgstr "Vietnamesisk"
 
-#: ../pidgin/gtkdialogs.c:205
+#: ../pidgin/gtkdialogs.c:209
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T. M. Thanh og Gnome-Vi-laget"
 
-#: ../pidgin/gtkdialogs.c:206
-#: ../pidgin/gtkdialogs.c:253
+#: ../pidgin/gtkdialogs.c:210
+#: ../pidgin/gtkdialogs.c:260
 msgid "Simplified Chinese"
 msgstr "Forenkla kinesisk"
 
-#: ../pidgin/gtkdialogs.c:207
-#: ../pidgin/gtkdialogs.c:208
-#: ../pidgin/gtkdialogs.c:209
+#: ../pidgin/gtkdialogs.c:211
+#: ../pidgin/gtkdialogs.c:212
+#: ../pidgin/gtkdialogs.c:213
 msgid "Hong Kong Chinese"
 msgstr "Hong Kong-kinesisk"
 
-#: ../pidgin/gtkdialogs.c:210
-#: ../pidgin/gtkdialogs.c:211
-#: ../pidgin/gtkdialogs.c:254
+#: ../pidgin/gtkdialogs.c:214
+#: ../pidgin/gtkdialogs.c:215
+#: ../pidgin/gtkdialogs.c:261
 msgid "Traditional Chinese"
 msgstr "Tradisjonell kinesisk"
 
-#: ../pidgin/gtkdialogs.c:217
+#: ../pidgin/gtkdialogs.c:221
 msgid "Amharic"
 msgstr "Amharisk"
 
-#: ../pidgin/gtkdialogs.c:339
+#: ../pidgin/gtkdialogs.c:346
 #, c-format
 msgid "About %s"
 msgstr "Om %s"
 
-#: ../pidgin/gtkdialogs.c:377
-#, 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, 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>"
+#: ../pidgin/gtkdialogs.c:384
+#, 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>"
 
-#: ../pidgin/gtkdialogs.c:392
+#: ../pidgin/gtkdialogs.c:399
 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:397
+#: ../pidgin/gtkdialogs.c:404
 msgid "Current Developers"
 msgstr "Noverande utviklarar"
 
-#: ../pidgin/gtkdialogs.c:412
+#: ../pidgin/gtkdialogs.c:419
 msgid "Crazy Patch Writers"
 msgstr "Rettarar"
 
-#: ../pidgin/gtkdialogs.c:427
+#: ../pidgin/gtkdialogs.c:434
 msgid "Retired Developers"
 msgstr "Tidlegare utviklarar"
 
-#: ../pidgin/gtkdialogs.c:442
+#: ../pidgin/gtkdialogs.c:449
 msgid "Retired Crazy Patch Writers"
 msgstr "Pensjonerte, pasjonerte lappeskrivarar"
 
-#: ../pidgin/gtkdialogs.c:457
+#: ../pidgin/gtkdialogs.c:464
 msgid "Artists"
 msgstr "Kunstnarar"
 
-#: ../pidgin/gtkdialogs.c:472
+#: ../pidgin/gtkdialogs.c:479
 msgid "Current Translators"
 msgstr "Noverande omsetjarar"
 
-#: ../pidgin/gtkdialogs.c:492
+#: ../pidgin/gtkdialogs.c:499
 msgid "Past Translators"
 msgstr "Tidlegare omsetjarar"
 
-#: ../pidgin/gtkdialogs.c:510
+#: ../pidgin/gtkdialogs.c:517
 msgid "Debugging Information"
 msgstr "Feilsøkingsinformasjon "
 
-#: ../pidgin/gtkdialogs.c:879
+#: ../pidgin/gtkdialogs.c:887
 msgid "Get User Info"
 msgstr "Hent brukarinfo"
 
-#: ../pidgin/gtkdialogs.c:881
+#: ../pidgin/gtkdialogs.c:889
 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:971
+#: ../pidgin/gtkdialogs.c:979
 msgid "View User Log"
 msgstr "Les brukarlogg"
 
-#: ../pidgin/gtkdialogs.c:973
+#: ../pidgin/gtkdialogs.c:981
 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:993
+#: ../pidgin/gtkdialogs.c:1001
 msgid "Alias Contact"
 msgstr "Kontaktalias"
 
-#: ../pidgin/gtkdialogs.c:994
+#: ../pidgin/gtkdialogs.c:1002
 msgid "Enter an alias for this contact."
 msgstr "Før opp eit kallenamn (alias) for denne kontakten."
 
-#: ../pidgin/gtkdialogs.c:1016
+#: ../pidgin/gtkdialogs.c:1024
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Før opp eit kallenamn (alias) for %s."
 
-#: ../pidgin/gtkdialogs.c:1018
+#: ../pidgin/gtkdialogs.c:1026
 msgid "Alias Buddy"
 msgstr "Vennealias"
 
-#: ../pidgin/gtkdialogs.c:1039
+#: ../pidgin/gtkdialogs.c:1047
 msgid "Alias Chat"
 msgstr "Kallenamn praterom"
 
-#: ../pidgin/gtkdialogs.c:1040
+#: ../pidgin/gtkdialogs.c:1048
 msgid "Enter an alias for this chat."
 msgstr "Før opp eit kallenamn for dette praterommet."
 
-#: ../pidgin/gtkdialogs.c:1079
+#: ../pidgin/gtkdialogs.c:1087
 #, 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?"
 
-#: ../pidgin/gtkdialogs.c:1087
+#: ../pidgin/gtkdialogs.c:1095
 msgid "Remove Contact"
 msgstr "Fjern kontakt"
 
-#: ../pidgin/gtkdialogs.c:1090
+#: ../pidgin/gtkdialogs.c:1098
 msgid "_Remove Contact"
 msgstr "_Fjern kontakt"
 
-#: ../pidgin/gtkdialogs.c:1121
+#: ../pidgin/gtkdialogs.c:1129
 #, 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?"
 
-#: ../pidgin/gtkdialogs.c:1128
+#: ../pidgin/gtkdialogs.c:1136
 msgid "Merge Groups"
 msgstr "Slå saman grupper"
 
-#: ../pidgin/gtkdialogs.c:1131
+#: ../pidgin/gtkdialogs.c:1139
 msgid "_Merge Groups"
 msgstr "_Slå saman grupper"
 
-#: ../pidgin/gtkdialogs.c:1181
+#: ../pidgin/gtkdialogs.c:1189
 #, 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?"
 
-#: ../pidgin/gtkdialogs.c:1184
+#: ../pidgin/gtkdialogs.c:1192
 msgid "Remove Group"
 msgstr "Fjern gruppa"
 
-#: ../pidgin/gtkdialogs.c:1187
+#: ../pidgin/gtkdialogs.c:1195
 msgid "_Remove Group"
 msgstr "_Fjern gruppe"
 
-#: ../pidgin/gtkdialogs.c:1220
+#: ../pidgin/gtkdialogs.c:1228
 #, c-format
 msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Er du sikker på at du ønskjer å fjerna %s frå vennelista di?"
 
-#: ../pidgin/gtkdialogs.c:1223
+#: ../pidgin/gtkdialogs.c:1231
 msgid "Remove Buddy"
 msgstr "Fjern venn"
 
-#: ../pidgin/gtkdialogs.c:1226
+#: ../pidgin/gtkdialogs.c:1234
 msgid "_Remove Buddy"
 msgstr "_Fjern venn"
 
-#: ../pidgin/gtkdialogs.c:1247
+#: ../pidgin/gtkdialogs.c:1255
 #, 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?"
 
-#: ../pidgin/gtkdialogs.c:1250
+#: ../pidgin/gtkdialogs.c:1258
 msgid "Remove Chat"
 msgstr "Fjern praterom"
 
-#: ../pidgin/gtkdialogs.c:1253
+#: ../pidgin/gtkdialogs.c:1261
 msgid "_Remove Chat"
 msgstr "_Fjern praterom"
 
@@ -13601,7 +13949,7 @@
 
 #. Pause button
 #: ../pidgin/gtkft.c:832
-#: ../pidgin/pidginstock.c:89
+#: ../pidgin/pidginstock.c:94
 msgid "_Pause"
 msgstr "_Pause"
 
@@ -13610,44 +13958,44 @@
 msgid "_Resume"
 msgstr "_Hald fram"
 
-#: ../pidgin/gtkimhtml.c:814
+#: ../pidgin/gtkimhtml.c:815
 msgid "Paste as Plain _Text"
 msgstr "_Lim inn som rein tekst"
 
-#: ../pidgin/gtkimhtml.c:831
-#: ../pidgin/gtkimhtmltoolbar.c:1138
+#: ../pidgin/gtkimhtml.c:832
+#: ../pidgin/gtkimhtmltoolbar.c:1190
 msgid "_Reset formatting"
 msgstr "_Ta vekk formatering"
 
-#: ../pidgin/gtkimhtml.c:1371
+#: ../pidgin/gtkimhtml.c:1372
 msgid "Hyperlink color"
 msgstr "Lenkjefarge"
 
-#: ../pidgin/gtkimhtml.c:1372
+#: ../pidgin/gtkimhtml.c:1373
 msgid "Color to draw hyperlinks."
 msgstr "Farge til å teikna lenkje."
 
-#: ../pidgin/gtkimhtml.c:1375
+#: ../pidgin/gtkimhtml.c:1376
 msgid "Hyperlink prelight color"
 msgstr "Lenkjefarge"
 
-#: ../pidgin/gtkimhtml.c:1376
+#: ../pidgin/gtkimhtml.c:1377
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Lenkjefarge når musa peikar på lenkja."
 
-#: ../pidgin/gtkimhtml.c:1596
+#: ../pidgin/gtkimhtml.c:1597
 msgid "_Copy E-Mail Address"
 msgstr "_Kopier e-postadresse"
 
-#: ../pidgin/gtkimhtml.c:1608
+#: ../pidgin/gtkimhtml.c:1609
 msgid "_Open Link in Browser"
 msgstr "_Opna lenkja i nettlesar"
 
-#: ../pidgin/gtkimhtml.c:1618
+#: ../pidgin/gtkimhtml.c:1619
 msgid "_Copy Link Location"
 msgstr "_Kopier lenkje"
 
-#: ../pidgin/gtkimhtml.c:3363
+#: ../pidgin/gtkimhtml.c:3365
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -13657,7 +14005,7 @@
 "\n"
 "Nyttar standardtypen PNG."
 
-#: ../pidgin/gtkimhtml.c:3366
+#: ../pidgin/gtkimhtml.c:3368
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -13667,7 +14015,7 @@
 "\n"
 "Nyttar standardtypen PNG."
 
-#: ../pidgin/gtkimhtml.c:3395
+#: ../pidgin/gtkimhtml.c:3397
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -13678,7 +14026,7 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3398
+#: ../pidgin/gtkimhtml.c:3400
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -13689,127 +14037,195 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3476
-#: ../pidgin/gtkimhtml.c:3488
+#: ../pidgin/gtkimhtml.c:3478
+#: ../pidgin/gtkimhtml.c:3490
 msgid "Save Image"
 msgstr "Lagra bilete"
 
-#: ../pidgin/gtkimhtml.c:3516
+#: ../pidgin/gtkimhtml.c:3518
 msgid "_Save Image..."
 msgstr "_Lagra bilete…"
 
-#: ../pidgin/gtkimhtmltoolbar.c:153
+#: ../pidgin/gtkimhtmltoolbar.c:162
 msgid "Select Font"
 msgstr "Vel skrifttype"
 
-#: ../pidgin/gtkimhtmltoolbar.c:232
+#: ../pidgin/gtkimhtmltoolbar.c:241
 msgid "Select Text Color"
 msgstr "Vel tekstfarge"
 
-#: ../pidgin/gtkimhtmltoolbar.c:311
+#: ../pidgin/gtkimhtmltoolbar.c:320
 msgid "Select Background Color"
 msgstr "Vel bakgrunnsfarge"
 
-#: ../pidgin/gtkimhtmltoolbar.c:400
+#: ../pidgin/gtkimhtmltoolbar.c:409
 msgid "_URL"
 msgstr "_Nettadresse"
 
-#: ../pidgin/gtkimhtmltoolbar.c:408
+#: ../pidgin/gtkimhtmltoolbar.c:417
 msgid "_Description"
 msgstr "Skil_dring"
 
-#: ../pidgin/gtkimhtmltoolbar.c:411
+#: ../pidgin/gtkimhtmltoolbar.c:420
 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:415
+#: ../pidgin/gtkimhtmltoolbar.c:424
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Skriv inn nettadressa du ønskjer å leggja til."
 
-#: ../pidgin/gtkimhtmltoolbar.c:420
+#: ../pidgin/gtkimhtmltoolbar.c:429
+#: ../pidgin/gtkimhtmltoolbar.c:1098
 msgid "Insert Link"
 msgstr "Legg til lenkje"
 
-#: ../pidgin/gtkimhtmltoolbar.c:424
-#: ../pidgin/gtkimhtmltoolbar.c:1207
+#: ../pidgin/gtkimhtmltoolbar.c:433
+#: ../pidgin/gtkimhtmltoolbar.c:1258
 msgid "_Insert"
 msgstr "_Set inn"
 
-#: ../pidgin/gtkimhtmltoolbar.c:493
+#: ../pidgin/gtkimhtmltoolbar.c:513
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Klarte ikkje å lagra bilete: %s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:519
-#: ../pidgin/gtkimhtmltoolbar.c:529
+#: ../pidgin/gtkimhtmltoolbar.c:539
+#: ../pidgin/gtkimhtmltoolbar.c:549
 msgid "Insert Image"
 msgstr "Legg til bilete"
 
-#: ../pidgin/gtkimhtmltoolbar.c:740
+#: ../pidgin/gtkimhtmltoolbar.c:760
 msgid "This theme has no available smileys."
 msgstr "Temaet har ingen tilgjengelege smilefjes."
 
 #. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:757
+#: ../pidgin/gtkimhtmltoolbar.c:777
 msgid "Smile!"
 msgstr "Smil!"
 
-#: ../pidgin/gtkimhtmltoolbar.c:820
-#: ../pidgin/gtkimhtmltoolbar.c:1164
+#: ../pidgin/gtkimhtmltoolbar.c:842
+#: ../pidgin/gtkimhtmltoolbar.c:1215
 msgid "_Font"
 msgstr "Skriftt_ype"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1124
+#: ../pidgin/gtkimhtmltoolbar.c:1050
+msgid "Group Items"
+msgstr "Grupper element"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1050
+msgid "Ungroup Items"
+msgstr "Avgrupper element"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1084
+#: ../pidgin/plugins/convcolors.c:287
+msgid "Bold"
+msgstr "Feit"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1085
+#: ../pidgin/plugins/convcolors.c:294
+msgid "Italic"
+msgstr "Kursiv"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1086
+#: ../pidgin/plugins/convcolors.c:301
+msgid "Underline"
+msgstr "Understreka"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1087
+msgid "Strikethrough"
+msgstr "Gjennomstreking"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1089
+msgid "Increase Font Size"
+msgstr "Auk skriftstorleiken"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1090
+msgid "Decrease Font Size"
+msgstr "Minsk skriftstorleiken"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1092
+msgid "Font Face"
+msgstr "Skrifttype"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1093
+msgid "Background Color"
+msgstr "Bakgrunnsfarge"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1094
+msgid "Foreground Color"
+msgstr "Forgrunnsfarge"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1096
+msgid "Reset Formatting"
+msgstr "Nullstill formateringa"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1099
+msgid "Insert IM Image"
+msgstr "Legg til lynmeldingsbilete"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1100
+msgid "Insert Smiley"
+msgstr "Legg til smilefjes"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1175
 msgid "<b>_Bold</b>"
 msgstr "<b>_Feit</b>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1125
+#: ../pidgin/gtkimhtmltoolbar.c:1176
 msgid "<i>_Italic</i>"
 msgstr "<i>_Kursiv</i>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1126
+#: ../pidgin/gtkimhtmltoolbar.c:1177
 msgid "<u>_Underline</u>"
 msgstr "<u>_Understrek</u>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1127
+#: ../pidgin/gtkimhtmltoolbar.c:1178
+msgid "<span strikethrough='true'>Strikethrough</span>"
+msgstr "<span strikethrough='true'>Gjennomstreking</span>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1179
 msgid "<span size='larger'>_Larger</span>"
 msgstr "<span size='larger'>_Større</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1129
+#: ../pidgin/gtkimhtmltoolbar.c:1181
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1131
+#: ../pidgin/gtkimhtmltoolbar.c:1183
 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:1135
+#: ../pidgin/gtkimhtmltoolbar.c:1187
 msgid "_Font face"
 msgstr "Skriftt_ype"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1136
+#: ../pidgin/gtkimhtmltoolbar.c:1188
 msgid "Foreground _color"
 msgstr "_Forgrunnsfarge"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1137
+#: ../pidgin/gtkimhtmltoolbar.c:1189
 msgid "Bac_kground color"
 msgstr "_Bakgrunnsfarge"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1215
+#: ../pidgin/gtkimhtmltoolbar.c:1266
 msgid "_Smiley"
 msgstr "_Smilefjes"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1221
+#: ../pidgin/gtkimhtmltoolbar.c:1272
 msgid "_Image"
 msgstr "_Bilete"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1227
+#: ../pidgin/gtkimhtmltoolbar.c:1278
 msgid "_Link"
 msgstr "_Lenkje"
 
+#: ../pidgin/gtkimhtmltoolbar.c:1284
+msgid "_Horizontal rule"
+msgstr "_Horisontal strek"
+
 #: ../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?"
@@ -13957,47 +14373,47 @@
 msgid "Pidgin"
 msgstr "Pidgin"
 
-#: ../pidgin/gtknotify.c:344
+#: ../pidgin/gtknotify.c:348
 msgid "Open All Messages"
 msgstr "Opna alle meldingar"
 
-#: ../pidgin/gtknotify.c:396
+#: ../pidgin/gtknotify.c:401
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Du har fått e-postmeldingar</span>"
 
-#: ../pidgin/gtknotify.c:516
+#: ../pidgin/gtknotify.c:521
 #, 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:527
+#: ../pidgin/gtknotify.c:532
 #, 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:967
+#: ../pidgin/gtknotify.c:957
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "Nettlesarkommandoen \"%s\" er ugyldig."
 
-#: ../pidgin/gtknotify.c:969
-#: ../pidgin/gtknotify.c:981
-#: ../pidgin/gtknotify.c:994
-#: ../pidgin/gtknotify.c:1122
+#: ../pidgin/gtknotify.c:959
+#: ../pidgin/gtknotify.c:971
+#: ../pidgin/gtknotify.c:984
+#: ../pidgin/gtknotify.c:1112
 msgid "Unable to open URL"
 msgstr "Klarte ikkje å opna adressa"
 
-#: ../pidgin/gtknotify.c:979
-#: ../pidgin/gtknotify.c:992
+#: ../pidgin/gtknotify.c:969
+#: ../pidgin/gtknotify.c:982
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Klarte ikkje å starta \"%s\": %s"
 
-#: ../pidgin/gtknotify.c:1123
+#: ../pidgin/gtknotify.c:1113
 msgid "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "'Manuell' nettlesarkommando er vald, men ingen kommando er brukt."
 
@@ -14048,100 +14464,100 @@
 msgstr "Vel ei fil"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:533
+#: ../pidgin/gtkpounce.c:531
 msgid "Pounce on Whom"
 msgstr "Varsling for"
 
-#: ../pidgin/gtkpounce.c:560
+#: ../pidgin/gtkpounce.c:558
 msgid "_Buddy name:"
 msgstr "_Vennenamn:"
 
+#: ../pidgin/gtkpounce.c:592
+msgid "Si_gns on"
+msgstr "Lo_ggar på"
+
 #: ../pidgin/gtkpounce.c:594
-msgid "Si_gns on"
-msgstr "Lo_ggar på"
+msgid "Signs o_ff"
+msgstr "L_oggar av"
 
 #: ../pidgin/gtkpounce.c:596
-msgid "Signs o_ff"
-msgstr "L_oggar av"
+msgid "Goes a_way"
+msgstr "Går _vekk"
 
 #: ../pidgin/gtkpounce.c:598
-msgid "Goes a_way"
-msgstr "Går _vekk"
+msgid "Ret_urns from away"
+msgstr "_Kjem attende etter å ha vore vekke"
 
 #: ../pidgin/gtkpounce.c:600
-msgid "Ret_urns from away"
-msgstr "_Kjem attende etter å ha vore vekke"
+msgid "Becomes _idle"
+msgstr "Blir _uverksam"
 
 #: ../pidgin/gtkpounce.c:602
-msgid "Becomes _idle"
-msgstr "Blir _uverksam"
-
-#: ../pidgin/gtkpounce.c:604
 msgid "Is no longer i_dle"
 msgstr "Er ikkje uverksam lenger"
 
-#: ../pidgin/gtkpounce.c:606
+#: ../pidgin/gtkpounce.c:604
 msgid "Starts _typing"
 msgstr "Begynner å skriva"
 
+#: ../pidgin/gtkpounce.c:606
+msgid "P_auses while typing"
+msgstr "Tek ein _pause under skrivinga"
+
 #: ../pidgin/gtkpounce.c:608
-msgid "P_auses while typing"
-msgstr "Tek ein _pause under skrivinga"
-
-#: ../pidgin/gtkpounce.c:610
 msgid "Stops t_yping"
 msgstr "Stansar skrivinga"
 
-#: ../pidgin/gtkpounce.c:612
+#: ../pidgin/gtkpounce.c:610
 msgid "Sends a _message"
 msgstr "Sender ei _melding"
 
+#: ../pidgin/gtkpounce.c:653
+msgid "Ope_n an IM window"
+msgstr "Opna eit lynmeldingsvindauge"
+
 #: ../pidgin/gtkpounce.c:655
-msgid "Ope_n an IM window"
-msgstr "Opna eit lynmeldingsvindauge"
-
-#: ../pidgin/gtkpounce.c:657
 msgid "_Pop up a notification"
 msgstr "Sprett opp eit _varsel"
 
-#: ../pidgin/gtkpounce.c:659
+#: ../pidgin/gtkpounce.c:657
 msgid "Send a _message"
 msgstr "Send ei _melding"
 
+#: ../pidgin/gtkpounce.c:659
+msgid "E_xecute a command"
+msgstr "Køyr ein _kommando"
+
 #: ../pidgin/gtkpounce.c:661
-msgid "E_xecute a command"
-msgstr "Køyr ein _kommando"
-
-#: ../pidgin/gtkpounce.c:663
 msgid "P_lay a sound"
 msgstr "Spel ein _lyd"
 
-#: ../pidgin/gtkpounce.c:669
+#: ../pidgin/gtkpounce.c:667
 msgid "Brows_e..."
 msgstr "_Bla gjennom…"
 
-#: ../pidgin/gtkpounce.c:671
+#: ../pidgin/gtkpounce.c:669
 msgid "Br_owse..."
 msgstr "_Bla gjennom…"
 
-#: ../pidgin/gtkpounce.c:672
+#: ../pidgin/gtkpounce.c:670
 msgid "Pre_view"
 msgstr "Førehands_vis"
 
-#: ../pidgin/gtkpounce.c:799
+#: ../pidgin/gtkpounce.c:797
 msgid "P_ounce only when my status is not Available"
 msgstr "Vennevarsling berre når eg ikkje er tilgjengeleg"
 
-#: ../pidgin/gtkpounce.c:804
+#: ../pidgin/gtkpounce.c:802
 msgid "_Recurring"
 msgstr "_Gjentakande"
 
-#: ../pidgin/gtkpounce.c:1260
+#: ../pidgin/gtkpounce.c:1245
 msgid "Pounce Target"
 msgstr "Varslingsmål"
 
 #: ../pidgin/gtkprefs.c:385
-#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:1
+#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
 msgid "Default"
 msgstr "Standard"
 
@@ -14182,7 +14598,7 @@
 msgstr "_Skjul  nye lynmeldingssamtaler:"
 
 #: ../pidgin/gtkprefs.c:907
-#: ../pidgin/gtkprefs.c:1939
+#: ../pidgin/gtkprefs.c:1941
 msgid "When away"
 msgstr "Når vekke"
 
@@ -14279,127 +14695,127 @@
 msgid "Conversation _font:"
 msgstr "Samtaleskrift:"
 
-#: ../pidgin/gtkprefs.c:1041
+#: ../pidgin/gtkprefs.c:1042
 msgid "Default Formatting"
 msgstr "Standardformatering"
 
-#: ../pidgin/gtkprefs.c:1059
+#: ../pidgin/gtkprefs.c:1061
 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:1125
+#: ../pidgin/gtkprefs.c:1127
 msgid "ST_UN server:"
 msgstr "ST_UN-tenar:"
 
-#: ../pidgin/gtkprefs.c:1137
+#: ../pidgin/gtkprefs.c:1139
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Døme: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1141
+#: ../pidgin/gtkprefs.c:1143
 msgid "_Autodetect IP address"
 msgstr "Finn IP-adressa _automatisk"
 
-#: ../pidgin/gtkprefs.c:1150
+#: ../pidgin/gtkprefs.c:1152
 msgid "Public _IP:"
 msgstr "Offentleg _IP:"
 
-#: ../pidgin/gtkprefs.c:1179
+#: ../pidgin/gtkprefs.c:1181
 msgid "Ports"
 msgstr "Portar"
 
-#: ../pidgin/gtkprefs.c:1182
+#: ../pidgin/gtkprefs.c:1184
 msgid "_Manually specify range of ports to listen on"
 msgstr "Før opp _portrekkje det skal lyttast til"
 
-#: ../pidgin/gtkprefs.c:1185
+#: ../pidgin/gtkprefs.c:1187
 msgid "_Start port:"
 msgstr "_Startport:"
 
-#: ../pidgin/gtkprefs.c:1192
+#: ../pidgin/gtkprefs.c:1194
 msgid "_End port:"
 msgstr "Sluttp_ort:"
 
-#: ../pidgin/gtkprefs.c:1200
+#: ../pidgin/gtkprefs.c:1202
 msgid "Proxy Server"
 msgstr "Mellomtenar"
 
-#: ../pidgin/gtkprefs.c:1204
+#: ../pidgin/gtkprefs.c:1206
 msgid "No proxy"
 msgstr "Inga mellomlagring"
 
-#: ../pidgin/gtkprefs.c:1260
+#: ../pidgin/gtkprefs.c:1262
 msgid "_User:"
 msgstr "Br_ukar:"
 
-#: ../pidgin/gtkprefs.c:1325
-msgid "Seamonkey"
-msgstr "Seamonkey"
-
-#: ../pidgin/gtkprefs.c:1326
-msgid "Opera"
-msgstr "Opera"
-
 #: ../pidgin/gtkprefs.c:1327
+msgid "Seamonkey"
+msgstr "Seamonkey"
+
+#: ../pidgin/gtkprefs.c:1328
+msgid "Opera"
+msgstr "Opera"
+
+#: ../pidgin/gtkprefs.c:1329
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1328
+#: ../pidgin/gtkprefs.c:1330
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1329
+#: ../pidgin/gtkprefs.c:1331
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1330
+#: ../pidgin/gtkprefs.c:1332
 msgid "GNOME Default"
 msgstr "GNOME-standard"
 
-#: ../pidgin/gtkprefs.c:1331
+#: ../pidgin/gtkprefs.c:1333
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1332
+#: ../pidgin/gtkprefs.c:1334
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1333
+#: ../pidgin/gtkprefs.c:1335
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1334
+#: ../pidgin/gtkprefs.c:1336
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1343
+#: ../pidgin/gtkprefs.c:1345
 msgid "Manual"
 msgstr "Sjølvvald"
 
-#: ../pidgin/gtkprefs.c:1396
+#: ../pidgin/gtkprefs.c:1398
 msgid "Browser Selection"
 msgstr "Nettlesarval"
 
-#: ../pidgin/gtkprefs.c:1400
+#: ../pidgin/gtkprefs.c:1402
 msgid "_Browser:"
 msgstr "_Nettlesar:"
 
-#: ../pidgin/gtkprefs.c:1408
+#: ../pidgin/gtkprefs.c:1410
 msgid "_Open link in:"
 msgstr "Opna _lenkje i:"
 
-#: ../pidgin/gtkprefs.c:1410
+#: ../pidgin/gtkprefs.c:1412
 msgid "Browser default"
 msgstr "Nettlesarstandard"
 
-#: ../pidgin/gtkprefs.c:1411
+#: ../pidgin/gtkprefs.c:1413
 msgid "Existing window"
 msgstr "Eksisterande vindauge"
 
-#: ../pidgin/gtkprefs.c:1413
+#: ../pidgin/gtkprefs.c:1415
 msgid "New tab"
 msgstr "Ny fane"
 
-#: ../pidgin/gtkprefs.c:1427
+#: ../pidgin/gtkprefs.c:1429
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -14408,63 +14824,63 @@
 "_Sjølvvald:\n"
 "(%s for adresse)"
 
-#: ../pidgin/gtkprefs.c:1467
+#: ../pidgin/gtkprefs.c:1469
 msgid "Log _format:"
 msgstr "Logg_format:"
 
-#: ../pidgin/gtkprefs.c:1472
+#: ../pidgin/gtkprefs.c:1474
 msgid "Log all _instant messages"
 msgstr "L_oggfør alle lynmeldingar"
 
-#: ../pidgin/gtkprefs.c:1474
-msgid "Log all c_hats"
-msgstr "Loggfør alle sa_mtaler"
-
 #: ../pidgin/gtkprefs.c:1476
+msgid "Log all c_hats"
+msgstr "Loggfør alle sa_mtaler"
+
+#: ../pidgin/gtkprefs.c:1478
 msgid "Log all _status changes to system log"
 msgstr "Loggfør alle _statusendringar i systemloggen"
 
-#: ../pidgin/gtkprefs.c:1622
+#: ../pidgin/gtkprefs.c:1624
 msgid "Sound Selection"
 msgstr "Lydval"
 
-#: ../pidgin/gtkprefs.c:1632
+#: ../pidgin/gtkprefs.c:1634
 msgid "Quietest"
 msgstr "Stillaste"
 
-#: ../pidgin/gtkprefs.c:1634
-msgid "Quieter"
-msgstr "Stillare"
-
 #: ../pidgin/gtkprefs.c:1636
+msgid "Quieter"
+msgstr "Stillare"
+
+#: ../pidgin/gtkprefs.c:1638
 msgid "Quiet"
 msgstr "Stille"
 
-#: ../pidgin/gtkprefs.c:1640
+#: ../pidgin/gtkprefs.c:1642
 msgid "Loud"
 msgstr "Høg"
 
-#: ../pidgin/gtkprefs.c:1642
+#: ../pidgin/gtkprefs.c:1644
 msgid "Louder"
 msgstr "Høgare"
 
-#: ../pidgin/gtkprefs.c:1644
+#: ../pidgin/gtkprefs.c:1646
 msgid "Loudest"
 msgstr "Høgast"
 
-#: ../pidgin/gtkprefs.c:1708
+#: ../pidgin/gtkprefs.c:1710
 msgid "_Method:"
 msgstr "_Metode:"
 
-#: ../pidgin/gtkprefs.c:1710
+#: ../pidgin/gtkprefs.c:1712
 msgid "Console beep"
 msgstr "Konsollyd"
 
-#: ../pidgin/gtkprefs.c:1717
+#: ../pidgin/gtkprefs.c:1719
 msgid "No sounds"
 msgstr "Ingen lydar"
 
-#: ../pidgin/gtkprefs.c:1725
+#: ../pidgin/gtkprefs.c:1727
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -14473,81 +14889,81 @@
 "Lyd_kommando:\n"
 "(%s for filnamn)"
 
-#: ../pidgin/gtkprefs.c:1752
+#: ../pidgin/gtkprefs.c:1754
 msgid "Sounds when conversation has _focus"
 msgstr "Lydar medan samtalevindauget har _fokus"
 
-#: ../pidgin/gtkprefs.c:1754
+#: ../pidgin/gtkprefs.c:1756
 msgid "Enable sounds:"
 msgstr "Bruk lydar:"
 
-#: ../pidgin/gtkprefs.c:1765
+#: ../pidgin/gtkprefs.c:1767
 msgid "Volume:"
 msgstr "Volum:"
 
-#: ../pidgin/gtkprefs.c:1845
+#: ../pidgin/gtkprefs.c:1847
 msgid "Play"
 msgstr "Spel"
 
-#: ../pidgin/gtkprefs.c:1922
+#: ../pidgin/gtkprefs.c:1924
 msgid "_Report idle time:"
 msgstr "Vis kor lenge _uverksam:"
 
-#: ../pidgin/gtkprefs.c:1927
+#: ../pidgin/gtkprefs.c:1929
 msgid "Based on keyboard or mouse use"
 msgstr "Basert på tastatur- eller musebruk"
 
-#: ../pidgin/gtkprefs.c:1936
+#: ../pidgin/gtkprefs.c:1938
 msgid "_Auto-reply:"
 msgstr "_Automatisk svar:"
 
-#: ../pidgin/gtkprefs.c:1940
+#: ../pidgin/gtkprefs.c:1942
 msgid "When both away and idle"
 msgstr "Både når vekke og uverksam"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1946
+#: ../pidgin/gtkprefs.c:1948
 msgid "Auto-away"
 msgstr "Automatisk vekke"
 
-#: ../pidgin/gtkprefs.c:1948
+#: ../pidgin/gtkprefs.c:1950
 msgid "Change status when _idle"
 msgstr "_Endra tilstand når uverksam"
 
-#: ../pidgin/gtkprefs.c:1952
+#: ../pidgin/gtkprefs.c:1954
 msgid "_Minutes before becoming idle:"
 msgstr "_Minutt før ein blir uverksam:"
 
-#: ../pidgin/gtkprefs.c:1960
+#: ../pidgin/gtkprefs.c:1962
 msgid "Change _status to:"
 msgstr "Endra _tilstand til:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1981
+#: ../pidgin/gtkprefs.c:1983
 msgid "Status at Startup"
 msgstr "Tilstand ved oppstart"
 
-#: ../pidgin/gtkprefs.c:1983
+#: ../pidgin/gtkprefs.c:1985
 msgid "Use status from last _exit at startup"
 msgstr "Bruk tilstanden frå _siste avslutning ved oppstart"
 
-#: ../pidgin/gtkprefs.c:1989
+#: ../pidgin/gtkprefs.c:1991
 msgid "Status to a_pply at startup:"
 msgstr "Tilstand å _bruka ved oppstart:"
 
-#: ../pidgin/gtkprefs.c:2027
+#: ../pidgin/gtkprefs.c:2029
 msgid "Interface"
 msgstr "Grensesnitt"
 
-#: ../pidgin/gtkprefs.c:2029
+#: ../pidgin/gtkprefs.c:2031
 msgid "Smiley Themes"
 msgstr "Smilefjestema"
 
-#: ../pidgin/gtkprefs.c:2036
+#: ../pidgin/gtkprefs.c:2038
 msgid "Browser"
 msgstr "Nettlesar"
 
-#: ../pidgin/gtkprefs.c:2040
+#: ../pidgin/gtkprefs.c:2042
 msgid "Status / Idle"
 msgstr "Tilstand/uverksam"
 
@@ -14639,24 +15055,24 @@
 msgid "Apply"
 msgstr "Bruk"
 
-#: ../pidgin/gtkrequest.c:1504
+#: ../pidgin/gtkrequest.c:1507
 msgid "That file already exists"
 msgstr "Fila finst allereie"
 
-#: ../pidgin/gtkrequest.c:1505
-msgid "Would you like to overwrite it?"
-msgstr "Vil du skriva over?"
-
 #: ../pidgin/gtkrequest.c:1508
+msgid "Would you like to overwrite it?"
+msgstr "Vil du skriva over?"
+
+#: ../pidgin/gtkrequest.c:1511
 msgid "Overwrite"
 msgstr "Skriv over"
 
-#: ../pidgin/gtkrequest.c:1509
+#: ../pidgin/gtkrequest.c:1512
 msgid "Choose New Name"
 msgstr "Vel nytt namn"
 
-#: ../pidgin/gtkrequest.c:1647
-#: ../pidgin/gtkrequest.c:1661
+#: ../pidgin/gtkrequest.c:1650
+#: ../pidgin/gtkrequest.c:1664
 msgid "Select Folder..."
 msgstr "Vel mappe…"
 
@@ -14698,7 +15114,7 @@
 msgstr "_Tittel:"
 
 #: ../pidgin/gtksavedstatuses.c:1177
-#: ../pidgin/gtksavedstatuses.c:1494
+#: ../pidgin/gtksavedstatuses.c:1496
 msgid "_Status:"
 msgstr "_Status:"
 
@@ -14712,7 +15128,7 @@
 msgid "Sa_ve & Use"
 msgstr "L_agra og bruk"
 
-#: ../pidgin/gtksavedstatuses.c:1477
+#: ../pidgin/gtksavedstatuses.c:1479
 #, c-format
 msgid "Status for %s"
 msgstr "Status for %s"
@@ -14725,61 +15141,61 @@
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1388
-#: ../pidgin/gtkutils.c:1411
+#: ../pidgin/gtkutils.c:1398
+#: ../pidgin/gtkutils.c:1421
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "Følgjande feil oppstod ved lastinga av %s: %s"
 
-#: ../pidgin/gtkutils.c:1391
-#: ../pidgin/gtkutils.c:1413
+#: ../pidgin/gtkutils.c:1401
+#: ../pidgin/gtkutils.c:1423
 msgid "Failed to load image"
 msgstr "Klarte ikkje å lagra biletet"
 
-#: ../pidgin/gtkutils.c:1487
+#: ../pidgin/gtkutils.c:1497
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Klarer ikkje å senda mappe %s."
 
-#: ../pidgin/gtkutils.c:1488
+#: ../pidgin/gtkutils.c:1498
 #, 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."
 
-#: ../pidgin/gtkutils.c:1520
-#: ../pidgin/gtkutils.c:1532
-#: ../pidgin/gtkutils.c:1539
+#: ../pidgin/gtkutils.c:1530
+#: ../pidgin/gtkutils.c:1542
+#: ../pidgin/gtkutils.c:1549
 msgid "You have dragged an image"
 msgstr "Du har drege eit biete"
 
-#: ../pidgin/gtkutils.c:1521
+#: ../pidgin/gtkutils.c:1531
 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:1527
-#: ../pidgin/gtkutils.c:1547
+#: ../pidgin/gtkutils.c:1537
+#: ../pidgin/gtkutils.c:1557
 msgid "Set as buddy icon"
 msgstr "Bruk som venne-ikon"
 
-#: ../pidgin/gtkutils.c:1528
-#: ../pidgin/gtkutils.c:1548
+#: ../pidgin/gtkutils.c:1538
+#: ../pidgin/gtkutils.c:1558
 msgid "Send image file"
 msgstr "Send biletfil"
 
-#: ../pidgin/gtkutils.c:1529
-#: ../pidgin/gtkutils.c:1548
+#: ../pidgin/gtkutils.c:1539
+#: ../pidgin/gtkutils.c:1558
 msgid "Insert in message"
 msgstr "Legg til i meldinga"
 
-#: ../pidgin/gtkutils.c:1533
+#: ../pidgin/gtkutils.c:1543
 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:1540
+#: ../pidgin/gtkutils.c:1550
 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:1541
+#: ../pidgin/gtkutils.c:1551
 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"
 
@@ -14788,15 +15204,15 @@
 #. * 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:1599
+#: ../pidgin/gtkutils.c:1609
 msgid "Cannot send launcher"
 msgstr "Klarer ikkje å senda lastaren"
 
-#: ../pidgin/gtkutils.c:1599
+#: ../pidgin/gtkutils.c:1609
 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:2334
+#: ../pidgin/gtkutils.c:2344
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -14807,25 +15223,25 @@
 "<b>Filstorleik:</b> %s\n"
 "<b>Biletstorleik:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2630
+#: ../pidgin/gtkutils.c:2640
 #, 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:2632
+#: ../pidgin/gtkutils.c:2642
 msgid "Icon Error"
 msgstr "Ikon-feil"
 
-#: ../pidgin/gtkutils.c:2633
+#: ../pidgin/gtkutils.c:2643
 msgid "Could not set icon"
 msgstr "Klarte ikkje å bruka ikonet"
 
-#: ../pidgin/gtkutils.c:2733
+#: ../pidgin/gtkutils.c:2743
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Klarte ikkje å opna fila '%s': %s"
 
-#: ../pidgin/gtkutils.c:2782
+#: ../pidgin/gtkutils.c:2792
 #, 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"
@@ -14839,31 +15255,31 @@
 msgid "Select color"
 msgstr "Vel farge"
 
-#: ../pidgin/pidginstock.c:81
+#: ../pidgin/pidginstock.c:86
 msgid "_Alias"
 msgstr "A_lias"
 
-#: ../pidgin/pidginstock.c:83
+#: ../pidgin/pidginstock.c:88
 msgid "Close _tabs"
 msgstr "Lukk _faner"
 
-#: ../pidgin/pidginstock.c:85
+#: ../pidgin/pidginstock.c:90
 msgid "_Get Info"
 msgstr "Hent _informasjon"
 
-#: ../pidgin/pidginstock.c:86
+#: ../pidgin/pidginstock.c:91
 msgid "_Invite"
 msgstr "_Inviter"
 
-#: ../pidgin/pidginstock.c:87
+#: ../pidgin/pidginstock.c:92
 msgid "_Modify"
 msgstr "_Endra"
 
-#: ../pidgin/pidginstock.c:88
+#: ../pidgin/pidginstock.c:93
 msgid "_Open Mail"
 msgstr "_Opna e-post"
 
-#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:2
+#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:2
 msgid "Pidgin smileys"
 msgstr "Pidgin-smilefjes"
 
@@ -15029,18 +15445,6 @@
 msgid "Select Color for %s"
 msgstr "Vel farge for %s"
 
-#: ../pidgin/plugins/convcolors.c:287
-msgid "Bold"
-msgstr "Feit"
-
-#: ../pidgin/plugins/convcolors.c:294
-msgid "Italic"
-msgstr "Kursiv"
-
-#: ../pidgin/plugins/convcolors.c:301
-msgid "Underline"
-msgstr "Understreka"
-
 #: ../pidgin/plugins/convcolors.c:310
 msgid "Ignore incoming format"
 msgstr "Ign_orer innkomande format"
@@ -15345,12 +15749,12 @@
 msgstr "Trekk markeringslinja i "
 
 #: ../pidgin/plugins/markerline.c:250
-#: ../pidgin/plugins/notify.c:676
+#: ../pidgin/plugins/notify.c:682
 msgid "_IM windows"
 msgstr "_Lynmeldingsvindauge"
 
 #: ../pidgin/plugins/markerline.c:254
-#: ../pidgin/plugins/notify.c:683
+#: ../pidgin/plugins/notify.c:689
 msgid "C_hat windows"
 msgstr "_Samtalevindauge"
 
@@ -15362,32 +15766,32 @@
 msgid "Music messaging session confirmed."
 msgstr "Musikkmeldingsøkta er stadfesta."
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:419
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:428
 msgid "Music Messaging"
 msgstr "Musikkmeldingar"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:420
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:429
 msgid "There was a conflict in running the command:"
 msgstr "Det oppstod ein konflikt under kjøringa av kommandoen:"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:528
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:537
 msgid "Error Running Editor"
 msgstr "Klarte ikkje å lasta skriveprogrammet"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:529
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:538
 msgid "The following error has occurred:"
 msgstr "Følgande feil har oppstått:"
 
 #. Configuration frame
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:628
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:637
 msgid "Music Messaging Configuration"
 msgstr "Musikkmeldingsinnstillingar"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:632
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:641
 msgid "Score Editor Path"
 msgstr "Filbane til notearkbehandlaren"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:633
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:642
 msgid "_Apply"
 msgstr "_Bruk"
 
@@ -15399,84 +15803,84 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:674
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:683
 msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Musikkmeldingstillegg for samkomponering."
 
 #. *  summary
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:676
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:685
 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:672
+#: ../pidgin/plugins/notify.c:678
 msgid "Notify For"
 msgstr "Nytt varsel for"
 
-#: ../pidgin/plugins/notify.c:691
+#: ../pidgin/plugins/notify.c:697
 msgid "\t_Only when someone says your screen name"
 msgstr "\t_Berre når nokon seier brukarnamnet ditt"
 
-#: ../pidgin/plugins/notify.c:701
+#: ../pidgin/plugins/notify.c:707
 msgid "_Focused windows"
 msgstr "_Fokuserte vindauge"
 
 #. ---------- "Notification Methods" ----------
-#: ../pidgin/plugins/notify.c:709
+#: ../pidgin/plugins/notify.c:715
 msgid "Notification Methods"
 msgstr "Varslingsmåtar"
 
-#: ../pidgin/plugins/notify.c:716
+#: ../pidgin/plugins/notify.c:722
 msgid "Prepend _string into window title:"
 msgstr "Legg til _tekst i tittellinja til vindauget:"
 
 #. Count method button
-#: ../pidgin/plugins/notify.c:735
+#: ../pidgin/plugins/notify.c:741
 msgid "Insert c_ount of new messages into window title"
 msgstr "Viser _talet på nye meldingar i vindaugstittelen"
 
 #. Count xprop method button
-#: ../pidgin/plugins/notify.c:744
+#: ../pidgin/plugins/notify.c:750
 msgid "Insert count of new message into _X property"
 msgstr "Legg til talet på nye meldingar i _X-eigenskapen"
 
 #. Urgent method button
-#: ../pidgin/plugins/notify.c:752
+#: ../pidgin/plugins/notify.c:758
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Plasserer eit \"_KRITISK\"-hint i vindaugsstyraren"
 
 #. Raise window method button
-#: ../pidgin/plugins/notify.c:761
+#: ../pidgin/plugins/notify.c:767
 msgid "R_aise conversation window"
 msgstr "Hev samtalevindauge"
 
 #. ---------- "Notification Removals" ----------
-#: ../pidgin/plugins/notify.c:769
+#: ../pidgin/plugins/notify.c:775
 msgid "Notification Removal"
 msgstr "Varslingsfjerning"
 
 #. Remove on focus button
-#: ../pidgin/plugins/notify.c:774
+#: ../pidgin/plugins/notify.c:780
 msgid "Remove when conversation window _gains focus"
 msgstr "Fjern når vindauget får _fokus"
 
 #. Remove on click button
-#: ../pidgin/plugins/notify.c:781
+#: ../pidgin/plugins/notify.c:787
 msgid "Remove when conversation window _receives click"
 msgstr "Fjern når det blir _klikka i vindauget"
 
 #. Remove on type button
-#: ../pidgin/plugins/notify.c:789
+#: ../pidgin/plugins/notify.c:795
 msgid "Remove when _typing in conversation window"
 msgstr "Fjern når det blir _skrive i vindauget"
 
 #. Remove on message send button
-#: ../pidgin/plugins/notify.c:797
+#: ../pidgin/plugins/notify.c:803
 msgid "Remove when a _message gets sent"
 msgstr "Fjern når ei _melding blir sendt"
 
 #. Remove on conversation switch button
-#: ../pidgin/plugins/notify.c:806
+#: ../pidgin/plugins/notify.c:812
 msgid "Remove on switch to conversation ta_b"
 msgstr "Fjern når samtalef_ana får fokus "
 
@@ -15486,7 +15890,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/notify.c:901
+#: ../pidgin/plugins/notify.c:907
 msgid "Message Notification"
 msgstr "Meldingsvarsling"
 
@@ -15494,8 +15898,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/notify.c:904
-#: ../pidgin/plugins/notify.c:906
+#: ../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."
 
@@ -15855,43 +16259,43 @@
 msgstr "Dette programtillegget tillèt at brukaren tilpassar tidsstempelformata for samtaler og loggmeldingar."
 
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:174
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:593
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:640
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:597
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:644
 msgid "Opacity:"
 msgstr "Ugjennomskin:"
 
 #. IM Convo trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:557
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:561
 msgid "IM Conversation Windows"
 msgstr "Samtalevindauge for lynmeldingar"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:558
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:562
 msgid "_IM window transparency"
 msgstr "_Gjennomsiktige lynmeldingsvindauge"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:572
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:576
 msgid "_Show slider bar in IM window"
 msgstr "Vis _glidefelt i lynmeldingsvindauga"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:579
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:583
 msgid "Remove IM window transparency on focus"
 msgstr "Ta vekk transparens i lynmeldingsvindauge ved fokus"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:582
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:630
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:586
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:634
 msgid "Always on top"
 msgstr "Alltid øvst"
 
 #. Buddy List trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:614
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:618
 msgid "Buddy List Window"
 msgstr "Vennelista"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:615
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:619
 msgid "_Buddy List window transparency"
 msgstr "Gjennomsiktig _venneliste"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:628
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:632
 msgid "Remove Buddy List window transparency on focus"
 msgstr "Ta vekk transparens i vennelistevindauge ved fokus"
 
@@ -15901,19 +16305,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:688
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:692
 msgid "Transparency"
 msgstr "Gjennomsikt"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:691
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:695
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "Variabel gjennomsikt i vennelista og samtalevindauga."
 
 #. *  description
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:693
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:697
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and the buddy list.\n"
 "\n"
@@ -15923,47 +16327,47 @@
 "\n"
 "*Merk: Tillegget krev Windows 2000 eller seinare utgåver."
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:307
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:303
 msgid "GTK+ Runtime Version"
 msgstr "GTK+ kjøremiljøversjon"
 
 #. Autostart
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:315
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:311
 msgid "Startup"
 msgstr "Oppstart"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:316
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:312
 #, c-format
 msgid "_Start %s on Windows startup"
 msgstr "_Start %s saman med Windows"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:327
 msgid "_Dockable Buddy List"
 msgstr "Vennelista kan _festast"
 
 #. Blist On Top
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:335
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
 msgid "_Keep Buddy List window on top:"
 msgstr "_Hald vennelistevindauget øvst:"
 
 #. XXX: Did this ever work?
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:336
 msgid "Only when docked"
 msgstr "Berre når festa"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:345
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:341
 msgid "_Flash window when chat messages are received"
 msgstr "La vindauget _blinka når det kjem nye meldingar"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:375
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:371
 msgid "Windows Pidgin Options"
 msgstr "Windows Pidgin-val"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:377
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:373
 msgid "Options specific to Pidgin for Windows."
 msgstr "Innstillingar som berre gjeld Pidgin under Windows."
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:378
+#: ../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."