diff po/nn.po @ 19484:472bcd9d502e

propagate from branch 'im.pidgin.pidgin' (head 384c9116031084a2f41659dc9e9a4aa7bba55d86) to branch 'im.pidgin.soc.2007.xmpp' (head 3826e19f149ec8f3f701f463eec7825eed512d05)
author Evan Schoenberg <evan.s@dreskin.net>
date Mon, 27 Aug 2007 21:59:11 +0000
parents bb460965c49c
children e5b23336e52f
line wrap: on
line diff
--- a/po/nn.po	Fri Aug 17 02:26:42 2007 +0000
+++ b/po/nn.po	Mon Aug 27 21:59:11 2007 +0000
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: \n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2007-07-20 14:11+0100\n"
-"Last-Translator: Yngve Spjeld Landro <nynorsk@strilen.net>\n"
+"PO-Revision-Date: 2007-08-14 00:28+0100\n"
+"Last-Translator: Y S Landro <nynorsk@strilen.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
@@ -12,19 +12,19 @@
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../finch/finch.c:70
-#: ../finch/finch.c:298
-#: ../finch/finch.c:327
-#: ../finch/finch.c:404
+#: ../finch/finch.c:64
+#: ../finch/finch.c:300
+#: ../finch/finch.c:329
+#: ../finch/finch.c:417
 msgid "Finch"
 msgstr "Finch"
 
-#: ../finch/finch.c:204
+#: ../finch/finch.c:206
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. Prøv `%s -h' for meir informasjon.\n"
 
-#: ../finch/finch.c:206
+#: ../finch/finch.c:208
 #, c-format
 msgid ""
 "%s\n"
@@ -45,8 +45,8 @@
 "  -n, --nologin       loggar ikkje på automatisk\n"
 "  -v, --version       vis noverande versjon og avslutt\n"
 
-#: ../finch/finch.c:325
-#: ../pidgin/gtkmain.c:708
+#: ../finch/finch.c:327
+#: ../pidgin/gtkmain.c:711
 #, c-format
 msgid "%s encountered errors migrating your settings from %s to %s. Please investigate and complete the migration by hand. Please report this error at http://developer.pidgin.im"
 msgstr "%s opplevde feil under migreringa av innstillingane dine frå %s til %s. Undersøk nærare og sluttfør migreringa for hand. Rapporter denne feilen til http://developer.pidgin.im"
@@ -54,8 +54,8 @@
 #: ../finch/gntaccount.c:123
 #: ../finch/gntaccount.c:478
 #: ../finch/gntblist.c:299
-#: ../finch/gntblist.c:424
-#: ../finch/gntblist.c:437
+#: ../finch/gntblist.c:432
+#: ../finch/gntblist.c:445
 #: ../finch/gntplugin.c:185
 #: ../finch/gntplugin.c:233
 #: ../finch/gntstatus.c:300
@@ -65,6 +65,7 @@
 #: ../libpurple/protocols/jabber/chat.c:688
 #: ../libpurple/protocols/jabber/jabber.c:1227
 #: ../libpurple/protocols/qq/group_join.c:328
+#: ../libpurple/protocols/qq/im.c:576
 #: ../libpurple/protocols/silc/ops.c:57
 #: ../libpurple/protocols/silc/ops.c:1456
 #: ../libpurple/protocols/silc10/ops.c:1451
@@ -96,8 +97,8 @@
 msgstr "(Du har truleg gløymt å kjøra 'make install')"
 
 #: ../finch/gntaccount.c:490
-#: ../pidgin/gtkaccount.c:1473
-#: ../pidgin/gtkblist.c:4014
+#: ../pidgin/gtkaccount.c:1478
+#: ../pidgin/gtkblist.c:4027
 msgid "Modify Account"
 msgstr "Endra konto"
 
@@ -129,16 +130,17 @@
 #: ../finch/gntaccount.c:632
 #: ../finch/gntaccount.c:878
 #: ../finch/gntblist.c:343
-#: ../finch/gntblist.c:412
-#: ../finch/gntblist.c:447
-#: ../finch/gntblist.c:794
-#: ../finch/gntblist.c:996
-#: ../finch/gntblist.c:1092
-#: ../finch/gntblist.c:2198
+#: ../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/gntplugin.c:378
 #: ../finch/gntpounce.c:458
 #: ../finch/gntpounce.c:656
 #: ../finch/gntprefs.c:264
+#: ../finch/gntsound.c:1045
 #: ../finch/gntstatus.c:144
 #: ../finch/gntstatus.c:481
 #: ../finch/gntstatus.c:606
@@ -164,25 +166,25 @@
 #: ../libpurple/protocols/msn/msn.c:293
 #: ../libpurple/protocols/msn/msn.c:310
 #: ../libpurple/protocols/msn/msn.c:331
-#: ../libpurple/protocols/oscar/oscar.c:6073
+#: ../libpurple/protocols/oscar/oscar.c:6042
 #: ../libpurple/protocols/oscar/peer.c:1023
 #: ../libpurple/protocols/qq/buddy_info.c:484
 #: ../libpurple/protocols/qq/buddy_opt.c:214
-#: ../libpurple/protocols/qq/buddy_opt.c:409
+#: ../libpurple/protocols/qq/buddy_opt.c:411
 #: ../libpurple/protocols/qq/group.c:124
 #: ../libpurple/protocols/qq/group_join.c:140
 #: ../libpurple/protocols/qq/group_join.c:365
 #: ../libpurple/protocols/qq/group_opt.c:144
 #: ../libpurple/protocols/qq/group_opt.c:399
-#: ../libpurple/protocols/qq/sys_msg.c:115
-#: ../libpurple/protocols/qq/sys_msg.c:174
-#: ../libpurple/protocols/qq/sys_msg.c:269
-#: ../libpurple/protocols/sametime/sametime.c:3388
-#: ../libpurple/protocols/sametime/sametime.c:3474
-#: ../libpurple/protocols/sametime/sametime.c:3645
-#: ../libpurple/protocols/sametime/sametime.c:5397
-#: ../libpurple/protocols/sametime/sametime.c:5487
-#: ../libpurple/protocols/sametime/sametime.c:5612
+#: ../libpurple/protocols/qq/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/silc/buddy.c:455
 #: ../libpurple/protocols/silc/buddy.c:1076
 #: ../libpurple/protocols/silc/buddy.c:1191
@@ -199,23 +201,23 @@
 #: ../libpurple/protocols/silc10/ops.c:1904
 #: ../libpurple/protocols/silc10/silc.c:736
 #: ../libpurple/protocols/silc10/silc.c:942
-#: ../libpurple/protocols/yahoo/yahoo.c:989
-#: ../libpurple/protocols/yahoo/yahoo.c:3248
-#: ../libpurple/protocols/yahoo/yahoo.c:3259
-#: ../pidgin/gtkaccount.c:1908
-#: ../pidgin/gtkaccount.c:2501
-#: ../pidgin/gtkblist.c:5915
-#: ../pidgin/gtkdialogs.c:727
-#: ../pidgin/gtkdialogs.c:865
-#: ../pidgin/gtkdialogs.c:957
+#: ../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:1001
-#: ../pidgin/gtkdialogs.c:1023
-#: ../pidgin/gtkdialogs.c:1071
-#: ../pidgin/gtkdialogs.c:1112
-#: ../pidgin/gtkdialogs.c:1168
-#: ../pidgin/gtkdialogs.c:1207
-#: ../pidgin/gtkdialogs.c:1234
+#: ../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
 #: ../pidgin/gtklog.c:327
 #: ../pidgin/gtkplugin.c:288
@@ -226,7 +228,7 @@
 #: ../pidgin/gtkprivacy.c:617
 #: ../pidgin/gtkrequest.c:270
 #: ../pidgin/gtksavedstatuses.c:344
-#: ../pidgin/gtkstatusbox.c:1582
+#: ../pidgin/gtkstatusbox.c:1572
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -236,6 +238,7 @@
 #: ../finch/gntplugin.c:378
 #: ../finch/gntpounce.c:464
 #: ../finch/gntprefs.c:264
+#: ../finch/gntsound.c:1042
 #: ../finch/gntstatus.c:484
 #: ../finch/gntstatus.c:594
 #: ../libpurple/account.c:1268
@@ -247,9 +250,9 @@
 msgstr "Lagra"
 
 #: ../finch/gntaccount.c:626
-#: ../pidgin/gtkaccount.c:1900
+#: ../pidgin/gtkaccount.c:1909
 #: ../pidgin/gtksavedstatuses.c:332
-#: ../pidgin/gtkstatusbox.c:1576
+#: ../pidgin/gtkstatusbox.c:1566
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Er du sikker på at du ønskjer å sletta %s?"
@@ -265,19 +268,19 @@
 #: ../finch/gntpounce.c:718
 #: ../finch/gntstatus.c:143
 #: ../finch/gntstatus.c:209
-#: ../pidgin/gtkaccount.c:1907
+#: ../pidgin/gtkaccount.c:1916
 #: ../pidgin/gtklog.c:326
 #: ../pidgin/gtkpounce.c:1114
 #: ../pidgin/gtkrequest.c:273
 #: ../pidgin/gtksavedstatuses.c:343
-#: ../pidgin/gtkstatusbox.c:1581
+#: ../pidgin/gtkstatusbox.c:1571
 msgid "Delete"
 msgstr "Slett"
 
 #: ../finch/gntaccount.c:663
-#: ../finch/gntblist.c:2104
-#: ../finch/gntui.c:77
-#: ../pidgin/gtkaccount.c:2327
+#: ../finch/gntblist.c:2115
+#: ../finch/gntui.c:81
+#: ../pidgin/gtkaccount.c:2334
 #: ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "Kontoar"
@@ -290,21 +293,21 @@
 #: ../finch/gntaccount.c:692
 #: ../finch/gntaccount.c:877
 #: ../finch/gntblist.c:342
-#: ../finch/gntblist.c:412
-#: ../finch/gntblist.c:447
+#: ../finch/gntblist.c:420
+#: ../finch/gntblist.c:455
 #: ../finch/gntnotify.c:379
 #: ../finch/gntpounce.c:702
 #: ../finch/gntstatus.c:198
 #: ../libpurple/protocols/gg/gg.c:878
-#: ../libpurple/protocols/qq/sys_msg.c:116
-#: ../libpurple/protocols/qq/sys_msg.c:175
-#: ../libpurple/protocols/qq/sys_msg.c:270
-#: ../libpurple/protocols/sametime/sametime.c:5486
+#: ../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/silc/chat.c:615
 #: ../libpurple/protocols/silc10/chat.c:599
-#: ../pidgin/gtkaccount.c:2500
-#: ../pidgin/gtkblist.c:5914
-#: ../pidgin/gtkconv.c:1651
+#: ../pidgin/gtkaccount.c:2510
+#: ../pidgin/gtkblist.c:5928
+#: ../pidgin/gtkconv.c:1653
 #: ../pidgin/gtkrequest.c:274
 msgid "Add"
 msgstr "Legg til"
@@ -316,41 +319,41 @@
 msgstr "Endre"
 
 #: ../finch/gntaccount.c:800
-#: ../pidgin/gtkaccount.c:2447
+#: ../pidgin/gtkaccount.c:2457
 #, 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:2499
+#: ../pidgin/gtkaccount.c:2509
 msgid "Add buddy to your list?"
 msgstr "Legg til venn i lista?"
 
-#: ../finch/gntaccount.c:927
-#: ../pidgin/gtkaccount.c:2551
+#: ../finch/gntaccount.c:933
+#: ../pidgin/gtkaccount.c:2567
 #, 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:952
-#: ../finch/gntaccount.c:955
-#: ../finch/gntaccount.c:982
-#: ../pidgin/gtkaccount.c:2574
-#: ../pidgin/gtkaccount.c:2580
+#: ../finch/gntaccount.c:958
+#: ../finch/gntaccount.c:961
+#: ../finch/gntaccount.c:988
+#: ../pidgin/gtkaccount.c:2590
+#: ../pidgin/gtkaccount.c:2596
 msgid "Authorize buddy?"
 msgstr "Godkjenna venn?"
 
-#: ../finch/gntaccount.c:959
-#: ../finch/gntaccount.c:986
-#: ../pidgin/gtkaccount.c:2575
-#: ../pidgin/gtkaccount.c:2581
+#: ../finch/gntaccount.c:965
+#: ../finch/gntaccount.c:992
+#: ../pidgin/gtkaccount.c:2591
+#: ../pidgin/gtkaccount.c:2597
 msgid "Authorize"
 msgstr "Godkjenn"
 
-#: ../finch/gntaccount.c:960
-#: ../finch/gntaccount.c:987
-#: ../pidgin/gtkaccount.c:2576
-#: ../pidgin/gtkaccount.c:2582
+#: ../finch/gntaccount.c:966
+#: ../finch/gntaccount.c:993
+#: ../pidgin/gtkaccount.c:2592
+#: ../pidgin/gtkaccount.c:2598
 msgid "Deny"
 msgstr "Avslå"
 
@@ -375,49 +378,49 @@
 msgstr "Klarte ikkje å leggja til venn"
 
 #: ../finch/gntblist.c:324
-#: ../libpurple/protocols/oscar/oscar.c:2864
-#: ../pidgin/gtkaccount.c:1983
+#: ../libpurple/protocols/oscar/oscar.c:2858
+#: ../pidgin/gtkaccount.c:1990
 #: ../pidgin/gtksavedstatuses.c:979
 msgid "Screen Name"
 msgstr "Brukarnamn"
 
 #: ../finch/gntblist.c:327
-#: ../finch/gntblist.c:404
-#: ../finch/gntblist.c:1240
+#: ../finch/gntblist.c:409
+#: ../finch/gntblist.c:1249
 #: ../libpurple/protocols/msn/msn.c:1364
 #: ../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:976
-#: ../pidgin/gtkdialogs.c:1000
-#: ../pidgin/gtkdialogs.c:1022
+#: ../pidgin/gtkdialogs.c:996
+#: ../pidgin/gtkdialogs.c:1020
+#: ../pidgin/gtkdialogs.c:1042
 #: ../pidgin/gtkrequest.c:277
 msgid "Alias"
 msgstr "Alias"
 
 #: ../finch/gntblist.c:330
-#: ../finch/gntblist.c:407
+#: ../finch/gntblist.c:412
 msgid "Group"
 msgstr "Gruppe"
 
 #: ../finch/gntblist.c:334
-#: ../finch/gntblist.c:395
-#: ../finch/gntblist.c:1292
+#: ../finch/gntblist.c:400
+#: ../finch/gntblist.c:1301
 #: ../finch/gntnotify.c:173
 #: ../finch/gntstatus.c:572
 #: ../libpurple/plugins/idle.c:153
 #: ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:2974
-#: ../pidgin/gtknotify.c:482
+#: ../pidgin/gtkblist.c:2986
+#: ../pidgin/gtknotify.c:483
 #: ../pidgin/gtkpounce.c:1282
-#: ../pidgin/plugins/gevolution/gevolution.c:443
+#: ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr "Konto"
 
 #: ../finch/gntblist.c:340
-#: ../finch/gntblist.c:843
+#: ../finch/gntblist.c:851
 #: ../libpurple/protocols/silc/buddy.c:725
 #: ../libpurple/protocols/silc/buddy.c:1027
 #: ../libpurple/protocols/silc/buddy.c:1072
@@ -426,8 +429,8 @@
 #: ../libpurple/protocols/silc10/buddy.c:1033
 #: ../libpurple/protocols/silc10/buddy.c:1080
 #: ../libpurple/protocols/silc10/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3161
-#: ../pidgin/gtkblist.c:5420
+#: ../libpurple/protocols/yahoo/yahoo.c:3182
+#: ../pidgin/gtkblist.c:5435
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "Legg til venn"
@@ -436,13 +439,13 @@
 msgid "Please enter buddy information."
 msgstr "Skriv inn venneinformasjonen."
 
-#: ../finch/gntblist.c:367
+#: ../finch/gntblist.c:369
 #: ../libpurple/blist.c:1190
 msgid "Chats"
 msgstr "Prat"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:401
+#: ../finch/gntblist.c:406
 #: ../libpurple/protocols/jabber/jabber.c:813
 #: ../libpurple/protocols/msn/msn.c:1553
 #: ../libpurple/protocols/msn/msn.c:1618
@@ -455,162 +458,163 @@
 msgid "Name"
 msgstr "Namn"
 
-#: ../finch/gntblist.c:410
-#: ../finch/gntblist.c:845
-#: ../pidgin/gtkblist.c:5800
+#: ../finch/gntblist.c:415
+#: ../finch/gntblist.c:818
+msgid "Auto-join"
+msgstr "Automatisk tilkopling"
+
+#: ../finch/gntblist.c:418
+#: ../finch/gntblist.c:853
+#: ../pidgin/gtkblist.c:5814
 msgid "Add Chat"
 msgstr "Legg til praterom"
 
-#: ../finch/gntblist.c:411
+#: ../finch/gntblist.c:419
 msgid "You can edit more information from the context menu later."
 msgstr "Du kan endra meir informasjon frå lokalmenyen seinare."
 
-#: ../finch/gntblist.c:424
-#: ../finch/gntblist.c:437
+#: ../finch/gntblist.c:432
+#: ../finch/gntblist.c:445
 msgid "Error adding group"
 msgstr "Klarte ikkje å leggja til gruppe"
 
-#: ../finch/gntblist.c:425
+#: ../finch/gntblist.c:433
 msgid "You must give a name for the group to add."
 msgstr "Gruppa du ønskjer å leggja til må ha eit namn."
 
-#: ../finch/gntblist.c:438
+#: ../finch/gntblist.c:446
 msgid "A group with the name already exists."
 msgstr "Det finst allereie ei gruppe med det namnet."
 
-#: ../finch/gntblist.c:445
-#: ../finch/gntblist.c:847
-#: ../libpurple/protocols/sametime/sametime.c:5396
-#: ../libpurple/protocols/sametime/sametime.c:5484
-#: ../pidgin/gtkblist.c:5911
+#: ../finch/gntblist.c:453
+#: ../finch/gntblist.c:855
+#: ../libpurple/protocols/sametime/sametime.c:5397
+#: ../libpurple/protocols/sametime/sametime.c:5485
+#: ../pidgin/gtkblist.c:5925
 msgid "Add Group"
 msgstr "Legg til gruppe"
 
-#: ../finch/gntblist.c:445
+#: ../finch/gntblist.c:453
 msgid "Enter the name of the group"
 msgstr "Skriv inn namnet på gruppa"
 
-#: ../finch/gntblist.c:793
+#: ../finch/gntblist.c:801
 msgid "Edit Chat"
 msgstr "Endra praterom"
 
-#: ../finch/gntblist.c:793
+#: ../finch/gntblist.c:801
 msgid "Please Update the necessary fields."
 msgstr "Oppdater dei nødvendige felta."
 
-#: ../finch/gntblist.c:794
+#: ../finch/gntblist.c:802
 #: ../finch/gntstatus.c:204
 msgid "Edit"
 msgstr "Endre"
 
-#: ../finch/gntblist.c:810
-msgid "Auto-join"
-msgstr "Automatisk tilkopling"
-
-#: ../finch/gntblist.c:819
+#: ../finch/gntblist.c:827
 msgid "Edit Settings"
 msgstr "Endra innstillingar"
 
-#: ../finch/gntblist.c:855
-#: ../pidgin/gtkutils.c:926
+#: ../finch/gntblist.c:863
+#: ../pidgin/gtkutils.c:930
 msgid "Information"
 msgstr "Informasjon"
 
-#: ../finch/gntblist.c:855
-#: ../pidgin/gtkutils.c:926
+#: ../finch/gntblist.c:863
+#: ../pidgin/gtkutils.c:930
 msgid "Retrieving..."
 msgstr "Hentar…"
 
-#: ../finch/gntblist.c:895
+#: ../finch/gntblist.c:903
 #: ../finch/gntconv.c:407
 #: ../libpurple/protocols/silc/chat.c:899
 #: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr "Hent info"
 
-#: ../finch/gntblist.c:899
+#: ../finch/gntblist.c:907
 msgid "Add Buddy Pounce"
 msgstr "Legg til vennevarsling"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:906
+#: ../finch/gntblist.c:914
 #: ../finch/gntconv.c:419
 #: ../libpurple/protocols/jabber/si.c:868
-#: ../libpurple/protocols/oscar/oscar.c:654
-#: ../libpurple/protocols/qq/qq.c:585
-#: ../pidgin/gtkconv.c:1599
+#: ../libpurple/protocols/oscar/oscar.c:653
+#: ../libpurple/protocols/qq/qq.c:587
+#: ../pidgin/gtkconv.c:1601
 msgid "Send File"
 msgstr "Send fil"
 
-#: ../finch/gntblist.c:910
+#: ../finch/gntblist.c:918
 msgid "View Log"
 msgstr "Vis l_ogg"
 
-#: ../finch/gntblist.c:991
+#: ../finch/gntblist.c:999
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "Skriv inn det nye namnet til %s"
 
-#: ../finch/gntblist.c:993
-#: ../finch/gntblist.c:1240
+#: ../finch/gntblist.c:1001
+#: ../finch/gntblist.c:1249
 msgid "Rename"
 msgstr "Gje nytt namn"
 
-#: ../finch/gntblist.c:993
+#: ../finch/gntblist.c:1001
 msgid "Set Alias"
 msgstr "Skriv alias:"
 
-#: ../finch/gntblist.c:994
+#: ../finch/gntblist.c:1002
 msgid "Enter empty string to reset the name."
 msgstr "Legg inn ein tom tekststreng for å nullstilla namnet."
 
-#: ../finch/gntblist.c:1070
+#: ../finch/gntblist.c:1078
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr "Å sletta denne kontakten vil òg sletta alle vennane til kontakten"
 
-#: ../finch/gntblist.c:1078
+#: ../finch/gntblist.c:1086
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr "Å sletta denne gruppa vil òg sletta alle vennane i gruppa"
 
-#: ../finch/gntblist.c:1083
+#: ../finch/gntblist.c:1091
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "Er du sikker på at du ønskjer å sletta %s?"
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1086
+#: ../finch/gntblist.c:1094
 msgid "Confirm Remove"
 msgstr "Stadfest fjerninga"
 
-#: ../finch/gntblist.c:1091
-#: ../finch/gntblist.c:1242
+#: ../finch/gntblist.c:1099
+#: ../finch/gntblist.c:1251
 #: ../finch/gntft.c:224
-#: ../pidgin/gtkconv.c:1648
+#: ../pidgin/gtkconv.c:1650
 #: ../pidgin/gtkrequest.c:275
 #: ../pidgin/gtkstatusbox.c:263
 msgid "Remove"
 msgstr "_Fjern"
 
 #. Buddy List
-#: ../finch/gntblist.c:1216
-#: ../finch/gntblist.c:2283
+#: ../finch/gntblist.c:1225
+#: ../finch/gntblist.c:2294
 #: ../finch/gntprefs.c:257
-#: ../finch/gntui.c:78
-#: ../pidgin/gtkblist.c:4256
+#: ../finch/gntui.c:82
+#: ../pidgin/gtkblist.c:4271
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:330
 msgid "Buddy List"
 msgstr "Venneliste"
 
-#: ../finch/gntblist.c:1247
+#: ../finch/gntblist.c:1256
 msgid "Place tagged"
 msgstr "Merka stad"
 
-#: ../finch/gntblist.c:1252
+#: ../finch/gntblist.c:1261
 msgid "Toggle Tag"
 msgstr "Slå merke av/på"
 
 #. General
-#: ../finch/gntblist.c:1287
+#: ../finch/gntblist.c:1296
 #: ../libpurple/protocols/gg/gg.c:632
 #: ../libpurple/protocols/gg/gg.c:1045
 #: ../libpurple/protocols/gg/gg.c:1118
@@ -632,33 +636,33 @@
 #: ../libpurple/protocols/silc10/ops.c:1179
 #: ../libpurple/protocols/silc10/ops.c:1328
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1066
-#: ../pidgin/gtkblist.c:2998
+#: ../pidgin/gtkblist.c:3010
 msgid "Nickname"
 msgstr "Kallenamn"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1307
+#: ../finch/gntblist.c:1316
 #: ../finch/gntprefs.c:260
-#: ../libpurple/protocols/bonjour/bonjour.c:314
+#: ../libpurple/protocols/bonjour/bonjour.c:333
 #: ../libpurple/protocols/jabber/buddy.c:647
 #: ../libpurple/protocols/jabber/buddy.c:687
 #: ../libpurple/protocols/msn/msn.c:516
 #: ../libpurple/protocols/msn/state.c:32
 #: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2888
-#: ../libpurple/protocols/yahoo/yahoo.c:2915
+#: ../libpurple/protocols/oscar/oscar.c:2882
+#: ../libpurple/protocols/yahoo/yahoo.c:2936
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:710
-#: ../pidgin/gtkblist.c:3026
-#: ../pidgin/gtkblist.c:3435
-#: ../pidgin/gtkprefs.c:1918
+#: ../pidgin/gtkblist.c:3038
+#: ../pidgin/gtkblist.c:3447
+#: ../pidgin/gtkprefs.c:1920
 msgid "Idle"
 msgstr "Uverksam"
 
-#: ../finch/gntblist.c:1320
+#: ../finch/gntblist.c:1330
 msgid "On Mobile"
 msgstr "På mobil"
 
-#: ../finch/gntblist.c:1400
+#: ../finch/gntblist.c:1411
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -667,12 +671,12 @@
 "Tilkopla: %d\n"
 "Totalt: %d"
 
-#: ../finch/gntblist.c:1409
+#: ../finch/gntblist.c:1420
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "Konto: %s (%s)"
 
-#: ../finch/gntblist.c:1421
+#: ../finch/gntblist.c:1432
 #, c-format
 msgid ""
 "\n"
@@ -681,51 +685,51 @@
 "\n"
 "Sist sett: %s ago"
 
-#: ../finch/gntblist.c:1687
+#: ../finch/gntblist.c:1698
 #: ../pidgin/gtkdocklet.c:470
 #: ../pidgin/gtkstatusbox.c:1070
 msgid "New..."
 msgstr "Ny…"
 
-#: ../finch/gntblist.c:1694
+#: ../finch/gntblist.c:1705
 #: ../pidgin/gtkdocklet.c:471
 #: ../pidgin/gtkstatusbox.c:1071
 msgid "Saved..."
 msgstr "Lagra…"
 
-#: ../finch/gntblist.c:2072
+#: ../finch/gntblist.c:2083
 #: ../finch/gntplugin.c:254
-#: ../finch/gntui.c:82
+#: ../finch/gntui.c:86
 #: ../pidgin/gtkdocklet.c:523
 #: ../pidgin/gtkplugin.c:530
 msgid "Plugins"
 msgstr "Tilleggsprogram"
 
-#: ../finch/gntblist.c:2179
-#: ../pidgin/gtkdialogs.c:708
-#: ../pidgin/gtkdialogs.c:846
-#: ../pidgin/gtkdialogs.c:927
+#: ../finch/gntblist.c:2190
+#: ../pidgin/gtkdialogs.c:728
+#: ../pidgin/gtkdialogs.c:866
+#: ../pidgin/gtkdialogs.c:947
 msgid "_Name"
 msgstr "_Namn"
 
-#: ../finch/gntblist.c:2184
-#: ../pidgin/gtkdialogs.c:713
-#: ../pidgin/gtkdialogs.c:851
-#: ../pidgin/gtkdialogs.c:932
+#: ../finch/gntblist.c:2195
+#: ../pidgin/gtkdialogs.c:733
+#: ../pidgin/gtkdialogs.c:871
+#: ../pidgin/gtkdialogs.c:952
 msgid "_Account"
 msgstr "_Konto"
 
-#: ../finch/gntblist.c:2192
-#: ../pidgin/gtkdialogs.c:721
+#: ../finch/gntblist.c:2203
+#: ../pidgin/gtkdialogs.c:741
 msgid "New Instant Message"
 msgstr "Ny lynmelding"
 
-#: ../finch/gntblist.c:2194
-#: ../pidgin/gtkdialogs.c:723
+#: ../finch/gntblist.c:2205
+#: ../pidgin/gtkdialogs.c:743
 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:2197
+#: ../finch/gntblist.c:2208
 #: ../finch/gntnotify.c:79
 #: ../libpurple/account.c:983
 #: ../libpurple/account.c:1233
@@ -738,7 +742,7 @@
 #: ../libpurple/protocols/msn/msn.c:275
 #: ../libpurple/protocols/msn/msn.c:292
 #: ../libpurple/protocols/msn/msn.c:309
-#: ../libpurple/protocols/oscar/oscar.c:6072
+#: ../libpurple/protocols/oscar/oscar.c:6041
 #: ../libpurple/protocols/silc/buddy.c:454
 #: ../libpurple/protocols/silc/buddy.c:1190
 #: ../libpurple/protocols/silc/chat.c:447
@@ -755,45 +759,45 @@
 #: ../libpurple/protocols/silc10/ops.c:1297
 #: ../libpurple/protocols/silc10/ops.c:1903
 #: ../libpurple/protocols/silc10/silc.c:735
-#: ../libpurple/protocols/yahoo/yahoo.c:988
-#: ../libpurple/protocols/yahoo/yahoo.c:3247
-#: ../libpurple/protocols/yahoo/yahoo.c:3258
-#: ../pidgin/gtkblist.c:4013
-#: ../pidgin/gtkdialogs.c:726
-#: ../pidgin/gtkdialogs.c:864
-#: ../pidgin/gtkdialogs.c:956
+#: ../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
 #: ../pidgin/gtkrequest.c:269
 msgid "OK"
 msgstr "OK"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2217
+#: ../finch/gntblist.c:2228
 #: ../finch/gntpounce.c:446
 #: ../pidgin/gtkpounce.c:791
 msgid "Options"
 msgstr "Val"
 
-#: ../finch/gntblist.c:2223
+#: ../finch/gntblist.c:2234
 msgid "Send IM..."
 msgstr "Send lynmelding…"
 
-#: ../finch/gntblist.c:2227
+#: ../finch/gntblist.c:2238
 msgid "Show empty groups"
 msgstr "Vis tomme grupper"
 
-#: ../finch/gntblist.c:2233
+#: ../finch/gntblist.c:2244
 msgid "Show offline buddies"
 msgstr "Vis fråkopla vennar"
 
-#: ../finch/gntblist.c:2239
+#: ../finch/gntblist.c:2250
 msgid "Sort by status"
 msgstr "Sorter etter tilstand"
 
-#: ../finch/gntblist.c:2243
+#: ../finch/gntblist.c:2254
 msgid "Sort alphabetically"
 msgstr "Sorter alfabetisk "
 
-#: ../finch/gntblist.c:2247
+#: ../finch/gntblist.c:2258
 msgid "Sort by log size"
 msgstr "Sorter etter loggstorleiken"
 
@@ -823,27 +827,27 @@
 msgstr "Kommandoen finst ikkje."
 
 #: ../finch/gntconv.c:121
-#: ../pidgin/gtkconv.c:492
+#: ../pidgin/gtkconv.c:494
 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:498
+#: ../pidgin/gtkconv.c:500
 msgid "Your command failed for an unknown reason."
 msgstr "Kommandoen din feila av ukjend årsak."
 
 #: ../finch/gntconv.c:131
-#: ../pidgin/gtkconv.c:505
+#: ../pidgin/gtkconv.c:507
 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:508
+#: ../pidgin/gtkconv.c:510
 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:513
+#: ../pidgin/gtkconv.c:515
 msgid "That command doesn't work on this protocol."
 msgstr "Den kommandoen verkar ikkje i denne protokollen."
 
@@ -892,7 +896,7 @@
 msgid "Add Buddy Pounce..."
 msgstr "Legg til vennevarsling…"
 
-#: ../finch/gntconv.c:614
+#: ../finch/gntconv.c:613
 msgid "<AUTO-REPLY> "
 msgstr "<AUTO-REPLY> "
 
@@ -902,17 +906,17 @@
 msgstr "Brukarliste:\n"
 
 #: ../finch/gntconv.c:880
-#: ../pidgin/gtkconv.c:335
+#: ../pidgin/gtkconv.c:337
 msgid "Supported debug options are:  version"
 msgstr "Støtta feilsøkingsval er:  versjon"
 
 #: ../finch/gntconv.c:915
-#: ../pidgin/gtkconv.c:384
+#: ../pidgin/gtkconv.c:386
 msgid "No such command (in this context)."
 msgstr "Kommandoen finst ikkje (i denne samanhengen)."
 
 #: ../finch/gntconv.c:918
-#: ../pidgin/gtkconv.c:387
+#: ../pidgin/gtkconv.c:389
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -921,27 +925,27 @@
 "Dei følgjande kommandoane er tilgjengelege i denne samanhengen:\n"
 
 #: ../finch/gntconv.c:976
-#: ../pidgin/gtkconv.c:7198
+#: ../pidgin/gtkconv.c:7343
 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:7201
+#: ../pidgin/gtkconv.c:7346
 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:7204
+#: ../pidgin/gtkconv.c:7349
 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:7207
+#: ../pidgin/gtkconv.c:7352
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Tømmer skjermen."
 
 #: ../finch/gntconv.c:988
-#: ../pidgin/gtkconv.c:7213
+#: ../pidgin/gtkconv.c:7358
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;command&gt;: Hjelp til ein spesifikk kommando."
 
@@ -974,7 +978,7 @@
 msgstr "statuses: viser lagra status-vindauget."
 
 #: ../finch/gntdebug.c:234
-#: ../finch/gntui.c:80
+#: ../finch/gntui.c:84
 #: ../pidgin/gtkdebug.c:694
 msgid "Debug Window"
 msgstr "Feilsøkingsvindauge"
@@ -1006,7 +1010,7 @@
 #. Create the window.
 #: ../finch/gntft.c:122
 #: ../finch/gntft.c:195
-#: ../finch/gntui.c:81
+#: ../finch/gntui.c:85
 #: ../pidgin/gtkft.c:233
 #: ../pidgin/gtkft.c:761
 msgid "File Transfers"
@@ -1040,7 +1044,7 @@
 #: ../finch/gntft.c:198
 #: ../finch/gntstatus.c:543
 #: ../finch/gntstatus.c:572
-#: ../libpurple/protocols/bonjour/bonjour.c:318
+#: ../libpurple/protocols/bonjour/bonjour.c:337
 #: ../libpurple/protocols/gg/gg.c:1034
 #: ../libpurple/protocols/gg/gg.c:1571
 #: ../libpurple/protocols/gg/gg.c:1579
@@ -1050,17 +1054,17 @@
 #: ../libpurple/protocols/jabber/jabber.c:1212
 #: ../libpurple/protocols/msn/msn.c:515
 #: ../libpurple/protocols/novell/novell.c:2835
-#: ../libpurple/protocols/oscar/oscar.c:821
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:2676
-#: ../libpurple/protocols/oscar/oscar.c:3794
-#: ../libpurple/protocols/sametime/sametime.c:3263
-#: ../libpurple/protocols/sametime/sametime.c:4150
-#: ../libpurple/protocols/yahoo/yahoo.c:3066
-#: ../pidgin/gtkblist.c:3070
-#: ../pidgin/gtkblist.c:3083
-#: ../pidgin/gtkblist.c:3085
+#: ../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
 #: ../pidgin/gtksavedstatuses.c:998
 #: ../pidgin/gtksavedstatuses.c:1143
 msgid "Status"
@@ -1088,7 +1092,7 @@
 #: ../libpurple/protocols/msn/msn.c:375
 #: ../libpurple/protocols/silc/util.c:382
 #: ../libpurple/protocols/silc10/util.c:377
-#: ../pidgin/gtkaccount.c:2474
+#: ../pidgin/gtkaccount.c:2484
 #: ../pidgin/gtkrequest.c:272
 msgid "Close"
 msgstr "Lukk"
@@ -1138,12 +1142,12 @@
 msgstr "Du har fått e-post."
 
 #: ../finch/gntnotify.c:173
-#: ../pidgin/gtknotify.c:489
+#: ../pidgin/gtknotify.c:490
 msgid "Sender"
 msgstr "Sendar"
 
 #: ../finch/gntnotify.c:173
-#: ../pidgin/gtknotify.c:496
+#: ../pidgin/gtknotify.c:497
 msgid "Subject"
 msgstr "Emne"
 
@@ -1155,34 +1159,35 @@
 msgstr[1] "%s (%s) har %d nye meldingar."
 
 #: ../finch/gntnotify.c:224
-#: ../pidgin/gtknotify.c:335
+#: ../pidgin/gtknotify.c:336
 msgid "New Mail"
 msgstr "Ny e-postmelding"
 
 #: ../finch/gntnotify.c:289
-#: ../pidgin/gtknotify.c:916
+#: ../pidgin/gtknotify.c:918
 #, c-format
 msgid "Info for %s"
-msgstr "Info til %s"
+msgstr "Info om %s"
 
 #: ../finch/gntnotify.c:290
 #: ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:917
+#: ../pidgin/gtknotify.c:919
 msgid "Buddy Information"
 msgstr "Venneinformasjon"
 
 #: ../finch/gntnotify.c:376
+#: ../libpurple/protocols/qq/group_join.c:367
 msgid "Continue"
 msgstr "Hald fram"
 
 #: ../finch/gntnotify.c:382
-#: ../pidgin/gtkconv.c:1627
+#: ../pidgin/gtkconv.c:1629
 #: ../pidgin/gtkdebug.c:834
 msgid "Info"
 msgstr "Informasjon"
 
 #: ../finch/gntnotify.c:385
-#: ../pidgin/gtkconv.c:1588
+#: ../pidgin/gtkconv.c:1590
 msgid "IM"
 msgstr "Lynmeldingar"
 
@@ -1191,7 +1196,7 @@
 msgstr "Bli med"
 
 #: ../finch/gntnotify.c:391
-#: ../libpurple/protocols/sametime/sametime.c:3473
+#: ../libpurple/protocols/sametime/sametime.c:3474
 msgid "Invite"
 msgstr "Inviter"
 
@@ -1253,9 +1258,9 @@
 #: ../finch/gntplugin.c:370
 #: ../finch/gntplugin.c:377
 #: ../finch/gntprefs.c:263
-#: ../finch/gntui.c:83
+#: ../finch/gntui.c:88
 #: ../pidgin/gtkdocklet.c:524
-#: ../pidgin/gtkprefs.c:2060
+#: ../pidgin/gtkprefs.c:2062
 msgid "Preferences"
 msgstr "Innstillingar "
 
@@ -1377,7 +1382,7 @@
 msgstr "Er du sikker på at du ønskjer å sletta varselet i %s  for %s??"
 
 #: ../finch/gntpounce.c:685
-#: ../finch/gntui.c:79
+#: ../finch/gntui.c:83
 #: ../pidgin/gtkpounce.c:1339
 msgid "Buddy Pounces"
 msgstr "Vennevarsel"
@@ -1452,15 +1457,15 @@
 msgstr "Basert på tastaturbruk"
 
 #: ../finch/gntprefs.c:93
-#: ../pidgin/gtkprefs.c:1923
+#: ../pidgin/gtkprefs.c:1925
 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:1922
-#: ../pidgin/gtkprefs.c:1936
+#: ../pidgin/gtkprefs.c:1924
+#: ../pidgin/gtkprefs.c:1938
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:337
 msgid "Never"
 msgstr "Aldri"
@@ -1512,14 +1517,14 @@
 #. Conversations
 #: ../finch/gntprefs.c:258
 #: ../pidgin/gtkprefs.c:992
-#: ../pidgin/gtkprefs.c:2026
+#: ../pidgin/gtkprefs.c:2028
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:344
 msgid "Conversations"
 msgstr "Samtaler"
 
 #: ../finch/gntprefs.c:259
-#: ../pidgin/gtkprefs.c:1462
-#: ../pidgin/gtkprefs.c:2037
+#: ../pidgin/gtkprefs.c:1464
+#: ../pidgin/gtkprefs.c:2039
 msgid "Logging"
 msgstr "Loggføring"
 
@@ -1528,17 +1533,197 @@
 msgstr "Enno ikkje teken i bruk."
 
 #: ../finch/gntrequest.c:635
-#: ../pidgin/gtkrequest.c:1526
-#: ../pidgin/gtkrequest.c:1572
+#: ../pidgin/gtkrequest.c:1552
+#: ../pidgin/gtkrequest.c:1598
 msgid "Save File..."
 msgstr "Lagra fil…"
 
 #: ../finch/gntrequest.c:635
-#: ../pidgin/gtkrequest.c:1527
-#: ../pidgin/gtkrequest.c:1573
+#: ../pidgin/gtkrequest.c:1553
+#: ../pidgin/gtkrequest.c:1599
 msgid "Open File..."
 msgstr "Opna fil…"
 
+#: ../finch/gntsound.c:94
+#: ../pidgin/gtksound.c:63
+msgid "Buddy logs in"
+msgstr "Venn loggar inn"
+
+#: ../finch/gntsound.c:95
+#: ../pidgin/gtksound.c:64
+msgid "Buddy logs out"
+msgstr "Venn loggar ut"
+
+#: ../finch/gntsound.c:96
+#: ../pidgin/gtksound.c:65
+msgid "Message received"
+msgstr "Melding motteken"
+
+#: ../finch/gntsound.c:97
+#: ../pidgin/gtksound.c:66
+msgid "Message received begins conversation"
+msgstr "Motteken melding startar samtala"
+
+#: ../finch/gntsound.c:98
+#: ../pidgin/gtksound.c:67
+msgid "Message sent"
+msgstr "Melding sendt"
+
+#: ../finch/gntsound.c:99
+#: ../pidgin/gtksound.c:68
+msgid "Person enters chat"
+msgstr "Person kjem inn i rommet"
+
+#: ../finch/gntsound.c:100
+#: ../pidgin/gtksound.c:69
+msgid "Person leaves chat"
+msgstr "Person forlèt rommet"
+
+#: ../finch/gntsound.c:101
+#: ../pidgin/gtksound.c:70
+msgid "You talk in chat"
+msgstr "Du pratar i rommet"
+
+#: ../finch/gntsound.c:102
+#: ../pidgin/gtksound.c:71
+msgid "Others talk in chat"
+msgstr "Andre pratar i rommet"
+
+#: ../finch/gntsound.c:104
+#: ../pidgin/gtksound.c:74
+msgid "Someone says your screen name in chat"
+msgstr "Nokon seier brukarnamnet ditt i praterommet"
+
+#: ../finch/gntsound.c:357
+#: ../pidgin/gtksound.c:310
+msgid "GStreamer Failure"
+msgstr "GStreamer-svikt"
+
+#: ../finch/gntsound.c:358
+#: ../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
+msgid "(default)"
+msgstr "(standard)"
+
+#: ../finch/gntsound.c:719
+msgid "Select Sound File ..."
+msgstr "Vel lydfil…"
+
+#: ../finch/gntsound.c:893
+msgid "Sound Preferences"
+msgstr "Lydinnstillingar "
+
+#: ../finch/gntsound.c:904
+msgid "Profiles"
+msgstr "Profilar"
+
+#: ../finch/gntsound.c:943
+#: ../pidgin/gtkprefs.c:1712
+msgid "Automatic"
+msgstr "Automatisk"
+
+#: ../finch/gntsound.c:946
+msgid "Console Beep"
+msgstr "Konsollyd"
+
+#: ../finch/gntsound.c:947
+#: ../pidgin/gtkprefs.c:1716
+msgid "Command"
+msgstr "Kommando"
+
+#: ../finch/gntsound.c:948
+msgid "No Sound"
+msgstr "Ingen lyd"
+
+#: ../finch/gntsound.c:950
+#: ../pidgin/gtkprefs.c:1707
+msgid "Sound Method"
+msgstr "Lydmetode"
+
+#: ../finch/gntsound.c:955
+msgid "Method: "
+msgstr "Metode:"
+
+#: ../finch/gntsound.c:962
+#, c-format
+msgid ""
+"Sound Command\n"
+"(%s for filename)"
+msgstr ""
+"Lydkommando:\n"
+"(%s for filnamn)"
+
+#. Sound options
+#: ../finch/gntsound.c:970
+#: ../pidgin/gtkprefs.c:1751
+msgid "Sound Options"
+msgstr "Lydinnstillingar"
+
+#: ../finch/gntsound.c:971
+msgid "Sounds when conversation has focus"
+msgstr "Lydar når samtalevindauget har fokus"
+
+#: ../finch/gntsound.c:979
+#: ../pidgin/gtkprefs.c:896
+#: ../pidgin/gtkprefs.c:908
+#: ../pidgin/gtkprefs.c:1758
+#: ../pidgin/plugins/timestamp_format.c:42
+#: ../pidgin/plugins/timestamp_format.c:51
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:338
+msgid "Always"
+msgstr "Alltid"
+
+#: ../finch/gntsound.c:980
+#: ../pidgin/gtkprefs.c:1756
+msgid "Only when available"
+msgstr "Berre når tilgjengeleg"
+
+#: ../finch/gntsound.c:981
+#: ../pidgin/gtkprefs.c:1757
+msgid "Only when not available"
+msgstr "Berre når ikkje tilgjengeleg"
+
+#: ../finch/gntsound.c:988
+msgid "Volume(0-100):"
+msgstr "Volum (0-100):"
+
+#. Sound events
+#: ../finch/gntsound.c:1005
+#: ../pidgin/gtkprefs.c:1793
+msgid "Sound Events"
+msgstr "Lydhendingar"
+
+#: ../finch/gntsound.c:1007
+#: ../pidgin/gtkprefs.c:1852
+msgid "Event"
+msgstr "Hending"
+
+#: ../finch/gntsound.c:1007
+msgid "File"
+msgstr "Fil"
+
+#: ../finch/gntsound.c:1026
+#: ../pidgin/gtkprefs.c:1871
+msgid "Test"
+msgstr "Test"
+
+#: ../finch/gntsound.c:1029
+#: ../pidgin/gtkprefs.c:1875
+msgid "Reset"
+msgstr "Nullstill"
+
+#: ../finch/gntsound.c:1032
+#: ../pidgin/gtkprefs.c:1879
+msgid "Choose..."
+msgstr "Vel…"
+
 #: ../finch/gntstatus.c:137
 #, c-format
 msgid "Are you sure you want to delete \"%s\""
@@ -1570,9 +1755,9 @@
 #: ../finch/gntstatus.c:182
 #: ../finch/gntstatus.c:560
 #: ../finch/gntstatus.c:572
-#: ../libpurple/protocols/bonjour/bonjour.c:247
-#: ../libpurple/protocols/bonjour/bonjour.c:254
-#: ../libpurple/protocols/bonjour/bonjour.c:320
+#: ../libpurple/protocols/bonjour/bonjour.c:249
+#: ../libpurple/protocols/bonjour/bonjour.c:256
+#: ../libpurple/protocols/bonjour/bonjour.c:339
 #: ../libpurple/protocols/gg/gg.c:1072
 #: ../libpurple/protocols/gg/gg.c:1574
 #: ../libpurple/protocols/gg/gg.c:1592
@@ -1591,21 +1776,21 @@
 #: ../libpurple/protocols/novell/novell.c:2941
 #: ../libpurple/protocols/novell/novell.c:2947
 #: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/oscar/oscar.c:5533
-#: ../libpurple/protocols/oscar/oscar.c:5751
-#: ../libpurple/protocols/oscar/oscar.c:5765
-#: ../libpurple/protocols/oscar/oscar.c:5781
-#: ../libpurple/protocols/oscar/oscar.c:5788
-#: ../libpurple/protocols/oscar/oscar.c:5795
-#: ../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/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/silc/buddy.c:1551
 #: ../libpurple/protocols/silc10/buddy.c:1551
 #: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3494
-#: ../libpurple/protocols/yahoo/yahoo.c:3500
+#: ../libpurple/protocols/yahoo/yahoo.c:3590
+#: ../libpurple/protocols/yahoo/yahoo.c:3596
 #: ../libpurple/protocols/zephyr/zephyr.c:2337
 #: ../pidgin/gtksavedstatuses.c:525
 #: ../pidgin/gtksavedstatuses.c:1009
@@ -1660,7 +1845,12 @@
 msgid "Save & Use"
 msgstr "Lagra og bruk"
 
-#: ../finch/gntui.c:84
+#: ../finch/gntui.c:87
+#: ../pidgin/gtkprefs.c:2030
+msgid "Sounds"
+msgstr "Lydar"
+
+#: ../finch/gntui.c:89
 msgid "Statuses"
 msgstr "Tilstandar"
 
@@ -1822,7 +2012,7 @@
 
 #: ../libpurple/account.c:1012
 #: ../libpurple/connection.c:107
-#: ../pidgin/gtkblist.c:4010
+#: ../pidgin/gtkblist.c:4023
 msgid "Connection Error"
 msgstr "Tilkoplingsfeil"
 
@@ -1873,7 +2063,7 @@
 #: ../libpurple/protocols/jabber/buddy.c:1462
 #: ../libpurple/protocols/jabber/buddy.c:1479
 #: ../libpurple/protocols/novell/novell.c:2831
-#: ../libpurple/protocols/qq/qq.c:230
+#: ../libpurple/protocols/qq/qq.c:232
 #: ../pidgin/gtkft.c:159
 msgid "Unknown"
 msgstr "Ukjend"
@@ -1882,7 +2072,7 @@
 #: ../libpurple/blist.c:1289
 #: ../libpurple/blist.c:1518
 #: ../libpurple/protocols/jabber/roster.c:68
-#: ../pidgin/gtkblist.c:5310
+#: ../pidgin/gtkblist.c:5325
 #: ../pidgin/plugins/gevolution/gevolution.c:96
 #: ../pidgin/plugins/gevolution/gevo-util.c:64
 msgid "Buddies"
@@ -1929,8 +2119,8 @@
 msgstr "Meldinga er for stor."
 
 #: ../libpurple/conversation.c:183
-#: ../libpurple/protocols/bonjour/jabber.c:284
-#: ../libpurple/protocols/bonjour/jabber.c:326
+#: ../libpurple/protocols/bonjour/jabber.c:255
+#: ../libpurple/protocols/bonjour/jabber.c:298
 msgid "Unable to send message."
 msgstr "Klarte ikkje å senda meldinga."
 
@@ -2323,36 +2513,36 @@
 msgid "Old flat format"
 msgstr "Gammalt flatformat"
 
-#: ../libpurple/log.c:837
+#: ../libpurple/log.c:838
 msgid "Logging of this conversation failed."
 msgstr "Klarte ikkje å loggføra denne samtala."
 
-#: ../libpurple/log.c:1280
+#: ../libpurple/log.c:1281
 msgid "XML"
 msgstr "XML"
 
-#: ../libpurple/log.c:1364
+#: ../libpurple/log.c:1365
 #, c-format
 msgid "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
 msgstr "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1366
+#: ../libpurple/log.c:1367
 #, c-format
 msgid "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
 msgstr "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1424
-#: ../libpurple/log.c:1557
+#: ../libpurple/log.c:1425
+#: ../libpurple/log.c:1558
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>Klarte ikkje å finna loggfilbana.</b></font>"
 
-#: ../libpurple/log.c:1436
-#: ../libpurple/log.c:1566
+#: ../libpurple/log.c:1437
+#: ../libpurple/log.c:1567
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>Klarte ikkje å lesa fila: %s</b></font>"
 
-#: ../libpurple/log.c:1498
+#: ../libpurple/log.c:1499
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
@@ -2436,19 +2626,19 @@
 
 #: ../libpurple/plugins/autoaccept.c:164
 msgid "_Save"
-msgstr "_Lagra"
+msgstr "La_gra"
 
 #: ../libpurple/plugins/autoaccept.c:165
 #: ../libpurple/plugins/idle.c:170
 #: ../libpurple/plugins/idle.c:204
 #: ../libpurple/plugins/idle.c:230
-#: ../libpurple/protocols/oscar/oscar.c:1458
-#: ../libpurple/protocols/oscar/oscar.c:2251
-#: ../libpurple/protocols/oscar/oscar.c:2298
-#: ../libpurple/protocols/oscar/oscar.c:5865
-#: ../libpurple/protocols/oscar/oscar.c:5920
-#: ../libpurple/protocols/oscar/oscar.c:6146
-#: ../libpurple/protocols/oscar/oscar.c:6216
+#: ../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/request.h:1387
 #: ../libpurple/request.h:1397
 msgid "_Cancel"
@@ -2495,7 +2685,7 @@
 #: ../libpurple/protocols/msn/msn.c:1629
 #: ../libpurple/protocols/msn/msn.c:1659
 msgid "Notes"
-msgstr "Merknader"
+msgstr "Notat"
 
 #: ../libpurple/plugins/buddynote.c:47
 msgid "Enter your notes below..."
@@ -2514,19 +2704,22 @@
 #. *< priority
 #. *< id
 #: ../libpurple/plugins/buddynote.c:90
+#: ../pidgin/plugins/gtkbuddynote.c:71
 msgid "Buddy Notes"
-msgstr "Vennemerknader"
+msgstr "Vennenotat"
 
 #. *< name
 #. *< version
 #: ../libpurple/plugins/buddynote.c:92
+#: ../pidgin/plugins/gtkbuddynote.c:73
 msgid "Store notes on particular buddies."
 msgstr "Lagra notat på utvalde vennar."
 
 #. *< summary
 #: ../libpurple/plugins/buddynote.c:93
+#: ../pidgin/plugins/gtkbuddynote.c:74
 msgid "Adds the option to store notes for buddies on your buddy list."
-msgstr "Legg til høve til å lagra merknader for dei på vennelista."
+msgstr "Legg til høve til å lagra notat for dei på vennelista."
 
 #. *< type
 #. *< ui_requirement
@@ -2718,108 +2911,108 @@
 #. * offset is way off.  The user should never really see it, but
 #. * it's here just in case.  The parens are to make it clear it's
 #. * not a real timezone.
-#: ../libpurple/plugins/log_reader.c:492
+#: ../libpurple/plugins/log_reader.c:493
 msgid "(UTC)"
 msgstr "(UTC)"
 
-#: ../libpurple/plugins/log_reader.c:1573
+#: ../libpurple/plugins/log_reader.c:1577
 msgid "User is offline."
 msgstr "Brukaren er fråkopla."
 
-#: ../libpurple/plugins/log_reader.c:1579
+#: ../libpurple/plugins/log_reader.c:1583
 msgid "Auto-response sent:"
 msgstr "Automatisk svar sendt:"
 
-#: ../libpurple/plugins/log_reader.c:1589
-#: ../libpurple/plugins/log_reader.c:1592
+#: ../libpurple/plugins/log_reader.c:1593
+#: ../libpurple/plugins/log_reader.c:1596
 #: ../libpurple/plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
 msgstr "%s har logga av."
 
-#: ../libpurple/plugins/log_reader.c:1606
+#: ../libpurple/plugins/log_reader.c:1610
 msgid "One or more messages may have been undeliverable."
 msgstr "Det kan henda at ei eller fleire meldingar ikkje blei leverte."
 
-#: ../libpurple/plugins/log_reader.c:1616
+#: ../libpurple/plugins/log_reader.c:1620
 msgid "You were disconnected from the server."
 msgstr "Du blei fråkopla tenaren."
 
-#: ../libpurple/plugins/log_reader.c:1624
+#: ../libpurple/plugins/log_reader.c:1628
 msgid "You are currently disconnected. Messages will not be received unless you are logged in."
 msgstr "Du er fråkopla. Du kan ikkje få nye meldingar før du loggar på."
 
-#: ../libpurple/plugins/log_reader.c:1639
+#: ../libpurple/plugins/log_reader.c:1643
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr "Meldinga kunne ikkje sendast sia ho var for stor."
 
-#: ../libpurple/plugins/log_reader.c:1644
+#: ../libpurple/plugins/log_reader.c:1648
 msgid "Message could not be sent."
 msgstr "Meldinga kunne ikkje sendast."
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2343
-#: ../libpurple/plugins/log_reader.c:2466
+#: ../libpurple/plugins/log_reader.c:2349
+#: ../libpurple/plugins/log_reader.c:2472
 msgid "Adium"
 msgstr "Adium"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2356
-#: ../libpurple/plugins/log_reader.c:2471
+#: ../libpurple/plugins/log_reader.c:2362
+#: ../libpurple/plugins/log_reader.c:2477
 msgid "Fire"
 msgstr "Fire"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2368
-#: ../libpurple/plugins/log_reader.c:2475
+#: ../libpurple/plugins/log_reader.c:2374
+#: ../libpurple/plugins/log_reader.c:2481
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2382
-#: ../libpurple/plugins/log_reader.c:2480
+#: ../libpurple/plugins/log_reader.c:2388
+#: ../libpurple/plugins/log_reader.c:2486
 msgid "QIP"
 msgstr "QIP"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2394
-#: ../libpurple/plugins/log_reader.c:2484
+#: ../libpurple/plugins/log_reader.c:2400
+#: ../libpurple/plugins/log_reader.c:2490
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2406
-#: ../libpurple/plugins/log_reader.c:2488
+#: ../libpurple/plugins/log_reader.c:2412
+#: ../libpurple/plugins/log_reader.c:2494
 msgid "Trillian"
 msgstr "Trillian"
 
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2448
+#: ../libpurple/plugins/log_reader.c:2454
 msgid "General Log Reading Configuration"
 msgstr "Generelle innstillingar for logglesing"
 
-#: ../libpurple/plugins/log_reader.c:2452
+#: ../libpurple/plugins/log_reader.c:2458
 msgid "Fast size calculations"
 msgstr "Raske storleiksutrekningar"
 
-#: ../libpurple/plugins/log_reader.c:2456
+#: ../libpurple/plugins/log_reader.c:2462
 msgid "Use name heuristics"
 msgstr "Bruk namneheuristikk"
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2462
+#: ../libpurple/plugins/log_reader.c:2468
 msgid "Log Directory"
 msgstr "Loggkatalog"
 
@@ -2829,19 +3022,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2517
+#: ../libpurple/plugins/log_reader.c:2523
 msgid "Log Reader"
 msgstr "Logglesar"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2521
+#: ../libpurple/plugins/log_reader.c:2527
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Tek med loggar frå andre lynmeldingsklientar i loggvisaren."
 
 #. * description
-#: ../libpurple/plugins/log_reader.c:2525
+#: ../libpurple/plugins/log_reader.c:2531
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. Currently, this includes Adium, MSN Messenger, and Trillian.\n"
 "\n"
@@ -3004,7 +3197,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/signals-test.c:684
+#: ../libpurple/plugins/signals-test.c:711
 msgid "Signals Test"
 msgstr "Signaltest"
 
@@ -3012,8 +3205,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/signals-test.c:687
-#: ../libpurple/plugins/signals-test.c:689
+#: ../libpurple/plugins/signals-test.c:714
+#: ../libpurple/plugins/signals-test.c:716
 msgid "Test to see that all signals are working properly."
 msgstr "Testar om alle signala verkar slik dei skal."
 
@@ -3175,29 +3368,43 @@
 msgid "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr "Klarer ikkje å kopla til den lokale mDNS-tenaren. Kjører han?"
 
-#. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
-#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
-#. Away stuff
-#: ../libpurple/protocols/bonjour/bonjour.c:294
-#: ../libpurple/protocols/gg/gg.c:1009
-#: ../libpurple/protocols/irc/irc.c:530
-#: ../libpurple/protocols/irc/msgs.c:310
-#: ../libpurple/protocols/jabber/buddy.c:1472
-#: ../libpurple/protocols/novell/novell.c:2819
-#: ../libpurple/protocols/oscar/oscar.c:733
-#: ../libpurple/protocols/oscar/oscar.c:4545
-#: ../libpurple/protocols/oscar/oscar.c:5611
-#: ../libpurple/protocols/qq/qq.c:180
-#: ../libpurple/protocols/silc/buddy.c:1476
-#: ../libpurple/protocols/silc10/buddy.c:1476
-#: ../libpurple/protocols/yahoo/yahoo.c:3397
-#: ../libpurple/protocols/yahoo/yahoo.c:3470
-#: ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:442
-#: ../pidgin/gtkprefs.c:1932
-#: ../pidgin/gtkstatusbox.c:1056
-msgid "Away"
-msgstr "Vekke"
+#. Creating the options for the protocol
+#: ../libpurple/protocols/bonjour/bonjour.c:344
+#: ../libpurple/protocols/bonjour/bonjour.c:614
+#: ../libpurple/protocols/gg/gg.c:627
+#: ../libpurple/protocols/jabber/jabber.c:828
+msgid "First name"
+msgstr "Fornamn"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:346
+#: ../libpurple/protocols/bonjour/bonjour.c:617
+#: ../libpurple/protocols/gg/gg.c:622
+#: ../libpurple/protocols/jabber/jabber.c:833
+msgid "Last name"
+msgstr "Etternamn"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:350
+#: ../libpurple/protocols/jabber/buddy.c:283
+#: ../libpurple/protocols/jabber/buddy.c:940
+#: ../libpurple/protocols/jabber/buddy.c:948
+#: ../libpurple/protocols/jabber/buddy.c:1629
+#: ../libpurple/protocols/silc/ops.c:1041
+#: ../libpurple/protocols/silc/util.c:555
+#: ../libpurple/protocols/silc10/ops.c:1075
+#: ../libpurple/protocols/silc10/util.c:551
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
+msgid "E-Mail"
+msgstr "E-post"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:353
+#: ../libpurple/protocols/bonjour/bonjour.c:623
+msgid "AIM Account"
+msgstr "AIM-konto"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:356
+#: ../libpurple/protocols/bonjour/bonjour.c:626
+msgid "XMPP Account"
+msgstr "XMPP-konto"
 
 #. *< type
 #. *< ui_requirement
@@ -3209,38 +3416,25 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:425
-#: ../libpurple/protocols/bonjour/bonjour.c:427
+#: ../libpurple/protocols/bonjour/bonjour.c:460
+#: ../libpurple/protocols/bonjour/bonjour.c:462
 msgid "Bonjour Protocol Plugin"
 msgstr "Bonjour protokolktillegg"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:470
-#: ../libpurple/protocols/bonjour/bonjour.c:477
-#: ../libpurple/protocols/bonjour/bonjour.c:535
+#: ../libpurple/protocols/bonjour/bonjour.c:505
+#: ../libpurple/protocols/bonjour/bonjour.c:512
+#: ../libpurple/protocols/bonjour/bonjour.c:561
 msgid "Purple Person"
 msgstr "Purple-person"
 
 #. Creating the user splits
-#: ../libpurple/protocols/bonjour/bonjour.c:583
+#: ../libpurple/protocols/bonjour/bonjour.c:610
 #: ../libpurple/protocols/silc/silc.c:1007
 #: ../libpurple/protocols/silc10/silc.c:918
 msgid "Hostname"
 msgstr "Vertsnamn"
 
-#. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:587
-#: ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/jabber/jabber.c:828
-msgid "First name"
-msgstr "Fornamn"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:590
-#: ../libpurple/protocols/gg/gg.c:622
-#: ../libpurple/protocols/jabber/jabber.c:833
-msgid "Last name"
-msgstr "Etternamn"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:593
+#: ../libpurple/protocols/bonjour/bonjour.c:620
 #: ../libpurple/protocols/gg/gg.c:472
 #: ../libpurple/protocols/jabber/jabber.c:818
 #: ../libpurple/protocols/silc/silc.c:770
@@ -3250,42 +3444,34 @@
 msgid "E-mail"
 msgstr "E-post"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:596
-msgid "AIM Account"
-msgstr "AIM-konto"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:599
-msgid "XMPP Account"
-msgstr "XMPP-konto"
-
 #: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:395
+#: ../libpurple/protocols/bonjour/jabber.c:381
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s har lukka samtala."
 
-#: ../libpurple/protocols/bonjour/jabber.c:441
-#: ../libpurple/protocols/bonjour/jabber.c:654
-#: ../libpurple/protocols/bonjour/jabber.c:679
+#: ../libpurple/protocols/bonjour/jabber.c:433
+#: ../libpurple/protocols/bonjour/jabber.c:656
+#: ../libpurple/protocols/bonjour/jabber.c:674
 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:575
+#: ../libpurple/protocols/bonjour/jabber.c:579
 msgid "Cannot open socket"
 msgstr "Klarte ikkje å opna endepunkt"
 
-#: ../libpurple/protocols/bonjour/jabber.c:583
+#: ../libpurple/protocols/bonjour/jabber.c:587
 msgid "Error setting socket options"
 msgstr "Klarte ikkje å lagra endepunktsval"
 
-#: ../libpurple/protocols/bonjour/jabber.c:607
+#: ../libpurple/protocols/bonjour/jabber.c:611
 msgid "Could not bind socket to port"
 msgstr "Klarte ikkje å binda endepunktet til port"
 
-#: ../libpurple/protocols/bonjour/jabber.c:615
+#: ../libpurple/protocols/bonjour/jabber.c:619
 msgid "Could not listen on socket"
 msgstr "Klarte ikkje å lytta til endepunktet"
 
@@ -3401,8 +3587,8 @@
 #: ../libpurple/protocols/gg/gg.c:1049
 #: ../libpurple/protocols/gg/gg.c:1121
 #: ../libpurple/protocols/jabber/jabber.c:843
-#: ../libpurple/protocols/oscar/oscar.c:3803
-#: ../libpurple/protocols/oscar/oscar.c:3816
+#: ../libpurple/protocols/oscar/oscar.c:3757
+#: ../libpurple/protocols/oscar/oscar.c:3770
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "By"
@@ -3413,12 +3599,12 @@
 
 #: ../libpurple/protocols/gg/gg.c:645
 #: ../libpurple/protocols/msn/msn.c:1558
-#: ../libpurple/protocols/oscar/oscar.c:3746
+#: ../libpurple/protocols/oscar/oscar.c:3700
 #: ../libpurple/protocols/qq/buddy_info.c:46
-#: ../libpurple/protocols/qq/qq.c:224
-#: ../libpurple/protocols/qq/qq.c:227
-#: ../libpurple/protocols/qq/qq.c:230
-#: ../libpurple/protocols/qq/qq.c:234
+#: ../libpurple/protocols/qq/qq.c:226
+#: ../libpurple/protocols/qq/qq.c:229
+#: ../libpurple/protocols/qq/qq.c:232
+#: ../libpurple/protocols/qq/qq.c:236
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1091
 msgid "Gender"
 msgstr "Kjønn"
@@ -3428,16 +3614,16 @@
 msgstr "Mann eller kvinne"
 
 #: ../libpurple/protocols/gg/gg.c:647
-#: ../libpurple/protocols/oscar/oscar.c:3746
+#: ../libpurple/protocols/oscar/oscar.c:3700
 #: ../libpurple/protocols/qq/buddy_info.c:83
-#: ../libpurple/protocols/qq/qq.c:224
+#: ../libpurple/protocols/qq/qq.c:226
 msgid "Male"
 msgstr "Mann"
 
 #: ../libpurple/protocols/gg/gg.c:648
-#: ../libpurple/protocols/oscar/oscar.c:3746
+#: ../libpurple/protocols/oscar/oscar.c:3700
 #: ../libpurple/protocols/qq/buddy_info.c:84
-#: ../libpurple/protocols/qq/qq.c:227
+#: ../libpurple/protocols/qq/qq.c:229
 msgid "Female"
 msgstr "Kvinne"
 
@@ -3500,14 +3686,15 @@
 #: ../libpurple/protocols/gg/gg.c:1003
 #: ../libpurple/protocols/jabber/buddy.c:1466
 #: ../libpurple/protocols/novell/novell.c:2828
-#: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:5583
+#: ../libpurple/protocols/oscar/oscar.c:827
+#: ../libpurple/protocols/oscar/oscar.c:5552
 #: ../libpurple/protocols/qq/qq.c:170
 #: ../libpurple/protocols/qq/qq.c:177
-#: ../libpurple/protocols/yahoo/yahoo.c:2917
+#: ../libpurple/protocols/qq/qq.c:292
+#: ../libpurple/protocols/yahoo/yahoo.c:2938
 #: ../libpurple/status.c:153
-#: ../pidgin/gtkblist.c:3070
-#: ../pidgin/gtkblist.c:3411
+#: ../pidgin/gtkblist.c:3082
+#: ../pidgin/gtkblist.c:3423
 #: ../pidgin/gtkdocklet.c:450
 #: ../pidgin/gtkstatusbox.c:1059
 msgid "Offline"
@@ -3520,17 +3707,42 @@
 #: ../libpurple/protocols/msn/state.c:37
 #: ../libpurple/protocols/msn/state.c:38
 #: ../libpurple/protocols/novell/novell.c:2816
-#: ../libpurple/protocols/yahoo/yahoo.c:2919
+#: ../libpurple/protocols/qq/qq.c:280
+#: ../libpurple/protocols/yahoo/yahoo.c:2940
 #: ../libpurple/status.c:154
 #: ../pidgin/gtkdocklet.c:438
 #: ../pidgin/gtkstatusbox.c:1055
 msgid "Available"
 msgstr "Tilgjengeleg"
 
+#. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
+#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
+#. Away stuff
+#: ../libpurple/protocols/gg/gg.c:1009
+#: ../libpurple/protocols/irc/irc.c:530
+#: ../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/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/status.c:157
+#: ../pidgin/gtkdocklet.c:442
+#: ../pidgin/gtkprefs.c:1934
+#: ../pidgin/gtkstatusbox.c:1056
+msgid "Away"
+msgstr "Vekke"
+
 #: ../libpurple/protocols/gg/gg.c:1038
 #: ../libpurple/protocols/gg/gg.c:1112
-#: ../libpurple/protocols/oscar/oscar.c:2675
-#: ../libpurple/protocols/oscar/oscar.c:3713
+#: ../libpurple/protocols/oscar/oscar.c:2669
+#: ../libpurple/protocols/oscar/oscar.c:3667
 msgid "UIN"
 msgstr "UIN"
 
@@ -3538,7 +3750,7 @@
 #: ../libpurple/protocols/gg/gg.c:1115
 #: ../libpurple/protocols/jabber/buddy.c:1623
 #: ../libpurple/protocols/jabber/buddy.c:1799
-#: ../libpurple/protocols/oscar/oscar.c:3724
+#: ../libpurple/protocols/oscar/oscar.c:3678
 #: ../libpurple/protocols/silc/ops.c:990
 #: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
@@ -3551,7 +3763,7 @@
 
 #: ../libpurple/protocols/gg/gg.c:1106
 #: ../libpurple/protocols/gg/gg.c:1175
-#: ../libpurple/protocols/oscar/oscar.c:3925
+#: ../libpurple/protocols/oscar/oscar.c:3879
 msgid "Unable to display the search results."
 msgstr "Klarer ikkje å visa søkjeresultata."
 
@@ -3723,7 +3935,7 @@
 
 #: ../libpurple/protocols/irc/irc.c:79
 msgid "No MOTD available"
-msgstr "Ingen \"Dagens melding\" er tilgjengeleg"
+msgstr "Inga \"Dagens melding\" er tilgjengeleg"
 
 #: ../libpurple/protocols/irc/irc.c:80
 msgid "There is no MOTD associated with this connection."
@@ -3766,11 +3978,11 @@
 #: ../libpurple/protocols/jabber/jabber.c:1046
 #: ../libpurple/protocols/msn/session.c:345
 #: ../libpurple/protocols/novell/novell.c:2182
-#: ../libpurple/protocols/oscar/oscar.c:1288
+#: ../libpurple/protocols/oscar/oscar.c:1285
 #: ../libpurple/protocols/qq/qq.c:136
-#: ../libpurple/protocols/sametime/sametime.c:3723
-#: ../libpurple/protocols/simple/simple.c:1671
-#: ../libpurple/protocols/yahoo/yahoo.c:2762
+#: ../libpurple/protocols/sametime/sametime.c:3724
+#: ../libpurple/protocols/simple/simple.c:1676
+#: ../libpurple/protocols/yahoo/yahoo.c:2783
 #: ../libpurple/protocols/zephyr/zephyr.c:1621
 #: ../pidgin/gtkstatusbox.c:661
 msgid "Connecting"
@@ -3784,12 +3996,12 @@
 
 #: ../libpurple/protocols/irc/irc.c:338
 #: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1586
+#: ../libpurple/protocols/simple/simple.c:1591
 msgid "Couldn't create socket"
 msgstr "Klarte ikkje å laga endepunkt"
 
 #: ../libpurple/protocols/irc/irc.c:416
-#: ../libpurple/protocols/oscar/oscar.c:1284
+#: ../libpurple/protocols/oscar/oscar.c:1281
 msgid "Couldn't connect to host"
 msgstr "Klarte ikkje å kopla til verten"
 
@@ -3816,7 +4028,7 @@
 msgstr "Brukarar"
 
 #: ../libpurple/protocols/irc/irc.c:778
-#: ../libpurple/protocols/sametime/sametime.c:3374
+#: ../libpurple/protocols/sametime/sametime.c:3375
 #: ../libpurple/protocols/silc/chat.c:1415
 #: ../libpurple/protocols/silc/ops.c:1389
 #: ../libpurple/protocols/silc10/chat.c:1429
@@ -3846,14 +4058,14 @@
 #: ../libpurple/protocols/irc/irc.c:942
 #: ../libpurple/protocols/irc/msgs.c:323
 #: ../libpurple/protocols/msn/msn.c:2154
-#: ../libpurple/protocols/oscar/oscar.c:6650
-#: ../libpurple/protocols/qq/qq.c:756
-#: ../libpurple/protocols/sametime/sametime.c:5727
+#: ../libpurple/protocols/oscar/oscar.c:6619
+#: ../libpurple/protocols/qq/qq.c:755
+#: ../libpurple/protocols/sametime/sametime.c:5728
 #: ../libpurple/protocols/silc/ops.c:1249
 #: ../libpurple/protocols/silc/ops.c:1341
 #: ../libpurple/protocols/silc10/ops.c:1244
 #: ../libpurple/protocols/silc10/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1850
+#: ../libpurple/protocols/simple/simple.c:1855
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Tenar"
@@ -3861,9 +4073,9 @@
 #. port to connect to
 #: ../libpurple/protocols/irc/irc.c:945
 #: ../libpurple/protocols/msn/msn.c:2159
-#: ../libpurple/protocols/oscar/oscar.c:6653
-#: ../libpurple/protocols/qq/qq.c:759
-#: ../libpurple/protocols/sametime/sametime.c:5732
+#: ../libpurple/protocols/oscar/oscar.c:6622
+#: ../libpurple/protocols/qq/qq.c:758
+#: ../libpurple/protocols/sametime/sametime.c:5733
 #: ../libpurple/protocols/silc/silc.c:1918
 #: ../libpurple/protocols/silc10/silc.c:1861
 #: ../libpurple/protocols/toc/toc.c:2331
@@ -3905,7 +4117,7 @@
 #.
 #: ../libpurple/protocols/irc/irc.c:962
 msgid "Use SSL"
-msgstr "Br_uk SSL "
+msgstr "Bruk SSL"
 
 #: ../libpurple/protocols/irc/msgs.c:187
 msgid "Bad mode"
@@ -3934,7 +4146,7 @@
 msgstr " <i>(identifisert)</i>"
 
 #: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3714
+#: ../libpurple/protocols/oscar/oscar.c:3668
 #: ../libpurple/protocols/silc/ops.c:1418
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
@@ -4167,7 +4379,7 @@
 msgstr "names [kanal]:  listar brukarane i kanalen."
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:1813
+#: ../libpurple/protocols/jabber/jabber.c:1830
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;nytt kallenamn&gt;:  endra kallenamnet ditt."
 
@@ -4267,7 +4479,7 @@
 
 #: ../libpurple/protocols/jabber/auth.c:52
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
-msgstr "Tenaren krev TLS/SSL for pålogging.  Fann ingen TLS/SSL-støtte."
+msgstr "Tenaren krev TLS/SSL for pålogging. Fann inga TLS/SSL-støtte."
 
 #: ../libpurple/protocols/jabber/auth.c:115
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -4320,7 +4532,7 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:271
 #: ../libpurple/protocols/jabber/buddy.c:825
-#: ../libpurple/protocols/sametime/sametime.c:4128
+#: ../libpurple/protocols/sametime/sametime.c:4129
 #: ../libpurple/protocols/silc/ops.c:986
 #: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
@@ -4381,18 +4593,6 @@
 msgid "Telephone"
 msgstr "Telefon"
 
-#: ../libpurple/protocols/jabber/buddy.c:283
-#: ../libpurple/protocols/jabber/buddy.c:940
-#: ../libpurple/protocols/jabber/buddy.c:948
-#: ../libpurple/protocols/jabber/buddy.c:1629
-#: ../libpurple/protocols/silc/ops.c:1041
-#: ../libpurple/protocols/silc/util.c:555
-#: ../libpurple/protocols/silc10/ops.c:1075
-#: ../libpurple/protocols/silc10/util.c:551
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
-msgid "E-Mail"
-msgstr "E-post"
-
 #: ../libpurple/protocols/jabber/buddy.c:284
 #: ../libpurple/protocols/jabber/buddy.c:963
 msgid "Organization Name"
@@ -4411,14 +4611,14 @@
 #: ../libpurple/protocols/jabber/buddy.c:288
 #: ../libpurple/protocols/jabber/buddy.c:859
 #: ../libpurple/protocols/msn/msn.c:1627
-#: ../libpurple/protocols/oscar/oscar.c:3763
+#: ../libpurple/protocols/oscar/oscar.c:3717
 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:3081
+#: ../pidgin/gtkblist.c:3093
 #: ../pidgin/gtkprefs.c:738
 msgid "Description"
 msgstr "Skildring"
@@ -4465,8 +4665,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:879
 #: ../libpurple/protocols/jabber/jabber.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3802
-#: ../libpurple/protocols/oscar/oscar.c:3815
+#: ../libpurple/protocols/oscar/oscar.c:3756
+#: ../libpurple/protocols/oscar/oscar.c:3769
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1030
 #: ../libpurple/protocols/silc10/ops.c:1064
@@ -4520,9 +4720,9 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:1476
 #: ../libpurple/protocols/jabber/jabber.c:1282
-#: ../libpurple/protocols/oscar/oscar.c:727
-#: ../libpurple/protocols/oscar/oscar.c:5787
-#: ../libpurple/protocols/sametime/sametime.c:3297
+#: ../libpurple/protocols/oscar/oscar.c:726
+#: ../libpurple/protocols/oscar/oscar.c:5756
+#: ../libpurple/protocols/sametime/sametime.c:3298
 msgid "Do Not Disturb"
 msgstr "Ikkje forstyrr meg"
 
@@ -4532,7 +4732,7 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:1625
 #: ../libpurple/protocols/jabber/buddy.c:1804
-#: ../libpurple/protocols/oscar/oscar.c:3725
+#: ../libpurple/protocols/oscar/oscar.c:3679
 msgid "Last Name"
 msgstr "Etternamn"
 
@@ -4566,8 +4766,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:1814
 #: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3728
-#: ../libpurple/protocols/oscar/oscar.c:3737
+#: ../libpurple/protocols/oscar/oscar.c:3682
+#: ../libpurple/protocols/oscar/oscar.c:3691
 msgid "E-Mail Address"
 msgstr "E-postadresse"
 
@@ -4580,10 +4780,10 @@
 #: ../libpurple/protocols/jabber/buddy.c:1825
 #: ../libpurple/protocols/qq/group.c:123
 #: ../libpurple/protocols/qq/group_im.c:147
-#: ../libpurple/protocols/qq/sys_msg.c:176
-#: ../libpurple/protocols/qq/sys_msg.c:253
-#: ../libpurple/protocols/qq/sys_msg.c:271
-#: ../libpurple/protocols/sametime/sametime.c:5611
+#: ../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
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
@@ -4606,7 +4806,7 @@
 msgstr "Søk katalog"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5273
+#: ../libpurple/protocols/oscar/oscar.c:5242
 #: ../libpurple/protocols/yahoo/yahoochat.c:962
 msgid "_Room:"
 msgstr "_Rom:"
@@ -4713,9 +4913,9 @@
 msgstr "Lesefeil"
 
 #: ../libpurple/protocols/jabber/jabber.c:467
-#: ../libpurple/protocols/oscar/flap_connection.c:386
-#: ../libpurple/protocols/yahoo/yahoo.c:2381
-#: ../libpurple/protocols/yahoo/yahoo.c:2413
+#: ../libpurple/protocols/oscar/flap_connection.c:394
+#: ../libpurple/protocols/yahoo/yahoo.c:2402
+#: ../libpurple/protocols/yahoo/yahoo.c:2434
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -4763,8 +4963,8 @@
 msgstr "Allereie registrert"
 
 #: ../libpurple/protocols/jabber/jabber.c:848
-#: ../libpurple/protocols/oscar/oscar.c:3804
-#: ../libpurple/protocols/oscar/oscar.c:3817
+#: ../libpurple/protocols/oscar/oscar.c:3758
+#: ../libpurple/protocols/oscar/oscar.c:3771
 msgid "State"
 msgstr "Fylke/Region/Stat"
 
@@ -4797,7 +4997,7 @@
 
 #. Register button
 #: ../libpurple/protocols/jabber/jabber.c:881
-#: ../pidgin/gtkaccount.c:1518
+#: ../pidgin/gtkaccount.c:1523
 msgid "Register"
 msgstr "Registrer"
 
@@ -4818,8 +5018,8 @@
 #: ../libpurple/protocols/jabber/jabber.c:1502
 #: ../libpurple/protocols/jabber/jabber.c:1543
 #: ../libpurple/protocols/jabber/jabber.c:1579
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:5581
+#: ../libpurple/protocols/oscar/oscar.c:825
+#: ../libpurple/protocols/oscar/oscar.c:5550
 msgid "Not Authorized"
 msgstr "Ikkje autorisert"
 
@@ -4880,7 +5080,7 @@
 msgstr "Skriv inn det nye passordet ditt"
 
 #: ../libpurple/protocols/jabber/jabber.c:1394
-#: ../libpurple/protocols/oscar/oscar.c:6367
+#: ../libpurple/protocols/oscar/oscar.c:6336
 #: ../libpurple/protocols/silc/silc.c:1093
 #: ../libpurple/protocols/silc10/silc.c:1004
 msgid "Set User Info..."
@@ -4888,7 +5088,7 @@
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
 #: ../libpurple/protocols/jabber/jabber.c:1399
-#: ../libpurple/protocols/oscar/oscar.c:6378
+#: ../libpurple/protocols/oscar/oscar.c:6347
 #: ../libpurple/protocols/silc/silc.c:1089
 #: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
@@ -5098,81 +5298,81 @@
 msgid "Stream Error"
 msgstr "Feil i datastraumen"
 
-#: ../libpurple/protocols/jabber/jabber.c:1670
+#: ../libpurple/protocols/jabber/jabber.c:1686
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Klarte ikkje å utestengja brukaren (%s)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1690
+#: ../libpurple/protocols/jabber/jabber.c:1706
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Ukjend tilknyting: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1695
+#: ../libpurple/protocols/jabber/jabber.c:1711
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Klarte ikkje å knyta til brukar %s som \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1714
+#: ../libpurple/protocols/jabber/jabber.c:1730
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Ukjend rolle: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1721
+#: ../libpurple/protocols/jabber/jabber.c:1735
 #, 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:1774
+#: ../libpurple/protocols/jabber/jabber.c:1788
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Klarte ikkje å sparka ut brukaren %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1805
+#: ../libpurple/protocols/jabber/jabber.c:1822
 msgid "config:  Configure a chat room."
 msgstr "config:  Endra prateromsinnstillingane."
 
-#: ../libpurple/protocols/jabber/jabber.c:1809
+#: ../libpurple/protocols/jabber/jabber.c:1826
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Endra prateromsinnstillingane."
 
-#: ../libpurple/protocols/jabber/jabber.c:1818
+#: ../libpurple/protocols/jabber/jabber.c:1835
 msgid "part [room]:  Leave the room."
 msgstr "part [rom]:  Forlata praterommet."
 
-#: ../libpurple/protocols/jabber/jabber.c:1823
+#: ../libpurple/protocols/jabber/jabber.c:1840
 msgid "register:  Register with a chat room."
 msgstr "register:  Registrera seg i eit praterom."
 
-#: ../libpurple/protocols/jabber/jabber.c:1829
+#: ../libpurple/protocols/jabber/jabber.c:1846
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [nytt emne]:  Visa eller endra emnet."
 
-#: ../libpurple/protocols/jabber/jabber.c:1835
+#: ../libpurple/protocols/jabber/jabber.c:1852
 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:1841
+#: ../libpurple/protocols/jabber/jabber.c:1858
 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:1847
+#: ../libpurple/protocols/jabber/jabber.c:1864
 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:1853
+#: ../libpurple/protocols/jabber/jabber.c:1870
 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:1859
+#: ../libpurple/protocols/jabber/jabber.c:1876
 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:1865
+#: ../libpurple/protocols/jabber/jabber.c:1882
 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:1870
+#: ../libpurple/protocols/jabber/jabber.c:1887
 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."
 
@@ -5206,7 +5406,7 @@
 msgstr "Tillat _autentisering i klartekst over ukrypterte samband"
 
 #: ../libpurple/protocols/jabber/libxmpp.c:216
-#: ../libpurple/protocols/simple/simple.c:1856
+#: ../libpurple/protocols/simple/simple.c:1861
 msgid "Connect port"
 msgstr "Tilkoplingsport"
 
@@ -5256,33 +5456,33 @@
 msgid "XML Parse error"
 msgstr "Feil i XML-tolkinga"
 
-#: ../libpurple/protocols/jabber/presence.c:290
+#: ../libpurple/protocols/jabber/presence.c:292
 msgid "Unknown Error in presence"
 msgstr "Ukjend feil til stades"
 
-#: ../libpurple/protocols/jabber/presence.c:364
-#: ../libpurple/protocols/jabber/presence.c:365
-msgid "Create New Room"
-msgstr "Lag eit nytt rom"
-
 #: ../libpurple/protocols/jabber/presence.c:366
+#: ../libpurple/protocols/jabber/presence.c:367
+msgid "Create New Room"
+msgstr "Lag eit nytt rom"
+
+#: ../libpurple/protocols/jabber/presence.c:368
 msgid "You are creating a new room.  Would you like to configure it, or accept the default settings?"
 msgstr "Du er i ferd med å laga eit nytt praterom. Ønskjer du å endra innstillingane til det, eller vil nytta standardinnstillingane?"
 
-#: ../libpurple/protocols/jabber/presence.c:372
+#: ../libpurple/protocols/jabber/presence.c:374
 msgid "_Configure Room"
 msgstr "Endra rom_innstillingane"
 
-#: ../libpurple/protocols/jabber/presence.c:373
+#: ../libpurple/protocols/jabber/presence.c:375
 msgid "_Accept Defaults"
 msgstr "_Godta standardinnstillingane"
 
-#: ../libpurple/protocols/jabber/presence.c:409
+#: ../libpurple/protocols/jabber/presence.c:417
 #, c-format
 msgid "Error in chat %s"
 msgstr "Feil i praterommet %s"
 
-#: ../libpurple/protocols/jabber/presence.c:412
+#: ../libpurple/protocols/jabber/presence.c:421
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Klarte ikkje å kopla til praterommet %s"
@@ -5530,7 +5730,7 @@
 msgstr "Tenaren er for oppteken"
 
 #: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1381
+#: ../libpurple/protocols/oscar/oscar.c:1378
 #: ../libpurple/protocols/silc/silc.c:233
 #: ../libpurple/protocols/silc10/ops.c:1709
 #: ../libpurple/protocols/toc/toc.c:728
@@ -5630,8 +5830,8 @@
 
 #: ../libpurple/protocols/msn/msn.c:551
 #: ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:2895
-#: ../libpurple/protocols/yahoo/yahoo.c:3504
+#: ../libpurple/protocols/yahoo/yahoo.c:2916
+#: ../libpurple/protocols/yahoo/yahoo.c:3600
 msgid "Be Right Back"
 msgstr "Kjem straks tilbake"
 
@@ -5643,20 +5843,20 @@
 #: ../libpurple/protocols/silc/silc.c:56
 #: ../libpurple/protocols/silc10/buddy.c:1480
 #: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:2897
-#: ../libpurple/protocols/yahoo/yahoo.c:3507
+#: ../libpurple/protocols/yahoo/yahoo.c:2918
+#: ../libpurple/protocols/yahoo/yahoo.c:3603
 msgid "Busy"
 msgstr "Oppteken"
 
 #: ../libpurple/protocols/msn/msn.c:559
-#: ../libpurple/protocols/yahoo/yahoo.c:2905
-#: ../libpurple/protocols/yahoo/yahoo.c:3519
+#: ../libpurple/protocols/yahoo/yahoo.c:2926
+#: ../libpurple/protocols/yahoo/yahoo.c:3615
 msgid "On the Phone"
 msgstr "Taler i  telefonen"
 
 #: ../libpurple/protocols/msn/msn.c:563
-#: ../libpurple/protocols/yahoo/yahoo.c:2909
-#: ../libpurple/protocols/yahoo/yahoo.c:3525
+#: ../libpurple/protocols/yahoo/yahoo.c:2930
+#: ../libpurple/protocols/yahoo/yahoo.c:3621
 msgid "Out to Lunch"
 msgstr "Er ute til lunsj"
 
@@ -5718,9 +5918,9 @@
 msgstr "Generelt"
 
 #: ../libpurple/protocols/msn/msn.c:1557
-#: ../libpurple/protocols/oscar/oscar.c:3769
+#: ../libpurple/protocols/oscar/oscar.c:3723
 #: ../libpurple/protocols/qq/buddy_info.c:45
-#: ../libpurple/protocols/qq/qq.c:219
+#: ../libpurple/protocols/qq/qq.c:221
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
 msgid "Age"
 msgstr "Alder"
@@ -5820,7 +6020,7 @@
 msgstr "Heimetelefon 2"
 
 #: ../libpurple/protocols/msn/msn.c:1622
-#: ../libpurple/protocols/oscar/oscar.c:3807
+#: ../libpurple/protocols/oscar/oscar.c:3761
 msgid "Home Address"
 msgstr "Heimeadresse"
 
@@ -5856,7 +6056,7 @@
 msgstr "Jobbtittel"
 
 #: ../libpurple/protocols/msn/msn.c:1647
-#: ../libpurple/protocols/oscar/oscar.c:3828
+#: ../libpurple/protocols/oscar/oscar.c:3782
 msgid "Company"
 msgstr "Firma"
 
@@ -5878,7 +6078,7 @@
 msgstr "Arbeidstelefon 2"
 
 #: ../libpurple/protocols/msn/msn.c:1652
-#: ../libpurple/protocols/oscar/oscar.c:3820
+#: ../libpurple/protocols/oscar/oscar.c:3774
 msgid "Work Address"
 msgstr "Arbeidsadresse"
 
@@ -5962,7 +6162,7 @@
 
 #: ../libpurple/protocols/msn/msn.c:2168
 msgid "Show custom smileys"
-msgstr "Vis _eigne smilefjes"
+msgstr "Vis eigne smilefjes"
 
 #: ../libpurple/protocols/msn/msn.c:2176
 msgid "nudge: nudge a user to get their attention"
@@ -6086,8 +6286,8 @@
 msgstr "Feil i HTTP-tolkinga."
 
 #: ../libpurple/protocols/msn/session.c:307
-#: ../libpurple/protocols/oscar/oscar.c:3481
-#: ../libpurple/protocols/yahoo/yahoo.c:202
+#: ../libpurple/protocols/oscar/flap_connection.c:384
+#: ../libpurple/protocols/yahoo/yahoo.c:205
 msgid "You have signed on from another location."
 msgstr "Du har logga på frå ein annan stad."
 
@@ -6178,22 +6378,22 @@
 msgid "%s just sent you a Nudge!"
 msgstr "%s sende deg nettopp ein dytt (\"nudge\")."
 
-#: ../libpurple/protocols/msn/userlist.c:250
+#: ../libpurple/protocols/msn/userlist.c:252
 #, c-format
 msgid "%s has added you to his or her buddy list."
 msgstr "%s har lagt deg til i vennelista si."
 
-#: ../libpurple/protocols/msn/userlist.c:319
+#: ../libpurple/protocols/msn/userlist.c:321
 #, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s har fjerna deg frå vennelista si."
 
-#: ../libpurple/protocols/msn/userlist.c:641
+#: ../libpurple/protocols/msn/userlist.c:643
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "Klarte ikkje å leggja til \"%s\"."
 
-#: ../libpurple/protocols/msn/userlist.c:643
+#: ../libpurple/protocols/msn/userlist.c:645
 msgid "The screen name specified is invalid."
 msgstr "Det oppgjevne brukarnamnet er ikkje gyldig."
 
@@ -6421,7 +6621,7 @@
 msgstr "E-postkontor"
 
 #: ../libpurple/protocols/novell/novell.c:1502
-#: ../libpurple/protocols/sametime/sametime.c:4122
+#: ../libpurple/protocols/sametime/sametime.c:4123
 msgid "User ID"
 msgstr "Brukar-ID"
 
@@ -6442,7 +6642,7 @@
 
 #: ../libpurple/protocols/novell/novell.c:1668
 msgid "Unable to make SSL connection to server."
-msgstr "Klarer ikkje å laga eit SSL-samabnd med tenaren."
+msgstr "Klarer ikkje å laga eit SSL-samband med tenaren."
 
 #: ../libpurple/protocols/novell/novell.c:1720
 msgid "Authenticating..."
@@ -6529,9 +6729,9 @@
 msgid "Server port"
 msgstr "Tenarport"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:379
-#: ../libpurple/protocols/yahoo/yahoo.c:2292
-#: ../libpurple/protocols/yahoo/yahoo.c:2459
+#: ../libpurple/protocols/oscar/flap_connection.c:387
+#: ../libpurple/protocols/yahoo/yahoo.c:2313
+#: ../libpurple/protocols/yahoo/yahoo.c:2480
 #: ../libpurple/protocols/yahoo/ycht.c:481
 #: ../libpurple/proxy.c:580
 #: ../libpurple/proxy.c:1099
@@ -6541,9 +6741,9 @@
 msgid "Server closed the connection."
 msgstr "Tenaren lukka tilkoplinga."
 
-#: ../libpurple/protocols/oscar/flap_connection.c:381
-#: ../libpurple/protocols/yahoo/yahoo.c:2286
-#: ../libpurple/protocols/yahoo/yahoo.c:2453
+#: ../libpurple/protocols/oscar/flap_connection.c:389
+#: ../libpurple/protocols/yahoo/yahoo.c:2307
+#: ../libpurple/protocols/yahoo/yahoo.c:2474
 #: ../libpurple/proxy.c:592
 #: ../libpurple/proxy.c:1111
 #: ../libpurple/proxy.c:1220
@@ -6557,7 +6757,7 @@
 "Mista sambandet med tenaren:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:384
+#: ../libpurple/protocols/oscar/flap_connection.c:392
 #: ../libpurple/proxy.c:1128
 #: ../libpurple/proxy.c:1233
 #: ../libpurple/proxy.c:1332
@@ -6597,7 +6797,7 @@
 msgstr "ICQ-protokolltillegg"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4111
+#: ../libpurple/protocols/yahoo/yahoo.c:4213
 #: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "Teiknkoding"
@@ -6728,32 +6928,32 @@
 msgid "Not while on AOL"
 msgstr "Ikkje når pålogga AOL"
 
-#: ../libpurple/protocols/oscar/oscar.c:348
+#: ../libpurple/protocols/oscar/oscar.c:347
 msgid "(There was an error receiving this message.  The buddy you are speaking with is probably using a different encoding than expected.  If you know what encoding he is using, you can specify it in the advanced account options for your AIM/ICQ account.)"
 msgstr "(Det oppstod ein feil under mottaket av meldinga. Truleg nyttar vennen du pratar med ei anna teiknkoding enn rekna med. Om du veit kva teiknkoding han nyttar, kan du oppgje det i dei avanserte kontovala for AIM/ICQ-kontoen din.)"
 
-#: ../libpurple/protocols/oscar/oscar.c:457
+#: ../libpurple/protocols/oscar/oscar.c:456
 #, c-format
 msgid "(There was an error receiving this message.  Either you and %s have different encodings selected, or %s has a buggy client.)"
 msgstr "(Det oppstod ein feil under mottaket av meldinga. Anten har du og %s vald ulike teiknkodingar, eller så nyttar %s ein klient med feil i.)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:639
-#: ../pidgin/gtkutils.c:2359
-#: ../pidgin/gtkutils.c:2389
+#: ../libpurple/protocols/oscar/oscar.c:638
+#: ../pidgin/gtkutils.c:2376
+#: ../pidgin/gtkutils.c:2406
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:334
 msgid "Buddy Icon"
 msgstr "Venneikon"
 
-#: ../libpurple/protocols/oscar/oscar.c:642
+#: ../libpurple/protocols/oscar/oscar.c:641
 msgid "Voice"
 msgstr "Stemme"
 
-#: ../libpurple/protocols/oscar/oscar.c:645
+#: ../libpurple/protocols/oscar/oscar.c:644
 msgid "AIM Direct IM"
 msgstr "AIM direktelynmelding"
 
-#: ../libpurple/protocols/oscar/oscar.c:648
+#: ../libpurple/protocols/oscar/oscar.c:647
 #: ../libpurple/protocols/silc/silc.c:768
 #: ../libpurple/protocols/silc/util.c:553
 #: ../libpurple/protocols/silc10/silc.c:679
@@ -6761,128 +6961,129 @@
 msgid "Chat"
 msgstr "Prat"
 
-#: ../libpurple/protocols/oscar/oscar.c:651
-#: ../libpurple/protocols/oscar/oscar.c:5989
+#: ../libpurple/protocols/oscar/oscar.c:650
+#: ../libpurple/protocols/oscar/oscar.c:5958
 msgid "Get File"
 msgstr "Hent fil"
 
-#: ../libpurple/protocols/oscar/oscar.c:658
+#: ../libpurple/protocols/oscar/oscar.c:657
 msgid "Games"
 msgstr "Spel"
 
-#: ../libpurple/protocols/oscar/oscar.c:661
+#: ../libpurple/protocols/oscar/oscar.c:660
 msgid "Add-Ins"
 msgstr "Tillegg"
 
-#: ../libpurple/protocols/oscar/oscar.c:664
+#: ../libpurple/protocols/oscar/oscar.c:663
 msgid "Send Buddy List"
 msgstr "Send vennelista"
 
-#: ../libpurple/protocols/oscar/oscar.c:667
+#: ../libpurple/protocols/oscar/oscar.c:666
 msgid "ICQ Direct Connect"
 msgstr "ICQ direktetilkopling"
 
-#: ../libpurple/protocols/oscar/oscar.c:670
+#: ../libpurple/protocols/oscar/oscar.c:669
 msgid "AP User"
 msgstr "AP-brukar"
 
-#: ../libpurple/protocols/oscar/oscar.c:673
+#: ../libpurple/protocols/oscar/oscar.c:672
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: ../libpurple/protocols/oscar/oscar.c:676
+#: ../libpurple/protocols/oscar/oscar.c:675
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: ../libpurple/protocols/oscar/oscar.c:679
+#: ../libpurple/protocols/oscar/oscar.c:678
 msgid "ICQ Server Relay"
 msgstr "ICQ tenarvidaresending"
 
-#: ../libpurple/protocols/oscar/oscar.c:682
+#: ../libpurple/protocols/oscar/oscar.c:681
 msgid "Old ICQ UTF8"
 msgstr "Gammal ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:685
+#: ../libpurple/protocols/oscar/oscar.c:684
 msgid "Trillian Encryption"
 msgstr "Trillian-kryptiering"
 
-#: ../libpurple/protocols/oscar/oscar.c:688
+#: ../libpurple/protocols/oscar/oscar.c:687
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:691
+#: ../libpurple/protocols/oscar/oscar.c:690
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../libpurple/protocols/oscar/oscar.c:694
+#: ../libpurple/protocols/oscar/oscar.c:693
 msgid "Security Enabled"
 msgstr "Tryggleik er slått på"
 
-#: ../libpurple/protocols/oscar/oscar.c:697
+#: ../libpurple/protocols/oscar/oscar.c:696
 msgid "Video Chat"
 msgstr "Videoprat"
 
-#: ../libpurple/protocols/oscar/oscar.c:701
+#: ../libpurple/protocols/oscar/oscar.c:700
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../libpurple/protocols/oscar/oscar.c:704
+#: ../libpurple/protocols/oscar/oscar.c:703
 msgid "Live Video"
 msgstr "Sanntidsvideo"
 
-#: ../libpurple/protocols/oscar/oscar.c:707
+#: ../libpurple/protocols/oscar/oscar.c:706
 msgid "Camera"
 msgstr "Kamera"
 
-#: ../libpurple/protocols/oscar/oscar.c:725
-#: ../libpurple/protocols/oscar/oscar.c:5759
+#: ../libpurple/protocols/oscar/oscar.c:724
+#: ../libpurple/protocols/oscar/oscar.c:5728
 msgid "Free For Chat"
 msgstr "Ledig for prat"
 
-#: ../libpurple/protocols/oscar/oscar.c:729
-#: ../libpurple/protocols/oscar/oscar.c:5794
+#: ../libpurple/protocols/oscar/oscar.c:728
+#: ../libpurple/protocols/oscar/oscar.c:5763
 msgid "Not Available"
 msgstr "Ikkje tilgjengeleg"
 
-#: ../libpurple/protocols/oscar/oscar.c:731
-#: ../libpurple/protocols/oscar/oscar.c:5780
+#: ../libpurple/protocols/oscar/oscar.c:730
+#: ../libpurple/protocols/oscar/oscar.c:5749
 msgid "Occupied"
 msgstr "Oppteken"
 
-#: ../libpurple/protocols/oscar/oscar.c:735
+#: ../libpurple/protocols/oscar/oscar.c:734
 msgid "Web Aware"
 msgstr "Nettmedviten"
 
-#: ../libpurple/protocols/oscar/oscar.c:737
+#: ../libpurple/protocols/oscar/oscar.c:736
 #: ../libpurple/protocols/qq/qq.c:183
-#: ../libpurple/protocols/yahoo/yahoo.c:2913
+#: ../libpurple/protocols/qq/qq.c:288
+#: ../libpurple/protocols/yahoo/yahoo.c:2934
 #: ../libpurple/status.c:156
 #: ../pidgin/gtkdocklet.c:446
 #: ../pidgin/gtkstatusbox.c:1058
 msgid "Invisible"
 msgstr "Usynleg"
 
-#: ../libpurple/protocols/oscar/oscar.c:739
+#: ../libpurple/protocols/oscar/oscar.c:738
 msgid "Online"
 msgstr "Tilkopla"
 
-#: ../libpurple/protocols/oscar/oscar.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3721
+#: ../libpurple/protocols/oscar/oscar.c:837
+#: ../libpurple/protocols/oscar/oscar.c:3675
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:721
-#: ../pidgin/gtkprefs.c:1121
+#: ../pidgin/gtkprefs.c:1123
 msgid "IP Address"
 msgstr "IP-adresse"
 
-#: ../libpurple/protocols/oscar/oscar.c:845
-#: ../libpurple/protocols/oscar/oscar.c:2867
+#: ../libpurple/protocols/oscar/oscar.c:844
+#: ../libpurple/protocols/oscar/oscar.c:2861
 msgid "Warning Level"
 msgstr "Åtvaringsnivå"
 
-#: ../libpurple/protocols/oscar/oscar.c:855
+#: ../libpurple/protocols/oscar/oscar.c:854
 msgid "Buddy Comment"
-msgstr "Vennemerknad"
-
-#: ../libpurple/protocols/oscar/oscar.c:995
+msgstr "Vennenotat"
+
+#: ../libpurple/protocols/oscar/oscar.c:994
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -6891,7 +7092,7 @@
 "Klarte ikkje å kopla opp mot autentiseringstenaren:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1003
+#: ../libpurple/protocols/oscar/oscar.c:1002
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -6900,140 +7101,140 @@
 "Klarte ikkje å kopla til BOS-tenaren:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1043
+#: ../libpurple/protocols/oscar/oscar.c:1042
 msgid "Screen name sent"
 msgstr "Brukarnamn er sendt"
 
-#: ../libpurple/protocols/oscar/oscar.c:1048
+#: ../libpurple/protocols/oscar/oscar.c:1047
 msgid "Connection established, cookie sent"
 msgstr "Oppretta samband, sendt informasjonskapsel"
 
 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1077
+#: ../libpurple/protocols/oscar/oscar.c:1076
 msgid "Finalizing connection"
 msgstr "Fullfører tilkoplinga"
 
-#: ../libpurple/protocols/oscar/oscar.c:1261
+#: ../libpurple/protocols/oscar/oscar.c:1258
 #, c-format
 msgid "Unable to login: Could not sign on as %s because the screen name is invalid.  Screen names must be a valid email address, or start with a letter and contain only letters, numbers and spaces, or contain only numbers."
 msgstr "Får ikkje til å logga på: klarer ikkje å logga på som %s fordi brukarnamnet er ugyldig. Brukarnamn må vera ei gyldig e-postadresse, eller begynna med ein bokstav og berre innehalda bokstavar. tal og mellomrom, eller berre innehalda tal."
 
-#: ../libpurple/protocols/oscar/oscar.c:1346
-#: ../libpurple/protocols/yahoo/yahoo.c:1934
+#: ../libpurple/protocols/oscar/oscar.c:1343
+#: ../libpurple/protocols/yahoo/yahoo.c:1952
 msgid "Invalid screen name."
 msgstr "Ugyldig brukarnamn."
 
-#: ../libpurple/protocols/oscar/oscar.c:1353
+#: ../libpurple/protocols/oscar/oscar.c:1350
 #: ../libpurple/protocols/qq/login_logout.c:483
-#: ../libpurple/protocols/simple/simple.c:1037
-#: ../libpurple/protocols/yahoo/yahoo.c:1952
+#: ../libpurple/protocols/simple/simple.c:1039
+#: ../libpurple/protocols/yahoo/yahoo.c:1973
 msgid "Incorrect password."
 msgstr "Feil passord."
 
-#: ../libpurple/protocols/oscar/oscar.c:1358
+#: ../libpurple/protocols/oscar/oscar.c:1355
 msgid "Your account is currently suspended."
 msgstr "Kontoen din er for tida sperra for bruk."
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1362
+#: ../libpurple/protocols/oscar/oscar.c:1359
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL si lynmeldingsteneste er mellombels utilgjengeleg."
 
-#: ../libpurple/protocols/oscar/oscar.c:1367
-#: ../libpurple/protocols/oscar/oscar.c:1378
+#: ../libpurple/protocols/oscar/oscar.c:1364
+#: ../libpurple/protocols/oscar/oscar.c:1375
 msgid "You have been connecting and disconnecting too frequently. Wait ten minutes and try again. If you continue to try, you will need to wait even longer."
 msgstr "Du har kopla til og blitt fråkopla for ofte. Vent i ti minutt og prøv igjen. Held du fram med å prøva, vil du måtta venta endå lenger."
 
-#: ../libpurple/protocols/oscar/oscar.c:1372
+#: ../libpurple/protocols/oscar/oscar.c:1369
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "Klientversjonen du bruker er for gammal. Oppgrader på %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1412
+#: ../libpurple/protocols/oscar/oscar.c:1408
 msgid "Could Not Connect"
 msgstr "Klarte ikkje å kopla til"
 
-#: ../libpurple/protocols/oscar/oscar.c:1417
+#: ../libpurple/protocols/oscar/oscar.c:1412
 msgid "Received authorization"
 msgstr "Motteken melding"
 
-#: ../libpurple/protocols/oscar/oscar.c:1440
+#: ../libpurple/protocols/oscar/oscar.c:1434
 msgid "The SecurID key entered is invalid."
 msgstr "Den innskrivne SecurID-nøkkelen er ugyldig."
 
-#: ../libpurple/protocols/oscar/oscar.c:1454
+#: ../libpurple/protocols/oscar/oscar.c:1447
 msgid "Enter SecurID"
 msgstr "Skriv inn SecurID"
 
-#: ../libpurple/protocols/oscar/oscar.c:1455
+#: ../libpurple/protocols/oscar/oscar.c:1448
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Før opp dei seks tala frå den digitale teiknruta."
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1457
-#: ../libpurple/protocols/oscar/oscar.c:2250
-#: ../libpurple/protocols/oscar/oscar.c:2297
-#: ../libpurple/protocols/oscar/oscar.c:5864
-#: ../libpurple/protocols/oscar/oscar.c:6145
+#: ../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/request.h:1387
 msgid "_OK"
 msgstr "_OK"
 
-#: ../libpurple/protocols/oscar/oscar.c:1496
-#: ../libpurple/protocols/oscar/oscar.c:1539
+#: ../libpurple/protocols/oscar/oscar.c:1489
+#: ../libpurple/protocols/oscar/oscar.c:1532
 #, c-format
 msgid "You may be disconnected shortly.  You may want to use TOC until this is fixed.  Check %s for updates."
 msgstr "Du kan bli frå kopla snart. Du vil kanskje nytta TOC fram til dette blir ordna. Sjå på %s etter oppdateringar."
 
-#: ../libpurple/protocols/oscar/oscar.c:1499
-#: ../libpurple/protocols/oscar/oscar.c:1542
+#: ../libpurple/protocols/oscar/oscar.c:1492
+#: ../libpurple/protocols/oscar/oscar.c:1535
 msgid "Unable to get a valid AIM login hash."
 msgstr "Klarer ikkje å henta ein gyldig AIM påloggingsnøkkel."
 
-#: ../libpurple/protocols/oscar/oscar.c:1627
+#: ../libpurple/protocols/oscar/oscar.c:1620
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "Du kan bli fråkopla snart. Sjå etter oppdateringar på %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:1630
+#: ../libpurple/protocols/oscar/oscar.c:1623
 msgid "Unable to get a valid login hash."
 msgstr "Klarer ikkje å henta ein gyldig påloggingsnøkkel."
 
-#: ../libpurple/protocols/oscar/oscar.c:1659
+#: ../libpurple/protocols/oscar/oscar.c:1652
 msgid "Password sent"
 msgstr "Passordet er sendt"
 
-#: ../libpurple/protocols/oscar/oscar.c:1715
+#: ../libpurple/protocols/oscar/oscar.c:1708
 msgid "Unable to initialize connection"
 msgstr "Klarte ikkje å setja i gang sambandet"
 
-#: ../libpurple/protocols/oscar/oscar.c:2220
+#: ../libpurple/protocols/oscar/oscar.c:2212
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Om du godtek meg, kan eg leggja deg til i vennelista mi."
 
-#: ../libpurple/protocols/oscar/oscar.c:2248
+#: ../libpurple/protocols/oscar/oscar.c:2240
 msgid "Authorization Request Message:"
 msgstr "Godtakingførespurnad:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2249
+#: ../libpurple/protocols/oscar/oscar.c:2241
 msgid "Please authorize me!"
 msgstr "Gjer vel og godta meg."
 
+#: ../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
+msgid "No reason given."
+msgstr "Ingen årsak oppgjeven."
+
 #: ../libpurple/protocols/oscar/oscar.c:2289
-#: ../libpurple/protocols/oscar/oscar.c:2296
-#: ../libpurple/protocols/oscar/oscar.c:2423
-#: ../libpurple/protocols/oscar/oscar.c:5242
-#: ../libpurple/protocols/yahoo/yahoo.c:987
-msgid "No reason given."
-msgstr "Ingen årsak oppgjeven."
-
-#: ../libpurple/protocols/oscar/oscar.c:2295
 msgid "Authorization Denied Message:"
 msgstr "Avvist godtaking:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2423
+#: ../libpurple/protocols/oscar/oscar.c:2417
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the following reason:\n"
@@ -7042,17 +7243,17 @@
 "Brukaren %u har avvist førespurnaden din om å leggja dei til vennelista di. Årsak:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2424
+#: ../libpurple/protocols/oscar/oscar.c:2418
 msgid "ICQ authorization denied."
 msgstr "ICQ-godtaking avvist."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2431
+#: ../libpurple/protocols/oscar/oscar.c:2425
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "Brukaren %u har gjeve deg løyve til å leggja dei til i vennelista di."
 
-#: ../libpurple/protocols/oscar/oscar.c:2439
+#: ../libpurple/protocols/oscar/oscar.c:2433
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7065,7 +7266,7 @@
 "Frå:%s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2447
+#: ../libpurple/protocols/oscar/oscar.c:2441
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7078,7 +7279,7 @@
 "Frå:%s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2455
+#: ../libpurple/protocols/oscar/oscar.c:2449
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -7091,60 +7292,60 @@
 "Meldinga er:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2476
+#: ../libpurple/protocols/oscar/oscar.c:2470
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ-brukaren %u har sendt deg ein venn: %s [%s]"
 
-#: ../libpurple/protocols/oscar/oscar.c:2482
+#: ../libpurple/protocols/oscar/oscar.c:2476
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Vil du leggja til denne vennen i vennelista di?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2487
+#: ../libpurple/protocols/oscar/oscar.c:2481
 #: ../pidgin/gtkroomlist.c:308
 msgid "_Add"
 msgstr "L_egg til"
 
-#: ../libpurple/protocols/oscar/oscar.c:2488
+#: ../libpurple/protocols/oscar/oscar.c:2482
 msgid "_Decline"
 msgstr "_Avvis"
 
-#: ../libpurple/protocols/oscar/oscar.c:2572
+#: ../libpurple/protocols/oscar/oscar.c:2566
 #, 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:2581
+#: ../libpurple/protocols/oscar/oscar.c:2575
 #, 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:2590
+#: ../libpurple/protocols/oscar/oscar.c:2584
 #, 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:2599
+#: ../libpurple/protocols/oscar/oscar.c:2593
 #, 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:2608
+#: ../libpurple/protocols/oscar/oscar.c:2602
 #, 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:2617
+#: ../libpurple/protocols/oscar/oscar.c:2611
 #, 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."
@@ -7152,283 +7353,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:2772
+#: ../libpurple/protocols/oscar/oscar.c:2766
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Klarer ikkje å senda melding: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2772
-#: ../libpurple/protocols/oscar/oscar.c:2777
-#: ../libpurple/protocols/oscar/oscar.c:2841
+#: ../libpurple/protocols/oscar/oscar.c:2766
+#: ../libpurple/protocols/oscar/oscar.c:2771
+#: ../libpurple/protocols/oscar/oscar.c:2835
 msgid "Unknown reason."
 msgstr "Ukjend årsak."
 
-#: ../libpurple/protocols/oscar/oscar.c:2775
+#: ../libpurple/protocols/oscar/oscar.c:2769
 #: ../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:2841
+#: ../libpurple/protocols/oscar/oscar.c:2835
 #, c-format
 msgid "User information not available: %s"
 msgstr "Brukarinformasjon er ikkje tilgjengeleg: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2872
+#: ../libpurple/protocols/oscar/oscar.c:2866
 msgid "Online Since"
 msgstr "Tilkopla sia"
 
-#: ../libpurple/protocols/oscar/oscar.c:2877
+#: ../libpurple/protocols/oscar/oscar.c:2871
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
 msgstr "Medlem sia"
 
-#: ../libpurple/protocols/oscar/oscar.c:2882
+#: ../libpurple/protocols/oscar/oscar.c:2876
 msgid "Capabilities"
 msgstr "Evner"
 
-#: ../libpurple/protocols/oscar/oscar.c:2912
+#: ../libpurple/protocols/oscar/oscar.c:2906
 msgid "Available Message"
 msgstr "Tilgjengeleg melding"
 
-#: ../libpurple/protocols/oscar/oscar.c:2940
+#: ../libpurple/protocols/oscar/oscar.c:2934
 msgid "Profile"
 msgstr "Profil"
 
-#: ../libpurple/protocols/oscar/oscar.c:3020
+#: ../libpurple/protocols/oscar/oscar.c:3014
 msgid "Your AIM connection may be lost."
 msgstr "AIM-sambandet kan vera tapt."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3208
+#: ../libpurple/protocols/oscar/oscar.c:3202
 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:3411
+#: ../libpurple/protocols/oscar/oscar.c:3366
 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:3483
-msgid "You have been signed off for an unknown reason."
-msgstr "Du er blitt avlogga av ukjend årsak."
-
-#: ../libpurple/protocols/oscar/oscar.c:3496
+#: ../libpurple/protocols/oscar/oscar.c:3449
 #: ../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:3743
+#: ../libpurple/protocols/oscar/oscar.c:3697
 #: ../libpurple/protocols/silc/util.c:585
 #: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: ../libpurple/protocols/oscar/oscar.c:3773
+#: ../libpurple/protocols/oscar/oscar.c:3727
 msgid "Personal Web Page"
 msgstr "Personelg nettside"
 
-#: ../libpurple/protocols/oscar/oscar.c:3797
+#: ../libpurple/protocols/oscar/oscar.c:3751
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Tilleggsinformasjon"
 
-#: ../libpurple/protocols/oscar/oscar.c:3805
-#: ../libpurple/protocols/oscar/oscar.c:3818
+#: ../libpurple/protocols/oscar/oscar.c:3759
+#: ../libpurple/protocols/oscar/oscar.c:3772
 msgid "Zip Code"
 msgstr "Postnummer"
 
-#: ../libpurple/protocols/oscar/oscar.c:3829
+#: ../libpurple/protocols/oscar/oscar.c:3783
 msgid "Division"
 msgstr "Avdeling"
 
-#: ../libpurple/protocols/oscar/oscar.c:3830
+#: ../libpurple/protocols/oscar/oscar.c:3784
 msgid "Position"
 msgstr "Stilling"
 
-#: ../libpurple/protocols/oscar/oscar.c:3832
+#: ../libpurple/protocols/oscar/oscar.c:3786
 msgid "Web Page"
 msgstr "Nettside"
 
-#: ../libpurple/protocols/oscar/oscar.c:3835
+#: ../libpurple/protocols/oscar/oscar.c:3789
 msgid "Work Information"
 msgstr "Arbeidsinformasjon"
 
-#: ../libpurple/protocols/oscar/oscar.c:3891
+#: ../libpurple/protocols/oscar/oscar.c:3845
 msgid "Pop-Up Message"
 msgstr "Sprettoppmelding"
 
-#: ../libpurple/protocols/oscar/oscar.c:3931
+#: ../libpurple/protocols/oscar/oscar.c:3885
 #, 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:3936
+#: ../libpurple/protocols/oscar/oscar.c:3890
 msgid "Screen name"
 msgstr "Brukarnamn"
 
-#: ../libpurple/protocols/oscar/oscar.c:3962
+#: ../libpurple/protocols/oscar/oscar.c:3916
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "Ingen resultat funnen for e-postadressa %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3983
+#: ../libpurple/protocols/oscar/oscar.c:3937
 #, 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:3985
+#: ../libpurple/protocols/oscar/oscar.c:3939
 msgid "Account Confirmation Requested"
 msgstr "Bede om kontostadfesting"
 
-#: ../libpurple/protocols/oscar/oscar.c:4016
+#: ../libpurple/protocols/oscar/oscar.c:3970
 msgid "Error Changing Account Info"
 msgstr "Feil ved endring av kontoinformasjon"
 
-#: ../libpurple/protocols/oscar/oscar.c:4019
+#: ../libpurple/protocols/oscar/oscar.c:3973
 #, 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:4022
+#: ../libpurple/protocols/oscar/oscar.c:3976
 #, 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:4025
+#: ../libpurple/protocols/oscar/oscar.c:3979
 #, 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:4028
+#: ../libpurple/protocols/oscar/oscar.c:3982
 #, 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:4031
+#: ../libpurple/protocols/oscar/oscar.c:3985
 #, 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:4034
+#: ../libpurple/protocols/oscar/oscar.c:3988
 #, 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:4037
+#: ../libpurple/protocols/oscar/oscar.c:3991
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Error 0x%04x: ukjent feil."
 
-#: ../libpurple/protocols/oscar/oscar.c:4047
+#: ../libpurple/protocols/oscar/oscar.c:4001
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "E-postadressa til %s er %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4049
+#: ../libpurple/protocols/oscar/oscar.c:4003
 msgid "Account Info"
 msgstr "Konto-info"
 
-#: ../libpurple/protocols/oscar/oscar.c:4221
+#: ../libpurple/protocols/oscar/oscar.c:4175
 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:4487
+#: ../libpurple/protocols/oscar/oscar.c:4446
 msgid "Unable to set AIM profile."
 msgstr "Klarer ikkje å lagra AIM-profilen."
 
-#: ../libpurple/protocols/oscar/oscar.c:4488
+#: ../libpurple/protocols/oscar/oscar.c:4447
 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:4502
+#: ../libpurple/protocols/oscar/oscar.c:4461
 #, 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:4507
+#: ../libpurple/protocols/oscar/oscar.c:4466
 msgid "Profile too long."
 msgstr "Profilen er for lang."
 
-#: ../libpurple/protocols/oscar/oscar.c:4552
+#: ../libpurple/protocols/oscar/oscar.c:4511
 #, 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:4557
+#: ../libpurple/protocols/oscar/oscar.c:4516
 msgid "Away message too long."
 msgstr "Fråværsmeldinga er for lang."
 
-#: ../libpurple/protocols/oscar/oscar.c:4626
+#: ../libpurple/protocols/oscar/oscar.c:4585
 #, 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:4628
-#: ../libpurple/protocols/oscar/oscar.c:5051
-#: ../libpurple/protocols/oscar/oscar.c:5066
+#: ../libpurple/protocols/oscar/oscar.c:4587
+#: ../libpurple/protocols/oscar/oscar.c:5020
+#: ../libpurple/protocols/oscar/oscar.c:5035
 msgid "Unable To Add"
 msgstr "Klarer ikkje å leggja til"
 
-#: ../libpurple/protocols/oscar/oscar.c:4732
+#: ../libpurple/protocols/oscar/oscar.c:4696
 msgid "Unable To Retrieve Buddy List"
 msgstr "Klarer ikkje å henta vennelista"
 
-#: ../libpurple/protocols/oscar/oscar.c:4733
+#: ../libpurple/protocols/oscar/oscar.c:4697
 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:4937
-#: ../libpurple/protocols/oscar/oscar.c:4938
-#: ../libpurple/protocols/oscar/oscar.c:4943
-#: ../libpurple/protocols/oscar/oscar.c:5120
-#: ../libpurple/protocols/oscar/oscar.c:5121
-#: ../libpurple/protocols/oscar/oscar.c:5126
+#: ../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
 msgid "Orphans"
 msgstr "Foreldrelause"
 
-#: ../libpurple/protocols/oscar/oscar.c:5049
+#: ../libpurple/protocols/oscar/oscar.c:5018
 #, 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:5049
-#: ../libpurple/protocols/oscar/oscar.c:5064
+#: ../libpurple/protocols/oscar/oscar.c:5018
+#: ../libpurple/protocols/oscar/oscar.c:5033
 msgid "(no name)"
 msgstr "(ikkje noko namn)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5063
+#: ../libpurple/protocols/oscar/oscar.c:5032
 #, 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:5157
+#: ../libpurple/protocols/oscar/oscar.c:5126
 #, 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:5165
+#: ../libpurple/protocols/oscar/oscar.c:5134
 msgid "Authorization Given"
 msgstr "Godkjent"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5238
+#: ../libpurple/protocols/oscar/oscar.c:5207
 #, 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:5239
+#: ../libpurple/protocols/oscar/oscar.c:5208
 msgid "Authorization Granted"
 msgstr "Godkjent"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5242
+#: ../libpurple/protocols/oscar/oscar.c:5211
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the following reason:\n"
@@ -7437,182 +7633,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:5243
+#: ../libpurple/protocols/oscar/oscar.c:5212
 msgid "Authorization Denied"
 msgstr "Godkjenning avvist"
 
-#: ../libpurple/protocols/oscar/oscar.c:5279
+#: ../libpurple/protocols/oscar/oscar.c:5248
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Exchange:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5319
+#: ../libpurple/protocols/oscar/oscar.c:5288
 msgid "Invalid chat name specified."
 msgstr "Det oppgjevne pratenamnet er ugyldig."
 
-#: ../libpurple/protocols/oscar/oscar.c:5388
+#: ../libpurple/protocols/oscar/oscar.c:5357
 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:5548
-#: ../libpurple/protocols/oscar/oscar.c:5553
+#: ../libpurple/protocols/oscar/oscar.c:5517
+#: ../libpurple/protocols/oscar/oscar.c:5522
 msgid "Away Message"
 msgstr "Fråværsmelding"
 
-#: ../libpurple/protocols/oscar/oscar.c:5553
+#: ../libpurple/protocols/oscar/oscar.c:5522
 msgid "<i>(retrieving)</i>"
 msgstr " <i>(hentar)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5753
+#: ../libpurple/protocols/oscar/oscar.c:5722
 msgid "iTunes Music Store Link"
 msgstr "Lenkje til iTunes Music Store"
 
-#: ../libpurple/protocols/oscar/oscar.c:5861
+#: ../libpurple/protocols/oscar/oscar.c:5830
 #, c-format
 msgid "Buddy Comment for %s"
-msgstr "Vennemerknad til %s"
-
-#: ../libpurple/protocols/oscar/oscar.c:5862
+msgstr "Vennenotat for %s"
+
+#: ../libpurple/protocols/oscar/oscar.c:5831
 msgid "Buddy Comment:"
 msgstr "Vennemerknad:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5909
+#: ../libpurple/protocols/oscar/oscar.c:5878
 #, 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:5913
+#: ../libpurple/protocols/oscar/oscar.c:5882
 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:5919
+#: ../libpurple/protocols/oscar/oscar.c:5888
 #: ../libpurple/protocols/oscar/peer.c:1022
 msgid "C_onnect"
 msgstr "_Koplar til"
 
-#: ../libpurple/protocols/oscar/oscar.c:5954
+#: ../libpurple/protocols/oscar/oscar.c:5923
 msgid "Get AIM Info"
 msgstr "Hent _AIM-informasjon"
 
-#: ../libpurple/protocols/oscar/oscar.c:5960
+#: ../libpurple/protocols/oscar/oscar.c:5929
 msgid "Edit Buddy Comment"
 msgstr "Endra vennemerknad"
 
-#: ../libpurple/protocols/oscar/oscar.c:5968
+#: ../libpurple/protocols/oscar/oscar.c:5937
 msgid "Get Status Msg"
 msgstr "Hent statusmelding"
 
-#: ../libpurple/protocols/oscar/oscar.c:5981
+#: ../libpurple/protocols/oscar/oscar.c:5950
 msgid "Direct IM"
 msgstr "Direktelynmelding"
 
-#: ../libpurple/protocols/oscar/oscar.c:6003
+#: ../libpurple/protocols/oscar/oscar.c:5972
 msgid "Re-request Authorization"
 msgstr "Spør om ny godkjenning"
 
-#: ../libpurple/protocols/oscar/oscar.c:6062
+#: ../libpurple/protocols/oscar/oscar.c:6031
 msgid "Require authorization"
 msgstr "Krev autorisasjon"
 
-#: ../libpurple/protocols/oscar/oscar.c:6065
+#: ../libpurple/protocols/oscar/oscar.c:6034
 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:6070
+#: ../libpurple/protocols/oscar/oscar.c:6039
 msgid "ICQ Privacy Options"
 msgstr "ICQ personvernval"
 
-#: ../libpurple/protocols/oscar/oscar.c:6089
+#: ../libpurple/protocols/oscar/oscar.c:6058
 msgid "The new formatting is invalid."
 msgstr "Den nye formateringa er ugyldig."
 
-#: ../libpurple/protocols/oscar/oscar.c:6090
+#: ../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:6143
+#: ../libpurple/protocols/oscar/oscar.c:6112
 msgid "Change Address To:"
 msgstr "Endra adressa til:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6189
+#: ../libpurple/protocols/oscar/oscar.c:6158
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>du ventar ikkje på godkjenning</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6192
+#: ../libpurple/protocols/oscar/oscar.c:6161
 msgid "You are awaiting authorization from the following buddies"
 msgstr "De ventar på godkjenning frå desse vennane"
 
-#: ../libpurple/protocols/oscar/oscar.c:6193
+#: ../libpurple/protocols/oscar/oscar.c:6162
 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:6210
+#: ../libpurple/protocols/oscar/oscar.c:6179
 msgid "Find Buddy by E-Mail"
 msgstr "Finn venn utfrå e-postadessa"
 
-#: ../libpurple/protocols/oscar/oscar.c:6211
+#: ../libpurple/protocols/oscar/oscar.c:6180
 msgid "Search for a buddy by e-mail address"
 msgstr "Bruk e-postadressa til å søkja etter ein venn"
 
-#: ../libpurple/protocols/oscar/oscar.c:6212
+#: ../libpurple/protocols/oscar/oscar.c:6181
 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:6215
+#: ../libpurple/protocols/oscar/oscar.c:6184
 msgid "_Search"
 msgstr "_Søk"
 
-#: ../libpurple/protocols/oscar/oscar.c:6373
+#: ../libpurple/protocols/oscar/oscar.c:6342
 msgid "Set User Info (URL)..."
 msgstr "Skriv inn brukarinfo (URL)…"
 
-#: ../libpurple/protocols/oscar/oscar.c:6384
+#: ../libpurple/protocols/oscar/oscar.c:6353
 msgid "Change Password (URL)"
 msgstr "Endra passord (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6388
+#: ../libpurple/protocols/oscar/oscar.c:6357
 msgid "Configure IM Forwarding (URL)"
 msgstr "Innstillingar for vidaresending (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6398
+#: ../libpurple/protocols/oscar/oscar.c:6367
 msgid "Set Privacy Options..."
 msgstr "Personvernval…"
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6405
+#: ../libpurple/protocols/oscar/oscar.c:6374
 msgid "Confirm Account"
 msgstr "Stadfest konto"
 
-#: ../libpurple/protocols/oscar/oscar.c:6409
+#: ../libpurple/protocols/oscar/oscar.c:6378
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Vis noverande registrerte e-postadresse"
 
-#: ../libpurple/protocols/oscar/oscar.c:6413
+#: ../libpurple/protocols/oscar/oscar.c:6382
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Endra noverande registrerte e-postadresse…"
 
-#: ../libpurple/protocols/oscar/oscar.c:6420
+#: ../libpurple/protocols/oscar/oscar.c:6389
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Vis vennar som ventar på godkjenning"
 
-#: ../libpurple/protocols/oscar/oscar.c:6426
+#: ../libpurple/protocols/oscar/oscar.c:6395
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Bruk e-postadressa til å søkja etter ein venn…"
 
-#: ../libpurple/protocols/oscar/oscar.c:6431
+#: ../libpurple/protocols/oscar/oscar.c:6400
 msgid "Search for Buddy by Information"
 msgstr "Søk etter venn utfrå opplysningar"
 
-#: ../libpurple/protocols/oscar/oscar.c:6499
+#: ../libpurple/protocols/oscar/oscar.c:6468
 msgid "Use recent buddies group"
 msgstr "Bruk seinaste vennegruppe"
 
-#: ../libpurple/protocols/oscar/oscar.c:6502
+#: ../libpurple/protocols/oscar/oscar.c:6471
 msgid "Show how long you have been idle"
 msgstr "Vis kor lenge du har vore uverksam"
 
-#: ../libpurple/protocols/oscar/oscar.c:6657
+#: ../libpurple/protocols/oscar/oscar.c:6626
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -7825,7 +8021,6 @@
 msgstr "Du avviste førespurnaden frå %d"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:209
-#: ../libpurple/protocols/qq/group_opt.c:137
 msgid "Input your reason:"
 msgstr "Før opp grunngjevinga di:"
 
@@ -7842,35 +8037,37 @@
 #: ../libpurple/protocols/qq/buddy_opt.c:214
 #: ../libpurple/protocols/qq/group_im.c:144
 #: ../libpurple/protocols/qq/group_opt.c:127
-#: ../libpurple/protocols/qq/sys_msg.c:91
-#: ../libpurple/protocols/qq/sys_msg.c:249
+#: ../libpurple/protocols/qq/sys_msg.c:90
+#: ../libpurple/protocols/qq/sys_msg.c:246
 msgid "Reject"
 msgstr "Avvis"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:277
-msgid "Add buddy with auth request fails"
+msgid "Add buddy with auth request failed"
 msgstr "Klarer ikkje å leggja til venn ved bruk av autentiseringsførespurnad"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:308
+#. TODO: We don't really need to notify the user about this, do we?
+#: ../libpurple/protocols/qq/buddy_opt.c:309
 msgid "You have successfully removed a buddy"
 msgstr "Du har fjerna vennen"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:336
-msgid "You have successfully removed yourself from a buddy"
-msgstr "Du har fjerna deg sjølv frå ein venn"
-
-#: ../libpurple/protocols/qq/buddy_opt.c:402
+#. TODO: Does the user really need to be notified about this?
+#: ../libpurple/protocols/qq/buddy_opt.c:338
+msgid "You have successfully removed yourself from your friend's buddy list"
+msgstr "Du har fjerna deg sjølv frå ein vennen din si venneliste"
+
+#: ../libpurple/protocols/qq/buddy_opt.c:404
 #, c-format
 msgid "User %d needs authentication"
 msgstr "Brukar %d treng autentisering"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:404
+#: ../libpurple/protocols/qq/buddy_opt.c:406
 #: ../libpurple/protocols/qq/group_join.c:136
 msgid "Input request here"
 msgstr "Skriv førespurnaden her"
 
 #. TODO: Awkward string to fix post string freeze - standardize auth dialogues? -evands
-#: ../libpurple/protocols/qq/buddy_opt.c:405
+#: ../libpurple/protocols/qq/buddy_opt.c:407
 #: ../libpurple/protocols/qq/group_join.c:137
 msgid "Would you be my friend?"
 msgstr "Vil du vera venn med meg?"
@@ -7878,22 +8075,22 @@
 #. multiline
 #. masked
 #. hint
-#: ../libpurple/protocols/qq/buddy_opt.c:406
+#: ../libpurple/protocols/qq/buddy_opt.c:408
 #: ../libpurple/protocols/qq/group_join.c:138
 #: ../libpurple/protocols/qq/group_opt.c:143
 msgid "Send"
 msgstr "Send"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:416
-#, c-format
-msgid "You have added %d in buddy list"
+#: ../libpurple/protocols/qq/buddy_opt.c:418
+#, c-format
+msgid "You have added %d to buddy list"
 msgstr "Du har lagt %d til i vennelista"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:513
+#: ../libpurple/protocols/qq/buddy_opt.c:515
 msgid "QQid Error"
 msgstr "QQ-id-feil"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:514
+#: ../libpurple/protocols/qq/buddy_opt.c:516
 msgid "Invalid QQid"
 msgstr "Ugyldig QQid"
 
@@ -7922,7 +8119,7 @@
 msgstr "QQ Qun"
 
 #: ../libpurple/protocols/qq/group.c:120
-msgid "Please input external group ID"
+msgid "Please enter external group ID"
 msgstr "Før opp ekstern gruppe-ID"
 
 #: ../libpurple/protocols/qq/group.c:121
@@ -7931,12 +8128,12 @@
 
 #: ../libpurple/protocols/qq/group_im.c:126
 #, c-format
-msgid "User %d applied to join group %d"
-msgstr "Brukaren %d søkte om å bli med i gruppa %d"
+msgid "User %d requested to join group %d"
+msgstr "Brukaren %d bad om å bli med i gruppa %d"
 
 #: ../libpurple/protocols/qq/group_im.c:127
 #: ../libpurple/protocols/qq/group_im.c:181
-#: ../libpurple/protocols/qq/sys_msg.c:195
+#: ../libpurple/protocols/qq/sys_msg.c:193
 #, c-format
 msgid "Reason: %s"
 msgstr "Årsak: %s"
@@ -7956,37 +8153,37 @@
 
 #: ../libpurple/protocols/qq/group_im.c:141
 #: ../libpurple/protocols/qq/group_opt.c:128
-#: ../libpurple/protocols/qq/sys_msg.c:92
-#: ../libpurple/protocols/qq/sys_msg.c:251
+#: ../libpurple/protocols/qq/sys_msg.c:91
+#: ../libpurple/protocols/qq/sys_msg.c:248
 msgid "Approve"
 msgstr "Godkjenn"
 
 #: ../libpurple/protocols/qq/group_im.c:180
 #, c-format
-msgid "You request to join group %d has been rejected by admin %d"
+msgid "Your request to join group %d has been rejected by admin %d"
 msgstr "Førespurnaden din om å bli med i gruppa %d er blitt avvist av admin %d"
 
 #: ../libpurple/protocols/qq/group_im.c:221
 #, c-format
-msgid "You request to join group %d has been approved by admin %d"
+msgid "Your request to join group %d has been approved by admin %d"
 msgstr "Førespurnaden din om å bli med i gruppa %d er blitt godteken av admin %d"
 
 #: ../libpurple/protocols/qq/group_im.c:257
 #, c-format
-msgid "You [%d] has exit group \"%d\""
+msgid "You [%d] have left group \"%d\""
 msgstr "Du [%d] har forlate gruppa  \"%d\""
 
 #: ../libpurple/protocols/qq/group_im.c:291
 #, c-format
-msgid "You [%d] has been added by group \"%d\""
-msgstr "Du [%d] er blitt lagt til av gruppa \"%d\""
+msgid "You [%d] have been added to group \"%d\""
+msgstr "Du [%d] er blitt lagt til i gruppa \"%d\""
 
 #: ../libpurple/protocols/qq/group_im.c:292
 msgid "This group has been added to your buddy list"
 msgstr "Brukaren er lagt til i vennelista di"
 
 #: ../libpurple/protocols/qq/group_internal.c:41
-msgid "I am not member"
+msgid "I am not a member"
 msgstr "Eg er ikkje medlem"
 
 #: ../libpurple/protocols/qq/group_internal.c:44
@@ -8010,7 +8207,7 @@
 msgstr "Denne gruppa tillèt ikkje at andre blir med"
 
 #: ../libpurple/protocols/qq/group_join.c:233
-msgid "You have successfully exited the group"
+msgid "You have successfully left the group"
 msgstr "Du har forlate gruppa"
 
 #: ../libpurple/protocols/qq/group_join.c:257
@@ -8018,15 +8215,15 @@
 msgstr "QQ-gruppegodkjenning"
 
 #: ../libpurple/protocols/qq/group_join.c:258
-msgid "Your authorization operation has been accepted by the QQ server"
-msgstr "Godkjenningshandlinga di er godteken av QQ-tenaren"
+msgid "Your authorization request has been accepted by the QQ server"
+msgstr "Godkjenningsførespurnaden din er godteken av QQ-tenaren"
 
 #: ../libpurple/protocols/qq/group_join.c:329
-msgid "You inputted a group id outside the acceptable range"
+msgid "You entered a group ID outside the acceptable range"
 msgstr "Du førte opp ein gruppe-ID utanfor godkjent område"
 
 #: ../libpurple/protocols/qq/group_join.c:360
-msgid "Are you sure to exit this Qun?"
+msgid "Are you sure you want to leave this Qun?"
 msgstr "Er du sikker på at du vil forlata denne Qun-en?"
 
 #: ../libpurple/protocols/qq/group_join.c:362
@@ -8037,10 +8234,6 @@
 "Ver merksam på at om du har laga denne Qun-en, \n"
 "vil denne handlinga fjerna han."
 
-#: ../libpurple/protocols/qq/group_join.c:367
-msgid "Go ahead"
-msgstr "Hald fram"
-
 #: ../libpurple/protocols/qq/group_network.c:92
 #, c-format
 msgid "Code [0x%02X]: %s"
@@ -8050,18 +8243,22 @@
 msgid "Group Operation Error"
 msgstr "Gruppehandlingsfeil"
 
-#. we wanna see window
+#. we want to see window
 #: ../libpurple/protocols/qq/group_opt.c:124
-#: ../libpurple/protocols/qq/sys_msg.c:88
-msgid "Do you wanna approve the request?"
+#: ../libpurple/protocols/qq/sys_msg.c:87
+msgid "Do you want to approve the request?"
 msgstr "Godtek du førespurnaden?"
 
+#: ../libpurple/protocols/qq/group_opt.c:137
+msgid "Enter your reason:"
+msgstr "Før opp grunngjevinga di:"
+
 #: ../libpurple/protocols/qq/group_opt.c:235
-msgid "You have successfully modify Qun member"
+msgid "You have successfully modified Qun member"
 msgstr "Du har endra Qun-medlemmet"
 
 #: ../libpurple/protocols/qq/group_opt.c:305
-msgid "You have successfully modify Qun information"
+msgid "You have successfully modified Qun information"
 msgstr "Du har endra Qun-opplysningane"
 
 #: ../libpurple/protocols/qq/group_opt.c:392
@@ -8081,20 +8278,16 @@
 msgstr "Systemmelding"
 
 #: ../libpurple/protocols/qq/im.c:576
-msgid "Server ACK"
-msgstr "Tenarstadfesting (ACK)"
-
-#: ../libpurple/protocols/qq/im.c:576
 msgid "Failed to send IM."
 msgstr "Klarte ikkje å senda lynmeldinga."
 
 #: ../libpurple/protocols/qq/keep_alive.c:87
-msgid "Keep alive error, seems connection lost!"
-msgstr "Oppnår ikkje samband - tilkoplinga kan vera tapt."
+msgid "Keep alive error"
+msgstr "Oppetidsfeil"
 
 #: ../libpurple/protocols/qq/login_logout.c:408
-msgid "Request login token error!"
-msgstr "Feil ved spørjing etter påloggingsmarkøren"
+msgid "Error requesting login token"
+msgstr "Feil ved førespurnad om påloggingsmarkør"
 
 #: ../libpurple/protocols/qq/login_logout.c:486
 msgid "Unable to login, check debug log"
@@ -8114,97 +8307,84 @@
 msgid "Unknown-%d"
 msgstr "Ukjend-%d"
 
-#: ../libpurple/protocols/qq/qq.c:209
-#, c-format
-msgid "%s Address"
-msgstr "%s adresse"
-
-#: ../libpurple/protocols/qq/qq.c:240
+#: ../libpurple/protocols/qq/qq.c:211
+msgid "TCP Address"
+msgstr "TCP-adresse"
+
+#: ../libpurple/protocols/qq/qq.c:213
+msgid "UDP Address"
+msgstr "UDP-adresse"
+
+#: ../libpurple/protocols/qq/qq.c:242
 msgid "Level"
 msgstr "Nivå"
 
-#: ../libpurple/protocols/qq/qq.c:278
-msgid "QQ: Available"
-msgstr "QQ: Tilgjengeleg"
-
-#: ../libpurple/protocols/qq/qq.c:282
-msgid "QQ: Away"
-msgstr "QQ: Vekke"
-
-#: ../libpurple/protocols/qq/qq.c:286
-msgid "QQ: Invisible"
-msgstr "QQ: Usynleg"
-
-#: ../libpurple/protocols/qq/qq.c:290
-msgid "QQ: Offline"
-msgstr "QQ: Fråkopla "
-
-#: ../libpurple/protocols/qq/qq.c:371
+#: ../libpurple/protocols/qq/qq.c:373
 msgid "Invalid name"
 msgstr "Ugyldig brukarnamn"
 
-#: ../libpurple/protocols/qq/qq.c:437
+#: ../libpurple/protocols/qq/qq.c:439
 #, c-format
 msgid "<b>Current Online</b>: %d<br>\n"
 msgstr "<b>Tilkopla no</b>: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:438
+#: ../libpurple/protocols/qq/qq.c:440
 #, c-format
 msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr "<b>Siste oppfrisking</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:442
+#: ../libpurple/protocols/qq/qq.c:444
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>Tilkoplingstilstand</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:443
+#: ../libpurple/protocols/qq/qq.c:445
 #, c-format
 msgid "<b>Server IP</b>: %s: %d<br>\n"
 msgstr "<b>Tenar-IP-adresse</b>: %s: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:444
+#: ../libpurple/protocols/qq/qq.c:446
 #, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
 msgstr "<b>Mi offentlege IP-adresse</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:449
+#: ../libpurple/protocols/qq/qq.c:451
 #, c-format
 msgid "<b>Login Time</b>: %s<br>\n"
 msgstr "<b>Påloggingstid</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:450
+#: ../libpurple/protocols/qq/qq.c:452
 #, c-format
 msgid "<b>Last Login IP</b>: %s<br>\n"
 msgstr "<b>Siste påloggings-IP-adresse</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:451
+#: ../libpurple/protocols/qq/qq.c:453
 #, c-format
 msgid "<b>Last Login Time</b>: %s\n"
 msgstr "<b>Siste påloggingstidspunkt</b>: %s\n"
 
-#: ../libpurple/protocols/qq/qq.c:455
+#: ../libpurple/protocols/qq/qq.c:457
 msgid "Login Information"
 msgstr "Påloggingsinformasjon "
 
-#: ../libpurple/protocols/qq/qq.c:531
-msgid "Modify My Information"
-msgstr "Endra mine opplysningar"
-
-#: ../libpurple/protocols/qq/qq.c:534
+#: ../libpurple/protocols/qq/qq.c:533
+msgid "Set My Information"
+msgstr "Lagra opplysningane mine"
+
+#: ../libpurple/protocols/qq/qq.c:536
 #: ../libpurple/protocols/toc/toc.c:1680
 msgid "Change Password"
 msgstr "Endra passord"
 
-#: ../libpurple/protocols/qq/qq.c:537
+#: ../libpurple/protocols/qq/qq.c:539
 msgid "Show Login Information"
 msgstr "Vis påloggingsinformasjon "
 
-#: ../libpurple/protocols/qq/qq.c:558
-msgid "Exit this QQ Qun"
-msgstr "Forlat denne QQ Qun"
-
-#: ../libpurple/protocols/qq/qq.c:582
+#: ../libpurple/protocols/qq/qq.c:560
+msgid "Leave this QQ Qun"
+msgstr "Forlat denne QQ Qun-en"
+
+#: ../libpurple/protocols/qq/qq.c:584
 msgid "Block this buddy"
 msgstr "Blokker denne vennen"
 
@@ -8218,26 +8398,14 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/qq/qq.c:723
 #: ../libpurple/protocols/qq/qq.c:725
+#: ../libpurple/protocols/qq/qq.c:727
 msgid "QQ Protocol\tPlugin"
 msgstr "QQ-protokoll\tTillegg"
 
-#: ../libpurple/protocols/qq/qq.c:750
-msgid "Login in TCP"
-msgstr "Pålogging med TCP"
-
-#: ../libpurple/protocols/qq/qq.c:753
-msgid "Login Hidden"
-msgstr "Skjult pålogging"
-
-#: ../libpurple/protocols/qq/qq_proxy.c:497
-msgid "Socket send error"
-msgstr "Sendefeil endepunkt"
-
-#: ../libpurple/protocols/qq/qq_proxy.c:500
-msgid "Connection refused"
-msgstr "Tilkoplinga avvist"
+#: ../libpurple/protocols/qq/qq.c:752
+msgid "Connect using TCP"
+msgstr "Kopla til ved hjelp av TCP"
 
 #: ../libpurple/protocols/qq/recv_core.c:309
 msgid "Socket error"
@@ -8271,53 +8439,52 @@
 msgid "Login failed, no reply"
 msgstr "Klarte ikkje å logga på: ikkje noko svar"
 
-#: ../libpurple/protocols/qq/sys_msg.c:112
-msgid "Do you wanna add this buddy?"
+#: ../libpurple/protocols/qq/sys_msg.c:110
+msgid "Do you want to add this buddy?"
 msgstr "Vil du leggja til denne vennen?"
 
 #. only need to get value
-#: ../libpurple/protocols/qq/sys_msg.c:168
+#: ../libpurple/protocols/qq/sys_msg.c:166
 #, c-format
 msgid "You have been added by %s"
 msgstr "%s har lagt deg til"
 
-#: ../libpurple/protocols/qq/sys_msg.c:171
+#: ../libpurple/protocols/qq/sys_msg.c:169
 msgid "Would like to add him?"
 msgstr "Vil du leggja han til?"
 
-#: ../libpurple/protocols/qq/sys_msg.c:178
-#, c-format
-msgid "%s has added you [%s]"
-msgstr "%s har lagt deg til [%s]"
-
-#: ../libpurple/protocols/qq/sys_msg.c:194
+#: ../libpurple/protocols/qq/sys_msg.c:176
+#, c-format
+msgid "%s has added you [%s] to his or her buddy list"
+msgstr "%s har lagt deg [%s] til i vennelista si"
+
+#: ../libpurple/protocols/qq/sys_msg.c:192
 #, c-format
 msgid "User %s rejected your request"
 msgstr "Brukaren %s avviste førespurnaden din"
 
-#: ../libpurple/protocols/qq/sys_msg.c:214
-#, c-format
-msgid "User %s has approved your request"
+#: ../libpurple/protocols/qq/sys_msg.c:212
+#, c-format
+msgid "User %s approved your request"
 msgstr "Brukaren %s godtok førespurnaden din"
 
-#. TODO: 'wanna' is not an appropriate word for this string. Fix after string freeze
 #. TODO: this should go through purple_account_request_authorization()
-#: ../libpurple/protocols/qq/sys_msg.c:241
-#, c-format
-msgid "%s wanna add you [%s] as friends"
-msgstr "%s ønskjer å leggja dykk [%s] til som vennar"
-
-#: ../libpurple/protocols/qq/sys_msg.c:242
+#: ../libpurple/protocols/qq/sys_msg.c:238
+#, c-format
+msgid "%s wants to add you [%s] as a friend"
+msgstr "%s ønskjer å leggja deg [%s] til som venn"
+
+#: ../libpurple/protocols/qq/sys_msg.c:239
 #, c-format
 msgid "Message: %s"
 msgstr "Melding: %s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:264
+#: ../libpurple/protocols/qq/sys_msg.c:261
 #, c-format
 msgid "%s is not in your buddy list"
 msgstr "%s er ikkje på vennelista di"
 
-#: ../libpurple/protocols/qq/sys_msg.c:266
+#: ../libpurple/protocols/qq/sys_msg.c:263
 msgid "Would you like to add him?"
 msgstr "Vil du leggja han til?"
 
@@ -8408,7 +8575,7 @@
 
 #. this is a regular connect, error out
 #: ../libpurple/protocols/sametime/sametime.c:1732
-#: ../libpurple/protocols/sametime/sametime.c:3726
+#: ../libpurple/protocols/sametime/sametime.c:3727
 msgid "Unable to connect to host"
 msgstr "Klarer ikkje å kopla til tenaren"
 
@@ -8429,151 +8596,151 @@
 msgid "Place Closed"
 msgstr "Staden er lukka"
 
-#: ../libpurple/protocols/sametime/sametime.c:3229
+#: ../libpurple/protocols/sametime/sametime.c:3230
 msgid "Microphone"
 msgstr "Mikrofon"
 
-#: ../libpurple/protocols/sametime/sametime.c:3230
+#: ../libpurple/protocols/sametime/sametime.c:3231
 msgid "Speakers"
 msgstr "Høgtalarar"
 
-#: ../libpurple/protocols/sametime/sametime.c:3231
+#: ../libpurple/protocols/sametime/sametime.c:3232
 msgid "Video Camera"
 msgstr "Videokamera"
 
-#: ../libpurple/protocols/sametime/sametime.c:3235
+#: ../libpurple/protocols/sametime/sametime.c:3236
 msgid "File Transfer"
 msgstr "Filoverføring"
 
-#: ../libpurple/protocols/sametime/sametime.c:3269
-#: ../libpurple/protocols/sametime/sametime.c:4145
+#: ../libpurple/protocols/sametime/sametime.c:3270
+#: ../libpurple/protocols/sametime/sametime.c:4146
 msgid "Supports"
 msgstr "Støttar"
 
-#: ../libpurple/protocols/sametime/sametime.c:3274
-#: ../libpurple/protocols/sametime/sametime.c:4119
+#: ../libpurple/protocols/sametime/sametime.c:3275
+#: ../libpurple/protocols/sametime/sametime.c:4120
 msgid "External User"
 msgstr "Ekstern brukar"
 
-#: ../libpurple/protocols/sametime/sametime.c:3380
+#: ../libpurple/protocols/sametime/sametime.c:3381
 msgid "Create conference with user"
 msgstr "Lag konferanse med brukar"
 
-#: ../libpurple/protocols/sametime/sametime.c:3381
+#: ../libpurple/protocols/sametime/sametime.c:3382
 #, 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:3385
+#: ../libpurple/protocols/sametime/sametime.c:3386
 msgid "New Conference"
 msgstr "Ny konferanse"
 
-#: ../libpurple/protocols/sametime/sametime.c:3387
+#: ../libpurple/protocols/sametime/sametime.c:3388
 msgid "Create"
 msgstr "Lag"
 
-#: ../libpurple/protocols/sametime/sametime.c:3452
+#: ../libpurple/protocols/sametime/sametime.c:3453
 msgid "Available Conferences"
 msgstr "Tilgjengelege konferansar"
 
-#: ../libpurple/protocols/sametime/sametime.c:3458
+#: ../libpurple/protocols/sametime/sametime.c:3459
 msgid "Create New Conference..."
 msgstr "Lag ny konferanse…"
 
-#: ../libpurple/protocols/sametime/sametime.c:3465
+#: ../libpurple/protocols/sametime/sametime.c:3466
 msgid "Invite user to a conference"
 msgstr "Inviter ein brukar til ein konferanse"
 
-#: ../libpurple/protocols/sametime/sametime.c:3466
+#: ../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:3471
+#: ../libpurple/protocols/sametime/sametime.c:3472
 msgid "Invite to Conference"
 msgstr "Inviter til konferanse"
 
-#: ../libpurple/protocols/sametime/sametime.c:3562
+#: ../libpurple/protocols/sametime/sametime.c:3563
 msgid "Invite to Conference..."
 msgstr "Inviter til konferanse…"
 
-#: ../libpurple/protocols/sametime/sametime.c:3567
+#: ../libpurple/protocols/sametime/sametime.c:3568
 msgid "Send TEST Announcement"
 msgstr "Send TEST-melding"
 
-#: ../libpurple/protocols/sametime/sametime.c:3586
-#: ../pidgin/gtkconv.c:4274
+#: ../libpurple/protocols/sametime/sametime.c:3587
+#: ../pidgin/gtkconv.c:4307
 msgid "Topic:"
 msgstr "Emne:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3614
+#: ../libpurple/protocols/sametime/sametime.c:3615
 msgid "No Sametime Community Server specified"
 msgstr "Ingen Sametime felleskapstenar spesifisert"
 
-#: ../libpurple/protocols/sametime/sametime.c:3636
+#: ../libpurple/protocols/sametime/sametime.c:3637
 #, 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:3641
+#: ../libpurple/protocols/sametime/sametime.c:3642
 msgid "Meanwhile Connection Setup"
 msgstr "Meanwhile tilkoplingsinnstillingar"
 
-#: ../libpurple/protocols/sametime/sametime.c:3642
+#: ../libpurple/protocols/sametime/sametime.c:3643
 msgid "No Sametime Community Server Specified"
 msgstr "Ingen Sametime felleskapstenar spesifisert"
 
-#: ../libpurple/protocols/sametime/sametime.c:3644
-#: ../pidgin/gtkblist.c:4015
+#: ../libpurple/protocols/sametime/sametime.c:3645
+#: ../pidgin/gtkblist.c:4028
 msgid "Connect"
 msgstr "Kopla til"
 
-#: ../libpurple/protocols/sametime/sametime.c:4135
+#: ../libpurple/protocols/sametime/sametime.c:4136
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "Ukjend (0x%04x)<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:4137
+#: ../libpurple/protocols/sametime/sametime.c:4138
 msgid "Last Known Client"
 msgstr "Sist kjende klient"
 
-#: ../libpurple/protocols/sametime/sametime.c:4301
-#: ../libpurple/protocols/sametime/sametime.c:5506
+#: ../libpurple/protocols/sametime/sametime.c:4302
+#: ../libpurple/protocols/sametime/sametime.c:5507
 msgid "User Name"
 msgstr "Brukarnamn"
 
-#: ../libpurple/protocols/sametime/sametime.c:4304
-#: ../libpurple/protocols/sametime/sametime.c:5509
+#: ../libpurple/protocols/sametime/sametime.c:4305
+#: ../libpurple/protocols/sametime/sametime.c:5510
 msgid "Sametime ID"
 msgstr "Sametime-ID"
 
-#: ../libpurple/protocols/sametime/sametime.c:4328
+#: ../libpurple/protocols/sametime/sametime.c:4329
 msgid "An ambiguous user ID was entered"
 msgstr "Brukar-ID-en var ikkje eintydig"
 
-#: ../libpurple/protocols/sametime/sametime.c:4329
+#: ../libpurple/protocols/sametime/sametime.c:4330
 #, 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:4334
+#: ../libpurple/protocols/sametime/sametime.c:4335
 msgid "Select User"
 msgstr "Vel brukar"
 
-#: ../libpurple/protocols/sametime/sametime.c:4418
+#: ../libpurple/protocols/sametime/sametime.c:4419
 msgid "Unable to add user: user not found"
 msgstr "Klarte ikkje å leggja til brukar: fann ikkje brukaren"
 
-#: ../libpurple/protocols/sametime/sametime.c:4420
+#: ../libpurple/protocols/sametime/sametime.c:4421
 #, 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:4425
+#: ../libpurple/protocols/sametime/sametime.c:4426
 msgid "Unable to add user"
 msgstr "Klarte ikkje å leggja til brukar"
 
-#: ../libpurple/protocols/sametime/sametime.c:5011
+#: ../libpurple/protocols/sametime/sametime.c:5012
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -8582,151 +8749,151 @@
 "Fillesefeil %s: \n"
 "%s\n"
 
-#: ../libpurple/protocols/sametime/sametime.c:5146
+#: ../libpurple/protocols/sametime/sametime.c:5147
 msgid "Remotely Stored Buddy List"
 msgstr "Fjernlagra venneliste"
 
-#: ../libpurple/protocols/sametime/sametime.c:5151
+#: ../libpurple/protocols/sametime/sametime.c:5152
 msgid "Buddy List Storage Mode"
 msgstr "Lagringstilstand venneliste"
 
-#: ../libpurple/protocols/sametime/sametime.c:5154
+#: ../libpurple/protocols/sametime/sametime.c:5155
 msgid "Local Buddy List Only"
 msgstr "Berre lokal venneliste"
 
-#: ../libpurple/protocols/sametime/sametime.c:5156
+#: ../libpurple/protocols/sametime/sametime.c:5157
 msgid "Merge List from Server"
 msgstr "Slå saman med liste frå tenar"
 
-#: ../libpurple/protocols/sametime/sametime.c:5158
+#: ../libpurple/protocols/sametime/sametime.c:5159
 msgid "Merge and Save List to Server"
 msgstr "Slå saman og lagra lista på tenar"
 
-#: ../libpurple/protocols/sametime/sametime.c:5160
+#: ../libpurple/protocols/sametime/sametime.c:5161
 msgid "Synchronize List with Server"
 msgstr "Synkronisera lista med tenaren"
 
-#: ../libpurple/protocols/sametime/sametime.c:5215
+#: ../libpurple/protocols/sametime/sametime.c:5216
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "Importer Sametime-liste for kontoen %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5255
+#: ../libpurple/protocols/sametime/sametime.c:5256
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "Eksporter Sametime-liste for kontoen %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5309
+#: ../libpurple/protocols/sametime/sametime.c:5310
 msgid "Unable to add group: group exists"
 msgstr "Klarte ikkje å leggja til gruppe: gruppa finst allereie"
 
-#: ../libpurple/protocols/sametime/sametime.c:5310
+#: ../libpurple/protocols/sametime/sametime.c:5311
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "Ei gruppe med namnet '%s' finst allereie i vennelista di."
 
-#: ../libpurple/protocols/sametime/sametime.c:5313
-#: ../libpurple/protocols/sametime/sametime.c:5443
+#: ../libpurple/protocols/sametime/sametime.c:5314
+#: ../libpurple/protocols/sametime/sametime.c:5444
 msgid "Unable to add group"
 msgstr "Klarte ikkje å leggja til gruppe"
 
-#: ../libpurple/protocols/sametime/sametime.c:5372
+#: ../libpurple/protocols/sametime/sametime.c:5373
 msgid "Possible Matches"
 msgstr "Moglege treff"
 
-#: ../libpurple/protocols/sametime/sametime.c:5388
+#: ../libpurple/protocols/sametime/sametime.c:5389
 msgid "Notes Address Book group results"
 msgstr "Grupperesultat Notes adressebok"
 
-#: ../libpurple/protocols/sametime/sametime.c:5389
+#: ../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:5394
+#: ../libpurple/protocols/sametime/sametime.c:5395
 msgid "Select Notes Address Book"
 msgstr "Vel Notes adressebok"
 
-#: ../libpurple/protocols/sametime/sametime.c:5437
+#: ../libpurple/protocols/sametime/sametime.c:5438
 msgid "Unable to add group: group not found"
 msgstr "Klarte ikkje å leggja til gruppa: gruppa finst ikkje"
 
-#: ../libpurple/protocols/sametime/sametime.c:5439
+#: ../libpurple/protocols/sametime/sametime.c:5440
 #, 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:5480
+#: ../libpurple/protocols/sametime/sametime.c:5481
 msgid "Notes Address Book Group"
 msgstr "Notes adressebokgruppe"
 
-#: ../libpurple/protocols/sametime/sametime.c:5481
+#: ../libpurple/protocols/sametime/sametime.c:5482
 msgid "Enter the name of a Notes Address Book group in the field below to add the group and its members to your buddy list."
 msgstr "Før opp namnet til ei Notes adressebokgruppe i feltet nedanfor for å leggja til gruppa og medlemmene hennar i vennelista di."
 
-#: ../libpurple/protocols/sametime/sametime.c:5530
+#: ../libpurple/protocols/sametime/sametime.c:5531
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Søkjeresultat for '%s'"
 
-#: ../libpurple/protocols/sametime/sametime.c:5531
+#: ../libpurple/protocols/sametime/sametime.c:5532
 #, 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:5538
-#: ../pidgin/gtknotify.c:719
+#: ../libpurple/protocols/sametime/sametime.c:5539
+#: ../pidgin/gtknotify.c:721
 msgid "Search Results"
 msgstr "Søkjeresultat"
 
-#: ../libpurple/protocols/sametime/sametime.c:5563
+#: ../libpurple/protocols/sametime/sametime.c:5564
 msgid "No matches"
 msgstr "Ingen treff"
 
-#: ../libpurple/protocols/sametime/sametime.c:5564
+#: ../libpurple/protocols/sametime/sametime.c:5565
 #, 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:5568
+#: ../libpurple/protocols/sametime/sametime.c:5569
 msgid "No Matches"
 msgstr "Ingen treff"
 
-#: ../libpurple/protocols/sametime/sametime.c:5605
+#: ../libpurple/protocols/sametime/sametime.c:5606
 msgid "Search for a user"
 msgstr "Søk etter ein brukar"
 
-#: ../libpurple/protocols/sametime/sametime.c:5606
+#: ../libpurple/protocols/sametime/sametime.c:5607
 msgid "Enter a name or partial ID in the field below to search for matching users in your Sametime community."
 msgstr "Skriv inn eit namn eller ei delvis ID-oppføring i feltet nedanfor for å søkja etter samsvarande brukarar i Sametime-fellesskapet ditt."
 
-#: ../libpurple/protocols/sametime/sametime.c:5609
+#: ../libpurple/protocols/sametime/sametime.c:5610
 msgid "User Search"
 msgstr "Brukarsøk"
 
-#: ../libpurple/protocols/sametime/sametime.c:5622
+#: ../libpurple/protocols/sametime/sametime.c:5623
 msgid "Import Sametime List..."
 msgstr "Importer Sametime-liste…"
 
-#: ../libpurple/protocols/sametime/sametime.c:5626
+#: ../libpurple/protocols/sametime/sametime.c:5627
 msgid "Export Sametime List..."
 msgstr "Eksporter Sametime-liste…"
 
-#: ../libpurple/protocols/sametime/sametime.c:5630
+#: ../libpurple/protocols/sametime/sametime.c:5631
 msgid "Add Notes Address Book Group..."
 msgstr "Legg til Notes adressebokgruppe…"
 
-#: ../libpurple/protocols/sametime/sametime.c:5634
+#: ../libpurple/protocols/sametime/sametime.c:5635
 msgid "User Search..."
 msgstr "Brukarsøk…"
 
-#: ../libpurple/protocols/sametime/sametime.c:5740
+#: ../libpurple/protocols/sametime/sametime.c:5741
 msgid "Force login (ignore server redirects)"
 msgstr "Tvungen pålogging (sjå vekk frå tenarvidaresending)"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5750
+#: ../libpurple/protocols/sametime/sametime.c:5751
 msgid "Hide client identity"
 msgstr "Skjul klientidentitet"
 
@@ -9067,7 +9234,7 @@
 #: ../libpurple/protocols/silc10/silc.c:670
 #: ../libpurple/protocols/silc10/util.c:528
 msgid "Bored"
-msgstr "Keisamt"
+msgstr "Keier meg"
 
 #: ../libpurple/protocols/silc/buddy.c:1511
 #: ../libpurple/protocols/silc/silc.c:761
@@ -9618,7 +9785,7 @@
 #: ../libpurple/protocols/silc/ops.c:1046
 #: ../libpurple/protocols/silc10/ops.c:1080
 msgid "Note"
-msgstr "Merknad"
+msgstr "Notat"
 
 #: ../libpurple/protocols/silc/ops.c:1093
 #: ../libpurple/protocols/silc10/ops.c:1128
@@ -9938,7 +10105,7 @@
 
 #: ../libpurple/protocols/silc/silc.c:741
 #: ../libpurple/protocols/silc10/silc.c:652
-#: ../pidgin/gtkprefs.c:1636
+#: ../pidgin/gtkprefs.c:1638
 msgid "Normal"
 msgstr "Normal"
 
@@ -10028,14 +10195,14 @@
 #: ../libpurple/protocols/silc/silc.c:859
 #: ../libpurple/protocols/silc10/silc.c:772
 msgid "No Message of the Day available"
-msgstr "Ingen Dagens melding er tilgjengeleg"
+msgstr "Inga \"Dagens melding\" er tilgjengeleg"
 
 #: ../libpurple/protocols/silc/silc.c:860
 #: ../libpurple/protocols/silc/silc.c:1481
 #: ../libpurple/protocols/silc10/silc.c:773
 #: ../libpurple/protocols/silc10/silc.c:1410
 msgid "There is no Message of the Day associated with this connection"
-msgstr "Det er ingen Dagens melding knytt til dette sambandet"
+msgstr "Det er inga \"Dagens melding\" knytt til dette sambandet"
 
 #: ../libpurple/protocols/silc/silc.c:911
 #: ../libpurple/protocols/silc/silc.c:957
@@ -10091,7 +10258,7 @@
 #: ../libpurple/protocols/silc/silc.c:1081
 #: ../libpurple/protocols/silc10/silc.c:992
 msgid "View Message of the Day"
-msgstr "Sjå Dagens melding"
+msgstr "Sjå \"Dagens melding\""
 
 #: ../libpurple/protocols/silc/silc.c:1085
 #: ../libpurple/protocols/silc10/silc.c:996
@@ -10188,7 +10355,7 @@
 #: ../libpurple/protocols/silc/silc.c:1686
 #: ../libpurple/protocols/silc10/silc.c:1615
 msgid "motd:  View the server's Message Of The Day"
-msgstr "motd:  sjå på tenaren si Dagens melding"
+msgstr "motd:  sjå på tenaren si \"Dagens melding\""
 
 #: ../libpurple/protocols/silc/silc.c:1690
 #: ../libpurple/protocols/silc10/silc.c:1619
@@ -10307,14 +10474,14 @@
 
 #: ../libpurple/protocols/silc/silc.c:1910
 #: ../libpurple/protocols/silc10/silc.c:1853
-#: ../pidgin/gtkprefs.c:2029
+#: ../pidgin/gtkprefs.c:2031
 msgid "Network"
 msgstr "Nettverk"
 
 #: ../libpurple/protocols/silc/silc.c:1921
 #: ../libpurple/protocols/silc10/silc.c:1864
 msgid "Public Key file"
-msgstr "_Offentleg nøkkel-fil"
+msgstr "Offentleg nøkkel-fil"
 
 #: ../libpurple/protocols/silc/silc.c:1925
 #: ../libpurple/protocols/silc10/silc.c:1868
@@ -10566,26 +10733,26 @@
 msgstr "Klarte ikkje å lagra"
 
 #: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1484
+#: ../libpurple/protocols/simple/simple.c:1489
 msgid "Could not connect"
 msgstr "Klarte ikkje å kopla til"
 
-#: ../libpurple/protocols/simple/simple.c:1518
-#: ../libpurple/protocols/simple/simple.c:1560
-#: ../libpurple/protocols/simple/simple.c:1573
-#: ../libpurple/protocols/simple/simple.c:1624
+#: ../libpurple/protocols/simple/simple.c:1523
+#: ../libpurple/protocols/simple/simple.c:1565
+#: ../libpurple/protocols/simple/simple.c:1578
+#: ../libpurple/protocols/simple/simple.c:1629
 msgid "Could not create listen socket"
 msgstr "Klarte ikkje å laga lytte-endepunkt"
 
-#: ../libpurple/protocols/simple/simple.c:1541
+#: ../libpurple/protocols/simple/simple.c:1546
 msgid "Couldn't resolve host"
 msgstr "Vertsoppslaget feila"
 
-#: ../libpurple/protocols/simple/simple.c:1632
+#: ../libpurple/protocols/simple/simple.c:1637
 msgid "Could not resolve hostname"
 msgstr "Vertsnamnoppslaget feila"
 
-#: ../libpurple/protocols/simple/simple.c:1649
+#: ../libpurple/protocols/simple/simple.c:1654
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "IRC-brukarnamn kan ikkje innehalda mellomrom eller @-teikn"
 
@@ -10597,36 +10764,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1824
+#: ../libpurple/protocols/simple/simple.c:1829
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE-protokolltillegg"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1825
+#: ../libpurple/protocols/simple/simple.c:1830
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE-protokolltillegget"
 
-#: ../libpurple/protocols/simple/simple.c:1853
+#: ../libpurple/protocols/simple/simple.c:1858
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Offentleggjer tilstand (merk: kven som helst kan sjå deg)"
 
-#: ../libpurple/protocols/simple/simple.c:1859
+#: ../libpurple/protocols/simple/simple.c:1864
 msgid "Use UDP"
 msgstr "Bruk UDP"
 
-#: ../libpurple/protocols/simple/simple.c:1861
+#: ../libpurple/protocols/simple/simple.c:1866
 msgid "Use proxy"
 msgstr "Bruk mellomlager"
 
-#: ../libpurple/protocols/simple/simple.c:1863
+#: ../libpurple/protocols/simple/simple.c:1868
 msgid "Proxy"
 msgstr "Mellomlager"
 
-#: ../libpurple/protocols/simple/simple.c:1865
+#: ../libpurple/protocols/simple/simple.c:1870
 msgid "Auth User"
 msgstr "Autentiser brukar"
 
-#: ../libpurple/protocols/simple/simple.c:1867
+#: ../libpurple/protocols/simple/simple.c:1872
 msgid "Auth Domain"
 msgstr "Autentiseringsdomene"
 
@@ -10782,8 +10949,8 @@
 msgstr "Passordet er endra"
 
 #: ../libpurple/protocols/toc/toc.c:1366
-#: ../pidgin/gtkblist.c:5519
-#: ../pidgin/gtkblist.c:5873
+#: ../pidgin/gtkblist.c:5534
+#: ../pidgin/gtkblist.c:5887
 msgid "_Group:"
 msgstr "_Gruppe:"
 
@@ -10846,94 +11013,94 @@
 msgid "TOC Protocol Plugin"
 msgstr "TOC-protokolltillegg"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:810
+#: ../libpurple/protocols/yahoo/yahoo.c:823
 msgid "Your Yahoo! message did not get sent."
 msgstr "Yahoo!-meldinga di blei ikkje sendt."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:880
+#: ../libpurple/protocols/yahoo/yahoo.c:895
 #, c-format
 msgid "%s just sent you a Buzz!"
 msgstr "%s sendte deg nettopp ein alarm"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:927
+#: ../libpurple/protocols/yahoo/yahoo.c:942
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Yahoo! systemmelding for %s:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:986
+#: ../libpurple/protocols/yahoo/yahoo.c:1003
 msgid "Authorization denied message:"
 msgstr "Melding om avvist autentisering:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1067
+#: ../libpurple/protocols/yahoo/yahoo.c:1084
 #, 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:1070
+#: ../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:1073
+#: ../libpurple/protocols/yahoo/yahoo.c:1090
 msgid "Add buddy rejected"
 msgstr "Er blitt nekta å leggja til venn"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1824
+#: ../libpurple/protocols/yahoo/yahoo.c:1841
 #, 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:1827
+#: ../libpurple/protocols/yahoo/yahoo.c:1844
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo!-autentiseringa feila"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1893
+#: ../libpurple/protocols/yahoo/yahoo.c:1910
 #, 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:1896
+#: ../libpurple/protocols/yahoo/yahoo.c:1913
 msgid "Ignore buddy?"
 msgstr "Ignorera vennen?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1955
+#: ../libpurple/protocols/yahoo/yahoo.c:1976
 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:1958
+#: ../libpurple/protocols/yahoo/yahoo.c:1979
 #, 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:2012
+#: ../libpurple/protocols/yahoo/yahoo.c:2033
 #, 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:2015
+#: ../libpurple/protocols/yahoo/yahoo.c:2036
 msgid "Could not add buddy to server list"
 msgstr "Klarte ikkje å leggja til vennen i tenarlista"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2134
+#: ../libpurple/protocols/yahoo/yahoo.c:2155
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Hørleg %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2474
+#: ../libpurple/protocols/yahoo/yahoo.c:2495
 msgid "Received unexpected HTTP response from server."
 msgstr "Fekk uventa HTTP-svar frå tenar."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2498
-#: ../libpurple/protocols/yahoo/yahoo.c:2684
-#: ../libpurple/protocols/yahoo/yahoo.c:2787
-#: ../libpurple/protocols/yahoo/yahoo.c:2797
+#: ../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/ycht.c:585
 msgid "Connection problem"
 msgstr "Tilkoplingsproblem"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2524
+#: ../libpurple/protocols/yahoo/yahoo.c:2545
 #, c-format
 msgid ""
 "Lost connection with %s:\n"
@@ -10942,7 +11109,7 @@
 "Mista sambandet med %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2549
+#: ../libpurple/protocols/yahoo/yahoo.c:2570
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
@@ -10951,108 +11118,111 @@
 "Klaret ikkje å få til samband med %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2899
-#: ../libpurple/protocols/yahoo/yahoo.c:3510
+#: ../libpurple/protocols/yahoo/yahoo.c:2920
+#: ../libpurple/protocols/yahoo/yahoo.c:3606
 msgid "Not at Home"
 msgstr "Ikkje heime"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2901
-#: ../libpurple/protocols/yahoo/yahoo.c:3513
+#: ../libpurple/protocols/yahoo/yahoo.c:2922
+#: ../libpurple/protocols/yahoo/yahoo.c:3609
 msgid "Not at Desk"
 msgstr "Ikkje ved pulten"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2903
-#: ../libpurple/protocols/yahoo/yahoo.c:3516
+#: ../libpurple/protocols/yahoo/yahoo.c:2924
+#: ../libpurple/protocols/yahoo/yahoo.c:3612
 msgid "Not in Office"
 msgstr "Ikkje på kontoret"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2907
-#: ../libpurple/protocols/yahoo/yahoo.c:3522
+#: ../libpurple/protocols/yahoo/yahoo.c:2928
+#: ../libpurple/protocols/yahoo/yahoo.c:3618
 msgid "On Vacation"
 msgstr "På ferie"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2911
-#: ../libpurple/protocols/yahoo/yahoo.c:3528
+#: ../libpurple/protocols/yahoo/yahoo.c:2932
+#: ../libpurple/protocols/yahoo/yahoo.c:3624
 msgid "Stepped Out"
 msgstr "Ute eit bel"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3004
-#: ../libpurple/protocols/yahoo/yahoo.c:3034
+#: ../libpurple/protocols/yahoo/yahoo.c:3025
+#: ../libpurple/protocols/yahoo/yahoo.c:3055
 msgid "Not on server list"
 msgstr "Ikkje på tenarlista"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3051
-#: ../libpurple/protocols/yahoo/yahoo.c:3109
+#: ../libpurple/protocols/yahoo/yahoo.c:3072
+#: ../libpurple/protocols/yahoo/yahoo.c:3130
 msgid "Appear Online"
 msgstr "Framstå som tilkopla"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3054
-#: ../libpurple/protocols/yahoo/yahoo.c:3130
+#: ../libpurple/protocols/yahoo/yahoo.c:3075
+#: ../libpurple/protocols/yahoo/yahoo.c:3151
 msgid "Appear Permanently Offline"
 msgstr "Verkar alltid vera fråkopla"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3072
+#: ../libpurple/protocols/yahoo/yahoo.c:3093
 msgid "Presence"
 msgstr "Nærvær"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3115
+#: ../libpurple/protocols/yahoo/yahoo.c:3136
 msgid "Appear Offline"
 msgstr "Verkar vera fråkopla"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3124
+#: ../libpurple/protocols/yahoo/yahoo.c:3145
 msgid "Don't Appear Permanently Offline"
 msgstr "Ikkje verka vera alltid fråkopla"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3172
+#: ../libpurple/protocols/yahoo/yahoo.c:3193
 msgid "Join in Chat"
 msgstr "Bli med i praterom"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3178
+#: ../libpurple/protocols/yahoo/yahoo.c:3199
 msgid "Initiate Conference"
 msgstr "Lag konferanse"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3206
+#: ../libpurple/protocols/yahoo/yahoo.c:3227
 msgid "Presence Settings"
 msgstr "Nærværsinnstillingar"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3212
+#: ../libpurple/protocols/yahoo/yahoo.c:3233
 msgid "Start Doodling"
 msgstr "Laga krusedullar"
 
-#. XXX Typo: This should be _("Activate which ID?") - fix after string freeze is over
-#: ../libpurple/protocols/yahoo/yahoo.c:3245
-msgid "Active which ID?"
+#: ../libpurple/protocols/yahoo/yahoo.c:3334
+msgid "Activate which ID?"
 msgstr "Kva ID skal takast i bruk?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3256
+#: ../libpurple/protocols/yahoo/yahoo.c:3345
 msgid "Join who in chat?"
 msgstr "Kven skal bli med i praterommet?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3268
+#: ../libpurple/protocols/yahoo/yahoo.c:3357
 msgid "Activate ID..."
 msgstr "Ta i bruk ID…"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3272
+#: ../libpurple/protocols/yahoo/yahoo.c:3361
 msgid "Join User in Chat..."
 msgstr "Bli med brukaren i praterommet…"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3779
+#: ../libpurple/protocols/yahoo/yahoo.c:3366
+msgid "Open Inbox"
+msgstr "Opna innkorga"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3881
 msgid "You have just sent a Buzz!"
 msgstr "Du har nettopp sendt ein alarm"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3838
+#: ../libpurple/protocols/yahoo/yahoo.c:3940
 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:3843
+#: ../libpurple/protocols/yahoo/yahoo.c:3945
 msgid "list: List rooms on the Yahoo network"
 msgstr "list: list romma på Yahoo-nettverket"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3847
+#: ../libpurple/protocols/yahoo/yahoo.c:3949
 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:3851
+#: ../libpurple/protocols/yahoo/yahoo.c:3953
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: spør ein brukar om å starta ei teikneøkt"
 
@@ -11066,56 +11236,56 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4059
-#: ../libpurple/protocols/yahoo/yahoo.c:4061
+#: ../libpurple/protocols/yahoo/yahoo.c:4161
+#: ../libpurple/protocols/yahoo/yahoo.c:4163
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo-protokolltillegg"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4084
+#: ../libpurple/protocols/yahoo/yahoo.c:4186
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4087
+#: ../libpurple/protocols/yahoo/yahoo.c:4189
 msgid "Pager server"
 msgstr "Søkjetenestetenar"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4090
+#: ../libpurple/protocols/yahoo/yahoo.c:4192
 msgid "Japan Pager server"
 msgstr "Søkjetenestetenar (_Japan)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4093
+#: ../libpurple/protocols/yahoo/yahoo.c:4195
 msgid "Pager port"
 msgstr "S_økjeport"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4096
+#: ../libpurple/protocols/yahoo/yahoo.c:4198
 msgid "File transfer server"
 msgstr "Filoverføringstenar"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4099
+#: ../libpurple/protocols/yahoo/yahoo.c:4201
 msgid "Japan file transfer server"
 msgstr "Filoverføringstenar (Japa_n)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4102
+#: ../libpurple/protocols/yahoo/yahoo.c:4204
 msgid "File transfer port"
 msgstr "Filoverførings_port"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4105
+#: ../libpurple/protocols/yahoo/yahoo.c:4207
 msgid "Chat room locale"
 msgstr "Pratero_mslokalitet"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4108
+#: ../libpurple/protocols/yahoo/yahoo.c:4210
 msgid "Ignore conference and chatroom invitations"
 msgstr "_Ignorer konferanse- og prateromsinvitasjonar"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4116
+#: ../libpurple/protocols/yahoo/yahoo.c:4218
 msgid "Chat room list URL"
 msgstr "Prateromslisteadresse"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4119
+#: ../libpurple/protocols/yahoo/yahoo.c:4221
 msgid "Yahoo Chat server"
 msgstr "Yahoo pratetenar"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4122
+#: ../libpurple/protocols/yahoo/yahoo.c:4224
 msgid "Yahoo Chat port"
 msgstr "Yahoo prateport"
 
@@ -11200,7 +11370,7 @@
 msgstr "Klarer ikkje å laga filskildring."
 
 #. TODO: what to do here - do we really have to disconnect?
-#: ../libpurple/protocols/yahoo/yahoo_packet.c:302
+#: ../libpurple/protocols/yahoo/yahoo_packet.c:307
 msgid "Write Error"
 msgstr "Skrivefeil"
 
@@ -11760,7 +11930,7 @@
 msgstr "SOCKS 5"
 
 #: ../pidgin/gtkaccount.c:967
-#: ../pidgin/gtkprefs.c:1206
+#: ../pidgin/gtkprefs.c:1208
 msgid "Use Environmental Settings"
 msgstr "Bruk miljøinnstillingar"
 
@@ -11783,51 +11953,51 @@
 msgstr "Mellomtenarval"
 
 #: ../pidgin/gtkaccount.c:1044
-#: ../pidgin/gtkprefs.c:1200
+#: ../pidgin/gtkprefs.c:1202
 msgid "Proxy _type:"
 msgstr "_Mellomtenartype:"
 
 #: ../pidgin/gtkaccount.c:1053
-#: ../pidgin/gtkprefs.c:1221
+#: ../pidgin/gtkprefs.c:1223
 msgid "_Host:"
 msgstr "_Vert:"
 
 #: ../pidgin/gtkaccount.c:1057
-#: ../pidgin/gtkprefs.c:1239
+#: ../pidgin/gtkprefs.c:1241
 msgid "_Port:"
 msgstr "_Port:"
 
 #: ../pidgin/gtkaccount.c:1065
 msgid "_Username:"
-msgstr "_Brukarnamn:"
+msgstr "Brukar_namn:"
 
 #: ../pidgin/gtkaccount.c:1072
-#: ../pidgin/gtkprefs.c:1276
+#: ../pidgin/gtkprefs.c:1278
 msgid "Pa_ssword:"
 msgstr "P_assord:"
 
-#: ../pidgin/gtkaccount.c:1473
+#: ../pidgin/gtkaccount.c:1478
 msgid "Add Account"
 msgstr "Legg til konto"
 
-#: ../pidgin/gtkaccount.c:1492
+#: ../pidgin/gtkaccount.c:1497
 msgid "_Basic"
 msgstr "_Grunnleggjande"
 
-#: ../pidgin/gtkaccount.c:1503
+#: ../pidgin/gtkaccount.c:1508
 msgid "_Advanced"
-msgstr "_Avansert"
-
-#: ../pidgin/gtkaccount.c:1975
+msgstr "A_vansert"
+
+#: ../pidgin/gtkaccount.c:1982
 #: ../pidgin/gtkplugin.c:568
 msgid "Enabled"
 msgstr "I bruk"
 
-#: ../pidgin/gtkaccount.c:2003
+#: ../pidgin/gtkaccount.c:2010
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: ../pidgin/gtkaccount.c:2203
+#: ../pidgin/gtkaccount.c:2210
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -11842,84 +12012,84 @@
 "\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:763
+#: ../pidgin/gtkblist.c:760
 msgid "Join a Chat"
 msgstr "Gå inn i eit praterom"
 
-#: ../pidgin/gtkblist.c:784
+#: ../pidgin/gtkblist.c:781
 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:795
-#: ../pidgin/gtkblist.c:5467
-#: ../pidgin/gtkblist.c:5834
+#: ../pidgin/gtkblist.c:792
+#: ../pidgin/gtkblist.c:5482
+#: ../pidgin/gtkblist.c:5848
 #: ../pidgin/gtkpounce.c:540
 #: ../pidgin/gtkroomlist.c:395
 msgid "_Account:"
 msgstr "_Konto:"
 
-#: ../pidgin/gtkblist.c:1084
+#: ../pidgin/gtkblist.c:1081
 #: ../pidgin/gtkprivacy.c:602
 #: ../pidgin/gtkprivacy.c:616
 msgid "_Block"
 msgstr "_Blokker"
 
-#: ../pidgin/gtkblist.c:1084
+#: ../pidgin/gtkblist.c:1081
 msgid "Un_block"
 msgstr "A_vblokker"
 
+#: ../pidgin/gtkblist.c:1132
+msgid "Get _Info"
+msgstr "Hent _info"
+
 #: ../pidgin/gtkblist.c:1135
-msgid "Get _Info"
-msgstr "Hent _info"
-
-#: ../pidgin/gtkblist.c:1138
 #: ../pidgin/pidginstock.c:84
 msgid "I_M"
 msgstr "_Lynmelding"
 
-#: ../pidgin/gtkblist.c:1144
+#: ../pidgin/gtkblist.c:1141
 msgid "_Send File"
 msgstr "_Send fil"
 
-#: ../pidgin/gtkblist.c:1151
+#: ../pidgin/gtkblist.c:1148
 msgid "Add Buddy _Pounce"
 msgstr "Legg til venne_varsling"
 
-#: ../pidgin/gtkblist.c:1155
-#: ../pidgin/gtkblist.c:1159
+#: ../pidgin/gtkblist.c:1153
+#: ../pidgin/gtkblist.c:1157
 #: ../pidgin/gtkblist.c:1262
 #: ../pidgin/gtkblist.c:1285
 msgid "View _Log"
 msgstr "Vis l_ogg"
 
-#: ../pidgin/gtkblist.c:1171
-#: ../pidgin/gtkblist.c:1180
+#: ../pidgin/gtkblist.c:1170
+#: ../pidgin/gtkblist.c:1179
 #: ../pidgin/gtkblist.c:1270
 #: ../pidgin/gtkblist.c:1291
 msgid "_Alias..."
 msgstr "A_lias…"
 
-#: ../pidgin/gtkblist.c:1174
-#: ../pidgin/gtkblist.c:1182
+#: ../pidgin/gtkblist.c:1173
+#: ../pidgin/gtkblist.c:1181
 #: ../pidgin/gtkblist.c:1272
 #: ../pidgin/gtkblist.c:1293
 msgid "_Remove"
 msgstr "_Fjern"
 
-#: ../pidgin/gtkblist.c:1232
+#: ../pidgin/gtkblist.c:1231
 msgid "Add a _Buddy"
 msgstr "Legg til ein _venn"
 
-#: ../pidgin/gtkblist.c:1235
+#: ../pidgin/gtkblist.c:1234
 msgid "Add a C_hat"
 msgstr "Legg til eit samtale_rom"
 
-#: ../pidgin/gtkblist.c:1238
+#: ../pidgin/gtkblist.c:1237
 msgid "_Delete Group"
 msgstr "_Slett gruppe"
 
-#: ../pidgin/gtkblist.c:1240
+#: ../pidgin/gtkblist.c:1239
 msgid "_Rename"
 msgstr "_Gje nytt namn"
 
@@ -11936,150 +12106,150 @@
 msgstr "Automatisk pålogging"
 
 #: ../pidgin/gtkblist.c:1298
-#: ../pidgin/gtkblist.c:1321
+#: ../pidgin/gtkblist.c:1322
 msgid "_Collapse"
 msgstr "_Slå saman"
 
-#: ../pidgin/gtkblist.c:1326
+#: ../pidgin/gtkblist.c:1327
 msgid "_Expand"
 msgstr "_Utvid"
 
-#: ../pidgin/gtkblist.c:1571
-#: ../pidgin/gtkblist.c:1583
-#: ../pidgin/gtkblist.c:4561
-#: ../pidgin/gtkblist.c:4571
+#: ../pidgin/gtkblist.c:1572
+#: ../pidgin/gtkblist.c:1584
+#: ../pidgin/gtkblist.c:4576
+#: ../pidgin/gtkblist.c:4586
 msgid "/Tools/Mute Sounds"
 msgstr "/Verktøy/Demp lydar"
 
-#: ../pidgin/gtkblist.c:2043
-#: ../pidgin/gtkconv.c:4602
+#: ../pidgin/gtkblist.c:2044
+#: ../pidgin/gtkconv.c:4707
 #: ../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:2838
+#: ../pidgin/gtkblist.c:2850
 msgid "/_Buddies"
 msgstr "/_Vennar"
 
-#: ../pidgin/gtkblist.c:2839
+#: ../pidgin/gtkblist.c:2851
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Vennar/_Ny lynmelding…"
 
-#: ../pidgin/gtkblist.c:2840
+#: ../pidgin/gtkblist.c:2852
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Vennar/Gå inn i eit prater_om…"
 
-#: ../pidgin/gtkblist.c:2841
+#: ../pidgin/gtkblist.c:2853
 msgid "/Buddies/Get User _Info..."
 msgstr "/Vennar/Hent brukar_info…"
 
-#: ../pidgin/gtkblist.c:2842
+#: ../pidgin/gtkblist.c:2854
 msgid "/Buddies/View User _Log..."
 msgstr "/Vennar/Vis brukar_logg…"
 
-#: ../pidgin/gtkblist.c:2844
+#: ../pidgin/gtkblist.c:2856
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Vennar/Vis _fråkopla vennar"
 
-#: ../pidgin/gtkblist.c:2845
+#: ../pidgin/gtkblist.c:2857
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Vennar/Vis _tomme grupper"
 
-#: ../pidgin/gtkblist.c:2846
+#: ../pidgin/gtkblist.c:2858
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/Vennar/Vis venne_detaljar"
 
-#: ../pidgin/gtkblist.c:2847
+#: ../pidgin/gtkblist.c:2859
 msgid "/Buddies/Show Idle _Times"
 msgstr "/Vennar/Vis fr_åkoplingstid"
 
-#: ../pidgin/gtkblist.c:2848
+#: ../pidgin/gtkblist.c:2860
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Vennar/Sort_er vennane"
 
-#: ../pidgin/gtkblist.c:2850
+#: ../pidgin/gtkblist.c:2862
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Vennar/Legg til _venn…"
 
-#: ../pidgin/gtkblist.c:2851
+#: ../pidgin/gtkblist.c:2863
 msgid "/Buddies/Add C_hat..."
 msgstr "/Vennar/Legg til _praterom…"
 
-#: ../pidgin/gtkblist.c:2852
+#: ../pidgin/gtkblist.c:2864
 msgid "/Buddies/Add _Group..."
 msgstr "/Vennar/Legg til _gruppe…"
 
-#: ../pidgin/gtkblist.c:2854
+#: ../pidgin/gtkblist.c:2866
 msgid "/Buddies/_Quit"
 msgstr "/Vennar/Avsl_utt"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2857
+#: ../pidgin/gtkblist.c:2869
 msgid "/_Accounts"
 msgstr "/K_ontoar"
 
-#: ../pidgin/gtkblist.c:2858
-#: ../pidgin/gtkblist.c:6532
+#: ../pidgin/gtkblist.c:2870
+#: ../pidgin/gtkblist.c:6546
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Kontoar/Legg til\\/endra"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2861
+#: ../pidgin/gtkblist.c:2873
 msgid "/_Tools"
 msgstr "/V_erktøy"
 
-#: ../pidgin/gtkblist.c:2862
+#: ../pidgin/gtkblist.c:2874
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Verktøy/Venne_varsling"
 
-#: ../pidgin/gtkblist.c:2863
+#: ../pidgin/gtkblist.c:2875
 msgid "/Tools/Plu_gins"
 msgstr "/Verktøy/Program_tillegg"
 
-#: ../pidgin/gtkblist.c:2864
+#: ../pidgin/gtkblist.c:2876
 msgid "/Tools/Pr_eferences"
 msgstr "/Verktøy/_Innstillingar"
 
-#: ../pidgin/gtkblist.c:2865
+#: ../pidgin/gtkblist.c:2877
 msgid "/Tools/Pr_ivacy"
-msgstr "/Verktøy/Person_vern"
-
-#: ../pidgin/gtkblist.c:2867
+msgstr "/Verktøy/_Personvern"
+
+#: ../pidgin/gtkblist.c:2879
 msgid "/Tools/_File Transfers"
 msgstr "/Verktøy/_Filoverføringar"
 
-#: ../pidgin/gtkblist.c:2868
+#: ../pidgin/gtkblist.c:2880
 msgid "/Tools/R_oom List"
 msgstr "/Verktøy/_Romliste"
 
-#: ../pidgin/gtkblist.c:2869
+#: ../pidgin/gtkblist.c:2881
 msgid "/Tools/System _Log"
 msgstr "/Verktøy/System_logg"
 
-#: ../pidgin/gtkblist.c:2871
+#: ../pidgin/gtkblist.c:2883
 msgid "/Tools/Mute _Sounds"
 msgstr "/Verktøy/_Demp lydar"
 
 #. Help
-#: ../pidgin/gtkblist.c:2873
+#: ../pidgin/gtkblist.c:2885
 msgid "/_Help"
 msgstr "/_Hjelp"
 
-#: ../pidgin/gtkblist.c:2874
+#: ../pidgin/gtkblist.c:2886
 msgid "/Help/Online _Help"
 msgstr "/Hjelp/_Hjelp på nettet"
 
-#: ../pidgin/gtkblist.c:2875
+#: ../pidgin/gtkblist.c:2887
 msgid "/Help/_Debug Window"
 msgstr "/Hjelp/_Feilsøkingsvindauge"
 
-#: ../pidgin/gtkblist.c:2877
-#: ../pidgin/gtkblist.c:2879
+#: ../pidgin/gtkblist.c:2889
+#: ../pidgin/gtkblist.c:2891
 msgid "/Help/_About"
 msgstr "/Hjelp/_Om"
 
-#: ../pidgin/gtkblist.c:2908
+#: ../pidgin/gtkblist.c:2920
 #, c-format
 msgid ""
 "\n"
@@ -12088,81 +12258,81 @@
 "\n"
 "<b>Konto:</b> %s"
 
-#: ../pidgin/gtkblist.c:2986
+#: ../pidgin/gtkblist.c:2998
 msgid "Buddy Alias"
 msgstr "Venne-alias"
 
-#: ../pidgin/gtkblist.c:3015
+#: ../pidgin/gtkblist.c:3027
 msgid "Logged In"
 msgstr "Pålogga"
 
-#: ../pidgin/gtkblist.c:3061
+#: ../pidgin/gtkblist.c:3073
 msgid "Last Seen"
 msgstr "Sist sett"
 
-#: ../pidgin/gtkblist.c:3081
+#: ../pidgin/gtkblist.c:3093
 msgid "Spooky"
 msgstr "Skummelt"
 
-#: ../pidgin/gtkblist.c:3083
+#: ../pidgin/gtkblist.c:3095
 msgid "Awesome"
 msgstr "Storarta"
 
-#: ../pidgin/gtkblist.c:3085
+#: ../pidgin/gtkblist.c:3097
 msgid "Rockin'"
 msgstr "Glimrande"
 
-#: ../pidgin/gtkblist.c:3428
+#: ../pidgin/gtkblist.c:3440
 #, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr "UVerksam %dd  %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3430
+#: ../pidgin/gtkblist.c:3442
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "UVerksam %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3432
+#: ../pidgin/gtkblist.c:3444
 #, c-format
 msgid "Idle %dm"
 msgstr "Uverksam %dm"
 
-#: ../pidgin/gtkblist.c:3577
+#: ../pidgin/gtkblist.c:3589
 msgid "/Buddies/New Instant Message..."
 msgstr "/Vennar/_Ny lynmelding…"
 
-#: ../pidgin/gtkblist.c:3578
-#: ../pidgin/gtkblist.c:3611
+#: ../pidgin/gtkblist.c:3590
+#: ../pidgin/gtkblist.c:3623
 msgid "/Buddies/Join a Chat..."
 msgstr "/Vennar/Gå inn i eit prater_om…"
 
-#: ../pidgin/gtkblist.c:3579
+#: ../pidgin/gtkblist.c:3591
 msgid "/Buddies/Get User Info..."
 msgstr "/Vennar/Hent brukar_informasjon…"
 
-#: ../pidgin/gtkblist.c:3580
+#: ../pidgin/gtkblist.c:3592
 msgid "/Buddies/Add Buddy..."
 msgstr "/Vennar/Legg til venn…"
 
-#: ../pidgin/gtkblist.c:3581
-#: ../pidgin/gtkblist.c:3614
+#: ../pidgin/gtkblist.c:3593
+#: ../pidgin/gtkblist.c:3626
 msgid "/Buddies/Add Chat..."
 msgstr "/Vennar/Legg til _praterom…"
 
-#: ../pidgin/gtkblist.c:3582
+#: ../pidgin/gtkblist.c:3594
 msgid "/Buddies/Add Group..."
 msgstr "/Vennar/Legg til gruppe…"
 
-#: ../pidgin/gtkblist.c:3617
+#: ../pidgin/gtkblist.c:3629
 msgid "/Tools/Privacy"
 msgstr "/Verktøy/Personvern"
 
-#: ../pidgin/gtkblist.c:3620
+#: ../pidgin/gtkblist.c:3632
 msgid "/Tools/Room List"
 msgstr "/Verktøy/Romliste"
 
 #
-#: ../pidgin/gtkblist.c:3717
+#: ../pidgin/gtkblist.c:3729
 #: ../pidgin/gtkdocklet.c:153
 #, c-format
 msgid "%d unread message from %s\n"
@@ -12170,55 +12340,55 @@
 msgstr[0] "%d unread message from %s\n"
 msgstr[1] "%d ulesne meldingar frå %s\n"
 
-#: ../pidgin/gtkblist.c:3797
+#: ../pidgin/gtkblist.c:3809
 msgid "Manually"
 msgstr "Manuelt"
 
-#: ../pidgin/gtkblist.c:3799
+#: ../pidgin/gtkblist.c:3811
 msgid "Alphabetically"
 msgstr "Alfabetisk "
 
-#: ../pidgin/gtkblist.c:3800
+#: ../pidgin/gtkblist.c:3812
 msgid "By status"
 msgstr "Etter status"
 
-#: ../pidgin/gtkblist.c:3801
+#: ../pidgin/gtkblist.c:3813
 msgid "By log size"
 msgstr "Etter loggstorleiken"
 
-#: ../pidgin/gtkblist.c:4005
+#: ../pidgin/gtkblist.c:4018
 #: ../pidgin/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "%s fråkopla"
 
-#: ../pidgin/gtkblist.c:4015
+#: ../pidgin/gtkblist.c:4028
 msgid "Re-enable Account"
 msgstr "Ta kontoen i bruk att "
 
-#: ../pidgin/gtkblist.c:4039
+#: ../pidgin/gtkblist.c:4054
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s fråkopla: %s</span>"
 
-#: ../pidgin/gtkblist.c:4191
+#: ../pidgin/gtkblist.c:4206
 msgid "<b>Username:</b>"
 msgstr "<b>Brukarnamn:</b>"
 
-#: ../pidgin/gtkblist.c:4198
+#: ../pidgin/gtkblist.c:4213
 msgid "<b>Password:</b>"
 msgstr "<b>Passord:</b>"
 
-#: ../pidgin/gtkblist.c:4209
+#: ../pidgin/gtkblist.c:4224
 msgid "_Login"
 msgstr "_Innlogging"
 
-#: ../pidgin/gtkblist.c:4292
+#: ../pidgin/gtkblist.c:4307
 msgid "/Accounts"
 msgstr "/Kontoar"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4306
+#: ../pidgin/gtkblist.c:4321
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -12227,87 +12397,87 @@
 msgstr ""
 "<span weight='bold' size='larger'>Velkomen til %s!</span>\n"
 "\n"
-"Ingen av kontoane dine er i bruk. Aktiver lynmeldingskontoane dine frå <b>Konto</b>-vindauget: <b>Kontoar->Legg til/endra</b>. Når kontoane er aktive vil du vera i stand til å logga på, endra tilstand og tala med vennane dine."
+"Ingen av kontoane dine er i bruk. Ta lynmeldingskontoane dine i bruk frå <b>Konto</b>-vindauget: <b>Kontoar->Legg til/endra</b>. Når kontoane er tekne i bruk, vil du vera i stand til å logga på, endra tilstand og tala med vennane dine."
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4555
+#: ../pidgin/gtkblist.c:4570
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Vennar/Vis fråkopla vennar"
 
-#: ../pidgin/gtkblist.c:4558
+#: ../pidgin/gtkblist.c:4573
 msgid "/Buddies/Show Empty Groups"
 msgstr "/vennar/Vis tomme grupper"
 
-#: ../pidgin/gtkblist.c:4564
+#: ../pidgin/gtkblist.c:4579
 msgid "/Buddies/Show Buddy Details"
 msgstr "/Vennar/Vis vennedetaljar"
 
-#: ../pidgin/gtkblist.c:4567
+#: ../pidgin/gtkblist.c:4582
 msgid "/Buddies/Show Idle Times"
 msgstr "/Vennar/Vis uverksam tid"
 
-#: ../pidgin/gtkblist.c:5444
+#: ../pidgin/gtkblist.c:5459
 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 brukarnmanet der det er mogleg.\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:5479
+#: ../pidgin/gtkblist.c:5494
 msgid "_Screen name:"
-msgstr "_Brukarnamn:"
-
-#: ../pidgin/gtkblist.c:5501
-#: ../pidgin/gtkblist.c:5855
+msgstr "Brukar_namn:"
+
+#: ../pidgin/gtkblist.c:5516
+#: ../pidgin/gtkblist.c:5869
 msgid "A_lias:"
-msgstr "A_lias:"
-
-#: ../pidgin/gtkblist.c:5767
+msgstr "Al_ias:"
+
+#: ../pidgin/gtkblist.c:5781
 msgid "This protocol does not support chat rooms."
 msgstr "Protokollen støttar ikkje praterom."
 
-#: ../pidgin/gtkblist.c:5783
+#: ../pidgin/gtkblist.c:5797
 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:5824
+#: ../pidgin/gtkblist.c:5838
 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:5912
+#: ../pidgin/gtkblist.c:5926
 msgid "Please enter the name of the group to be added."
 msgstr "Skriv inn namnet på gruppa du ønskjer å leggja til."
 
-#: ../pidgin/gtkblist.c:6552
+#: ../pidgin/gtkblist.c:6566
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Kontoar/"
 
-#: ../pidgin/gtkblist.c:6576
+#: ../pidgin/gtkblist.c:6590
 msgid "_Edit Account"
 msgstr "_Endra konto"
 
-#: ../pidgin/gtkblist.c:6589
-#: ../pidgin/gtkconv.c:2982
+#: ../pidgin/gtkblist.c:6603
+#: ../pidgin/gtkconv.c:3014
 msgid "No actions available"
 msgstr "Ingen tilgjengelege handlingar"
 
-#: ../pidgin/gtkblist.c:6597
+#: ../pidgin/gtkblist.c:6611
 msgid "_Disable"
 msgstr "_Slå av"
 
-#: ../pidgin/gtkblist.c:6609
+#: ../pidgin/gtkblist.c:6623
 msgid "Enable Account"
 msgstr "Ta konto i bruk"
 
-#: ../pidgin/gtkblist.c:6615
+#: ../pidgin/gtkblist.c:6629
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/Kontoar/Ta i bruk konto"
 
-#: ../pidgin/gtkblist.c:6664
+#: ../pidgin/gtkblist.c:6678
 msgid "/Tools"
 msgstr "/V_erktøy"
 
-#: ../pidgin/gtkblist.c:6734
+#: ../pidgin/gtkblist.c:6748
 msgid "/Buddies/Sort Buddies"
 msgstr "/Vennar/Sorter vennar"
 
@@ -12322,224 +12492,224 @@
 "\n"
 "%s vil ikkje prøva å kopla kontoen til att før du rettar feilen og slår på kontoen."
 
-#: ../pidgin/gtkconv.c:485
+#: ../pidgin/gtkconv.c:487
 msgid "Unknown command."
 msgstr "Ukjend kommando."
 
-#: ../pidgin/gtkconv.c:757
-#: ../pidgin/gtkconv.c:783
+#: ../pidgin/gtkconv.c:759
+#: ../pidgin/gtkconv.c:785
 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:777
+#: ../pidgin/gtkconv.c:779
 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:830
+#: ../pidgin/gtkconv.c:832
 msgid "Invite Buddy Into Chat Room"
 msgstr "Inviter venn til praterommet"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:860
+#: ../pidgin/gtkconv.c:862
 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:881
+#: ../pidgin/gtkconv.c:883
 msgid "_Buddy:"
 msgstr "_Venn:"
 
-#: ../pidgin/gtkconv.c:901
+#: ../pidgin/gtkconv.c:903
 #: ../pidgin/gtksavedstatuses.c:1193
 #: ../pidgin/gtksavedstatuses.c:1525
 msgid "_Message:"
 msgstr "_Melding:"
 
-#: ../pidgin/gtkconv.c:958
-#: ../pidgin/gtkconv.c:2506
+#: ../pidgin/gtkconv.c:960
+#: ../pidgin/gtkconv.c:2521
 #: ../pidgin/gtkdebug.c:218
 #: ../pidgin/gtkft.c:542
 msgid "Unable to open file."
 msgstr "Klarte ikkje å opna fila."
 
-#: ../pidgin/gtkconv.c:964
+#: ../pidgin/gtkconv.c:966
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Samtale med %s</h1>\n"
 
-#: ../pidgin/gtkconv.c:1000
+#: ../pidgin/gtkconv.c:1002
 msgid "Save Conversation"
 msgstr "Lagra samtale"
 
-#: ../pidgin/gtkconv.c:1149
+#: ../pidgin/gtkconv.c:1151
 #: ../pidgin/gtkdebug.c:166
 #: ../pidgin/gtkdebug.c:742
 msgid "Find"
 msgstr "Finn"
 
-#: ../pidgin/gtkconv.c:1175
+#: ../pidgin/gtkconv.c:1177
 #: ../pidgin/gtkdebug.c:194
 msgid "_Search for:"
 msgstr "S_øk etter:"
 
-#: ../pidgin/gtkconv.c:1358
+#: ../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:1366
+#: ../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:1614
+#: ../pidgin/gtkconv.c:1616
 msgid "Un-Ignore"
 msgstr "Avblokker"
 
-#: ../pidgin/gtkconv.c:1617
+#: ../pidgin/gtkconv.c:1619
 msgid "Ignore"
 msgstr "Blokker"
 
-#: ../pidgin/gtkconv.c:1637
+#: ../pidgin/gtkconv.c:1639
 msgid "Get Away Message"
 msgstr "Hent fråværsmelding"
 
-#: ../pidgin/gtkconv.c:1660
+#: ../pidgin/gtkconv.c:1662
 msgid "Last said"
 msgstr "Sist sagt"
 
-#: ../pidgin/gtkconv.c:2514
+#: ../pidgin/gtkconv.c:2529
 msgid "Unable to save icon file to disk."
 msgstr "Klarte ikkje å lagra ikonet."
 
-#: ../pidgin/gtkconv.c:2565
+#: ../pidgin/gtkconv.c:2580
 msgid "Save Icon"
 msgstr "Lagra ikon"
 
-#: ../pidgin/gtkconv.c:2617
+#: ../pidgin/gtkconv.c:2632
 msgid "Animate"
 msgstr "Animer"
 
-#: ../pidgin/gtkconv.c:2622
+#: ../pidgin/gtkconv.c:2637
 msgid "Hide Icon"
 msgstr "Skjul ikon"
 
-#: ../pidgin/gtkconv.c:2625
+#: ../pidgin/gtkconv.c:2640
 msgid "Save Icon As..."
 msgstr "Lagra ikon som…"
 
-#: ../pidgin/gtkconv.c:2629
+#: ../pidgin/gtkconv.c:2644
 msgid "Set Custom Icon..."
 msgstr "Bruk eige ikon…"
 
-#: ../pidgin/gtkconv.c:2642
+#: ../pidgin/gtkconv.c:2657
 msgid "Remove Custom Icon"
 msgstr "Fjern eige ikon"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2784
+#: ../pidgin/gtkconv.c:2799
 msgid "/_Conversation"
 msgstr "/_Samtale"
 
-#: ../pidgin/gtkconv.c:2786
+#: ../pidgin/gtkconv.c:2801
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Samtale/_Ny lynmelding…"
 
-#: ../pidgin/gtkconv.c:2791
+#: ../pidgin/gtkconv.c:2806
 msgid "/Conversation/_Find..."
 msgstr "/Samtale/_Finn…"
 
-#: ../pidgin/gtkconv.c:2793
+#: ../pidgin/gtkconv.c:2808
 msgid "/Conversation/View _Log"
 msgstr "/Samtale/Vis l_ogg"
 
-#: ../pidgin/gtkconv.c:2794
+#: ../pidgin/gtkconv.c:2809
 msgid "/Conversation/_Save As..."
 msgstr "/Samtale/Lagra _som…"
 
-#: ../pidgin/gtkconv.c:2796
+#: ../pidgin/gtkconv.c:2811
 msgid "/Conversation/Clea_r Scrollback"
-msgstr "/Samtale/_Tøm skjermen"
-
-#: ../pidgin/gtkconv.c:2800
+msgstr "/Samtale/T_øm skjermen"
+
+#: ../pidgin/gtkconv.c:2815
 msgid "/Conversation/Se_nd File..."
-msgstr "/Samtale/Send _fil…"
-
-#: ../pidgin/gtkconv.c:2801
+msgstr "/Samtale/S_end fil…"
+
+#: ../pidgin/gtkconv.c:2816
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Samtale/Legg til _vennevarsling…"
 
-#: ../pidgin/gtkconv.c:2803
+#: ../pidgin/gtkconv.c:2818
 msgid "/Conversation/_Get Info"
-msgstr "/Samtale/Hent _informasjon"
-
-#: ../pidgin/gtkconv.c:2805
+msgstr "/Samtale/Hent info_rmasjon"
+
+#: ../pidgin/gtkconv.c:2820
 msgid "/Conversation/In_vite..."
 msgstr "/Samtale/_Inviter…"
 
-#: ../pidgin/gtkconv.c:2807
+#: ../pidgin/gtkconv.c:2822
 msgid "/Conversation/M_ore"
 msgstr "/Samtale/_Meir"
 
-#: ../pidgin/gtkconv.c:2811
+#: ../pidgin/gtkconv.c:2826
 msgid "/Conversation/Al_ias..."
 msgstr "/Samtale/_Kallenamn…"
 
-#: ../pidgin/gtkconv.c:2813
+#: ../pidgin/gtkconv.c:2828
 msgid "/Conversation/_Block..."
 msgstr "/Samtale/_Blokker…"
 
-#: ../pidgin/gtkconv.c:2815
+#: ../pidgin/gtkconv.c:2830
 msgid "/Conversation/_Unblock..."
 msgstr "/Samtale/_Avblokker…"
 
-#: ../pidgin/gtkconv.c:2817
+#: ../pidgin/gtkconv.c:2832
 msgid "/Conversation/_Add..."
 msgstr "/Samtale/Legg _til…"
 
-#: ../pidgin/gtkconv.c:2819
+#: ../pidgin/gtkconv.c:2834
 msgid "/Conversation/_Remove..."
 msgstr "/Samtale/F_jern…"
 
-#: ../pidgin/gtkconv.c:2824
+#: ../pidgin/gtkconv.c:2839
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Samtale/Set inn _lenkje…"
 
-#: ../pidgin/gtkconv.c:2826
+#: ../pidgin/gtkconv.c:2841
 msgid "/Conversation/Insert Imag_e..."
-msgstr "/Samtale/Sett inn bilete…"
-
-#: ../pidgin/gtkconv.c:2832
+msgstr "/Samtale/Set inn _bilete…"
+
+#: ../pidgin/gtkconv.c:2847
 msgid "/Conversation/_Close"
 msgstr "/Samtale/L_ukk"
 
 #. Options
-#: ../pidgin/gtkconv.c:2836
+#: ../pidgin/gtkconv.c:2851
 msgid "/_Options"
 msgstr "/_Val"
 
-#: ../pidgin/gtkconv.c:2837
+#: ../pidgin/gtkconv.c:2852
 msgid "/Options/Enable _Logging"
 msgstr "/Val/Bruk l_ogging"
 
-#: ../pidgin/gtkconv.c:2838
+#: ../pidgin/gtkconv.c:2853
 msgid "/Options/Enable _Sounds"
 msgstr "/Val/Bruk _lydar"
 
-#: ../pidgin/gtkconv.c:2839
+#: ../pidgin/gtkconv.c:2854
 msgid "/Options/Show Buddy _Icon"
 msgstr "/Val/Vis venne_ikon"
 
-#: ../pidgin/gtkconv.c:2841
+#: ../pidgin/gtkconv.c:2856
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Val/Vis _formateringsverktøya"
 
-#: ../pidgin/gtkconv.c:2842
+#: ../pidgin/gtkconv.c:2857
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Val/Vis _tidsstempel"
 
-#: ../pidgin/gtkconv.c:2918
+#: ../pidgin/gtkconv.c:3002
 msgid "/Conversation/More"
 msgstr "/Samtale/Meir"
 
-#: ../pidgin/gtkconv.c:3026
+#: ../pidgin/gtkconv.c:3058
 msgid "/Options"
 msgstr "/Val"
 
@@ -12548,182 +12718,183 @@
 #. 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:3061
 #: ../pidgin/gtkconv.c:3093
+#: ../pidgin/gtkconv.c:3125
 msgid "/Conversation"
 msgstr "/Samtale"
 
-#: ../pidgin/gtkconv.c:3101
+#: ../pidgin/gtkconv.c:3133
 msgid "/Conversation/View Log"
 msgstr "/Samtale/Vis logg"
 
-#: ../pidgin/gtkconv.c:3107
+#: ../pidgin/gtkconv.c:3139
 msgid "/Conversation/Send File..."
 msgstr "/Samtale/Send fil…"
 
-#: ../pidgin/gtkconv.c:3111
+#: ../pidgin/gtkconv.c:3143
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Samtale/Legg til vennevarsling…"
 
-#: ../pidgin/gtkconv.c:3117
+#: ../pidgin/gtkconv.c:3149
 msgid "/Conversation/Get Info"
 msgstr "/Samtale/Hent info"
 
-#: ../pidgin/gtkconv.c:3121
+#: ../pidgin/gtkconv.c:3153
 msgid "/Conversation/Invite..."
 msgstr "/Samtale/Inviter…"
 
-#: ../pidgin/gtkconv.c:3127
+#: ../pidgin/gtkconv.c:3159
 msgid "/Conversation/Alias..."
 msgstr "/Samtale/Kallenamn…"
 
-#: ../pidgin/gtkconv.c:3131
+#: ../pidgin/gtkconv.c:3163
 msgid "/Conversation/Block..."
 msgstr "/Samtale/Blokker…"
 
-#: ../pidgin/gtkconv.c:3135
+#: ../pidgin/gtkconv.c:3167
 msgid "/Conversation/Unblock..."
 msgstr "/Samtale/Avblokker…"
 
-#: ../pidgin/gtkconv.c:3139
+#: ../pidgin/gtkconv.c:3171
 msgid "/Conversation/Add..."
 msgstr "/Samtale/Legg til…"
 
-#: ../pidgin/gtkconv.c:3143
+#: ../pidgin/gtkconv.c:3175
 msgid "/Conversation/Remove..."
 msgstr "/Samtale/Fjern…"
 
-#: ../pidgin/gtkconv.c:3149
+#: ../pidgin/gtkconv.c:3181
 msgid "/Conversation/Insert Link..."
-msgstr "/Samtale/Sett inn lenkje…"
-
-#: ../pidgin/gtkconv.c:3153
+msgstr "/Samtale/Set inn lenkje…"
+
+#: ../pidgin/gtkconv.c:3185
 msgid "/Conversation/Insert Image..."
-msgstr "/Samtale/Sett inn bilete…"
-
-#: ../pidgin/gtkconv.c:3159
+msgstr "/Samtale/Set inn _bilete…"
+
+#: ../pidgin/gtkconv.c:3191
 msgid "/Options/Enable Logging"
 msgstr "/Val/Skru på logging"
 
-#: ../pidgin/gtkconv.c:3162
+#: ../pidgin/gtkconv.c:3194
 msgid "/Options/Enable Sounds"
 msgstr "/Vis/Skru på lyd"
 
-#: ../pidgin/gtkconv.c:3175
+#: ../pidgin/gtkconv.c:3207
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Val/Vis formateringsverktøya"
 
-#: ../pidgin/gtkconv.c:3178
+#: ../pidgin/gtkconv.c:3210
 msgid "/Options/Show Timestamps"
 msgstr "/Val/Vis tidsstempel"
 
-#: ../pidgin/gtkconv.c:3181
+#: ../pidgin/gtkconv.c:3213
 msgid "/Options/Show Buddy Icon"
 msgstr "/Val/Vis venne_ikon"
 
-#: ../pidgin/gtkconv.c:3265
-#: ../pidgin/gtkconv.c:3307
+#: ../pidgin/gtkconv.c:3297
+#: ../pidgin/gtkconv.c:3339
 msgid "User is typing..."
 msgstr "Brukaren skriv…"
 
-#: ../pidgin/gtkconv.c:3310
+#: ../pidgin/gtkconv.c:3342
 msgid "User has typed something and stopped"
 msgstr "Brukaren har skrive noko og stoppa"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3492
+#: ../pidgin/gtkconv.c:3525
+#: ../pidgin/gtkconv.c:7784
 msgid "_Send To"
 msgstr "Sen_d som"
 
-#: ../pidgin/gtkconv.c:4206
+#: ../pidgin/gtkconv.c:4239
 msgid "_Send"
 msgstr "_Send"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4310
+#: ../pidgin/gtkconv.c:4343
 msgid "0 people in room"
 msgstr "0 personar i rommet"
 
-#: ../pidgin/gtkconv.c:5496
-#: ../pidgin/gtkconv.c:5617
+#: ../pidgin/gtkconv.c:5609
+#: ../pidgin/gtkconv.c:5730
 #, 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:6216
+#: ../pidgin/gtkconv.c:6338
 #: ../pidgin/gtkstatusbox.c:659
 msgid "Typing"
 msgstr "Skriv"
 
-#: ../pidgin/gtkconv.c:6222
+#: ../pidgin/gtkconv.c:6342
 msgid "Stopped Typing"
 msgstr "Stoppa å skriva"
 
-#: ../pidgin/gtkconv.c:6227
+#: ../pidgin/gtkconv.c:6345
 msgid "Nick Said"
 msgstr "Kallenamnet sa"
 
-#: ../pidgin/gtkconv.c:6232
+#: ../pidgin/gtkconv.c:6348
 #: ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr "Ulesne meldingar"
 
-#: ../pidgin/gtkconv.c:6237
+#: ../pidgin/gtkconv.c:6351
 msgid "New Event"
 msgstr "Ny hending"
 
-#: ../pidgin/gtkconv.c:7210
+#: ../pidgin/gtkconv.c:7355
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "clear: Tømmer skjermen."
 
-#: ../pidgin/gtkconv.c:7374
+#: ../pidgin/gtkconv.c:7519
 msgid "Confirm close"
 msgstr "Stadfest lukking"
 
-#: ../pidgin/gtkconv.c:7406
+#: ../pidgin/gtkconv.c:7551
 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:7978
+#: ../pidgin/gtkconv.c:8111
 msgid "Close other tabs"
 msgstr "Lukk andre faner"
 
-#: ../pidgin/gtkconv.c:7984
+#: ../pidgin/gtkconv.c:8117
 msgid "Close all tabs"
 msgstr "Lukk alle fanene"
 
-#: ../pidgin/gtkconv.c:7992
+#: ../pidgin/gtkconv.c:8125
 msgid "Detach this tab"
 msgstr "Kopla frå denne fana"
 
-#: ../pidgin/gtkconv.c:7998
+#: ../pidgin/gtkconv.c:8131
 msgid "Close this tab"
 msgstr "Lukk denne fana"
 
-#: ../pidgin/gtkconv.c:8444
+#: ../pidgin/gtkconv.c:8609
 msgid "Close conversation"
 msgstr "Lukk samtala"
 
-#: ../pidgin/gtkconv.c:8968
+#: ../pidgin/gtkconv.c:9209
 msgid "Last created window"
 msgstr "Siste opna vindauge"
 
-#: ../pidgin/gtkconv.c:8970
+#: ../pidgin/gtkconv.c:9211
 msgid "Separate IM and Chat windows"
 msgstr "Skilde lynmeldings- og samtalevindauge"
 
-#: ../pidgin/gtkconv.c:8972
-#: ../pidgin/gtkprefs.c:1410
+#: ../pidgin/gtkconv.c:9213
+#: ../pidgin/gtkprefs.c:1412
 msgid "New window"
 msgstr "Nytt vindauge"
 
-#: ../pidgin/gtkconv.c:8974
+#: ../pidgin/gtkconv.c:9215
 msgid "By group"
 msgstr "Etter gruppe"
 
-#: ../pidgin/gtkconv.c:8976
+#: ../pidgin/gtkconv.c:9217
 msgid "By account"
 msgstr "Etter konto"
 
@@ -12789,7 +12960,7 @@
 msgstr "Alvorleg feil"
 
 #: ../pidgin/gtkdialogs.c:71
-#: ../pidgin/gtkdialogs.c:117
+#: ../pidgin/gtkdialogs.c:113
 msgid "lead developer"
 msgstr "sjefsutviklar"
 
@@ -12798,6 +12969,7 @@
 #: ../pidgin/gtkdialogs.c:74
 #: ../pidgin/gtkdialogs.c:75
 #: ../pidgin/gtkdialogs.c:76
+#: ../pidgin/gtkdialogs.c:77
 #: ../pidgin/gtkdialogs.c:78
 #: ../pidgin/gtkdialogs.c:79
 #: ../pidgin/gtkdialogs.c:80
@@ -12812,10 +12984,6 @@
 msgid "developer"
 msgstr "utviklar"
 
-#: ../pidgin/gtkdialogs.c:77
-msgid "developer & webmaster"
-msgstr "utviklar og nettansvarleg"
-
 #: ../pidgin/gtkdialogs.c:86
 msgid "support"
 msgstr "brukarstøtte"
@@ -12824,498 +12992,506 @@
 msgid "support/QA"
 msgstr "brukarstøtte/KS"
 
-#: ../pidgin/gtkdialogs.c:109
+#: ../pidgin/gtkdialogs.c:104
 msgid "win32 port"
 msgstr "win32-port"
 
-#: ../pidgin/gtkdialogs.c:110
-#: ../pidgin/gtkdialogs.c:111
+#: ../pidgin/gtkdialogs.c:105
+#: ../pidgin/gtkdialogs.c:106
 msgid "maintainer"
 msgstr "ansvarleg"
 
-#: ../pidgin/gtkdialogs.c:112
+#: ../pidgin/gtkdialogs.c:107
 msgid "libfaim maintainer"
 msgstr "libfaim-ansvarleg"
 
+#: ../pidgin/gtkdialogs.c:108
+msgid "developer & webmaster"
+msgstr "utviklar og nettansvarleg"
+
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../pidgin/gtkdialogs.c:114
+#: ../pidgin/gtkdialogs.c:110
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hackar og fast sjåfør [sofatryne]"
 
-#: ../pidgin/gtkdialogs.c:115
+#: ../pidgin/gtkdialogs.c:111
 msgid "XMPP developer"
 msgstr "XMPP-utviklar"
 
-#: ../pidgin/gtkdialogs.c:116
+#: ../pidgin/gtkdialogs.c:112
 msgid "original author"
 msgstr "opprinneleg laga av"
 
-#: ../pidgin/gtkdialogs.c:123
+#: ../pidgin/gtkdialogs.c:128
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
-#: ../pidgin/gtkdialogs.c:124
+#: ../pidgin/gtkdialogs.c:129
 msgid "Arabic"
 msgstr "Arabisk"
 
-#: ../pidgin/gtkdialogs.c:125
-#: ../pidgin/gtkdialogs.c:126
-#: ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:130
+#: ../pidgin/gtkdialogs.c:131
+#: ../pidgin/gtkdialogs.c:218
 msgid "Bulgarian"
 msgstr "Bulgarsk"
 
-#: ../pidgin/gtkdialogs.c:127
-#: ../pidgin/gtkdialogs.c:128
-#: ../pidgin/gtkdialogs.c:129
-#: ../pidgin/gtkdialogs.c:130
+#: ../pidgin/gtkdialogs.c:132
+#: ../pidgin/gtkdialogs.c:133
+#: ../pidgin/gtkdialogs.c:134
+#: ../pidgin/gtkdialogs.c:135
 msgid "Bengali"
 msgstr "Bengali"
 
-#: ../pidgin/gtkdialogs.c:131
+#: ../pidgin/gtkdialogs.c:136
 msgid "Bosnian"
 msgstr "Bosnisk"
 
-#: ../pidgin/gtkdialogs.c:132
-#: ../pidgin/gtkdialogs.c:214
-#: ../pidgin/gtkdialogs.c:215
+#: ../pidgin/gtkdialogs.c:137
+#: ../pidgin/gtkdialogs.c:219
+#: ../pidgin/gtkdialogs.c:220
 msgid "Catalan"
 msgstr "Katalansk"
 
 # Valensiansk er *ikkje* katalansk, men eit eige språk i den katalanske språkfamilen. Molt important!
-#: ../pidgin/gtkdialogs.c:133
-#: ../pidgin/gtkdialogs.c:134
+#: ../pidgin/gtkdialogs.c:138
+#: ../pidgin/gtkdialogs.c:139
 msgid "Valencian-Catalan"
 msgstr "Valensiansk"
 
-#: ../pidgin/gtkdialogs.c:135
-#: ../pidgin/gtkdialogs.c:216
+#: ../pidgin/gtkdialogs.c:140
+#: ../pidgin/gtkdialogs.c:221
 msgid "Czech"
 msgstr "Tsjekkisk"
 
-#: ../pidgin/gtkdialogs.c:136
-#: ../pidgin/gtkdialogs.c:137
+#: ../pidgin/gtkdialogs.c:141
+#: ../pidgin/gtkdialogs.c:142
 msgid "Danish"
 msgstr "Dansk"
 
-#: ../pidgin/gtkdialogs.c:138
-#: ../pidgin/gtkdialogs.c:139
-#: ../pidgin/gtkdialogs.c:217
-msgid "German"
-msgstr "Tysk"
-
-#: ../pidgin/gtkdialogs.c:140
-#: ../pidgin/gtkdialogs.c:141
-#: ../pidgin/gtkdialogs.c:142
-msgid "Dzongkha"
-msgstr "Dzongkha"
-
 #: ../pidgin/gtkdialogs.c:143
 #: ../pidgin/gtkdialogs.c:144
+#: ../pidgin/gtkdialogs.c:222
+msgid "German"
+msgstr "Tysk"
+
+#: ../pidgin/gtkdialogs.c:145
+#: ../pidgin/gtkdialogs.c:146
+#: ../pidgin/gtkdialogs.c:147
+msgid "Dzongkha"
+msgstr "Dzongkha"
+
+#: ../pidgin/gtkdialogs.c:148
+#: ../pidgin/gtkdialogs.c:149
 msgid "Greek"
 msgstr "Gresk"
 
-#: ../pidgin/gtkdialogs.c:145
+#: ../pidgin/gtkdialogs.c:150
 msgid "Australian English"
 msgstr "Australsk-engelsk"
 
-#: ../pidgin/gtkdialogs.c:146
+#: ../pidgin/gtkdialogs.c:151
 msgid "Canadian English"
 msgstr "Kanadisk-engelsk"
 
-#: ../pidgin/gtkdialogs.c:147
+#: ../pidgin/gtkdialogs.c:152
 msgid "British English"
 msgstr "Britisk-engelsk"
 
-#: ../pidgin/gtkdialogs.c:148
+#: ../pidgin/gtkdialogs.c:153
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../pidgin/gtkdialogs.c:149
-#: ../pidgin/gtkdialogs.c:218
-#: ../pidgin/gtkdialogs.c:219
-#: ../pidgin/gtkdialogs.c:220
-#: ../pidgin/gtkdialogs.c:221
-msgid "Spanish"
-msgstr "Spansk"
-
-#: ../pidgin/gtkdialogs.c:150
-#: ../pidgin/gtkdialogs.c:151
-msgid "Euskera(Basque)"
-msgstr "Baskisk"
-
-#: ../pidgin/gtkdialogs.c:152
-#: ../pidgin/gtkdialogs.c:153
 #: ../pidgin/gtkdialogs.c:154
-msgid "Persian"
-msgstr "Persisk"
-
-#: ../pidgin/gtkdialogs.c:155
-#: ../pidgin/gtkdialogs.c:222
 #: ../pidgin/gtkdialogs.c:223
-msgid "Finnish"
-msgstr "Finsk"
-
-#: ../pidgin/gtkdialogs.c:156
 #: ../pidgin/gtkdialogs.c:224
 #: ../pidgin/gtkdialogs.c:225
 #: ../pidgin/gtkdialogs.c:226
-#: ../pidgin/gtkdialogs.c:227
-msgid "French"
-msgstr "Fransk"
+msgid "Spanish"
+msgstr "Spansk"
+
+#: ../pidgin/gtkdialogs.c:155
+#: ../pidgin/gtkdialogs.c:156
+msgid "Euskera(Basque)"
+msgstr "Baskisk"
 
 #: ../pidgin/gtkdialogs.c:157
 #: ../pidgin/gtkdialogs.c:158
-msgid "Galician"
-msgstr "Galisisk"
-
 #: ../pidgin/gtkdialogs.c:159
-#: ../pidgin/gtkdialogs.c:160
-msgid "Gujarati"
-msgstr "Gujarati"
+msgid "Persian"
+msgstr "Persisk"
 
 #: ../pidgin/gtkdialogs.c:160
-msgid "Gujarati Language Team"
-msgstr "Gujarati-språkgruppa"
+#: ../pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:228
+msgid "Finnish"
+msgstr "Finsk"
 
 #: ../pidgin/gtkdialogs.c:161
-#: ../pidgin/gtkdialogs.c:228
-msgid "Hebrew"
-msgstr "Hebraisk"
-
-#: ../pidgin/gtkdialogs.c:162
-msgid "Hindi"
-msgstr "Hindi"
-
-#: ../pidgin/gtkdialogs.c:163
-msgid "Hungarian"
-msgstr "Ungarsk"
-
-#: ../pidgin/gtkdialogs.c:164
-msgid "Indonesian"
-msgstr "Indonesisk"
-
-#: ../pidgin/gtkdialogs.c:165
 #: ../pidgin/gtkdialogs.c:229
-msgid "Italian"
-msgstr "Italiensk"
-
-#: ../pidgin/gtkdialogs.c:166
 #: ../pidgin/gtkdialogs.c:230
 #: ../pidgin/gtkdialogs.c:231
 #: ../pidgin/gtkdialogs.c:232
-msgid "Japanese"
-msgstr "Japansk"
-
-#: ../pidgin/gtkdialogs.c:167
+msgid "French"
+msgstr "Fransk"
+
+#: ../pidgin/gtkdialogs.c:162
+#: ../pidgin/gtkdialogs.c:163
+msgid "Galician"
+msgstr "Galisisk"
+
+#: ../pidgin/gtkdialogs.c:164
+#: ../pidgin/gtkdialogs.c:165
+msgid "Gujarati"
+msgstr "Gujarati"
+
+#: ../pidgin/gtkdialogs.c:165
+msgid "Gujarati Language Team"
+msgstr "Gujarati-språkgruppa"
+
+#: ../pidgin/gtkdialogs.c:166
 #: ../pidgin/gtkdialogs.c:233
-msgid "Georgian"
-msgstr "Georgisk"
+msgid "Hebrew"
+msgstr "Hebraisk"
 
 #: ../pidgin/gtkdialogs.c:167
-msgid "Ubuntu Georgian Translators"
-msgstr "Ubuntu georgisk-omsetjarar"
+msgid "Hindi"
+msgstr "Hindi"
 
 #: ../pidgin/gtkdialogs.c:168
+msgid "Hungarian"
+msgstr "Ungarsk"
+
+#: ../pidgin/gtkdialogs.c:169
+msgid "Indonesian"
+msgstr "Indonesisk"
+
+#: ../pidgin/gtkdialogs.c:170
+#: ../pidgin/gtkdialogs.c:234
+msgid "Italian"
+msgstr "Italiensk"
+
+#: ../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"
+
+#: ../pidgin/gtkdialogs.c:172
+msgid "Ubuntu Georgian Translators"
+msgstr "Ubuntu georgisk-omsetjarar"
+
+#: ../pidgin/gtkdialogs.c:173
 msgid "Kannada"
 msgstr "Kannada"
 
-#: ../pidgin/gtkdialogs.c:168
+#: ../pidgin/gtkdialogs.c:173
 msgid "Kannada Translation team"
 msgstr "Kannada-språkgruppa"
 
-#: ../pidgin/gtkdialogs.c:169
-#: ../pidgin/gtkdialogs.c:234
-#: ../pidgin/gtkdialogs.c:235
-msgid "Korean"
-msgstr "Koreansk"
-
-#: ../pidgin/gtkdialogs.c:170
-#: ../pidgin/gtkdialogs.c:171
-#: ../pidgin/gtkdialogs.c:172
-msgid "Kurdish"
-msgstr "Kurdisk"
-
-#: ../pidgin/gtkdialogs.c:173
-#: ../pidgin/gtkdialogs.c:236
-#: ../pidgin/gtkdialogs.c:237
-msgid "Lithuanian"
-msgstr "Litauisk"
-
 #: ../pidgin/gtkdialogs.c:174
+#: ../pidgin/gtkdialogs.c:239
+#: ../pidgin/gtkdialogs.c:240
+msgid "Korean"
+msgstr "Koreansk"
+
 #: ../pidgin/gtkdialogs.c:175
-#: ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:176
+#: ../pidgin/gtkdialogs.c:177
+msgid "Kurdish"
+msgstr "Kurdisk"
+
+#: ../pidgin/gtkdialogs.c:178
+#: ../pidgin/gtkdialogs.c:241
+#: ../pidgin/gtkdialogs.c:242
+msgid "Lithuanian"
+msgstr "Litauisk"
+
+#: ../pidgin/gtkdialogs.c:179
+#: ../pidgin/gtkdialogs.c:180
+#: ../pidgin/gtkdialogs.c:243
 msgid "Macedonian"
 msgstr "Makedonsk"
 
-#: ../pidgin/gtkdialogs.c:176
+#: ../pidgin/gtkdialogs.c:181
 msgid "Bokmål Norwegian"
 msgstr "Norsk bokmål"
 
-#: ../pidgin/gtkdialogs.c:177
+#: ../pidgin/gtkdialogs.c:182
 msgid "Nepali"
 msgstr "Nepali"
 
-#: ../pidgin/gtkdialogs.c:178
+#: ../pidgin/gtkdialogs.c:183
 msgid "Dutch, Flemish"
 msgstr "Nederlandsk, flamsk"
 
-#: ../pidgin/gtkdialogs.c:179
+#: ../pidgin/gtkdialogs.c:184
 msgid "Norwegian"
 msgstr "Norsk"
 
-#: ../pidgin/gtkdialogs.c:180
+#: ../pidgin/gtkdialogs.c:185
 msgid "Norwegian Nynorsk"
 msgstr "Norsk (nynorsk)"
 
-#: ../pidgin/gtkdialogs.c:181
-#: ../pidgin/gtkdialogs.c:182
-#: ../pidgin/gtkdialogs.c:183
-#: ../pidgin/gtkdialogs.c:239
+#: ../pidgin/gtkdialogs.c:186
+#: ../pidgin/gtkdialogs.c:187
+#: ../pidgin/gtkdialogs.c:188
+#: ../pidgin/gtkdialogs.c:244
 msgid "Polish"
 msgstr "Polsk"
 
-#: ../pidgin/gtkdialogs.c:184
+#: ../pidgin/gtkdialogs.c:189
 msgid "Portuguese"
 msgstr "Portugisisk"
 
-#: ../pidgin/gtkdialogs.c:185
+#: ../pidgin/gtkdialogs.c:190
 msgid "Portuguese-Brazil"
 msgstr "Brasiliansk-portugisisk"
 
-#: ../pidgin/gtkdialogs.c:186
+#: ../pidgin/gtkdialogs.c:191
 msgid "Pashto"
 msgstr "Pashto"
 
-#: ../pidgin/gtkdialogs.c:187
+#: ../pidgin/gtkdialogs.c:192
 msgid "Romanian"
 msgstr "Rumensk"
 
-#: ../pidgin/gtkdialogs.c:188
-#: ../pidgin/gtkdialogs.c:240
-#: ../pidgin/gtkdialogs.c:241
+#: ../pidgin/gtkdialogs.c:193
+#: ../pidgin/gtkdialogs.c:245
+#: ../pidgin/gtkdialogs.c:246
 msgid "Russian"
 msgstr "Russisk"
 
-#: ../pidgin/gtkdialogs.c:189
-#: ../pidgin/gtkdialogs.c:190
-#: ../pidgin/gtkdialogs.c:242
-#: ../pidgin/gtkdialogs.c:243
-#: ../pidgin/gtkdialogs.c:244
+#: ../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:191
-#: ../pidgin/gtkdialogs.c:245
+#: ../pidgin/gtkdialogs.c:196
+#: ../pidgin/gtkdialogs.c:250
 msgid "Slovenian"
 msgstr "Slovensk"
 
-#: ../pidgin/gtkdialogs.c:192
-msgid "Albanian"
-msgstr "Albansk"
-
-#: ../pidgin/gtkdialogs.c:193
-#: ../pidgin/gtkdialogs.c:194
-msgid "Serbian"
-msgstr "Serbisk"
-
-#: ../pidgin/gtkdialogs.c:195
-#: ../pidgin/gtkdialogs.c:246
-msgid "Swedish"
-msgstr "Svensk"
-
-#: ../pidgin/gtkdialogs.c:196
-msgid "Tamil"
-msgstr "Tamil"
-
 #: ../pidgin/gtkdialogs.c:197
-msgid "Telugu"
-msgstr "Telugu"
+msgid "Albanian"
+msgstr "Albansk"
 
 #: ../pidgin/gtkdialogs.c:198
-msgid "Thai"
-msgstr "Thai"
-
 #: ../pidgin/gtkdialogs.c:199
-#: ../pidgin/gtkdialogs.c:247
-msgid "Turkish"
-msgstr "Tyrkisk"
+msgid "Serbian"
+msgstr "Serbisk"
 
 #: ../pidgin/gtkdialogs.c:200
-msgid "Vietnamese"
-msgstr "Vietnamesisk"
-
-#: ../pidgin/gtkdialogs.c:200
-msgid "T.M.Thanh and the Gnome-Vi Team"
-msgstr "T. M. Thanh og Gnome-Vi-laget"
+#: ../pidgin/gtkdialogs.c:251
+msgid "Swedish"
+msgstr "Svensk"
 
 #: ../pidgin/gtkdialogs.c:201
-#: ../pidgin/gtkdialogs.c:248
-msgid "Simplified Chinese"
-msgstr "Forenkla kinesisk"
+msgid "Tamil"
+msgstr "Tamil"
 
 #: ../pidgin/gtkdialogs.c:202
+msgid "Telugu"
+msgstr "Telugu"
+
 #: ../pidgin/gtkdialogs.c:203
+msgid "Thai"
+msgstr "Thai"
+
 #: ../pidgin/gtkdialogs.c:204
-msgid "Hong Kong Chinese"
-msgstr "Hong Kong-kinesisk"
+#: ../pidgin/gtkdialogs.c:252
+msgid "Turkish"
+msgstr "Tyrkisk"
+
+#: ../pidgin/gtkdialogs.c:205
+msgid "Vietnamese"
+msgstr "Vietnamesisk"
 
 #: ../pidgin/gtkdialogs.c:205
+msgid "T.M.Thanh and the Gnome-Vi Team"
+msgstr "T. M. Thanh og Gnome-Vi-laget"
+
 #: ../pidgin/gtkdialogs.c:206
-#: ../pidgin/gtkdialogs.c:249
+#: ../pidgin/gtkdialogs.c:253
+msgid "Simplified Chinese"
+msgstr "Forenkla kinesisk"
+
+#: ../pidgin/gtkdialogs.c:207
+#: ../pidgin/gtkdialogs.c:208
+#: ../pidgin/gtkdialogs.c:209
+msgid "Hong Kong Chinese"
+msgstr "Hong Kong-kinesisk"
+
+#: ../pidgin/gtkdialogs.c:210
+#: ../pidgin/gtkdialogs.c:211
+#: ../pidgin/gtkdialogs.c:254
 msgid "Traditional Chinese"
-msgstr "Tradisjonelt kinesisk"
-
-#: ../pidgin/gtkdialogs.c:212
+msgstr "Tradisjonell kinesisk"
+
+#: ../pidgin/gtkdialogs.c:217
 msgid "Amharic"
 msgstr "Amharisk"
 
-#: ../pidgin/gtkdialogs.c:334
+#: ../pidgin/gtkdialogs.c:339
 #, c-format
 msgid "About %s"
 msgstr "Om %s"
 
-#: ../pidgin/gtkdialogs.c:372
+#: ../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>"
-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). Ei 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:387
+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
 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:392
+#: ../pidgin/gtkdialogs.c:397
 msgid "Current Developers"
 msgstr "Noverande utviklarar"
 
-#: ../pidgin/gtkdialogs.c:407
+#: ../pidgin/gtkdialogs.c:412
 msgid "Crazy Patch Writers"
 msgstr "Rettarar"
 
-#: ../pidgin/gtkdialogs.c:422
+#: ../pidgin/gtkdialogs.c:427
 msgid "Retired Developers"
 msgstr "Tidlegare utviklarar"
 
-#: ../pidgin/gtkdialogs.c:437
+#: ../pidgin/gtkdialogs.c:442
+msgid "Retired Crazy Patch Writers"
+msgstr "Pensjonerte, pasjonerte lappeskrivarar"
+
+#: ../pidgin/gtkdialogs.c:457
 msgid "Artists"
 msgstr "Kunstnarar"
 
-#: ../pidgin/gtkdialogs.c:452
-msgid "Current Translators"
-msgstr "Noverande omsetjarar"
-
 #: ../pidgin/gtkdialogs.c:472
+msgid "Current Translators"
+msgstr "Noverande omsetjarar"
+
+#: ../pidgin/gtkdialogs.c:492
 msgid "Past Translators"
 msgstr "Tidlegare omsetjarar"
 
-#: ../pidgin/gtkdialogs.c:490
+#: ../pidgin/gtkdialogs.c:510
 msgid "Debugging Information"
 msgstr "Feilsøkingsinformasjon "
 
-#: ../pidgin/gtkdialogs.c:859
+#: ../pidgin/gtkdialogs.c:879
 msgid "Get User Info"
 msgstr "Hent brukarinfo"
 
-#: ../pidgin/gtkdialogs.c:861
+#: ../pidgin/gtkdialogs.c:881
 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:951
+#: ../pidgin/gtkdialogs.c:971
 msgid "View User Log"
 msgstr "Les brukarlogg"
 
-#: ../pidgin/gtkdialogs.c:953
-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:973
+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
 msgid "Alias Contact"
 msgstr "Kontaktalias"
 
-#: ../pidgin/gtkdialogs.c:974
+#: ../pidgin/gtkdialogs.c:994
 msgid "Enter an alias for this contact."
 msgstr "Før opp eit kallenamn (alias) for denne kontakten."
 
-#: ../pidgin/gtkdialogs.c:996
+#: ../pidgin/gtkdialogs.c:1016
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Før opp eit kallenamn (alias) for %s."
 
-#: ../pidgin/gtkdialogs.c:998
+#: ../pidgin/gtkdialogs.c:1018
 msgid "Alias Buddy"
 msgstr "Vennealias"
 
-#: ../pidgin/gtkdialogs.c:1019
+#: ../pidgin/gtkdialogs.c:1039
 msgid "Alias Chat"
 msgstr "Kallenamn praterom"
 
-#: ../pidgin/gtkdialogs.c:1020
+#: ../pidgin/gtkdialogs.c:1040
 msgid "Enter an alias for this chat."
 msgstr "Før opp eit kallenamn for dette praterommet."
 
-#: ../pidgin/gtkdialogs.c:1059
+#: ../pidgin/gtkdialogs.c:1079
 #, 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:1067
+#: ../pidgin/gtkdialogs.c:1087
 msgid "Remove Contact"
 msgstr "Fjern kontakt"
 
-#: ../pidgin/gtkdialogs.c:1070
+#: ../pidgin/gtkdialogs.c:1090
 msgid "_Remove Contact"
 msgstr "_Fjern kontakt"
 
-#: ../pidgin/gtkdialogs.c:1101
+#: ../pidgin/gtkdialogs.c:1121
 #, 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:1108
+#: ../pidgin/gtkdialogs.c:1128
 msgid "Merge Groups"
 msgstr "Slå saman grupper"
 
-#: ../pidgin/gtkdialogs.c:1111
+#: ../pidgin/gtkdialogs.c:1131
 msgid "_Merge Groups"
 msgstr "_Slå saman grupper"
 
-#: ../pidgin/gtkdialogs.c:1161
+#: ../pidgin/gtkdialogs.c:1181
 #, 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:1164
+#: ../pidgin/gtkdialogs.c:1184
 msgid "Remove Group"
 msgstr "Fjern gruppa"
 
-#: ../pidgin/gtkdialogs.c:1167
+#: ../pidgin/gtkdialogs.c:1187
 msgid "_Remove Group"
 msgstr "_Fjern gruppe"
 
-#: ../pidgin/gtkdialogs.c:1200
+#: ../pidgin/gtkdialogs.c:1220
 #, 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:1203
+#: ../pidgin/gtkdialogs.c:1223
 msgid "Remove Buddy"
 msgstr "Fjern venn"
 
-#: ../pidgin/gtkdialogs.c:1206
+#: ../pidgin/gtkdialogs.c:1226
 msgid "_Remove Buddy"
 msgstr "_Fjern venn"
 
-#: ../pidgin/gtkdialogs.c:1227
+#: ../pidgin/gtkdialogs.c:1247
 #, 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:1230
+#: ../pidgin/gtkdialogs.c:1250
 msgid "Remove Chat"
 msgstr "Fjern praterom"
 
-#: ../pidgin/gtkdialogs.c:1233
+#: ../pidgin/gtkdialogs.c:1253
 msgid "_Remove Chat"
 msgstr "_Fjern praterom"
 
@@ -13412,7 +13588,7 @@
 
 #: ../pidgin/gtkft.c:783
 msgid "Close this window when all transfers _finish"
-msgstr "Lukk dette vindauget når alle overføringar er _ferdige"
+msgstr "Lukk dette _vindauget når alle overføringar er ferdige"
 
 #: ../pidgin/gtkft.c:793
 msgid "C_lear finished transfers"
@@ -13434,43 +13610,44 @@
 msgid "_Resume"
 msgstr "_Hald fram"
 
-#: ../pidgin/gtkimhtml.c:795
+#: ../pidgin/gtkimhtml.c:814
 msgid "Paste as Plain _Text"
 msgstr "_Lim inn som rein tekst"
 
-#: ../pidgin/gtkimhtml.c:812
+#: ../pidgin/gtkimhtml.c:831
+#: ../pidgin/gtkimhtmltoolbar.c:1138
 msgid "_Reset formatting"
 msgstr "_Ta vekk formatering"
 
-#: ../pidgin/gtkimhtml.c:1349
+#: ../pidgin/gtkimhtml.c:1371
 msgid "Hyperlink color"
 msgstr "Lenkjefarge"
 
-#: ../pidgin/gtkimhtml.c:1350
+#: ../pidgin/gtkimhtml.c:1372
 msgid "Color to draw hyperlinks."
 msgstr "Farge til å teikna lenkje."
 
-#: ../pidgin/gtkimhtml.c:1353
+#: ../pidgin/gtkimhtml.c:1375
 msgid "Hyperlink prelight color"
 msgstr "Lenkjefarge"
 
-#: ../pidgin/gtkimhtml.c:1354
+#: ../pidgin/gtkimhtml.c:1376
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Lenkjefarge når musa peikar på lenkja."
 
-#: ../pidgin/gtkimhtml.c:1575
+#: ../pidgin/gtkimhtml.c:1596
 msgid "_Copy E-Mail Address"
 msgstr "_Kopier e-postadresse"
 
-#: ../pidgin/gtkimhtml.c:1587
+#: ../pidgin/gtkimhtml.c:1608
 msgid "_Open Link in Browser"
 msgstr "_Opna lenkja i nettlesar"
 
-#: ../pidgin/gtkimhtml.c:1597
+#: ../pidgin/gtkimhtml.c:1618
 msgid "_Copy Link Location"
 msgstr "_Kopier lenkje"
 
-#: ../pidgin/gtkimhtml.c:3341
+#: ../pidgin/gtkimhtml.c:3363
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -13480,7 +13657,7 @@
 "\n"
 "Nyttar standardtypen PNG."
 
-#: ../pidgin/gtkimhtml.c:3344
+#: ../pidgin/gtkimhtml.c:3366
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -13490,7 +13667,7 @@
 "\n"
 "Nyttar standardtypen PNG."
 
-#: ../pidgin/gtkimhtml.c:3373
+#: ../pidgin/gtkimhtml.c:3395
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -13501,7 +13678,7 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3376
+#: ../pidgin/gtkimhtml.c:3398
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -13512,12 +13689,12 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3454
-#: ../pidgin/gtkimhtml.c:3466
+#: ../pidgin/gtkimhtml.c:3476
+#: ../pidgin/gtkimhtml.c:3488
 msgid "Save Image"
 msgstr "Lagra bilete"
 
-#: ../pidgin/gtkimhtml.c:3494
+#: ../pidgin/gtkimhtml.c:3516
 msgid "_Save Image..."
 msgstr "_Lagra bilete…"
 
@@ -13539,7 +13716,7 @@
 
 #: ../pidgin/gtkimhtmltoolbar.c:408
 msgid "_Description"
-msgstr "_Skildring"
+msgstr "Skil_dring"
 
 #: ../pidgin/gtkimhtmltoolbar.c:411
 msgid "Please enter the URL and description of the link that you want to insert. The description is optional."
@@ -13554,9 +13731,9 @@
 msgstr "Legg til lenkje"
 
 #: ../pidgin/gtkimhtmltoolbar.c:424
-#: ../pidgin/gtkimhtmltoolbar.c:1155
+#: ../pidgin/gtkimhtmltoolbar.c:1207
 msgid "_Insert"
-msgstr "_Sett inn"
+msgstr "_Set inn"
 
 #: ../pidgin/gtkimhtmltoolbar.c:493
 #, c-format
@@ -13577,59 +13754,59 @@
 msgid "Smile!"
 msgstr "Smil!"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1064
-msgid "_Bold"
-msgstr "_Feit"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1065
-msgid "_Italic"
-msgstr "_Kursiv"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1066
-msgid "_Underline"
-msgstr "_Understreka"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1067
-msgid "_Larger"
-msgstr "_Større"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1069
+#: ../pidgin/gtkimhtmltoolbar.c:820
+#: ../pidgin/gtkimhtmltoolbar.c:1164
+msgid "_Font"
+msgstr "Skriftt_ype"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1124
+msgid "<b>_Bold</b>"
+msgstr "<b>_Feit</b>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1125
+msgid "<i>_Italic</i>"
+msgstr "<i>_Kursiv</i>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1126
+msgid "<u>_Underline</u>"
+msgstr "<u>_Understrek</u>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1127
+msgid "<span size='larger'>_Larger</span>"
+msgstr "<span size='larger'>_Større</span>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1129
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1071
-msgid "_Smaller"
-msgstr "_Mindre"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1072
+#: ../pidgin/gtkimhtmltoolbar.c:1131
+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
 msgid "_Font face"
-msgstr "_Skrifttype"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1073
-msgid "_Foreground color"
+msgstr "Skriftt_ype"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1136
+msgid "Foreground _color"
 msgstr "_Forgrunnsfarge"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1074
-msgid "_Background color"
+#: ../pidgin/gtkimhtmltoolbar.c:1137
+msgid "Bac_kground color"
 msgstr "_Bakgrunnsfarge"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1100
-msgid "_Font"
-msgstr "_Skrifttype"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1135
-msgid "_Reset font"
-msgstr "_Nullstill skrifttype"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1162
+#: ../pidgin/gtkimhtmltoolbar.c:1215
 msgid "_Smiley"
 msgstr "_Smilefjes"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1168
+#: ../pidgin/gtkimhtmltoolbar.c:1221
 msgid "_Image"
 msgstr "_Bilete"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1174
+#: ../pidgin/gtkimhtmltoolbar.c:1227
 msgid "_Link"
 msgstr "_Lenkje"
 
@@ -13702,12 +13879,12 @@
 msgid "System Log"
 msgstr "Systemlogg"
 
-#: ../pidgin/gtkmain.c:385
+#: ../pidgin/gtkmain.c:386
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. Prøv `%s -h' for meir informasjon.\n"
 
-#: ../pidgin/gtkmain.c:387
+#: ../pidgin/gtkmain.c:388
 #, c-format
 msgid ""
 "%s %s\n"
@@ -13734,7 +13911,7 @@
 "                      konto(ar) å bruka, skilde med komma)\n"
 "  -v, --version       vis noverande versjon og avslutt\n"
 
-#: ../pidgin/gtkmain.c:511
+#: ../pidgin/gtkmain.c:512
 #, c-format
 msgid ""
 "%s has segfaulted and attempted to dump a core file.\n"
@@ -13775,52 +13952,52 @@
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../pidgin/gtkmain.c:697
+#: ../pidgin/gtkmain.c:699
 #: ../pidgin/pidgin.h:50
 msgid "Pidgin"
 msgstr "Pidgin"
 
-#: ../pidgin/gtknotify.c:343
+#: ../pidgin/gtknotify.c:344
 msgid "Open All Messages"
 msgstr "Opna alle meldingar"
 
-#: ../pidgin/gtknotify.c:395
+#: ../pidgin/gtknotify.c:396
 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:515
+#: ../pidgin/gtknotify.c:516
 #, 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:526
+#: ../pidgin/gtknotify.c:527
 #, 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:965
+#: ../pidgin/gtknotify.c:967
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "Nettlesarkommandoen \"%s\" er ugyldig."
 
-#: ../pidgin/gtknotify.c:967
+#: ../pidgin/gtknotify.c:969
+#: ../pidgin/gtknotify.c:981
+#: ../pidgin/gtknotify.c:994
+#: ../pidgin/gtknotify.c:1122
+msgid "Unable to open URL"
+msgstr "Klarte ikkje å opna adressa"
+
 #: ../pidgin/gtknotify.c:979
 #: ../pidgin/gtknotify.c:992
-#: ../pidgin/gtknotify.c:1120
-msgid "Unable to open URL"
-msgstr "Klarte ikkje å opna adressa"
-
-#: ../pidgin/gtknotify.c:977
-#: ../pidgin/gtknotify.c:990
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Klarte ikkje å starta \"%s\": %s"
 
-#: ../pidgin/gtknotify.c:1121
+#: ../pidgin/gtknotify.c:1123
 msgid "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "'Manuell' nettlesarkommando er vald, men ingen kommando er brukt."
 
@@ -13992,15 +14169,6 @@
 msgid "_Show system tray icon:"
 msgstr "Vis systempanel_ikon:"
 
-#: ../pidgin/gtkprefs.c:896
-#: ../pidgin/gtkprefs.c:908
-#: ../pidgin/gtkprefs.c:1756
-#: ../pidgin/plugins/timestamp_format.c:42
-#: ../pidgin/plugins/timestamp_format.c:51
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:338
-msgid "Always"
-msgstr "Alltid"
-
 #: ../pidgin/gtkprefs.c:898
 msgid "On unread messages"
 msgstr "Ved ulesne meldingar"
@@ -14014,7 +14182,7 @@
 msgstr "_Skjul  nye lynmeldingssamtaler:"
 
 #: ../pidgin/gtkprefs.c:907
-#: ../pidgin/gtkprefs.c:1937
+#: ../pidgin/gtkprefs.c:1939
 msgid "When away"
 msgstr "Når vekke"
 
@@ -14033,7 +14201,7 @@
 
 #: ../pidgin/gtkprefs.c:934
 msgid "_Placement:"
-msgstr "_Plasessring:"
+msgstr "_Plassering:"
 
 #: ../pidgin/gtkprefs.c:936
 msgid "Top"
@@ -14068,8 +14236,8 @@
 msgstr "Vis _formatering i innkomne meldingar"
 
 #: ../pidgin/gtkprefs.c:997
-msgid "Show buddy _icons"
-msgstr "Vis venne_ikon"
+msgid "Show _detailed information"
+msgstr "Vis _detaljar"
 
 #: ../pidgin/gtkprefs.c:999
 msgid "Enable buddy ic_on animation"
@@ -14115,123 +14283,123 @@
 msgid "Default Formatting"
 msgstr "Standardformatering"
 
-#: ../pidgin/gtkprefs.c:1057
+#: ../pidgin/gtkprefs.c:1059
 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:1123
+#: ../pidgin/gtkprefs.c:1125
 msgid "ST_UN server:"
 msgstr "ST_UN-tenar:"
 
-#: ../pidgin/gtkprefs.c:1135
+#: ../pidgin/gtkprefs.c:1137
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Døme: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1139
+#: ../pidgin/gtkprefs.c:1141
 msgid "_Autodetect IP address"
 msgstr "Finn IP-adressa _automatisk"
 
-#: ../pidgin/gtkprefs.c:1148
+#: ../pidgin/gtkprefs.c:1150
 msgid "Public _IP:"
 msgstr "Offentleg _IP:"
 
-#: ../pidgin/gtkprefs.c:1177
+#: ../pidgin/gtkprefs.c:1179
 msgid "Ports"
 msgstr "Portar"
 
-#: ../pidgin/gtkprefs.c:1180
+#: ../pidgin/gtkprefs.c:1182
 msgid "_Manually specify range of ports to listen on"
-msgstr "Før opp _portrekke det skal lyttast til"
-
-#: ../pidgin/gtkprefs.c:1183
+msgstr "Før opp _portrekkje det skal lyttast til"
+
+#: ../pidgin/gtkprefs.c:1185
 msgid "_Start port:"
-msgstr "St_artport:"
-
-#: ../pidgin/gtkprefs.c:1190
+msgstr "_Startport:"
+
+#: ../pidgin/gtkprefs.c:1192
 msgid "_End port:"
-msgstr "Sl_uttport:"
-
-#: ../pidgin/gtkprefs.c:1198
+msgstr "Sluttp_ort:"
+
+#: ../pidgin/gtkprefs.c:1200
 msgid "Proxy Server"
 msgstr "Mellomtenar"
 
-#: ../pidgin/gtkprefs.c:1202
+#: ../pidgin/gtkprefs.c:1204
 msgid "No proxy"
 msgstr "Inga mellomlagring"
 
-#: ../pidgin/gtkprefs.c:1258
+#: ../pidgin/gtkprefs.c:1260
 msgid "_User:"
 msgstr "Br_ukar:"
 
-#: ../pidgin/gtkprefs.c:1323
+#: ../pidgin/gtkprefs.c:1325
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1324
+#: ../pidgin/gtkprefs.c:1326
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1325
+#: ../pidgin/gtkprefs.c:1327
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1326
+#: ../pidgin/gtkprefs.c:1328
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1327
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: ../pidgin/gtkprefs.c:1328
-msgid "GNOME Default"
-msgstr "GNOME-standard"
-
 #: ../pidgin/gtkprefs.c:1329
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: ../pidgin/gtkprefs.c:1330
+msgid "GNOME Default"
+msgstr "GNOME-standard"
+
+#: ../pidgin/gtkprefs.c:1331
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1330
+#: ../pidgin/gtkprefs.c:1332
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1331
+#: ../pidgin/gtkprefs.c:1333
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1332
+#: ../pidgin/gtkprefs.c:1334
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1341
+#: ../pidgin/gtkprefs.c:1343
 msgid "Manual"
 msgstr "Sjølvvald"
 
-#: ../pidgin/gtkprefs.c:1394
+#: ../pidgin/gtkprefs.c:1396
 msgid "Browser Selection"
 msgstr "Nettlesarval"
 
-#: ../pidgin/gtkprefs.c:1398
+#: ../pidgin/gtkprefs.c:1400
 msgid "_Browser:"
 msgstr "_Nettlesar:"
 
-#: ../pidgin/gtkprefs.c:1406
+#: ../pidgin/gtkprefs.c:1408
 msgid "_Open link in:"
 msgstr "Opna _lenkje i:"
 
-#: ../pidgin/gtkprefs.c:1408
+#: ../pidgin/gtkprefs.c:1410
 msgid "Browser default"
 msgstr "Nettlesarstandard"
 
-#: ../pidgin/gtkprefs.c:1409
+#: ../pidgin/gtkprefs.c:1411
 msgid "Existing window"
 msgstr "Eksisterande vindauge"
 
-#: ../pidgin/gtkprefs.c:1411
+#: ../pidgin/gtkprefs.c:1413
 msgid "New tab"
 msgstr "Ny fane"
 
-#: ../pidgin/gtkprefs.c:1425
+#: ../pidgin/gtkprefs.c:1427
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -14240,81 +14408,63 @@
 "_Sjølvvald:\n"
 "(%s for adresse)"
 
-#: ../pidgin/gtkprefs.c:1465
+#: ../pidgin/gtkprefs.c:1467
 msgid "Log _format:"
 msgstr "Logg_format:"
 
-#: ../pidgin/gtkprefs.c:1470
+#: ../pidgin/gtkprefs.c:1472
 msgid "Log all _instant messages"
-msgstr "_Loggfør alle lynmeldingar"
-
-#: ../pidgin/gtkprefs.c:1472
-msgid "Log all c_hats"
-msgstr "_Loggfør alle samtaler"
+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 _status changes to system log"
 msgstr "Loggfør alle _statusendringar i systemloggen"
 
-#: ../pidgin/gtkprefs.c:1582
-#: ../pidgin/gtkprefs.c:1671
-#: ../pidgin/gtkprefs.c:1865
-msgid "(default)"
-msgstr "(standard)"
-
-#: ../pidgin/gtkprefs.c:1620
+#: ../pidgin/gtkprefs.c:1622
 msgid "Sound Selection"
 msgstr "Lydval"
 
-#: ../pidgin/gtkprefs.c:1630
+#: ../pidgin/gtkprefs.c:1632
 msgid "Quietest"
 msgstr "Stillaste"
 
-#: ../pidgin/gtkprefs.c:1632
+#: ../pidgin/gtkprefs.c:1634
 msgid "Quieter"
 msgstr "Stillare"
 
-#: ../pidgin/gtkprefs.c:1634
+#: ../pidgin/gtkprefs.c:1636
 msgid "Quiet"
 msgstr "Stille"
 
-#: ../pidgin/gtkprefs.c:1638
+#: ../pidgin/gtkprefs.c:1640
 msgid "Loud"
 msgstr "Høg"
 
-#: ../pidgin/gtkprefs.c:1640
-msgid "Louder"
-msgstr "Høgare"
-
 #: ../pidgin/gtkprefs.c:1642
+msgid "Louder"
+msgstr "Høgare"
+
+#: ../pidgin/gtkprefs.c:1644
 msgid "Loudest"
 msgstr "Høgast"
 
-#: ../pidgin/gtkprefs.c:1705
-msgid "Sound Method"
-msgstr "Lydmetode"
-
-#: ../pidgin/gtkprefs.c:1706
+#: ../pidgin/gtkprefs.c:1708
 msgid "_Method:"
 msgstr "_Metode:"
 
-#: ../pidgin/gtkprefs.c:1708
+#: ../pidgin/gtkprefs.c:1710
 msgid "Console beep"
 msgstr "Konsollyd"
 
-#: ../pidgin/gtkprefs.c:1710
-msgid "Automatic"
-msgstr "Automatisk"
-
-#: ../pidgin/gtkprefs.c:1714
-msgid "Command"
-msgstr "Kommando"
-
-#: ../pidgin/gtkprefs.c:1715
+#: ../pidgin/gtkprefs.c:1717
 msgid "No sounds"
 msgstr "Ingen lydar"
 
-#: ../pidgin/gtkprefs.c:1723
+#: ../pidgin/gtkprefs.c:1725
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -14323,117 +14473,81 @@
 "Lyd_kommando:\n"
 "(%s for filnamn)"
 
-#: ../pidgin/gtkprefs.c:1749
-msgid "Sound Options"
-msgstr "Lydinnstillingar"
-
-#: ../pidgin/gtkprefs.c:1750
+#: ../pidgin/gtkprefs.c:1752
 msgid "Sounds when conversation has _focus"
 msgstr "Lydar medan samtalevindauget har _fokus"
 
-#: ../pidgin/gtkprefs.c:1752
-msgid "Enable sounds:"
-msgstr "Bruk lydar:"
-
 #: ../pidgin/gtkprefs.c:1754
-msgid "Only when available"
-msgstr "Berre når ttilgjengeleg"
-
-#: ../pidgin/gtkprefs.c:1755
-msgid "Only when not available"
-msgstr "Berre når ikkje tilgjengeleg"
-
-#: ../pidgin/gtkprefs.c:1763
+msgid "Enable sounds:"
+msgstr "Bruk lydar:"
+
+#: ../pidgin/gtkprefs.c:1765
 msgid "Volume:"
 msgstr "Volum:"
 
-#: ../pidgin/gtkprefs.c:1791
-msgid "Sound Events"
-msgstr "Lydhendingar"
-
-#: ../pidgin/gtkprefs.c:1843
+#: ../pidgin/gtkprefs.c:1845
 msgid "Play"
 msgstr "Spel"
 
-#: ../pidgin/gtkprefs.c:1850
-msgid "Event"
-msgstr "Hending"
-
-#: ../pidgin/gtkprefs.c:1869
-msgid "Test"
-msgstr "Test"
-
-#: ../pidgin/gtkprefs.c:1873
-msgid "Reset"
-msgstr "Nullstill"
-
-#: ../pidgin/gtkprefs.c:1877
-msgid "Choose..."
-msgstr "Velâ?¦"
-
-#: ../pidgin/gtkprefs.c:1920
+#: ../pidgin/gtkprefs.c:1922
 msgid "_Report idle time:"
 msgstr "Vis kor lenge _uverksam:"
 
-#: ../pidgin/gtkprefs.c:1925
+#: ../pidgin/gtkprefs.c:1927
 msgid "Based on keyboard or mouse use"
 msgstr "Basert på tastatur- eller musebruk"
 
-#: ../pidgin/gtkprefs.c:1934
+#: ../pidgin/gtkprefs.c:1936
 msgid "_Auto-reply:"
 msgstr "_Automatisk svar:"
 
-#: ../pidgin/gtkprefs.c:1938
+#: ../pidgin/gtkprefs.c:1940
 msgid "When both away and idle"
 msgstr "Både når vekke og uverksam"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1944
+#: ../pidgin/gtkprefs.c:1946
 msgid "Auto-away"
 msgstr "Automatisk vekke"
 
-#: ../pidgin/gtkprefs.c:1946
+#: ../pidgin/gtkprefs.c:1948
 msgid "Change status when _idle"
-msgstr "Endra tilstand når _uverksam"
-
-#: ../pidgin/gtkprefs.c:1950
-msgid "_Minutes before changing status:"
-msgstr "_Minutt før endring av tilstand:"
-
-#: ../pidgin/gtkprefs.c:1958
+msgstr "_Endra tilstand når uverksam"
+
+#: ../pidgin/gtkprefs.c:1952
+msgid "_Minutes before becoming idle:"
+msgstr "_Minutt før ein blir uverksam:"
+
+#: ../pidgin/gtkprefs.c:1960
 msgid "Change _status to:"
 msgstr "Endra _tilstand til:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1979
+#: ../pidgin/gtkprefs.c:1981
 msgid "Status at Startup"
 msgstr "Tilstand ved oppstart"
 
-#: ../pidgin/gtkprefs.c:1981
+#: ../pidgin/gtkprefs.c:1983
 msgid "Use status from last _exit at startup"
-msgstr "Bruka tilstanden frå siste _avslutning ved oppstart"
-
-#: ../pidgin/gtkprefs.c:1987
+msgstr "Bruk tilstanden frå _siste avslutning ved oppstart"
+
+#: ../pidgin/gtkprefs.c:1989
 msgid "Status to a_pply at startup:"
 msgstr "Tilstand å _bruka ved oppstart:"
 
-#: ../pidgin/gtkprefs.c:2025
+#: ../pidgin/gtkprefs.c:2027
 msgid "Interface"
 msgstr "Grensesnitt"
 
-#: ../pidgin/gtkprefs.c:2027
+#: ../pidgin/gtkprefs.c:2029
 msgid "Smiley Themes"
 msgstr "Smilefjestema"
 
-#: ../pidgin/gtkprefs.c:2028
-msgid "Sounds"
-msgstr "Lydar"
-
-#: ../pidgin/gtkprefs.c:2034
+#: ../pidgin/gtkprefs.c:2036
 msgid "Browser"
 msgstr "Nettlesar"
 
-#: ../pidgin/gtkprefs.c:2038
+#: ../pidgin/gtkprefs.c:2040
 msgid "Status / Idle"
 msgstr "Tilstand/uverksam"
 
@@ -14525,24 +14639,24 @@
 msgid "Apply"
 msgstr "Bruk"
 
-#: ../pidgin/gtkrequest.c:1478
+#: ../pidgin/gtkrequest.c:1504
 msgid "That file already exists"
 msgstr "Fila finst allereie"
 
-#: ../pidgin/gtkrequest.c:1479
+#: ../pidgin/gtkrequest.c:1505
 msgid "Would you like to overwrite it?"
 msgstr "Vil du skriva over?"
 
-#: ../pidgin/gtkrequest.c:1482
+#: ../pidgin/gtkrequest.c:1508
 msgid "Overwrite"
 msgstr "Skriv over"
 
-#: ../pidgin/gtkrequest.c:1483
+#: ../pidgin/gtkrequest.c:1509
 msgid "Choose New Name"
 msgstr "Vel nytt namn"
 
-#: ../pidgin/gtkrequest.c:1621
-#: ../pidgin/gtkrequest.c:1635
+#: ../pidgin/gtkrequest.c:1647
+#: ../pidgin/gtkrequest.c:1661
 msgid "Select Folder..."
 msgstr "Vel mappe…"
 
@@ -14603,117 +14717,69 @@
 msgid "Status for %s"
 msgstr "Status for %s"
 
-#: ../pidgin/gtksound.c:63
-msgid "Buddy logs in"
-msgstr "Venn loggar inn"
-
-#: ../pidgin/gtksound.c:64
-msgid "Buddy logs out"
-msgstr "Venn loggar ut"
-
-#: ../pidgin/gtksound.c:65
-msgid "Message received"
-msgstr "Melding motteken"
-
-#: ../pidgin/gtksound.c:66
-msgid "Message received begins conversation"
-msgstr "Motteken melding startar samtala"
-
-#: ../pidgin/gtksound.c:67
-msgid "Message sent"
-msgstr "Melding sendt"
-
-#: ../pidgin/gtksound.c:68
-msgid "Person enters chat"
-msgstr "Person kjem inn i rommet"
-
-#: ../pidgin/gtksound.c:69
-msgid "Person leaves chat"
-msgstr "Person forlèt rommet"
-
-#: ../pidgin/gtksound.c:70
-msgid "You talk in chat"
-msgstr "Du pratar i rommet"
-
-#: ../pidgin/gtksound.c:71
-msgid "Others talk in chat"
-msgstr "Andre pratar i rommet"
-
-#: ../pidgin/gtksound.c:74
-msgid "Someone says your screen name in chat"
-msgstr "Nokon seier brukarnamnet ditt i praterommet"
-
-#: ../pidgin/gtksound.c:310
-msgid "GStreamer Failure"
-msgstr "GStreamer-svikt"
-
-#: ../pidgin/gtksound.c:311
-msgid "GStreamer failed to initialize."
-msgstr "GStreamer klarte ikkje å starta."
-
 #: ../pidgin/gtkstatusbox.c:663
 msgid "Waiting for network connection"
 msgstr "Ventar på nettverkssamband"
 
-#: ../pidgin/gtkutils.c:627
+#: ../pidgin/gtkutils.c:631
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1384
-#: ../pidgin/gtkutils.c:1407
+#: ../pidgin/gtkutils.c:1388
+#: ../pidgin/gtkutils.c:1411
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "Følgjande feil oppstod ved lastinga av %s: %s"
 
-#: ../pidgin/gtkutils.c:1387
-#: ../pidgin/gtkutils.c:1409
+#: ../pidgin/gtkutils.c:1391
+#: ../pidgin/gtkutils.c:1413
 msgid "Failed to load image"
 msgstr "Klarte ikkje å lagra biletet"
 
-#: ../pidgin/gtkutils.c:1483
+#: ../pidgin/gtkutils.c:1487
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Klarer ikkje å senda mappe %s."
 
-#: ../pidgin/gtkutils.c:1484
+#: ../pidgin/gtkutils.c:1488
 #, 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:1516
-#: ../pidgin/gtkutils.c:1528
-#: ../pidgin/gtkutils.c:1535
+#: ../pidgin/gtkutils.c:1520
+#: ../pidgin/gtkutils.c:1532
+#: ../pidgin/gtkutils.c:1539
 msgid "You have dragged an image"
 msgstr "Du har drege eit biete"
 
-#: ../pidgin/gtkutils.c:1517
+#: ../pidgin/gtkutils.c:1521
 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:1523
-#: ../pidgin/gtkutils.c:1543
+#: ../pidgin/gtkutils.c:1527
+#: ../pidgin/gtkutils.c:1547
 msgid "Set as buddy icon"
 msgstr "Bruk som venne-ikon"
 
-#: ../pidgin/gtkutils.c:1524
-#: ../pidgin/gtkutils.c:1544
+#: ../pidgin/gtkutils.c:1528
+#: ../pidgin/gtkutils.c:1548
 msgid "Send image file"
 msgstr "Send biletfil"
 
-#: ../pidgin/gtkutils.c:1525
-#: ../pidgin/gtkutils.c:1544
+#: ../pidgin/gtkutils.c:1529
+#: ../pidgin/gtkutils.c:1548
 msgid "Insert in message"
 msgstr "Legg til i meldinga"
 
-#: ../pidgin/gtkutils.c:1529
+#: ../pidgin/gtkutils.c:1533
 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:1536
+#: ../pidgin/gtkutils.c:1540
 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:1537
+#: ../pidgin/gtkutils.c:1541
 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"
 
@@ -14722,15 +14788,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:1595
+#: ../pidgin/gtkutils.c:1599
 msgid "Cannot send launcher"
 msgstr "Klarer ikkje å senda lastaren"
 
-#: ../pidgin/gtkutils.c:1595
+#: ../pidgin/gtkutils.c:1599
 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:2317
+#: ../pidgin/gtkutils.c:2334
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -14741,25 +14807,25 @@
 "<b>Filstorleik:</b> %s\n"
 "<b>Biletstorleik:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2613
+#: ../pidgin/gtkutils.c:2630
 #, 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:2615
+#: ../pidgin/gtkutils.c:2632
 msgid "Icon Error"
 msgstr "Ikon-feil"
 
-#: ../pidgin/gtkutils.c:2616
+#: ../pidgin/gtkutils.c:2633
 msgid "Could not set icon"
 msgstr "Klarte ikkje å bruka ikonet"
 
-#: ../pidgin/gtkutils.c:2716
+#: ../pidgin/gtkutils.c:2733
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Klarte ikkje å opna fila '%s': %s"
 
-#: ../pidgin/gtkutils.c:2765
+#: ../pidgin/gtkutils.c:2782
 #, 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"
@@ -14813,38 +14879,38 @@
 msgid "none"
 msgstr "ingen"
 
-#: ../pidgin/plugins/cap/cap.c:449
+#: ../pidgin/plugins/cap/cap.c:450
 msgid "Display Statistics"
 msgstr "Vis statistikk"
 
-#: ../pidgin/plugins/cap/cap.c:461
-#: ../pidgin/plugins/cap/cap.c:464
+#: ../pidgin/plugins/cap/cap.c:462
+#: ../pidgin/plugins/cap/cap.c:465
 msgid "Response Probability:"
 msgstr "Sannsynleg svar:"
 
-#: ../pidgin/plugins/cap/cap.c:810
+#: ../pidgin/plugins/cap/cap.c:811
 msgid "Statistics Configuration"
 msgstr "Statistikkinnstillingar"
 
 #. msg_difference spinner
-#: ../pidgin/plugins/cap/cap.c:813
+#: ../pidgin/plugins/cap/cap.c:814
 msgid "Maximum response timeout:"
 msgstr "Største tidsavbrot for svar:"
 
-#: ../pidgin/plugins/cap/cap.c:816
-#: ../pidgin/plugins/cap/cap.c:823
-#: ../pidgin/plugins/cap/cap.c:830
+#: ../pidgin/plugins/cap/cap.c:817
+#: ../pidgin/plugins/cap/cap.c:824
+#: ../pidgin/plugins/cap/cap.c:831
 #: ../pidgin/plugins/timestamp.c:150
 msgid "minutes"
 msgstr "minutt"
 
 #. last_seen spinner
-#: ../pidgin/plugins/cap/cap.c:820
+#: ../pidgin/plugins/cap/cap.c:821
 msgid "Maximum last-seen difference:"
 msgstr "Største skilnad for sist sett:"
 
 #. threshold spinner
-#: ../pidgin/plugins/cap/cap.c:827
+#: ../pidgin/plugins/cap/cap.c:828
 msgid "Threshold:"
 msgstr "Grense:"
 
@@ -14854,18 +14920,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/cap/cap.c:935
+#: ../pidgin/plugins/cap/cap.c:936
 msgid "Contact Availability Prediction"
 msgstr "Kontakttilgjengespådom"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/cap/cap.c:937
+#: ../pidgin/plugins/cap/cap.c:938
 msgid "Contact Availability Prediction plugin."
 msgstr "Programtillegg for kontakttilgjengespådom."
 
 #. *  summary
-#: ../pidgin/plugins/cap/cap.c:938
+#: ../pidgin/plugins/cap/cap.c:939
 msgid "The contact availability plugin (cap) is used to display statistical information about buddies in a users contact list."
 msgstr "Programtillegget for kontakttilgjengespådom (cap) blir brukt til å syna statistisk informasjon om vennar i ein brukar si kontaktliste."
 
@@ -15123,34 +15189,34 @@
 msgid "_Associate Buddy"
 msgstr "_Knyt til venn"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:238
-#: ../pidgin/plugins/gevolution/gevolution.c:244
+#: ../pidgin/plugins/gevolution/gevolution.c:240
+#: ../pidgin/plugins/gevolution/gevolution.c:246
 msgid "Unable to send e-mail"
 msgstr "Klarte ikkje å senda e-postmeldinga"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:239
+#: ../pidgin/plugins/gevolution/gevolution.c:241
 msgid "The evolution executable was not found in the PATH."
 msgstr "Evolution si programfil blei ikkje funnen i filbana (PATH)."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:245
+#: ../pidgin/plugins/gevolution/gevolution.c:247
 msgid "An e-mail address was not found for this buddy."
 msgstr "Fann inga e-postadresse for denne vennen."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:271
+#: ../pidgin/plugins/gevolution/gevolution.c:273
 msgid "Add to Address Book"
 msgstr "Legg til i adresseboka"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:283
+#: ../pidgin/plugins/gevolution/gevolution.c:285
 msgid "Send E-Mail"
 msgstr "Send e-post"
 
 #. Configuration frame
-#: ../pidgin/plugins/gevolution/gevolution.c:410
+#: ../pidgin/plugins/gevolution/gevolution.c:412
 msgid "Evolution Integration Configuration"
 msgstr "Innstillingar for Evolution-integreringa"
 
 #. Label
-#: ../pidgin/plugins/gevolution/gevolution.c:413
+#: ../pidgin/plugins/gevolution/gevolution.c:415
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "Vel alle kontoane du vil at vennane automatisk skal leggjast til i."
 
@@ -15160,7 +15226,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gevolution/gevolution.c:525
+#: ../pidgin/plugins/gevolution/gevolution.c:527
 msgid "Evolution Integration"
 msgstr "Evolution-integrering "
 
@@ -15168,8 +15234,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gevolution/gevolution.c:528
 #: ../pidgin/plugins/gevolution/gevolution.c:530
+#: ../pidgin/plugins/gevolution/gevolution.c:532
 msgid "Provides integration with Evolution."
 msgstr "Gjev integrering med Evolution."
 
@@ -15202,6 +15268,15 @@
 msgid "E-mail:"
 msgstr "E-post:"
 
+#: ../pidgin/plugins/gtkbuddynote.c:34
+#, c-format
+msgid ""
+"\n"
+"<b>Buddy Note</b>: %s"
+msgstr ""
+"\n"
+"<b>Vennenotat</b>: %s"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -15780,43 +15855,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:589
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:636
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:593
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:640
 msgid "Opacity:"
 msgstr "Ugjennomskin:"
 
 #. IM Convo trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:553
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:557
 msgid "IM Conversation Windows"
 msgstr "Samtalevindauge for lynmeldingar"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:554
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:558
 msgid "_IM window transparency"
 msgstr "_Gjennomsiktige lynmeldingsvindauge"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:568
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:572
 msgid "_Show slider bar in IM window"
 msgstr "Vis _glidefelt i lynmeldingsvindauga"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:575
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:579
 msgid "Remove IM window transparency on focus"
 msgstr "Ta vekk transparens i lynmeldingsvindauge ved fokus"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:578
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:626
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:582
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:630
 msgid "Always on top"
 msgstr "Alltid øvst"
 
 #. Buddy List trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:610
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:614
 msgid "Buddy List Window"
 msgstr "Vennelista"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:611
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:615
 msgid "_Buddy List window transparency"
 msgstr "Gjennomsiktig _venneliste"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:624
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:628
 msgid "Remove Buddy List window transparency on focus"
 msgstr "Ta vekk transparens i vennelistevindauge ved fokus"
 
@@ -15826,19 +15901,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:684
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:688
 msgid "Transparency"
 msgstr "Gjennomsikt"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:687
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:691
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "Variabel gjennomsikt i vennelista og samtalevindauga."
 
 #. *  description
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:689
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:693
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and the buddy list.\n"
 "\n"